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

Reworked some stuff for MP

Browse Source
This commit is contained in:
ZioPao
2023-11-12 22:20:46 +01:00
parent f973b774a2
commit 4887699892
13 changed files with 209 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
media/lua/client/TOC/ClientSyncCommands.lua
View File

@@ -1,24 +1,27 @@
local CommandsData = require("TOC/CommandsData")
local ModDataHandler = require("TOC/Handlers/ModDataHandler")
local ClientSyncCommands = {}
local moduleName = CommandsData.modules.TOC_SYNC
------------------------------
---Send the toc mod data to the server to relay it to someone else
---@param args {surgeonNum : number}
---@param args sendPlayerDataParams
function ClientSyncCommands.SendPlayerData(args)
-- TODO get moddata and send it
sendClientCommand(moduleName, CommandsData.server.Sync.RelayPlayerData, {surgeonNum = args.surgeonNum, tocData = {}})
---@type relayPlayerDataParams
local params = {surgeonNum = args.surgeonNum, tocData = {}}
sendClientCommand(moduleName, CommandsData.server.Sync.RelayPlayerData, params)
end
---Receives and store the toc mod data from another player
---@param args {patientNum : number}
---@param args receivePlayerDataParams
function ClientSyncCommands.ReceivePlayerData(args)
local patientPl = getSpecificPlayer(args.patientNum)
local patientUsername patientPl:getUsername()
-- TODO Save the data somewhere that makes sense.
ModDataHandler.AddExternalTocData(patientUsername, args.tocData)
end
------------------------------

15
media/lua/client/TOC/Debug.lua
View File

@@ -1,15 +0,0 @@
TOC_DEBUG = {}
TOC_DEBUG.disablePaneMod = false
function TOC_DEBUG.togglePaneMod()
TOC_DEBUG.disablePaneMod = not TOC_DEBUG.disablePaneMod
end
---comment
---@param string string
function TOC_DEBUG.print(string)
if isDebugEnabled() then
print("TOC: " .. string)
end
end

9
media/lua/client/TOC/Handlers/AmputationHandler.lua
View File

@@ -76,7 +76,10 @@ function AmputationHandler:execute(damagePlayer)
-- Set the data in modData
ModDataHandler.GetInstance():setCutLimb(self.limbName, false, false, false, surgeonFactor)
-- TODO This could be run on another player!
local modDataHandler = ModDataHandler.GetInstance()
modDataHandler:setCutLimb(self.limbName, false, false, false, surgeonFactor)
modDataHandler:apply()
-- Give the player the correct amputation item
ItemsHandler.DeleteOldAmputationItem(self.patient, self.limbName)
@@ -86,7 +89,7 @@ function AmputationHandler:execute(damagePlayer)
PlayerHandler.AddLocalAmputatedLimb(self.limbName)
-- Set the highest amputation and caches them.
ISHealthPanel.GetHighestAmputation()
--ISHealthPanel.GetHighestAmputation()
end
---Deletes the instance
@@ -98,7 +101,7 @@ end
function AmputationHandler.UpdateCicatrization()
if ModDataHandler.GetInstance():getIsAnyLimbCut() == false then return end
-- TODO Update cicatrization
end
return AmputationHandler

2
media/lua/client/TOC/Handlers/ItemsHandler.lua
View File

@@ -109,7 +109,7 @@ function ISInventoryPane:refreshContainer()
for i=1, #self.itemslist do
local cItem = self.itemslist[i]
if cItem and cItem.cat == "Amputation" then
TOC_DEBUG.print("current item is an amputation, removing it from the list")
TOC_DEBUG.print("Refreshing container - current item is an amputation, removing it from the list of the container")
table.remove(self.itemslist, i)
end
end

72
media/lua/client/TOC/Handlers/ModDataHandler.lua
View File

@@ -1,35 +1,67 @@
local CommandsData = require("TOC/CommandsData")
local StaticData = require("TOC/StaticData")
----------------
--- Handle all mod data related stuff
---@class ModDataHandler
---@field playerObj IsoPlayer
---@field username string
---@field tocData tocModData
local ModDataHandler = {}
ModDataHandler.instances = {}
function ModDataHandler.AddExternalTocData(username, tocData)
end
-- Instead of requiring a player, to make it compatible in a MP env, we should require the table containing the modData for the init
---@param username string
---@param tocData tocModData
---@param isResetForced boolean?
---@return ModDataHandler
function ModDataHandler:new(username, tocData)
function ModDataHandler:new(username, isResetForced)
local o = {}
setmetatable(o, self)
self.__index = self
-- Instead of requiring a player, to make it compatible in a MP env, we should require the table containing the modData for the init
o.username = username
local key = CommandsData.GetKey(username)
ModData.request(key)
o.tocData = ModData.get(key)
if isResetForced or o.tocData == nil or o.tocData.Hand_L == nil or o.tocData.Hand_L.isCut == nil then
TOC_DEBUG.print("tocData in ModDataHandler for " .. username .. " is nil, creating it now")
self:setup(key)
end
o.tocData = tocData
ModDataHandler.instances[username] = o
return o
end
---Setup a new toc mod data data class
---@param key string
function ModDataHandler:setup(key)
---@type tocModData
self.tocData = {
-- Generic stuff that does not belong anywhere else
isIgnoredPartInfected = false,
isAnyLimbCut = false
}
---@type partData
local defaultParams = {isCut = false, isInfected = false, isOperated = false, isCicatrized = false, isCauterized = false, isVisible = false}
-- Initialize limbs
for i=1, #StaticData.LIMBS_STRINGS do
local limbName = StaticData.LIMBS_STRINGS[i]
self.tocData[limbName] = {}
self:setLimbParams(StaticData.LIMBS_STRINGS[i], defaultParams, 0)
end
-- Add it to global mod data
ModData.add(key, self.tocData)
-- Transmit it to the server
ModData.transmit(key)
end
-----------------
@@ -137,17 +169,23 @@ function ModDataHandler:setLimbParams(limbName, ampStatus, cicatrizationTime)
end
--* Global Mod Data Apply *--
function ModDataHandler:apply()
ModData.transmit(CommandsData.GetKey(self.username))
end
---@param username string?
---@return ModDataHandler?
---@return ModDataHandler
function ModDataHandler.GetInstance(username)
if username == nil then
username = getPlayer():getUsername()
end
if username == nil then username = getPlayer():getUsername() end
if ModDataHandler.instances[username] ~= nil then
return ModDataHandler.instances[username]
if ModDataHandler.instances[username] == nil then
return ModDataHandler:new(username)
else
return nil -- TODO This isn't exactly good
--return ModDataHandler:new(getPlayer())
return ModDataHandler.instances[username]
end
end

61
media/lua/client/TOC/Handlers/PlayerHandler.lua
View File

@@ -15,61 +15,36 @@ local StaticData = require("TOC/StaticData")
---@field playerObj IsoPlayer
local PlayerHandler = {}
PlayerHandler.amputatedLimbs = {}
---Setup the Player Handler and modData
---@param _ nil
---@param playerObj IsoPlayer
---@param isForced boolean?
function PlayerHandler.InitializePlayer(_, playerObj, isForced)
PlayerHandler.SetupModData(playerObj, isForced)
PlayerHandler.playerObj = playerObj
function PlayerHandler.InitializePlayer(playerObj, isForced)
local username = playerObj:getUsername()
TOC_DEBUG.print("initializing " .. username)
local modDataHandler = ModDataHandler:new(username, isForced)
PlayerHandler.playerObj = playerObj
-- Calculate amputated limbs at startup
PlayerHandler.amputatedLimbs = {}
PlayerHandler.amputatedLimbs[username] = {}
for i=1, #StaticData.LIMBS_STRINGS do
local limbName = StaticData.LIMBS_STRINGS[i]
if ModDataHandler.GetInstance():getIsCut(limbName) then
PlayerHandler.AddLocalAmputatedLimb(limbName)
if modDataHandler:getIsCut(limbName) then
PlayerHandler.AddLocalAmputatedLimb(username, limbName)
end
end
-- Since isForced is used to reset an existing player data, we're gonna clean their ISHealthPanel table too
if isForced then
ISHealthPanel.highestAmputations = {}
--ISHealthPanel.highestAmputations = {}
local ItemsHandler = require("TOC/Handlers/ItemsHandler")
ItemsHandler.DeleteAllOldAmputationItems(playerObj)
end
end
---Setup TOC mod data to a local client
---@param playerObj IsoPlayer
---@param isForced boolean?
function PlayerHandler.SetupModData(playerObj, isForced)
local tocData = playerObj:getModData()[StaticData.MOD_NAME]
if isForced or tocData == nil or tocData.Hand_L == nil or tocData.Hand_L.isCut == nil then
local modData = playerObj:getModData()
modData[StaticData.MOD_NAME] = {
-- Generic stuff that does not belong anywhere else
isIgnoredPartInfected = false,
isAnyLimbCut = false
}
---@type partData
local defaultParams = {isCut = false, isInfected = false, isOperated = false, isCicatrized = false, isCauterized = false, isVisible = false}
-- We're gonna make a instance of ModDataHandler to setup this player
local plUsername = playerObj:getUsername()
local dataHandler = ModDataHandler:new(plUsername, modData[StaticData.MOD_NAME])
-- Initialize limbs
for i=1, #StaticData.LIMBS_STRINGS do
local limbName = StaticData.LIMBS_STRINGS[i]
modData[StaticData.MOD_NAME][limbName] = {}
dataHandler:setLimbParams(StaticData.LIMBS_STRINGS[i], defaultParams, 0)
end
end
end
---Handles the traits
---@param playerObj IsoPlayer
function PlayerHandler.ManageTraits(playerObj)
@@ -87,9 +62,9 @@ end
---Cache the currently amputated limbs
---@param limbName string
function PlayerHandler.AddLocalAmputatedLimb(limbName)
TOC_DEBUG.print("added " .. limbName .. " to known amputated limbs")
table.insert(PlayerHandler.amputatedLimbs, limbName) -- TODO This should be player specific, not generic
function PlayerHandler.AddLocalAmputatedLimb(username, limbName)
TOC_DEBUG.print("added " .. limbName .. " to known amputated limbs for " .. username)
table.insert(PlayerHandler.amputatedLimbs[username], limbName) -- TODO This should be player specific, not generic
end
--* Getters *--
@@ -108,16 +83,18 @@ function PlayerHandler.CheckInfection(character)
-- This fucking event barely works. Bleeding seems to be the only thing that triggers it
if character ~= getPlayer() then return end
local bd = character:getBodyDamage()
local modDataHandler = ModDataHandler.GetInstance()
for i=1, #StaticData.LIMBS_STRINGS do
local limbName = StaticData.LIMBS_STRINGS[i]
local bptEnum = StaticData.BODYPARTSTYPES_ENUM[limbName]
local bodyPart = bd:getBodyPart(bptEnum)
if bodyPart:bitten() or bodyPart:IsInfected() then
if ModDataHandler.GetInstance():getIsCut(limbName) then
if modDataHandler:getIsCut(limbName) then
bodyPart:SetBitten(false)
else
ModDataHandler.GetInstance():setIsInfected(limbName, true)
modDataHandler:setIsInfected(limbName, true)
end
end
end

9
media/lua/client/TOC/Main.lua
View File

@@ -40,10 +40,17 @@ function Main.Start()
Main.SetupTraits()
-- Starts initialization for local client
Events.OnCreatePlayer.Add(PlayerHandler.InitializePlayer)
Events.OnGameStart.Add(Main.Initialize)
end
function Main.Initialize()
local pl = getPlayer()
PlayerHandler.InitializePlayer(pl, false)
end
--* Events *--
Events.OnGameBoot.Add(Main.Start)

2
media/lua/client/TOC/Tests.lua
View File

@@ -11,7 +11,7 @@ TestFramework.registerTestModule("Functionality", "PlayerHandler", function()
local Tests = {}
function Tests.InitializePlayer()
local pl = getPlayer()
PlayerHandler.InitializePlayer(_, pl, true)
PlayerHandler.InitializePlayer(pl, true)
end
function Tests.SetMaxPerks()

43
media/lua/client/TOC/UI/HealthPanel.lua
View File

@@ -2,6 +2,7 @@ local PlayerHandler = require("TOC/Handlers/PlayerHandler")
local StaticData = require("TOC/StaticData")
local CommonMethods = require("TOC/CommonMethods")
local ModDataHandler = require("TOC/Handlers/ModDataHandler")
local CommandsData = require("TOC/CommandsData")
---@diagnostic disable: duplicate-set-field
local CutLimbHandler = require("TOC/UI/CutLimbInteractions")
@@ -44,23 +45,35 @@ end
--* Modification to handle visible amputation on the health menu *--
function ISHealthPanel:setHighestAmputation()
--TOC_DEBUG.print("setHighestAmputation")
if PlayerHandler.amputatedLimbs == nil or PlayerHandler.amputatedLimbs[self.tocUsername] then
TOC_DEBUG.print("PlayerHandler.amputatedLimbs is still nil or wasn't initialized for that player")
return
end
if self.otherPlayer ~= nil then
self.tocUsername = self.otherPlayer:getUsername()
else
self.tocUsername = self.character:getUsername()
end
ISHealthPanel.highestAmputations[self.tocUsername] = {}
self.highestAmputations[self.tocUsername] = {}
TOC_DEBUG.print("Searching highest amputations for " .. self.tocUsername)
local modDataHandler = ModDataHandler.GetInstance(self.tocUsername)
if modDataHandler == nil then return end -- TODO Test this
if modDataHandler == nil then
TOC_DEBUG.print("ModDataHandler not found for " .. self.tocUsername)
return
end
for i=1, #PlayerHandler.amputatedLimbs do
local limbName = PlayerHandler.amputatedLimbs[i]
local index = CommonMethods.GetSide(limbName)
if modDataHandler:getIsCut(limbName) and modDataHandler:getIsVisible(limbName) then
ISHealthPanel.highestAmputations[index] = limbName
TOC_DEBUG.print("found high amputation " .. limbName)
self.highestAmputations[self.tocUsername][index] = limbName
end
end
end
@@ -73,6 +86,7 @@ function ISHealthPanel:initialise()
self.sexPl = "Male"
end
self.highestAmputations = {}
self:setHighestAmputation()
og_ISHealthPanel_initialise(self)
@@ -87,6 +101,12 @@ function ISHealthPanel:setOtherPlayer(playerObj)
-- Since setOtherPlayer may be run after initialise (or always), we need to recheck it after.
self:setHighestAmputation()
-- TODO Request from server!
-----@type askPlayerDataParams
--local params = {patientNum = playerObj:getOnlineID()}
--sendClientCommand(CommandsData.modules.TOC_SYNC, CommandsData.server.Sync.AskPlayerData, params)
end
@@ -96,20 +116,21 @@ function ISHealthPanel:render()
-- TODO Handle another player health panel
if ISHealthPanel.highestAmputations[self.tocUsername] then
if self.highestAmputations ~= nil and self.highestAmputations[self.tocUsername] ~= nil then
-- Left Texture
if ISHealthPanel.highestAmputations[self.tocUsername]["L"] then
local textureL = StaticData.HEALTH_PANEL_TEXTURES[self.sexPl][ISHealthPanel.highestAmputations["L"]]
if self.highestAmputations[self.tocUsername]["L"] then
local textureL = StaticData.HEALTH_PANEL_TEXTURES[self.sexPl][self.highestAmputations[self.tocUsername]["L"]]
self:drawTexture(textureL, self.healthPanel.x/2 - 2, self.healthPanel.y/2, 1, 1, 0, 0)
end
-- Right Texture
if ISHealthPanel.highestAmputations[self.tocUsername]["R"] then
local textureR = StaticData.HEALTH_PANEL_TEXTURES[self.sexPl][ISHealthPanel.highestAmputations["R"]]
if self.highestAmputations["R"] then
local textureR = StaticData.HEALTH_PANEL_TEXTURES[self.sexPl][self.highestAmputations[self.tocUsername]["R"]]
self:drawTexture(textureR, self.healthPanel.x/2 + 2, self.healthPanel.y/2, 1, 1, 0, 0)
end
else
ISHealthPanel.GetHighestAmputation(self.tocUsername)
self:setHighestAmputation()
--ISHealthPanel.GetHighestAmputation(self.tocUsername)
end
end