Reorganizing

media/lua/client/TOC/Handlers/AmputationHandler.lua

@@ -1,8 +1,7 @@
-local ModDataHandler = require("Handlers/TOC_ModDataHandler")
-local StaticData = require("TOC_StaticData")
-local ItemsHandler = require("Handlers/TOC_ItemsHandler")
-local PlayerHandler = require("Handlers/TOC_PlayerHandler")
-
+local ModDataHandler = require("TOC/Handlers/ModDataHandler")
+local ItemsHandler = require("TOC/Handlers/ItemsHandler")
+local PlayerHandler = require("TOC/Handlers/PlayerHandler")
+local StaticData = require("TOC/StaticData")
 ---------------------------
 
 -- TODO Add Bandages, Torniquet, etc.

media/lua/client/TOC/Handlers/ItemsHandler.lua

@@ -1,5 +1,5 @@
-local StaticData = require("TOC_StaticData")
-local CommonMethods = require("TOC_Common")
+local StaticData = require("TOC/StaticData")
+local CommonMethods = require("TOC/CommonMethods")
 
 ---------------------------
 

media/lua/client/TOC/Handlers/ModDataHandler.lua

@@ -1,4 +1,4 @@
-local StaticData = require("TOC_StaticData")
+local StaticData = require("TOC/StaticData")
 
 ----------------
 ---@alias partData { isCut : boolean?, isInfected : boolean?, isOperated : boolean?, isCicatrized : boolean?, isCauterized : boolean?, isVisible : boolean?, cicatrizationTime : number }

media/lua/client/TOC/Handlers/PlayerHandler.lua

@@ -1,6 +1,6 @@
-local ModDataHandler = require("Handlers/TOC_ModDataHandler")
-local CommonMethods = require("TOC_Common")
-local StaticData = require("TOC_StaticData")
+local ModDataHandler = require("TOC/Handlers/ModDataHandler")
+local CommonMethods = require("TOC/CommonMethods")
+local StaticData = require("TOC/StaticData")
 -----------
 
 -- TODO We should instantiate this anyway if we want to keep track of cut limbs here. Doing so, we would be able to handle other players too
@@ -20,7 +20,7 @@ local PlayerHandler = {}
 ---@param playerObj IsoPlayer
 ---@param isForced boolean?
 function PlayerHandler.InitializePlayer(_, playerObj, isForced)
-    PlayerHandler.modDataHandler = ModDataHandler:new(playerObj)
+    PlayerHandler.modDataHandler = ModDataHandler:new(playerObj)        -- TODO This isn't gonna work for MP purposes
     PlayerHandler.modDataHandler:setup(isForced)
     PlayerHandler.playerObj = playerObj
 
@@ -37,7 +37,7 @@ function PlayerHandler.InitializePlayer(_, playerObj, isForced)
     -- Since isForced is used to reset an existing player data, we're gonna clean their ISHealthPanel table too
     if isForced then
         ISHealthPanel.highestAmputations = {}
-        local ItemsHandler = require("Handlers/TOC_ItemsHandler")
+        local ItemsHandler = require("TOC/Handlers/ItemsHandler")
         ItemsHandler.DeleteAllOldAmputationItems(playerObj)
     end
 end
@@ -62,12 +62,12 @@ end
 ---@param limbName string
 function PlayerHandler.AddLocalAmputatedLimb(limbName)
     print("TOC: added " .. limbName .. " to known amputated limbs")
-    table.insert(PlayerHandler.amputatedLimbs, limbName)
+    table.insert(PlayerHandler.amputatedLimbs, limbName)        -- TODO This should be player specific, not generic
 end
 
 --* Getters *--
 
----Get a table with the strings of the amputated limbs
+---Get a table with the strings of the cached amputated limbs
 ---@return table
 function PlayerHandler.GetAmputatedLimbs()
     return PlayerHandler.amputatedLimbs or {}

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

@@ -1,5 +1,5 @@
-local CommonMethods = require("TOC_Common")
-local PlayerHandler = require("Handlers/TOC_PlayerHandler")
+local CommonMethods = require("TOC/CommonMethods")
+local PlayerHandler = require("TOC/Handlers/PlayerHandler")
 
 -------------------------
 

media/lua/client/TOC/Main.lua

@@ -1,4 +1,4 @@
-local PlayerHandler = require("Handlers/TOC_PlayerHandler")
+local PlayerHandler = require("TOC/Handlers/PlayerHandler")
 
 
 ------------------

media/lua/client/TOC/Test.lua

@@ -2,7 +2,7 @@ if not getActivatedMods():contains("TEST_FRAMEWORK") or not isDebugEnabled() the
 local TestFramework = require("TestFramework/TestFramework")
 local TestUtils = require("TestFramework/TestUtils")
 
-local PlayerHandler = require("Handlers/TOC_PlayerHandler")
+local PlayerHandler = require("TOC/Handlers/PlayerHandler")
 local AmputationHandler = require("Handlers/TOC_AmputationHandler")
 
 

media/lua/client/TOC/UI/CutLimbInteractions.lua

@@ -1,7 +1,7 @@
 local BaseHandler = require("UI/TOC_HealthPanelBaseHandler")
 local CutLimbAction = require("TimedActions/TOC_CutLimbAction")
-local StaticData = require("TOC_StaticData")
-local ModDataHandler = require("Handlers/TOC_ModDataHandler")
+local StaticData = require("TOC/StaticData")
+local ModDataHandler = require("TOC/Handlers/ModDataHandler")
 
 ---------------------
 

media/lua/client/TOC/UI/HealthPanel.lua

@@ -1,6 +1,6 @@
-local PlayerHandler = require("Handlers/TOC_PlayerHandler")
-local StaticData = require("TOC_StaticData")
-local CommonMethods = require("TOC_Common")
+local PlayerHandler = require("TOC/Handlers/PlayerHandler")
+local StaticData = require("TOC/StaticData")
+local CommonMethods = require("TOC/CommonMethods")
 
 ---@diagnostic disable: duplicate-set-field
 local CutLimbHandler = require("UI/TOC_CutLimbInteractions")

media/lua/client/TOC/UI/SurgeryInteractions.lua

@@ -1,6 +1,5 @@
-local PlayerHandler = require("Handlers/TOC_PlayerHandler")
-local StaticData = require("TOC_StaticData")
-local ModDataHandler = require("Handlers/TOC_ModDataHandler")
+local PlayerHandler = require("TOC/Handlers/PlayerHandler")
+local ModDataHandler = require("TOC/Handlers/ModDataHandler")
 
 ---------------
 

media/lua/server/TOC/ModData.lua

@@ -0,0 +1,8 @@
+-- Mh how do I require it from another folder?
+
+local TOCData = {}
+
+
+-- function TOCData.Init()
+--     ModData.getOrCreate(StaticData.MOD_NAME)
+-- end