external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-16 18:58:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
drdev
2016-01-12 01:58:23 +00:00
parent 233918c4ee
commit 2f232b2b5b
5 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
forge-gui-mobile/src/forge/screens/planarconquest/ConquestMultiverseScreen.java
View File

@@ -6,6 +6,7 @@ import com.badlogic.gdx.graphics.Color;
import com.badlogic.gdx.math.Rectangle; import com.badlogic.gdx.math.Rectangle;
import com.badlogic.gdx.math.Vector2; import com.badlogic.gdx.math.Vector2;
import forge.FThreads;
import forge.Forge; import forge.Forge;
import forge.Graphics; import forge.Graphics;
import forge.animation.ForgeAnimation; import forge.animation.ForgeAnimation;
@@ -173,10 +174,15 @@ public class ConquestMultiverseScreen extends FScreen {
} }
private void launchChaosBattle() { private void launchChaosBattle() {
LoadingOverlay.show("Chaos approaching...", new Runnable() { FThreads.invokeInEdtNowOrLater(new Runnable() {
@Override @Override
public void run() { public void run() {
FModel.getConquest().launchEvent(new ConquestChaosBattle()); LoadingOverlay.show("Chaos approaching...", new Runnable() {
@Override
public void run() {
FModel.getConquest().launchEvent(new ConquestChaosBattle());
}
});
} }
}); });
} }

5
forge-gui/src/main/java/forge/planarconquest/ConquestChaosBattle.java
View File

@@ -8,6 +8,7 @@ import forge.deck.Deck;
import forge.game.GameType; import forge.game.GameType;
import forge.game.GameView; import forge.game.GameView;
import forge.interfaces.IButton; import forge.interfaces.IButton;
import forge.interfaces.IGuiGame;
import forge.interfaces.IWinLoseView; import forge.interfaces.IWinLoseView;
import forge.model.FModel; import forge.model.FModel;
import forge.planarconquest.ConquestPreferences.CQPref; import forge.planarconquest.ConquestPreferences.CQPref;
@@ -69,8 +70,8 @@ public class ConquestChaosBattle extends ConquestEvent {
} }
@Override @Override
public String getAvatarImageKey() { public void setOpponentAvatar(LobbyPlayer aiPlayer, IGuiGame gui) {
return duel.getIconImageKey(); gui.setPlayerAvatar(aiPlayer, duel);
} }
@Override @Override

6
forge-gui/src/main/java/forge/planarconquest/ConquestController.java
View File

@@ -35,6 +35,7 @@ import forge.game.GameType;
import forge.game.GameView; import forge.game.GameView;
import forge.game.player.RegisteredPlayer; import forge.game.player.RegisteredPlayer;
import forge.interfaces.IButton; import forge.interfaces.IButton;
import forge.interfaces.IGuiGame;
import forge.interfaces.IWinLoseView; import forge.interfaces.IWinLoseView;
import forge.item.PaperCard; import forge.item.PaperCard;
import forge.match.HostedMatch; import forge.match.HostedMatch;
@@ -114,8 +115,9 @@ public class ConquestController {
humanPlayer.setAvatarCardImageKey(commander.getCard().getImageKey(false)); humanPlayer.setAvatarCardImageKey(commander.getCard().getImageKey(false));
starter.add(humanStart.setPlayer(humanPlayer)); starter.add(humanStart.setPlayer(humanPlayer));
final IGuiGame gui = GuiBase.getInterface().getNewGuiGame();
final LobbyPlayer aiPlayer = GamePlayerUtil.createAiPlayer(aiPlayerName, -1); final LobbyPlayer aiPlayer = GamePlayerUtil.createAiPlayer(aiPlayerName, -1);
aiPlayer.setAvatarCardImageKey(event.getAvatarImageKey()); event.setOpponentAvatar(aiPlayer, gui);
starter.add(aiStart.setPlayer(aiPlayer)); starter.add(aiStart.setPlayer(aiPlayer));
final boolean useRandomFoil = FModel.getPreferences().getPrefBoolean(FPref.UI_RANDOM_FOIL); final boolean useRandomFoil = FModel.getPreferences().getPrefBoolean(FPref.UI_RANDOM_FOIL);
@@ -130,7 +132,7 @@ public class ConquestController {
FThreads.invokeInEdtNowOrLater(new Runnable(){ FThreads.invokeInEdtNowOrLater(new Runnable(){
@Override @Override
public void run() { public void run() {
hostedMatch.startMatch(rules, null, starter, humanStart, GuiBase.getInterface().getNewGuiGame()); hostedMatch.startMatch(rules, null, starter, humanStart, gui);
} }
}); });
activeEvent = event; activeEvent = event;

3
forge-gui/src/main/java/forge/planarconquest/ConquestEvent.java
View File

@@ -7,6 +7,7 @@ import forge.deck.Deck;
import forge.game.GameType; import forge.game.GameType;
import forge.game.GameView; import forge.game.GameView;
import forge.interfaces.IButton; import forge.interfaces.IButton;
import forge.interfaces.IGuiGame;
import forge.interfaces.IWinLoseView; import forge.interfaces.IWinLoseView;
import forge.util.XmlReader; import forge.util.XmlReader;
import forge.util.XmlWriter; import forge.util.XmlWriter;
@@ -71,7 +72,7 @@ public abstract class ConquestEvent {
public abstract void addVariants(Set<GameType> variants); public abstract void addVariants(Set<GameType> variants);
public abstract String getEventName(); public abstract String getEventName();
public abstract String getOpponentName(); public abstract String getOpponentName();
public abstract String getAvatarImageKey(); public abstract void setOpponentAvatar(LobbyPlayer aiPlayer, IGuiGame gui);
public static class ConquestEventRecord implements IXmlWritable { public static class ConquestEventRecord implements IXmlWritable {
private final ConquestRecord[] tiers = new ConquestRecord[4]; private final ConquestRecord[] tiers = new ConquestRecord[4];

6
forge-gui/src/main/java/forge/planarconquest/ConquestLocation.java
View File

@@ -4,8 +4,10 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;
import forge.LobbyPlayer;
import forge.deck.Deck; import forge.deck.Deck;
import forge.game.GameType; import forge.game.GameType;
import forge.interfaces.IGuiGame;
import forge.item.PaperCard; import forge.item.PaperCard;
import forge.model.FModel; import forge.model.FModel;
import forge.planarconquest.ConquestEvent.ConquestEventRecord; import forge.planarconquest.ConquestEvent.ConquestEventRecord;
@@ -141,8 +143,8 @@ public class ConquestLocation implements IXmlWritable {
} }
@Override @Override
public String getAvatarImageKey() { public void setOpponentAvatar(LobbyPlayer aiPlayer, IGuiGame gui) {
return commander.getImageKey(false); aiPlayer.setAvatarCardImageKey(commander.getImageKey(false));
} }
@Override @Override