From 8a008c4d9026d78a84deaf4fca5cbc70a110d705 Mon Sep 17 00:00:00 2001 From: Florian Kinder Date: Fri, 24 Jan 2014 09:52:04 +0100 Subject: [PATCH 1/4] Added M249_EP1_DZ --- SQF/dayz_code/Configs/CfgWeapons.hpp | 1 + SQF/dayz_code/Configs/CfgWeapons/Weapon/LMG/M249_EP1.hpp | 4 ++++ SQF/dayz_code/external/R3F_Realism/R3F_Weight/R3F_CfgWeight.h | 4 ++++ 3 files changed, 9 insertions(+) create mode 100644 SQF/dayz_code/Configs/CfgWeapons/Weapon/LMG/M249_EP1.hpp diff --git a/SQF/dayz_code/Configs/CfgWeapons.hpp b/SQF/dayz_code/Configs/CfgWeapons.hpp index f8dc6afbe..fe5f16af9 100644 --- a/SQF/dayz_code/Configs/CfgWeapons.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons.hpp @@ -273,6 +273,7 @@ class CfgWeapons { #include "CfgWeapons\Weapon\Sniper\DMR_DZ.hpp" #include "CfgWeapons\Weapon\Pistol\MakerovSD.hpp" #include "CfgWeapons\Weapon\LMG\m240_scoped.hpp" + #include "CfgWeapons\Weapon\LMG\M249_EP1.hpp" #include "CfgWeapons\Weapon\LMG\M249_m145_EP1.hpp" #include "CfgWeapons\Weapon\LMG\M60A4.hpp" // #include "CfgWeapons\Weapon\Rifle\FN_FAL_ANPVS4_DZE.hpp" diff --git a/SQF/dayz_code/Configs/CfgWeapons/Weapon/LMG/M249_EP1.hpp b/SQF/dayz_code/Configs/CfgWeapons/Weapon/LMG/M249_EP1.hpp new file mode 100644 index 000000000..f1484365d --- /dev/null +++ b/SQF/dayz_code/Configs/CfgWeapons/Weapon/LMG/M249_EP1.hpp @@ -0,0 +1,4 @@ +class M249_EP1; +class M249_EP1_DZ:M249_EP1 { + type = "1"; +}; diff --git a/SQF/dayz_code/external/R3F_Realism/R3F_Weight/R3F_CfgWeight.h b/SQF/dayz_code/external/R3F_Realism/R3F_Weight/R3F_CfgWeight.h index 78f7fd492..48ccb0426 100644 --- a/SQF/dayz_code/external/R3F_Realism/R3F_Weight/R3F_CfgWeight.h +++ b/SQF/dayz_code/external/R3F_Realism/R3F_Weight/R3F_CfgWeight.h @@ -375,6 +375,10 @@ class CfgWeight { weight = 6.5; }; + class M249_EP1_DZ + { + weight = 6.5; + }; class Mk_48 { weight = 8.2; From af16c8306519e4b1c4e597808a7646c0f001ba84 Mon Sep 17 00:00:00 2001 From: Florian Kinder Date: Fri, 24 Jan 2014 09:52:16 +0100 Subject: [PATCH 2/4] Updated loot table --- SQF/dayz_code/Configs/CfgBuildingLoot/CfgBuildingLoot.hpp | 2 +- SQF/dayz_code/Configs/CfgBuildingLoot/cfgLoot.hpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/SQF/dayz_code/Configs/CfgBuildingLoot/CfgBuildingLoot.hpp b/SQF/dayz_code/Configs/CfgBuildingLoot/CfgBuildingLoot.hpp index 03cf28acf..49088d5dd 100644 --- a/SQF/dayz_code/Configs/CfgBuildingLoot/CfgBuildingLoot.hpp +++ b/SQF/dayz_code/Configs/CfgBuildingLoot/CfgBuildingLoot.hpp @@ -1803,7 +1803,7 @@ class CfgBuildingLoot { itemType[] = { { "M16A2","weapon" }, { "M16A2GL","weapon" }, - { "M249_DZ","weapon" }, + { "M249_EP1_DZ","weapon" }, { "M9SD","weapon" }, { "Pecheneg_DZ","weapon"}, { "AK_74","weapon" }, diff --git a/SQF/dayz_code/Configs/CfgBuildingLoot/cfgLoot.hpp b/SQF/dayz_code/Configs/CfgBuildingLoot/cfgLoot.hpp index 692ec9634..ff1f31727 100644 --- a/SQF/dayz_code/Configs/CfgBuildingLoot/cfgLoot.hpp +++ b/SQF/dayz_code/Configs/CfgBuildingLoot/cfgLoot.hpp @@ -1003,7 +1003,7 @@ class CfgLoot { "M249_m145_EP1_DZE", "m240_scoped_EP1_DZE", "M240_DZ", - "M249_DZ", + "M249_EP1_DZ", "Mk_48_DZ" }, { From 9bda183fd8673c534154620e658b8aae66cc8b18 Mon Sep 17 00:00:00 2001 From: Florian Kinder Date: Fri, 24 Jan 2014 09:52:39 +0100 Subject: [PATCH 3/4] Added to trader & added sql update --- Server Files/SQL/1_0_4_updates.sql | 5 +++++ Server Files/SQL/epoch.sql | 10 +++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/Server Files/SQL/1_0_4_updates.sql b/Server Files/SQL/1_0_4_updates.sql index eb7e43b50..5694b8735 100644 --- a/Server Files/SQL/1_0_4_updates.sql +++ b/Server Files/SQL/1_0_4_updates.sql @@ -75,3 +75,8 @@ UPDATE `Traders_DATA` SET `buy`= '[2,"ItemGoldBar",1]' WHERE `item`='["ItemTrout UPDATE `Traders_DATA` SET `buy`= '[3,"ItemGoldBar",1]' WHERE `item`='["ItemSeaBassCooked",1]'; UPDATE `Traders_DATA` SET `buy`= '[4,"ItemGoldBar",1]' WHERE `item`='["ItemTunaCooked",1]'; UPDATE `Traders_DATA` SET `buy`= '[1,"ItemSilverBar10oz",1]' WHERE `item`='["FoodMRE",1]'; + +-- ---------------------------- +-- WEAPON UPDATE +-- ---------------------------- +UPDATE `Traders_DATA` SET `item`= '["M249_EP1_DZ",3]' WHERE `item`='["M249_DZ",3]'; diff --git a/Server Files/SQL/epoch.sql b/Server Files/SQL/epoch.sql index b656a5d62..4f187df0f 100644 --- a/Server Files/SQL/epoch.sql +++ b/Server Files/SQL/epoch.sql @@ -363,7 +363,7 @@ INSERT INTO `Traders_DATA` VALUES(5057, '["M4A1",3]', 250, '[4,"ItemGoldBar",1]' INSERT INTO `Traders_DATA` VALUES(5059, '["M4A1_HWS_GL_camo",3]', 250, '[8,"ItemGoldBar",1]', '[4,"ItemGoldBar",1]', 0, 485, 'trade_weapons'); INSERT INTO `Traders_DATA` VALUES(5060, '["M4A3_CCO_EP1",3]', 250, '[1,"ItemGoldBar10oz",1]', '[7,"ItemGoldBar",1]', 0, 485, 'trade_weapons'); INSERT INTO `Traders_DATA` VALUES(5061, '["M4A1_Aim",3]', 250, '[6,"ItemGoldBar",1]', '[4,"ItemGoldBar",1]', 0, 485, 'trade_weapons'); -INSERT INTO `Traders_DATA` VALUES(5063, '["M249_DZ",3]', 251, '[1,"ItemGoldBar10oz",1]', '[6,"ItemGoldBar",1]', 0, 486, 'trade_weapons'); +INSERT INTO `Traders_DATA` VALUES(5063, '["M249_EP1_DZ",3]', 251, '[1,"ItemGoldBar10oz",1]', '[6,"ItemGoldBar",1]', 0, 486, 'trade_weapons'); INSERT INTO `Traders_DATA` VALUES(5064, '["M240_DZ",3]', 250, '[1,"ItemGoldBar10oz",1]', '[6,"ItemGoldBar",1]', 0, 486, 'trade_weapons'); INSERT INTO `Traders_DATA` VALUES(5065, '["Mk_48_DZ",3]', 248, '[1,"ItemGoldBar10oz",1]', '[6,"ItemGoldBar",1]', 0, 486, 'trade_weapons'); INSERT INTO `Traders_DATA` VALUES(5066, '["Pecheneg_DZ",3]', 250, '[2,"ItemGoldBar10oz",1]', '[1,"ItemGoldBar10oz",1]', 0, 486, 'trade_weapons'); @@ -848,7 +848,7 @@ INSERT INTO `Traders_DATA` VALUES(6164, '["AKS_74_U",3]', 250, '[2,"ItemGoldBar" INSERT INTO `Traders_DATA` VALUES(6165, '["AK_47_M",3]', 250, '[8,"ItemGoldBar",1]', '[6,"ItemGoldBar",1]', 0, 602, 'trade_weapons'); INSERT INTO `Traders_DATA` VALUES(6166, '["AK_74",3]', 251, '[2,"ItemGoldBar",1]', '[1,"ItemGoldBar",1]', 0, 602, 'trade_weapons'); INSERT INTO `Traders_DATA` VALUES(6167, '["FN_FAL",3]', 250, '[1,"ItemGoldBar10oz",1]', '[7,"ItemGoldBar",1]', 0, 602, 'trade_weapons'); -INSERT INTO `Traders_DATA` VALUES(6168, '["M249_DZ",3]', 250, '[1,"ItemGoldBar10oz",1]', '[6,"ItemGoldBar",1]', 0, 603, 'trade_weapons'); +INSERT INTO `Traders_DATA` VALUES(6168, '["M249_EP1_DZ",3]', 250, '[1,"ItemGoldBar10oz",1]', '[6,"ItemGoldBar",1]', 0, 603, 'trade_weapons'); INSERT INTO `Traders_DATA` VALUES(6169, '["M240_DZ",3]', 250, '[1,"ItemGoldBar10oz",1]', '[6,"ItemGoldBar",1]', 0, 603, 'trade_weapons'); INSERT INTO `Traders_DATA` VALUES(6170, '["Mk_48_DZ",3]', 250, '[1,"ItemGoldBar10oz",1]', '[6,"ItemGoldBar",1]', 0, 603, 'trade_weapons'); INSERT INTO `Traders_DATA` VALUES(6171, '["Pecheneg_DZ",3]', 253, '[2,"ItemGoldBar10oz",1]', '[1,"ItemGoldBar10oz",1]', 0, 603, 'trade_weapons'); @@ -942,7 +942,7 @@ INSERT INTO `Traders_DATA` VALUES(6260, '["AKS_74_U",3]', 250, '[2,"ItemGoldBar" INSERT INTO `Traders_DATA` VALUES(6261, '["AK_47_M",3]', 250, '[8,"ItemGoldBar",1]', '[6,"ItemGoldBar",1]', 0, 615, 'trade_weapons'); INSERT INTO `Traders_DATA` VALUES(6262, '["AK_74",3]', 250, '[2,"ItemGoldBar",1]', '[1,"ItemGoldBar",1]', 0, 615, 'trade_weapons'); INSERT INTO `Traders_DATA` VALUES(6263, '["FN_FAL",3]', 250, '[1,"ItemGoldBar10oz",1]', '[7,"ItemGoldBar",1]', 0, 615, 'trade_weapons'); -INSERT INTO `Traders_DATA` VALUES(6264, '["M249_DZ",3]', 250, '[1,"ItemGoldBar10oz",1]', '[6,"ItemGoldBar",1]', 0, 616, 'trade_weapons'); +INSERT INTO `Traders_DATA` VALUES(6264, '["M249_EP1_DZ",3]', 250, '[1,"ItemGoldBar10oz",1]', '[6,"ItemGoldBar",1]', 0, 616, 'trade_weapons'); INSERT INTO `Traders_DATA` VALUES(6265, '["M240_DZ",3]', 250, '[1,"ItemGoldBar10oz",1]', '[6,"ItemGoldBar",1]', 0, 616, 'trade_weapons'); INSERT INTO `Traders_DATA` VALUES(6266, '["Mk_48_DZ",3]', 250, '[1,"ItemGoldBar10oz",1]', '[6,"ItemGoldBar",1]', 0, 616, 'trade_weapons'); INSERT INTO `Traders_DATA` VALUES(6267, '["Pecheneg_DZ",3]', 250, '[2,"ItemGoldBar10oz",1]', '[1,"ItemGoldBar10oz",1]', 0, 616, 'trade_weapons'); @@ -1145,7 +1145,7 @@ INSERT INTO `Traders_DATA` VALUES(6468, '["AKS_74_U",3]', 251, '[2,"ItemGoldBar" INSERT INTO `Traders_DATA` VALUES(6469, '["AK_47_M",3]', 250, '[8,"ItemGoldBar",1]', '[6,"ItemGoldBar",1]', 0, 637, 'trade_weapons'); INSERT INTO `Traders_DATA` VALUES(6470, '["AK_74",3]', 256, '[2,"ItemGoldBar",1]', '[1,"ItemGoldBar",1]', 0, 637, 'trade_weapons'); INSERT INTO `Traders_DATA` VALUES(6471, '["FN_FAL",3]', 252, '[1,"ItemGoldBar10oz",1]', '[7,"ItemGoldBar",1]', 0, 637, 'trade_weapons'); -INSERT INTO `Traders_DATA` VALUES(6472, '["M249_DZ",3]', 250, '[1,"ItemGoldBar10oz",1]', '[6,"ItemGoldBar",1]', 0, 638, 'trade_weapons'); +INSERT INTO `Traders_DATA` VALUES(6472, '["M249_EP1_DZ",3]', 250, '[1,"ItemGoldBar10oz",1]', '[6,"ItemGoldBar",1]', 0, 638, 'trade_weapons'); INSERT INTO `Traders_DATA` VALUES(6473, '["M240_DZ",3]', 254, '[1,"ItemGoldBar10oz",1]', '[6,"ItemGoldBar",1]', 0, 638, 'trade_weapons'); INSERT INTO `Traders_DATA` VALUES(6474, '["Mk_48_DZ",3]', 252, '[1,"ItemGoldBar10oz",1]', '[6,"ItemGoldBar",1]', 0, 638, 'trade_weapons'); INSERT INTO `Traders_DATA` VALUES(6475, '["Pecheneg_DZ",3]', 249, '[2,"ItemGoldBar10oz",1]', '[1,"ItemGoldBar10oz",1]', 0, 638, 'trade_weapons'); @@ -1902,7 +1902,7 @@ INSERT INTO `trader_items` VALUES(466, 'M16A2GL', 3, 'Rifle', 'trade_weapons'); INSERT INTO `trader_items` VALUES(467, 'M16A4_ACG', 3, 'Rifle', 'trade_weapons'); INSERT INTO `trader_items` VALUES(468, 'M24', 3, 'Rifle Sniper', 'trade_weapons'); INSERT INTO `trader_items` VALUES(469, 'M240_DZ', 3, 'Machine Gun', 'trade_weapons'); -INSERT INTO `trader_items` VALUES(470, 'M249_DZ', 3, 'Machine Gun', 'trade_weapons'); +INSERT INTO `trader_items` VALUES(470, 'M249_EP1_DZ', 3, 'Machine Gun', 'trade_weapons'); INSERT INTO `trader_items` VALUES(471, 'M40A3', 3, 'Rifle Sniper', 'trade_weapons'); INSERT INTO `trader_items` VALUES(472, 'M4A1', 3, 'Rifle', 'trade_weapons'); INSERT INTO `trader_items` VALUES(473, 'M4A1_Aim', 3, 'Rifle', 'trade_weapons'); From 92ee0f90d399481335b77c71335640ba998822b0 Mon Sep 17 00:00:00 2001 From: Florian Kinder Date: Fri, 24 Jan 2014 13:36:34 +0100 Subject: [PATCH 4/4] Added SQL Inventory/Backpack replace --- Server Files/SQL/1_0_4_updates.sql | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Server Files/SQL/1_0_4_updates.sql b/Server Files/SQL/1_0_4_updates.sql index 5694b8735..1b0be871b 100644 --- a/Server Files/SQL/1_0_4_updates.sql +++ b/Server Files/SQL/1_0_4_updates.sql @@ -80,3 +80,7 @@ UPDATE `Traders_DATA` SET `buy`= '[1,"ItemSilverBar10oz",1]' WHERE `item`='["Foo -- WEAPON UPDATE -- ---------------------------- UPDATE `Traders_DATA` SET `item`= '["M249_EP1_DZ",3]' WHERE `item`='["M249_DZ",3]'; +UPDATE `Character_DATA` SET `Inventory` = REPLACE(`Inventory`, '"M249_DZ"', '"M249_EP1_DZ"') WHERE `Inventory` LIKE '%"M249_DZ"%'; +UPDATE `Character_DATA` SET `Backpack` = REPLACE(`Backpack`, '"M249_DZ"', '"M249_EP1_DZ"') WHERE `Backpack` LIKE '%"M249_DZ"%'; +UPDATE `Character_DATA` SET `CurrentState` = '["","",42,[]]' WHERE `CurrentState` LIKE '%"M249_DZ"%'; +UPDATE `Object_DATA` SET `Inventory` = REPLACE(`Inventory`, '"M249_DZ"', '"M249_EP1_DZ"') WHERE `Inventory` LIKE '%"M249_DZ"%'; \ No newline at end of file