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

Changed bandageTable

Browse Source
This commit is contained in:
Pao
2023-03-02 19:20:59 +01:00
parent 7693963d77
commit f75b80583a
2 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
media/lua/client/ActionsMethods/JCIO_CutLimb.lua
View File

@@ -213,8 +213,8 @@ JCIO.CutLimb = function(partName, surgeonFactor, bandageTable, painkillerTable)
-- If bandages are available, use them -- If bandages are available, use them
adjacentBodyPart:setBandaged(bandageTable.use_bandage, 10, bandageTable.is_bandage_sterilized, adjacentBodyPart:setBandaged(bandageTable.useBandage, 10, bandageTable.isBandageSterilized,
bandageTable.bandage_type) bandageTable.bandageType)

56
media/lua/client/TimedActions/JCIO_CutLimbAction.lua
View File

@@ -29,7 +29,7 @@ function JCIO_CutLimbAction:update()
self.soundTime = getTimestamp() self.soundTime = getTimestamp()
if not self.character:getEmitter():isPlaying(self.sawSound) then if not self.character:getEmitter():isPlaying(self.sawSound) then
print("JCIO: Running sound again") --print("JCIO: Running sound again")
self.sawSound = self.character:getEmitter():playSound("Amputation_Sound") self.sawSound = self.character:getEmitter():playSound("Amputation_Sound")
addSound(self.surgeon, self.surgeon:getX(), self.surgeon:getY(), self.surgeon:getZ(), 3, 3) addSound(self.surgeon, self.surgeon:getX(), self.surgeon:getY(), self.surgeon:getZ(), 3, 3)
end end
@@ -40,7 +40,7 @@ end
function JCIO_CutLimbAction:stop() function JCIO_CutLimbAction:stop()
print("Stopping ISCutLimb") --print("Stopping ISCutLimb")
-- Handles sound -- Handles sound
@@ -94,39 +94,39 @@ function JCIO_CutLimbAction:start()
end end
function JCIO_CutLimbAction:findArgs() function JCIO_CutLimbAction:findArgs()
local surgeon_factor = self.surgeon:getPerkLevel(Perks.Doctor) local surgeonFactor = self.surgeon:getPerkLevel(Perks.Doctor)
if self.surgeon:getDescriptor():getProfession() == "surgeon" then surgeon_factor = surgeon_factor + 15 end if self.surgeon:getDescriptor():getProfession() == "surgeon" then surgeonFactor = surgeonFactor + 15 end
if self.surgeon:getDescriptor():getProfession() == "doctor" then surgeon_factor = surgeon_factor + 9 end if self.surgeon:getDescriptor():getProfession() == "doctor" then surgeonFactor = surgeonFactor + 9 end
if self.surgeon:getDescriptor():getProfession() == "nurse" then surgeon_factor = surgeon_factor + 4 end if self.surgeon:getDescriptor():getProfession() == "nurse" then surgeonFactor = surgeonFactor + 4 end
local bandage_table = { local bandageTable = {
use_bandage = false, useBandage = false,
bandage_type = nil, bandageType = nil,
is_bandage_sterilized = nil isBandageSterilized = nil
} }
local painkiller_table = {} local painkiller_table = {}
local bandage = self.surgeon:getInventory():FindAndReturn('Bandage') local bandage = self.surgeon:getInventory():FindAndReturn('Bandage')
local sterilized_bandage = self.surgeon:getInventory():FindAndReturn('AlcoholBandage') local sterilizedBandage = self.surgeon:getInventory():FindAndReturn('AlcoholBandage')
--local ripped_sheets = self.surgeon:getInventory():FindAndReturn("...") --local ripped_sheets = self.surgeon:getInventory():FindAndReturn("...")
if sterilized_bandage then if sterilizedBandage then
bandage_table.bandage_type = sterilized_bandage:getType() bandageTable.bandageType = sterilizedBandage:getType()
bandage_table.is_bandage_sterilized = true bandageTable.isBandageSterilized = true
bandage_table.use_bandage = true bandageTable.useBandage = true
self.surgeon:getInventory():Remove(sterilized_bandage) self.surgeon:getInventory():Remove(sterilizedBandage)
surgeon_factor = surgeon_factor + 4 surgeonFactor = surgeonFactor + 4
elseif bandage then elseif bandage then
bandage_table.bandage_type = bandage:getType() bandageTable.bandageType = bandage:getType()
bandage_table.is_bandage_sterilized = false bandageTable.isBandageSterilized = false
bandage_table.use_bandage = true bandageTable.useBandage = true
self.surgeon:getInventory():Remove(bandage) self.surgeon:getInventory():Remove(bandage)
surgeon_factor = surgeon_factor + 2 surgeonFactor = surgeonFactor + 2
else else
bandage_table.bandage_type = "" bandageTable.bandageType = ""
bandage_table.use_bandage = false bandageTable.useBandage = false
bandage_table.is_bandage_sterilized = false bandageTable.isBandageSterilized = false
end end
@@ -137,17 +137,17 @@ function JCIO_CutLimbAction:findArgs()
-- painkillerCount = painkiller:getRemainingUses(); -- painkillerCount = painkiller:getRemainingUses();
-- end -- end
return surgeon_factor, bandage_table, painkiller_table return surgeonFactor, bandageTable, painkiller_table
end end
function JCIO_CutLimbAction:perform() function JCIO_CutLimbAction:perform()
local surgeon_factor, bandage_table, painkiller_table = self:findArgs() local surgeonFactor, bandageTable, painkillerTable = self:findArgs()
if self.patient ~= self.surgeon and isClient() then if self.patient ~= self.surgeon and isClient() then
SendCutLimb(self.patient, self.partName, surgeon_factor, bandage_table, painkiller_table) SendCutLimb(self.patient, self.partName, surgeonFactor, bandageTable, painkillerTable)
sendClientCommand(self.surgeon, "JCIO", "AskStopAmputationSound", {surgeonID = self.surgeon:getOnlineID()}) sendClientCommand(self.surgeon, "JCIO", "AskStopAmputationSound", {surgeonID = self.surgeon:getOnlineID()})
else else
JCIO.CutLimb(self.partName, surgeon_factor, bandage_table, painkiller_table) JCIO.CutLimb(self.partName, surgeonFactor, bandageTable, painkillerTable)
end end
self.surgeon:getEmitter():stopSoundByName("Amputation_Sound") self.surgeon:getEmitter():stopSoundByName("Amputation_Sound")