Merge pull request #37 from ZioPao/dev

v2.0.3

media/lua/client/TOC/Controllers/DataController.lua

@@ -57,6 +57,7 @@ function DataController:setup(key)
     ---@type tocModDataType
     self.tocData = {
         -- Generic stuff that does not belong anywhere else
+        isInitializing = true,
         isIgnoredPartInfected = false,
         isAnyLimbCut = false,
         limbs = {},
@@ -86,9 +87,16 @@ function DataController:setup(key)
         }
     end
 
-    -- Add it to global mod data
+    -- Add it to client global mod data
     ModData.add(key, self.tocData)
 
+    -- Sync with the server
+    self:apply()
+
+    -- -- Disable lock
+    -- self.tocData.isInitializing = false
+    -- ModData.add(key, self.tocData)
+
 end
 
 ---In case of desync between the table on ModData and the table here
@@ -100,7 +108,7 @@ function DataController:applyOnlineData(tocData)
 end
 
 ---@param key string
-function DataController:loadLocalData(key)
+function DataController:tryLoadLocalData(key)
     self.tocData = ModData.get(key)
 
     --TOC_DEBUG.printTable(self.tocData)
@@ -389,6 +397,7 @@ function DataController.ReceiveData(key, data)
     -- TODO Add update from server scenario
 
     if handler.isResetForced then
+        TOC_DEBUG.print("Forced reset")
         handler:setup(key)
     elseif data then
         if data.isUpdateFromServer then
@@ -396,7 +405,8 @@ function DataController.ReceiveData(key, data)
         end
         handler:applyOnlineData(data)
     elseif username == getPlayer():getUsername() then
-        handler:loadLocalData(key)
+        TOC_DEBUG.print("loading local data")
+        handler:tryLoadLocalData(key)
     end
 
 
@@ -436,7 +446,7 @@ Events.OnReceiveGlobalModData.Add(DataController.ReceiveData)
 --- SP Only initialization
 ---@param key string
 function DataController:initSinglePlayer(key)
-    self:loadLocalData(key)
+    self:tryLoadLocalData(key)
     if self.tocData == nil or self.isResetForced then
         self:setup(key)
     end

media/lua/client/TOC/Controllers/LimitActionsController.lua

@@ -15,8 +15,12 @@ local StaticData = require("TOC/StaticData")
 -- a prosthesis on, that can trigger random bleeds.
 
 local function CheckHandFeasibility(limbName)
+    TOC_DEBUG.print("Checking hand feasibility: " .. limbName)
     local dcInst = DataController.GetInstance()
-    return not dcInst:getIsCut(limbName) or dcInst:getIsProstEquipped(limbName)
+
+    local isFeasible = not dcInst:getIsCut(limbName) or dcInst:getIsProstEquipped(limbName)
+    TOC_DEBUG.print("isFeasible: " .. tostring(isFeasible))
+    return isFeasible
 end
 
 
@@ -107,6 +111,8 @@ end
 ---A recreation of the original method, but with amputations in mind
 ---@param dcInst DataController
 function ISEquipWeaponAction:performWithAmputation(dcInst)
+
+    TOC_DEBUG.print("running ISEquipWeaponAction performWithAmputation")
     local hand = nil
     local otherHand = nil
     local getMethodFirst = nil
@@ -130,6 +136,10 @@ function ISEquipWeaponAction:performWithAmputation(dcInst)
         setMethodSecond = self.character.setSecondaryHandItem
     end
 
+    local isFirstValid = CheckHandFeasibility(hand)
+    local isSecondValid = CheckHandFeasibility(otherHand)
+
+
     if not self.twoHands then
         if getMethodFirst(self.character) and getMethodFirst(self.character):isRequiresEquippedBothHands() then
             setMethodFirst(self.character, nil)
@@ -145,10 +155,10 @@ function ISEquipWeaponAction:performWithAmputation(dcInst)
             setMethodSecond(self.character, nil)
             -- TODO We should use the CachedData indexable instead of dcInst
 
-            if not dcInst:getIsCut(hand) then
+            if isFirstValid then
                 setMethodSecond(self.character, self.item)
                 -- Check other HAND!
-            elseif not dcInst:getIsCut(otherHand) then
+            elseif isSecondValid then
                 setMethodFirst(self.character, self.item)
             end
         end
@@ -156,13 +166,10 @@ function ISEquipWeaponAction:performWithAmputation(dcInst)
         setMethodFirst(self.character, nil)
         setMethodSecond(self.character, nil)
 
-
-        local isFirstValid = CheckHandFeasibility(hand)
-        local isSecondValid = CheckHandFeasibility(otherHand)
         -- TOC_DEBUG.print("First Hand: " .. tostring(hand))
-        -- TOC_DEBUG.print("Prost Group: " .. tostring(prostGroup))
+        -- --TOC_DEBUG.print("Prost Group: " .. tostring(prostGroup))
         -- TOC_DEBUG.print("Other Hand: " .. tostring(otherHand))
-        -- TOC_DEBUG.print("Other Prost Group: " .. tostring(otherProstGroup))
+        -- --TOC_DEBUG.print("Other Prost Group: " .. tostring(otherProstGroup))
 
         -- TOC_DEBUG.print("isPrimaryHandValid: " .. tostring(isFirstValid))
         -- TOC_DEBUG.print("isSecondaryHandValid: " .. tostring(isSecondValid))

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

@@ -354,10 +354,20 @@ function LocalPlayerController.DropItemsAfterAmputation(limbName)
             end
         end
     end
+
+    -- TODO Consider 2 handed weapons too
+
+    -- equipped items too
+    if side == "R" then
+        pl:setPrimaryHandItem(nil)
+    elseif side == "L" then
+        pl:setSecondaryHandItem(nil)
+    end
+
 end
 
 Events.OnAmputatedLimb.Add(LocalPlayerController.DropItemsAfterAmputation)
-
+Events.OnProsthesisUnequipped.Add(LocalPlayerController.DropItemsAfterAmputation)
 
 
 

media/lua/client/TOC/Events.lua

@@ -1,3 +1,4 @@
 --* Setup Events *--
 LuaEventManager.AddEvent("OnAmputatedLimb")     --Triggered when a limb has been amputated
+LuaEventManager.AddEvent("OnProsthesisUnequipped")
 LuaEventManager.AddEvent("OnReceivedTocData")   -- Triggered when TOC data is ready

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

@@ -111,6 +111,8 @@ end
 
 
 
+
+
 --* Hand feasibility caching *--
 CachedDataHandler.handFeasibility = {}
 

media/lua/client/TOC/Handlers/ProsthesisHandler.lua

@@ -70,7 +70,6 @@ function ProsthesisHandler.CheckIfEquippable(fullType)
     return false
 end
 
-
 ---Handle equipping or unequipping prosthetics
 ---@param item InventoryItem
 ---@param isEquipping boolean
@@ -133,8 +132,6 @@ function ISClothingExtraAction:isValid()
     return HandleProsthesisValidation(testItem, isEquippable)
 end
 
-
-
 --[[
     Horrendous workaround
 
@@ -161,7 +158,6 @@ function ISClothingExtraAction:perform()
     if isProst then
         group:setMultiItem("TOC_ArmProst", true)
     end
-
 end
 
 local og_ISUnequipAction_perform = ISUnequipAction.perform
@@ -176,8 +172,15 @@ function ISUnequipAction:perform()
 
     if isProst then
         group:setMultiItem("TOC_ArmProst", true)
+
+        -- we need to fetch the limbname associated to the prosthesis
+        local side = CommonMethods.GetSide(self.item:getFullType())
+        local highestAmputatedLimbs = CachedDataHandler.GetHighestAmputatedLimbs(getPlayer():getUsername())
+        if highestAmputatedLimbs then
+            local hal = highestAmputatedLimbs[side]
+            triggerEvent("OnProsthesisUnequipped", hal)
+        end
     end
 end
 
-
 return ProsthesisHandler

media/lua/server/TOC/ServerDataHandler.lua

@@ -29,12 +29,11 @@ function ServerDataHandler.AddTable(key, table)
     --TOC_DEBUG.printTable(table)
 
     -- Set that the data has been modified and it's updated on the server
-    table.isUpdateFromServer = true
+    table.isUpdateFromServer = true -- FIX this is useless as of now
 
     ModData.add(key, table)     -- Add it to the server mod data
     ServerDataHandler.modData[key] = table
 
-
     -- Since this could be triggered by a different client than the one referenced in the key, we're gonna
     -- apply the changes back to the key client again to be sure that everything is in sync
     local username = CommandsData.GetUsername(key)

media/lua/shared/TOC/StaticData.lua

@@ -2,7 +2,7 @@
 ---@alias limbsTable {Hand_L : partDataType, ForeArm_L : partDataType, UpperArm_L : partDataType, Hand_R : partDataType, ForeArm_R : partDataType, UpperArm_R : partDataType }
 ---@alias prosthesisData {isProstEquipped : boolean, prostFactor : number }
 ---@alias prosthesesTable {Top_L : prosthesisData, Top_R : prosthesisData }     -- TODO add Bottom_L and Bottom_R
----@alias tocModDataType { limbs : limbsTable, prostheses : prosthesesTable, isIgnoredPartInfected : boolean, isAnyLimbCut : boolean, isUpdateFromServer : boolean }
+---@alias tocModDataType { limbs : limbsTable, prostheses : prosthesesTable, isIgnoredPartInfected : boolean, isAnyLimbCut : boolean, isUpdateFromServer : boolean, isInitializing : boolean}
 ---------------------------
 
 

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.2
+modversion=2.0.3
 pzversion=41.65