diff --git a/forge-gui/res/skins/default/sprite_icons.png b/forge-gui/res/skins/default/sprite_icons.png index 29961579bd8..2a0d9845d7b 100644 Binary files a/forge-gui/res/skins/default/sprite_icons.png and b/forge-gui/res/skins/default/sprite_icons.png differ diff --git a/forge-gui/res/skins/firebloom/sprite_icons.png b/forge-gui/res/skins/firebloom/sprite_icons.png index d8779c91fd1..9321084af30 100644 Binary files a/forge-gui/res/skins/firebloom/sprite_icons.png and b/forge-gui/res/skins/firebloom/sprite_icons.png differ diff --git a/forge-gui/src/main/java/forge/card/CardRulesReader.java b/forge-gui/src/main/java/forge/card/CardRulesReader.java index fa7cbe882ee..d434c80cc0b 100644 --- a/forge-gui/src/main/java/forge/card/CardRulesReader.java +++ b/forge-gui/src/main/java/forge/card/CardRulesReader.java @@ -173,7 +173,6 @@ public class CardRulesReader { case 'O': if ("Oracle".equals(key)) { this.faces[this.curFace].setOracleText(value); - } break; @@ -224,7 +223,6 @@ public class CardRulesReader { } break; } - } /** diff --git a/forge-gui/src/main/java/forge/gui/toolbox/FSkin.java b/forge-gui/src/main/java/forge/gui/toolbox/FSkin.java index df26142b53a..913b4d8ca8b 100644 --- a/forge-gui/src/main/java/forge/gui/toolbox/FSkin.java +++ b/forge-gui/src/main/java/forge/gui/toolbox/FSkin.java @@ -1323,6 +1323,7 @@ public enum FSkin { IMG_SNOW (new int[] {320, 160, 40, 40}), /** */ IMG_TAP (new int[] {660, 440, 20, 20}), /** */ IMG_UNTAP (new int[] {640, 460, 20, 20}), /** */ + IMG_CHAOS (new int[] {320, 400, 40, 40}), /** */ IMG_SLASH (new int[] {660, 400, 10, 13}), /** */ IMG_ATTACK (new int[] {160, 320, 80, 80, 32, 32}), /** */ IMG_DEFEND (new int[] {160, 400, 80, 80, 32, 32}), /** */ @@ -1919,6 +1920,7 @@ public enum FSkin { addEncodingSymbol("X", ColorlessManaImages.IMG_X); addEncodingSymbol("Y", ColorlessManaImages.IMG_Y); addEncodingSymbol("Z", ColorlessManaImages.IMG_Z); + addEncodingSymbol("C", GameplayImages.IMG_CHAOS); addEncodingSymbol("Q", GameplayImages.IMG_UNTAP); addEncodingSymbol("S", GameplayImages.IMG_SNOW); addEncodingSymbol("T", GameplayImages.IMG_TAP);