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

- Fix imports + avoid using variable assignment

Browse Source
This commit is contained in:
Agetian
2023-06-12 18:23:05 +03:00
parent 67e0610d38
commit 59e8c5aab3
1 changed files with 9 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
forge-ai/src/main/java/forge/ai/AiCostDecision.java
View File

@@ -1,27 +1,14 @@
package forge.ai; package forge.ai;
import static forge.ai.ComputerUtilCard.getBestCreatureAI;
import java.util.*;
import forge.card.MagicColor;
import forge.game.cost.*;
import org.apache.commons.lang3.ObjectUtils;
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.Lists; import com.google.common.collect.Lists;
import forge.card.CardType; import forge.card.CardType;
import forge.card.MagicColor;
import forge.game.Game; import forge.game.Game;
import forge.game.GameEntityCounterTable; import forge.game.GameEntityCounterTable;
import forge.game.card.Card; import forge.game.card.*;
import forge.game.card.CardCollection; import forge.game.cost.*;
import forge.game.card.CardCollectionView;
import forge.game.card.CardLists;
import forge.game.card.CardPredicates;
import forge.game.card.CounterEnumType;
import forge.game.card.CounterType;
import forge.game.keyword.Keyword; import forge.game.keyword.Keyword;
import forge.game.player.Player; import forge.game.player.Player;
import forge.game.spellability.SpellAbility; import forge.game.spellability.SpellAbility;
@@ -30,6 +17,11 @@ import forge.game.zone.ZoneType;
import forge.util.Aggregates; import forge.util.Aggregates;
import forge.util.TextUtil; import forge.util.TextUtil;
import forge.util.collect.FCollectionView; import forge.util.collect.FCollectionView;
import org.apache.commons.lang3.ObjectUtils;
import java.util.*;
import static forge.ai.ComputerUtilCard.getBestCreatureAI;
public class AiCostDecision extends CostDecisionMakerBase { public class AiCostDecision extends CostDecisionMakerBase {
private final CardCollection discarded; private final CardCollection discarded;
@@ -481,8 +473,7 @@ public class AiCostDecision extends CostDecisionMakerBase {
if (cost.getRevealFrom().containsAll(Arrays.asList(ZoneType.Hand, ZoneType.Battlefield))) { // RevealOrChoose if (cost.getRevealFrom().containsAll(Arrays.asList(ZoneType.Hand, ZoneType.Battlefield))) { // RevealOrChoose
CardCollection battlefieldOrHand = CardLists.getValidCards(player.getCardsIn(ZoneType.Battlefield), CardCollection battlefieldOrHand = CardLists.getValidCards(player.getCardsIn(ZoneType.Battlefield),
type.split(";"), player, source, ability); type.split(";"), player, source, ability);
hand = CardLists.getValidCards(hand, type.split(";"), player, source, ability); battlefieldOrHand.addAll(CardLists.getValidCards(hand, type.split(";"), player, source, ability));
battlefieldOrHand.addAll(hand);
return PaymentDecision.card(getBestCreatureAI(battlefieldOrHand)); return PaymentDecision.card(getBestCreatureAI(battlefieldOrHand));
} }