Improved overall UI. Removed KorzUtils hard dependency

nerthul11 · Oct 2, 2024 · bca108e · bca108e
1 parent b5201e1
commit bca108e
Show file tree

Hide file tree

Showing 8 changed files with 69 additions and 38 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -33,11 +33,6 @@ jobs:
           wget https://github.com/homothetyhk/HollowKnight.ItemChanger/releases/latest/download/ItemChanger.zip -O ItemChanger.zip
           unzip -o ItemChanger.zip -d References
       
-      - name: Fetch KorzUtils
-        run: |
-          wget https://github.com/Korzer420/KorzUtils/releases/latest/download/KorzUtils.zip -O KorzUtils.zip
-          unzip -o KorzUtils.zip -d References
-      
       - name: Fetch MenuChanger
         run: |
           wget https://github.com/homothetyhk/HollowKnight.MenuChanger/releases/latest/download/MenuChanger.zip -O MenuChanger.zip

diff --git a/AccessRandomizer.cs b/AccessRandomizer.cs
@@ -9,7 +9,7 @@ namespace AccessRandomizer
     public class AccessRandomizer : Mod, IGlobalSettings<AccessSettings> 
     {
         new public string GetName() => "AccessRandomizer";
-        public override string GetVersion() => "1.2.4.0";
+        public override string GetVersion() => "1.2.4.1";
 
         private static AccessRandomizer _instance;
         public AccessRandomizer() : base()

diff --git a/AccessRandomizer.csproj b/AccessRandomizer.csproj
@@ -8,8 +8,8 @@
     <Product>AccessRandomizer</Product>
     <Description>A Randomizer add-on for a few miscellaneous access checks.</Description>
     <Copyright>Copyright © </Copyright>
-    <AssemblyVersion>1.2.4.0</AssemblyVersion>
-    <FileVersion>1.2.4.0</FileVersion>
+    <AssemblyVersion>1.2.4.1</AssemblyVersion>
+    <FileVersion>1.2.4.1</FileVersion>
     <OutputPath>bin\$(Configuration)\</OutputPath>
     <LangVersion>latest</LangVersion>
   </PropertyGroup>
@@ -83,9 +83,6 @@
     <Reference Include="ItemChanger">
       <HintPath>$(LocalRefs)/Mods/ItemChanger/ItemChanger.dll</HintPath>
     </Reference>
-    <Reference Include="KorzUtils">
-      <HintPath>$(LocalRefs)/Mods/KorzUtils/KorzUtils.dll</HintPath>
-    </Reference>
     <Reference Include="MenuChanger">
       <HintPath>$(LocalRefs)/Mods/MenuChanger/MenuChanger.dll</HintPath>
     </Reference>

diff --git a/IC/AccessSprite.cs b/IC/AccessSprite.cs
@@ -1,5 +1,5 @@
 using ItemChanger;
-using KorzUtils.Helper;
+using ItemChanger.Internal;
 using Newtonsoft.Json;
 using System;
 using UnityEngine;
@@ -9,25 +9,15 @@ namespace AccessRandomizer.IC
     [Serializable]
     public class AccessSprite : ISprite
     {
-        #region Constructors
-
+        private static SpriteManager EmbeddedSpriteManager = new(typeof(AccessSprite).Assembly, "AccessRandomizer.Resources.Sprites.");
+        public string Key { get; set; }
         public AccessSprite(string key)
         {
             if (!string.IsNullOrEmpty(key))
                 Key = key;
         }
-
-        #endregion
-
-        #region Properties
-
-        public string Key { get; set; }
-
         [JsonIgnore]
-        public Sprite Value => SpriteHelper.CreateSprite<AccessRandomizer>("Sprites." + Key.Replace("/", ".").Replace("\\", "."));
-
-        #endregion
-
-        public ISprite Clone() => new AccessSprite(Key);
+        public Sprite Value => EmbeddedSpriteManager.GetSprite(Key);
+        public ISprite Clone() => (ISprite)MemberwiseClone();
     }
 }
diff --git a/IC/RespectLocation.cs b/IC/RespectLocation.cs
@@ -2,10 +2,10 @@
 using ItemChanger.Locations;
 using ItemChanger.Util;
 using ItemChanger.Tags;
-using KorzUtils.Helper;
 using Satchel;
 using System.Linq;
 using AccessRandomizer.Fsm;
+using UnityEngine;
 
 namespace AccessRandomizer.IC
 {
@@ -69,7 +69,12 @@ private void ToggleChallenge(PlayMakerFSM fsm)
                 fsm.ChangeTransition("Can Talk Bool?", "TRUE", "Idle 2");
                 // Keep the location disabled but spawn shiny item
                 if (Placement.Items.All(x => x.WasEverObtained()))
-                    ItemHelper.SpawnShiny(new(30.2f, 7.4f), Placement);
+                {
+                    Container c = Container.GetContainer(Container.Shiny);
+                    GameObject shiny = c.GetNewContainer(new(c.Name, Placement, flingType));
+                    shiny.transform.position = new(30.2f, 7.4f);
+                    shiny.SetActive(true);
+                }
             }
             else
                 // Force enable if it isn't

diff --git a/IC/TrapBenchItem.cs b/IC/TrapBenchItem.cs
@@ -11,6 +11,7 @@ public class TrapBenchItem : AbstractItem
         public override void GiveImmediate(GiveInfo info)
         {
             AccessModule.Instance.TrapBench = true;
+            PlayerData.instance.spiderCapture = false;
             AccessModule.Instance.CompletedChallenges();
         }
 

diff --git a/IC/TrapBenchLocation.cs b/IC/TrapBenchLocation.cs
@@ -1,17 +1,19 @@
+using System;
 using ItemChanger;
 using ItemChanger.Locations;
 using ItemChanger.Tags;
+using ItemChanger.Util;
+using Satchel;
+using UnityEngine;
 
 namespace AccessRandomizer.IC
 {
-    public class TrapBenchLocation : CoordinateLocation
+    public class TrapBenchLocation : AutoLocation
     {
         public TrapBenchLocation()
         {
             name = "Trap_Bench";
             sceneName = SceneNames.Deepnest_Spider_Town;
-            x = 45.0f;
-            y = 58.4f;
             tags = [TrapBenchLocationTag()];
         }
 
@@ -29,7 +31,46 @@ private static Tag TrapBenchLocationTag()
 
         protected override void OnLoad()
         {
-            base.OnLoad();
+            Events.AddFsmEdit(sceneName, new("RestBench Spider", "FSM"), SpawnShiny);
+            Events.AddFsmEdit(sceneName, new("RestBench Spider", "Bench Control Spider"), GiveItem);
+        }
+
+        protected override void OnUnload()
+        {
+            Events.RemoveFsmEdit(sceneName, new("RestBench Spider", "FSM"), SpawnShiny);
+            Events.RemoveFsmEdit(sceneName, new("RestBench Spider", "Bench Control Spider"), GiveItem);
+        }
+
+        private void SpawnShiny(PlayMakerFSM fsm)
+        {
+            fsm.AddState("Spawn Shiny");
+            fsm.AddCustomAction("Spawn Shiny", () => 
+                {
+                    if (!Placement.AllObtained())
+                    {
+                        Container c = Container.GetContainer(Container.Shiny);
+                        GameObject shiny = c.GetNewContainer(new(c.Name, Placement, flingType));
+                        shiny.transform.position = new(47.0f, 58.4f);
+                        shiny.SetActive(true);
+                    }
+                });
+            fsm.ChangeTransition("Check", "DESTROY", "Spawn Shiny");
+            fsm.AddTransition("Spawn Shiny", "FINISHED", "Destroy");
+        }
+        private void GiveItem(PlayMakerFSM fsm)
+        {
+            AccessRandomizer.Instance.Log("This exists");
+            fsm.AddState("GiveItem");
+            fsm.AddCustomAction("GiveItem", () => {
+                ItemUtility.GiveSequentially(Placement.Items, Placement, new GiveInfo()
+                {
+                    FlingType = FlingType.DirectDeposit,
+                    MessageType = MessageType.Corner,
+                });
+            });
+
+            fsm.ChangeTransition("Sit Start", "FINISHED", "GiveItem");
+            fsm.AddTransition("GiveItem", "FINISHED", "Neutral");
         }
     }
 }
diff --git a/Modules/AccessModule.cs b/Modules/AccessModule.cs
@@ -61,6 +61,14 @@ public override void Initialize()
             }
         }
 
+        public override void Unload()
+        {
+            On.PlayerData.SetBool -= Refresh;
+            On.GameManager.BeginSceneTransition -= ForceBools;
+            Events.RemoveLanguageEdit(new LanguageKey("UI", "INV_NAME_TRAM_PASS"), TramName);
+            Events.RemoveLanguageEdit(new LanguageKey("UI", "INV_DESC_TRAM_PASS"), TramDesc);
+        }
+
         private void TramName(ref string value)
         {
             if (UpperTram && LowerTram)
@@ -96,12 +104,6 @@ private void ElevatorDesc(StringBuilder builder)
                 builder.AppendLine("You cannot ride large elevators.");
         }
 
-        public override void Unload()
-        {
-            On.PlayerData.SetBool -= Refresh;
-            On.GameManager.BeginSceneTransition -= ForceBools;
-        }
-
         private void ForceBools(On.GameManager.orig_BeginSceneTransition orig, GameManager self, GameManager.SceneLoadInfo info)
         {
             orig(self, info);