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

Improve AI for Sorin, Vengeful Broodlord and similar + Fix Roiling Vortex AI logic (#3932)

Browse Source 
* - DamageDealAi: allow beneficial PW abilities (e.g. Sorin, Vengeful Broodlord).

* - Better place for the logic

* - Fix AI logic for Roiling Vortex and similar.

* - Simpler implementation
This commit is contained in:
Agetian
2023-10-21 07:33:27 +03:00
committed by GitHub
parent a2c7eeae86
commit ba69a03868
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
forge-ai/src/main/java/forge/ai/ability/DamageDealAi.java
View File

@@ -15,6 +15,7 @@ import forge.game.ability.ApiType;
import forge.game.card.*;
import forge.game.cost.Cost;
import forge.game.cost.CostPartMana;
import forge.game.cost.CostPutCounter;
import forge.game.keyword.Keyword;
import forge.game.phase.PhaseHandler;
import forge.game.phase.PhaseType;
@@ -735,7 +736,8 @@ public class DamageDealAi extends DamageAiBase {
|| (isSorcerySpeed(sa, ai) && phase.is(PhaseType.MAIN2))
|| immediately) {
boolean pingAfterAttack = "PingAfterAttack".equals(logic) && phase.getPhase().isAfter(PhaseType.COMBAT_DECLARE_ATTACKERS) && phase.isPlayerTurn(ai);
if ((pingAfterAttack && !avoidTargetP(ai, sa)) || shouldTgtP(ai, sa, dmg, noPrevention)) {
boolean isPWAbility = sa.isPwAbility() && sa.getPayCosts().hasSpecificCostType(CostPutCounter.class);
if (isPWAbility || (pingAfterAttack && !avoidTargetP(ai, sa)) || shouldTgtP(ai, sa, dmg, noPrevention)) {
tcs.add(enemy);
if (divided) {
sa.addDividedAllocation(enemy, dmg);

3
forge-ai/src/main/java/forge/ai/ability/EffectAi.java
View File

@@ -212,7 +212,8 @@ public class EffectAi extends SpellAbilityAi {
return false;
}
final SpellAbility topStack = game.getStack().peekAbility();
return topStack.getActivatingPlayer().isOpponentOf(ai) && topStack.getApi() == ApiType.GainLife;
final Player tgtPlayer = topStack.getActivatingPlayer();
return tgtPlayer.isOpponentOf(ai) && tgtPlayer.canGainLife() && topStack.getApi() == ApiType.GainLife;
} else if (logic.equals("Fight")) {
return FightAi.canFightAi(ai, sa, 0, 0);
} else if (logic.equals("Pump")) {