Erliens 3 سال پیش
والد
کامیت
ce7dad0dbf

+ 4 - 2
addons - Copy/RD501_Droids/B1/b1_common.hpp

@@ -10,7 +10,8 @@ linkeditems[]=
 	"ItemMap",
 	"ItemCompass",
 	"ItemWatch",
-	"JLTS_droid_comlink"
+	"JLTS_droid_comlink",
+	"JLTS_NVG_droid_chip_1"
 };
 respawnlinkeditems[]=
 {
@@ -18,7 +19,8 @@ respawnlinkeditems[]=
 	"ItemMap",
 	"ItemCompass",
 	"ItemWatch",
-	"JLTS_droid_comlink"
+	"JLTS_droid_comlink",
+	"JLTS_NVG_droid_chip_1"
 };
 
 class HitPoints

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

@@ -68,7 +68,8 @@ class CfgVehicles
 			"ItemMap",
 			"ItemCompass",
 			"ItemWatch",
-			"JLTS_droid_comlink"
+			"JLTS_droid_comlink",
+			"JLTS_NVG_droid_chip_1"
 		};
 		respawnlinkeditems[]=
 		{
@@ -76,7 +77,8 @@ class CfgVehicles
 			"ItemMap",
 			"ItemCompass",
 			"ItemWatch",
-			"JLTS_droid_comlink"
+			"JLTS_droid_comlink",
+			"JLTS_NVG_droid_chip_1"
 		};
 		items[]={
 			_3(macro_zip_tie)

+ 1 - 1
addons - Copy/RD501_Helmets/infantry/config.cpp

@@ -121,7 +121,6 @@ class CfgWeapons
 	NEW_501_Inf_Helm_JLTS(Oktapius,Oktapius,Oktapius.paa)
 	NEW_501_Inf_Helm_JLTS(Flux,Flux,Flux.paa)
 	NEW_501_Inf_Helm_JLTS(Goddest,Goddest,Goddest.paa)
-	NEW_501_Inf_Helm_JLTS(Odd,Odd,Odd.paa)
 	NEW_501_Inf_Helm_JLTS(Dusty,Dusty,Dusty.paa)
 	NEW_501_Inf_Helm_JLTS(Chaser,Chaser,Chaser.paa)
 	NEW_501_Inf_Helm_JLTS(Parrot,Parrot,Parrot.paa)
@@ -180,4 +179,5 @@ class CfgWeapons
 	NEW_501_ARC_Helm_JLTS(Darkstar,Darkstar,Darkstar.paa)
 	NEW_501_ARC_Helm_JLTS(Train,Train,Train.paa)
 	NEW_501_ARC_Helm_JLTS(Hook,Hook,Hook.paa)
+	NEW_501_ARC_Helm_JLTS(Odd,Odd,Odd.paa)
 };

BIN
addons - Copy/RD501_Markers/ui/markers/logo/rd501_marker_avalanche_2_logo.paa


+ 2 - 2
addons - Copy/RD501_Units/opfor/B2/config.cpp

@@ -232,7 +232,7 @@ class CfgVehicles
 				depends="(((Total - 0.25) max 0) + ((HitHead - 0.25) max 0) + ((HitBody - 0.25) max 0)) * 2";
 			};
 		};
-		armor=30;
+		armor=15;
 		armorStructural=1;
 		explosionShielding=0.40000001;
 		uniformClass=macro_new_uniform_class(opfor,B2_Armor)
@@ -255,7 +255,7 @@ class CfgVehicles
 	class macro_new_unit_class(opfor,B2_droid_Super) : macro_new_unit_class(opfor,B2_droid_Standard)
 	{
 		displayname = "Super B2";
-		armor=45;
+		armor=30;
 		armorStructural=1;
 		uniformClass=macro_new_uniform_class(opfor,B2_SuperArmor)
 		hiddenSelections[]=

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

@@ -99,33 +99,4 @@ class Components: Components
 			};
 		};
 	};
-};
-class Turrets: Turrets
-{
-	class LaserPilot: LaserPilot
-	{
-		weapons[]=
-		{
-			//macro_basic_air_weapons,
-			//macro_new_weapon(generic,republic_aircraft_cannon)
-		};
-		magazines[]=
-		{
-			//macro_basic_air_mags,
-			//macro_new_mag(generic_aircraft_cannon_green,1000)
-		};
-	};
-	class Reargun: Reargun
-	{
-		weapons[]=
-		{
-			macro_basic_air_weapons,
-			macro_new_weapon(generic,republic_aircraft_cannon)
-		};
-		magazines[]=
-		{
-			macro_basic_air_mags,
-			macro_new_mag(generic_aircraft_cannon_green,1000)
-		};
-	};
 };

+ 10 - 10
addons - Copy/RD501_Vehicles/air/ARC_170X/arc170_inheritance.hpp

@@ -9,45 +9,45 @@ class 3as_arc_170_razor: 3as_arc_170_base
 		class Reargun;
 	};
 };
-class 3as_arc_170_blue: 3as_arc_170_base
+class 3as_arc_170_blue: 3as_arc_170_razor
 {
-	class Components;
+	class Components:Components{};
 	class Turrets: Turrets
 	{
 		class LaserPilot;
 		class Reargun;
 	};
 };
-class 3as_arc_170_green: 3as_arc_170_base
+class 3as_arc_170_green: 3as_arc_170_razor
 {
-	class Components;
+	class Components:Components{};
 	class Turrets: Turrets
 	{
 		class LaserPilot;
 		class Reargun;
 	};
 };
-class 3as_arc_170_Orange: 3as_arc_170_base
+class 3as_arc_170_Orange: 3as_arc_170_razor
 {
-	class Components;
+	class Components:Components{};
 	class Turrets: Turrets
 	{
 		class LaserPilot;
 		class Reargun;
 	};
 };
-class 3as_arc_170_yellow: 3as_arc_170_base
+class 3as_arc_170_yellow: 3as_arc_170_razor
 {
-	class Components;
+	class Components:Components{};
 	class Turrets: Turrets
 	{
 		class LaserPilot;
 		class Reargun;
 	};
 };
-class 3as_arc_170_red: 3as_arc_170_base
+class 3as_arc_170_red: 3as_arc_170_razor
 {
-	class Components;
+	class Components:Components{};
 	class Turrets: Turrets
 	{
 		class LaserPilot;

+ 18 - 1
addons - Copy/RD501_Vehicles/air/LAAT/common_stuff_tcw.hpp

@@ -55,7 +55,24 @@ class pilotCamera
 	pilotOpticsShowCursor=1;
 	controllable=1;
 };
-
+class ViewPilot
+	{
+		initAngleX = 0;
+		minAngleX = -55;
+		maxAngleX = 85;
+		initAngleY = 0;
+		minAngleY = -150;
+		maxAngleY = 150;
+		minFov = 0.25;
+		maxFov = 1.25;
+		initFov = 0.75;
+		minMoveX = -100;
+		maxMoveX = 100;
+		minMoveY = 0;
+		maxMoveY = 0;
+		minMoveZ = 0;
+		maxMoveZ = 0;
+	};
 //transport
 class TransportWeapons
 {

+ 1 - 1
addons - Copy/RD501_Vehicles/common/smallvehiclekit.hpp

@@ -30,7 +30,7 @@ class TransportWeapons
 	{
 	class _transport_dc15a
 		{
-			weapon = macro_new_weapon(DC,r15a)
+			weapon = macro_new_weapon(DC,15a)
 			count = 3;
 		};
 	class _transport_dc15c

+ 0 - 7
addons - Copy/RD501_Vehicles/land/AAT/aat_templates.hpp

@@ -60,8 +60,6 @@ class Turrets : Turrets {\
 		class Turrets : Turrets {\
 			/*Commanders guns,the side ones*/\
 			class CommanderOptics:CommanderOptics {\
-				weapons[] = {"Cannon_ITTLaser"};\
-				magazines[] = {"10000Rnd_ITTLaser_Cannon_Minigun","10000Rnd_ITTLaser_Cannon_Minigun"};\
 				AAT_WEAPON_ROTATION;\
 			};\
 		};\
@@ -96,11 +94,6 @@ class Turrets : Turrets {\
 	class MainTurret : MainTurret {\
 		class Turrets : Turrets {\
 			class CommanderOptics : CommanderOptics {\
-				maxHorizontalRotSpeed = .1;/*1.8*/\
-				maxVerticalRotSpeed = .1;/*1.8*/\
-				AAT_WEAPON_ROTATION;\
-				weapons[] = {"Cannon_AAT_mc","Cannon_ATST"};\
-				magazines[] = {"1000Rnd_Laser_Cannon_Minigun","1000Rnd_Laser_Cannon_Minigun","100Rnd_Laser_Cannon_AAT_m", "100Rnd_Laser_Cannon_AAT_m", "100Rnd_Laser_Cannon_AAT_m"};\
 			};\
 		};\
 		maxHorizontalRotSpeed = 1.2/3;\

+ 6 - 6
addons - Copy/RD501_Vehicles/land/droideka/config.cpp

@@ -38,7 +38,7 @@ class CfgVehicles
 	class SWOP_Droideka;
 
 	// REMOVE FROM HERE
-	class macro_new_vehicle(droideka,base_depr) :SWOP_Droideka
+	/*class macro_new_vehicle(droideka,base_depr) :SWOP_Droideka
 	{
 		scope=2;
 		armor = 275;
@@ -91,7 +91,7 @@ class CfgVehicles
 		hiddenSelections[] = {"Camo1"};
 		hiddenSelectionsTextures[] = {"SW_CloneWarsWeapons\Droideka\DroidikaOK_co.paa"};
 
-	};
+	};*/
 	// REMOVE TO HERE
 
 
@@ -100,7 +100,7 @@ class CfgVehicles
 	class macro_new_vehicle(droideka,base): SWOP_Droideka
 	{
 		scope=2;
-		displayName = "Static Droideka (new)";
+		displayName = "Static Droideka";
 		class EventHandlers: DefaultEventhandlers {}; 
 
 		faction = macro_cis_faction;
@@ -132,17 +132,17 @@ class CfgVehicles
 
 	class macro_new_vehicle(droideka,normal): macro_new_vehicle(droideka,base)
 	{
-		displayName = "Moveable Droideka (new)";
+		displayName = "Moveable Droideka)";
 		hiddenSelectionsTextures[] = {"SW_CloneWarsWeapons\Droideka\DroidikaOK_co.paa"};
 	};
 	class macro_new_vehicle(droideka,camo): macro_new_vehicle(droideka,normal)
 	{
-		displayName = "Moveable Droideka  (new)(Camo)";
+		displayName = "Moveable Droideka(Camo)";
 		hiddenSelectionsTextures[] = {"SW_CloneWarsWeapons\Droideka\DroidikacamoOK_co.paa"};
 	};
 	class macro_new_vehicle(droideka,support): macro_new_vehicle(droideka,normal)
 	{
-		displayName = "Moveable Droideka  (new)(Support)";
+		displayName = "Moveable Droideka(Support)";
 		hiddenSelectionsTextures[] = {"SW_CloneWarsWeapons\Droideka\DroidikasupportOK_co.paa"};
 	};
 

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

@@ -39,7 +39,7 @@ class CfgVehicles
 	};
 
 	// REMOVE FROM HERE
-	class macro_new_vehicle(dwarf_spider_droid,MkII_depr): SpiderDSD
+	/*class macro_new_vehicle(dwarf_spider_droid,MkII_depr): SpiderDSD
 	{
 		displayName = "Dwarf Spider Droid MkII";
 		armor = 350;
@@ -72,13 +72,13 @@ class CfgVehicles
 	{
 		displayName = "Dwarf Spider Droid MkII (Moveable)";
 		forceInGarage = 0;
-	};
+	};*/
 	// REMOVE TO HERE
 
 
 	class macro_new_vehicle(dwarf_spider_droid,MkII): SpiderDSD
 	{
-		displayName = "Dwarf Spider Droid MkII (new)";
+		displayName = "Dwarf Spider Droid MkII";
 		scope = 2;
 		forceInGarage = 1;
 
@@ -113,7 +113,7 @@ class CfgVehicles
 
 	class macro_new_vehicle(dwarf_spider_droid,Movable_MkII): macro_new_vehicle(dwarf_spider_droid,MkII)
 	{
-		displayName = "Dwarf Spider Droid MkII (new) (Moveable)";
+		displayName = "Dwarf Spider Droid MkII (Moveable)";
 		forceInGarage = 0;
 	};
 };	

+ 2 - 2
addons - Copy/RD501_Weapons/Launchers/RPS1/config.cpp

@@ -60,8 +60,8 @@ class macro_new_weapon(launcher,rps1_u) : macro_new_weapon(launcher,rps1)
 		icon = "\RD501_Weapons\Launchers\RPS1\rps_disposable_icon.paa";
 		picture = "\RD501_Weapons\Launchers\RPS1\rps_disposable_icon.paa";
 		baseWeapon = macro_new_weapon(launcher,rps1_u)
-
-		magazines[] = { "CBA_FakeLauncherMagazine" };
+		magazineWell[]={"empty"};
+		magazines[] = { "empty" };
         class WeaponSlotsInfo: WeaponSlotsInfo {
             mass = 10;
         };

+ 4 - 0
addons - Copy/RD501_Weapons/_mag/config.cpp

@@ -33,6 +33,7 @@ class CfgMagazines
 		displayName="30 Round 2MW Cell";
 		picture="\RD501_Weapons\_mag\data\rd501_icon_mag_dc17a.paa";
 		count = 30;
+		mass=4;
 		ammo=macro_new_ammo(2mw)
 		typicalSpeed=400;
 		descriptionShort="Low power magazine";
@@ -51,6 +52,7 @@ class CfgMagazines
 		displayName="15 Round 5MW Cell";
 		picture="\RD501_Weapons\_mag\data\rd501_icon_mag_dc17.paa";
 		count = 15;
+		mass=4;
 		ammo=macro_new_ammo(5mw)
 		typicalSpeed=400;
 		descriptionShort="Low power magazine";
@@ -334,5 +336,7 @@ class CfgMagazines
 	class macro_new_mag(rps1,1):RPG32_F
 	{
 		scope=1;
+		weight=1;
+		mass=1;
 	}
 };