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

Tweaks

Browse Source
This commit is contained in:
TRT
2023-05-22 07:53:50 +02:00
parent 3a8213fcca
commit 0230d29a4f
2 changed files with 9 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
forge-ai/src/main/java/forge/ai/ComputerUtilAbility.java
View File

@@ -306,17 +306,16 @@ public class ComputerUtilAbility {
a1 += getSpellAbilityPriority(a);
b1 += getSpellAbilityPriority(b);
int diff = b1 - a1;
// If both are creature spells with roughly the same priority sort them after
if (safeToEvaluateCreatures && Math.abs(diff) < 4 && a.getApi() == ApiType.PermanentCreature && b.getApi() == ApiType.PermanentCreature) {
return 0;
// If both are creature spells sort them after
if (safeToEvaluateCreatures) {
a1 += Math.round(ComputerUtilCard.evaluateCreature(a) / 100f);
b1 += Math.round(ComputerUtilCard.evaluateCreature(b) / 100f);
}
return diff;
return b1 - a1;
}
private int getSpellAbilityPriority(SpellAbility sa) {
private static int getSpellAbilityPriority(SpellAbility sa) {
int p = 0;
Card source = sa.getHostCard();
final Player ai = source == null ? sa.getActivatingPlayer() : source.getController();
@@ -395,6 +394,7 @@ public class ComputerUtilAbility {
};
public static List<SpellAbility> sortCreatureSpells(List<SpellAbility> all) {
// try to smoothen power creeping by making CMC less of a factor
List<SpellAbility> creatures = AiController.filterListByApi(Lists.newArrayList(all), ApiType.PermanentCreature);
Collections.sort(creatures, ComputerUtilCard.EvaluateCreatureSpellComparator);
int idx = 0;

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

@@ -570,13 +570,8 @@ public class ComputerUtilCard {
public static final Comparator<SpellAbility> EvaluateCreatureSpellComparator = new Comparator<SpellAbility>() {
@Override
public int compare(final SpellAbility a, final SpellAbility b) {
// only reorder if generic priorities can't decide
// TODO ideally we could reuse the value
int comp = ComputerUtilAbility.saEvaluator.compareEvaluator(a, b, true);
if (comp == 0) {
return evaluateCreature(b) - evaluateCreature(a);
}
return comp;
// TODO ideally we could reuse the value from the previous pass with false
return ComputerUtilAbility.saEvaluator.compareEvaluator(a, b, true);
}
};