From 95de5bb914da0ba2f7e3519d174b42eb1dfbc55e Mon Sep 17 00:00:00 2001 From: A Man Date: Mon, 6 Apr 2020 21:54:41 +0200 Subject: [PATCH] Add more broken tool versions --- .../Configs/CfgWeapons/CfgWeapons.hpp | 10 +- .../Configs/CfgWeapons/Tools/APSI.hpp | 6 + .../Configs/CfgWeapons/Tools/Etool.hpp | 9 ++ .../Configs/CfgWeapons/Tools/FishingPole.hpp | 7 ++ .../Configs/CfgWeapons/Tools/Flashlight.hpp | 55 -------- .../CfgWeapons/Tools/FlashlightRed.hpp | 48 ------- .../Configs/CfgWeapons/Tools/Flashlights.hpp | 118 ++++++++++++++++++ .../Configs/CfgWeapons/Tools/GPS.hpp | 8 ++ .../Configs/CfgWeapons/Tools/GPSBroken.hpp | 7 -- .../Configs/CfgWeapons/Tools/Gasmask1.hpp | 6 - .../Configs/CfgWeapons/Tools/Gasmask2.hpp | 6 - .../Configs/CfgWeapons/Tools/ItemKeyKit.hpp | 5 + .../Configs/CfgWeapons/Tools/Machete.hpp | 7 ++ .../Configs/CfgWeapons/Tools/Masks.hpp | 35 ++++++ .../Configs/CfgWeapons/Tools/NVG.hpp | 8 ++ .../Configs/CfgWeapons/Tools/NVGBroken.hpp | 7 -- .../Configs/CfgWeapons/Tools/Pilotmask.hpp | 6 - .../Configs/CfgWeapons/Tools/Radio.hpp | 8 ++ .../Configs/CfgWeapons/Tools/RadioBroken.hpp | 7 -- .../Configs/CfgWeapons/Tools/Sledgehammer.hpp | 7 ++ .../Configs/CfgWeapons/Tools/Solder.hpp | 5 + .../Configs/CfgWeapons/Tools/Toolbox.hpp | 6 + SQF/dayz_code/stringtable.xml | 100 ++++++++++++++- 23 files changed, 329 insertions(+), 152 deletions(-) delete mode 100644 SQF/dayz_code/Configs/CfgWeapons/Tools/Flashlight.hpp delete mode 100644 SQF/dayz_code/Configs/CfgWeapons/Tools/FlashlightRed.hpp create mode 100644 SQF/dayz_code/Configs/CfgWeapons/Tools/Flashlights.hpp delete mode 100644 SQF/dayz_code/Configs/CfgWeapons/Tools/GPSBroken.hpp delete mode 100644 SQF/dayz_code/Configs/CfgWeapons/Tools/Gasmask1.hpp delete mode 100644 SQF/dayz_code/Configs/CfgWeapons/Tools/Gasmask2.hpp create mode 100644 SQF/dayz_code/Configs/CfgWeapons/Tools/Masks.hpp delete mode 100644 SQF/dayz_code/Configs/CfgWeapons/Tools/NVGBroken.hpp delete mode 100644 SQF/dayz_code/Configs/CfgWeapons/Tools/Pilotmask.hpp delete mode 100644 SQF/dayz_code/Configs/CfgWeapons/Tools/RadioBroken.hpp diff --git a/SQF/dayz_code/Configs/CfgWeapons/CfgWeapons.hpp b/SQF/dayz_code/Configs/CfgWeapons/CfgWeapons.hpp index 0860f6b1c..42eb6ed17 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/CfgWeapons.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/CfgWeapons.hpp @@ -320,19 +320,13 @@ class CfgWeapons #include "Tools\Hatchet.hpp" #include "Tools\Machete.hpp" - #include "Tools\Flashlight.hpp" - #include "Tools\FlashlightRed.hpp" + #include "Tools\Flashlights.hpp" #include "Tools\Radio.hpp" #include "Tools\ItemKeyKit.hpp" #include "Tools\APSI.hpp" - #include "Tools\Pilotmask.hpp" - #include "Tools\Gasmask1.hpp" - #include "Tools\Gasmask2.hpp" - #include "Tools\GPSBroken.hpp" - #include "Tools\NVGBroken.hpp" - #include "Tools\RadioBroken.hpp" + #include "Tools\Masks.hpp" #include "Tools\Solder.hpp" #include "Item\ItemKeys.hpp" diff --git a/SQF/dayz_code/Configs/CfgWeapons/Tools/APSI.hpp b/SQF/dayz_code/Configs/CfgWeapons/Tools/APSI.hpp index f66f2f221..888097564 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Tools/APSI.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Tools/APSI.hpp @@ -3,4 +3,10 @@ class ItemAPSI_DZE : ItemCore { displayName = $STR_EQUIP_APSI; picture = "\dayz_epoch_c\icons\tools\ItemAPSI.paa"; descriptionShort = $STR_EQUIP_APSI_DESC; +}; + +class ItemAPSIBroken_DZE : ItemAPSI_DZE { + displayName = $STR_EQUIP_APSI_BROKEN; + descriptionShort = $STR_EQUIP_APSI_BROKEN_DESC; + picture = "\dayz_epoch_c\icons\tools\ItemAPSI.paa"; }; \ No newline at end of file diff --git a/SQF/dayz_code/Configs/CfgWeapons/Tools/Etool.hpp b/SQF/dayz_code/Configs/CfgWeapons/Tools/Etool.hpp index dbbb61df8..f3735f87a 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Tools/Etool.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Tools/Etool.hpp @@ -9,4 +9,13 @@ class ItemEtool : ItemCore stashsmall = "StashSmall"; stashmedium = "StashMedium"; consume = "ItemSandbag"; +}; + +class ItemEtoolBroken : ItemCore +{ + scope = public; + model = "\dayz_equip\models\etool.p3d"; + picture = "\dayz_equip\textures\equip_etool_ca.paa"; + displayName = $STR_EQUIP_NAME_1_BROKEN; + descriptionShort = $STR_EQUIP_DESC_1_BROKEN; }; \ No newline at end of file diff --git a/SQF/dayz_code/Configs/CfgWeapons/Tools/FishingPole.hpp b/SQF/dayz_code/Configs/CfgWeapons/Tools/FishingPole.hpp index 736c017b7..24bb138c9 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Tools/FishingPole.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Tools/FishingPole.hpp @@ -37,4 +37,11 @@ class ItemFishingPole : ItemCore }; }; }; +}; + +class ItemFishingPoleBroken : ItemFishingPole +{ + displayName = $STR_ITEM_NAME_FISHINGPOLEBROKEN; + descriptionShort = $STR_ITEM_DESC_FISHINGPOLE_BROKEN; + class ItemActions {}; }; \ No newline at end of file diff --git a/SQF/dayz_code/Configs/CfgWeapons/Tools/Flashlight.hpp b/SQF/dayz_code/Configs/CfgWeapons/Tools/Flashlight.hpp deleted file mode 100644 index c395b33b9..000000000 --- a/SQF/dayz_code/Configs/CfgWeapons/Tools/Flashlight.hpp +++ /dev/null @@ -1,55 +0,0 @@ -class ItemFlashlight : ItemCore -{ - scope = public; - - model = "\dayz_equip\models\flashlight.p3d"; - picture = "\dayz_equip\textures\equip_flashlight_ca.paa"; - displayName = $STR_EQUIP_NAME_5; - descriptionShort = $STR_EQUIP_DESC_5; - - class ItemActions - { - class Toolbelt - { - text = $STR_ACTIONS_RFROMTB; - script = "spawn player_addToolbelt;"; - use[] = {"ItemFlashlight"}; - output[] = {"MeleeFlashlight"}; - }; - }; -}; - -class MeleeFlashlight : Pistol -{ - scope = public; - - model = "\dayz_equip\models\flashlight.p3d"; - picture = "\dayz_equip\textures\equip_flashlight_ca.paa"; - displayName = $STR_EQUIP_NAME_5; - descriptionShort = $STR_EQUIP_DESC_5; - - modelOptics = "-"; - magazines[] = {}; - - class FlashLight - { - color[] = {0.9, 0.9, 0.7, 0.9}; - ambient[] = {0.1, 0.1, 0.1, 1}; - position = "flash dir"; - direction = "flash"; - angle = 30; - scale[] = {1, 1, 0.5}; - brightness = 0.1; - }; - - class ItemActions - { - class Toolbelt - { - text = $STR_ACTIONS_2TB; - script = "spawn player_addToolbelt;"; - use[] = {"MeleeFlashlight"}; - output[] = {"ItemFlashlight"}; - }; - }; -}; \ No newline at end of file diff --git a/SQF/dayz_code/Configs/CfgWeapons/Tools/FlashlightRed.hpp b/SQF/dayz_code/Configs/CfgWeapons/Tools/FlashlightRed.hpp deleted file mode 100644 index 8ed7aeb55..000000000 --- a/SQF/dayz_code/Configs/CfgWeapons/Tools/FlashlightRed.hpp +++ /dev/null @@ -1,48 +0,0 @@ -class ItemFlashlightRed : ItemFlashlight -{ - model = "\dayz_equip\models\flashlight_mil.p3d"; - picture = "\dayz_equip\textures\equip_flashlight_mil_ca.paa"; - displayName = $STR_EQUIP_NAME_6; - descriptionShort = $STR_EQUIP_DESC_6; - - class ItemActions - { - class Toolbelt - { - text = $STR_ACTIONS_RFROMTB; - script = "spawn player_addToolbelt;"; - use[] = {"ItemFlashlightRed"}; - output[] = {"MeleeFlashlightRed"}; - }; - }; -}; - -class MeleeFlashlightRed : MeleeFlashlight -{ - model = "\dayz_equip\models\flashlight_mil.p3d"; - picture = "\dayz_equip\textures\equip_flashlight_mil_ca.paa"; - displayName = $STR_EQUIP_NAME_6; - descriptionShort = $STR_EQUIP_DESC_6; - - class FlashLight - { - color[] = {0.9, 0.0, 0.0, 0.9}; - ambient[] = {0.1, 0.0, 0.0, 1}; - position = "flash dir"; - direction = "flash"; - angle = 30; - scale[] = {1, 1, 0.5}; - brightness = 0.08; - }; - - class ItemActions - { - class Toolbelt - { - text = $STR_ACTIONS_2TB; - script = "spawn player_addToolbelt;"; - use[] = {"MeleeFlashlightRed"}; - output[] = {"ItemFlashlightRed"}; - }; - }; -}; \ No newline at end of file diff --git a/SQF/dayz_code/Configs/CfgWeapons/Tools/Flashlights.hpp b/SQF/dayz_code/Configs/CfgWeapons/Tools/Flashlights.hpp new file mode 100644 index 000000000..9afcbfc4d --- /dev/null +++ b/SQF/dayz_code/Configs/CfgWeapons/Tools/Flashlights.hpp @@ -0,0 +1,118 @@ +class ItemFlashlight : ItemCore +{ + scope = public; + + model = "\dayz_equip\models\flashlight.p3d"; + picture = "\dayz_equip\textures\equip_flashlight_ca.paa"; + displayName = $STR_EQUIP_NAME_5; + descriptionShort = $STR_EQUIP_DESC_5; + + class ItemActions + { + class Toolbelt + { + text = $STR_ACTIONS_RFROMTB; + script = "spawn player_addToolbelt;"; + use[] = {"ItemFlashlight"}; + output[] = {"MeleeFlashlight"}; + }; + }; +}; + +class ItemFlashlightBroken : ItemFlashlight +{ + displayName = $STR_EQUIP_NAME_5_BROKEN; + descriptionShort = $STR_EQUIP_DESC_5_BROKEN; + class ItemActions {}; +}; + +class MeleeFlashlight : Pistol +{ + scope = public; + + model = "\dayz_equip\models\flashlight.p3d"; + picture = "\dayz_equip\textures\equip_flashlight_ca.paa"; + displayName = $STR_EQUIP_NAME_5; + descriptionShort = $STR_EQUIP_DESC_5; + + modelOptics = "-"; + magazines[] = {}; + + class FlashLight + { + color[] = {0.9, 0.9, 0.7, 0.9}; + ambient[] = {0.1, 0.1, 0.1, 1}; + position = "flash dir"; + direction = "flash"; + angle = 30; + scale[] = {1, 1, 0.5}; + brightness = 0.1; + }; + + class ItemActions + { + class Toolbelt + { + text = $STR_ACTIONS_2TB; + script = "spawn player_addToolbelt;"; + use[] = {"MeleeFlashlight"}; + output[] = {"ItemFlashlight"}; + }; + }; +}; + +class ItemFlashlightRed : ItemFlashlight +{ + model = "\dayz_equip\models\flashlight_mil.p3d"; + picture = "\dayz_equip\textures\equip_flashlight_mil_ca.paa"; + displayName = $STR_EQUIP_NAME_6; + descriptionShort = $STR_EQUIP_DESC_6; + + class ItemActions + { + class Toolbelt + { + text = $STR_ACTIONS_RFROMTB; + script = "spawn player_addToolbelt;"; + use[] = {"ItemFlashlightRed"}; + output[] = {"MeleeFlashlightRed"}; + }; + }; +}; + +class ItemFlashlightRedBroken : ItemFlashlightRed +{ + displayName = $STR_EQUIP_NAME_6_BROKEN; + descriptionShort = $STR_EQUIP_DESC_6_BROKEN; + class ItemActions {}; +}; + +class MeleeFlashlightRed : MeleeFlashlight +{ + model = "\dayz_equip\models\flashlight_mil.p3d"; + picture = "\dayz_equip\textures\equip_flashlight_mil_ca.paa"; + displayName = $STR_EQUIP_NAME_6; + descriptionShort = $STR_EQUIP_DESC_6; + + class FlashLight + { + color[] = {0.9, 0.0, 0.0, 0.9}; + ambient[] = {0.1, 0.0, 0.0, 1}; + position = "flash dir"; + direction = "flash"; + angle = 30; + scale[] = {1, 1, 0.5}; + brightness = 0.08; + }; + + class ItemActions + { + class Toolbelt + { + text = $STR_ACTIONS_2TB; + script = "spawn player_addToolbelt;"; + use[] = {"MeleeFlashlightRed"}; + output[] = {"ItemFlashlightRed"}; + }; + }; +}; \ No newline at end of file diff --git a/SQF/dayz_code/Configs/CfgWeapons/Tools/GPS.hpp b/SQF/dayz_code/Configs/CfgWeapons/Tools/GPS.hpp index cb7c25def..fa8135c36 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Tools/GPS.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Tools/GPS.hpp @@ -1,4 +1,12 @@ class ItemGPS : ItemCore { model = "z\addons\dayz_communityassets\models\gps.p3d"; +}; + +class ItemGPSBroken_DZE : ItemCore { + scope = public; + displayName = $STR_EQUIP_BROKEN_GPS; + model = "z\addons\dayz_communityassets\models\gps.p3d"; + picture = "\dayz_epoch_c\icons\tools\ItemGPSBroken.paa"; + descriptionShort = $STR_EQUIP_BROKEN_GPS_DESC; }; \ No newline at end of file diff --git a/SQF/dayz_code/Configs/CfgWeapons/Tools/GPSBroken.hpp b/SQF/dayz_code/Configs/CfgWeapons/Tools/GPSBroken.hpp deleted file mode 100644 index d70327f56..000000000 --- a/SQF/dayz_code/Configs/CfgWeapons/Tools/GPSBroken.hpp +++ /dev/null @@ -1,7 +0,0 @@ -class ItemGPSBroken_DZE : ItemCore { - scope = public; - displayName = $STR_EQUIP_BROKEN_GPS; - model = "z\addons\dayz_communityassets\models\gps.p3d"; - picture = "\dayz_epoch_c\icons\tools\ItemGPSBroken.paa"; - descriptionShort = $STR_EQUIP_BROKEN_GPS_DESC; -}; \ No newline at end of file diff --git a/SQF/dayz_code/Configs/CfgWeapons/Tools/Gasmask1.hpp b/SQF/dayz_code/Configs/CfgWeapons/Tools/Gasmask1.hpp deleted file mode 100644 index 14b70c6c3..000000000 --- a/SQF/dayz_code/Configs/CfgWeapons/Tools/Gasmask1.hpp +++ /dev/null @@ -1,6 +0,0 @@ -class ItemGasmask1_DZE : ItemCore { - scope = public; - picture = "\dayz_epoch_c\icons\tools\ItemGasmask1.paa"; - displayName = $STR_EQUIP_GAS_MASK1; - descriptionShort = $STR_EQUIP_GAS_MASK1_DESC; -}; \ No newline at end of file diff --git a/SQF/dayz_code/Configs/CfgWeapons/Tools/Gasmask2.hpp b/SQF/dayz_code/Configs/CfgWeapons/Tools/Gasmask2.hpp deleted file mode 100644 index f3afafc60..000000000 --- a/SQF/dayz_code/Configs/CfgWeapons/Tools/Gasmask2.hpp +++ /dev/null @@ -1,6 +0,0 @@ -class ItemGasmask2_DZE : ItemCore { - scope = public; - picture = "\dayz_epoch_c\icons\tools\ItemGasmask2.paa"; - displayName = $STR_EQUIP_GAS_MASK2; - descriptionShort = $STR_EQUIP_GAS_MASK2_DESC; -}; \ No newline at end of file diff --git a/SQF/dayz_code/Configs/CfgWeapons/Tools/ItemKeyKit.hpp b/SQF/dayz_code/Configs/CfgWeapons/Tools/ItemKeyKit.hpp index 0717abf89..f953562a9 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Tools/ItemKeyKit.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Tools/ItemKeyKit.hpp @@ -5,3 +5,8 @@ class ItemKeyKit: ItemCore { descriptionShort=$STR_EQUIP_KEYKIT_DESC; picture="\z\addons\dayz_epoch\pictures\equip_keykit_ca.paa"; }; + +class ItemKeyKitBroken: ItemKeyKit { + displayname = $STR_EQUIP_KEYKIT_BROKEN; + descriptionShort = $STR_EQUIP_KEYKIT_BROKEN_DESC; +}; \ No newline at end of file diff --git a/SQF/dayz_code/Configs/CfgWeapons/Tools/Machete.hpp b/SQF/dayz_code/Configs/CfgWeapons/Tools/Machete.hpp index b0b915a49..e11f48843 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Tools/Machete.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Tools/Machete.hpp @@ -25,4 +25,11 @@ class ItemMachete : ItemCore output[] = {"MeleeMachete"}; }; }; +}; + +class ItemMacheteBroken : ItemMachete +{ + displayName = $STR_EQUIP_NAME_MACHETE_BROKEN; + descriptionShort = $STR_EQUIP_DESC_MACHETE_BROKEN; + class ItemActions {}; }; \ No newline at end of file diff --git a/SQF/dayz_code/Configs/CfgWeapons/Tools/Masks.hpp b/SQF/dayz_code/Configs/CfgWeapons/Tools/Masks.hpp new file mode 100644 index 000000000..311d41d36 --- /dev/null +++ b/SQF/dayz_code/Configs/CfgWeapons/Tools/Masks.hpp @@ -0,0 +1,35 @@ +class ItemPilotmask_DZE : ItemCore { + scope = public; + picture = "\dayz_epoch_c\icons\tools\ItemPilotmask.paa"; + displayName = $STR_EQUIP_PILOT_MASK; + descriptionShort = $STR_EQUIP_PILOT_MASK_DESC; +}; + +class ItemPilotmaskBroken_DZE : ItemPilotmask_DZE { + displayName = $STR_EQUIP_PILOT_MASK_BROKEN; + descriptionShort = $STR_EQUIP_PILOT_MASK_BROKEN_DESC; +}; + +class ItemGasmask1_DZE : ItemCore { + scope = public; + picture = "\dayz_epoch_c\icons\tools\ItemGasmask1.paa"; + displayName = $STR_EQUIP_GAS_MASK1; + descriptionShort = $STR_EQUIP_GAS_MASK1_DESC; +}; + +class ItemGasmask1Broken_DZE : ItemGasmask1_DZE { + displayName = $STR_EQUIP_GAS_MASK1_BROKEN; + descriptionShort = $STR_EQUIP_GAS_MASK1_BROKEN_DESC; +}; + +class ItemGasmask2_DZE : ItemCore { + scope = public; + picture = "\dayz_epoch_c\icons\tools\ItemGasmask2.paa"; + displayName = $STR_EQUIP_GAS_MASK2; + descriptionShort = $STR_EQUIP_GAS_MASK2_DESC; +}; + +class ItemGasmask2Broken_DZE : ItemGasmask2_DZE { + displayName = $STR_EQUIP_GAS_MASK2_BROKEN; + descriptionShort = $STR_EQUIP_GAS_MASK2_BROKEN_DESC; +}; \ No newline at end of file diff --git a/SQF/dayz_code/Configs/CfgWeapons/Tools/NVG.hpp b/SQF/dayz_code/Configs/CfgWeapons/Tools/NVG.hpp index c60e6c92b..6a9e7e076 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Tools/NVG.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Tools/NVG.hpp @@ -4,4 +4,12 @@ class NVGoggles_DZE: NVGoggles displayName = "NVG (Full Screen)"; modelOptics = ""; descriptionShort = "Full Screen Night Vision Goggles"; +}; + +class ItemNVGBroken_DZE : ItemCore { + scope = public; + displayName = $STR_EQUIP_BROKEN_NV; + model = "\dayz_epoch_c\items\nvg\nvg_dzn.p3d"; + picture = "\dayz_epoch_c\icons\tools\ItemNVGBroken.paa"; + descriptionShort = $STR_EQUIP_BROKEN_NV_DESC; }; \ No newline at end of file diff --git a/SQF/dayz_code/Configs/CfgWeapons/Tools/NVGBroken.hpp b/SQF/dayz_code/Configs/CfgWeapons/Tools/NVGBroken.hpp deleted file mode 100644 index 44c86f92a..000000000 --- a/SQF/dayz_code/Configs/CfgWeapons/Tools/NVGBroken.hpp +++ /dev/null @@ -1,7 +0,0 @@ -class ItemNVGBroken_DZE : ItemCore { - scope = public; - displayName = $STR_EQUIP_BROKEN_NV; - model = "\dayz_epoch_c\items\nvg\nvg_dzn.p3d"; - picture = "\dayz_epoch_c\icons\tools\ItemNVGBroken.paa"; - descriptionShort = $STR_EQUIP_BROKEN_NV_DESC; -}; \ No newline at end of file diff --git a/SQF/dayz_code/Configs/CfgWeapons/Tools/Pilotmask.hpp b/SQF/dayz_code/Configs/CfgWeapons/Tools/Pilotmask.hpp deleted file mode 100644 index 3da11f22e..000000000 --- a/SQF/dayz_code/Configs/CfgWeapons/Tools/Pilotmask.hpp +++ /dev/null @@ -1,6 +0,0 @@ -class ItemPilotmask_DZE : ItemCore { - scope = public; - picture = "\dayz_epoch_c\icons\tools\ItemPilotmask.paa"; - displayName = $STR_EQUIP_PILOT_MASK; - descriptionShort = $STR_EQUIP_PILOT_MASK_DESC; -}; \ No newline at end of file diff --git a/SQF/dayz_code/Configs/CfgWeapons/Tools/Radio.hpp b/SQF/dayz_code/Configs/CfgWeapons/Tools/Radio.hpp index d25ff7f86..0fce7ca5a 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Tools/Radio.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Tools/Radio.hpp @@ -9,4 +9,12 @@ class ItemRadio : ItemCore script = ";if (!isNil 'dayz_groupInit') then {[] spawn dayz_openGroupDialog;};"; }; }; +}; + +class ItemRadioBroken_DZE : ItemCore { + scope = public; + displayName = $STR_EQUIP_BROKEN_RADIO; + model = "\nst\ns_dayz\items\radio\radio_dzn.p3d"; + picture = "\dayz_epoch_c\icons\tools\ItemRadioBroken.paa"; + descriptionShort = $STR_EQUIP_BROKEN_RADIO_DESC; }; \ No newline at end of file diff --git a/SQF/dayz_code/Configs/CfgWeapons/Tools/RadioBroken.hpp b/SQF/dayz_code/Configs/CfgWeapons/Tools/RadioBroken.hpp deleted file mode 100644 index 64d5198fb..000000000 --- a/SQF/dayz_code/Configs/CfgWeapons/Tools/RadioBroken.hpp +++ /dev/null @@ -1,7 +0,0 @@ -class ItemRadioBroken_DZE : ItemCore { - scope = public; - displayName = $STR_EQUIP_BROKEN_RADIO; - model = "\nst\ns_dayz\items\radio\radio_dzn.p3d"; - picture = "\dayz_epoch_c\icons\tools\ItemRadioBroken.paa"; - descriptionShort = $STR_EQUIP_BROKEN_RADIO_DESC; -}; \ No newline at end of file diff --git a/SQF/dayz_code/Configs/CfgWeapons/Tools/Sledgehammer.hpp b/SQF/dayz_code/Configs/CfgWeapons/Tools/Sledgehammer.hpp index 38cafb64b..134088902 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Tools/Sledgehammer.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Tools/Sledgehammer.hpp @@ -35,6 +35,13 @@ class ItemSledge: ItemCore // Epoch class }; }; +class ItemSledgeBroken: ItemSledge // Epoch class +{ + displayName = $STR_name_ItemSledgeHammerBroken; + descriptionShort = $STR_desc_ItemSledgeHammerBroken; + class ItemActions {}; +}; + //Vanilla sledge is using a different model. //All scripts have been changed to use Epoch ItemSledge, but leave this defined in case admins want to use it for something. class ItemSledgeHammer : ItemCore diff --git a/SQF/dayz_code/Configs/CfgWeapons/Tools/Solder.hpp b/SQF/dayz_code/Configs/CfgWeapons/Tools/Solder.hpp index 3d39d6adf..ee80c40ae 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Tools/Solder.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Tools/Solder.hpp @@ -4,4 +4,9 @@ class ItemSolder_DZE : ItemCore { model = "\nst\ns_dayz\items\solder\solder_dzn.p3d"; picture = "\nst\ns_dayz\items\solder\data\icon_solder_dzn_ca.paa"; descriptionShort = $STR_EQUIP_SOLDER_DESC; +}; + +class ItemSolderBroken_DZE : ItemSolder_DZE { + displayName = $STR_EQUIP_SOLDER_BROKEN; + descriptionShort = $STR_EQUIP_SOLDER_BROKEN_DESC; }; \ No newline at end of file diff --git a/SQF/dayz_code/Configs/CfgWeapons/Tools/Toolbox.hpp b/SQF/dayz_code/Configs/CfgWeapons/Tools/Toolbox.hpp index 588b59845..43ae0bf5e 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Tools/Toolbox.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Tools/Toolbox.hpp @@ -13,5 +13,11 @@ class ItemToolbox : ItemCore script=";[['DesertCamoNet_DZ','ForestCamoNet_DZ','DesertLargeCamoNet_DZ','ForestLargeCamoNet_DZ'],10,'str_epoch_player_8'] call player_removeNearby;"; }; }; +}; +class ItemToolboxBroken : ItemToolbox +{ + displayName = $STR_EQUIP_NAME_2_BROKEN; + descriptionShort = $STR_EQUIP_DESC_2_BROKEN; + class ItemActions {}; }; \ No newline at end of file diff --git a/SQF/dayz_code/stringtable.xml b/SQF/dayz_code/stringtable.xml index 7b3c6e10c..a5b43fdc4 100644 --- a/SQF/dayz_code/stringtable.xml +++ b/SQF/dayz_code/stringtable.xml @@ -3162,14 +3162,22 @@ Outil de tranchée Polní lopatka + + Broken Entrenching Tool + Kaputter Klappspaten + - Collapsible spade used together with the engineering backpack to create field defences + Collapsible spade used together with the engineering backpack to create field defences. Ein Klappspaten, welcher beim Verschanzen und für viele Bautätigkeiten benötigt wird. Саперная лопатка используется вместе с инженерным ранцем для создания оборонительных сооружений. Una pala plegable usada para crear defensas en el campo. Une pelle démontable permettant de construire des éléments de défense. Polní lopatka se používá při stavbě obranných postavení. Pokud jste SpecNaz, umíte s ní zabít. + + Broken collapsible spade that must be repaired. + Ein kaputter Klappspaten, welcher repariert werden muss. + Shovel Schaufel @@ -3204,6 +3212,10 @@ Boîte à outils Sada nástrojů + + Broken Toolbox + Kaputter Werkzeugkasten + Toolbox that can be used for repairing damaged vehicles and equipment. Eine Kiste mit Werkzeugen, welche zum Reparieren beschädigter Fahrzeuge und Ausrüstung verwendet werden können. @@ -3212,6 +3224,10 @@ Boîte à outils servant à réparer le matériel et les véhicules. Sada nástrojů se používá pro opravy poškozených vozidel a vybavení. + + A broken toolbox that must be repaired. + Ein kaputter Werkzeugkasten, welcher repariert werden muss. + While creating the fire you realise you only have 5 matches left. После розжига огня осталось всего 5 спичек. @@ -3394,6 +3410,10 @@ Lampe torche Baterka + + Broken Flashlight + Kaputte Taschenlampe + Battery-powered Flashlight<br/>Batteries: 2 x D-size Batteriebetriebene Taschenlampe, benötigte Batterien: 2x R20/D @@ -3402,6 +3422,10 @@ Lampe torche à piles.<br/>Piles: 2 x Type D Klasická baterka na baterie<br/>Baterie: 2xD + + A broken Battery-powered Flashlight that must be repaired. + Eine kaputte batteriebetriebene Taschenlampe, welche repariert werden muss. + Flashlight (Military) Militärtaschenlampe @@ -3410,6 +3434,10 @@ Lampe torche (Mil.) Baterka (Vojenská) + + Broken Flashlight (Military) + Kaputte Militärtaschenlampe + Military Red-light Battery-powered Flashlight<br/>Batteries: 2 x D-size Militärische, batteriebetriebene Rotlichtlampe, benötigte Batterien: 2x R20/D @@ -3418,6 +3446,10 @@ Lampe torche militaire à piles, lumière rouge.<br/>Piles: 2 x Type D Vojenská baterka s červeným světlem na baterie<br/>Baterie: 2xD + + A broken military Red-light that must be repaired. + Eine kaputte militärische, batteriebetriebene Rotlichtlampe, welche repariert werden muss. + Bandage Verbandszeug @@ -4521,6 +4553,10 @@ Mačeta Machette + + Broken Machete + Kaputte Machete + An agricultural tool turned into a weapon, the Machete may be less versatile than the common hatchet, but it packs a punch. Сельскохозяйственный инструмент, превращенный в оружие. Не такой универсальный, как топор, но весьма мощный. @@ -4529,6 +4565,10 @@ Un outil agricole qui peut être utilisé comme une arme. La machette est moins versatile que la hache mais plus tranchante. Ein ursprünglich in der Landwirtschaft verwendetes Werkzeug mit langer Klinge, das auch als Waffe verwendet werden kann. Ungeeignet zum Holzfällen. + + Broken machete that must be reparied. + Eine kaputte Machete, welche repariert werden muss. + Baseball Bat Бейсбольная бита @@ -6355,6 +6395,10 @@ Angel Vishengel + + Broken Fishing Pole + Kaputte Angel + This carbon fiber rod may be old but she still works like a charm. Эта карбоновая палка хоть и выглядит старой, но работает как надо. @@ -6364,6 +6408,10 @@ Die Carbon-Angelrute mag alt aussehen, funktioniert aber noch tadellos. Dit carbonnen hengeltje is al oud, maar werkt nog prima! + + A broken fishing pole that must be repaired. + Eine kaputte Angelrute, welche repariert werden muss. + CamoNet Камуфляжная сеть @@ -15272,6 +15320,10 @@ Kit de Reproduction de Clés Sada klíčů + + Broken Keymakers kit + Kaputtes Schlüsselmacher Kit + Kit including the tools required to smelt, mold and shape keys. Ein Kit zum Schmelzen und Formen von Schlüsseln. @@ -15281,6 +15333,10 @@ Ce kit inclut tous les outils nécessaires à fondre, modeler et découper des clés. Sada obsahující nástroje potřebné k vytvoření klíčů. + + A broken kit to make key that must be repaired. + Ein kaputtes Kit zum Schmelzen und Formen von Schlüsseln, welches repariert werden muss. + A tool with a large, flat head attached to a handle. The head is typically made of metal. The sledgehammer can apply more force than other hammers. Ein Vorschlaghammer ist ein aus einem Hammerkopf (typischerweise aus geschmiedetem Stahl) und einem Stiel bestehendes Handwerkzeug. Der Vorschlaghammer kann mit höheren Schlagkräften als andere Hämmer genutzt werden. @@ -23014,10 +23070,18 @@ Portable Solder Tragbarer Lötkolben + + Broken Portable Solder + Kaputter Tragbarer Lötkolben + Soldering tool used for repairing broken equipment and items. Ein tragbarer Lötkolben, um beschädigte Gegenstände und Ausrüstung zu reparieren. - + + + Broken soldering tool that must be reparied. + Ein kaputter tragbarer Lötkolben, welcher repariert werden muss. + Broken Radio Beschädigtes Funkgerät @@ -23046,33 +23110,65 @@ Pilot Mask Pilotenmaske + + Broken Pilot Mask + Kaputte Pilotenmaske + A wearable pilot mask. Eine tragbare Pilotenmaske. + + A wearable pilot mask that must be repaired. + Eine tragbare Pilotenmaske, welche repariert werden muss. + Gas Mask 4A1 Gasmaske 4A1 + + Broken Gas Mask 4A1 + Kaputte Gasmaske 4A1 + Gas Mask 4A1 used by civilians. Gasmaske 4A1 für die Zivilbevölkerung. + + A broken Gas Mask 4A1 that must be repaired. + Eine kaputte Gasmaske 4A1, welche repariert werden muss. + Gas Mask S10 NBC Gasmaske S10 NBC + + Broken Gas Mask S10 NBC + Kaputte Gasmaske S10 NBC + Gas Mask S10 NBC used by the military. Gasmaske S10 NBC für das Militär. + + A broken Gas Mask S10 NBC that must be repaired. + Eine kaputte Gasmaske S10 NBC, welche repariert werden muss. + APSI + + Broken APSI + Beschädigtes APSI + APSI (Anti PSI) device, which full purpose is yet unknown. APSI (Anti PSI) Emitter, dessen vollständige Funktion noch unbekannt ist. + + Broken APSI (Anti PSI) device, that must be repaired. + Kaputter APSI (Anti PSI) Emitter, welcher repariert werden muss. + Disabled: Deaktiviert: