From 911511d0392d35c00401e033ab29cab64f0ba7dd Mon Sep 17 00:00:00 2001 From: tool4EvEr Date: Fri, 23 Jul 2021 21:33:25 +0200 Subject: [PATCH] Add Dungeon to EditionSectionWithCollectorNumbers --- .../main/java/forge/CardStorageReader.java | 6 ++-- .../src/main/java/forge/StaticData.java | 3 -- .../src/main/java/forge/card/CardDb.java | 27 +++++++-------- .../src/main/java/forge/card/CardEdition.java | 33 ++++++++++--------- .../src/main/java/forge/card/CardRules.java | 6 ++-- .../src/main/java/forge/card/CardType.java | 3 +- .../src/main/java/forge/card/MagicColor.java | 4 +-- .../src/main/java/forge/card/PrintSheet.java | 28 ++++++++-------- forge-core/src/main/java/forge/deck/Deck.java | 8 ++--- .../src/main/java/forge/game/GameAction.java | 2 +- .../game/ability/effects/DamageAllEffect.java | 3 +- .../game/combat/AttackRestrictionType.java | 2 +- .../forge/game/mana/ManaConversionMatrix.java | 3 +- .../forge/game/mana/ManaCostBeingPaid.java | 3 +- .../main/java/forge/game/mana/ManaPool.java | 14 +++----- .../forge/game/mulligan/MulliganService.java | 4 +-- .../forge/game/player/RegisteredPlayer.java | 4 +-- .../StaticAbilityCantBeCast.java | 1 - .../StaticAbilityCastWithFlash.java | 4 --- .../main/java/forge/game/trigger/Trigger.java | 6 ++-- .../forge/game/trigger/TriggerHandler.java | 2 +- .../main/java/forge/screens/home/VLobby.java | 2 +- 22 files changed, 74 insertions(+), 94 deletions(-) diff --git a/forge-core/src/main/java/forge/CardStorageReader.java b/forge-core/src/main/java/forge/CardStorageReader.java index d83f642b715..3f6c89288df 100644 --- a/forge-core/src/main/java/forge/CardStorageReader.java +++ b/forge-core/src/main/java/forge/CardStorageReader.java @@ -138,7 +138,7 @@ public class CardStorageReader { final CardRules.Reader rulesReader = new CardRules.Reader(); final List result = new ArrayList<>(); - for(int i = from; i < to; i++) { + for (int i = from; i < to; i++) { final ZipEntry ze = files.get(i); // if (ze.getName().endsWith(CardStorageReader.CARD_FILE_DOT_EXTENSION)) // already filtered! result.add(this.loadCard(rulesReader, ze)); @@ -315,11 +315,11 @@ public class CardStorageReader { final List>> parts = executor.invokeAll(tasks); executor.shutdown(); cdl.await(); - for(final Future> pp : parts) { + for (final Future> pp : parts) { result.addAll(pp.get()); } } else { - for(final Callable> c : tasks) { + for (final Callable> c : tasks) { result.addAll(c.call()); } } diff --git a/forge-core/src/main/java/forge/StaticData.java b/forge-core/src/main/java/forge/StaticData.java index 4dc8e927706..a58d286a0cd 100644 --- a/forge-core/src/main/java/forge/StaticData.java +++ b/forge-core/src/main/java/forge/StaticData.java @@ -322,7 +322,6 @@ public class StaticData { } public PaperCard getCardByEditionDate(PaperCard card, Date editionDate) { - PaperCard c = this.getCommonCards().getCardFromEdition(card.getName(), editionDate, CardDb.SetPreference.LatestCoreExp, card.getArtIndex()); if (null != c) { @@ -346,7 +345,6 @@ public class StaticData { } public PaperCard getCardFromLatestorEarliest(PaperCard card) { - PaperCard c = this.getCommonCards().getCardFromEdition(card.getName(), null, CardDb.SetPreference.Latest, card.getArtIndex()); if (null != c && c.hasImage()) { @@ -376,7 +374,6 @@ public class StaticData { } public PaperCard getCardFromEarliestCoreExp(PaperCard card) { - PaperCard c = this.getCommonCards().getCardFromEdition(card.getName(), null, CardDb.SetPreference.EarliestCoreExp, card.getArtIndex()); if (null != c && c.hasImage()) { diff --git a/forge-core/src/main/java/forge/card/CardDb.java b/forge-core/src/main/java/forge/card/CardDb.java index 9d260c6eabe..8a1ca7e0290 100644 --- a/forge-core/src/main/java/forge/card/CardDb.java +++ b/forge-core/src/main/java/forge/card/CardDb.java @@ -212,16 +212,14 @@ public final class CardDb implements ICardDatabase, IDeckGenPool { CardRules cr = rulesByName.get(cis.name); if (cr != null) { addSetCard(e, cis, cr); - } - else { + } else { missingCards.add(cis.name); } } if (isCoreExpSet && logMissingPerEdition) { if (missingCards.isEmpty()) { System.out.println(" ... 100% "); - } - else { + } else { int missing = (e.getAllCardsInSet().size() - missingCards.size()) * 10000 / e.getAllCardsInSet().size(); System.out.printf(" ... %.2f%% (%s missing: %s)%n", missing * 0.01f, Lang.nounWithAmount(missingCards.size(), "card"), StringUtils.join(missingCards, " | ")); } @@ -245,7 +243,7 @@ public final class CardDb implements ICardDatabase, IDeckGenPool { if (!contains(cr.getName())) { if (upcomingSet != null) { addCard(new PaperCard(cr, upcomingSet.getCode(), CardRarity.Unknown, 1)); - } else if(enableUnknownCards) { + } else if (enableUnknownCards) { System.err.println("The card " + cr.getName() + " was not assigned to any set. Adding it to UNKNOWN set... to fix see res/editions/ folder. "); addCard(new PaperCard(cr, CardEdition.UNKNOWN.getCode(), CardRarity.Special, 1)); } @@ -505,17 +503,16 @@ public final class CardDb implements ICardDatabase, IDeckGenPool { if (pc.hasImage()) { return pc; } - else { - if (firstWithoutImage == null) { - firstWithoutImage = pc; //ensure first without image returns if none have image - } - if (cardsListReadOnly) { //ensure we don't modify a cached collection - cards = new ArrayList<>(cards); - cardsListReadOnly = false; - } - cards.remove(randomIndex); //remove card from collection and try another random card - sz--; + if (firstWithoutImage == null) { + firstWithoutImage = pc; //ensure first without image returns if none have image } + if (cardsListReadOnly) { //ensure we don't modify a cached collection + cards = new ArrayList<>(cards); + cardsListReadOnly = false; + } + cards.remove(randomIndex); //remove card from collection and try another random card + sz--; + } } } diff --git a/forge-core/src/main/java/forge/card/CardEdition.java b/forge-core/src/main/java/forge/card/CardEdition.java index 533f425c466..be8e277b372 100644 --- a/forge-core/src/main/java/forge/card/CardEdition.java +++ b/forge-core/src/main/java/forge/card/CardEdition.java @@ -146,7 +146,8 @@ public final class CardEdition implements Comparable { BUY_A_BOX("buy a box"), PROMO("promo"), BUNDLE("bundle"), - BOX_TOPPER("box topper"); + BOX_TOPPER("box topper"), + DUNGEONS("dungeons"); private final String name; @@ -216,11 +217,11 @@ public final class CardEdition implements Comparable { try { collNr = Integer.parseInt(onlyNumeric); } catch (NumberFormatException exon) { - collNr = 0; // this is the case of ONLY-letters collector numbers + collNr = 0; // this is the case of ONLY-letters collector numbers } if ((collNr > 0) && (sortableCollNr.startsWith(onlyNumeric))) // e.g. 12a, 37+, 2018f, sortableCollNr = String.format("%05d", collNr) + nonNumeric; - else // e.g. WS6, S1 + else // e.g. WS6, S1 sortableCollNr = nonNumeric + String.format("%05d", collNr); } return sortableCollNr; @@ -459,11 +460,11 @@ public final class CardEdition implements Comparable { Map cardToIndex = new HashMap<>(); List sheets = Lists.newArrayList(); - for(String sectionName : cardMap.keySet()) { + for (String sectionName : cardMap.keySet()) { PrintSheet sheet = new PrintSheet(String.format("%s %s", this.getCode(), sectionName)); List cards = cardMap.get(sectionName); - for(CardInSet card : cards) { + for (CardInSet card : cards) { int index = 1; if (cardToIndex.containsKey(card.name)) { index = cardToIndex.get(card.name); @@ -478,7 +479,7 @@ public final class CardEdition implements Comparable { sheets.add(sheet); } - for(String sheetName : customPrintSheetsToParse.keySet()) { + for (String sheetName : customPrintSheetsToParse.keySet()) { List sheetToParse = customPrintSheetsToParse.get(sheetName); CardPool sheetPool = CardPool.fromCardList(sheetToParse); PrintSheet sheet = new PrintSheet(String.format("%s %s", this.getCode(), sheetName), sheetPool); @@ -561,7 +562,7 @@ public final class CardEdition implements Comparable { // parse tokens section if (contents.containsKey("tokens")) { - for(String line : contents.get("tokens")) { + for (String line : contents.get("tokens")) { if (StringUtils.isBlank(line)) continue; @@ -589,11 +590,11 @@ public final class CardEdition implements Comparable { res.mciCode = res.code2.toLowerCase(); } res.scryfallCode = section.get("ScryfallCode"); - if (res.scryfallCode == null){ + if (res.scryfallCode == null) { res.scryfallCode = res.code; } res.cardsLanguage = section.get("CardLang"); - if (res.cardsLanguage == null){ + if (res.cardsLanguage == null) { res.cardsLanguage = "en"; } @@ -619,7 +620,7 @@ public final class CardEdition implements Comparable { res.borderColor = BorderColor.valueOf(section.get("border", "Black").toUpperCase(Locale.ENGLISH)); Type enumType = Type.UNKNOWN; if (this.isCustomEditions){ - enumType = Type.CUSTOM_SET; // Forcing ThirdParty Edition Type to avoid inconsistencies + enumType = Type.CUSTOM_SET; // Forcing ThirdParty Edition Type to avoid inconsistencies } else { String type = section.get("type"); if (null != type && !type.isEmpty()) { @@ -636,7 +637,7 @@ public final class CardEdition implements Comparable { res.prerelease = section.get("Prerelease", null); res.boosterBoxCount = Integer.parseInt(section.get("BoosterBox", enumType.getBoosterBoxDefault())); - switch(section.get("foil", "newstyle").toLowerCase()) { + switch (section.get("foil", "newstyle").toLowerCase()) { case "notsupported": res.foilType = FoilType.NOT_SUPPORTED; break; @@ -769,7 +770,7 @@ public final class CardEdition implements Comparable { @Override public Map readAll() { Map map = new TreeMap<>(String.CASE_INSENSITIVE_ORDER); - for(CardEdition ce : Collection.this) { + for (CardEdition ce : Collection.this) { List boosterTypes = Lists.newArrayList(ce.getAvailableBoosterTypes()); for (String type : boosterTypes) { String setAffix = type.equals("Draft") ? "" : type; @@ -799,18 +800,18 @@ public final class CardEdition implements Comparable { for (Entry k : cards) { PaperCard cp = StaticData.instance().getCommonCards().getCardFromEdition(k.getKey().getName(), strictness); - if( cp == null && strictness == SetPreference.EarliestCoreExp) { + if (cp == null && strictness == SetPreference.EarliestCoreExp) { strictness = SetPreference.Earliest; // card is not found in core and expansions only (probably something CMD or C13) cp = StaticData.instance().getCommonCards().getCardFromEdition(k.getKey().getName(), strictness); } - if ( cp == null ) + if (cp == null) cp = k.getKey(); // it's unlikely, this code will ever run minEditions.add(cp.getEdition()); } - for(CardEdition ed : getOrderedEditions()) { - if(minEditions.contains(ed.getCode())) + for (CardEdition ed : getOrderedEditions()) { + if (minEditions.contains(ed.getCode())) return ed; } return UNKNOWN; diff --git a/forge-core/src/main/java/forge/card/CardRules.java b/forge-core/src/main/java/forge/card/CardRules.java index c490bbd781a..a0d6cc930aa 100644 --- a/forge-core/src/main/java/forge/card/CardRules.java +++ b/forge-core/src/main/java/forge/card/CardRules.java @@ -513,14 +513,14 @@ public final class CardRules implements ICardCharacteristics { case 'S': if ("S".equals(key)) { this.faces[this.curFace].addStaticAbility(value); - } else if ( "SVar".equals(key) ) { - if ( null == value ) throw new IllegalArgumentException("SVar has no variable name"); + } else if ("SVar".equals(key)) { + if (null == value) throw new IllegalArgumentException("SVar has no variable name"); colonPos = value.indexOf(':'); String variable = colonPos > 0 ? value.substring(0, colonPos) : value; value = colonPos > 0 ? value.substring(1+colonPos) : null; - if ( "Picture".equals(variable) ) { + if ("Picture".equals(variable)) { this.pictureUrl[this.curFace] = value; } else this.faces[curFace].addSVar(variable, value); diff --git a/forge-core/src/main/java/forge/card/CardType.java b/forge-core/src/main/java/forge/card/CardType.java index 257230a184a..2dc2f912a2d 100644 --- a/forge-core/src/main/java/forge/card/CardType.java +++ b/forge-core/src/main/java/forge/card/CardType.java @@ -451,8 +451,7 @@ public final class CardType implements Comparable, CardTypeView { if (calculatedType == null) { if (subtypes.isEmpty()) { calculatedType = StringUtils.join(getTypesBeforeDash(), ' '); - } - else { + } else { calculatedType = StringUtils.join(getTypesBeforeDash(), ' ') + " - " + StringUtils.join(subtypes, " "); } } diff --git a/forge-core/src/main/java/forge/card/MagicColor.java b/forge-core/src/main/java/forge/card/MagicColor.java index 13a73fb55d1..465559faa5a 100644 --- a/forge-core/src/main/java/forge/card/MagicColor.java +++ b/forge-core/src/main/java/forge/card/MagicColor.java @@ -84,7 +84,7 @@ public final class MagicColor { } public static String toShortString(final byte color) { - switch (color){ + switch (color) { case WHITE: return "W"; case BLUE: return "U"; case BLACK: return "B"; @@ -95,7 +95,7 @@ public final class MagicColor { } public static String toLongString(final byte color) { - switch (color){ + switch (color) { case WHITE: return Constant.WHITE; case BLUE: return Constant.BLUE; case BLACK: return Constant.BLACK; diff --git a/forge-core/src/main/java/forge/card/PrintSheet.java b/forge-core/src/main/java/forge/card/PrintSheet.java index 530e9ad2717..822c37bafe2 100644 --- a/forge-core/src/main/java/forge/card/PrintSheet.java +++ b/forge-core/src/main/java/forge/card/PrintSheet.java @@ -29,8 +29,8 @@ public class PrintSheet { public static final IStorage initializePrintSheets(File sheetsFile, CardEdition.Collection editions) { IStorage sheets = new StorageExtendable<>("Special print runs", new PrintSheet.Reader(sheetsFile)); - for(CardEdition edition : editions) { - for(PrintSheet ps : edition.getPrintSheetsBySection()) { + for (CardEdition edition : editions) { + for (PrintSheet ps : edition.getPrintSheetsBySection()) { sheets.add(ps.name, ps); } } @@ -64,7 +64,7 @@ public class PrintSheet { } public void addAll(Iterable cards, int weight) { - for(PaperCard card : cards) + for (PaperCard card : cards) cardsWithWeights.add(card, weight); } @@ -78,15 +78,15 @@ public class PrintSheet { private PaperCard fetchRoulette(int start, int roulette, Collection toSkip) { int sum = start; boolean isSecondRun = start > 0; - for(Entry cc : cardsWithWeights ) { + for (Entry cc : cardsWithWeights ) { sum += cc.getValue(); - if( sum > roulette ) { - if( toSkip != null && toSkip.contains(cc.getKey())) + if (sum > roulette) { + if (toSkip != null && toSkip.contains(cc.getKey())) continue; return cc.getKey(); } } - if( isSecondRun ) + if (isSecondRun) throw new IllegalStateException("Print sheet does not have enough unique cards"); return fetchRoulette(sum + 1, roulette, toSkip); // start over from beginning, in case last cards were to skip @@ -94,8 +94,8 @@ public class PrintSheet { public List all() { List result = new ArrayList<>(); - for(Entry kv : cardsWithWeights) { - for(int i = 0; i < kv.getValue(); i++) { + for (Entry kv : cardsWithWeights) { + for (int i = 0; i < kv.getValue(); i++) { result.add(kv.getKey()); } } @@ -106,26 +106,26 @@ public class PrintSheet { List result = new ArrayList<>(); int totalWeight = cardsWithWeights.countAll(); - if( totalWeight == 0) { + if (totalWeight == 0) { System.err.println("No cards were found on sheet " + name); return result; } // If they ask for 40 unique basic lands (to make a fatpack) out of 20 distinct possible, add the whole print run N times. int uniqueCards = cardsWithWeights.countDistinct(); - while ( number >= uniqueCards ) { - for(Entry kv : cardsWithWeights) { + while (number >= uniqueCards) { + for (Entry kv : cardsWithWeights) { result.add(kv.getKey()); } number -= uniqueCards; } List uniques = wantUnique ? new ArrayList<>() : null; - for(int iC = 0; iC < number; iC++) { + for (int iC = 0; iC < number; iC++) { int index = MyRandom.getRandom().nextInt(totalWeight); PaperCard toAdd = fetchRoulette(0, index, wantUnique ? uniques : null); result.add(toAdd); - if( wantUnique ) + if (wantUnique) uniques.add(toAdd); } return result; diff --git a/forge-core/src/main/java/forge/deck/Deck.java b/forge-core/src/main/java/forge/deck/Deck.java index 24eccbae1b2..8ef91a52b1e 100644 --- a/forge-core/src/main/java/forge/deck/Deck.java +++ b/forge-core/src/main/java/forge/deck/Deck.java @@ -244,7 +244,7 @@ public class Deck extends DeckBase implements Iterable p : parts.entrySet()) { - if( p.getKey() == DeckSection.Planes || p.getKey() == DeckSection.Schemes || p.getKey() == DeckSection.Avatar) + for (Entry p : parts.entrySet()) { + if (p.getKey() == DeckSection.Planes || p.getKey() == DeckSection.Schemes || p.getKey() == DeckSection.Avatar) continue; CardPool newPool = new CardPool(); - for(Entry cp : p.getValue()){ + for (Entry cp : p.getValue()) { PaperCard card = cp.getKey(); int count = cp.getValue(); diff --git a/forge-game/src/main/java/forge/game/GameAction.java b/forge-game/src/main/java/forge/game/GameAction.java index b0a62990da8..a9279ea019d 100644 --- a/forge-game/src/main/java/forge/game/GameAction.java +++ b/forge-game/src/main/java/forge/game/GameAction.java @@ -545,7 +545,7 @@ public class GameAction { if (fromBattlefield && !zoneFrom.getPlayer().equals(zoneTo.getPlayer())) { final Map runParams2 = AbilityKey.mapFromCard(lastKnownInfo); runParams2.put(AbilityKey.OriginalController, zoneFrom.getPlayer()); - if(params != null) { + if (params != null) { runParams2.putAll(params); } game.getTriggerHandler().runTrigger(TriggerType.ChangesController, runParams2, false); diff --git a/forge-game/src/main/java/forge/game/ability/effects/DamageAllEffect.java b/forge-game/src/main/java/forge/game/ability/effects/DamageAllEffect.java index 9d2cb2c41e4..ceba5f12a53 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/DamageAllEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/DamageAllEffect.java @@ -75,8 +75,7 @@ public class DamageAllEffect extends DamageBaseEffect { CardCollectionView list; if (sa.hasParam("ValidCards")) { list = game.getCardsIn(ZoneType.Battlefield); - } - else { + } else { list = CardCollection.EMPTY; } diff --git a/forge-game/src/main/java/forge/game/combat/AttackRestrictionType.java b/forge-game/src/main/java/forge/game/combat/AttackRestrictionType.java index 4e283e71746..0956a885107 100644 --- a/forge-game/src/main/java/forge/game/combat/AttackRestrictionType.java +++ b/forge-game/src/main/java/forge/game/combat/AttackRestrictionType.java @@ -19,7 +19,7 @@ public enum AttackRestrictionType { public Predicate getPredicate(final Card attacker) { switch (this) { case NEED_GREATER_POWER: - return CardPredicates.hasGreaterPowerThan(attacker.getNetPower()); + return CardPredicates.hasGreaterPowerThan(attacker.getNetPower()); case NEED_BLACK_OR_GREEN: return Predicates.and( CardPredicates.isColor((byte) (MagicColor.BLACK | MagicColor.GREEN)), diff --git a/forge-game/src/main/java/forge/game/mana/ManaConversionMatrix.java b/forge-game/src/main/java/forge/game/mana/ManaConversionMatrix.java index 76938cafcd5..f8165271f14 100644 --- a/forge-game/src/main/java/forge/game/mana/ManaConversionMatrix.java +++ b/forge-game/src/main/java/forge/game/mana/ManaConversionMatrix.java @@ -36,8 +36,7 @@ public class ManaConversionMatrix { rowIdx = rowIdx < 0 ? identityMatrix.length - 1 : rowIdx; if (additive) { colorConversionMatrix[rowIdx] |= replacementColor; - } - else { + } else { colorRestrictionMatrix[rowIdx] &= replacementColor; } } diff --git a/forge-game/src/main/java/forge/game/mana/ManaCostBeingPaid.java b/forge-game/src/main/java/forge/game/mana/ManaCostBeingPaid.java index 889aa5baa82..501a59d57e5 100644 --- a/forge-game/src/main/java/forge/game/mana/ManaCostBeingPaid.java +++ b/forge-game/src/main/java/forge/game/mana/ManaCostBeingPaid.java @@ -258,8 +258,7 @@ public class ManaCostBeingPaid { ManaCostShard shard; if (StringUtils.isEmpty(xColor)) { shard = ManaCostShard.GENERIC; - } - else { + } else { shard = ManaCostShard.parseNonGeneric(xColor); } increaseShard(shard, xCost, true); diff --git a/forge-game/src/main/java/forge/game/mana/ManaPool.java b/forge-game/src/main/java/forge/game/mana/ManaPool.java index c78f1cf66bb..2f890d8c5d1 100644 --- a/forge-game/src/main/java/forge/game/mana/ManaPool.java +++ b/forge-game/src/main/java/forge/game/mana/ManaPool.java @@ -137,18 +137,15 @@ public class ManaPool extends ManaConversionMatrix implements Iterable { if (convertToColorless) { convertManaColor(b, (byte)ManaAtom.COLORLESS); cm.addAll(pMana); - } - else { + } else { cleared.addAll(cm); cm.clear(); floatingMana.putAll(b, pMana); } - } - else { + } else { if (convertToColorless) { convertManaColor(b, (byte)ManaAtom.COLORLESS); - } - else { + } else { cleared.addAll(cm); cm.clear(); } @@ -261,8 +258,7 @@ public class ManaPool extends ManaConversionMatrix implements Iterable { if (poolLane != null && poolLane.contains(mana)) { removeFloating.add(mana); - } - else { + } else { manaNotAccountedFor = true; break; } @@ -319,7 +315,7 @@ public class ManaPool extends ManaConversionMatrix implements Iterable { // TODO Debug this for Paying Gonti, byte line = getPossibleColorUses(color); - for(byte outColor : ManaAtom.MANATYPES) { + for (byte outColor : ManaAtom.MANATYPES) { if ((line & outColor) != 0 && shard.canBePaidWithManaOfColor(outColor)) { return true; } diff --git a/forge-game/src/main/java/forge/game/mulligan/MulliganService.java b/forge-game/src/main/java/forge/game/mulligan/MulliganService.java index 0d787327ff1..3da293bb4ff 100644 --- a/forge-game/src/main/java/forge/game/mulligan/MulliganService.java +++ b/forge-game/src/main/java/forge/game/mulligan/MulliganService.java @@ -63,7 +63,7 @@ public class MulliganService { boolean allKept; do { allKept = true; - for(AbstractMulligan mulligan : mulligans) { + for (AbstractMulligan mulligan : mulligans) { if (mulligan.hasKept()) { continue; } @@ -85,7 +85,7 @@ public class MulliganService { } } while (!allKept); - for(AbstractMulligan mulligan : mulligans) { + for (AbstractMulligan mulligan : mulligans) { mulligan.afterMulligan(); } } diff --git a/forge-game/src/main/java/forge/game/player/RegisteredPlayer.java b/forge-game/src/main/java/forge/game/player/RegisteredPlayer.java index 7bf24a25d2e..08ff4bca196 100644 --- a/forge-game/src/main/java/forge/game/player/RegisteredPlayer.java +++ b/forge-game/src/main/java/forge/game/player/RegisteredPlayer.java @@ -136,7 +136,7 @@ public class RegisteredPlayer { } if (appliedVariants.contains(GameType.Vanguard) || appliedVariants.contains(GameType.MomirBasic) || appliedVariants.contains(GameType.MoJhoSto)) { //fix the crash, if somehow the avatar is null, get it directly from the deck - start.setVanguardAvatars(vanguardAvatar == null ? deck.get(DeckSection.Avatar).toFlatList():vanguardAvatar.toFlatList()); + start.setVanguardAvatars(vanguardAvatar == null ? deck.get(DeckSection.Avatar).toFlatList() : vanguardAvatar.toFlatList()); } return start; } @@ -167,7 +167,7 @@ public class RegisteredPlayer { private void setVanguardAvatars(List vanguardAvatars0) { vanguardAvatars = vanguardAvatars0; if (vanguardAvatars == null) { return; } - for(PaperCard avatar: vanguardAvatars){ + for (PaperCard avatar: vanguardAvatars) { setStartingLife(getStartingLife() + avatar.getRules().getLife()); setStartingHand(getStartingHand() + avatar.getRules().getHand()); } diff --git a/forge-game/src/main/java/forge/game/staticability/StaticAbilityCantBeCast.java b/forge-game/src/main/java/forge/game/staticability/StaticAbilityCantBeCast.java index f9d75340e3e..f298d3ef624 100644 --- a/forge-game/src/main/java/forge/game/staticability/StaticAbilityCantBeCast.java +++ b/forge-game/src/main/java/forge/game/staticability/StaticAbilityCantBeCast.java @@ -163,7 +163,6 @@ public class StaticAbilityCantBeCast { return false; } - if (stAb.hasParam("AffectedZone") && !card.isInZone(ZoneType.smartValueOf(stAb.getParam("AffectedZone")))) { return false; } diff --git a/forge-game/src/main/java/forge/game/staticability/StaticAbilityCastWithFlash.java b/forge-game/src/main/java/forge/game/staticability/StaticAbilityCastWithFlash.java index 218b3996a85..c1b51e90d34 100644 --- a/forge-game/src/main/java/forge/game/staticability/StaticAbilityCastWithFlash.java +++ b/forge-game/src/main/java/forge/game/staticability/StaticAbilityCastWithFlash.java @@ -48,11 +48,7 @@ public class StaticAbilityCastWithFlash { return false; } - - - public static boolean commonParts(final StaticAbility stAb, final SpellAbility sa, final Card card, final Player activator) { - if (!stAb.matchesValidParam("ValidCard", card)) { return false; } diff --git a/forge-game/src/main/java/forge/game/trigger/Trigger.java b/forge-game/src/main/java/forge/game/trigger/Trigger.java index c1d71f61551..a3b7d54e6a5 100644 --- a/forge-game/src/main/java/forge/game/trigger/Trigger.java +++ b/forge-game/src/main/java/forge/game/trigger/Trigger.java @@ -535,14 +535,12 @@ public abstract class Trigger extends TriggerReplacementBase { return this.numberTurnActivations; } - public void triggerRun() - { + public void triggerRun() { this.numberTurnActivations++; } // Resets the state stored each turn for per-turn and per-instance restriction - public void resetTurnState() - { + public void resetTurnState() { this.numberTurnActivations = 0; } diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerHandler.java b/forge-game/src/main/java/forge/game/trigger/TriggerHandler.java index 0ee95950379..046e673abe4 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerHandler.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerHandler.java @@ -335,7 +335,7 @@ public class TriggerHandler { waitingTriggers.clear(); } - public void resetTurnTriggerState() { + public void resetTurnTriggerState() { for(final Trigger t : activeTriggers) { t.resetTurnState(); } diff --git a/forge-gui-desktop/src/main/java/forge/screens/home/VLobby.java b/forge-gui-desktop/src/main/java/forge/screens/home/VLobby.java index bf494e89567..cc8903b14f9 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/home/VLobby.java +++ b/forge-gui-desktop/src/main/java/forge/screens/home/VLobby.java @@ -839,7 +839,7 @@ public class VLobby implements ILobbyView { } private boolean isPlayerAI(final int playernum) { - if(playernum < activePlayersNum){ + if (playernum < activePlayersNum) { return playerPanels.get(playernum).isAi(); } return true;