diff --git a/media/lua/client/TOC/Controllers/LimitActionsController.lua b/media/lua/client/TOC/Controllers/LimitActionsController.lua index f5a6034..6ee7c30 100644 --- a/media/lua/client/TOC/Controllers/LimitActionsController.lua +++ b/media/lua/client/TOC/Controllers/LimitActionsController.lua @@ -58,19 +58,22 @@ local og_ISBaseTimedAction_perform = ISBaseTimedAction.perform function ISBaseTimedAction:perform() og_ISBaseTimedAction_perform(self) + TOC_DEBUG.print("Running ISBaseTimedAction.perform override") + local dcInst = DataController.GetInstance() if not dcInst:getIsAnyLimbCut() then return end local amputatedLimbs = CachedDataHandler.GetAmputatedLimbs(LocalPlayerController.username) for k, _ in pairs(amputatedLimbs) do local limbName = k - if dcInst:getIsCut(limbName) then + + -- We're checking for only "visible" amputations to prevent from having bleeds everywhere + if dcInst:getIsCut(limbName) and dcInst:getIsVisible(limbName) then local side = CommonMethods.GetSide(limbName) LocalPlayerController.playerObj:getXp():AddXP(Perks["Side_" .. side], 1) -- TODO Make it dynamic local prostGroup = StaticData.LIMBS_TO_PROST_GROUP_MATCH_IND_STR[limbName] if not dcInst:getIsCicatrized(limbName) and dcInst:getIsProstEquipped(prostGroup) then TOC_DEBUG.print("Trying for bleed, player met the criteria") - -- TODO If we have cut a forearm, it will try to check the hand too, with cicatrization time = 0. We should skip this LocalPlayerController.TryRandomBleed(self.character, limbName) end end diff --git a/media/lua/shared/Translate/EN/IG_UI_EN.txt b/media/lua/shared/Translate/EN/IG_UI_EN.txt index 25d4d01..08a7520 100644 --- a/media/lua/shared/Translate/EN/IG_UI_EN.txt +++ b/media/lua/shared/Translate/EN/IG_UI_EN.txt @@ -6,7 +6,7 @@ IG_UI_EN = { IGUI_perks_ProstFamiliarity= "Familiarity", IGUI_ItemCat_Prosthesis = "Prosthesis", - IGUI_ItemCat_Prosthesis = "Surgery", + IGUI_ItemCat_Surgery = "Surgery", IGUI_ItemCat_Amputation = "Amputation" IGUI_HealthPanel_Cicatrization = "Cicatrization", diff --git a/media/models_X/Prosthesis/hookArm_Ground.fbx b/media/models_X/Prosthesis/hookArm_Ground.fbx new file mode 100644 index 0000000..0e6da0d Binary files /dev/null and b/media/models_X/Prosthesis/hookArm_Ground.fbx differ diff --git a/media/models_X/Prosthesis/hookArm_L_M.fbx b/media/models_X/Prosthesis/hookArm_L_M.fbx new file mode 100644 index 0000000..0f0e431 Binary files /dev/null and b/media/models_X/Prosthesis/hookArm_L_M.fbx differ diff --git a/media/models_X/Prosthesis/hookArm_R_M.fbx b/media/models_X/Prosthesis/hookArm_R_M.fbx new file mode 100644 index 0000000..7e7b8a5 Binary files /dev/null and b/media/models_X/Prosthesis/hookArm_R_M.fbx differ diff --git a/media/models_X/Prosthesis/normalArm_L_M.fbx b/media/models_X/Prosthesis/normalArm_L_M.fbx new file mode 100644 index 0000000..6ac64e7 Binary files /dev/null and b/media/models_X/Prosthesis/normalArm_L_M.fbx differ diff --git a/media/models_X/Prosthesis/normalArm_R_M.fbx b/media/models_X/Prosthesis/normalArm_R_M.fbx new file mode 100644 index 0000000..4d7fa6b Binary files /dev/null and b/media/models_X/Prosthesis/normalArm_R_M.fbx differ diff --git a/media/scripts/TOC_models.txt b/media/scripts/TOC_models.txt index 071c109..1871433 100644 --- a/media/scripts/TOC_models.txt +++ b/media/scripts/TOC_models.txt @@ -12,5 +12,11 @@ module Prosthesis } + model prostheticArmHook + { + mesh = Prosthesis/hookArm_Ground, + texture = Prosthesis\hookArm, + } + } \ No newline at end of file diff --git a/media/scripts/TOC_prosthesis_items.txt b/media/scripts/TOC_prosthesis_items.txt index 29fedf0..6bad195 100644 --- a/media/scripts/TOC_prosthesis_items.txt +++ b/media/scripts/TOC_prosthesis_items.txt @@ -23,8 +23,11 @@ module TOC Insulation = 1.0, WindResistance = 1.0, WaterResistance = 1.0, - Icon = armProsthetic, CanHaveHoles = false, + + Icon = armProsthetic, + WorldStaticModel = prostheticArmHook, + } item Prost_HookArm_R { @@ -42,8 +45,10 @@ module TOC Insulation = 1.0, WindResistance = 1.0, WaterResistance = 1.0, - Icon = armProsthetic, CanHaveHoles = false, + + Icon = armProsthetic, + WorldStaticModel = prostheticArmHook, } item Prost_NormalArm_L @@ -62,9 +67,10 @@ module TOC Insulation = 1.0, WindResistance = 1.0, WaterResistance = 1.0, + CanHaveHoles = false, + Icon = armProsthetic, WorldStaticModel = prostheticArm, - CanHaveHoles = false, } item Prost_NormalArm_R { @@ -82,9 +88,10 @@ module TOC Insulation = 1.0, WindResistance = 1.0, WaterResistance = 1.0, + CanHaveHoles = false, + Icon = armProsthetic, WorldStaticModel = prostheticArm, - CanHaveHoles = false, } } \ No newline at end of file