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

Merge branch 'bo1' into 'master'

Browse Source 
Add "best of 1 (or 5)" option to Constructed

See merge request core-developers/forge!5871
This commit is contained in:
Michael Kamensky
2021-11-25 18:18:48 +00:00
parent 9c2cf62312 01e21b340a
commit 67072c96cd
9 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
forge-gui-desktop/src/main/java/forge/screens/home/VLobby.java
View File

@@ -11,11 +11,7 @@ import java.util.Collections;
import java.util.List;
import java.util.Vector;
import javax.swing.JButton;
import javax.swing.JPanel;
import javax.swing.ListSelectionModel;
import javax.swing.ScrollPaneConstants;
import javax.swing.SwingConstants;
import javax.swing.*;
import javax.swing.event.ListSelectionEvent;
import javax.swing.event.ListSelectionListener;
@@ -84,6 +80,8 @@ public class VLobby implements ILobbyView {
private final StartButton btnStart = new StartButton();
private final JPanel pnlStart = new JPanel(new MigLayout("insets 0, gap 0, wrap 2"));
private final JComboBox gamesInMatch = new JComboBox(new String[] {"1","3","5"});
private final JPanel gamesInMatchFrame = new JPanel(new MigLayout("insets 0, gap 0, wrap 2"));
private final JPanel constructedFrame = new JPanel(new MigLayout("insets 0, gap 0, wrap 2")); // Main content frame
// Variants frame and variables
@@ -212,11 +210,19 @@ public class VLobby implements ILobbyView {
public final void actionPerformed(final ActionEvent arg0) {
Runnable startGame = lobby.startGame();
if (startGame != null) {
if (!gamesInMatch.getSelectedItem().equals(ForgePreferences.FPref.UI_MATCHES_PER_GAME)) {
FModel.getPreferences().setPref(FPref.UI_MATCHES_PER_GAME, (String) gamesInMatch.getSelectedItem());
}
startGame.run();
}
}
});
}
gamesInMatchFrame.add(newLabel(localizer.getMessage("lblGamesInMatch")), "w 150px!, h 30px!");
gamesInMatchFrame.add(gamesInMatch, "w 50px!, h 30px!");
gamesInMatchFrame.setOpaque(false);
gamesInMatch.setSelectedItem("3");
pnlStart.add(gamesInMatchFrame);
}
public void updateDeckPanel() {

1
forge-gui/res/languages/de-DE.properties
View File

@@ -286,6 +286,7 @@ lblTryAgain=Neu
lblAddAPlayer=Spieler hinzufügen
lblVariants=Varianten
lblRandom=Zufällig
lblGamesInMatch=Games in match:
#VSubmenuConstructed.java
lblConstructedMode=Constructed-Modus
lblConstructed=Constructed

1
forge-gui/res/languages/en-US.properties
View File

@@ -287,6 +287,7 @@ lblTryAgain=Try Again
lblAddAPlayer=Add a Player
lblVariants=Variants
lblRandom=Random
lblGamesInMatch=Games in match:
#VSubmenuConstructed.java
lblConstructedMode=Constructed Mode
lblConstructed=Constructed

1
forge-gui/res/languages/es-ES.properties
View File

@@ -287,6 +287,7 @@ lblTryAgain=Probar de nuevo
lblAddAPlayer=Añadir jugador
lblVariants=Variantes
lblRandom=Aleatorio
lblGamesInMatch=Games in match:
#VSubmenuConstructed.java
lblConstructedMode=Modo Construido
lblConstructed=Construido

1
forge-gui/res/languages/it-IT.properties
View File

@@ -286,6 +286,7 @@ lblTryAgain=Riprova
lblAddAPlayer=Aggiungi un giocatore
lblVariants=Varianti
lblRandom=Casuale
lblGamesInMatch=Games in match:
#VSubmenuConstructed.java
lblConstructedMode=Modalità costruita
lblConstructed=Costruito

1
forge-gui/res/languages/ja-JP.properties
View File

@@ -287,6 +287,7 @@ lblTryAgain=再試行
lblAddAPlayer=プレーヤーを追加
lblVariants=バリエーション
lblRandom=ランダム
lblGamesInMatch=Games in match:
#VSubmenuConstructed.java
lblConstructedMode=構築戦
lblConstructed=構築戦

1
forge-gui/res/languages/zh-CN.properties
View File

@@ -287,6 +287,7 @@ lblTryAgain=再试一次
lblAddAPlayer=增加一个玩家
lblVariants=变种
lblRandom=随机
lblGamesInMatch=Games in match:
#VSubmenuConstructed.java
lblConstructedMode=构筑模式
lblConstructed=构筑

1
forge-gui/src/main/java/forge/gamemodes/match/HostedMatch.java
View File

@@ -89,6 +89,7 @@ public class HostedMatch {
gameRules.setSideboardForAI(FModel.getPreferences().getPrefBoolean(FPref.MATCH_SIDEBOARD_FOR_AI));
gameRules.setCanCloneUseTargetsImage(FModel.getPreferences().getPrefBoolean(FPref.UI_CLONE_MODE_SOURCE));
gameRules.setUseGrayText(FModel.getPreferences().getPrefBoolean(FPref.UI_GRAY_INACTIVE_TEXT));
gameRules.setGamesPerMatch(FModel.getPreferences().getPrefInt(FPref.UI_MATCHES_PER_GAME));
return gameRules;
}

1
forge-gui/src/main/java/forge/localinstance/properties/ForgePreferences.java
View File

@@ -68,6 +68,7 @@ public class ForgePreferences extends PreferencesStore<ForgePreferences.FPref> {
BRAWL_P7_DECK_STATE(""),
BRAWL_P8_DECK_STATE(""),
UI_LANDSCAPE_MODE ("false"),
UI_MATCHES_PER_GAME("3"),
UI_COMPACT_MAIN_MENU ("false"),
UI_USE_OLD ("false"),
UI_RANDOM_FOIL ("false"),