Skip to content

Slight optimization of pain/death sounds #82

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TovarischPootis merged 2 commits into from
Sep 14, 2021
Merged

Slight optimization of pain/death sounds #82

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7e5488f
small optimizing
TovarischPootis Sep 13, 2021
d78623e
Merge branch '1.2.2-wip' of https://github.com/TovarischPootis/NutScr…
TovarischPootis Sep 14, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion gamemode/core/meta/inventory/sv_base_inventory.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,7 @@ function Inventory:sync(recipients)
net.WriteType(self.id)
net.WriteString(self.typeID)
net.WriteTable(self.data)
net.WriteUInt(table.Count(self.items), 32)
net.WriteUInt(table.Count(self.items), 32)
local function writeItem(item)
net.WriteUInt(item:getID(), 32)
net.WriteString(item.uniqueID)
Expand Down
6 changes: 3 additions & 3 deletions plugins/playerinjuries/sv_hooks.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ end

function PLUGIN:PlayerDeath(client)
local deathSound = hook.Run("GetPlayerDeathSound", client)
or table.Random(DEATH_SOUNDS)
or DEATH_SOUNDS[math.random(#DEATH_SOUNDS)]
if (client:isFemale() and !deathSound:find("female")) then
deathSound = deathSound:gsub("male", "female")
end
Expand All @@ -48,14 +48,14 @@ end

function PLUGIN:GetPlayerPainSound(client)
if (client:WaterLevel() >= 3) then
return table.Random(DROWN_SOUNDS)
return DROWN_SOUNDS[math.random(#DROWN_SOUNDS)]
end
end

function PLUGIN:PlayerHurt(client, attacker, health, damage)
if ((client.nutNextPain or 0) < CurTime() and health > 0) then
local painSound = hook.Run("GetPlayerPainSound", client)
or table.Random(PAIN_SOUNDS)
or PAIN_SOUNDS[math.random(#PAIN_SOUNDS)]
if (client:isFemale() and !painSound:find("female")) then
painSound = painSound:gsub("male", "female")
end
Expand Down