W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2025-12-17 09:10:27 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'RC1-1.0.5.2' of https://github.com/vbawol/DayZ-Epoch into DB_backup_script

Browse Source 
Conflicts:
	SQF/dayz_code/Configs/CfgVehicles/AIR/CH53.hpp
This commit is contained in:
RimBlock
2014-07-24 20:30:25 +08:00
parent 8e640ef5b3 41c658c0c8
commit dd968044d3
87 changed files with 615 additions and 477 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
SQF/dayz_code/Configs/CfgVehicles/AIR/AH6.hpp
View File

@@ -1,4 +1,49 @@
class AH6_Base_EP1;
class AH6J_EP1_DZ: AH6_Base_EP1
{
scope = 2;
side = 2;
displayName = "AH6J_DZ";
crew = "";
typicalCargo[] = {};
weapons[] = {"TwinM134","CMFlareLauncher"};
magazines[] = {"4000Rnd_762x51_M134","60Rnd_CMFlareMagazine"};
threat[] = {0.6,0.4,0.1};
gunBeg[] = {"muzzle_1","muzzle_2"};
gunEnd[] = {"chamber_1","chamber_2"};
radarType = 0;
class TransportMagazines {};
class TransportWeapons {};
class Turrets {};
class AnimationSources
{
class Gatling_1
{
source = "revolving";
weapon = "TwinM134";
};
class Gatling_2
{
source = "revolving";
weapon = "TwinM134";
};
};
hiddenSelections[] = {"camo1","camo2"};
hiddenSelectionsTextures[] = {"ca\air_e\ah6j\data\ah6_merge1_co.paa","ca\air_e\ah6j\data\default_co.paa"};
commanderCanSee = 2+16+32;
gunnerCanSee = 2+16+32;
driverCanSee = 2+16+32;
transportMaxWeapons = 3;
transportMaxMagazines = 10;
transportmaxbackpacks = 2;
};
class AH6J_EP1_DZE: AH6J_EP1_DZ
{
scope = 2;
side = 2;
displayName = "AH6J_DZE";
magazines[] = {};
};
class AH6X_DZ: AH6_Base_EP1 {
displayname = "AH6X Little Bird";
displaynameshort = "AH6X_DZ";

34
SQF/dayz_code/Configs/CfgVehicles/AIR/CH53.hpp
View File

@@ -1,21 +1,21 @@
#include "\usec_ch53\config.cpp"
class CH53_base: USEC_ch53_E {
class Turrets: Turrets {
class MainTurret: MainTurret {
class ViewOptics: ViewOptics {};
class Turrets: Turrets {};
};
};
};
class CH53_DZ: CH53_base {
displayname = "USEC CH53E";
displaynameshort = "CH53_DZ";
enablemanualfire = 0;
class USEC_ch53_E;
class CH53_DZE : USEC_ch53_E {
scope = 2;
side = 2;
displayname = "USEC CH53E DZE";
displaynameshort = "CH53_DZE";
destrType = "DestructWreck";
enablemanualfire = 0;
crew = "";
soundGetIn[] = {"\ca\Sounds\Air\Noises\heli_door_01",0.316228,1};
soundGetOut[] = {"\ca\Sounds\Air\Noises\heli_door_01",0.316228,1,30};
soundEnviron[] = {"",0.0316228,1};
soundEngineOnInt[] = {"ca\sounds\Air\UH1Y\int\int-start-final",0.1,1};
soundEngineOnExt[] = {"ca\sounds\Air\UH1Y\ext\ext-motor-start",1,1,800};
soundEngineOffInt[] = {"ca\sounds\Air\UH1Y\int\int-stop-final",0.1,1};
soundEngineOffExt[] = {"ca\sounds\Air\UH1Y\ext\ext-motor-stop",1,1,800};
soundGear[] = {"\usec_ch53\sound\ch53_gear", db10, 1, 100};
soundDammage[] = {"\usec_ch53\sound\dws_warning_beeps", 3.16228, 1, 20};
typicalCargo[] = {};
hiddenSelections[] = {};
radartype = 0;
@@ -27,6 +27,7 @@ class CH53_DZ: CH53_base {
transportMaxWeapons = 25;
transportMaxMagazines = 80;
transportmaxbackpacks = 15;
<<<<<<< HEAD
fuelCapacity = 3849;
class Turrets : Turrets {
@@ -43,3 +44,6 @@ class CH53_DZE: CH53_DZ {
};
};
};
=======
};
>>>>>>> 41c658c0c8b8f580c5b137ea22830ac81c2123e6