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

Split cards' images are properly shown

Browse Source
This commit is contained in:
Maxmtg
2013-02-22 08:55:25 +00:00
parent 871f0f739b
commit 6f194b1608
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/forge/card/cardfactory/CardFactory.java
View File

@@ -159,7 +159,7 @@ public class CardFactory {
final boolean bCopyDetails) { final boolean bCopyDetails) {
Player originalController = original.getController(); Player originalController = original.getController();
Player controller = sa.getActivatingPlayer(); Player controller = sa.getActivatingPlayer();
final Card c = Singletons.getModel().getCardFactory().copyCard(original); final Card c = copyCard(original);
// change the color of the copy (eg: Fork) // change the color of the copy (eg: Fork)
final SpellAbility sourceSA = source.getFirstSpellAbility(); final SpellAbility sourceSA = source.getFirstSpellAbility();
@@ -239,7 +239,8 @@ public class CardFactory {
c.setCurSetCode(cp.getEdition()); c.setCurSetCode(cp.getEdition());
c.setRandomPicture(cp.getArtIndex() + 1); c.setRandomPicture(cp.getArtIndex() + 1);
c.setImageFilename(cp.getImageFilename()); String originalPicture = cp.getImageFilename();
c.setImageFilename(originalPicture);
c.setToken(cp.isToken()); c.setToken(cp.isToken());
if (c.hasAlternateState()) { if (c.hasAlternateState()) {
@@ -249,8 +250,14 @@ public class CardFactory {
if (c.isDoubleFaced()) { if (c.isDoubleFaced()) {
c.setState(CardCharacteristicName.Transformed); c.setState(CardCharacteristicName.Transformed);
} }
c.setCurSetCode(cp.getEdition()); if (c.getRules().getSplitType() == CardSplitType.Split) {
c.setState(CardCharacteristicName.LeftSplit);
c.setImageFilename(originalPicture);
c.setState(CardCharacteristicName.RightSplit);
c.setImageFilename(originalPicture);
} else {
c.setImageFilename(CardUtil.buildFilename(c)); c.setImageFilename(CardUtil.buildFilename(c));
}
c.setState(CardCharacteristicName.Original); c.setState(CardCharacteristicName.Original);
} }
return c; return c;
@@ -344,7 +351,8 @@ public class CardFactory {
card.setState(CardCharacteristicName.Original); card.setState(CardCharacteristicName.Original);
} }
if ( st == CardSplitType.Split ) { if ( st == CardSplitType.Split ) {
// BUILD COMBINED 'ORIGINAL' SIDE card.setName(rules.getName());
// BUILD COMBINED 'Original' SIDE HERE
} }
return card; return card;