Droog71
/
magarena
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

show other side of unimplemented card in card explorer

master
melvinzhang 2016-01-06 11:03:35 +08:00
parent 37c47e405e
commit 1fee8d6607
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/magic/data/CardDefinitions.java
View File

@ -252,6 +252,15 @@ public class CardDefinitions {
}
}
public static MagicCardDefinition getMissingOrCard(final String original) {
final String key = getASCII(original);
if (missingCards != null && missingCards.containsKey(key)) {
return missingCards.get(key);
} else {
return getCard(original);
}
}
public static MagicCardDefinition getCard(final String original) {
final String key = getASCII(original);
// lazy loading of card scripts

4
src/magic/model/MagicCardDefinition.java
View File

@ -379,7 +379,7 @@ public class MagicCardDefinition implements MagicAbilityStore, IRenderableCard {
public MagicCardDefinition getFlippedDefinition() {
if (flipCardDefinition == null) {
flipCardDefinition = isFlipCard() ?
CardDefinitions.getCard(flipCardName) :
CardDefinitions.getMissingOrCard(flipCardName) :
MagicCardDefinition.UNKNOWN;
}
return flipCardDefinition;
@ -388,7 +388,7 @@ public class MagicCardDefinition implements MagicAbilityStore, IRenderableCard {
public MagicCardDefinition getTransformedDefinition() {
if (transformCardDefinition == null) {
transformCardDefinition = isDoubleFaced() ?
CardDefinitions.getCard(transformCardName) :
CardDefinitions.getMissingOrCard(transformCardName) :
MagicCardDefinition.UNKNOWN;
}
return transformCardDefinition;

2
src/magic/ui/duel/viewer/CardViewer.java
View File

@ -108,7 +108,7 @@ public class CardViewer extends JPanel implements ICardSelectionListener {
}
private void switchCardAspect() {
if (currentCardDefinition.hasMultipleAspects() && currentCardDefinition.isValid()) {
if (currentCardDefinition.hasMultipleAspects()) {
setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
if (currentCardDefinition.isDoubleFaced()) {
setCard(currentCardDefinition.getTransformedDefinition());