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

Clean up

Browse Source
This commit is contained in:
tool4EvEr
2022-05-09 22:24:41 +02:00
parent 6b13169fd5
commit e5f3488d5d
5 changed files with 11 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -88,6 +88,13 @@ public class AiController {
private SpellAbilityPicker simPicker;
private int lastAttackAggression;
public AiController(final Player computerPlayer, final Game game0) {
player = computerPlayer;
game = game0;
memory = new AiCardMemory();
simPicker = new SpellAbilityPicker(game, player);
}
public boolean canCheatShuffle() {
return cheatShuffle;
}
@@ -141,13 +148,6 @@ public class AiController {
return predictedCombatNextTurn;
}
public AiController(final Player computerPlayer, final Game game0) {
player = computerPlayer;
game = game0;
memory = new AiCardMemory();
simPicker = new SpellAbilityPicker(game, player);
}
private List<SpellAbility> getPossibleETBCounters() {
CardCollection all = new CardCollection(player.getCardsIn(ZoneType.Hand));
CardCollectionView ccvPlayerLibrary = player.getCardsIn(ZoneType.Library);

2
forge-ai/src/main/java/forge/ai/ability/CountersPutAi.java
View File

@@ -341,7 +341,7 @@ public class CountersPutAi extends CountersAi {
if (sa.hasParam("Bolster")) {
CardCollection creatsYouCtrl = ai.getCreaturesInPlay();
CardCollection leastToughness = new CardCollection(Aggregates.listWithMin(creatsYouCtrl, CardPredicates.Accessors.fnGetDefense));
CardCollection leastToughness = new CardCollection(Aggregates.listWithMin(creatsYouCtrl, CardPredicates.Accessors.fnGetNetToughness));
if (leastToughness.isEmpty()) {
return false;
}

2
forge-game/src/main/java/forge/game/ability/effects/CountersPutEffect.java
View File

@@ -183,7 +183,7 @@ public class CountersPutEffect extends SpellAbilityEffect {
if (sa.hasParam("Bolster")) {
CardCollection creatsYouCtrl = activator.getCreaturesInPlay();
CardCollection leastToughness = new CardCollection(
Aggregates.listWithMin(creatsYouCtrl, CardPredicates.Accessors.fnGetDefense));
Aggregates.listWithMin(creatsYouCtrl, CardPredicates.Accessors.fnGetNetToughness));
Map<String, Object> params = Maps.newHashMap();
params.put("CounterType", counterType);

7
forge-game/src/main/java/forge/game/card/CardPredicates.java
View File

@@ -733,13 +733,6 @@ public final class CardPredicates {
}
public static class Accessors {
public static final Function<Card, Integer> fnGetDefense = new Function<Card, Integer>() {
@Override
public Integer apply(Card a) {
return a.getNetToughness();
}
};
public static final Function<Card, Integer> fnGetNetPower = new Function<Card, Integer>() {
@Override
public Integer apply(Card a) {

4
forge-game/src/main/java/forge/game/combat/CombatUtil.java
View File

@@ -268,7 +268,7 @@ public class CombatUtil {
}
return true;
} // canAttack(Card, GameEntity)
}
public static boolean isAttackerSick(final Card attacker, final GameEntity defender) {
final Game game = attacker.getGame();
@@ -1158,7 +1158,7 @@ public class CombatUtil {
}
return true;
} // canBlock()
}
public static boolean canAttackerBeBlockedWithAmount(Card attacker, int amount, Combat combat) {
return canAttackerBeBlockedWithAmount(attacker, amount, combat != null ? combat.getDefenderPlayerByAttacker(attacker) : null);