From 736d527a13e0bcb2d612288b8e006d5d47fe22f0 Mon Sep 17 00:00:00 2001 From: ZioPao Date: Sat, 4 Jan 2025 21:00:39 +0100 Subject: [PATCH] Fix instanceItem, oops --- .../TOC/Controllers/LimitActionsController.lua | 2 +- .../lua/client/TOC/Handlers/ProsthesisHandler.lua | 4 ++-- .../client/TOC/TimedActions/IgnoredActions.lua | 15 ++++++++------- 42/media/lua/shared/TOC/CommandsData.lua | 2 +- 42/media/lua/shared/TOC/StaticData.lua | 4 ++-- 5 files changed, 14 insertions(+), 13 deletions(-) diff --git a/42/media/lua/client/TOC/Controllers/LimitActionsController.lua b/42/media/lua/client/TOC/Controllers/LimitActionsController.lua index c7ad4f5..5129ffc 100644 --- a/42/media/lua/client/TOC/Controllers/LimitActionsController.lua +++ b/42/media/lua/client/TOC/Controllers/LimitActionsController.lua @@ -365,5 +365,5 @@ end local og_ISClothingExtraAction_isValid = ISClothingExtraAction.isValid ---@diagnostic disable-next-line: duplicate-set-field function ISClothingExtraAction:isValid() - return WrapClothingAction(self, og_ISClothingExtraAction_isValid, instanceItem.CreateItem(self.extra)) + return WrapClothingAction(self, og_ISClothingExtraAction_isValid, instanceItem(self.extra)) end diff --git a/42/media/lua/client/TOC/Handlers/ProsthesisHandler.lua b/42/media/lua/client/TOC/Handlers/ProsthesisHandler.lua index 7beed49..ed98921 100644 --- a/42/media/lua/client/TOC/Handlers/ProsthesisHandler.lua +++ b/42/media/lua/client/TOC/Handlers/ProsthesisHandler.lua @@ -128,14 +128,14 @@ local og_ISClothingExtraAction_isValid = ISClothingExtraAction.isValid function ISClothingExtraAction:isValid() local isEquippable = og_ISClothingExtraAction_isValid(self) -- self.extra is a string, not the item - local testItem = instanceItem.CreateItem(self.extra) + local testItem = instanceItem(self.extra) return HandleProsthesisValidation(testItem, isEquippable) end local og_ISClothingExtraAction_perform = ISClothingExtraAction.perform function ISClothingExtraAction:perform() - local extraItem = instanceItem.CreateItem(self.extra) + local extraItem = instanceItem(self.extra) ProsthesisHandler.SearchAndSetupProsthesis(extraItem, true) og_ISClothingExtraAction_perform(self) end diff --git a/42/media/lua/client/TOC/TimedActions/IgnoredActions.lua b/42/media/lua/client/TOC/TimedActions/IgnoredActions.lua index d40fd90..898cf86 100644 --- a/42/media/lua/client/TOC/TimedActions/IgnoredActions.lua +++ b/42/media/lua/client/TOC/TimedActions/IgnoredActions.lua @@ -122,13 +122,14 @@ function ISDrinkFromBottle:new(character, item, uses) return action end -local og_ISFinalizeDealAction_new = ISFinalizeDealAction.new -function ISFinalizeDealAction:new(player, otherPlayer, itemsToGive, itemsToReceive, time) - local action = og_ISFinalizeDealAction_new(self, player, otherPlayer, itemsToGive, itemsToReceive, time) - --TOC_DEBUG.print("Override ISFinalizeDealAction") - action.skipTOC = true - return action -end +-- FIX This doesn't exist anymore in B42 +-- local og_ISFinalizeDealAction_new = ISFinalizeDealAction.new +-- function ISFinalizeDealAction:new(player, otherPlayer, itemsToGive, itemsToReceive, time) +-- local action = og_ISFinalizeDealAction_new(self, player, otherPlayer, itemsToGive, itemsToReceive, time) +-- --TOC_DEBUG.print("Override ISFinalizeDealAction") +-- action.skipTOC = true +-- return action +-- end local og_ISCampingInfoAction_new = ISCampingInfoAction.new function ISCampingInfoAction:new(character, campfireObject, campfire) diff --git a/42/media/lua/shared/TOC/CommandsData.lua b/42/media/lua/shared/TOC/CommandsData.lua index 569ecde..b15c729 100644 --- a/42/media/lua/shared/TOC/CommandsData.lua +++ b/42/media/lua/shared/TOC/CommandsData.lua @@ -31,7 +31,7 @@ CommandsData.server = { Relay = { RelayDamageDuringAmputation = "RelayDamageDuringAmputation", ---@alias relayDamageDuringAmputationParams {patientNum : number, limbName : string} RelayExecuteAmputationAction = "RelayExecuteAmputationAction", ---@alias relayExecuteAmputationActionParams {patientNum : number, limbName : string} - + --* ADMIN ONLY *-- RelayExecuteInitialization = "RelayExecuteInitialization", ---@alias relayExecuteInitializationParams {patientNum : number} RelayForcedAmputation = "RelayForcedAmputation" ---@alias relayForcedAmputationParams {patientNum : number, limbName : string} diff --git a/42/media/lua/shared/TOC/StaticData.lua b/42/media/lua/shared/TOC/StaticData.lua index 2a6c2b5..964915b 100644 --- a/42/media/lua/shared/TOC/StaticData.lua +++ b/42/media/lua/shared/TOC/StaticData.lua @@ -276,8 +276,8 @@ StaticData.AMPUTATION_CLOTHING_ITEM_BASE = "TOC.Amputation_" ------------------ --* Items check -local sawObj = instanceItem.CreateItem("Base.Saw") -local gardenSawObj = instanceItem.CreateItem("Base.GardenSaw") +local sawObj = instanceItem("Base.Saw") +local gardenSawObj = instanceItem("Base.GardenSaw") StaticData.SAWS_NAMES_IND_STR = { saw = sawObj:getName(),