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

Merge branch 'aicombat' into 'master'

Browse Source 
Fix predictToughnessBonusOfAttacker logic

See merge request core-developers/forge!5653
This commit is contained in:
Michael Kamensky
2021-10-25 12:52:22 +00:00
parent 6ae88ea82b f0f6592a38
commit f9d933c6bd
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forge-ai/src/main/java/forge/ai/AiAttackController.java
View File

@@ -208,7 +208,7 @@ public class AiAttackController {
*/ */
public final boolean isEffectiveAttacker(final Player ai, final Card attacker, final Combat combat, final GameEntity defender) { public final boolean isEffectiveAttacker(final Player ai, final Card attacker, final Combat combat, final GameEntity defender) {
// if the attacker will die when attacking don't attack // if the attacker will die when attacking don't attack
if ((attacker.getNetToughness() + ComputerUtilCombat.predictToughnessBonusOfAttacker(attacker, null, combat, true)) <= 0) { if (attacker.getNetToughness() + ComputerUtilCombat.predictToughnessBonusOfAttacker(attacker, null, combat, true) <= 0) {
return false; return false;
} }

2
forge-ai/src/main/java/forge/ai/ComputerUtilCombat.java
View File

@@ -1478,7 +1478,7 @@ public class ComputerUtilCombat {
// DealDamage triggers // DealDamage triggers
if (ApiType.DealDamage.equals(sa.getApi())) { if (ApiType.DealDamage.equals(sa.getApi())) {
if ("TriggeredAttacker".equals(sa.getParam("Defined"))) { if (!sa.hasParam("Defined") || !sa.getParam("Defined").startsWith("TriggeredAttacker")) {
continue; continue;
} }
int damage = AbilityUtils.calculateAmount(source, sa.getParam("NumDmg"), sa); int damage = AbilityUtils.calculateAmount(source, sa.getParam("NumDmg"), sa);