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

Add internal pathway for ensuring correct application of bindable mods

Browse Source
This commit is contained in:
Dean Herbert 2021-01-03 15:48:28 +09:00
parent 23e216fa0b
commit 29dbb1cc0d
3 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/Online/API/APIMod.cs
View File

@ -51,7 +51,7 @@ namespace osu.Game.Online.API
if (!Settings.TryGetValue(property.Name.Underscore(), out object settingValue))
continue;
((IBindable)property.GetValue(resultMod)).Parse(settingValue);
resultMod.CopyAdjustedSetting((IBindable)property.GetValue(resultMod), settingValue);
}
return resultMod;

21
osu.Game/Rulesets/Mods/Mod.cs
View File

@ -3,7 +3,6 @@
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
using System.Reflection;
using Newtonsoft.Json;
@ -134,19 +133,25 @@ namespace osu.Game.Rulesets.Mods
// Copy bindable values across
foreach (var (_, prop) in this.GetSettingsSourceProperties())
{
var origBindable = prop.GetValue(this);
var copyBindable = prop.GetValue(copy);
var origBindable = (IBindable)prop.GetValue(this);
var copyBindable = (IBindable)prop.GetValue(copy);
// The bindables themselves are readonly, so the value must be transferred through the Bindable<T>.Value property.
var valueProperty = origBindable.GetType().GetProperty(nameof(Bindable<object>.Value), BindingFlags.Public | BindingFlags.Instance);
Debug.Assert(valueProperty != null);
valueProperty.SetValue(copyBindable, valueProperty.GetValue(origBindable));
// we only care about changes that have been made away from defaults.
if (!origBindable.IsDefault)
copy.CopyAdjustedSetting(copyBindable, origBindable);
}
return copy;
}
/// <summary>
/// When creating copies or clones of a Mod, this method will be called to copy explicitly adjusted user settings.
/// The base implementation will transfer the value via <see cref="Bindable{T}.Parse"/> and should be called unless replaced with custom logic.
/// </summary>
/// <param name="bindable">The target bindable to apply the adjustment.</param>
/// <param name="value">The adjustment to apply.</param>
internal virtual void CopyAdjustedSetting(IBindable bindable, object value) => bindable.Parse(value);
public bool Equals(IMod other) => GetType() == other?.GetType();
}
}

6
osu.Game/Rulesets/Mods/ModDifficultyAdjust.cs
View File

@ -114,6 +114,12 @@ namespace osu.Game.Rulesets.Mods
bindable.ValueChanged += _ => userChangedSettings[bindable] = !bindable.IsDefault;
}
internal override void CopyAdjustedSetting(IBindable bindable, object value)
{
userChangedSettings[bindable] = true;
base.CopyAdjustedSetting(bindable, value);
}
/// <summary>
/// Apply all custom settings to the provided beatmap.
/// </summary>