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

Merge branch 'fix_phyrexian_mana' into 'master'

Browse Source 
Add pure Phyrexian mana symbol for Rage Extractor

See merge request core-developers/forge!5184
This commit is contained in:
Michael Kamensky
2021-08-06 03:29:42 +00:00
parent 1d4f68d95f 763d509638
commit 37de739a9c
8 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
forge-gui-desktop/src/main/java/forge/ImageCache.java
View File

@@ -256,8 +256,10 @@ public class ImageCache {
legalString = "Illus. " + ipc.getArtist() + " ©" + year + " WOTC";
}
FCardImageRenderer.drawCardImage(original.createGraphics(), card, altState, width, height, art, legalString);
if (art != null || !fetcherEnabled)
_CACHE.put(originalKey, original);
// Skip store cache since the rendering speed seems to be fast enough
// Also the scaleImage below will already cache re-sized image for CardPanel anyway
// if (art != null || !fetcherEnabled)
// _CACHE.put(originalKey, original);
} else {
original = _defaultImage;
}

1
forge-gui-desktop/src/main/java/forge/toolbox/CardFaceSymbols.java
View File

@@ -64,6 +64,7 @@ public class CardFaceSymbols {
MANA_IMAGES.put("W", FSkin.getImage(FSkinProp.IMG_MANA_W));
MANA_IMAGES.put("WB", FSkin.getImage(FSkinProp.IMG_MANA_HYBRID_WB));
MANA_IMAGES.put("WU", FSkin.getImage(FSkinProp.IMG_MANA_HYBRID_WU));
MANA_IMAGES.put("P", FSkin.getImage(FSkinProp.IMG_MANA_PHRYX));
MANA_IMAGES.put("PW", FSkin.getImage(FSkinProp.IMG_MANA_PHRYX_W));
MANA_IMAGES.put("PR", FSkin.getImage(FSkinProp.IMG_MANA_PHRYX_R));
MANA_IMAGES.put("PU", FSkin.getImage(FSkinProp.IMG_MANA_PHRYX_U));

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

@@ -1405,6 +1405,7 @@ public class FSkin {
addEncodingSymbol("2/B", FSkinProp.IMG_MANA_2B);
addEncodingSymbol("2/R", FSkinProp.IMG_MANA_2R);
addEncodingSymbol("2/G", FSkinProp.IMG_MANA_2G);
addEncodingSymbol("P", FSkinProp.IMG_MANA_PHRYX);
addEncodingSymbol("P/W", FSkinProp.IMG_MANA_PHRYX_W);
addEncodingSymbol("P/U", FSkinProp.IMG_MANA_PHRYX_U);
addEncodingSymbol("P/B", FSkinProp.IMG_MANA_PHRYX_B);

1
forge-gui-mobile/src/forge/assets/FSkinImage.java
View File

@@ -62,6 +62,7 @@ public enum FSkinImage implements FImage {
MANA_HYBRID_UR (FSkinProp.IMG_MANA_HYBRID_UR, SourceFile.MANAICONS),
MANA_HYBRID_WB (FSkinProp.IMG_MANA_HYBRID_WB, SourceFile.MANAICONS),
MANA_HYBRID_WU (FSkinProp.IMG_MANA_HYBRID_WU, SourceFile.MANAICONS),
MANA_PHRYX (FSkinProp.IMG_MANA_PHRYX, SourceFile.MANAICONS),
MANA_PHRYX_U (FSkinProp.IMG_MANA_PHRYX_U, SourceFile.MANAICONS),
MANA_PHRYX_W (FSkinProp.IMG_MANA_PHRYX_W, SourceFile.MANAICONS),
MANA_PHRYX_R (FSkinProp.IMG_MANA_PHRYX_R, SourceFile.MANAICONS),

1
forge-gui-mobile/src/forge/assets/TextRenderer.java
View File

@@ -43,6 +43,7 @@ public class TextRenderer {
symbolLookup.put("2/B", FSkinImage.MANA_2B);
symbolLookup.put("2/R", FSkinImage.MANA_2R);
symbolLookup.put("2/G", FSkinImage.MANA_2G);
symbolLookup.put("P", FSkinImage.MANA_PHRYX);
symbolLookup.put("P/W", FSkinImage.MANA_PHRYX_W);
symbolLookup.put("P/U", FSkinImage.MANA_PHRYX_U);
symbolLookup.put("P/B", FSkinImage.MANA_PHRYX_B);

1
forge-gui-mobile/src/forge/card/CardFaceSymbols.java
View File

@@ -56,6 +56,7 @@ public class CardFaceSymbols {
MANA_IMAGES.put("W", FSkinImage.MANA_W);
MANA_IMAGES.put("WB", FSkinImage.MANA_HYBRID_WB);
MANA_IMAGES.put("WU", FSkinImage.MANA_HYBRID_WU);
MANA_IMAGES.put("P", FSkinImage.MANA_PHRYX);
MANA_IMAGES.put("PW", FSkinImage.MANA_PHRYX_W);
MANA_IMAGES.put("PR", FSkinImage.MANA_PHRYX_R);
MANA_IMAGES.put("PU", FSkinImage.MANA_PHRYX_U);

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

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 108 KiB

After

Width:  |  Height:  |  Size: 152 KiB

1
forge-gui/src/main/java/forge/localinstance/skin/FSkinProp.java
View File

@@ -93,6 +93,7 @@ public enum FSkinProp {
IMG_MANA_HYBRID_UR (new int[] {412, 330, 80, 80}, PropType.MANAICONS),
IMG_MANA_HYBRID_WB (new int[] {330, 412, 80, 80}, PropType.MANAICONS),
IMG_MANA_HYBRID_WU (new int[] {412, 412, 80, 80}, PropType.MANAICONS),
IMG_MANA_PHRYX (new int[] {166, 822, 80, 80}, PropType.MANAICONS),
IMG_MANA_PHRYX_U (new int[] {330, 248, 80, 80}, PropType.MANAICONS),
IMG_MANA_PHRYX_W (new int[] {412, 248, 80, 80}, PropType.MANAICONS),
IMG_MANA_PHRYX_R (new int[] {412, 166, 80, 80}, PropType.MANAICONS),