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

Conflicts: SQF/dayz_code/Configs/CfgVehicles/AIR/CH53.hpp
2026-02-17 21:52:56 +03:00 · 2014-07-24 20:30:25 +08:00
parent 8e640ef5b3 41c658c0c8
commit dd968044d3
87 changed files with 615 additions and 477 deletions
--- a/SQF/dayz_code/Configs/CfgArma.hpp
+++ b/SQF/dayz_code/Configs/CfgArma.hpp
@@ -314,6 +314,7 @@ class CfgSurvival {
 			sex = "female";
 			playerModel = "SurvivorWpink_DZ";
 		};
+		/*
 		class Skin_SurvivorWsequisha_DZ: Default {
 			sex = "female";
 			playerModel = "SurvivorWsequisha_DZ";
@@ -322,6 +323,7 @@ class CfgSurvival {
 			sex = "female";
 			playerModel = "SurvivorWsequishaD_DZ";
 		};
+		*/
 		class Skin_SurvivorWcombat_DZ: Default {
 			sex = "female";
 			playerModel = "SurvivorWcombat_DZ";
--- a/SQF/dayz_code/Configs/CfgLoot/CfgBuildingLoot.hpp
+++ b/SQF/dayz_code/Configs/CfgLoot/CfgBuildingLoot.hpp
@@ -116,7 +116,7 @@ class CfgBuildingLoot {
 			{"specialclothes","specialclothes",0.01},
 			{"WeaponHolder_MeleeCrowbar","object",0.03},
 			{"ItemBriefcaseEmpty","magazine",0.01},
-			{ "shotgunsingleshot", "cfglootweapon", 0.05},
+			{ "shotgunsingleshot", "cfglootweapon", 0.05}
 		};
 		lootTypeSmall[] = {
 			{ "ItemSodaMdew","magazine",0.01 },
@@ -225,7 +225,7 @@ class CfgBuildingLoot {
 			{"ItemFishingPole","weapon",0.02},
 			{"ItemLightBulb","magazine",0.02},
 			{"ItemSledgeHandle","magazine",0.02},
-			{ "farmweapons", "cfglootweapon", 0.15},
+			{ "farmweapons", "cfglootweapon", 0.15}
 		};
 		lootTypeSmall[] = {
 			{ "","generic", 0.79},
@@ -366,17 +366,15 @@ class CfgBuildingLoot {
 			{ "machineguns", "cfglootweapon", 0.03 }
 		};
 		lootTypeSmall[] = {
-			{ "pistols","cfglootweapon",0.15 },
-			{ "Binocular","weapon",0.02 },
-			{ "ItemFlashlightRed","weapon",0.03 },
-			{ "ItemKnife","weapon",0.04 },
-			{ "ItemGPS","weapon",0.02 },
-			{ "ItemMap","weapon",0.02 },
-			{ "","medical",0.09 },
-			{ "","generic",0.34 },
-			{ "","military",0.26 },
-			{ "submachinegun","cfglootweapon",0.02 },
-			{ "ItemEtool","weapon",0.01 }
+			{ "pistols", "cfglootweapon", 0.14 },
+			{ "Binocular", "weapon", 0.05 },
+			{ "ItemFlashlightRed", "weapon", 0.03 },
+			{ "ItemKnife", "weapon", 0.04 },
+			{ "ItemGPS", "weapon", 0.02 },
+			{ "", "medical", 0.12 },
+			{ "", "generic", 0.22 },
+			{ "", "military", 0.35 },
+			{ "ItemEtool", "weapon", 0.03 }
 		};
 	};
 	class MilitaryIndustrial: Default {
@@ -412,16 +410,15 @@ class CfgBuildingLoot {
 			{ "machineguns", "cfglootweapon", 0.01 }
 		};
 		lootTypeSmall[] = {
-			{ "pistols","cfglootweapon",0.12 },
-			{ "Binocular","weapon",0.05 },
-			{ "ItemFlashlightRed","weapon",0.03 },
-			{ "ItemKnife","weapon",0.04 },
-			{ "ItemGPS","weapon",0.02 },
-			{ "","medical",0.02 },
-			{ "","generic",0.09 },
-			{ "","military",0.34 },
-			{ "submachinegun","cfglootweapon",0.26 },
-			{ "ItemEtool","weapon",0.03 }
+			{ "pistols", "cfglootweapon", 0.14 },
+			{ "Binocular", "weapon", 0.05 },
+			{ "ItemFlashlightRed", "weapon", 0.03 },
+			{ "ItemKnife", "weapon", 0.04 },
+			{ "ItemGPS", "weapon", 0.02 },
+			{ "", "medical", 0.12 },
+			{ "", "generic", 0.22 },
+			{ "", "military", 0.35 },
+			{ "ItemEtool", "weapon", 0.03 }
 		};
 	};
 	class IndustrialMilitary: Default {
@@ -462,15 +459,14 @@ class CfgBuildingLoot {
 			{ "machineguns", "cfglootweapon", 0.01 }
 		};
 		lootTypeSmall[] = {
-			{ "pistols", "cfglootweapon", 0.12 },
+			{ "pistols", "cfglootweapon", 0.14 },
 			{ "Binocular", "weapon", 0.05 },
 			{ "ItemFlashlightRed", "weapon", 0.03 },
 			{ "ItemKnife", "weapon", 0.04 },
 			{ "ItemGPS", "weapon", 0.02 },
-			{ "", "medical", 0.02 },
-			{ "", "generic", 0.09 },
-			{ "", "military", 0.34 },
-			{ "submachinegun", "cfglootweapon", 0.26 },
+			{ "", "medical", 0.12 },
+			{ "", "generic", 0.22 },
+			{ "", "military", 0.35 },
 			{ "ItemEtool", "weapon", 0.03 }
 		};
 	};
--- a/SQF/dayz_code/Configs/CfgLoot/CfgBuildingPos.hpp
+++ b/SQF/dayz_code/Configs/CfgLoot/CfgBuildingPos.hpp
@@ -307,8 +307,9 @@ class Land_A_Castle_Gate: Residential {
 	lootPos[] = {{0.244141,-4.48486,-3.14362},{-1.25293,2.98779,-3.07028},{4.50684,-3.31152,-2.94885},{4.55176,3.29834,-2.94858},{7.94824,1.4082,-2.91003}};
 }; // Qty: 3
 class Land_Mil_Barracks: Military {
-	lootPos[] = {};
-	lootPosZombie[] = {{9.02515,-0.694336,-1.16602},{9.01538,0.856445,-1.16602}};
+	lootPos[] = {{-0.891113,-3.48926,-1.51633},{-1.09204,2.88672,-1.51633},{-3.55591,3.42871,-1.51633},{-6.31299,3.7041,-1.51633},{-7.68262,-3.54102,-1.93634},{-5.11475,-2.09961,-1.93634},{0.24707,3.57324,-1.93634},{6.72217,-2.47949,-1.93634},{5.41602,3.99316,-1.93634},{-6.34912,3.90137,-0.726349},{-3.58691,2.8252,-0.726349},{-1.04224,3.39941,-0.726349},{-3.75195,-3.25977,-0.726349},{-0.864746,-3.88672,-0.726349},{-3.52563,-2.44824,-1.93634},{-6.06396,2.57422,-1.93634},{-0.935059,-4.05078,-1.93634},{-1.39502,3.89941,-1.93634}};
+	lootPosZombie[] = {{-2.15845,-3.12793,-1.06134},{2.13281,3.24316,-1.06134},{-6.20679,-0.125,-1.06134},{2.09521,-3.36719,-1.06134}};
+	lootPosSmall[] = {{-6.45703,2.03125,-1.79633},{-3.5127,1.98242,-1.79633},{-1.14746,1.9873,-1.79633},{-0.911621,-1.87598,-1.79633},{-3.81567,-1.90234,-1.79633},{-6.5249,-1.86426,-1.79633},{3.78979,-4.17773,-1.13635},{5.32861,-4.19043,-1.13635},{5.20923,-1.99805,-1.65634},{6.54175,-1.99707,-1.65634},{3.82324,-1.96582,-1.65634},{6.89209,2.93457,-1.84634},{6.98877,1.95215,-1.84634},{6.98291,2.23145,-1.46634},{7.00391,2.73438,-1.46634},{6.96729,3.01953,-1.08633},{6.94824,2.04785,-0.706329},{4.36768,3.13086,-0.396332},{3.86768,3.49316,-0.396332},{3.84521,3.49609,-1.86633},{4.33984,3.1748,-1.86633}};
 }; // Qty: 8
 class Land_Mil_Barracks_L: Military {
 	lootPos[] = {};
--- a/SQF/dayz_code/Configs/CfgMagazines.hpp
+++ b/SQF/dayz_code/Configs/CfgMagazines.hpp
@@ -1700,7 +1700,7 @@ class CfgMagazines {
 		{
 			class Crafting
 			{
-				text = $STR_EPOCH_PLAYER_269;
+				text = $STR_EPOCH_PLAYER_269b;
 				script = ";['Crafting','CfgMagazines', _id] spawn player_craftItem;";
 				neednearby[] = {"workshop"};
 				requiretools[] = {"ItemToolbox","ItemKnife"};
--- a/SQF/dayz_code/Configs/CfgMagazines/Skins.hpp
+++ b/SQF/dayz_code/Configs/CfgMagazines/Skins.hpp
@@ -155,6 +155,7 @@ class Skin_SurvivorWpink_DZ: SkinBase {
 	displayName = "Melly (female)";
 	descriptionShort = "Purple top with blue pants.";
 };
+/*
 class Skin_SurvivorWsequisha_DZ: SkinBase {
 	scope = 2;
 	displayName = "Maria (female)";
@@ -165,6 +166,7 @@ class Skin_SurvivorWsequishaD_DZ: SkinBase {
 	displayName = "Sequisha (female)";
 	descriptionShort = "Sequisha Clothes (female)";
 };
+*/
 class Skin_SurvivorWcombat_DZ: SkinBase {
 	scope = 2;
 	displayName = "Alejandria";
--- a/SQF/dayz_code/Configs/CfgVehicles/AIR/AH6.hpp
+++ b/SQF/dayz_code/Configs/CfgVehicles/AIR/AH6.hpp
@@ -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";
--- a/SQF/dayz_code/Configs/CfgVehicles/AIR/CH53.hpp
+++ b/SQF/dayz_code/Configs/CfgVehicles/AIR/CH53.hpp
@@ -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
--- a/SQF/dayz_code/Configs/CfgWeapons.hpp
+++ b/SQF/dayz_code/Configs/CfgWeapons.hpp
@@ -274,7 +274,7 @@ class CfgWeapons {
 	#include "CfgWeapons\Weapon\Sniper\KSVK.hpp"

 	#include "CfgWeapons\Weapon\Sniper\DMR_DZ.hpp"
-	#include "CfgWeapons\Weapon\Pistol\MakerovSD.hpp"
+	#include "CfgWeapons\Weapon\Pistol\MakarovSD.hpp"
 	#include "CfgWeapons\Weapon\LMG\m240_scoped.hpp"
 	#include "CfgWeapons\Weapon\LMG\M249_EP1.hpp"
 	#include "CfgWeapons\Weapon\LMG\M249_m145_EP1.hpp"
--- a/SQF/dayz_code/Configs/CfgWeapons/Melee/Crossbow.hpp
+++ b/SQF/dayz_code/Configs/CfgWeapons/Melee/Crossbow.hpp
@@ -1,7 +1,4 @@
 class Crossbow_DZ : Crossbow {
 	displayName = $STR_EQUIP_CROSSBOW;
-		magazines[] =
-		{
-			"WoodenArrow"
-		};
+		magazines[] ={"Quiver","WoodenArrow"};
 	};
--- a/SQF/dayz_code/Configs/CfgWeapons/Weapon/Pistol/MakarovSD.hpp
+++ b/SQF/dayz_code/Configs/CfgWeapons/Weapon/Pistol/MakarovSD.hpp
--- a/SQF/dayz_code/Configs/RscDisplay/RscPlayerUI.hpp
+++ b/SQF/dayz_code/Configs/RscDisplay/RscPlayerUI.hpp
@@ -119,6 +119,14 @@ class RscTitles
 		name = "statusBorder";
 		onLoad = "uiNamespace setVariable ['DAYZ_GUI_display', _this select 0];";
 		class ControlsBackground {
+			class RscStructuredText_1199: RscStructuredText
+			{
+				idc = 1199;
+				x = 0.250001;
+				y = 0.350001;
+				w = 0.5;
+				h = 0.1;
+			};
 			class RscPicture_1901: RscPictureGUI
 			{
 				idc = 1901;
--- a/SQF/dayz_code/Configs/cfgVehicles.hpp
+++ b/SQF/dayz_code/Configs/cfgVehicles.hpp
@@ -215,6 +215,8 @@ class CfgVehicles {
 	#include "CfgVehicles\AIR\UH1.hpp"
 	#include "CfgVehicles\AIR\AH6.hpp"
 	#include "CfgVehicles\AIR\C130.hpp"
+	#include "CfgVehicles\AIR\CH53.hpp"
+	

 	// LAND (Armed)
 	#include "CfgVehicles\LAND\HMMWV.hpp"
--- a/SQF/dayz_code/Configs/rscTitles.hpp
+++ b/SQF/dayz_code/Configs/rscTitles.hpp
@@ -181,7 +181,7 @@ class RscDisplayMain : RscStandardDisplay {
 		class CA_Version;
 		class DAYZ_Version : CA_Version {
 			idc = -1;
-			text = "1.0.5";
+			text = "1.0.5.2";
 			y = "(SafeZoneH + SafeZoneY) - (1 - 0.95)";
 		};
 		delete CA_TitleMainMenu;