From e213a7f90077c0e14a1a740f1b8bce72a8102ca1 Mon Sep 17 00:00:00 2001
From: Rapandrasmus <78219215+Rapandrasmus@users.noreply.github.com>
Date: Tue, 14 Feb 2023 19:12:08 +0100
Subject: [PATCH] fixed small bug with ssds (#273)

* Tons of stuff...

* Drumming practice improvements

* Easing for drumming practice

* Converted TOTC to prefunction

* Split scratch o into two

* Forthington voice lines can now be played outside of air rally

* Rhythm Rally Improvements

* Air rally sound improvements

* Spawn blocks rework

* BTS ds small tweaks

* Tap Trial fixes

* More tweaks to tap trial

* Final minor tweaks

* Fixed small ssds bug

---------

Co-authored-by: minenice55 <star.elementa@gmail.com>
---
 .../Games/SamuraiSliceNtr/SamuraiSliceNtr.cs  | 30 +++++++++----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/Assets/Scripts/Games/SamuraiSliceNtr/SamuraiSliceNtr.cs b/Assets/Scripts/Games/SamuraiSliceNtr/SamuraiSliceNtr.cs
index 867c6a9b..7fc2667a 100644
--- a/Assets/Scripts/Games/SamuraiSliceNtr/SamuraiSliceNtr.cs
+++ b/Assets/Scripts/Games/SamuraiSliceNtr/SamuraiSliceNtr.cs
@@ -15,21 +15,6 @@ namespace HeavenStudio.Games.Loaders
         public static Minigame AddGame(EventCaller eventCaller) {
             return new Minigame("samuraiSliceNtr", "Samurai Slice (DS)", "00165D", false, false, new List<GameAction>()
             {
-                //backwards compatibility
-                new GameAction("spawn object", "Toss Object")
-                {
-                    function = delegate
-                    {
-                        SamuraiSliceNtr.instance.ObjectIn(eventCaller.currentEntity.beat, eventCaller.currentEntity["type"], (int) eventCaller.currentEntity["valA"]);
-                    },
-                    defaultLength = 8,
-                    parameters = new List<Param>()
-                    {
-                        new Param("type", SamuraiSliceNtr.ObjectType.Melon, "Object", "The object to spawn"),
-                        new Param("valA", new EntityTypes.Integer(0, 30, 1), "Money", "The amount of coins the melon spills out when sliced"),
-                    },
-                    hidden = true
-                },
                 new GameAction("melon", "Melon")
                 {
                     function = delegate
@@ -67,6 +52,21 @@ namespace HeavenStudio.Games.Loaders
                         new Param("valA", new EntityTypes.Integer(0, 30, 1), "Money", "The amount of coins the demon spills out when sliced"),
                     }
                 },
+                //backwards compatibility
+                new GameAction("spawn object", "Toss Object")
+                {
+                    function = delegate
+                    {
+                        SamuraiSliceNtr.instance.ObjectIn(eventCaller.currentEntity.beat, eventCaller.currentEntity["type"], (int) eventCaller.currentEntity["valA"]);
+                    },
+                    defaultLength = 8,
+                    parameters = new List<Param>()
+                    {
+                        new Param("type", SamuraiSliceNtr.ObjectType.Melon, "Object", "The object to spawn"),
+                        new Param("valA", new EntityTypes.Integer(0, 30, 1), "Money", "The amount of coins the melon spills out when sliced"),
+                    },
+                    hidden = true
+                },
             },
             new List<string>() {"ntr", "normal"},
             "ntrsamurai", "en",