From 91e8c24769df3f87d54d3ddc2d32271a0c7401ee Mon Sep 17 00:00:00 2001 From: tool4EvEr Date: Mon, 26 Jul 2021 19:11:40 +0200 Subject: [PATCH] Clean up --- forge-ai/src/main/java/forge/ai/AiController.java | 3 +-- forge-ai/src/main/java/forge/ai/ComputerUtil.java | 4 +--- .../src/main/java/forge/ai/ComputerUtilCost.java | 2 +- forge-ai/src/main/java/forge/ai/SpecialCardAi.java | 2 +- .../src/main/java/forge/ai/ability/EffectAi.java | 1 - .../src/main/java/forge/ai/ability/ManaEffectAi.java | 2 +- .../forge/ai/ability/RearrangeTopOfLibraryAi.java | 2 +- forge-core/src/main/java/forge/card/CardRules.java | 2 +- .../src/main/java/forge/card/mana/ManaCost.java | 2 +- .../game/ability/effects/CopySpellAbilityEffect.java | 1 - .../forge/game/ability/effects/RollDiceEffect.java | 1 + .../java/forge/game/spellability/AbilitySub.java | 4 ---- .../src/main/java/forge/itemmanager/ColumnDef.java | 12 ++++++------ .../achievements/AchievementCollection.java | 4 ++-- .../achievements/AltWinAchievements.java | 2 +- .../achievements/ChallengeAchievements.java | 2 +- .../achievements/PlaneswalkerAchievements.java | 2 +- .../achievements/PuzzleAchievements.java | 2 +- 18 files changed, 21 insertions(+), 29 deletions(-) diff --git a/forge-ai/src/main/java/forge/ai/AiController.java b/forge-ai/src/main/java/forge/ai/AiController.java index 0ba68b4b601..02697597d23 100644 --- a/forge-ai/src/main/java/forge/ai/AiController.java +++ b/forge-ai/src/main/java/forge/ai/AiController.java @@ -818,8 +818,7 @@ public class AiController { if (!canPlay) { return AiPlayDecision.CantPlayAi; } - } - else { + } else { Cost payCosts = sa.getPayCosts(); if (payCosts != null) { ManaCost mana = payCosts.getTotalMana(); diff --git a/forge-ai/src/main/java/forge/ai/ComputerUtil.java b/forge-ai/src/main/java/forge/ai/ComputerUtil.java index 6acf36772da..d32aa26b545 100644 --- a/forge-ai/src/main/java/forge/ai/ComputerUtil.java +++ b/forge-ai/src/main/java/forge/ai/ComputerUtil.java @@ -2913,9 +2913,7 @@ public class ComputerUtil { // at this point, we're assuming that card will be castable from whichever zone it's in by the AI player. abTest.setActivatingPlayer(ai); abTest.getRestrictions().setZone(c.getZone().getZoneType()); - final boolean play = AiPlayDecision.WillPlay == aic.canPlaySa(abTest); - final boolean pay = ComputerUtilCost.canPayCost(abTest, ai); - if (play && pay) { + if (AiPlayDecision.WillPlay == aic.canPlaySa(abTest) && ComputerUtilCost.canPayCost(abTest, ai)) { targetSpellCard = c; break; } diff --git a/forge-ai/src/main/java/forge/ai/ComputerUtilCost.java b/forge-ai/src/main/java/forge/ai/ComputerUtilCost.java index 0f0d72882c4..409c29cfa94 100644 --- a/forge-ai/src/main/java/forge/ai/ComputerUtilCost.java +++ b/forge-ai/src/main/java/forge/ai/ComputerUtilCost.java @@ -633,7 +633,7 @@ public class ComputerUtilCost { } // Check if the AI intends to play the card and if it can pay for it with the mana it has boolean willPlay = ComputerUtil.hasReasonToPlayCardThisTurn(payer, c); - boolean canPay = c.getManaCost().canBePaidWithAvaliable(ColorSet.fromNames(getAvailableManaColors(payer, source)).getColor()); + boolean canPay = c.getManaCost().canBePaidWithAvailable(ColorSet.fromNames(getAvailableManaColors(payer, source)).getColor()); return canPay && willPlay; } } diff --git a/forge-ai/src/main/java/forge/ai/SpecialCardAi.java b/forge-ai/src/main/java/forge/ai/SpecialCardAi.java index 501a3ab4a61..0da2f61ca26 100644 --- a/forge-ai/src/main/java/forge/ai/SpecialCardAi.java +++ b/forge-ai/src/main/java/forge/ai/SpecialCardAi.java @@ -1099,7 +1099,7 @@ public class SpecialCardAi { for (final SpellAbility testSa : ComputerUtilAbility.getOriginalAndAltCostAbilities(all, ai)) { ManaCost cost = testSa.getPayCosts().getTotalMana(); - boolean canPayWithAvailableColors = cost.canBePaidWithAvaliable(ColorSet.fromNames( + boolean canPayWithAvailableColors = cost.canBePaidWithAvailable(ColorSet.fromNames( ComputerUtilCost.getAvailableManaColors(ai, sa.getHostCard())).getColor()); byte colorProfile = cost.getColorProfile(); diff --git a/forge-ai/src/main/java/forge/ai/ability/EffectAi.java b/forge-ai/src/main/java/forge/ai/ability/EffectAi.java index e643da47300..407f96baa73 100644 --- a/forge-ai/src/main/java/forge/ai/ability/EffectAi.java +++ b/forge-ai/src/main/java/forge/ai/ability/EffectAi.java @@ -313,6 +313,5 @@ public class EffectAi extends SpellAbilityAi { } return super.doTriggerAINoCost(aiPlayer, sa, mandatory); - } } diff --git a/forge-ai/src/main/java/forge/ai/ability/ManaEffectAi.java b/forge-ai/src/main/java/forge/ai/ability/ManaEffectAi.java index 0d26dcd0667..35bc3ad2afe 100644 --- a/forge-ai/src/main/java/forge/ai/ability/ManaEffectAi.java +++ b/forge-ai/src/main/java/forge/ai/ability/ManaEffectAi.java @@ -167,7 +167,7 @@ public class ManaEffectAi extends SpellAbilityAi { List all = ComputerUtilAbility.getSpellAbilities(ai.getCardsIn(ZoneType.Hand), ai); for (final SpellAbility testSa : ComputerUtilAbility.getOriginalAndAltCostAbilities(all, ai)) { ManaCost cost = testSa.getPayCosts().getTotalMana(); - boolean canPayWithAvailableColors = cost.canBePaidWithAvaliable(ColorSet.fromNames( + boolean canPayWithAvailableColors = cost.canBePaidWithAvailable(ColorSet.fromNames( ComputerUtilCost.getAvailableManaColors(ai, (List)null)).getColor()); if (cost.getCMC() == 0 && cost.countX() == 0) { diff --git a/forge-ai/src/main/java/forge/ai/ability/RearrangeTopOfLibraryAi.java b/forge-ai/src/main/java/forge/ai/ability/RearrangeTopOfLibraryAi.java index 004591af7a8..b3bd6f61e57 100644 --- a/forge-ai/src/main/java/forge/ai/ability/RearrangeTopOfLibraryAi.java +++ b/forge-ai/src/main/java/forge/ai/ability/RearrangeTopOfLibraryAi.java @@ -107,7 +107,7 @@ public class RearrangeTopOfLibraryAi extends SpellAbilityAi { uncastableCMCThreshold = aic.getIntProperty(AiProps.SCRY_IMMEDIATELY_UNCASTABLE_CMC_DIFF); } - Player p = pc.getFirst(); // FIXME: is this always a single target spell? + Player p = pc.getFirst(); // currently always a single target spell Card top = p.getCardsIn(ZoneType.Library).getFirst(); int landsOTB = CardLists.filter(p.getCardsIn(ZoneType.Battlefield), CardPredicates.Presets.LANDS_PRODUCING_MANA).size(); int cmc = top.isSplitCard() ? Math.min(top.getCMC(Card.SplitCMCMode.LeftSplitCMC), top.getCMC(Card.SplitCMCMode.RightSplitCMC)) diff --git a/forge-core/src/main/java/forge/card/CardRules.java b/forge-core/src/main/java/forge/card/CardRules.java index a0d6cc930aa..d062a4a0f0e 100644 --- a/forge-core/src/main/java/forge/card/CardRules.java +++ b/forge-core/src/main/java/forge/card/CardRules.java @@ -182,7 +182,7 @@ public final class CardRules implements ICardCharacteristics { //if card face has no cost, assume castable only by mana of its defined color return face.getColor().hasNoColorsExcept(colorCode); } - return face.getManaCost().canBePaidWithAvaliable(colorCode); + return face.getManaCost().canBePaidWithAvailable(colorCode); } public boolean canCastWithAvailable(byte colorCode) { diff --git a/forge-core/src/main/java/forge/card/mana/ManaCost.java b/forge-core/src/main/java/forge/card/mana/ManaCost.java index 34a0387b61b..85ce4c528a7 100644 --- a/forge-core/src/main/java/forge/card/mana/ManaCost.java +++ b/forge-core/src/main/java/forge/card/mana/ManaCost.java @@ -353,7 +353,7 @@ public final class ManaCost implements Comparable, Iterable copies = Lists.newArrayList(); SpellAbility chosenSA = controller.getController().chooseSingleSpellForEffect(tgtSpells, sa, diff --git a/forge-game/src/main/java/forge/game/ability/effects/RollDiceEffect.java b/forge-game/src/main/java/forge/game/ability/effects/RollDiceEffect.java index 653f3fc4b4c..01b13539df5 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/RollDiceEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/RollDiceEffect.java @@ -121,6 +121,7 @@ public class RollDiceEffect extends SpellAbilityEffect { int total = rollDiceForPlayer(sa, player, amount, sides, ignore, rolls); total += modifier; + total = 20; if (sa.hasParam("ResultSVar")) { host.setSVar(sa.getParam("ResultSVar"), Integer.toString(total)); } diff --git a/forge-game/src/main/java/forge/game/spellability/AbilitySub.java b/forge-game/src/main/java/forge/game/spellability/AbilitySub.java index 1986274237d..13aafddb2f3 100644 --- a/forge-game/src/main/java/forge/game/spellability/AbilitySub.java +++ b/forge-game/src/main/java/forge/game/spellability/AbilitySub.java @@ -63,8 +63,6 @@ public final class AbilitySub extends SpellAbility implements java.io.Serializab return this.parent; } - - /** {@inheritDoc} */ @Override public boolean canPlay() { @@ -72,10 +70,8 @@ public final class AbilitySub extends SpellAbility implements java.io.Serializab return false; } - private final SpellAbilityEffect effect; - public AbilitySub(ApiType api0, final Card ca, final TargetRestrictions tgt, Map params0) { super(ca, Cost.Zero); this.setTargetRestrictions(tgt); diff --git a/forge-gui/src/main/java/forge/itemmanager/ColumnDef.java b/forge-gui/src/main/java/forge/itemmanager/ColumnDef.java index 54721468484..9dcb3ec2157 100644 --- a/forge-gui/src/main/java/forge/itemmanager/ColumnDef.java +++ b/forge-gui/src/main/java/forge/itemmanager/ColumnDef.java @@ -697,9 +697,9 @@ public enum ColumnDef { return !(((IPaperCard) i).getRules().getType().isArtifact() && (toColor(i).isColorless() || //If it isn't colorless, see if it can be paid with only white, only blue, only black. //No need to check others since three-color hybrid shards don't exist. - manaCost.canBePaidWithAvaliable(MagicColor.WHITE) && - manaCost.canBePaidWithAvaliable(MagicColor.BLUE) && - manaCost.canBePaidWithAvaliable(MagicColor.BLACK))) + manaCost.canBePaidWithAvailable(MagicColor.WHITE) && + manaCost.canBePaidWithAvailable(MagicColor.BLUE) && + manaCost.canBePaidWithAvailable(MagicColor.BLACK))) ? "0" + toSplitLast(i) : "1"; } @@ -757,9 +757,9 @@ public enum ColumnDef { private static String toGoldFirst(final InventoryItem i) { forge.card.mana.ManaCost manaCost = ((IPaperCard) i).getRules().getManaCost(); - return !(manaCost.canBePaidWithAvaliable(MagicColor.WHITE) | manaCost.canBePaidWithAvaliable(MagicColor.BLUE) | - manaCost.canBePaidWithAvaliable(MagicColor.BLACK) | manaCost.canBePaidWithAvaliable(MagicColor.RED) | - manaCost.canBePaidWithAvaliable(MagicColor.GREEN)) ? "0" : "1"; + return !(manaCost.canBePaidWithAvailable(MagicColor.WHITE) | manaCost.canBePaidWithAvailable(MagicColor.BLUE) | + manaCost.canBePaidWithAvailable(MagicColor.BLACK) | manaCost.canBePaidWithAvailable(MagicColor.RED) | + manaCost.canBePaidWithAvailable(MagicColor.GREEN)) ? "0" : "1"; } /** diff --git a/forge-gui/src/main/java/forge/localinstance/achievements/AchievementCollection.java b/forge-gui/src/main/java/forge/localinstance/achievements/AchievementCollection.java index 053c22b1c7e..2b6c7c4acfc 100644 --- a/forge-gui/src/main/java/forge/localinstance/achievements/AchievementCollection.java +++ b/forge-gui/src/main/java/forge/localinstance/achievements/AchievementCollection.java @@ -90,12 +90,12 @@ public abstract class AchievementCollection implements Iterable { filename = filename0; isLimitedFormat = isLimitedFormat0; path = path0; - addSharedAchivements(); + addSharedAchievements(); addAchievements(); load(); } - protected void addSharedAchivements() { + protected void addSharedAchievements() { add(new GameWinStreak(10, 25, 50, 100)); add(new MatchWinStreak(10, 25, 50, 100)); add(new TotalGameWins(250, 500, 1000, 2000)); diff --git a/forge-gui/src/main/java/forge/localinstance/achievements/AltWinAchievements.java b/forge-gui/src/main/java/forge/localinstance/achievements/AltWinAchievements.java index 07047282542..8fbc04f7315 100644 --- a/forge-gui/src/main/java/forge/localinstance/achievements/AltWinAchievements.java +++ b/forge-gui/src/main/java/forge/localinstance/achievements/AltWinAchievements.java @@ -18,7 +18,7 @@ public class AltWinAchievements extends AchievementCollection { } @Override - protected void addSharedAchivements() { + protected void addSharedAchievements() { //prevent including shared achievements } diff --git a/forge-gui/src/main/java/forge/localinstance/achievements/ChallengeAchievements.java b/forge-gui/src/main/java/forge/localinstance/achievements/ChallengeAchievements.java index 3989a7ad663..bb9579dbfee 100644 --- a/forge-gui/src/main/java/forge/localinstance/achievements/ChallengeAchievements.java +++ b/forge-gui/src/main/java/forge/localinstance/achievements/ChallengeAchievements.java @@ -15,7 +15,7 @@ public class ChallengeAchievements extends AchievementCollection { } @Override - protected void addSharedAchivements() { + protected void addSharedAchievements() { //prevent including shared achievements } diff --git a/forge-gui/src/main/java/forge/localinstance/achievements/PlaneswalkerAchievements.java b/forge-gui/src/main/java/forge/localinstance/achievements/PlaneswalkerAchievements.java index 5d634c020de..dec37106514 100644 --- a/forge-gui/src/main/java/forge/localinstance/achievements/PlaneswalkerAchievements.java +++ b/forge-gui/src/main/java/forge/localinstance/achievements/PlaneswalkerAchievements.java @@ -23,7 +23,7 @@ public class PlaneswalkerAchievements extends AchievementCollection { } @Override - protected void addSharedAchivements() { + protected void addSharedAchievements() { //prevent including shared achievements } diff --git a/forge-gui/src/main/java/forge/localinstance/achievements/PuzzleAchievements.java b/forge-gui/src/main/java/forge/localinstance/achievements/PuzzleAchievements.java index b9c886d1e23..3b8d7a82d59 100644 --- a/forge-gui/src/main/java/forge/localinstance/achievements/PuzzleAchievements.java +++ b/forge-gui/src/main/java/forge/localinstance/achievements/PuzzleAchievements.java @@ -8,7 +8,7 @@ public class PuzzleAchievements extends AchievementCollection { } @Override - protected void addSharedAchivements() { + protected void addSharedAchievements() { //prevent including shared achievements }