HRiggs/The-Only-Cure
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed zombie amputations not enabling

Browse Source
This commit is contained in:
ZioPao
2024-08-17 16:47:28 +02:00
parent d1f63ab55f
commit 751e36cba7
5 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.vscode/tasks.json vendored
View File

@@ -10,10 +10,10 @@
"command": "python ${config:zomboid_user_folder}/PaosCrap/make_workshop_pack.py picch ${workspaceFolderBasename}", "command": "python ${config:zomboid_user_folder}/PaosCrap/make_workshop_pack.py picch ${workspaceFolderBasename}",
}, },
{ {
"label": "Upload mod", "label": "Bump Mod Version",
"type": "shell", "type": "shell",
"options": {"statusbar": {"label": "$(arrow-up) Upload Mod"}}, "options": {"statusbar": {"label": "$(arrow-up) Bump Mod Version"}},
"command": "python ${config:zomboid_user_folder}/PaosCrap/upload_mod_to_steam/main.py ${config:mod_id} ${config:zomboid_user_folder}/Workshop/${workspaceFolderBasename}", "command": "python ${config:zomboid_user_folder}/PaosCrap/bump_version.py media/lua/client/TOC/Main.lua",
}, },
{ {
"label": "Run Zomboid Debug No Steam", "label": "Run Zomboid Debug No Steam",

3
media/lua/client/TOC/Controllers/ItemsController.lua
View File

@@ -156,6 +156,9 @@ function ItemsController.Zombie.SpawnAmputationItem(zombie, amputationFullType)
-- Spawn the item too in the inventory to keep track of stuff this way. It's gonna get deleted when we reload the game -- Spawn the item too in the inventory to keep track of stuff this way. It's gonna get deleted when we reload the game
local zombieInv = zombie:getInventory() local zombieInv = zombie:getInventory()
zombieInv:AddItem(amputationFullType) zombieInv:AddItem(amputationFullType)
-- TODO Remove objects in that part of the body to prevent items floating in mid air
end end
function ItemsController.Zombie.GetAmputationTexturesIndex(zombie) function ItemsController.Zombie.GetAmputationTexturesIndex(zombie)

2
media/lua/client/TOC/Main.lua
View File

@@ -6,7 +6,7 @@ require("TOC/Events")
---@class Main ---@class Main
local Main = { local Main = {
_version = "2.1" _version = "2.1.1"
} }
function Main.Start() function Main.Start()

8
media/lua/client/TOC/Zombies/ZombiesAmputation.lua
View File

@@ -1,6 +1,3 @@
if not SandboxVars.TOC.EnableZombieAmputations then return end
require "lua_timers" require "lua_timers"
local ItemsController = require("TOC/Controllers/ItemsController") local ItemsController = require("TOC/Controllers/ItemsController")
@@ -73,6 +70,8 @@ local bloodAmount = 10
---@param zombie IsoZombie ---@param zombie IsoZombie
---@param handWeapon HandWeapon ---@param handWeapon HandWeapon
local function HandleZombiesAmputations(player, zombie, handWeapon, damage) local function HandleZombiesAmputations(player, zombie, handWeapon, damage)
if not SandboxVars.TOC.EnableZombieAmputations then return end
if not instanceof(zombie, "IsoZombie") or not instanceof(player, "IsoPlayer") then return end if not instanceof(zombie, "IsoZombie") or not instanceof(player, "IsoPlayer") then return end
if player ~= getPlayer() then return end if player ~= getPlayer() then return end
@@ -109,6 +108,7 @@ Events.OnWeaponHitCharacter.Add(HandleZombiesAmputations)
local localOnlyZombiesMD local localOnlyZombiesMD
local function SetupZombiesModData() local function SetupZombiesModData()
if not SandboxVars.TOC.EnableZombieAmputations then return end
local zombieKey = CommandsData.GetZombieKey() local zombieKey = CommandsData.GetZombieKey()
localOnlyZombiesMD = ModData.getOrCreate(zombieKey) localOnlyZombiesMD = ModData.getOrCreate(zombieKey)
end end
@@ -118,6 +118,8 @@ Events.OnInitGlobalModData.Add(SetupZombiesModData)
---@param zombie IsoZombie ---@param zombie IsoZombie
local function ReapplyAmputation(zombie) local function ReapplyAmputation(zombie)
if not SandboxVars.TOC.EnableZombieAmputations then return end
local pID = GetZombieID(zombie) local pID = GetZombieID(zombie)
if localOnlyZombiesMD[pID] ~= nil then if localOnlyZombiesMD[pID] ~= nil then

2
mod.info
View File

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