external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-17 19:28:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

CardFactoryUtil: moved Echo to new Format

Browse Source
This commit is contained in:
Hanmac
2016-12-12 06:04:29 +00:00
parent 9aaf5ccba0
commit 3bdc2101e6
1 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
forge-game/src/main/java/forge/game/card/CardFactoryUtil.java
View File

@@ -2170,19 +2170,7 @@ public class CardFactoryUtil {
card.setSVar("GraveyardToLibrary", ab); card.setSVar("GraveyardToLibrary", ab);
} }
else if (keyword.startsWith("Echo")) { else if (keyword.startsWith("Echo")) {
final String[] k = keyword.split(":"); addTriggerAbility(keyword, card, null);
final String cost = k[1];
String upkeepTrig = "Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield " +
" | Execute$ TrigUpkeepEcho | IsPresent$ Card.Self+cameUnderControlSinceLastUpkeep | Secondary$ True | " +
"TriggerDescription$ Echo: At the beginning of your upkeep, if CARDNAME came under your control since the " +
"beginning of your last upkeep, sacrifice it unless you pay the Echo cost";
String ref = "X".equals(cost) ? " | References$ X" : "";
card.setSVar("TrigUpkeepEcho", "AB$ Sacrifice | Cost$ 0 | SacValid$ Self | "
+ "Echo$ " + cost + ref);
final Trigger parsedUpkeepTrig = TriggerHandler.parseTrigger(upkeepTrig, card, true);
card.addTrigger(parsedUpkeepTrig);
} }
else if (keyword.startsWith("Suspend")) { else if (keyword.startsWith("Suspend")) {
card.setSuspend(true); card.setSuspend(true);
@@ -2708,6 +2696,25 @@ public class CardFactoryUtil {
final Trigger cardTrigger = card.addTrigger(dethroneTrigger); final Trigger cardTrigger = card.addTrigger(dethroneTrigger);
if (!intrinsic) {
kws.addTrigger(cardTrigger);
}
} else if (keyword.startsWith("Echo")) {
final String[] k = keyword.split(":");
final String cost = k[1];
String upkeepTrig = "Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield " +
" | IsPresent$ Card.Self+cameUnderControlSinceLastUpkeep | Secondary$ True | " +
"TriggerDescription$ " + Keyword.getInstance(keyword).getReminderText();
String ref = "X".equals(cost) ? " | References$ X" : "";
String effect = "DB$ Sacrifice | SacValid$ Self | "
+ "Echo$ " + cost + ref;
final Trigger trigger = TriggerHandler.parseTrigger(upkeepTrig, card, intrinsic);
trigger.setOverridingAbility(AbilityFactory.getAbility(effect, card));
final Trigger cardTrigger = card.addTrigger(trigger);
if (!intrinsic) { if (!intrinsic) {
kws.addTrigger(cardTrigger); kws.addTrigger(cardTrigger);
} }