From a6a36af074b9aea672e293b41f546f1dcecbc2f8 Mon Sep 17 00:00:00 2001 From: Florian Kinder Date: Wed, 5 Feb 2014 12:48:22 +0100 Subject: [PATCH 1/6] Added BTR90 DZ and AL --- .../Configs/CfgVehicles/LAND/BTR90.hpp | 57 +++++++++++++++++++ SQF/dayz_code/Configs/cfgVehicles.hpp | 2 + 2 files changed, 59 insertions(+) create mode 100644 SQF/dayz_code/Configs/CfgVehicles/LAND/BTR90.hpp diff --git a/SQF/dayz_code/Configs/CfgVehicles/LAND/BTR90.hpp b/SQF/dayz_code/Configs/CfgVehicles/LAND/BTR90.hpp new file mode 100644 index 000000000..4cbf85224 --- /dev/null +++ b/SQF/dayz_code/Configs/CfgVehicles/LAND/BTR90.hpp @@ -0,0 +1,57 @@ +class BTR90_DZ: BTR90 { + scope = public; + side = TGuerrila; + displayName = "BTR-90 DZ"; + + commanderCanSee = 2+16+32; + gunnerCanSee = 2+16+32; + driverCanSee = 2+16+32; + + crew = ""; + typicalCargo[] = {}; + TransportMagazines[] = {}; + + transportMaxMagazines = 100; // Default: 100 + transportMaxWeapons = 10; // Default: 10 + //transportmaxbackpacks = ; // Default: +}; +class BTR90_HQ_DZ: BTR90_HQ { + scope = public; + side = TGuerrila; + displayName = "BTR-90 (HQ) DZ"; + + commanderCanSee = 2+16+32; + gunnerCanSee = 2+16+32; + driverCanSee = 2+16+32; + + crew = ""; + typicalCargo[] = {}; + TransportMagazines[] = {}; + + transportMaxMagazines = 100; // Default: 100 + transportMaxWeapons = 10; // Default: 10 + //transportmaxbackpacks = ; // Default: +}; + +// Ammo Less +class BTR90_DZE: BTR90_DZ { + displayName = "BTR-90 AL"; + class Turrets: Turrets { + class MainTurret : MainTurret { + magazines[] = {}; + }; + class Turrets: Turrets { + class CommanderOptics: CommanderOptics { + magazines[] = {}; + }; + }; + }; +}; +class BTR90_HQ_DZE: BTR90_HQ_DZ { + displayName = "BTR-90 (HQ) AL"; + class Turrets: Turrets { + class MainTurret : MainTurret { + magazines[] = {}; + }; + }; +}; \ No newline at end of file diff --git a/SQF/dayz_code/Configs/cfgVehicles.hpp b/SQF/dayz_code/Configs/cfgVehicles.hpp index 5da2ee1e6..4de596903 100644 --- a/SQF/dayz_code/Configs/cfgVehicles.hpp +++ b/SQF/dayz_code/Configs/cfgVehicles.hpp @@ -223,6 +223,7 @@ class CfgVehicles { #include "CfgVehicles\LAND\ArmoredSUV.hpp" #include "CfgVehicles\LAND\Pickup_PK.hpp" #include "CfgVehicles\LAND\Offroad_DSHKM.hpp" + #include "CfgVehicles\LAND\BTR90.hpp" // LAND (Unarmed) #include "CfgVehicles\LAND\V3S.hpp" @@ -322,6 +323,7 @@ class CfgVehicles { class House { class DestructionEffects; }; + }; #include "CfgVehicles\Wrecks.hpp" #include "CfgVehicles\DZE\Wrecks.hpp" From f843454db33320fe1287370dd6d7bf9350cf03bc Mon Sep 17 00:00:00 2001 From: Florian Kinder Date: Wed, 5 Feb 2014 12:52:46 +0100 Subject: [PATCH 2/6] Added LAV25 DZ and AL --- .../Configs/CfgVehicles/LAND/LAV25.hpp | 57 +++++++++++++++++++ SQF/dayz_code/Configs/cfgVehicles.hpp | 1 + 2 files changed, 58 insertions(+) create mode 100644 SQF/dayz_code/Configs/CfgVehicles/LAND/LAV25.hpp diff --git a/SQF/dayz_code/Configs/CfgVehicles/LAND/LAV25.hpp b/SQF/dayz_code/Configs/CfgVehicles/LAND/LAV25.hpp new file mode 100644 index 000000000..58f48f472 --- /dev/null +++ b/SQF/dayz_code/Configs/CfgVehicles/LAND/LAV25.hpp @@ -0,0 +1,57 @@ +class LAV25_DZ: LAV25 { + scope = public; + side = TGuerrila; + displayName = "LAV-25 DZ"; + + commanderCanSee = 2+16+32; + gunnerCanSee = 2+16+32; + driverCanSee = 2+16+32; + + crew = ""; + typicalCargo[] = {}; + TransportMagazines[] = {}; + + transportMaxMagazines = 100; // Default: 100 + transportMaxWeapons = 10; // Default: 10 + //transportmaxbackpacks = ; // Default: +}; +class LAV25_HQ_DZ: LAV25_HQ { + scope = public; + side = TGuerrila; + displayName = "LAV-25 (HQ) DZ"; + + commanderCanSee = 2+16+32; + gunnerCanSee = 2+16+32; + driverCanSee = 2+16+32; + + crew = ""; + typicalCargo[] = {}; + TransportMagazines[] = {}; + + transportMaxMagazines = 100; // Default: 100 + transportMaxWeapons = 10; // Default: 10 + //transportmaxbackpacks = ; // Default: +}; + +// Ammo Less +class LAV25_DZE: LAV25_DZ { + displayName = "LAV-25 AL"; + class Turrets: Turrets { + class MainTurret : MainTurret { + magazines[] = {}; + }; + class Turrets: Turrets { + class CommanderOptics: CommanderOptics { + magazines[] = {}; + }; + }; + }; +}; +class LAV25_HQ_DZE: LAV25_HQ_DZ { + displayName = "LAV-25 (HQ) AL"; + class Turrets: Turrets { + class MainTurret : MainTurret { + magazines[] = {}; + }; + }; +}; \ No newline at end of file diff --git a/SQF/dayz_code/Configs/cfgVehicles.hpp b/SQF/dayz_code/Configs/cfgVehicles.hpp index 4de596903..e2195f4f2 100644 --- a/SQF/dayz_code/Configs/cfgVehicles.hpp +++ b/SQF/dayz_code/Configs/cfgVehicles.hpp @@ -224,6 +224,7 @@ class CfgVehicles { #include "CfgVehicles\LAND\Pickup_PK.hpp" #include "CfgVehicles\LAND\Offroad_DSHKM.hpp" #include "CfgVehicles\LAND\BTR90.hpp" + #include "CfgVehicles\LAND\LAV25.hpp" // LAND (Unarmed) #include "CfgVehicles\LAND\V3S.hpp" From da2c954e237856839c5b1026dacad2cc60e10ac5 Mon Sep 17 00:00:00 2001 From: Florian Kinder Date: Wed, 5 Feb 2014 14:06:01 +0100 Subject: [PATCH 3/6] Fixed missing external class reference --- SQF/dayz_code/Configs/CfgVehicles/LAND/BTR90.hpp | 13 +++++++++++++ SQF/dayz_code/Configs/CfgVehicles/LAND/LAV25.hpp | 9 +++++++++ 2 files changed, 22 insertions(+) diff --git a/SQF/dayz_code/Configs/CfgVehicles/LAND/BTR90.hpp b/SQF/dayz_code/Configs/CfgVehicles/LAND/BTR90.hpp index 4cbf85224..3f544cbdf 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/LAND/BTR90.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/LAND/BTR90.hpp @@ -1,3 +1,4 @@ +class BTR90; class BTR90_DZ: BTR90 { scope = public; side = TGuerrila; @@ -14,7 +15,15 @@ class BTR90_DZ: BTR90 { transportMaxMagazines = 100; // Default: 100 transportMaxWeapons = 10; // Default: 10 //transportmaxbackpacks = ; // Default: + + class Turrets { + class MainTurret; // External class reference + class Turrets { + class CommanderOptics; // External class reference + }; + }; }; +class BTR90_HQ; class BTR90_HQ_DZ: BTR90_HQ { scope = public; side = TGuerrila; @@ -31,6 +40,10 @@ class BTR90_HQ_DZ: BTR90_HQ { transportMaxMagazines = 100; // Default: 100 transportMaxWeapons = 10; // Default: 10 //transportmaxbackpacks = ; // Default: + + class Turrets { + class MainTurret; // External class reference + } }; // Ammo Less diff --git a/SQF/dayz_code/Configs/CfgVehicles/LAND/LAV25.hpp b/SQF/dayz_code/Configs/CfgVehicles/LAND/LAV25.hpp index 58f48f472..d62d106ea 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/LAND/LAV25.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/LAND/LAV25.hpp @@ -1,3 +1,4 @@ +class LAV25; class LAV25_DZ: LAV25 { scope = public; side = TGuerrila; @@ -14,7 +15,12 @@ class LAV25_DZ: LAV25 { transportMaxMagazines = 100; // Default: 100 transportMaxWeapons = 10; // Default: 10 //transportmaxbackpacks = ; // Default: + + class Turrets; + class MainTurret; + class CommanderOptics; }; +class LAV25_HQ; class LAV25_HQ_DZ: LAV25_HQ { scope = public; side = TGuerrila; @@ -31,6 +37,9 @@ class LAV25_HQ_DZ: LAV25_HQ { transportMaxMagazines = 100; // Default: 100 transportMaxWeapons = 10; // Default: 10 //transportmaxbackpacks = ; // Default: + + class Turrets; + class MainTurret; }; // Ammo Less From bf7110448be2d9440e4bd837a80fba0a6a7d83c2 Mon Sep 17 00:00:00 2001 From: Florian Kinder Date: Wed, 5 Feb 2014 14:06:19 +0100 Subject: [PATCH 4/6] Added M113 DZ and AL & fixed compile problem --- .../Configs/CfgVehicles/LAND/M113.hpp | 65 +++++++++++++++++++ SQF/dayz_code/Configs/cfgVehicles.hpp | 3 +- 2 files changed, 67 insertions(+), 1 deletion(-) diff --git a/SQF/dayz_code/Configs/CfgVehicles/LAND/M113.hpp b/SQF/dayz_code/Configs/CfgVehicles/LAND/M113.hpp index ee3259f20..9e7075e69 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/LAND/M113.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/LAND/M113.hpp @@ -1,3 +1,68 @@ +// Armed +class M113_UN_EP1; +class M113_UN_EP1_DZ: M113_UN_EP1 { + scope = public; + side = TGuerrila; + displayName = "M113 DZ"; + + commanderCanSee = 2+16+32; + gunnerCanSee = 2+16+32; + driverCanSee = 2+16+32; + + crew = ""; + typicalCargo[] = {}; + TransportMagazines[] = {}; + + transportMaxMagazines = 100; // Default: 100 + transportMaxWeapons = 20; // Default: 20 + //transportmaxbackpacks = ; // Default: + + class Turrets { + class MainTurret; // External class reference + }; +}; +class M113_TK_EP1; +class M113_TK_EP1_DZ: M113_TK_EP1 { + scope = public; + side = TGuerrila; + displayName = "M113 DZ"; + + commanderCanSee = 2+16+32; + gunnerCanSee = 2+16+32; + driverCanSee = 2+16+32; + + crew = ""; + typicalCargo[] = {}; + TransportMagazines[] = {}; + + transportMaxMagazines = 100; // Default: 100 + transportMaxWeapons = 20; // Default: 20 + //transportmaxbackpacks = ; // Default: + + class Turrets { + class MainTurret; // External class reference + }; +}; + +// Ammo Less +class M113_UN_EP1_DZE: M113_UN_EP1_DZ { + displayName = "M113 AL"; + class Turrets: Turrets { + class MainTurret : MainTurret { + magazines[] = {}; + }; + }; +}; +class M113_TK_EP1_DZE: M113_TK_EP1_DZ { + displayName = "M113 AL"; + class Turrets: Turrets { + class MainTurret : MainTurret { + magazines[] = {}; + }; + }; +}; + +// Unarmed class M113Ambul_UN_EP1; class M113Ambul_UN_EP1_DZ: M113Ambul_UN_EP1 { scope = 2; diff --git a/SQF/dayz_code/Configs/cfgVehicles.hpp b/SQF/dayz_code/Configs/cfgVehicles.hpp index e2195f4f2..e707e40c1 100644 --- a/SQF/dayz_code/Configs/cfgVehicles.hpp +++ b/SQF/dayz_code/Configs/cfgVehicles.hpp @@ -240,6 +240,8 @@ class CfgVehicles { #include "CfgVehicles\LAND\UAZ.hpp" #include "CfgVehicles\LAND\SUV.hpp" #include "CfgVehicles\LAND\TT650.hpp" + + // Land (Armed & Unarmed) #include "CfgVehicles\LAND\M113.hpp" // SEA @@ -324,7 +326,6 @@ class CfgVehicles { class House { class DestructionEffects; }; - }; #include "CfgVehicles\Wrecks.hpp" #include "CfgVehicles\DZE\Wrecks.hpp" From c8d3668218625e9704e98a748628fb49a5fa79f8 Mon Sep 17 00:00:00 2001 From: Florian Kinder Date: Wed, 5 Feb 2014 15:45:59 +0100 Subject: [PATCH 5/6] Final Fixed version --- .../Configs/CfgVehicles/LAND/BTR90.hpp | 22 +++++-------------- .../Configs/CfgVehicles/LAND/LAV25.hpp | 18 +++++---------- .../Configs/CfgVehicles/LAND/M113.hpp | 12 ++++------ 3 files changed, 16 insertions(+), 36 deletions(-) diff --git a/SQF/dayz_code/Configs/CfgVehicles/LAND/BTR90.hpp b/SQF/dayz_code/Configs/CfgVehicles/LAND/BTR90.hpp index 3f544cbdf..66ebb6f92 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/LAND/BTR90.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/LAND/BTR90.hpp @@ -10,18 +10,14 @@ class BTR90_DZ: BTR90 { crew = ""; typicalCargo[] = {}; - TransportMagazines[] = {}; + class TransportMagazines{}; transportMaxMagazines = 100; // Default: 100 transportMaxWeapons = 10; // Default: 10 //transportmaxbackpacks = ; // Default: - class Turrets { - class MainTurret; // External class reference - class Turrets { - class CommanderOptics; // External class reference - }; - }; + class Turrets; // External class reference + class MainTurret; // External class reference }; class BTR90_HQ; class BTR90_HQ_DZ: BTR90_HQ { @@ -35,15 +31,14 @@ class BTR90_HQ_DZ: BTR90_HQ { crew = ""; typicalCargo[] = {}; - TransportMagazines[] = {}; + class TransportMagazines{}; transportMaxMagazines = 100; // Default: 100 transportMaxWeapons = 10; // Default: 10 //transportmaxbackpacks = ; // Default: - class Turrets { - class MainTurret; // External class reference - } + class Turrets; // External class reference + class MainTurret; // External class reference }; // Ammo Less @@ -53,11 +48,6 @@ class BTR90_DZE: BTR90_DZ { class MainTurret : MainTurret { magazines[] = {}; }; - class Turrets: Turrets { - class CommanderOptics: CommanderOptics { - magazines[] = {}; - }; - }; }; }; class BTR90_HQ_DZE: BTR90_HQ_DZ { diff --git a/SQF/dayz_code/Configs/CfgVehicles/LAND/LAV25.hpp b/SQF/dayz_code/Configs/CfgVehicles/LAND/LAV25.hpp index d62d106ea..5c80d1648 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/LAND/LAV25.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/LAND/LAV25.hpp @@ -10,15 +10,14 @@ class LAV25_DZ: LAV25 { crew = ""; typicalCargo[] = {}; - TransportMagazines[] = {}; + class TransportMagazines{}; transportMaxMagazines = 100; // Default: 100 transportMaxWeapons = 10; // Default: 10 //transportmaxbackpacks = ; // Default: - class Turrets; - class MainTurret; - class CommanderOptics; + class Turrets; // External class reference + class MainTurret; // External class reference }; class LAV25_HQ; class LAV25_HQ_DZ: LAV25_HQ { @@ -32,14 +31,14 @@ class LAV25_HQ_DZ: LAV25_HQ { crew = ""; typicalCargo[] = {}; - TransportMagazines[] = {}; + class TransportMagazines{}; transportMaxMagazines = 100; // Default: 100 transportMaxWeapons = 10; // Default: 10 //transportmaxbackpacks = ; // Default: - class Turrets; - class MainTurret; + class Turrets; // External class reference + class MainTurret; // External class reference }; // Ammo Less @@ -49,11 +48,6 @@ class LAV25_DZE: LAV25_DZ { class MainTurret : MainTurret { magazines[] = {}; }; - class Turrets: Turrets { - class CommanderOptics: CommanderOptics { - magazines[] = {}; - }; - }; }; }; class LAV25_HQ_DZE: LAV25_HQ_DZ { diff --git a/SQF/dayz_code/Configs/CfgVehicles/LAND/M113.hpp b/SQF/dayz_code/Configs/CfgVehicles/LAND/M113.hpp index 9e7075e69..d119c8bde 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/LAND/M113.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/LAND/M113.hpp @@ -11,15 +11,13 @@ class M113_UN_EP1_DZ: M113_UN_EP1 { crew = ""; typicalCargo[] = {}; - TransportMagazines[] = {}; + class TransportMagazines{}; transportMaxMagazines = 100; // Default: 100 transportMaxWeapons = 20; // Default: 20 //transportmaxbackpacks = ; // Default: - class Turrets { - class MainTurret; // External class reference - }; + class MainTurret; // External class reference }; class M113_TK_EP1; class M113_TK_EP1_DZ: M113_TK_EP1 { @@ -33,15 +31,13 @@ class M113_TK_EP1_DZ: M113_TK_EP1 { crew = ""; typicalCargo[] = {}; - TransportMagazines[] = {}; + class TransportMagazines{}; transportMaxMagazines = 100; // Default: 100 transportMaxWeapons = 20; // Default: 20 //transportmaxbackpacks = ; // Default: - class Turrets { - class MainTurret; // External class reference - }; + class MainTurret; // External class reference }; // Ammo Less From 279054d2dfeb95369b0be8e674b7a2e06cc305a0 Mon Sep 17 00:00:00 2001 From: Florian Kinder Date: Wed, 5 Feb 2014 15:46:29 +0100 Subject: [PATCH 6/6] Unique Prefix --- SQF/dayz_code/$PREFIX$ | 1 + SQF/dayz_server/{$PBOPREFIX$ => $PREFIX$} | 0 SQF/dayz_server/PboPrefix.txt | 1 - 3 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 SQF/dayz_code/$PREFIX$ rename SQF/dayz_server/{$PBOPREFIX$ => $PREFIX$} (100%) delete mode 100644 SQF/dayz_server/PboPrefix.txt diff --git a/SQF/dayz_code/$PREFIX$ b/SQF/dayz_code/$PREFIX$ new file mode 100644 index 000000000..86d7c3d1a --- /dev/null +++ b/SQF/dayz_code/$PREFIX$ @@ -0,0 +1 @@ +z\addons\dayz_code \ No newline at end of file diff --git a/SQF/dayz_server/$PBOPREFIX$ b/SQF/dayz_server/$PREFIX$ similarity index 100% rename from SQF/dayz_server/$PBOPREFIX$ rename to SQF/dayz_server/$PREFIX$ diff --git a/SQF/dayz_server/PboPrefix.txt b/SQF/dayz_server/PboPrefix.txt deleted file mode 100644 index 0f58ae7bf..000000000 --- a/SQF/dayz_server/PboPrefix.txt +++ /dev/null @@ -1 +0,0 @@ -z\addons\dayz_server \ No newline at end of file