Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

Changes related to Cascade ability (#7583):

Browse source 
* Cascade: added correct spell ability choose for forced cast of mdf and adventure cards (can contains one or both sides);
* Cascade: added tests from latest oracle changes;
* AI: improved spell ability choose for forced cast (example: cast target card without mana cost);
* GUI: improved spell ability choose for forced cast (now you can see only castable spells to choose);
* Other: fixed wrong PlayFromNotOwnHandZone in some cards, fixed NPE;
This commit is contained in:
Oleg Agafonov 2021-02-23 02:00:38 +04:00
parent 0c65a6fb7e
commit 91f4d78992
12 changed files with 178 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

22
Mage/src/main/java/mage/players/PlayerImpl.java
View file

@ -1519,14 +1519,26 @@ public abstract class PlayerImpl implements Player, Serializable {
return false;
}
/**
* Return spells for possible cast
* Uses in GUI to show only playable spells for choosing from the card
* (example: effect allow to cast card and player must choose the spell ability)
*
* @param playerId
* @param object
* @param zone
* @param game
* @return
*/
public static LinkedHashMap<UUID, ActivatedAbility> getSpellAbilities(UUID playerId, MageObject object, Zone zone, Game game) {
// it uses simple check from spellCanBeActivatedRegularlyNow
// reason: no approved info here (e.g. forced to choose spell ability from cast card)
LinkedHashMap<UUID, ActivatedAbility> useable = new LinkedHashMap<>();
for (Ability ability : object.getAbilities()) {
if (ability instanceof SpellAbility) {
switch (((SpellAbility) ability).getSpellAbilityType()) {
case BASE_ALTERNATE:
ActivationStatus as = ((SpellAbility) ability).canActivate(playerId, game);
if (as.canActivate()) {
if (((SpellAbility) ability).spellCanBeActivatedRegularlyNow(playerId, game)) {
useable.put(ability.getId(), (SpellAbility) ability); // example: Chandra, Torch of Defiance +1 loyal ability
}
return useable;
@ -1560,7 +1572,9 @@ public abstract class PlayerImpl implements Player, Serializable {
}
return useable;
default:
useable.put(ability.getId(), (SpellAbility) ability);
if (((SpellAbility) ability).spellCanBeActivatedRegularlyNow(playerId, game)) {
useable.put(ability.getId(), (SpellAbility) ability);
}
}
}
}
@ -2713,7 +2727,9 @@ public abstract class PlayerImpl implements Player, Serializable {
// casting selected card
// TODO: fix costs (why is Panglacial Wurm automatically accepting payment?)
game.getState().setValue("PlayFromNotOwnHandZone" + card.getId(), Boolean.TRUE);
targetPlayer.cast(targetPlayer.chooseAbilityForCast(card, game, false), game, false, null);
game.getState().setValue("PlayFromNotOwnHandZone" + card.getId(), null);
castableCards.remove(card.getId());
casted = true;
}