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

Fix Meld cards in FIN (#7973)

Browse Source
This commit is contained in:
Eradev
2025-07-09 01:39:48 -04:00
committed by GitHub
parent 127d0fced6
commit fd5af3c93e
24 changed files with 204 additions and 198 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
forge-core/src/main/java/forge/util/ImageUtil.java
View File

@@ -236,9 +236,15 @@ public class ImageUtil {
} else if (cp.getRules().getSplitType() == CardSplitType.Meld } else if (cp.getRules().getSplitType() == CardSplitType.Meld
&& !cardCollectorNumber.endsWith("a") && !cardCollectorNumber.endsWith("a")
&& !cardCollectorNumber.endsWith("b")) { && !cardCollectorNumber.endsWith("b")) {
// Only the bottom half of a meld card shares a collector number. // Only the bottom half of a meld card shares a collector number.
// Hanweir Garrison EMN already has a appended. // Hanweir Garrison EMN already has a appended.
cardCollectorNumber += face.equals("back") ? "b" : "a"; // Exception: The front facing card doesn't use a in FIN
if (face.equals("back")) {
cardCollectorNumber += "b";
} else if (!editionCode.equals("fin")) {
cardCollectorNumber += "a";
}
} }
String cardCollectorNumberEncoded; String cardCollectorNumberEncoded;

6
forge-gui/res/editions/Final Fantasy.txt
View File

@@ -172,7 +172,7 @@ Replace=.18F BasicLand:fromSheet("FIN cards"):!fromSheet("FIN dual lands")+
104 R Jecht, Reluctant Guardian @Michael MacRae 104 R Jecht, Reluctant Guardian @Michael MacRae
105 R Kain, Traitorous Dragoon @Russell Dongjun Lu 105 R Kain, Traitorous Dragoon @Russell Dongjun Lu
106 C Malboro @Dan Watson 106 C Malboro @Dan Watson
107 C Namazu Trader @Andrea Montalto 107 C Namazu Trader @Andrea Tentori Montalto
108 R Ninja's Blades @Immanuela Crovius 108 R Ninja's Blades @Immanuela Crovius
109 U Overkill @Bachzim 109 U Overkill @Bachzim
110 U Phantom Train @Gal Or 110 U Phantom Train @Gal Or
@@ -362,7 +362,7 @@ Replace=.18F BasicLand:fromSheet("FIN cards"):!fromSheet("FIN dual lands")+
294 L Plains @Shahab Alizadeh 294 L Plains @Shahab Alizadeh
295 L Plains @Jonas De Ro 295 L Plains @Jonas De Ro
296 L Plains @Eddie Mendoza 296 L Plains @Eddie Mendoza
297 L Island @Fabira Khamesh 297 L Island @Fariba Khamseh
298 L Island @Eddie Mendoza 298 L Island @Eddie Mendoza
299 L Island @Jeremy Paillotin 299 L Island @Jeremy Paillotin
300 L Swamp @Domenico Cava 300 L Swamp @Domenico Cava
@@ -426,7 +426,7 @@ Replace=.18F BasicLand:fromSheet("FIN cards"):!fromSheet("FIN dual lands")+
340 R Triple Triad @Hagiya Kaoru 340 R Triple Triad @Hagiya Kaoru
341 U Clash of the Eikons @Hagiya Kaoru 341 U Clash of the Eikons @Hagiya Kaoru
342 R The Earth Crystal @Kei Satsuki 342 R The Earth Crystal @Kei Satsuki
343 R Jumbo Cactuar @Yumeko 343 R Jumbo Cactuar @Hisashi Momose
344 R A Realm Reborn @Ono Tako 344 R A Realm Reborn @Ono Tako
345 U Torgal, A Fine Hound @Makura Tami 345 U Torgal, A Fine Hound @Makura Tami
346 R Jenova, Ancient Calamity @Karo ARAI 346 R Jenova, Ancient Calamity @Karo ARAI