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

Merge branch 'master' into 'master'

Browse Source 
DamageDealAi: fix a crash and logic error for cards like Expansion // Explosion, Chamber Sentry, etc.

See merge request core-developers/forge!1830
This commit is contained in:
Michael Kamensky
2019-06-11 12:20:12 +00:00
parent ee2733cd86 cfed38f4f1
commit 0fe0ca00bc
1 changed files with 2 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

@@ -276,7 +276,7 @@ public class DamageDealAi extends DamageAiBase {
final boolean noPrevention = sa.hasParam("NoPrevention"); final boolean noPrevention = sa.hasParam("NoPrevention");
for (final Card c : sa.getTargets().getTargetCards()) { for (final Card c : sa.getTargets().getTargetCards()) {
final int adjDamage = ComputerUtilCombat.getEnoughDamageToKill(c, dmg, source, false, noPrevention); final int adjDamage = ComputerUtilCombat.getEnoughDamageToKill(c, dmg, source, false, noPrevention);
if ((adjDamage > actualPay) && (adjDamage <= dmg)) { if (adjDamage < actualPay) {
actualPay = adjDamage; actualPay = adjDamage;
} }
} }
@@ -291,7 +291,7 @@ public class DamageDealAi extends DamageAiBase {
// Check to ensure that we have enough counters to remove per the defined PayX // Check to ensure that we have enough counters to remove per the defined PayX
for (CostPart part : sa.getPayCosts().getCostParts()) { for (CostPart part : sa.getPayCosts().getCostParts()) {
if (part instanceof CostRemoveCounter) { if (part instanceof CostRemoveCounter) {
if (source.getCounters(((CostRemoveCounter) part).counter) < Integer.valueOf(sa.getSVar("PayX"))) { if (source.getCounters(((CostRemoveCounter) part).counter) < Integer.valueOf(source.getSVar("PayX"))) {
return false; return false;
} }
break; break;