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

Support retrying if you lose a game in Planar Conquest

Browse Source
This commit is contained in:
drdev
2016-01-10 17:52:51 +00:00
parent 65a49d7e41
commit 64723e431e
6 changed files with 95 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
forge-gui-mobile/src/forge/screens/match/winlose/ConquestWinLose.java
View File

@@ -28,12 +28,12 @@ public class ConquestWinLose extends ControlWinLose {
@Override
public final void showRewards() {
FModel.getConquest().showGameRewards(lastGame, getView());
FModel.getConquest().showGameOutcome(lastGame, getView());
}
@Override
public final void actionOnQuit() {
FModel.getConquest().finishEvent();
super.actionOnQuit();
FModel.getConquest().onGameFinished(lastGame);
}
}

19
forge-gui-mobile/src/forge/screens/planarconquest/ConquestEventScreen.java
View File

@@ -3,14 +3,11 @@ package forge.screens.planarconquest;
import forge.Forge;
import forge.model.FModel;
import forge.planarconquest.ConquestEvent;
import forge.planarconquest.ConquestController.GameRunner;
import forge.planarconquest.ConquestEvent.IConquestEventLauncher;
import forge.screens.LaunchScreen;
import forge.screens.LoadingOverlay;
import forge.toolbox.FOptionPane;
import forge.util.ThreadUtil;
public class ConquestEventScreen extends LaunchScreen implements IConquestEventLauncher {
public class ConquestEventScreen extends LaunchScreen {
protected static final float PADDING = FOptionPane.PADDING;
private final ConquestEvent event;
@@ -37,22 +34,12 @@ public class ConquestEventScreen extends LaunchScreen implements IConquestEventL
@Override
protected void startMatch() {
if (launchedEvent) { return; } //avoid launching event more than once
launchedEvent = true;
ThreadUtil.invokeInGameThread(new Runnable() {
@Override
public void run() {
FModel.getConquest().launchEvent(ConquestEventScreen.this, FModel.getConquest().getModel().getSelectedCommander(), event);
}
});
}
@Override
public void startGame(final GameRunner gameRunner) {
LoadingOverlay.show("Loading new game...", new Runnable() {
LoadingOverlay.show("Starting battle...", new Runnable() {
@Override
public void run() {
gameRunner.finishStartingGame();
FModel.getConquest().launchEvent(FModel.getConquest().getModel().getSelectedCommander(), event);
}
});
}

1
forge-gui-mobile/src/forge/screens/planarconquest/ConquestPrefsScreen.java
View File

@@ -53,6 +53,7 @@ public class ConquestPrefsScreen extends FScreen {
scroller.add(new PrefsOption("Base Card Value", CQPref.AETHER_BASE_VALUE, PrefsGroup.AETHER));
scroller.add(new PrefsOption("Markup Percentage", CQPref.AETHER_MARKUP, PrefsGroup.AETHER));
scroller.add(new PrefsOption("Starting Shards", CQPref.AETHER_START_SHARDS, PrefsGroup.AETHER));
scroller.add(new PrefsOption("Chaos Wheel Shard Value", CQPref.AETHER_WHEEL_SHARDS, PrefsGroup.AETHER));
scroller.add(new PrefsHeader("Booster Packs", FSkinImage.PACK, PrefsGroup.BOOSTER));
scroller.add(new PrefsOption("Commons", CQPref.BOOSTER_COMMONS, PrefsGroup.BOOSTER));

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

@@ -39,7 +39,6 @@ import forge.interfaces.IWinLoseView;
import forge.item.PaperCard;
import forge.match.HostedMatch;
import forge.model.FModel;
import forge.planarconquest.ConquestEvent.IConquestEventLauncher;
import forge.planarconquest.ConquestPlane.AwardPool;
import forge.planarconquest.ConquestPreferences.CQPref;
import forge.player.GamePlayerUtil;
@@ -56,7 +55,7 @@ import forge.util.storage.StorageImmediatelySerialized;
public class ConquestController {
private ConquestData model;
private IStorage<Deck> decks;
private GameRunner gameRunner;
private ConquestEvent activeEvent;
private LobbyPlayerHuman humanPlayer;
public ConquestController() {
@@ -82,48 +81,9 @@ public class ConquestController {
return decks;
}
public void launchEvent(final IConquestEventLauncher launcher0, final ConquestCommander commander0, final ConquestEvent event0) {
if (gameRunner != null) { return; } //prevent running multiple games at once
public void launchEvent(ConquestCommander commander, ConquestEvent event) {
if (activeEvent != null) { return; }
gameRunner = new GameRunner(launcher0, commander0, event0);
gameRunner.invokeAndWait();
gameRunner = null;
}
public class GameRunner {
private class Lock {
}
private final Lock lock = new Lock();
private final IConquestEventLauncher launcher;
private final ConquestCommander commander;
private final ConquestEvent event;
private GameRunner(final IConquestEventLauncher launcher0, final ConquestCommander commander0, final ConquestEvent event0) {
launcher = launcher0;
commander = commander0;
event = event0;
}
public final void invokeAndWait() {
FThreads.assertExecutedByEdt(false); //not supported if on UI thread
FThreads.invokeInEdtLater(new Runnable() {
@Override
public void run() {
launcher.startGame(GameRunner.this);
}
});
try {
synchronized(lock) {
lock.wait();
}
}
catch (InterruptedException e) {
e.printStackTrace();
}
}
public void finishStartingGame() {
//determine game variants
Set<GameType> variants = new HashSet<GameType>();
event.addVariants(variants);
@@ -172,12 +132,7 @@ public class ConquestController {
hostedMatch.startMatch(rules, null, starter, humanStart, GuiBase.getInterface().getNewGuiGame());
}
});
}
private void finish() {
synchronized(lock) { //release game lock once game finished
lock.notify();
}
activeEvent = event;
}
private List<PaperCard> generatePlanarPool() {
@@ -213,40 +168,29 @@ public class ConquestController {
}
return pool;
}
}
public void showGameRewards(final GameView game, final IWinLoseView<? extends IButton> view) {
public void showGameOutcome(final GameView game, final IWinLoseView<? extends IButton> view) {
if (game.isMatchWonBy(humanPlayer)) {
view.getBtnRestart().setVisible(false);
view.getBtnQuit().setText("Great!");
//give controller a chance to run remaining logic on a separate thread
view.showRewards(new Runnable() {
@Override
public void run() {
awardBooster(view);
}
});
model.addWin(activeEvent);
}
else {
view.getBtnQuit().setText("OK");
}
}
public void onGameFinished(final GameView game) {
if (game.isMatchWonBy(humanPlayer)) {
model.addWin(gameRunner.event);
}
else {
model.addLoss(gameRunner.event);
view.getBtnRestart().setVisible(true);
view.getBtnRestart().setText("Retry");
view.getBtnQuit().setText("Quit");
model.addLoss(activeEvent);
}
model.saveData();
FModel.getConquestPreferences().save();
gameRunner.finish();
}
private void awardBooster(final IWinLoseView<? extends IButton> view) {
public void finishEvent() {
activeEvent = null;
}
public List<ConquestReward> awardBooster() {
AwardPool pool = FModel.getConquest().getModel().getCurrentPlane().getAwardPool();
ConquestPreferences prefs = FModel.getConquestPreferences();
List<PaperCard> rewards = new ArrayList<PaperCard>();
@@ -289,14 +233,9 @@ public class ConquestController {
allRewards.add(new ConquestReward(card, replacementShards));
}
FThreads.invokeInEdtNowOrLater(new Runnable() {
@Override
public void run() {
view.showConquestRewards("Booster Awarded", allRewards);
}
});
model.unlockCards(rewards);
model.rewardAEtherShards(shards);
return allRewards;
}
public int calculateShardCost(ItemPool<PaperCard> filteredCards, int unfilteredCount) {

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

@@ -4,7 +4,6 @@ import java.util.Set;
import forge.deck.Deck;
import forge.game.GameType;
import forge.planarconquest.ConquestController.GameRunner;
import forge.util.XmlReader;
import forge.util.XmlWriter;
import forge.util.XmlWriter.IXmlWritable;
@@ -40,10 +39,6 @@ public abstract class ConquestEvent {
public abstract String getOpponentName();
public abstract String getAvatarImageKey();
public static interface IConquestEventLauncher {
void startGame(GameRunner gameRunner);
}
public static class ConquestEventRecord implements IXmlWritable {
private final ConquestRecord[] tiers = new ConquestRecord[4];

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

@@ -31,7 +31,8 @@ public class ConquestPreferences extends PreferencesStore<ConquestPreferences.CQ
AETHER_BASE_VALUE("100"),
AETHER_MARKUP("50"),
AETHER_START_SHARDS("1000"),
AETHER_START_SHARDS("3000"),
AETHER_WHEEL_SHARDS("1000"),
BOOSTER_COMMONS("11"),
BOOSTER_UNCOMMONS("3"),