From 17745a5ca79aafe55d3b83ad7285bdcc6b75c4cb Mon Sep 17 00:00:00 2001
From: AstrlJelly <bdlawson115@gmail.com>
Date: Mon, 26 Feb 2024 12:46:30 -0500
Subject: [PATCH] Fix Anim Block, Fine Semitones in SFX Block (#724)

* Fix Anim Block, Fine Semitones in SFX Block

* i was recursively getting the anim object path BACKWARDS. oops
* added fine semitones in the sfx block, thanks Vincells
* GetPitchFromSemitones uses a float instead of an int now

* revert the semitones thing

* okay that's better

use cents correctly
---
 Assets/Scripts/Minigames.cs      | 18 ++++++++++--------
 Assets/Scripts/Util/SoundByte.cs | 11 +++--------
 2 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/Assets/Scripts/Minigames.cs b/Assets/Scripts/Minigames.cs
index 9fbba446..c2f74d7d 100644
--- a/Assets/Scripts/Minigames.cs
+++ b/Assets/Scripts/Minigames.cs
@@ -1171,16 +1171,16 @@ namespace HeavenStudio
                                 var gm = GameManager.instance;
                                 Minigame game = gm.GetGameInfo(gm.currentGame);
                                 if (game != null) {
-                                    var animators = gm.minigameObj.transform.GetComponentsInChildren<Animator>();
+                                    Animator[] animators = gm.minigameObj.transform.GetComponentsInChildren<Animator>();
                                     // not in an update loop so it's fine :3
                                     ((EntityTypes.DropdownObj)e["animator"]).SetValues(animators.Select(anim => {
-                                        var obj = anim.gameObject;
+                                        Transform obj = anim.transform;
                                         List<string> path = new() { obj.name };
-                                        for (int i = 0; i < 10; i++)
+                                        for (int i = 0; i < 10; i++) // not a while loop because i don't trust myself
                                         {
-                                            if (obj.transform.parent == null || obj.transform.parent.name == game.name) break;
-                                            obj = obj.transform.parent.gameObject;
-                                            path.Add(obj.name);
+                                            if (obj.parent.name == game.name || obj.parent == null) break;
+                                            obj = obj.parent;
+                                            path.Insert(0, obj.name);
                                         }
                                         return string.Join('/', path);
                                     }).ToList());
@@ -1244,10 +1244,11 @@ namespace HeavenStudio
                             }), "Get SFX", "Get all the sfx in the selected minigame."),
                             new Param("sfxName", new EntityTypes.Dropdown(), "SFX Name", "The name of the sfx to play."),
                             new Param("useSemitones", false, "Use Semitones", "Toggle to use semitones instead of straight pitch.", new() {
-                                new((x, e) => (bool)x, "semitones"),
+                                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("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."),
                             new Param("offset", new EntityTypes.Integer(-500, 500), "Offset (ms)", "The offset of the sfx in milliseconds."),
@@ -1255,7 +1256,8 @@ namespace HeavenStudio
                         },
                         preFunction : delegate {
                             var e = eventCaller.currentEntity;
-                            float pitch = e["useSemitones"] ? SoundByte.GetPitchFromSemiTones(e["semitones"], true) : e["pitch"];
+                            float pitch = e["pitch"];
+                            if (e["useSemitones"]) pitch = SoundByte.GetPitchFromCents((e["semitones"] * 100) + e["cents"], false);
                             GameManager.PlaySFXArbitrary(e.beat, e.length, e["game"].CurrentValue, e["sfxName"].CurrentValue, pitch, e["volume"], e["loop"], e["offset"]);
                         }
                     ),
diff --git a/Assets/Scripts/Util/SoundByte.cs b/Assets/Scripts/Util/SoundByte.cs
index 1bb448ca..51b7981e 100644
--- a/Assets/Scripts/Util/SoundByte.cs
+++ b/Assets/Scripts/Util/SoundByte.cs
@@ -460,14 +460,9 @@ namespace HeavenStudio.Util
         /// </summary>
         public static float GetPitchFromSemiTones(int semiTones, bool pitchToMusic)
         {
-            if (pitchToMusic)
-            {
-                return Mathf.Pow(2f, (1f / 12f) * semiTones) * Conductor.instance.musicSource.pitch;
-            }
-            else
-            {
-                return Mathf.Pow(2f, (1f / 12f) * semiTones);
-            }
+            var newSemitones = Mathf.Pow(2f, (1f / 12f) * semiTones);
+            if (pitchToMusic) newSemitones *= Conductor.instance.musicSource.pitch;
+            return newSemitones;
         }
         /// <summary>
         /// Returns the semitones from a pitch.