From 46bc6030fee65c751849965faad7431e63687345 Mon Sep 17 00:00:00 2001 From: ZioPao Date: Wed, 15 Nov 2023 03:04:30 +0100 Subject: [PATCH] Added indexed limbs_str --- media/lua/client/TOC/Handlers/PlayerHandler.lua | 17 ++++++++--------- media/lua/shared/TOC/StaticData.lua | 6 ++++-- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/media/lua/client/TOC/Handlers/PlayerHandler.lua b/media/lua/client/TOC/Handlers/PlayerHandler.lua index 288b589..e0c3010 100644 --- a/media/lua/client/TOC/Handlers/PlayerHandler.lua +++ b/media/lua/client/TOC/Handlers/PlayerHandler.lua @@ -214,24 +214,23 @@ function ISEquipWeaponAction:performWithAmputation(modDataHandler) local otherProstGroup = nil local getMethodFirst = nil local setMethodFirst = nil - local getMethodSecond = nil local setMethodSecond = nil if self.primary then - hand = "Hand_R" - prostGroup = "Top_R" - otherHand = "Hand_L" - otherProstGroup = "Top_L" + hand = StaticData.LIMBS_IND_STR.Hand_R + prostGroup = StaticData.PROSTHESES_GROUPS_IND_STR.Top_R + otherHand = StaticData.LIMBS_IND_STR.Hand_L + otherProstGroup = StaticData.PROSTHESES_GROUPS_IND_STR.Top_L getMethodFirst = self.character.getSecondaryHandItem setMethodFirst = self.character.setSecondaryHandItem getMethodSecond = self.character.getPrimaryHandItem setMethodSecond = self.character.setPrimaryHandItem else - hand = "Hand_L" - prostGroup = "Top_L" - otherHand = "Hand_R" - otherProstGroup = "Top_R" + hand = StaticData.LIMBS_IND_STR.Hand_L + prostGroup = StaticData.PROSTHESES_GROUPS_IND_STR.Top_L + otherHand = StaticData.LIMBS_IND_STR.Hand_R + otherProstGroup = StaticData.PROSTHESES_GROUPS_IND_STR.Top_R getMethodFirst = self.character.getPrimaryHandItem setMethodFirst = self.character.setPrimaryHandItem getMethodSecond = self.character.getSecondaryHandItem diff --git a/media/lua/shared/TOC/StaticData.lua b/media/lua/shared/TOC/StaticData.lua index c0ccf23..c317a01 100644 --- a/media/lua/shared/TOC/StaticData.lua +++ b/media/lua/shared/TOC/StaticData.lua @@ -48,6 +48,7 @@ StaticData.IGNORED_BODYLOCS_BPT = { -- Assembled BodyParts string StaticData.LIMBS_STR = {} +StaticData.LIMBS_IND_STR = {} StaticData.LIMBS_DEPENDENCIES_IND_STR = {} StaticData.LIMBS_CICATRIZATION_TIME_IND_NUM = {} StaticData.LIMBS_BASE_DAMAGE_IND_NUM = {} @@ -82,6 +83,7 @@ for side, _ in pairs(StaticData.SIDES_IND_STR) do -- Assembled strings table.insert(StaticData.LIMBS_STR, assembledName) -- We need a table like this to cycle through it easily + StaticData.LIMBS_IND_STR[assembledName] = assembledName StaticData.BODYLOCS_IND_BPT[assembledName] = BodyPartType[assembledName] -- Dependencies and cicatrization time @@ -98,7 +100,7 @@ end ----------------- --* Prostheses -StaticData.PROSTHESE_GROUPS_BASE_IND_STR = { +StaticData.PROSTHESES_GROUPS_BASE_IND_STR = { Top = "Top", Bottom = "Bottom" } @@ -107,7 +109,7 @@ StaticData.PROSTHESES_GROUPS_IND_STR = {} StaticData.PROSTHESES_GROUPS_STR = {} for side, _ in pairs(StaticData.SIDES_IND_STR) do - for group, _ in pairs(StaticData.PROSTHESE_GROUPS_BASE_IND_STR) do + for group, _ in pairs(StaticData.PROSTHESES_GROUPS_BASE_IND_STR) do local sidedGroup = group .. "_" .. side StaticData.PROSTHESES_GROUPS_IND_STR[sidedGroup] = sidedGroup table.insert(StaticData.PROSTHESES_GROUPS_STR, sidedGroup)