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

Merge branch 'master' into 'master'

Browse Source 
Improve logic for grantsUsefulExtraBlockOpts, fix an issue with AI spam-activating pump abilities when low on life.

See merge request core-developers/forge!2964
This commit is contained in:
Michael Kamensky
2020-07-05 12:43:12 +00:00
parent b2ee13cadc fc8922e271
commit e402df9010
2 changed files with 30 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forge-ai/src/main/java/forge/ai/ability/PumpAi.java
View File

@@ -388,7 +388,7 @@ public class PumpAi extends PumpAiBase {
} }
return true; return true;
} else if (grantsUsefulExtraBlockOpts(ai, card)) { } else if (grantsUsefulExtraBlockOpts(ai, sa, card, keywords)) {
return true; return true;
} }
} }

31
forge-ai/src/main/java/forge/ai/ability/PumpAiBase.java
View File

@@ -9,6 +9,7 @@ import forge.ai.ComputerUtilCombat;
import forge.ai.SpellAbilityAi; import forge.ai.SpellAbilityAi;
import forge.card.MagicColor; import forge.card.MagicColor;
import forge.game.Game; import forge.game.Game;
import forge.game.ability.AbilityUtils;
import forge.game.card.*; import forge.game.card.*;
import forge.game.combat.Combat; import forge.game.combat.Combat;
import forge.game.combat.CombatUtil; import forge.game.combat.CombatUtil;
@@ -37,22 +38,48 @@ public abstract class PumpAiBase extends SpellAbilityAi {
} }
public boolean grantsUsefulExtraBlockOpts(final Player ai, final Card card) { public boolean grantsUsefulExtraBlockOpts(final Player ai, final SpellAbility sa, final Card card, List<String> keywords) {
PhaseHandler ph = ai.getGame().getPhaseHandler(); PhaseHandler ph = ai.getGame().getPhaseHandler();
Card pumped = ComputerUtilCard.getPumpedCreature(ai, sa, card, 0, 0, keywords);
ai.getGame().getAction().checkStaticAbilities(false);
if (ph.isPlayerTurn(ai) || !ph.getPhase().equals(PhaseType.COMBAT_DECLARE_ATTACKERS)) { if (ph.isPlayerTurn(ai) || !ph.getPhase().equals(PhaseType.COMBAT_DECLARE_ATTACKERS)) {
return false; return false;
} }
int canBlockNum = 1 + card.canBlockAdditional(); int canBlockNum = 1 + card.canBlockAdditional();
int canBlockNumPumped = canBlockNum; // PumpedCreature doesn't return a meaningful value of canBlockAdditional, so we'll use sa params below
if (sa.hasParam("CanBlockAny")) {
canBlockNumPumped = Integer.MAX_VALUE;
} else if (sa.hasParam("CanBlockAmount")) {
canBlockNumPumped += AbilityUtils.calculateAmount(pumped, sa.getParam("CanBlockAmount"), sa);
}
int possibleBlockNum = 0; int possibleBlockNum = 0;
int possibleBlockNumPumped = 0;
for (Card attacker : ai.getGame().getCombat().getAttackers()) { for (Card attacker : ai.getGame().getCombat().getAttackers()) {
if (CombatUtil.canBlock(attacker, card)) { if (CombatUtil.canBlock(attacker, card)) {
possibleBlockNum++; possibleBlockNum++;
if (possibleBlockNum > canBlockNum) { if (possibleBlockNum > canBlockNum) {
possibleBlockNum = canBlockNum;
break; break;
} }
} }
} }
return possibleBlockNum > canBlockNum; for (Card attacker : ai.getGame().getCombat().getAttackers()) {
if (CombatUtil.canBlock(attacker, pumped)) {
possibleBlockNumPumped++;
if (possibleBlockNumPumped > canBlockNumPumped) {
possibleBlockNumPumped = canBlockNumPumped;
break;
}
}
}
return possibleBlockNumPumped > possibleBlockNum;
} }
/** /**