removed broken skillslot.none code

ArcPh1r3 · Jan 22, 2024 · 9b80726 · 9b80726
1 parent 77e6806
commit 9b80726
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/HenryMod/Characters/Survivors/Henry/HenrySurvivor.cs b/HenryMod/Characters/Survivors/Henry/HenrySurvivor.cs
@@ -151,6 +151,9 @@ public override void InitializeEntityStateMachines()
         #region skills
         public override void InitializeSkills()
         {
+            //remove the genericskills from the commando body we cloned
+            Skills.ClearGenericSkills(bodyPrefab);
+            //add our own
             Skills.CreateSkillFamilies(bodyPrefab);
             AddPrimarySkills();
             AddSecondarySkills();

diff --git a/HenryMod/Modules/Prefabs.cs b/HenryMod/Modules/Prefabs.cs
@@ -131,7 +131,6 @@ public static GameObject CreateBodyPrefab(GameObject newBodyPrefab, GameObject m
             SetupCameraTargetParams(newBodyPrefab, bodyInfo);
             //SetupRigidbody(newPrefab);
             SetupCapsuleCollider(newBodyPrefab);
-            Skills.ClearGenericSkills(newBodyPrefab);
 
             Modules.Content.AddCharacterBodyPrefab(newBodyPrefab);
 

diff --git a/HenryMod/Modules/Skills.cs b/HenryMod/Modules/Skills.cs
@@ -15,14 +15,12 @@ internal static class Skills
         /// Create 4 GenericSkills for primary, secondary, utility, and special, and create skillfamilies for them
         /// </summary>
         /// <param name="targetPrefab">Body prefab to add GenericSkills</param>
-        /// <param name="destroyExisting">Destroy any existing GenericSkills on the body prefab so you can replace them?</param>
         public static void CreateSkillFamilies(GameObject targetPrefab) => CreateSkillFamilies(targetPrefab, SkillSlot.Primary, SkillSlot.Secondary, SkillSlot.Utility, SkillSlot.Special);
         /// <summary>
         /// Create in order the GenericSkills for the skillslots desired, and create skillfamilies for them.
         /// </summary>
         /// <param name="targetPrefab">Body prefab to add GenericSkills</param>
-        /// <param name="destroyExisting">Destroy any existing GenericSkills on the body prefab so you can replace them?</param>
-        /// <param name="slots">Order of slots to add to the body prefab. <para>Input SkillSlot.None to create a GenericSkill on the prefab outside of usual 4. These will be called GenericSkill1, with the number being its order on the loadout screen</para><para>For example, mul-t's selectable second primary, a selectable passive like acrid, etc</para></param>
+        /// <param name="slots">Order of slots to add to the body prefab.</param>
         public static void CreateSkillFamilies(GameObject targetPrefab, params SkillSlot[] slots)
         {
             SkillLocator skillLocator = targetPrefab.GetComponent<SkillLocator>();
@@ -44,11 +42,9 @@ public static void CreateSkillFamilies(GameObject targetPrefab, params SkillSlot
                         skillLocator.special = CreateGenericSkillWithSkillFamily(targetPrefab, "Special");
                         break;
                     case SkillSlot.None:
-                        CreateGenericSkillWithSkillFamily(targetPrefab, "GenericSkill" + i+1);
                         break;
                 }
             }
-
         }
 
         public static void ClearGenericSkills(GameObject targetPrefab)