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 
A more reliable check for Valid Targeting in damage chaining.

See merge request core-developers/forge!1221
This commit is contained in:
Michael Kamensky
2018-12-13 18:58:44 +00:00
parent cdd9c882fb 36154db24d
commit 92fc1b1061
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -28,6 +28,7 @@ import forge.util.MyRandom;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.tuple.Pair; import org.apache.commons.lang3.tuple.Pair;
import java.util.Arrays;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@@ -1070,15 +1071,16 @@ public class DamageDealAi extends DamageAiBase {
continue; continue;
} else if (tgtSa.canTgtPlaneswalker() && !tgtAb.canTgtPlaneswalker()) { } else if (tgtSa.canTgtPlaneswalker() && !tgtAb.canTgtPlaneswalker()) {
continue; continue;
} else if ((tgtSa.getSAValidTargeting() != null && tgtSa.getSAValidTargeting().contains("."))
|| (tgtAb.getSAValidTargeting() != null && tgtAb.getSAValidTargeting().contains("."))) {
if (!tgtAb.getSAValidTargeting().contains(tgtSa.getSAValidTargeting())) {
// if the targeting has additional conditions, make sure that the chained spell
// contains the same condition specifications (or at least these specs are a part
// of what SA can target, hopefully)
continue;
}
} }
// Check that "ab" has a ValidTgts specification that includes everything "sa" includes, or
// the AI can misplay
String[] validTgtsSa = sa.getTargetRestrictions().getValidTgts();
String[] validTgtsAb = ab.getTargetRestrictions().getValidTgts();
if (!Arrays.asList(validTgtsSa).containsAll(Arrays.asList(validTgtsAb))) {
continue;
}
// FIXME: should it also check restrictions for targeting players? // FIXME: should it also check restrictions for targeting players?
ManaCost costSa = sa.getPayCosts() != null ? sa.getPayCosts().getTotalMana() : ManaCost.NO_COST; ManaCost costSa = sa.getPayCosts() != null ? sa.getPayCosts().getTotalMana() : ManaCost.NO_COST;
ManaCost costAb = ab.getPayCosts().getTotalMana(); // checked for null above ManaCost costAb = ab.getPayCosts().getTotalMana(); // checked for null above