W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2025-12-14 04:02:37 +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

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