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

[Simulated AI] Don't de-dupe creatures involved in combat when evaluating potential targets.

Browse Source 
Makes an exception if two identical creatures are attacking the same entity and haven't been blocked yet.
This commit is contained in:
Myrd
2017-02-27 00:05:31 +00:00
parent 0527f4cb44
commit 8311daada4
2 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -10,6 +10,7 @@ import forge.ai.ComputerUtilCard;
import forge.game.GameObject;
import forge.game.ability.AbilityUtils;
import forge.game.card.Card;
import forge.game.combat.Combat;
import forge.game.player.Player;
import forge.game.spellability.SpellAbility;
import forge.game.spellability.TargetRestrictions;
@@ -115,6 +116,7 @@ public class PossibleTargetSelector {
}
Card c = (Card) o;
Combat combat = c.getGame().getCombat();
for (Card existingTarget : validTargetsMap.get(c.getName())) {
// Note: Checks are ordered from cheapest to more expensive ones. For example, type equals()
// ends up calling toString() on the type object and is more expensive than the checks above it.
@@ -130,7 +132,25 @@ public class PossibleTargetSelector {
if (!getTypeString(existingTarget).equals(getTypeString(c))) {
continue;
}
if (c.isCreature() && getCreatureScore(c) != getCreatureScore(existingTarget)) {
if (c.isCreature()) {
if (!existingTarget.isCreature()) {
continue;
}
if (getCreatureScore(c) != getCreatureScore(existingTarget)) {
continue;
}
if (combat != null) {
if (combat.getDefenderByAttacker(c) != combat.getDefenderByAttacker(existingTarget)) {
// Either attacking different entities or one is attacking and the other is not.
continue;
}
if (combat.isBlocked(c) || combat.isBlocked(existingTarget) ||
combat.isBlocking(c) || combat.isBlocking(existingTarget)) {
// If either is blocked or blocking, consider them separately as well.
continue;
}
}
continue;
}
return true;

2
forge-gui-desktop/src/test/java/forge/ai/simulation/SpellAbilityPickerTest.java
View File

@@ -303,7 +303,7 @@ public class SpellAbilityPickerTest extends SimulationTestCase {
Card blocker = addCard("Fugitive Wizard", opponent);
Card attacker1 = addCard("Dwarven Trader", p);
attacker1.setSickness(false);
Card attacker2 = addCard("Kird Ape", p);
Card attacker2 = addCard("Dwarven Trader", p);
attacker2.setSickness(false);
addCard("Mountain", p);
addCardToZone("Brute Force", p, ZoneType.Hand);