external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-20 20:58:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Improved AnimateAi.

Browse Source
This commit is contained in:
Sloth
2013-07-20 20:23:26 +00:00
parent b741c594e2
commit ab9092d53e
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
res/cardsfolder/p/planeswalkers_fury.txt
View File

@@ -5,5 +5,6 @@ A:AB$ Reveal | Cost$ 3 R | Random$ True | RememberRevealed$ True | ValidTgts$ Op
SVar:DBDamage:DB$ DealDamage | Defined$ Opponent | NumDmg$ X | References$ X | SubAbility$ DBCleanup
SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
SVar:X:Remembered$CardManaCost
SVar:RemAIDeck:True
SVar:Picture:http://www.wizards.com/global/images/magic/general/planeswalkers_fury.jpg
Oracle:{3}{R}: Target opponent reveals a card at random from his or her hand. Planeswalker's Fury deals damage equal to that card's converted mana cost to that player. Activate this ability only any time you could cast a sorcery.

11
src/main/java/forge/card/ability/ai/AnimateAi.java
View File

@@ -11,6 +11,7 @@ import forge.card.ability.SpellAbilityAi;
import forge.card.spellability.SpellAbility;
import forge.card.spellability.TargetRestrictions;
import forge.game.Game;
import forge.game.phase.PhaseHandler;
import forge.game.phase.PhaseType;
import forge.game.player.Player;
import forge.game.zone.ZoneType;
@@ -34,6 +35,7 @@ public class AnimateAi extends SpellAbilityAi {
final TargetRestrictions tgt = sa.getTargetRestrictions();
final Card source = sa.getSourceCard();
final Game game = aiPlayer.getGame();
final PhaseHandler ph = game.getPhaseHandler();
// TODO - add some kind of check to answer
// "Am I going to attack with this?"
@@ -42,8 +44,8 @@ public class AnimateAi extends SpellAbilityAi {
// don't use instant speed animate abilities outside computers
// Combat_Begin step
if (!game.getPhaseHandler().is(PhaseType.COMBAT_BEGIN)
&& game.getPhaseHandler().isPlayerTurn(aiPlayer)
if (!ph.is(PhaseType.COMBAT_BEGIN)
&& ph.isPlayerTurn(aiPlayer)
&& !SpellAbilityAi.isSorcerySpeed(sa)
&& !sa.hasParam("ActivationPhases") && !sa.hasParam("Permanent")) {
return false;
@@ -51,7 +53,7 @@ public class AnimateAi extends SpellAbilityAi {
Player opponent = aiPlayer.getWeakestOpponent();
// don't animate if the AI won't attack anyway
if (game.getPhaseHandler().isPlayerTurn(aiPlayer)
if (ph.isPlayerTurn(aiPlayer)
&& aiPlayer.getLife() < 6
&& opponent.getLife() > 6
&& Iterables.any(opponent.getCardsIn(ZoneType.Battlefield), CardPredicates.Presets.CREATURES)) {
@@ -60,7 +62,8 @@ public class AnimateAi extends SpellAbilityAi {
// don't use instant speed animate abilities outside humans
// Combat_Declare_Attackers_InstantAbility step
if (game.getPhaseHandler().is(PhaseType.COMBAT_DECLARE_ATTACKERS, opponent) && game.getCombat().getAttackers().isEmpty()) {
if (ph.getPlayerTurn().isOpponentOf(aiPlayer) &&
(!game.getPhaseHandler().is(PhaseType.COMBAT_DECLARE_ATTACKERS, opponent) || game.getCombat().getAttackersOf(aiPlayer).isEmpty())) {
return false;
}