From f399d91445f15eeb44ef640811dfccea7b463eea Mon Sep 17 00:00:00 2001 From: Pao Date: Tue, 28 Feb 2023 02:28:58 +0100 Subject: [PATCH] and some others to camelCase --- media/lua/client/Interface/JCIO_UI.lua | 18 +++---- media/lua/client/JCIO_CommonFunctions.lua | 2 +- media/lua/client/JCIO_Init.lua | 20 ++++---- media/lua/client/JCIO_ServerCommands.lua | 61 +++++++++++------------ media/lua/server/JCIO_ClientCommands.lua | 8 +-- 5 files changed, 53 insertions(+), 56 deletions(-) diff --git a/media/lua/client/Interface/JCIO_UI.lua b/media/lua/client/Interface/JCIO_UI.lua index 8420ebb..0bc8d89 100644 --- a/media/lua/client/Interface/JCIO_UI.lua +++ b/media/lua/client/Interface/JCIO_UI.lua @@ -294,7 +294,7 @@ local function OnClickMainUI(button, args) descUI:open() descUI:setPositionPixel(mainUI:getRight(), mainUI:getY()) - JCIO_UI.SetupDescUI(mainUI.surgeon, mainUI.patient, mainUI.limbsData, args.part_name) -- surgeon is generic. + JCIO_UI.SetupDescUI(mainUI.surgeon, mainUI.patient, mainUI.limbsData, args.partName) -- surgeon is generic. end @@ -423,37 +423,37 @@ local function CreateMainUI() mainUI:setWidthPercent(0.1) mainUI:addImageButton("b11", "", OnClickMainUI) - mainUI["b11"]:addArg("part_name", "Right_UpperArm") + mainUI["b11"]:addArg("partName", "Right_UpperArm") mainUI:addImageButton("b12", "", OnClickMainUI) - mainUI["b12"]:addArg("part_name", "Left_UpperArm") + mainUI["b12"]:addArg("partName", "Left_UpperArm") mainUI:nextLine() mainUI:addImageButton("b21", "", OnClickMainUI) - mainUI["b21"]:addArg("part_name", "Right_LowerArm") + mainUI["b21"]:addArg("partName", "Right_LowerArm") mainUI:addImageButton("b22", "", OnClickMainUI) - mainUI["b22"]:addArg("part_name", "Left_LowerArm") + mainUI["b22"]:addArg("partName", "Left_LowerArm") mainUI:nextLine() mainUI:addImageButton("b31", "", OnClickMainUI) - mainUI["b31"]:addArg("part_name", "Right_Hand") + mainUI["b31"]:addArg("partName", "Right_Hand") mainUI:addImageButton("b32", "", OnClickMainUI) - mainUI["b32"]:addArg("part_name", "Left_Hand") + mainUI["b32"]:addArg("partName", "Left_Hand") mainUI:nextLine() mainUI:addImageButton("b41", "", OnClickMainUI) - mainUI["b41"]:addArg("part_name", "Right_Foot") + mainUI["b41"]:addArg("partName", "Right_Foot") mainUI:addImageButton("b42", "", OnClickMainUI) - mainUI["b42"]:addArg("part_name", "Left_Foot") + mainUI["b42"]:addArg("partName", "Left_Foot") mainUI:saveLayout() diff --git a/media/lua/client/JCIO_CommonFunctions.lua b/media/lua/client/JCIO_CommonFunctions.lua index ac0e2a3..82a6c50 100644 --- a/media/lua/client/JCIO_CommonFunctions.lua +++ b/media/lua/client/JCIO_CommonFunctions.lua @@ -98,7 +98,7 @@ JCIO_Common.GetPartNameFromBodyPartType = function(bodyPartType) end --- 1:1 map of part_name to BodyPartType +-- 1:1 map of partName to BodyPartType JCIO_Common.GetBodyPartFromPartName = function(partName) if partName == "Right_Hand" then return BodyPartType.Hand_R end if partName == "Right_LowerArm" then return BodyPartType.ForeArm_R end diff --git a/media/lua/client/JCIO_Init.lua b/media/lua/client/JCIO_Init.lua index fca0913..d84ad55 100644 --- a/media/lua/client/JCIO_Init.lua +++ b/media/lua/client/JCIO_Init.lua @@ -56,19 +56,19 @@ JCIO.CutLimbForTrait = function(player, jcioModData, partName) end end -JCIO.InitPart = function(limbs_data, part_name) +JCIO.InitPart = function(limbsData, partName) - limbs_data[part_name].isCut = false - limbs_data[part_name].isInfected = false - limbs_data[part_name].isOperated = false - limbs_data[part_name].isCicatrized = false - limbs_data[part_name].isCauterized = false - limbs_data[part_name].isAmputation_shown = false + limbsData[partName].isCut = false + limbsData[partName].isInfected = false + limbsData[partName].isOperated = false + limbsData[partName].isCicatrized = false + limbsData[partName].isCauterized = false + limbsData[partName].isAmputation_shown = false - limbs_data[part_name].cicatrizationTime = 0 + limbsData[partName].cicatrizationTime = 0 - limbs_data[part_name].isProsthesisEquipped = false - limbs_data[part_name].equippedProsthesis = {} + limbsData[partName].isProsthesisEquipped = false + limbsData[partName].equippedProsthesis = {} end diff --git a/media/lua/client/JCIO_ServerCommands.lua b/media/lua/client/JCIO_ServerCommands.lua index 2eea3fe..32966e3 100644 --- a/media/lua/client/JCIO_ServerCommands.lua +++ b/media/lua/client/JCIO_ServerCommands.lua @@ -22,12 +22,12 @@ end ServerCommands.CanCutLimb = function(arg) - local part_name = arg["toSend"] + local partName = arg["toSend"] arg["To"] = arg["From"] arg["From"] = getPlayer():getOnlineID() arg["command"] = "ResponseCanAct" - arg["toSend"] = { part_name, "Cut", JCIO_Common.CheckIfCanBeCut(part_name) } + arg["toSend"] = { partName, "Cut", JCIO_Common.CheckIfCanBeCut(partName) } sendClientCommand("JCIO", "SendServer", arg) end ServerCommands.CutLimb = function(arg) @@ -44,12 +44,12 @@ end ServerCommands.CanOperateLimb = function(arg) - local part_name = arg["toSend"] + local partName = arg["toSend"] arg["To"] = arg["From"] arg["From"] = getPlayer():getOnlineID() arg["command"] = "ResponseCanAct" - arg["toSend"] = { part_name, "Operate", JCIO_Common.CheckIfCanBeOperated(part_name) } + arg["toSend"] = { partName, "Operate", JCIO_Common.CheckIfCanBeOperated(partName) } sendClientCommand("JCIO", "SendServer", arg) end ServerCommands.OperateLimb = function(arg) @@ -65,13 +65,13 @@ end ServerCommands.CanEquipProsthesis = function(arg) - local part_name = arg["toSend"] + local partName = arg["toSend"] --local item = arg["toSend"][2] -- TODO Add item prosth here arg["To"] = arg["From"] arg["From"] = getPlayer():getOnlineID() arg["command"] = "ResponseCanAct" - arg["toSend"] = {part_name, "Equip", JCIO_Common.CheckIfProsthesisCanBeEquipped(part_name) } + arg["toSend"] = {partName, "Equip", JCIO_Common.CheckIfProsthesisCanBeEquipped(partName) } sendClientCommand("JCIO", "SendServer", arg) end @@ -86,17 +86,17 @@ ServerCommands.EquipProsthesis = function(arg) local partName = data[1] local prosthesisItem = data[2] - JCIO.EquipProsthesis(partName, prosthesisItem, _) -- TODO Add the third param + JCIO.EquipProsthesis(partName, prosthesisItem, _) -- TODO Add the third param when modular prost are done end ServerCommands.CanUnequipProsthesis = function(arg) - local part_name = arg["toSend"] + local partName = arg["toSend"] arg["To"] = arg["From"] arg["From"] = getPlayer():getOnlineID() arg["command"] = "ResponseCanAct" - arg["toSend"] = { part_name, "Unequip", JCIO_Common.CheckIfProsthesisCanBeUnequipped(part_name)} + arg["toSend"] = { partName, "Unequip", JCIO_Common.CheckIfProsthesisCanBeUnequipped(partName)} sendClientCommand("JCIO", "SendServer", arg) end ServerCommands.UnequipProsthesis = function(arg) @@ -112,12 +112,12 @@ end ServerCommands.CanResetEverything = function(arg) - local part_name = "RightHand" --useless + local partName = "RightHand" --useless arg["To"] = arg["From"] arg["From"] = getPlayer():getOnlineID() arg["command"] = "ResponseCanAct" - arg["toSend"] = { part_name, "Cut", true } + arg["toSend"] = { partName, "Cut", true } sendClientCommand("JCIO", "SendServer", arg) end ServerCommands.ResetEverything = function(_) @@ -128,8 +128,8 @@ end -- Used when amputating the limb of another player ServerCommands.AcceptDamageOtherPlayer = function(arg) local patient = getPlayerByOnlineID(arg[1]) - local part_name = arg[2] - JCIO.DamagePlayerDuringAmputation(patient, part_name) + local partName = arg[2] + JCIO.DamagePlayerDuringAmputation(patient, partName) end -- Used to propagate animation changes after amputating a foot @@ -191,7 +191,7 @@ Events.OnConnected.Add(OnConnected) -------------------------------------------------------- -function SendCutLimb(player, part_name, surgeon_factor, bandage_table, painkiller_table) +function SendCutLimb(player, partName, surgeonFactor, bandageTable, painkillerTable) local arg = {} arg["From"] = getPlayer():getOnlineID() arg["To"] = player:getOnlineID() @@ -199,78 +199,75 @@ function SendCutLimb(player, part_name, surgeon_factor, bandage_table, painkille -- TODO Hotfix for sound, fix this later - arg["toSend"] = {part_name, surgeon_factor, bandage_table, painkiller_table} - - - + arg["toSend"] = {partName, surgeonFactor, bandageTable, painkillerTable} sendClientCommand("JCIO", "SendServer", arg) end -function SendOperateLimb(player, part_name, surgeon_factor, use_oven) +function SendOperateLimb(player, partName, surgeonFactor, useOven) local arg = {} arg["From"] = getPlayer():getOnlineID() arg["To"] = player:getOnlineID() arg["command"] = "OperateLimb" - arg["toSend"] = { part_name, surgeon_factor, use_oven } + arg["toSend"] = { partName, surgeonFactor, useOven } sendClientCommand("JCIO", "SendServer", arg) end -function SendEquipProsthesis(player, part_name, item, prosthesis_base_name) +function SendEquipProsthesis(player, partName, item, prosthesisBaseName) local arg = {} arg["From"] = getPlayer():getOnlineID() arg["To"] = player:getOnlineID() arg["command"] = "EquipProsthesis" - arg["toSend"] = { part_name, item, prosthesis_base_name} + arg["toSend"] = { partName, item, prosthesisBaseName} sendClientCommand("JCIO", "SendServer", arg) end -function SendUnequipProsthesis(player, part_name, item) +function SendUnequipProsthesis(player, partName, item) local arg = {} arg["From"] = getPlayer():getOnlineID() arg["To"] = player:getOnlineID() arg["command"] = "UnequipProsthesis" - arg["toSend"] = { player, part_name, item} + arg["toSend"] = { player, partName, item} sendClientCommand("JCIO", "SendServer", arg) end -function AskCanCutLimb(player, part_name) +function AskCanCutLimb(player, partName) GetConfirmUIMP().responseReceive = false local arg = {} arg["From"] = getPlayer():getOnlineID() arg["To"] = player:getOnlineID() arg["command"] = "CanCutLimb" - arg["toSend"] = part_name + arg["toSend"] = partName sendClientCommand("JCIO", "SendServer", arg) end -function AskCanOperateLimb(player, part_name) +function AskCanOperateLimb(player, partName) GetConfirmUIMP().responseReceive = false local arg = {} arg["From"] = getPlayer():getOnlineID() arg["To"] = player:getOnlineID() arg["command"] = "CanOperateLimb" - arg["toSend"] = part_name + arg["toSend"] = partName sendClientCommand("JCIO", "SendServer", arg) end -function AskCanEquipProsthesis(player, part_name) +function AskCanEquipProsthesis(player, partName) GetConfirmUIMP().responseReceive = false local arg = {} arg["From"] = getPlayer():getOnlineID() arg["To"] = player:getOnlineID() arg["command"] = "CanEquipProsthesis" - arg["toSend"] = part_name -- TODO to be more precise there should be prosthesis item here too to check + arg["toSend"] = partName -- TODO to be more precise there should be prosthesis item here too to check sendClientCommand("JCIO", "SendServer", arg) end -function AskCanUnequipProsthesis(player, part_name) +function AskCanUnequipProsthesis(player, partName) GetConfirmUIMP().responseReceive = false local arg = {} arg["From"] = getPlayer():getOnlineID() arg["To"] = player:getOnlineID() arg["command"] = "CanUnequipProsthesis" - arg["toSend"] = part_name + arg["toSend"] = partName sendClientCommand("JCIO", "SendServer", arg) end diff --git a/media/lua/server/JCIO_ClientCommands.lua b/media/lua/server/JCIO_ClientCommands.lua index ce15fad..e5abf0b 100644 --- a/media/lua/server/JCIO_ClientCommands.lua +++ b/media/lua/server/JCIO_ClientCommands.lua @@ -6,8 +6,8 @@ local ClientCommands = {} --- Main handler of base functions for TOC, not changed till now 'cause it works -ClientCommands.SendServer = function(player, arg) +-- Main handler of base functions for JCIO, based on the original work for TOC +ClientCommands.SendServer = function(_, arg) local otherPlayer = getPlayerByOnlineID(arg["To"]) sendServerCommand(otherPlayer, "JCIO", arg["command"], arg) @@ -19,9 +19,9 @@ ClientCommands.AskDamageOtherPlayer = function(_, arg) local patient = getPlayerByOnlineID(arg[1]) local patient_id = arg[1] - local part_name = arg[2] + local partName = arg[2] - sendServerCommand(patient, "JCIO", "AcceptDamageOtherPlayer", {patient_id, part_name}) + sendServerCommand(patient, "JCIO", "AcceptDamageOtherPlayer", {patient_id, partName}) end