do a hook call inside callback param of HookMethod, and wrapped __params

2021-11-11 17:19:06 +08:00
parent 9635db22fc
commit d1188a1ea5
4 changed files with 86 additions and 65 deletions
@@ -1,10 +1,24 @@

-Hook.HookMethod("Barotrauma.Item", "TryInteract", "itemInteract", nil) -- instance, picker, ignoreRequiredItems, forceSelectKey, forceActionKey
-Hook.HookMethod("Barotrauma.Item", "Use", "itemUse", function (instance, deltaTime, character, targetLimb) return {instance, character, targetLimb} end)
-Hook.HookMethod("Barotrauma.Item", "SecondaryUse", "itemSecondaryUse", function (instance, deltaTime, character) return {instance, character} end)
-Hook.HookMethod("Barotrauma.Item", "ApplyTreatment", "itemApplyTreatment", nil) -- instance, user, character, targetLimb
-Hook.HookMethod("Barotrauma.Item", "Combine", "itemCombine", nil) -- instance, item, user
-Hook.HookMethod("Barotrauma.Item", "Drop", "itemDrop", function (instance, dropper, createNetworkEvent)	return {instance, dropper} end)
-Hook.HookMethod("Barotrauma.Item", "Equip", "itemEquip", nil) -- instance, character
-Hook.HookMethod("Barotrauma.Item", "Unequip", "itemUnequip", nil) -- instance, character
+Hook.HookMethod("Barotrauma.Item", "TryInteract", function (instance, p)
+	Hook.Call("itemInteract", instance, p.picker, p.ignoreRequiredItems, p.forceSelectKey, p.forceActionKey)
+end, Hook.HookMethodType.Before)

+Hook.HookMethod("Barotrauma.Item", "ApplyTreatment", function (instance, p)
+	Hook.Call("itemApplyTreatment", instance, p.user, p.character, p.targetLimb)
+end, Hook.HookMethodType.Before)
+
+Hook.HookMethod("Barotrauma.Item", "Combine", function (instance, p)
+	Hook.Call("itemCombine", instance, p.item, p.user)
+end, Hook.HookMethodType.Before)
+
+Hook.HookMethod("Barotrauma.Item", "Drop", function (instance, p)
+	Hook.Call("itemDrop", instance, p.dropper)
+end, Hook.HookMethodType.Before)
+
+Hook.HookMethod("Barotrauma.Item", "Equip", function (instance, p)
+	Hook.Call("itemEquip", instance, p.character)
+end, Hook.HookMethodType.Before)
+
+Hook.HookMethod("Barotrauma.Item", "Unequip", function (instance, p)
+	Hook.Call("itemUnequip", instance, p.character)
+end, Hook.HookMethodType.Before)