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

Merge branch 'newBranch' into 'master'

Browse Source 
[Mobile] Prevent Conceding while on Mulligan

Closes #1376

See merge request core-developers/forge!3287
This commit is contained in:
Michael Kamensky
2020-10-23 07:59:47 +00:00
parent dfc4b5af13 63e67b0aa5
commit 4835e4c1d8
4 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
forge-game/src/main/java/forge/game/GameView.java
View File

@@ -116,6 +116,14 @@ public class GameView extends TrackableObject {
public boolean isMatchOver() { public boolean isMatchOver() {
return get(TrackableProperty.MatchOver); return get(TrackableProperty.MatchOver);
} }
public boolean isMulligan() {
if (get(TrackableProperty.Mulligan) == null)
return false;
return get(TrackableProperty.Mulligan);
}
public void updateIsMulligan(boolean value) {
set(TrackableProperty.Mulligan, value);
}
public String getWinningPlayerName() { public String getWinningPlayerName() {
return get(TrackableProperty.WinningPlayerName); return get(TrackableProperty.WinningPlayerName);
} }

1
forge-game/src/main/java/forge/trackable/TrackableProperty.java
View File

@@ -206,6 +206,7 @@ public enum TrackableProperty {
WinningPlayerName(TrackableTypes.StringType), WinningPlayerName(TrackableTypes.StringType),
WinningTeam(TrackableTypes.IntegerType), WinningTeam(TrackableTypes.IntegerType),
MatchOver(TrackableTypes.BooleanType), MatchOver(TrackableTypes.BooleanType),
Mulligan(TrackableTypes.BooleanType),
NumGamesInMatch(TrackableTypes.IntegerType), NumGamesInMatch(TrackableTypes.IntegerType),
NumPlayedGamesInMatch(TrackableTypes.IntegerType), NumPlayedGamesInMatch(TrackableTypes.IntegerType),
Stack(TrackableTypes.StackItemViewListType), Stack(TrackableTypes.StackItemViewListType),

8
forge-gui-mobile/src/forge/screens/match/MatchScreen.java
View File

@@ -358,10 +358,10 @@ public class MatchScreen extends FScreen {
if(gameMenu!=null) { if(gameMenu!=null) {
if(gameMenu.getChildCount()>3){ if(gameMenu.getChildCount()>3){
if(viewWinLose == null) { if(viewWinLose == null) {
gameMenu.getChildAt(0).setEnabled(true); gameMenu.getChildAt(0).setEnabled(!game.isMulligan());
gameMenu.getChildAt(1).setEnabled(true); gameMenu.getChildAt(1).setEnabled(!game.isMulligan());
gameMenu.getChildAt(2).setEnabled(true); gameMenu.getChildAt(2).setEnabled(!game.isMulligan());
gameMenu.getChildAt(3).setEnabled(true); gameMenu.getChildAt(3).setEnabled(!game.isMulligan());
gameMenu.getChildAt(4).setEnabled(false); gameMenu.getChildAt(4).setEnabled(false);
} else { } else {
gameMenu.getChildAt(0).setEnabled(false); gameMenu.getChildAt(0).setEnabled(false);

2
forge-gui/src/main/java/forge/match/input/InputLondonMulligan.java
View File

@@ -54,6 +54,7 @@ public class InputLondonMulligan extends InputSyncronizedBase {
public final void showMessage() { public final void showMessage() {
final Localizer localizer = Localizer.getInstance(); final Localizer localizer = Localizer.getInstance();
final Game game = player.getGame(); final Game game = player.getGame();
game.getView().updateIsMulligan(true);
int cardsLeft = toReturn - selected.size(); int cardsLeft = toReturn - selected.size();
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
@@ -79,6 +80,7 @@ public class InputLondonMulligan extends InputSyncronizedBase {
private void done() { private void done() {
resetCardHighlights(); resetCardHighlights();
getController().getGame().getView().updateIsMulligan(false);
stop(); stop();
} }