From 83363d7491e2a611ef82fbb036e38560be45dcfd Mon Sep 17 00:00:00 2001 From: swordshine Date: Wed, 26 Feb 2014 06:22:24 +0000 Subject: [PATCH] - Better script for Price of Glory --- forge-ai/src/main/java/forge/ai/AiController.java | 9 ++++----- forge-gui/res/cardsfolder/p/price_of_glory.txt | 3 ++- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/forge-ai/src/main/java/forge/ai/AiController.java b/forge-ai/src/main/java/forge/ai/AiController.java index ed41d87b253..7481038f870 100644 --- a/forge-ai/src/main/java/forge/ai/AiController.java +++ b/forge-ai/src/main/java/forge/ai/AiController.java @@ -178,12 +178,11 @@ public class AiController { private boolean checkCurseEffects() { for (final Card c : game.getCardsIn(ZoneType.Battlefield)) { - for (Trigger t : c.getTriggers()) { - if (t.getMapParams().containsKey("CurseNonActive") - && !player.equals(game.getPhaseHandler().getPlayerTurn())) { - return true; - } + if (c.hasSVar("CurseNonActiveEffect") + && !player.equals(game.getPhaseHandler().getPlayerTurn())) { + return true; } + } return false; } diff --git a/forge-gui/res/cardsfolder/p/price_of_glory.txt b/forge-gui/res/cardsfolder/p/price_of_glory.txt index dfb48b1f51e..c052abc143d 100644 --- a/forge-gui/res/cardsfolder/p/price_of_glory.txt +++ b/forge-gui/res/cardsfolder/p/price_of_glory.txt @@ -1,8 +1,9 @@ Name:Price of Glory ManaCost:2 R Types:Enchantment -T:Mode$ TapsForMana | ValidCard$ Land | Execute$ TrigDestroy | TriggerZones$ Battlefield | Activator$ Player.NonActive | CurseNonActive$ True | TriggerDescription$ Whenever a player taps a land for mana, if it's not that player's turn, destroy that land. +T:Mode$ TapsForMana | ValidCard$ Land | Execute$ TrigDestroy | TriggerZones$ Battlefield | Activator$ Player.NonActive | TriggerDescription$ Whenever a player taps a land for mana, if it's not that player's turn, destroy that land. SVar:TrigDestroy:DB$ Destroy | Defined$ TriggeredCard +SVar:CurseNonActiveEffect:True SVar:RemAIDeck:True SVar:Picture:http://www.wizards.com/global/images/magic/general/price_of_glory.jpg Oracle:Whenever a player taps a land for mana, if it's not that player's turn, destroy that land.