HRiggs/The-Only-Cure
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor

Browse Source
This commit is contained in:
Pao
2023-02-03 14:19:36 +01:00
parent 88620ca321
commit c19a586110
14 changed files with 501 additions and 496 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
media/lua/client/TimedActions/ISCutLimb.lua
View File

@@ -116,7 +116,7 @@ function ISCutLimb:perform()
if self.patient ~= self.surgeon and isClient() then
SendCutLimb(self.patient, self.part_name, surgeon_factor, bandage_table, painkiller_table)
else
TheOnlyCure.CutLimb(self.part_name, surgeon_factor, bandage_table, painkiller_table)
TocCutLimb(self.part_name, surgeon_factor, bandage_table, painkiller_table)
end
self.character:getEmitter():stopSoundByName("Amputation_Sound")

2
media/lua/client/TimedActions/ISInstallProsthesis.lua
View File

@@ -56,7 +56,7 @@ function ISInstallProsthesis:perform()
SendEquipProsthesis(self.patient, self.part_name, prosthesis_base_name)
else
TheOnlyCure.EquipProsthesis(self.part_name, prosthesis_base_name)
TocEquipProsthesis(self.part_name, prosthesis_base_name)
end

59
media/lua/client/TimedActions/ISUninstallProsthesis.lua
View File

@@ -4,7 +4,7 @@ ISUninstallProsthesis = ISBaseTimedAction:derive("ISUninstallProsthesis");
function ISUninstallProsthesis:isValid()
if self.item ~= nil then
if self.item ~= nil and self.is_prosthesis_equipped then
return true
else
return false
@@ -56,66 +56,20 @@ function ISUninstallProsthesis:perform()
if self.patient ~= self.surgeon and isClient() then
SendUnequipProsthesis(self.patient, self.part_name, self.item)
SendUnequipProsthesis(self.patient, self.part_name)
else
TheOnlyCure.UnequipProsthesis(self.part_name, self.item)
TheOnlyCure.UnequipProsthesis(self.patient, self.part_name)
end
ISBaseTimedAction.perform(self)
-- for _, v in ipairs(GetAcceptingProsthesisBodyPartTypes()) do
-- if self.bodyPart:getType() == v then
-- local part_name = TocGetPartNameFromBodyPartType(v)
-- print("Found prost in " .. part_name)
-- if part_name then
-- toc_data.Limbs[part_name].is_prosthesis_equipped = false
-- local item_full_type = self.item:getFullType()
-- print("Searching for " .. item_full_type)
-- for _, prost_v in ipairs(GetProsthesisList()) do
-- local prosthesis_name = string.match(item_full_type, prost_v)
-- if prosthesis_name then
-- self.character:getInventory():AddItem(prosthesis_name)
-- self.character:setWornItem(self.item:getBodyLocation(), nil)
-- self.character:getInventory():Remove(self.item)
-- self.character:transmitModData()
-- -- needed to remove from queue / start next.
-- ISBaseTimedAction.perform(self)
-- end
-- end
-- end
-- end
-- end
-- TODO Make the object currently on the hand return to the inventory
end
function ISUninstallProsthesis:new(surgeon, patient, part_name)
local o = ISBaseTimedAction.new(self, surgeon)
o.item = TocFindItemInProstBodyLocation(part_name, patient)
local toc_limbs_data = patient:getModData().TOC.Limbs
o.item = toc_limbs_data[part_name].equipped_prosthesis
o.character = surgeon -- For animation purposes
o.patient = patient
@@ -124,6 +78,7 @@ function ISUninstallProsthesis:new(surgeon, patient, part_name)
o.part_name = part_name
o.is_prosthesis_equipped = toc_limbs_data[part_name].is_prosthesis_equipped
o.maxTime = 100;