github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-12-25 03:00:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

* Storm - Fixed a bug that the number of copies for storm were calculated wrong if a card was cast multiple times in one turn (e.g. by Yawgmoth's Will).

Browse source
This commit is contained in:
LevelX2 2015-03-05 18:01:56 +01:00
parent 10657683af
commit 794c7c7d49
2 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
Mage/src/mage/abilities/keyword/StormAbility.java
View file

@ -102,12 +102,16 @@ class StormEffect extends OneShotEffect {
if (spell != null) {
CastSpellLastTurnWatcher watcher = (CastSpellLastTurnWatcher) game.getState().getWatchers().get("CastSpellLastTurnWatcher");
for (int i = 0; i < watcher.getSpellOrder(spell) - 1; i++) {
Spell copy = spell.copySpell();
copy.setControllerId(source.getControllerId());
copy.setCopiedSpell(true);
game.getStack().push(copy);
copy.chooseNewTargets(game, source.getControllerId());
int stormCount = watcher.getSpellOrder(spell) - 1;
if (stormCount > 0) {
game.informPlayers("Storm: " + spell.getName() + " will be copied " + stormCount + " time" + (stormCount > 1 ?"s":""));
for (int i = 0; i < stormCount; i++) {
Spell copy = spell.copySpell();
copy.setControllerId(source.getControllerId());
copy.setCopiedSpell(true);
game.getStack().push(copy);
copy.chooseNewTargets(game, source.getControllerId());
}
}
return true;
}

9
Mage/src/mage/watchers/common/CastSpellLastTurnWatcher.java
View file

@ -34,6 +34,7 @@ import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.UUID;
import mage.MageObjectReference;
import mage.constants.WatcherScope;
import mage.game.Game;
import mage.game.events.GameEvent;
@ -48,7 +49,7 @@ public class CastSpellLastTurnWatcher extends Watcher {
private final Map<UUID, Integer> amountOfSpellsCastOnPrevTurn = new HashMap<>();
private final Map<UUID, Integer> amountOfSpellsCastOnCurrentTurn = new HashMap<>();
private final List<UUID> spellsCastThisTurnInOrder = new ArrayList<>();
private final List<MageObjectReference> spellsCastThisTurnInOrder = new ArrayList<>();
public CastSpellLastTurnWatcher() {
super("CastSpellLastTurnWatcher", WatcherScope.GAME);
@ -67,7 +68,7 @@ public class CastSpellLastTurnWatcher extends Watcher {
@Override
public void watch(GameEvent event, Game game) {
if (event.getType() == GameEvent.EventType.SPELL_CAST) {
spellsCastThisTurnInOrder.add(event.getTargetId());
spellsCastThisTurnInOrder.add(new MageObjectReference(event.getSourceId(), game));
UUID playerId = event.getPlayerId();
if (playerId != null) {
Integer amount = amountOfSpellsCastOnCurrentTurn.get(playerId);
@ -116,9 +117,9 @@ public class CastSpellLastTurnWatcher extends Watcher {
public int getSpellOrder(Spell spell) {
int index = 0;
for (UUID uuid : spellsCastThisTurnInOrder) {
for (MageObjectReference mor : spellsCastThisTurnInOrder) {
index++;
if (spell.getId().equals(uuid)) {
if (mor.refersTo(spell)) {
return index;
}
}