Fixes for broken Owlcat mod events

CHANGELOG.md

@@ -1,3 +1,6 @@
+## Version 0.5.4
+* Contains fix for broken IAfterRulebookEventTriggerHandler, and IBeforeRulebookEventTriggerHandler events
+
 ## Version 0.5.3
 * Removed old GetComponent method as it has been replaced by owlcat tooling.
 * ContextArcaneSpellFailureIncrease now handles shields more correctly.

Repository.json

@@ -2,7 +2,7 @@
     "Releases": [
       {
         "Id": "TabletopTweaks-Core",
-        "Version": "0.5.3"
+        "Version": "0.5.4"
       }
     ]
 }

TabletopTweaks-Core/Bugfixes/General/EventTriggers.cs

@@ -0,0 +1,61 @@
+using HarmonyLib;
+using Kingmaker.Blueprints;
+using Kingmaker.PubSubSystem;
+using Kingmaker.RuleSystem;
+using Kingmaker.RuleSystem.Rules;
+using Kingmaker.RuleSystem.Rules.Damage;
+using Kingmaker.Visual.CharacterSystem;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Runtime.Serialization;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace TabletopTweaks.Core.Bugfixes.General {
+    internal class EventTriggers {
+        // Breaks generics
+        //[HarmonyPatch]
+        static class Rulebook_EventHandler_Ensure {
+            static MethodBase TargetMethod() {
+                return AccessTools.Method(typeof(Rulebook), "TriggerEventInternal").MakeGenericMethod(new Type[] { typeof(RulebookEvent) });
+            }
+            static bool Prefix(Rulebook __instance, RulebookEvent evt) {
+                Type T = evt.GetType();
+                Main.TTTContext.Logger.Log($"TriggerEventInternal<{T.Name}>");
+                Type handlerType = typeof(Rulebook.EventHandler<>).MakeGenericType(new Type[] { T });
+                Main.TTTContext.Logger.Log($"Handler Type: {handlerType.Name}<{handlerType.GetGenericArguments()[0].Name}>");
+                var handlerConstructors = AccessTools.GetDeclaredConstructors(handlerType);
+                var handlerConstructor = handlerConstructors.FirstOrDefault();
+                try {
+                    var newHandler = handlerConstructor.Invoke(null);
+                    Main.TTTContext.Logger.Log($"New Handler Type: {newHandler.GetType().Name}<{newHandler.GetType().GetGenericArguments()[0].Name}>");
+                    var instanceField = AccessTools.Field(handlerType, "s_Instance");
+                    var beforeEvent = AccessTools.Field(handlerType, "m_BeforeEvent");
+                    var afterEvent = AccessTools.Field(handlerType, "m_AfterEvent");
+                    instanceField.SetValue(null, newHandler);
+                    var test = instanceField.GetValue(null);
+                    Main.TTTContext.Logger.Log($"HasAfterEvent: {afterEvent.GetValue(newHandler) != null}");
+                    Main.TTTContext.Logger.Log($"HasBeforeEvent: {beforeEvent.GetValue(newHandler) != null}");
+                    Main.TTTContext.Logger.Log($"Set complete: {newHandler == test}");
+
+                } catch(Exception e) {
+                    Main.TTTContext.Logger.Log($"{handlerConstructor?.FullDescription()}");
+                    Main.TTTContext.Logger.LogError(e.ToString());
+                    Main.TTTContext.Logger.LogError(e.Message);
+                }
+                return true;
+            }
+        }
+        [HarmonyPatch]
+        static class Rulebook_EventHandler_CleanUp {
+            static MethodBase TargetMethod() {
+                return AccessTools.Method(typeof(Rulebook.EventHandler<>).MakeGenericType(typeof(RulebookEvent)), "CleanUp");
+            }
+            static bool Prefix() {
+                return false;
+            }
+        }
+    }
+}

TabletopTweaks-Core/Info.json

@@ -10,5 +10,5 @@
   "Repository": "https://raw.githubusercontent.com/Vek17/TabletopTweaks-Core/master/Repository.json",
   "Requirements": [],
   "LoadAfter": ["MewsiferConsole.Mod"],
-  "Version": "0.5.3"
+  "Version": "0.5.4"
 }

TabletopTweaks-Core/NewComponents/AbilitySpecific/TitanStrikeComponent.cs

@@ -1,4 +1,5 @@
 using Kingmaker.Blueprints;
+using Kingmaker.Blueprints.Items.Weapons;
 using Kingmaker.Blueprints.JsonSystem;
 using Kingmaker.Enums;
 using Kingmaker.PubSubSystem;
@@ -25,7 +26,9 @@ public class TitanStrikeComponent : UnitFactComponentDelegate,
 
         public void OnEventAboutToTrigger(RuleCalculateWeaponStats evt) {
             if (evt.Weapon.Blueprint.Type.IsUnarmed) {
-                evt.IncreaseWeaponSize(1);
+                evt.WeaponDamageDice.Modify(
+                    WeaponDamageScaleTable.Scale(evt.WeaponDamageDice.ModifiedValue, Size.Large, Size.Medium), base.Fact
+                );
             }
         }
 

TabletopTweaks-Core/TabletopTweaks-Core.csproj

@@ -156,6 +156,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Bugfixes\General\ContextRankConfigFix.cs" />
+    <Compile Include="Bugfixes\General\EventTriggers.cs" />
     <Compile Include="Bugfixes\General\PropertyFixes.cs" />
     <Compile Include="Bugfixes\General\RuleCalculateCMDFix.cs" />
     <Compile Include="Config\Blueprints.cs" />