Erliens hace 2 años
padre
commit
0435d1e5eb

+ 4 - 4
addons - Copy/RD501_Droids/config.cpp

@@ -309,7 +309,7 @@ class CfgGroups
 						position[]={.5,-.5,0};
 						rank="CORPORAL";
 						side=0;
-						vehicle=macro_new_unit_class(opfor,B2_droid_Standard);
+						vehicle=macro_new_unit_class(opfor,B2_droid_Super);
 					};
 					class Unit2
 					{
@@ -667,7 +667,7 @@ class CfgGroups
 						position[]={-.5,-.5,0};
 						rank="CORPORAL";
 						side=0;
-						vehicle=macro_new_unit_class(opfor,B2_droid_Standard);
+						vehicle=macro_new_unit_class(opfor,B2_droid_Super);
 					};
 					class Unit3
 					{
@@ -726,7 +726,7 @@ class CfgGroups
 						position[]={1,-1,0};
 						rank="CORPORAL";
 						side=0;
-						vehicle=macro_new_unit_class(opfor,B2_droid_Standard);
+						vehicle=macro_new_unit_class(opfor,B2_droid_Super);
 					};
 					class Unit4
 					{
@@ -1502,7 +1502,7 @@ class CfgGroups
 						position[]={1,-1,0};
 						rank="PRIVATE";
 						side=0;
-						vehicle=macro_new_unit_class(opfor,B2_droid_Standard);
+						vehicle=macro_new_unit_class(opfor,B2_droid_Super);
 					};
 				};
 				class macro_new_composition(opfor,light_assault_team)

+ 6 - 0
addons - Copy/RD501_Main/functions/AutoCrate/autocrate.sqf

@@ -1,6 +1,12 @@
 params ["_this"]; 
  
 ["rd501_resuppy_box_small_medical", _this, true] call ace_cargo_fnc_loadItem; 
+["rd501_resuppy_box_small_medical", _this, true] call ace_cargo_fnc_loadItem; 
+["rd501_resuppy_box_small_medical", _this, true] call ace_cargo_fnc_loadItem; 
+["rd501_resuppy_box_small_medical", _this, true] call ace_cargo_fnc_loadItem; 
+["rd501_resuppy_box_small_ammo", _this, true] call ace_cargo_fnc_loadItem;  
+["rd501_resuppy_box_small_ammo", _this, true] call ace_cargo_fnc_loadItem;  
+["rd501_resuppy_box_small_ammo", _this, true] call ace_cargo_fnc_loadItem;  
 ["rd501_resuppy_box_small_ammo", _this, true] call ace_cargo_fnc_loadItem;  
 ["rd501_stat_reweb", _this, true] call ace_cargo_fnc_loadItem;
 ["rd501_stat_Striker", _this, true] call ace_cargo_fnc_loadItem;

+ 1 - 0
addons - Copy/RD501_Vehicle_Weapons/_ammo/config.cpp

@@ -530,6 +530,7 @@ class CfgAmmo
 		caliber = 1;
 		explosive = 0.6;
 		model="RD501_Vehicle_Weapons\_ammo\data\laser_small_green.p3d"
+		tracerScale=2;
 	};
 	class macro_new_ammo(generic_aircraft_laser_gun_praetorian) : macro_new_ammo(generic_aircraft_laser_gun_red)
 	{

+ 8 - 0
addons - Copy/RD501_Vehicle_Weapons/_mags/config.cpp

@@ -286,6 +286,14 @@ class CfgMagazines
 		displayNameShort = "Zephyr A2A";
 		tracersEvery=1;
 	};
+	class macro_new_mag(a2a,2) : 4Rnd_AAA_missiles //RD501_4Rnd_A2AM_Mag
+	{
+		ammo = macro_new_ammo(a2a)
+		count = 2;
+		displayName = "Evil Zephyr A2A";
+		displayNameShort = "Evil Zephyr A2A";
+		tracersEvery=1;
+	};
 
 	class macro_new_mag(agm,6) : PylonRack_12Rnd_PG_missiles//6Rnd_Missile_AGM_02_F
 	{

+ 1 - 1
addons - Copy/RD501_Vehicle_Weapons/aircraft/generic/aircraft_laser_gun.hpp

@@ -6,7 +6,7 @@
 		//magazines[] = {"10000Rnd_RD501_RED_AircraftGun_Mag"};
 		modes[] = {"LowROF"};
 		canLock=0;
-		ballisticsComputer=4;
+		ballisticsComputer=1;
 		weaponLockSystem = 0;//changed
 		
 		magazines[] = {macro_new_mag(generic_aircraft_gun,1000)};

+ 10 - 0
addons - Copy/RD501_Vehicle_Weapons/misc/missiles/config.cpp

@@ -44,6 +44,16 @@ class CfgWeapons
 		lockedTargetSound[] = {"TIE\LockedOn_2.ogg",0.7,1};
 		lockingTargetSound[] = {"TIE\Locking_Beep1.ogg",1,1};
 	};
+	class macro_new_weapon(wynd,a2a_vulture) : missiles_ASRAAM
+	{
+		displayName = "Zephyr (AA)";
+		displayNameShort = "Zephyr";
+		magazines[] = {macro_new_mag(a2a,2)};
+		soundFly[] = {"\xt\SWrocketloop.ogg",3,1,800};
+		lockedTargetSound[] = {"TIE\LockedOn_2.ogg",0.7,1};
+		lockingTargetSound[] = {"TIE\Locking_Beep1.ogg",1,1};
+		magazineReloadTime=15;
+	};
 	class macro_new_weapon(wynd,agm) : missiles_DAGR
 	{
 		displayName = "Torrent (AGM)";

+ 15 - 0
addons - Copy/RD501_Vehicles/air/ARC_170X/arc170_common.hpp

@@ -35,6 +35,21 @@ class Turrets: Turrets
 	class LaserPilot:LaserPilot{};
 	class Reargun:Reargun{};
 };
+class ACE_SelfActions
+		{
+			class ACE_Passengers
+			{
+				condition = "alive _target";
+				displayName = "Passengers";
+				insertChildren = "_this call ace_interaction_fnc_addPassengersActions";
+				statement = "";
+			};
+			#include "../../common/universal_hud_color_changer.hpp"
+		};
+class ViewPilot: ViewPilot
+{
+	initAngleX = 0;
+};
 class Components: Components
 {
 	class TransportPylonsComponent

+ 4 - 0
addons - Copy/RD501_Vehicles/air/ARC_170X/arc170_inheritance.hpp

@@ -15,6 +15,7 @@
 	};
 	class Plane_Fighter_03_base_F: Plane_Base_F
 	{
+		class ViewPilot;
 		class Turrets
 		{
 			class MainTurret;
@@ -22,6 +23,7 @@
 	};
 	class Plane_Fighter_03_dynamicLoadout_base_F: Plane_Fighter_03_base_F
 	{
+		class ViewPilot: ViewPilot{};
 		class Turrets: Turrets
 		{
 			class MainTurret: MainTurret
@@ -39,6 +41,7 @@
 	};
 class 3as_arc_170_base:Plane_Fighter_03_dynamicLoadout_base_F
 {
+	class ViewPilot: ViewPilot{};
 	class Turrets: Turrets
 	{
 		class LaserPilot:NewTurret{};
@@ -58,6 +61,7 @@ class NewTurret;
 class 3as_arc_170_blue: 3as_arc_170_base
 {
 	class Components;
+	class ViewPilot: ViewPilot{};
 	class Turrets: Turrets
 	{
 		class LaserPilot:LaserPilot{};

+ 7 - 0
addons - Copy/RD501_Vehicles/air/NuClass/config.cpp

@@ -29,10 +29,12 @@ class CfgVehicles
 	class 3as_nuclass_base;
 	class 3as_nuclass_f: 3as_nuclass_base
 	{
+		class ViewPilot;
 		class UserActions;
 	};
 	class 3AS_Nuclass : 3as_nuclass_f
 	{
+		class ViewPilot: ViewPilot{};
 		class UserActions: UserActions
 		{
 			class rampOpen;
@@ -136,6 +138,11 @@ class CfgVehicles
 				insertChildren = "_this call ace_interaction_fnc_addPassengersActions";
 				statement = "";
 			};
+			#include "../../common/universal_hud_color_changer.hpp"
+		};
+		class ViewPilot: ViewPilot
+		{	
+			initAngleX = 0;
 		};
 		class TransportWeapons
 		{

+ 15 - 0
addons - Copy/RD501_Vehicles/air/Vulture/config.cpp

@@ -103,6 +103,21 @@ class CfgVehicles
 		editorSubcategory = macro_editor_cat_air(CIS)
 		vehicleClass = macro_editor_vehicle_type_air(CIS)
 		radarTargetSize = 0.7;
+		weapons[]={
+			macro_new_weapon(generic,aircraft_laser),
+			macro_new_weapon(wynd,a2a_vulture)
+		};
+		magazines[]={
+			macro_new_mag(generic_aircraft_gun,1000),
+			macro_new_mag(generic_aircraft_gun,1000),
+			macro_new_mag(a2a,2),
+			macro_new_mag(a2a,2)
+		};
+		class Components: Components
+		{
+			class TransportPylonsComponent
+			{};
+		};
 		class HitPoints: HitPoints
 		{
 			class HitHull: HitHull

+ 2 - 2
addons - Copy/RD501_Vehicles/common/universal_mfd.hpp

@@ -17,7 +17,8 @@ class MFD//color[]={"user0","user1","user2"}; alpha = "user3"
 		{
 			type = "vector";
 			pos0[] = {0.5,0.5};
-			pos10[] = {1.225,1.1};
+			pos10[] = {0.5,0.5};
+			//pos10[] = {1.225,1.1};
 		};
 		topLeft = "HUD LH";
 		topRight = "HUD PH";
@@ -27,7 +28,6 @@ class MFD//color[]={"user0","user1","user2"}; alpha = "user3"
 		borderTop = 0;
 		borderBottom = 0;
 		color[]={"user0","user1","user2"};//color[] = {0.082, 0.408, 0.039, 1};
-		//yikes
 		class Bones
 		{
 			class ThrustVectoringRotation

+ 2 - 1
addons - Copy/RD501_Weapons/Launchers/RPS4/config.cpp

@@ -44,7 +44,8 @@ class CfgWeapons
 		{
 			macro_new_mag(rps4heat,1),
 			macro_new_mag(rps4he,1),
-			macro_new_mag(rps4burst,1)
+			macro_new_mag(rps4burst,1),
+			macro_new_mag(rps4emp,1)
 		};
 	};
 };

+ 8 - 0
addons - Copy/RD501_Weapons/_ammo/config.cpp

@@ -594,6 +594,14 @@ class CfgAmmo
 		hit=150;
 		submunitionAmmo="ammo_Penetrator_Titan_AT";
 	};
+	class macro_new_ammo(rps4emp):R_PG32V_F
+	{
+		hit=1;
+		submunitionAmmo="";
+		submunitionDirectionType="";
+		CraterEffects="";
+		explosionEffects="JLTS_fx_exp_EMP";
+	};
 	class macro_new_ammo(rps4burst):R_PG32V_F
 	{
 		triggerTime  = 1;

+ 2 - 2
addons - Copy/RD501_Weapons/_mag/config.cpp

@@ -512,7 +512,7 @@ class CfgMagazines
 		displayName="RPS4 Smoke Cluster Rocket";
 		descriptionShort="Burst Rocket";
 		count=1;
-		scope=1;
+		scope=2;
 		ammo = macro_new_ammo(rps4burst);
 	};
 	class macro_new_mag(rps4emp,1): RPG32_F
@@ -520,7 +520,7 @@ class CfgMagazines
 		author="RD501";
 		displayName="RPS4 EMP Rocket";
 		descriptionShort="EMP Rocket";
-		ammo=macro_new_ammo(rps4heat)
+		ammo=macro_new_ammo(rps4emp)
 	};
 	////////////////////////////////////////////////////
 	/////////////Shotgun  Magazines/////////////////////