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

Merge branch 'triggerRunParams' into 'master'

Browse Source 
Trigger: remove runParams from Trigger

See merge request core-developers/forge!2479
This commit is contained in:
Michael Kamensky
2020-01-31 10:15:31 +00:00
parent 415f911e46 c3b05157c5
commit a757e033d9
87 changed files with 248 additions and 291 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
forge-game/src/main/java/forge/game/card/Card.java
View File

@@ -1299,12 +1299,12 @@ public class Card extends GameEntity implements Comparable<Card> {
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<Card> {
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

2
forge-game/src/main/java/forge/game/card/CardFactory.java
View File

@@ -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());

8
forge-game/src/main/java/forge/game/cost/Cost.java
View File

@@ -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() {

4
forge-game/src/main/java/forge/game/player/Player.java
View File

@@ -939,10 +939,10 @@ public class Player extends GameEntity implements Comparable<Player> {
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);

8
forge-game/src/main/java/forge/game/spellability/SpellAbility.java
View File

@@ -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<AbilityKey, Object> 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);
}

26
forge-game/src/main/java/forge/game/trigger/Trigger.java
View File

@@ -65,10 +65,6 @@ public abstract class Trigger extends TriggerReplacementBase {
/** The ID. */
private int id;
/** The run params. */
private Map<AbilityKey, Object> runParams;
private TriggerType mode;
private Map<AbilityKey, Object> 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<AbilityKey, Object> runParams0) {
this.runParams = runParams0;
}
public abstract void setTriggeringObjects(SpellAbility sa, final Map<AbilityKey, Object> runParams);
/**
* Gets the id.

6
forge-game/src/main/java/forge/game/trigger/TriggerAbandoned.java
View File

@@ -44,7 +44,7 @@ public class TriggerAbandoned extends Trigger {
* @param intrinsic
* the intrinsic
*/
public TriggerAbandoned(final java.util.Map<String, String> params, final Card host, final boolean intrinsic) {
public TriggerAbandoned(final Map<String, String> 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<AbilityKey, Object> runParams) {
sa.setTriggeringObjectsFrom(runParams, AbilityKey.Scheme);
}
@Override

4
forge-game/src/main/java/forge/game/trigger/TriggerAdapt.java
View File

@@ -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<AbilityKey, Object> runParams) {
sa.setTriggeringObjectsFrom(runParams, AbilityKey.Card);
}
@Override

4
forge-game/src/main/java/forge/game/trigger/TriggerAlways.java
View File

@@ -45,7 +45,7 @@ public class TriggerAlways extends Trigger {
* @param intrinsic
* the intrinsic
*/
public TriggerAlways(final java.util.Map<String, String> params, final Card host, final boolean intrinsic) {
public TriggerAlways(final Map<String, String> 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<AbilityKey, Object> runParams) {
}
@Override

8
forge-game/src/main/java/forge/game/trigger/TriggerAttached.java
View File

@@ -46,7 +46,7 @@ public class TriggerAttached extends Trigger {
* @param intrinsic
* the intrinsic
*/
public TriggerAttached(final java.util.Map<String, String> params, final Card host, final boolean intrinsic) {
public TriggerAttached(final Map<String, String> 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<AbilityKey, Object> runParams) {
sa.setTriggeringObject(AbilityKey.Source, runParams.get(AbilityKey.AttachSource));
sa.setTriggeringObject(AbilityKey.Target, runParams.get(AbilityKey.AttachTarget));
}
@Override

6
forge-game/src/main/java/forge/game/trigger/TriggerAttackerBlocked.java
View File

@@ -47,7 +47,7 @@ public class TriggerAttackerBlocked extends Trigger {
* @param intrinsic
* the intrinsic
*/
public TriggerAttackerBlocked(final java.util.Map<String, String> params, final Card host, final boolean intrinsic) {
public TriggerAttackerBlocked(final Map<String, String> 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<AbilityKey, Object> runParams) {
sa.setTriggeringObjectsFrom(
this,
runParams,
AbilityKey.Attacker,
AbilityKey.Blockers,
AbilityKey.Defender,

6
forge-game/src/main/java/forge/game/trigger/TriggerAttackerBlockedByCreature.java
View File

@@ -46,7 +46,7 @@ public class TriggerAttackerBlockedByCreature extends Trigger {
* @param intrinsic
* the intrinsic
*/
public TriggerAttackerBlockedByCreature(final java.util.Map<String, String> params, final Card host, final boolean intrinsic) {
public TriggerAttackerBlockedByCreature(final Map<String, String> 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<AbilityKey, Object> runParams) {
sa.setTriggeringObjectsFrom(runParams, AbilityKey.Attacker, AbilityKey.Blocker);
}
@Override

6
forge-game/src/main/java/forge/game/trigger/TriggerAttackerUnblocked.java
View File

@@ -46,7 +46,7 @@ public class TriggerAttackerUnblocked extends Trigger {
* @param intrinsic
* the intrinsic
*/
public TriggerAttackerUnblocked(final java.util.Map<String, String> params, final Card host, final boolean intrinsic) {
public TriggerAttackerUnblocked(final Map<String, String> 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<AbilityKey, Object> runParams) {
sa.setTriggeringObjectsFrom(runParams, AbilityKey.Attacker, AbilityKey.Defender, AbilityKey.DefendingPlayer);
}
@Override

6
forge-game/src/main/java/forge/game/trigger/TriggerAttackerUnblockedOnce.java
View File

@@ -48,7 +48,7 @@ public class TriggerAttackerUnblockedOnce extends Trigger {
* @param intrinsic
* the intrinsic
*/
public TriggerAttackerUnblockedOnce(final java.util.Map<String, String> params, final Card host, final boolean intrinsic) {
public TriggerAttackerUnblockedOnce(final Map<String, String> 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<AbilityKey, Object> runParams) {
sa.setTriggeringObjectsFrom(runParams, AbilityKey.AttackingPlayer, AbilityKey.Defenders);
}
@Override

6
forge-game/src/main/java/forge/game/trigger/TriggerAttackersDeclared.java
View File

@@ -42,7 +42,7 @@ public class TriggerAttackersDeclared extends Trigger {
* @param intrinsic
* the intrinsic
*/
public TriggerAttackersDeclared(final java.util.Map<String, String> params, final Card host, final boolean intrinsic) {
public TriggerAttackersDeclared(final Map<String, String> 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<AbilityKey, Object> runParams) {
sa.setTriggeringObjectsFrom(runParams, AbilityKey.Attackers, AbilityKey.AttackingPlayer);
}
@Override

8
forge-game/src/main/java/forge/game/trigger/TriggerAttacks.java
View File

@@ -49,7 +49,7 @@ public class TriggerAttacks extends Trigger {
* @param intrinsic
* the intrinsic
*/
public TriggerAttacks(final java.util.Map<String, String> params, final Card host, final boolean intrinsic) {
public TriggerAttacks(final Map<String, String> 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<AbilityKey, Object> runParams) {
sa.setTriggeringObject(AbilityKey.Defender, runParams.get(AbilityKey.Attacked));
sa.setTriggeringObjectsFrom(
this,
runParams,
AbilityKey.Attacker,
AbilityKey.Defenders,
AbilityKey.DefendingPlayer

4
forge-game/src/main/java/forge/game/trigger/TriggerBecomeMonarch.java
View File

@@ -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<AbilityKey, Object> runParams) {
sa.setTriggeringObjectsFrom(runParams, AbilityKey.Player);
}
@Override

4
forge-game/src/main/java/forge/game/trigger/TriggerBecomeMonstrous.java
View File

@@ -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<AbilityKey, Object> runParams) {
sa.setTriggeringObjectsFrom(runParams, AbilityKey.Card, AbilityKey.MonstrosityAmount);
}
@Override

6
forge-game/src/main/java/forge/game/trigger/TriggerBecomeRenowned.java
View File

@@ -46,7 +46,7 @@ public class TriggerBecomeRenowned extends Trigger {
* @param intrinsic
* the intrinsic
*/
public TriggerBecomeRenowned(final java.util.Map<String, String> params, final Card host, final boolean intrinsic) {
public TriggerBecomeRenowned(final Map<String, String> 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<AbilityKey, Object> runParams) {
sa.setTriggeringObjectsFrom(runParams, AbilityKey.Card);
}
@Override

8
forge-game/src/main/java/forge/game/trigger/TriggerBecomesTarget.java
View File

@@ -47,7 +47,7 @@ public class TriggerBecomesTarget extends Trigger {
* @param intrinsic
* the intrinsic
*/
public TriggerBecomesTarget(final java.util.Map<String, String> params, final Card host, final boolean intrinsic) {
public TriggerBecomesTarget(final Map<String, String> 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<AbilityKey, Object> runParams) {
sa.setTriggeringObject(AbilityKey.Source, ((SpellAbility) runParams.get(AbilityKey.SourceSA)).getHostCard());
sa.setTriggeringObjectsFrom(runParams, AbilityKey.SourceSA, AbilityKey.Target);
}
@Override

8
forge-game/src/main/java/forge/game/trigger/TriggerBecomesTargetOnce.java
View File

@@ -49,7 +49,7 @@ public class TriggerBecomesTargetOnce extends Trigger {
* @param intrinsic
* the intrinsic
*/
public TriggerBecomesTargetOnce(final java.util.Map<String, String> params, final Card host, final boolean intrinsic) {
public TriggerBecomesTargetOnce(final Map<String, String> 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<AbilityKey, Object> runParams) {
sa.setTriggeringObjectsFrom(runParams, AbilityKey.SourceSA, AbilityKey.Targets);
sa.setTriggeringObject(AbilityKey.Source, ((SpellAbility) runParams.get(AbilityKey.SourceSA)).getHostCard());
}
@Override

6
forge-game/src/main/java/forge/game/trigger/TriggerBlockersDeclared.java
View File

@@ -40,7 +40,7 @@ public class TriggerBlockersDeclared extends Trigger {
* @param intrinsic
* the intrinsic
*/
public TriggerBlockersDeclared(final java.util.Map<String, String> params, final Card host, final boolean intrinsic) {
public TriggerBlockersDeclared(final Map<String, String> 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<AbilityKey, Object> runParams) {
sa.setTriggeringObjectsFrom(runParams, AbilityKey.Blockers, AbilityKey.Attackers);
}
@Override

6
forge-game/src/main/java/forge/game/trigger/TriggerBlocks.java
View File

@@ -46,7 +46,7 @@ public class TriggerBlocks extends Trigger {
* @param intrinsic
* the intrinsic
*/
public TriggerBlocks(final java.util.Map<String, String> params, final Card host, final boolean intrinsic) {
public TriggerBlocks(final Map<String, String> 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<AbilityKey, Object> runParams) {
sa.setTriggeringObjectsFrom(runParams, AbilityKey.Blocker, AbilityKey.Attackers);
}
@Override

6
forge-game/src/main/java/forge/game/trigger/TriggerChampioned.java
View File

@@ -47,7 +47,7 @@ public class TriggerChampioned extends Trigger {
* @param intrinsic
* the intrinsic
*/
public TriggerChampioned(final java.util.Map<String, String> params, final Card host, final boolean intrinsic) {
public TriggerChampioned(final Map<String, String> 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<AbilityKey, Object> runParams) {
sa.setTriggeringObjectsFrom(runParams, AbilityKey.Championed, AbilityKey.Card);
}
@Override

6
forge-game/src/main/java/forge/game/trigger/TriggerChangesController.java
View File

@@ -46,7 +46,7 @@ public class TriggerChangesController extends Trigger {
* @param intrinsic
* the intrinsic
*/
public TriggerChangesController(final java.util.Map<String, String> params, final Card host, final boolean intrinsic) {
public TriggerChangesController(final Map<String, String> 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<AbilityKey, Object> runParams) {
sa.setTriggeringObjectsFrom(runParams, AbilityKey.Card);
}
@Override

4
forge-game/src/main/java/forge/game/trigger/TriggerChangesZone.java
View File

@@ -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<AbilityKey, Object> runParams) {
sa.setTriggeringObjectsFrom(runParams, AbilityKey.Card);
}
@Override

4
forge-game/src/main/java/forge/game/trigger/TriggerChangesZoneAll.java
View File

@@ -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<AbilityKey, Object> runParams) {
final CardZoneTable table = (CardZoneTable) runParams.get(AbilityKey.Cards);
CardCollection allCards = this.filterCards(table);

2
forge-game/src/main/java/forge/game/trigger/TriggerClashed.java
View File

@@ -71,7 +71,7 @@ public class TriggerClashed extends Trigger {
/** {@inheritDoc} */
@Override
public void setTriggeringObjects(final SpellAbility sa) {
public void setTriggeringObjects(final SpellAbility sa, Map<AbilityKey, Object> runParams) {
// No triggered-variables for you :(
}

4
forge-game/src/main/java/forge/game/trigger/TriggerCounterAdded.java
View File

@@ -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<AbilityKey, Object> runParams) {
sa.setTriggeringObjectsFrom(runParams, AbilityKey.Card, AbilityKey.Player);
}
@Override

4
forge-game/src/main/java/forge/game/trigger/TriggerCounterAddedAll.java
View File

@@ -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<AbilityKey, Object> runParams) {
final GameEntityCounterTable table = (GameEntityCounterTable) runParams.get(AbilityKey.Objects);
Map<GameEntity, Integer> all = this.filterTable(table);

6
forge-game/src/main/java/forge/game/trigger/TriggerCounterAddedOnce.java
View File

@@ -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<AbilityKey, Object> runParams) {
sa.setTriggeringObjectsFrom(runParams, AbilityKey.Card, AbilityKey.Player);
sa.setTriggeringObject(AbilityKey.Amount, runParams.get(AbilityKey.CounterAmount));
}
@Override

6
forge-game/src/main/java/forge/game/trigger/TriggerCounterRemoved.java
View File

@@ -47,7 +47,7 @@ public class TriggerCounterRemoved extends Trigger {
* @param intrinsic
* the intrinsic
*/
public TriggerCounterRemoved(final java.util.Map<String, String> params, final Card host, final boolean intrinsic) {
public TriggerCounterRemoved(final Map<String, String> 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<AbilityKey, Object> runParams) {
sa.setTriggeringObjectsFrom(runParams, AbilityKey.Card);
}
@Override

8
forge-game/src/main/java/forge/game/trigger/TriggerCounterRemovedOnce.java
View File

@@ -47,7 +47,7 @@ public class TriggerCounterRemovedOnce extends Trigger {
* @param intrinsic
* the intrinsic
*/
public TriggerCounterRemovedOnce(final java.util.Map<String, String> params, final Card host, final boolean intrinsic) {
public TriggerCounterRemovedOnce(final Map<String, String> 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<AbilityKey, Object> runParams) {
sa.setTriggeringObjectsFrom(runParams, AbilityKey.Card);
sa.setTriggeringObject(AbilityKey.Amount, runParams.get(AbilityKey.CounterAmount));
}
@Override

6
forge-game/src/main/java/forge/game/trigger/TriggerCountered.java
View File

@@ -46,7 +46,7 @@ public class TriggerCountered extends Trigger {
* @param intrinsic
* the intrinsic
*/
public TriggerCountered(final java.util.Map<String, String> params, final Card host, final boolean intrinsic) {
public TriggerCountered(final Map<String, String> 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<AbilityKey, Object> runParams) {
sa.setTriggeringObjectsFrom(
this,
runParams,
AbilityKey.Card,
AbilityKey.Cause,
AbilityKey.Player,

6
forge-game/src/main/java/forge/game/trigger/TriggerCrewed.java
View File

@@ -10,7 +10,7 @@ import java.util.Map;
public class TriggerCrewed extends Trigger {
public TriggerCrewed(final java.util.Map<String, String> params, final Card host, final boolean intrinsic) {
public TriggerCrewed(final Map<String, String> 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<AbilityKey, Object> runParams) {
sa.setTriggeringObjectsFrom(runParams, AbilityKey.Vehicle, AbilityKey.Crew);
}
@Override

6
forge-game/src/main/java/forge/game/trigger/TriggerCycled.java
View File

@@ -46,14 +46,14 @@ public class TriggerCycled extends Trigger {
* @param intrinsic
* a boolean
*/
public TriggerCycled(final java.util.Map<String, String> params, final Card host, final boolean intrinsic) {
public TriggerCycled(final Map<String, String> 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<AbilityKey, Object> runParams) {
sa.setTriggeringObjectsFrom(runParams, AbilityKey.Card);
}
@Override

10
forge-game/src/main/java/forge/game/trigger/TriggerDamageDealtOnce.java
View File

@@ -49,7 +49,7 @@ public class TriggerDamageDealtOnce extends Trigger {
* @param intrinsic
* the intrinsic
*/
public TriggerDamageDealtOnce(final java.util.Map<String, String> params, final Card host, final boolean intrinsic) {
public TriggerDamageDealtOnce(final Map<String, String> 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<AbilityKey, Object> runParams) {
sa.setTriggeringObjectsFrom(runParams, AbilityKey.DamageAmount);
sa.setTriggeringObject(AbilityKey.Source, runParams.get(AbilityKey.DamageSource));
sa.setTriggeringObject(AbilityKey.Targets, runParams.get(AbilityKey.DamageTargets));
}
@Override

10
forge-game/src/main/java/forge/game/trigger/TriggerDamageDone.java
View File

@@ -49,7 +49,7 @@ public class TriggerDamageDone extends Trigger {
* @param intrinsic
* the intrinsic
*/
public TriggerDamageDone(final java.util.Map<String, String> params, final Card host, final boolean intrinsic) {
public TriggerDamageDone(final Map<String, String> 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<AbilityKey, Object> 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

8
forge-game/src/main/java/forge/game/trigger/TriggerDamageDoneOnce.java
View File

@@ -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<AbilityKey, Object> runParams) {
sa.setTriggeringObject(AbilityKey.Target, runParams.get(AbilityKey.DamageTarget));
sa.setTriggeringObject(AbilityKey.Sources, runParams.get(AbilityKey.DamageSources));
sa.setTriggeringObjectsFrom(runParams, AbilityKey.DamageAmount);
}
@Override

10
forge-game/src/main/java/forge/game/trigger/TriggerDamagePrevented.java
View File

@@ -48,7 +48,7 @@ public class TriggerDamagePrevented extends Trigger {
* @param intrinsic
* the intrinsic
*/
public TriggerDamagePrevented(final java.util.Map<String, String> params, final Card host, final boolean intrinsic) {
public TriggerDamagePrevented(final Map<String, String> 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<AbilityKey, Object> 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

8
forge-game/src/main/java/forge/game/trigger/TriggerDamagePreventedOnce.java
View File

@@ -47,7 +47,7 @@ public class TriggerDamagePreventedOnce extends Trigger {
* @param intrinsic
* the intrinsic
*/
public TriggerDamagePreventedOnce(final java.util.Map<String, String> params, final Card host, final boolean intrinsic) {
public TriggerDamagePreventedOnce(final Map<String, String> 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<AbilityKey, Object> runParams) {
sa.setTriggeringObject(AbilityKey.Target, runParams.get(AbilityKey.DamageTarget));
sa.setTriggeringObjectsFrom(runParams, AbilityKey.DamageAmount);
}
@Override

4
forge-game/src/main/java/forge/game/trigger/TriggerDestroyed.java
View File

@@ -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<AbilityKey, Object> runParams) {
sa.setTriggeringObjectsFrom(runParams, AbilityKey.Card, AbilityKey.Causer);
}
@Override

6
forge-game/src/main/java/forge/game/trigger/TriggerDevoured.java
View File

@@ -46,7 +46,7 @@ public class TriggerDevoured extends Trigger {
* @param intrinsic
* the intrinsic
*/
public TriggerDevoured(final java.util.Map<String, String> params, final Card host, final boolean intrinsic) {
public TriggerDevoured(final Map<String, String> 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<AbilityKey, Object> runParams) {
sa.setTriggeringObjectsFrom(runParams, AbilityKey.Devoured);
}
@Override

6
forge-game/src/main/java/forge/game/trigger/TriggerDiscarded.java
View File

@@ -46,7 +46,7 @@ public class TriggerDiscarded extends Trigger {
* @param intrinsic
* the intrinsic
*/
public TriggerDiscarded(final java.util.Map<String, String> params, final Card host, final boolean intrinsic) {
public TriggerDiscarded(final Map<String, String> 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<AbilityKey, Object> runParams) {
sa.setTriggeringObjectsFrom(runParams, AbilityKey.Card, AbilityKey.Cause);
}
@Override

4
forge-game/src/main/java/forge/game/trigger/TriggerDrawn.java
View File

@@ -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<AbilityKey, Object> runParams) {
sa.setTriggeringObjectsFrom(runParams, AbilityKey.Card, AbilityKey.Player);
}
@Override

4
forge-game/src/main/java/forge/game/trigger/TriggerEvolved.java
View File

@@ -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<AbilityKey, Object> runParams) {
sa.setTriggeringObjectsFrom(runParams, AbilityKey.Card);
}
@Override

4
forge-game/src/main/java/forge/game/trigger/TriggerExerted.java
View File

@@ -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<AbilityKey, Object> runParams) {
sa.setTriggeringObjectsFrom(runParams, AbilityKey.Card, AbilityKey.Player);
}
@Override

4
forge-game/src/main/java/forge/game/trigger/TriggerExiled.java
View File

@@ -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<AbilityKey, Object> runParams) {
sa.setTriggeringObjectsFrom(runParams, AbilityKey.Card);
}
@Override

6
forge-game/src/main/java/forge/game/trigger/TriggerExploited.java
View File

@@ -47,7 +47,7 @@ public class TriggerExploited extends Trigger {
* @param intrinsic
* the intrinsic
*/
public TriggerExploited(final java.util.Map<String, String> params, final Card host, final boolean intrinsic) {
public TriggerExploited(final Map<String, String> 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<AbilityKey, Object> runParams) {
sa.setTriggeringObjectsFrom(runParams, AbilityKey.Exploited, AbilityKey.Card);
}
@Override

6
forge-game/src/main/java/forge/game/trigger/TriggerExplores.java
View File

@@ -45,7 +45,7 @@ public class TriggerExplores extends Trigger {
* @param intrinsic
* the intrinsic
*/
public TriggerExplores(final java.util.Map<String, String> params, final Card host, final boolean intrinsic) {
public TriggerExplores(final Map<String, String> 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<AbilityKey, Object> runParams) {
sa.setTriggeringObject(AbilityKey.Explorer, runParams.get(AbilityKey.Card));
}
@Override

8
forge-game/src/main/java/forge/game/trigger/TriggerFight.java
View File

@@ -47,7 +47,7 @@ public class TriggerFight extends Trigger {
* @param intrinsic
* the intrinsic
*/
public TriggerFight(final java.util.Map<String, String> params, final Card host, final boolean intrinsic) {
public TriggerFight(final Map<String, String> 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<AbilityKey, Object> runParams) {
sa.setTriggeringObjectsFrom(runParams, AbilityKey.Fighter);
}
@Override

6
forge-game/src/main/java/forge/game/trigger/TriggerFlippedCoin.java
View File

@@ -46,7 +46,7 @@ public class TriggerFlippedCoin extends Trigger {
* @param intrinsic
* the intrinsic
*/
public TriggerFlippedCoin(final java.util.Map<String, String> params, final Card host, final boolean intrinsic) {
public TriggerFlippedCoin(final Map<String, String> 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<AbilityKey, Object> runParams) {
sa.setTriggeringObjectsFrom(runParams, AbilityKey.Player);
}
@Override

28
forge-game/src/main/java/forge/game/trigger/TriggerHandler.java
View File

@@ -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<AbilityKey, Object> runParams) {
final Map<String, String> 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());

4
forge-game/src/main/java/forge/game/trigger/TriggerImmediate.java
View File

@@ -26,7 +26,7 @@ import java.util.Map;
public class TriggerImmediate extends Trigger {
public TriggerImmediate(final java.util.Map<String, String> params, final Card host, final boolean intrinsic) {
public TriggerImmediate(final Map<String, String> 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<AbilityKey, Object> runParams) {
}
@Override

6
forge-game/src/main/java/forge/game/trigger/TriggerInvestigated.java
View File

@@ -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<AbilityKey, Object> runParams) {
sa.setTriggeringObjectsFrom(runParams, AbilityKey.Player);
}
/** {@inheritDoc}
@@ -70,7 +70,7 @@ public class TriggerInvestigated extends Trigger {
public final boolean performTest(final Map<AbilityKey, Object> 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;
}
}

4
forge-game/src/main/java/forge/game/trigger/TriggerLandPlayed.java
View File

@@ -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<AbilityKey, Object> runParams) {
sa.setTriggeringObjectsFrom(runParams, AbilityKey.Card);
}
@Override

4
forge-game/src/main/java/forge/game/trigger/TriggerLifeGained.java
View File

@@ -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<AbilityKey, Object> runParams) {
sa.setTriggeringObjectsFrom(runParams, AbilityKey.LifeAmount, AbilityKey.Player);
}
@Override

4
forge-game/src/main/java/forge/game/trigger/TriggerLifeLost.java
View File

@@ -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<AbilityKey, Object> runParams) {
sa.setTriggeringObjectsFrom(runParams, AbilityKey.LifeAmount, AbilityKey.Player);
}
@Override

6
forge-game/src/main/java/forge/game/trigger/TriggerLosesGame.java
View File

@@ -24,7 +24,7 @@ public class TriggerLosesGame extends Trigger {
* @param intrinsic
* the intrinsic
*/
public TriggerLosesGame(final java.util.Map<String, String> params, final Card host, final boolean intrinsic) {
public TriggerLosesGame(final Map<String, String> 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<AbilityKey, Object> runParams) {
sa.setTriggeringObjectsFrom(runParams, AbilityKey.Player);
}
@Override

4
forge-game/src/main/java/forge/game/trigger/TriggerNewGame.java
View File

@@ -45,7 +45,7 @@ public class TriggerNewGame extends Trigger {
* @param intrinsic
* the intrinsic
*/
public TriggerNewGame(final java.util.Map<String, String> params, final Card host, final boolean intrinsic) {
public TriggerNewGame(final Map<String, String> 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<AbilityKey, Object> runParams) {
}
@Override

6
forge-game/src/main/java/forge/game/trigger/TriggerPayCumulativeUpkeep.java
View File

@@ -46,7 +46,7 @@ public class TriggerPayCumulativeUpkeep extends Trigger {
* @param intrinsic
* the intrinsic
*/
public TriggerPayCumulativeUpkeep(final java.util.Map<String, String> params, final Card host, final boolean intrinsic) {
public TriggerPayCumulativeUpkeep(final Map<String, String> 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<AbilityKey, Object> runParams) {
sa.setTriggeringObjectsFrom(runParams, AbilityKey.Card, AbilityKey.PayingMana);
}
@Override

6
forge-game/src/main/java/forge/game/trigger/TriggerPayEcho.java
View File

@@ -45,7 +45,7 @@ public class TriggerPayEcho extends Trigger {
* @param intrinsic
* the intrinsic
*/
public TriggerPayEcho(final java.util.Map<String, String> params, final Card host, final boolean intrinsic) {
public TriggerPayEcho(final Map<String, String> 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<AbilityKey, Object> runParams) {
sa.setTriggeringObjectsFrom(runParams, AbilityKey.Card);
}
@Override

4
forge-game/src/main/java/forge/game/trigger/TriggerPayLife.java
View File

@@ -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<AbilityKey, Object> runParams) {
sa.setTriggeringObjectsFrom(runParams, AbilityKey.LifeAmount, AbilityKey.Player);
}
@Override

6
forge-game/src/main/java/forge/game/trigger/TriggerPhase.java
View File

@@ -46,7 +46,7 @@ public class TriggerPhase extends Trigger {
* @param intrinsic
* the intrinsic
*/
public TriggerPhase(final java.util.Map<String, String> params, final Card host, final boolean intrinsic) {
public TriggerPhase(final Map<String, String> 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<AbilityKey, Object> runParams) {
sa.setTriggeringObjectsFrom(runParams, AbilityKey.Player);
}
@Override

4
forge-game/src/main/java/forge/game/trigger/TriggerPhaseIn.java
View File

@@ -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<AbilityKey, Object> runParams) {
sa.setTriggeringObjectsFrom(runParams, AbilityKey.Card);
}
@Override

4
forge-game/src/main/java/forge/game/trigger/TriggerPhaseOut.java
View File

@@ -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<AbilityKey, Object> runParams) {
sa.setTriggeringObjectsFrom(runParams, AbilityKey.Card);
}
@Override

9
forge-game/src/main/java/forge/game/trigger/TriggerPlanarDice.java
View File

@@ -26,7 +26,7 @@ public class TriggerPlanarDice extends Trigger {
* @param intrinsic
* the intrinsic
*/
public TriggerPlanarDice(final java.util.Map<String, String> params, final Card host, final boolean intrinsic) {
public TriggerPlanarDice(final Map<String, String> 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<AbilityKey, Object> runParams) {
sa.setTriggeringObjectsFrom(runParams, AbilityKey.Player);
}
@Override

7
forge-game/src/main/java/forge/game/trigger/TriggerPlaneswalkedFrom.java
View File

@@ -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<AbilityKey, Object> runParams) {
sa.setTriggeringObjectsFrom(runParams, AbilityKey.Cards);
}
@Override

7
forge-game/src/main/java/forge/game/trigger/TriggerPlaneswalkedTo.java
View File

@@ -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<AbilityKey, Object> runParams) {
sa.setTriggeringObjectsFrom(runParams, AbilityKey.Cards);
}
@Override

4
forge-game/src/main/java/forge/game/trigger/TriggerRegenerated.java
View File

@@ -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<AbilityKey, Object> runParams) {
sa.setTriggeringObjectsFrom(runParams, AbilityKey.Card, AbilityKey.Cause);
}
@Override

4
forge-game/src/main/java/forge/game/trigger/TriggerRevealed.java
View File

@@ -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<AbilityKey, Object> runParams) {
sa.setTriggeringObjectsFrom(runParams, AbilityKey.Card);
}
@Override

6
forge-game/src/main/java/forge/game/trigger/TriggerSacrificed.java
View File

@@ -49,7 +49,7 @@ public class TriggerSacrificed extends Trigger {
* @param intrinsic
* the intrinsic
*/
public TriggerSacrificed(final java.util.Map<String, String> params, final Card host, final boolean intrinsic) {
public TriggerSacrificed(final Map<String, String> 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<AbilityKey, Object> runParams) {
sa.setTriggeringObjectsFrom(runParams, AbilityKey.Card);
}
@Override

6
forge-game/src/main/java/forge/game/trigger/TriggerScry.java
View File

@@ -46,7 +46,7 @@ public class TriggerScry extends Trigger {
* @param intrinsic
* the intrinsic
*/
public TriggerScry(final java.util.Map<String, String> params, final Card host, final boolean intrinsic) {
public TriggerScry(final Map<String, String> 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<AbilityKey, Object> runParams) {
sa.setTriggeringObjectsFrom(runParams, AbilityKey.Player);
}
@Override

6
forge-game/src/main/java/forge/game/trigger/TriggerSearchedLibrary.java
View File

@@ -48,7 +48,7 @@ public class TriggerSearchedLibrary extends Trigger {
* @param intrinsic
* the intrinsic
*/
public TriggerSearchedLibrary(final java.util.Map<String, String> params, final Card host, final boolean intrinsic) {
public TriggerSearchedLibrary(final Map<String, String> 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<AbilityKey, Object> runParams) {
sa.setTriggeringObjectsFrom(runParams, AbilityKey.Player);
}
@Override

6
forge-game/src/main/java/forge/game/trigger/TriggerSetInMotion.java
View File

@@ -46,7 +46,7 @@ public class TriggerSetInMotion extends Trigger {
* @param intrinsic
* the intrinsic
*/
public TriggerSetInMotion(final java.util.Map<String, String> params, final Card host, final boolean intrinsic) {
public TriggerSetInMotion(final Map<String, String> 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<AbilityKey, Object> runParams) {
sa.setTriggeringObjectsFrom(runParams, AbilityKey.Scheme);
}
@Override

6
forge-game/src/main/java/forge/game/trigger/TriggerShuffled.java
View File

@@ -46,7 +46,7 @@ public class TriggerShuffled extends Trigger {
* @param intrinsic
* the intrinsic
*/
public TriggerShuffled(final java.util.Map<String, String> params, final Card host, final boolean intrinsic) {
public TriggerShuffled(final Map<String, String> 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<AbilityKey, Object> runParams) {
sa.setTriggeringObjectsFrom(runParams, AbilityKey.Player);
}
@Override

6
forge-game/src/main/java/forge/game/trigger/TriggerSpellAbilityCast.java
View File

@@ -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<AbilityKey, Object> 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,

4
forge-game/src/main/java/forge/game/trigger/TriggerSpellAbilityCopy.java
View File

@@ -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<AbilityKey, Object> 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);

4
forge-game/src/main/java/forge/game/trigger/TriggerSurveil.java
View File

@@ -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<AbilityKey, Object> runParams) {
sa.setTriggeringObjectsFrom(runParams, AbilityKey.Player);
}
/** {@inheritDoc}

4
forge-game/src/main/java/forge/game/trigger/TriggerTaps.java
View File

@@ -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<AbilityKey, Object> runParams) {
sa.setTriggeringObjectsFrom(runParams, AbilityKey.Card);
}
@Override

6
forge-game/src/main/java/forge/game/trigger/TriggerTapsForMana.java
View File

@@ -48,7 +48,7 @@ public class TriggerTapsForMana extends Trigger {
* @param intrinsic
* the intrinsic
*/
public TriggerTapsForMana(final java.util.Map<String, String> params, final Card host, final boolean intrinsic) {
public TriggerTapsForMana(final Map<String, String> 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<AbilityKey, Object> runParams) {
sa.setTriggeringObjectsFrom(runParams, AbilityKey.Card, AbilityKey.Player, AbilityKey.Produced);
}
@Override

8
forge-game/src/main/java/forge/game/trigger/TriggerTransformed.java
View File

@@ -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<AbilityKey, Object> runParams) {
sa.setTriggeringObjectsFrom(runParams, AbilityKey.Transformer);
}
@Override

6
forge-game/src/main/java/forge/game/trigger/TriggerTurnBegin.java
View File

@@ -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<String, String> params, final Card host, final boolean intrinsic) {
public TriggerTurnBegin(final Map<String, String> 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<AbilityKey, Object> runParams) {
sa.setTriggeringObjectsFrom(runParams, AbilityKey.Player);
}
@Override

6
forge-game/src/main/java/forge/game/trigger/TriggerTurnFaceUp.java
View File

@@ -46,7 +46,7 @@ public class TriggerTurnFaceUp extends Trigger {
* @param intrinsic
* the intrinsic
*/
public TriggerTurnFaceUp(final java.util.Map<String, String> params, final Card host, final boolean intrinsic) {
public TriggerTurnFaceUp(final Map<String, String> 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<AbilityKey, Object> runParams) {
sa.setTriggeringObjectsFrom(runParams, AbilityKey.Card);
}
@Override

6
forge-game/src/main/java/forge/game/trigger/TriggerUnattach.java
View File

@@ -46,7 +46,7 @@ public class TriggerUnattach extends Trigger {
* @param intrinsic
* the intrinsic
*/
public TriggerUnattach(final java.util.Map<String, String> params, final Card host, final boolean intrinsic) {
public TriggerUnattach(final Map<String, String> 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<AbilityKey, Object> runParams) {
sa.setTriggeringObjectsFrom(runParams, AbilityKey.Object, AbilityKey.Attach);
}
@Override

4
forge-game/src/main/java/forge/game/trigger/TriggerUntaps.java
View File

@@ -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<AbilityKey, Object> runParams) {
sa.setTriggeringObjectsFrom(runParams, AbilityKey.Card);
}
@Override

4
forge-game/src/main/java/forge/game/trigger/TriggerVote.java
View File

@@ -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<AbilityKey, Object> runParams) {
@SuppressWarnings("unchecked")
FCollection<Player> voters = getVoters(
this.getHostCard().getController(),
(ListMultimap<Object, Player>) getFromRunParams(AbilityKey.AllVotes),
(ListMultimap<Object, Player>) runParams.get(AbilityKey.AllVotes),
true,
true
);