diff --git a/forge-gui-mobile/src/forge/card/CardRenderer.java b/forge-gui-mobile/src/forge/card/CardRenderer.java index 8fd37c2f3f2..b425f2e4d9f 100644 --- a/forge-gui-mobile/src/forge/card/CardRenderer.java +++ b/forge-gui-mobile/src/forge/card/CardRenderer.java @@ -1360,6 +1360,11 @@ public class CardRenderer { } public static void drawFoilEffect(Graphics g, CardView card, float x, float y, float w, float h, boolean inZoomer) { + if (card.getCurrentState().isBattle()) + return; + if (card.getAlternateState() != null && card.getCurrentState().isBattle()) + return; + //todo add support for battle, better to move the render inside the draw method for card in the future or a general foil effect shader.. float new_x = x; float new_y = y; float new_w = w; diff --git a/forge-gui/res/languages/de-DE.properties b/forge-gui/res/languages/de-DE.properties index b3869526743..a7a52144a75 100644 --- a/forge-gui/res/languages/de-DE.properties +++ b/forge-gui/res/languages/de-DE.properties @@ -2483,7 +2483,7 @@ lblWinGameFromYourCommanderDealing=Gewinne ein Spiel durch Zufügen von lblNCombatDamage={0} Commander-Schaden lblDamage=Schaden #CardActivationAchievements.java -lblSpecialCardUltimates=Special Card Ultimates +lblSpecialCardUltimates=Spezielle Karten Ultimaten #ChallengeAchievements.java lblChromatic=Chromatisch lblWinGameAfterCasting5CSpell=Gewinne ein Spiel durch Sprechen eines 5-farbigen Spruches @@ -2964,4 +2964,4 @@ lblStartArena=Willst du in die Arena gehen? lblWouldYouLikeDestroy=Möchten Sie {0} zerstören? lblAdventureDescription=Im Abenteuermodus erkunden Sie die sich ständig ändernde Landschaft von Shandalar und Duell-Kreaturen; um Gold, Scherben, Ausrüstung und neue Karten zu gewinnen, sie alle zu sammeln und der Beste zu werden! lblEmptyDeck=Leeres Kartendeck -lblNoAvailableSlots=Keine verfgbaren Slots +lblNoAvailableSlots=Keine verf�gbaren Slots diff --git a/forge-gui/res/languages/es-ES.properties b/forge-gui/res/languages/es-ES.properties index 088827e7207..1bff4f2119f 100644 --- a/forge-gui/res/languages/es-ES.properties +++ b/forge-gui/res/languages/es-ES.properties @@ -2484,7 +2484,7 @@ lblWinGameFromYourCommanderDealing=Gana una partida de tu comandante que reparte lblNCombatDamage={0} punto(s) de daño de combate lblDamage=Daño #CardActivationAchievements.java -lblSpecialCardUltimates=Special Card Ultimates +lblSpecialCardUltimates=Ultimates de tarjetas especiales #ChallengeAchievements.java lblChromatic=Cromático lblWinGameAfterCasting5CSpell=Gana una partida después de lanzar un hechizo de 5 colores @@ -2965,6 +2965,6 @@ lblBoon=Boon lblExitToWoldMap=Salir al mapa del mundo? lblStartArena=¿Quieres ir a la arena? lblWouldYouLikeDestroy=¿Le gustaría destruir {0}? -lblAdventureDescription=El modo de aventura es donde exploras el paisaje siempre cambiante de Shandalar, y criaturas de duelo para ganar oro, fragmentos, equipos y nuevas tarjetas para convertirte en el mejor y recogerlas a todos! -lblEmptyDeck=Baraja de cartas vaca +lblAdventureDescription=�El modo de aventura es donde exploras el paisaje siempre cambiante de Shandalar, y criaturas de duelo para ganar oro, fragmentos, equipos y nuevas tarjetas para convertirte en el mejor y recogerlas a todos! +lblEmptyDeck=Baraja de cartas vac�a lblNoAvailableSlots=No hay ranuras disponibles diff --git a/forge-gui/res/languages/fr-FR.properties b/forge-gui/res/languages/fr-FR.properties index 66295518438..ac8542fb386 100644 --- a/forge-gui/res/languages/fr-FR.properties +++ b/forge-gui/res/languages/fr-FR.properties @@ -2485,7 +2485,7 @@ lblWinGameFromYourCommanderDealing=Gagnez une partie grâce à votre commandant lblNCombatDamage={0} dégâts de combat lblDamage=Dégâts #CardActivationAchievements.java -lblSpecialCardUltimates=Special Card Ultimates +lblSpecialCardUltimates=Ultimates de carte spéciale #ChallengeAchievements.java lblChromatic=Chromatique lblWinGameAfterCasting5CSpell=Gagner une partie après avoir lancé un sort de 5 couleurs diff --git a/forge-gui/res/languages/it-IT.properties b/forge-gui/res/languages/it-IT.properties index 31e0234878f..50ba4593e23 100644 --- a/forge-gui/res/languages/it-IT.properties +++ b/forge-gui/res/languages/it-IT.properties @@ -2483,7 +2483,7 @@ lblWinGameFromYourCommanderDealing=Vinci una partita grazie al tuo Generale che lblNCombatDamage={0} danni da combattimento lblDamage=Danno #CardActivationAchievements.java -lblSpecialCardUltimates=Special Card Ultimates +lblSpecialCardUltimates=Ultimate delle carte speciali #ChallengeAchievements.java lblChromatic=Cromatico lblWinGameAfterCasting5CSpell=Vinci una partita dopo aver lanciato una magia penta-colore diff --git a/forge-gui/res/languages/ja-JP.properties b/forge-gui/res/languages/ja-JP.properties index a4abf7eb214..b7a029458d8 100644 --- a/forge-gui/res/languages/ja-JP.properties +++ b/forge-gui/res/languages/ja-JP.properties @@ -2483,7 +2483,7 @@ lblWinGameFromYourCommanderDealing=あなたの統率者が与えた lblNCombatDamage={0}点のダメージによりゲームに勝利 lblDamage=ダメージ #CardActivationAchievements.java -lblSpecialCardUltimates=Special Card Ultimates +lblSpecialCardUltimates=特別なカード究極 #ChallengeAchievements.java lblChromatic=彩色 lblWinGameAfterCasting5CSpell=5色の呪文をキャストした後、ゲームに勝利 diff --git a/forge-gui/res/languages/pt-BR.properties b/forge-gui/res/languages/pt-BR.properties index a543c46a29a..f1af00ba0d9 100644 --- a/forge-gui/res/languages/pt-BR.properties +++ b/forge-gui/res/languages/pt-BR.properties @@ -2562,7 +2562,7 @@ lblWinGameFromYourCommanderDealing=Ganhe um jogo com o seu comandante lblNCombatDamage={0} dano de combate lblDamage=Dano #CardActivationAchievements.java -lblSpecialCardUltimates=Special Card Ultimates +lblSpecialCardUltimates=Ultimatos de cartão especial #ChallengeAchievements.java lblChromatic=Cromático lblWinGameAfterCasting5CSpell=Ganhe um jogo após conjurar uma mágica de 5 cores @@ -3056,5 +3056,5 @@ lblStartArena=Você quer entrar na arena? lblWouldYouLikeDestroy=Você gostaria de destruir {0}? lblAdventureDescription=O modo de aventura é onde você explora a paisagem em constante mudança de Shandalar, e duelo para ganhar ouro, fragmentos, equipamentos e novos cartões para se tornarem os melhores e colecioná-los! lblEmptyDeck=Baralho de cartas vazio -lblNoAvailableSlots=No h slots disponveis +lblNoAvailableSlots=N�o h� slots dispon�veis diff --git a/forge-gui/res/languages/zh-CN.properties b/forge-gui/res/languages/zh-CN.properties index 9f8f1469780..6b947171c4e 100644 --- a/forge-gui/res/languages/zh-CN.properties +++ b/forge-gui/res/languages/zh-CN.properties @@ -2485,7 +2485,7 @@ lblWinGameFromYourCommanderDealing=赢得一局游戏游戏中由你的指挥官 lblNCombatDamage={0}战斗伤害 lblDamage=伤害 #CardActivationAchievements.java -lblSpecialCardUltimates=Special Card Ultimates +lblSpecialCardUltimates=特殊的卡片 #ChallengeAchievements.java lblChromatic=五彩 lblWinGameAfterCasting5CSpell=释放过五色咒语后赢的比赛 @@ -2948,5 +2948,5 @@ lblExitToWoldMap=退出世界地图？ lblStartArena=您想进入竞技场吗？ lblWouldYouLikeDestroy=您想销毁{0}吗？ lblAdventureDescription=冒险模式是您探索山达尔（Shandalar）不断变化的景观，以及决斗生物获得黄金，碎片，设备和新卡片，使其成为最好的，并收集所有这些！ -lblEmptyDeck=空牌 - 空牌 -lblNoAvailableSlots=没有可用的槽位 +lblEmptyDeck=空甲板 +lblNoAvailableSlots=没有可用的插槽