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

Merge pull request #27535 from nekodex/argon-hitsounds

Browse Source 
Add support for argon hitsounds
This commit is contained in:
Dean Herbert 2024-03-09 01:47:35 +08:00 committed by GitHub
commit 612bc66e86
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/Audio/HitSampleInfo.cs
View File

@ -80,6 +80,8 @@ namespace osu.Game.Audio
yield return $"Gameplay/{Bank}-{Name}{Suffix}";
yield return $"Gameplay/{Bank}-{Name}";
yield return $"Gameplay/{Name}";
}
}

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

@ -24,9 +24,11 @@ namespace osu.Game.Skinning
{
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)
return sample;
}

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

@ -77,7 +77,10 @@ namespace osu.Game.Skinning
{
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)
return sample;
}