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

Make CreatureEvaluator implement Function, so that a separate class isn't needed for that.

Browse Source
This commit is contained in:
Myrd
2015-02-12 05:11:55 +00:00
parent 5617b87c28
commit b138ec3e1d
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,6 +1,5 @@
package forge.ai; package forge.ai;
import com.google.common.base.Function;
import com.google.common.base.Predicate; import com.google.common.base.Predicate;
import com.google.common.base.Predicates; import com.google.common.base.Predicates;
import com.google.common.collect.Iterables; import com.google.common.collect.Iterables;
@@ -235,7 +234,7 @@ public class ComputerUtilCard {
* @return the card * @return the card
*/ */
public static Card getBestCreatureAI(final Iterable<Card> list) { public static Card getBestCreatureAI(final Iterable<Card> list) {
return Aggregates.itemWithMax(Iterables.filter(list, CardPredicates.Presets.CREATURES), ComputerUtilCard.fnEvaluateCreature); return Aggregates.itemWithMax(Iterables.filter(list, CardPredicates.Presets.CREATURES), ComputerUtilCard.creatureEvaluator);
} }
/** /**
@@ -248,7 +247,7 @@ public class ComputerUtilCard {
* @return a {@link forge.game.card.Card} object. * @return a {@link forge.game.card.Card} object.
*/ */
public static Card getWorstCreatureAI(final Iterable<Card> list) { public static Card getWorstCreatureAI(final Iterable<Card> list) {
return Aggregates.itemWithMin(Iterables.filter(list, CardPredicates.Presets.CREATURES), ComputerUtilCard.fnEvaluateCreature); return Aggregates.itemWithMin(Iterables.filter(list, CardPredicates.Presets.CREATURES), ComputerUtilCard.creatureEvaluator);
} }
// This selection rates tokens higher // This selection rates tokens higher
@@ -352,12 +351,6 @@ public class ComputerUtilCard {
return getCheapestPermanentAI(list, null, false); return getCheapestPermanentAI(list, null, false);
} }
public static final Function<Card, Integer> fnEvaluateCreature = new Function<Card, Integer>() {
@Override
public Integer apply(Card a) {
return ComputerUtilCard.evaluateCreature(a);
}
};
public static final Comparator<Card> EvaluateCreatureComparator = new Comparator<Card>() { public static final Comparator<Card> EvaluateCreatureComparator = new Comparator<Card>() {
@Override @Override
public int compare(final Card a, final Card b) { public int compare(final Card a, final Card b) {
@@ -389,7 +382,7 @@ public class ComputerUtilCard {
} }
public static int evaluateCreatureList(final CardCollectionView list) { public static int evaluateCreatureList(final CardCollectionView list) {
return Aggregates.sum(list, fnEvaluateCreature); return Aggregates.sum(list, creatureEvaluator);
} }
public static boolean doesCreatureAttackAI(final Player ai, final Card card) { public static boolean doesCreatureAttackAI(final Player ai, final Card card) {

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

@@ -1,9 +1,11 @@
package forge.ai; package forge.ai;
import com.google.common.base.Function;
import forge.game.card.Card; import forge.game.card.Card;
import forge.game.spellability.SpellAbility; import forge.game.spellability.SpellAbility;
public class CreatureEvaluator { public class CreatureEvaluator implements Function<Card, Integer> {
protected int getEffectivePower(final Card c) { protected int getEffectivePower(final Card c) {
return c.getNetCombatDamage(); return c.getNetCombatDamage();
} }
@@ -11,6 +13,11 @@ public class CreatureEvaluator {
return c.getNetToughness(); return c.getNetToughness();
} }
@Override
public Integer apply(Card c) {
return evaluateCreature(c);
}
public int evaluateCreature(final Card c) { public int evaluateCreature(final Card c) {
int value = 80; int value = 80;
if (!c.isToken()) { if (!c.isToken()) {