External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2026-01-09 12:22:10 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

* StormAbility - Fixed that the storm amount was not calculated correctly if a game state was restored (fixes #1051).

Browse source
This commit is contained in:
LevelX2 2015-07-16 11:05:32 +02:00
parent fa58de0772
commit 68d5f7bb9f
4 changed files with 143 additions and 75 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Mage/src/mage/abilities/keyword/ForecastAbility.java
View file

@ -70,6 +70,7 @@ public class ForecastAbility extends LimitedTimesPerTurnActivatedAbility {
@Override
public boolean canActivate(UUID playerId, Game game) {
// May be activated only during the upkeep step of the card's owner
// Because it can only be activated from a players hand it should be ok to check here with controllerId instead of card.getOwnerId().
if (!game.getActivePlayerId().equals(controllerId) || !PhaseStep.UPKEEP.equals(game.getStep().getType())) {
return false;
}

5
Mage/src/mage/game/Game.java
View file

@ -154,6 +154,11 @@ public interface Game extends MageItem, Serializable {
boolean canPlaySorcery(UUID playerId);
/**
* Id of the player the current turn it is.
*
* @return
*/
UUID getActivePlayerId();
UUID getPriorityPlayerId();

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

@ -1,31 +1,30 @@
/*
* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without modification, are
* permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice, this list of
* conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright notice, this list
* of conditions and the following disclaimer in the documentation and/or other materials
* provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* The views and conclusions contained in the software and documentation are those of the
* authors and should not be interpreted as representing official policies, either expressed
* or implied, of BetaSteward_at_googlemail.com.
*/
* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without modification, are
* permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice, this list of
* conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright notice, this list
* of conditions and the following disclaimer in the documentation and/or other materials
* provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* The views and conclusions contained in the software and documentation are those of the
* authors and should not be interpreted as representing official policies, either expressed
* or implied, of BetaSteward_at_googlemail.com.
*/
package mage.watchers.common;
import java.util.ArrayList;
@ -41,9 +40,9 @@ import mage.game.events.GameEvent;
import mage.watchers.Watcher;
/**
*
* @author nantuko, BetaSteward_at_googlemail.com
*/
*
* @author nantuko, BetaSteward_at_googlemail.com
*/
public class CastSpellLastTurnWatcher extends Watcher {
private final Map<UUID, Integer> amountOfSpellsCastOnPrevTurn = new HashMap<>();
@ -51,83 +50,84 @@ public class CastSpellLastTurnWatcher extends Watcher {
private final List<MageObjectReference> spellsCastThisTurnInOrder = new ArrayList<>();
public CastSpellLastTurnWatcher() {
super("CastSpellLastTurnWatcher", WatcherScope.GAME);
super("CastSpellLastTurnWatcher", WatcherScope.GAME);
}
public CastSpellLastTurnWatcher(final CastSpellLastTurnWatcher watcher) {
super(watcher);
for (Entry<UUID, Integer> entry: watcher.amountOfSpellsCastOnCurrentTurn.entrySet()) {
amountOfSpellsCastOnCurrentTurn.put(entry.getKey(), entry.getValue());
}
for (Entry<UUID, Integer> entry: watcher.amountOfSpellsCastOnPrevTurn.entrySet()) {
amountOfSpellsCastOnPrevTurn.put(entry.getKey(), entry.getValue());
}
super(watcher);
for (Entry<UUID, Integer> entry : watcher.amountOfSpellsCastOnCurrentTurn.entrySet()) {
amountOfSpellsCastOnCurrentTurn.put(entry.getKey(), entry.getValue());
}
for (Entry<UUID, Integer> entry : watcher.amountOfSpellsCastOnPrevTurn.entrySet()) {
amountOfSpellsCastOnPrevTurn.put(entry.getKey(), entry.getValue());
}
this.spellsCastThisTurnInOrder.addAll(watcher.spellsCastThisTurnInOrder);
}
@Override
public void watch(GameEvent event, Game game) {
if (event.getType() == GameEvent.EventType.SPELL_CAST) {
spellsCastThisTurnInOrder.add(new MageObjectReference(event.getTargetId(), game));
UUID playerId = event.getPlayerId();
if (playerId != null) {
Integer amount = amountOfSpellsCastOnCurrentTurn.get(playerId);
if (amount == null) {
amount = 1;
} else {
amount = amount+1;
}
amountOfSpellsCastOnCurrentTurn.put(playerId, amount);
}
}
if (event.getType() == GameEvent.EventType.SPELL_CAST) {
spellsCastThisTurnInOrder.add(new MageObjectReference(event.getTargetId(), game));
UUID playerId = event.getPlayerId();
if (playerId != null) {
Integer amount = amountOfSpellsCastOnCurrentTurn.get(playerId);
if (amount == null) {
amount = 1;
} else {
amount = amount + 1;
}
amountOfSpellsCastOnCurrentTurn.put(playerId, amount);
}
}
}
@Override
public void reset() {
amountOfSpellsCastOnPrevTurn.clear();
amountOfSpellsCastOnPrevTurn.putAll(amountOfSpellsCastOnCurrentTurn);
amountOfSpellsCastOnCurrentTurn.clear();
spellsCastThisTurnInOrder.clear();
amountOfSpellsCastOnPrevTurn.clear();
amountOfSpellsCastOnPrevTurn.putAll(amountOfSpellsCastOnCurrentTurn);
amountOfSpellsCastOnCurrentTurn.clear();
spellsCastThisTurnInOrder.clear();
}
public Map<UUID, Integer> getAmountOfSpellsCastOnPrevTurn() {
return amountOfSpellsCastOnPrevTurn;
return amountOfSpellsCastOnPrevTurn;
}
public Map<UUID, Integer> getAmountOfSpellsCastOnCurrentTurn() {
return amountOfSpellsCastOnCurrentTurn;
return amountOfSpellsCastOnCurrentTurn;
}
public int getAmountOfSpellsAllPlayersCastOnCurrentTurn() {
int totalAmount = 0;
for(Integer amount: amountOfSpellsCastOnCurrentTurn.values()) {
for (Integer amount : amountOfSpellsCastOnCurrentTurn.values()) {
totalAmount += amount;
}
return totalAmount;
}
public int getAmountOfSpellsPlayerCastOnCurrentTurn(UUID playerId) {
Integer value = amountOfSpellsCastOnCurrentTurn.get(playerId);
if (value != null) {
return value;
} else {
return 0;
}
Integer value = amountOfSpellsCastOnCurrentTurn.get(playerId);
if (value != null) {
return value;
} else {
return 0;
}
}
public int getSpellOrder(MageObjectReference spell, Game game) {
int index = 0;
for (MageObjectReference mor : spellsCastThisTurnInOrder) {
index++;
if (mor.equals(spell)) {
return index;
}
}
return 0;
int index = 0;
for (MageObjectReference mor : spellsCastThisTurnInOrder) {
index++;
if (mor.equals(spell)) {
return index;
}
}
return 0;
}
@Override
public CastSpellLastTurnWatcher copy() {
return new CastSpellLastTurnWatcher(this);
return new CastSpellLastTurnWatcher(this);
}
}