diff --git a/media/lua/client/TOC/CommonMethods.lua b/media/lua/client/TOC/CommonMethods.lua index 1740658..f6c2831 100644 --- a/media/lua/client/TOC/CommonMethods.lua +++ b/media/lua/client/TOC/CommonMethods.lua @@ -1,6 +1,6 @@ local CommonMethods = {} ----comment +---TODO This is useless ---@param val number ---@param min number ---@param max number diff --git a/media/lua/client/TOC/Handlers/PlayerHandler.lua b/media/lua/client/TOC/Handlers/PlayerHandler.lua index 9843913..6472169 100644 --- a/media/lua/client/TOC/Handlers/PlayerHandler.lua +++ b/media/lua/client/TOC/Handlers/PlayerHandler.lua @@ -108,11 +108,12 @@ function PlayerHandler.TryRandomBleed(character, limbName) if cicTime == 0 then return end -- TODO Sometimes we get cicTime = 0... Shouldn't really do it - local normCicTime = CommonMethods.Normalize(cicTime, 0, 100) + -- TODO This is just a placeholder, we need to figure out a better way to calculate this chance + local normCicTime = CommonMethods.Normalize(cicTime, 0, StaticData.LIMBS_CICATRIZATION_TIME_IND_NUM[limbName])/2 TOC_DEBUG.print("OG cicTime: " .. tostring(cicTime)) TOC_DEBUG.print("Normalized cic time : " .. tostring(normCicTime)) - local chance = ZombRand(0,100) + local chance = ZombRandFloat(0.0, 1.0) if chance > normCicTime then TOC_DEBUG.print("Triggered bleeding from non cicatrized wound") local adjacentBodyPartType = BodyPartType[StaticData.LIMBS_ADJACENT_IND_STR[limbName]] diff --git a/media/lua/server/TOC/ServerDataHandler.lua b/media/lua/server/TOC/ServerDataHandler.lua index 430f0c6..cbc63b5 100644 --- a/media/lua/server/TOC/ServerDataHandler.lua +++ b/media/lua/server/TOC/ServerDataHandler.lua @@ -1,8 +1,11 @@ if isClient() then return end -- The event makes this necessary to prevent clients from running this file +local StaticData = require("TOC/StaticData") +------------------------ local ServerDataHandler = {} ServerDataHandler.modData = {} + ---Get the server mod data table containing that player TOC data ---@param key string ---@return tocModData @@ -14,10 +17,10 @@ end ---@param key string ---@param table tocModData function ServerDataHandler.AddTable(key, table) - print("TOC: received ModData => " .. key) - - TOC_DEBUG.printTable(table) - --TOC_DEBUG.print("Adding table with key: " .. tostring(key)) + -- Check if key is valid + if not luautils.stringStarts(key, StaticData.MOD_NAME .. "_") then return end + + TOC_DEBUG.print("received TOC ModData: " .. tostring(key)) ModData.add(key, table) -- Add it to the server mod data ServerDataHandler.modData[key] = table end