Updating dependencies and shortening Hatchling code

Exempt-Medic · Nov 30, 2022 · c23eba4 · c23eba4
1 parent fb89b58
commit c23eba4
Show file tree

Hide file tree

Showing 5 changed files with 339 additions and 377 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -26,7 +26,7 @@ jobs:
         uses: BadMagic100/setup-hk@v1
         with:
           apiPath: API
-          #dependencyFilePath: HiveKin/ModDependencies.txt
+          dependencyFilePath: HiveKin/ModDependencies.txt
 
       - name: Setup .NET
         uses: actions/setup-dotnet@v3

diff --git a/HiveKin/HiveKin.cs b/HiveKin/HiveKin.cs
@@ -30,7 +30,6 @@ public HiveKinMod() : base("HiveKin")
             _instance = this;
         }
 
-
         public override void Initialize()
         {
             Log("Initializing");
@@ -59,45 +58,12 @@ private void OnSetVelocity2dAction(On.HutongGames.PlayMaker.Actions.SetVelocity2
         {
             orig(self);
 
-            if (self.Fsm.GameObject.name == "Knight" && self.Fsm.Name == "Spell Control" && self.State.Name == "Spell End" && PlayerDataAccess.equippedCharm_29)
+            if (self.Fsm.GameObject.name == "Knight" && self.Fsm.Name == "Spell Control" && self.State.Name == "Spell End" && PlayerDataAccess.equippedCharm_29 && self.Fsm.PreviousActiveState.Name != "Send Event")
             {
-                int spellLevel = self.Fsm.FsmComponent.GetFsmIntVariable("Spell Level").Value;
-
-                if (self.Fsm.PreviousActiveState.Name == "Fireball Recoil")
-                {
-                    if (spellLevel == 1)
-                    {
-                        HeroController.instance.gameObject.transform.Find("Charm Effects").gameObject.LocateMyFSM("Hatchling Spawn").GetFsmAction<SpawnObjectFromGlobalPool>("Hatch", 2).gameObject.Value.gameObject.Spawn(HeroController.instance.gameObject.transform.position);
-                    }
-
-                    else
-                    {
-                        HeroController.instance.gameObject.transform.Find("Charm Effects").gameObject.LocateMyFSM("Hatchling Spawn").GetFsmAction<SpawnObjectFromGlobalPool>("Hatch", 2).gameObject.Value.gameObject.Spawn(HeroController.instance.gameObject.transform.position);
-                        HeroController.instance.gameObject.transform.Find("Charm Effects").gameObject.LocateMyFSM("Hatchling Spawn").GetFsmAction<SpawnObjectFromGlobalPool>("Hatch", 2).gameObject.Value.gameObject.Spawn(HeroController.instance.gameObject.transform.position);
-                    }
-                }
+                HeroController.instance.gameObject.transform.Find("Charm Effects").gameObject.LocateMyFSM("Hatchling Spawn").GetFsmAction<SpawnObjectFromGlobalPool>("Hatch", 2).gameObject.Value.gameObject.Spawn(HeroController.instance.gameObject.transform.position);
 
-                else if (self.Fsm.PreviousActiveState.Name == "Quake Finish")
+                if (self.Fsm.FsmComponent.GetFsmIntVariable("Spell Level").Value == 2)
                 {
-                    if (spellLevel == 1)
-                    {
-                        HeroController.instance.gameObject.transform.Find("Charm Effects").gameObject.LocateMyFSM("Hatchling Spawn").GetFsmAction<SpawnObjectFromGlobalPool>("Hatch", 2).gameObject.Value.gameObject.Spawn(HeroController.instance.gameObject.transform.position);
-                    }
-                    else
-                    {
-                        HeroController.instance.gameObject.transform.Find("Charm Effects").gameObject.LocateMyFSM("Hatchling Spawn").GetFsmAction<SpawnObjectFromGlobalPool>("Hatch", 2).gameObject.Value.gameObject.Spawn(HeroController.instance.gameObject.transform.position);
-                        HeroController.instance.gameObject.transform.Find("Charm Effects").gameObject.LocateMyFSM("Hatchling Spawn").GetFsmAction<SpawnObjectFromGlobalPool>("Hatch", 2).gameObject.Value.gameObject.Spawn(HeroController.instance.gameObject.transform.position);
-                    }
-                }
-
-                else if (self.Fsm.PreviousActiveState.Name == "Scream End")
-                {
-                    HeroController.instance.gameObject.transform.Find("Charm Effects").gameObject.LocateMyFSM("Hatchling Spawn").GetFsmAction<SpawnObjectFromGlobalPool>("Hatch", 2).gameObject.Value.gameObject.Spawn(HeroController.instance.gameObject.transform.position);
-                }
-
-                else if (self.Fsm.PreviousActiveState.Name == "Scream End 2")
-                {
-                    HeroController.instance.gameObject.transform.Find("Charm Effects").gameObject.LocateMyFSM("Hatchling Spawn").GetFsmAction<SpawnObjectFromGlobalPool>("Hatch", 2).gameObject.Value.gameObject.Spawn(HeroController.instance.gameObject.transform.position);
                     HeroController.instance.gameObject.transform.Find("Charm Effects").gameObject.LocateMyFSM("Hatchling Spawn").GetFsmAction<SpawnObjectFromGlobalPool>("Hatch", 2).gameObject.Value.gameObject.Spawn(HeroController.instance.gameObject.transform.position);
                 }
             }