diff --git a/forge-ai/src/main/java/forge/ai/ability/DamageDealAi.java b/forge-ai/src/main/java/forge/ai/ability/DamageDealAi.java index 580509510e0..5bba9bee342 100644 --- a/forge-ai/src/main/java/forge/ai/ability/DamageDealAi.java +++ b/forge-ai/src/main/java/forge/ai/ability/DamageDealAi.java @@ -566,7 +566,7 @@ public class DamageDealAi extends DamageAiBase { TargetChoices tcs = sa.getTargets(); // Do not use if would kill self - if (("SelfDamage".equals(logic)) && (ai.getLife() <= Integer.parseInt(source.getSVar("SelfDamageAmount")))) { + if ("SelfDamage".equals(logic) && ai.getLife() <= Integer.parseInt(source.getSVar("SelfDamageAmount"))) { return false; } diff --git a/forge-core/src/main/java/forge/deck/generation/DeckGeneratorBase.java b/forge-core/src/main/java/forge/deck/generation/DeckGeneratorBase.java index 0aa65acf1c3..7eb4291f684 100644 --- a/forge-core/src/main/java/forge/deck/generation/DeckGeneratorBase.java +++ b/forge-core/src/main/java/forge/deck/generation/DeckGeneratorBase.java @@ -92,7 +92,6 @@ public abstract class DeckGeneratorBase { final Iterable cards = selectCardsOfMatchingColorForPlayer(forAi); // build subsets based on type - final Iterable creatures = Iterables.filter(cards, Predicates.compose(CardRulesPredicates.Presets.IS_CREATURE, PaperCard.FN_GET_RULES)); final int creatCnt = (int) Math.ceil(getCreaturePercentage() * size); trace.append("Creatures to add:").append(creatCnt).append("\n"); diff --git a/forge-core/src/main/java/forge/util/lang/LangGerman.java b/forge-core/src/main/java/forge/util/lang/LangGerman.java index 3c9d6dc1674..30558194d07 100644 --- a/forge-core/src/main/java/forge/util/lang/LangGerman.java +++ b/forge-core/src/main/java/forge/util/lang/LangGerman.java @@ -26,7 +26,6 @@ public class LangGerman extends Lang { return getPossesive(owner) + " " + object; } - @Override public String getNickName(final String name) { if (name.contains(",")) { diff --git a/forge-gui/res/cardsfolder/c/cast_out.txt b/forge-gui/res/cardsfolder/c/cast_out.txt index 11266256ed5..ddff71a35fe 100644 --- a/forge-gui/res/cardsfolder/c/cast_out.txt +++ b/forge-gui/res/cardsfolder/c/cast_out.txt @@ -3,7 +3,7 @@ ManaCost:3 W Types:Enchantment K:Flash T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigExile | TriggerDescription$ When CARDNAME enters the battlefield, exile target nonland permanent an opponent controls until CARDNAME leaves the battlefield. -SVar:TrigExile:DB$ ChangeZone | Origin$ Battlefield | Destination$ Exile | ValidTgts$ Permanent.nonLand+OppCtrl | TgtPrompt$ Select target nonland permanent an opponent controls | Duration$ UntilHostLeavesPlay +SVar:TrigExile:DB$ ChangeZone | Origin$ Battlefield | Destination$ Exile | ValidTgts$ Permanent.nonLand+OppCtrl | TgtPrompt$ Select target nonland permanent an opponent controls | Duration$ UntilHostLeavesPlay K:Cycling:W SVar:OblivionRing:TRUE Oracle:Flash\nWhen Cast Out enters the battlefield, exile target nonland permanent an opponent controls until Cast Out leaves the battlefield.\nCycling {W} ({W}, Discard this card: Draw a card.) diff --git a/forge-gui/src/main/java/forge/gamemodes/limited/CardThemedDeckBuilder.java b/forge-gui/src/main/java/forge/gamemodes/limited/CardThemedDeckBuilder.java index aa7d7ebd81d..903868338a1 100644 --- a/forge-gui/src/main/java/forge/gamemodes/limited/CardThemedDeckBuilder.java +++ b/forge-gui/src/main/java/forge/gamemodes/limited/CardThemedDeckBuilder.java @@ -216,8 +216,7 @@ public class CardThemedDeckBuilder extends DeckGeneratorBase { System.out.println("Post more creatures and spells : " + deckList.size()); } - // 5. If there are still on-color cards, and the average cmc is low, add - // extras. + // 5. If there are still on-color cards, and the average cmc is low, add extras. double avCMC = getAverageCMC(deckList); //calculated required lands based on https://www.channelfireball.com/articles/how-many-lands-do-you-need-to-consistently-hit-your-land-drops/ float baseLandParameter = 16f; @@ -326,14 +325,12 @@ public class CardThemedDeckBuilder extends DeckGeneratorBase { aiPlayables.remove(sbCard); rankedColorList.remove(sbCard); - ++i; } if (logToConsole) { debugFinalDeck(); } return result; - } //Extend to playsets for non land cards to fill out deck for when no other suitable cards are available @@ -714,7 +711,6 @@ public class CardThemedDeckBuilder extends DeckGeneratorBase { while (deckList.size() > targetSize) { deckList.remove(deckList.size() - 1); } - } /** @@ -872,9 +868,7 @@ public class CardThemedDeckBuilder extends DeckGeneratorBase { Collections.shuffle(possibleList); //addManaCurveCards(CardRanker.rankCardsInDeck(possibleList.subList(0, targetSize*3 <= possibleList.size() ? targetSize*3 : possibleList.size())), //num, "Random Card"); - addManaCurveCards(possibleList, - num, "Random Card"); - + addManaCurveCards(possibleList, num, "Random Card"); } /** diff --git a/forge-gui/src/main/java/forge/gamemodes/tournament/system/AbstractTournament.java b/forge-gui/src/main/java/forge/gamemodes/tournament/system/AbstractTournament.java index 4747832c4b4..ff9871df2d0 100644 --- a/forge-gui/src/main/java/forge/gamemodes/tournament/system/AbstractTournament.java +++ b/forge-gui/src/main/java/forge/gamemodes/tournament/system/AbstractTournament.java @@ -28,8 +28,8 @@ public abstract class AbstractTournament implements Serializable { protected final List completedPairings = new ArrayList<>(); protected final List activePairings = new ArrayList<>(); - public List getCompletedPairings() { return completedPairings; } - public List getActivePairings() { return activePairings; } + public List getCompletedPairings() { return completedPairings; } + public List getActivePairings() { return activePairings; } public AbstractTournament(int ttlRnds) { activeRound = 0; @@ -60,13 +60,13 @@ public abstract class AbstractTournament implements Serializable { public int getActiveRound() { return activeRound; } public int getTotalRounds() { return totalRounds; } - public boolean isContinualPairing() { return continualPairing; } + public boolean isContinualPairing() { return continualPairing; } - public void setContinualPairing(boolean continualPairing) { this.continualPairing = continualPairing; } + public void setContinualPairing(boolean continualPairing) { this.continualPairing = continualPairing; } public boolean isInitialized() { return initialized; } - public void setInitialized(boolean initialized) { this.initialized = initialized; } + public void setInitialized(boolean initialized) { this.initialized = initialized; } public boolean isPlayerRemaining(TournamentPlayer player) { return remainingPlayers.contains(player); @@ -144,7 +144,7 @@ public abstract class AbstractTournament implements Serializable { } } - public List getAllPlayers(){ + public List getAllPlayers() { return allPlayers; }