From a78cd7cb5490f7cbdb2d5dc4be4a990c0356acb4 Mon Sep 17 00:00:00 2001 From: Hanmac Date: Sat, 19 Nov 2016 10:52:14 +0000 Subject: [PATCH] CardFactoryUtil: moved Evolve to new Trigger Format --- .../java/forge/game/card/CardFactoryUtil.java | 27 +++++++++++-------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java b/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java index ebabd93774a..8d09a2c5e67 100644 --- a/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java +++ b/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java @@ -2332,17 +2332,7 @@ public class CardFactoryUtil { addTriggerAbility(keyword, card, null); } else if (keyword.equals("Evolve")) { - final String evolveTrigger = "Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | " - + " ValidCard$ Creature.YouCtrl+Other | EvolveCondition$ True | " - + "TriggerZones$ Battlefield | Execute$ EvolveAddCounter | Secondary$ True | " - + "TriggerDescription$ Evolve (Whenever a creature enters the battlefield under your " - + "control, if that creature has greater power or toughness than this creature, put a " - + "+1/+1 counter on this creature.)"; - final String abString = "AB$ PutCounter | Cost$ 0 | Defined$ Self | CounterType$ P1P1 | " - + "CounterNum$ 1 | Evolve$ True"; - final Trigger parsedTrigger = TriggerHandler.parseTrigger(evolveTrigger, card, true); - card.addTrigger(parsedTrigger); - card.setSVar("EvolveAddCounter", abString); + addTriggerAbility(keyword, card, null); } else if (keyword.startsWith("Dredge")) { final int dredgeAmount = card.getKeywordMagnitude("Dredge"); @@ -2728,6 +2718,21 @@ public class CardFactoryUtil { trigger.setOverridingAbility(AbilityFactory.getAbility(effect, card)); final Trigger cardTrigger = card.addTrigger(trigger); + if (!intrinsic) { + kws.addTrigger(cardTrigger); + } + } else if (keyword.equals("Evolve")) { + final String trigStr = "Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | " + + " ValidCard$ Creature.YouCtrl+Other | EvolveCondition$ True | " + + "TriggerZones$ Battlefield | Secondary$ True | " + + "TriggerDescription$ Evolve (" + Keyword.getInstance(keyword).getReminderText()+ ")"; + final String effect = "DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | " + + "CounterNum$ 1 | Evolve$ True"; + + final Trigger trigger = TriggerHandler.parseTrigger(trigStr.toString(), card, intrinsic); + trigger.setOverridingAbility(AbilityFactory.getAbility(effect, card)); + final Trigger cardTrigger = card.addTrigger(trigger); + if (!intrinsic) { kws.addTrigger(cardTrigger); }