diff --git a/.vscode/settings.json b/.vscode/settings.json index a95b2c5..03366c8 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -11,14 +11,26 @@ "Lua.diagnostics.globals": [ "ModOptions", "zombie", - "_" + "_", ], "Lua.format.defaultConfig": { "indent_style": "space", "indent_size": "2" }, "Lua.workspace.library": [ - "C:\\Users\\picch\\Zomboid\\Umbrella", - "C:\\Users\\picch\\Zomboid\\mods\\The-Only-Cure" + "${addons}/umbrella-unstable/module/library" ], + "Lua.runtime.version": "Lua 5.1", + "Lua.runtime.path": [ + "?.lua", + "?/init.lua", + "server/?.lua" + ], + "Lua.completion.requireSeparator": "/", + "Lua.runtime.builtin": { + "debug": "disable", + "io": "disable", + "package": "disable" + }, + "Lua.workspace.checkThirdParty": false } \ No newline at end of file diff --git a/common/media/lua/client/TOC/Controllers/LimitActionsController.lua b/common/media/lua/client/TOC/Controllers/LimitActionsController.lua index e80f0fd..a7bb67e 100644 --- a/common/media/lua/client/TOC/Controllers/LimitActionsController.lua +++ b/common/media/lua/client/TOC/Controllers/LimitActionsController.lua @@ -129,7 +129,7 @@ function ISBaseTimedAction:perform() -- First check level of perks. if already at max, skip - LocalPlayerController.playerObj:getPerkLevel(perkAmp) + -- LocalPlayerController.playerObj:getPerkLevel(perkAmp) -- todo local amputatedLimbs = CachedDataHandler.GetAmputatedLimbs(LocalPlayerController.username) local xp = self.maxTime / 100 @@ -173,7 +173,7 @@ end --* Equipping items overrides *-- local og_ISEquipWeaponAction_isValid = ISEquipWeaponAction.isValid ---Add a condition to check the feasibility of having 2 handed weapons or if both arms are cut off ----@return boolean +---@return boolean? ---@diagnostic disable-next-line: duplicate-set-field function ISEquipWeaponAction:isValid() local isValid = og_ISEquipWeaponAction_isValid(self) diff --git a/common/media/lua/client/TOC/TimedActions/CleanWoundAction.lua b/common/media/lua/client/TOC/TimedActions/CleanWoundAction.lua index 66bc78f..3d306c9 100644 --- a/common/media/lua/client/TOC/TimedActions/CleanWoundAction.lua +++ b/common/media/lua/client/TOC/TimedActions/CleanWoundAction.lua @@ -33,7 +33,7 @@ function CleanWoundAction:new(doctor, otherPlayer, bandage, bodyPart) if doctor:isTimedActionInstant() then o.maxTime = 1 end - if doctor:getAccessLevel() ~= "None" then + if doctor:getAccessLevel() ~= "None" then -- TODO Fix for B42 o.doctorLevel = 10 end return o