From f648f97c729f2a532b83adbe213f23b7980019c0 Mon Sep 17 00:00:00 2001 From: swordshine Date: Mon, 1 Apr 2013 00:30:53 +0000 Subject: [PATCH] - Simplified scripts of Burning-Tree Bloodscale and Auriok Siege Sled --- res/cardsfolder/a/auriok_siege_sled.txt | 5 ++--- res/cardsfolder/b/burning_tree_bloodscale.txt | 6 +++--- src/main/java/forge/Card.java | 3 +-- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/res/cardsfolder/a/auriok_siege_sled.txt b/res/cardsfolder/a/auriok_siege_sled.txt index 9bd63b014e6..cc275b3de89 100644 --- a/res/cardsfolder/a/auriok_siege_sled.txt +++ b/res/cardsfolder/a/auriok_siege_sled.txt @@ -2,9 +2,8 @@ Name:Auriok Siege Sled ManaCost:6 Types:Artifact Creature Juggernaut PT:3/5 -A:AB$ Pump | Cost$ 1 | ValidTgts$ Creature.Artifact | TgtPrompt$ Select target artifact creature that can't block this creature this turn | IsCurse$ True | RememberObjects$ Targeted | SubAbility$ DBCantblock | StackDescription$ None | SpellDescription$ Target artifact creature can't block CARDNAME this turn. -SVar:DBCantblock:DB$ Effect | Name$ Auriok Siege Sled Effect | RememberObjects$ Targeted | StaticAbilities$ STCantBlock | ImprintCards$ Self -SVar:STCantBlock:Mode$ Continuous | Affected$ Card.IsImprinted | EffectZone$ Command | AddHiddenKeyword$ CantBeBlockedBy Creature.IsRemembered | Description$ Auriok Siege Sled can't be blocked by target artifact creature. +A:AB$ Pump | Cost$ 1 | ValidTgts$ Creature.Artifact | TgtPrompt$ Select target artifact creature that can't block this creature this turn | IsCurse$ True | RememberObjects$ Targeted | SubAbility$ DBPump | StackDescription$ {c:Targeted} can't block CARDNAME this turn. | SpellDescription$ Target artifact creature can't block CARDNAME this turn. +SVar:DBPump:DB$ Pump | KW$ HIDDEN CantBeBlockedBy Creature.IsRemembered | StackDescription$ None T:Mode$ Phase | Phase$ Cleanup | TriggerZones$ Battlefield | Execute$ DBCleanup | Static$ True T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | ValidCard$ Card.Self | Execute$ DBCleanup | Static$ True SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True diff --git a/res/cardsfolder/b/burning_tree_bloodscale.txt b/res/cardsfolder/b/burning_tree_bloodscale.txt index 6f215e6eb80..3de8a45ef5c 100644 --- a/res/cardsfolder/b/burning_tree_bloodscale.txt +++ b/res/cardsfolder/b/burning_tree_bloodscale.txt @@ -3,13 +3,13 @@ ManaCost:2 R G Types:Creature Viashino Berserker PT:2/2 K:Bloodthirst 1 -A:AB$ Pump | Cost$ 2 R | ValidTgts$ Creature | TgtPrompt$ Select target creature that can't block this creature this turn | IsCurse$ True | RememberObjects$ Targeted | SubAbility$ DBCantblock | StackDescription$ None | SpellDescription$ Target creature can't block CARDNAME this turn. -SVar:DBCantblock:DB$ Effect | Name$ Burning-Tree Bloodscale Effect | RememberObjects$ Targeted | StaticAbilities$ STCantBlock | ImprintCards$ Self -SVar:STCantBlock:Mode$ Continuous | Affected$ Card.IsImprinted | EffectZone$ Command | AddHiddenKeyword$ CantBeBlockedBy Creature.IsRemembered | Description$ Burning-Tree Bloodscale can't be blocked by target creature. +A:AB$ Pump | Cost$ 2 R | ValidTgts$ Creature | TgtPrompt$ Select target creature that can't block this creature this turn | IsCurse$ True | RememberObjects$ Targeted | SubAbility$ DBPump | StackDescription$ {c:Targeted} can't block CARDNAME this turn. | SpellDescription$ Target creature can't block CARDNAME this turn. +SVar:DBPump:DB$ Pump | KW$ HIDDEN CantBeBlockedBy Creature.IsRemembered | StackDescription$ None T:Mode$ Phase | Phase$ Cleanup | TriggerZones$ Battlefield | Execute$ DBCleanup | Static$ True T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | ValidCard$ Card.Self | Execute$ DBCleanup | Static$ True SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True A:AB$ MustBlock | Cost$ 2 G | ValidTgts$ Creature | TgtPrompt$ Select target creature that must block this creature this turn | SpellDescription$ Target creature blocks CARDNAME this turn if able. +SVar:RemAIDeck:True SVar:Picture:http://www.wizards.com/global/images/magic/general/burning_tree_bloodscale.jpg Oracle:Bloodthirst 1 (If an opponent was dealt damage this turn, this creature enters the battlefield with a +1/+1 counter on it.)\n{2}{R}: Target creature can't block Burning-Tree Bloodscale this turn.\n{2}{G}: Target creature blocks Burning-Tree Bloodscale this turn if able. SetInfo:GPT Common \ No newline at end of file diff --git a/src/main/java/forge/Card.java b/src/main/java/forge/Card.java index d4c11d29f3d..bfbf60bfa51 100644 --- a/src/main/java/forge/Card.java +++ b/src/main/java/forge/Card.java @@ -1258,13 +1258,12 @@ public class Card extends GameEntity implements Comparable { if (this.hasKeyword("CARDNAME can't have counters placed on it.")) { return false; } - if (this.isCreature() && counterName.equals(CounterType.M1M1)) { + if (this.isCreature() && counterName == CounterType.M1M1) { for (final Card c : this.getController().getCreaturesInPlay()) { // look for Melira, Sylvok Outcast if (c.hasKeyword("Creatures you control can't have -1/-1 counters placed on them.")) { return false; } } - } return true; }