Ver Fonte

Revert "Revert "Aviation related changes""

This reverts commit 1a5b7a98a915de6e9aaa8c1d181d883834a45e39.
Zatama há 6 anos atrás
pai
commit
428d5790ff

+ 10 - 2
Scripts/scripts/zeus3denScripts/played_based/Items/Resupply_boxes.sqf

@@ -3,6 +3,8 @@
 large_ammo=
 	{
 	params["_vic"];
+	_vic  allowDamage false;
+	_vic addEventHandler ["HandleDamage", {0}];
 	_vic  addAction ["<t color='#47FF1A'>Unlock</t>",                
     {
     box = _this select 0;
@@ -15,6 +17,8 @@ large_ammo=
 small_ammo=
 	{
 	params["_vic"];
+	_vic  allowDamage false;
+	_vic addEventHandler ["HandleDamage", {0}];
 	_vic  addAction ["<t color='#47FF1A'>Unlock</t>",                
     {
     box = _this select 0;
@@ -26,7 +30,9 @@ small_ammo=
 	
 Large_Medical=
 	{
-		params["_vic"];
+	params["_vic"];
+	_vic  allowDamage false;
+	_vic addEventHandler ["HandleDamage", {0}];
 	_vic  addAction ["<t color='#47FF1A'>Unlock</t>",                
     {
     box = _this select 0;
@@ -38,7 +44,9 @@ Large_Medical=
 
 small_Medical=
 	{
-			params["_vic"];
+	params["_vic"];
+	_vic  allowDamage false;
+	_vic addEventHandler ["HandleDamage", {0}];
 	_vic  addAction ["<t color='#47FF1A'>Unlock</t>",                
     {
     box = _this select 0;

+ 4 - 1
Scripts/scripts/zeus3denScripts/played_based/Items/boxes/Large_ammo.sqf

@@ -39,4 +39,7 @@
 	_vic addMagazineCargoGlobal ["3Rnd_SmokeOrange_Grenade_shell", 20];
 	_vic addMagazineCargoGlobal ["ACE_HuntIR_M203", 20];
 	_vic addMagazineCargoGlobal ["SWOP_DC17Pistol_Mag", 25]; 
-	_vic addMagazineCargoGlobal ["DCStun_DC17_Mag" , 20];
+	_vic addMagazineCargoGlobal ["DCStun_DC17_Mag" , 20];
+	_vic addMagazineCargoGlobal ["SWOP_WESTARM5_MAG", 50];
+	_vic addMagazineCargoGlobal ["SWOP_Westar35Pistol_Mag", 50];
+	

+ 2 - 0
Scripts/scripts/zeus3denScripts/played_based/Items/boxes/Small_ammo.sqf

@@ -42,4 +42,6 @@
 	_vic addMagazineCargoGlobal ["ACE_HuntIR_M203", 10];
 	_vic addMagazineCargoGlobal ["SWOP_DC17Pistol_Mag", 15]; 
 	_vic addMagazineCargoGlobal ["DCStun_DC17_Mag" , 15];
+	_vic addMagazineCargoGlobal ["SWOP_WESTARM5_MAG", 10];
+	_vic addMagazineCargoGlobal ["SWOP_Westar35Pistol_Mag", 15];
 	ACE_maxWeightCarry = 20000;	

+ 3 - 3
Scripts/scripts/zeus3denScripts/vehicle_based/vehicle_variants/air_based/LAAT/laatClaymore.sqf

@@ -62,13 +62,13 @@ claymoreI={
 		
 */
 	// function as file add the wing tip smoke for laat
-	_vic  addAction ["<t color='#886688'>Smoker--------U13</t>",
+/*	_vic  addAction ["<t color='#886688'>Smoker--------U13</t>",
 	{
 		[_this select 0] execVM (laatSmokeQuick);
 	}
 	,[1],0,false,true,"User13"," driver  _target == _this"];
 
-
+*/
 	comment "gets health";
 	_vic   addAction ["<t color='#00FF00'>Damage Report</t>",
 	{
@@ -167,7 +167,7 @@ claymoreI={
 						_namLaatFireObj=_namLaatFireObj+[_fire];
 					};//makes two fires or watever much, and then stores them in the array while also randomly palcing on laat
 					
-					sleep 20;
+					sleep 60;
 					_namUnitSpawn allowDamage true;	
 					_namUnitSpawn removeAllEventHandlers "HandleDamage";
 					

+ 2 - 2
Scripts/scripts/zeus3denScripts/vehicle_based/vehicle_variants/air_based/YWING/ywingScylla.sqf

@@ -61,11 +61,11 @@ scylla={
 //	else {};
 */
 	
-	// function as file
+/*	// function as file
 	_vic  addAction ["<t color='#886688'>Smoker--------U13</t>",
 	{[_this select 0] execVM (ywingSmokeQuick);}
 	,[1],0,false,true,"User13"," driver  _target == _this"];
-	
+*/	
 
 	comment "gets health";
 	_vic   addAction ["<t color='#00FF00'>Damage Report</t>",

+ 2 - 2
Scripts/scripts/zeus3denScripts/vehicle_based/vehicle_variants/air_based/arc170/arcXiphos.sqf

@@ -56,13 +56,13 @@ xiphosI={
 //	else {};
 */	
 	// function as file
-	_vic  addAction ["<t color='#886688'>Smoker--------U13</t>",
+/*	_vic  addAction ["<t color='#886688'>Smoker--------U13</t>",
 	{
 
 		[_this select 0] execVM (arc170SmokeQuick);
 	}
 	,[1],0,false,true,"User13"," driver  _target == _this"];
-	
+*/	
 
 
 	comment "gets health";

+ 1 - 1
Scripts/scripts/zeus3denScripts/vehicle_based/vehicle_variants/air_based/arc170/removeEject.sqf

@@ -1,4 +1,4 @@
-
+/*
 	params["_vic"];