Browse Source

Patch 3.26

Erliens 4 years ago
parent
commit
db81e2831e

+ 45 - 3
addons - Copy/RD501_Units/blufor/clones/config.cpp

@@ -424,7 +424,7 @@ class cfgWeapons
 		displayName = "[501st] INF ACC 03 (Sr. Corporal)";
 		picture = "\MRC\JLTS\characters\CloneArmor\data\ui\CloneVestHeavy_ui_ca.paa";
 		model = "\MRC\JLTS\characters\CloneArmor\CloneVestReconNCO.p3d";
-		hiddenSelections[] = {"Camo1"};
+		hiddenSelections[] = {"camo2"};
 		hiddenSelectionsTextures[] = {TEXTUREPATH\Republic\clones\Infantry\acc\sr_nco_acc.paa};
 		hiddenSelectionsMaterials[]=
         {
@@ -434,9 +434,51 @@ class cfgWeapons
 		{
 			uniformModel = "\MRC\JLTS\characters\CloneArmor\CloneVestReconNCO.p3d";
 			containerClass="Supply100";
-			hiddenSelectionsMaterials[]=
+			hiddenSelections[]=
 			{
-			
+				"camo2"
+			};
+		};
+	};
+	class macro_new_vest_class(501_inf,acc_3_b): macro_new_vest_class(501_inf,acc_9)
+	{
+		displayName = "[501st] INF ACC 03 Medic (Sr. Corporal)";
+		picture = "\MRC\JLTS\characters\CloneArmor\data\ui\CloneVestHeavy_ui_ca.paa";
+		model = "\MRC\JLTS\characters\CloneArmor\CloneVestReconNCO.p3d";
+		hiddenSelections[] = {"camo2"};
+		hiddenSelectionsTextures[] = {TEXTUREPATH\Republic\clones\Infantry\acc\inf_medic_nco.paa};
+		hiddenSelectionsMaterials[]=
+        {
+        
+        };
+		class ItemInfo: ItemInfo
+		{
+			uniformModel = "\MRC\JLTS\characters\CloneArmor\CloneVestReconNCO.p3d";
+			containerClass="Supply100";
+			hiddenSelections[]=
+			{
+				"camo2"
+			};
+		};
+	};
+	class macro_new_vest_class(501_inf,acc_3_c): macro_new_vest_class(501_inf,acc_9)
+	{
+		displayName = "[501st] INF ACC 03 RTO (Sr. Corporal)";
+		picture = "\MRC\JLTS\characters\CloneArmor\data\ui\CloneVestHeavy_ui_ca.paa";
+		model = "\MRC\JLTS\characters\CloneArmor\CloneVestReconNCO.p3d";
+		hiddenSelections[] = {"camo2"};
+		hiddenSelectionsTextures[] = {TEXTUREPATH\Republic\clones\Infantry\acc\inf_rto_nco.paa};
+		hiddenSelectionsMaterials[]=
+        {
+        
+        };
+		class ItemInfo: ItemInfo
+		{
+			uniformModel = "\MRC\JLTS\characters\CloneArmor\CloneVestReconNCO.p3d";
+			containerClass="Supply100";
+			hiddenSelections[]=
+			{
+				"camo2"
 			};
 		};
 	};

BIN
addons - Copy/RD501_Units/textures/Republic/clones/Infantry/acc/inf_medic_nco.paa


BIN
addons - Copy/RD501_Units/textures/Republic/clones/Infantry/acc/inf_rto_nco.paa


+ 1 - 4
addons - Copy/RD501_Vehicles/_init_functions/cis_aircraft_turrets.hpp

@@ -1,12 +1,9 @@
 
 //CIS_Air
-	class macro_new_vehicle(vulture,MKII) {
+	class macro_new_vehicle(cis,vulture) {
         class turret_script {
             init = [_this select 0,macro_single_quote(macro_new_vehicle(Praetorian_Variant,opfor)),[0,1.5,-.6]] spawn macro_fnc_name(apply_aircraft_turrets);
         };
-        class swop_init {
-        	init = "[_this select 0] execVM '\vulture\init.sqf';[_this select 0] execVM '\vulture\initturbine.sqf';";
-        };
     };
     
     class macro_new_vehicle(trifighter,MKII) {

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

@@ -2,6 +2,10 @@
 scope = 2;
 scopeCurator = 2;
 scopeArsenal = 2;
+stallSpeed=5;
+draconicTorqueYCoef[]={1.5,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
+draconicForceYCoef=6;
+envelope[] = {0.5,2.11,2.43,1.97,1.72,2.69,3.87,5.27,6.89,8.72,9.7,9.6,9.2,8.5,8.2,8};
 faction="RD501_Republic_Faction";
 editorSubcategory="RD501_Editor_Category_Air_Republic_vtol";
 weapons[]=

+ 46 - 2
addons - Copy/RD501_Vehicles/air/Vulture/config.cpp

@@ -26,7 +26,8 @@ class CfgPatches
 		requiredVersion=0.1;
 		units[]=
 		{
-			macro_new_vehicle(vulture,MKII)
+			macro_new_vehicle(cis,vulture),
+			macro_new_vehicle(cis,vulture_elite)
 		};
 		weapons[]=
 		{
@@ -40,7 +41,6 @@ class CfgPatches
 
 class CfgVehicles
 {
-	class Plane_Base_F;
 	class swop_vulture;
 
 	class macro_new_vehicle(vulture,MKII) : swop_vulture
@@ -101,4 +101,48 @@ class CfgVehicles
 		};
 		
 	};
+	class Plane;
+	class Plane_Base_F: Plane
+	{
+		class Components;
+	};
+	class Plane_Fighter_03_base_F: Plane_Base_F
+	{
+		class Components: Components{};
+	};
+	class Plane_Fighter_03_dynamicLoadout_base_F:Plane_Fighter_03_base_F
+	{
+		class Components: Components{};
+	};
+	class 3as_vulture_dynamicLoadout_base:Plane_Fighter_03_dynamicLoadout_base_F
+	{
+		class Components:Components{};
+	};
+	class 3as_Vulture_dynamicLoadout:3as_vulture_dynamicLoadout_base
+	{
+		class Components:Components{};
+	};
+	class macro_new_vehicle(cis,vulture_elite) : 3as_Vulture_dynamicLoadout
+	{
+		displayName="CIS Vulture Elite Droid"
+		maxSpeed=700;
+		airBrake=20;
+		faction = macro_cis_faction
+		editorSubcategory = macro_editor_cat_air(CIS)
+		vehicleClass = macro_editor_vehicle_type_air(CIS)
+	};
+	class macro_new_vehicle(cis,vulture) : 3as_Vulture_dynamicLoadout
+	{
+		displayName="CIS Vulture Droid"
+		maxSpeed=700;
+		airBrake=20;
+		faction = macro_cis_faction
+		editorSubcategory = macro_editor_cat_air(CIS)
+		vehicleClass = macro_editor_vehicle_type_air(CIS)
+		class Components: Components
+		{
+			class TransportPylonsComponent
+			{};
+		};
+	};
 };

+ 1 - 0
addons - Copy/RD501_Vehicles/air/Z95/config.cpp

@@ -61,6 +61,7 @@ class CfgVehicles
 		scopeCurator=2;
 		forceInGarage = 1;
 		side=1;
+		stallSpeed=5;
 		displayName = "Republic Z95 'Headhunter'"
 		author = "RD501"
 		faction = macro_republic_faction

+ 12 - 2
addons - Copy/RD501_Vehicles/air/drones/medical_drone_items.hpp

@@ -3,6 +3,11 @@ class _xx_ACE_tourniquet
     name = "ACE_tourniquet";
     count = 8;
 };
+class _xx_ACE_splint
+{
+    name = "ACE_splint";
+    count = 8;
+};
 class _xx_ACE_plasmaIV_250
 {
     name = "ACE_plasmaIV_250";
@@ -36,7 +41,7 @@ class _xx_ACE_packingBandage
 class _xx_ACE_morphine
 {
     name = "ACE_morphine";
-    count = 15;
+    count = 10;
 };									
 class _xx_ACE_epinephrine
 {
@@ -47,4 +52,9 @@ class _xx_SmokeShellPurple
 {
     name = "SmokeShellPurple";
     count = 5;
-};
+};
+class _xx_ACE_painkiller
+{
+    name = "RD501_Painkiller";
+    count = 10;
+};	

+ 1 - 1
addons - Copy/RD501_Vehicles/land/AAT/common.hpp

@@ -2,7 +2,7 @@
 		side=0;
 		scopeCurator=2;
 		forceInGarage = 1;
-		armor=150
+		armor=300;
 
 		crew=macro_new_unit_class(opfor,B1_crew)
 		

+ 1 - 0
addons - Copy/RD501_Vehicles/land/ADSD/config.cpp

@@ -67,6 +67,7 @@ class CfgVehicles
         scope = 2;
         scopeCurator = 2;
         forceInGarage = 1;
+		armor=1300;
 		class Turrets: Turrets
 		{
 			class MainTurret: MainTurret

+ 2 - 2
addons - Copy/RD501_Vehicles/land/GAT/config.cpp

@@ -56,7 +56,7 @@ class CfgVehicles
 	class macro_new_vehicle(cis,gat):3AS_GAT_base_F
 	{
 		scope=2;
-		armor = 1000;
+		armor = 2000;
 		displayName = "CIS GAT"
 		crew = macro_new_unit_class(opfor,B1_crew)
         side = 0;
@@ -143,7 +143,7 @@ class CfgVehicles
 	class macro_new_vehicle(cis,gat_aa):3AS_GAT_Light_Base
 	{
 		scope=2;
-		armor = 1000;
+		armor = 1500;
 		displayName = "CIS GAT AA"
 		crew = macro_new_unit_class(opfor,B1_crew)
         side = 0;

+ 1 - 0
addons - Copy/RD501_Vehicles/land/MTT/config.cpp

@@ -49,6 +49,7 @@ class CfgVehicles
 		scope = 2;
 		side=0;
 		scopeCurator=2;
+		armor=4000;
 
 		faction = macro_cis_faction
 		editorSubcategory = macro_editor_cat(tank)

+ 4 - 2
addons - Copy/RD501_Vehicles/land/dwarf_spider_droid/config.cpp

@@ -82,7 +82,8 @@ class CfgVehicles
 		faction = macro_cis_faction;
 		editorSubcategory = macro_editor_cat(heavy_armored_infantry);
 		vehicleClass = macro_editor_vehicle_type(heavy_armored_infantry);
-
+		ace_dragging_canCarry = 0;
+		ace_dragging_canDrag = 0;
 		armor = 35;
 		armorStructural = 1.0;
 		explosionShielding	= 0.1;
@@ -128,7 +129,8 @@ class CfgVehicles
 		minTotalDamageThreshold	= 0.01;
 		impactDamageMultiplier = 0.1;
 		class EventHandlers: DefaultEventhandlers {}; 
-
+		ace_dragging_canCarry = 0;
+		ace_dragging_canDrag = 0;
 		faction = macro_cis_faction;
 		editorSubcategory = macro_editor_cat(heavy_armored_infantry);
 		vehicleClass = macro_editor_vehicle_type(heavy_armored_infantry);

+ 2 - 2
addons - Copy/RD501_Vehicles/land/static_cis/config.cpp

@@ -156,7 +156,7 @@ class CfgVehicles
 			{};
 		};
 	};
-	class macro_new_vehicle(mortar,cis):3AS_Republic_Mortar
+	/*class macro_new_vehicle(mortar,cis):3AS_Republic_Mortar
 	{
 		author = "RD501";
 		scope = 2;
@@ -167,5 +167,5 @@ class CfgVehicles
 		faction = macro_cis_faction
 		editorSubcategory = macro_editor_cat(turrets)
 		vehicleClass = macro_editor_vehicle_type(turrets)
-	}
+	}*/
 };

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

@@ -29,6 +29,7 @@ class CfgWeapons
 		displayName="Republic RPS4 Launcher";
 		icon = "\RD501_Weapons\Launchers\RPS6\icon.paa";
 		picture = "\RD501_Weapons\Launchers\RPS6\icon.paa";
+		weaponInfoType="RscOpticsRangeFinderNLAW";
 		JLTS_hasElectronics=0;
 		recoil="";
 		hiddenSelections[]=