external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-20 20:58:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Support displaying Chaos icon in details

Browse Source
This commit is contained in:
drdev
2013-11-14 09:20:29 +00:00
parent 5548c71bda
commit ee00b544f7
4 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
forge-gui/res/skins/default/sprite_icons.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 632 KiB

After

Width:  |  Height:  |  Size: 627 KiB

BIN
forge-gui/res/skins/firebloom/sprite_icons.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 166 KiB

After

Width:  |  Height:  |  Size: 165 KiB

2
forge-gui/src/main/java/forge/card/CardRulesReader.java
View File

@@ -173,7 +173,6 @@ public class CardRulesReader {
case 'O': case 'O':
if ("Oracle".equals(key)) { if ("Oracle".equals(key)) {
this.faces[this.curFace].setOracleText(value); this.faces[this.curFace].setOracleText(value);
} }
break; break;
@@ -224,7 +223,6 @@ public class CardRulesReader {
} }
break; break;
} }
} }
/** /**

2
forge-gui/src/main/java/forge/gui/toolbox/FSkin.java
View File

@@ -1323,6 +1323,7 @@ public enum FSkin {
IMG_SNOW (new int[] {320, 160, 40, 40}), /** */ IMG_SNOW (new int[] {320, 160, 40, 40}), /** */
IMG_TAP (new int[] {660, 440, 20, 20}), /** */ IMG_TAP (new int[] {660, 440, 20, 20}), /** */
IMG_UNTAP (new int[] {640, 460, 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_SLASH (new int[] {660, 400, 10, 13}), /** */
IMG_ATTACK (new int[] {160, 320, 80, 80, 32, 32}), /** */ IMG_ATTACK (new int[] {160, 320, 80, 80, 32, 32}), /** */
IMG_DEFEND (new int[] {160, 400, 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("X", ColorlessManaImages.IMG_X);
addEncodingSymbol("Y", ColorlessManaImages.IMG_Y); addEncodingSymbol("Y", ColorlessManaImages.IMG_Y);
addEncodingSymbol("Z", ColorlessManaImages.IMG_Z); addEncodingSymbol("Z", ColorlessManaImages.IMG_Z);
addEncodingSymbol("C", GameplayImages.IMG_CHAOS);
addEncodingSymbol("Q", GameplayImages.IMG_UNTAP); addEncodingSymbol("Q", GameplayImages.IMG_UNTAP);
addEncodingSymbol("S", GameplayImages.IMG_SNOW); addEncodingSymbol("S", GameplayImages.IMG_SNOW);
addEncodingSymbol("T", GameplayImages.IMG_TAP); addEncodingSymbol("T", GameplayImages.IMG_TAP);