diff --git a/.gitignore b/.gitignore index 600d2d3..5a869cf 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -.vscode \ No newline at end of file +/media \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json index 87aed1a..a2e2a17 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,16 +1,23 @@ { - "todo-tree.tree.scanMode": "workspace", - "mod_id": "3236152598", - "zomboid_user_folder": "C:/Users/picch/Zomboid", - "zomboid_folder": "E:\\Steam\\steamapps\\common\\ProjectZomboid", - "zomboid_server_folder": "E:\\Steam\\steamapps\\common\\Project Zomboid Dedicated Server", - "Lua.diagnostics.globals": [ - "ModOptions", - "zombie", - "_" + "Lua.workspace.library": [ + "${addons}/umbrella-unstable/module/library" ], - "Lua.format.defaultConfig": { - "indent_style": "space", - "indent_size": "2" - } + "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, + "Lua.workspace.ignoreDir": [ + ".vscode", + "dev_stuff", + "workshop_files" + ] } \ No newline at end of file diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 8f6ce15..533f4fe 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -7,73 +7,109 @@ "label": "Create Workshop folder", "type": "shell", "options": {"statusbar": {"label": "$(combine) Assemble Mod"}}, - "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": "Create Workshop folder", + "type": "shell", + "options": {"statusbar": {"label": "$(combine) Assemble Mod (B41 ONLY)"}}, + "command": "python ${config:zomboid_user_folder}/PaosCrap/make_workshop_pack_b41.py \"picch\" \"${workspaceFolderBasename}\"", + }, + { + "label": "Create Workshop folder", + "type": "shell", + "options": {"statusbar": {"label": "$(combine) Assemble Mod (Test)"}}, + "command": "python ${config:zomboid_user_folder}/PaosCrap/make_workshop_pack.py \"picch\" \"${workspaceFolderBasename}\" \"test\"", }, { "label": "Bump Mod Version", "type": "shell", "options": {"statusbar": {"label": "$(arrow-up) Bump Mod Version"}}, - "command": "python ${config:zomboid_user_folder}/PaosCrap/bump_version.py media/lua/client/TOC/Main.lua", + "command": "python ${config:zomboid_user_folder}/PaosCrap/bump_version.py 42/media/lua/client/TOC/Main.lua", }, { - "label": "Run Zomboid Debug No Steam", + "label": "Run Zomboid Debug No Steam (42)", "type": "shell", "presentation": { "group": "groupZomboid" }, - "command": "\"${config:zomboid_folder}\\ProjectZomboid64 - nosteam-debug.bat\"", - "options": {"statusbar": {"label": "$(run) Zomboid client"}}, + "command": "\"${config:zomboid_folder_b42}\\ProjectZomboid64 - nosteam-debug 42.bat\"", + "options": {"statusbar": {"label": "$(run) Zomboid client (42)"}}, "problemMatcher": [ "$eslint-stylish" ] }, { - "label": "Run Zomboid Debug No Steam 2", + "label": "Run Zomboid Debug No Steam (41)", "type": "shell", - "command": "\"${config:zomboid_folder}\\ProjectZomboid64 - nosteam-debug.bat\"", - "options": {"statusbar": {"hide": true}}, - - "problemMatcher": [ - "$eslint-stylish" - ] - }, - { - "label": "Run two instances of Zomboid Debug No Steam", - "options": {"statusbar": {"label": "$(run-all) Two Zomboid Clients"}}, "presentation": { - "reveal": "always", - "panel": "new" - }, - "dependsOn": [ - "Run Zomboid Debug No Steam", "Run Zomboid Debug No Steam 2"], - "problemMatcher": [] - }, - { - "label": "Run Zomboid Test Server", - "options": {"statusbar": {"label": "$(run) Zomboid Server (TOC)"}}, - "type": "shell", - "command":"\"${config:zomboid_server_folder}\\StartServer64_nosteam_custom.bat\" TOC", + "group": "groupZomboid" + }, + "command": "\"${config:zomboid_folder_b41}\\ProjectZomboid64 - nosteam-debug.bat\"", + "options": {"statusbar": {"label": "$(run) Zomboid client (41)"}}, "problemMatcher": [ "$eslint-stylish" ] }, - { - "label": "Run Zomboid Test Server 2", - "options": {"statusbar": {"label": "$(run) Zomboid Server (TOC+FH+BH)"}}, - "type": "shell", - "command":"\"${config:zomboid_server_folder}\\StartServer64_nosteam_custom.bat\" TOC_FH_BH", - "problemMatcher": [ - "$eslint-stylish" - ] - }, - { - "label": "Run Zomboid Test Server 3", - "options": {"statusbar": {"label": "$(run) Zomboid Server (TOC+FH+BH+iMedsFixed)"}}, - "type": "shell", - "command":"\"${config:zomboid_server_folder}\\StartServer64_nosteam_custom.bat\" TOC_FH_BH_imeds", - "problemMatcher": [ - "$eslint-stylish" - ] - } + // { + // "label": "Run Zomboid Debug No Steam", + // "type": "shell", + // "presentation": { + // "group": "groupZomboid" + // }, + // "command": "\"${config:zomboid_folder}\\ProjectZomboid64 - nosteam-debug.bat\"", + // "options": {"statusbar": {"label": "$(run) Zomboid client"}}, + // "problemMatcher": [ + // "$eslint-stylish" + // ] + // }, + // { + // "label": "Run Zomboid Debug No Steam 2", + // "type": "shell", + // "command": "\"${config:zomboid_folder}\\ProjectZomboid64 - nosteam-debug.bat\"", + // "options": {"statusbar": {"hide": true}}, + + // "problemMatcher": [ + // "$eslint-stylish" + // ] + // }, + // { + // "label": "Run two instances of Zomboid Debug No Steam", + // "options": {"statusbar": {"label": "$(run-all) Two Zomboid Clients"}}, + // "presentation": { + // "reveal": "always", + // "panel": "new" + // }, + // "dependsOn": [ + // "Run Zomboid Debug No Steam", "Run Zomboid Debug No Steam 2"], + // "problemMatcher": [] + // }, + // { + // "label": "Run Zomboid Test Server", + // "options": {"statusbar": {"label": "$(run) Zomboid Server (TOC)"}}, + // "type": "shell", + // "command":"\"${config:zomboid_server_folder}\\StartServer64_nosteam_custom.bat\" TOC", + // "problemMatcher": [ + // "$eslint-stylish" + // ] + // }, + // { + // "label": "Run Zomboid Test Server 2", + // "options": {"statusbar": {"label": "$(run) Zomboid Server (TOC+FH+BH)"}}, + // "type": "shell", + // "command":"\"${config:zomboid_server_folder}\\StartServer64_nosteam_custom.bat\" TOC_FH_BH", + // "problemMatcher": [ + // "$eslint-stylish" + // ] + // }, + // { + // "label": "Run Zomboid Test Server 3", + // "options": {"statusbar": {"label": "$(run) Zomboid Server (TOC+FH+BH+iMedsFixed)"}}, + // "type": "shell", + // "command":"\"${config:zomboid_server_folder}\\StartServer64_nosteam_custom.bat\" TOC_FH_BH_imeds", + // "problemMatcher": [ + // "$eslint-stylish" + // ] + // } ] } \ No newline at end of file diff --git a/42/media/lua/client/TOC-42/Controllers/LimitActionsController.lua b/42/media/lua/client/TOC-42/Controllers/LimitActionsController.lua new file mode 100644 index 0000000..bad1481 --- /dev/null +++ b/42/media/lua/client/TOC-42/Controllers/LimitActionsController.lua @@ -0,0 +1,10 @@ +local LimitActionsController = require("TOC/Controllers/LimitActionsController") -- declared in common +local OverridenMethodsArchive = require("TOC/OverridenMethodsArchive") + +local og_ISClothingExtraAction_isValid = OverridenMethodsArchive.Get("ISClothingExtraAction_isValid") +---@diagnostic disable-next-line: duplicate-set-field +function ISClothingExtraAction:isValid() + TOC_DEBUG.print("Inside ISClothingExtraAction:isValid 42") + TOC_DEBUG.print(OverridenMethodsArchive.Get("ISClothingExtraAction_isValid")) + return LimitActionsController.WrapClothingAction(self, og_ISClothingExtraAction_isValid, instanceItem(self.extra)) +end \ No newline at end of file diff --git a/42/media/lua/client/TOC-42/Handlers/ProsthesisHandler.lua b/42/media/lua/client/TOC-42/Handlers/ProsthesisHandler.lua new file mode 100644 index 0000000..7d90b73 --- /dev/null +++ b/42/media/lua/client/TOC-42/Handlers/ProsthesisHandler.lua @@ -0,0 +1,40 @@ +local ProsthesisHandler = require("TOC/Handlers/ProsthesisHandler") -- declared in common +local OverridenMethodsArchive = require("TOC/OverridenMethodsArchive") + + + +local og_ISClothingExtraAction_isValid = OverridenMethodsArchive.Get("ISClothingExtraAction_isValid") +---@diagnostic disable-next-line: duplicate-set-field +function ISClothingExtraAction:isValid() + local isEquippable = og_ISClothingExtraAction_isValid(self) + -- self.extra is a string, not the item + local testItem = instanceItem(self.extra) + return ProsthesisHandler.Validate(testItem, isEquippable) +end + + +local og_ISClothingExtraAction_perform = OverridenMethodsArchive.Get("ISClothingExtraAction_perform") +function ISClothingExtraAction:perform() + local extraItem = instanceItem(self.extra) + ProsthesisHandler.SearchAndSetupProsthesis(extraItem, true) + og_ISClothingExtraAction_perform(self) +end + + +local og_ISUnequipAction_complete = ISUnequipAction.complete +function ISUnequipAction:complete() + -- Horrendous workaround. For B42, as of now, it will basically happen two times, once with :perform and once with :complete. Shouldn't + -- matter for performance but it's really ugly. + local isProst = ProsthesisHandler.SearchAndSetupProsthesis(self.item, false) + local group + if isProst then + group = BodyLocations.getGroup("Human") + group:setMultiItem("TOC_ArmProst", false) + end + og_ISUnequipAction_complete(self) + + if isProst then + group:setMultiItem("TOC_ArmProst", true) + end + +end \ No newline at end of file diff --git a/42/media/ui/Female/ForeArm_L.png b/42/media/ui/Female/ForeArm_L.png new file mode 100644 index 0000000..ded9ed1 Binary files /dev/null and b/42/media/ui/Female/ForeArm_L.png differ diff --git a/42/media/ui/Female/ForeArm_R.png b/42/media/ui/Female/ForeArm_R.png new file mode 100644 index 0000000..9d10f3e Binary files /dev/null and b/42/media/ui/Female/ForeArm_R.png differ diff --git a/42/media/ui/Female/Hand_L.png b/42/media/ui/Female/Hand_L.png new file mode 100644 index 0000000..b9540f3 Binary files /dev/null and b/42/media/ui/Female/Hand_L.png differ diff --git a/42/media/ui/Female/Hand_R.png b/42/media/ui/Female/Hand_R.png new file mode 100644 index 0000000..a6f4e15 Binary files /dev/null and b/42/media/ui/Female/Hand_R.png differ diff --git a/42/media/ui/Female/UpperArm_L.png b/42/media/ui/Female/UpperArm_L.png new file mode 100644 index 0000000..9b6d0b4 Binary files /dev/null and b/42/media/ui/Female/UpperArm_L.png differ diff --git a/42/media/ui/Female/UpperArm_R.png b/42/media/ui/Female/UpperArm_R.png new file mode 100644 index 0000000..8d75cc0 Binary files /dev/null and b/42/media/ui/Female/UpperArm_R.png differ diff --git a/42/media/ui/Male/ForeArm_L.png b/42/media/ui/Male/ForeArm_L.png new file mode 100644 index 0000000..a0e9fbe Binary files /dev/null and b/42/media/ui/Male/ForeArm_L.png differ diff --git a/42/media/ui/Male/ForeArm_R.png b/42/media/ui/Male/ForeArm_R.png new file mode 100644 index 0000000..058fed0 Binary files /dev/null and b/42/media/ui/Male/ForeArm_R.png differ diff --git a/42/media/ui/Male/Hand_L.png b/42/media/ui/Male/Hand_L.png new file mode 100644 index 0000000..da1bad4 Binary files /dev/null and b/42/media/ui/Male/Hand_L.png differ diff --git a/42/media/ui/Male/Hand_R.png b/42/media/ui/Male/Hand_R.png new file mode 100644 index 0000000..0be41ee Binary files /dev/null and b/42/media/ui/Male/Hand_R.png differ diff --git a/42/media/ui/Male/UpperArm_L.png b/42/media/ui/Male/UpperArm_L.png new file mode 100644 index 0000000..036e271 Binary files /dev/null and b/42/media/ui/Male/UpperArm_L.png differ diff --git a/42/media/ui/Male/UpperArm_R.png b/42/media/ui/Male/UpperArm_R.png new file mode 100644 index 0000000..0bfade2 Binary files /dev/null and b/42/media/ui/Male/UpperArm_R.png differ diff --git a/42/media/ui/test_pattern.png b/42/media/ui/test_pattern.png new file mode 100644 index 0000000..e35f5f4 Binary files /dev/null and b/42/media/ui/test_pattern.png differ diff --git a/42/mod.info b/42/mod.info new file mode 100644 index 0000000..6452b21 --- /dev/null +++ b/42/mod.info @@ -0,0 +1,11 @@ +name=The Only Cure +poster=poster.png +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.2 +versionMin=42.6 + +loadModAfter=\FancyHandwork,\BrutalHandwork,\TwoWeaponsOnBackRework +incompatible=\BB_FirstAidOverhaul \ No newline at end of file diff --git a/The-Only-Cure.code-workspace b/The-Only-Cure.code-workspace deleted file mode 100644 index 876a149..0000000 --- a/The-Only-Cure.code-workspace +++ /dev/null @@ -1,8 +0,0 @@ -{ - "folders": [ - { - "path": "." - } - ], - "settings": {} -} \ No newline at end of file diff --git a/media/clothing/clothingItems/Amputation_ForeArm_L.xml b/common/media/clothing/clothingItems/Amputation_ForeArm_L.xml similarity index 100% rename from media/clothing/clothingItems/Amputation_ForeArm_L.xml rename to common/media/clothing/clothingItems/Amputation_ForeArm_L.xml diff --git a/media/clothing/clothingItems/Amputation_ForeArm_R.xml b/common/media/clothing/clothingItems/Amputation_ForeArm_R.xml similarity index 100% rename from media/clothing/clothingItems/Amputation_ForeArm_R.xml rename to common/media/clothing/clothingItems/Amputation_ForeArm_R.xml diff --git a/media/clothing/clothingItems/Amputation_Hand_L.xml b/common/media/clothing/clothingItems/Amputation_Hand_L.xml similarity index 100% rename from media/clothing/clothingItems/Amputation_Hand_L.xml rename to common/media/clothing/clothingItems/Amputation_Hand_L.xml diff --git a/media/clothing/clothingItems/Amputation_Hand_R.xml b/common/media/clothing/clothingItems/Amputation_Hand_R.xml similarity index 100% rename from media/clothing/clothingItems/Amputation_Hand_R.xml rename to common/media/clothing/clothingItems/Amputation_Hand_R.xml diff --git a/media/clothing/clothingItems/Amputation_UpperArm_L.xml b/common/media/clothing/clothingItems/Amputation_UpperArm_L.xml similarity index 100% rename from media/clothing/clothingItems/Amputation_UpperArm_L.xml rename to common/media/clothing/clothingItems/Amputation_UpperArm_L.xml diff --git a/media/clothing/clothingItems/Amputation_UpperArm_R.xml b/common/media/clothing/clothingItems/Amputation_UpperArm_R.xml similarity index 100% rename from media/clothing/clothingItems/Amputation_UpperArm_R.xml rename to common/media/clothing/clothingItems/Amputation_UpperArm_R.xml diff --git a/media/clothing/clothingItems/Prost_HookArm_L.xml b/common/media/clothing/clothingItems/Prost_HookArm_L.xml similarity index 100% rename from media/clothing/clothingItems/Prost_HookArm_L.xml rename to common/media/clothing/clothingItems/Prost_HookArm_L.xml diff --git a/media/clothing/clothingItems/Prost_HookArm_R.xml b/common/media/clothing/clothingItems/Prost_HookArm_R.xml similarity index 100% rename from media/clothing/clothingItems/Prost_HookArm_R.xml rename to common/media/clothing/clothingItems/Prost_HookArm_R.xml diff --git a/media/clothing/clothingItems/Prost_NormalArm_L.xml b/common/media/clothing/clothingItems/Prost_NormalArm_L.xml similarity index 100% rename from media/clothing/clothingItems/Prost_NormalArm_L.xml rename to common/media/clothing/clothingItems/Prost_NormalArm_L.xml diff --git a/media/clothing/clothingItems/Prost_NormalArm_R.xml b/common/media/clothing/clothingItems/Prost_NormalArm_R.xml similarity index 100% rename from media/clothing/clothingItems/Prost_NormalArm_R.xml rename to common/media/clothing/clothingItems/Prost_NormalArm_R.xml diff --git a/media/clothing/clothingItems/Surg_Arm_Tourniquet_L.xml b/common/media/clothing/clothingItems/Surg_Arm_Tourniquet_L.xml similarity index 100% rename from media/clothing/clothingItems/Surg_Arm_Tourniquet_L.xml rename to common/media/clothing/clothingItems/Surg_Arm_Tourniquet_L.xml diff --git a/media/clothing/clothingItems/Surg_Arm_Tourniquet_R.xml b/common/media/clothing/clothingItems/Surg_Arm_Tourniquet_R.xml similarity index 100% rename from media/clothing/clothingItems/Surg_Arm_Tourniquet_R.xml rename to common/media/clothing/clothingItems/Surg_Arm_Tourniquet_R.xml diff --git a/media/fileGuidTable.xml b/common/media/fileGuidTable.xml similarity index 100% rename from media/fileGuidTable.xml rename to common/media/fileGuidTable.xml diff --git a/media/lua/client/TOC/API.lua b/common/media/lua/client/TOC/API.lua similarity index 100% rename from media/lua/client/TOC/API.lua rename to common/media/lua/client/TOC/API.lua diff --git a/media/lua/client/TOC/Admin.lua b/common/media/lua/client/TOC/Admin.lua similarity index 98% rename from media/lua/client/TOC/Admin.lua rename to common/media/lua/client/TOC/Admin.lua index 6f40140..81dd1c4 100644 --- a/media/lua/client/TOC/Admin.lua +++ b/common/media/lua/client/TOC/Admin.lua @@ -31,6 +31,7 @@ local function AddAdminTocOptions(playerNum, context, worldobjects) end + -- ugly This whole section should be done better for _, pl in pairs(players) do ---@cast pl IsoPlayer @@ -45,7 +46,6 @@ local function AddAdminTocOptions(playerNum, context, worldobjects) sendClientCommand(CommandsData.modules.TOC_RELAY, CommandsData.server.Relay.RelayExecuteInitialization, { patientNum = clickedPlayerNum }) else - -- TODO ugly ClientRelayCommands.ReceiveExecuteInitialization() end end) @@ -65,7 +65,6 @@ local function AddAdminTocOptions(playerNum, context, worldobjects) { patientNum = clickedPlayerNum, limbName = limbName }) else ClientRelayCommands.ReceiveExecuteAmputationAction({surgeonNum=clickedPlayerNum, limbName=limbName, damagePlayer=false}) - -- todo ugly end end) diff --git a/media/lua/client/TOC/ClientRelayCommands.lua b/common/media/lua/client/TOC/ClientRelayCommands.lua similarity index 100% rename from media/lua/client/TOC/ClientRelayCommands.lua rename to common/media/lua/client/TOC/ClientRelayCommands.lua diff --git a/media/lua/client/TOC/CommonMethods.lua b/common/media/lua/client/TOC/CommonMethods.lua similarity index 100% rename from media/lua/client/TOC/CommonMethods.lua rename to common/media/lua/client/TOC/CommonMethods.lua diff --git a/media/lua/client/TOC/Compat.lua b/common/media/lua/client/TOC/Compat.lua similarity index 95% rename from media/lua/client/TOC/Compat.lua rename to common/media/lua/client/TOC/Compat.lua index 45486e7..7f4150d 100644 --- a/media/lua/client/TOC/Compat.lua +++ b/common/media/lua/client/TOC/Compat.lua @@ -50,6 +50,10 @@ Compat.handlers = { ['iMedsFixed'] = { fun = Compat.iMeds, isActive = false} + + + + -- TODO Check if FirstAidOverhaul can be made compatible } diff --git a/media/lua/client/TOC/Controllers/DataController.lua b/common/media/lua/client/TOC/Controllers/DataController.lua similarity index 97% rename from media/lua/client/TOC/Controllers/DataController.lua rename to common/media/lua/client/TOC/Controllers/DataController.lua index 7dde5bd..fba40cd 100644 --- a/media/lua/client/TOC/Controllers/DataController.lua +++ b/common/media/lua/client/TOC/Controllers/DataController.lua @@ -5,7 +5,7 @@ local StaticData = require("TOC/StaticData") ---------------- --- An instance will be abbreviated with dcInst - +-- https://github.com/ZioPao/The-Only-Cure/issues/187 --- Handle all TOC mod data related stuff ---@class DataController @@ -103,6 +103,10 @@ end ---In case of desync between the table on ModData and the table here ---@param tocData tocModDataType function DataController:applyOnlineData(tocData) + if not tocData or not tocData.limbs then + TOC_DEBUG.print("Received invalid tocData") + return + end local key = CommandsData.GetKey(self.username) ModData.add(key, tocData) self.tocData = ModData.get(key) @@ -229,12 +233,8 @@ end ---@param limbName string ---@return boolean function DataController:getIsCut(limbName) - if not self.isDataReady then return false end - if self.tocData.limbs[limbName] then - return self.tocData.limbs[limbName].isCut - else - return false - end + if not self.isDataReady or not self.tocData or not self.tocData.limbs then return false end + return self.tocData.limbs[limbName] and self.tocData.limbs[limbName].isCut or false end ---Get isVisible @@ -403,9 +403,6 @@ function DataController.ReceiveData(key, data) handler:setup(key) elseif data and data.limbs then -- Let's validate that the data structure is actually valid to prevent issues - if data.isUpdateFromServer then - TOC_DEBUG.print("Update from the server") - end handler:applyOnlineData(data) elseif username == getPlayer():getUsername() then TOC_DEBUG.print("Trying to load local data or no data is available") diff --git a/media/lua/client/TOC/Controllers/ItemsController.lua b/common/media/lua/client/TOC/Controllers/ItemsController.lua similarity index 100% rename from media/lua/client/TOC/Controllers/ItemsController.lua rename to common/media/lua/client/TOC/Controllers/ItemsController.lua diff --git a/media/lua/client/TOC/Controllers/LimitActionsController.lua b/common/media/lua/client/TOC/Controllers/LimitActionsController.lua similarity index 83% rename from media/lua/client/TOC/Controllers/LimitActionsController.lua rename to common/media/lua/client/TOC/Controllers/LimitActionsController.lua index 4cbdbec..df1b8e2 100644 --- a/media/lua/client/TOC/Controllers/LimitActionsController.lua +++ b/common/media/lua/client/TOC/Controllers/LimitActionsController.lua @@ -5,14 +5,50 @@ local CachedDataHandler = require("TOC/Handlers/CachedDataHandler") local CommonMethods = require("TOC/CommonMethods") local StaticData = require("TOC/StaticData") +local OverridenMethodsArchive = require("TOC/OverridenMethodsArchive") ----------------- +---@class LimitActionsController +local LimitActionsController = {} ---* TIMED ACTIONS *-- --- We want to be able to modify how long actions are gonna take, --- depending on amputation status and kind of action. Also, when the --- player has not completely cicatrized their own wounds, and try to do any action with --- a prosthesis on, that can trigger random bleeds. +--* DISABLE WEARING CERTAIN ITEMS WHEN NO LIMB + +function LimitActionsController.CheckLimbFeasibility(limbName) + local dcInst = DataController.GetInstance() + local isFeasible = not dcInst:getIsCut(limbName) or dcInst:getIsProstEquipped(limbName) + --TOC_DEBUG.print("isFeasible="..tostring(isFeasible)) + return isFeasible +end + +---@param obj any +---@param wrappedFunc function +---@param item InventoryItem +---@return boolean +function LimitActionsController.WrapClothingAction(obj, wrappedFunc, item) + local isEquippable = wrappedFunc(obj) + if not isEquippable then return isEquippable end + + local itemBodyLoc = item:getBodyLocation() + + local limbToCheck = StaticData.AFFECTED_BODYLOCS_TO_LIMBS_IND_STR[itemBodyLoc] + if LimitActionsController.CheckLimbFeasibility(limbToCheck) then return isEquippable else return false end +end + + + + + + + + + + +-------------------------------------------- +--* TIMED ACTIONS +--* We want to be able to modify how long actions are gonna take, +--* depending on amputation status and kind of action. Also, when the +--* player has not completely cicatrized their own wounds, and try to do any action with +--* a prosthesis on, that can trigger random bleeds. local function CheckHandFeasibility(limbName) TOC_DEBUG.print("Checking hand feasibility: " .. limbName) @@ -24,18 +60,18 @@ local function CheckHandFeasibility(limbName) end ---* Time to perform actions overrides *-- +--* Time to perform actions overrides local og_ISBaseTimedAction_adjustMaxTime = ISBaseTimedAction.adjustMaxTime --- Adjust time ---@diagnostic disable-next-line: duplicate-set-field function ISBaseTimedAction:adjustMaxTime(maxTime) local time = og_ISBaseTimedAction_adjustMaxTime(self, maxTime) - + --TOC_DEBUG.print("Running override for adjustMaxTime") -- Exceptions handling, if we find that parameter then we just use the original time local actionsQueue = ISTimedActionQueue.getTimedActionQueue(getPlayer()) - if actionsQueue and actionsQueue.current and actionsQueue.skipTOC then - --TOC_DEBUG.print("Should skip TOC stuff") + if actionsQueue and actionsQueue.current and actionsQueue.current.skipTOC then + TOC_DEBUG.print("Should skip TOC stuff") return time end @@ -78,37 +114,58 @@ function ISBaseTimedAction:adjustMaxTime(maxTime) return time end ---* Random bleeding during cicatrization + Perks leveling override *-- +--* Random bleeding during cicatrization + Perks leveling override local og_ISBaseTimedAction_perform = ISBaseTimedAction.perform --- After each action, level up perks ---@diagnostic disable-next-line: duplicate-set-field function ISBaseTimedAction:perform() og_ISBaseTimedAction_perform(self) - TOC_DEBUG.print("Running ISBaseTimedAction.perform override") - TOC_DEBUG.print("max time: " .. tostring(self.maxTime)) + + --TOC_DEBUG.print("Running ISBaseTimedAction.perform override") + --TOC_DEBUG.print("max time: " .. tostring(self.maxTime)) local dcInst = DataController.GetInstance() - if not dcInst:getIsAnyLimbCut() then return end + if not dcInst:getIsAnyLimbCut() or self.noExp then return end + + --* LEVELING + -- First check level of perks. if already at max, skip local amputatedLimbs = CachedDataHandler.GetAmputatedLimbs(LocalPlayerController.username) local xp = self.maxTime / 100 + -- TODO Exp should be added while doing the action, not after it's done + + -- Prevent xp from being negative and decreasing perks + if xp < 0 then xp = 0 end for k, _ in pairs(amputatedLimbs) do local limbName = k -- We're checking for only "visible" amputations to prevent from having bleeds everywhere if dcInst:getIsCut(limbName) and dcInst:getIsVisible(limbName) then local side = CommonMethods.GetSide(limbName) - LocalPlayerController.playerObj:getXp():AddXP(Perks["Side_" .. side], xp) - if not dcInst:getIsCicatrized(limbName) and dcInst:getIsProstEquipped(limbName) then - TOC_DEBUG.print("Trying for bleed, player met the criteria") - LocalPlayerController.TryRandomBleed(self.character, limbName) + + local ampPerk = Perks["Side_" .. side] + local ampPerkLevel = LocalPlayerController.playerObj:getPerkLevel(ampPerk) + + if ampPerkLevel < 10 then + --TOC_DEBUG.print("Levelling") + LocalPlayerController.playerObj:getXp():AddXP(ampPerk, xp) end -- Level up prosthesis perk if dcInst:getIsProstEquipped(limbName) then - LocalPlayerController.playerObj:getXp():AddXP(Perks["ProstFamiliarity"], xp) + local prostPerk = Perks["ProstFamiliarity"] + local prostPerkLevel = LocalPlayerController.playerObj:getPerkLevel(prostPerk) + if prostPerkLevel < 10 then + LocalPlayerController.playerObj:getXp():AddXP(prostPerk, xp) + end + end + + -- Bleeding when not cicatrized + if not dcInst:getIsCicatrized(limbName) and dcInst:getIsProstEquipped(limbName) then + --TOC_DEBUG.print("Trying for bleed, player met the criteria") + LocalPlayerController.TryRandomBleed(self.character, limbName) end end end @@ -124,7 +181,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) @@ -328,42 +385,30 @@ function ISWorldObjectContextMenu.createMenu(player, worldobjects, x, y, test) return ogContext end ---* DISABLE WEARING CERTAIN ITEMS WHEN NO LIMB - -local function CheckLimbFeasibility(limbName) - local dcInst = DataController.GetInstance() - local isFeasible = not dcInst:getIsCut(limbName) or dcInst:getIsProstEquipped(limbName) - --TOC_DEBUG.print("isFeasible="..tostring(isFeasible)) - return isFeasible -end - - - - ----@param obj any ----@param wrappedFunc function ----@param item InventoryItem ----@return boolean -local function WrapClothingAction(obj, wrappedFunc, item) - local isEquippable = wrappedFunc(obj) - if not isEquippable then return isEquippable end - - local itemBodyLoc = item:getBodyLocation() - - local limbToCheck = StaticData.AFFECTED_BODYLOCS_TO_LIMBS_IND_STR[itemBodyLoc] - if CheckLimbFeasibility(limbToCheck) then return isEquippable else return false end -end - - - ---@diagnostic disable-next-line: duplicate-set-field local og_ISWearClothing_isValid = ISWearClothing.isValid function ISWearClothing:isValid() - return WrapClothingAction(self, og_ISWearClothing_isValid, self.item) + return LimitActionsController.WrapClothingAction(self, og_ISWearClothing_isValid, self.item) end -local og_ISClothingExtraAction_isValid = ISClothingExtraAction.isValid + + +local og_ISClothingExtraAction_isValid = OverridenMethodsArchive.Save("ISClothingExtraAction_isValid", ISClothingExtraAction.isValid) ---@diagnostic disable-next-line: duplicate-set-field function ISClothingExtraAction:isValid() - return WrapClothingAction(self, og_ISClothingExtraAction_isValid, InventoryItemFactory.CreateItem(self.extra)) + return LimitActionsController.WrapClothingAction(self, og_ISClothingExtraAction_isValid, InventoryItemFactory.CreateItem(self.extra)) end + + + + +--* Book exception for exp + +local og_ISReadABook_perform = ISReadABook.perform +function ISReadABook:perform() + self.noExp = true + og_ISReadABook_perform(self) + +end + +return LimitActionsController \ No newline at end of file diff --git a/media/lua/client/TOC/Controllers/LocalPlayerController.lua b/common/media/lua/client/TOC/Controllers/LocalPlayerController.lua similarity index 100% rename from media/lua/client/TOC/Controllers/LocalPlayerController.lua rename to common/media/lua/client/TOC/Controllers/LocalPlayerController.lua diff --git a/media/lua/client/TOC/Controllers/TourniquetController.lua b/common/media/lua/client/TOC/Controllers/TourniquetController.lua similarity index 100% rename from media/lua/client/TOC/Controllers/TourniquetController.lua rename to common/media/lua/client/TOC/Controllers/TourniquetController.lua diff --git a/media/lua/client/TOC/Events.lua b/common/media/lua/client/TOC/Events.lua similarity index 100% rename from media/lua/client/TOC/Events.lua rename to common/media/lua/client/TOC/Events.lua diff --git a/media/lua/client/TOC/Handlers/AmputationHandler.lua b/common/media/lua/client/TOC/Handlers/AmputationHandler.lua similarity index 100% rename from media/lua/client/TOC/Handlers/AmputationHandler.lua rename to common/media/lua/client/TOC/Handlers/AmputationHandler.lua diff --git a/media/lua/client/TOC/Handlers/CachedDataHandler.lua b/common/media/lua/client/TOC/Handlers/CachedDataHandler.lua similarity index 100% rename from media/lua/client/TOC/Handlers/CachedDataHandler.lua rename to common/media/lua/client/TOC/Handlers/CachedDataHandler.lua diff --git a/media/lua/client/TOC/Handlers/ProsthesisHandler.lua b/common/media/lua/client/TOC/Handlers/ProsthesisHandler.lua similarity index 91% rename from media/lua/client/TOC/Handlers/ProsthesisHandler.lua rename to common/media/lua/client/TOC/Handlers/ProsthesisHandler.lua index b4f84e8..1787794 100644 --- a/media/lua/client/TOC/Handlers/ProsthesisHandler.lua +++ b/common/media/lua/client/TOC/Handlers/ProsthesisHandler.lua @@ -2,6 +2,8 @@ local CommonMethods = require("TOC/CommonMethods") local StaticData = require("TOC/StaticData") local DataController = require("TOC/Controllers/DataController") local CachedDataHandler = require("TOC/Handlers/CachedDataHandler") + +local OverridenMethodsArchive = require("TOC/OverridenMethodsArchive") ------------------------- ---@class ProsthesisHandler @@ -88,14 +90,7 @@ function ProsthesisHandler.SearchAndSetupProsthesis(item, isEquipping) return true end -------------------------- ---* Overrides *-- - - ----@param item InventoryItem ----@param isEquippable boolean ----@return unknown -local function HandleProsthesisValidation(item, isEquippable) +function ProsthesisHandler.Validate(item, isEquippable) local isProst = ProsthesisHandler.CheckIfProst(item) if not isProst then return isEquippable end @@ -110,11 +105,16 @@ local function HandleProsthesisValidation(item, isEquippable) end + +------------------------- +--* Overrides *-- + + ---@diagnostic disable-next-line: duplicate-set-field local og_ISWearClothing_isValid = ISWearClothing.isValid function ISWearClothing:isValid() local isEquippable = og_ISWearClothing_isValid(self) - return HandleProsthesisValidation(self.item, isEquippable) + return ProsthesisHandler.Validate(self.item, isEquippable) end local og_ISWearClothing_perform = ISWearClothing.perform @@ -123,17 +123,22 @@ function ISWearClothing:perform() og_ISWearClothing_perform(self) end -local og_ISClothingExtraAction_isValid = ISClothingExtraAction.isValid + + + + + +local og_ISClothingExtraAction_isValid = OverridenMethodsArchive.Save("ISClothingExtraAction_isValid", ISClothingExtraAction.isValid) + ---@diagnostic disable-next-line: duplicate-set-field function ISClothingExtraAction:isValid() local isEquippable = og_ISClothingExtraAction_isValid(self) -- self.extra is a string, not the item local testItem = InventoryItemFactory.CreateItem(self.extra) - return HandleProsthesisValidation(testItem, isEquippable) + return ProsthesisHandler.Validate(testItem, isEquippable) end - -local og_ISClothingExtraAction_perform = ISClothingExtraAction.perform +local og_ISClothingExtraAction_perform = OverridenMethodsArchive.Save("ISClothingExtraAction_perform", ISClothingExtraAction.perform) function ISClothingExtraAction:perform() local extraItem = InventoryItemFactory.CreateItem(self.extra) ProsthesisHandler.SearchAndSetupProsthesis(extraItem, true) @@ -172,7 +177,6 @@ function ISUnequipAction:perform() -- This could break if amputated limbs aren't cached for some reason triggerEvent("OnProsthesisUnequipped", hal) end - end end end diff --git a/media/lua/client/TOC/Main.lua b/common/media/lua/client/TOC/Main.lua similarity index 98% rename from media/lua/client/TOC/Main.lua rename to common/media/lua/client/TOC/Main.lua index 07edc7b..07bcac6 100644 --- a/media/lua/client/TOC/Main.lua +++ b/common/media/lua/client/TOC/Main.lua @@ -6,7 +6,7 @@ require("TOC/Events") ---@class Main local Main = { - _version = "2.1.5" + _version = "2.1.6" } function Main.Start() diff --git a/media/lua/client/TOC/Tests.lua b/common/media/lua/client/TOC/Tests.lua similarity index 99% rename from media/lua/client/TOC/Tests.lua rename to common/media/lua/client/TOC/Tests.lua index a636c15..3c326c9 100644 --- a/media/lua/client/TOC/Tests.lua +++ b/common/media/lua/client/TOC/Tests.lua @@ -160,7 +160,6 @@ TestFramework.registerTestModule("Various", "Player", function() return Tests end) - TestFramework.registerTestModule("Various", "Visuals", function() local Tests = {} diff --git a/media/lua/client/TOC/TimedActions/CauterizeAction.lua b/common/media/lua/client/TOC/TimedActions/CauterizeAction.lua similarity index 100% rename from media/lua/client/TOC/TimedActions/CauterizeAction.lua rename to common/media/lua/client/TOC/TimedActions/CauterizeAction.lua diff --git a/media/lua/client/TOC/TimedActions/CleanWoundAction.lua b/common/media/lua/client/TOC/TimedActions/CleanWoundAction.lua similarity index 97% rename from media/lua/client/TOC/TimedActions/CleanWoundAction.lua rename to common/media/lua/client/TOC/TimedActions/CleanWoundAction.lua index 66bc78f..3d306c9 100644 --- a/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 diff --git a/media/lua/client/TOC/TimedActions/CutLimbAction.lua b/common/media/lua/client/TOC/TimedActions/CutLimbAction.lua similarity index 100% rename from media/lua/client/TOC/TimedActions/CutLimbAction.lua rename to common/media/lua/client/TOC/TimedActions/CutLimbAction.lua diff --git a/common/media/lua/client/TOC/TimedActions/IgnoredActions.lua b/common/media/lua/client/TOC/TimedActions/IgnoredActions.lua new file mode 100644 index 0000000..09e2a8f --- /dev/null +++ b/common/media/lua/client/TOC/TimedActions/IgnoredActions.lua @@ -0,0 +1,139 @@ +-- TODO This section must be overhauled + +local DataController = require("TOC/Controllers/DataController") +local StaticData = require("TOC/StaticData") + +---@diagnostic disable: duplicate-set-field +-- Bunch of actions shouldn't be modified by the adjusted time + +----------------------------------------------- +---* Some actions have specific maxTime calculations and we must account for that +---ISAttachItemHotbar +---ISDetachItemHotbar +---ISEquipWeaponAction +---ISUnequipAction + +--- We're forced to re-run this crap to fix it +---@param action ISBaseTimedAction +local function OverrideAction(action, maxTime) + -- TODO Add forced debuff instead of just relying on the vanilla values? + action.skipTOC = true + action.maxTime = maxTime + action.animSpeed = 1.0 +end + +local og_ISAttachItemHotbar_new = ISAttachItemHotbar.new +function ISAttachItemHotbar:new(character, item, slot, slotIndex, slotDef) + local action = og_ISAttachItemHotbar_new(self, character, item, slot, slotIndex, slotDef) + OverrideAction(action, 30) -- Default time for this action + return action +end + +local og_ISDetachItemHotbar_new = ISDetachItemHotbar.new +function ISDetachItemHotbar:new(character, item) + local action = og_ISDetachItemHotbar_new(self, character, item) + OverrideAction(action, 25) -- Default time for this action + return action +end + + +local og_ISEquipWeaponAction_new = ISEquipWeaponAction.new +function ISEquipWeaponAction:new(character, item, time, primary, twoHands) + + local action = og_ISEquipWeaponAction_new(self, character, item, time, primary, twoHands) + TOC_DEBUG.print("Override ISEquipWeaponAction New") + + + -- check if right arm is cut off or not. if it is, penality shall apply + -- if we got here, the action is valid, so we know that we have a prosthesis. + + local dcInst = DataController.GetInstance() + + -- Brutal Handwork should be considered. Use the twohands thing + if not (dcInst:getIsAnyLimbCut() and twoHands) then + OverrideAction(action, time) + end + + return action + +end + +local og_ISUnequipAction_new = ISUnequipAction.new +function ISUnequipAction:new(character, item, time) + local action = og_ISUnequipAction_new(self, character, item, time) + ---@cast item InventoryItem + + -- TODO Consider other cases where unequipping something should skip TOC. + if instanceof(item, 'HandWeapon') then + OverrideAction(action, time) + end + + return action +end + +------------------------------------------------------ +--- Normal cases + + +local og_ISEatFoodAction_new = ISEatFoodAction.new +function ISEatFoodAction:new(character, item, percentage) + local action = og_ISEatFoodAction_new(self, character, item, percentage) + --TOC_DEBUG.print("Override ISEatFoodAction") + action.skipTOC = true + return action +end + +local og_ISReadABook_new = ISReadABook.new +function ISReadABook:new(character, item, time) + local action = og_ISReadABook_new(self, character, item, time) + --TOC_DEBUG.print("Override ISReadABook") + action.skipTOC = true + return action +end + +local og_ISTakePillAction_new = ISTakePillAction.new +function ISTakePillAction:new(character, item, time) + local action = og_ISTakePillAction_new(self, character, item, time) + --TOC_DEBUG.print("Override ISTakePillAction") + action.skipTOC = true + return action +end + +local og_ISTakeWaterAction_new = ISTakeWaterAction.new +function ISTakeWaterAction:new(character, item, waterUnit, waterObject, time, oldItem) + local action = og_ISTakeWaterAction_new(self, character, item, waterUnit, waterObject, time, oldItem) + --TOC_DEBUG.print("Override ISTakeWaterAction") + action.skipTOC = true + return action +end + +local og_ISDrinkFromBottle_new = ISDrinkFromBottle.new +function ISDrinkFromBottle:new(character, item, uses) + local action = og_ISDrinkFromBottle_new(self, character, item, uses) + --TOC_DEBUG.print("Override ISDrinkFromBottle") + action.skipTOC = true + return action +end + + +if StaticData.COMPAT_42 == false then + -- TODO confirm that this doesn't exist anymore in B42 + -- B42 nenen + local og_ISFinalizeDealAction_new = ISFinalizeDealAction.new + function ISFinalizeDealAction:new(player, otherPlayer, itemsToGive, itemsToReceive, time) + local action = og_ISFinalizeDealAction_new(self, player, otherPlayer, itemsToGive, itemsToReceive, time) + --TOC_DEBUG.print("Override ISFinalizeDealAction") + action.skipTOC = true + return action + end + +end + + +local og_ISCampingInfoAction_new = ISCampingInfoAction.new +function ISCampingInfoAction:new(character, campfireObject, campfire) + local action = og_ISCampingInfoAction_new(self, character, campfireObject, campfire) + --TOC_DEBUG.print("Override ISCampingInfoAction") + action.skipTOC = true + return action +end \ No newline at end of file diff --git a/media/lua/client/TOC/TimedActions/WashYourselfOverride.lua b/common/media/lua/client/TOC/TimedActions/WashYourselfOverride.lua similarity index 100% rename from media/lua/client/TOC/TimedActions/WashYourselfOverride.lua rename to common/media/lua/client/TOC/TimedActions/WashYourselfOverride.lua diff --git a/media/lua/client/TOC/UI/ConfirmationPanel.lua b/common/media/lua/client/TOC/UI/ConfirmationPanel.lua similarity index 95% rename from media/lua/client/TOC/UI/ConfirmationPanel.lua rename to common/media/lua/client/TOC/UI/ConfirmationPanel.lua index 6e00bea..9337d1c 100644 --- a/media/lua/client/TOC/UI/ConfirmationPanel.lua +++ b/common/media/lua/client/TOC/UI/ConfirmationPanel.lua @@ -53,14 +53,14 @@ function ConfirmationPanel:createChildren() local yButton = self:getHeight() - yPadding - btnHeight - self.btnYes = ISButton:new(xPadding, yButton, btnWidth, btnHeight, "Yes", self, self.onClick) + self.btnYes = ISButton:new(xPadding, yButton, btnWidth, btnHeight, getText("IGUI_Yes"), self, self.onClick) self.btnYes.internal = "YES" self.btnYes:initialise() self.btnYes.borderColor = { r = 1, g = 0, b = 0, a = 1 } self.btnYes:setEnable(true) self:addChild(self.btnYes) - self.btnNo = ISButton:new(self:getWidth() - xPadding - btnWidth, yButton, btnWidth, btnHeight, "No", self, + self.btnNo = ISButton:new(self:getWidth() - xPadding - btnWidth, yButton, btnWidth, btnHeight, getText("IGUI_No"), self, self.onClick) self.btnNo.internal = "NO" self.btnNo:initialise() diff --git a/media/lua/client/TOC/UI/HealthPanel.lua b/common/media/lua/client/TOC/UI/HealthPanel.lua similarity index 95% rename from media/lua/client/TOC/UI/HealthPanel.lua rename to common/media/lua/client/TOC/UI/HealthPanel.lua index 4c519de..fea0e21 100644 --- a/media/lua/client/TOC/UI/HealthPanel.lua +++ b/common/media/lua/client/TOC/UI/HealthPanel.lua @@ -10,10 +10,22 @@ local WoundCleaningInteractionHandler = require("TOC/UI/Interactions/WoundCleani local isReady = false + +local xMod, yMod + +if StaticData.COMPAT_42 then + -- B42 For some reason (I didn't investigate), when applying stuff to the health panel there is an un-accounted shift in B42. + xMod = 5 + yMod = 13 +else + xMod = 0 + yMod = 0 +end + + function SetHealthPanelTOC() -- depending on compatibility - isReady = true end @@ -101,14 +113,14 @@ function ISHealthPanel:tryDrawAmputation(highestAmputations, side, username) local sexPl = self.character:isFemale() and "Female" or "Male" texture = StaticData.HEALTH_PANEL_TEXTURES[sexPl][limbName] end - - self:drawTexture(texture, self.healthPanel.x, self.healthPanel.y, 1, redColor, 0, 0) + -- B42, for some reason the positioning of the texture changed. Realigned it manually with those fixed values + self:drawTexture(texture, self.healthPanel.x - xMod, self.healthPanel.y - yMod, 1, redColor, 0, 0) end function ISHealthPanel:tryDrawProsthesis(highestAmputations, side, username) local dc = DataController.GetInstance(username) -- TODO CACHE PROSTHESIS!!! Don't use DC here local limbName = highestAmputations[side] if limbName and dc:getIsProstEquipped(limbName) then - self:drawTexture(StaticData.HEALTH_PANEL_TEXTURES.ProstArm[side], self.healthPanel.x, self.healthPanel.y, 1, 1, 1, 1) + self:drawTexture(StaticData.HEALTH_PANEL_TEXTURES.ProstArm[side], self.healthPanel.x - xMod, self.healthPanel.y - yMod, 1, 1, 1, 1) end end diff --git a/media/lua/client/TOC/UI/Interactions/CutLimbInteractionHandler.lua b/common/media/lua/client/TOC/UI/Interactions/CutLimbInteractionHandler.lua similarity index 100% rename from media/lua/client/TOC/UI/Interactions/CutLimbInteractionHandler.lua rename to common/media/lua/client/TOC/UI/Interactions/CutLimbInteractionHandler.lua diff --git a/media/lua/client/TOC/UI/Interactions/HealthPanelBaseHandler.lua b/common/media/lua/client/TOC/UI/Interactions/HealthPanelBaseHandler.lua similarity index 98% rename from media/lua/client/TOC/UI/Interactions/HealthPanelBaseHandler.lua rename to common/media/lua/client/TOC/UI/Interactions/HealthPanelBaseHandler.lua index a95545a..78ced2a 100644 --- a/media/lua/client/TOC/UI/Interactions/HealthPanelBaseHandler.lua +++ b/common/media/lua/client/TOC/UI/Interactions/HealthPanelBaseHandler.lua @@ -118,7 +118,7 @@ function BaseHandler:toPlayerInventory(item, previousAction) if item:getContainer() ~= self:getDoctor():getInventory() then local action = ISInventoryTransferAction:new(self:getDoctor(), item, item:getContainer(), self:getDoctor():getInventory()) ISTimedActionQueue.addAfter(previousAction, action) - -- FIXME: ISHealthPanel.actions never gets cleared + -- FIX: ISHealthPanel.actions never gets cleared self.panel.actions = self.panel.actions or {} self.panel.actions[action] = self.bodyPart return action diff --git a/media/lua/client/TOC/UI/Interactions/WoundCleaningInteractionHandler.lua b/common/media/lua/client/TOC/UI/Interactions/WoundCleaningInteractionHandler.lua similarity index 100% rename from media/lua/client/TOC/UI/Interactions/WoundCleaningInteractionHandler.lua rename to common/media/lua/client/TOC/UI/Interactions/WoundCleaningInteractionHandler.lua diff --git a/media/lua/client/TOC/UI/SurgeryInteractions.lua b/common/media/lua/client/TOC/UI/SurgeryInteractions.lua similarity index 98% rename from media/lua/client/TOC/UI/SurgeryInteractions.lua rename to common/media/lua/client/TOC/UI/SurgeryInteractions.lua index 9a8dd77..a49d20f 100644 --- a/media/lua/client/TOC/UI/SurgeryInteractions.lua +++ b/common/media/lua/client/TOC/UI/SurgeryInteractions.lua @@ -68,7 +68,7 @@ local function AddStoveContextMenu(playerNum, context, worldObjects, test) -- Notifications, in case the player can't do the action - local isPlayerCourageous = pl:HasTrait("Brave") or pl:getPerkLevel(Perks.Strength) > 5 + local isPlayerCourageous = pl:HasTrait("Brave") or pl:HasTrait("Desensitized") or pl:getPerkLevel(Perks.Strength) > 5 local isTempHighEnough = stoveObj:getCurrentTemperature() >= 250 local isLimbFree = not dcInst:getIsProstEquipped(limbName) diff --git a/media/lua/client/TOC/Zombies/ZombiesAmputation.lua b/common/media/lua/client/TOC/Zombies/ZombiesAmputation.lua similarity index 100% rename from media/lua/client/TOC/Zombies/ZombiesAmputation.lua rename to common/media/lua/client/TOC/Zombies/ZombiesAmputation.lua diff --git a/common/media/lua/client/lua_timers.lua b/common/media/lua/client/lua_timers.lua new file mode 100644 index 0000000..1c2d9a6 --- /dev/null +++ b/common/media/lua/client/lua_timers.lua @@ -0,0 +1,171 @@ +-- Made by Vyshnia +-- Workshop ID: 2875394066 +-- Mod ID: LuaTimers + +local os_time = os.time +local table_insert = table.insert +local table_remove = table.remove +local assert = assert +local type = type +local pairs = pairs + +timer = { + Timers = {}, + SimpleTimers = {} +} + +function timer:Simple(delay, func) + assert(type(delay) == "number", "Delay of timer should be a number type") + assert(type(func) == "function", "Func of timer should be a function type (lol)") + + table_insert(self.SimpleTimers, { + EndTime = os_time() + delay, + Func = func + }) +end + +function timer:Create(name, delay, repetitions, func) + assert(type(name) == "string", "ID of timer should be a string type") + assert(type(delay) == "number", "Delay of timer should be a number type") + assert(type(repetitions) == "number", "Repetitions of timer should be a number type") + assert(type(func) == "function", "Func of timer should be a function type (lol)") + + self.Timers[name] = { + Delay = delay, + StartRepetitions = repetitions, + Repetitions = repetitions, + Infinity = repetitions == 0, + LastFuncTime = os_time(), + Func = func, + Paused = false, + } +end + +local function timerUpdate() + local cur_time = os_time() + + for k, v in pairs(timer.Timers) do + if not v.Paused then + if cur_time >= v.LastFuncTime + v.Delay then + v.Func() + + v.LastFuncTime = cur_time + + if not v.Infinity then + v.Repetitions = v.Repetitions - 1 + + if v.Repetitions <= 0 then + timer.Timers[k] = nil + end + end + end + end + end + + local simple_timers = timer.SimpleTimers + + for i = #simple_timers, 1, -1 do + local t = simple_timers[i] + + if t.EndTime <= cur_time then + t.Func() + + table_remove(simple_timers, i) + end + end +end +Events.OnTickEvenPaused.Add(timerUpdate) + +function timer:Remove(name) + local t = self.Timers[name] + + if not t then return false end + + self.Timers[name] = nil + + return true +end + +function timer:Exists(name) + return self.Timers[name] and true or false +end + +function timer:Start(name) + local t = self.Timers[name] + + if not t then return false end + + t.Repetitions = t.StartRepetitions + t.LastFuncTime = os_time() + t.Paused = false + t.PausedTime = nil + + return true +end + +function timer:Pause(name) + local t = self.Timers[name] + + if not t then return false end + + if t.Paused then return false end + + t.Paused = true + t.PausedTime = os_time() + + return true +end + +function timer:UnPause(name) + local t = self.Timers[name] + + if not t then return false end + + if not t.Paused then return false end + + t.Paused = false + + return true +end + +timer.Resume = timer.UnPause + +function timer:Toggle(name) + local t = self.Timers[name] + + if not t then return false end + + t.Paused = not t.Paused + + return true +end + +function timer:TimeLeft(name) + local t = self.Timers[name] + + if not t then return end + + if t.Paused then + return (t.Repetitions - 1) * t.Delay + (t.LastFuncTime + t.Delay - t.PausedTime) + else + return (t.Repetitions - 1) * t.Delay + (t.LastFuncTime + t.Delay - os_time()) + end +end + +function timer:NextTimeLeft(name) + local t = self.Timers[name] + + if not t then return end + + if t.Paused then + return t.LastFuncTime + t.Delay - t.PausedTime + else + return t.LastFuncTime + t.Delay - os_time() + end +end + +function timer:RepsLeft(name) + local t = self.Timers[name] + + return t and t.Repetitions +end diff --git a/media/lua/server/TOC/DebugCommands.lua b/common/media/lua/server/TOC/DebugCommands.lua similarity index 100% rename from media/lua/server/TOC/DebugCommands.lua rename to common/media/lua/server/TOC/DebugCommands.lua diff --git a/media/lua/server/TOC/Distributions.lua b/common/media/lua/server/TOC/Distributions.lua similarity index 100% rename from media/lua/server/TOC/Distributions.lua rename to common/media/lua/server/TOC/Distributions.lua diff --git a/media/lua/server/TOC/LimitActionsController.lua b/common/media/lua/server/TOC/LimitActionsController.lua similarity index 100% rename from media/lua/server/TOC/LimitActionsController.lua rename to common/media/lua/server/TOC/LimitActionsController.lua diff --git a/media/lua/server/TOC/ServerDataHandler.lua b/common/media/lua/server/TOC/ServerDataHandler.lua similarity index 96% rename from media/lua/server/TOC/ServerDataHandler.lua rename to common/media/lua/server/TOC/ServerDataHandler.lua index b45aa92..39e678a 100644 --- a/media/lua/server/TOC/ServerDataHandler.lua +++ b/common/media/lua/server/TOC/ServerDataHandler.lua @@ -24,8 +24,6 @@ function ServerDataHandler.AddTable(key, table) --TOC_DEBUG.printTable(table) -- Set that the data has been modified and it's updated on the server - table.isUpdateFromServer = true -- FIX this is useless as of now - ModData.add(key, table) -- Add it to the server mod data ServerDataHandler.modData[key] = table diff --git a/media/lua/server/TOC/ServerRelayCommands.lua b/common/media/lua/server/TOC/ServerRelayCommands.lua similarity index 100% rename from media/lua/server/TOC/ServerRelayCommands.lua rename to common/media/lua/server/TOC/ServerRelayCommands.lua diff --git a/media/lua/shared/TOC/BodyLocations.lua b/common/media/lua/shared/TOC/BodyLocations.lua similarity index 100% rename from media/lua/shared/TOC/BodyLocations.lua rename to common/media/lua/shared/TOC/BodyLocations.lua diff --git a/media/lua/shared/TOC/CommandsData.lua b/common/media/lua/shared/TOC/CommandsData.lua similarity index 99% rename from media/lua/shared/TOC/CommandsData.lua rename to common/media/lua/shared/TOC/CommandsData.lua index 569ecde..b15c729 100644 --- a/media/lua/shared/TOC/CommandsData.lua +++ b/common/media/lua/shared/TOC/CommandsData.lua @@ -31,7 +31,7 @@ CommandsData.server = { Relay = { RelayDamageDuringAmputation = "RelayDamageDuringAmputation", ---@alias relayDamageDuringAmputationParams {patientNum : number, limbName : string} RelayExecuteAmputationAction = "RelayExecuteAmputationAction", ---@alias relayExecuteAmputationActionParams {patientNum : number, limbName : string} - + --* ADMIN ONLY *-- RelayExecuteInitialization = "RelayExecuteInitialization", ---@alias relayExecuteInitializationParams {patientNum : number} RelayForcedAmputation = "RelayForcedAmputation" ---@alias relayForcedAmputationParams {patientNum : number, limbName : string} diff --git a/media/lua/shared/TOC/Debug.lua b/common/media/lua/shared/TOC/Debug.lua similarity index 99% rename from media/lua/shared/TOC/Debug.lua rename to common/media/lua/shared/TOC/Debug.lua index 9b0deba..d559da9 100644 --- a/media/lua/shared/TOC/Debug.lua +++ b/common/media/lua/shared/TOC/Debug.lua @@ -7,7 +7,7 @@ function TOC_DEBUG.TogglePaneMod() end function TOC_DEBUG.ToggleHealthPanelDebug() - TOC_DEBUG.enableHealthPanelDebug = not TOC_DEBUG.enableHealthPanelDebug + TOC_DEBUG.enableHealthPanelDebug = not TOC_DEBUG.enableHealthPanelDebug end ---Print debug diff --git a/common/media/lua/shared/TOC/OverridenMethodsArchive.lua b/common/media/lua/shared/TOC/OverridenMethodsArchive.lua new file mode 100644 index 0000000..8eb4dd0 --- /dev/null +++ b/common/media/lua/shared/TOC/OverridenMethodsArchive.lua @@ -0,0 +1,31 @@ +-- instead of relying on local to save og methods, we save them in a table here that we can use later. + +---@class OverridenMethodsArchive +local OverridenMethodsArchive = {} +OverridenMethodsArchive.methods = {} + +-- Save an original method, if it wasn't already saved and returns it to be used in common +function OverridenMethodsArchive.Save(methodName, method) + if not OverridenMethodsArchive.methods[methodName] then + OverridenMethodsArchive.methods[methodName] = method + TOC_DEBUG.print("Saved method " .. methodName) + end + + + return method + +end + +-- Get the original method +function OverridenMethodsArchive.Get(methodName) + --TOC_DEBUG.print("Getting og method " .. methodName) + + --TOC_DEBUG.print("OverridenMethodsArchive.list[methodName] = " .. tostring(OverridenMethodsArchive.methods[methodName])) + --TOC_DEBUG.print(methodName) + --TOC_DEBUG.print(OverridenMethodsArchive.methods[methodName]) + return OverridenMethodsArchive.methods[methodName] + +end + + +return OverridenMethodsArchive diff --git a/media/lua/shared/TOC/StaticData.lua b/common/media/lua/shared/TOC/StaticData.lua similarity index 95% rename from media/lua/shared/TOC/StaticData.lua rename to common/media/lua/shared/TOC/StaticData.lua index 2d3c47f..833095f 100644 --- a/media/lua/shared/TOC/StaticData.lua +++ b/common/media/lua/shared/TOC/StaticData.lua @@ -2,7 +2,7 @@ ---@alias limbsTable {Hand_L : partDataType, ForeArm_L : partDataType, UpperArm_L : partDataType, Hand_R : partDataType, ForeArm_R : partDataType, UpperArm_R : partDataType } ---@alias prosthesisData {isProstEquipped : boolean, prostFactor : number } ---@alias prosthesesTable {Top_L : prosthesisData, Top_R : prosthesisData } -- TODO add Bottom_L and Bottom_R ----@alias tocModDataType { limbs : limbsTable, prostheses : prosthesesTable, isIgnoredPartInfected : boolean, isAnyLimbCut : boolean, isUpdateFromServer : boolean, isInitializing : boolean} +---@alias tocModDataType { limbs : limbsTable, prostheses : prosthesesTable, isIgnoredPartInfected : boolean, isAnyLimbCut : boolean, isInitializing : boolean} --------------------------- @@ -21,6 +21,10 @@ local StaticData = {} ---Mod name, used to setup Global Mod Data and various stuff StaticData.MOD_NAME = "TOC" +-- Game version, used to correct some stuff instead of relying on versioned folders + +StaticData.COMPAT_42 = luautils.stringStarts(getGameVersion(), "42") + ------------------------- --* Base @@ -276,8 +280,17 @@ StaticData.AMPUTATION_CLOTHING_ITEM_BASE = "TOC.Amputation_" ------------------ --* Items check -local sawObj = InventoryItemFactory.CreateItem("Base.Saw") -local gardenSawObj = InventoryItemFactory.CreateItem("Base.GardenSaw") +local sawObj +local gardenSawObj + +if StaticData.COMPAT_42 then + sawObj = instanceItem("Base.Saw") + gardenSawObj = instanceItem("Base.GardenSaw") +else + sawObj = InventoryItemFactory.CreateItem("Base.Saw") + gardenSawObj = InventoryItemFactory.CreateItem("Base.GardenSaw") +end + StaticData.SAWS_NAMES_IND_STR = { saw = sawObj:getName(), diff --git a/media/lua/shared/TOC/Traits.lua b/common/media/lua/shared/TOC/Traits.lua similarity index 94% rename from media/lua/shared/TOC/Traits.lua rename to common/media/lua/shared/TOC/Traits.lua index 9958155..9013554 100644 --- a/media/lua/shared/TOC/Traits.lua +++ b/common/media/lua/shared/TOC/Traits.lua @@ -19,8 +19,6 @@ end local function SetupTraits() - -- Perks.Left_Hand is defined in perks.txt - local traitsTable = { [1] = TraitFactory.addTrait(TRAITS.Amputee_Hand, GetTraitText(TRAITS.Amputee_Hand), -8, GetTraitDesc(TRAITS.Amputee_Hand), false, false), [2] = TraitFactory.addTrait(TRAITS.Amputee_ForeArm, GetTraitText(TRAITS.Amputee_ForeArm), -10, GetTraitDesc(TRAITS.Amputee_ForeArm), false, false), @@ -32,7 +30,7 @@ local function SetupTraits() ---@type Trait local t = traitsTable[i] ---@diagnostic disable-next-line: undefined-field - t:addXPBoost(Perks.Left_Hand, 4) + t:addXPBoost(Perks.Side_L, 4) t:addXPBoost(Perks.Fitness, -1) t:addXPBoost(Perks.Strength, -1) end diff --git a/media/lua/shared/Translate/DE/ContextMenu_DE.txt b/common/media/lua/shared/Translate/DE/ContextMenu_DE.txt similarity index 100% rename from media/lua/shared/Translate/DE/ContextMenu_DE.txt rename to common/media/lua/shared/Translate/DE/ContextMenu_DE.txt diff --git a/media/lua/shared/Translate/DE/IG_UI_DE.txt b/common/media/lua/shared/Translate/DE/IG_UI_DE.txt similarity index 93% rename from media/lua/shared/Translate/DE/IG_UI_DE.txt rename to common/media/lua/shared/Translate/DE/IG_UI_DE.txt index 4165f92..685a50e 100644 --- a/media/lua/shared/Translate/DE/IG_UI_DE.txt +++ b/common/media/lua/shared/Translate/DE/IG_UI_DE.txt @@ -1,4 +1,7 @@ IG_UI_DE = { + IGUI_Yes = "Ja", + IGUI_No = "Nein", + IGUI_perks_Amputations = "Amputationen", IGUI_perks_Side_R = "Rechte Seite", IGUI_perks_Side_L = "Linke Seite", diff --git a/media/lua/shared/Translate/DE/ItemName_DE.txt b/common/media/lua/shared/Translate/DE/ItemName_DE.txt similarity index 100% rename from media/lua/shared/Translate/DE/ItemName_DE.txt rename to common/media/lua/shared/Translate/DE/ItemName_DE.txt diff --git a/media/lua/shared/Translate/DE/Recipes_DE.txt b/common/media/lua/shared/Translate/DE/Recipes_DE.txt similarity index 100% rename from media/lua/shared/Translate/DE/Recipes_DE.txt rename to common/media/lua/shared/Translate/DE/Recipes_DE.txt diff --git a/media/lua/shared/Translate/DE/Sandbox_DE.txt b/common/media/lua/shared/Translate/DE/Sandbox_DE.txt similarity index 100% rename from media/lua/shared/Translate/DE/Sandbox_DE.txt rename to common/media/lua/shared/Translate/DE/Sandbox_DE.txt diff --git a/media/lua/shared/Translate/DE/Tooltip_DE.txt b/common/media/lua/shared/Translate/DE/Tooltip_DE.txt similarity index 100% rename from media/lua/shared/Translate/DE/Tooltip_DE.txt rename to common/media/lua/shared/Translate/DE/Tooltip_DE.txt diff --git a/media/lua/shared/Translate/DE/UI_DE.txt b/common/media/lua/shared/Translate/DE/UI_DE.txt similarity index 100% rename from media/lua/shared/Translate/DE/UI_DE.txt rename to common/media/lua/shared/Translate/DE/UI_DE.txt diff --git a/media/lua/shared/Translate/EN/ContextMenu_EN.txt b/common/media/lua/shared/Translate/EN/ContextMenu_EN.txt similarity index 100% rename from media/lua/shared/Translate/EN/ContextMenu_EN.txt rename to common/media/lua/shared/Translate/EN/ContextMenu_EN.txt diff --git a/media/lua/shared/Translate/EN/IG_UI_EN.txt b/common/media/lua/shared/Translate/EN/IG_UI_EN.txt similarity index 61% rename from media/lua/shared/Translate/EN/IG_UI_EN.txt rename to common/media/lua/shared/Translate/EN/IG_UI_EN.txt index df9b692..9e37096 100644 --- a/media/lua/shared/Translate/EN/IG_UI_EN.txt +++ b/common/media/lua/shared/Translate/EN/IG_UI_EN.txt @@ -1,9 +1,14 @@ IG_UI_EN = { + IGUI_Yes = "Yes", + IGUI_No = "No", + IGUI_perks_Amputations = "Amputations", IGUI_perks_Side_R = "Right Side", + IGUI_perks_Right Side_Description = "Familiarity with amputations on the right side of your body", IGUI_perks_Side_L = "Left Side", - IGUI_perks_Prosthesis = "Prosthesis", - IGUI_perks_ProstFamiliarity= "Familiarity", + IGUI_perks_Left Side_Description = "Familiarity with amputations on the left side of your body", + IGUI_perks_Prosthesis = "Prosthesis Familiarity", + IGUI_perks_Prosthesis Familiarity_Description = "Familiarity with prosthetic limbs", IGUI_ItemCat_Prosthesis = "Prosthesis", IGUI_ItemCat_Surgery = "Surgery", diff --git a/media/lua/shared/Translate/EN/ItemName_EN.txt b/common/media/lua/shared/Translate/EN/ItemName_EN.txt similarity index 100% rename from media/lua/shared/Translate/EN/ItemName_EN.txt rename to common/media/lua/shared/Translate/EN/ItemName_EN.txt diff --git a/media/lua/shared/Translate/EN/Recipes_EN.txt b/common/media/lua/shared/Translate/EN/Recipes_EN.txt similarity index 100% rename from media/lua/shared/Translate/EN/Recipes_EN.txt rename to common/media/lua/shared/Translate/EN/Recipes_EN.txt diff --git a/media/lua/shared/Translate/EN/Sandbox_EN.txt b/common/media/lua/shared/Translate/EN/Sandbox_EN.txt similarity index 100% rename from media/lua/shared/Translate/EN/Sandbox_EN.txt rename to common/media/lua/shared/Translate/EN/Sandbox_EN.txt diff --git a/media/lua/shared/Translate/EN/Tooltip_EN.txt b/common/media/lua/shared/Translate/EN/Tooltip_EN.txt similarity index 100% rename from media/lua/shared/Translate/EN/Tooltip_EN.txt rename to common/media/lua/shared/Translate/EN/Tooltip_EN.txt diff --git a/media/lua/shared/Translate/EN/UI_EN.txt b/common/media/lua/shared/Translate/EN/UI_EN.txt similarity index 100% rename from media/lua/shared/Translate/EN/UI_EN.txt rename to common/media/lua/shared/Translate/EN/UI_EN.txt diff --git a/media/lua/shared/Translate/FR/ContextMenu_FR.txt b/common/media/lua/shared/Translate/FR/ContextMenu_FR.txt similarity index 100% rename from media/lua/shared/Translate/FR/ContextMenu_FR.txt rename to common/media/lua/shared/Translate/FR/ContextMenu_FR.txt diff --git a/common/media/lua/shared/Translate/FR/IG_UI_FR.txt b/common/media/lua/shared/Translate/FR/IG_UI_FR.txt new file mode 100644 index 0000000..fde28c0 --- /dev/null +++ b/common/media/lua/shared/Translate/FR/IG_UI_FR.txt @@ -0,0 +1,21 @@ +IG_UI_FR = { + IGUI_Yes = "Oui", + IGUI_No = "Non", + + 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/common/media/lua/shared/Translate/FR/ItemName_FR.txt similarity index 100% rename from media/lua/shared/Translate/FR/ItemName_FR.txt rename to common/media/lua/shared/Translate/FR/ItemName_FR.txt diff --git a/media/lua/shared/Translate/FR/Recipes_FR.txt b/common/media/lua/shared/Translate/FR/Recipes_FR.txt similarity index 100% rename from media/lua/shared/Translate/FR/Recipes_FR.txt rename to common/media/lua/shared/Translate/FR/Recipes_FR.txt diff --git a/media/lua/shared/Translate/FR/Sandbox_FR.txt b/common/media/lua/shared/Translate/FR/Sandbox_FR.txt similarity index 100% rename from media/lua/shared/Translate/FR/Sandbox_FR.txt rename to common/media/lua/shared/Translate/FR/Sandbox_FR.txt diff --git a/media/lua/shared/Translate/FR/Tooltip_FR.txt b/common/media/lua/shared/Translate/FR/Tooltip_FR.txt similarity index 100% rename from media/lua/shared/Translate/FR/Tooltip_FR.txt rename to common/media/lua/shared/Translate/FR/Tooltip_FR.txt diff --git a/media/lua/shared/Translate/FR/UI_FR.txt b/common/media/lua/shared/Translate/FR/UI_FR.txt similarity index 100% rename from media/lua/shared/Translate/FR/UI_FR.txt rename to common/media/lua/shared/Translate/FR/UI_FR.txt diff --git a/media/lua/shared/Translate/IT/ContextMenu_IT.txt b/common/media/lua/shared/Translate/IT/ContextMenu_IT.txt similarity index 100% rename from media/lua/shared/Translate/IT/ContextMenu_IT.txt rename to common/media/lua/shared/Translate/IT/ContextMenu_IT.txt diff --git a/media/lua/shared/Translate/IT/IG_UI_IT.txt b/common/media/lua/shared/Translate/IT/IG_UI_IT.txt similarity index 93% rename from media/lua/shared/Translate/IT/IG_UI_IT.txt rename to common/media/lua/shared/Translate/IT/IG_UI_IT.txt index 61e43fd..9d1d0c6 100644 --- a/media/lua/shared/Translate/IT/IG_UI_IT.txt +++ b/common/media/lua/shared/Translate/IT/IG_UI_IT.txt @@ -1,4 +1,7 @@ IG_UI_IT = { + IGUI_Yes = "Si", + IGUI_No = "No", + IGUI_perks_Amputations = "Amputazioni", IGUI_perks_Side_R = "Parte destra", IGUI_perks_Side_L = "Parte sinistra", diff --git a/media/lua/shared/Translate/IT/ItemName_IT.txt b/common/media/lua/shared/Translate/IT/ItemName_IT.txt similarity index 100% rename from media/lua/shared/Translate/IT/ItemName_IT.txt rename to common/media/lua/shared/Translate/IT/ItemName_IT.txt diff --git a/media/lua/shared/Translate/IT/Recipes_IT.txt b/common/media/lua/shared/Translate/IT/Recipes_IT.txt similarity index 100% rename from media/lua/shared/Translate/IT/Recipes_IT.txt rename to common/media/lua/shared/Translate/IT/Recipes_IT.txt diff --git a/media/lua/shared/Translate/IT/Sandbox_IT.txt b/common/media/lua/shared/Translate/IT/Sandbox_IT.txt similarity index 100% rename from media/lua/shared/Translate/IT/Sandbox_IT.txt rename to common/media/lua/shared/Translate/IT/Sandbox_IT.txt diff --git a/media/lua/shared/Translate/IT/Tooltip_IT.txt b/common/media/lua/shared/Translate/IT/Tooltip_IT.txt similarity index 100% rename from media/lua/shared/Translate/IT/Tooltip_IT.txt rename to common/media/lua/shared/Translate/IT/Tooltip_IT.txt diff --git a/media/lua/shared/Translate/IT/UI_IT.txt b/common/media/lua/shared/Translate/IT/UI_IT.txt similarity index 100% rename from media/lua/shared/Translate/IT/UI_IT.txt rename to common/media/lua/shared/Translate/IT/UI_IT.txt diff --git a/media/lua/shared/Translate/KO/ContextMenu_KO.txt b/common/media/lua/shared/Translate/KO/ContextMenu_KO.txt similarity index 100% rename from media/lua/shared/Translate/KO/ContextMenu_KO.txt rename to common/media/lua/shared/Translate/KO/ContextMenu_KO.txt diff --git a/media/lua/shared/Translate/KO/IG_UI_KO.txt b/common/media/lua/shared/Translate/KO/IG_UI_KO.txt similarity index 92% rename from media/lua/shared/Translate/KO/IG_UI_KO.txt rename to common/media/lua/shared/Translate/KO/IG_UI_KO.txt index 422da48..961602a 100644 Binary files a/media/lua/shared/Translate/KO/IG_UI_KO.txt and b/common/media/lua/shared/Translate/KO/IG_UI_KO.txt differ diff --git a/media/lua/shared/Translate/KO/ItemName_KO.txt b/common/media/lua/shared/Translate/KO/ItemName_KO.txt similarity index 100% rename from media/lua/shared/Translate/KO/ItemName_KO.txt rename to common/media/lua/shared/Translate/KO/ItemName_KO.txt diff --git a/media/lua/shared/Translate/KO/Recipes_KO.txt b/common/media/lua/shared/Translate/KO/Recipes_KO.txt similarity index 100% rename from media/lua/shared/Translate/KO/Recipes_KO.txt rename to common/media/lua/shared/Translate/KO/Recipes_KO.txt diff --git a/media/lua/shared/Translate/KO/Sandbox_KO.txt b/common/media/lua/shared/Translate/KO/Sandbox_KO.txt similarity index 100% rename from media/lua/shared/Translate/KO/Sandbox_KO.txt rename to common/media/lua/shared/Translate/KO/Sandbox_KO.txt diff --git a/media/lua/shared/Translate/KO/Tooltip_KO.txt b/common/media/lua/shared/Translate/KO/Tooltip_KO.txt similarity index 100% rename from media/lua/shared/Translate/KO/Tooltip_KO.txt rename to common/media/lua/shared/Translate/KO/Tooltip_KO.txt diff --git a/media/lua/shared/Translate/KO/UI_KO.txt b/common/media/lua/shared/Translate/KO/UI_KO.txt similarity index 100% rename from media/lua/shared/Translate/KO/UI_KO.txt rename to common/media/lua/shared/Translate/KO/UI_KO.txt diff --git a/media/lua/shared/Translate/RU/ContextMenu_RU.txt b/common/media/lua/shared/Translate/RU/ContextMenu_RU.txt similarity index 97% rename from media/lua/shared/Translate/RU/ContextMenu_RU.txt rename to common/media/lua/shared/Translate/RU/ContextMenu_RU.txt index d02fbd5..b7ec375 100644 --- a/media/lua/shared/Translate/RU/ContextMenu_RU.txt +++ b/common/media/lua/shared/Translate/RU/ContextMenu_RU.txt @@ -1,33 +1,33 @@ -ContextMenu_RU = { - ContextMenu_Amputate = "Àìïóòèðîâàòü", - ContextMenu_Amputate_Bandage = "Àìïóòèðîâàòü è ïåðåâÿçàòü", - ContextMenu_Amputate_Stitch = "Àìïóòèðîâàòü è íàëîæèòü øâû", - ContextMenu_Amputate_Stitch_Bandage = "Àìïóòèðîâàòü, íàëîæèòü øâû è ïåðåâÿçàòü", - - ContextMenu_Cauterize = "Ïðèæå÷ü", - - ContextMenu_Limb_Hand_L = "Ëåâàÿ ðóêà", - ContextMenu_Limb_ForeArm_L = "Ëåâàÿ ïðåäïëå÷üå", - ContextMenu_Limb_UpperArm_L = "Ëåâîå ïëå÷î" - ContextMenu_Limb_Hand_R = "Ïðàâàÿ ðóêà", - ContextMenu_Limb_ForeArm_R = "Ïðàâàÿ ïðåäïëå÷üå", - ContextMenu_Limb_UpperArm_R = "Ïðàâàÿ ïëå÷î", - - ContextMenu_InstallProstRight = "Óñòàíîâèòü ïðîòåç íà ïðàâóþ ðóêó", - ContextMenu_InstallProstLeft = "Óñòàíîâèòü ïðîòåç íà ëåâóþ ðóêó", - - ContextMenu_PutTourniquetArmLeft = "Íàëîæèòü æãóò íà ëåâóþ ðóêó", - ContextMenu_PutTourniquetLegL = "Íàëîæèòü æãóò íà ëåâóþ íîãó", - ContextMenu_PutTourniquetArmRight = "Íàëîæèòü æãóò íà ïðàâóþ ðóêó", - ContextMenu_PutTourniquetLegR = "Íàëîæèòü æãóò íà ïðàâóþ íîãó", - - - ContextMenu_CleanWound = "Î÷èñòèòü ðàíó", - - - - ContextMenu_Admin_TOC = "TOC", - ContextMenu_Admin_ResetTOC = "Ñáðîñèòü àìïóòàöèè", - ContextMenu_Admin_ForceAmputation = "Ìîìåíòàëüíî àìïóòèðîâàòü", - -} +ContextMenu_RU = { + ContextMenu_Amputate = "Àìïóòèðîâàòü", + ContextMenu_Amputate_Bandage = "Àìïóòèðîâàòü è ïåðåâÿçàòü", + ContextMenu_Amputate_Stitch = "Àìïóòèðîâàòü è íàëîæèòü øâû", + ContextMenu_Amputate_Stitch_Bandage = "Àìïóòèðîâàòü, íàëîæèòü øâû è ïåðåâÿçàòü", + + ContextMenu_Cauterize = "Ïðèæå÷ü", + + ContextMenu_Limb_Hand_L = "Ëåâàÿ ðóêà", + ContextMenu_Limb_ForeArm_L = "Ëåâàÿ ïðåäïëå÷üå", + ContextMenu_Limb_UpperArm_L = "Ëåâîå ïëå÷î" + ContextMenu_Limb_Hand_R = "Ïðàâàÿ ðóêà", + ContextMenu_Limb_ForeArm_R = "Ïðàâàÿ ïðåäïëå÷üå", + ContextMenu_Limb_UpperArm_R = "Ïðàâàÿ ïëå÷î", + + ContextMenu_InstallProstRight = "Óñòàíîâèòü ïðîòåç íà ïðàâóþ ðóêó", + ContextMenu_InstallProstLeft = "Óñòàíîâèòü ïðîòåç íà ëåâóþ ðóêó", + + ContextMenu_PutTourniquetArmLeft = "Íàëîæèòü æãóò íà ëåâóþ ðóêó", + ContextMenu_PutTourniquetLegL = "Íàëîæèòü æãóò íà ëåâóþ íîãó", + ContextMenu_PutTourniquetArmRight = "Íàëîæèòü æãóò íà ïðàâóþ ðóêó", + ContextMenu_PutTourniquetLegR = "Íàëîæèòü æãóò íà ïðàâóþ íîãó", + + + ContextMenu_CleanWound = "Î÷èñòèòü ðàíó", + + + + ContextMenu_Admin_TOC = "TOC", + ContextMenu_Admin_ResetTOC = "Ñáðîñèòü àìïóòàöèè", + ContextMenu_Admin_ForceAmputation = "Ìîìåíòàëüíî àìïóòèðîâàòü", + +} diff --git a/media/lua/shared/Translate/RU/IG_UI_RU.txt b/common/media/lua/shared/Translate/RU/IG_UI_RU.txt similarity index 97% rename from media/lua/shared/Translate/RU/IG_UI_RU.txt rename to common/media/lua/shared/Translate/RU/IG_UI_RU.txt index b4b962c..53bfb75 100644 --- a/media/lua/shared/Translate/RU/IG_UI_RU.txt +++ b/common/media/lua/shared/Translate/RU/IG_UI_RU.txt @@ -1,18 +1,18 @@ -IG_UI_RU = { - IGUI_perks_Amputations = "Àìïóòàöèè", - IGUI_perks_Side_R = "Ïðàâàÿ ñòîðîíà", - IGUI_perks_Side_L = "Ëåâàÿ ñòîðîíà", - IGUI_perks_Prosthesis = "Ïðîòåç", - IGUI_perks_ProstFamiliarity= "Ïðèñïîñîáëåííîñòü", - - IGUI_ItemCat_Prosthesis = "Ïðîòåç", - IGUI_ItemCat_Surgery = "Õèðóðãèÿ", - IGUI_ItemCat_Amputation = "Àìïóòàöèÿ" - - IGUI_HealthPanel_Cicatrization = "Çàæèâëåíèå", - IGUI_HealthPanel_Cicatrized = "Çàæèâëåíî", - IGUI_HealthPanel_Cauterized = "Ïðèææåííî", - IGUI_HealthPanel_WoundDirtyness = "Çàãðåçí¸ííàÿ ðàíà", - IGUI_HealthPanel_ProstEquipped = "Ïðîòåç ýêèïèðîâàí", - +IG_UI_RU = { + IGUI_perks_Amputations = "Àìïóòàöèè", + IGUI_perks_Side_R = "Ïðàâàÿ ñòîðîíà", + IGUI_perks_Side_L = "Ëåâàÿ ñòîðîíà", + IGUI_perks_Prosthesis = "Ïðîòåç", + IGUI_perks_ProstFamiliarity= "Ïðèñïîñîáëåííîñòü", + + IGUI_ItemCat_Prosthesis = "Ïðîòåç", + IGUI_ItemCat_Surgery = "Õèðóðãèÿ", + IGUI_ItemCat_Amputation = "Àìïóòàöèÿ" + + IGUI_HealthPanel_Cicatrization = "Çàæèâëåíèå", + IGUI_HealthPanel_Cicatrized = "Çàæèâëåíî", + IGUI_HealthPanel_Cauterized = "Ïðèææåííî", + IGUI_HealthPanel_WoundDirtyness = "Çàãðåçí¸ííàÿ ðàíà", + IGUI_HealthPanel_ProstEquipped = "Ïðîòåç ýêèïèðîâàí", + } \ No newline at end of file diff --git a/media/lua/shared/Translate/RU/ItemName_RU.txt b/common/media/lua/shared/Translate/RU/ItemName_RU.txt similarity index 96% rename from media/lua/shared/Translate/RU/ItemName_RU.txt rename to common/media/lua/shared/Translate/RU/ItemName_RU.txt index c22246a..1ee955c 100644 --- a/media/lua/shared/Translate/RU/ItemName_RU.txt +++ b/common/media/lua/shared/Translate/RU/ItemName_RU.txt @@ -1,11 +1,11 @@ -ItemName_RU = { - - ItemName_TOC.Surg_Arm_Tourniquet_L = "Æãóò", - ItemName_TOC.Surg_Arm_Tourniquet_R = "Æãóò", - - ItemName_TOC.Prost_NormalArm_L = "Ïðîòåç ðóêè", - ItemName_TOC.Prost_NormalArm_R = "Ïðîòåç ðóêè", - - ItemName_TOC.Prost_HookArm_L = "Ïðîòåç ðóêè - Êðþê", - ItemName_TOC.Prost_HookArm_R = "Ïðîòåç ðóêè - Êðþê", +ItemName_RU = { + + ItemName_TOC.Surg_Arm_Tourniquet_L = "Æãóò", + ItemName_TOC.Surg_Arm_Tourniquet_R = "Æãóò", + + ItemName_TOC.Prost_NormalArm_L = "Ïðîòåç ðóêè", + ItemName_TOC.Prost_NormalArm_R = "Ïðîòåç ðóêè", + + ItemName_TOC.Prost_HookArm_L = "Ïðîòåç ðóêè - Êðþê", + ItemName_TOC.Prost_HookArm_R = "Ïðîòåç ðóêè - Êðþê", } \ No newline at end of file diff --git a/media/lua/shared/Translate/RU/Recipes_RU.txt b/common/media/lua/shared/Translate/RU/Recipes_RU.txt similarity index 97% rename from media/lua/shared/Translate/RU/Recipes_RU.txt rename to common/media/lua/shared/Translate/RU/Recipes_RU.txt index 7acf52d..ff132f2 100644 --- a/media/lua/shared/Translate/RU/Recipes_RU.txt +++ b/common/media/lua/shared/Translate/RU/Recipes_RU.txt @@ -1,4 +1,4 @@ -Recipes_RU = { - Recipe_Craft_Prosthetic_Arm = "Èçãîòîâèòü ïðîòåç ðóêè", - Recipe_Craft_Prosthetic_Hook = "Èçãîòîâèòü ïðîòåç ââèäå êðþ÷êà", +Recipes_RU = { + Recipe_Craft_Prosthetic_Arm = "Èçãîòîâèòü ïðîòåç ðóêè", + Recipe_Craft_Prosthetic_Hook = "Èçãîòîâèòü ïðîòåç ââèäå êðþ÷êà", } \ No newline at end of file diff --git a/media/lua/shared/Translate/RU/Sandbox_RU.txt b/common/media/lua/shared/Translate/RU/Sandbox_RU.txt similarity index 97% rename from media/lua/shared/Translate/RU/Sandbox_RU.txt rename to common/media/lua/shared/Translate/RU/Sandbox_RU.txt index eaca95c..3a42ad7 100644 --- a/media/lua/shared/Translate/RU/Sandbox_RU.txt +++ b/common/media/lua/shared/Translate/RU/Sandbox_RU.txt @@ -1,7 +1,7 @@ -Sandbox_RU = { - Sandbox_TOC = "The Only Cure", - Sandbox_TOC_CicatrizationSpeed = "Ñêîðîñòü çàæèâëåíèÿ", - Sandbox_TOC_WoundDirtynessMultiplier = "Ìíîæèòåëü çàãðÿçíåíèÿ ðàí", - Sandbox_TOC_SurgeonAbilityImportance = "Çíà÷èìîñòü ñïîñîáíîñòåé âðà÷à-õèðóðãà", - +Sandbox_RU = { + Sandbox_TOC = "The Only Cure", + Sandbox_TOC_CicatrizationSpeed = "Ñêîðîñòü çàæèâëåíèÿ", + Sandbox_TOC_WoundDirtynessMultiplier = "Ìíîæèòåëü çàãðÿçíåíèÿ ðàí", + Sandbox_TOC_SurgeonAbilityImportance = "Çíà÷èìîñòü ñïîñîáíîñòåé âðà÷à-õèðóðãà", + } \ No newline at end of file diff --git a/media/lua/shared/Translate/RU/Tooltip_RU.txt b/common/media/lua/shared/Translate/RU/Tooltip_RU.txt similarity index 96% rename from media/lua/shared/Translate/RU/Tooltip_RU.txt rename to common/media/lua/shared/Translate/RU/Tooltip_RU.txt index 0595427..194f818 100644 --- a/media/lua/shared/Translate/RU/Tooltip_RU.txt +++ b/common/media/lua/shared/Translate/RU/Tooltip_RU.txt @@ -1,10 +1,10 @@ -Tooltip_RU = { - - Tooltip_Surgery_CantCauterize = "Íåëüçÿ ïðèæèãàòü ðàíó", - - Tooltip_Surgery_And = " è " - Tooltip_Surgery_TempTooLow = "Òåìïåðàòóðà âñå åùå ñëèøêîì íèçêàÿ", - Tooltip_Surgery_Coward = "Ó òåáÿ íå õâàòèò ñìåëîñòè ñäåëàòü ýòî", - Tooltip_Surgery_LimbNotFree = "Ñíà÷àëà íóæíî ñíÿòü ïðîòåç", - +Tooltip_RU = { + + Tooltip_Surgery_CantCauterize = "Íåëüçÿ ïðèæèãàòü ðàíó", + + Tooltip_Surgery_And = " è " + Tooltip_Surgery_TempTooLow = "Òåìïåðàòóðà âñå åùå ñëèøêîì íèçêàÿ", + Tooltip_Surgery_Coward = "Ó òåáÿ íå õâàòèò ñìåëîñòè ñäåëàòü ýòî", + Tooltip_Surgery_LimbNotFree = "Ñíà÷àëà íóæíî ñíÿòü ïðîòåç", + } \ No newline at end of file diff --git a/media/lua/shared/Translate/RU/UI_RU.txt b/common/media/lua/shared/Translate/RU/UI_RU.txt similarity index 97% rename from media/lua/shared/Translate/RU/UI_RU.txt rename to common/media/lua/shared/Translate/RU/UI_RU.txt index da92849..2411780 100644 --- a/media/lua/shared/Translate/RU/UI_RU.txt +++ b/common/media/lua/shared/Translate/RU/UI_RU.txt @@ -1,16 +1,16 @@ -UI_RU = { - UI_trait_Amputee_Hand = "Àìïóòèðîâàííàÿ ëåâàÿ ðóêà", - UI_trait_Amputee_Hand_desc = "Âû íà÷èíàåòå ñ àìïóòèðîâàííîé ëåâîé ðóêîé.", - - UI_trait_Amputee_ForeArm = "Àìïóòèðîâàííîå ëåâîå ïðåäïëå÷üå", - UI_trait_Amputee_ForeArm_desc = "Âû íà÷èíàåòå ñ àìïóòèðîâàííûì ëåâûì ïðåäïëå÷üåì.", - - UI_trait_Amputee_UpperArm = "Àìïóòèðîâàííîå ëåâîå ïëå÷î", - UI_trait_Amputee_UpperArm_desc = "Âû íà÷èíàåòå ñ àìïóòèðîâàííâì ëåâûì ïëå÷¸ì.", - - UI_trait_Insensitive = "Íå÷óâñòâèòåëüíûé", - UI_trait_Insensitive_desc = "", - - - UI_Say_CantEquip = "ß íå ìîãó åãî òàê ýêèïèðîâàòü..." +UI_RU = { + UI_trait_Amputee_Hand = "Àìïóòèðîâàííàÿ ëåâàÿ ðóêà", + UI_trait_Amputee_Hand_desc = "Âû íà÷èíàåòå ñ àìïóòèðîâàííîé ëåâîé ðóêîé.", + + UI_trait_Amputee_ForeArm = "Àìïóòèðîâàííîå ëåâîå ïðåäïëå÷üå", + UI_trait_Amputee_ForeArm_desc = "Âû íà÷èíàåòå ñ àìïóòèðîâàííûì ëåâûì ïðåäïëå÷üåì.", + + UI_trait_Amputee_UpperArm = "Àìïóòèðîâàííîå ëåâîå ïëå÷î", + UI_trait_Amputee_UpperArm_desc = "Âû íà÷èíàåòå ñ àìïóòèðîâàííâì ëåâûì ïëå÷¸ì.", + + UI_trait_Insensitive = "Íå÷óâñòâèòåëüíûé", + UI_trait_Insensitive_desc = "", + + + UI_Say_CantEquip = "ß íå ìîãó åãî òàê ýêèïèðîâàòü..." } \ No newline at end of file diff --git a/common/media/lua/shared/Translate/TR/ContextMenu_TR.txt b/common/media/lua/shared/Translate/TR/ContextMenu_TR.txt new file mode 100644 index 0000000..d2c4879 --- /dev/null +++ b/common/media/lua/shared/Translate/TR/ContextMenu_TR.txt @@ -0,0 +1,31 @@ +ContextMenu_TR = { + ContextMenu_Amputate = "Ampute Et", + ContextMenu_Amputate_Bandage = "Ampute Et ve Bandajla", + ContextMenu_Amputate_Stitch = "Ampute Et ve Dikiþ At", + ContextMenu_Amputate_Stitch_Bandage = "Ampute Et, Dikiþ At ve Bandajla", + + ContextMenu_Cauterize = "Daðla", + + ContextMenu_Limb_Hand_L = "Sol El", + ContextMenu_Limb_ForeArm_L = "Sol Ön Kol", + ContextMenu_Limb_UpperArm_L = "Sol Üst Kol", + ContextMenu_Limb_Hand_R = "Sað El", + ContextMenu_Limb_ForeArm_R = "Sað Ön Kol", + ContextMenu_Limb_UpperArm_R = "Sað Üst Kol", + + ContextMenu_InstallProstRight = "Sað kola protez tak", + ContextMenu_InstallProstLeft = "Sol kola protez tak", + + ContextMenu_PutTourniquetArmLeft = "Sol kola turnike tak", + ContextMenu_PutTourniquetLegL = "Sol bacaðýna turnike tak", + ContextMenu_PutTourniquetArmRight = "Sað kola turnike tak", + ContextMenu_PutTourniquetLegR = "Sað bacaðýna turnike tak", + + + ContextMenu_CleanWound = "Yarayý Temizle", + + + ContextMenu_Admin_TOC = "TOC", + ContextMenu_Admin_ResetTOC = "Amputasyonlarý Sýfýrla", + ContextMenu_Admin_ForceAmputation = "Zorla Amputasyon Yap", +} diff --git a/common/media/lua/shared/Translate/TR/IG_UI_TR.txt b/common/media/lua/shared/Translate/TR/IG_UI_TR.txt new file mode 100644 index 0000000..8133fd6 --- /dev/null +++ b/common/media/lua/shared/Translate/TR/IG_UI_TR.txt @@ -0,0 +1,19 @@ +IG_UI_TR = { + IGUI_perks_Amputations = "Amputasyonlar", + IGUI_perks_Side_R = "Sað Taraf", + IGUI_perks_Side_L = "Sol Taraf", + IGUI_perks_Prosthesis = "Protez", + IGUI_perks_ProstFamiliarity = "Aþinalýk", + + IGUI_ItemCat_Prosthesis = "Protez", + IGUI_ItemCat_Surgery = "Cerrahi", + IGUI_ItemCat_Amputation = "Amputasyon", + + IGUI_HealthPanel_Cicatrization = "Yara Ýyileþmesi", + IGUI_HealthPanel_Cicatrized = "Ýyileþti", + IGUI_HealthPanel_Cauterized = "Daðlandý", + IGUI_HealthPanel_WoundDirtyness = "Yara Kirliliði", + IGUI_HealthPanel_ProstEquipped = "Protez Takýlý", + + IGUI_Confirmation_Amputate = " Bu uzvu gerçekten ampute etmek istiyor musunuz?" +} diff --git a/common/media/lua/shared/Translate/TR/ItemName_TR.txt b/common/media/lua/shared/Translate/TR/ItemName_TR.txt new file mode 100644 index 0000000..0f51f48 --- /dev/null +++ b/common/media/lua/shared/Translate/TR/ItemName_TR.txt @@ -0,0 +1,11 @@ +ItemName_TR = { + + ItemName_TOC.Surg_Arm_Tourniquet_L = "Turnike", + ItemName_TOC.Surg_Arm_Tourniquet_R = "Turnike", + + ItemName_TOC.Prost_NormalArm_L = "Protez Kol", + ItemName_TOC.Prost_NormalArm_R = "Protez Kol", + + ItemName_TOC.Prost_HookArm_L = "Protez Kol - Kanca", + ItemName_TOC.Prost_HookArm_R = "Protez Kol - Kanca", +} diff --git a/common/media/lua/shared/Translate/TR/Recipes_TR.txt b/common/media/lua/shared/Translate/TR/Recipes_TR.txt new file mode 100644 index 0000000..33ca911 --- /dev/null +++ b/common/media/lua/shared/Translate/TR/Recipes_TR.txt @@ -0,0 +1,4 @@ +Recipes_TR = { + Recipe_Craft_Prosthetic_Arm = "Protez Kol Yap", + Recipe_Craft_Prosthetic_Hook = "Protez Kanca Yap", +} diff --git a/common/media/lua/shared/Translate/TR/Sandbox_TR.txt b/common/media/lua/shared/Translate/TR/Sandbox_TR.txt new file mode 100644 index 0000000..3b7b4fd --- /dev/null +++ b/common/media/lua/shared/Translate/TR/Sandbox_TR.txt @@ -0,0 +1,9 @@ +Sandbox_TR = { + Sandbox_TOC = "The Only Cure", + Sandbox_TOC_CicatrizationSpeed = "Yara Ýyileþme Hýzý", + Sandbox_TOC_WoundDirtynessMultiplier = "Yara Kirlilik Çarpaný", + Sandbox_TOC_SurgeonAbilityImportance = "Cerrahýn Yetenek Önemi", + Sandbox_TOC_EnableZombieAmputations = "Zombi Amputasyonlarýný Etkinleþtir", + Sandbox_TOC_ZombieAmputationDamageThreshold = "Zombi Amputasyon Hasar Eþiði", + Sandbox_TOC_ZombieAmputationDamageChance = "Zombi Amputasyon Hasar Þansý", +} diff --git a/common/media/lua/shared/Translate/TR/Tooltip_TR.txt b/common/media/lua/shared/Translate/TR/Tooltip_TR.txt new file mode 100644 index 0000000..0f14aa0 --- /dev/null +++ b/common/media/lua/shared/Translate/TR/Tooltip_TR.txt @@ -0,0 +1,10 @@ +Tooltip_TR = { + + Tooltip_Surgery_CantCauterize = "Yarayý daðlayamazsýn", + + Tooltip_Surgery_And = " ve ", + Tooltip_Surgery_TempTooLow = "Sýcaklýk hâlâ çok düþük", + Tooltip_Surgery_Coward = "Bunu yapacak cesaretin yok. KORKUYORSUN!", + Tooltip_Surgery_LimbNotFree = "Önce protezi çýkarman gerekiyor", + +} diff --git a/common/media/lua/shared/Translate/TR/UI_TR.txt b/common/media/lua/shared/Translate/TR/UI_TR.txt new file mode 100644 index 0000000..c1d66b6 --- /dev/null +++ b/common/media/lua/shared/Translate/TR/UI_TR.txt @@ -0,0 +1,15 @@ +UI_TR = { + UI_trait_Amputee_Hand = "Ampute Sol El", + UI_trait_Amputee_Hand_desc = "", + + UI_trait_Amputee_ForeArm = "Ampute Sol �n Kol", + UI_trait_Amputee_ForeArm_desc = "", + + UI_trait_Amputee_UpperArm = "Ampute Sol �st Kol", + UI_trait_Amputee_UpperArm_desc = "", + + UI_trait_Insensitive = "Hissiz", + UI_trait_Insensitive_desc = "", + + UI_Say_CantEquip = "Bunu bu �ekilde ku�anamam...", +} diff --git a/media/lua/shared/Translate/UA/ContextMenu_UA.txt b/common/media/lua/shared/Translate/UA/ContextMenu_UA.txt similarity index 97% rename from media/lua/shared/Translate/UA/ContextMenu_UA.txt rename to common/media/lua/shared/Translate/UA/ContextMenu_UA.txt index 74b5477..2381172 100644 --- a/media/lua/shared/Translate/UA/ContextMenu_UA.txt +++ b/common/media/lua/shared/Translate/UA/ContextMenu_UA.txt @@ -1,33 +1,33 @@ -ContextMenu_UA = { - ContextMenu_Amputate = "Àìïóòóâàòè", - ContextMenu_Amputate_Bandage = "Àìïóòóâàòè òà ïåðåâ'ÿçàòè", - ContextMenu_Amputate_Stitch = "Àìïóòóâàòè òà íàêëàñòè øâè", - ContextMenu_Amputate_Stitch_Bandage = "Àìïóòóâàòè, íàêëàñòè øâè òà ïåðåâ'ÿçàòè", - - ContextMenu_Cauterize = "Ïðèïåêòè", - - ContextMenu_Limb_Hand_L = "˳âà Ðóêà", - ContextMenu_Limb_ForeArm_L = "˳âå Ïåðåäïë³÷÷ÿ", - ContextMenu_Limb_UpperArm_L = "˳âå Ïëå÷å" - ContextMenu_Limb_Hand_R = "Ïðàâà Ðóêà", - ContextMenu_Limb_ForeArm_R = "Ïðàâå Ïåðåäïë³÷÷ÿ", - ContextMenu_Limb_UpperArm_R = "Ïðàâå Ïëå÷å", - - ContextMenu_InstallProstRight = "Óñòàíîâèòè ïðîòåç íà ïðàâó ðóêó", - ContextMenu_InstallProstLeft = "Óñòàíîâèòè ïðîòåç íà ë³âó ðóêó", - - ContextMenu_PutTourniquetArmLeft = "Íàêëàñòè äæãóò íà ë³âó ðóêó", - ContextMenu_PutTourniquetLegL = "Íàêëàñòè äæãóò íà ë³âó íîãó", - ContextMenu_PutTourniquetArmRight = "Íàêëàñòè äæãóò íà ïðàâó ðóêó", - ContextMenu_PutTourniquetLegR = "Íàêëàñòè äæãóò íà ïðàâó íîãó", - - - ContextMenu_CleanWound = "Î÷èñòèòè ðàíó", - - - - ContextMenu_Admin_TOC = "TOC", - ContextMenu_Admin_ResetTOC = "Ñêèíóòè Àìïóòàö³¿", - ContextMenu_Admin_ForceAmputation = "Ïðèìóñîâî Àìïóòóâàòè", - -} +ContextMenu_UA = { + ContextMenu_Amputate = "Àìïóòóâàòè", + ContextMenu_Amputate_Bandage = "Àìïóòóâàòè òà ïåðåâ'ÿçàòè", + ContextMenu_Amputate_Stitch = "Àìïóòóâàòè òà íàêëàñòè øâè", + ContextMenu_Amputate_Stitch_Bandage = "Àìïóòóâàòè, íàêëàñòè øâè òà ïåðåâ'ÿçàòè", + + ContextMenu_Cauterize = "Ïðèïåêòè", + + ContextMenu_Limb_Hand_L = "˳âà Ðóêà", + ContextMenu_Limb_ForeArm_L = "˳âå Ïåðåäïë³÷÷ÿ", + ContextMenu_Limb_UpperArm_L = "˳âå Ïëå÷å" + ContextMenu_Limb_Hand_R = "Ïðàâà Ðóêà", + ContextMenu_Limb_ForeArm_R = "Ïðàâå Ïåðåäïë³÷÷ÿ", + ContextMenu_Limb_UpperArm_R = "Ïðàâå Ïëå÷å", + + ContextMenu_InstallProstRight = "Óñòàíîâèòè ïðîòåç íà ïðàâó ðóêó", + ContextMenu_InstallProstLeft = "Óñòàíîâèòè ïðîòåç íà ë³âó ðóêó", + + ContextMenu_PutTourniquetArmLeft = "Íàêëàñòè äæãóò íà ë³âó ðóêó", + ContextMenu_PutTourniquetLegL = "Íàêëàñòè äæãóò íà ë³âó íîãó", + ContextMenu_PutTourniquetArmRight = "Íàêëàñòè äæãóò íà ïðàâó ðóêó", + ContextMenu_PutTourniquetLegR = "Íàêëàñòè äæãóò íà ïðàâó íîãó", + + + ContextMenu_CleanWound = "Î÷èñòèòè ðàíó", + + + + ContextMenu_Admin_TOC = "TOC", + ContextMenu_Admin_ResetTOC = "Ñêèíóòè Àìïóòàö³¿", + ContextMenu_Admin_ForceAmputation = "Ïðèìóñîâî Àìïóòóâàòè", + +} diff --git a/media/lua/shared/Translate/UA/IG_UI_UA.txt b/common/media/lua/shared/Translate/UA/IG_UI_UA.txt similarity index 97% rename from media/lua/shared/Translate/UA/IG_UI_UA.txt rename to common/media/lua/shared/Translate/UA/IG_UI_UA.txt index c32e243..e592ca0 100644 --- a/media/lua/shared/Translate/UA/IG_UI_UA.txt +++ b/common/media/lua/shared/Translate/UA/IG_UI_UA.txt @@ -1,18 +1,18 @@ -IG_UI_UA = { - IGUI_perks_Amputations = "Àìïóòàö³¿", - IGUI_perks_Side_R = "Ïðàâà ñòîðîíà", - IGUI_perks_Side_L = "˳âà ñòîðîíà", - IGUI_perks_Prosthesis = "Ïðîòåç", - IGUI_perks_ProstFamiliarity= "Ïðèñòîñîâàí³ñòü", - - IGUI_ItemCat_Prosthesis = "Ïðîòåç", - IGUI_ItemCat_Surgery = "Õ³ðóðã³ÿ", - IGUI_ItemCat_Amputation = "Àìïóòàö³ÿ" - - IGUI_HealthPanel_Cicatrization = "Ðóáöþâàííÿ", - IGUI_HealthPanel_Cicatrized = "Çàðóáöüîâàíà", - IGUI_HealthPanel_Cauterized = "Ïðèïå÷åíà", - IGUI_HealthPanel_WoundDirtyness = "Çàáðóäíåíà ðàíà", - IGUI_HealthPanel_ProstEquipped = "Ïðîòåç óñòàíîâëåíî", - +IG_UI_UA = { + IGUI_perks_Amputations = "Àìïóòàö³¿", + IGUI_perks_Side_R = "Ïðàâà ñòîðîíà", + IGUI_perks_Side_L = "˳âà ñòîðîíà", + IGUI_perks_Prosthesis = "Ïðîòåç", + IGUI_perks_ProstFamiliarity= "Ïðèñòîñîâàí³ñòü", + + IGUI_ItemCat_Prosthesis = "Ïðîòåç", + IGUI_ItemCat_Surgery = "Õ³ðóðã³ÿ", + IGUI_ItemCat_Amputation = "Àìïóòàö³ÿ" + + IGUI_HealthPanel_Cicatrization = "Ðóáöþâàííÿ", + IGUI_HealthPanel_Cicatrized = "Çàðóáöüîâàíà", + IGUI_HealthPanel_Cauterized = "Ïðèïå÷åíà", + IGUI_HealthPanel_WoundDirtyness = "Çàáðóäíåíà ðàíà", + IGUI_HealthPanel_ProstEquipped = "Ïðîòåç óñòàíîâëåíî", + } \ No newline at end of file diff --git a/media/lua/shared/Translate/UA/ItemName_UA.txt b/common/media/lua/shared/Translate/UA/ItemName_UA.txt similarity index 96% rename from media/lua/shared/Translate/UA/ItemName_UA.txt rename to common/media/lua/shared/Translate/UA/ItemName_UA.txt index 32a0a72..9b96e4c 100644 --- a/media/lua/shared/Translate/UA/ItemName_UA.txt +++ b/common/media/lua/shared/Translate/UA/ItemName_UA.txt @@ -1,11 +1,11 @@ -ItemName_UA = { - - ItemName_TOC.Surg_Arm_Tourniquet_L = "Äæãóò", - ItemName_TOC.Surg_Arm_Tourniquet_R = "Äæãóò", - - ItemName_TOC.Prost_NormalArm_L = "Ïðîòåç Ðóêè", - ItemName_TOC.Prost_NormalArm_R = "Ïðîòåç Ðóêè", - - ItemName_TOC.Prost_HookArm_L = "Ïðîòåç Ðóêè - Ãàê", - ItemName_TOC.Prost_HookArm_R = "Ïðîòåç Ðóêè - Ãàê", +ItemName_UA = { + + ItemName_TOC.Surg_Arm_Tourniquet_L = "Äæãóò", + ItemName_TOC.Surg_Arm_Tourniquet_R = "Äæãóò", + + ItemName_TOC.Prost_NormalArm_L = "Ïðîòåç Ðóêè", + ItemName_TOC.Prost_NormalArm_R = "Ïðîòåç Ðóêè", + + ItemName_TOC.Prost_HookArm_L = "Ïðîòåç Ðóêè - Ãàê", + ItemName_TOC.Prost_HookArm_R = "Ïðîòåç Ðóêè - Ãàê", } \ No newline at end of file diff --git a/media/lua/shared/Translate/UA/Recipes_UA.txt b/common/media/lua/shared/Translate/UA/Recipes_UA.txt similarity index 97% rename from media/lua/shared/Translate/UA/Recipes_UA.txt rename to common/media/lua/shared/Translate/UA/Recipes_UA.txt index c170f77..9bf3e3e 100644 --- a/media/lua/shared/Translate/UA/Recipes_UA.txt +++ b/common/media/lua/shared/Translate/UA/Recipes_UA.txt @@ -1,4 +1,4 @@ -Recipes_UA = { - Recipe_Craft_Prosthetic_Arm = "Ñòâîðèòè Ïðîòåç Ðóêè", - Recipe_Craft_Prosthetic_Hook = "Ñòâîðèòè Ïðîòåç Ðóêè - Ãàê", +Recipes_UA = { + Recipe_Craft_Prosthetic_Arm = "Ñòâîðèòè Ïðîòåç Ðóêè", + Recipe_Craft_Prosthetic_Hook = "Ñòâîðèòè Ïðîòåç Ðóêè - Ãàê", } \ No newline at end of file diff --git a/media/lua/shared/Translate/UA/Sandbox_UA.txt b/common/media/lua/shared/Translate/UA/Sandbox_UA.txt similarity index 98% rename from media/lua/shared/Translate/UA/Sandbox_UA.txt rename to common/media/lua/shared/Translate/UA/Sandbox_UA.txt index f4ec574..2da06e4 100644 --- a/media/lua/shared/Translate/UA/Sandbox_UA.txt +++ b/common/media/lua/shared/Translate/UA/Sandbox_UA.txt @@ -1,10 +1,10 @@ -Sandbox_UA = { - Sandbox_TOC = "The Only Cure", - Sandbox_TOC_CicatrizationSpeed = "Øâèäê³ñòü ðóáöþâàííÿ", - Sandbox_TOC_WoundDirtynessMultiplier = "Ìíîæíèê çàáðóäíåííÿ ðàíè", - Sandbox_TOC_SurgeonAbilityImportance = "Âàæëèâ³ñòü ìåäè÷íèõ íàâè÷îê ë³êàðÿ", - Sandbox_TOC_EnableZombieAmputations = "Óâ³ìêíóòè àìïóòàö³¿ çîìá³", - Sandbox_TOC_ZombieAmputationDamageThreshold = "Ïîð³ã øêîäè ïðè àìïóòàö³¿ çîìá³", - Sandbox_TOC_ZombieAmputationDamageChance = "Øàíñ íàíåñåííÿ øêîäè ïðè àìïóòàö³¿ çîìá³", - +Sandbox_UA = { + Sandbox_TOC = "The Only Cure", + Sandbox_TOC_CicatrizationSpeed = "Øâèäê³ñòü ðóáöþâàííÿ", + Sandbox_TOC_WoundDirtynessMultiplier = "Ìíîæíèê çàáðóäíåííÿ ðàíè", + Sandbox_TOC_SurgeonAbilityImportance = "Âàæëèâ³ñòü ìåäè÷íèõ íàâè÷îê ë³êàðÿ", + Sandbox_TOC_EnableZombieAmputations = "Óâ³ìêíóòè àìïóòàö³¿ çîìá³", + Sandbox_TOC_ZombieAmputationDamageThreshold = "Ïîð³ã øêîäè ïðè àìïóòàö³¿ çîìá³", + Sandbox_TOC_ZombieAmputationDamageChance = "Øàíñ íàíåñåííÿ øêîäè ïðè àìïóòàö³¿ çîìá³", + } \ No newline at end of file diff --git a/media/lua/shared/Translate/UA/Tooltip_UA.txt b/common/media/lua/shared/Translate/UA/Tooltip_UA.txt similarity index 96% rename from media/lua/shared/Translate/UA/Tooltip_UA.txt rename to common/media/lua/shared/Translate/UA/Tooltip_UA.txt index 1bc8ded..d88e781 100644 --- a/media/lua/shared/Translate/UA/Tooltip_UA.txt +++ b/common/media/lua/shared/Translate/UA/Tooltip_UA.txt @@ -1,10 +1,10 @@ -Tooltip_UA = { - - Tooltip_Surgery_CantCauterize = "Íå ìîæíà ïðèïåêòè ðàíó", - - Tooltip_Surgery_And = " òà " - Tooltip_Surgery_TempTooLow = "Òåìïåðàòóðà çàíàäòî íèçüêà", - Tooltip_Surgery_Coward = "Âàì íå âèñòà÷ຠñì³ëèâîñò³ çðîáèòè öå", - Tooltip_Surgery_LimbNotFree = "Ñïî÷àòêó íåîáõ³äíî çíÿòè ïðîòåç", - +Tooltip_UA = { + + Tooltip_Surgery_CantCauterize = "Íå ìîæíà ïðèïåêòè ðàíó", + + Tooltip_Surgery_And = " òà " + Tooltip_Surgery_TempTooLow = "Òåìïåðàòóðà çàíàäòî íèçüêà", + Tooltip_Surgery_Coward = "Âàì íå âèñòà÷ຠñì³ëèâîñò³ çðîáèòè öå", + Tooltip_Surgery_LimbNotFree = "Ñïî÷àòêó íåîáõ³äíî çíÿòè ïðîòåç", + } \ No newline at end of file diff --git a/media/lua/shared/Translate/UA/UI_UA.txt b/common/media/lua/shared/Translate/UA/UI_UA.txt similarity index 96% rename from media/lua/shared/Translate/UA/UI_UA.txt rename to common/media/lua/shared/Translate/UA/UI_UA.txt index 23087d4..1b80484 100644 --- a/media/lua/shared/Translate/UA/UI_UA.txt +++ b/common/media/lua/shared/Translate/UA/UI_UA.txt @@ -1,16 +1,16 @@ -UI_UA = { - UI_trait_Amputee_Hand = "Àìïóòîâàíà ˳âà Ðóêà", - UI_trait_Amputee_Hand_desc = "", - - UI_trait_Amputee_ForeArm = "Àìïóòîâàíå ˳âå Ïåðåäïë³÷÷ÿ", - UI_trait_Amputee_ForeArm_desc = "", - - UI_trait_Amputee_UpperArm = "Àìïóòîâàíå ˳âå Ïëå÷å", - UI_trait_Amputee_UpperArm_desc = "", - - UI_trait_Insensitive = "Íå÷óòëèâèé", - UI_trait_Insensitive_desc = "", - - - UI_Say_CantEquip = "ß íå ìîæó âñòàíîâèòè öå òàêèì ÷èíîì..." +UI_UA = { + UI_trait_Amputee_Hand = "Àìïóòîâàíà ˳âà Ðóêà", + UI_trait_Amputee_Hand_desc = "", + + UI_trait_Amputee_ForeArm = "Àìïóòîâàíå ˳âå Ïåðåäïë³÷÷ÿ", + UI_trait_Amputee_ForeArm_desc = "", + + UI_trait_Amputee_UpperArm = "Àìïóòîâàíå ˳âå Ïëå÷å", + UI_trait_Amputee_UpperArm_desc = "", + + UI_trait_Insensitive = "Íå÷óòëèâèé", + UI_trait_Insensitive_desc = "", + + + UI_Say_CantEquip = "ß íå ìîæó âñòàíîâèòè öå òàêèì ÷èíîì..." } \ No newline at end of file diff --git a/media/models_X/Amputation/Amputation_GenericModel.fbx b/common/media/models_X/Amputation/Amputation_GenericModel.fbx similarity index 100% rename from media/models_X/Amputation/Amputation_GenericModel.fbx rename to common/media/models_X/Amputation/Amputation_GenericModel.fbx diff --git a/media/models_X/Amputation/Amputation_Left_Hand_Female.fbx b/common/media/models_X/Amputation/Amputation_Left_Hand_Female.fbx similarity index 100% rename from media/models_X/Amputation/Amputation_Left_Hand_Female.fbx rename to common/media/models_X/Amputation/Amputation_Left_Hand_Female.fbx diff --git a/media/models_X/Amputation/Amputation_Left_Hand_Male.fbx b/common/media/models_X/Amputation/Amputation_Left_Hand_Male.fbx similarity index 100% rename from media/models_X/Amputation/Amputation_Left_Hand_Male.fbx rename to common/media/models_X/Amputation/Amputation_Left_Hand_Male.fbx diff --git a/media/models_X/Amputation/Amputation_Left_LowerArm_Female.fbx b/common/media/models_X/Amputation/Amputation_Left_LowerArm_Female.fbx similarity index 100% rename from media/models_X/Amputation/Amputation_Left_LowerArm_Female.fbx rename to common/media/models_X/Amputation/Amputation_Left_LowerArm_Female.fbx diff --git a/media/models_X/Amputation/Amputation_Left_LowerArm_Male.fbx b/common/media/models_X/Amputation/Amputation_Left_LowerArm_Male.fbx similarity index 100% rename from media/models_X/Amputation/Amputation_Left_LowerArm_Male.fbx rename to common/media/models_X/Amputation/Amputation_Left_LowerArm_Male.fbx diff --git a/media/models_X/Amputation/Amputation_Left_UpperArm_Female.fbx b/common/media/models_X/Amputation/Amputation_Left_UpperArm_Female.fbx similarity index 100% rename from media/models_X/Amputation/Amputation_Left_UpperArm_Female.fbx rename to common/media/models_X/Amputation/Amputation_Left_UpperArm_Female.fbx diff --git a/media/models_X/Amputation/Amputation_Left_UpperArm_Male.fbx b/common/media/models_X/Amputation/Amputation_Left_UpperArm_Male.fbx similarity index 100% rename from media/models_X/Amputation/Amputation_Left_UpperArm_Male.fbx rename to common/media/models_X/Amputation/Amputation_Left_UpperArm_Male.fbx diff --git a/media/models_X/Amputation/Amputation_Right_Hand_Female.fbx b/common/media/models_X/Amputation/Amputation_Right_Hand_Female.fbx similarity index 100% rename from media/models_X/Amputation/Amputation_Right_Hand_Female.fbx rename to common/media/models_X/Amputation/Amputation_Right_Hand_Female.fbx diff --git a/media/models_X/Amputation/Amputation_Right_Hand_Male.fbx b/common/media/models_X/Amputation/Amputation_Right_Hand_Male.fbx similarity index 100% rename from media/models_X/Amputation/Amputation_Right_Hand_Male.fbx rename to common/media/models_X/Amputation/Amputation_Right_Hand_Male.fbx diff --git a/media/models_X/Amputation/Amputation_Right_LowerArm_Female.fbx b/common/media/models_X/Amputation/Amputation_Right_LowerArm_Female.fbx similarity index 100% rename from media/models_X/Amputation/Amputation_Right_LowerArm_Female.fbx rename to common/media/models_X/Amputation/Amputation_Right_LowerArm_Female.fbx diff --git a/media/models_X/Amputation/Amputation_Right_LowerArm_Male.fbx b/common/media/models_X/Amputation/Amputation_Right_LowerArm_Male.fbx similarity index 100% rename from media/models_X/Amputation/Amputation_Right_LowerArm_Male.fbx rename to common/media/models_X/Amputation/Amputation_Right_LowerArm_Male.fbx diff --git a/media/models_X/Amputation/Amputation_Right_UpperArm_Female.fbx b/common/media/models_X/Amputation/Amputation_Right_UpperArm_Female.fbx similarity index 100% rename from media/models_X/Amputation/Amputation_Right_UpperArm_Female.fbx rename to common/media/models_X/Amputation/Amputation_Right_UpperArm_Female.fbx diff --git a/media/models_X/Amputation/Amputation_Right_UpperArm_Male.fbx b/common/media/models_X/Amputation/Amputation_Right_UpperArm_Male.fbx similarity index 100% rename from media/models_X/Amputation/Amputation_Right_UpperArm_Male.fbx rename to common/media/models_X/Amputation/Amputation_Right_UpperArm_Male.fbx diff --git a/media/models_X/Prosthesis/hookArm_Ground.fbx b/common/media/models_X/Prosthesis/hookArm_Ground.fbx similarity index 100% rename from media/models_X/Prosthesis/hookArm_Ground.fbx rename to common/media/models_X/Prosthesis/hookArm_Ground.fbx diff --git a/media/models_X/Prosthesis/hookArm_L_F.fbx b/common/media/models_X/Prosthesis/hookArm_L_F.fbx similarity index 100% rename from media/models_X/Prosthesis/hookArm_L_F.fbx rename to common/media/models_X/Prosthesis/hookArm_L_F.fbx diff --git a/media/models_X/Prosthesis/hookArm_L_M.fbx b/common/media/models_X/Prosthesis/hookArm_L_M.fbx similarity index 100% rename from media/models_X/Prosthesis/hookArm_L_M.fbx rename to common/media/models_X/Prosthesis/hookArm_L_M.fbx diff --git a/media/models_X/Prosthesis/hookArm_R_F.fbx b/common/media/models_X/Prosthesis/hookArm_R_F.fbx similarity index 100% rename from media/models_X/Prosthesis/hookArm_R_F.fbx rename to common/media/models_X/Prosthesis/hookArm_R_F.fbx diff --git a/media/models_X/Prosthesis/hookArm_R_M.fbx b/common/media/models_X/Prosthesis/hookArm_R_M.fbx similarity index 100% rename from media/models_X/Prosthesis/hookArm_R_M.fbx rename to common/media/models_X/Prosthesis/hookArm_R_M.fbx diff --git a/media/models_X/Prosthesis/normalArm_Ground.fbx b/common/media/models_X/Prosthesis/normalArm_Ground.fbx similarity index 100% rename from media/models_X/Prosthesis/normalArm_Ground.fbx rename to common/media/models_X/Prosthesis/normalArm_Ground.fbx diff --git a/media/models_X/Prosthesis/normalArm_L_F.fbx b/common/media/models_X/Prosthesis/normalArm_L_F.fbx similarity index 100% rename from media/models_X/Prosthesis/normalArm_L_F.fbx rename to common/media/models_X/Prosthesis/normalArm_L_F.fbx diff --git a/media/models_X/Prosthesis/normalArm_L_M.fbx b/common/media/models_X/Prosthesis/normalArm_L_M.fbx similarity index 100% rename from media/models_X/Prosthesis/normalArm_L_M.fbx rename to common/media/models_X/Prosthesis/normalArm_L_M.fbx diff --git a/media/models_X/Prosthesis/normalArm_R_F.fbx b/common/media/models_X/Prosthesis/normalArm_R_F.fbx similarity index 100% rename from media/models_X/Prosthesis/normalArm_R_F.fbx rename to common/media/models_X/Prosthesis/normalArm_R_F.fbx diff --git a/media/models_X/Prosthesis/normalArm_R_M.fbx b/common/media/models_X/Prosthesis/normalArm_R_M.fbx similarity index 100% rename from media/models_X/Prosthesis/normalArm_R_M.fbx rename to common/media/models_X/Prosthesis/normalArm_R_M.fbx diff --git a/media/models_X/Surgery/Tourniquet_Ground.fbx b/common/media/models_X/Surgery/Tourniquet_Ground.fbx similarity index 100% rename from media/models_X/Surgery/Tourniquet_Ground.fbx rename to common/media/models_X/Surgery/Tourniquet_Ground.fbx diff --git a/media/models_X/Surgery/Tourniquet_Left.fbx b/common/media/models_X/Surgery/Tourniquet_Left.fbx similarity index 100% rename from media/models_X/Surgery/Tourniquet_Left.fbx rename to common/media/models_X/Surgery/Tourniquet_Left.fbx diff --git a/media/models_X/Surgery/Tourniquet_Right.fbx b/common/media/models_X/Surgery/Tourniquet_Right.fbx similarity index 100% rename from media/models_X/Surgery/Tourniquet_Right.fbx rename to common/media/models_X/Surgery/Tourniquet_Right.fbx diff --git a/media/perks.txt b/common/media/perks.txt similarity index 77% rename from media/perks.txt rename to common/media/perks.txt index e264e83..c585ff1 100644 --- a/media/perks.txt +++ b/common/media/perks.txt @@ -52,27 +52,11 @@ perk Side_R } -perk Prosthesis -{ - parent = None, - translation = Prosthesis, - passive = false, - xp1 = 0, - xp2 = 0, - xp3 = 0, - xp4 = 0, - xp5 = 0, - xp6 = 0, - xp7 = 0, - xp8 = 0, - xp9 = 0, - xp10 = 0, -} perk ProstFamiliarity { - parent = Prosthesis, - name = ProstFamiliarity, - translation = ProstFamiliarity, + parent = Amputations, + name = Prosthesis, + translation = Prosthesis, passive = false, xp1 = 50, xp2 = 100, diff --git a/media/sandbox-options.txt b/common/media/sandbox-options.txt similarity index 100% rename from media/sandbox-options.txt rename to common/media/sandbox-options.txt diff --git a/media/scripts/TOC_amputation_items.txt b/common/media/scripts/TOC_amputation_items.txt similarity index 100% rename from media/scripts/TOC_amputation_items.txt rename to common/media/scripts/TOC_amputation_items.txt diff --git a/media/scripts/TOC_models.txt b/common/media/scripts/TOC_models.txt similarity index 100% rename from media/scripts/TOC_models.txt rename to common/media/scripts/TOC_models.txt diff --git a/media/scripts/TOC_prosthesis_items.txt b/common/media/scripts/TOC_prosthesis_items.txt similarity index 100% rename from media/scripts/TOC_prosthesis_items.txt rename to common/media/scripts/TOC_prosthesis_items.txt diff --git a/media/scripts/TOC_recipes.txt b/common/media/scripts/TOC_recipes.txt similarity index 100% rename from media/scripts/TOC_recipes.txt rename to common/media/scripts/TOC_recipes.txt diff --git a/media/scripts/TOC_sounds.txt b/common/media/scripts/TOC_sounds.txt similarity index 100% rename from media/scripts/TOC_sounds.txt rename to common/media/scripts/TOC_sounds.txt diff --git a/media/scripts/TOC_surgery_items.txt b/common/media/scripts/TOC_surgery_items.txt similarity index 100% rename from media/scripts/TOC_surgery_items.txt rename to common/media/scripts/TOC_surgery_items.txt diff --git a/media/sound/Amputation.ogg b/common/media/sound/Amputation.ogg similarity index 100% rename from media/sound/Amputation.ogg rename to common/media/sound/Amputation.ogg diff --git a/media/sound/Cauterization.ogg b/common/media/sound/Cauterization.ogg similarity index 100% rename from media/sound/Cauterization.ogg rename to common/media/sound/Cauterization.ogg diff --git a/media/textures/Amputations/Human/Forearm/skin01_b.png b/common/media/textures/Amputations/Human/Forearm/skin01_b.png similarity index 100% rename from media/textures/Amputations/Human/Forearm/skin01_b.png rename to common/media/textures/Amputations/Human/Forearm/skin01_b.png diff --git a/media/textures/Amputations/Human/Forearm/skin01_hairy_b.png b/common/media/textures/Amputations/Human/Forearm/skin01_hairy_b.png similarity index 100% rename from media/textures/Amputations/Human/Forearm/skin01_hairy_b.png rename to common/media/textures/Amputations/Human/Forearm/skin01_hairy_b.png diff --git a/media/textures/Amputations/Human/Forearm/skin02_b.png b/common/media/textures/Amputations/Human/Forearm/skin02_b.png similarity index 100% rename from media/textures/Amputations/Human/Forearm/skin02_b.png rename to common/media/textures/Amputations/Human/Forearm/skin02_b.png diff --git a/media/textures/Amputations/Human/Forearm/skin02_hairy_b.png b/common/media/textures/Amputations/Human/Forearm/skin02_hairy_b.png similarity index 100% rename from media/textures/Amputations/Human/Forearm/skin02_hairy_b.png rename to common/media/textures/Amputations/Human/Forearm/skin02_hairy_b.png diff --git a/media/textures/Amputations/Human/Forearm/skin03_b.png b/common/media/textures/Amputations/Human/Forearm/skin03_b.png similarity index 100% rename from media/textures/Amputations/Human/Forearm/skin03_b.png rename to common/media/textures/Amputations/Human/Forearm/skin03_b.png diff --git a/media/textures/Amputations/Human/Forearm/skin03_hairy_b.png b/common/media/textures/Amputations/Human/Forearm/skin03_hairy_b.png similarity index 100% rename from media/textures/Amputations/Human/Forearm/skin03_hairy_b.png rename to common/media/textures/Amputations/Human/Forearm/skin03_hairy_b.png diff --git a/media/textures/Amputations/Human/Forearm/skin04_b.png b/common/media/textures/Amputations/Human/Forearm/skin04_b.png similarity index 100% rename from media/textures/Amputations/Human/Forearm/skin04_b.png rename to common/media/textures/Amputations/Human/Forearm/skin04_b.png diff --git a/media/textures/Amputations/Human/Forearm/skin04_hairy_b.png b/common/media/textures/Amputations/Human/Forearm/skin04_hairy_b.png similarity index 100% rename from media/textures/Amputations/Human/Forearm/skin04_hairy_b.png rename to common/media/textures/Amputations/Human/Forearm/skin04_hairy_b.png diff --git a/media/textures/Amputations/Human/Forearm/skin05_b.png b/common/media/textures/Amputations/Human/Forearm/skin05_b.png similarity index 100% rename from media/textures/Amputations/Human/Forearm/skin05_b.png rename to common/media/textures/Amputations/Human/Forearm/skin05_b.png diff --git a/media/textures/Amputations/Human/Forearm/skin05_hairy_b.png b/common/media/textures/Amputations/Human/Forearm/skin05_hairy_b.png similarity index 100% rename from media/textures/Amputations/Human/Forearm/skin05_hairy_b.png rename to common/media/textures/Amputations/Human/Forearm/skin05_hairy_b.png diff --git a/media/textures/Amputations/Human/Upperarm/skin01_b.png b/common/media/textures/Amputations/Human/Upperarm/skin01_b.png similarity index 100% rename from media/textures/Amputations/Human/Upperarm/skin01_b.png rename to common/media/textures/Amputations/Human/Upperarm/skin01_b.png diff --git a/media/textures/Amputations/Human/Upperarm/skin01_hairy_b.png b/common/media/textures/Amputations/Human/Upperarm/skin01_hairy_b.png similarity index 100% rename from media/textures/Amputations/Human/Upperarm/skin01_hairy_b.png rename to common/media/textures/Amputations/Human/Upperarm/skin01_hairy_b.png diff --git a/media/textures/Amputations/Human/Upperarm/skin02_b.png b/common/media/textures/Amputations/Human/Upperarm/skin02_b.png similarity index 100% rename from media/textures/Amputations/Human/Upperarm/skin02_b.png rename to common/media/textures/Amputations/Human/Upperarm/skin02_b.png diff --git a/media/textures/Amputations/Human/Upperarm/skin02_hairy_b.png b/common/media/textures/Amputations/Human/Upperarm/skin02_hairy_b.png similarity index 100% rename from media/textures/Amputations/Human/Upperarm/skin02_hairy_b.png rename to common/media/textures/Amputations/Human/Upperarm/skin02_hairy_b.png diff --git a/media/textures/Amputations/Human/Upperarm/skin03_b.png b/common/media/textures/Amputations/Human/Upperarm/skin03_b.png similarity index 100% rename from media/textures/Amputations/Human/Upperarm/skin03_b.png rename to common/media/textures/Amputations/Human/Upperarm/skin03_b.png diff --git a/media/textures/Amputations/Human/Upperarm/skin03_hairy_b.png b/common/media/textures/Amputations/Human/Upperarm/skin03_hairy_b.png similarity index 100% rename from media/textures/Amputations/Human/Upperarm/skin03_hairy_b.png rename to common/media/textures/Amputations/Human/Upperarm/skin03_hairy_b.png diff --git a/media/textures/Amputations/Human/Upperarm/skin04_b.png b/common/media/textures/Amputations/Human/Upperarm/skin04_b.png similarity index 100% rename from media/textures/Amputations/Human/Upperarm/skin04_b.png rename to common/media/textures/Amputations/Human/Upperarm/skin04_b.png diff --git a/media/textures/Amputations/Human/Upperarm/skin04_hairy_b.png b/common/media/textures/Amputations/Human/Upperarm/skin04_hairy_b.png similarity index 100% rename from media/textures/Amputations/Human/Upperarm/skin04_hairy_b.png rename to common/media/textures/Amputations/Human/Upperarm/skin04_hairy_b.png diff --git a/media/textures/Amputations/Human/Upperarm/skin05_b.png b/common/media/textures/Amputations/Human/Upperarm/skin05_b.png similarity index 100% rename from media/textures/Amputations/Human/Upperarm/skin05_b.png rename to common/media/textures/Amputations/Human/Upperarm/skin05_b.png diff --git a/media/textures/Amputations/Human/Upperarm/skin05_hairy_b.png b/common/media/textures/Amputations/Human/Upperarm/skin05_hairy_b.png similarity index 100% rename from media/textures/Amputations/Human/Upperarm/skin05_hairy_b.png rename to common/media/textures/Amputations/Human/Upperarm/skin05_hairy_b.png diff --git a/media/textures/Amputations/Masks/LeftArm.png b/common/media/textures/Amputations/Masks/LeftArm.png similarity index 100% rename from media/textures/Amputations/Masks/LeftArm.png rename to common/media/textures/Amputations/Masks/LeftArm.png diff --git a/media/textures/Amputations/Masks/LeftHand.png b/common/media/textures/Amputations/Masks/LeftHand.png similarity index 100% rename from media/textures/Amputations/Masks/LeftHand.png rename to common/media/textures/Amputations/Masks/LeftHand.png diff --git a/media/textures/Amputations/Masks/Mask.png b/common/media/textures/Amputations/Masks/Mask.png similarity index 100% rename from media/textures/Amputations/Masks/Mask.png rename to common/media/textures/Amputations/Masks/Mask.png diff --git a/media/textures/Amputations/Masks/RightArm.png b/common/media/textures/Amputations/Masks/RightArm.png similarity index 100% rename from media/textures/Amputations/Masks/RightArm.png rename to common/media/textures/Amputations/Masks/RightArm.png diff --git a/media/textures/Amputations/Masks/RightHand.png b/common/media/textures/Amputations/Masks/RightHand.png similarity index 100% rename from media/textures/Amputations/Masks/RightHand.png rename to common/media/textures/Amputations/Masks/RightHand.png diff --git a/media/textures/Amputations/Zombie/Forearm/z_skin01_l1.png b/common/media/textures/Amputations/Zombie/Forearm/z_skin01_l1.png similarity index 100% rename from media/textures/Amputations/Zombie/Forearm/z_skin01_l1.png rename to common/media/textures/Amputations/Zombie/Forearm/z_skin01_l1.png diff --git a/media/textures/Amputations/Zombie/Forearm/z_skin01_l2.png b/common/media/textures/Amputations/Zombie/Forearm/z_skin01_l2.png similarity index 100% rename from media/textures/Amputations/Zombie/Forearm/z_skin01_l2.png rename to common/media/textures/Amputations/Zombie/Forearm/z_skin01_l2.png diff --git a/media/textures/Amputations/Zombie/Forearm/z_skin01_l3.png b/common/media/textures/Amputations/Zombie/Forearm/z_skin01_l3.png similarity index 100% rename from media/textures/Amputations/Zombie/Forearm/z_skin01_l3.png rename to common/media/textures/Amputations/Zombie/Forearm/z_skin01_l3.png diff --git a/media/textures/Amputations/Zombie/Forearm/z_skin02_l1.png b/common/media/textures/Amputations/Zombie/Forearm/z_skin02_l1.png similarity index 100% rename from media/textures/Amputations/Zombie/Forearm/z_skin02_l1.png rename to common/media/textures/Amputations/Zombie/Forearm/z_skin02_l1.png diff --git a/media/textures/Amputations/Zombie/Forearm/z_skin02_l2.png b/common/media/textures/Amputations/Zombie/Forearm/z_skin02_l2.png similarity index 100% rename from media/textures/Amputations/Zombie/Forearm/z_skin02_l2.png rename to common/media/textures/Amputations/Zombie/Forearm/z_skin02_l2.png diff --git a/media/textures/Amputations/Zombie/Forearm/z_skin02_l3.png b/common/media/textures/Amputations/Zombie/Forearm/z_skin02_l3.png similarity index 100% rename from media/textures/Amputations/Zombie/Forearm/z_skin02_l3.png rename to common/media/textures/Amputations/Zombie/Forearm/z_skin02_l3.png diff --git a/media/textures/Amputations/Zombie/Forearm/z_skin03_l1.png b/common/media/textures/Amputations/Zombie/Forearm/z_skin03_l1.png similarity index 100% rename from media/textures/Amputations/Zombie/Forearm/z_skin03_l1.png rename to common/media/textures/Amputations/Zombie/Forearm/z_skin03_l1.png diff --git a/media/textures/Amputations/Zombie/Forearm/z_skin03_l2.png b/common/media/textures/Amputations/Zombie/Forearm/z_skin03_l2.png similarity index 100% rename from media/textures/Amputations/Zombie/Forearm/z_skin03_l2.png rename to common/media/textures/Amputations/Zombie/Forearm/z_skin03_l2.png diff --git a/media/textures/Amputations/Zombie/Forearm/z_skin03_l3.png b/common/media/textures/Amputations/Zombie/Forearm/z_skin03_l3.png similarity index 100% rename from media/textures/Amputations/Zombie/Forearm/z_skin03_l3.png rename to common/media/textures/Amputations/Zombie/Forearm/z_skin03_l3.png diff --git a/media/textures/Amputations/Zombie/Forearm/z_skin04_l1.png b/common/media/textures/Amputations/Zombie/Forearm/z_skin04_l1.png similarity index 100% rename from media/textures/Amputations/Zombie/Forearm/z_skin04_l1.png rename to common/media/textures/Amputations/Zombie/Forearm/z_skin04_l1.png diff --git a/media/textures/Amputations/Zombie/Forearm/z_skin04_l2.png b/common/media/textures/Amputations/Zombie/Forearm/z_skin04_l2.png similarity index 100% rename from media/textures/Amputations/Zombie/Forearm/z_skin04_l2.png rename to common/media/textures/Amputations/Zombie/Forearm/z_skin04_l2.png diff --git a/media/textures/Amputations/Zombie/Forearm/z_skin04_l3.png b/common/media/textures/Amputations/Zombie/Forearm/z_skin04_l3.png similarity index 100% rename from media/textures/Amputations/Zombie/Forearm/z_skin04_l3.png rename to common/media/textures/Amputations/Zombie/Forearm/z_skin04_l3.png diff --git a/media/textures/Amputations/Zombie/Upperarm/z_skin01_l1.png b/common/media/textures/Amputations/Zombie/Upperarm/z_skin01_l1.png similarity index 100% rename from media/textures/Amputations/Zombie/Upperarm/z_skin01_l1.png rename to common/media/textures/Amputations/Zombie/Upperarm/z_skin01_l1.png diff --git a/media/textures/Amputations/Zombie/Upperarm/z_skin01_l2.png b/common/media/textures/Amputations/Zombie/Upperarm/z_skin01_l2.png similarity index 100% rename from media/textures/Amputations/Zombie/Upperarm/z_skin01_l2.png rename to common/media/textures/Amputations/Zombie/Upperarm/z_skin01_l2.png diff --git a/media/textures/Amputations/Zombie/Upperarm/z_skin01_l3.png b/common/media/textures/Amputations/Zombie/Upperarm/z_skin01_l3.png similarity index 100% rename from media/textures/Amputations/Zombie/Upperarm/z_skin01_l3.png rename to common/media/textures/Amputations/Zombie/Upperarm/z_skin01_l3.png diff --git a/media/textures/Amputations/Zombie/Upperarm/z_skin02_l1.png b/common/media/textures/Amputations/Zombie/Upperarm/z_skin02_l1.png similarity index 100% rename from media/textures/Amputations/Zombie/Upperarm/z_skin02_l1.png rename to common/media/textures/Amputations/Zombie/Upperarm/z_skin02_l1.png diff --git a/media/textures/Amputations/Zombie/Upperarm/z_skin02_l2.png b/common/media/textures/Amputations/Zombie/Upperarm/z_skin02_l2.png similarity index 100% rename from media/textures/Amputations/Zombie/Upperarm/z_skin02_l2.png rename to common/media/textures/Amputations/Zombie/Upperarm/z_skin02_l2.png diff --git a/media/textures/Amputations/Zombie/Upperarm/z_skin02_l3.png b/common/media/textures/Amputations/Zombie/Upperarm/z_skin02_l3.png similarity index 100% rename from media/textures/Amputations/Zombie/Upperarm/z_skin02_l3.png rename to common/media/textures/Amputations/Zombie/Upperarm/z_skin02_l3.png diff --git a/media/textures/Amputations/Zombie/Upperarm/z_skin03_l1.png b/common/media/textures/Amputations/Zombie/Upperarm/z_skin03_l1.png similarity index 100% rename from media/textures/Amputations/Zombie/Upperarm/z_skin03_l1.png rename to common/media/textures/Amputations/Zombie/Upperarm/z_skin03_l1.png diff --git a/media/textures/Amputations/Zombie/Upperarm/z_skin03_l2.png b/common/media/textures/Amputations/Zombie/Upperarm/z_skin03_l2.png similarity index 100% rename from media/textures/Amputations/Zombie/Upperarm/z_skin03_l2.png rename to common/media/textures/Amputations/Zombie/Upperarm/z_skin03_l2.png diff --git a/media/textures/Amputations/Zombie/Upperarm/z_skin03_l3.png b/common/media/textures/Amputations/Zombie/Upperarm/z_skin03_l3.png similarity index 100% rename from media/textures/Amputations/Zombie/Upperarm/z_skin03_l3.png rename to common/media/textures/Amputations/Zombie/Upperarm/z_skin03_l3.png diff --git a/media/textures/Amputations/Zombie/Upperarm/z_skin04_l1.png b/common/media/textures/Amputations/Zombie/Upperarm/z_skin04_l1.png similarity index 100% rename from media/textures/Amputations/Zombie/Upperarm/z_skin04_l1.png rename to common/media/textures/Amputations/Zombie/Upperarm/z_skin04_l1.png diff --git a/media/textures/Amputations/Zombie/Upperarm/z_skin04_l2.png b/common/media/textures/Amputations/Zombie/Upperarm/z_skin04_l2.png similarity index 100% rename from media/textures/Amputations/Zombie/Upperarm/z_skin04_l2.png rename to common/media/textures/Amputations/Zombie/Upperarm/z_skin04_l2.png diff --git a/media/textures/Amputations/Zombie/Upperarm/z_skin04_l3.png b/common/media/textures/Amputations/Zombie/Upperarm/z_skin04_l3.png similarity index 100% rename from media/textures/Amputations/Zombie/Upperarm/z_skin04_l3.png rename to common/media/textures/Amputations/Zombie/Upperarm/z_skin04_l3.png diff --git a/media/textures/Prosthesis/hookArm.png b/common/media/textures/Prosthesis/hookArm.png similarity index 100% rename from media/textures/Prosthesis/hookArm.png rename to common/media/textures/Prosthesis/hookArm.png diff --git a/media/textures/Prosthesis/normalArm.png b/common/media/textures/Prosthesis/normalArm.png similarity index 100% rename from media/textures/Prosthesis/normalArm.png rename to common/media/textures/Prosthesis/normalArm.png diff --git a/media/textures/Surgery/tourniquet.png b/common/media/textures/Surgery/tourniquet.png similarity index 100% rename from media/textures/Surgery/tourniquet.png rename to common/media/textures/Surgery/tourniquet.png diff --git a/media/textures/item_armProsthetic.png b/common/media/textures/item_armProsthetic.png similarity index 100% rename from media/textures/item_armProsthetic.png rename to common/media/textures/item_armProsthetic.png diff --git a/media/textures/item_tourniquet.png b/common/media/textures/item_tourniquet.png similarity index 100% rename from media/textures/item_tourniquet.png rename to common/media/textures/item_tourniquet.png diff --git a/common/media/ui/Female/ForeArm_L.png b/common/media/ui/Female/ForeArm_L.png new file mode 100644 index 0000000..1902325 Binary files /dev/null and b/common/media/ui/Female/ForeArm_L.png differ diff --git a/common/media/ui/Female/ForeArm_R.png b/common/media/ui/Female/ForeArm_R.png new file mode 100644 index 0000000..caa8607 Binary files /dev/null and b/common/media/ui/Female/ForeArm_R.png differ diff --git a/common/media/ui/Female/Hand_L.png b/common/media/ui/Female/Hand_L.png new file mode 100644 index 0000000..c473072 Binary files /dev/null and b/common/media/ui/Female/Hand_L.png differ diff --git a/common/media/ui/Female/Hand_R.png b/common/media/ui/Female/Hand_R.png new file mode 100644 index 0000000..e338f69 Binary files /dev/null and b/common/media/ui/Female/Hand_R.png differ diff --git a/common/media/ui/Female/UpperArm_L.png b/common/media/ui/Female/UpperArm_L.png new file mode 100644 index 0000000..bcf269a Binary files /dev/null and b/common/media/ui/Female/UpperArm_L.png differ diff --git a/common/media/ui/Female/UpperArm_R.png b/common/media/ui/Female/UpperArm_R.png new file mode 100644 index 0000000..5b605dd Binary files /dev/null and b/common/media/ui/Female/UpperArm_R.png differ diff --git a/media/ui/Male/ForeArm_L.png b/common/media/ui/Male/ForeArm_L.png similarity index 100% rename from media/ui/Male/ForeArm_L.png rename to common/media/ui/Male/ForeArm_L.png diff --git a/media/ui/Male/ForeArm_R.png b/common/media/ui/Male/ForeArm_R.png similarity index 100% rename from media/ui/Male/ForeArm_R.png rename to common/media/ui/Male/ForeArm_R.png diff --git a/media/ui/Male/Hand_L.png b/common/media/ui/Male/Hand_L.png similarity index 100% rename from media/ui/Male/Hand_L.png rename to common/media/ui/Male/Hand_L.png diff --git a/media/ui/Male/Hand_R.png b/common/media/ui/Male/Hand_R.png similarity index 100% rename from media/ui/Male/Hand_R.png rename to common/media/ui/Male/Hand_R.png diff --git a/media/ui/Male/UpperArm_L.png b/common/media/ui/Male/UpperArm_L.png similarity index 100% rename from media/ui/Male/UpperArm_L.png rename to common/media/ui/Male/UpperArm_L.png diff --git a/media/ui/Male/UpperArm_R.png b/common/media/ui/Male/UpperArm_R.png similarity index 100% rename from media/ui/Male/UpperArm_R.png rename to common/media/ui/Male/UpperArm_R.png diff --git a/media/ui/ProstArm_L.png b/common/media/ui/ProstArm_L.png similarity index 100% rename from media/ui/ProstArm_L.png rename to common/media/ui/ProstArm_L.png diff --git a/media/ui/ProstArm_R.png b/common/media/ui/ProstArm_R.png similarity index 100% rename from media/ui/ProstArm_R.png rename to common/media/ui/ProstArm_R.png diff --git a/media/ui/Traits/trait_Amputee_ForeArm.png b/common/media/ui/Traits/trait_Amputee_ForeArm.png similarity index 100% rename from media/ui/Traits/trait_Amputee_ForeArm.png rename to common/media/ui/Traits/trait_Amputee_ForeArm.png diff --git a/media/ui/Traits/trait_Amputee_Hand.png b/common/media/ui/Traits/trait_Amputee_Hand.png similarity index 100% rename from media/ui/Traits/trait_Amputee_Hand.png rename to common/media/ui/Traits/trait_Amputee_Hand.png diff --git a/media/ui/Traits/trait_Amputee_UpperArm.png b/common/media/ui/Traits/trait_Amputee_UpperArm.png similarity index 100% rename from media/ui/Traits/trait_Amputee_UpperArm.png rename to common/media/ui/Traits/trait_Amputee_UpperArm.png diff --git a/media/ui/Traits/trait_insensitive.png b/common/media/ui/Traits/trait_insensitive.png similarity index 100% rename from media/ui/Traits/trait_insensitive.png rename to common/media/ui/Traits/trait_insensitive.png diff --git a/media/ui/male_base_test.png b/common/media/ui/male_base_test.png similarity index 100% rename from media/ui/male_base_test.png rename to common/media/ui/male_base_test.png diff --git a/common/media/ui/test.png b/common/media/ui/test.png new file mode 100644 index 0000000..1b80611 Binary files /dev/null and b/common/media/ui/test.png differ diff --git a/common/media/ui/test_pattern.png b/common/media/ui/test_pattern.png new file mode 100644 index 0000000..8bd9be4 Binary files /dev/null and b/common/media/ui/test_pattern.png differ diff --git a/dev_stuff/healthPanelFixFemale.psd b/dev_stuff/healthPanelFixFemale.psd new file mode 100644 index 0000000..330d0c5 Binary files /dev/null and b/dev_stuff/healthPanelFixFemale.psd differ diff --git a/dev_stuff/healthPanelFixMale.psd b/dev_stuff/healthPanelFixMale.psd new file mode 100644 index 0000000..a253a74 Binary files /dev/null and b/dev_stuff/healthPanelFixMale.psd differ diff --git a/dev_stuff/make_symlink_for_b41.bat b/dev_stuff/make_symlink_for_b41.bat new file mode 100644 index 0000000..d77639f --- /dev/null +++ b/dev_stuff/make_symlink_for_b41.bat @@ -0,0 +1 @@ +mklink /J "../common/media" "../media" \ No newline at end of file diff --git a/dev_stuff/old_workshop_page.txt b/dev_stuff/old_workshop_page.txt deleted file mode 100644 index fc2ab29..0000000 --- a/dev_stuff/old_workshop_page.txt +++ /dev/null @@ -1,54 +0,0 @@ -https://steamcommunity.com/sharedfiles/filedetails/?id=3236152598 - - -[img]https://i.imgur.com/PctsskC.png[/img] - -[h1]Supports B41+. Compatible with SP and MP[/h1] -[h2]Made by [b]Mr. Bounty[/b] and maintained by [b]Pao[/b][/h2] -[img]https://i.imgur.com/RNxXaZ8.gif[/img] - - -[img]https://i.imgur.com/C6FcUgm.png[/img] -[h1] An update will come "soon". The work in progress version is available on GitHub [url=https://github.com/ZioPao/The-Only-Cure]here[/url].[/h1] - - -[img]https://i.imgur.com/koMbiql.png[/img] -[list] -[*]Amputate different parts of your arm to prevent an infection -[*]Cicatrization process and surgery after amputation -[*]Prosthesis for cut limbs up to the forearm -[*]Debug cheats (Multiplayer compatible) -[/list] - - -[img]https://i.imgur.com/BOj0YGn.png[/img] -You can find a concise tutorial about the mod [url=https://github.com/ZioPao/The-Only-Cure/wiki]here[/url]. The wiki will be updated whenever we add some new feature that needs to be explained. - - -[img]https://i.imgur.com/RGF3ZTF.png[/img] -[h2]Required mods[/h2] -[list] -[*][url=https://steamcommunity.com/workshop/filedetails/?id=2760035814]Simple UI library[/url] -[/list] - -[h2]Recommended mods[/h2] -[list] -[*][url=https://steamcommunity.com/sharedfiles/filedetails/?id=2904920097]Fancy Handwork[/url] -[*][url=https://steamcommunity.com/sharedfiles/filedetails/?id=2934621024]Brutal Handwork[/url] -[/list] - -[h2]Compatible mods[/h2] -[list] -[*][url=https://steamcommunity.com/sharedfiles/filedetails/?id=2366717227]Swap It[/url] -[/list] - -[h2]Incompatible mods[/h2] -[list] -[*][url=https://steamcommunity.com/workshop/filedetails/?id=2629286881]Military Ponchos[/url] (Amputation sometimes won't show) -[*][url=https://steamcommunity.com/sharedfiles/filedetails/?id=2915572347]zRe Bandaged Status[/url] (TOC button in the health panel menu won't shown) -[/list] - -[hr] - -Workshop ID: 2703664356 -Mod ID: Amputation \ No newline at end of file diff --git a/dev_stuff/python_helpers/Modular_prost.psd b/dev_stuff/python_helpers/Modular_prost.psd deleted file mode 100644 index 10abaff..0000000 Binary files a/dev_stuff/python_helpers/Modular_prost.psd and /dev/null differ diff --git a/dev_stuff/python_helpers/main.py b/dev_stuff/python_helpers/main.py deleted file mode 100644 index 165a79e..0000000 --- a/dev_stuff/python_helpers/main.py +++ /dev/null @@ -1,304 +0,0 @@ -import lxml.etree as gfg -import pandas as pd -import uuid -import openpyxl -import os - - - -#### ITEMS FORMAT SHOULD BE - -# Prost_Something_HookArm_L - -os.chdir(os.getcwd() + "\\dev_stuff\\python_helpers\\") - - -def generate_file_table(name, guid): - root_guid = gfg.Element("files") - - path_guidtable = gfg.Element("path") - path_guidtable.text = "media/clothing/clothingItems/" + name + ".xml" - root_guid.append(path_guidtable) - - guid_guidtable = gfg.Element("guid") - guid_guidtable.text = guid - root_guid.append(guid_guidtable) - - tree_guid = gfg.ElementTree(root_guid) - - path_idtable = r'outputs/fileGuidTable.xml' - - with open(path_idtable, "ab") as file: - tree_guid.write(file, encoding='utf-8', pretty_print=True) - - - - - - -def generate_clothing_item(name, model, texture_choices): - root = gfg.Element("clothingItem") - - m_MaleModel = gfg.Element("m_MaleModel") - m_MaleModel.text = f"{model}_Male" - root.append(m_MaleModel) - - m_FemaleModel = gfg.Element("m_FemaleModel") - m_FemaleModel.text = f"{model}_Female" - root.append(m_FemaleModel) - - guid = str(uuid.uuid4()) - m_GUID = gfg.Element("m_GUID") - m_GUID.text = guid - - root.append(m_GUID) - - m_Static = gfg.Element("m_Static") - m_Static.text = "false" - root.append(m_Static) - - m_AllowRandomTint = gfg.Element("m_AllowRandomTint") - m_AllowRandomTint.text = "false" - root.append(m_AllowRandomTint) - - # Defined by the amount of textures that we're gonna pass - for tex in texture_choices: - textureChoices = gfg.Element("textureChoices") - textureChoices.text = tex - root.append(textureChoices) - - tree = gfg.ElementTree(root) - - path = r'outputs/output_clothing/' + name + ".xml" - - with open(path, "wb") as file: - tree.write(file, encoding='utf-8', xml_declaration=True, pretty_print=True ) - - # Generate the element inside the file table - generate_file_table(name, guid) - -def generate_recipe(recipe_name, result_name, recipe_items, on_create_func, time, skill_required, tooltip): - root_element = f"recipe {recipe_name}\n" - root_element += "\t{\n" - - for item in recipe_items: - root_element += f"\t\t{item},\n" - - root_element += "\n\n" - - # if result != "": - # root_element += f"\t\tResult: {result_name},\n" - root_element += f"\t\tTime: {time:.1f},\n" - root_element += f"\t\tResult: {result_name},\n" - root_element += "\t\tNeedToBeLearn: true,\n" - root_element += "\t\tCanBeDoneFromFloor: false,\n" - root_element += "\t\tOnGiveXP: NoXP_OnGiveXP,\n" - root_element += f"\t\tSkillRequired: {skill_required[0]}={skill_required[1]},\n" - root_element += "\t\tCategory: Surgeon,\n" - root_element += f"\t\tOnCreate:{on_create_func},\n" - root_element += f"\t\tTooltip: {tooltip},\n" - - root_element += "\t}\n" - - - path = r'outputs/output_recipe/script.txt' - - with open(path, "at") as file: - file.write(root_element) - file.close() - -def generate_item(item_name, weight, item_type, display_category, display_name, icon, tooltip, can_have_holes, clothing_item=None, body_location = None, blood_location = None, world_static_model = None): - root_element = f"item {item_name}\n" - root_element += "\t{\n" - - root_element += f"\t\tWeight = {weight},\n" - root_element += f"\t\tType = {item_type},\n" - root_element += f"\t\tDisplayCategory = {display_category},\n" - root_element += f"\t\tDisplayName = {display_name},\n" - - if item_type == "Clothing": - root_element += f"\t\tClothingItem = {clothing_item},\n" - root_element += f"\t\tBodyLocation = {body_location},\n" - root_element += f"\t\tBloodLocation = {blood_location},\n" - - root_element += f"\t\tIcon = {icon},\n" - root_element += f"\t\tTooltip = {tooltip},\n" - root_element += f"\t\tCanHaveHoles = {can_have_holes.lower()},\n" - root_element += f"\t\tWorldStaticModel = {world_static_model},\n" - - root_element += "\t}\n" - - - path = r'outputs/output_item/script.txt' - - with open(path, "at") as file: - file.write(root_element) - file.close() - -def generate_normal_items(df, part_type): - for row in df.iterrows(): - item_id = "ProstPart_" + row[1][part_type] - item_type = "Normal" - weight = "{0:.2f}".format(float(row[1]["Weight"])) - display_category = "Prosthesis" - display_name = row[1]["Display Name"] - icon = "ProstTest" + part_type - generate_item(item_id, weight, item_type, display_category, display_name, icon, "TempTooltip", "false") - - - -########################################################################################### -def read_table(file_name: str, table_name: str) -> pd.DataFrame: - wb = openpyxl.load_workbook(file_name, read_only=False, data_only=True) # openpyxl does not have table info if read_only is True; data_only means any functions will pull the last saved value instead of the formula - for sheetname in wb.sheetnames: # pulls as strings - sheet = wb[sheetname] # get the sheet object instead of string - if table_name in sheet.tables: # tables are stored within sheets, not within the workbook, although table names are unique in a workbook - tbl = sheet.tables[table_name] # get table object instead of string - tbl_range = tbl.ref #something like 'C4:F9' - break # we've got our table, bail from for-loop - data = sheet[tbl_range] # returns a tuple that contains rows, where each row is a tuple containing cells - content = [[cell.value for cell in row] for row in data] # loop through those row/cell tuples - header = content[0] # first row is column headers - rest = content[1:] # every row that isn't the first is data - df = pd.DataFrame(rest, columns=header) - wb.close() - return df - -########################################################################################### - -excel_path = r'modules_prost.xlsx' -df_base = read_table(excel_path, "BaseTable") -df_top = read_table(excel_path, "TopTable") - -limbs = ["Hand", "LowerArm"] -sides = ["Left", "Right"] -prost_bodylocations = ["TOC_ArmRightProsthesis", "TOC_ArmLeftProsthesis"] -texture_types = ["Wooden", "Metal"] - - - -######################### - -# CLOTHING GENERATION PASS -def run_clothing_generation(): - - # TODO Fix this, model is wrong! - for base_row in df_base.iterrows(): - for top_row in df_top.iterrows(): - base_name = base_row[1][0] - top_name = top_row[1][0] - - for limb in limbs: - for side in sides: - current_name = "Prost_" + side + "_" + limb + "_" + base_name + "_" + top_name - texture_choices = {r"Amputations\Upperarm\skin01_b"} - generate_clothing_item(current_name, current_name, texture_choices) - -# CLOTHING ITEM GENERATION PASS - ASSEMBLED -def run_assembled_item_generation(): - for base_row in df_base.iterrows(): - for top_row in df_top.iterrows(): - for limb in limbs: - for side in sides: - - base_id = base_row[1]["Base"] - top_id = top_row[1]["Top"] - - item_id = "Prost_" + side + "_" + limb + "_" + base_id + "_" + top_id - item_type = "Clothing" - weight = "{0:.2f}".format(float(base_row[1]["Weight"]) + float(top_row[1]["Weight"])) - display_category = "Prosthesis" - display_name = "Prosthesis - " + base_row[1]["Display Name"] + " and " + top_row[1]["Display Name"] - - - clothing_item_name = "Prost_" + side + "_" + limb + "_" + base_id + "_" + top_id - bl = prost_bodylocations[0] if side == "Right" else prost_bodylocations[1] - - icon = "metalLeg" - generate_item(item_id, weight, item_type, display_category, display_name, icon, "TempTooltip", "false", clothing_item_name, bl, "Hands") - -# NORMAL ITEM -def run_assembled_normal_item_generation(): - for base_row in df_base.iterrows(): - for top_row in df_top.iterrows(): - base_id = base_row[1]["Base"] - top_id = top_row[1]["Top"] - - item_id = base_id + "_" + top_id - item_type = "Normal" - weight = "{0:.2f}".format(float(base_row[1]["Weight"]) + float(top_row[1]["Weight"])) - display_category = "Prosthesis" - display_name = "Prosthesis - " + base_row[1]["Display Name"] + " and " + top_row[1]["Display Name"] - - world_static_model = "TOC.MetalHook" - - icon = "metalLeg" - generate_item(item_id, weight, item_type, display_category, display_name, icon, "TempTooltip", "false", None, None, "Hands", world_static_model) - - - - - - -# ITEM GENERATION PASS - Single item to assemble stuff -def run_single_part_item_generation(): - generate_normal_items(df_base, "Base") - generate_normal_items(df_top, "Top") - - -# RECIPE GENERATION PASS - Assembly -def run_recipe_assemble_generation(): - for base_row in df_base.iterrows(): - for top_row in df_top.iterrows(): - - base_name = base_row[1]["Base"] - top_name = top_row[1]["Top"] - base_display_name = base_row[1]["Display Name"] - top_display_name = top_row[1]["Display Name"] - - recipe_name = f"Craft prosthesis with {base_display_name} and {top_display_name}" - - first_item = "ProstPart_" + base_row[1]["Base"] - second_item = "ProstPart_" + top_row[1]["Top"] - # TODO add screwdriver and some screws to the items - - - result_name = "Prost_" + base_row[1]["Base"] + "_" + top_row[1]["Top"] - recipe_items = [first_item, second_item] - on_create_func = "ProsthesisRecipes.OnCreateProsthesis" - time = 10 # TODO Change this - skill_required = ["FirstAid", "2"] # TODO Change this - tooltip = "Recipe_Tooltip_AssembleProsthesis" - generate_recipe(recipe_name, result_name, recipe_items, on_create_func, time, skill_required, tooltip) - - -# RECIPE GENERATION PASS - Disassembly -def run_recipe_disassemble_generation(): - for base_row in df_base.iterrows(): - for top_row in df_top.iterrows(): - - base_name = base_row[1]["Base"] - top_name = top_row[1]["Top"] - - base_display_name = base_row[1]["Display Name"] - top_display_name = top_row[1]["Display Name"] - - - # TODO Add result name - result_name = "" - recipe_name = f"Disassemble prosthesis with {base_display_name} and {top_display_name}" - recipe_item = [f"Prost_{base_name}_{top_name}"] - on_create_func = "ProsthesisRecipes.OnDisassembleProsthesis" - time = 10 # TODO Change this - skill_required = ["FirstAid", "2"] # TODO Change this - tooltip = "Recipe_Tooltip_DisassembleProsthesis" - generate_recipe(recipe_name, result_name, recipe_item, on_create_func, time, skill_required, tooltip) - - -# RECIPE GENERATION PASS - Single parts - Base -# TODO do this - - - - -run_assembled_normal_item_generation() \ No newline at end of file diff --git a/dev_stuff/python_helpers/modules_prost.xlsx b/dev_stuff/python_helpers/modules_prost.xlsx deleted file mode 100644 index 94d004e..0000000 Binary files a/dev_stuff/python_helpers/modules_prost.xlsx and /dev/null differ diff --git a/dev_stuff/python_helpers/outputs/fileGuidTable.xml b/dev_stuff/python_helpers/outputs/fileGuidTable.xml deleted file mode 100644 index ef38784..0000000 --- a/dev_stuff/python_helpers/outputs/fileGuidTable.xml +++ /dev/null @@ -1,288 +0,0 @@ - - media/clothing/clothingItems/Prost_Left_Hand_WoodenBase_WoodenHook.xml - 0683abbb-0cc9-4f19-9f16-e06f6786b559 - - - media/clothing/clothingItems/Prost_Right_Hand_WoodenBase_WoodenHook.xml - e78ed217-0ae0-4083-8631-09771dd29808 - - - media/clothing/clothingItems/Prost_Left_LowerArm_WoodenBase_WoodenHook.xml - 26242655-de69-4b32-bba9-b50108126b60 - - - media/clothing/clothingItems/Prost_Right_LowerArm_WoodenBase_WoodenHook.xml - 18022764-d6e5-418b-8cbe-fc55f26ddeb1 - - - media/clothing/clothingItems/Prost_Left_Hand_WoodenBase_MetalHook.xml - 6c3812e2-c9ea-4082-b490-3e37cd6fa309 - - - media/clothing/clothingItems/Prost_Right_Hand_WoodenBase_MetalHook.xml - 430a1e73-b662-4970-a11f-41b318335b8d - - - media/clothing/clothingItems/Prost_Left_LowerArm_WoodenBase_MetalHook.xml - ac1e8170-8e0b-46c8-9775-0ffe59815a90 - - - media/clothing/clothingItems/Prost_Right_LowerArm_WoodenBase_MetalHook.xml - b06f3d44-4662-4015-a9a9-423da95d4d03 - - - media/clothing/clothingItems/Prost_Left_Hand_WoodenBase_MetalHand.xml - 7ce57ea3-3396-408c-b10b-f8b171e3ee1b - - - media/clothing/clothingItems/Prost_Right_Hand_WoodenBase_MetalHand.xml - cb3f6114-be69-4c9b-b957-f3a1b7b29d76 - - - media/clothing/clothingItems/Prost_Left_LowerArm_WoodenBase_MetalHand.xml - 1c635807-4545-4764-b146-17f8311da9fb - - - media/clothing/clothingItems/Prost_Right_LowerArm_WoodenBase_MetalHand.xml - bc7ac81c-cc8d-4cca-846a-c60bad714bee - - - media/clothing/clothingItems/Prost_Left_Hand_MetalBase_WoodenHook.xml - 67ee2e98-779a-441d-8222-cae988a4bf83 - - - media/clothing/clothingItems/Prost_Right_Hand_MetalBase_WoodenHook.xml - 3f84cd14-8caf-4b43-b5fc-19075cef431b - - - media/clothing/clothingItems/Prost_Left_LowerArm_MetalBase_WoodenHook.xml - bd04f7ab-200c-4631-844a-82720563bc4e - - - media/clothing/clothingItems/Prost_Right_LowerArm_MetalBase_WoodenHook.xml - fe78f39f-f123-4363-99e8-4f0a96b622fd - - - media/clothing/clothingItems/Prost_Left_Hand_MetalBase_MetalHook.xml - aa4d751d-dda9-49cb-8014-5c606769103f - - - media/clothing/clothingItems/Prost_Right_Hand_MetalBase_MetalHook.xml - 86e48b70-05aa-4276-a754-719e5c49cf50 - - - media/clothing/clothingItems/Prost_Left_LowerArm_MetalBase_MetalHook.xml - 1cf57ca2-7bf5-4c18-8017-b4b7d3f60f9c - - - media/clothing/clothingItems/Prost_Right_LowerArm_MetalBase_MetalHook.xml - 76548260-f719-4546-80bd-156606f47379 - - - media/clothing/clothingItems/Prost_Left_Hand_MetalBase_MetalHand.xml - 4fa41665-0db0-4cf0-bbb6-a8c7f1ed2ba7 - - - media/clothing/clothingItems/Prost_Right_Hand_MetalBase_MetalHand.xml - 051a6973-7634-4f0a-8bc2-3b0197db9236 - - - media/clothing/clothingItems/Prost_Left_LowerArm_MetalBase_MetalHand.xml - 0bc5357f-41b8-4149-a635-b364cc0e925c - - - media/clothing/clothingItems/Prost_Right_LowerArm_MetalBase_MetalHand.xml - 018ff030-bf72-4658-a7ae-29a22cfab99b - - - media/clothing/clothingItems/Prost_Left_Hand_LeatherBase_WoodenHook.xml - d57f0188-2fd0-44d4-adb8-35810115a467 - - - media/clothing/clothingItems/Prost_Right_Hand_LeatherBase_WoodenHook.xml - 8c8521aa-5dda-4446-91ad-9ff138676b56 - - - media/clothing/clothingItems/Prost_Left_LowerArm_LeatherBase_WoodenHook.xml - 2cdd3791-2ca9-4327-816d-7f48cc106b32 - - - media/clothing/clothingItems/Prost_Right_LowerArm_LeatherBase_WoodenHook.xml - 505289a8-712c-4b9e-ba1c-d2a916c99ba8 - - - media/clothing/clothingItems/Prost_Left_Hand_LeatherBase_MetalHook.xml - 45980406-ff1e-480f-92b0-05502795799e - - - media/clothing/clothingItems/Prost_Right_Hand_LeatherBase_MetalHook.xml - a479cb20-54ba-49f2-9dcc-0be5c9026016 - - - media/clothing/clothingItems/Prost_Left_LowerArm_LeatherBase_MetalHook.xml - 36f5c1ea-8ef3-4ba0-9bcb-565ed80e1d2b - - - media/clothing/clothingItems/Prost_Right_LowerArm_LeatherBase_MetalHook.xml - cdf1f215-2eb7-4caa-a7fb-1c06470dd122 - - - media/clothing/clothingItems/Prost_Left_Hand_LeatherBase_MetalHand.xml - 4b60fa0c-5028-4035-a9ba-53d9ece5c26c - - - media/clothing/clothingItems/Prost_Right_Hand_LeatherBase_MetalHand.xml - 2b81d029-7ba2-4f62-b2fc-ed2874064b67 - - - media/clothing/clothingItems/Prost_Left_LowerArm_LeatherBase_MetalHand.xml - cd9339b5-38f6-4817-a810-f1b23b08d6d6 - - - media/clothing/clothingItems/Prost_Right_LowerArm_LeatherBase_MetalHand.xml - c8460ab8-5ff3-4b2a-b233-dfa416d6130c - - - media/clothing/clothingItems/Prost_Left_Hand_WoodenBase_WoodenHook.xml - 5e666510-59a4-4d01-b096-dd2ccc381ace - - - media/clothing/clothingItems/Prost_Right_Hand_WoodenBase_WoodenHook.xml - de809ecd-bad4-4392-912f-82bef2f955e0 - - - media/clothing/clothingItems/Prost_Left_LowerArm_WoodenBase_WoodenHook.xml - 878c9bb7-65c4-4882-b8e1-a00464e923c2 - - - media/clothing/clothingItems/Prost_Right_LowerArm_WoodenBase_WoodenHook.xml - 922ac868-8328-4db0-a855-9faaad70b4fe - - - media/clothing/clothingItems/Prost_Left_Hand_WoodenBase_MetalHook.xml - a6399346-6834-4305-be6d-42986a44b19b - - - media/clothing/clothingItems/Prost_Right_Hand_WoodenBase_MetalHook.xml - 09826af7-ba1d-483b-aa0c-f0e0af0171bc - - - media/clothing/clothingItems/Prost_Left_LowerArm_WoodenBase_MetalHook.xml - 72649e94-eaf2-414c-a314-531492fb8a77 - - - media/clothing/clothingItems/Prost_Right_LowerArm_WoodenBase_MetalHook.xml - bd35c56f-0833-4589-9814-8e73049baf9b - - - media/clothing/clothingItems/Prost_Left_Hand_WoodenBase_MetalHand.xml - cba1dc62-beb1-4463-936e-23bf9f124a97 - - - media/clothing/clothingItems/Prost_Right_Hand_WoodenBase_MetalHand.xml - ff47802d-b64c-4024-b404-049926ab0c88 - - - media/clothing/clothingItems/Prost_Left_LowerArm_WoodenBase_MetalHand.xml - 4f0b16e6-df19-4b81-8e53-5addb8d62d63 - - - media/clothing/clothingItems/Prost_Right_LowerArm_WoodenBase_MetalHand.xml - e9d08964-8a0e-4f5c-b803-565231b42fcd - - - media/clothing/clothingItems/Prost_Left_Hand_MetalBase_WoodenHook.xml - 4828986a-b6c3-472b-960e-9775d851e11f - - - media/clothing/clothingItems/Prost_Right_Hand_MetalBase_WoodenHook.xml - 7fec909e-7a18-46fe-b101-06e03df41e3b - - - media/clothing/clothingItems/Prost_Left_LowerArm_MetalBase_WoodenHook.xml - cf1b61e3-c317-4b30-8370-e89da866c665 - - - media/clothing/clothingItems/Prost_Right_LowerArm_MetalBase_WoodenHook.xml - 21e5310e-e019-4ee3-9336-ca05f2f09d15 - - - media/clothing/clothingItems/Prost_Left_Hand_MetalBase_MetalHook.xml - 96269ef6-3e63-4394-9e61-f10219ad6474 - - - media/clothing/clothingItems/Prost_Right_Hand_MetalBase_MetalHook.xml - af39a824-e8b8-4b6f-91dd-4f5970ffcc6d - - - media/clothing/clothingItems/Prost_Left_LowerArm_MetalBase_MetalHook.xml - d3f41d18-1849-4446-a0e6-4ccf318430b7 - - - media/clothing/clothingItems/Prost_Right_LowerArm_MetalBase_MetalHook.xml - 12398ee6-7835-4f42-86cf-fd308ea0994f - - - media/clothing/clothingItems/Prost_Left_Hand_MetalBase_MetalHand.xml - c102e410-5774-4032-96d1-7dd0807c987e - - - media/clothing/clothingItems/Prost_Right_Hand_MetalBase_MetalHand.xml - 72f25654-e1f8-4c44-a63e-72c8e97e45ee - - - media/clothing/clothingItems/Prost_Left_LowerArm_MetalBase_MetalHand.xml - 1c9195de-efa8-427e-833d-67a3ec055a83 - - - media/clothing/clothingItems/Prost_Right_LowerArm_MetalBase_MetalHand.xml - 4cb21720-0551-4b14-a796-97c7d0c33c06 - - - media/clothing/clothingItems/Prost_Left_Hand_LeatherBase_WoodenHook.xml - b890d3cd-f999-45a9-a501-43158d38d5a3 - - - media/clothing/clothingItems/Prost_Right_Hand_LeatherBase_WoodenHook.xml - cc73e01c-587f-4929-b367-23c752e848b5 - - - media/clothing/clothingItems/Prost_Left_LowerArm_LeatherBase_WoodenHook.xml - 62bce2a6-540e-473c-9f0c-f8a7384659bb - - - media/clothing/clothingItems/Prost_Right_LowerArm_LeatherBase_WoodenHook.xml - 4f23729e-2304-4149-bd18-c2ca05794bda - - - media/clothing/clothingItems/Prost_Left_Hand_LeatherBase_MetalHook.xml - b86301fb-51cb-4cfe-ba1d-14d181fe2aaf - - - media/clothing/clothingItems/Prost_Right_Hand_LeatherBase_MetalHook.xml - cccd86ec-bbb9-40dc-8370-ef8f928650db - - - media/clothing/clothingItems/Prost_Left_LowerArm_LeatherBase_MetalHook.xml - 8a829f56-b9ab-44b2-ab4f-5e988dd7f144 - - - media/clothing/clothingItems/Prost_Right_LowerArm_LeatherBase_MetalHook.xml - de32b01d-ec3c-4c3e-80a4-49dfb763b959 - - - media/clothing/clothingItems/Prost_Left_Hand_LeatherBase_MetalHand.xml - 0097e116-6e5e-4597-8bf2-c71e87222e1e - - - media/clothing/clothingItems/Prost_Right_Hand_LeatherBase_MetalHand.xml - eed0d663-4862-4646-8ccd-7d73aa6b0489 - - - media/clothing/clothingItems/Prost_Left_LowerArm_LeatherBase_MetalHand.xml - f7ef6867-a455-4504-a157-626ecd32af08 - - - media/clothing/clothingItems/Prost_Right_LowerArm_LeatherBase_MetalHand.xml - e12307d2-672e-4c77-bcd6-af397455d7a9 - diff --git a/dev_stuff/python_helpers/outputs/output_clothing/Prost_Left_Hand_LeatherBase_MetalHand.xml b/dev_stuff/python_helpers/outputs/output_clothing/Prost_Left_Hand_LeatherBase_MetalHand.xml deleted file mode 100644 index 7c364ba..0000000 --- a/dev_stuff/python_helpers/outputs/output_clothing/Prost_Left_Hand_LeatherBase_MetalHand.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - Prost_Left_Hand_LeatherBase_MetalHand_Male - Prost_Left_Hand_LeatherBase_MetalHand_Female - 0097e116-6e5e-4597-8bf2-c71e87222e1e - false - false - Amputations\Upperarm\skin01_b - diff --git a/dev_stuff/python_helpers/outputs/output_clothing/Prost_Left_Hand_LeatherBase_MetalHook.xml b/dev_stuff/python_helpers/outputs/output_clothing/Prost_Left_Hand_LeatherBase_MetalHook.xml deleted file mode 100644 index a4e6317..0000000 --- a/dev_stuff/python_helpers/outputs/output_clothing/Prost_Left_Hand_LeatherBase_MetalHook.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - Prost_Left_Hand_LeatherBase_MetalHook_Male - Prost_Left_Hand_LeatherBase_MetalHook_Female - b86301fb-51cb-4cfe-ba1d-14d181fe2aaf - false - false - Amputations\Upperarm\skin01_b - diff --git a/dev_stuff/python_helpers/outputs/output_clothing/Prost_Left_Hand_LeatherBase_WoodenHook.xml b/dev_stuff/python_helpers/outputs/output_clothing/Prost_Left_Hand_LeatherBase_WoodenHook.xml deleted file mode 100644 index 229c3cb..0000000 --- a/dev_stuff/python_helpers/outputs/output_clothing/Prost_Left_Hand_LeatherBase_WoodenHook.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - Prost_Left_Hand_LeatherBase_WoodenHook_Male - Prost_Left_Hand_LeatherBase_WoodenHook_Female - b890d3cd-f999-45a9-a501-43158d38d5a3 - false - false - Amputations\Upperarm\skin01_b - diff --git a/dev_stuff/python_helpers/outputs/output_clothing/Prost_Left_Hand_MetalBase_MetalHand.xml b/dev_stuff/python_helpers/outputs/output_clothing/Prost_Left_Hand_MetalBase_MetalHand.xml deleted file mode 100644 index 3433486..0000000 --- a/dev_stuff/python_helpers/outputs/output_clothing/Prost_Left_Hand_MetalBase_MetalHand.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - Prost_Left_Hand_MetalBase_MetalHand_Male - Prost_Left_Hand_MetalBase_MetalHand_Female - c102e410-5774-4032-96d1-7dd0807c987e - false - false - Amputations\Upperarm\skin01_b - diff --git a/dev_stuff/python_helpers/outputs/output_clothing/Prost_Left_Hand_MetalBase_MetalHook.xml b/dev_stuff/python_helpers/outputs/output_clothing/Prost_Left_Hand_MetalBase_MetalHook.xml deleted file mode 100644 index c8cd6c6..0000000 --- a/dev_stuff/python_helpers/outputs/output_clothing/Prost_Left_Hand_MetalBase_MetalHook.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - Prost_Left_Hand_MetalBase_MetalHook_Male - Prost_Left_Hand_MetalBase_MetalHook_Female - 96269ef6-3e63-4394-9e61-f10219ad6474 - false - false - Amputations\Upperarm\skin01_b - diff --git a/dev_stuff/python_helpers/outputs/output_clothing/Prost_Left_Hand_MetalBase_WoodenHook.xml b/dev_stuff/python_helpers/outputs/output_clothing/Prost_Left_Hand_MetalBase_WoodenHook.xml deleted file mode 100644 index 04b5714..0000000 --- a/dev_stuff/python_helpers/outputs/output_clothing/Prost_Left_Hand_MetalBase_WoodenHook.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - Prost_Left_Hand_MetalBase_WoodenHook_Male - Prost_Left_Hand_MetalBase_WoodenHook_Female - 4828986a-b6c3-472b-960e-9775d851e11f - false - false - Amputations\Upperarm\skin01_b - diff --git a/dev_stuff/python_helpers/outputs/output_clothing/Prost_Left_Hand_WoodenBase_MetalHand.xml b/dev_stuff/python_helpers/outputs/output_clothing/Prost_Left_Hand_WoodenBase_MetalHand.xml deleted file mode 100644 index aca1340..0000000 --- a/dev_stuff/python_helpers/outputs/output_clothing/Prost_Left_Hand_WoodenBase_MetalHand.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - Prost_Left_Hand_WoodenBase_MetalHand_Male - Prost_Left_Hand_WoodenBase_MetalHand_Female - cba1dc62-beb1-4463-936e-23bf9f124a97 - false - false - Amputations\Upperarm\skin01_b - diff --git a/dev_stuff/python_helpers/outputs/output_clothing/Prost_Left_Hand_WoodenBase_MetalHook.xml b/dev_stuff/python_helpers/outputs/output_clothing/Prost_Left_Hand_WoodenBase_MetalHook.xml deleted file mode 100644 index 16ab619..0000000 --- a/dev_stuff/python_helpers/outputs/output_clothing/Prost_Left_Hand_WoodenBase_MetalHook.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - Prost_Left_Hand_WoodenBase_MetalHook_Male - Prost_Left_Hand_WoodenBase_MetalHook_Female - a6399346-6834-4305-be6d-42986a44b19b - false - false - Amputations\Upperarm\skin01_b - diff --git a/dev_stuff/python_helpers/outputs/output_clothing/Prost_Left_Hand_WoodenBase_WoodenHook.xml b/dev_stuff/python_helpers/outputs/output_clothing/Prost_Left_Hand_WoodenBase_WoodenHook.xml deleted file mode 100644 index 98b415e..0000000 --- a/dev_stuff/python_helpers/outputs/output_clothing/Prost_Left_Hand_WoodenBase_WoodenHook.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - Prost_Left_Hand_WoodenBase_WoodenHook_Male - Prost_Left_Hand_WoodenBase_WoodenHook_Female - 5e666510-59a4-4d01-b096-dd2ccc381ace - false - false - Amputations\Upperarm\skin01_b - diff --git a/dev_stuff/python_helpers/outputs/output_clothing/Prost_Left_LowerArm_LeatherBase_MetalHand.xml b/dev_stuff/python_helpers/outputs/output_clothing/Prost_Left_LowerArm_LeatherBase_MetalHand.xml deleted file mode 100644 index 77bf30e..0000000 --- a/dev_stuff/python_helpers/outputs/output_clothing/Prost_Left_LowerArm_LeatherBase_MetalHand.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - Prost_Left_LowerArm_LeatherBase_MetalHand_Male - Prost_Left_LowerArm_LeatherBase_MetalHand_Female - f7ef6867-a455-4504-a157-626ecd32af08 - false - false - Amputations\Upperarm\skin01_b - diff --git a/dev_stuff/python_helpers/outputs/output_clothing/Prost_Left_LowerArm_LeatherBase_MetalHook.xml b/dev_stuff/python_helpers/outputs/output_clothing/Prost_Left_LowerArm_LeatherBase_MetalHook.xml deleted file mode 100644 index 1751ea4..0000000 --- a/dev_stuff/python_helpers/outputs/output_clothing/Prost_Left_LowerArm_LeatherBase_MetalHook.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - Prost_Left_LowerArm_LeatherBase_MetalHook_Male - Prost_Left_LowerArm_LeatherBase_MetalHook_Female - 8a829f56-b9ab-44b2-ab4f-5e988dd7f144 - false - false - Amputations\Upperarm\skin01_b - diff --git a/dev_stuff/python_helpers/outputs/output_clothing/Prost_Left_LowerArm_LeatherBase_WoodenHook.xml b/dev_stuff/python_helpers/outputs/output_clothing/Prost_Left_LowerArm_LeatherBase_WoodenHook.xml deleted file mode 100644 index cd10826..0000000 --- a/dev_stuff/python_helpers/outputs/output_clothing/Prost_Left_LowerArm_LeatherBase_WoodenHook.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - Prost_Left_LowerArm_LeatherBase_WoodenHook_Male - Prost_Left_LowerArm_LeatherBase_WoodenHook_Female - 62bce2a6-540e-473c-9f0c-f8a7384659bb - false - false - Amputations\Upperarm\skin01_b - diff --git a/dev_stuff/python_helpers/outputs/output_clothing/Prost_Left_LowerArm_MetalBase_MetalHand.xml b/dev_stuff/python_helpers/outputs/output_clothing/Prost_Left_LowerArm_MetalBase_MetalHand.xml deleted file mode 100644 index aa3fe8b..0000000 --- a/dev_stuff/python_helpers/outputs/output_clothing/Prost_Left_LowerArm_MetalBase_MetalHand.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - Prost_Left_LowerArm_MetalBase_MetalHand_Male - Prost_Left_LowerArm_MetalBase_MetalHand_Female - 1c9195de-efa8-427e-833d-67a3ec055a83 - false - false - Amputations\Upperarm\skin01_b - diff --git a/dev_stuff/python_helpers/outputs/output_clothing/Prost_Left_LowerArm_MetalBase_MetalHook.xml b/dev_stuff/python_helpers/outputs/output_clothing/Prost_Left_LowerArm_MetalBase_MetalHook.xml deleted file mode 100644 index 2e06ab7..0000000 --- a/dev_stuff/python_helpers/outputs/output_clothing/Prost_Left_LowerArm_MetalBase_MetalHook.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - Prost_Left_LowerArm_MetalBase_MetalHook_Male - Prost_Left_LowerArm_MetalBase_MetalHook_Female - d3f41d18-1849-4446-a0e6-4ccf318430b7 - false - false - Amputations\Upperarm\skin01_b - diff --git a/dev_stuff/python_helpers/outputs/output_clothing/Prost_Left_LowerArm_MetalBase_WoodenHook.xml b/dev_stuff/python_helpers/outputs/output_clothing/Prost_Left_LowerArm_MetalBase_WoodenHook.xml deleted file mode 100644 index f467255..0000000 --- a/dev_stuff/python_helpers/outputs/output_clothing/Prost_Left_LowerArm_MetalBase_WoodenHook.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - Prost_Left_LowerArm_MetalBase_WoodenHook_Male - Prost_Left_LowerArm_MetalBase_WoodenHook_Female - cf1b61e3-c317-4b30-8370-e89da866c665 - false - false - Amputations\Upperarm\skin01_b - diff --git a/dev_stuff/python_helpers/outputs/output_clothing/Prost_Left_LowerArm_WoodenBase_MetalHand.xml b/dev_stuff/python_helpers/outputs/output_clothing/Prost_Left_LowerArm_WoodenBase_MetalHand.xml deleted file mode 100644 index 901c4fd..0000000 --- a/dev_stuff/python_helpers/outputs/output_clothing/Prost_Left_LowerArm_WoodenBase_MetalHand.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - Prost_Left_LowerArm_WoodenBase_MetalHand_Male - Prost_Left_LowerArm_WoodenBase_MetalHand_Female - 4f0b16e6-df19-4b81-8e53-5addb8d62d63 - false - false - Amputations\Upperarm\skin01_b - diff --git a/dev_stuff/python_helpers/outputs/output_clothing/Prost_Left_LowerArm_WoodenBase_MetalHook.xml b/dev_stuff/python_helpers/outputs/output_clothing/Prost_Left_LowerArm_WoodenBase_MetalHook.xml deleted file mode 100644 index b3e90e8..0000000 --- a/dev_stuff/python_helpers/outputs/output_clothing/Prost_Left_LowerArm_WoodenBase_MetalHook.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - Prost_Left_LowerArm_WoodenBase_MetalHook_Male - Prost_Left_LowerArm_WoodenBase_MetalHook_Female - 72649e94-eaf2-414c-a314-531492fb8a77 - false - false - Amputations\Upperarm\skin01_b - diff --git a/dev_stuff/python_helpers/outputs/output_clothing/Prost_Left_LowerArm_WoodenBase_WoodenHook.xml b/dev_stuff/python_helpers/outputs/output_clothing/Prost_Left_LowerArm_WoodenBase_WoodenHook.xml deleted file mode 100644 index 495d4e7..0000000 --- a/dev_stuff/python_helpers/outputs/output_clothing/Prost_Left_LowerArm_WoodenBase_WoodenHook.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - Prost_Left_LowerArm_WoodenBase_WoodenHook_Male - Prost_Left_LowerArm_WoodenBase_WoodenHook_Female - 878c9bb7-65c4-4882-b8e1-a00464e923c2 - false - false - Amputations\Upperarm\skin01_b - diff --git a/dev_stuff/python_helpers/outputs/output_clothing/Prost_Right_Hand_LeatherBase_MetalHand.xml b/dev_stuff/python_helpers/outputs/output_clothing/Prost_Right_Hand_LeatherBase_MetalHand.xml deleted file mode 100644 index d9cd664..0000000 --- a/dev_stuff/python_helpers/outputs/output_clothing/Prost_Right_Hand_LeatherBase_MetalHand.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - Prost_Right_Hand_LeatherBase_MetalHand_Male - Prost_Right_Hand_LeatherBase_MetalHand_Female - eed0d663-4862-4646-8ccd-7d73aa6b0489 - false - false - Amputations\Upperarm\skin01_b - diff --git a/dev_stuff/python_helpers/outputs/output_clothing/Prost_Right_Hand_LeatherBase_MetalHook.xml b/dev_stuff/python_helpers/outputs/output_clothing/Prost_Right_Hand_LeatherBase_MetalHook.xml deleted file mode 100644 index a74f5b9..0000000 --- a/dev_stuff/python_helpers/outputs/output_clothing/Prost_Right_Hand_LeatherBase_MetalHook.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - Prost_Right_Hand_LeatherBase_MetalHook_Male - Prost_Right_Hand_LeatherBase_MetalHook_Female - cccd86ec-bbb9-40dc-8370-ef8f928650db - false - false - Amputations\Upperarm\skin01_b - diff --git a/dev_stuff/python_helpers/outputs/output_clothing/Prost_Right_Hand_LeatherBase_WoodenHook.xml b/dev_stuff/python_helpers/outputs/output_clothing/Prost_Right_Hand_LeatherBase_WoodenHook.xml deleted file mode 100644 index a3205ea..0000000 --- a/dev_stuff/python_helpers/outputs/output_clothing/Prost_Right_Hand_LeatherBase_WoodenHook.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - Prost_Right_Hand_LeatherBase_WoodenHook_Male - Prost_Right_Hand_LeatherBase_WoodenHook_Female - cc73e01c-587f-4929-b367-23c752e848b5 - false - false - Amputations\Upperarm\skin01_b - diff --git a/dev_stuff/python_helpers/outputs/output_clothing/Prost_Right_Hand_MetalBase_MetalHand.xml b/dev_stuff/python_helpers/outputs/output_clothing/Prost_Right_Hand_MetalBase_MetalHand.xml deleted file mode 100644 index 9bfc505..0000000 --- a/dev_stuff/python_helpers/outputs/output_clothing/Prost_Right_Hand_MetalBase_MetalHand.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - Prost_Right_Hand_MetalBase_MetalHand_Male - Prost_Right_Hand_MetalBase_MetalHand_Female - 72f25654-e1f8-4c44-a63e-72c8e97e45ee - false - false - Amputations\Upperarm\skin01_b - diff --git a/dev_stuff/python_helpers/outputs/output_clothing/Prost_Right_Hand_MetalBase_MetalHook.xml b/dev_stuff/python_helpers/outputs/output_clothing/Prost_Right_Hand_MetalBase_MetalHook.xml deleted file mode 100644 index 8190207..0000000 --- a/dev_stuff/python_helpers/outputs/output_clothing/Prost_Right_Hand_MetalBase_MetalHook.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - Prost_Right_Hand_MetalBase_MetalHook_Male - Prost_Right_Hand_MetalBase_MetalHook_Female - af39a824-e8b8-4b6f-91dd-4f5970ffcc6d - false - false - Amputations\Upperarm\skin01_b - diff --git a/dev_stuff/python_helpers/outputs/output_clothing/Prost_Right_Hand_MetalBase_WoodenHook.xml b/dev_stuff/python_helpers/outputs/output_clothing/Prost_Right_Hand_MetalBase_WoodenHook.xml deleted file mode 100644 index e014517..0000000 --- a/dev_stuff/python_helpers/outputs/output_clothing/Prost_Right_Hand_MetalBase_WoodenHook.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - Prost_Right_Hand_MetalBase_WoodenHook_Male - Prost_Right_Hand_MetalBase_WoodenHook_Female - 7fec909e-7a18-46fe-b101-06e03df41e3b - false - false - Amputations\Upperarm\skin01_b - diff --git a/dev_stuff/python_helpers/outputs/output_clothing/Prost_Right_Hand_WoodenBase_MetalHand.xml b/dev_stuff/python_helpers/outputs/output_clothing/Prost_Right_Hand_WoodenBase_MetalHand.xml deleted file mode 100644 index 8e01d8d..0000000 --- a/dev_stuff/python_helpers/outputs/output_clothing/Prost_Right_Hand_WoodenBase_MetalHand.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - Prost_Right_Hand_WoodenBase_MetalHand_Male - Prost_Right_Hand_WoodenBase_MetalHand_Female - ff47802d-b64c-4024-b404-049926ab0c88 - false - false - Amputations\Upperarm\skin01_b - diff --git a/dev_stuff/python_helpers/outputs/output_clothing/Prost_Right_Hand_WoodenBase_MetalHook.xml b/dev_stuff/python_helpers/outputs/output_clothing/Prost_Right_Hand_WoodenBase_MetalHook.xml deleted file mode 100644 index 4b0560a..0000000 --- a/dev_stuff/python_helpers/outputs/output_clothing/Prost_Right_Hand_WoodenBase_MetalHook.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - Prost_Right_Hand_WoodenBase_MetalHook_Male - Prost_Right_Hand_WoodenBase_MetalHook_Female - 09826af7-ba1d-483b-aa0c-f0e0af0171bc - false - false - Amputations\Upperarm\skin01_b - diff --git a/dev_stuff/python_helpers/outputs/output_clothing/Prost_Right_Hand_WoodenBase_WoodenHook.xml b/dev_stuff/python_helpers/outputs/output_clothing/Prost_Right_Hand_WoodenBase_WoodenHook.xml deleted file mode 100644 index c87d258..0000000 --- a/dev_stuff/python_helpers/outputs/output_clothing/Prost_Right_Hand_WoodenBase_WoodenHook.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - Prost_Right_Hand_WoodenBase_WoodenHook_Male - Prost_Right_Hand_WoodenBase_WoodenHook_Female - de809ecd-bad4-4392-912f-82bef2f955e0 - false - false - Amputations\Upperarm\skin01_b - diff --git a/dev_stuff/python_helpers/outputs/output_clothing/Prost_Right_LowerArm_LeatherBase_MetalHand.xml b/dev_stuff/python_helpers/outputs/output_clothing/Prost_Right_LowerArm_LeatherBase_MetalHand.xml deleted file mode 100644 index bd743b7..0000000 --- a/dev_stuff/python_helpers/outputs/output_clothing/Prost_Right_LowerArm_LeatherBase_MetalHand.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - Prost_Right_LowerArm_LeatherBase_MetalHand_Male - Prost_Right_LowerArm_LeatherBase_MetalHand_Female - e12307d2-672e-4c77-bcd6-af397455d7a9 - false - false - Amputations\Upperarm\skin01_b - diff --git a/dev_stuff/python_helpers/outputs/output_clothing/Prost_Right_LowerArm_LeatherBase_MetalHook.xml b/dev_stuff/python_helpers/outputs/output_clothing/Prost_Right_LowerArm_LeatherBase_MetalHook.xml deleted file mode 100644 index b45e198..0000000 --- a/dev_stuff/python_helpers/outputs/output_clothing/Prost_Right_LowerArm_LeatherBase_MetalHook.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - Prost_Right_LowerArm_LeatherBase_MetalHook_Male - Prost_Right_LowerArm_LeatherBase_MetalHook_Female - de32b01d-ec3c-4c3e-80a4-49dfb763b959 - false - false - Amputations\Upperarm\skin01_b - diff --git a/dev_stuff/python_helpers/outputs/output_clothing/Prost_Right_LowerArm_LeatherBase_WoodenHook.xml b/dev_stuff/python_helpers/outputs/output_clothing/Prost_Right_LowerArm_LeatherBase_WoodenHook.xml deleted file mode 100644 index aee4005..0000000 --- a/dev_stuff/python_helpers/outputs/output_clothing/Prost_Right_LowerArm_LeatherBase_WoodenHook.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - Prost_Right_LowerArm_LeatherBase_WoodenHook_Male - Prost_Right_LowerArm_LeatherBase_WoodenHook_Female - 4f23729e-2304-4149-bd18-c2ca05794bda - false - false - Amputations\Upperarm\skin01_b - diff --git a/dev_stuff/python_helpers/outputs/output_clothing/Prost_Right_LowerArm_MetalBase_MetalHand.xml b/dev_stuff/python_helpers/outputs/output_clothing/Prost_Right_LowerArm_MetalBase_MetalHand.xml deleted file mode 100644 index f701cfc..0000000 --- a/dev_stuff/python_helpers/outputs/output_clothing/Prost_Right_LowerArm_MetalBase_MetalHand.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - Prost_Right_LowerArm_MetalBase_MetalHand_Male - Prost_Right_LowerArm_MetalBase_MetalHand_Female - 4cb21720-0551-4b14-a796-97c7d0c33c06 - false - false - Amputations\Upperarm\skin01_b - diff --git a/dev_stuff/python_helpers/outputs/output_clothing/Prost_Right_LowerArm_MetalBase_MetalHook.xml b/dev_stuff/python_helpers/outputs/output_clothing/Prost_Right_LowerArm_MetalBase_MetalHook.xml deleted file mode 100644 index 09e230f..0000000 --- a/dev_stuff/python_helpers/outputs/output_clothing/Prost_Right_LowerArm_MetalBase_MetalHook.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - Prost_Right_LowerArm_MetalBase_MetalHook_Male - Prost_Right_LowerArm_MetalBase_MetalHook_Female - 12398ee6-7835-4f42-86cf-fd308ea0994f - false - false - Amputations\Upperarm\skin01_b - diff --git a/dev_stuff/python_helpers/outputs/output_clothing/Prost_Right_LowerArm_MetalBase_WoodenHook.xml b/dev_stuff/python_helpers/outputs/output_clothing/Prost_Right_LowerArm_MetalBase_WoodenHook.xml deleted file mode 100644 index 97bb740..0000000 --- a/dev_stuff/python_helpers/outputs/output_clothing/Prost_Right_LowerArm_MetalBase_WoodenHook.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - Prost_Right_LowerArm_MetalBase_WoodenHook_Male - Prost_Right_LowerArm_MetalBase_WoodenHook_Female - 21e5310e-e019-4ee3-9336-ca05f2f09d15 - false - false - Amputations\Upperarm\skin01_b - diff --git a/dev_stuff/python_helpers/outputs/output_clothing/Prost_Right_LowerArm_WoodenBase_MetalHand.xml b/dev_stuff/python_helpers/outputs/output_clothing/Prost_Right_LowerArm_WoodenBase_MetalHand.xml deleted file mode 100644 index 360cd76..0000000 --- a/dev_stuff/python_helpers/outputs/output_clothing/Prost_Right_LowerArm_WoodenBase_MetalHand.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - Prost_Right_LowerArm_WoodenBase_MetalHand_Male - Prost_Right_LowerArm_WoodenBase_MetalHand_Female - e9d08964-8a0e-4f5c-b803-565231b42fcd - false - false - Amputations\Upperarm\skin01_b - diff --git a/dev_stuff/python_helpers/outputs/output_clothing/Prost_Right_LowerArm_WoodenBase_MetalHook.xml b/dev_stuff/python_helpers/outputs/output_clothing/Prost_Right_LowerArm_WoodenBase_MetalHook.xml deleted file mode 100644 index 4c675bf..0000000 --- a/dev_stuff/python_helpers/outputs/output_clothing/Prost_Right_LowerArm_WoodenBase_MetalHook.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - Prost_Right_LowerArm_WoodenBase_MetalHook_Male - Prost_Right_LowerArm_WoodenBase_MetalHook_Female - bd35c56f-0833-4589-9814-8e73049baf9b - false - false - Amputations\Upperarm\skin01_b - diff --git a/dev_stuff/python_helpers/outputs/output_clothing/Prost_Right_LowerArm_WoodenBase_WoodenHook.xml b/dev_stuff/python_helpers/outputs/output_clothing/Prost_Right_LowerArm_WoodenBase_WoodenHook.xml deleted file mode 100644 index 37375f0..0000000 --- a/dev_stuff/python_helpers/outputs/output_clothing/Prost_Right_LowerArm_WoodenBase_WoodenHook.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - Prost_Right_LowerArm_WoodenBase_WoodenHook_Male - Prost_Right_LowerArm_WoodenBase_WoodenHook_Female - 922ac868-8328-4db0-a855-9faaad70b4fe - false - false - Amputations\Upperarm\skin01_b - diff --git a/dev_stuff/python_helpers/outputs/output_item/script.txt b/dev_stuff/python_helpers/outputs/output_item/script.txt deleted file mode 100644 index 5581c9e..0000000 --- a/dev_stuff/python_helpers/outputs/output_item/script.txt +++ /dev/null @@ -1,198 +0,0 @@ -item WoodenBase_WoodenHook - { - Weight = 0.90, - Type = Normal, - DisplayCategory = Prosthesis, - DisplayName = Prosthesis - Wooden Base and Wooden Hook, - Icon = metalLeg, - Tooltip = TempTooltip, - CanHaveHoles = false, - WorldStaticModel = TOC.MetalHook, - } -item WoodenBase_MetalHook - { - Weight = 1.20, - Type = Normal, - DisplayCategory = Prosthesis, - DisplayName = Prosthesis - Wooden Base and Metal Hook, - Icon = metalLeg, - Tooltip = TempTooltip, - CanHaveHoles = false, - WorldStaticModel = TOC.MetalHook, - } -item WoodenBase_MetalHand - { - Weight = 1.40, - Type = Normal, - DisplayCategory = Prosthesis, - DisplayName = Prosthesis - Wooden Base and Metal Hand, - Icon = metalLeg, - Tooltip = TempTooltip, - CanHaveHoles = false, - WorldStaticModel = TOC.MetalHook, - } -item MetalBase_WoodenHook - { - Weight = 1.40, - Type = Normal, - DisplayCategory = Prosthesis, - DisplayName = Prosthesis - Metal Base and Wooden Hook, - Icon = metalLeg, - Tooltip = TempTooltip, - CanHaveHoles = false, - WorldStaticModel = TOC.MetalHook, - } -item MetalBase_MetalHook - { - Weight = 1.70, - Type = Normal, - DisplayCategory = Prosthesis, - DisplayName = Prosthesis - Metal Base and Metal Hook, - Icon = metalLeg, - Tooltip = TempTooltip, - CanHaveHoles = false, - WorldStaticModel = TOC.MetalHook, - } -item MetalBase_MetalHand - { - Weight = 1.90, - Type = Normal, - DisplayCategory = Prosthesis, - DisplayName = Prosthesis - Metal Base and Metal Hand, - Icon = metalLeg, - Tooltip = TempTooltip, - CanHaveHoles = false, - WorldStaticModel = TOC.MetalHook, - } -item LeatherBase_WoodenHook - { - Weight = 1.20, - Type = Normal, - DisplayCategory = Prosthesis, - DisplayName = Prosthesis - Leather Base and Wooden Hook, - Icon = metalLeg, - Tooltip = TempTooltip, - CanHaveHoles = false, - WorldStaticModel = TOC.MetalHook, - } -item LeatherBase_MetalHook - { - Weight = 1.50, - Type = Normal, - DisplayCategory = Prosthesis, - DisplayName = Prosthesis - Leather Base and Metal Hook, - Icon = metalLeg, - Tooltip = TempTooltip, - CanHaveHoles = false, - WorldStaticModel = TOC.MetalHook, - } -item LeatherBase_MetalHand - { - Weight = 1.70, - Type = Normal, - DisplayCategory = Prosthesis, - DisplayName = Prosthesis - Leather Base and Metal Hand, - Icon = metalLeg, - Tooltip = TempTooltip, - CanHaveHoles = false, - WorldStaticModel = TOC.MetalHook, - } -item WoodenBase_WoodenHook - { - Weight = 0.90, - Type = Normal, - DisplayCategory = Prosthesis, - DisplayName = Prosthesis - Wooden Base and Wooden Hook, - Icon = metalLeg, - Tooltip = TempTooltip, - CanHaveHoles = false, - WorldStaticModel = TOC.MetalHook, - } -item WoodenBase_MetalHook - { - Weight = 1.20, - Type = Normal, - DisplayCategory = Prosthesis, - DisplayName = Prosthesis - Wooden Base and Metal Hook, - Icon = metalLeg, - Tooltip = TempTooltip, - CanHaveHoles = false, - WorldStaticModel = TOC.MetalHook, - } -item WoodenBase_MetalHand - { - Weight = 1.40, - Type = Normal, - DisplayCategory = Prosthesis, - DisplayName = Prosthesis - Wooden Base and Metal Hand, - Icon = metalLeg, - Tooltip = TempTooltip, - CanHaveHoles = false, - WorldStaticModel = TOC.MetalHook, - } -item MetalBase_WoodenHook - { - Weight = 1.40, - Type = Normal, - DisplayCategory = Prosthesis, - DisplayName = Prosthesis - Metal Base and Wooden Hook, - Icon = metalLeg, - Tooltip = TempTooltip, - CanHaveHoles = false, - WorldStaticModel = TOC.MetalHook, - } -item MetalBase_MetalHook - { - Weight = 1.70, - Type = Normal, - DisplayCategory = Prosthesis, - DisplayName = Prosthesis - Metal Base and Metal Hook, - Icon = metalLeg, - Tooltip = TempTooltip, - CanHaveHoles = false, - WorldStaticModel = TOC.MetalHook, - } -item MetalBase_MetalHand - { - Weight = 1.90, - Type = Normal, - DisplayCategory = Prosthesis, - DisplayName = Prosthesis - Metal Base and Metal Hand, - Icon = metalLeg, - Tooltip = TempTooltip, - CanHaveHoles = false, - WorldStaticModel = TOC.MetalHook, - } -item LeatherBase_WoodenHook - { - Weight = 1.20, - Type = Normal, - DisplayCategory = Prosthesis, - DisplayName = Prosthesis - Leather Base and Wooden Hook, - Icon = metalLeg, - Tooltip = TempTooltip, - CanHaveHoles = false, - WorldStaticModel = TOC.MetalHook, - } -item LeatherBase_MetalHook - { - Weight = 1.50, - Type = Normal, - DisplayCategory = Prosthesis, - DisplayName = Prosthesis - Leather Base and Metal Hook, - Icon = metalLeg, - Tooltip = TempTooltip, - CanHaveHoles = false, - WorldStaticModel = TOC.MetalHook, - } -item LeatherBase_MetalHand - { - Weight = 1.70, - Type = Normal, - DisplayCategory = Prosthesis, - DisplayName = Prosthesis - Leather Base and Metal Hand, - Icon = metalLeg, - Tooltip = TempTooltip, - CanHaveHoles = false, - WorldStaticModel = TOC.MetalHook, - } diff --git a/dev_stuff/python_helpers/outputs/output_recipe/script.txt b/dev_stuff/python_helpers/outputs/output_recipe/script.txt deleted file mode 100644 index 9a17aea..0000000 --- a/dev_stuff/python_helpers/outputs/output_recipe/script.txt +++ /dev/null @@ -1,144 +0,0 @@ -recipe Craft prosthesis with Wooden Base and Wooden Hook - { - ProstPart_WoodenBase, - ProstPart_WoodenHook, - - - Time: 10.0, - Result: Prost_WoodenBase_WoodenHook, - NeedToBeLearn: true, - CanBeDoneFromFloor: false, - OnGiveXP: NoXP_OnGiveXP, - SkillRequired: FirstAid=2, - Category: Surgeon, - OnCreate:ProsthesisRecipes.OnCreateProsthesis, - Tooltip: Recipe_Tooltip_AssembleProsthesis, - } -recipe Craft prosthesis with Wooden Base and Metal Hook - { - ProstPart_WoodenBase, - ProstPart_MetalHook, - - - Time: 10.0, - Result: Prost_WoodenBase_MetalHook, - NeedToBeLearn: true, - CanBeDoneFromFloor: false, - OnGiveXP: NoXP_OnGiveXP, - SkillRequired: FirstAid=2, - Category: Surgeon, - OnCreate:ProsthesisRecipes.OnCreateProsthesis, - Tooltip: Recipe_Tooltip_AssembleProsthesis, - } -recipe Craft prosthesis with Wooden Base and Metal Hand - { - ProstPart_WoodenBase, - ProstPart_MetalHand, - - - Time: 10.0, - Result: Prost_WoodenBase_MetalHand, - NeedToBeLearn: true, - CanBeDoneFromFloor: false, - OnGiveXP: NoXP_OnGiveXP, - SkillRequired: FirstAid=2, - Category: Surgeon, - OnCreate:ProsthesisRecipes.OnCreateProsthesis, - Tooltip: Recipe_Tooltip_AssembleProsthesis, - } -recipe Craft prosthesis with Metal Base and Wooden Hook - { - ProstPart_MetalBase, - ProstPart_WoodenHook, - - - Time: 10.0, - Result: Prost_MetalBase_WoodenHook, - NeedToBeLearn: true, - CanBeDoneFromFloor: false, - OnGiveXP: NoXP_OnGiveXP, - SkillRequired: FirstAid=2, - Category: Surgeon, - OnCreate:ProsthesisRecipes.OnCreateProsthesis, - Tooltip: Recipe_Tooltip_AssembleProsthesis, - } -recipe Craft prosthesis with Metal Base and Metal Hook - { - ProstPart_MetalBase, - ProstPart_MetalHook, - - - Time: 10.0, - Result: Prost_MetalBase_MetalHook, - NeedToBeLearn: true, - CanBeDoneFromFloor: false, - OnGiveXP: NoXP_OnGiveXP, - SkillRequired: FirstAid=2, - Category: Surgeon, - OnCreate:ProsthesisRecipes.OnCreateProsthesis, - Tooltip: Recipe_Tooltip_AssembleProsthesis, - } -recipe Craft prosthesis with Metal Base and Metal Hand - { - ProstPart_MetalBase, - ProstPart_MetalHand, - - - Time: 10.0, - Result: Prost_MetalBase_MetalHand, - NeedToBeLearn: true, - CanBeDoneFromFloor: false, - OnGiveXP: NoXP_OnGiveXP, - SkillRequired: FirstAid=2, - Category: Surgeon, - OnCreate:ProsthesisRecipes.OnCreateProsthesis, - Tooltip: Recipe_Tooltip_AssembleProsthesis, - } -recipe Craft prosthesis with Leather Base and Wooden Hook - { - ProstPart_LeatherBase, - ProstPart_WoodenHook, - - - Time: 10.0, - Result: Prost_LeatherBase_WoodenHook, - NeedToBeLearn: true, - CanBeDoneFromFloor: false, - OnGiveXP: NoXP_OnGiveXP, - SkillRequired: FirstAid=2, - Category: Surgeon, - OnCreate:ProsthesisRecipes.OnCreateProsthesis, - Tooltip: Recipe_Tooltip_AssembleProsthesis, - } -recipe Craft prosthesis with Leather Base and Metal Hook - { - ProstPart_LeatherBase, - ProstPart_MetalHook, - - - Time: 10.0, - Result: Prost_LeatherBase_MetalHook, - NeedToBeLearn: true, - CanBeDoneFromFloor: false, - OnGiveXP: NoXP_OnGiveXP, - SkillRequired: FirstAid=2, - Category: Surgeon, - OnCreate:ProsthesisRecipes.OnCreateProsthesis, - Tooltip: Recipe_Tooltip_AssembleProsthesis, - } -recipe Craft prosthesis with Leather Base and Metal Hand - { - ProstPart_LeatherBase, - ProstPart_MetalHand, - - - Time: 10.0, - Result: Prost_LeatherBase_MetalHand, - NeedToBeLearn: true, - CanBeDoneFromFloor: false, - OnGiveXP: NoXP_OnGiveXP, - SkillRequired: FirstAid=2, - Category: Surgeon, - OnCreate:ProsthesisRecipes.OnCreateProsthesis, - Tooltip: Recipe_Tooltip_AssembleProsthesis, - } diff --git a/media/lua/client/TOC/TimedActions/IgnoredActions.lua b/media/lua/client/TOC/TimedActions/IgnoredActions.lua deleted file mode 100644 index d40fd90..0000000 --- a/media/lua/client/TOC/TimedActions/IgnoredActions.lua +++ /dev/null @@ -1,139 +0,0 @@ --- TODO This section must be overhauled - --- local DataController = require("TOC/Controllers/DataController") --- local StaticData = require("TOC/StaticData") - ----@diagnostic disable: duplicate-set-field --- Bunch of actions shouldn't be modified by the adjusted time - ------------------------------------------------ ----* Some actions have specific maxTime calculations and we must account for that ----ISAttachItemHotbar ----ISDetachItemHotbar ----ISEquipWeaponAction ----ISUnequipAction - --- --- We're forced to re-run this crap to fix it --- ---@param action ISBaseTimedAction --- local function HandleSpeedSpecificAction(action, time) --- action.skipTOC = true --- action.maxTime = time --- action.animSpeed = 1.0 --- end - --- local og_ISAttachItemHotbar_new = ISAttachItemHotbar.new --- function ISAttachItemHotbar:new(character, item, slot, slotIndex, slotDef) --- local action = og_ISAttachItemHotbar_new(self, character, item, slot, slotIndex, slotDef) --- HandleSpeedSpecificAction(action, -1) --- return action --- end - --- local og_ISDetachItemHotbar_new = ISDetachItemHotbar.new --- function ISDetachItemHotbar:new(character, item) --- local action = og_ISDetachItemHotbar_new(self, character, item) --- HandleSpeedSpecificAction(action, -1) --- return action --- end - - --- local og_ISEquipWeaponAction_new = ISEquipWeaponAction.new --- function ISEquipWeaponAction:new(character, item, time, primary, twoHands) - --- local action = og_ISEquipWeaponAction_new(self, character, item, time, primary, twoHands) --- TOC_DEBUG.print("Override ISEquipWeaponAction New") - - --- -- check if right arm is cut off or not. if it is, penality shall apply --- -- if we got here, the action is valid, so we know that we have a prosthesis. - - --- local dcInst = DataController.GetInstance() - --- if not dcInst:getIsCut(StaticData.LIMBS_IND_STR.Hand_R) then --- action.skipTOC = true --- action.maxTime = time --- action.animSpeed = 1.0 --- TOC_DEBUG.print("Skipping TOC for ISEquipWeaponAction new") --- end - - --- -- if not twoHands then --- -- TOC_DEBUG.print("Not a two handed action, re-adding skip TOC") --- -- HandleSpeedSpecificAction(action) --- -- end --- return action --- end - --- local og_ISUnequipAction_new = ISUnequipAction.new --- function ISUnequipAction:new(character, item, time) --- local action = og_ISUnequipAction_new(self, character, item, time) --- ---@cast item InventoryItem - --- -- For some reason (I have no clue why), if we re-run the method it breaks basically every unequip clothing action. Not for weapons though. --- if instanceof(item, 'HandWeapon') then --- --print("Running handlespeedspecificaction") --- HandleSpeedSpecificAction(action) --- end - --- return action --- end - ------------------------------------------------------- ---- Normal cases - - -local og_ISEatFoodAction_new = ISEatFoodAction.new -function ISEatFoodAction:new(character, item, percentage) - local action = og_ISEatFoodAction_new(self, character, item, percentage) - --TOC_DEBUG.print("Override ISEatFoodAction") - action.skipTOC = true - return action -end - -local og_ISReadABook_new = ISReadABook.new -function ISReadABook:new(character, item, time) - local action = og_ISReadABook_new(self, character, item, time) - --TOC_DEBUG.print("Override ISReadABook") - action.skipTOC = true - return action -end - -local og_ISTakePillAction_new = ISTakePillAction.new -function ISTakePillAction:new(character, item, time) - local action = og_ISTakePillAction_new(self, character, item, time) - --TOC_DEBUG.print("Override ISTakePillAction") - action.skipTOC = true - return action -end - -local og_ISTakeWaterAction_new = ISTakeWaterAction.new -function ISTakeWaterAction:new(character, item, waterUnit, waterObject, time, oldItem) - local action = og_ISTakeWaterAction_new(self, character, item, waterUnit, waterObject, time, oldItem) - --TOC_DEBUG.print("Override ISTakeWaterAction") - action.skipTOC = true - return action -end - -local og_ISDrinkFromBottle_new = ISDrinkFromBottle.new -function ISDrinkFromBottle:new(character, item, uses) - local action = og_ISDrinkFromBottle_new(self, character, item, uses) - --TOC_DEBUG.print("Override ISDrinkFromBottle") - action.skipTOC = true - return action -end - -local og_ISFinalizeDealAction_new = ISFinalizeDealAction.new -function ISFinalizeDealAction:new(player, otherPlayer, itemsToGive, itemsToReceive, time) - local action = og_ISFinalizeDealAction_new(self, player, otherPlayer, itemsToGive, itemsToReceive, time) - --TOC_DEBUG.print("Override ISFinalizeDealAction") - action.skipTOC = true - return action -end - -local og_ISCampingInfoAction_new = ISCampingInfoAction.new -function ISCampingInfoAction:new(character, campfireObject, campfire) - local action = og_ISCampingInfoAction_new(self, character, campfireObject, campfire) - --TOC_DEBUG.print("Override ISCampingInfoAction") - action.skipTOC = true - return action -end \ No newline at end of file diff --git a/media/lua/client/lua_timers.lua b/media/lua/client/lua_timers.lua deleted file mode 100644 index 2ee0d69..0000000 --- a/media/lua/client/lua_timers.lua +++ /dev/null @@ -1,216 +0,0 @@ --- Made by Vyshnia --- Workshop ID: 2875394066 --- Mod ID: LuaTimers - -local os_time = os.time -local table_insert = table.insert -local table_remove = table.remove -local assert = assert -local type = type -local pairs = pairs - -timer = { - Timers = {}, - SimpleTimers = {} -} - -function timer:Simple(delay, func) - - assert(type(delay) == "number", "Delay of timer should be a number type") - assert(type(func) == "function", "Func of timer should be a function type (lol)") - - table_insert(self.SimpleTimers, { - EndTime = os_time() + delay, - Func = func - }) - -end - -function timer:Create(name, delay, repetitions, func) - - assert(type(name) == "string", "ID of timer should be a string type") - assert(type(delay) == "number", "Delay of timer should be a number type") - assert(type(repetitions) == "number", "Repetitions of timer should be a number type") - assert(type(func) == "function", "Func of timer should be a function type (lol)") - - self.Timers[name] = { - Delay = delay, - StartRepetitions = repetitions, - Repetitions = repetitions, - Infinity = repetitions == 0, - LastFuncTime = os_time(), - Func = func, - Paused = false, - } - -end - -local function timerUpdate() - - local cur_time = os_time() - - for k,v in pairs(timer.Timers) do - - if not v.Paused then - - if cur_time >= v.LastFuncTime + v.Delay then - - v.Func() - - v.LastFuncTime = cur_time - - if not v.Infinity then - - v.Repetitions = v.Repetitions - 1 - - if v.Repetitions <= 0 then - - timer.Timers[k] = nil - - end - - end - - end - - end - - end - - local simple_timers = timer.SimpleTimers - - for i = #simple_timers, 1, -1 do - - local t = simple_timers[i] - - if t.EndTime <= cur_time then - - t.Func() - - table_remove(simple_timers, i) - - end - - end - -end -Events.OnTickEvenPaused.Add(timerUpdate) - -function timer:Remove(name) - - local t = self.Timers[name] - - if not t then return false end - - self.Timers[name] = nil - - return true - -end - -function timer:Exists(name) - - return self.Timers[name] and true or false - -end - -function timer:Start(name) - - local t = self.Timers[name] - - if not t then return false end - - t.Repetitions = t.StartRepetitions - t.LastFuncTime = os_time() - t.Paused = false - t.PausedTime = nil - - return true - -end - -function timer:Pause(name) - - local t = self.Timers[name] - - if not t then return false end - - if t.Paused then return false end - - t.Paused = true - t.PausedTime = os_time() - - return true - -end - -function timer:UnPause(name) - - local t = self.Timers[name] - - if not t then return false end - - if not t.Paused then return false end - - t.Paused = false - - return true - -end -timer.Resume = timer.UnPause - -function timer:Toggle(name) - - local t = self.Timers[name] - - if not t then return false end - - t.Paused = not t.Paused - - return true - -end - -function timer:TimeLeft(name) - - local t = self.Timers[name] - - if not t then return end - - if t.Paused then - - return (t.Repetitions - 1) * t.Delay + (t.LastFuncTime + t.Delay - t.PausedTime) - - else - - return (t.Repetitions - 1) * t.Delay + (t.LastFuncTime + t.Delay - os_time()) - - end - -end - -function timer:NextTimeLeft(name) - - local t = self.Timers[name] - - if not t then return end - - if t.Paused then - - return t.LastFuncTime + t.Delay - t.PausedTime - - else - - return t.LastFuncTime + t.Delay - os_time() - - end - -end - -function timer:RepsLeft(name) - - local t = self.Timers[name] - - return t and t.Repetitions - -end \ No newline at end of file diff --git a/media/lua/shared/Translate/FR/IG_UI_FR.txt b/media/lua/shared/Translate/FR/IG_UI_FR.txt deleted file mode 100644 index a46405c..0000000 --- a/media/lua/shared/Translate/FR/IG_UI_FR.txt +++ /dev/null @@ -1,18 +0,0 @@ -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/ui/Female/ForeArm_L.png b/media/ui/Female/ForeArm_L.png deleted file mode 100644 index bbb5406..0000000 Binary files a/media/ui/Female/ForeArm_L.png and /dev/null differ diff --git a/media/ui/Female/ForeArm_R.png b/media/ui/Female/ForeArm_R.png deleted file mode 100644 index 3bba378..0000000 Binary files a/media/ui/Female/ForeArm_R.png and /dev/null differ diff --git a/media/ui/Female/Hand_L.png b/media/ui/Female/Hand_L.png deleted file mode 100644 index 6d83393..0000000 Binary files a/media/ui/Female/Hand_L.png and /dev/null differ diff --git a/media/ui/Female/Hand_R.png b/media/ui/Female/Hand_R.png deleted file mode 100644 index b2c70c9..0000000 Binary files a/media/ui/Female/Hand_R.png and /dev/null differ diff --git a/media/ui/Female/UpperArm_L.png b/media/ui/Female/UpperArm_L.png deleted file mode 100644 index 0203f40..0000000 Binary files a/media/ui/Female/UpperArm_L.png and /dev/null differ diff --git a/media/ui/Female/UpperArm_R.png b/media/ui/Female/UpperArm_R.png deleted file mode 100644 index 2d0386e..0000000 Binary files a/media/ui/Female/UpperArm_R.png and /dev/null differ diff --git a/media/ui/test.png b/media/ui/test.png deleted file mode 100644 index b5e36ee..0000000 Binary files a/media/ui/test.png and /dev/null differ diff --git a/media/ui/test_pattern.png b/media/ui/test_pattern.png deleted file mode 100644 index 51b85d4..0000000 Binary files a/media/ui/test_pattern.png and /dev/null differ diff --git a/mod.info b/mod.info index f17812a..7b8bb47 100644 --- a/mod.info +++ b/mod.info @@ -4,5 +4,4 @@ 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.5 -pzversion=41.65 +modversion=2.1.7 \ No newline at end of file diff --git a/workshop_files/workshop_test.txt b/workshop_files/workshop_test.txt new file mode 100644 index 0000000..e193552 --- /dev/null +++ b/workshop_files/workshop_test.txt @@ -0,0 +1,3 @@ +version=1 +title=[B41/B42] The Only Cure - Rebuilt (TEST) +visibility=hidden