From ce4e6ec9def20b23463edd44685a4433739ea290 Mon Sep 17 00:00:00 2001 From: Pao Date: Sun, 22 Jan 2023 20:08:11 +0100 Subject: [PATCH] Corrected some parameters --- media/lua/client/TOC_LocalActions.lua | 33 ++++++++++++--------------- media/lua/client/TOC_main.lua | 6 ++--- 2 files changed, 18 insertions(+), 21 deletions(-) diff --git a/media/lua/client/TOC_LocalActions.lua b/media/lua/client/TOC_LocalActions.lua index c1cd5bd..815b5a5 100644 --- a/media/lua/client/TOC_LocalActions.lua +++ b/media/lua/client/TOC_LocalActions.lua @@ -1,45 +1,42 @@ --- TODO patient and surgeon will always be the same if we're local... dumb cock - - -function TocCutLocal(_, patient, surgeon, part_name) - if TocGetSawInInventory(surgeon) ~= nil then - ISTimedActionQueue.add(ISCutLimb:new(patient, surgeon, part_name)); +function TocCutLocal(_, player, part_name) + if TocGetSawInInventory(player) ~= nil then + ISTimedActionQueue.add(ISCutLimb:new(player, player, part_name)); else - surgeon:Say("I don't have a saw on me") + player:Say("I don't have a saw on me") end end -function TocOperateLocal(_, patient, surgeon, part_name, use_oven) +function TocOperateLocal(_, player, part_name, use_oven) --local player = getPlayer(); -- todo add a check if the player has already been amputated or somethin if use_oven then - ISTimedActionQueue.add(ISOperateLimb:new(patient, surgeon, _, part_name, use_oven)); + ISTimedActionQueue.add(ISOperateLimb:new(player, player, _, part_name, use_oven)); else - local kit = TocGetKitInInventory(surgeon) + local kit = TocGetKitInInventory(player) if kit ~= nil then - ISTimedActionQueue.add(ISOperateLimb:new(patient, surgeon, kit, part_name, false)) + ISTimedActionQueue.add(ISOperateLimb:new(player, player, kit, part_name, false)) else - surgeon:Say("I don't have a kit on me") + player:Say("I don't have a kit on me") end end end -function TocEquipProsthesisLocal(_, patient, surgeon, part_name) - local surgeon_inventory = surgeon:getInventory() +function TocEquipProsthesisLocal(_, player, part_name) + local surgeon_inventory = player:getInventory() local prosthesis_to_equip = surgeon_inventory:getItemFromType('TOC.MetalHand') or surgeon_inventory:getItemFromType('TOC.MetalHook') or surgeon_inventory:getItemFromType('TOC.WoodenHook') if prosthesis_to_equip then - ISTimedActionQueue.add(ISInstallProsthesis:new(surgeon, patient, prosthesis_to_equip, part_name)) + ISTimedActionQueue.add(ISInstallProsthesis:new(player, player, prosthesis_to_equip, part_name)) else - surgeon:Say("I need a prosthesis") + player:Say("I need a prosthesis") end end -function TocUnequipProsthesisLocal(_, patient, part_name) +function TocUnequipProsthesisLocal(_, player, part_name) --local equipped_prosthesis = TocFindItemInProstBodyLocation(part_name, patient) - ISTimedActionQueue.add(ISUninstallProsthesis:new(patient, patient, part_name)) + ISTimedActionQueue.add(ISUninstallProsthesis:new(player, player, part_name)) --ISTimedActionQueue.add(ISUninstallProsthesis:new(patient, equipped_prosthesis, -- patient:getBodyDamage():getBodyPart(TocGetBodyPartTypeFromPartName(part_name)))) diff --git a/media/lua/client/TOC_main.lua b/media/lua/client/TOC_main.lua index f6ca7a3..510023d 100644 --- a/media/lua/client/TOC_main.lua +++ b/media/lua/client/TOC_main.lua @@ -402,11 +402,11 @@ function TryTocAction(_, part_name, action, surgeon, patient) if not isServer() and not isClient() then if action == "Cut" then - TocCutLocal(_, surgeon, surgeon, part_name) + TocCutLocal(_, surgeon, part_name) elseif action == "Operate" then - TocOperateLocal(_, surgeon, surgeon, part_name, false) + TocOperateLocal(_, surgeon, part_name, false) elseif action == "Equip" then - TocEquipProsthesisLocal(_, surgeon, surgeon, part_name) + TocEquipProsthesisLocal(_, surgeon, part_name) elseif action == "Unequip" then TocUnequipProsthesisLocal(_, surgeon, part_name) end