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

- AI improvements in AF Tap.

Browse Source
This commit is contained in:
Sloth
2012-07-05 11:26:22 +00:00
parent 6c76d7117e
commit 359a329222
1 changed files with 24 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/main/java/forge/card/abilityfactory/AbilityFactoryPermanentState.java
View File

@@ -36,6 +36,7 @@ import forge.card.spellability.AbilitySub;
import forge.card.spellability.Spell; import forge.card.spellability.Spell;
import forge.card.spellability.SpellAbility; import forge.card.spellability.SpellAbility;
import forge.card.spellability.Target; import forge.card.spellability.Target;
import forge.game.phase.CombatUtil;
import forge.game.phase.PhaseHandler; import forge.game.phase.PhaseHandler;
import forge.game.phase.PhaseType; import forge.game.phase.PhaseType;
import forge.game.player.ComputerUtil; import forge.game.player.ComputerUtil;
@@ -861,9 +862,9 @@ public class AbilityFactoryPermanentState {
final PhaseHandler phase = Singletons.getModel().getGameState().getPhaseHandler(); final PhaseHandler phase = Singletons.getModel().getGameState().getPhaseHandler();
final Player turn = phase.getPlayerTurn(); final Player turn = phase.getPlayerTurn();
if (turn.isHuman()) { if (turn.isHuman() && phase.getPhase().isBefore(PhaseType.COMBAT_DECLARE_ATTACKERS)) {
// Tap things down if it's Human's turn // Tap things down if it's Human's turn
} else if (phase.inCombat() && phase.getPhase().isBefore(PhaseType.COMBAT_DECLARE_BLOCKERS)) { } else if (turn.isComputer() && phase.getPhase().isBefore(PhaseType.COMBAT_DECLARE_BLOCKERS)) {
// Tap creatures down if in combat -- handled in tapPrefTargeting(). // Tap creatures down if in combat -- handled in tapPrefTargeting().
} else if (source.isSorcery()) { } else if (source.isSorcery()) {
// Cast it if it's a sorcery. // Cast it if it's a sorcery.
@@ -1023,13 +1024,28 @@ public class AbilityFactoryPermanentState {
} }
PhaseHandler phase = Singletons.getModel().getGameState().getPhaseHandler(); PhaseHandler phase = Singletons.getModel().getGameState().getPhaseHandler();
if (phase.inCombat() && phase.getPhase().isBefore(PhaseType.COMBAT_DECLARE_BLOCKERS)) { if (phase.isPlayerTurn(AllZone.getComputerPlayer())
// Tap creatures if in combat during AI's turn. && phase.getPhase().isBefore(PhaseType.COMBAT_DECLARE_BLOCKERS)) {
CardList creatureList = tapList.filter(CardListFilter.CREATURES); // Tap creatures possible blockers before combat during AI's turn.
CardList creatureList = tapList.filter(new CardListFilter() {
@Override
public boolean addCard(final Card c) {
return CombatUtil.canBlock(c);
}
});
if (!AllZone.getCombat().getAttackers().isEmpty() || !ComputerUtil.getPossibleAttackers().isEmpty()) {
choice = CardFactoryUtil.getBestCreatureAI(creatureList);
}
} else if (phase.isPlayerTurn(AllZone.getHumanPlayer())
&& phase.getPhase().isBefore(PhaseType.COMBAT_DECLARE_ATTACKERS)) {
// Tap creatures possible blockers before combat during AI's turn.
CardList creatureList = tapList.filter(new CardListFilter() {
@Override
public boolean addCard(final Card c) {
return CombatUtil.canAttack(c);
}
});
choice = CardFactoryUtil.getBestCreatureAI(creatureList); choice = CardFactoryUtil.getBestCreatureAI(creatureList);
} else if (tapList.getNotType("Creature").size() == 0) {
// if only creatures take the best
choice = CardFactoryUtil.getBestCreatureAI(tapList);
} else { } else {
choice = CardFactoryUtil.getMostExpensivePermanentAI(tapList, sa, false); choice = CardFactoryUtil.getMostExpensivePermanentAI(tapList, sa, false);
} }