From c23eba4499557a528245984c429c07756d438412 Mon Sep 17 00:00:00 2001 From: Exempt-Medic Date: Wed, 30 Nov 2022 09:27:41 -0500 Subject: [PATCH] Updating dependencies and shortening Hatchling code --- .github/workflows/build.yml | 2 +- HiveKin/HiveKin.cs | 40 +-- HiveKin/HiveKin.csproj | 669 ++++++++++++++++++------------------ HiveKin/ModDependencies.txt | 2 + README.md | 3 - 5 files changed, 339 insertions(+), 377 deletions(-) create mode 100644 HiveKin/ModDependencies.txt diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8a30800..4b92000 100644 --- 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 index 5b89255..6f28924 100644 --- 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("Hatch", 2).gameObject.Value.gameObject.Spawn(HeroController.instance.gameObject.transform.position); - } - - else - { - HeroController.instance.gameObject.transform.Find("Charm Effects").gameObject.LocateMyFSM("Hatchling Spawn").GetFsmAction("Hatch", 2).gameObject.Value.gameObject.Spawn(HeroController.instance.gameObject.transform.position); - HeroController.instance.gameObject.transform.Find("Charm Effects").gameObject.LocateMyFSM("Hatchling Spawn").GetFsmAction("Hatch", 2).gameObject.Value.gameObject.Spawn(HeroController.instance.gameObject.transform.position); - } - } + HeroController.instance.gameObject.transform.Find("Charm Effects").gameObject.LocateMyFSM("Hatchling Spawn").GetFsmAction("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("Hatch", 2).gameObject.Value.gameObject.Spawn(HeroController.instance.gameObject.transform.position); - } - else - { - HeroController.instance.gameObject.transform.Find("Charm Effects").gameObject.LocateMyFSM("Hatchling Spawn").GetFsmAction("Hatch", 2).gameObject.Value.gameObject.Spawn(HeroController.instance.gameObject.transform.position); - HeroController.instance.gameObject.transform.Find("Charm Effects").gameObject.LocateMyFSM("Hatchling Spawn").GetFsmAction("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("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("Hatch", 2).gameObject.Value.gameObject.Spawn(HeroController.instance.gameObject.transform.position); HeroController.instance.gameObject.transform.Find("Charm Effects").gameObject.LocateMyFSM("Hatchling Spawn").GetFsmAction("Hatch", 2).gameObject.Value.gameObject.Spawn(HeroController.instance.gameObject.transform.position); } } diff --git a/HiveKin/HiveKin.csproj b/HiveKin/HiveKin.csproj index cc357da..411ba8e 100644 --- a/HiveKin/HiveKin.csproj +++ b/HiveKin/HiveKin.csproj @@ -1,340 +1,337 @@ - - HiveKin - HiveKin - net472 - HiveKin - HiveKin - A Hollow Knight mod that... - Copyright © Exempt-Medic 2022 - Exempt-Medic - 7035 - 0.1.* - false - bin\$(Configuration)\ - latest - enable - ..\API - bin\Publish - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + HiveKin + HiveKin + net472 + HiveKin + HiveKin + A Hollow Knight mod that... + Copyright © Exempt-Medic 2022 + Exempt-Medic + 7035 + 0.1.* + false + bin\$(Configuration)\ + latest + enable + ..\API + bin\Publish + + + + + + + + + + + + + + + + + + + - - - + - - - - $(HollowKnightRefs)/Assembly-CSharp.dll - - - $(HollowKnightRefs)/Assembly-CSharp-firstpass.dll - - - $(HollowKnightRefs)/GalaxyCSharp.dll - - - ..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\Hollow Knight\hollow_knight_Data\Managed\Mods\HKMirror\HKMirror.dll - - - $(HollowKnightRefs)/MMHOOK_Assembly-CSharp.dll - - - $(HollowKnightRefs)/MMHOOK_PlayMaker.dll - - - $(HollowKnightRefs)/Mono.Cecil.dll - - - $(HollowKnightRefs)/Mono.Security.dll - - - $(HollowKnightRefs)/MonoMod.RuntimeDetour.dll - - - $(HollowKnightRefs)/MonoMod.Utils.dll - - - $(HollowKnightRefs)/netstandard.dll - - - $(HollowKnightRefs)/Newtonsoft.Json.dll - - - $(HollowKnightRefs)/PlayMaker.dll - - - ..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\Hollow Knight\hollow_knight_Data\Managed\Mods\SFCore\SFCore.dll - - - $(HollowKnightRefs)/System.ComponentModel.Composition.dll - - - $(HollowKnightRefs)/System.Configuration.dll - - - $(HollowKnightRefs)/System.Diagnostics.StackTrace.dll - - - $(HollowKnightRefs)/System.EnterpriseServices.dll - - - $(HollowKnightRefs)/System.Globalization.Extensions.dll - - - $(HollowKnightRefs)/System.IO.Compression.dll - - - $(HollowKnightRefs)/System.Net.Http.dll - - - $(HollowKnightRefs)/System.Runtime.Serialization.Xml.dll - - - $(HollowKnightRefs)/System.ServiceModel.Internals.dll - - - $(HollowKnightRefs)/System.Transactions.dll - - - $(HollowKnightRefs)/System.Xml.XPath.XDocument.dll - - - $(HollowKnightRefs)/Unity.Timeline.dll - - - $(HollowKnightRefs)/UnityEngine.dll - - - $(HollowKnightRefs)/UnityEngine.AccessibilityModule.dll - - - $(HollowKnightRefs)/UnityEngine.AIModule.dll - - - $(HollowKnightRefs)/UnityEngine.AndroidJNIModule.dll - - - $(HollowKnightRefs)/UnityEngine.AnimationModule.dll - - - $(HollowKnightRefs)/UnityEngine.ARModule.dll - - - $(HollowKnightRefs)/UnityEngine.AssetBundleModule.dll - - - $(HollowKnightRefs)/UnityEngine.AudioModule.dll - - - $(HollowKnightRefs)/UnityEngine.ClothModule.dll - - - $(HollowKnightRefs)/UnityEngine.ClusterInputModule.dll - - - $(HollowKnightRefs)/UnityEngine.ClusterRendererModule.dll - - - $(HollowKnightRefs)/UnityEngine.CoreModule.dll - - - $(HollowKnightRefs)/UnityEngine.CrashReportingModule.dll - - - $(HollowKnightRefs)/UnityEngine.DirectorModule.dll - - - $(HollowKnightRefs)/UnityEngine.DSPGraphModule.dll - - - $(HollowKnightRefs)/UnityEngine.GameCenterModule.dll - - - $(HollowKnightRefs)/UnityEngine.GIModule.dll - - - $(HollowKnightRefs)/UnityEngine.GridModule.dll - - - $(HollowKnightRefs)/UnityEngine.HotReloadModule.dll - - - $(HollowKnightRefs)/UnityEngine.ImageConversionModule.dll - - - $(HollowKnightRefs)/UnityEngine.IMGUIModule.dll - - - $(HollowKnightRefs)/UnityEngine.InputLegacyModule.dll - - - $(HollowKnightRefs)/UnityEngine.InputModule.dll - - - $(HollowKnightRefs)/UnityEngine.JSONSerializeModule.dll - - - $(HollowKnightRefs)/UnityEngine.LocalizationModule.dll - - - $(HollowKnightRefs)/UnityEngine.ParticleSystemModule.dll - - - $(HollowKnightRefs)/UnityEngine.PerformanceReportingModule.dll - - - $(HollowKnightRefs)/UnityEngine.Physics2DModule.dll - - - $(HollowKnightRefs)/UnityEngine.PhysicsModule.dll - - - $(HollowKnightRefs)/UnityEngine.ProfilerModule.dll - - - $(HollowKnightRefs)/UnityEngine.RuntimeInitializeOnLoadManagerInitializerModule.dll - - - $(HollowKnightRefs)/UnityEngine.ScreenCaptureModule.dll - - - $(HollowKnightRefs)/UnityEngine.SharedInternalsModule.dll - - - $(HollowKnightRefs)/UnityEngine.SpriteMaskModule.dll - - - $(HollowKnightRefs)/UnityEngine.SpriteShapeModule.dll - - - $(HollowKnightRefs)/UnityEngine.StreamingModule.dll - - - $(HollowKnightRefs)/UnityEngine.SubstanceModule.dll - - - $(HollowKnightRefs)/UnityEngine.SubsystemsModule.dll - - - $(HollowKnightRefs)/UnityEngine.TerrainModule.dll - - - $(HollowKnightRefs)/UnityEngine.TerrainPhysicsModule.dll - - - $(HollowKnightRefs)/UnityEngine.TextCoreModule.dll - - - $(HollowKnightRefs)/UnityEngine.TextRenderingModule.dll - - - $(HollowKnightRefs)/UnityEngine.TilemapModule.dll - - - $(HollowKnightRefs)/UnityEngine.TLSModule.dll - - - $(HollowKnightRefs)/UnityEngine.UI.dll - - - $(HollowKnightRefs)/UnityEngine.UIElementsModule.dll - - - $(HollowKnightRefs)/UnityEngine.UIElementsNativeModule.dll - - - $(HollowKnightRefs)/UnityEngine.UIModule.dll - - - $(HollowKnightRefs)/UnityEngine.UmbraModule.dll - - - $(HollowKnightRefs)/UnityEngine.UNETModule.dll - - - $(HollowKnightRefs)/UnityEngine.UnityAnalyticsModule.dll - - - $(HollowKnightRefs)/UnityEngine.UnityConnectModule.dll - - - $(HollowKnightRefs)/UnityEngine.UnityCurlModule.dll - - - $(HollowKnightRefs)/UnityEngine.UnityTestProtocolModule.dll - - - $(HollowKnightRefs)/UnityEngine.UnityWebRequestAssetBundleModule.dll - - - $(HollowKnightRefs)/UnityEngine.UnityWebRequestAudioModule.dll - - - $(HollowKnightRefs)/UnityEngine.UnityWebRequestModule.dll - - - $(HollowKnightRefs)/UnityEngine.UnityWebRequestTextureModule.dll - - - $(HollowKnightRefs)/UnityEngine.UnityWebRequestWWWModule.dll - - - $(HollowKnightRefs)/UnityEngine.VehiclesModule.dll - - - $(HollowKnightRefs)/UnityEngine.VFXModule.dll - - - $(HollowKnightRefs)/UnityEngine.VideoModule.dll - - - $(HollowKnightRefs)/UnityEngine.VirtualTexturingModule.dll - - - $(HollowKnightRefs)/UnityEngine.VRModule.dll - - - $(HollowKnightRefs)/UnityEngine.WindModule.dll - - - $(HollowKnightRefs)/UnityEngine.XRModule.dll - - - - - - - - - - + + + + + + + + + + $(HollowKnightRefs)/Assembly-CSharp.dll + + + $(HollowKnightRefs)/Assembly-CSharp-firstpass.dll + + + $(HollowKnightRefs)/GalaxyCSharp.dll + + + ..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\Hollow Knight\hollow_knight_Data\Managed\Mods\HKMirror\HKMirror.dll + + + $(HollowKnightRefs)/Mods/HKMirror/HKMirror.dll + + + $(HollowKnightRefs)/MMHOOK_Assembly-CSharp.dll + + + $(HollowKnightRefs)/MMHOOK_PlayMaker.dll + + + $(HollowKnightRefs)/Mono.Cecil.dll + + + $(HollowKnightRefs)/Mono.Security.dll + + + $(HollowKnightRefs)/MonoMod.RuntimeDetour.dll + + + $(HollowKnightRefs)/MonoMod.Utils.dll + + + $(HollowKnightRefs)/netstandard.dll + + + $(HollowKnightRefs)/Newtonsoft.Json.dll + + + $(HollowKnightRefs)/PlayMaker.dll + + + ..\..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\Hollow Knight\hollow_knight_Data\Managed\Mods\SFCore\SFCore.dll + + + $(HollowKnightRefs)/Mods/SFCore/SFCore.dll + + + $(HollowKnightRefs)/System.ComponentModel.Composition.dll + + + $(HollowKnightRefs)/System.Configuration.dll + + + $(HollowKnightRefs)/System.Diagnostics.StackTrace.dll + + + $(HollowKnightRefs)/System.EnterpriseServices.dll + + + $(HollowKnightRefs)/System.Globalization.Extensions.dll + + + $(HollowKnightRefs)/System.IO.Compression.dll + + + $(HollowKnightRefs)/System.Net.Http.dll + + + $(HollowKnightRefs)/System.Runtime.Serialization.Xml.dll + + + $(HollowKnightRefs)/System.ServiceModel.Internals.dll + + + $(HollowKnightRefs)/System.Transactions.dll + + + $(HollowKnightRefs)/System.Xml.XPath.XDocument.dll + + + $(HollowKnightRefs)/Unity.Timeline.dll + + + $(HollowKnightRefs)/UnityEngine.dll + + + $(HollowKnightRefs)/UnityEngine.AccessibilityModule.dll + + + $(HollowKnightRefs)/UnityEngine.AIModule.dll + + + $(HollowKnightRefs)/UnityEngine.AndroidJNIModule.dll + + + $(HollowKnightRefs)/UnityEngine.AnimationModule.dll + + + $(HollowKnightRefs)/UnityEngine.ARModule.dll + + + $(HollowKnightRefs)/UnityEngine.AssetBundleModule.dll + + + $(HollowKnightRefs)/UnityEngine.AudioModule.dll + + + $(HollowKnightRefs)/UnityEngine.ClothModule.dll + + + $(HollowKnightRefs)/UnityEngine.ClusterInputModule.dll + + + $(HollowKnightRefs)/UnityEngine.ClusterRendererModule.dll + + + $(HollowKnightRefs)/UnityEngine.CoreModule.dll + + + $(HollowKnightRefs)/UnityEngine.CrashReportingModule.dll + + + $(HollowKnightRefs)/UnityEngine.DirectorModule.dll + + + $(HollowKnightRefs)/UnityEngine.DSPGraphModule.dll + + + $(HollowKnightRefs)/UnityEngine.GameCenterModule.dll + + + $(HollowKnightRefs)/UnityEngine.GIModule.dll + + + $(HollowKnightRefs)/UnityEngine.GridModule.dll + + + $(HollowKnightRefs)/UnityEngine.HotReloadModule.dll + + + $(HollowKnightRefs)/UnityEngine.ImageConversionModule.dll + + + $(HollowKnightRefs)/UnityEngine.IMGUIModule.dll + + + $(HollowKnightRefs)/UnityEngine.InputLegacyModule.dll + + + $(HollowKnightRefs)/UnityEngine.InputModule.dll + + + $(HollowKnightRefs)/UnityEngine.JSONSerializeModule.dll + + + $(HollowKnightRefs)/UnityEngine.LocalizationModule.dll + + + $(HollowKnightRefs)/UnityEngine.ParticleSystemModule.dll + + + $(HollowKnightRefs)/UnityEngine.PerformanceReportingModule.dll + + + $(HollowKnightRefs)/UnityEngine.Physics2DModule.dll + + + $(HollowKnightRefs)/UnityEngine.PhysicsModule.dll + + + $(HollowKnightRefs)/UnityEngine.ProfilerModule.dll + + + $(HollowKnightRefs)/UnityEngine.RuntimeInitializeOnLoadManagerInitializerModule.dll + + + $(HollowKnightRefs)/UnityEngine.ScreenCaptureModule.dll + + + $(HollowKnightRefs)/UnityEngine.SharedInternalsModule.dll + + + $(HollowKnightRefs)/UnityEngine.SpriteMaskModule.dll + + + $(HollowKnightRefs)/UnityEngine.SpriteShapeModule.dll + + + $(HollowKnightRefs)/UnityEngine.StreamingModule.dll + + + $(HollowKnightRefs)/UnityEngine.SubstanceModule.dll + + + $(HollowKnightRefs)/UnityEngine.SubsystemsModule.dll + + + $(HollowKnightRefs)/UnityEngine.TerrainModule.dll + + + $(HollowKnightRefs)/UnityEngine.TerrainPhysicsModule.dll + + + $(HollowKnightRefs)/UnityEngine.TextCoreModule.dll + + + $(HollowKnightRefs)/UnityEngine.TextRenderingModule.dll + + + $(HollowKnightRefs)/UnityEngine.TilemapModule.dll + + + $(HollowKnightRefs)/UnityEngine.TLSModule.dll + + + $(HollowKnightRefs)/UnityEngine.UI.dll + + + $(HollowKnightRefs)/UnityEngine.UIElementsModule.dll + + + $(HollowKnightRefs)/UnityEngine.UIElementsNativeModule.dll + + + $(HollowKnightRefs)/UnityEngine.UIModule.dll + + + $(HollowKnightRefs)/UnityEngine.UmbraModule.dll + + + $(HollowKnightRefs)/UnityEngine.UNETModule.dll + + + $(HollowKnightRefs)/UnityEngine.UnityAnalyticsModule.dll + + + $(HollowKnightRefs)/UnityEngine.UnityConnectModule.dll + + + $(HollowKnightRefs)/UnityEngine.UnityCurlModule.dll + + + $(HollowKnightRefs)/UnityEngine.UnityTestProtocolModule.dll + + + $(HollowKnightRefs)/UnityEngine.UnityWebRequestAssetBundleModule.dll + + + $(HollowKnightRefs)/UnityEngine.UnityWebRequestAudioModule.dll + + + $(HollowKnightRefs)/UnityEngine.UnityWebRequestModule.dll + + + $(HollowKnightRefs)/UnityEngine.UnityWebRequestTextureModule.dll + + + $(HollowKnightRefs)/UnityEngine.UnityWebRequestWWWModule.dll + + + $(HollowKnightRefs)/UnityEngine.VehiclesModule.dll + + + $(HollowKnightRefs)/UnityEngine.VFXModule.dll + + + $(HollowKnightRefs)/UnityEngine.VideoModule.dll + + + $(HollowKnightRefs)/UnityEngine.VirtualTexturingModule.dll + + + $(HollowKnightRefs)/UnityEngine.VRModule.dll + + + $(HollowKnightRefs)/UnityEngine.WindModule.dll + + + $(HollowKnightRefs)/UnityEngine.XRModule.dll + + + + + + + \ No newline at end of file diff --git a/HiveKin/ModDependencies.txt b/HiveKin/ModDependencies.txt new file mode 100644 index 0000000..303b7ee --- /dev/null +++ b/HiveKin/ModDependencies.txt @@ -0,0 +1,2 @@ +HKMirror +SFCore \ No newline at end of file diff --git a/README.md b/README.md index 03c846d..a22a456 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,3 @@ # HiveKin A Hollow Knight mod that prevents Focusing and causes Hiveblood to always be active and heal continuously. Charms have additional interactions. -Requires: -* SF Core -* HK Mirror