From 684d007bbab1777776d870957f651160edffbf22 Mon Sep 17 00:00:00 2001 From: dayz10k Date: Mon, 18 Nov 2013 16:58:12 -0500 Subject: [PATCH 1/5] #696 Add more weapons to loot spawns Nightvision toggle to regular scope FAL --- .../Configs/CfgWeapons/Weapon/Rifle/FN_FAL_ANPVS4_DZE.hpp | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 SQF/dayz_code/Configs/CfgWeapons/Weapon/Rifle/FN_FAL_ANPVS4_DZE.hpp diff --git a/SQF/dayz_code/Configs/CfgWeapons/Weapon/Rifle/FN_FAL_ANPVS4_DZE.hpp b/SQF/dayz_code/Configs/CfgWeapons/Weapon/Rifle/FN_FAL_ANPVS4_DZE.hpp new file mode 100644 index 000000000..f0d7f21b7 --- /dev/null +++ b/SQF/dayz_code/Configs/CfgWeapons/Weapon/Rifle/FN_FAL_ANPVS4_DZE.hpp @@ -0,0 +1,3 @@ +class FN_FAL_ANPVS4_DZE:FN_FAL_ANPVS4 { + visionMode[] = {"Normal", NVG}; +}; From b1096449c902208a7ff5431f07414e7182a5c000 Mon Sep 17 00:00:00 2001 From: dayz10k Date: Mon, 18 Nov 2013 16:59:03 -0500 Subject: [PATCH 2/5] #696 Add more weapons to loot spawns --- SQF/dayz_code/Configs/CfgWeapons.hpp | 1 + 1 file changed, 1 insertion(+) diff --git a/SQF/dayz_code/Configs/CfgWeapons.hpp b/SQF/dayz_code/Configs/CfgWeapons.hpp index 1df446900..8f932ac85 100644 --- a/SQF/dayz_code/Configs/CfgWeapons.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons.hpp @@ -87,4 +87,5 @@ class CfgWeapons { #include "CfgWeapons\Weapon\LMG\m240_scoped.hpp" #include "CfgWeapons\Weapon\LMG\m249_scoped.hpp" #include "CfgWeapons\Weapon\LMG\M60A4.hpp" + #include "CfgWeapons\Weapon\Rifle\FN_FAL_ANPVS4_DZE.hpp" }; From f5a306419b26506263ddaf0ff587051691c90268 Mon Sep 17 00:00:00 2001 From: dayz10k Date: Mon, 18 Nov 2013 16:59:13 -0500 Subject: [PATCH 3/5] Update CfgWeapons.hpp --- SQF/dayz_code/Configs/CfgWeapons.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SQF/dayz_code/Configs/CfgWeapons.hpp b/SQF/dayz_code/Configs/CfgWeapons.hpp index 8f932ac85..344fb0779 100644 --- a/SQF/dayz_code/Configs/CfgWeapons.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons.hpp @@ -87,5 +87,5 @@ class CfgWeapons { #include "CfgWeapons\Weapon\LMG\m240_scoped.hpp" #include "CfgWeapons\Weapon\LMG\m249_scoped.hpp" #include "CfgWeapons\Weapon\LMG\M60A4.hpp" - #include "CfgWeapons\Weapon\Rifle\FN_FAL_ANPVS4_DZE.hpp" +// #include "CfgWeapons\Weapon\Rifle\FN_FAL_ANPVS4_DZE.hpp" }; From c5b510018b817f7ea3f91c926c9b8db39198a724 Mon Sep 17 00:00:00 2001 From: dayz10k Date: Mon, 18 Nov 2013 17:13:49 -0500 Subject: [PATCH 4/5] #709 Add Stringtable localization for Epoch toolbelt items --- SQF/dayz_epoch_b/stringtable.xml | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/SQF/dayz_epoch_b/stringtable.xml b/SQF/dayz_epoch_b/stringtable.xml index d1d6b2730..f5fbec0c2 100644 --- a/SQF/dayz_epoch_b/stringtable.xml +++ b/SQF/dayz_epoch_b/stringtable.xml @@ -2529,7 +2529,7 @@ Keymakers kit Keymakers kit Sleutelmakers set - Keymakers kit + Kit de Reproduction de Clés Keymakers kit @@ -2539,7 +2539,7 @@ Kit including the tools required to smelt, mold and shape keys. Kit including the tools required to smelt, mold and shape keys. Met deze sleutelmakers set kun je indien je een vuur en tin hebt je sleutels kopieren. - Kit including the tools required to smelt, mold and shape keys. + Ce kit inclut tous les outils nécessaires à fondre, modeler et découper des clés. Kit including the tools required to smelt, mold and shape keys. @@ -2549,7 +2549,7 @@ кувалда Almádena Voorhamer - Frappe-Devant + Masse Perlík @@ -2559,7 +2559,7 @@ 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. 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. Een grote voorhamer met stalen kop. Handig voor sloop en bouw werkzaamheden. - 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. + Un outil composé d'une large tête aux faces latérales plates attachée à un manche. Sa tête est habituellement faite en acier. La masse se manipule à deux mains et permet d'exercer plus de force qu'un marteau. 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. @@ -2579,7 +2579,7 @@ Fishing Pole: This carbon fiber rod may be old but, she still works like a charm. Fishing Pole: This carbon fiber rod may be old but, she still works like a charm. Vishengel: Dit carbonnen hengeltje is al oud, maar werkt nog prima! - Fishing Pole: This carbon fiber rod may be old but, she still works like a charm. + Cette canne à pêche en fibre de carbone a beau être vieille, elle fonctionne encore à merveille! Fishing Pole: This carbon fiber rod may be old but, she still works like a charm. @@ -2589,18 +2589,18 @@ aншпуг Palanca Breekijzer - Pied de Biche + Pied-de-biche Sochor A tool consisting of a metal bar with a single curved end and flattened points, often with a small fissure on one or both ends for removing nails. A tool consisting of a metal bar with a single curved end and flattened points, often with a small fissure on one or both ends for removing nails. - - - - - - + A tool consisting of a metal bar with a single curved end and flattened points, often with a small fissure on one or both ends for removing nails. + A tool consisting of a metal bar with a single curved end and flattened points, often with a small fissure on one or both ends for removing nails. + A tool consisting of a metal bar with a single curved end and flattened points, often with a small fissure on one or both ends for removing nails. + A tool consisting of a metal bar with a single curved end and flattened points, often with a small fissure on one or both ends for removing nails. + Un outil constitué d'une barre de métal dont l'une des extrémité est recourbée servant de point d'appui, légèrement aplatie et fendue, permettant ainsi d'arracher des clous. + A tool consisting of a metal bar with a single curved end and flattened points, often with a small fissure on one or both ends for removing nails. Etool @@ -2609,7 +2609,7 @@ саперная лопатка Pala Afianzar Opklapbare schep/spade. - Outil de Tranchée + Pelle Pliable Etool @@ -5561,7 +5561,7 @@ Remove from Toolbelt. Remove from Toolbelt. Verwijder van gereedschapsgordel - Remove from Toolbelt. + Retirer de la Ceinture. Remove from Toolbelt. @@ -5571,7 +5571,7 @@ Add to Toolbelt. Add to Toolbelt. Voeg toe aan gereedschapsgordel - Add to Toolbelt. + Ajouter à la Ceinture. Add to Toolbelt. @@ -5581,7 +5581,7 @@ Cast Fishing Pole Cast Fishing Pole Werp vislijn uit - Cast Fishing Pole + Lancer la Ligne Cast Fishing Pole From 573146e774ef2c8b144cf1126f0d6dfb628b95c6 Mon Sep 17 00:00:00 2001 From: "[VB]AWOL" Date: Mon, 18 Nov 2013 23:47:46 -0600 Subject: [PATCH 5/5] added missing $'s --- .../CfgWeapons/Item/ItemFishingPole.hpp | 2 +- .../Configs/CfgWeapons/Item/ItemSledge.hpp | 2 +- .../Configs/CfgWeapons/Melee/ItemHatchet.hpp | 2 +- .../Configs/CfgWeapons/Melee/ItemMachete.hpp | 2 +- .../Configs/CfgWeapons/Melee/MeleeCrowbar.hpp | 2 +- .../CfgWeapons/Melee/MeleeFishingPole.hpp | 4 +- .../Configs/CfgWeapons/Melee/MeleeHatchet.hpp | 68 +++++++++---------- .../CfgWeapons/Melee/MeleeSledgehammer.hpp | 2 +- 8 files changed, 42 insertions(+), 42 deletions(-) diff --git a/SQF/dayz_code/Configs/CfgWeapons/Item/ItemFishingPole.hpp b/SQF/dayz_code/Configs/CfgWeapons/Item/ItemFishingPole.hpp index 5294df8c8..964a32f76 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Item/ItemFishingPole.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Item/ItemFishingPole.hpp @@ -9,7 +9,7 @@ class ItemFishingPole: ItemCore { class Toolbelt { - text="STR_EPOCH_PLAYER_295"; + text="$STR_EPOCH_PLAYER_295"; script="spawn player_addToolbelt;"; use[]= { diff --git a/SQF/dayz_code/Configs/CfgWeapons/Item/ItemSledge.hpp b/SQF/dayz_code/Configs/CfgWeapons/Item/ItemSledge.hpp index a83ca112d..5e183b6d4 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Item/ItemSledge.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Item/ItemSledge.hpp @@ -9,7 +9,7 @@ class ItemSledge: ItemCore { class Toolbelt { - text="STR_EPOCH_PLAYER_295"; + text="$STR_EPOCH_PLAYER_295"; script="spawn player_addToolbelt;"; use[]= { diff --git a/SQF/dayz_code/Configs/CfgWeapons/Melee/ItemHatchet.hpp b/SQF/dayz_code/Configs/CfgWeapons/Melee/ItemHatchet.hpp index 128bb7dbc..c84d404df 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Melee/ItemHatchet.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Melee/ItemHatchet.hpp @@ -8,7 +8,7 @@ class ItemHatchet_DZE : ItemCore { class Toolbelt { - text="STR_EPOCH_PLAYER_295"; + text="$STR_EPOCH_PLAYER_295"; script="spawn player_addToolbelt;"; use[]= { diff --git a/SQF/dayz_code/Configs/CfgWeapons/Melee/ItemMachete.hpp b/SQF/dayz_code/Configs/CfgWeapons/Melee/ItemMachete.hpp index 607111e7a..2722c8de2 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Melee/ItemMachete.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Melee/ItemMachete.hpp @@ -9,7 +9,7 @@ class ItemMachete: ItemCore { class Toolbelt { - text="STR_EPOCH_PLAYER_295"; + text="$STR_EPOCH_PLAYER_295"; script="spawn player_addToolbelt;"; use[]= { diff --git a/SQF/dayz_code/Configs/CfgWeapons/Melee/MeleeCrowbar.hpp b/SQF/dayz_code/Configs/CfgWeapons/Melee/MeleeCrowbar.hpp index f9551968a..112384341 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Melee/MeleeCrowbar.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Melee/MeleeCrowbar.hpp @@ -21,7 +21,7 @@ class MeleeCrowbar: MeleeWeapon { class Toolbelt { - text="STR_EPOCH_PLAYER_296"; + text="$STR_EPOCH_PLAYER_296"; script="spawn player_addToolbelt;"; use[]= { diff --git a/SQF/dayz_code/Configs/CfgWeapons/Melee/MeleeFishingPole.hpp b/SQF/dayz_code/Configs/CfgWeapons/Melee/MeleeFishingPole.hpp index 1ab57f47f..a50b75750 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Melee/MeleeFishingPole.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Melee/MeleeFishingPole.hpp @@ -19,12 +19,12 @@ class MeleeFishingPole: MeleeWeapon { class Use { - text="STR_EPOCH_PLAYER_297"; + text="$STR_EPOCH_PLAYER_297"; script="spawn player_goFishing;"; }; class Toolbelt { - text="STR_EPOCH_PLAYER_296"; + text="$STR_EPOCH_PLAYER_296"; script="spawn player_addToolbelt;"; use[]= { diff --git a/SQF/dayz_code/Configs/CfgWeapons/Melee/MeleeHatchet.hpp b/SQF/dayz_code/Configs/CfgWeapons/Melee/MeleeHatchet.hpp index ba7886bda..ec97cfd90 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Melee/MeleeHatchet.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Melee/MeleeHatchet.hpp @@ -1,41 +1,41 @@ class MeleeHatchet: MeleeWeapon +{ + scope=2; + melee= "true"; + autoreload=1; + magazineReloadTime=0; + model="\dayz_weapons\models\Hatchet_weaponized"; + picture="\dayz_equip\textures\equip_hatchet_CA.paa"; + displayName="$STR_EQUIP_NAME_41"; + droppeditem= "ItemHatchet_DZE"; + magazines[]= { - scope=2; - melee= "true"; - autoreload=1; - magazineReloadTime=0; - model="\dayz_weapons\models\Hatchet_weaponized"; - picture="\dayz_equip\textures\equip_hatchet_CA.paa"; - displayName="$STR_EQUIP_NAME_41"; - droppeditem= "ItemHatchet_DZE"; - magazines[]= + "Hatchet_Swing" + }; + handAnim[]= + { + "OFP2_ManSkeleton", + "\dayz_weapons\anim\melee_hatchet_holding.rtm" + }; + class ItemActions + { + class Toolbelt { - "Hatchet_Swing" - }; - handAnim[]= - { - "OFP2_ManSkeleton", - "\dayz_weapons\anim\melee_hatchet_holding.rtm" - }; - class ItemActions - { - class Toolbelt + text="$STR_EPOCH_PLAYER_296"; + script="spawn player_addToolbelt;"; + use[]= { - text="STR_EPOCH_PLAYER_296"; - script="spawn player_addToolbelt;"; - use[]= - { - "MeleeHatchet" - }; - output[]= - { - "ItemHatchet_DZE" - }; + "MeleeHatchet" + }; + output[]= + { + "ItemHatchet_DZE" }; }; - class Library - { - libTextDesc="$STR_EQUIP_DESC_41"; - }; - descriptionShort="$STR_EQUIP_DESC_41"; }; + class Library + { + libTextDesc="$STR_EQUIP_DESC_41"; + }; + descriptionShort="$STR_EQUIP_DESC_41"; +}; diff --git a/SQF/dayz_code/Configs/CfgWeapons/Melee/MeleeSledgehammer.hpp b/SQF/dayz_code/Configs/CfgWeapons/Melee/MeleeSledgehammer.hpp index 105c1e7ab..aff99f76f 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Melee/MeleeSledgehammer.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Melee/MeleeSledgehammer.hpp @@ -21,7 +21,7 @@ class MeleeSledge: MeleeWeapon { class Toolbelt { - text="STR_EPOCH_PLAYER_296"; + text="$STR_EPOCH_PLAYER_296"; script="spawn player_addToolbelt;"; use[]= {