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

Fixed various Word of Command bugs, implemented mana pool restore methods

Browse source
This commit is contained in:
L_J 2018-06-04 14:30:37 +02:00 committed by GitHub
parent 9a5b574c0c
commit cb7c222eb9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 62 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Mage.Sets/src/mage/cards/w/WordOfCommand.java
View file

@ -4,11 +4,8 @@ import java.util.UUID;
import mage.MageObject;
import mage.MageObjectReference;
import mage.abilities.Ability;
import mage.abilities.DelayedTriggeredAbility;
import mage.abilities.effects.Effect;
import mage.abilities.effects.OneShotEffect;
import mage.abilities.effects.RestrictionEffect;
import mage.abilities.effects.common.LoseControlOnOtherPlayersControllerEffect;
import mage.cards.Card;
import mage.cards.CardImpl;
import mage.cards.CardSetInfo;
@ -18,8 +15,6 @@ import mage.constants.Outcome;
import mage.constants.Zone;
import mage.filter.FilterCard;
import mage.game.Game;
import mage.game.events.GameEvent;
import mage.game.events.ZoneChangeEvent;
import mage.game.permanent.Permanent;
import mage.game.stack.Spell;
import mage.players.ManaPool;
@ -101,6 +96,7 @@ class WordOfCommandEffect extends OneShotEffect {
// and only if mana they produce is spent to activate other mana abilities of lands he or she controls and/or play that card
ManaPool manaPool = targetPlayer.getManaPool();
manaPool.setForcedToPay(true);
manaPool.storeMana();
int bookmark = game.bookmarkState();
if ((card.isLand() && (!targetPlayer.canPlayLand() || !game.getActivePlayerId().equals(targetPlayer.getId())))
@ -127,7 +123,7 @@ class WordOfCommandEffect extends OneShotEffect {
}
}
Spell wordOfCommand = game.getSpell(sourceObject.getId());
Spell wordOfCommand = game.getSpell(source.getSourceId());
if (wordOfCommand != null) {
wordOfCommand.setCommandedBy(controller.getId()); // You control the player until Word of Command finishes resolving
} else {

6
Mage/src/main/java/mage/abilities/costs/mana/ManaCostsImpl.java
View file

@ -237,7 +237,8 @@ public class ManaCostsImpl<T extends ManaCost> extends ArrayList<T> implements M
@Override
public void assignPayment(Game game, Ability ability, ManaPool pool, Cost costToPay) {
if (!pool.isAutoPayment() && pool.getUnlockedManaType() == null) {
boolean wasUnlockedManaType = (pool.getUnlockedManaType() != null);
if (!pool.isAutoPayment() && !wasUnlockedManaType) {
// if auto payment is inactive and no mana type was clicked manually - do nothing
return;
}
@ -324,8 +325,10 @@ public class ManaCostsImpl<T extends ManaCost> extends ArrayList<T> implements M
}
// stop using mana of the clicked mana type
pool.lockManaType();
if (!wasUnlockedManaType) {
handleForcedToPayOnlyForCurrentPayment(game, pool, referenceCosts);
}
}
private void handleForcedToPayOnlyForCurrentPayment(Game game, ManaPool pool, ManaCosts referenceCosts) {
// for Word of Command
@ -336,6 +339,7 @@ public class ManaCostsImpl<T extends ManaCost> extends ArrayList<T> implements M
if (player != null) {
game.undo(playerId);
this.clearPaid();
player.getManaPool().restoreMana(pool.getPoolBookmark());
game.bookmarkState();
}
}

2
Mage/src/main/java/mage/game/Game.java
View file

@ -394,7 +394,7 @@ public interface Game extends MageItem, Serializable {
void playPriority(UUID activePlayerId, boolean resuming);
void resetControlAfterSpellResolve(Spell spell);
void resetControlAfterSpellResolve(UUID topId);
boolean endTurn(Ability source);

12
Mage/src/main/java/mage/game/GameImpl.java
View file

@ -1395,13 +1395,8 @@ public abstract class GameImpl implements Game, Serializable {
StackObject top = null;
try {
top = state.getStack().peek();
Spell topSpell = getSpell(top.getId());
if (topSpell != null) {
top.resolve(this);
resetControlAfterSpellResolve(topSpell);
} else {
top.resolve(this);
}
resetControlAfterSpellResolve(top.getId());
} finally {
if (top != null) {
state.getStack().remove(top, this); // seems partly redundant because move card from stack to grave is already done and the stack removed
@ -1417,8 +1412,10 @@ public abstract class GameImpl implements Game, Serializable {
}
@Override
public void resetControlAfterSpellResolve(Spell spell) {
public void resetControlAfterSpellResolve(UUID topId) {
// for Word of Command
Spell spell = getSpellOrLKIStack(topId);
if (spell != null) {
if (spell.getCommandedBy() != null) {
UUID commandedBy = spell.getCommandedBy();
UUID spellControllerId = null;
@ -1440,6 +1437,7 @@ public abstract class GameImpl implements Game, Serializable {
}
}
}
}
/**
* This checks if the stack gets filled iterated, without ever getting empty

9
Mage/src/main/java/mage/game/stack/SpellStack.java
View file

@ -36,17 +36,12 @@ public class SpellStack extends ArrayDeque<StackObject> {
StackObject top = null;
try {
top = this.peek();
Spell topSpell = getSpell(top.getId());
if (topSpell != null) {
top.resolve(game);
game.resetControlAfterSpellResolve(topSpell);
} else {
top.resolve(game);
}
game.resetControlAfterSpellResolve(top.getId());
} finally {
if (top != null) {
if (contains(top)) {
logger.warn("StackObject was still on the stack after resoving" + top.getName());
logger.warn("StackObject was still on the stack after resolving" + top.getName());
this.remove(top, game);
}
}

28
Mage/src/main/java/mage/players/ManaPool.java
View file

@ -36,6 +36,7 @@ public class ManaPool implements Serializable {
private boolean autoPaymentRestricted; // auto payment from mana pool: true - if auto Payment is on, it will only pay if one kind of mana is in the pool
private ManaType unlockedManaType; // type of mana that was selected to pay manually
private boolean forcedToPay; // for Word of Command
private final List<ManaPoolItem> poolBookmark = new ArrayList<>(); // mana pool bookmark for rollback purposes
private final Set<ManaType> doNotEmptyManaTypes = new HashSet<>();
@ -56,6 +57,9 @@ public class ManaPool implements Serializable {
this.autoPaymentRestricted = pool.autoPaymentRestricted;
this.unlockedManaType = pool.unlockedManaType;
this.forcedToPay = pool.forcedToPay;
for (ManaPoolItem item : pool.poolBookmark) {
poolBookmark.add(item.copy());
}
this.doNotEmptyManaTypes.addAll(pool.doNotEmptyManaTypes);
}
@ -503,4 +507,28 @@ public class ManaPool implements Serializable {
public UUID getPlayerId() {
return playerId;
}
public void storeMana() {
poolBookmark.clear();
poolBookmark.addAll(getManaItems());
}
public List<ManaPoolItem> getPoolBookmark() {
List<ManaPoolItem> itemsCopy = new ArrayList<>();
for (ManaPoolItem manaItem : poolBookmark) {
itemsCopy.add(manaItem.copy());
}
return itemsCopy;
}
public void restoreMana(List<ManaPoolItem> manaList) {
manaItems.clear();
if (!manaList.isEmpty()) {
List<ManaPoolItem> itemsCopy = new ArrayList<>();
for (ManaPoolItem manaItem : manaList) {
itemsCopy.add(manaItem.copy());
}
manaItems.addAll(itemsCopy);
}
}
}