From 38fa63324cb34ca641f9846edca7d2970813fd46 Mon Sep 17 00:00:00 2001 From: Pgmbru Date: Tue, 6 Aug 2024 00:05:11 +0100 Subject: [PATCH 1/3] Add Translate FR --- .../shared/Translate/FR/ContextMenu_FR.txt | 29 +++++++++++++++++++ media/lua/shared/Translate/FR/IG_UI_FR.txt | 18 ++++++++++++ media/lua/shared/Translate/FR/ItemName_FR.txt | 11 +++++++ media/lua/shared/Translate/FR/Recipes_FR.txt | 5 ++++ media/lua/shared/Translate/FR/Sandbox_FR.txt | 7 +++++ media/lua/shared/Translate/FR/Tooltip_FR.txt | 10 +++++++ media/lua/shared/Translate/FR/UI_FR.txt | 16 ++++++++++ 7 files changed, 96 insertions(+) create mode 100644 media/lua/shared/Translate/FR/ContextMenu_FR.txt create mode 100644 media/lua/shared/Translate/FR/IG_UI_FR.txt create mode 100644 media/lua/shared/Translate/FR/ItemName_FR.txt create mode 100644 media/lua/shared/Translate/FR/Recipes_FR.txt create mode 100644 media/lua/shared/Translate/FR/Sandbox_FR.txt create mode 100644 media/lua/shared/Translate/FR/Tooltip_FR.txt create mode 100644 media/lua/shared/Translate/FR/UI_FR.txt diff --git a/media/lua/shared/Translate/FR/ContextMenu_FR.txt b/media/lua/shared/Translate/FR/ContextMenu_FR.txt new file mode 100644 index 0000000..3dabea2 --- /dev/null +++ b/media/lua/shared/Translate/FR/ContextMenu_FR.txt @@ -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", +} diff --git a/media/lua/shared/Translate/FR/IG_UI_FR.txt b/media/lua/shared/Translate/FR/IG_UI_FR.txt new file mode 100644 index 0000000..a46405c --- /dev/null +++ b/media/lua/shared/Translate/FR/IG_UI_FR.txt @@ -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", + +} \ No newline at end of file diff --git a/media/lua/shared/Translate/FR/ItemName_FR.txt b/media/lua/shared/Translate/FR/ItemName_FR.txt new file mode 100644 index 0000000..2f453a4 --- /dev/null +++ b/media/lua/shared/Translate/FR/ItemName_FR.txt @@ -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", +} \ No newline at end of file diff --git a/media/lua/shared/Translate/FR/Recipes_FR.txt b/media/lua/shared/Translate/FR/Recipes_FR.txt new file mode 100644 index 0000000..7a55bc2 --- /dev/null +++ b/media/lua/shared/Translate/FR/Recipes_FR.txt @@ -0,0 +1,5 @@ +Recipes_FR = { + Recipe_Craft_Prosthetic_Arm = "Fabriquer un bras prothétique", + Recipe_Craft_Prosthetic_Hook = "Fabriquer un crochet prothétique", + +} \ No newline at end of file diff --git a/media/lua/shared/Translate/FR/Sandbox_FR.txt b/media/lua/shared/Translate/FR/Sandbox_FR.txt new file mode 100644 index 0000000..9716512 --- /dev/null +++ b/media/lua/shared/Translate/FR/Sandbox_FR.txt @@ -0,0 +1,7 @@ +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", + +} \ No newline at end of file diff --git a/media/lua/shared/Translate/FR/Tooltip_FR.txt b/media/lua/shared/Translate/FR/Tooltip_FR.txt new file mode 100644 index 0000000..ed7f1e3 --- /dev/null +++ b/media/lua/shared/Translate/FR/Tooltip_FR.txt @@ -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", + +} \ No newline at end of file diff --git a/media/lua/shared/Translate/FR/UI_FR.txt b/media/lua/shared/Translate/FR/UI_FR.txt new file mode 100644 index 0000000..3df430c --- /dev/null +++ b/media/lua/shared/Translate/FR/UI_FR.txt @@ -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..." + +} \ No newline at end of file From 487e6168013c385c1710b8cf09fd27b069ad8f56 Mon Sep 17 00:00:00 2001 From: Pgmbru Date: Mon, 12 Aug 2024 03:04:07 +0100 Subject: [PATCH 2/3] Update Sandbox_FR.txt Add Translate + Update Sandbox_FR --- media/lua/shared/Translate/FR/Sandbox_FR.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/media/lua/shared/Translate/FR/Sandbox_FR.txt b/media/lua/shared/Translate/FR/Sandbox_FR.txt index 9716512..fca8db1 100644 --- a/media/lua/shared/Translate/FR/Sandbox_FR.txt +++ b/media/lua/shared/Translate/FR/Sandbox_FR.txt @@ -3,5 +3,8 @@ Sandbox_FR = { 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", } \ No newline at end of file From 751e36cba753166ba0e696d41d2ddfe5e97e824b Mon Sep 17 00:00:00 2001 From: ZioPao Date: Sat, 17 Aug 2024 16:47:28 +0200 Subject: [PATCH 3/3] Fixed zombie amputations not enabling --- .vscode/tasks.json | 6 +++--- media/lua/client/TOC/Controllers/ItemsController.lua | 3 +++ media/lua/client/TOC/Main.lua | 2 +- media/lua/client/TOC/Zombies/ZombiesAmputation.lua | 8 +++++--- mod.info | 2 +- 5 files changed, 13 insertions(+), 8 deletions(-) diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 6fe0a36..8f6ce15 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -10,10 +10,10 @@ "command": "python ${config:zomboid_user_folder}/PaosCrap/make_workshop_pack.py picch ${workspaceFolderBasename}", }, { - "label": "Upload mod", + "label": "Bump Mod Version", "type": "shell", - "options": {"statusbar": {"label": "$(arrow-up) Upload Mod"}}, - "command": "python ${config:zomboid_user_folder}/PaosCrap/upload_mod_to_steam/main.py ${config:mod_id} ${config:zomboid_user_folder}/Workshop/${workspaceFolderBasename}", + "options": {"statusbar": {"label": "$(arrow-up) Bump Mod Version"}}, + "command": "python ${config:zomboid_user_folder}/PaosCrap/bump_version.py media/lua/client/TOC/Main.lua", }, { "label": "Run Zomboid Debug No Steam", diff --git a/media/lua/client/TOC/Controllers/ItemsController.lua b/media/lua/client/TOC/Controllers/ItemsController.lua index f539e6c..a4fbf35 100644 --- a/media/lua/client/TOC/Controllers/ItemsController.lua +++ b/media/lua/client/TOC/Controllers/ItemsController.lua @@ -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 local zombieInv = zombie:getInventory() zombieInv:AddItem(amputationFullType) + + + -- TODO Remove objects in that part of the body to prevent items floating in mid air end function ItemsController.Zombie.GetAmputationTexturesIndex(zombie) diff --git a/media/lua/client/TOC/Main.lua b/media/lua/client/TOC/Main.lua index 50d9ecb..8b540bc 100644 --- a/media/lua/client/TOC/Main.lua +++ b/media/lua/client/TOC/Main.lua @@ -6,7 +6,7 @@ require("TOC/Events") ---@class Main local Main = { - _version = "2.1" + _version = "2.1.1" } function Main.Start() diff --git a/media/lua/client/TOC/Zombies/ZombiesAmputation.lua b/media/lua/client/TOC/Zombies/ZombiesAmputation.lua index 191fae2..56adbd4 100644 --- a/media/lua/client/TOC/Zombies/ZombiesAmputation.lua +++ b/media/lua/client/TOC/Zombies/ZombiesAmputation.lua @@ -1,6 +1,3 @@ - -if not SandboxVars.TOC.EnableZombieAmputations then return end - require "lua_timers" local ItemsController = require("TOC/Controllers/ItemsController") @@ -73,6 +70,8 @@ local bloodAmount = 10 ---@param zombie IsoZombie ---@param handWeapon HandWeapon 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 player ~= getPlayer() then return end @@ -109,6 +108,7 @@ Events.OnWeaponHitCharacter.Add(HandleZombiesAmputations) local localOnlyZombiesMD local function SetupZombiesModData() + if not SandboxVars.TOC.EnableZombieAmputations then return end local zombieKey = CommandsData.GetZombieKey() localOnlyZombiesMD = ModData.getOrCreate(zombieKey) end @@ -118,6 +118,8 @@ Events.OnInitGlobalModData.Add(SetupZombiesModData) ---@param zombie IsoZombie local function ReapplyAmputation(zombie) + if not SandboxVars.TOC.EnableZombieAmputations then return end + local pID = GetZombieID(zombie) if localOnlyZombiesMD[pID] ~= nil then diff --git a/mod.info b/mod.info index c3866c7..3ba4d94 100644 --- a/mod.info +++ b/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.1 +modversion=2.1.1 pzversion=41.65