diff --git a/.gitignore b/.gitignore index 2f2fd17..9e9435e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,2 @@ .vscode -media mod.info diff --git a/42/ui/Female/ForeArm_L.png b/42/media/ui/Female/ForeArm_L.png similarity index 100% rename from 42/ui/Female/ForeArm_L.png rename to 42/media/ui/Female/ForeArm_L.png diff --git a/42/ui/Female/ForeArm_R.png b/42/media/ui/Female/ForeArm_R.png similarity index 100% rename from 42/ui/Female/ForeArm_R.png rename to 42/media/ui/Female/ForeArm_R.png diff --git a/42/ui/Female/Hand_L.png b/42/media/ui/Female/Hand_L.png similarity index 100% rename from 42/ui/Female/Hand_L.png rename to 42/media/ui/Female/Hand_L.png diff --git a/42/ui/Female/Hand_R.png b/42/media/ui/Female/Hand_R.png similarity index 100% rename from 42/ui/Female/Hand_R.png rename to 42/media/ui/Female/Hand_R.png diff --git a/42/ui/Female/UpperArm_L.png b/42/media/ui/Female/UpperArm_L.png similarity index 100% rename from 42/ui/Female/UpperArm_L.png rename to 42/media/ui/Female/UpperArm_L.png diff --git a/42/ui/Female/UpperArm_R.png b/42/media/ui/Female/UpperArm_R.png similarity index 100% rename from 42/ui/Female/UpperArm_R.png rename to 42/media/ui/Female/UpperArm_R.png diff --git a/42/ui/Male/ForeArm_L.png b/42/media/ui/Male/ForeArm_L.png similarity index 100% rename from 42/ui/Male/ForeArm_L.png rename to 42/media/ui/Male/ForeArm_L.png diff --git a/42/ui/Male/ForeArm_R.png b/42/media/ui/Male/ForeArm_R.png similarity index 100% rename from 42/ui/Male/ForeArm_R.png rename to 42/media/ui/Male/ForeArm_R.png diff --git a/42/ui/Male/Hand_L.png b/42/media/ui/Male/Hand_L.png similarity index 100% rename from 42/ui/Male/Hand_L.png rename to 42/media/ui/Male/Hand_L.png diff --git a/42/ui/Male/Hand_R.png b/42/media/ui/Male/Hand_R.png similarity index 100% rename from 42/ui/Male/Hand_R.png rename to 42/media/ui/Male/Hand_R.png diff --git a/42/ui/Male/UpperArm_L.png b/42/media/ui/Male/UpperArm_L.png similarity index 100% rename from 42/ui/Male/UpperArm_L.png rename to 42/media/ui/Male/UpperArm_L.png diff --git a/42/ui/Male/UpperArm_R.png b/42/media/ui/Male/UpperArm_R.png similarity index 100% rename from 42/ui/Male/UpperArm_R.png rename to 42/media/ui/Male/UpperArm_R.png diff --git a/42/media/ui/test_pattern.png b/42/media/ui/test_pattern.png new file mode 100644 index 0000000..e35f5f4 Binary files /dev/null and b/42/media/ui/test_pattern.png differ diff --git a/common/media/lua/client/TOC/Controllers/LimitActionsController.lua b/common/media/lua/client/TOC/Controllers/LimitActionsController.lua index 0482471..3962f62 100644 --- a/common/media/lua/client/TOC/Controllers/LimitActionsController.lua +++ b/common/media/lua/client/TOC/Controllers/LimitActionsController.lua @@ -127,6 +127,9 @@ function ISBaseTimedAction:perform() local dcInst = DataController.GetInstance() if not dcInst:getIsAnyLimbCut() then return end + + -- First check level of perks. if already at max, skip + LocalPlayerController.playerObj:getPerkLevel(perkAmp) local amputatedLimbs = CachedDataHandler.GetAmputatedLimbs(LocalPlayerController.username) local xp = self.maxTime / 100 @@ -139,7 +142,14 @@ function ISBaseTimedAction:perform() -- 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], xp) + + + -- TODO Test it + local xpObj = LocalPlayerController.playerObj:getXp() + if xpObj:getLevel() < 10 then + xpObj:AddXP(Perks["Side_" .. side], xp) + end + if not dcInst:getIsCicatrized(limbName) and dcInst:getIsProstEquipped(limbName) then TOC_DEBUG.print("Trying for bleed, player met the criteria") LocalPlayerController.TryRandomBleed(self.character, limbName)