From 962597e816ea40da6ba62f7336d55b90207c429f Mon Sep 17 00:00:00 2001 From: Sol Date: Fri, 16 Oct 2015 01:53:32 +0000 Subject: [PATCH] - Fix triggers from using the trigger variables to using the SA variables, which are more correct with multiple simultaneous triggers --- .../src/main/java/forge/game/trigger/TriggerAttached.java | 2 +- .../java/forge/game/trigger/TriggerAttackerBlocked.java | 4 ++-- .../game/trigger/TriggerAttackerBlockedByCreature.java | 4 ++-- .../java/forge/game/trigger/TriggerAttackerUnblocked.java | 2 +- .../java/forge/game/trigger/TriggerAttackersDeclared.java | 2 +- .../java/forge/game/trigger/TriggerBecomeMonstrous.java | 2 +- .../main/java/forge/game/trigger/TriggerBecomeRenowned.java | 2 +- .../main/java/forge/game/trigger/TriggerBecomesTarget.java | 4 ++-- .../java/forge/game/trigger/TriggerBlockersDeclared.java | 2 +- .../src/main/java/forge/game/trigger/TriggerBlocks.java | 2 +- .../src/main/java/forge/game/trigger/TriggerChampioned.java | 2 +- .../java/forge/game/trigger/TriggerChangesController.java | 2 +- .../forge/game/trigger/TriggerCombatDamageDoneOnce.java | 4 ++-- .../main/java/forge/game/trigger/TriggerCounterAdded.java | 2 +- .../java/forge/game/trigger/TriggerCounterAddedOnce.java | 2 +- .../main/java/forge/game/trigger/TriggerCounterRemoved.java | 2 +- .../src/main/java/forge/game/trigger/TriggerCountered.java | 4 ++-- .../src/main/java/forge/game/trigger/TriggerCycled.java | 2 +- .../src/main/java/forge/game/trigger/TriggerDamageDone.java | 6 +++--- .../forge/game/trigger/TriggerDealtCombatDamageOnce.java | 6 +++--- .../src/main/java/forge/game/trigger/TriggerDestroyed.java | 4 ++-- .../src/main/java/forge/game/trigger/TriggerDevoured.java | 2 +- .../src/main/java/forge/game/trigger/TriggerDiscarded.java | 4 ++-- .../src/main/java/forge/game/trigger/TriggerDrawn.java | 2 +- .../src/main/java/forge/game/trigger/TriggerEvolved.java | 2 +- .../src/main/java/forge/game/trigger/TriggerExploited.java | 4 ++-- .../src/main/java/forge/game/trigger/TriggerFight.java | 2 +- .../main/java/forge/game/trigger/TriggerFlippedCoin.java | 2 +- .../src/main/java/forge/game/trigger/TriggerLandPlayed.java | 2 +- .../src/main/java/forge/game/trigger/TriggerLifeGained.java | 4 ++-- .../src/main/java/forge/game/trigger/TriggerLifeLost.java | 4 ++-- .../src/main/java/forge/game/trigger/TriggerLosesGame.java | 2 +- .../java/forge/game/trigger/TriggerPayCumulativeUpkeep.java | 2 +- .../src/main/java/forge/game/trigger/TriggerPhaseIn.java | 2 +- .../src/main/java/forge/game/trigger/TriggerPhaseOut.java | 2 +- .../src/main/java/forge/game/trigger/TriggerPlanarDice.java | 2 +- .../java/forge/game/trigger/TriggerPlaneswalkedFrom.java | 2 +- .../main/java/forge/game/trigger/TriggerPlaneswalkedTo.java | 2 +- .../src/main/java/forge/game/trigger/TriggerSacrificed.java | 2 +- .../src/main/java/forge/game/trigger/TriggerScry.java | 2 +- .../java/forge/game/trigger/TriggerSearchedLibrary.java | 2 +- .../src/main/java/forge/game/trigger/TriggerShuffled.java | 2 +- .../java/forge/game/trigger/TriggerSpellAbilityCast.java | 6 +++--- .../src/main/java/forge/game/trigger/TriggerTaps.java | 2 +- .../main/java/forge/game/trigger/TriggerTapsForMana.java | 4 ++-- .../main/java/forge/game/trigger/TriggerTransformed.java | 2 +- .../src/main/java/forge/game/trigger/TriggerTurnBegin.java | 2 +- .../src/main/java/forge/game/trigger/TriggerTurnFaceUp.java | 2 +- .../src/main/java/forge/game/trigger/TriggerUnequip.java | 4 ++-- .../src/main/java/forge/game/trigger/TriggerUntaps.java | 2 +- .../src/main/java/forge/game/trigger/TriggerVote.java | 2 +- 51 files changed, 69 insertions(+), 69 deletions(-) diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerAttached.java b/forge-game/src/main/java/forge/game/trigger/TriggerAttached.java index 614df314ef3..67773daab52 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerAttached.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerAttached.java @@ -79,7 +79,7 @@ public class TriggerAttached extends Trigger { @Override public String getImportantStackObjects(SpellAbility sa) { StringBuilder sb = new StringBuilder(); - sb.append("Attachee: ").append(this.getRunParams().get("AttachTarget")); + sb.append("Attachee: ").append(sa.getTriggeringObject("Target")); return sb.toString(); } } diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerAttackerBlocked.java b/forge-game/src/main/java/forge/game/trigger/TriggerAttackerBlocked.java index 755650f7357..68ed2d8f907 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerAttackerBlocked.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerAttackerBlocked.java @@ -86,8 +86,8 @@ public class TriggerAttackerBlocked extends Trigger { @Override public String getImportantStackObjects(SpellAbility sa) { StringBuilder sb = new StringBuilder(); - sb.append("Attacker: ").append(this.getRunParams().get("Attacker")); - sb.append(" Number Blockers: ").append(this.getRunParams().get("NumBlockers")); + sb.append("Attacker: ").append(sa.getTriggeringObject("Attacker")).append(", "); + sb.append("Number Blockers: ").append(sa.getTriggeringObject("NumBlockers")); return sb.toString(); } } diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerAttackerBlockedByCreature.java b/forge-game/src/main/java/forge/game/trigger/TriggerAttackerBlockedByCreature.java index 2b064d62504..4f4ae302f7a 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerAttackerBlockedByCreature.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerAttackerBlockedByCreature.java @@ -94,8 +94,8 @@ public class TriggerAttackerBlockedByCreature extends Trigger { @Override public String getImportantStackObjects(SpellAbility sa) { StringBuilder sb = new StringBuilder(); - sb.append("Attacker: ").append(this.getRunParams().get("Attacker")); - sb.append(", Blocker: ").append(this.getRunParams().get("Blocker")); + sb.append("Attacker: ").append(sa.getTriggeringObject("Attacker")).append(", "); + sb.append("Blocker: ").append(sa.getTriggeringObject("Blocker")); return sb.toString(); } } diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerAttackerUnblocked.java b/forge-game/src/main/java/forge/game/trigger/TriggerAttackerUnblocked.java index 93efa61e637..c9ac21fc4bd 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerAttackerUnblocked.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerAttackerUnblocked.java @@ -77,7 +77,7 @@ public class TriggerAttackerUnblocked extends Trigger { @Override public String getImportantStackObjects(SpellAbility sa) { StringBuilder sb = new StringBuilder(); - sb.append("Attacker: ").append(this.getRunParams().get("Attacker")); + sb.append("Attacker: ").append(sa.getTriggeringObject("Attacker")); return sb.toString(); } } diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerAttackersDeclared.java b/forge-game/src/main/java/forge/game/trigger/TriggerAttackersDeclared.java index d8ff51ecede..7cc73b9bf4b 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerAttackersDeclared.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerAttackersDeclared.java @@ -80,7 +80,7 @@ public class TriggerAttackersDeclared extends Trigger { @Override public String getImportantStackObjects(SpellAbility sa) { StringBuilder sb = new StringBuilder(); - sb.append("Number Attackers: ").append(this.getRunParams().get("Attackers")); + sb.append("Number Attackers: ").append(sa.getTriggeringObject("Attackers")); return sb.toString(); } } diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerBecomeMonstrous.java b/forge-game/src/main/java/forge/game/trigger/TriggerBecomeMonstrous.java index 0b15791c5af..0fa2ed9e3f9 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerBecomeMonstrous.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerBecomeMonstrous.java @@ -68,7 +68,7 @@ public class TriggerBecomeMonstrous extends Trigger { @Override public String getImportantStackObjects(SpellAbility sa) { StringBuilder sb = new StringBuilder(); - sb.append("Monstrosity: ").append(this.getRunParams().get("Card")); + sb.append("Monstrous: ").append(sa.getTriggeringObject("Card")); return sb.toString(); } } diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerBecomeRenowned.java b/forge-game/src/main/java/forge/game/trigger/TriggerBecomeRenowned.java index 60e1b90bea3..5146fdb555d 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerBecomeRenowned.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerBecomeRenowned.java @@ -68,7 +68,7 @@ public class TriggerBecomeRenowned extends Trigger { @Override public String getImportantStackObjects(SpellAbility sa) { StringBuilder sb = new StringBuilder(); - sb.append("Renowned: ").append(this.getRunParams().get("Card")); + sb.append("Renowned: ").append(sa.getTriggeringObject("Card")); return sb.toString(); } } diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerBecomesTarget.java b/forge-game/src/main/java/forge/game/trigger/TriggerBecomesTarget.java index 9fd403fd86e..097262f0c51 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerBecomesTarget.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerBecomesTarget.java @@ -96,8 +96,8 @@ public class TriggerBecomesTarget extends Trigger { @Override public String getImportantStackObjects(SpellAbility sa) { StringBuilder sb = new StringBuilder(); - sb.append("Source: ").append(((SpellAbility) this.getRunParams().get("SourceSA")).getHostCard()).append(", "); - sb.append("Target: ").append(this.getRunParams().get("Target")); + sb.append("Source: ").append(((SpellAbility) sa.getTriggeringObject("SourceSA")).getHostCard()).append(", "); + sb.append("Target: ").append(sa.getTriggeringObject("Target")); return sb.toString(); } } diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerBlockersDeclared.java b/forge-game/src/main/java/forge/game/trigger/TriggerBlockersDeclared.java index f6a4b4b2755..b2904143a4f 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerBlockersDeclared.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerBlockersDeclared.java @@ -58,7 +58,7 @@ public class TriggerBlockersDeclared extends Trigger { @Override public String getImportantStackObjects(SpellAbility sa) { StringBuilder sb = new StringBuilder(); - sb.append("Blockers: ").append(this.getRunParams().get("Blockers")); + sb.append("Blockers: ").append(sa.getTriggeringObject("Blockers")); return sb.toString(); } } diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerBlocks.java b/forge-game/src/main/java/forge/game/trigger/TriggerBlocks.java index 84b0bebb16c..1f351c52813 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerBlocks.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerBlocks.java @@ -95,7 +95,7 @@ public class TriggerBlocks extends Trigger { @Override public String getImportantStackObjects(SpellAbility sa) { StringBuilder sb = new StringBuilder(); - sb.append("Blocker: ").append(this.getRunParams().get("Blocker")); + sb.append("Blocker: ").append(sa.getTriggeringObject("Blocker")); return sb.toString(); } } diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerChampioned.java b/forge-game/src/main/java/forge/game/trigger/TriggerChampioned.java index 1ecdac1f310..0bfae8891c1 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerChampioned.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerChampioned.java @@ -78,7 +78,7 @@ public class TriggerChampioned extends Trigger { @Override public String getImportantStackObjects(SpellAbility sa) { StringBuilder sb = new StringBuilder(); - sb.append("Championed: ").append(this.getRunParams().get("Championed")); + sb.append("Championed: ").append(sa.getTriggeringObject("Championed")); return sb.toString(); } } diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerChangesController.java b/forge-game/src/main/java/forge/game/trigger/TriggerChangesController.java index 6275ef68861..d2d417abe4e 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerChangesController.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerChangesController.java @@ -76,7 +76,7 @@ public class TriggerChangesController extends Trigger { @Override public String getImportantStackObjects(SpellAbility sa) { StringBuilder sb = new StringBuilder(); - sb.append("Changed Controller: ").append(this.getRunParams().get("Card")); + sb.append("Changed Controller: ").append(sa.getTriggeringObject("Card")); return sb.toString(); } } diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerCombatDamageDoneOnce.java b/forge-game/src/main/java/forge/game/trigger/TriggerCombatDamageDoneOnce.java index 891444f1ae5..a2cc7c5ad08 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerCombatDamageDoneOnce.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerCombatDamageDoneOnce.java @@ -87,8 +87,8 @@ public class TriggerCombatDamageDoneOnce extends Trigger { @Override public String getImportantStackObjects(SpellAbility sa) { StringBuilder sb = new StringBuilder(); - sb.append("Sources: ").append(this.getRunParams().get("DamageSources")).append(", "); - sb.append("Target: ").append(this.getRunParams().get("DamageTarget")); + sb.append("Sources: ").append(sa.getTriggeringObject("Sources")).append(", "); + sb.append("Target: ").append(sa.getTriggeringObject("Target")); return sb.toString(); } } diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerCounterAdded.java b/forge-game/src/main/java/forge/game/trigger/TriggerCounterAdded.java index 097522d4875..3cf5b6e6542 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerCounterAdded.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerCounterAdded.java @@ -79,7 +79,7 @@ public class TriggerCounterAdded extends Trigger { @Override public String getImportantStackObjects(SpellAbility sa) { StringBuilder sb = new StringBuilder(); - sb.append("Added to: ").append(this.getRunParams().get("Card")); + sb.append("Added to: ").append(sa.getTriggeringObject("Card")); return sb.toString(); } } diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerCounterAddedOnce.java b/forge-game/src/main/java/forge/game/trigger/TriggerCounterAddedOnce.java index fedb470d8c0..3653f0ea6a6 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerCounterAddedOnce.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerCounterAddedOnce.java @@ -79,7 +79,7 @@ public class TriggerCounterAddedOnce extends Trigger { @Override public String getImportantStackObjects(SpellAbility sa) { StringBuilder sb = new StringBuilder(); - sb.append("Added once: ").append(this.getRunParams().get("Card")); + sb.append("Added once: ").append(sa.getTriggeringObject("Card")); return sb.toString(); } } diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerCounterRemoved.java b/forge-game/src/main/java/forge/game/trigger/TriggerCounterRemoved.java index 72b00d9de70..75522ebfbd3 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerCounterRemoved.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerCounterRemoved.java @@ -88,7 +88,7 @@ public class TriggerCounterRemoved extends Trigger { @Override public String getImportantStackObjects(SpellAbility sa) { StringBuilder sb = new StringBuilder(); - sb.append("Removed to: ").append(this.getRunParams().get("Card")); + sb.append("Removed from: ").append(sa.getTriggeringObject("Card")); return sb.toString(); } } diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerCountered.java b/forge-game/src/main/java/forge/game/trigger/TriggerCountered.java index e07dad8a5a0..61844e18b78 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerCountered.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerCountered.java @@ -86,8 +86,8 @@ public class TriggerCountered extends Trigger { @Override public String getImportantStackObjects(SpellAbility sa) { StringBuilder sb = new StringBuilder(); - sb.append("Countered: ").append(this.getRunParams().get("Card")).append(", "); - sb.append("Cause: ").append(this.getRunParams().get("Cause")); + sb.append("Countered: ").append(sa.getTriggeringObject("Card")).append(", "); + sb.append("Cause: ").append(sa.getTriggeringObject("Cause")); return sb.toString(); } } diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerCycled.java b/forge-game/src/main/java/forge/game/trigger/TriggerCycled.java index 7f6c41ad5c3..a13e8664d9e 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerCycled.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerCycled.java @@ -55,7 +55,7 @@ public class TriggerCycled extends Trigger { @Override public String getImportantStackObjects(SpellAbility sa) { StringBuilder sb = new StringBuilder(); - sb.append("Cycled: ").append(this.getRunParams().get("Card")); + sb.append("Cycled: ").append(sa.getTriggeringObject("Card")); return sb.toString(); } diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerDamageDone.java b/forge-game/src/main/java/forge/game/trigger/TriggerDamageDone.java index 8287687e734..5e474ba2794 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerDamageDone.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerDamageDone.java @@ -111,9 +111,9 @@ public class TriggerDamageDone extends Trigger { @Override public String getImportantStackObjects(SpellAbility sa) { StringBuilder sb = new StringBuilder(); - sb.append("Damage Source: ").append(this.getRunParams().get("DamageSource")).append(", "); - sb.append("Damaged: ").append(this.getRunParams().get("DamageTarget")).append(", "); - sb.append("Amount: ").append(this.getRunParams().get("DamageAmount")); + sb.append("Damage Source: ").append(sa.getTriggeringObject("Source")).append(", "); + sb.append("Damaged: ").append(sa.getTriggeringObject("Target")).append(", "); + sb.append("Amount: ").append(sa.getTriggeringObject("DamageAmount")); return sb.toString(); } } diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerDealtCombatDamageOnce.java b/forge-game/src/main/java/forge/game/trigger/TriggerDealtCombatDamageOnce.java index edc19b9037b..d6cbf467888 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerDealtCombatDamageOnce.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerDealtCombatDamageOnce.java @@ -106,9 +106,9 @@ public class TriggerDealtCombatDamageOnce extends Trigger { @Override public String getImportantStackObjects(SpellAbility sa) { StringBuilder sb = new StringBuilder(); - sb.append("Damage Source: ").append(this.getRunParams().get("DamageSource")).append(", "); - sb.append("Damaged: ").append(this.getRunParams().get("DamageTargets")).append(", "); - sb.append("Amount: ").append(this.getRunParams().get("DamageAmount")); + sb.append("Damage Source: ").append(sa.getTriggeringObject("Source")).append(", "); + sb.append("Damaged: ").append(sa.getTriggeringObject("Targets")).append(", "); + sb.append("Amount: ").append(sa.getTriggeringObject("Amount")); return sb.toString(); } } diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerDestroyed.java b/forge-game/src/main/java/forge/game/trigger/TriggerDestroyed.java index 9a10f9572e0..b9d35e9bd72 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerDestroyed.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerDestroyed.java @@ -74,8 +74,8 @@ public class TriggerDestroyed extends Trigger { @Override public String getImportantStackObjects(SpellAbility sa) { StringBuilder sb = new StringBuilder(); - sb.append("Destroyed: ").append(this.getRunParams().get("Card")).append(", "); - sb.append("Destroyer: ").append(this.getRunParams().get("Causer")); + sb.append("Destroyed: ").append(sa.getTriggeringObject("Card")).append(", "); + sb.append("Destroyer: ").append(sa.getTriggeringObject("Causer")); return sb.toString(); } } diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerDevoured.java b/forge-game/src/main/java/forge/game/trigger/TriggerDevoured.java index 5f984ce4908..6002f4b98e1 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerDevoured.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerDevoured.java @@ -68,7 +68,7 @@ public class TriggerDevoured extends Trigger { @Override public String getImportantStackObjects(SpellAbility sa) { StringBuilder sb = new StringBuilder(); - sb.append("Devoured: ").append(this.getRunParams().get("Devoured")); + sb.append("Devoured: ").append(sa.getTriggeringObject("Devoured")); return sb.toString(); } } diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerDiscarded.java b/forge-game/src/main/java/forge/game/trigger/TriggerDiscarded.java index fe9628099f7..0c60b064149 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerDiscarded.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerDiscarded.java @@ -92,8 +92,8 @@ public class TriggerDiscarded extends Trigger { @Override public String getImportantStackObjects(SpellAbility sa) { StringBuilder sb = new StringBuilder(); - sb.append("Discarded: ").append(this.getRunParams().get("Card")).append(", "); - sb.append("Cause: ").append(this.getRunParams().get("Cause")); + sb.append("Discarded: ").append(sa.getTriggeringObject("Card")).append(", "); + sb.append("Cause: ").append(sa.getTriggeringObject("Cause")); return sb.toString(); } } diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerDrawn.java b/forge-game/src/main/java/forge/game/trigger/TriggerDrawn.java index dcb3ce8e7d1..6c2cab62fe0 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerDrawn.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerDrawn.java @@ -77,7 +77,7 @@ public class TriggerDrawn extends Trigger { @Override public String getImportantStackObjects(SpellAbility sa) { StringBuilder sb = new StringBuilder(); - sb.append("Player: ").append(this.getRunParams().get("Player")); + sb.append("Player: ").append(sa.getTriggeringObject("Player")); return sb.toString(); } } diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerEvolved.java b/forge-game/src/main/java/forge/game/trigger/TriggerEvolved.java index 14a366520f5..95daba1d0a3 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerEvolved.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerEvolved.java @@ -68,7 +68,7 @@ public class TriggerEvolved extends Trigger { @Override public String getImportantStackObjects(SpellAbility sa) { StringBuilder sb = new StringBuilder(); - sb.append("Evolved: ").append(this.getRunParams().get("Card")); + sb.append("Evolved: ").append(sa.getTriggeringObject("Card")); return sb.toString(); } } diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerExploited.java b/forge-game/src/main/java/forge/game/trigger/TriggerExploited.java index 8f3b1644301..1de368877bc 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerExploited.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerExploited.java @@ -78,8 +78,8 @@ public class TriggerExploited extends Trigger { @Override public String getImportantStackObjects(SpellAbility sa) { StringBuilder sb = new StringBuilder(); - sb.append("Exploited: ").append(this.getRunParams().get("Exploited")).append(", "); - sb.append("Exploiter: ").append(this.getRunParams().get("Card")); + sb.append("Exploited: ").append(sa.getTriggeringObject("Exploited")).append(", "); + sb.append("Exploiter: ").append(sa.getTriggeringObject("Card")); return sb.toString(); } } diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerFight.java b/forge-game/src/main/java/forge/game/trigger/TriggerFight.java index ea872159076..55519520217 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerFight.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerFight.java @@ -70,7 +70,7 @@ public class TriggerFight extends Trigger { @Override public String getImportantStackObjects(SpellAbility sa) { StringBuilder sb = new StringBuilder(); - sb.append("Fighter: ").append(this.getRunParams().get("Fighter")); + sb.append("Fighter: ").append(sa.getTriggeringObject("Fighter")); return sb.toString(); } } diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerFlippedCoin.java b/forge-game/src/main/java/forge/game/trigger/TriggerFlippedCoin.java index 5b385a21b26..749ccdb88a0 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerFlippedCoin.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerFlippedCoin.java @@ -75,7 +75,7 @@ public class TriggerFlippedCoin extends Trigger { @Override public String getImportantStackObjects(SpellAbility sa) { StringBuilder sb = new StringBuilder(); - sb.append("Player: ").append(this.getRunParams().get("Player")); + sb.append("Player: ").append(sa.getTriggeringObject("Player")); return sb.toString(); } } diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerLandPlayed.java b/forge-game/src/main/java/forge/game/trigger/TriggerLandPlayed.java index da927cc11a6..0622263bdce 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerLandPlayed.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerLandPlayed.java @@ -57,7 +57,7 @@ public class TriggerLandPlayed extends Trigger { @Override public String getImportantStackObjects(SpellAbility sa) { StringBuilder sb = new StringBuilder(); - sb.append("Land played: ").append(this.getRunParams().get("Card")); + sb.append("Land played: ").append(sa.getTriggeringObject("Card")); return sb.toString(); } diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerLifeGained.java b/forge-game/src/main/java/forge/game/trigger/TriggerLifeGained.java index 0cffd135382..6c520df4570 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerLifeGained.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerLifeGained.java @@ -70,8 +70,8 @@ public class TriggerLifeGained extends Trigger { @Override public String getImportantStackObjects(SpellAbility sa) { StringBuilder sb = new StringBuilder(); - sb.append("Player: ").append(this.getRunParams().get("Player")).append(", "); - sb.append("Gained Amount: ").append(this.getRunParams().get("LifeAmount")); + sb.append("Player: ").append(sa.getTriggeringObject("Player")).append(", "); + sb.append("Gained Amount: ").append(sa.getTriggeringObject("LifeAmount")); return sb.toString(); } } diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerLifeLost.java b/forge-game/src/main/java/forge/game/trigger/TriggerLifeLost.java index d3703cf9c13..38197db9e2d 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerLifeLost.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerLifeLost.java @@ -69,8 +69,8 @@ public class TriggerLifeLost extends Trigger { @Override public String getImportantStackObjects(SpellAbility sa) { StringBuilder sb = new StringBuilder(); - sb.append("Player: ").append(this.getRunParams().get("Player")).append(", "); - sb.append("Lost Amount: ").append(this.getRunParams().get("LifeAmount")); + sb.append("Player: ").append(sa.getTriggeringObject("Player")).append(", "); + sb.append("Lost Amount: ").append(sa.getTriggeringObject("LifeAmount")); return sb.toString(); } } diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerLosesGame.java b/forge-game/src/main/java/forge/game/trigger/TriggerLosesGame.java index c4fd1a966dc..87db4bce49a 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerLosesGame.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerLosesGame.java @@ -46,7 +46,7 @@ public class TriggerLosesGame extends Trigger { @Override public String getImportantStackObjects(SpellAbility sa) { StringBuilder sb = new StringBuilder(); - sb.append("Player: ").append(this.getRunParams().get("Player")); + sb.append("Player: ").append(sa.getTriggeringObject("Player")); return sb.toString(); } } diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerPayCumulativeUpkeep.java b/forge-game/src/main/java/forge/game/trigger/TriggerPayCumulativeUpkeep.java index dcca9564864..7d19453dc0c 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerPayCumulativeUpkeep.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerPayCumulativeUpkeep.java @@ -76,7 +76,7 @@ public class TriggerPayCumulativeUpkeep extends Trigger { @Override public String getImportantStackObjects(SpellAbility sa) { StringBuilder sb = new StringBuilder(); - sb.append("Mana: ").append(this.getRunParams().get("PayingMana")); + sb.append("Mana: ").append(sa.getTriggeringObject("PayingMana")); return sb.toString(); } } diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerPhaseIn.java b/forge-game/src/main/java/forge/game/trigger/TriggerPhaseIn.java index c815c7b919b..8b5ec22f143 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerPhaseIn.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerPhaseIn.java @@ -35,7 +35,7 @@ public class TriggerPhaseIn extends Trigger { @Override public String getImportantStackObjects(SpellAbility sa) { StringBuilder sb = new StringBuilder(); - sb.append("Phased In: ").append(this.getRunParams().get("Card")); + sb.append("Phased In: ").append(sa.getTriggeringObject("Card")); return sb.toString(); } } diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerPhaseOut.java b/forge-game/src/main/java/forge/game/trigger/TriggerPhaseOut.java index 2c053751336..b85f3ba1b25 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerPhaseOut.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerPhaseOut.java @@ -41,7 +41,7 @@ public class TriggerPhaseOut extends Trigger { @Override public String getImportantStackObjects(SpellAbility sa) { StringBuilder sb = new StringBuilder(); - sb.append("Phased Out: ").append(this.getRunParams().get("Card")); + sb.append("Phased Out: ").append(sa.getTriggeringObject("Card")); return sb.toString(); } } diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerPlanarDice.java b/forge-game/src/main/java/forge/game/trigger/TriggerPlanarDice.java index 2630cb45282..edee49ac59a 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerPlanarDice.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerPlanarDice.java @@ -61,7 +61,7 @@ public class TriggerPlanarDice extends Trigger { @Override public String getImportantStackObjects(SpellAbility sa) { StringBuilder sb = new StringBuilder(); - sb.append("Roller: ").append(this.getRunParams().get("Player")); + sb.append("Roller: ").append(sa.getTriggeringObject("Player")); return sb.toString(); } } diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerPlaneswalkedFrom.java b/forge-game/src/main/java/forge/game/trigger/TriggerPlaneswalkedFrom.java index e021ffc52a1..45ace5d067d 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerPlaneswalkedFrom.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerPlaneswalkedFrom.java @@ -58,7 +58,7 @@ public class TriggerPlaneswalkedFrom extends Trigger { @Override public String getImportantStackObjects(SpellAbility sa) { StringBuilder sb = new StringBuilder(); - sb.append("Planeswalked From: ").append(this.getRunParams().get("Cards")); + sb.append("Planeswalked From: ").append(sa.getTriggeringObject("Cards")); return sb.toString(); } diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerPlaneswalkedTo.java b/forge-game/src/main/java/forge/game/trigger/TriggerPlaneswalkedTo.java index 79ef42645c0..ebd89c2d1b3 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerPlaneswalkedTo.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerPlaneswalkedTo.java @@ -58,7 +58,7 @@ public class TriggerPlaneswalkedTo extends Trigger { @Override public String getImportantStackObjects(SpellAbility sa) { StringBuilder sb = new StringBuilder(); - sb.append("Planeswalked To: ").append(this.getRunParams().get("Cards")); + sb.append("Planeswalked To: ").append(sa.getTriggeringObject("Cards")); return sb.toString(); } } diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerSacrificed.java b/forge-game/src/main/java/forge/game/trigger/TriggerSacrificed.java index 7b62b00e067..68889b90f13 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerSacrificed.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerSacrificed.java @@ -82,7 +82,7 @@ public class TriggerSacrificed extends Trigger { @Override public String getImportantStackObjects(SpellAbility sa) { StringBuilder sb = new StringBuilder(); - sb.append("Sacrificed: ").append(this.getRunParams().get("Card")); + sb.append("Sacrificed: ").append(sa.getTriggeringObject("Card")); return sb.toString(); } diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerScry.java b/forge-game/src/main/java/forge/game/trigger/TriggerScry.java index 20a21b38962..686ecec0459 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerScry.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerScry.java @@ -69,7 +69,7 @@ public class TriggerScry extends Trigger { @Override public String getImportantStackObjects(SpellAbility sa) { StringBuilder sb = new StringBuilder(); - sb.append("Scryer: ").append(this.getRunParams().get("Player")); + sb.append("Scryer: ").append(sa.getTriggeringObject("Player")); return sb.toString(); } } diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerSearchedLibrary.java b/forge-game/src/main/java/forge/game/trigger/TriggerSearchedLibrary.java index f183a4a1c1f..be31abae8cf 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerSearchedLibrary.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerSearchedLibrary.java @@ -79,7 +79,7 @@ public class TriggerSearchedLibrary extends Trigger { @Override public String getImportantStackObjects(SpellAbility sa) { StringBuilder sb = new StringBuilder(); - sb.append("Searcher: ").append(this.getRunParams().get("Player")); + sb.append("Searcher: ").append(sa.getTriggeringObject("Player")); return sb.toString(); } } diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerShuffled.java b/forge-game/src/main/java/forge/game/trigger/TriggerShuffled.java index b4a441becce..e8abae4f522 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerShuffled.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerShuffled.java @@ -79,7 +79,7 @@ public class TriggerShuffled extends Trigger { @Override public String getImportantStackObjects(SpellAbility sa) { StringBuilder sb = new StringBuilder(); - sb.append("Shuffler: ").append(this.getRunParams().get("Player")); + sb.append("Shuffler: ").append(sa.getTriggeringObject("Player")); return sb.toString(); } } diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerSpellAbilityCast.java b/forge-game/src/main/java/forge/game/trigger/TriggerSpellAbilityCast.java index 3c3b2068b30..4efa883caf0 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerSpellAbilityCast.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerSpellAbilityCast.java @@ -244,9 +244,9 @@ public class TriggerSpellAbilityCast extends Trigger { @Override public String getImportantStackObjects(SpellAbility sa) { StringBuilder sb = new StringBuilder(); - sb.append("Card: ").append(this.getRunParams().get("Card")).append(", "); - sb.append("Activator: ").append(this.getRunParams().get("Activator")).append(", "); - sb.append("SpellAbility: ").append(this.getRunParams().get("SpellAbility")); + sb.append("Card: ").append(sa.getTriggeringObject("Card")).append(", "); + sb.append("Activator: ").append(sa.getTriggeringObject("Activator")).append(", "); + sb.append("SpellAbility: ").append(sa.getTriggeringObject("SpellAbility")); return sb.toString(); } } diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerTaps.java b/forge-game/src/main/java/forge/game/trigger/TriggerTaps.java index 73b695c6cbb..b954784514d 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerTaps.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerTaps.java @@ -73,7 +73,7 @@ public class TriggerTaps extends Trigger { @Override public String getImportantStackObjects(SpellAbility sa) { StringBuilder sb = new StringBuilder(); - sb.append("Tapped: ").append(this.getRunParams().get("Card")); + sb.append("Tapped: ").append(sa.getTriggeringObject("Card")); return sb.toString(); } diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerTapsForMana.java b/forge-game/src/main/java/forge/game/trigger/TriggerTapsForMana.java index 949397d6eda..68aa7e4b963 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerTapsForMana.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerTapsForMana.java @@ -112,8 +112,8 @@ public class TriggerTapsForMana extends Trigger { @Override public String getImportantStackObjects(SpellAbility sa) { StringBuilder sb = new StringBuilder(); - sb.append("Tapped for Mana: ").append(this.getRunParams().get("Card")); - sb.append("Produced: ").append(this.getRunParams().get("Produced")); + sb.append("Tapped for Mana: ").append(sa.getTriggeringObject("Card")); + sb.append("Produced: ").append(sa.getTriggeringObject("Produced")); return sb.toString(); } diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerTransformed.java b/forge-game/src/main/java/forge/game/trigger/TriggerTransformed.java index bf220f8e54d..aa78ecdab77 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerTransformed.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerTransformed.java @@ -66,7 +66,7 @@ public class TriggerTransformed extends Trigger { @Override public String getImportantStackObjects(SpellAbility sa) { StringBuilder sb = new StringBuilder(); - sb.append("Transformed: ").append(this.getRunParams().get("Transformer")); + sb.append("Transformed: ").append(sa.getTriggeringObject("Transformer")); return sb.toString(); } diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerTurnBegin.java b/forge-game/src/main/java/forge/game/trigger/TriggerTurnBegin.java index cb722c71743..a2a97b385a7 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerTurnBegin.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerTurnBegin.java @@ -28,7 +28,7 @@ public class TriggerTurnBegin extends Trigger { @Override public String getImportantStackObjects(SpellAbility sa) { StringBuilder sb = new StringBuilder(); - sb.append("Player: ").append(this.getRunParams().get("Player")); + sb.append("Player: ").append(sa.getTriggeringObject("Player")); return sb.toString(); } } diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerTurnFaceUp.java b/forge-game/src/main/java/forge/game/trigger/TriggerTurnFaceUp.java index aeffc272bd6..1136077e14b 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerTurnFaceUp.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerTurnFaceUp.java @@ -68,7 +68,7 @@ public class TriggerTurnFaceUp extends Trigger { @Override public String getImportantStackObjects(SpellAbility sa) { StringBuilder sb = new StringBuilder(); - sb.append("Turn Face up: ").append(this.getRunParams().get("Card")); + sb.append("Turn Face up: ").append(sa.getTriggeringObject("Card")); return sb.toString(); } diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerUnequip.java b/forge-game/src/main/java/forge/game/trigger/TriggerUnequip.java index b69053e3a5e..2b444034f53 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerUnequip.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerUnequip.java @@ -79,8 +79,8 @@ public class TriggerUnequip extends Trigger { @Override public String getImportantStackObjects(SpellAbility sa) { StringBuilder sb = new StringBuilder(); - sb.append("Equippee: ").append(this.getRunParams().get("Card")).append(", "); - sb.append("Equipment: ").append(this.getRunParams().get("Equipment")); + sb.append("Equippee: ").append(sa.getTriggeringObject("Card")).append(", "); + sb.append("Equipment: ").append(sa.getTriggeringObject("Equipment")); return sb.toString(); } diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerUntaps.java b/forge-game/src/main/java/forge/game/trigger/TriggerUntaps.java index a697a485df5..36ed47ccbd7 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerUntaps.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerUntaps.java @@ -72,7 +72,7 @@ public class TriggerUntaps extends Trigger { @Override public String getImportantStackObjects(SpellAbility sa) { StringBuilder sb = new StringBuilder(); - sb.append("Untapped: ").append(this.getRunParams().get("Card")); + sb.append("Untapped: ").append(sa.getTriggeringObject("Card")); return sb.toString(); } } diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerVote.java b/forge-game/src/main/java/forge/game/trigger/TriggerVote.java index 44e396306eb..69d53cc5a5c 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerVote.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerVote.java @@ -71,7 +71,7 @@ public class TriggerVote extends Trigger { @Override public String getImportantStackObjects(SpellAbility sa) { StringBuilder sb = new StringBuilder(); - sb.append("Voters: ").append(this.getRunParams().get("OtherVoters")); + sb.append("Voters: ").append(sa.getTriggeringObject("OtherVoters")); return sb.toString(); }