From ae0d42ff09b20e17c83a1c3fd8951aa92b2a2110 Mon Sep 17 00:00:00 2001 From: Nathan Date: Wed, 10 Jul 2024 16:27:50 -0600 Subject: [PATCH 1/3] Use song hash to set note shuffle seed --- Assets/Script/Gameplay/Player/TrackPlayer.cs | 2 +- YARG.Core | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Assets/Script/Gameplay/Player/TrackPlayer.cs b/Assets/Script/Gameplay/Player/TrackPlayer.cs index 44e743dcd..4d5a5c994 100644 --- a/Assets/Script/Gameplay/Player/TrackPlayer.cs +++ b/Assets/Script/Gameplay/Player/TrackPlayer.cs @@ -185,7 +185,7 @@ public override void Initialize(int index, YargPlayer player, SongChart chart, T SetupTheme(player.Profile.GameMode); OriginalNoteTrack = GetNotes(chart); - player.Profile.ApplyModifiers(OriginalNoteTrack); + player.Profile.ApplyModifiers(GameManager.Song, OriginalNoteTrack); NoteTrack = OriginalNoteTrack; Notes = NoteTrack.Notes; diff --git a/YARG.Core b/YARG.Core index 5cf5dfcdd..13ed72e5c 160000 --- a/YARG.Core +++ b/YARG.Core @@ -1 +1 @@ -Subproject commit 5cf5dfcdd1a9742e6e70c79b5671455cc3dd2110 +Subproject commit 13ed72e5c630e66f702840aea1c9d9bdc2fd2ac1 From 5005c487c3f9f5319ef536f5dedaf48a6839c937 Mon Sep 17 00:00:00 2001 From: Nathan Date: Wed, 10 Jul 2024 16:36:22 -0600 Subject: [PATCH 2/3] Add Note Shuffle icon --- Assets/Art/Menu/Common/ModifierIcons.png | 4 ++-- Assets/Art/Menu/Common/ModifierIcons.png.meta | 20 +++++++++---------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Assets/Art/Menu/Common/ModifierIcons.png b/Assets/Art/Menu/Common/ModifierIcons.png index 8d85027d3..35ede7a21 100644 --- a/Assets/Art/Menu/Common/ModifierIcons.png +++ b/Assets/Art/Menu/Common/ModifierIcons.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:36d49ec39a47442bcfb910f18ea4d6c0cabaced44f00556fe97b09f40d2b1535 -size 1846713 +oid sha256:ff3d100e06ee4c294e60be36b2a5d412f04283e1f156570874e7270c62ef858d +size 1729403 diff --git a/Assets/Art/Menu/Common/ModifierIcons.png.meta b/Assets/Art/Menu/Common/ModifierIcons.png.meta index 1545ab9ad..96b7025ec 100644 --- a/Assets/Art/Menu/Common/ModifierIcons.png.meta +++ b/Assets/Art/Menu/Common/ModifierIcons.png.meta @@ -420,7 +420,7 @@ TextureImporter: edges: [] weights: [] - serializedVersion: 2 - name: ModifierIcons_15 + name: NoteShuffle rect: serializedVersion: 2 x: 1536 @@ -458,15 +458,15 @@ TextureImporter: Ghosting: 960618387 HoposToTaps: 1309754347 InfiniteFrontEnd: -1660463282 - ModifierIcons_15: 1841026791 - ModifierIcons_3: -1638818548 - ModifierIcons_4: 1692867385 - ModifierIcons_5: -1436843964 - ModifierIcons_6: 1497401919 - ModifierIcons_7: -1355680061 - NoKicks: -1200274759 - TapsToHopos: 1609936924 - UnpitchedOnly: -2147107449 + ModifierIcons_3: 1692867385 + ModifierIcons_4: -1436843964 + ModifierIcons_5: 1497401919 + ModifierIcons_6: -1355680061 + ModifierIcons_7: -1200274759 + NoKicks: 1609936924 + NoteShuffle: 1841026791 + TapsToHopos: -2147107449 + UnpitchedOnly: 1841026791 spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 From f5212206c7549229584d496edc2b688289f17a6e Mon Sep 17 00:00:00 2001 From: Nathan Date: Wed, 10 Jul 2024 23:45:18 -0600 Subject: [PATCH 3/3] Rework shuffle algorithm to greatly improve distributions --- YARG.Core | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/YARG.Core b/YARG.Core index 13ed72e5c..ecc2fb192 160000 --- a/YARG.Core +++ b/YARG.Core @@ -1 +1 @@ -Subproject commit 13ed72e5c630e66f702840aea1c9d9bdc2fd2ac1 +Subproject commit ecc2fb192a2a581a1e74ff3a5668119055f5470b