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

- Fix logic in DamageDealAi, update logic for Chandra, Fire of Kaladesh.

Browse Source
This commit is contained in:
Agetian
2018-06-22 12:04:08 +03:00
parent 7dc6573513
commit bd7da33e77
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -491,6 +491,10 @@ public class DamageDealAi extends DamageAiBase {
sa.getTargets().add(enemy);
}
return true;
} else if ("PingAfterCombat".equals(sa.getParam("AILogic"))) {
if (this.shouldTgtP(ai, sa, dmg, noPrevention)) {
}
}
if (tgt.getMaxTargets(source, sa) <= 0) {
@@ -657,7 +661,7 @@ public class DamageDealAi extends DamageAiBase {
}
}
} else if (tgt.canTgtCreature() || tgt.canTgtPlaneswalker()) {
} else if (tgt.canTgtCreature()) {
final Card c = this.dealDamageChooseTgtC(ai, sa, dmg, noPrevention, enemy, mandatory);
if (c != null) {
//option to hold removal instead only applies for single targeted removal
@@ -693,6 +697,7 @@ public class DamageDealAi extends DamageAiBase {
else if (sa.canTarget(enemy)) {
if (((phase.is(PhaseType.END_OF_TURN) && phase.getNextTurn().equals(ai))
|| (SpellAbilityAi.isSorcerySpeed(sa) && phase.is(PhaseType.MAIN2))
|| ("PingAfterAttack".equals(sa.getParam("AILogic")) && phase.getPhase().isAfter(PhaseType.COMBAT_DECLARE_ATTACKERS))
|| sa.getPayCosts() == null || immediately
|| this.shouldTgtP(ai, sa, dmg, noPrevention)) &&
(!avoidTargetP(ai, sa))) {