Fix for Point blank master

pheonix99 · Jun 20, 2022 · f9a502c · f9a502c
1 parent db9ce1e
commit f9a502c
Show file tree

Hide file tree

Showing 5 changed files with 51 additions and 2 deletions.
diff --git a/ToggleableThrowingWeapons/Content/BaseWeapons.cs b/ToggleableThrowingWeapons/Content/BaseWeapons.cs
@@ -5,6 +5,7 @@
 using Kingmaker.Blueprints;
 using Kingmaker.Blueprints.Items.Weapons;
 using Kingmaker.Designers.Mechanics.WeaponEnchants;
+using Kingmaker.Enums;
 using Kingmaker.ResourceLinks;
 using System;
 using System.Collections.Generic;
@@ -113,7 +114,7 @@ public static void MakeBaseWeapons()
                     x.m_OtherForm = BlueprintTool.GetRef<BlueprintWeaponTypeReference>("ThrownStarknife");
                 });
 
-
+                
             }
 
             Main.TTWContext.Blueprints.GetDerivedMaster("ThrownStarknifeMasterId");

diff --git a/ToggleableThrowingWeapons/Info.json b/ToggleableThrowingWeapons/Info.json
@@ -2,7 +2,7 @@
   "Id": "ToggleableThrowingWeapons",
   "DisplayName": "Toggleable Throwing Weapons",
   "Author": "pheonix99",
-  "Version": "1.1.1",
+  "Version": "1.2.0",
   "ManagerVersion": "0.21.3",
   "AssemblyName": "ToggleableThrowingWeapons.dll",
   "EntryMethod": "ToggleableThrowingWeapons.Main.Load",

diff --git a/ToggleableThrowingWeapons/Patch/PatchWeaponCategoryExtension.cs b/ToggleableThrowingWeapons/Patch/PatchWeaponCategoryExtension.cs
@@ -0,0 +1,44 @@
+using HarmonyLib;
+using Kingmaker.Enums;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ToggleableThrowingWeapons.Patch
+{
+    class PatchWeaponCategoryExtension
+    {
+        [HarmonyPatch(typeof(WeaponCategoryExtension), "HasSubCategory")]
+        static class ApplyThrownFixToHasSubCategory
+        {
+
+            [HarmonyPriority(Priority.Normal)]
+            public static void Postfix(ref bool __result, WeaponCategory category, WeaponSubCategory subCategory)
+            {
+                if ((category == WeaponCategory.Dagger || category == WeaponCategory.Starknife) && subCategory == WeaponSubCategory.Ranged)
+                {
+                    __result = true;
+                }
+            }
+        }
+
+        [HarmonyPatch(typeof(WeaponCategoryExtension), "GetSubCategories")]
+        static class ApplyThrownFixToGetSubCategories
+        {
+
+            [HarmonyPriority(Priority.Normal)]
+            public static void Postfix(ref WeaponSubCategory[] __result, WeaponCategory category)
+            {
+                if ((category == WeaponCategory.Dagger || category == WeaponCategory.Starknife) && !__result.Contains(WeaponSubCategory.Ranged))
+                {
+                    __result = __result.Append(WeaponSubCategory.Ranged).ToArray();
+                }
+            }
+        }
+    }
+
+
+}
+
diff --git a/ToggleableThrowingWeapons/ToggleableThrowingWeapons.csproj b/ToggleableThrowingWeapons/ToggleableThrowingWeapons.csproj
@@ -120,10 +120,12 @@
     <Compile Include="Content\BaseWeapons.cs" />
     <Compile Include="Content\MatchHambeardWeapons.cs" />
     <Compile Include="Content\ModeSwitching.cs" />
+    <Compile Include="Content\NewFeats.cs" />
     <Compile Include="Content\PairCreation.cs" />
     <Compile Include="Main.cs" />
     <Compile Include="ModLogic\ModContextTTW.cs" />
     <Compile Include="Patch\OverrideItemEntityBlueprintHook.cs" />
+    <Compile Include="Patch\PatchWeaponCategoryExtension.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Resources\AddToRoot.cs" />
     <Compile Include="UMMSettingsUI.cs" />

diff --git a/readme.md b/readme.md
@@ -16,4 +16,6 @@ The item names don't change by mode. I'll get to this later.
 Thanks to Truinto for the AddFactOnlyParty code.
 
 #Changelog
+1.2: Point Blank Master (and any other ranged-only paramaterized features added by mods) now apply to thrown daggers/starknives. Increased range to 30 feet. 
+
 1.1: Fixed dex to melee damage cutting out, fixed some graphical jank