h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-13 07:43:00 +08:00
Code Issues Releases Wiki Activity

Add support for Argon hitsounds

Browse Source
This commit is contained in:
Jamie Taylor 2024-03-08 21:43:18 +09:00
parent e18bbc9509
commit ad842b60f5
No known key found for this signature in database
GPG Key ID: 2ACFA8B6370B8C8C
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
osu.Game/Skinning/ArgonProSkin.cs
View File

@ -24,9 +24,11 @@ namespace osu.Game.Skinning
{ {
foreach (string lookup in sampleInfo.LookupNames) foreach (string lookup in sampleInfo.LookupNames)
{ {
string remappedLookup = lookup.Replace(@"Gameplay/", @"Gameplay/ArgonPro/"); var sample = Samples?.Get(lookup)
?? Resources.AudioManager?.Samples.Get(lookup.Replace(@"Gameplay/", @"Gameplay/ArgonPro/"))
?? Resources.AudioManager?.Samples.Get(lookup.Replace(@"Gameplay/", @"Gameplay/Argon/"))
?? Resources.AudioManager?.Samples.Get(lookup);
var sample = Samples?.Get(remappedLookup) ?? Resources.AudioManager?.Samples.Get(remappedLookup);
if (sample != null) if (sample != null)
return sample; return sample;
} }

5
osu.Game/Skinning/ArgonSkin.cs
View File

@ -77,7 +77,10 @@ namespace osu.Game.Skinning
{ {
foreach (string lookup in sampleInfo.LookupNames) foreach (string lookup in sampleInfo.LookupNames)
{ {
var sample = Samples?.Get(lookup) ?? Resources.AudioManager?.Samples.Get(lookup); var sample = Samples?.Get(lookup)
?? Resources.AudioManager?.Samples.Get(lookup.Replace(@"Gameplay/", @"Gameplay/Argon/"))
?? Resources.AudioManager?.Samples.Get(lookup);
if (sample != null) if (sample != null)
return sample; return sample;
} }