diff --git a/res/cardsfolder/m/melira_sylvok_outcast.txt b/res/cardsfolder/m/melira_sylvok_outcast.txt index c0f5de31493..3d6dd5a7962 100644 --- a/res/cardsfolder/m/melira_sylvok_outcast.txt +++ b/res/cardsfolder/m/melira_sylvok_outcast.txt @@ -6,6 +6,9 @@ PT:2/2 K:Creatures you control can't have -1/-1 counters placed on them. S:Mode$ Continuous | Affected$ You | AddKeyword$ You can't get poison counters | Description$ You can't get poison counters. S:Mode$ Continuous | Affected$ Creature.YouDontCtrl | RemoveKeyword$ Infect | Description$ Creatures your opponents control lose infect. +S:Mode$ Continuous | Affected$ Creature.YouCtrl+withPersist | AddSVar$ Sac | AddKeyword$ Sac +SVar:Sac:SVar:SacMe:3 +SVar:PlayMain1:TRUE SVar:Rarity:Rare SVar:Picture:http://www.wizards.com/global/images/magic/general/melira_sylvok_outcast.jpg SetInfo:NPH|Rare|http://magiccards.info/scans/en/nph/115.jpg diff --git a/res/cardsfolder/s/skeletal_vampire.txt b/res/cardsfolder/s/skeletal_vampire.txt index 44061b8cd22..5fbd0844fba 100644 --- a/res/cardsfolder/s/skeletal_vampire.txt +++ b/res/cardsfolder/s/skeletal_vampire.txt @@ -8,7 +8,7 @@ T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.S SVar:TrigToken:AB$Token | Cost$ 0 | TokenImage$ B 1 1 Bat | TokenName$ Bat | TokenColors$ Black | TokenTypes$ Creature,Bat | TokenPower$ 1 | TokenToughness$ 1 | TokenKeywords$ Flying | TokenOwner$ You | TokenAmount$ 2 | TokenSVars$ Sac A:AB$ Token | Cost$ 3 B B Sac<1/Bat> | TokenAmount$ 2 | TokenImage$ B 1 1 Bat | TokenName$ Bat | TokenColors$ Black | TokenTypes$ Creature,Bat | TokenPower$ 1 | TokenToughness$ 1 | TokenKeywords$ Flying | TokenOwner$ You | TokenSVars$ Sac | SpellDescription$ Put two 1/1 black Bat creature tokens with flying onto the battlefield. A:AB$ Regenerate | Cost$ Sac<1/Bat> | SpellDescription$ Regenerate CARDNAME. -SVar:Sac:SVar:SacMe:4 +SVar:Sac:SVar:SacMe:1 SVar:Rarity:Rare SVar:Picture:http://www.wizards.com/global/images/magic/general/skeletal_vampire.jpg SetInfo:GPT|Rare|http://magiccards.info/scans/en/gp/62.jpg diff --git a/src/main/java/forge/CombatUtil.java b/src/main/java/forge/CombatUtil.java index ab9c2836f6e..d41eca62d87 100644 --- a/src/main/java/forge/CombatUtil.java +++ b/src/main/java/forge/CombatUtil.java @@ -1763,7 +1763,8 @@ public class CombatUtil { if (((attacker.hasKeyword("Indestructible") || (ComputerUtil.canRegenerate(attacker) && !withoutAbilities)) && !(defender .hasKeyword("Wither") || defender.hasKeyword("Infect"))) - || (attacker.hasKeyword("Persist") && !attacker.canHaveCountersPlacedOnIt(Counters.M1M1))) { + || (attacker.hasKeyword("Persist") && !attacker.canHaveCountersPlacedOnIt(Counters.M1M1) + && attacker.getCounters(Counters.M1M1) == 0)) { return false; } @@ -1894,7 +1895,8 @@ public class CombatUtil { if (((defender.hasKeyword("Indestructible") || (ComputerUtil.canRegenerate(defender) && !withoutAbilities)) && !(attacker .hasKeyword("Wither") || attacker.hasKeyword("Infect"))) - || (defender.hasKeyword("Persist") && !defender.canHaveCountersPlacedOnIt(Counters.M1M1))) { + || (defender.hasKeyword("Persist") && !defender.canHaveCountersPlacedOnIt(Counters.M1M1)) + && defender.getCounters(Counters.M1M1) == 0) { return false; } diff --git a/src/main/java/forge/card/staticability/StaticAbilityContinuous.java b/src/main/java/forge/card/staticability/StaticAbilityContinuous.java index 3d97eb46793..31ae52865cb 100644 --- a/src/main/java/forge/card/staticability/StaticAbilityContinuous.java +++ b/src/main/java/forge/card/staticability/StaticAbilityContinuous.java @@ -265,7 +265,14 @@ public class StaticAbilityContinuous { // add SVars if (addSVars != null) { for (final String sVar : addSVars) { - affectedCard.setSVar(sVar, hostCard.getSVar(sVar)); + String actualSVar = hostCard.getSVar(sVar); + String name = sVar; + if (actualSVar.startsWith("SVar")) { + actualSVar = actualSVar.split("SVar:")[1]; + name = actualSVar.split(":")[0]; + actualSVar = actualSVar.split(":")[1]; + } + affectedCard.setSVar(name, actualSVar); } }