Skip to content

Phase label fix for multiplayer #8335

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
tovernaar123 wants to merge 5 commits into from
Closed

Phase label fix for multiplayer #8335

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bdc0902
Fixes a bug that causes the phase labels for multiplayer games (and h…
tovernaar123 Aug 8, 2025
6f4578c
Merge branch 'Card-Forge:master' into master
tovernaar123 Aug 8, 2025
523bb76
Merge branch 'master' into master
tool4ever Sep 1, 2025
f908a3c
Adds a check to prevent doubling writing of the phase label data.
tovernaar123 Sep 6, 2025
f5a1bd2
Merge remote-tracking branch 'origin/master'
tovernaar123 Sep 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
113 changes: 50 additions & 63 deletions forge-gui-desktop/src/main/java/forge/screens/match/CMatchUI.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,11 +288,18 @@ public SkinImage getPlayerAvatar(final PlayerView p, final int defaultIndex) {
final int avatarIdx = p.getAvatarIndex();
return FSkin.getAvatars().get(avatarIdx >= 0 ? avatarIdx : defaultIndex);
}

private java.util.Set<PlayerView> initiallyControlled = new java.util.HashSet<>();
private boolean hasSaved = false;
private void initMatch(final FCollectionView<PlayerView> sortedPlayers, final Collection<PlayerView> myPlayers) {
this.sortedPlayers = sortedPlayers;
allHands = sortedPlayers.size() == getLocalPlayerCount();

initiallyControlled.clear();
if (myPlayers != null) {
initiallyControlled.addAll(myPlayers);
}
hasSaved = false;

final String[] indices = FModel.getPreferences().getPref(FPref.UI_AVATARS).split(",");

final List<VField> fields = new ArrayList<>();
Expand Down Expand Up @@ -822,6 +829,11 @@ public void finishGame() {
FloatingZone.closeAll(); //ensure floating card areas cleared and closed after the game
final GameView gameView = getGameView();
if (hasLocalPlayers() || gameView.isMatchOver()) {
//Otherwise only the host will save in a multiplayer match.
if (!hasSaved) {
writeMatchPreferences();
}

new ViewWinLose(gameView, this).show();
}
if (showOverlay) {
Expand Down Expand Up @@ -1165,83 +1177,58 @@ public boolean isUiSetToSkipPhase(final PlayerView playerTurn, final PhaseType p
}

/**
* TODO: Needs to be reworked for efficiency with rest of prefs saves in codebase.
* Writes the preferences for the default enabled save labels.
* For both the non-local (ai or multiplayer) and local player(s)
*/
public void writeMatchPreferences() {
hasSaved = true;
final ForgePreferences prefs = FModel.getPreferences();
final List<VField> fieldViews = getFieldViews();

// AI field is at index [1]
final PhaseIndicator fvAi = fieldViews.get(1).getPhaseIndicator();
prefs.setPref(FPref.PHASE_AI_UPKEEP, fvAi.getLblUpkeep().getEnabled());
prefs.setPref(FPref.PHASE_AI_DRAW, fvAi.getLblDraw().getEnabled());
prefs.setPref(FPref.PHASE_AI_MAIN1, fvAi.getLblMain1().getEnabled());
prefs.setPref(FPref.PHASE_AI_BEGINCOMBAT, fvAi.getLblBeginCombat().getEnabled());
prefs.setPref(FPref.PHASE_AI_DECLAREATTACKERS, fvAi.getLblDeclareAttackers().getEnabled());
prefs.setPref(FPref.PHASE_AI_DECLAREBLOCKERS, fvAi.getLblDeclareBlockers().getEnabled());
prefs.setPref(FPref.PHASE_AI_FIRSTSTRIKE, fvAi.getLblFirstStrike().getEnabled());
prefs.setPref(FPref.PHASE_AI_COMBATDAMAGE, fvAi.getLblCombatDamage().getEnabled());
prefs.setPref(FPref.PHASE_AI_ENDCOMBAT, fvAi.getLblEndCombat().getEnabled());
prefs.setPref(FPref.PHASE_AI_MAIN2, fvAi.getLblMain2().getEnabled());
prefs.setPref(FPref.PHASE_AI_EOT, fvAi.getLblEndTurn().getEnabled());
prefs.setPref(FPref.PHASE_AI_CLEANUP, fvAi.getLblCleanup().getEnabled());

// Human field is at index [0]
final PhaseIndicator fvHuman = fieldViews.get(0).getPhaseIndicator();
prefs.setPref(FPref.PHASE_HUMAN_UPKEEP, fvHuman.getLblUpkeep().getEnabled());
prefs.setPref(FPref.PHASE_HUMAN_DRAW, fvHuman.getLblDraw().getEnabled());
prefs.setPref(FPref.PHASE_HUMAN_MAIN1, fvHuman.getLblMain1().getEnabled());
prefs.setPref(FPref.PHASE_HUMAN_BEGINCOMBAT, fvHuman.getLblBeginCombat().getEnabled());
prefs.setPref(FPref.PHASE_HUMAN_DECLAREATTACKERS, fvHuman.getLblDeclareAttackers().getEnabled());
prefs.setPref(FPref.PHASE_HUMAN_DECLAREBLOCKERS, fvHuman.getLblDeclareBlockers().getEnabled());
prefs.setPref(FPref.PHASE_HUMAN_FIRSTSTRIKE, fvHuman.getLblFirstStrike().getEnabled());
prefs.setPref(FPref.PHASE_HUMAN_COMBATDAMAGE, fvHuman.getLblCombatDamage().getEnabled());
prefs.setPref(FPref.PHASE_HUMAN_ENDCOMBAT, fvHuman.getLblEndCombat().getEnabled());
prefs.setPref(FPref.PHASE_HUMAN_MAIN2, fvHuman.getLblMain2().getEnabled());
prefs.setPref(FPref.PHASE_HUMAN_EOT, fvHuman.getLblEndTurn().getEnabled());
prefs.setPref(FPref.PHASE_HUMAN_CLEANUP, fvHuman.getLblCleanup().getEnabled());
//TODO: this new solution will still override data if there is more then 1 non controlled player
// or more then one controlled player.

//loops over all fields
for (int playerIndex = 0; playerIndex < fieldViews.size(); playerIndex++) {
// This is needed for multiplayer games and if there is more than one human in the game (the index is not just 0)
Comment thread
tool4ever marked this conversation as resolved.
final PlayerView player = sortedPlayers.get(playerIndex);
final boolean isLocal = initiallyControlled.contains(player);
final FPref[] keys = isLocal ? FPref.PHASES_HUMAN : FPref.PHASES_AI;
final PhaseIndicator PhaseBar = fieldViews.get(playerIndex).getPhaseIndicator();

//Get all Phase types expect upkeep cause there is no label for the upkeep step (same as in actuateMatchPreferences)
PhaseType[] phases = Arrays.stream(PhaseType.values()).skip(1).toArray(PhaseType[]::new);

for (int phaseIndex = 0; phaseIndex < phases.length; phaseIndex++) {
prefs.setPref(keys[phaseIndex],PhaseBar.getLabelFor(phases[phaseIndex]).getEnabled());
}
}

prefs.save();
}

/**
* TODO: Needs to be reworked for efficiency with rest of prefs saves in codebase.
* Uses the preferences for the default enabled save labels.
* For both the non-local (ai or multiplayer) and local player(s)
*/

private void actuateMatchPreferences() {
final ForgePreferences prefs = FModel.getPreferences();
final List<VField> fieldViews = getFieldViews();

// Human field is at index [0]
//TODO: Rework without that assumption; not true in 4 AI game or hotseat game.
final PhaseIndicator fvHuman = fieldViews.get(0).getPhaseIndicator();
fvHuman.getLblUpkeep().setEnabled(prefs.getPrefBoolean(FPref.PHASE_HUMAN_UPKEEP));
fvHuman.getLblDraw().setEnabled(prefs.getPrefBoolean(FPref.PHASE_HUMAN_DRAW));
fvHuman.getLblMain1().setEnabled(prefs.getPrefBoolean(FPref.PHASE_HUMAN_MAIN1));
fvHuman.getLblBeginCombat().setEnabled(prefs.getPrefBoolean(FPref.PHASE_HUMAN_BEGINCOMBAT));
fvHuman.getLblDeclareAttackers().setEnabled(prefs.getPrefBoolean(FPref.PHASE_HUMAN_DECLAREATTACKERS));
fvHuman.getLblDeclareBlockers().setEnabled(prefs.getPrefBoolean(FPref.PHASE_HUMAN_DECLAREBLOCKERS));
fvHuman.getLblFirstStrike().setEnabled(prefs.getPrefBoolean(FPref.PHASE_HUMAN_FIRSTSTRIKE));
fvHuman.getLblCombatDamage().setEnabled(prefs.getPrefBoolean(FPref.PHASE_HUMAN_COMBATDAMAGE));
fvHuman.getLblEndCombat().setEnabled(prefs.getPrefBoolean(FPref.PHASE_HUMAN_ENDCOMBAT));
fvHuman.getLblMain2().setEnabled(prefs.getPrefBoolean(FPref.PHASE_HUMAN_MAIN2));
fvHuman.getLblEndTurn().setEnabled(prefs.getPrefBoolean(FPref.PHASE_HUMAN_EOT));
fvHuman.getLblCleanup().setEnabled(prefs.getPrefBoolean(FPref.PHASE_HUMAN_CLEANUP));

// AI field is at index [1], ...
for (int i = 1; i < fieldViews.size(); i++) {
final PhaseIndicator fvAi = fieldViews.get(i).getPhaseIndicator();
fvAi.getLblUpkeep().setEnabled(prefs.getPrefBoolean(FPref.PHASE_AI_UPKEEP));
fvAi.getLblDraw().setEnabled(prefs.getPrefBoolean(FPref.PHASE_AI_DRAW));
fvAi.getLblMain1().setEnabled(prefs.getPrefBoolean(FPref.PHASE_AI_MAIN1));
fvAi.getLblBeginCombat().setEnabled(prefs.getPrefBoolean(FPref.PHASE_AI_BEGINCOMBAT));
fvAi.getLblDeclareAttackers().setEnabled(prefs.getPrefBoolean(FPref.PHASE_AI_DECLAREATTACKERS));
fvAi.getLblDeclareBlockers().setEnabled(prefs.getPrefBoolean(FPref.PHASE_AI_DECLAREBLOCKERS));
fvAi.getLblFirstStrike().setEnabled(prefs.getPrefBoolean(FPref.PHASE_AI_FIRSTSTRIKE));
fvAi.getLblCombatDamage().setEnabled(prefs.getPrefBoolean(FPref.PHASE_AI_COMBATDAMAGE));
fvAi.getLblEndCombat().setEnabled(prefs.getPrefBoolean(FPref.PHASE_AI_ENDCOMBAT));
fvAi.getLblMain2().setEnabled(prefs.getPrefBoolean(FPref.PHASE_AI_MAIN2));
fvAi.getLblEndTurn().setEnabled(prefs.getPrefBoolean(FPref.PHASE_AI_EOT));
fvAi.getLblCleanup().setEnabled(prefs.getPrefBoolean(FPref.PHASE_AI_CLEANUP));
//loops over all fields
for (int playerIndex = 0; playerIndex < fieldViews.size(); playerIndex++) {
// This is needed for multiplayer games and if there is more than one human in the game (the index is not just 0)
final PlayerView player = sortedPlayers.get(playerIndex);
final boolean isLocal = initiallyControlled.contains(player);
final FPref[] keys = isLocal ? FPref.PHASES_HUMAN : FPref.PHASES_AI;
final PhaseIndicator pi = fieldViews.get(playerIndex).getPhaseIndicator();

//Get all Phase types expect upkeep cause there is no label for the upkeep step
PhaseType[] Phases = Arrays.stream(PhaseType.values()).skip(1).toArray(PhaseType[]::new);
for (int PhaseIndex = 0; PhaseIndex < Phases.length; PhaseIndex++) {
pi.getLabelFor(Phases[PhaseIndex]).setEnabled(prefs.getPrefBoolean(keys[PhaseIndex]));
}
}
}

Expand Down
14 changes: 14 additions & 0 deletions forge-gui/src/main/java/forge/localinstance/properties/ForgePreferences.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,6 +329,20 @@ public String getDefault() {
BRAWL_P5_DECK_STATE, BRAWL_P6_DECK_STATE,
BRAWL_P7_DECK_STATE, BRAWL_P8_DECK_STATE };

public static FPref[] PHASES_AI = {
PHASE_AI_UPKEEP, PHASE_AI_DRAW, PHASE_AI_MAIN1,
PHASE_AI_BEGINCOMBAT, PHASE_AI_DECLAREATTACKERS,
PHASE_AI_DECLAREBLOCKERS, PHASE_AI_FIRSTSTRIKE,
PHASE_AI_COMBATDAMAGE, PHASE_AI_ENDCOMBAT,
PHASE_AI_MAIN2, PHASE_AI_EOT, PHASE_AI_CLEANUP,
};
public static FPref[] PHASES_HUMAN= {
PHASE_HUMAN_UPKEEP, PHASE_HUMAN_DRAW, PHASE_HUMAN_MAIN1,
PHASE_HUMAN_BEGINCOMBAT, PHASE_HUMAN_DECLAREATTACKERS,
PHASE_HUMAN_DECLAREBLOCKERS, PHASE_HUMAN_FIRSTSTRIKE ,
PHASE_HUMAN_COMBATDAMAGE , PHASE_HUMAN_ENDCOMBAT ,
PHASE_HUMAN_MAIN2, PHASE_HUMAN_EOT , PHASE_HUMAN_CLEANUP,
};
}

/** Instantiates a ForgePreferences object. */
Expand Down