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

[Simulated AI] Fix a bug in my previous changes.

Browse Source 
resetTargets() needs to be called before tgt.getAllCandidates() so that the currently-set target is also considered.
This commit is contained in:
Myrd
2016-12-27 20:24:18 +00:00
parent 2a6ab7ec26
commit 0cd378b442
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
forge-ai/src/main/java/forge/ai/simulation/PossibleTargetSelector.java
View File

@@ -30,7 +30,7 @@ public class PossibleTargetSelector {
final int originalTargetCount;
final int targetIndex;
final String description;
private Targets(int targetingSaIndex, int originalTargetCount, int targetIndex, String description) {
this.targetingSaIndex = targetingSaIndex;
this.originalTargetCount = originalTargetCount;
@@ -41,7 +41,7 @@ public class PossibleTargetSelector {
throw new IllegalArgumentException("Invalid targetIndex=" + targetIndex);
}
}
@Override
public String toString() {
return description;
@@ -60,6 +60,8 @@ public class PossibleTargetSelector {
if (targetingSa == null) {
return;
}
sa.setActivatingPlayer(player);
targetingSa.resetTargets();
tgt = targetingSa.getTargetRestrictions();
maxTargets = tgt.getMaxTargets(sa.getHostCard(), targetingSa);
@@ -70,8 +72,6 @@ public class PossibleTargetSelector {
}
validTargets.add(o);
}
targetingSa.resetTargets();
sa.setActivatingPlayer(player);
}
private static class SimilarTargetSkipper {
@@ -88,7 +88,7 @@ public class PossibleTargetSelector {
} else {
creatureScores = new HashMap<Card, Integer>();
}
int score = ComputerUtilCard.evaluateCreature(c);
creatureScores.put(c, score);
return score;
@@ -192,12 +192,14 @@ public class PossibleTargetSelector {
public boolean selectTargets(Targets targets) {
if (targets.originalTargetCount != validTargets.size() || targets.targetingSaIndex != targetingSaIndex) {
System.err.println("SA: "+sa + " tSA: " + targetingSa);
System.err.println(targets.originalTargetCount + " vs. " + validTargets.size() + " - " + targets.targetingSaIndex + " vs. " + targetingSaIndex);
return false;
}
selectTargetsByIndex(targets.targetIndex);
return true;
}
public boolean selectNextTargets() {
if (targetIndex >= validTargets.size()) {
return false;