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

- Further progress with quest draft tournaments in mobile Forge. There are a few issues remaining, most notably a stupid duplication of "edit deck / leave tournament" button set in prepare deck mode that I can't solve (tried a gazillion things already) and the fact that AI vs. AI match results do not register properly unless the quest is in "Simulate AI vs. AI Matches" mode, In Simulate AI vs. AI Matches mode, the QDTs should be largely playable and completable (with a couple caveats). In non-Simulate mode, they are not completable yet.

Browse Source
This commit is contained in:
Agetian
2017-01-14 06:30:42 +00:00
parent 8018da67db
commit be29951d76
2 changed files with 83 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
forge-gui-mobile/src/forge/screens/quest/QuestTournamentsScreen.java
View File

@@ -20,10 +20,12 @@ import forge.limited.BoosterDraft;
import forge.model.FModel;
import forge.properties.ForgePreferences.FPref;
import forge.quest.IQuestTournamentView;
import forge.quest.QuestDraftUtils;
import forge.quest.QuestEventDraft;
import forge.quest.QuestTournamentController;
import forge.quest.QuestDraftUtils.Mode;
import forge.quest.data.QuestEventDraftContainer;
import forge.quest.data.QuestPreferences;
import forge.screens.limited.DraftingProcessScreen;
import forge.toolbox.FButton;
import forge.toolbox.FContainer;
@@ -61,6 +63,8 @@ public class QuestTournamentsScreen extends QuestLaunchScreen implements IQuestT
//Tournament Active panel
private final TournamentActivePanel pnlTournamentActive = add(new TournamentActivePanel());
private final FButton btnEditDeckInTourn = add(new FButton("Edit Deck"));
private final FButton btnLeaveTournamentInTourn = add(new FButton("Leave Tournament"));
//Results labels
private static final FSkinFont RESULTS_FONT = FSkinFont.get(15);
@@ -105,11 +109,30 @@ public class QuestTournamentsScreen extends QuestLaunchScreen implements IQuestT
}
});
// TODO: is it possible to somehow reuse the original btnEditDeck/btnLeaveTournament
btnEditDeckInTourn.setCommand(new FEventHandler() {
@Override
public void handleEvent(FEvent e) {
editDeck(true);
}
});
btnLeaveTournamentInTourn.setCommand(new FEventHandler() {
@Override
public void handleEvent(FEvent e) {
FThreads.invokeInBackgroundThread(new Runnable() { //must run in background thread to handle alerts
@Override
public void run() {
controller.endTournamentAndAwardPrizes();
}
});
}
});
pnlPrepareDeck.add(btnEditDeck);
pnlPrepareDeck.add(btnLeaveTournament);
pnlTournamentActive.add(btnEditDeck);
pnlTournamentActive.add(btnLeaveTournament);
pnlTournamentActive.add(btnEditDeckInTourn);
pnlTournamentActive.add(btnLeaveTournamentInTourn);
deckViewer.setCaption("Main Deck");
deckViewer.setup(ItemManagerConfig.QUEST_DRAFT_DECK_VIEWER);
@@ -162,9 +185,14 @@ public class QuestTournamentsScreen extends QuestLaunchScreen implements IQuestT
public void setMode(Mode mode0) {
if (mode == mode0) { return; }
mode = mode0;
pnlSelectTournament.setVisible(mode == Mode.SELECT_TOURNAMENT);
pnlSelectTournament.setVisible(mode == Mode.SELECT_TOURNAMENT || mode == Mode.EMPTY);
pnlPrepareDeck.setVisible(mode == Mode.PREPARE_DECK);
pnlTournamentActive.setVisible(mode == Mode.TOURNAMENT_ACTIVE);
btnEditDeckInTourn.setVisible(mode == Mode.TOURNAMENT_ACTIVE);
btnLeaveTournamentInTourn.setVisible(mode == Mode.TOURNAMENT_ACTIVE);
btnEditDeck.setVisible(mode == Mode.PREPARE_DECK);
btnLeaveTournament.setVisible(mode == Mode.PREPARE_DECK);
updateHeaderCaption();
}
@@ -223,6 +251,14 @@ public class QuestTournamentsScreen extends QuestLaunchScreen implements IQuestT
@Override
protected void startMatch() {
if (mode == Mode.TOURNAMENT_ACTIVE && FModel.getQuestPreferences().getPrefInt(QuestPreferences.QPref.SIMULATE_AI_VS_AI_RESULTS) == 1 && QuestDraftUtils.isNextMatchAIvsAI()) {
// Special handling for simulating AI vs. AI match outcome - do not invoke in background thread (since the match is not played out)
// and instead revalidate right after the outcome is decided in order to refresh the tournament screen.
controller.startNextMatch();
revalidate();
return;
}
FThreads.invokeInBackgroundThread(new Runnable() { //must run in background thread to handle alerts
@Override
public void run() {
@@ -278,6 +314,13 @@ public class QuestTournamentsScreen extends QuestLaunchScreen implements IQuestT
return btnLeaveTournament;
}
public FButton getBtnEditDeckInTourn() {
return btnEditDeckInTourn;
}
public FButton getBtnLeaveTournamentInTourn() {
return btnLeaveTournamentInTourn;
}
private class SelectTournamentPanel extends FContainer {
@Override
protected void doLayout(float width, float height) {
@@ -334,9 +377,21 @@ public class QuestTournamentsScreen extends QuestLaunchScreen implements IQuestT
lblStandings.setBounds(x, y, w, lblStandings.getAutoSizeBounds().height);
y += lblStandings.getHeight() + PADDING;
if (qd.getBracket().isTournamentOver()) {
getBtnLeaveTournament().setText("Collect Prizes");
boolean tournamentComplete = !qd.playerHasMatchesLeft();
btnEditDeckInTourn.setVisible(mode == Mode.TOURNAMENT_ACTIVE);
btnLeaveTournamentInTourn.setVisible(mode == Mode.TOURNAMENT_ACTIVE);
if (tournamentComplete) {
String sid = qd.getStandings()[qd.getStandings().length - 1];
String winnersName = sid.equals(QuestEventDraft.HUMAN) ? FModel.getPreferences().getPref(FPref.PLAYER_NAME) : qd.getAINames()[Integer.parseInt(sid) - 1];
FLabel lblWinner = add(new FLabel.Builder().text("Winner: " + winnersName).align(HAlignment.CENTER).font(FSkinFont.get(20)).build());
lblWinner.setBounds(x, y, w, lblStandings.getAutoSizeBounds().height);
y += lblWinner.getHeight() + PADDING;
getBtnLeaveTournamentInTourn().setText("Collect Prizes");
} else {
getBtnLeaveTournamentInTourn().setText("Leave Tournament");
String sid1, sid2, pairedPlayer1 = "NONE", pairedPlayer2 = "NONE";
int pos = Arrays.asList(qd.getStandings()).indexOf(QuestEventDraft.UNDETERMINED);
if (pos != -1) {
@@ -412,10 +467,10 @@ public class QuestTournamentsScreen extends QuestLaunchScreen implements IQuestT
}
}
y += labels[0].getHeight() + PADDING;
y += lblStandings.getHeight() + PADDING;
btnEditDeck.setBounds(PADDING, y, buttonWidth, FTextField.getDefaultHeight());
btnLeaveTournament.setBounds(btnEditDeck.getRight() + PADDING, y, buttonWidth, btnEditDeck.getHeight());
btnEditDeckInTourn.setBounds(PADDING, y, buttonWidth, FTextField.getDefaultHeight());
btnLeaveTournamentInTourn.setBounds(btnEditDeckInTourn.getRight() + PADDING, y, buttonWidth, btnEditDeckInTourn.getHeight());
}
}
}

19
forge-gui/src/main/java/forge/quest/QuestDraftUtils.java
View File

@@ -415,6 +415,25 @@ public class QuestDraftUtils {
return LimitedDeckEvaluator.getDeckDraftValue(d);
}
public static boolean isNextMatchAIvsAI() {
QuestEventDraft qd = FModel.getQuest().getAchievements().getCurrentDraft();
int pos = Arrays.asList(qd.getStandings()).indexOf(QuestEventDraft.UNDETERMINED);
if (pos == -1) {
return false;
}
int offset = (pos - 8) * 2;
String sid1 = qd.getStandings()[offset];
String sid2 = qd.getStandings()[offset + 1];
if (sid1.equals(QuestEventDraft.HUMAN) || sid2.equals(QuestEventDraft.HUMAN)) {
return false;
}
return true;
}
public static boolean injectRandomMatchOutcome(boolean simHumanMatches) {
matchInProgress = true; // prevent the player from trying to start another match before we finish simulating results