From c0de6f7721eb68cd6f489aceae01373ae5b93c46 Mon Sep 17 00:00:00 2001 From: swordshine Date: Thu, 8 Aug 2013 10:25:05 +0000 Subject: [PATCH] - Simplified Standstill's script --- res/cardsfolder/s/standstill.txt | 15 +++++++-------- .../card/ability/ai/PermanentNoncreatureAi.java | 2 -- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/res/cardsfolder/s/standstill.txt b/res/cardsfolder/s/standstill.txt index d0fe1803931..49cd650208f 100644 --- a/res/cardsfolder/s/standstill.txt +++ b/res/cardsfolder/s/standstill.txt @@ -1,15 +1,14 @@ Name:Standstill ManaCost:1 U Types:Enchantment -A:SP$ PermanentNoncreature | Cost$ 1 U | AILogic$ MoreCreatures -T:Mode$ SpellCast | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigSacYou | TriggerDescription$ When a player casts a spell, sacrifice CARDNAME. If you do, each of that player's opponents draws three cards. -T:Mode$ SpellCast | ValidActivatingPlayer$ Opponent | TriggerZones$ Battlefield | Execute$ TrigSacOpp | Secondary$ True | TriggerDescription$ When a player casts a spell, sacrifice CARDNAME. If you do, each of that player's opponents draws three cards. -#Must use SacrificeAll since regular sacrifice can't remember the sac'd cards atm. -SVar:TrigSacYou:AB$SacrificeAll | Cost$ 0 | ValidCards$ Card.Self | RememberSacrificed$ True | SubAbility$ DrawOpp -SVar:TrigSacOpp:AB$SacrificeAll | Cost$ 0 | ValidCards$ Card.Self | RememberSacrificed$ True | SubAbility$ DrawYou -SVar:DrawOpp:DB$ Draw | NumCards$ 3 | Defined$ Opponent | ConditionCheckSVar$ X | ConditionSVarCompare$ GE1 -SVar:DrawYou:DB$ Draw | NumCards$ 3 | Defined$ You | ConditionCheckSVar$ X | ConditionSVarCompare$ GE1 +T:Mode$ SpellCast | ValidActivatingPlayer$ Player | TriggerZones$ Battlefield | Execute$ TrigSac | TriggerDescription$ When a player casts a spell, sacrifice CARDNAME. If you do, each of that player's opponents draws three cards. +SVar:TrigSac:AB$ Sacrifice | Cost$ 0 | SacValid$ Self | RememberSacrificed$ True | SubAbility$ DrawOpp +SVar:DrawOpp:DB$ Draw | NumCards$ 3 | Defined$ TriggeredCardOpponent | ConditionCheckSVar$ X | ConditionSVarCompare$ GE1 | SubAbility$ DBCleanup +SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True SVar:X:Remembered$Amount +SVar:Y:Count$Valid Creature.YouCtrl +SVar:Z:Count$Valid Creature.OppCtrl +SVar:NeedsToPlayVar:Y GTZ Svar:RemAIDeck:True SVar:Picture:http://www.wizards.com/global/images/magic/general/standstill.jpg Oracle:When a player casts a spell, sacrifice Standstill. If you do, each of that player's opponents draws three cards. \ No newline at end of file diff --git a/src/main/java/forge/card/ability/ai/PermanentNoncreatureAi.java b/src/main/java/forge/card/ability/ai/PermanentNoncreatureAi.java index 5b01c95f8f7..393101fefe6 100644 --- a/src/main/java/forge/card/ability/ai/PermanentNoncreatureAi.java +++ b/src/main/java/forge/card/ability/ai/PermanentNoncreatureAi.java @@ -21,8 +21,6 @@ public class PermanentNoncreatureAi extends SpellAbilityAi { if ("DontCast".equals(logic)) { return false; - } else if ("MoreCreatures".equals(logic)) { - return (aiPlayer.getCreaturesInPlay().size() > aiPlayer.getOpponent().getCreaturesInPlay().size()); } // Wait for Main2 if possible