From fd54e2bf221dd968810a0d07ae34ebabc0de9e88 Mon Sep 17 00:00:00 2001 From: playinful <82474412+playinful@users.noreply.github.com> Date: Thu, 28 Mar 2024 16:20:16 -0400 Subject: [PATCH] i accidentally removed a bunch of work from yall oops this should fix that i think --- Assets/Scripts/Minigames.cs | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/Assets/Scripts/Minigames.cs b/Assets/Scripts/Minigames.cs index 0cdda17bb..b2b1a54cb 100644 --- a/Assets/Scripts/Minigames.cs +++ b/Assets/Scripts/Minigames.cs @@ -252,6 +252,8 @@ namespace HeavenStudio e.dynamicData.Add(param.propertyName, ((EntityTypes.Integer)param.parameter).val); else if (type == typeof(EntityTypes.Float)) e.dynamicData.Add(param.propertyName, ((EntityTypes.Float)param.parameter).val); + else if (type == typeof(EntityTypes.Note)) + e.dynamicData.Add(param.propertyName, ((EntityTypes.Note)param.parameter).val); else if (type.IsEnum) e.dynamicData.Add(param.propertyName, (int)param.parameter); else @@ -263,7 +265,7 @@ namespace HeavenStudio { try { - if (type == typeof(EntityTypes.Integer)) + if (type == typeof(EntityTypes.Integer) || type == typeof(EntityTypes.Note)) e.dynamicData[param.propertyName] = (int)e[param.propertyName]; else if (type == typeof(EntityTypes.Float)) e.dynamicData[param.propertyName] = (float)e[param.propertyName]; @@ -295,6 +297,8 @@ namespace HeavenStudio // use default value if (type == typeof(EntityTypes.Integer)) e.dynamicData[param.propertyName] = ((EntityTypes.Integer)param.parameter).val; + else if (type == typeof(EntityTypes.Note)) + e.dynamicData[param.propertyName] = ((EntityTypes.Note)param.parameter).val; else if (type == typeof(EntityTypes.Float)) e.dynamicData[param.propertyName] = ((EntityTypes.Float)param.parameter).val; else if (type.IsEnum && param.propertyName != "ease") @@ -367,6 +371,7 @@ namespace HeavenStudio public bool hidden; public bool fxOnly; public List actions = new List(); + public uint? chronologicalSortKey; // playinful: basically i figure this should just be whatever index number the minigame is @@ -1380,7 +1385,7 @@ namespace HeavenStudio new((x, e) => (bool)x, "semitones", "cents"), new((x, e) => !(bool)x, "pitch"), }), - new Param("semitones", new EntityTypes.Integer(-24, 24, 0), "Semitones", "The semitones of the sfx."), + new Param("semitones", new EntityTypes.Integer(-EntityTypes.Note.maxSemitones, EntityTypes.Note.maxSemitones, 0), "Semitones", "The semitones of the sfx."), new Param("cents", new EntityTypes.Integer(-100, 100, 0), "Cents", "The cents of the sfx."), new Param("pitch", new EntityTypes.Float(0, 5, 1), "Pitch", "The pitch of the sfx."), new Param("volume", new EntityTypes.Float(0, 2, 1), "Volume", "The volume of the sfx."),