From c3b05157c52cc9fa81b22517f8752f5dcaa404a2 Mon Sep 17 00:00:00 2001 From: Hans Mackowiak Date: Fri, 31 Jan 2020 10:15:31 +0000 Subject: [PATCH] Trigger: remove runParams from Trigger --- .../src/main/java/forge/game/card/Card.java | 8 +++--- .../java/forge/game/card/CardFactory.java | 2 +- .../src/main/java/forge/game/cost/Cost.java | 8 +----- .../main/java/forge/game/player/Player.java | 4 +-- .../forge/game/spellability/SpellAbility.java | 8 ++++-- .../main/java/forge/game/trigger/Trigger.java | 26 +---------------- .../forge/game/trigger/TriggerAbandoned.java | 6 ++-- .../java/forge/game/trigger/TriggerAdapt.java | 4 +-- .../forge/game/trigger/TriggerAlways.java | 4 +-- .../forge/game/trigger/TriggerAttached.java | 8 +++--- .../game/trigger/TriggerAttackerBlocked.java | 6 ++-- .../TriggerAttackerBlockedByCreature.java | 6 ++-- .../trigger/TriggerAttackerUnblocked.java | 6 ++-- .../trigger/TriggerAttackerUnblockedOnce.java | 6 ++-- .../trigger/TriggerAttackersDeclared.java | 6 ++-- .../forge/game/trigger/TriggerAttacks.java | 8 +++--- .../game/trigger/TriggerBecomeMonarch.java | 4 +-- .../game/trigger/TriggerBecomeMonstrous.java | 4 +-- .../game/trigger/TriggerBecomeRenowned.java | 6 ++-- .../game/trigger/TriggerBecomesTarget.java | 8 +++--- .../trigger/TriggerBecomesTargetOnce.java | 8 +++--- .../game/trigger/TriggerBlockersDeclared.java | 6 ++-- .../forge/game/trigger/TriggerBlocks.java | 6 ++-- .../forge/game/trigger/TriggerChampioned.java | 6 ++-- .../trigger/TriggerChangesController.java | 6 ++-- .../game/trigger/TriggerChangesZone.java | 4 +-- .../game/trigger/TriggerChangesZoneAll.java | 4 +-- .../forge/game/trigger/TriggerClashed.java | 2 +- .../game/trigger/TriggerCounterAdded.java | 4 +-- .../game/trigger/TriggerCounterAddedAll.java | 4 +-- .../game/trigger/TriggerCounterAddedOnce.java | 6 ++-- .../game/trigger/TriggerCounterRemoved.java | 6 ++-- .../trigger/TriggerCounterRemovedOnce.java | 8 +++--- .../forge/game/trigger/TriggerCountered.java | 6 ++-- .../forge/game/trigger/TriggerCrewed.java | 6 ++-- .../forge/game/trigger/TriggerCycled.java | 6 ++-- .../game/trigger/TriggerDamageDealtOnce.java | 10 +++---- .../forge/game/trigger/TriggerDamageDone.java | 10 +++---- .../game/trigger/TriggerDamageDoneOnce.java | 8 +++--- .../game/trigger/TriggerDamagePrevented.java | 10 +++---- .../trigger/TriggerDamagePreventedOnce.java | 8 +++--- .../forge/game/trigger/TriggerDestroyed.java | 4 +-- .../forge/game/trigger/TriggerDevoured.java | 6 ++-- .../forge/game/trigger/TriggerDiscarded.java | 6 ++-- .../java/forge/game/trigger/TriggerDrawn.java | 4 +-- .../forge/game/trigger/TriggerEvolved.java | 4 +-- .../forge/game/trigger/TriggerExerted.java | 4 +-- .../forge/game/trigger/TriggerExiled.java | 4 +-- .../forge/game/trigger/TriggerExploited.java | 6 ++-- .../forge/game/trigger/TriggerExplores.java | 6 ++-- .../java/forge/game/trigger/TriggerFight.java | 8 +++--- .../game/trigger/TriggerFlippedCoin.java | 6 ++-- .../forge/game/trigger/TriggerHandler.java | 28 +++++++++---------- .../forge/game/trigger/TriggerImmediate.java | 4 +-- .../game/trigger/TriggerInvestigated.java | 6 ++-- .../forge/game/trigger/TriggerLandPlayed.java | 4 +-- .../forge/game/trigger/TriggerLifeGained.java | 4 +-- .../forge/game/trigger/TriggerLifeLost.java | 4 +-- .../forge/game/trigger/TriggerLosesGame.java | 6 ++-- .../forge/game/trigger/TriggerNewGame.java | 4 +-- .../trigger/TriggerPayCumulativeUpkeep.java | 6 ++-- .../forge/game/trigger/TriggerPayEcho.java | 6 ++-- .../forge/game/trigger/TriggerPayLife.java | 4 +-- .../java/forge/game/trigger/TriggerPhase.java | 6 ++-- .../forge/game/trigger/TriggerPhaseIn.java | 4 +-- .../forge/game/trigger/TriggerPhaseOut.java | 4 +-- .../forge/game/trigger/TriggerPlanarDice.java | 9 ++---- .../game/trigger/TriggerPlaneswalkedFrom.java | 7 ++--- .../game/trigger/TriggerPlaneswalkedTo.java | 7 ++--- .../game/trigger/TriggerRegenerated.java | 4 +-- .../forge/game/trigger/TriggerRevealed.java | 4 +-- .../forge/game/trigger/TriggerSacrificed.java | 6 ++-- .../java/forge/game/trigger/TriggerScry.java | 6 ++-- .../game/trigger/TriggerSearchedLibrary.java | 6 ++-- .../game/trigger/TriggerSetInMotion.java | 6 ++-- .../forge/game/trigger/TriggerShuffled.java | 6 ++-- .../game/trigger/TriggerSpellAbilityCast.java | 6 ++-- .../game/trigger/TriggerSpellAbilityCopy.java | 4 +-- .../forge/game/trigger/TriggerSurveil.java | 4 +-- .../java/forge/game/trigger/TriggerTaps.java | 4 +-- .../game/trigger/TriggerTapsForMana.java | 6 ++-- .../game/trigger/TriggerTransformed.java | 8 ++---- .../forge/game/trigger/TriggerTurnBegin.java | 6 ++-- .../forge/game/trigger/TriggerTurnFaceUp.java | 6 ++-- .../forge/game/trigger/TriggerUnattach.java | 6 ++-- .../forge/game/trigger/TriggerUntaps.java | 4 +-- .../java/forge/game/trigger/TriggerVote.java | 4 +-- 87 files changed, 248 insertions(+), 291 deletions(-) diff --git a/forge-game/src/main/java/forge/game/card/Card.java b/forge-game/src/main/java/forge/game/card/Card.java index b47002737f7..6a82483e4b2 100644 --- a/forge-game/src/main/java/forge/game/card/Card.java +++ b/forge-game/src/main/java/forge/game/card/Card.java @@ -1299,12 +1299,12 @@ public class Card extends GameEntity implements Comparable { for (int i = 0; i < addAmount; i++) { runParams.put(AbilityKey.CounterAmount, oldValue + i + 1); getGame().getTriggerHandler().runTrigger( - TriggerType.CounterAdded, Maps.newHashMap(runParams), false); + TriggerType.CounterAdded, AbilityKey.newMap(runParams), false); } if (addAmount > 0) { runParams.put(AbilityKey.CounterAmount, addAmount); getGame().getTriggerHandler().runTrigger( - TriggerType.CounterAddedOnce, Maps.newHashMap(runParams), false); + TriggerType.CounterAddedOnce, AbilityKey.newMap(runParams), false); } } else { setCounters(counterType, newValue); @@ -1378,10 +1378,10 @@ public class Card extends GameEntity implements Comparable { runParams.put(AbilityKey.CounterType, counterName); for (int i = 0; i < delta && curCounters != 0; i++) { runParams.put(AbilityKey.NewCounterAmount, --curCounters); - getGame().getTriggerHandler().runTrigger(TriggerType.CounterRemoved, runParams, false); + getGame().getTriggerHandler().runTrigger(TriggerType.CounterRemoved, AbilityKey.newMap(runParams), false); } runParams.put(AbilityKey.CounterAmount, delta); - getGame().getTriggerHandler().runTrigger(TriggerType.CounterRemovedOnce, runParams, false); + getGame().getTriggerHandler().runTrigger(TriggerType.CounterRemovedOnce, AbilityKey.newMap(runParams), false); } @Override diff --git a/forge-game/src/main/java/forge/game/card/CardFactory.java b/forge-game/src/main/java/forge/game/card/CardFactory.java index 34aec26647b..5fa4868727e 100644 --- a/forge-game/src/main/java/forge/game/card/CardFactory.java +++ b/forge-game/src/main/java/forge/game/card/CardFactory.java @@ -664,7 +664,7 @@ public class CardFactory { trig.setHostCard(sa.getHostCard()); trig.setTrigger(true); trig.setSourceTrigger(t.getId()); - t.setTriggeringObjects(trig); + sa.setTriggeringObjects(sa.getTriggeringObjects()); trig.setTriggerRemembered(t.getTriggerRemembered()); if (t.getStoredTriggeredObjects() != null) { trig.setTriggeringObjects(t.getStoredTriggeredObjects()); diff --git a/forge-game/src/main/java/forge/game/cost/Cost.java b/forge-game/src/main/java/forge/game/cost/Cost.java index 98bb194ff46..e8e92ce1aff 100644 --- a/forge-game/src/main/java/forge/game/cost/Cost.java +++ b/forge-game/src/main/java/forge/game/cost/Cost.java @@ -63,13 +63,7 @@ public class Cost implements Serializable { } private void cacheTapCost() { - tapCost = false; - for (CostPart p : getCostParts()) { - if (p instanceof CostTap || p instanceof CostUntap) { - tapCost = true; - return; - } - } + tapCost = hasSpecificCostType(CostTap.class); } public final boolean hasNoManaCost() { diff --git a/forge-game/src/main/java/forge/game/player/Player.java b/forge-game/src/main/java/forge/game/player/Player.java index f7e61dbaaa4..78522a023d8 100644 --- a/forge-game/src/main/java/forge/game/player/Player.java +++ b/forge-game/src/main/java/forge/game/player/Player.java @@ -939,10 +939,10 @@ public class Player extends GameEntity implements Comparable { runParams.put(AbilityKey.Source, this); runParams.put(AbilityKey.CounterType, counterType); for (int i = 0; i < addAmount; i++) { - getGame().getTriggerHandler().runTrigger(TriggerType.CounterAdded, runParams, false); + getGame().getTriggerHandler().runTrigger(TriggerType.CounterAdded, AbilityKey.newMap(runParams), false); } if (addAmount > 0) { - getGame().getTriggerHandler().runTrigger(TriggerType.CounterAddedOnce, runParams, false); + getGame().getTriggerHandler().runTrigger(TriggerType.CounterAddedOnce, AbilityKey.newMap(runParams), false); } if (table != null) { table.put(this, counterType, addAmount); diff --git a/forge-game/src/main/java/forge/game/spellability/SpellAbility.java b/forge-game/src/main/java/forge/game/spellability/SpellAbility.java index 66d83c5a483..d467b6c0ffe 100644 --- a/forge-game/src/main/java/forge/game/spellability/SpellAbility.java +++ b/forge-game/src/main/java/forge/game/spellability/SpellAbility.java @@ -556,15 +556,17 @@ public abstract class SpellAbility extends CardTraitBase implements ISpellAbilit public void setTriggeringObject(final AbilityKey type, final Object o) { triggeringObjects.put(type, o); } - public void setTriggeringObjectsFrom(final Trigger trigger, final AbilityKey... types) { + + public void setTriggeringObjectsFrom(final Map runParams, final AbilityKey... types) { int typesLength = types.length; for (int i = 0; i < typesLength; i += 1) { AbilityKey type = types[i]; - triggeringObjects.put(type, trigger.getFromRunParams(type)); + if (runParams.containsKey(type)) { + triggeringObjects.put(type, runParams.get(type)); + } } } - public boolean hasTriggeringObject(final AbilityKey type) { return triggeringObjects.containsKey(type); } diff --git a/forge-game/src/main/java/forge/game/trigger/Trigger.java b/forge-game/src/main/java/forge/game/trigger/Trigger.java index bf86d05a1a6..1e545628e6e 100644 --- a/forge-game/src/main/java/forge/game/trigger/Trigger.java +++ b/forge-game/src/main/java/forge/game/trigger/Trigger.java @@ -65,10 +65,6 @@ public abstract class Trigger extends TriggerReplacementBase { /** The ID. */ private int id; - - /** The run params. */ - private Map runParams; - private TriggerType mode; private Map storedTriggeredObjects = null; @@ -123,7 +119,6 @@ public abstract class Trigger extends TriggerReplacementBase { this.id = nextId(); this.intrinsic = intrinsic; - this.setRunParams(AbilityKey.newMap()); // TODO: Consider whether this can be null instead, for performance reasons. this.originalMapParams.putAll(params); this.mapParams.putAll(params); this.setHostCard(host); @@ -454,26 +449,7 @@ public abstract class Trigger extends TriggerReplacementBase { * @param sa * a {@link forge.game.spellability.SpellAbility} object. */ - public abstract void setTriggeringObjects(SpellAbility sa); - - /** - * Gets the run params. - * - * @return the runParams - */ - public Object getFromRunParams(AbilityKey key) { - return this.runParams.get(key); - } - - /** - * Sets the run params. - * - * @param runParams0 - * the runParams to set - */ - public void setRunParams(final Map runParams0) { - this.runParams = runParams0; - } + public abstract void setTriggeringObjects(SpellAbility sa, final Map runParams); /** * Gets the id. diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerAbandoned.java b/forge-game/src/main/java/forge/game/trigger/TriggerAbandoned.java index 0bdb607ac22..b55f49353e0 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerAbandoned.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerAbandoned.java @@ -44,7 +44,7 @@ public class TriggerAbandoned extends Trigger { * @param intrinsic * the intrinsic */ - public TriggerAbandoned(final java.util.Map params, final Card host, final boolean intrinsic) { + public TriggerAbandoned(final Map params, final Card host, final boolean intrinsic) { super(params, host, intrinsic); } @@ -65,8 +65,8 @@ public class TriggerAbandoned extends Trigger { /** {@inheritDoc} */ @Override - public final void setTriggeringObjects(final SpellAbility sa) { - sa.setTriggeringObjectsFrom(this, AbilityKey.Scheme); + public final void setTriggeringObjects(final SpellAbility sa, Map runParams) { + sa.setTriggeringObjectsFrom(runParams, AbilityKey.Scheme); } @Override diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerAdapt.java b/forge-game/src/main/java/forge/game/trigger/TriggerAdapt.java index 81b8b35f765..2dcb3de5a65 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerAdapt.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerAdapt.java @@ -65,8 +65,8 @@ public class TriggerAdapt extends Trigger { /** {@inheritDoc} */ @Override - public final void setTriggeringObjects(final SpellAbility sa) { - sa.setTriggeringObjectsFrom(this, AbilityKey.Card); + public final void setTriggeringObjects(final SpellAbility sa, Map runParams) { + sa.setTriggeringObjectsFrom(runParams, AbilityKey.Card); } @Override diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerAlways.java b/forge-game/src/main/java/forge/game/trigger/TriggerAlways.java index 26785de17b1..83fc709efc7 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerAlways.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerAlways.java @@ -45,7 +45,7 @@ public class TriggerAlways extends Trigger { * @param intrinsic * the intrinsic */ - public TriggerAlways(final java.util.Map params, final Card host, final boolean intrinsic) { + public TriggerAlways(final Map params, final Card host, final boolean intrinsic) { super(params, host, intrinsic); } @@ -57,7 +57,7 @@ public class TriggerAlways extends Trigger { /** {@inheritDoc} */ @Override - public void setTriggeringObjects(final SpellAbility sa) { + public void setTriggeringObjects(final SpellAbility sa, Map runParams) { } @Override 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 08b18dcc290..65beac475be 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerAttached.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerAttached.java @@ -46,7 +46,7 @@ public class TriggerAttached extends Trigger { * @param intrinsic * the intrinsic */ - public TriggerAttached(final java.util.Map params, final Card host, final boolean intrinsic) { + public TriggerAttached(final Map params, final Card host, final boolean intrinsic) { super(params, host, intrinsic); } @@ -76,9 +76,9 @@ public class TriggerAttached extends Trigger { /** {@inheritDoc} */ @Override - public final void setTriggeringObjects(final SpellAbility sa) { - sa.setTriggeringObject(AbilityKey.Source, getFromRunParams(AbilityKey.AttachSource)); - sa.setTriggeringObject(AbilityKey.Target, getFromRunParams(AbilityKey.AttachTarget)); + public final void setTriggeringObjects(final SpellAbility sa, Map runParams) { + sa.setTriggeringObject(AbilityKey.Source, runParams.get(AbilityKey.AttachSource)); + sa.setTriggeringObject(AbilityKey.Target, runParams.get(AbilityKey.AttachTarget)); } @Override 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 b77d0939526..3c2b36834db 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerAttackerBlocked.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerAttackerBlocked.java @@ -47,7 +47,7 @@ public class TriggerAttackerBlocked extends Trigger { * @param intrinsic * the intrinsic */ - public TriggerAttackerBlocked(final java.util.Map params, final Card host, final boolean intrinsic) { + public TriggerAttackerBlocked(final Map params, final Card host, final boolean intrinsic) { super(params, host, intrinsic); } @@ -86,9 +86,9 @@ public class TriggerAttackerBlocked extends Trigger { /** {@inheritDoc} */ @Override - public final void setTriggeringObjects(final SpellAbility sa) { + public final void setTriggeringObjects(final SpellAbility sa, Map runParams) { sa.setTriggeringObjectsFrom( - this, + runParams, AbilityKey.Attacker, AbilityKey.Blockers, AbilityKey.Defender, 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 b8dad166edc..aca509fca2b 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerAttackerBlockedByCreature.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerAttackerBlockedByCreature.java @@ -46,7 +46,7 @@ public class TriggerAttackerBlockedByCreature extends Trigger { * @param intrinsic * the intrinsic */ - public TriggerAttackerBlockedByCreature(final java.util.Map params, final Card host, final boolean intrinsic) { + public TriggerAttackerBlockedByCreature(final Map params, final Card host, final boolean intrinsic) { super(params, host, intrinsic); } @@ -89,8 +89,8 @@ public class TriggerAttackerBlockedByCreature extends Trigger { /** {@inheritDoc} */ @Override - public final void setTriggeringObjects(final SpellAbility sa) { - sa.setTriggeringObjectsFrom(this, AbilityKey.Attacker, AbilityKey.Blocker); + public final void setTriggeringObjects(final SpellAbility sa, Map runParams) { + sa.setTriggeringObjectsFrom(runParams, AbilityKey.Attacker, AbilityKey.Blocker); } @Override 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 9e201617e39..fa48e8e329a 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerAttackerUnblocked.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerAttackerUnblocked.java @@ -46,7 +46,7 @@ public class TriggerAttackerUnblocked extends Trigger { * @param intrinsic * the intrinsic */ - public TriggerAttackerUnblocked(final java.util.Map params, final Card host, final boolean intrinsic) { + public TriggerAttackerUnblocked(final Map params, final Card host, final boolean intrinsic) { super(params, host, intrinsic); } @@ -71,8 +71,8 @@ public class TriggerAttackerUnblocked extends Trigger { /** {@inheritDoc} */ @Override - public final void setTriggeringObjects(final SpellAbility sa) { - sa.setTriggeringObjectsFrom(this, AbilityKey.Attacker, AbilityKey.Defender, AbilityKey.DefendingPlayer); + public final void setTriggeringObjects(final SpellAbility sa, Map runParams) { + sa.setTriggeringObjectsFrom(runParams, AbilityKey.Attacker, AbilityKey.Defender, AbilityKey.DefendingPlayer); } @Override diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerAttackerUnblockedOnce.java b/forge-game/src/main/java/forge/game/trigger/TriggerAttackerUnblockedOnce.java index b17acd00911..30e89333357 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerAttackerUnblockedOnce.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerAttackerUnblockedOnce.java @@ -48,7 +48,7 @@ public class TriggerAttackerUnblockedOnce extends Trigger { * @param intrinsic * the intrinsic */ - public TriggerAttackerUnblockedOnce(final java.util.Map params, final Card host, final boolean intrinsic) { + public TriggerAttackerUnblockedOnce(final Map params, final Card host, final boolean intrinsic) { super(params, host, intrinsic); } @@ -86,8 +86,8 @@ public class TriggerAttackerUnblockedOnce extends Trigger { /** {@inheritDoc} */ @Override - public final void setTriggeringObjects(final SpellAbility sa) { - sa.setTriggeringObjectsFrom(this, AbilityKey.AttackingPlayer, AbilityKey.Defenders); + public final void setTriggeringObjects(final SpellAbility sa, Map runParams) { + sa.setTriggeringObjectsFrom(runParams, AbilityKey.AttackingPlayer, AbilityKey.Defenders); } @Override 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 b50ee54a75f..c174343b171 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerAttackersDeclared.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerAttackersDeclared.java @@ -42,7 +42,7 @@ public class TriggerAttackersDeclared extends Trigger { * @param intrinsic * the intrinsic */ - public TriggerAttackersDeclared(final java.util.Map params, final Card host, final boolean intrinsic) { + public TriggerAttackersDeclared(final Map params, final Card host, final boolean intrinsic) { super(params, host, intrinsic); } @@ -88,8 +88,8 @@ public class TriggerAttackersDeclared extends Trigger { /** {@inheritDoc} */ @Override - public final void setTriggeringObjects(final SpellAbility sa) { - sa.setTriggeringObjectsFrom(this, AbilityKey.Attackers, AbilityKey.AttackingPlayer); + public final void setTriggeringObjects(final SpellAbility sa, Map runParams) { + sa.setTriggeringObjectsFrom(runParams, AbilityKey.Attackers, AbilityKey.AttackingPlayer); } @Override diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerAttacks.java b/forge-game/src/main/java/forge/game/trigger/TriggerAttacks.java index 5634b1f928f..39ed08eb070 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerAttacks.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerAttacks.java @@ -49,7 +49,7 @@ public class TriggerAttacks extends Trigger { * @param intrinsic * the intrinsic */ - public TriggerAttacks(final java.util.Map params, final Card host, final boolean intrinsic) { + public TriggerAttacks(final Map params, final Card host, final boolean intrinsic) { super(params, host, intrinsic); } @@ -126,10 +126,10 @@ public class TriggerAttacks extends Trigger { /** {@inheritDoc} */ @Override - public final void setTriggeringObjects(final SpellAbility sa) { - sa.setTriggeringObject(AbilityKey.Defender, getFromRunParams(AbilityKey.Attacked)); + public final void setTriggeringObjects(final SpellAbility sa, Map runParams) { + sa.setTriggeringObject(AbilityKey.Defender, runParams.get(AbilityKey.Attacked)); sa.setTriggeringObjectsFrom( - this, + runParams, AbilityKey.Attacker, AbilityKey.Defenders, AbilityKey.DefendingPlayer diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerBecomeMonarch.java b/forge-game/src/main/java/forge/game/trigger/TriggerBecomeMonarch.java index 85196ffcb2a..ee9033a0054 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerBecomeMonarch.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerBecomeMonarch.java @@ -36,8 +36,8 @@ public class TriggerBecomeMonarch extends Trigger { /** {@inheritDoc} */ @Override - public final void setTriggeringObjects(final SpellAbility sa) { - sa.setTriggeringObjectsFrom(this, AbilityKey.Player); + public final void setTriggeringObjects(final SpellAbility sa, Map runParams) { + sa.setTriggeringObjectsFrom(runParams, AbilityKey.Player); } @Override 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 172d04e2468..dd08102da7a 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerBecomeMonstrous.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerBecomeMonstrous.java @@ -66,8 +66,8 @@ public class TriggerBecomeMonstrous extends Trigger { /** {@inheritDoc} */ @Override - public final void setTriggeringObjects(final SpellAbility sa) { - sa.setTriggeringObjectsFrom(this, AbilityKey.Card, AbilityKey.MonstrosityAmount); + public final void setTriggeringObjects(final SpellAbility sa, Map runParams) { + sa.setTriggeringObjectsFrom(runParams, AbilityKey.Card, AbilityKey.MonstrosityAmount); } @Override 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 fc4c62064cd..ad874601269 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerBecomeRenowned.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerBecomeRenowned.java @@ -46,7 +46,7 @@ public class TriggerBecomeRenowned extends Trigger { * @param intrinsic * the intrinsic */ - public TriggerBecomeRenowned(final java.util.Map params, final Card host, final boolean intrinsic) { + public TriggerBecomeRenowned(final Map params, final Card host, final boolean intrinsic) { super(params, host, intrinsic); } @@ -66,8 +66,8 @@ public class TriggerBecomeRenowned extends Trigger { /** {@inheritDoc} */ @Override - public final void setTriggeringObjects(final SpellAbility sa) { - sa.setTriggeringObjectsFrom(this, AbilityKey.Card); + public final void setTriggeringObjects(final SpellAbility sa, Map runParams) { + sa.setTriggeringObjectsFrom(runParams, AbilityKey.Card); } @Override 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 cb56d395650..52f97018375 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerBecomesTarget.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerBecomesTarget.java @@ -47,7 +47,7 @@ public class TriggerBecomesTarget extends Trigger { * @param intrinsic * the intrinsic */ - public TriggerBecomesTarget(final java.util.Map params, final Card host, final boolean intrinsic) { + public TriggerBecomesTarget(final Map params, final Card host, final boolean intrinsic) { super(params, host, intrinsic); } @@ -89,9 +89,9 @@ public class TriggerBecomesTarget extends Trigger { /** {@inheritDoc} */ @Override - public final void setTriggeringObjects(final SpellAbility sa) { - sa.setTriggeringObject(AbilityKey.Source, ((SpellAbility) getFromRunParams(AbilityKey.SourceSA)).getHostCard()); - sa.setTriggeringObjectsFrom(this, AbilityKey.SourceSA, AbilityKey.Target); + public final void setTriggeringObjects(final SpellAbility sa, Map runParams) { + sa.setTriggeringObject(AbilityKey.Source, ((SpellAbility) runParams.get(AbilityKey.SourceSA)).getHostCard()); + sa.setTriggeringObjectsFrom(runParams, AbilityKey.SourceSA, AbilityKey.Target); } @Override diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerBecomesTargetOnce.java b/forge-game/src/main/java/forge/game/trigger/TriggerBecomesTargetOnce.java index 5c929279e64..821c1866fa6 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerBecomesTargetOnce.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerBecomesTargetOnce.java @@ -49,7 +49,7 @@ public class TriggerBecomesTargetOnce extends Trigger { * @param intrinsic * the intrinsic */ - public TriggerBecomesTargetOnce(final java.util.Map params, final Card host, final boolean intrinsic) { + public TriggerBecomesTargetOnce(final Map params, final Card host, final boolean intrinsic) { super(params, host, intrinsic); } @@ -81,9 +81,9 @@ public class TriggerBecomesTargetOnce extends Trigger { /** {@inheritDoc} */ @Override - public final void setTriggeringObjects(final SpellAbility sa) { - sa.setTriggeringObjectsFrom(this, AbilityKey.SourceSA, AbilityKey.Targets); - sa.setTriggeringObject(AbilityKey.Source, ((SpellAbility) getFromRunParams(AbilityKey.SourceSA)).getHostCard()); + public final void setTriggeringObjects(final SpellAbility sa, Map runParams) { + sa.setTriggeringObjectsFrom(runParams, AbilityKey.SourceSA, AbilityKey.Targets); + sa.setTriggeringObject(AbilityKey.Source, ((SpellAbility) runParams.get(AbilityKey.SourceSA)).getHostCard()); } @Override 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 9a6ebdef762..5263ebd9de9 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerBlockersDeclared.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerBlockersDeclared.java @@ -40,7 +40,7 @@ public class TriggerBlockersDeclared extends Trigger { * @param intrinsic * the intrinsic */ - public TriggerBlockersDeclared(final java.util.Map params, final Card host, final boolean intrinsic) { + public TriggerBlockersDeclared(final Map params, final Card host, final boolean intrinsic) { super(params, host, intrinsic); } @@ -53,8 +53,8 @@ public class TriggerBlockersDeclared extends Trigger { /** {@inheritDoc} */ @Override - public final void setTriggeringObjects(final SpellAbility sa) { - sa.setTriggeringObjectsFrom(this, AbilityKey.Blockers, AbilityKey.Attackers); + public final void setTriggeringObjects(final SpellAbility sa, Map runParams) { + sa.setTriggeringObjectsFrom(runParams, AbilityKey.Blockers, AbilityKey.Attackers); } @Override 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 4c7d72c3b2e..f8362c0d25b 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerBlocks.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerBlocks.java @@ -46,7 +46,7 @@ public class TriggerBlocks extends Trigger { * @param intrinsic * the intrinsic */ - public TriggerBlocks(final java.util.Map params, final Card host, final boolean intrinsic) { + public TriggerBlocks(final Map params, final Card host, final boolean intrinsic) { super(params, host, intrinsic); } @@ -90,8 +90,8 @@ public class TriggerBlocks extends Trigger { /** {@inheritDoc} */ @Override - public final void setTriggeringObjects(final SpellAbility sa) { - sa.setTriggeringObjectsFrom(this, AbilityKey.Blocker, AbilityKey.Attackers); + public final void setTriggeringObjects(final SpellAbility sa, Map runParams) { + sa.setTriggeringObjectsFrom(runParams, AbilityKey.Blocker, AbilityKey.Attackers); } @Override 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 53542cb8a5c..d68819e5738 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerChampioned.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerChampioned.java @@ -47,7 +47,7 @@ public class TriggerChampioned extends Trigger { * @param intrinsic * the intrinsic */ - public TriggerChampioned(final java.util.Map params, final Card host, final boolean intrinsic) { + public TriggerChampioned(final Map params, final Card host, final boolean intrinsic) { super(params, host, intrinsic); } @@ -75,8 +75,8 @@ public class TriggerChampioned extends Trigger { /** {@inheritDoc} */ @Override - public final void setTriggeringObjects(final SpellAbility sa) { - sa.setTriggeringObjectsFrom(this, AbilityKey.Championed, AbilityKey.Card); + public final void setTriggeringObjects(final SpellAbility sa, Map runParams) { + sa.setTriggeringObjectsFrom(runParams, AbilityKey.Championed, AbilityKey.Card); } @Override 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 610da7e7dd2..e499c248c1e 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerChangesController.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerChangesController.java @@ -46,7 +46,7 @@ public class TriggerChangesController extends Trigger { * @param intrinsic * the intrinsic */ - public TriggerChangesController(final java.util.Map params, final Card host, final boolean intrinsic) { + public TriggerChangesController(final Map params, final Card host, final boolean intrinsic) { super(params, host, intrinsic); } @@ -74,8 +74,8 @@ public class TriggerChangesController extends Trigger { /** {@inheritDoc} */ @Override - public final void setTriggeringObjects(final SpellAbility sa) { - sa.setTriggeringObjectsFrom(this, AbilityKey.Card); + public final void setTriggeringObjects(final SpellAbility sa, Map runParams) { + sa.setTriggeringObjectsFrom(runParams, AbilityKey.Card); } @Override diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerChangesZone.java b/forge-game/src/main/java/forge/game/trigger/TriggerChangesZone.java index 3371d03c786..7b1e8670005 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerChangesZone.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerChangesZone.java @@ -213,8 +213,8 @@ public class TriggerChangesZone extends Trigger { /** {@inheritDoc} */ @Override - public final void setTriggeringObjects(final SpellAbility sa) { - sa.setTriggeringObjectsFrom(this, AbilityKey.Card); + public final void setTriggeringObjects(final SpellAbility sa, Map runParams) { + sa.setTriggeringObjectsFrom(runParams, AbilityKey.Card); } @Override diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerChangesZoneAll.java b/forge-game/src/main/java/forge/game/trigger/TriggerChangesZoneAll.java index 6d618f3d98a..380f5b84d24 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerChangesZoneAll.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerChangesZoneAll.java @@ -23,8 +23,8 @@ public class TriggerChangesZoneAll extends Trigger { } @Override - public void setTriggeringObjects(SpellAbility sa) { - final CardZoneTable table = (CardZoneTable) getFromRunParams(AbilityKey.Cards); + public void setTriggeringObjects(SpellAbility sa, Map runParams) { + final CardZoneTable table = (CardZoneTable) runParams.get(AbilityKey.Cards); CardCollection allCards = this.filterCards(table); diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerClashed.java b/forge-game/src/main/java/forge/game/trigger/TriggerClashed.java index 769b79316dd..568405652f6 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerClashed.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerClashed.java @@ -71,7 +71,7 @@ public class TriggerClashed extends Trigger { /** {@inheritDoc} */ @Override - public void setTriggeringObjects(final SpellAbility sa) { + public void setTriggeringObjects(final SpellAbility sa, Map runParams) { // No triggered-variables for you :( } 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 5cc8c980b88..67db772703d 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerCounterAdded.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerCounterAdded.java @@ -121,8 +121,8 @@ public class TriggerCounterAdded extends Trigger { /** {@inheritDoc} */ @Override - public final void setTriggeringObjects(final SpellAbility sa) { - sa.setTriggeringObjectsFrom(this, AbilityKey.Card, AbilityKey.Player); + public final void setTriggeringObjects(final SpellAbility sa, Map runParams) { + sa.setTriggeringObjectsFrom(runParams, AbilityKey.Card, AbilityKey.Player); } @Override diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerCounterAddedAll.java b/forge-game/src/main/java/forge/game/trigger/TriggerCounterAddedAll.java index e80579ae5ec..b87d585f774 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerCounterAddedAll.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerCounterAddedAll.java @@ -25,8 +25,8 @@ public class TriggerCounterAddedAll extends Trigger { } @Override - public void setTriggeringObjects(SpellAbility sa) { - final GameEntityCounterTable table = (GameEntityCounterTable) getFromRunParams(AbilityKey.Objects); + public void setTriggeringObjects(SpellAbility sa, Map runParams) { + final GameEntityCounterTable table = (GameEntityCounterTable) runParams.get(AbilityKey.Objects); Map all = this.filterTable(table); 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 8d349470a72..5a3c28347a3 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerCounterAddedOnce.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerCounterAddedOnce.java @@ -107,9 +107,9 @@ public class TriggerCounterAddedOnce extends Trigger { /** {@inheritDoc} */ @Override - public final void setTriggeringObjects(final SpellAbility sa) { - sa.setTriggeringObjectsFrom(this, AbilityKey.Card, AbilityKey.Player); - sa.setTriggeringObject(AbilityKey.Amount, getFromRunParams(AbilityKey.CounterAmount)); + public final void setTriggeringObjects(final SpellAbility sa, Map runParams) { + sa.setTriggeringObjectsFrom(runParams, AbilityKey.Card, AbilityKey.Player); + sa.setTriggeringObject(AbilityKey.Amount, runParams.get(AbilityKey.CounterAmount)); } @Override 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 a4c7209bfb9..e2623c7806b 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerCounterRemoved.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerCounterRemoved.java @@ -47,7 +47,7 @@ public class TriggerCounterRemoved extends Trigger { * @param intrinsic * the intrinsic */ - public TriggerCounterRemoved(final java.util.Map params, final Card host, final boolean intrinsic) { + public TriggerCounterRemoved(final Map params, final Card host, final boolean intrinsic) { super(params, host, intrinsic); } @@ -86,8 +86,8 @@ public class TriggerCounterRemoved extends Trigger { /** {@inheritDoc} */ @Override - public final void setTriggeringObjects(final SpellAbility sa) { - sa.setTriggeringObjectsFrom(this, AbilityKey.Card); + public final void setTriggeringObjects(final SpellAbility sa, Map runParams) { + sa.setTriggeringObjectsFrom(runParams, AbilityKey.Card); } @Override diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerCounterRemovedOnce.java b/forge-game/src/main/java/forge/game/trigger/TriggerCounterRemovedOnce.java index 028751ebb00..5df7ba0c723 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerCounterRemovedOnce.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerCounterRemovedOnce.java @@ -47,7 +47,7 @@ public class TriggerCounterRemovedOnce extends Trigger { * @param intrinsic * the intrinsic */ - public TriggerCounterRemovedOnce(final java.util.Map params, final Card host, final boolean intrinsic) { + public TriggerCounterRemovedOnce(final Map params, final Card host, final boolean intrinsic) { super(params, host, intrinsic); } @@ -77,9 +77,9 @@ public class TriggerCounterRemovedOnce extends Trigger { /** {@inheritDoc} */ @Override - public final void setTriggeringObjects(final SpellAbility sa) { - sa.setTriggeringObjectsFrom(this, AbilityKey.Card); - sa.setTriggeringObject(AbilityKey.Amount, getFromRunParams(AbilityKey.CounterAmount)); + public final void setTriggeringObjects(final SpellAbility sa, Map runParams) { + sa.setTriggeringObjectsFrom(runParams, AbilityKey.Card); + sa.setTriggeringObject(AbilityKey.Amount, runParams.get(AbilityKey.CounterAmount)); } @Override 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 db4bb45b006..3e72d6df061 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerCountered.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerCountered.java @@ -46,7 +46,7 @@ public class TriggerCountered extends Trigger { * @param intrinsic * the intrinsic */ - public TriggerCountered(final java.util.Map params, final Card host, final boolean intrinsic) { + public TriggerCountered(final Map params, final Card host, final boolean intrinsic) { super(params, host, intrinsic); } @@ -96,9 +96,9 @@ public class TriggerCountered extends Trigger { /** {@inheritDoc} */ @Override - public final void setTriggeringObjects(final SpellAbility sa) { + public final void setTriggeringObjects(final SpellAbility sa, Map runParams) { sa.setTriggeringObjectsFrom( - this, + runParams, AbilityKey.Card, AbilityKey.Cause, AbilityKey.Player, diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerCrewed.java b/forge-game/src/main/java/forge/game/trigger/TriggerCrewed.java index 2c93e2a6813..2c8350bbe38 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerCrewed.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerCrewed.java @@ -10,7 +10,7 @@ import java.util.Map; public class TriggerCrewed extends Trigger { - public TriggerCrewed(final java.util.Map params, final Card host, final boolean intrinsic) { + public TriggerCrewed(final Map params, final Card host, final boolean intrinsic) { super(params, host, intrinsic); } @@ -39,8 +39,8 @@ public class TriggerCrewed extends Trigger { } @Override - public void setTriggeringObjects(SpellAbility sa) { - sa.setTriggeringObjectsFrom(this, AbilityKey.Vehicle, AbilityKey.Crew); + public void setTriggeringObjects(SpellAbility sa, Map runParams) { + sa.setTriggeringObjectsFrom(runParams, AbilityKey.Vehicle, AbilityKey.Crew); } @Override 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 5da329a6360..3fc236f94bc 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerCycled.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerCycled.java @@ -46,14 +46,14 @@ public class TriggerCycled extends Trigger { * @param intrinsic * a boolean */ - public TriggerCycled(final java.util.Map params, final Card host, final boolean intrinsic) { + public TriggerCycled(final Map params, final Card host, final boolean intrinsic) { super(params, host, intrinsic); } /** {@inheritDoc} */ @Override - public final void setTriggeringObjects(final SpellAbility sa) { - sa.setTriggeringObjectsFrom(this, AbilityKey.Card); + public final void setTriggeringObjects(final SpellAbility sa, Map runParams) { + sa.setTriggeringObjectsFrom(runParams, AbilityKey.Card); } @Override diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerDamageDealtOnce.java b/forge-game/src/main/java/forge/game/trigger/TriggerDamageDealtOnce.java index be92e7a2929..c47f29118ec 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerDamageDealtOnce.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerDamageDealtOnce.java @@ -49,7 +49,7 @@ public class TriggerDamageDealtOnce extends Trigger { * @param intrinsic * the intrinsic */ - public TriggerDamageDealtOnce(final java.util.Map params, final Card host, final boolean intrinsic) { + public TriggerDamageDealtOnce(final Map params, final Card host, final boolean intrinsic) { super(params, host, intrinsic); } @@ -108,10 +108,10 @@ public class TriggerDamageDealtOnce extends Trigger { /** {@inheritDoc} */ @Override - public final void setTriggeringObjects(final SpellAbility sa) { - sa.setTriggeringObjectsFrom(this, AbilityKey.DamageAmount); - sa.setTriggeringObject(AbilityKey.Source, getFromRunParams(AbilityKey.DamageSource)); - sa.setTriggeringObject(AbilityKey.Targets, getFromRunParams(AbilityKey.DamageTargets)); + public final void setTriggeringObjects(final SpellAbility sa, Map runParams) { + sa.setTriggeringObjectsFrom(runParams, AbilityKey.DamageAmount); + sa.setTriggeringObject(AbilityKey.Source, runParams.get(AbilityKey.DamageSource)); + sa.setTriggeringObject(AbilityKey.Targets, runParams.get(AbilityKey.DamageTargets)); } @Override 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 0a41c3b53b4..92416235226 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerDamageDone.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerDamageDone.java @@ -49,7 +49,7 @@ public class TriggerDamageDone extends Trigger { * @param intrinsic * the intrinsic */ - public TriggerDamageDone(final java.util.Map params, final Card host, final boolean intrinsic) { + public TriggerDamageDone(final Map params, final Card host, final boolean intrinsic) { super(params, host, intrinsic); } @@ -122,11 +122,11 @@ public class TriggerDamageDone extends Trigger { /** {@inheritDoc} */ @Override - public final void setTriggeringObjects(final SpellAbility sa) { - sa.setTriggeringObject(AbilityKey.Source, CardUtil.getLKICopy((Card)getFromRunParams(AbilityKey.DamageSource))); - sa.setTriggeringObject(AbilityKey.Target, getFromRunParams(AbilityKey.DamageTarget)); + public final void setTriggeringObjects(final SpellAbility sa, Map runParams) { + sa.setTriggeringObject(AbilityKey.Source, CardUtil.getLKICopy((Card)runParams.get(AbilityKey.DamageSource))); + sa.setTriggeringObject(AbilityKey.Target, runParams.get(AbilityKey.DamageTarget)); sa.setTriggeringObjectsFrom( - this, + runParams, AbilityKey.DamageAmount, // This parameter is here because LKI information related to combat doesn't work properly AbilityKey.DefendingPlayer diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerDamageDoneOnce.java b/forge-game/src/main/java/forge/game/trigger/TriggerDamageDoneOnce.java index 96233e6ccf7..dbd1cf48fb6 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerDamageDoneOnce.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerDamageDoneOnce.java @@ -58,10 +58,10 @@ public class TriggerDamageDoneOnce extends Trigger { } @Override - public void setTriggeringObjects(SpellAbility sa) { - sa.setTriggeringObject(AbilityKey.Target, getFromRunParams(AbilityKey.DamageTarget)); - sa.setTriggeringObject(AbilityKey.Sources, getFromRunParams(AbilityKey.DamageSources)); - sa.setTriggeringObjectsFrom(this, AbilityKey.DamageAmount); + public void setTriggeringObjects(SpellAbility sa, Map runParams) { + sa.setTriggeringObject(AbilityKey.Target, runParams.get(AbilityKey.DamageTarget)); + sa.setTriggeringObject(AbilityKey.Sources, runParams.get(AbilityKey.DamageSources)); + sa.setTriggeringObjectsFrom(runParams, AbilityKey.DamageAmount); } @Override diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerDamagePrevented.java b/forge-game/src/main/java/forge/game/trigger/TriggerDamagePrevented.java index d38b52f0675..90ee1d2f156 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerDamagePrevented.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerDamagePrevented.java @@ -48,7 +48,7 @@ public class TriggerDamagePrevented extends Trigger { * @param intrinsic * the intrinsic */ - public TriggerDamagePrevented(final java.util.Map params, final Card host, final boolean intrinsic) { + public TriggerDamagePrevented(final Map params, final Card host, final boolean intrinsic) { super(params, host, intrinsic); } @@ -106,10 +106,10 @@ public class TriggerDamagePrevented extends Trigger { /** {@inheritDoc} */ @Override - public final void setTriggeringObjects(final SpellAbility sa) { - sa.setTriggeringObject(AbilityKey.Source, CardUtil.getLKICopy((Card)getFromRunParams(AbilityKey.DamageSource))); - sa.setTriggeringObject(AbilityKey.Target, getFromRunParams(AbilityKey.DamageTarget)); - sa.setTriggeringObjectsFrom(this, AbilityKey.DamageAmount); + public final void setTriggeringObjects(final SpellAbility sa, Map runParams) { + sa.setTriggeringObject(AbilityKey.Source, CardUtil.getLKICopy((Card)runParams.get(AbilityKey.DamageSource))); + sa.setTriggeringObject(AbilityKey.Target, runParams.get(AbilityKey.DamageTarget)); + sa.setTriggeringObjectsFrom(runParams, AbilityKey.DamageAmount); } @Override diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerDamagePreventedOnce.java b/forge-game/src/main/java/forge/game/trigger/TriggerDamagePreventedOnce.java index 72383a0720a..0cdfb575b20 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerDamagePreventedOnce.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerDamagePreventedOnce.java @@ -47,7 +47,7 @@ public class TriggerDamagePreventedOnce extends Trigger { * @param intrinsic * the intrinsic */ - public TriggerDamagePreventedOnce(final java.util.Map params, final Card host, final boolean intrinsic) { + public TriggerDamagePreventedOnce(final Map params, final Card host, final boolean intrinsic) { super(params, host, intrinsic); } @@ -97,9 +97,9 @@ public class TriggerDamagePreventedOnce extends Trigger { /** {@inheritDoc} */ @Override - public final void setTriggeringObjects(final SpellAbility sa) { - sa.setTriggeringObject(AbilityKey.Target, getFromRunParams(AbilityKey.DamageTarget)); - sa.setTriggeringObjectsFrom(this, AbilityKey.DamageAmount); + public final void setTriggeringObjects(final SpellAbility sa, Map runParams) { + sa.setTriggeringObject(AbilityKey.Target, runParams.get(AbilityKey.DamageTarget)); + sa.setTriggeringObjectsFrom(runParams, AbilityKey.DamageAmount); } @Override 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 369c7b7015d..be79de6d14c 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerDestroyed.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerDestroyed.java @@ -69,8 +69,8 @@ public class TriggerDestroyed extends Trigger { /** {@inheritDoc} */ @Override - public final void setTriggeringObjects(final SpellAbility sa) { - sa.setTriggeringObjectsFrom(this, AbilityKey.Card, AbilityKey.Causer); + public final void setTriggeringObjects(final SpellAbility sa, Map runParams) { + sa.setTriggeringObjectsFrom(runParams, AbilityKey.Card, AbilityKey.Causer); } @Override 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 700e5c83167..c05f58bbbb4 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerDevoured.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerDevoured.java @@ -46,7 +46,7 @@ public class TriggerDevoured extends Trigger { * @param intrinsic * the intrinsic */ - public TriggerDevoured(final java.util.Map params, final Card host, final boolean intrinsic) { + public TriggerDevoured(final Map params, final Card host, final boolean intrinsic) { super(params, host, intrinsic); } @@ -64,8 +64,8 @@ public class TriggerDevoured extends Trigger { /** {@inheritDoc} */ @Override - public final void setTriggeringObjects(final SpellAbility sa) { - sa.setTriggeringObjectsFrom(this, AbilityKey.Devoured); + public final void setTriggeringObjects(final SpellAbility sa, Map runParams) { + sa.setTriggeringObjectsFrom(runParams, AbilityKey.Devoured); } @Override 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 ef604384410..f3c38da306d 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerDiscarded.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerDiscarded.java @@ -46,7 +46,7 @@ public class TriggerDiscarded extends Trigger { * @param intrinsic * the intrinsic */ - public TriggerDiscarded(final java.util.Map params, final Card host, final boolean intrinsic) { + public TriggerDiscarded(final Map params, final Card host, final boolean intrinsic) { super(params, host, intrinsic); } @@ -89,8 +89,8 @@ public class TriggerDiscarded extends Trigger { /** {@inheritDoc} */ @Override - public final void setTriggeringObjects(final SpellAbility sa) { - sa.setTriggeringObjectsFrom(this, AbilityKey.Card, AbilityKey.Cause); + public final void setTriggeringObjects(final SpellAbility sa, Map runParams) { + sa.setTriggeringObjectsFrom(runParams, AbilityKey.Card, AbilityKey.Cause); } @Override 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 eeb6afaff98..4eb1b913da3 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerDrawn.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerDrawn.java @@ -82,8 +82,8 @@ public class TriggerDrawn extends Trigger { /** {@inheritDoc} */ @Override - public final void setTriggeringObjects(final SpellAbility sa) { - sa.setTriggeringObjectsFrom(this, AbilityKey.Card, AbilityKey.Player); + public final void setTriggeringObjects(final SpellAbility sa, Map runParams) { + sa.setTriggeringObjectsFrom(runParams, AbilityKey.Card, AbilityKey.Player); } @Override 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 dd8d536257f..14f4471e507 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerEvolved.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerEvolved.java @@ -63,8 +63,8 @@ public class TriggerEvolved extends Trigger { /** {@inheritDoc} */ @Override - public final void setTriggeringObjects(final SpellAbility sa) { - sa.setTriggeringObjectsFrom(this, AbilityKey.Card); + public final void setTriggeringObjects(final SpellAbility sa, Map runParams) { + sa.setTriggeringObjectsFrom(runParams, AbilityKey.Card); } @Override diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerExerted.java b/forge-game/src/main/java/forge/game/trigger/TriggerExerted.java index d17a504b2fc..521192734d5 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerExerted.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerExerted.java @@ -33,8 +33,8 @@ public class TriggerExerted extends Trigger { } @Override - public void setTriggeringObjects(SpellAbility sa) { - sa.setTriggeringObjectsFrom(this, AbilityKey.Card, AbilityKey.Player); + public void setTriggeringObjects(SpellAbility sa, Map runParams) { + sa.setTriggeringObjectsFrom(runParams, AbilityKey.Card, AbilityKey.Player); } @Override diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerExiled.java b/forge-game/src/main/java/forge/game/trigger/TriggerExiled.java index 107126c2098..af999023b8e 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerExiled.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerExiled.java @@ -98,8 +98,8 @@ public class TriggerExiled extends Trigger { /** {@inheritDoc} */ @Override - public final void setTriggeringObjects(final SpellAbility sa) { - sa.setTriggeringObjectsFrom(this, AbilityKey.Card); + public final void setTriggeringObjects(final SpellAbility sa, Map runParams) { + sa.setTriggeringObjectsFrom(runParams, AbilityKey.Card); } @Override 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 509c1951a7e..11bb2a04bde 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerExploited.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerExploited.java @@ -47,7 +47,7 @@ public class TriggerExploited extends Trigger { * @param intrinsic * the intrinsic */ - public TriggerExploited(final java.util.Map params, final Card host, final boolean intrinsic) { + public TriggerExploited(final Map params, final Card host, final boolean intrinsic) { super(params, host, intrinsic); } @@ -75,8 +75,8 @@ public class TriggerExploited extends Trigger { /** {@inheritDoc} */ @Override - public final void setTriggeringObjects(final SpellAbility sa) { - sa.setTriggeringObjectsFrom(this, AbilityKey.Exploited, AbilityKey.Card); + public final void setTriggeringObjects(final SpellAbility sa, Map runParams) { + sa.setTriggeringObjectsFrom(runParams, AbilityKey.Exploited, AbilityKey.Card); } @Override diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerExplores.java b/forge-game/src/main/java/forge/game/trigger/TriggerExplores.java index 90edb8c33c1..4cef5a58ec6 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerExplores.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerExplores.java @@ -45,7 +45,7 @@ public class TriggerExplores extends Trigger { * @param intrinsic * the intrinsic */ - public TriggerExplores(final java.util.Map params, final Card host, final boolean intrinsic) { + public TriggerExplores(final Map params, final Card host, final boolean intrinsic) { super(params, host, intrinsic); } @@ -62,8 +62,8 @@ public class TriggerExplores extends Trigger { /** {@inheritDoc} */ @Override - public final void setTriggeringObjects(final SpellAbility sa) { - sa.setTriggeringObject(AbilityKey.Explorer, getFromRunParams(AbilityKey.Card)); + public final void setTriggeringObjects(final SpellAbility sa, Map runParams) { + sa.setTriggeringObject(AbilityKey.Explorer, runParams.get(AbilityKey.Card)); } @Override 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 fbf2a764773..406c9d90fa4 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerFight.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerFight.java @@ -47,7 +47,7 @@ public class TriggerFight extends Trigger { * @param intrinsic * the intrinsic */ - public TriggerFight(final java.util.Map params, final Card host, final boolean intrinsic) { + public TriggerFight(final Map params, final Card host, final boolean intrinsic) { super(params, host, intrinsic); } @@ -59,15 +59,15 @@ public class TriggerFight extends Trigger { if (hasParam("ValidCard")) { return fighter.isValid(getParam("ValidCard").split(","), - this.getHostCard().getController(), this.getHostCard(), null); + getHostCard().getController(), getHostCard(), null); } return true; } /** {@inheritDoc} */ @Override - public final void setTriggeringObjects(final SpellAbility sa) { - sa.setTriggeringObjectsFrom(this, AbilityKey.Fighter); + public final void setTriggeringObjects(final SpellAbility sa, Map runParams) { + sa.setTriggeringObjectsFrom(runParams, AbilityKey.Fighter); } @Override 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 52c8e9798e5..9ddf84f268b 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerFlippedCoin.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerFlippedCoin.java @@ -46,7 +46,7 @@ public class TriggerFlippedCoin extends Trigger { * @param intrinsic * the intrinsic */ - public TriggerFlippedCoin(final java.util.Map params, final Card host, final boolean intrinsic) { + public TriggerFlippedCoin(final Map params, final Card host, final boolean intrinsic) { super(params, host, intrinsic); } @@ -73,8 +73,8 @@ public class TriggerFlippedCoin extends Trigger { /** {@inheritDoc} */ @Override - public final void setTriggeringObjects(final SpellAbility sa) { - sa.setTriggeringObjectsFrom(this, AbilityKey.Player); + public final void setTriggeringObjects(final SpellAbility sa, Map runParams) { + sa.setTriggeringObjectsFrom(runParams, AbilityKey.Player); } @Override diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerHandler.java b/forge-game/src/main/java/forge/game/trigger/TriggerHandler.java index 9696848bbce..8dfcc69f698 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerHandler.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerHandler.java @@ -499,9 +499,6 @@ public class TriggerHandler { // runs it if so. // Return true if the trigger went off, false otherwise. private void runSingleTrigger(final Trigger regtrig, final Map runParams) { - final Map triggerParams = regtrig.getMapParams(); - - regtrig.setRunParams(runParams); // All tests passed, execute ability. if (regtrig instanceof TriggerTapsForMana) { @@ -513,7 +510,7 @@ public class TriggerHandler { SpellAbility sa = null; Card host = regtrig.getHostCard(); - final Card trigCard = (Card) regtrig.getFromRunParams(AbilityKey.Card); + final Card trigCard = (Card) runParams.get(AbilityKey.Card); if (trigCard != null && (host.getId() == trigCard.getId())) { host = trigCard; @@ -530,7 +527,7 @@ public class TriggerHandler { sa = regtrig.getOverridingAbility(); if (sa == null) { - if (!triggerParams.containsKey("Execute")) { + if (!regtrig.hasParam("Execute")) { sa = new Ability(host, ManaCost.ZERO) { @Override public void resolve() { @@ -538,12 +535,13 @@ public class TriggerHandler { }; } else { - if (!host.getCurrentState().hasSVar(triggerParams.get("Execute"))) { - System.err.println("Warning: tried to run a trigger for card " + host + " referencing a SVar " + triggerParams.get("Execute") + " not present on the current state " + host.getCurrentState() + ". Aborting trigger execution to prevent a crash."); + String name = regtrig.getParam("Execute"); + if (!host.getCurrentState().hasSVar(name)) { + System.err.println("Warning: tried to run a trigger for card " + host + " referencing a SVar " + name + " not present on the current state " + host.getCurrentState() + ". Aborting trigger execution to prevent a crash."); return; } - sa = AbilityFactory.getAbility(host, triggerParams.get("Execute")); + sa = AbilityFactory.getAbility(host, name); } } else { // need to copy the SA because of TriggeringObjects @@ -556,7 +554,7 @@ public class TriggerHandler { sa.setTrigger(true); sa.setSourceTrigger(regtrig.getId()); - regtrig.setTriggeringObjects(sa); + regtrig.setTriggeringObjects(sa, runParams); sa.setTriggerRemembered(regtrig.getTriggerRemembered()); if (regtrig.getStoredTriggeredObjects() != null) { sa.setTriggeringObjects(regtrig.getStoredTriggeredObjects()); @@ -570,12 +568,12 @@ public class TriggerHandler { sa.setActivatingPlayer(sa.getDeltrigActivatingPlayer()); } - if (triggerParams.containsKey("TriggerController")) { - Player p = AbilityUtils.getDefinedPlayers(regtrig.getHostCard(), triggerParams.get("TriggerController"), sa).get(0); + if (regtrig.hasParam("TriggerController")) { + Player p = AbilityUtils.getDefinedPlayers(regtrig.getHostCard(), regtrig.getParam("TriggerController"), sa).get(0); sa.setActivatingPlayer(p); } - if (triggerParams.containsKey("RememberController")) { + if (regtrig.hasParam("RememberController")) { host.addRemembered(sa.getActivatingPlayer()); } @@ -594,9 +592,9 @@ public class TriggerHandler { Player decider = null; boolean mand = false; - if (triggerParams.containsKey("OptionalDecider")) { + if (regtrig.hasParam("OptionalDecider")) { sa.setOptionalTrigger(true); - decider = AbilityUtils.getDefinedPlayers(host, triggerParams.get("OptionalDecider"), sa).get(0); + decider = AbilityUtils.getDefinedPlayers(host, regtrig.getParam("OptionalDecider"), sa).get(0); } else if (sa instanceof AbilitySub || !sa.hasParam("Cost") || sa.getParam("Cost").equals("0")) { mand = true; @@ -634,7 +632,7 @@ public class TriggerHandler { regtrig.triggerRun(); - if (triggerParams.containsKey("OneOff")) { + if (regtrig.hasParam("OneOff")) { if (regtrig.getHostCard().isImmutable()) { Player p = regtrig.getHostCard().getController(); p.getZone(ZoneType.Command).remove(regtrig.getHostCard()); diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerImmediate.java b/forge-game/src/main/java/forge/game/trigger/TriggerImmediate.java index 8c6760ef102..32e9960acc6 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerImmediate.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerImmediate.java @@ -26,7 +26,7 @@ import java.util.Map; public class TriggerImmediate extends Trigger { - public TriggerImmediate(final java.util.Map params, final Card host, final boolean intrinsic) { + public TriggerImmediate(final Map params, final Card host, final boolean intrinsic) { super(params, host, intrinsic); } @@ -39,7 +39,7 @@ public class TriggerImmediate extends Trigger { /** {@inheritDoc} */ @Override - public void setTriggeringObjects(final SpellAbility sa) { + public void setTriggeringObjects(final SpellAbility sa, Map runParams) { } @Override diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerInvestigated.java b/forge-game/src/main/java/forge/game/trigger/TriggerInvestigated.java index 0ed0ab95e3d..3ce7d750926 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerInvestigated.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerInvestigated.java @@ -60,8 +60,8 @@ public class TriggerInvestigated extends Trigger { /** {@inheritDoc} */ @Override - public final void setTriggeringObjects(final SpellAbility sa) { - sa.setTriggeringObjectsFrom(this, AbilityKey.Player); + public final void setTriggeringObjects(final SpellAbility sa, Map runParams) { + sa.setTriggeringObjectsFrom(runParams, AbilityKey.Player); } /** {@inheritDoc} @@ -70,7 +70,7 @@ public class TriggerInvestigated extends Trigger { public final boolean performTest(final Map runParams) { Player p = (Player) runParams.get(AbilityKey.Player); if (hasParam("ValidPlayer")) { - if (!matchesValid(p, getParam("ValidPlayer").split(","), this.getHostCard())) { + if (!matchesValid(p, getParam("ValidPlayer").split(","), getHostCard())) { return false; } } 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 cb8b32fd694..6ad3e45ac01 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerLandPlayed.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerLandPlayed.java @@ -52,8 +52,8 @@ public class TriggerLandPlayed extends Trigger { /** {@inheritDoc} */ @Override - public final void setTriggeringObjects(final SpellAbility sa) { - sa.setTriggeringObjectsFrom(this, AbilityKey.Card); + public final void setTriggeringObjects(final SpellAbility sa, Map runParams) { + sa.setTriggeringObjectsFrom(runParams, AbilityKey.Card); } @Override 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 17e934eef05..29096cb897b 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerLifeGained.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerLifeGained.java @@ -75,8 +75,8 @@ public class TriggerLifeGained extends Trigger { /** {@inheritDoc} */ @Override - public final void setTriggeringObjects(final SpellAbility sa) { - sa.setTriggeringObjectsFrom(this, AbilityKey.LifeAmount, AbilityKey.Player); + public final void setTriggeringObjects(final SpellAbility sa, Map runParams) { + sa.setTriggeringObjectsFrom(runParams, AbilityKey.LifeAmount, AbilityKey.Player); } @Override 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 cb42ed21581..071db7c4df6 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerLifeLost.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerLifeLost.java @@ -72,8 +72,8 @@ public class TriggerLifeLost extends Trigger { /** {@inheritDoc} */ @Override - public final void setTriggeringObjects(final SpellAbility sa) { - sa.setTriggeringObjectsFrom(this, AbilityKey.LifeAmount, AbilityKey.Player); + public final void setTriggeringObjects(final SpellAbility sa, Map runParams) { + sa.setTriggeringObjectsFrom(runParams, AbilityKey.LifeAmount, AbilityKey.Player); } @Override 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 9b9c3df538f..bda69cff8b2 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerLosesGame.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerLosesGame.java @@ -24,7 +24,7 @@ public class TriggerLosesGame extends Trigger { * @param intrinsic * the intrinsic */ - public TriggerLosesGame(final java.util.Map params, final Card host, final boolean intrinsic) { + public TriggerLosesGame(final Map params, final Card host, final boolean intrinsic) { super(params, host, intrinsic); } @@ -42,8 +42,8 @@ public class TriggerLosesGame extends Trigger { /** {@inheritDoc} */ @Override - public final void setTriggeringObjects(final SpellAbility sa) { - sa.setTriggeringObjectsFrom(this, AbilityKey.Player); + public final void setTriggeringObjects(final SpellAbility sa, Map runParams) { + sa.setTriggeringObjectsFrom(runParams, AbilityKey.Player); } @Override diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerNewGame.java b/forge-game/src/main/java/forge/game/trigger/TriggerNewGame.java index 41507d6b31d..2a4abb1ec36 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerNewGame.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerNewGame.java @@ -45,7 +45,7 @@ public class TriggerNewGame extends Trigger { * @param intrinsic * the intrinsic */ - public TriggerNewGame(final java.util.Map params, final Card host, final boolean intrinsic) { + public TriggerNewGame(final Map params, final Card host, final boolean intrinsic) { super(params, host, intrinsic); } @@ -58,7 +58,7 @@ public class TriggerNewGame extends Trigger { /** {@inheritDoc} */ @Override - public final void setTriggeringObjects(final SpellAbility sa) { + public final void setTriggeringObjects(final SpellAbility sa, Map runParams) { } @Override 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 f3789b45f1b..8a87328118a 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerPayCumulativeUpkeep.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerPayCumulativeUpkeep.java @@ -46,7 +46,7 @@ public class TriggerPayCumulativeUpkeep extends Trigger { * @param intrinsic * the intrinsic */ - public TriggerPayCumulativeUpkeep(final java.util.Map params, final Card host, final boolean intrinsic) { + public TriggerPayCumulativeUpkeep(final Map params, final Card host, final boolean intrinsic) { super(params, host, intrinsic); } @@ -73,8 +73,8 @@ public class TriggerPayCumulativeUpkeep extends Trigger { /** {@inheritDoc} */ @Override - public final void setTriggeringObjects(final SpellAbility sa) { - sa.setTriggeringObjectsFrom(this, AbilityKey.Card, AbilityKey.PayingMana); + public final void setTriggeringObjects(final SpellAbility sa, Map runParams) { + sa.setTriggeringObjectsFrom(runParams, AbilityKey.Card, AbilityKey.PayingMana); } @Override diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerPayEcho.java b/forge-game/src/main/java/forge/game/trigger/TriggerPayEcho.java index 410c91009df..b1ac0b60c0d 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerPayEcho.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerPayEcho.java @@ -45,7 +45,7 @@ public class TriggerPayEcho extends Trigger { * @param intrinsic * the intrinsic */ - public TriggerPayEcho(final java.util.Map params, final Card host, final boolean intrinsic) { + public TriggerPayEcho(final Map params, final Card host, final boolean intrinsic) { super(params, host, intrinsic); } @@ -72,8 +72,8 @@ public class TriggerPayEcho extends Trigger { /** {@inheritDoc} */ @Override - public final void setTriggeringObjects(final SpellAbility sa) { - sa.setTriggeringObjectsFrom(this, AbilityKey.Card); + public final void setTriggeringObjects(final SpellAbility sa, Map runParams) { + sa.setTriggeringObjectsFrom(runParams, AbilityKey.Card); } @Override diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerPayLife.java b/forge-game/src/main/java/forge/game/trigger/TriggerPayLife.java index dec7ee4f3be..8cd5d3aa377 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerPayLife.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerPayLife.java @@ -62,8 +62,8 @@ public class TriggerPayLife extends Trigger { /** {@inheritDoc} */ @Override - public final void setTriggeringObjects(final SpellAbility sa) { - sa.setTriggeringObjectsFrom(this, AbilityKey.LifeAmount, AbilityKey.Player); + public final void setTriggeringObjects(final SpellAbility sa, Map runParams) { + sa.setTriggeringObjectsFrom(runParams, AbilityKey.LifeAmount, AbilityKey.Player); } @Override diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerPhase.java b/forge-game/src/main/java/forge/game/trigger/TriggerPhase.java index d059f8205f7..a3572a5feda 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerPhase.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerPhase.java @@ -46,7 +46,7 @@ public class TriggerPhase extends Trigger { * @param intrinsic * the intrinsic */ - public TriggerPhase(final java.util.Map params, final Card host, final boolean intrinsic) { + public TriggerPhase(final Map params, final Card host, final boolean intrinsic) { super(params, host, intrinsic); } @@ -63,8 +63,8 @@ public class TriggerPhase extends Trigger { /** {@inheritDoc} */ @Override - public final void setTriggeringObjects(final SpellAbility sa) { - sa.setTriggeringObjectsFrom(this, AbilityKey.Player); + public final void setTriggeringObjects(final SpellAbility sa, Map runParams) { + sa.setTriggeringObjectsFrom(runParams, AbilityKey.Player); } @Override 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 3946cb5eba6..9b93061a7dc 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerPhaseIn.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerPhaseIn.java @@ -29,8 +29,8 @@ public class TriggerPhaseIn extends Trigger { /** {@inheritDoc} */ @Override - public final void setTriggeringObjects(final SpellAbility sa) { - sa.setTriggeringObjectsFrom(this, AbilityKey.Card); + public final void setTriggeringObjects(final SpellAbility sa, Map runParams) { + sa.setTriggeringObjectsFrom(runParams, AbilityKey.Card); } @Override 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 bd9d0469d6f..6cdf64422fa 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerPhaseOut.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerPhaseOut.java @@ -37,8 +37,8 @@ public class TriggerPhaseOut extends Trigger { /** {@inheritDoc} */ @Override - public final void setTriggeringObjects(final SpellAbility sa) { - sa.setTriggeringObjectsFrom(this, AbilityKey.Card); + public final void setTriggeringObjects(final SpellAbility sa, Map runParams) { + sa.setTriggeringObjectsFrom(runParams, AbilityKey.Card); } @Override 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 99c63e0ff32..1bc6b4277a6 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerPlanarDice.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerPlanarDice.java @@ -26,7 +26,7 @@ public class TriggerPlanarDice extends Trigger { * @param intrinsic * the intrinsic */ - public TriggerPlanarDice(final java.util.Map params, final Card host, final boolean intrinsic) { + public TriggerPlanarDice(final Map params, final Card host, final boolean intrinsic) { super(params, host, intrinsic); } @@ -52,12 +52,9 @@ public class TriggerPlanarDice extends Trigger { return true; } - /* (non-Javadoc) - * @see forge.card.trigger.Trigger#setTriggeringObjects(forge.card.spellability.SpellAbility) - */ @Override - public void setTriggeringObjects(SpellAbility sa) { - sa.setTriggeringObjectsFrom(this, AbilityKey.Player); + public void setTriggeringObjects(SpellAbility sa, Map runParams) { + sa.setTriggeringObjectsFrom(runParams, AbilityKey.Player); } @Override 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 8a174b04fca..36a97bdd3fa 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerPlaneswalkedFrom.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerPlaneswalkedFrom.java @@ -49,12 +49,9 @@ public class TriggerPlaneswalkedFrom extends Trigger { return true; } - /* (non-Javadoc) - * @see forge.card.trigger.Trigger#setTriggeringObjects(forge.card.spellability.SpellAbility) - */ @Override - public void setTriggeringObjects(final SpellAbility sa) { - sa.setTriggeringObjectsFrom(this, AbilityKey.Cards); + public void setTriggeringObjects(final SpellAbility sa, Map runParams) { + sa.setTriggeringObjectsFrom(runParams, AbilityKey.Cards); } @Override 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 b12d1cee14a..f3475bd5cac 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerPlaneswalkedTo.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerPlaneswalkedTo.java @@ -49,12 +49,9 @@ public class TriggerPlaneswalkedTo extends Trigger { return true; } - /* (non-Javadoc) - * @see forge.card.trigger.Trigger#setTriggeringObjects(forge.card.spellability.SpellAbility) - */ @Override - public void setTriggeringObjects(SpellAbility sa) { - sa.setTriggeringObjectsFrom(this, AbilityKey.Cards); + public void setTriggeringObjects(SpellAbility sa, Map runParams) { + sa.setTriggeringObjectsFrom(runParams, AbilityKey.Cards); } @Override diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerRegenerated.java b/forge-game/src/main/java/forge/game/trigger/TriggerRegenerated.java index 11a965aaaf0..07b2b52511a 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerRegenerated.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerRegenerated.java @@ -69,8 +69,8 @@ public class TriggerRegenerated extends Trigger { /** {@inheritDoc} */ @Override - public final void setTriggeringObjects(final SpellAbility sa) { - sa.setTriggeringObjectsFrom(this, AbilityKey.Card, AbilityKey.Cause); + public final void setTriggeringObjects(final SpellAbility sa, Map runParams) { + sa.setTriggeringObjectsFrom(runParams, AbilityKey.Card, AbilityKey.Cause); } @Override diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerRevealed.java b/forge-game/src/main/java/forge/game/trigger/TriggerRevealed.java index 3d11d6934ce..32775be89e1 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerRevealed.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerRevealed.java @@ -31,8 +31,8 @@ public class TriggerRevealed extends Trigger { } @Override - public void setTriggeringObjects(SpellAbility sa) { - sa.setTriggeringObjectsFrom(this, AbilityKey.Card); + public void setTriggeringObjects(SpellAbility sa, Map runParams) { + sa.setTriggeringObjectsFrom(runParams, AbilityKey.Card); } @Override 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 79b4436c909..3cbaa734980 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerSacrificed.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerSacrificed.java @@ -49,7 +49,7 @@ public class TriggerSacrificed extends Trigger { * @param intrinsic * the intrinsic */ - public TriggerSacrificed(final java.util.Map params, final Card host, final boolean intrinsic) { + public TriggerSacrificed(final Map params, final Card host, final boolean intrinsic) { super(params, host, intrinsic); } @@ -129,8 +129,8 @@ public class TriggerSacrificed extends Trigger { /** {@inheritDoc} */ @Override - public final void setTriggeringObjects(final SpellAbility sa) { - sa.setTriggeringObjectsFrom(this, AbilityKey.Card); + public final void setTriggeringObjects(final SpellAbility sa, Map runParams) { + sa.setTriggeringObjectsFrom(runParams, AbilityKey.Card); } @Override 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 47cb3c7335e..3456e012a22 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerScry.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerScry.java @@ -46,7 +46,7 @@ public class TriggerScry extends Trigger { * @param intrinsic * the intrinsic */ - public TriggerScry(final java.util.Map params, final Card host, final boolean intrinsic) { + public TriggerScry(final Map params, final Card host, final boolean intrinsic) { super(params, host, intrinsic); } @@ -65,8 +65,8 @@ public class TriggerScry extends Trigger { /** {@inheritDoc} */ @Override - public final void setTriggeringObjects(final SpellAbility sa) { - sa.setTriggeringObjectsFrom(this, AbilityKey.Player); + public final void setTriggeringObjects(final SpellAbility sa, Map runParams) { + sa.setTriggeringObjectsFrom(runParams, AbilityKey.Player); } @Override 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 56b8f91b65a..9f60c39af72 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerSearchedLibrary.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerSearchedLibrary.java @@ -48,7 +48,7 @@ public class TriggerSearchedLibrary extends Trigger { * @param intrinsic * the intrinsic */ - public TriggerSearchedLibrary(final java.util.Map params, final Card host, final boolean intrinsic) { + public TriggerSearchedLibrary(final Map params, final Card host, final boolean intrinsic) { super(params, host, intrinsic); } @@ -76,8 +76,8 @@ public class TriggerSearchedLibrary extends Trigger { /** {@inheritDoc} */ @Override - public final void setTriggeringObjects(final SpellAbility sa) { - sa.setTriggeringObjectsFrom(this, AbilityKey.Player); + public final void setTriggeringObjects(final SpellAbility sa, Map runParams) { + sa.setTriggeringObjectsFrom(runParams, AbilityKey.Player); } @Override diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerSetInMotion.java b/forge-game/src/main/java/forge/game/trigger/TriggerSetInMotion.java index b03533288ce..f3d32f8c26d 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerSetInMotion.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerSetInMotion.java @@ -46,7 +46,7 @@ public class TriggerSetInMotion extends Trigger { * @param intrinsic * the intrinsic */ - public TriggerSetInMotion(final java.util.Map params, final Card host, final boolean intrinsic) { + public TriggerSetInMotion(final Map params, final Card host, final boolean intrinsic) { super(params, host, intrinsic); } @@ -79,8 +79,8 @@ public class TriggerSetInMotion extends Trigger { /** {@inheritDoc} */ @Override - public final void setTriggeringObjects(final SpellAbility sa) { - sa.setTriggeringObjectsFrom(this, AbilityKey.Scheme); + public final void setTriggeringObjects(final SpellAbility sa, Map runParams) { + sa.setTriggeringObjectsFrom(runParams, AbilityKey.Scheme); } @Override 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 a211eba1438..fb9aa30bf54 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerShuffled.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerShuffled.java @@ -46,7 +46,7 @@ public class TriggerShuffled extends Trigger { * @param intrinsic * the intrinsic */ - public TriggerShuffled(final java.util.Map params, final Card host, final boolean intrinsic) { + public TriggerShuffled(final Map params, final Card host, final boolean intrinsic) { super(params, host, intrinsic); } @@ -77,8 +77,8 @@ public class TriggerShuffled extends Trigger { /** {@inheritDoc} */ @Override - public final void setTriggeringObjects(final SpellAbility sa) { - sa.setTriggeringObjectsFrom(this, AbilityKey.Player); + public final void setTriggeringObjects(final SpellAbility sa, Map runParams) { + sa.setTriggeringObjectsFrom(runParams, AbilityKey.Player); } @Override 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 6708ee73337..bf5e16496c9 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerSpellAbilityCast.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerSpellAbilityCast.java @@ -265,15 +265,15 @@ public class TriggerSpellAbilityCast extends Trigger { /** {@inheritDoc} */ @Override - public final void setTriggeringObjects(final SpellAbility sa) { - final SpellAbility castSA = (SpellAbility) getFromRunParams(AbilityKey.CastSA); + public final void setTriggeringObjects(final SpellAbility sa, Map runParams) { + final SpellAbility castSA = (SpellAbility) runParams.get(AbilityKey.CastSA); final SpellAbilityStackInstance si = sa.getHostCard().getGame().getStack().getInstanceFromSpellAbility(castSA); sa.setTriggeringObject(AbilityKey.Card, castSA.getHostCard()); sa.setTriggeringObject(AbilityKey.SpellAbility, castSA); sa.setTriggeringObject(AbilityKey.StackInstance, si); sa.setTriggeringObject(AbilityKey.SpellAbilityTargetingCards, (si != null ? si.getSpellAbility(true) : castSA).getTargets().getTargetCards()); sa.setTriggeringObjectsFrom( - this, + runParams, AbilityKey.Player, AbilityKey.Activator, AbilityKey.CurrentStormCount, diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerSpellAbilityCopy.java b/forge-game/src/main/java/forge/game/trigger/TriggerSpellAbilityCopy.java index ec00915227f..8a5cae2c650 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerSpellAbilityCopy.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerSpellAbilityCopy.java @@ -92,8 +92,8 @@ public class TriggerSpellAbilityCopy extends Trigger { /** {@inheritDoc} */ @Override - public final void setTriggeringObjects(final SpellAbility sa) { - final SpellAbility copySA = (SpellAbility) getFromRunParams(AbilityKey.CopySA); + public final void setTriggeringObjects(final SpellAbility sa, Map runParams) { + final SpellAbility copySA = (SpellAbility) runParams.get(AbilityKey.CopySA); final SpellAbilityStackInstance si = sa.getHostCard().getGame().getStack().getInstanceFromSpellAbility(copySA); sa.setTriggeringObject(AbilityKey.Card, copySA.getHostCard()); sa.setTriggeringObject(AbilityKey.SpellAbility, copySA); diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerSurveil.java b/forge-game/src/main/java/forge/game/trigger/TriggerSurveil.java index cb5d6f1afea..6c8c20a79da 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerSurveil.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerSurveil.java @@ -56,8 +56,8 @@ public class TriggerSurveil extends Trigger { /** {@inheritDoc} */ @Override - public final void setTriggeringObjects(final SpellAbility sa) { - sa.setTriggeringObjectsFrom(this, AbilityKey.Player); + public final void setTriggeringObjects(final SpellAbility sa, Map runParams) { + sa.setTriggeringObjectsFrom(runParams, AbilityKey.Player); } /** {@inheritDoc} 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 23a30a55195..d5a4151ca09 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerTaps.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerTaps.java @@ -79,8 +79,8 @@ public class TriggerTaps extends Trigger { /** {@inheritDoc} */ @Override - public final void setTriggeringObjects(final SpellAbility sa) { - sa.setTriggeringObjectsFrom(this, AbilityKey.Card); + public final void setTriggeringObjects(final SpellAbility sa, Map runParams) { + sa.setTriggeringObjectsFrom(runParams, AbilityKey.Card); } @Override 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 de96aa18d8b..bd32d65a794 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerTapsForMana.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerTapsForMana.java @@ -48,7 +48,7 @@ public class TriggerTapsForMana extends Trigger { * @param intrinsic * the intrinsic */ - public TriggerTapsForMana(final java.util.Map params, final Card host, final boolean intrinsic) { + public TriggerTapsForMana(final Map params, final Card host, final boolean intrinsic) { super(params, host, intrinsic); } @@ -108,8 +108,8 @@ public class TriggerTapsForMana extends Trigger { /** {@inheritDoc} */ @Override - public final void setTriggeringObjects(final SpellAbility sa) { - sa.setTriggeringObjectsFrom(this, AbilityKey.Card, AbilityKey.Player, AbilityKey.Produced); + public final void setTriggeringObjects(final SpellAbility sa, Map runParams) { + sa.setTriggeringObjectsFrom(runParams, AbilityKey.Card, AbilityKey.Player, AbilityKey.Produced); } @Override 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 36f0429f32c..22a6e7bf8e3 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerTransformed.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerTransformed.java @@ -54,13 +54,9 @@ public class TriggerTransformed extends Trigger { return true; } - - /* (non-Javadoc) - * @see forge.card.trigger.Trigger#setTriggeringObjects(forge.card.spellability.SpellAbility) - */ @Override - public void setTriggeringObjects(SpellAbility sa) { - sa.setTriggeringObjectsFrom(this, AbilityKey.Transformer); + public void setTriggeringObjects(SpellAbility sa, Map runParams) { + sa.setTriggeringObjectsFrom(runParams, AbilityKey.Transformer); } @Override 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 e6bd53b8b28..eeed5ca559e 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerTurnBegin.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerTurnBegin.java @@ -9,7 +9,7 @@ import java.util.Map; // Turn Begin isn't a "real" trigger, but is useful for Advanced Scripting Techniques public class TriggerTurnBegin extends Trigger { - public TriggerTurnBegin(final java.util.Map params, final Card host, final boolean intrinsic) { + public TriggerTurnBegin(final Map params, final Card host, final boolean intrinsic) { super(params, host, intrinsic); } @@ -23,8 +23,8 @@ public class TriggerTurnBegin extends Trigger { } @Override - public final void setTriggeringObjects(final SpellAbility sa) { - sa.setTriggeringObjectsFrom(this, AbilityKey.Player); + public final void setTriggeringObjects(final SpellAbility sa, Map runParams) { + sa.setTriggeringObjectsFrom(runParams, AbilityKey.Player); } @Override 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 f27a472667c..0ca7689734d 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerTurnFaceUp.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerTurnFaceUp.java @@ -46,7 +46,7 @@ public class TriggerTurnFaceUp extends Trigger { * @param intrinsic * the intrinsic */ - public TriggerTurnFaceUp(final java.util.Map params, final Card host, final boolean intrinsic) { + public TriggerTurnFaceUp(final Map params, final Card host, final boolean intrinsic) { super(params, host, intrinsic); } @@ -64,8 +64,8 @@ public class TriggerTurnFaceUp extends Trigger { /** {@inheritDoc} */ @Override - public final void setTriggeringObjects(final SpellAbility sa) { - sa.setTriggeringObjectsFrom(this, AbilityKey.Card); + public final void setTriggeringObjects(final SpellAbility sa, Map runParams) { + sa.setTriggeringObjectsFrom(runParams, AbilityKey.Card); } @Override diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerUnattach.java b/forge-game/src/main/java/forge/game/trigger/TriggerUnattach.java index 18dbaeb6c7b..e512e216632 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerUnattach.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerUnattach.java @@ -46,7 +46,7 @@ public class TriggerUnattach extends Trigger { * @param intrinsic * the intrinsic */ - public TriggerUnattach(final java.util.Map params, final Card host, final boolean intrinsic) { + public TriggerUnattach(final Map params, final Card host, final boolean intrinsic) { super(params, host, intrinsic); } @@ -76,8 +76,8 @@ public class TriggerUnattach extends Trigger { /** {@inheritDoc} */ @Override - public final void setTriggeringObjects(final SpellAbility sa) { - sa.setTriggeringObjectsFrom(this, AbilityKey.Object, AbilityKey.Attach); + public final void setTriggeringObjects(final SpellAbility sa, Map runParams) { + sa.setTriggeringObjectsFrom(runParams, AbilityKey.Object, AbilityKey.Attach); } @Override 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 a01a3f8d46d..b2eb3661a7a 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerUntaps.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerUntaps.java @@ -68,8 +68,8 @@ public class TriggerUntaps extends Trigger { /** {@inheritDoc} */ @Override - public final void setTriggeringObjects(final SpellAbility sa) { - sa.setTriggeringObjectsFrom(this, AbilityKey.Card); + public final void setTriggeringObjects(final SpellAbility sa, Map runParams) { + sa.setTriggeringObjectsFrom(runParams, AbilityKey.Card); } @Override 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 1a21bf5aa75..c97bd048b26 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerVote.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerVote.java @@ -64,11 +64,11 @@ public class TriggerVote extends Trigger { /** {@inheritDoc} */ @Override - public final void setTriggeringObjects(final SpellAbility sa) { + public final void setTriggeringObjects(final SpellAbility sa, Map runParams) { @SuppressWarnings("unchecked") FCollection voters = getVoters( this.getHostCard().getController(), - (ListMultimap) getFromRunParams(AbilityKey.AllVotes), + (ListMultimap) runParams.get(AbilityKey.AllVotes), true, true );