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

SpellAbilityEffect: extend registerDelayedTrigger to be able to use end of combat.

Browse Source
This commit is contained in:
Hanmac
2016-07-22 17:32:04 +00:00
parent b7e2c7bf41
commit c8f31282fb
1 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
forge-game/src/main/java/forge/game/ability/SpellAbilityEffect.java
View File

@@ -195,18 +195,30 @@ public abstract class SpellAbilityEffect {
protected static void registerDelayedTrigger(final SpellAbility sa, String location, final List<Card> crds) { protected static void registerDelayedTrigger(final SpellAbility sa, String location, final List<Card> crds) {
boolean your = location.startsWith("Your"); boolean your = location.startsWith("Your");
boolean combat = location.endsWith("Combat");
if (your) { if (your) {
location = location.substring("Your".length()); location = location.substring("Your".length());
} }
if (combat) {
location = location.substring(0, location.length() - "Combat".length());
}
StringBuilder delTrig = new StringBuilder(); StringBuilder delTrig = new StringBuilder();
delTrig.append("Mode$ Phase | Phase$ End Of Turn "); delTrig.append("Mode$ Phase | Phase$ ");
delTrig.append(combat ? "EndCombat " : "End Of Turn ");
if (your) { if (your) {
delTrig.append("| ValidPlayer$ You "); delTrig.append("| ValidPlayer$ You ");
} }
delTrig.append("| TriggerDescription$ " + location + " " + crds + " at the beginning of "); delTrig.append("| TriggerDescription$ " + location + " " + crds + " at the ");
delTrig.append(your ? "your" : "the"); if (combat) {
delTrig.append(" next end step."); delTrig.append("end of combat.");
} else {
delTrig.append("beginning of ");
delTrig.append(your ? "your" : "the");
delTrig.append(" next end step.");
}
final Trigger trig = TriggerHandler.parseTrigger(delTrig.toString(), sa.getHostCard(), true); final Trigger trig = TriggerHandler.parseTrigger(delTrig.toString(), sa.getHostCard(), true);
for (final Card c : crds) { for (final Card c : crds) {
trig.addRemembered(c); trig.addRemembered(c);