- Fix triggers from using the trigger variables to using the SA variables, which are more correct with multiple simultaneous triggers

This commit is contained in:
Sol
2015-10-16 01:53:32 +00:00
parent bddbd365d8
commit 962597e816
51 changed files with 69 additions and 69 deletions

View File

@@ -79,7 +79,7 @@ public class TriggerAttached extends Trigger {
@Override
public String getImportantStackObjects(SpellAbility sa) {
StringBuilder sb = new StringBuilder();
sb.append("Attachee: ").append(this.getRunParams().get("AttachTarget"));
sb.append("Attachee: ").append(sa.getTriggeringObject("Target"));
return sb.toString();
}
}

View File

@@ -86,8 +86,8 @@ public class TriggerAttackerBlocked extends Trigger {
@Override
public String getImportantStackObjects(SpellAbility sa) {
StringBuilder sb = new StringBuilder();
sb.append("Attacker: ").append(this.getRunParams().get("Attacker"));
sb.append(" Number Blockers: ").append(this.getRunParams().get("NumBlockers"));
sb.append("Attacker: ").append(sa.getTriggeringObject("Attacker")).append(", ");
sb.append("Number Blockers: ").append(sa.getTriggeringObject("NumBlockers"));
return sb.toString();
}
}

View File

@@ -94,8 +94,8 @@ public class TriggerAttackerBlockedByCreature extends Trigger {
@Override
public String getImportantStackObjects(SpellAbility sa) {
StringBuilder sb = new StringBuilder();
sb.append("Attacker: ").append(this.getRunParams().get("Attacker"));
sb.append(", Blocker: ").append(this.getRunParams().get("Blocker"));
sb.append("Attacker: ").append(sa.getTriggeringObject("Attacker")).append(", ");
sb.append("Blocker: ").append(sa.getTriggeringObject("Blocker"));
return sb.toString();
}
}

View File

@@ -77,7 +77,7 @@ public class TriggerAttackerUnblocked extends Trigger {
@Override
public String getImportantStackObjects(SpellAbility sa) {
StringBuilder sb = new StringBuilder();
sb.append("Attacker: ").append(this.getRunParams().get("Attacker"));
sb.append("Attacker: ").append(sa.getTriggeringObject("Attacker"));
return sb.toString();
}
}

View File

@@ -80,7 +80,7 @@ public class TriggerAttackersDeclared extends Trigger {
@Override
public String getImportantStackObjects(SpellAbility sa) {
StringBuilder sb = new StringBuilder();
sb.append("Number Attackers: ").append(this.getRunParams().get("Attackers"));
sb.append("Number Attackers: ").append(sa.getTriggeringObject("Attackers"));
return sb.toString();
}
}

View File

@@ -68,7 +68,7 @@ public class TriggerBecomeMonstrous extends Trigger {
@Override
public String getImportantStackObjects(SpellAbility sa) {
StringBuilder sb = new StringBuilder();
sb.append("Monstrosity: ").append(this.getRunParams().get("Card"));
sb.append("Monstrous: ").append(sa.getTriggeringObject("Card"));
return sb.toString();
}
}

View File

@@ -68,7 +68,7 @@ public class TriggerBecomeRenowned extends Trigger {
@Override
public String getImportantStackObjects(SpellAbility sa) {
StringBuilder sb = new StringBuilder();
sb.append("Renowned: ").append(this.getRunParams().get("Card"));
sb.append("Renowned: ").append(sa.getTriggeringObject("Card"));
return sb.toString();
}
}

View File

@@ -96,8 +96,8 @@ public class TriggerBecomesTarget extends Trigger {
@Override
public String getImportantStackObjects(SpellAbility sa) {
StringBuilder sb = new StringBuilder();
sb.append("Source: ").append(((SpellAbility) this.getRunParams().get("SourceSA")).getHostCard()).append(", ");
sb.append("Target: ").append(this.getRunParams().get("Target"));
sb.append("Source: ").append(((SpellAbility) sa.getTriggeringObject("SourceSA")).getHostCard()).append(", ");
sb.append("Target: ").append(sa.getTriggeringObject("Target"));
return sb.toString();
}
}

View File

@@ -58,7 +58,7 @@ public class TriggerBlockersDeclared extends Trigger {
@Override
public String getImportantStackObjects(SpellAbility sa) {
StringBuilder sb = new StringBuilder();
sb.append("Blockers: ").append(this.getRunParams().get("Blockers"));
sb.append("Blockers: ").append(sa.getTriggeringObject("Blockers"));
return sb.toString();
}
}

View File

@@ -95,7 +95,7 @@ public class TriggerBlocks extends Trigger {
@Override
public String getImportantStackObjects(SpellAbility sa) {
StringBuilder sb = new StringBuilder();
sb.append("Blocker: ").append(this.getRunParams().get("Blocker"));
sb.append("Blocker: ").append(sa.getTriggeringObject("Blocker"));
return sb.toString();
}
}

View File

@@ -78,7 +78,7 @@ public class TriggerChampioned extends Trigger {
@Override
public String getImportantStackObjects(SpellAbility sa) {
StringBuilder sb = new StringBuilder();
sb.append("Championed: ").append(this.getRunParams().get("Championed"));
sb.append("Championed: ").append(sa.getTriggeringObject("Championed"));
return sb.toString();
}
}

View File

@@ -76,7 +76,7 @@ public class TriggerChangesController extends Trigger {
@Override
public String getImportantStackObjects(SpellAbility sa) {
StringBuilder sb = new StringBuilder();
sb.append("Changed Controller: ").append(this.getRunParams().get("Card"));
sb.append("Changed Controller: ").append(sa.getTriggeringObject("Card"));
return sb.toString();
}
}

View File

@@ -87,8 +87,8 @@ public class TriggerCombatDamageDoneOnce extends Trigger {
@Override
public String getImportantStackObjects(SpellAbility sa) {
StringBuilder sb = new StringBuilder();
sb.append("Sources: ").append(this.getRunParams().get("DamageSources")).append(", ");
sb.append("Target: ").append(this.getRunParams().get("DamageTarget"));
sb.append("Sources: ").append(sa.getTriggeringObject("Sources")).append(", ");
sb.append("Target: ").append(sa.getTriggeringObject("Target"));
return sb.toString();
}
}

View File

@@ -79,7 +79,7 @@ public class TriggerCounterAdded extends Trigger {
@Override
public String getImportantStackObjects(SpellAbility sa) {
StringBuilder sb = new StringBuilder();
sb.append("Added to: ").append(this.getRunParams().get("Card"));
sb.append("Added to: ").append(sa.getTriggeringObject("Card"));
return sb.toString();
}
}

View File

@@ -79,7 +79,7 @@ public class TriggerCounterAddedOnce extends Trigger {
@Override
public String getImportantStackObjects(SpellAbility sa) {
StringBuilder sb = new StringBuilder();
sb.append("Added once: ").append(this.getRunParams().get("Card"));
sb.append("Added once: ").append(sa.getTriggeringObject("Card"));
return sb.toString();
}
}

View File

@@ -88,7 +88,7 @@ public class TriggerCounterRemoved extends Trigger {
@Override
public String getImportantStackObjects(SpellAbility sa) {
StringBuilder sb = new StringBuilder();
sb.append("Removed to: ").append(this.getRunParams().get("Card"));
sb.append("Removed from: ").append(sa.getTriggeringObject("Card"));
return sb.toString();
}
}

View File

@@ -86,8 +86,8 @@ public class TriggerCountered extends Trigger {
@Override
public String getImportantStackObjects(SpellAbility sa) {
StringBuilder sb = new StringBuilder();
sb.append("Countered: ").append(this.getRunParams().get("Card")).append(", ");
sb.append("Cause: ").append(this.getRunParams().get("Cause"));
sb.append("Countered: ").append(sa.getTriggeringObject("Card")).append(", ");
sb.append("Cause: ").append(sa.getTriggeringObject("Cause"));
return sb.toString();
}
}

View File

@@ -55,7 +55,7 @@ public class TriggerCycled extends Trigger {
@Override
public String getImportantStackObjects(SpellAbility sa) {
StringBuilder sb = new StringBuilder();
sb.append("Cycled: ").append(this.getRunParams().get("Card"));
sb.append("Cycled: ").append(sa.getTriggeringObject("Card"));
return sb.toString();
}

View File

@@ -111,9 +111,9 @@ public class TriggerDamageDone extends Trigger {
@Override
public String getImportantStackObjects(SpellAbility sa) {
StringBuilder sb = new StringBuilder();
sb.append("Damage Source: ").append(this.getRunParams().get("DamageSource")).append(", ");
sb.append("Damaged: ").append(this.getRunParams().get("DamageTarget")).append(", ");
sb.append("Amount: ").append(this.getRunParams().get("DamageAmount"));
sb.append("Damage Source: ").append(sa.getTriggeringObject("Source")).append(", ");
sb.append("Damaged: ").append(sa.getTriggeringObject("Target")).append(", ");
sb.append("Amount: ").append(sa.getTriggeringObject("DamageAmount"));
return sb.toString();
}
}

View File

@@ -106,9 +106,9 @@ public class TriggerDealtCombatDamageOnce extends Trigger {
@Override
public String getImportantStackObjects(SpellAbility sa) {
StringBuilder sb = new StringBuilder();
sb.append("Damage Source: ").append(this.getRunParams().get("DamageSource")).append(", ");
sb.append("Damaged: ").append(this.getRunParams().get("DamageTargets")).append(", ");
sb.append("Amount: ").append(this.getRunParams().get("DamageAmount"));
sb.append("Damage Source: ").append(sa.getTriggeringObject("Source")).append(", ");
sb.append("Damaged: ").append(sa.getTriggeringObject("Targets")).append(", ");
sb.append("Amount: ").append(sa.getTriggeringObject("Amount"));
return sb.toString();
}
}

View File

@@ -74,8 +74,8 @@ public class TriggerDestroyed extends Trigger {
@Override
public String getImportantStackObjects(SpellAbility sa) {
StringBuilder sb = new StringBuilder();
sb.append("Destroyed: ").append(this.getRunParams().get("Card")).append(", ");
sb.append("Destroyer: ").append(this.getRunParams().get("Causer"));
sb.append("Destroyed: ").append(sa.getTriggeringObject("Card")).append(", ");
sb.append("Destroyer: ").append(sa.getTriggeringObject("Causer"));
return sb.toString();
}
}

View File

@@ -68,7 +68,7 @@ public class TriggerDevoured extends Trigger {
@Override
public String getImportantStackObjects(SpellAbility sa) {
StringBuilder sb = new StringBuilder();
sb.append("Devoured: ").append(this.getRunParams().get("Devoured"));
sb.append("Devoured: ").append(sa.getTriggeringObject("Devoured"));
return sb.toString();
}
}

View File

@@ -92,8 +92,8 @@ public class TriggerDiscarded extends Trigger {
@Override
public String getImportantStackObjects(SpellAbility sa) {
StringBuilder sb = new StringBuilder();
sb.append("Discarded: ").append(this.getRunParams().get("Card")).append(", ");
sb.append("Cause: ").append(this.getRunParams().get("Cause"));
sb.append("Discarded: ").append(sa.getTriggeringObject("Card")).append(", ");
sb.append("Cause: ").append(sa.getTriggeringObject("Cause"));
return sb.toString();
}
}

View File

@@ -77,7 +77,7 @@ public class TriggerDrawn extends Trigger {
@Override
public String getImportantStackObjects(SpellAbility sa) {
StringBuilder sb = new StringBuilder();
sb.append("Player: ").append(this.getRunParams().get("Player"));
sb.append("Player: ").append(sa.getTriggeringObject("Player"));
return sb.toString();
}
}

View File

@@ -68,7 +68,7 @@ public class TriggerEvolved extends Trigger {
@Override
public String getImportantStackObjects(SpellAbility sa) {
StringBuilder sb = new StringBuilder();
sb.append("Evolved: ").append(this.getRunParams().get("Card"));
sb.append("Evolved: ").append(sa.getTriggeringObject("Card"));
return sb.toString();
}
}

View File

@@ -78,8 +78,8 @@ public class TriggerExploited extends Trigger {
@Override
public String getImportantStackObjects(SpellAbility sa) {
StringBuilder sb = new StringBuilder();
sb.append("Exploited: ").append(this.getRunParams().get("Exploited")).append(", ");
sb.append("Exploiter: ").append(this.getRunParams().get("Card"));
sb.append("Exploited: ").append(sa.getTriggeringObject("Exploited")).append(", ");
sb.append("Exploiter: ").append(sa.getTriggeringObject("Card"));
return sb.toString();
}
}

View File

@@ -70,7 +70,7 @@ public class TriggerFight extends Trigger {
@Override
public String getImportantStackObjects(SpellAbility sa) {
StringBuilder sb = new StringBuilder();
sb.append("Fighter: ").append(this.getRunParams().get("Fighter"));
sb.append("Fighter: ").append(sa.getTriggeringObject("Fighter"));
return sb.toString();
}
}

View File

@@ -75,7 +75,7 @@ public class TriggerFlippedCoin extends Trigger {
@Override
public String getImportantStackObjects(SpellAbility sa) {
StringBuilder sb = new StringBuilder();
sb.append("Player: ").append(this.getRunParams().get("Player"));
sb.append("Player: ").append(sa.getTriggeringObject("Player"));
return sb.toString();
}
}

View File

@@ -57,7 +57,7 @@ public class TriggerLandPlayed extends Trigger {
@Override
public String getImportantStackObjects(SpellAbility sa) {
StringBuilder sb = new StringBuilder();
sb.append("Land played: ").append(this.getRunParams().get("Card"));
sb.append("Land played: ").append(sa.getTriggeringObject("Card"));
return sb.toString();
}

View File

@@ -70,8 +70,8 @@ public class TriggerLifeGained extends Trigger {
@Override
public String getImportantStackObjects(SpellAbility sa) {
StringBuilder sb = new StringBuilder();
sb.append("Player: ").append(this.getRunParams().get("Player")).append(", ");
sb.append("Gained Amount: ").append(this.getRunParams().get("LifeAmount"));
sb.append("Player: ").append(sa.getTriggeringObject("Player")).append(", ");
sb.append("Gained Amount: ").append(sa.getTriggeringObject("LifeAmount"));
return sb.toString();
}
}

View File

@@ -69,8 +69,8 @@ public class TriggerLifeLost extends Trigger {
@Override
public String getImportantStackObjects(SpellAbility sa) {
StringBuilder sb = new StringBuilder();
sb.append("Player: ").append(this.getRunParams().get("Player")).append(", ");
sb.append("Lost Amount: ").append(this.getRunParams().get("LifeAmount"));
sb.append("Player: ").append(sa.getTriggeringObject("Player")).append(", ");
sb.append("Lost Amount: ").append(sa.getTriggeringObject("LifeAmount"));
return sb.toString();
}
}

View File

@@ -46,7 +46,7 @@ public class TriggerLosesGame extends Trigger {
@Override
public String getImportantStackObjects(SpellAbility sa) {
StringBuilder sb = new StringBuilder();
sb.append("Player: ").append(this.getRunParams().get("Player"));
sb.append("Player: ").append(sa.getTriggeringObject("Player"));
return sb.toString();
}
}

View File

@@ -76,7 +76,7 @@ public class TriggerPayCumulativeUpkeep extends Trigger {
@Override
public String getImportantStackObjects(SpellAbility sa) {
StringBuilder sb = new StringBuilder();
sb.append("Mana: ").append(this.getRunParams().get("PayingMana"));
sb.append("Mana: ").append(sa.getTriggeringObject("PayingMana"));
return sb.toString();
}
}

View File

@@ -35,7 +35,7 @@ public class TriggerPhaseIn extends Trigger {
@Override
public String getImportantStackObjects(SpellAbility sa) {
StringBuilder sb = new StringBuilder();
sb.append("Phased In: ").append(this.getRunParams().get("Card"));
sb.append("Phased In: ").append(sa.getTriggeringObject("Card"));
return sb.toString();
}
}

View File

@@ -41,7 +41,7 @@ public class TriggerPhaseOut extends Trigger {
@Override
public String getImportantStackObjects(SpellAbility sa) {
StringBuilder sb = new StringBuilder();
sb.append("Phased Out: ").append(this.getRunParams().get("Card"));
sb.append("Phased Out: ").append(sa.getTriggeringObject("Card"));
return sb.toString();
}
}

View File

@@ -61,7 +61,7 @@ public class TriggerPlanarDice extends Trigger {
@Override
public String getImportantStackObjects(SpellAbility sa) {
StringBuilder sb = new StringBuilder();
sb.append("Roller: ").append(this.getRunParams().get("Player"));
sb.append("Roller: ").append(sa.getTriggeringObject("Player"));
return sb.toString();
}
}

View File

@@ -58,7 +58,7 @@ public class TriggerPlaneswalkedFrom extends Trigger {
@Override
public String getImportantStackObjects(SpellAbility sa) {
StringBuilder sb = new StringBuilder();
sb.append("Planeswalked From: ").append(this.getRunParams().get("Cards"));
sb.append("Planeswalked From: ").append(sa.getTriggeringObject("Cards"));
return sb.toString();
}

View File

@@ -58,7 +58,7 @@ public class TriggerPlaneswalkedTo extends Trigger {
@Override
public String getImportantStackObjects(SpellAbility sa) {
StringBuilder sb = new StringBuilder();
sb.append("Planeswalked To: ").append(this.getRunParams().get("Cards"));
sb.append("Planeswalked To: ").append(sa.getTriggeringObject("Cards"));
return sb.toString();
}
}

View File

@@ -82,7 +82,7 @@ public class TriggerSacrificed extends Trigger {
@Override
public String getImportantStackObjects(SpellAbility sa) {
StringBuilder sb = new StringBuilder();
sb.append("Sacrificed: ").append(this.getRunParams().get("Card"));
sb.append("Sacrificed: ").append(sa.getTriggeringObject("Card"));
return sb.toString();
}

View File

@@ -69,7 +69,7 @@ public class TriggerScry extends Trigger {
@Override
public String getImportantStackObjects(SpellAbility sa) {
StringBuilder sb = new StringBuilder();
sb.append("Scryer: ").append(this.getRunParams().get("Player"));
sb.append("Scryer: ").append(sa.getTriggeringObject("Player"));
return sb.toString();
}
}

View File

@@ -79,7 +79,7 @@ public class TriggerSearchedLibrary extends Trigger {
@Override
public String getImportantStackObjects(SpellAbility sa) {
StringBuilder sb = new StringBuilder();
sb.append("Searcher: ").append(this.getRunParams().get("Player"));
sb.append("Searcher: ").append(sa.getTriggeringObject("Player"));
return sb.toString();
}
}

View File

@@ -79,7 +79,7 @@ public class TriggerShuffled extends Trigger {
@Override
public String getImportantStackObjects(SpellAbility sa) {
StringBuilder sb = new StringBuilder();
sb.append("Shuffler: ").append(this.getRunParams().get("Player"));
sb.append("Shuffler: ").append(sa.getTriggeringObject("Player"));
return sb.toString();
}
}

View File

@@ -244,9 +244,9 @@ public class TriggerSpellAbilityCast extends Trigger {
@Override
public String getImportantStackObjects(SpellAbility sa) {
StringBuilder sb = new StringBuilder();
sb.append("Card: ").append(this.getRunParams().get("Card")).append(", ");
sb.append("Activator: ").append(this.getRunParams().get("Activator")).append(", ");
sb.append("SpellAbility: ").append(this.getRunParams().get("SpellAbility"));
sb.append("Card: ").append(sa.getTriggeringObject("Card")).append(", ");
sb.append("Activator: ").append(sa.getTriggeringObject("Activator")).append(", ");
sb.append("SpellAbility: ").append(sa.getTriggeringObject("SpellAbility"));
return sb.toString();
}
}

View File

@@ -73,7 +73,7 @@ public class TriggerTaps extends Trigger {
@Override
public String getImportantStackObjects(SpellAbility sa) {
StringBuilder sb = new StringBuilder();
sb.append("Tapped: ").append(this.getRunParams().get("Card"));
sb.append("Tapped: ").append(sa.getTriggeringObject("Card"));
return sb.toString();
}

View File

@@ -112,8 +112,8 @@ public class TriggerTapsForMana extends Trigger {
@Override
public String getImportantStackObjects(SpellAbility sa) {
StringBuilder sb = new StringBuilder();
sb.append("Tapped for Mana: ").append(this.getRunParams().get("Card"));
sb.append("Produced: ").append(this.getRunParams().get("Produced"));
sb.append("Tapped for Mana: ").append(sa.getTriggeringObject("Card"));
sb.append("Produced: ").append(sa.getTriggeringObject("Produced"));
return sb.toString();
}

View File

@@ -66,7 +66,7 @@ public class TriggerTransformed extends Trigger {
@Override
public String getImportantStackObjects(SpellAbility sa) {
StringBuilder sb = new StringBuilder();
sb.append("Transformed: ").append(this.getRunParams().get("Transformer"));
sb.append("Transformed: ").append(sa.getTriggeringObject("Transformer"));
return sb.toString();
}

View File

@@ -28,7 +28,7 @@ public class TriggerTurnBegin extends Trigger {
@Override
public String getImportantStackObjects(SpellAbility sa) {
StringBuilder sb = new StringBuilder();
sb.append("Player: ").append(this.getRunParams().get("Player"));
sb.append("Player: ").append(sa.getTriggeringObject("Player"));
return sb.toString();
}
}

View File

@@ -68,7 +68,7 @@ public class TriggerTurnFaceUp extends Trigger {
@Override
public String getImportantStackObjects(SpellAbility sa) {
StringBuilder sb = new StringBuilder();
sb.append("Turn Face up: ").append(this.getRunParams().get("Card"));
sb.append("Turn Face up: ").append(sa.getTriggeringObject("Card"));
return sb.toString();
}

View File

@@ -79,8 +79,8 @@ public class TriggerUnequip extends Trigger {
@Override
public String getImportantStackObjects(SpellAbility sa) {
StringBuilder sb = new StringBuilder();
sb.append("Equippee: ").append(this.getRunParams().get("Card")).append(", ");
sb.append("Equipment: ").append(this.getRunParams().get("Equipment"));
sb.append("Equippee: ").append(sa.getTriggeringObject("Card")).append(", ");
sb.append("Equipment: ").append(sa.getTriggeringObject("Equipment"));
return sb.toString();
}

View File

@@ -72,7 +72,7 @@ public class TriggerUntaps extends Trigger {
@Override
public String getImportantStackObjects(SpellAbility sa) {
StringBuilder sb = new StringBuilder();
sb.append("Untapped: ").append(this.getRunParams().get("Card"));
sb.append("Untapped: ").append(sa.getTriggeringObject("Card"));
return sb.toString();
}
}

View File

@@ -71,7 +71,7 @@ public class TriggerVote extends Trigger {
@Override
public String getImportantStackObjects(SpellAbility sa) {
StringBuilder sb = new StringBuilder();
sb.append("Voters: ").append(this.getRunParams().get("OtherVoters"));
sb.append("Voters: ").append(sa.getTriggeringObject("OtherVoters"));
return sb.toString();
}