Browse Source

B1 and sabre recon fix

Erliens 4 years ago
parent
commit
83571b70f5

+ 102 - 113
addons - Copy/RD501_Droids/B1/b1_common.hpp

@@ -25,181 +25,170 @@ respawnlinkeditems[]=
 
 class HitPoints
 {
-	class HitAbdomen
+	class HitFace
 	{
-		armor=15;
-		explosionShielding=0.25;
+		armor=1;
 		material=-1;
+		name="face_hub";
+		passThrough=0.80000001;
+		radius=0.079999998;
+		explosionShielding=0.1;
 		minimalHit=0.0099999998;
-		name="spine1";
-		passThrough=0.5;
-		radius=0.15000001;
-		visual="injury_body";
 	};
-	class HitArms
+	class HitNeck: HitFace
 	{
-		armor=15;
-		explosionShielding=0.25;
+		armor=1;
 		material=-1;
-		minimalHit=0.0099999998;
-		name="arms";
-		passThrough=1;
+		name="neck";
+		passThrough=0.80000001;
 		radius=0.1;
-		visual="injury_hands";
+		explosionShielding=0.5;
+		minimalHit=0.0099999998;
 	};
-	class HitBody
+	class HitHead: HitNeck
 	{
-		armor=1000;
-		depends="HitPelvis max HitAbdomen max HitDiaphragm max HitChest";
-		explosionShielding=2;
+		armor=1;
 		material=-1;
+		name="head";
+		passThrough=0.80000001;
+		radius=0.2;
+		explosionShielding=0.5;
 		minimalHit=0.0099999998;
-		name="body";
-		passThrough=0.5;
-		radius=0.16;
-		visual="injury_body";
+		depends="HitFace max HitNeck";
 	};
-	class HitChest
+	class HitPelvis: HitHead
 	{
-		armor=15;
-		explosionShielding=2;
+		armor=8;
 		material=-1;
-		minimalHit=0.0099999998;
-		name="spine3";
-		passThrough=0.5;
-		radius=0.15000001;
+		name="pelvis";
+		passThrough=0.80000001;
+		radius=0.23999999;
+		explosionShielding=3;
 		visual="injury_body";
+		minimalHit=0.0099999998;
+		depends="";
 	};
-	class HitDiaphragm
+	class HitAbdomen: HitPelvis
 	{
-		armor=15;
-		explosionShielding=2;
+		armor=6;
 		material=-1;
-		minimalHit=0.0099999998;
-		name="spine2";
-		passThrough=0.5;
-		radius=0.15000001;
+		name="spine1";
+		passThrough=0.80000001;
+		radius=0.16;
+		explosionShielding=3;
 		visual="injury_body";
+		minimalHit=0.0099999998;
 	};
-	class HitFace
+	class HitDiaphragm: HitAbdomen
 	{
-		armor=2;
-		explosionShielding=0.1;
+		armor=6;
 		material=-1;
+		name="spine2";
+		passThrough=0.33000001;
+		radius=0.18000001;
+		explosionShielding=6;
+		visual="injury_body";
 		minimalHit=0.0099999998;
-		name="face_hub";
-		passThrough=0.5;
-		radius=0.079999998;
 	};
-	class HitHands
+	class HitChest: HitDiaphragm
 	{
-		armor=15;
-		depends="HitArms";
-		explosionShielding=0.25;
+		armor=8;
 		material=-1;
+		name="spine3";
+		passThrough=0.33000001;
+		radius=0.18000001;
+		explosionShielding=6;
+		visual="injury_body";
 		minimalHit=0.0099999998;
-		name="hands";
-		passThrough=1;
-		radius=0.1;
-		visual="injury_hands";
 	};
-	class HitHead
+	class HitBody: HitChest
 	{
-		armor=2;
-		depends="HitFace max HitNeck";
-		explosionShielding=0.1;
+		armor=1000;
 		material=-1;
+		name="body";
+		passThrough=1;
+		radius=0;
+		explosionShielding=6;
+		visual="injury_body";
 		minimalHit=0.0099999998;
-		name="head";
-		passThrough=0.5;
-		radius=0.2;
+		depends="HitPelvis max HitAbdomen max HitDiaphragm max HitChest";
 	};
-	class HitLeftArm
+	class HitArms: HitBody
 	{
-		armor=1;
-		explosionShielding=0.25;
+		armor=6;
 		material=-1;
-		minimalHit=0.0099999998;
-		name="hand_l";
-		passThrough=0.1;
+		name="arms";
+		passThrough=1;
 		radius=0.1;
+		explosionShielding=3;
 		visual="injury_hands";
+		minimalHit=0.0099999998;
+		depends="0";
 	};
-	class HitLeftLeg
+	class HitHands: HitArms
 	{
-		armor=1;
-		explosionShielding=0.25;
+		armor=6;
 		material=-1;
-		minimalHit=0.0099999998;
-		name="leg_l";
-		passThrough=0.1;
+		name="hands";
+		passThrough=1;
 		radius=0.1;
+		explosionShielding=1;
 		visual="injury_hands";
+		minimalHit=0.0099999998;
+		depends="HitArms";
 	};
-	class HitLegs
+	class HitLegs: HitHands
 	{
-		armor=15;
-		explosionShielding=0.25;
+		armor=6;
 		material=-1;
-		minimalHit=0.0099999998;
 		name="legs";
 		passThrough=1;
-		radius=0.12;
+		radius=0.14;
+		explosionShielding=3;
 		visual="injury_legs";
+		minimalHit=0.0099999998;
+		depends="0";
 	};
-	class HitNeck
+	class Incapacitated: HitLegs
 	{
-		armor=5;
-		explosionShielding=0.1;
+		armor=1000;
 		material=-1;
-		minimalHit=0.0099999998;
-		name="neck";
-		passThrough=0.5;
-		radius=0.1;
+		name="body";
+		passThrough=1;
+		radius=0;
+		explosionShielding=3;
+		visual="";
+		minimalHit=0;
+		depends="(((Total - 0.25) max 0) + ((HitHead - 0.25) max 0) + ((HitBody - 0.25) max 0)) * 2";
 	};
-	class HitPelvis
+	class HitLeftArm
 	{
-		armor=15;
-		explosionShielding=0.25;
+		armor=6;
 		material=-1;
+		name="hand_l";
+		passThrough=1;
+		radius=0.079999998;
+		explosionShielding=3;
+		visual="injury_hands";
 		minimalHit=0.0099999998;
-		name="pelvis";
-		passThrough=0.25;
-		radius=0.2;
-		visual="injury_body";
 	};
-	class HitRightArm
+	class HitRightArm: HitLeftArm
 	{
-		armor=1;
-		explosionShielding=0.25;
-		material=-1;
-		minimalHit=0.0099999998;
 		name="hand_r";
-		passThrough=0.1;
-		radius=0.1;
-		visual="injury_hands";
 	};
-	class HitRightLeg
+	class HitLeftLeg
 	{
-		armor=1;
-		explosionShielding=0.25;
+		armor=6;
 		material=-1;
-		minimalHit=0.0099999998;
-		name="leg_r";
-		passThrough=0.1;
+		name="leg_l";
+		passThrough=1;
 		radius=0.1;
-		visual="injury_hands";
+		explosionShielding=3;
+		visual="injury_legs";
+		minimalHit=0.0099999998;
 	};
-	class Incapacitated
+	class HitRightLeg: HitLeftLeg
 	{
-		armor=1000;
-		depends="(((Total - 0.25) max 0) + ((HitHead - 0.25) max 0) + ((HitBody - 0.25) max 0)) * 2";
-		explosionShielding=1;
-		material=-1;
-		minimalHit=0;
-		name="body";
-		passThrough=1;
-		radius=0;
-		visual="";
+		name="leg_r";
 	};
 };

+ 4 - 1
addons - Copy/RD501_Vehicles/land/saber/config.cpp

@@ -566,6 +566,10 @@ class CfgWeapons
 	class macro_new_weapon(saber_gl,40mm):3as_saber_gmg_40mm
 	{
 		magazineReloadTime=3;
+		magazines[]=
+		{
+			macro_new_mag(saber_recon,100)
+		};
 	};
 	class macro_new_weapon(saber_cannon,supermkii):3AS_Sabre_Cannons_Super
 	{
@@ -597,7 +601,6 @@ class CfgMagazines
 	class macro_new_mag(saber_recon,100):3as_saber_200Rnd_autocannon_30mm_mag
 	{
 		count=100;
-		ammo=macro_new_ammo(saber_mg);
 	};
 };
 class CfgAmmo