sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-01 08:20:00 +09:00
Code Issues Packages Projects Releases Wiki Activity

Implement per-hitobject custom sample banks

Browse Source
This commit is contained in:
smoogipoo
2018-07-20 15:12:44 +09:00
parent de8d05bb0c
commit c087a73f40
4 changed files with 62 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
View File

@ -194,8 +194,8 @@ namespace osu.Game.Rulesets.Objects.Legacy
string[] split = str.Split(':');
var bank = (LegacyBeatmapDecoder.LegacySampleBank)Convert.ToInt32(split[0]);
var addbank = (LegacyBeatmapDecoder.LegacySampleBank)Convert.ToInt32(split[1]);
var bank = (LegacyBeatmapDecoder.LegacySampleBank)int.Parse(split[0]);
var addbank = (LegacyBeatmapDecoder.LegacySampleBank)int.Parse(split[1]);
string stringBank = bank.ToString().ToLower();
if (stringBank == @"none")
@ -207,6 +207,9 @@ namespace osu.Game.Rulesets.Objects.Legacy
bankInfo.Normal = stringBank;
bankInfo.Add = stringAddBank;
if (split.Length > 2)
bankInfo.CustomSampleBank = int.Parse(split[2]);
if (split.Length > 3)
bankInfo.Volume = int.Parse(split[3]);
@ -258,41 +261,45 @@ namespace osu.Game.Rulesets.Objects.Legacy
var soundTypes = new List<SampleInfo>
{
new SampleInfo
new LegacySampleInfo
{
Bank = bankInfo.Normal,
Name = SampleInfo.HIT_NORMAL,
Volume = bankInfo.Volume
Volume = bankInfo.Volume,
CustomSampleBank = bankInfo.CustomSampleBank
}
};
if (type.HasFlag(LegacySoundType.Finish))
{
soundTypes.Add(new SampleInfo
soundTypes.Add(new LegacySampleInfo
{
Bank = bankInfo.Add,
Name = SampleInfo.HIT_FINISH,
Volume = bankInfo.Volume
Volume = bankInfo.Volume,
CustomSampleBank = bankInfo.CustomSampleBank
});
}
if (type.HasFlag(LegacySoundType.Whistle))
{
soundTypes.Add(new SampleInfo
soundTypes.Add(new LegacySampleInfo
{
Bank = bankInfo.Add,
Name = SampleInfo.HIT_WHISTLE,
Volume = bankInfo.Volume
Volume = bankInfo.Volume,
CustomSampleBank = bankInfo.CustomSampleBank
});
}
if (type.HasFlag(LegacySoundType.Clap))
{
soundTypes.Add(new SampleInfo
soundTypes.Add(new LegacySampleInfo
{
Bank = bankInfo.Add,
Name = SampleInfo.HIT_CLAP,
Volume = bankInfo.Volume
Volume = bankInfo.Volume,
CustomSampleBank = bankInfo.CustomSampleBank
});
}
@ -307,9 +314,23 @@ namespace osu.Game.Rulesets.Objects.Legacy
public string Add;
public int Volume;
public int CustomSampleBank;
public SampleBankInfo Clone() => (SampleBankInfo)MemberwiseClone();
}
private class LegacySampleInfo : SampleInfo
{
public int CustomSampleBank
{
set
{
if (value > 1)
Suffix = value.ToString();
}
}
}
private class FileSampleInfo : SampleInfo
{
public string Filename;