From 3c186e38ded59cc25f3f8cc08bb2cacddc247c1b Mon Sep 17 00:00:00 2001 From: Anthony Calosa Date: Thu, 11 Aug 2022 20:43:05 +0800 Subject: [PATCH] Update DuelScene.java fix avatar and player extra cards overwritten by blank effects.. (effect cards uses setcardsonbattlefields) --- .../src/forge/adventure/scene/DuelScene.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/forge-gui-mobile/src/forge/adventure/scene/DuelScene.java b/forge-gui-mobile/src/forge/adventure/scene/DuelScene.java index c38b92e88a5..eb0cadc4d2c 100644 --- a/forge-gui-mobile/src/forge/adventure/scene/DuelScene.java +++ b/forge-gui-mobile/src/forge/adventure/scene/DuelScene.java @@ -90,8 +90,8 @@ public class DuelScene extends ForgeScene { FThreads.invokeInEdtNowOrLater(() -> FOptionPane.showMessageDialog(message, enemyName, new FBufferedImage(120, 120) { @Override protected void draw(Graphics g, float w, float h) { - if (FSkin.getAvatars().get(90000) != null) - g.drawImage(FSkin.getAvatars().get(90000), 0, 0, w, h); + if (FSkin.getAvatars().get(90001) != null) + g.drawImage(FSkin.getAvatars().get(90001), 0, 0, w, h); } }, new Callback() { @Override @@ -135,7 +135,7 @@ public class DuelScene extends ForgeScene { changeStartCards+= data.changeStartCards; startCards.addAll(data.startBattleWithCards()); } - player.addExtraCardsOnBattlefield(startCards); + player.setCardsOnBattlefield(startCards); player.setStartingLife(Math.max(1,lifeMod+player.getStartingLife())); player.setStartingHand(player.getStartingHand()+changeStartCards); } @@ -179,7 +179,7 @@ public class DuelScene extends ForgeScene { DeckProxy deckProxy =null; if(chaosBattle) { - deckProxyMapMap = DeckProxy.getAllQuestChallenges(); + deckProxyMapMap = DeckProxy.getAllQuestChallenges(); List decks = new ArrayList<>(deckProxyMapMap.keySet()); deckProxy = Aggregates.random(decks); //playerextras @@ -309,11 +309,11 @@ public class DuelScene extends ForgeScene { "It's all or nothing!","It's all on the line!","You can't back down now!","Do you have what it takes?","What will happen next?", "Don't blink!","You can't lose here!","There's no turning back!","It's all or nothing now!"); String message = Aggregates.random(list); - FThreads.delayInEDT(600, () -> FThreads.invokeInEdtNowOrLater(() -> FOptionPane.showMessageDialog(message, enemy.getName(), new FBufferedImage(120, 120) { + FThreads.delayInEDT(600, () -> FThreads.invokeInEdtNowOrLater(() -> FOptionPane.showMessageDialog(message, enemy.nameOverride.isEmpty() ? enemy.getData().name : enemy.nameOverride, new FBufferedImage(120, 120) { @Override protected void draw(Graphics g, float w, float h) { - if (FSkin.getAvatars().get(90000) != null) - g.drawImage(FSkin.getAvatars().get(90000), 0, 0, w, h); + if (FSkin.getAvatars().get(90001) != null) + g.drawImage(FSkin.getAvatars().get(90001), 0, 0, w, h); } }))); }