Add solo taps modifier to score card.

An interim icon was added to the ModifierIcons sprite sheet to support this change.
YARC-Official · Jan 19, 2025 · ef4f218 · ef4f218
1 parent 647e7f7
commit ef4f218
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 7 deletions.
diff --git a/Assets/Art/Menu/Common/ModifierIcons.png b/Assets/Art/Menu/Common/ModifierIcons.png
diff --git a/Assets/Art/Menu/Common/ModifierIcons.png.meta b/Assets/Art/Menu/Common/ModifierIcons.png.meta
diff --git a/Assets/Script/Menu/ScoreScreen/ScoreCards/ModifierIcon.cs b/Assets/Script/Menu/ScoreScreen/ScoreCards/ModifierIcon.cs
@@ -11,6 +11,7 @@ public class ModifierIcon : MonoBehaviour
         private const string GHOSTING           = "Ghosting";
         private const string INFINITE_FRONT_END = "InfiniteFrontEnd";
         private const string DYNAMIC_HIT_WINDOW = "DynamicHitWindow";
+        private const string SOLO_TAPS          = "SoloTaps";
 
         [SerializeField]
         private Image _icon;
@@ -55,6 +56,13 @@ public static void SpawnEnginePresetIcons(ModifierIcon prefab, Transform parent,
                         icon.InitializeCustom(DYNAMIC_HIT_WINDOW);
                     }
 
+                    // Solo Taps
+                    if (enginePreset.FiveFretGuitar.SoloTaps)
+                    {
+                        var icon = Instantiate(prefab, parent);
+                        icon.InitializeCustom(SOLO_TAPS);
+                    }
+
                     break;
                 case GameMode.FiveLaneDrums:
                 case GameMode.FourLaneDrums:

diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset
@@ -139,8 +139,7 @@ PlayerSettings:
     Others: 1
   bundleVersion: 0.1.0
   preloadedAssets:
-  - {fileID: 11400000, guid: 2ffed9dcd47320f4986a850f05ff2ad5, type: 2}
-  - {fileID: 11400000, guid: 8efbce013f4e1c34895851b7038c76e9, type: 2}
+  - {fileID: 0}
   metroInputSource: 0
   wsaTransparentSwapchain: 0
   m_HolographicPauseOnTrackingLoss: 1

diff --git a/YARG.Core b/YARG.Core
+1 −1		ReplayCli/Cli.SimulateFps.cs
+14 −2		ReplayCli/Cli.Verify.cs
+10 −2		ReplayCli/Cli.cs
+0 −3		YARG.Core/Chart/Events/ChartEvent.cs
+5 −46		YARG.Core/Chart/Events/WaitCountdown.cs
+2 −2		YARG.Core/Chart/SongChart.AutoGeneration.cs
+35 −7		YARG.Core/Chart/Sync/SyncTrack.cs
+7 −7		YARG.Core/Chart/Sync/TempoChange.cs
+1 −1		YARG.Core/Chart/Sync/TimeSignatureEvent.cs
+112 −139		YARG.Core/Engine/BaseEngine.Generic.cs
+59 −40		YARG.Core/Engine/BaseEngine.cs
+32 −2		YARG.Core/Engine/BaseStats.cs
+32 −3		YARG.Core/Engine/Drums/DrumsEngine.cs
+49 −0		YARG.Core/Engine/Drums/DrumsStats.cs
+10 −2		YARG.Core/Engine/Drums/Engines/YargDrumsEngine.cs
+32 −23		YARG.Core/Engine/Guitar/Engines/YargFiveFretEngine.cs
+42 −14		YARG.Core/Engine/Guitar/GuitarEngine.cs
+8 −1		YARG.Core/Engine/Guitar/GuitarEngineParameters.cs
+0 −4		YARG.Core/Engine/Guitar/GuitarStats.cs
+33 −24		YARG.Core/Engine/ProKeys/Engines/YargProKeysEngine.cs
+21 −7		YARG.Core/Engine/ProKeys/ProKeysEngine.cs
+9 −0		YARG.Core/Engine/ProKeys/ProKeysStats.cs
+11 −2		YARG.Core/Engine/SoloSection.cs
+0 −2		YARG.Core/Engine/Vocals/Engines/YargVocalsEngine.cs
+6 −1		YARG.Core/Game/Presets/EnginePreset.Instruments.cs
+12 −0		YARG.Core/Input/InputActions.cs
+3 −3		YARG.Core/MoonscraperChartParser/Events/MoonNote.cs
+4 −6		YARG.Core/MoonscraperChartParser/IO/Chart/ChartReader.cs
+63 −36		YARG.Core/MoonscraperChartParser/IO/Midi/MidReader.cs
+2 −2		YARG.Core/MoonscraperChartParser/MoonSong.cs
+3 −2		YARG.Core/Replays/Analyzer/AnalysisResult.cs
+251 −49		YARG.Core/Replays/Analyzer/ReplayAnalyzer.cs
+2 −2		YARG.Core/Song/Entries/Ini/SongEntry.IniBase.cs