Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

* Setting of mana automatic payment option is saved and restored now so persistent between games (fixes #1002).

Browse source
This commit is contained in:
LevelX2 2015-06-05 00:05:40 +02:00
parent 3b9cb1dc6e
commit a50447c84d
3 changed files with 11 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Mage.Client/src/main/java/mage/client/dialog/PreferencesDialog.java
View file

@ -132,6 +132,9 @@ public class PreferencesDialog extends javax.swing.JDialog {
public static final String KEY_STOP_ALL_MAIN_PHASES = "stopOnAllMainPhases"; public static final String KEY_STOP_ALL_MAIN_PHASES = "stopOnAllMainPhases";
public static final String KEY_STOP_ALL_END_PHASES = "stopOnAllEndPhases"; public static final String KEY_STOP_ALL_END_PHASES = "stopOnAllEndPhases";
// mana auto payment
public static final String KEY_GAME_MANA_AUTOPAYMENT = "gameManaAutopayment";
// Size of frame to check if divider locations should be used // Size of frame to check if divider locations should be used
public static final String KEY_MAGE_PANEL_LAST_SIZE = "gamepanelLastSize"; public static final String KEY_MAGE_PANEL_LAST_SIZE = "gamepanelLastSize";

7
Mage.Client/src/main/java/mage/client/game/GamePanel.java
View file

@ -90,6 +90,7 @@ import mage.client.dialog.PickChoiceDialog;
import mage.client.dialog.PickNumberDialog; import mage.client.dialog.PickNumberDialog;
import mage.client.dialog.PickPileDialog; import mage.client.dialog.PickPileDialog;
import mage.client.dialog.PreferencesDialog; import mage.client.dialog.PreferencesDialog;
import static mage.client.dialog.PreferencesDialog.KEY_GAME_MANA_AUTOPAYMENT;
import mage.client.dialog.ShowCardsDialog; import mage.client.dialog.ShowCardsDialog;
import mage.client.game.FeedbackPanel.FeedbackMode; import mage.client.game.FeedbackPanel.FeedbackMode;
import mage.client.plugins.adapters.MageActionCallback; import mage.client.plugins.adapters.MageActionCallback;
@ -382,7 +383,8 @@ public final class GamePanel extends javax.swing.JPanel {
this.gameChatPanel.connect(session.getGameChatId(gameId)); this.gameChatPanel.connect(session.getGameChatId(gameId));
if (!session.joinGame(gameId)) { if (!session.joinGame(gameId)) {
removeGame(); removeGame();
} else { } else {
// play start sound
AudioManager.playYourGameStarted(); AudioManager.playYourGameStarted();
} }
} }
@ -456,6 +458,9 @@ public final class GamePanel extends javax.swing.JPanel {
public synchronized void init(GameView game) { public synchronized void init(GameView game) {
addPlayers(game); addPlayers(game);
// default menu states
setMenuStates(PreferencesDialog.getCachedValue(KEY_GAME_MANA_AUTOPAYMENT, "true").equals("true"));
updateGame(game); updateGame(game);
} }

2
Mage.Client/src/main/java/mage/client/game/PlayAreaPanel.java
View file

@ -53,6 +53,7 @@ import mage.client.MageFrame;
import mage.client.cards.BigCard; import mage.client.cards.BigCard;
import mage.client.dialog.PreferencesDialog; import mage.client.dialog.PreferencesDialog;
import static mage.client.dialog.PreferencesDialog.KEY_GAME_ALLOW_REQUEST_SHOW_HAND_CARDS; import static mage.client.dialog.PreferencesDialog.KEY_GAME_ALLOW_REQUEST_SHOW_HAND_CARDS;
import static mage.client.dialog.PreferencesDialog.KEY_GAME_MANA_AUTOPAYMENT;
import mage.constants.PlayerAction; import mage.constants.PlayerAction;
import mage.view.PlayerView; import mage.view.PlayerView;
@ -220,6 +221,7 @@ public class PlayAreaPanel extends javax.swing.JPanel {
@Override @Override
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
boolean manaPoolAutomatic = ((JCheckBoxMenuItem)e.getSource()).getState(); boolean manaPoolAutomatic = ((JCheckBoxMenuItem)e.getSource()).getState();
PreferencesDialog.saveValue(KEY_GAME_MANA_AUTOPAYMENT, manaPoolAutomatic ? "true": "false");
gamePanel.setMenuStates(manaPoolAutomatic); gamePanel.setMenuStates(manaPoolAutomatic);
gamePanel.getSession().sendPlayerAction(manaPoolAutomatic ? PlayerAction.MANA_AUTO_PAYMENT_ON: PlayerAction.MANA_AUTO_PAYMENT_OFF, gameId, null); gamePanel.getSession().sendPlayerAction(manaPoolAutomatic ? PlayerAction.MANA_AUTO_PAYMENT_ON: PlayerAction.MANA_AUTO_PAYMENT_OFF, gameId, null);
} }