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

- Experimental: fixed state triggers so they will trigger during the middle of the resolution of a spell or ability. (e.g. Cloudshift an Enchantment creature would fire Tethered Griffin's trigger)

Browse Source
This commit is contained in:
swordshine
2014-02-25 05:46:33 +00:00
parent 48f53491c6
commit 31e5b0d4c0
5 changed files with 24 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
forge-game/src/main/java/forge/game/GameAction.java
View File

@@ -763,6 +763,9 @@ public class GameAction {
game.fireEvent(new GameEventCardStatsChanged(affectedCards));
}
final HashMap<String, Object> runParams = new HashMap<String, Object>();
game.getTriggerHandler().runTrigger(TriggerType.Always, runParams, false);
}
/**
@@ -802,9 +805,6 @@ public class GameAction {
this.checkStaticAbilities();
final HashMap<String, Object> runParams = new HashMap<String, Object>();
game.getTriggerHandler().runTrigger(TriggerType.Always, runParams, false);
for (Player p : game.getPlayers()) {
for (Card c : p.getCardsIn(ZoneType.Battlefield)) {
if (!c.getController().equals(p)) { // should not be here

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

@@ -155,8 +155,9 @@ public class TriggerHandler {
}
//runWaitingTrigger(new TriggerWaiting(mode, runParams));
if (game.getStack().isFrozen() || holdTrigger) {
if (mode == TriggerType.Always) {
runStateTrigger(runParams);
} else if (game.getStack().isFrozen() || holdTrigger) {
waitingTriggers.add(new TriggerWaiting(mode, runParams));
} else {
runWaitingTrigger(new TriggerWaiting(mode, runParams));
@@ -164,6 +165,21 @@ public class TriggerHandler {
// Tell auto stop to stop
}
public final boolean runStateTrigger(Map<String, Object> runParams) {
boolean checkStatics = false;
// only cards in play can run state triggers
List<Card> allCards = new ArrayList<Card>(game.getCardsIn(ZoneType.listValueOf("Battlefield,Command")));
for (final Card c : allCards) {
for (final Trigger t : c.getTriggers()) {
if (canRunTrigger(t, TriggerType.Always, runParams)) {
this.runSingleTrigger(t, runParams);
checkStatics = true;
}
}
}
return checkStatics;
}
public final boolean runWaitingTriggers() {
ArrayList<TriggerWaiting> waiting = new ArrayList<TriggerWaiting>(waitingTriggers);
waitingTriggers.clear();