From 143ca4ad41c7cb628bd59dc340ac00ba4a3bd7cb Mon Sep 17 00:00:00 2001 From: CCTV-1 Date: Mon, 3 Feb 2020 08:50:30 +0800 Subject: [PATCH] if token is a card clone,still translate it(e.g momir basic token). --- forge-gui-mobile/src/forge/card/CardImageRenderer.java | 6 +++++- forge-gui/src/main/java/forge/card/CardDetailUtil.java | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/forge-gui-mobile/src/forge/card/CardImageRenderer.java b/forge-gui-mobile/src/forge/card/CardImageRenderer.java index 3a9e12c2921..b2668a5010e 100644 --- a/forge-gui-mobile/src/forge/card/CardImageRenderer.java +++ b/forge-gui-mobile/src/forge/card/CardImageRenderer.java @@ -271,7 +271,11 @@ public class CardImageRenderer { g.drawImage(image, x + (w - iconSize) / 2, y + (h - iconSize) / 2, iconSize, iconSize); } else { - boolean needTranslation = !card.isToken(); + boolean needTranslation = true; + if (card.isToken()) { + if (card.getCloneOrigin() == null) + needTranslation = false; + } final String text = card.getText(state, needTranslation ? CardTranslation.getTranslationTexts(state.getName(), "") : null); if (StringUtils.isEmpty(text)) { return; } diff --git a/forge-gui/src/main/java/forge/card/CardDetailUtil.java b/forge-gui/src/main/java/forge/card/CardDetailUtil.java index d3e180ef9e8..4a71798f51f 100644 --- a/forge-gui/src/main/java/forge/card/CardDetailUtil.java +++ b/forge-gui/src/main/java/forge/card/CardDetailUtil.java @@ -280,7 +280,11 @@ public class CardDetailUtil { area.append("\n"); } - boolean needTranslation = !card.isToken(); + boolean needTranslation = true; + if (card.isToken()) { + if (card.getCloneOrigin() == null) + needTranslation = false; + } String text = card.getText(state, needTranslation ? CardTranslation.getTranslationTexts(state.getName(), "") : null); // LEVEL [0-9]+-[0-9]+