CardFactoryUtil: Persist/Undying using OncePerEffect to prevent it from triggering itself

This commit is contained in:
Hanmac
2016-07-30 19:35:31 +00:00
parent 13b1f01e3b
commit 7dc03721ff

View File

@@ -3060,7 +3060,7 @@ public class CardFactoryUtil {
kws.addTrigger(cardTrigger); kws.addTrigger(cardTrigger);
} }
} else if (keyword.equals("Persist")) { } else if (keyword.equals("Persist")) {
final String trigStr = "Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard " + final String trigStr = "Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | OncePerEffect$ True " +
" | Execute$ PersistReturn | ValidCard$ Card.Self+counters_EQ0_M1M1 | Secondary$ True" + " | Execute$ PersistReturn | ValidCard$ Card.Self+counters_EQ0_M1M1 | Secondary$ True" +
" | TriggerDescription$ Persist (" + Keyword.getInstance(keyword).getReminderText() + ")"; " | TriggerDescription$ Persist (" + Keyword.getInstance(keyword).getReminderText() + ")";
final String effect = "AB$ ChangeZone | Cost$ 0 | Defined$ TriggeredCard | Origin$ Graveyard | Destination$ Battlefield | WithCounters$ M1M1_1"; final String effect = "AB$ ChangeZone | Cost$ 0 | Defined$ TriggeredCard | Origin$ Graveyard | Destination$ Battlefield | WithCounters$ M1M1_1";
@@ -3094,7 +3094,7 @@ public class CardFactoryUtil {
kws.addTrigger(cardTrigger); kws.addTrigger(cardTrigger);
} }
} else if (keyword.equals("Undying")) { } else if (keyword.equals("Undying")) {
final String trigStr = "Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard " + final String trigStr = "Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | OncePerEffect$ True " +
" | Execute$ UndyingReturn | ValidCard$ Card.Self+counters_EQ0_P1P1 | Secondary$ True" + " | Execute$ UndyingReturn | ValidCard$ Card.Self+counters_EQ0_P1P1 | Secondary$ True" +
" | TriggerDescription$ Undying (" + Keyword.getInstance(keyword).getReminderText() + ")"; " | TriggerDescription$ Undying (" + Keyword.getInstance(keyword).getReminderText() + ")";
final String effect = "AB$ ChangeZone | Cost$ 0 | Defined$ TriggeredCard | Origin$ Graveyard | Destination$ Battlefield | WithCounters$ P1P1_1"; final String effect = "AB$ ChangeZone | Cost$ 0 | Defined$ TriggeredCard | Origin$ Graveyard | Destination$ Battlefield | WithCounters$ P1P1_1";