Merge pull request #72 from ZioPao/dev

v2.0.11

media/lua/client/TOC/Controllers/ItemsController.lua

@@ -17,10 +17,12 @@ ItemsController.Player = {}
 ---@return number
 ---@private
 function ItemsController.Player.GetAmputationTexturesIndex(playerObj, isCicatrized)
+    -- FIX Broken
     local textureString = playerObj:getHumanVisual():getSkinTexture()
     local isHairy = textureString:sub(-1) == "a"
 
-    local matchedIndex = tonumber(textureString:match("%d$")) or 0
+    local matchedIndex = tonumber(textureString:match("%d%d"))      -- it must always be at least 1
+    TOC_DEBUG.print("Texture string: " .. tostring(textureString))
 
     if isHairy then
         matchedIndex = matchedIndex + 5
@@ -30,7 +32,7 @@ function ItemsController.Player.GetAmputationTexturesIndex(playerObj, isCicatriz
         matchedIndex = matchedIndex + (isHairy and 5 or 10) -- We add 5 is it's the texture, else 10
     end
 
-    TOC_DEBUG.print("isCicatrized= " .. tostring(isCicatrized))
+    TOC_DEBUG.print("isCicatrized = " .. tostring(isCicatrized))
     TOC_DEBUG.print("Amputation Texture Index: " .. tostring(matchedIndex))
     return matchedIndex - 1
 end

media/lua/client/TOC/Controllers/LocalPlayerController.lua

@@ -149,7 +149,11 @@ LocalPlayerController.hasBeenDamaged = false
 function LocalPlayerController.HandleDamage(character)
     --TOC_DEBUG.print("Player got hit!")
     -- TOC_DEBUG.print(damageType)
-    if character ~= getPlayer() then return end
+    if character ~= getPlayer() then
+        -- Disable lock before doing anything else
+        LocalPlayerController.hasBeenDamaged = false
+        return
+    end
     local bd = character:getBodyDamage()
     local dcInst = DataController.GetInstance()
     local modDataNeedsUpdate = false
@@ -198,17 +202,13 @@ function LocalPlayerController.HandleDamage(character)
     LocalPlayerController.hasBeenDamaged = false
 end
 
----Setup HandleDamage, triggered by OnPlayerGetDamage
+---Setup HandleDamage, triggered by OnPlayerGetDamage. To prevent a spam caused by this awful event, we use a bool lock
 ---@param character IsoPlayer|IsoGameCharacter
 ---@param damageType string
 ---@param damageAmount number
 function LocalPlayerController.OnGetDamage(character, damageType, damageAmount)
-    -- TODO Check if other players in the online triggers this
-
     if LocalPlayerController.hasBeenDamaged == false then
         -- Start checks
-
-        -- TODO Add a timer before we can re-enable this bool?
         LocalPlayerController.hasBeenDamaged = true
         LocalPlayerController.HandleDamage(character)
     end

media/lua/client/TOC/Handlers/CachedDataHandler.lua

@@ -133,16 +133,21 @@ function CachedDataHandler.CalculateBothHandsFeasibility()
     CachedDataHandler.CalculateHandFeasibility("Hand_L")
     CachedDataHandler.CalculateHandFeasibility("Hand_R")
     local interactStr = "Interact"
+
+    if CachedDataHandler.interactKey == nil or CachedDataHandler.interactKey == 0 then
+        CachedDataHandler.interactKey = getCore():getKey(interactStr)
+    end
+
+
+
     if not CachedDataHandler.GetBothHandsFeasibility() then
         TOC_DEBUG.print("Disabling interact key")
-
-        -- Cache the current key
-        CachedDataHandler.interactKey = getCore():getKey(interactStr)
+        TOC_DEBUG.print("Cached current key for interact: " .. tostring(CachedDataHandler.interactKey))
         getCore():addKeyBinding(interactStr, Keyboard.KEY_NONE)
     else
         TOC_DEBUG.print("Re-enabling interact key")
+        TOC_DEBUG.print("Cached current key for interact: " .. tostring(CachedDataHandler.interactKey))
 
-        if not CachedDataHandler.interactKey then CachedDataHandler.interactKey = getCore():getKey(interactStr) end
         getCore():addKeyBinding(interactStr, CachedDataHandler.interactKey)
     end
 end

media/lua/client/TOC/Main.lua

@@ -6,7 +6,7 @@ require("TOC/Events")
 
 ---@class Main
 local Main = {
-    _version = "2.0.10"
+    _version = "2.0.11"
 }
 
 function Main.Start()
@@ -58,8 +58,9 @@ function Main.WipeData(player)
 
 
     -- Let's wipe the instance too just to be sure
-    local DataController = require("TOC/Controllers/DataController")
-    DataController.DestroyInstance(username)
+    -- TODO This can break things I guess
+    --local DataController = require("TOC/Controllers/DataController")
+    --DataController.DestroyInstance(username)
 
 end
 

mod.info

@@ -4,5 +4,5 @@ description=You've been bitten. You have only two choices.
 id=TheOnlyCure
 icon=icon.png
 url=https://github.com/ZioPao/The-Only-Cure
-modversion=2.0.10
+modversion=2.0.11
 pzversion=41.65