Minor fixes pre release

CHANGELOG.md

@@ -2,10 +2,13 @@
 * Fixes to monk AC interactions.
 * Life bubble now is correctly AoE and has a corrected duration.
 * Destructive Dispel should now trigger once per dispel instead of for every effect dispeled.
+* Accursed Glare now works on enemies (oppsie).
 * Fixes
     * Shifter
         * Shifter claws should more correctly bypass DR.
         * Holy claws should now correctly bypass DR.
+    * Weapons
+        * Slams are now correctly finessable like all natural weapons.
 
 ## Version 2.5.8
 * Fixes to monk AC interactions.

Repository.json

@@ -2,7 +2,7 @@
     "Releases": [
       {
         "Id": "TabletopTweaks-Base",
-        "Version": "2.5.8"
+        "Version": "2.5.9"
       }
     ]
 }

TabletopTweaks-Base/Bugfixes/Items/Weapons.cs

@@ -6,6 +6,7 @@
 using Kingmaker.Blueprints.JsonSystem;
 using Kingmaker.Designers.Mechanics.Facts;
 using Kingmaker.ElementsSystem;
+using Kingmaker.EntitySystem.Stats;
 using Kingmaker.Enums;
 using Kingmaker.Enums.Damage;
 using Kingmaker.ResourceLinks;
@@ -26,6 +27,7 @@
 using TabletopTweaks.Core.NewComponents;
 using TabletopTweaks.Core.NewComponents.OwlcatReplacements;
 using TabletopTweaks.Core.Utilities;
+using static Kingmaker.EntitySystem.EntityDataBase;
 using static Kingmaker.RuleSystem.Rules.Damage.DamageTypeDescription;
 using static TabletopTweaks.Base.Main;
 
@@ -54,6 +56,8 @@ static void Postfix() {
                 PatchThunderingBurst();
                 PatchVorpal();
 
+                PatchNaturalWeapons();
+
                 void PatchBladeOfTheMerciful() {
                     if (Main.TTTContext.Fixes.Items.Weapons.IsDisabled("BladeOfTheMerciful")) { return; }
 
@@ -293,6 +297,21 @@ void PatchVorpal() {
 
                     TTTContext.Logger.LogPatch("Patched", Vorpal);
                 }
+                void PatchNaturalWeapons() {
+                    //if (Main.TTTContext.Fixes.Items.Weapons.IsDisabled("NaturalWeaponsFinesse")) { return; }
+
+                    WeaponCategoryExtension.Data.Where(weapon => weapon.Category == WeaponCategory.Slam)
+                        .ForEach(weapon => {
+                            AddToSubCategories(weapon, WeaponSubCategory.Finessable);
+                        });
+
+                    void AddToSubCategories(WeaponCategoryExtension.DataItem weapon, params WeaponSubCategory[] categories) {
+                        var SubCategories = AccessTools.Field(typeof(WeaponCategoryExtension.DataItem), "SubCategories");
+                        SubCategories.SetValue(weapon, weapon.SubCategories.AppendToArray(categories).Distinct().ToArray());
+
+                        TTTContext.Logger.Log($"Patched: {weapon.Category} - SubCategories");
+                    }
+                }
             }
         }
 

TabletopTweaks-Base/Info.json

@@ -10,5 +10,5 @@
   "Repository": "https://raw.githubusercontent.com/Vek17/TabletopTweaks-Base/master/Repository.json",
   "Requirements": [ "TabletopTweaks-Core-0.6.1" ],
   "LoadAfter": [ "TabletopTweaks-Core" ],
-  "Version": "2.5.8"
+  "Version": "2.5.9"
 }

TabletopTweaks-Base/NewContent/Spells/AccursedGlare.cs

@@ -59,8 +59,9 @@ public static void AddAccursedGlare() {
                     | Metamagic.Persistent
                     | Metamagic.Reach;
                 bp.Range = AbilityRange.Close;
-                bp.CanTargetFriends = true;
-                bp.CanTargetEnemies = false;
+                bp.CanTargetFriends = false;
+                bp.CanTargetSelf = false;
+                bp.CanTargetEnemies = true;
                 bp.SpellResistance = true;
                 bp.EffectOnAlly = AbilityEffectOnUnit.Harmful;
                 bp.EffectOnEnemy = AbilityEffectOnUnit.Harmful;