From a505cb5e5430b9477e48dd908dc9f1bb092419a2 Mon Sep 17 00:00:00 2001 From: ebaydayz Date: Tue, 8 Mar 2016 16:51:18 -0500 Subject: [PATCH] Move females.hpp to DZE\Females.hpp --- .../Configs/CfgVehicles/CfgVehicles.hpp | 2 +- .../{Females/females.hpp => DZE/Females.hpp} | 9 +++- .../Configs/CfgVehicles/Helicopter/AH6.hpp | 2 +- .../Configs/CfgVehicles/Helicopter/AH6X.hpp | 46 ------------------- .../Configs/CfgVehicles/Helicopter/UH1H.hpp | 46 +++++++++++-------- 5 files changed, 37 insertions(+), 68 deletions(-) rename SQF/dayz_code/Configs/CfgVehicles/{Females/females.hpp => DZE/Females.hpp} (96%) delete mode 100644 SQF/dayz_code/Configs/CfgVehicles/Helicopter/AH6X.hpp diff --git a/SQF/dayz_code/Configs/CfgVehicles/CfgVehicles.hpp b/SQF/dayz_code/Configs/CfgVehicles/CfgVehicles.hpp index b2ecba26f..d5050b04a 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/CfgVehicles.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/CfgVehicles.hpp @@ -431,7 +431,7 @@ class CfgVehicles { #include "Zeds\WildZeds.hpp" //Viral type zeds #include "Zeds\SwarmZeds.hpp" //Swarm #include "Zeds\PlayerZeds.hpp" - #include "Females\females.hpp" + #include "DZE\Females.hpp" //Survivor Skins #include "Skins.hpp" //Bags diff --git a/SQF/dayz_code/Configs/CfgVehicles/Females/females.hpp b/SQF/dayz_code/Configs/CfgVehicles/DZE/Females.hpp similarity index 96% rename from SQF/dayz_code/Configs/CfgVehicles/Females/females.hpp rename to SQF/dayz_code/Configs/CfgVehicles/DZE/Females.hpp index 473f04ab5..418a7bd83 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Females/females.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/DZE/Females.hpp @@ -3,14 +3,14 @@ class Soldier_Bodyguard_M4_PMC; class SurvivorW2_DZ: Soldier_Bodyguard_M4_PMC { displayName = $STR_CHAR_1; - side = 1; + side = TWest; weapons[] = {"Throw","Put"}; model = "\dayz\characters\annie_original"; magazines[] = {}; respawnWeapons[] = {"Throw","Put"}; respawnMagazines[] = {}; weaponSlots = "1 + 4 + 12* 256 + 2* 4096 + 2 + 8* 16 + 12*131072"; - canHideBodies = 1; + canHideBodies = true; identityTypes[] = {"Language_W_EN_EP1","Woman"}; languages[] = {"EN"}; class TalkTopics @@ -193,6 +193,11 @@ class SurvivorW2_DZ: Soldier_Bodyguard_M4_PMC }; hiddenSelections[] = {"Camo"}; hiddenSelectionsTextures[] = {"\ca\characters_e\woman\baker\data\baker_co.paa"}; + + class Eventhandlers + { + local = "_z = _this select 0; if (!isServer && {!isNull _z} && {!(side _z in [west,east,civilian])}) exitWith { PVDZ_sec_atp = ['wrong side', player]; publicVariableServer 'PVDZ_sec_atp'; deleteVehicle _z; };"; + }; }; class BanditW1_DZ: SurvivorW2_DZ { diff --git a/SQF/dayz_code/Configs/CfgVehicles/Helicopter/AH6.hpp b/SQF/dayz_code/Configs/CfgVehicles/Helicopter/AH6.hpp index 798fd47f3..33462b65b 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Helicopter/AH6.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Helicopter/AH6.hpp @@ -67,7 +67,7 @@ class AH6X_DZ: AH6_Base_EP1 { gunnerCanSee = 2+16+32; driverCanSee = 2+16+32; transportMaxWeapons = 3; - transportMaxMagazines = 10; + transportMaxMagazines = 30; transportmaxbackpacks = 2; fuelCapacity = 242; class Turrets {}; diff --git a/SQF/dayz_code/Configs/CfgVehicles/Helicopter/AH6X.hpp b/SQF/dayz_code/Configs/CfgVehicles/Helicopter/AH6X.hpp deleted file mode 100644 index 46e5fe44c..000000000 --- a/SQF/dayz_code/Configs/CfgVehicles/Helicopter/AH6X.hpp +++ /dev/null @@ -1,46 +0,0 @@ -class AH6X_DZ_Base: AH6_Base_EP1 -{ - class Helicopter: Air - { - class NewTurret; - class Turrets {class MainTurret;}; - class HitPoints - { - class HitGlass1; - class HitGlass2; - class HitGlass3; - class HitGlass4; - class HitGlass5; - }; - }; -}; - -class AH6X_DZ: AH6_Base_EP1 -{ - displayname = $STR_VEH_NAME_AH6X; - displaynameshort = $STR_EP1_DN_AH6X; - audible = 6; - enablemanualfire = 0; - scope = public; - side = 2; - crew = ""; - typicalCargo[] = {}; - hiddenselections[] = {"camo1"}; - hiddenselectionstextures[] = {"ca\air_e\ah6j\data\ah6_merge1_co.paa"}; - icon = "\ca\air_e\data\UI\Icon_ah6x_CA.paa"; - model = "\ca\air_e\ah6j\ah6x"; - picture = "\ca\air_e\data\UI\Picture_ah6x_CA.paa"; - isuav = 0; - radartype = 0; - class TransportMagazines{}; - class TransportWeapons{}; - weapons[] = {}; - magazines[] = {}; - commanderCanSee = 2+16+32; - gunnerCanSee = 2+16+32; - driverCanSee = 2+16+32; - transportMaxWeapons = 3; - transportMaxMagazines = 30; - transportmaxbackpacks = 2; - class Turrets {}; -}; diff --git a/SQF/dayz_code/Configs/CfgVehicles/Helicopter/UH1H.hpp b/SQF/dayz_code/Configs/CfgVehicles/Helicopter/UH1H.hpp index e8da21d1b..d0352eaaa 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/Helicopter/UH1H.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/Helicopter/UH1H.hpp @@ -1,16 +1,21 @@ -class UH1H_base: Helicopter { - class Turrets: Turrets { - class MainTurret: MainTurret { +class UH1H_base: Helicopter +{ + class Turrets: Turrets + { + class MainTurret: MainTurret + { class ViewOptics: ViewOptics {}; class Turrets: Turrets {}; }; - class LeftDoorGun: MainTurret { + class LeftDoorGun: MainTurret + { class Turrets: Turrets {}; }; }; }; -class UH1H_DZ: UH1H_base { +class UH1H_DZ: UH1H_base +{ scope = public; side = 2; crew = ""; @@ -25,25 +30,19 @@ class UH1H_DZ: UH1H_base { transportMaxMagazines = 25; transportmaxbackpacks = 4; fuelCapacity = 1333; - class Turrets : Turrets { - class MainTurret : MainTurret { + class Turrets : Turrets + { + class MainTurret : MainTurret + { magazines[] = {"100Rnd_762x51_M240"}; }; - class LeftDoorGun : LeftDoorGun { + class LeftDoorGun : LeftDoorGun + { magazines[] = {"100Rnd_762x51_M240"}; }; }; }; -class UH1H_DZE: UH1H_DZ { - class Turrets : Turrets { - class MainTurret : MainTurret { - magazines[] = {}; - }; - class LeftDoorGun : LeftDoorGun { - magazines[] = {}; - }; - }; -}; + class UH1H_2_DZ : UH1H_DZ { hiddenSelections[] = {"Camo1","Camo2","Camo_mlod"}; @@ -53,4 +52,15 @@ class UH1H_2_DZ : UH1H_DZ "ca\air_E\UH1H\data\UH1D_in_TKA_CO.paa", "ca\air_E\UH1H\data\default_TKA_co.paa" }; +}; + +class UH1H_DZE: UH1H_DZ { + class Turrets : Turrets { + class MainTurret : MainTurret { + magazines[] = {}; + }; + class LeftDoorGun : LeftDoorGun { + magazines[] = {}; + }; + }; }; \ No newline at end of file