From 2f232b2b5bdc84b27a2d81b28b2fc31aa0ebff0b Mon Sep 17 00:00:00 2001 From: drdev Date: Tue, 12 Jan 2016 01:58:23 +0000 Subject: [PATCH] --- .../planarconquest/ConquestMultiverseScreen.java | 10 ++++++++-- .../java/forge/planarconquest/ConquestChaosBattle.java | 5 +++-- .../java/forge/planarconquest/ConquestController.java | 6 ++++-- .../main/java/forge/planarconquest/ConquestEvent.java | 3 ++- .../java/forge/planarconquest/ConquestLocation.java | 6 ++++-- 5 files changed, 21 insertions(+), 9 deletions(-) diff --git a/forge-gui-mobile/src/forge/screens/planarconquest/ConquestMultiverseScreen.java b/forge-gui-mobile/src/forge/screens/planarconquest/ConquestMultiverseScreen.java index 3085beab84f..0a5217403f6 100644 --- a/forge-gui-mobile/src/forge/screens/planarconquest/ConquestMultiverseScreen.java +++ b/forge-gui-mobile/src/forge/screens/planarconquest/ConquestMultiverseScreen.java @@ -6,6 +6,7 @@ import com.badlogic.gdx.graphics.Color; import com.badlogic.gdx.math.Rectangle; import com.badlogic.gdx.math.Vector2; +import forge.FThreads; import forge.Forge; import forge.Graphics; import forge.animation.ForgeAnimation; @@ -173,10 +174,15 @@ public class ConquestMultiverseScreen extends FScreen { } private void launchChaosBattle() { - LoadingOverlay.show("Chaos approaching...", new Runnable() { + FThreads.invokeInEdtNowOrLater(new Runnable() { @Override public void run() { - FModel.getConquest().launchEvent(new ConquestChaosBattle()); + LoadingOverlay.show("Chaos approaching...", new Runnable() { + @Override + public void run() { + FModel.getConquest().launchEvent(new ConquestChaosBattle()); + } + }); } }); } diff --git a/forge-gui/src/main/java/forge/planarconquest/ConquestChaosBattle.java b/forge-gui/src/main/java/forge/planarconquest/ConquestChaosBattle.java index a34e07125c9..f774f1d0e30 100644 --- a/forge-gui/src/main/java/forge/planarconquest/ConquestChaosBattle.java +++ b/forge-gui/src/main/java/forge/planarconquest/ConquestChaosBattle.java @@ -8,6 +8,7 @@ import forge.deck.Deck; import forge.game.GameType; import forge.game.GameView; import forge.interfaces.IButton; +import forge.interfaces.IGuiGame; import forge.interfaces.IWinLoseView; import forge.model.FModel; import forge.planarconquest.ConquestPreferences.CQPref; @@ -69,8 +70,8 @@ public class ConquestChaosBattle extends ConquestEvent { } @Override - public String getAvatarImageKey() { - return duel.getIconImageKey(); + public void setOpponentAvatar(LobbyPlayer aiPlayer, IGuiGame gui) { + gui.setPlayerAvatar(aiPlayer, duel); } @Override diff --git a/forge-gui/src/main/java/forge/planarconquest/ConquestController.java b/forge-gui/src/main/java/forge/planarconquest/ConquestController.java index c84c16fdba2..22949be4650 100644 --- a/forge-gui/src/main/java/forge/planarconquest/ConquestController.java +++ b/forge-gui/src/main/java/forge/planarconquest/ConquestController.java @@ -35,6 +35,7 @@ import forge.game.GameType; import forge.game.GameView; import forge.game.player.RegisteredPlayer; import forge.interfaces.IButton; +import forge.interfaces.IGuiGame; import forge.interfaces.IWinLoseView; import forge.item.PaperCard; import forge.match.HostedMatch; @@ -114,8 +115,9 @@ public class ConquestController { humanPlayer.setAvatarCardImageKey(commander.getCard().getImageKey(false)); starter.add(humanStart.setPlayer(humanPlayer)); + final IGuiGame gui = GuiBase.getInterface().getNewGuiGame(); final LobbyPlayer aiPlayer = GamePlayerUtil.createAiPlayer(aiPlayerName, -1); - aiPlayer.setAvatarCardImageKey(event.getAvatarImageKey()); + event.setOpponentAvatar(aiPlayer, gui); starter.add(aiStart.setPlayer(aiPlayer)); final boolean useRandomFoil = FModel.getPreferences().getPrefBoolean(FPref.UI_RANDOM_FOIL); @@ -130,7 +132,7 @@ public class ConquestController { FThreads.invokeInEdtNowOrLater(new Runnable(){ @Override public void run() { - hostedMatch.startMatch(rules, null, starter, humanStart, GuiBase.getInterface().getNewGuiGame()); + hostedMatch.startMatch(rules, null, starter, humanStart, gui); } }); activeEvent = event; diff --git a/forge-gui/src/main/java/forge/planarconquest/ConquestEvent.java b/forge-gui/src/main/java/forge/planarconquest/ConquestEvent.java index dda48be74b1..65258b771e0 100644 --- a/forge-gui/src/main/java/forge/planarconquest/ConquestEvent.java +++ b/forge-gui/src/main/java/forge/planarconquest/ConquestEvent.java @@ -7,6 +7,7 @@ import forge.deck.Deck; import forge.game.GameType; import forge.game.GameView; import forge.interfaces.IButton; +import forge.interfaces.IGuiGame; import forge.interfaces.IWinLoseView; import forge.util.XmlReader; import forge.util.XmlWriter; @@ -71,7 +72,7 @@ public abstract class ConquestEvent { public abstract void addVariants(Set variants); public abstract String getEventName(); public abstract String getOpponentName(); - public abstract String getAvatarImageKey(); + public abstract void setOpponentAvatar(LobbyPlayer aiPlayer, IGuiGame gui); public static class ConquestEventRecord implements IXmlWritable { private final ConquestRecord[] tiers = new ConquestRecord[4]; diff --git a/forge-gui/src/main/java/forge/planarconquest/ConquestLocation.java b/forge-gui/src/main/java/forge/planarconquest/ConquestLocation.java index b7385a4a68c..94df69b420b 100644 --- a/forge-gui/src/main/java/forge/planarconquest/ConquestLocation.java +++ b/forge-gui/src/main/java/forge/planarconquest/ConquestLocation.java @@ -4,8 +4,10 @@ import java.util.ArrayList; import java.util.List; import java.util.Set; +import forge.LobbyPlayer; import forge.deck.Deck; import forge.game.GameType; +import forge.interfaces.IGuiGame; import forge.item.PaperCard; import forge.model.FModel; import forge.planarconquest.ConquestEvent.ConquestEventRecord; @@ -141,8 +143,8 @@ public class ConquestLocation implements IXmlWritable { } @Override - public String getAvatarImageKey() { - return commander.getImageKey(false); + public void setOpponentAvatar(LobbyPlayer aiPlayer, IGuiGame gui) { + aiPlayer.setAvatarCardImageKey(commander.getImageKey(false)); } @Override