diff --git a/media/lua/client/TimedActions/ISCutLimb.lua b/media/lua/client/TimedActions/ISCutLimb.lua index 7a51971..3d2fa8d 100644 --- a/media/lua/client/TimedActions/ISCutLimb.lua +++ b/media/lua/client/TimedActions/ISCutLimb.lua @@ -22,11 +22,22 @@ function ISCutLimb:update() end end +function ISCutLimb:stop() + + self.character:getEmitter():stopSoundByName("Amputation_Sound") + + +end + + + + function ISCutLimb:start() self:setActionAnim("SawLog") local saw_item = TocGetSawInInventory(self.surgeon) + self.sound = self.character:getEmitter():playSound("Amputation_Sound") -- Return whatever object we've got in the inventory if self.surgeon:getPrimaryHandItem() then diff --git a/media/lua/client/TimedActions/ISOperateLimb.lua b/media/lua/client/TimedActions/ISOperateLimb.lua index 7597cd3..56d3f85 100644 --- a/media/lua/client/TimedActions/ISOperateLimb.lua +++ b/media/lua/client/TimedActions/ISOperateLimb.lua @@ -21,10 +21,10 @@ function ISOperateLimb:update() end function ISOperateLimb:start() - self:setActionAnim("MedicalCheck"); + self:setActionAnim("MedicalCheck") if self.use_oven then - self.sound = self.patient:getEmitter():playSound("Burn_sound") - self:forceComplete(); + self.sound = self.patient:getEmitter():playSound("Burn_sound") -- TODO currently broken, but maybe that's good + self:forceComplete() end end diff --git a/media/lua/shared/NPCs/ExtraProfession.lua b/media/lua/shared/NPCs/ExtraProfession.lua index ac6021e..0804fff 100644 --- a/media/lua/shared/NPCs/ExtraProfession.lua +++ b/media/lua/shared/NPCs/ExtraProfession.lua @@ -23,4 +23,4 @@ local function AddProfession() end end -Events.OnGameBoot.Add(AddProfession); \ No newline at end of file +Events.OnGameBoot.Add(AddProfession) \ No newline at end of file diff --git a/media/scripts/TOC_items.txt b/media/scripts/TOC_items.txt index 9cef0ec..b2c236e 100644 --- a/media/scripts/TOC_items.txt +++ b/media/scripts/TOC_items.txt @@ -4,7 +4,7 @@ imports { Base } -/****************** Clothing that look like a cut arm ******************/ +/****************** Clothing that look like a cut limb ******************/ item Amputation_Right_Hand { Type = Clothing, @@ -114,7 +114,7 @@ imports CanHaveHoles = false, } -/************************ Other items ************************/ +/************************ Operation items ************************/ item Improvised_surgeon_kit { Type = Normal, @@ -148,7 +148,7 @@ imports Icon = surgeonKit, } -/************************ Prothese cloth ************************/ +/************************ Prosthesis clothing item ************************/ item Prost_Right_Hand_WoodenHook { @@ -334,7 +334,7 @@ imports CanHaveHoles = false, } -/************************ Prothese items ************************/ +/************************ Prosthesis base items ************************/ item WoodenHook { diff --git a/media/scripts/TOC_sounds.txt b/media/scripts/TOC_sounds.txt index e29486b..e5beaad 100644 --- a/media/scripts/TOC_sounds.txt +++ b/media/scripts/TOC_sounds.txt @@ -1,9 +1,9 @@ module base { - sound Cut_sound { - category = TOC, + sound Amputation_Sound { + category = Player, loop = true, - is3D = true, + is3D = true, clip { file = media/sound/Cut_sound.ogg, distanceMax = 3, @@ -12,7 +12,7 @@ module base { } sound Operate_sound { - category = TOC, + category = Player, loop = true, is3D = true, clip { @@ -23,7 +23,7 @@ module base { } sound Burn_sound { - category = TOC, + category = Player, loop = false, is3D = true, clip {