From 7e57a9c396b1928db6689f0665205bfea9cf6dc0 Mon Sep 17 00:00:00 2001 From: dayz10k Date: Mon, 18 Nov 2013 13:05:20 -0500 Subject: [PATCH 1/8] #696 Add more weapons to loot spawns --- .../CfgBuildingLoot/CfgBuildingLoot.hpp | 42 +++++++++++++++---- 1 file changed, 35 insertions(+), 7 deletions(-) diff --git a/SQF/dayz_code/Configs/CfgBuildingLoot/CfgBuildingLoot.hpp b/SQF/dayz_code/Configs/CfgBuildingLoot/CfgBuildingLoot.hpp index f3f5f4600..cf02b7633 100644 --- a/SQF/dayz_code/Configs/CfgBuildingLoot/CfgBuildingLoot.hpp +++ b/SQF/dayz_code/Configs/CfgBuildingLoot/CfgBuildingLoot.hpp @@ -693,7 +693,12 @@ class CfgBuildingLoot { {"ItemSandbag","magazine"}, {"Sa58P_EP1","weapon"}, {"Sa58V_EP1","weapon"}, - {"BAF_L85A2_RIS_Holo","weapon"} + {"BAF_L85A2_RIS_Holo","weapon"}, + {"Saiga12K","weapon" }, + {"Bizon","weapon" }, + {"M8_SAW","weapon" }, + {"MG36","weapon" }, + {"RPK_74","weapon" }, }; itemChance[] = { 0.01, @@ -731,7 +736,12 @@ class CfgBuildingLoot { 0.02, 0.01, 0.02, - 0.01 + 0.01, + 0.02, //saiga + 0.02, //bizon + 0.01, //m8_saw + 0.01, //mg36 + 0.01 //rpk_74 }; itemTypeSmall[] = { { "M9","weapon" }, @@ -808,7 +818,9 @@ class CfgBuildingLoot { {"Sa58V_EP1","weapon"}, {"BAF_L85A2_RIS_Holo","weapon"}, {"ItemFuelBarrel","magazine"}, - {"ItemFuelPump","magazine"} + {"ItemFuelPump","magazine"}, + {"RPK_74","weapon"}, + {"Saiga12K","weapon"} }; itemChance[] = { 0.01, @@ -848,6 +860,8 @@ class CfgBuildingLoot { 0.01, 0.01, 0.01, + 0.01, + 0.01, 0.01 }; itemTypeSmall[] = { @@ -934,7 +948,11 @@ class CfgBuildingLoot { {"100Rnd_762x54_PK","magazine"}, { "militaryclothes","single" }, {"NVGoggles","weapon"}, - { "militaryammo","single" } + { "militaryammo","single" }, + {"M60A4_EP1_DZE","weapon" }, + {"m240_scoped_EP1_DZE","weapon" }, + {"M249_m145_EP1_DZE","weapon" }, + {"MG36_camo","weapon" }, }; itemChance[] = { 0.01, @@ -982,7 +1000,11 @@ class CfgBuildingLoot { 0.02, 0.01, 0.01, - 0.03 + 0.03, + 0.01, //m60 + 0.01, //m240_scoped + 0.01, //m249 scoped + 0.01 //mg36 camo }; itemTypeSmall[] = { { "M9SD","weapon" }, @@ -1004,7 +1026,8 @@ class CfgBuildingLoot { {"29Rnd_30mm_AGS30","magazine"}, {"50Rnd_127x107_DSHKM","magazine"}, {"48Rnd_40mm_MK19","magazine"}, - {"100Rnd_127x99_M2","magazine"} + {"100Rnd_127x99_M2","magazine"}, + {"100Rnd_556x45_BetaCMag","magazine" } }; itemChanceSmall[] = { 0.04, @@ -1027,6 +1050,7 @@ class CfgBuildingLoot { 0.03, 0.03, 0.02 + 0.02 }; }; class Hunting: Default { @@ -2016,6 +2040,8 @@ class CfgBuildingLoot { {"WeaponHolder_ItemMachete", "object"}, { "SCAR_H_LNG_Sniper_SD","weapon" }, {"2000Rnd_762x51_M134","magazine"}, + {"KSVK","weapon" }, + {"m240_scoped_EP1_DZE","weapon" } }; itemChance[] = { 0.03, @@ -2070,7 +2096,9 @@ class CfgBuildingLoot { 0.05, 0.02, 0.01, - 0.01 + 0.01, + 0.01, //ksvk + 0.01 //m240 scoped }; }; class Land_House_C_1_EP1: Residential From c5b36ba3208ed8591e25d855b38899f05bac0b08 Mon Sep 17 00:00:00 2001 From: dayz10k Date: Mon, 18 Nov 2013 13:18:27 -0500 Subject: [PATCH 2/8] #696 Add more weapons to loot spawns --- SQF/dayz_code/Configs/CfgWeapons/Weapon/LMG/M60A4.hpp | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 SQF/dayz_code/Configs/CfgWeapons/Weapon/LMG/M60A4.hpp diff --git a/SQF/dayz_code/Configs/CfgWeapons/Weapon/LMG/M60A4.hpp b/SQF/dayz_code/Configs/CfgWeapons/Weapon/LMG/M60A4.hpp new file mode 100644 index 000000000..3e8052e96 --- /dev/null +++ b/SQF/dayz_code/Configs/CfgWeapons/Weapon/LMG/M60A4.hpp @@ -0,0 +1,4 @@ +class M60A4_EP1; +class M60A4_EP1_DZE : M60A4_EP1 { + type = "1"; +}; From 88dfaf7dddee4fa60be738a9f0a5526887de90e1 Mon Sep 17 00:00:00 2001 From: dayz10k Date: Mon, 18 Nov 2013 13:19:29 -0500 Subject: [PATCH 3/8] #696 Add more weapons to loot spawns --- SQF/dayz_code/Configs/CfgWeapons/Weapon/LMG/m240_scoped.hpp | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 SQF/dayz_code/Configs/CfgWeapons/Weapon/LMG/m240_scoped.hpp diff --git a/SQF/dayz_code/Configs/CfgWeapons/Weapon/LMG/m240_scoped.hpp b/SQF/dayz_code/Configs/CfgWeapons/Weapon/LMG/m240_scoped.hpp new file mode 100644 index 000000000..2a011e92b --- /dev/null +++ b/SQF/dayz_code/Configs/CfgWeapons/Weapon/LMG/m240_scoped.hpp @@ -0,0 +1,4 @@ +class m240_scoped_EP1; +class m240_scoped_EP1_DZE:m240_scoped_EP1 { + type = "1"; +}; From 2f3281d442a8c48000568ab8d836042d724dbcaa Mon Sep 17 00:00:00 2001 From: dayz10k Date: Mon, 18 Nov 2013 13:20:08 -0500 Subject: [PATCH 4/8] #696 Add more weapons to loot spawns --- SQF/dayz_code/Configs/CfgWeapons/Weapon/LMG/m249_scoped.hpp | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 SQF/dayz_code/Configs/CfgWeapons/Weapon/LMG/m249_scoped.hpp diff --git a/SQF/dayz_code/Configs/CfgWeapons/Weapon/LMG/m249_scoped.hpp b/SQF/dayz_code/Configs/CfgWeapons/Weapon/LMG/m249_scoped.hpp new file mode 100644 index 000000000..c5c53103d --- /dev/null +++ b/SQF/dayz_code/Configs/CfgWeapons/Weapon/LMG/m249_scoped.hpp @@ -0,0 +1,4 @@ +class M249_m145_EP1; +class M249_m145_EP1_DZE:M249_m145_EP1 { + type = "1"; +}; From 52f458be6f8be0f976e21180245cfd862a14806f Mon Sep 17 00:00:00 2001 From: dayz10k Date: Mon, 18 Nov 2013 13:21:22 -0500 Subject: [PATCH 5/8] #696 Add more weapons to loot spawns --- SQF/dayz_code/Configs/CfgWeapons.hpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/SQF/dayz_code/Configs/CfgWeapons.hpp b/SQF/dayz_code/Configs/CfgWeapons.hpp index c0d8a78ac..1df446900 100644 --- a/SQF/dayz_code/Configs/CfgWeapons.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons.hpp @@ -84,4 +84,7 @@ class CfgWeapons { // #include "CfgWeapons\Weapon\Sniper\DMR_DZ2.hpp" // #include "CfgWeapons\Weapon\Sniper\DMR_DZ3.hpp" #include "CfgWeapons\Weapon\Pistol\MakerovSD.hpp" -}; \ No newline at end of file + #include "CfgWeapons\Weapon\LMG\m240_scoped.hpp" + #include "CfgWeapons\Weapon\LMG\m249_scoped.hpp" + #include "CfgWeapons\Weapon\LMG\M60A4.hpp" +}; From 94d0abfeb6f141cc65e35174104e5bba13c31713 Mon Sep 17 00:00:00 2001 From: "[VB]AWOL" Date: Mon, 18 Nov 2013 12:37:29 -0600 Subject: [PATCH 6/8] missing comma --- SQF/dayz_code/Configs/CfgBuildingLoot/CfgBuildingLoot.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SQF/dayz_code/Configs/CfgBuildingLoot/CfgBuildingLoot.hpp b/SQF/dayz_code/Configs/CfgBuildingLoot/CfgBuildingLoot.hpp index cf02b7633..bb0809cd8 100644 --- a/SQF/dayz_code/Configs/CfgBuildingLoot/CfgBuildingLoot.hpp +++ b/SQF/dayz_code/Configs/CfgBuildingLoot/CfgBuildingLoot.hpp @@ -1049,7 +1049,7 @@ class CfgBuildingLoot { 0.02, 0.03, 0.03, - 0.02 + 0.02, 0.02 }; }; From f51cca3883485d3ddcb11794682127d738c238ae Mon Sep 17 00:00:00 2001 From: dayz10k Date: Mon, 18 Nov 2013 13:56:15 -0500 Subject: [PATCH 7/8] #696 Add more weapons to loot spawns WIP SQL --- Server Files/mysql/add_new_weapons.sql | 39 ++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 Server Files/mysql/add_new_weapons.sql diff --git a/Server Files/mysql/add_new_weapons.sql b/Server Files/mysql/add_new_weapons.sql new file mode 100644 index 000000000..ee7f6973a --- /dev/null +++ b/Server Files/mysql/add_new_weapons.sql @@ -0,0 +1,39 @@ +-- ---------------------------- +-- This should be done +-- ---------------------------- +INSERT INTO `trader_items` VALUES(771, 'KSVK', 3, 'Rifle Sniper', 'trade_weapons'); +INSERT INTO `trader_items` VALUES(772, '5Rnd_127x108_KSVK', 1, 'Ammo Rifle Sniper', 'trade_items'); +INSERT INTO `trader_items` VALUES(773, 'Saiga12K', 3, 'Shotgun', 'trade_weapons'); +INSERT INTO `trader_items` VALUES(774, '8Rnd_B_Saiga12_74Slug', 1, 'Ammo Shotgun', 'trade_items'); +INSERT INTO `trader_items` VALUES(775, '8Rnd_B_Saiga12_74Pellets', 1, 'Ammo Shotgun', 'trade_items'); +INSERT INTO `trader_items` VALUES(776, 'bizon', 3, 'Sub Machine Gun', 'trade_weapons'); +INSERT INTO `trader_items` VALUES(777, '64Rnd_9x19_Bizon', 1, 'Ammo SMG', 'trade_items'); +INSERT INTO `trader_items` VALUES(778, 'M8_SAW', 3, 'Machine Gun', 'trade_weapons'); +INSERT INTO `trader_items` VALUES(779, 'MG36', 3, 'Machine Gun', 'trade_weapons'); +INSERT INTO `trader_items` VALUES(780, 'RPK_74', 3, 'Machine Gun', 'trade_weapons'); +INSERT INTO `trader_items` VALUES(781, 'M60A4_EP1_DZE', 3, 'Machine Gun', 'trade_weapons'); +INSERT INTO `trader_items` VALUES(782, 'm240_scoped_EP1_DZE', 3, 'Machine Gun', 'trade_weapons'); +INSERT INTO `trader_items` VALUES(783, 'M249_m145_EP1', 3, 'Machine Gun', 'trade_weapons'); +INSERT INTO `trader_items` VALUES(784, 'MG36_camo', 3, 'Machine Gun', 'trade_weapons'); +INSERT INTO `trader_items` VALUES(785, '100Rnd_556x45_BetaCMag', 1, 'Ammo - Light Machine Gun', 'trade_items'); +INSERT INTO `trader_items` VALUES(786, '75Rnd_545x39_RPK', 1, 'Ammo - Light Machine Gun', 'trade_items'); +INSERT INTO `trader_items` VALUES(787, '100Rnd_556x45', 1, 'Ammo - Light Machine Gun', 'trade_items'); + + +-- ------------------------------------------------------------------------------------------------------------- +-- This needs flushed out more, as most is on black market (bizon, saiga should be on other vendors?) +-- ------------------------------------------------------------------------------------------------------------- +INSERT INTO `Traders_DATA` VALUES(7370, '["M8_SAW",3]', 10, '[1,"ItemGoldBar10oz",1]', '[6,"ItemGoldBar",1]', 0, 526, 'trade_weapons'); +INSERT INTO `Traders_DATA` VALUES(7371, '["MG36",3]', 8, '[1,"ItemGoldBar10oz",1]', '[6,"ItemGoldBar",1]', 0, 526, 'trade_weapons'); +INSERT INTO `Traders_DATA` VALUES(7372, '["RPK_74",3]', 10, '[1,"ItemGoldBar10oz",1]', '[6,"ItemGoldBar",1]', 0, 526, 'trade_weapons'); +INSERT INTO `Traders_DATA` VALUES(7373, '["M60A4_EP1_DZE",3]', 5, '[2,"ItemGoldBar10oz",1]', '[1,"ItemGoldBar10oz",1]', 0, 526, 'trade_weapons'); +INSERT INTO `Traders_DATA` VALUES(7374, '["m240_scoped_EP1_DZE",3]', 5, '[1,"ItemGoldBar10oz",1]', '[6,"ItemGoldBar",1]', 0, 526, 'trade_weapons'); +INSERT INTO `Traders_DATA` VALUES(7375, '["M249_m145_EP1_DZE",3]', 5, '[1,"ItemGoldBar10oz",1]', '[6,"ItemGoldBar",1]', 0, 526, 'trade_weapons'); +INSERT INTO `Traders_DATA` VALUES(7376, '["MG36_camo",3]', 8, '[1,"ItemGoldBar10oz",1]', '[6,"ItemGoldBar",1]', 0, 526, 'trade_weapons'); +INSERT INTO `Traders_DATA` VALUES(7377, '["100Rnd_556x45_BetaCMag",1]', 10, '[3,"ItemSilverBar10oz",1]', '[1,"ItemSilverBar10oz",1]', 0, 527, 'trade_items'); +INSERT INTO `Traders_DATA` VALUES(7378, '["100Rnd_556x45",1]', 10, '[3,"ItemSilverBar10oz",1]', '[1,"ItemSilverBar10oz",1]', 0, 527, 'trade_items'); +INSERT INTO `Traders_DATA` VALUES(7379, '["75Rnd_545x39_RPK",1]', 10, '[3,"ItemSilverBar10oz",1]', '[1,"ItemSilverBar10oz",1]', 0, 527, 'trade_items'); +INSERT INTO `Traders_DATA` VALUES(7380, '["KSVK",3]', 10, '[3,"ItemGoldBar10oz",1]', '[1,"ItemGoldBar10oz",1]', 0, 526, 'trade_weapons'); +INSERT INTO `Traders_DATA` VALUES(7381, '["64Rnd_9x19_Bizon",1]', 10, '[2,"ItemSilverBar",1]', '[1,"ItemSilverBar",1]', 0, 527, 'trade_items'); +INSERT INTO `Traders_DATA` VALUES(7382, '["5Rnd_127x108_KSVK",1]', 10, '[1,"ItemSilverBar10oz",1]', '[5,"ItemSilverBar",1]', 0, 527, 'trade_items'); +INSERT INTO `Traders_DATA` VALUES(7380, '["bizon",3]', 10, '[1,"ItemGoldBar10oz",1]', '[5,"ItemGoldBar",1]', 0, 526, 'trade_weapons'); From 2683369ec2cb929e1fd69fcd67c8447ab7cab550 Mon Sep 17 00:00:00 2001 From: dayz10k Date: Mon, 18 Nov 2013 14:02:01 -0500 Subject: [PATCH 8/8] #709 Add Stringtable localization for Epoch toolbelt items --- SQF/dayz_epoch_b/stringtable.xml | 42 ++++++++++++++++---------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/SQF/dayz_epoch_b/stringtable.xml b/SQF/dayz_epoch_b/stringtable.xml index bf091a129..4d6eb42be 100644 --- a/SQF/dayz_epoch_b/stringtable.xml +++ b/SQF/dayz_epoch_b/stringtable.xml @@ -2528,7 +2528,7 @@ Keymakers kit Keymakers kit Keymakers kit - Keymakers kit + Sleutelmakers set Keymakers kit Keymakers kit @@ -2538,7 +2538,7 @@ Kit including the tools required to smelt, mold and shape keys. Kit including the tools required to smelt, mold and shape keys. 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. Kit including the tools required to smelt, mold and shape keys. @@ -2548,7 +2548,7 @@ Vorschlaghammer кувалда Almádena - Beukhamer + Voorhamer Frappe-Devant Perlík @@ -2558,7 +2558,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. 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. 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. @@ -2568,7 +2568,7 @@ Angelrute удочка Caña de Pesca - Hengelroede + Vishengel Canne à Pêche Rybářský Prut @@ -2578,7 +2578,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. 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. Fishing Pole: This carbon fiber rod may be old but, she still works like a charm. @@ -2608,9 +2608,9 @@ Feldspaten саперная лопатка Pala Afianzar - + Opklapbare schep/spade. Outil de Tranchée - + Etool @@ -5557,22 +5557,22 @@ Remove from Toolbelt. Remove from Toolbelt. - - - - - - + Remove from Toolbelt. + Remove from Toolbelt. + Remove from Toolbelt. + Verwijder van gereedschapsgordel + Remove from Toolbelt. + Remove from Toolbelt. Add to Toolbelt. Add to Toolbelt. - - - - - - + Add to Toolbelt. + Add to Toolbelt. + Add to Toolbelt. + Voeg toe aan gereedschapsgordel + Add to Toolbelt. + Add to Toolbelt. Cast Fishing Pole @@ -5580,7 +5580,7 @@ Cast Fishing Pole Cast Fishing Pole Cast Fishing Pole - Cast Fishing Pole + Werp vislijn uit Cast Fishing Pole Cast Fishing Pole