Revert Comment out some currently unsupported cards in Commander precons

forge-core/src/main/java/forge/card/CardRules.java

@@ -67,7 +67,7 @@ public final class CardRules implements ICardCharacteristics {
     }
 
     void reinitializeFromRules(CardRules newRules) {
-        if(!newRules.getName().equals(this.getName()))
+        if (!newRules.getName().equals(this.getName()))
             throw new UnsupportedOperationException("You cannot rename the card using the same CardRules object");
 
         splitType = newRules.splitType;
@@ -91,7 +91,7 @@ public final class CardRules implements ICardCharacteristics {
             }
         }
         int len = oracleText.length();
-        for(int i = 0; i < len; i++) {
+        for (int i = 0; i < len; i++) {
             char c = oracleText.charAt(i); // This is to avoid needless allocations performed by toCharArray()
             switch(c) {
                 case('('): isReminder = i > 0; break; // if oracle has only reminder, consider it valid rules (basic and true lands need this)
@@ -99,7 +99,7 @@ public final class CardRules implements ICardCharacteristics {
                 case('{'): isSymbol = true; break;
                 case('}'): isSymbol = false; break;
                 default:
-                    if(isSymbol && !isReminder) {
+                    if (isSymbol && !isReminder) {
                         switch(c) {
                             case('W'): res |= MagicColor.WHITE; break;
                             case('U'): res |= MagicColor.BLUE; break;
@@ -317,7 +317,7 @@ public final class CardRules implements ICardCharacteristics {
     /** Instantiates class, reads a card. For batch operations better create you own reader instance. */
     public static CardRules fromScript(Iterable<String> script) {
         Reader crr = new Reader();
-        for(String line : script) {
+        for (String line : script) {
             crr.parseLine(line);
         }
         return crr.getCard();

forge-core/src/main/java/forge/card/CardRulesPredicates.java

@@ -270,7 +270,6 @@ public final class CardRulesPredicates {
         return new PredicateSuperType(type, isEqual);
     }
 
-
     /**
      * Checks for color.
      *

forge-core/src/main/java/forge/item/PaperToken.java

@@ -122,7 +122,7 @@ public class PaperToken implements InventoryItemFromSet, IPaperCard {
             String formatEdition = null == edition || CardEdition.UNKNOWN == edition ? "" : "_" + edition.getCode().toLowerCase();
 
             this.imageFileName.add(String.format("%s%s", imageFileName, formatEdition));
-            for(int idx = 2; idx <= this.artIndex; idx++) {
+            for (int idx = 2; idx <= this.artIndex; idx++) {
                 this.imageFileName.add(String.format("%s%d%s", imageFileName, idx, formatEdition));
             }
         }

forge-core/src/main/java/forge/token/TokenDb.java

@@ -40,7 +40,7 @@ public class TokenDb implements ITokenDatabase {
     }
 
     public void preloadTokens() {
-        for(CardEdition edition : this.editions) {
+        for (CardEdition edition : this.editions) {
             for (String name : edition.getTokens().keySet()) {
                 try {
                     getToken(name, edition.getCode());

forge-game/src/main/java/forge/game/card/TokenCreateTable.java

@@ -89,7 +89,6 @@ public class TokenCreateTable extends ForwardingTable<Player, Card, Integer> {
             result += c.getValue();
         }
 
-        
         return result;
     }
 }

forge-gui/res/cardsfolder/c/chrome_mox.txt

@@ -2,7 +2,7 @@ Name:Chrome Mox
 ManaCost:0
 Types:Artifact
 T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | OptionalDecider$ You | Execute$ TrigExile | TriggerDescription$ Imprint — When CARDNAME enters the battlefield, you may exile a nonartifact, nonland card from your hand.
-SVar:TrigExile:DB$ChangeZone | Imprint$ True | Origin$ Hand | Destination$ Exile | ChangeType$ Card.nonArtifact+nonLand | ChangeNum$ 1
+SVar:TrigExile:DB$ ChangeZone | Imprint$ True | Origin$ Hand | Destination$ Exile | ChangeType$ Card.nonArtifact+nonLand | ChangeNum$ 1
 A:AB$ ManaReflected | Cost$ T | Valid$ Defined.Imprinted | ColorOrType$ Color | ReflectProperty$ Is | SpellDescription$ Add one mana of any of the exiled card's colors.
 T:Mode$ ChangesZone | Origin$ Battlefield | ValidCard$ Card.Self | Destination$ Any | Execute$ DBCleanup | Static$ True
 T:Mode$ ChangesZone | Origin$ Exile | Destination$ Any | Static$ True | ValidCard$ Card.IsImprinted+ExiledWithSource | Execute$ DBForget

forge-gui/res/cardsfolder/c/cold_storage.txt

@@ -6,7 +6,7 @@ A:AB$ ChangeZoneAll | Cost$ Sac<1/CARDNAME> | ChangeType$ Card.Creature+IsRememb
 T:Mode$ ChangesZone | Origin$ Exile | Destination$ Any | Static$ True | ValidCard$ Card.IsRemembered+ExiledWithSource | Execute$ DBForget
 SVar:DBForget:DB$ Pump | ForgetObjects$ TriggeredCard
 T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | Static$ True | ValidCard$ Card.Self | Execute$ DBCleanup
-SVar:DBCleanup:DB$Cleanup | ClearRemembered$ True
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:NonStackingEffect:True
 AI:RemoveDeck:All
 SVar:Picture:http://www.wizards.com/global/images/magic/general/cold_storage.jpg

forge-gui/res/quest/commanderprecons/Built from Scratch (2018).dck

@@ -32,7 +32,7 @@ Name=Built from Scratch (2018)
 1 Great Furnace|CM2
 1 Hoard-Smelter Dragon|CM2
 1 Ichor Wellspring|CM2
-#1 Impact Resonance|CM2
+1 Impact Resonance|CM2
 1 Incite Rebellion|CM2
 1 Ingot Chewer|CM2
 1 Jalum Tome|CM2

forge-gui/res/quest/commanderprecons/Built from Scratch.dck

@@ -32,7 +32,7 @@ Name=Built from Scratch
 1 Great Furnace|C14
 1 Hoard-Smelter Dragon|C14
 1 Ichor Wellspring|C14
-#1 Impact Resonance|C14
+1 Impact Resonance|C14
 1 Incite Rebellion|C14
 1 Ingot Chewer|C14
 1 Jalum Tome|C14

forge-gui/res/quest/commanderprecons/Entropic Uprising.dck

@@ -83,6 +83,6 @@ Name=Entropic Uprising
 1 Curtains' Call|C16
 1 Parting Thoughts|C16
 1 Grave Upheaval|C16
-#1 Cruel Entertainment|C16
+1 Cruel Entertainment|C16
 1 Treacherous Terrain|C16
 1 Ash Barrens|C16

forge-gui/res/quest/commanderprecons/Feline Ferocity.dck

@@ -77,7 +77,7 @@ Name=Feline Ferocity
 1 Soul's Majesty|C17
 1 Spirit of the Hearth|C17
 1 Staff of Nin|C17
-#1 Stalking Leonin|C17
+1 Stalking Leonin|C17
 1 Stirring Wildwood|C17
 1 Sunspear Shikari|C17
 1 Swiftfoot Boots|C17