Merge pull request #113 from ZioPao/dev

v2.1.1
This commit is contained in:
Pao
2024-08-17 16:48:59 +02:00
committed by GitHub
12 changed files with 112 additions and 8 deletions

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",

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)

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()

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

View File

@@ -0,0 +1,29 @@
ContextMenu_FR = {
ContextMenu_Amputate = "Amputer",
ContextMenu_Amputate_Bandage = "Amputer et bander",
ContextMenu_Amputate_Stitch = "Amputer et suturer",
ContextMenu_Amputate_Stitch_Bandage = "Amputer, suturer et bander",
ContextMenu_Cauterize = "Cautériser",
ContextMenu_Limb_Hand_L = "Main gauche",
ContextMenu_Limb_ForeArm_L = "Avant-bras gauche",
ContextMenu_Limb_UpperArm_L = "Bras supérieur gauche",
ContextMenu_Limb_Hand_R = "Main droite",
ContextMenu_Limb_ForeArm_R = "Avant-bras droit",
ContextMenu_Limb_UpperArm_R = "Bras supérieur droit",
ContextMenu_InstallProstRight = "Installer une prothèse sur le bras droit",
ContextMenu_InstallProstLeft = "Installer une prothèse sur le bras gauche",
ContextMenu_PutTourniquetArmLeft = "Mettre un garrot sur le bras gauche",
ContextMenu_PutTourniquetLegL = "Mettre un garrot sur la jambe gauche",
ContextMenu_PutTourniquetArmRight = "Mettre un garrot sur le bras droit",
ContextMenu_PutTourniquetLegR = "Mettre un garrot sur la jambe droite",
ContextMenu_CleanWound = "Nettoyer la plaie",
ContextMenu_Admin_TOC = "TOC",
ContextMenu_Admin_ResetTOC = "Réinitialiser les amputations",
ContextMenu_Admin_ForceAmputation = "Forcer l'amputation",
}

View File

@@ -0,0 +1,18 @@
IG_UI_FR = {
IGUI_perks_Amputations = "Amputations",
IGUI_perks_Side_R = "Côté droit",
IGUI_perks_Side_L = "Côté gauche",
IGUI_perks_Prosthesis = "Prothèse",
IGUI_perks_ProstFamiliarity = "Familiarité",
IGUI_ItemCat_Prosthesis = "Prothèse",
IGUI_ItemCat_Surgery = "Chirurgie",
IGUI_ItemCat_Amputation = "Amputation",
IGUI_HealthPanel_Cicatrization = "Cicatrisation",
IGUI_HealthPanel_Cicatrized = "Cicatrisé",
IGUI_HealthPanel_Cauterized = "Cautérisé",
IGUI_HealthPanel_WoundDirtyness = "Saleté de la plaie",
IGUI_HealthPanel_ProstEquipped = "Prothèse équipée",
}

View File

@@ -0,0 +1,11 @@
ItemName_FR = {
ItemName_TOC.Surg_Arm_Tourniquet_L = "Garrot",
ItemName_TOC.Surg_Arm_Tourniquet_R = "Garrot",
ItemName_TOC.Prost_NormalArm_L = "Bras prothétique",
ItemName_TOC.Prost_NormalArm_R = "Bras prothétique",
ItemName_TOC.Prost_HookArm_L = "Bras prothétique - Crochet",
ItemName_TOC.Prost_HookArm_R = "Bras prothétique - Crochet",
}

View File

@@ -0,0 +1,5 @@
Recipes_FR = {
Recipe_Craft_Prosthetic_Arm = "Fabriquer un bras prothétique",
Recipe_Craft_Prosthetic_Hook = "Fabriquer un crochet prothétique",
}

View File

@@ -0,0 +1,10 @@
Sandbox_FR = {
Sandbox_TOC = "Le Seul Remède",
Sandbox_TOC_CicatrizationSpeed = "Vitesse de cicatrisation",
Sandbox_TOC_WoundDirtynessMultiplier = "Multiplicateur de saleté de la plaie",
Sandbox_TOC_SurgeonAbilityImportance = "Importance de la compétence du chirurgien",
Sandbox_TOC_EnableZombieAmputations = "Activer les amputations de zombies",
Sandbox_TOC_ZombieAmputationDamageThreshold = "Seuil de dégâts pour amputations de zombies",
Sandbox_TOC_ZombieAmputationDamageChance = "Probabilité d'amputations de zombies",
}

View File

@@ -0,0 +1,10 @@
Tooltip_FR = {
Tooltip_Surgery_CantCauterize = "Vous ne pouvez pas cautériser la plaie",
Tooltip_Surgery_And = " et ",
Tooltip_Surgery_TempTooLow = "La température est encore trop basse",
Tooltip_Surgery_Coward = "Vous n'avez pas le courage de le faire",
Tooltip_Surgery_LimbNotFree = "Vous devez d'abord retirer la prothèse",
}

View File

@@ -0,0 +1,16 @@
UI_FR = {
UI_trait_Amputee_Hand = "Main gauche amputée",
UI_trait_Amputee_Hand_desc = "",
UI_trait_Amputee_ForeArm = "Avant-bras gauche amputé",
UI_trait_Amputee_ForeArm_desc = "",
UI_trait_Amputee_UpperArm = "Bras supérieur gauche amputé",
UI_trait_Amputee_UpperArm_desc = "",
UI_trait_Insensitive = "Insensible",
UI_trait_Insensitive_desc = "",
UI_Say_CantEquip = "Je ne peux pas l'équiper comme ça..."
}

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