github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2025-04-09 09:11:05 -09:00
Code Issues Projects Releases Packages Wiki Activity

* Fixed that spells without mana costs but suspend could be cast with no mana (e.g. Ancestral Vision).

Browse source
This commit is contained in:
LevelX2 2015-10-21 20:16:52 +02:00
parent 511fb37838
commit 4629366ae7
2 changed files with 35 additions and 1 deletions
Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords
SuspendTest.java
Mage/src/mage/players
PlayerImpl.java

16
Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/SuspendTest.java
View file

@ -147,4 +147,20 @@ public class SuspendTest extends CardTestPlayerBase {
assertCounterOnExiledCardCount("Deep-Sea Kraken", CounterType.TIME, 8); // -1 from spell of player B
}
@Test
public void testAncestralVisionCantBeCastDirectly() {
// Suspend 4-{U}
// Target player draws three cards.
addCard(Zone.HAND, playerA, "Ancestral Vision", 1);
castSpell(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Ancestral Vision", playerA);
setStopAt(1, PhaseStep.BEGIN_COMBAT);
execute();
assertHandCount(playerA, 1);
assertHandCount(playerA, "Ancestral Vision", 1);
}
}

20
Mage/src/mage/players/PlayerImpl.java
View file

@ -1217,11 +1217,15 @@ public abstract class PlayerImpl implements Player, Serializable {
public LinkedHashMap<UUID, ActivatedAbility> getUseableActivatedAbilities(MageObject object, Zone zone, Game game) {
LinkedHashMap<UUID, ActivatedAbility> useable = new LinkedHashMap<>();
boolean canUse = !(object instanceof Permanent) || ((Permanent) object).canUseActivatedAbilities(game);
ManaOptions availableMana = null;
// ManaOptions availableMana = getManaAvailable(game); // can only be activated if mana calculation works flawless otherwise player can't play spells they could play if calculation would work correctly
// availableMana.addMana(manaPool.getMana());
for (Ability ability : object.getAbilities()) {
if (canUse || ability.getAbilityType().equals(AbilityType.SPECIAL_ACTION)) {
if (ability.getZone().match(zone)) {
if (ability instanceof ActivatedAbility) {
if (((ActivatedAbility) ability).canActivate(playerId, game)) {
if (canPlay(((ActivatedAbility) ability), availableMana, object, game)) {
// if (((ActivatedAbility) ability).canActivate(playerId, game)) {
useable.put(ability.getId(), (ActivatedAbility) ability);
}
} else if (ability instanceof AlternativeSourceCosts) {
@ -2297,6 +2301,14 @@ public abstract class PlayerImpl implements Player, Serializable {
return result;
}
/**
*
* @param ability
* @param available if null, it won't be checked if enough mana is available
* @param sourceObject
* @param game
* @return
*/
protected boolean canPlay(ActivatedAbility ability, ManaOptions available, MageObject sourceObject, Game game) {
if (!(ability instanceof ManaAbility)) {
ActivatedAbility copy = ability.copy();
@ -2329,6 +2341,9 @@ public abstract class PlayerImpl implements Player, Serializable {
if (abilityOptions.size() == 0) {
return true;
} else {
if (available == null) {
return true;
}
for (Mana mana : abilityOptions) {
for (Mana avail : available) {
if (mana.enough(avail)) {
@ -2377,6 +2392,9 @@ public abstract class PlayerImpl implements Player, Serializable {
if (manaCosts.size() == 0) {
return true;
} else {
if (available == null) {
return true;
}
for (Mana mana : manaCosts.getOptions()) {
for (Mana avail : available) {
if (mana.enough(avail)) {