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

ManaCostShard: add Hybrid Colorless (#5199)

Browse Source 
* ManaCostShard: add Hybrid Colorless

* Add Hybrid Colorless Sprite

* fix CostReduction for ColorlessHybrid

---------

Co-authored-by: tool4ever <therealtoolkit@hotmail.com>
This commit is contained in:
Hans Mackowiak
2024-05-06 07:21:01 +02:00
committed by GitHub
parent e49d57851f
commit 31ab875d6e
15 changed files with 103 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -109,6 +109,11 @@ public class CardFaceSymbols {
MANA_IMAGES.put("2R", FSkin.getImage(FSkinProp.IMG_MANA_2R));
MANA_IMAGES.put("2G", FSkin.getImage(FSkinProp.IMG_MANA_2G));
MANA_IMAGES.put("2B", FSkin.getImage(FSkinProp.IMG_MANA_2B));
MANA_IMAGES.put("CW", FSkin.getImage(FSkinProp.IMG_MANA_HYBRID_CW));
MANA_IMAGES.put("CU", FSkin.getImage(FSkinProp.IMG_MANA_HYBRID_CU));
MANA_IMAGES.put("CR", FSkin.getImage(FSkinProp.IMG_MANA_HYBRID_CR));
MANA_IMAGES.put("CG", FSkin.getImage(FSkinProp.IMG_MANA_HYBRID_CG));
MANA_IMAGES.put("CB", FSkin.getImage(FSkinProp.IMG_MANA_HYBRID_CB));
MANA_IMAGES.put("S", FSkin.getImage(FSkinProp.IMG_MANA_SNOW));
MANA_IMAGES.put("T", FSkin.getImage(FSkinProp.IMG_TAP));

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

@@ -1098,7 +1098,7 @@ public class FSkin {
private static String preferredDir;
private static String preferredName;
private static BufferedImage bimDefaultSprite, bimFavIcon, bimPreferredSprite, bimFoils, bimQuestDraftDeck, bimOldFoils,
bimDefaultAvatars, bimPreferredAvatars, bimTrophies, bimAbilities, bimManaIcons, bimPhyrexian, bimDefaultSleeve,
bimDefaultAvatars, bimPreferredAvatars, bimTrophies, bimAbilities, bimManaIcons, bimPhyrexian, bimColorlessHybrid, bimDefaultSleeve,
bimDefaultSleeve2, bimDefaultDeckbox, bimPrefferedSetLogo, bimDefaultWatermark, bimDefaultDraftRank;
private static int x0, y0, w0, h0, newW, newH, preferredW, preferredH;
private static int defaultFontSize = 12;
@@ -1239,8 +1239,9 @@ public class FSkin {
final File f15 = new File(defaultDir + ForgeConstants.SPRITE_SETLOGO_FILE);
final File f16 = new File(preferredDir + ForgeConstants.SPRITE_SETLOGO_FILE);
final File f17 = new File(defaultDir + ForgeConstants.SPRITE_WATERMARK_FILE);
final File f18 = new File(defaultDir +ForgeConstants.SPRITE_PHYREXIAN_FILE);
final File f19 = new File(defaultDir + ForgeConstants.SPRITE_DRAFTRANKS_FILE);
final File f18 = new File(defaultDir + ForgeConstants.SPRITE_PHYREXIAN_FILE);
final File f19 = new File(defaultDir + ForgeConstants.SPRITE_COLORLESS_HYBRID_FILE);
final File f20 = new File(defaultDir + ForgeConstants.SPRITE_DRAFTRANKS_FILE);
try {
int p = 0;
@@ -1252,6 +1253,8 @@ public class FSkin {
FView.SINGLETON_INSTANCE.incrementSplashProgessBar(++p);
bimPhyrexian = ImageIO.read(f18);
FView.SINGLETON_INSTANCE.incrementSplashProgessBar(++p);
bimColorlessHybrid = ImageIO.read(f19);
FView.SINGLETON_INSTANCE.incrementSplashProgessBar(++p);
bimPreferredSprite = ImageIO.read(f2);
FView.SINGLETON_INSTANCE.incrementSplashProgessBar(++p);
bimFoils = ImageIO.read(f3);
@@ -1266,7 +1269,7 @@ public class FSkin {
FView.SINGLETON_INSTANCE.incrementSplashProgessBar(++p);
bimDefaultDeckbox = ImageIO.read(f14);
FView.SINGLETON_INSTANCE.incrementSplashProgessBar(++p);
bimDefaultDraftRank = ImageIO.read(f19);
bimDefaultDraftRank = ImageIO.read(f20);
FView.SINGLETON_INSTANCE.incrementSplashProgessBar(++p);
bimPrefferedSetLogo = f16.exists() ? ImageIO.read(f16) : ImageIO.read(f15);
FView.SINGLETON_INSTANCE.incrementSplashProgessBar(++p);
@@ -1336,6 +1339,9 @@ public class FSkin {
case PHYREXIAN:
setImage(prop, bimPhyrexian);
break;
case COLORLESS_HYBRID:
setImage(prop, bimColorlessHybrid);
break;
case DECKBOX:
setImage(prop, bimDefaultDeckbox);
break;
@@ -1378,6 +1384,7 @@ public class FSkin {
bimTrophies.flush();
bimAbilities.flush();
bimPhyrexian.flush();
bimColorlessHybrid.flush();
bimManaIcons.flush();
if (bimPreferredAvatars != null) { bimPreferredAvatars.flush(); }
@@ -1398,6 +1405,7 @@ public class FSkin {
bimTrophies = null;
bimAbilities = null;
bimPhyrexian = null;
bimColorlessHybrid = null;
bimManaIcons = null;
//establish encoding symbols
@@ -1431,6 +1439,11 @@ 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("C/W", FSkinProp.IMG_MANA_HYBRID_CW);
addEncodingSymbol("C/U", FSkinProp.IMG_MANA_HYBRID_CU);
addEncodingSymbol("C/B", FSkinProp.IMG_MANA_HYBRID_CB);
addEncodingSymbol("C/R", FSkinProp.IMG_MANA_HYBRID_CR);
addEncodingSymbol("C/G", FSkinProp.IMG_MANA_HYBRID_CG);
addEncodingSymbol("P", FSkinProp.IMG_MANA_PHRYX);
addEncodingSymbol("P/W", FSkinProp.IMG_MANA_PHRYX_W);
addEncodingSymbol("P/U", FSkinProp.IMG_MANA_PHRYX_U);