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

- Added Soul Sculptor

Browse Source
This commit is contained in:
swordshine
2014-05-31 12:01:11 +00:00
parent 7ae0860355
commit 084928b926
4 changed files with 40 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forge-game/src/main/java/forge/game/ability/effects/AnimateEffect.java
View File

@@ -299,6 +299,8 @@ public class AnimateEffect extends AnimateEffectBase {
}
} else if (sa.hasParam("UntilControllerNextUntap")) {
game.getUntap().addUntil(c.getController(), unanimate);
} else if (sa.hasParam("UntilAPlayerCastSpell")) {
game.getStack().addCastCommand(sa.getParam("UntilAPlayerCastSpell"), unanimate);
} else if (sa.hasParam("UntilYourNextTurn")) {
game.getCleanup().addUntil(source.getController(), unanimate);
} else {

29
forge-game/src/main/java/forge/game/zone/MagicStack.java
View File

@@ -19,6 +19,9 @@ package forge.game.zone;
import com.esotericsoftware.minlog.Log;
import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
import forge.GameCommand;
import forge.card.mana.ManaCost;
import forge.game.Game;
import forge.game.GameLogEntryType;
@@ -46,6 +49,7 @@ import forge.game.trigger.Trigger;
import forge.game.trigger.TriggerType;
import java.util.*;
import java.util.Map.Entry;
import java.util.concurrent.LinkedBlockingDeque;
@@ -71,6 +75,7 @@ public class MagicStack /* extends MyObservable */ implements Iterable<SpellAbil
private final List<Card> thisTurnCast = new ArrayList<Card>();
private List<Card> lastTurnCast = new ArrayList<Card>();
private Card curResolvingCard = null;
private final HashMap<String, List<GameCommand>> commandList = new HashMap<String, List<GameCommand>>();
private final Game game;
@@ -399,6 +404,7 @@ public class MagicStack /* extends MyObservable */ implements Iterable<SpellAbil
// Run SpellCast triggers
if (sp.isSpell()) {
game.getTriggerHandler().runTrigger(TriggerType.SpellCast, runParams, true);
this.executeCastCommand(si.getSpellAbility().getHostCard());
}
// Run AbilityCast triggers
@@ -859,6 +865,29 @@ public class MagicStack /* extends MyObservable */ implements Iterable<SpellAbil
return this.lastTurnCast;
}
public final void addCastCommand(final String valid, final GameCommand c) {
if (this.commandList.containsKey(valid)) {
this.commandList.get(valid).add(0, c);
} else {
this.commandList.put(valid, Lists.newArrayList(c));
}
}
private void executeCastCommand(final Card cast) {
for (Entry<String, List<GameCommand>> ev : this.commandList.entrySet()) {
if (cast.isType(ev.getKey())) {
this.execute(ev.getValue());
}
}
}
private void execute(final List<GameCommand> c) {
final int length = c.size();
for (int i = 0; i < length; i++) {
c.remove(0).run();
}
}
/**
* Checks if is resolving.
*