From 63a56b313064dbe1daa05a280e226645cf71cb2f Mon Sep 17 00:00:00 2001 From: Josh Date: Thu, 1 May 2014 14:16:49 -0400 Subject: [PATCH 01/12] Create CH53.hpp --- .../Configs/CfgVehicles/AIR/CH53.hpp | 43 +++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 SQF/dayz_code/Configs/CfgVehicles/AIR/CH53.hpp diff --git a/SQF/dayz_code/Configs/CfgVehicles/AIR/CH53.hpp b/SQF/dayz_code/Configs/CfgVehicles/AIR/CH53.hpp new file mode 100644 index 000000000..f8ac106d7 --- /dev/null +++ b/SQF/dayz_code/Configs/CfgVehicles/AIR/CH53.hpp @@ -0,0 +1,43 @@ +class CH53_base: Helicopter { + class Turrets: Turrets { + class MainTurret: MainTurret { + class ViewOptics: ViewOptics {}; + class Turrets: Turrets {}; + }; + }; +}; + +class CH53_DZ: CH53_base { + displayname = "USEC CH53"; + displaynameshort = "CH53_DZ"; + scope = 2; + side = 2; + crew = ""; + typicalCargo[] = {}; + hiddenSelections[] = {}; + class TransportMagazines{}; + class TransportWeapons{}; + commanderCanSee = 2+16+32; + gunnerCanSee = 2+16+32; + driverCanSee = 2+16+32; + transportMaxWeapons = 25; + transportMaxMagazines = 80; + transportmaxbackpacks = 15; + + class Turrets : Turrets { + class MainTurret : MainTurret { + magazines[] = {"2000Rnd_762x51_M134"}; + }; + }; +}; +class CH53_DZE: CH53_DZ { + displaynameshort = "Mi17_DZE"; + class Turrets : Turrets { + class MainTurret : MainTurret { + magazines[] = {}; + }; + class BackTurret : BackTurret { + magazines[] = {}; + }; + }; +}; From fb7b8e9d9237d3223facb6a299561ed934663687 Mon Sep 17 00:00:00 2001 From: Josh Date: Thu, 1 May 2014 14:19:40 -0400 Subject: [PATCH 02/12] Update CH53.hpp --- SQF/dayz_code/Configs/CfgVehicles/AIR/CH53.hpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/SQF/dayz_code/Configs/CfgVehicles/AIR/CH53.hpp b/SQF/dayz_code/Configs/CfgVehicles/AIR/CH53.hpp index f8ac106d7..c9a8a7861 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/AIR/CH53.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/AIR/CH53.hpp @@ -10,11 +10,15 @@ class CH53_base: Helicopter { class CH53_DZ: CH53_base { displayname = "USEC CH53"; displaynameshort = "CH53_DZ"; + enablemanualfire = 0; scope = 2; side = 2; crew = ""; typicalCargo[] = {}; hiddenSelections[] = {}; + icon = "\ca\air_e\data\UI\Icon_ah6x_CA.paa"; + model = "\ca\air_e\ah6j\ah6x"; + radartype = 0; class TransportMagazines{}; class TransportWeapons{}; commanderCanSee = 2+16+32; From a3dfbde300395455d118aa94abd64206fecc1c99 Mon Sep 17 00:00:00 2001 From: Josh Date: Thu, 1 May 2014 22:02:33 -0400 Subject: [PATCH 03/12] Added in the whole config stuff for the CH53 --- SQF/dayz_code/Configs/CfgVehicles/AIR/CH53.hpp | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/SQF/dayz_code/Configs/CfgVehicles/AIR/CH53.hpp b/SQF/dayz_code/Configs/CfgVehicles/AIR/CH53.hpp index c9a8a7861..29d304c81 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/AIR/CH53.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/AIR/CH53.hpp @@ -1,4 +1,6 @@ -class CH53_base: Helicopter { +#using usec_ch53\config.cpp; + +class CH53_base: USEC_ch53_E { class Turrets: Turrets { class MainTurret: MainTurret { class ViewOptics: ViewOptics {}; @@ -7,8 +9,8 @@ class CH53_base: Helicopter { }; }; -class CH53_DZ: CH53_base { - displayname = "USEC CH53"; +class CH53_DZ: CH53_base { + displayname = "USEC CH53E"; displaynameshort = "CH53_DZ"; enablemanualfire = 0; scope = 2; @@ -16,8 +18,6 @@ class CH53_DZ: CH53_base { crew = ""; typicalCargo[] = {}; hiddenSelections[] = {}; - icon = "\ca\air_e\data\UI\Icon_ah6x_CA.paa"; - model = "\ca\air_e\ah6j\ah6x"; radartype = 0; class TransportMagazines{}; class TransportWeapons{}; @@ -38,10 +38,7 @@ class CH53_DZE: CH53_DZ { displaynameshort = "Mi17_DZE"; class Turrets : Turrets { class MainTurret : MainTurret { - magazines[] = {}; - }; - class BackTurret : BackTurret { - magazines[] = {}; + magazines[] = {"2000Rnd_762x51_M134"}; }; }; }; From 165dd1b54576a7e584682400be342171053c97e5 Mon Sep 17 00:00:00 2001 From: Josh Date: Thu, 1 May 2014 22:04:25 -0400 Subject: [PATCH 04/12] Update CH53.hpp --- SQF/dayz_code/Configs/CfgVehicles/AIR/CH53.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SQF/dayz_code/Configs/CfgVehicles/AIR/CH53.hpp b/SQF/dayz_code/Configs/CfgVehicles/AIR/CH53.hpp index 29d304c81..2e2390a76 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/AIR/CH53.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/AIR/CH53.hpp @@ -35,7 +35,7 @@ class CH53_DZ: CH53_base { }; }; class CH53_DZE: CH53_DZ { - displaynameshort = "Mi17_DZE"; + displaynameshort = "CH53_DZE"; class Turrets : Turrets { class MainTurret : MainTurret { magazines[] = {"2000Rnd_762x51_M134"}; From e37fb5e6db86d85b474d82e0808faaf2a6e41f1c Mon Sep 17 00:00:00 2001 From: Josh Date: Thu, 1 May 2014 22:08:48 -0400 Subject: [PATCH 05/12] Syntax error, glad I caught that --- SQF/dayz_code/Configs/CfgVehicles/AIR/CH53.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SQF/dayz_code/Configs/CfgVehicles/AIR/CH53.hpp b/SQF/dayz_code/Configs/CfgVehicles/AIR/CH53.hpp index 2e2390a76..a33333a2e 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/AIR/CH53.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/AIR/CH53.hpp @@ -1,4 +1,4 @@ -#using usec_ch53\config.cpp; +#using "usec_ch53\config.cpp"; class CH53_base: USEC_ch53_E { class Turrets: Turrets { From b9236a7e903abe26ea75efb9d60c3e33b70d1871 Mon Sep 17 00:00:00 2001 From: Josh Date: Fri, 2 May 2014 21:34:54 +0800 Subject: [PATCH 06/12] Fixed anther syntax error --- SQF/dayz_code/Configs/CfgVehicles/AIR/CH53.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SQF/dayz_code/Configs/CfgVehicles/AIR/CH53.hpp b/SQF/dayz_code/Configs/CfgVehicles/AIR/CH53.hpp index a33333a2e..6148d807b 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/AIR/CH53.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/AIR/CH53.hpp @@ -1,4 +1,4 @@ -#using "usec_ch53\config.cpp"; +#using "\usec_ch53\config.cpp"; class CH53_base: USEC_ch53_E { class Turrets: Turrets { From 099b83daf65d177e71743027bf78fcc7a6908717 Mon Sep 17 00:00:00 2001 From: Josh Date: Sat, 3 May 2014 01:19:20 +0800 Subject: [PATCH 07/12] Update CH53.hpp --- SQF/dayz_code/Configs/CfgVehicles/AIR/CH53.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SQF/dayz_code/Configs/CfgVehicles/AIR/CH53.hpp b/SQF/dayz_code/Configs/CfgVehicles/AIR/CH53.hpp index 6148d807b..cb418b98c 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/AIR/CH53.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/AIR/CH53.hpp @@ -1,4 +1,4 @@ -#using "\usec_ch53\config.cpp"; +#include "\usec_ch53\config.cpp"; class CH53_base: USEC_ch53_E { class Turrets: Turrets { From 376a55f09d7573a215ce646358b08c1ca25b002b Mon Sep 17 00:00:00 2001 From: Josh Date: Fri, 2 May 2014 21:42:56 -0400 Subject: [PATCH 08/12] Update CH53.hpp --- SQF/dayz_code/Configs/CfgVehicles/AIR/CH53.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SQF/dayz_code/Configs/CfgVehicles/AIR/CH53.hpp b/SQF/dayz_code/Configs/CfgVehicles/AIR/CH53.hpp index cb418b98c..3c2f7670a 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/AIR/CH53.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/AIR/CH53.hpp @@ -38,7 +38,7 @@ class CH53_DZE: CH53_DZ { displaynameshort = "CH53_DZE"; class Turrets : Turrets { class MainTurret : MainTurret { - magazines[] = {"2000Rnd_762x51_M134"}; + magazines[] = {""}; }; }; }; From f4e9982e902516bd1a9cb8ac7291e6beb6525572 Mon Sep 17 00:00:00 2001 From: Josh Date: Mon, 5 May 2014 13:24:37 -0400 Subject: [PATCH 09/12] Semicolon not needed for #include --- SQF/dayz_code/Configs/CfgVehicles/AIR/CH53.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SQF/dayz_code/Configs/CfgVehicles/AIR/CH53.hpp b/SQF/dayz_code/Configs/CfgVehicles/AIR/CH53.hpp index 3c2f7670a..23d17c7fb 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/AIR/CH53.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/AIR/CH53.hpp @@ -1,4 +1,4 @@ -#include "\usec_ch53\config.cpp"; +#include "\usec_ch53\config.cpp" class CH53_base: USEC_ch53_E { class Turrets: Turrets { From 6ab4103b7f5a797d5cc360c50c7c88c8d375c3ab Mon Sep 17 00:00:00 2001 From: Josh Date: Mon, 5 May 2014 13:48:56 -0400 Subject: [PATCH 10/12] Game still recognizes without the back slash there --- SQF/dayz_code/Configs/CfgVehicles/AIR/CH53.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SQF/dayz_code/Configs/CfgVehicles/AIR/CH53.hpp b/SQF/dayz_code/Configs/CfgVehicles/AIR/CH53.hpp index 23d17c7fb..fe227a723 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/AIR/CH53.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/AIR/CH53.hpp @@ -1,4 +1,4 @@ -#include "\usec_ch53\config.cpp" +#include "usec_ch53\config.cpp" class CH53_base: USEC_ch53_E { class Turrets: Turrets { From f1130d121ffe2e5ae7324ffd903cbbaec96dfcf8 Mon Sep 17 00:00:00 2001 From: Josh Date: Tue, 6 May 2014 14:35:45 -0400 Subject: [PATCH 11/12] Update config.cpp --- SQF/dayz_sfx/config.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SQF/dayz_sfx/config.cpp b/SQF/dayz_sfx/config.cpp index 54d51d11d..f716fb55b 100644 --- a/SQF/dayz_sfx/config.cpp +++ b/SQF/dayz_sfx/config.cpp @@ -22,7 +22,7 @@ class CfgPatches { units[] = {}; weapons[] = {}; requiredVersion = 0.1; - dayzVersion = "1.0.4.2"; + dayzVersion = "1.0.5"; requiredAddons[] = {}; }; }; From 5c8049a47660d4542948deefe73fcc5f1337f1aa Mon Sep 17 00:00:00 2001 From: Josh Date: Wed, 7 May 2014 12:36:33 -0400 Subject: [PATCH 12/12] Update 1.0.5_Updates.sql --- Server Files/SQL/1.0.5_Updates.sql | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Server Files/SQL/1.0.5_Updates.sql b/Server Files/SQL/1.0.5_Updates.sql index ce2e6f501..2d6d5c79a 100644 --- a/Server Files/SQL/1.0.5_Updates.sql +++ b/Server Files/SQL/1.0.5_Updates.sql @@ -3,7 +3,8 @@ INSERT INTO `Traders_DATA` VALUES (NULL, '["ItemFuelBarrelEmpty",1]', 250, '[1," INSERT INTO `Traders_DATA` VALUES (NULL, '["ItemFuelBarrelEmpty",1]', 250, '[1,"ItemGoldBar",1]', '[5,"ItemSilverBar10oz",1]', 0, 636, 'trade_items'); INSERT INTO `Traders_DATA` VALUES (NULL, '["ItemFuelBarrelEmpty",1]', 250, '[1,"ItemGoldBar",1]', '[5,"ItemSilverBar10oz",1]', 0, 555, 'trade_items'); -INSERT INTO `Traders_DATA` VALUES (NULL, '["USEC_CH53_DZE",1]', 6, '[2,"ItemBriefcase",1]', '[1,"ItemBriefcase",1]', 0, 493, 'trade_any_vehicle'); -INSERT INTO `Traders_DATA` VALUES (NULL, '["USEC_CH53_DZE",1]', 10, '[3,"ItemBriefcase",1]', '[2,"ItemBriefcase",1]', 0, 512, 'trade_any_vehicle'); +INSERT INTO `Traders_DATA` VALUES (NULL, '["USEC_CH53_DZE",1]', 6, '[2,"ItemBriefcase100oz",1]', '[1,"ItemBriefcase100oz",1]', 0, 493, 'trade_any_vehicle'); +INSERT INTO `Traders_DATA` VALUES (NULL, '["USEC_CH53_DZE",1]', 10, '[3,"ItemBriefcase100oz",1]', '[2,"ItemBriefcase100oz",1]', 0, 512, 'trade_any_vehicle'); +INSERT INTO 'Traders_DATA' VALUES (NULL, '["BAF_Merlin_DZE",1]', 5, '[2,"ItemBriefcase100oz",1]', '[1,"ItemBriefcase100oz",1]', 0, 519, 'trade_any_vehicle'); UPDATE `Traders_DATA` SET `item` = '["C130J_US_EP1_DZ",2]' WHERE `item` = '["C130J_US_EP1",2]'