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

AI: Evaluate creature spells when deciding between two spells with the same CMC (#3133)

Browse Source 
* - Fix the name of the swamp tribal town.

* - Update deck conversion toolchain to the one that was used for the May 2023 MTGDecks.net archive update.

* - Evaluate creature spells when deciding priority for two spells with the same CMC

* - Evaluate the card based on its state.

* - Evaluate the card based on its state, wrapper approach.
This commit is contained in:
Agetian
2023-05-18 16:19:14 +03:00
committed by GitHub
parent 6de7dd6bcc
commit 1a76a7e81f
2 changed files with 32 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
forge-ai/src/main/java/forge/ai/AiController.java
View File

@@ -1082,6 +1082,17 @@ public class AiController {
} }
} }
// If both are permanent creature spells, prefer the one that evaluates higher
if (a1 == b1 && a.getApi() == ApiType.PermanentCreature && b.getApi() == ApiType.PermanentCreature) {
int evalA = ComputerUtilCard.evaluateCreature(a);
int evalB = ComputerUtilCard.evaluateCreature(b);
if (evalA > evalB) {
a1++;
} else if (evalB > evalA) {
b1++;
}
}
a1 += getSpellAbilityPriority(a); a1 += getSpellAbilityPriority(a);
b1 += getSpellAbilityPriority(b); b1 += getSpellAbilityPriority(b);

21
forge-ai/src/main/java/forge/ai/ComputerUtilCard.java
View File

@@ -582,7 +582,28 @@ public class ComputerUtilCard {
public static int evaluateCreature(final Card c) { public static int evaluateCreature(final Card c) {
return creatureEvaluator.evaluateCreature(c); return creatureEvaluator.evaluateCreature(c);
} }
public static int evaluateCreature(final SpellAbility sa) {
final Card host = sa.getHostCard();
if (sa.getApi() != ApiType.PermanentCreature) {
System.err.println("Warning: tried to evaluate a non-creature spell with evaluateCreature for card " + host + " via SA " + sa);
return 0;
}
// switch to the needed card face
CardStateName currentState = sa.getCardState() != null && host.getCurrentStateName() != sa.getCardStateName() && !host.isInPlay() ? host.getCurrentStateName() : null;
if (currentState != null) {
host.setState(sa.getCardStateName(), false);
}
int eval = creatureEvaluator.evaluateCreature(host);
if (currentState != null) {
host.setState(currentState, false);
}
return eval;
}
public static int evaluateCreature(final Card c, final boolean considerPT, final boolean considerCMC) { public static int evaluateCreature(final Card c, final boolean considerPT, final boolean considerCMC) {
return creatureEvaluator.evaluateCreature(c, considerPT, considerCMC); return creatureEvaluator.evaluateCreature(c, considerPT, considerCMC);
} }