Skip to content
Open
Changes from all commits
Commits
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
13 changes: 11 additions & 2 deletions Assets/Script/Menu/DifficultySelect/DifficultySelectMenu.cs
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,14 @@ private void OnEnable()
_songList = new List<SongEntry> { GlobalVariables.State.CurrentSong };
}

// Starting a fresh selection session: discard any session-scoped modifiers
// imposed by a previous song (see ApplySessionModifiers) so each player's
// own saved selection is what shows and is edited here.
foreach (var player in PlayerContainer.Players)
{
player.Profile.RestoreSavedModifiers();
}

// ChangePlayer(0) will update for the current player
_playerIndex = 0;
_vocalModifierSelectIndex = -1;
Expand Down Expand Up @@ -534,15 +542,16 @@ private void ChangePlayer(int add)
// Call the player with the selected modifiers, the "primary player"
var primaryPlayer = PlayerContainer.Players[_vocalModifierSelectIndex];

// Copy modifiers to all other vocal players
// Apply the primary player's modifiers to the other vocal players
// for this session only, so their own saved selections survive
foreach (var player in PlayerContainer.Players)
{
if (player.SittingOut) continue;
if (player == primaryPlayer) continue;

if (player.Profile.GameMode == GameMode.Vocals)
{
player.Profile.CopyModifiers(primaryPlayer.Profile);
player.Profile.ApplySessionModifiers(primaryPlayer.Profile);
}
}
}
Expand Down