Ammo and squad shield test

addons - Copy/RD501_Vehicle_Weapons/_ammo/aircraft_laser_gun.hpp

@@ -12,7 +12,7 @@ class macro_new_ammo(generic_aircraft_laser_gun_red) : B_35mm_AA_Tracer_Red
     caliber = 1;
     explosive = 0;
     cost = 1;
-    model = "\SWOP_Main\Effects\Tracer\laserred";
+    model = "\RD501_Vehicle_Weapons\_ammo\data\laser_small_red.p3d";
     tracerScale = 1;
     brightness = 100000;
     tracerColor[] = {"Red"};
@@ -249,19 +249,16 @@ class macro_new_ammo(generic_aircraft_laser_gun_blue) : macro_new_ammo(generic_a
     model = "\SWOP_Main\Effects\Tracer\laserblue";
     tracerColor[] = {"Blue"};
     muzzleEffect = "";
-    effectFly = "SWOP_BlueLaserEffect";
 };
 class macro_new_ammo(generic_aircraft_laser_gun_green) : macro_new_ammo(generic_aircraft_laser_gun_red)
 {
     model = "\SWOP_Main\Effects\Tracer\LaserGreen";
-    effectFly = "SWOP_greenLaserEffect";
     tracerColor[] = {"Green"};
     muzzleEffect = "";
 };
 class macro_new_ammo(generic_aircraft_laser_gun_purple) : macro_new_ammo(generic_aircraft_laser_gun_red)
 {
-    model = "\GeonFighter\LaserGeon.p3d";
-    effectFly = "SWOP_RedLaserEffect";
+    model = "\RD501_Vehicle_Weapons\_ammo\data\laser_medium_purple.p3d";
     tracerColor[] = {0.4,0,0.5,1};
 };
 class macro_new_ammo(generic_aircraft_laser_gun_praetorian): macro_new_ammo(generic_aircraft_laser_gun_purple)

addons - Copy/RD501_Vehicle_Weapons/_ammo/data/laser.rvmat

@@ -0,0 +1,13 @@
+ambient[]={0.5,0.5,0.5,5};
+diffuse[]={0,0,0,1};
+forcedDiffuse[]={0.5,0.5,0.5,0};
+emmisive[]={5000,5000,5000,2500};
+specular[]={0,0,0,0};
+specularPower=0;
+renderFlags[]=
+{
+	"NoZWrite",
+	"AddBlend"
+};
+PixelShaderID="Normal";
+VertexShaderID="Basic";

addons - Copy/RD501_Vehicle_Weapons/_ammo/tank_cannons.hpp

@@ -16,7 +16,7 @@
 		//submunitionAmmo = "ammo_Penetrator_120mm";
 	};
 	class 3AS_GAT_redPlasma_AT;
-	class macro_new_ammo(aat_mbt): 3AS_GAT_redPlasma_AT//AAT_Laser
+	class macro_new_ammo(aat_mbt): 3AS_GAT_redPlasma_AT//GAT_Laser
 	{
 		hit = 450;
 		indirectHit = 120;
@@ -27,35 +27,42 @@
 		typicalSpeed = 70;
 		aiAmmoUsageFlags = "64 + 128 + 256 + 512";
 		allowAgainstInfantry = 1;
-
+		model = "\RD501_Vehicle_Weapons\_ammo\data\laser_medium_blue.p3d";
 		CraterEffects = "ATMissileCrater";
 		explosionEffects = "IEDMineSmallExplosion";
-		tracerScale = 3;
+		tracerScale = 1;
 		tracerStartTime = 0;
 		tracerEndTime = 10;
+		brightness = 100000;
+		tracerColor[] = {0,0,1,0};
 		timeToLive=10;
 	}
-	class macro_new_ammo(aat_king): 3AS_ATT_redPlasma_AT//AAT_Laser
+	class macro_new_ammo(aat_king): 3AS_ATT_redPlasma_AT//AAT_ADSD_Laser
 	{
 		hit = 650;
 		indirectHit = 130;
 		indirectHitRange = 10;
 		visibleFire = 42;
 		audibleFire = 42;
-		initSpeed=1000;
+		//initSpeed=1000;
+		initSpeed=20;
 		explosionSoundEffect = "DefaultExplosion";
 		explosive = 0.1;
 		cost = 22;
 		CraterEffects = "ATMissileCrater";
 		explosionEffects = "IEDMineSmallExplosion";
+		tracerScale=1;
 		tracerStartTime = 0;
 		tracerEndTime = 10;
+		brightness = 100000;
+		tracerColor[] = {1,0,0,0};
 		airFriction = 0;
 		muzzleEffect = "";
 		caliber = 5;
 		typicalSpeed = 70;
 		aiAmmoUsageFlags = "64 + 128 + 256 + 512";
 		allowAgainstInfantry = 1;
+		model = "\RD501_Vehicle_Weapons\_ammo\data\laser_big_red.p3d";
 		timeToLive=10;
 	};
 

addons - Copy/RD501_Vehicle_Weapons/_mags/tank_cannons.hpp

@@ -28,7 +28,8 @@
 		ammo = macro_new_ammo(aat_king)
 		count = 10;
 		tracersEvery = 1;
-		initSpeed = 800;
+		//typicalSpeedSpeed = 800;
+		typicalSpeedSpeed = 20;
 		muzzleImpulseFactor = 0;
 		maxLeadSpeed = 600;
 	};

addons - Copy/RD501_Vehicle_Weapons/land/tank_cannons/config.cpp

@@ -77,7 +77,7 @@ class CfgWeapons
 		modes[] = {"manual","close"};
 		class manual: manual
 		{
-			reloadTime=1;
+			reloadTime=0.5;
 		};
 	};
 

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

@@ -20,7 +20,7 @@
 					class CommanderOptics : CommanderOptics {
 					};
 				};
-				weapons[] = {"SmokeLauncher","Cannon_EWEBSWBFgun",macro_new_weapon(aat_cannon,king)};
-				magazines[] = {"SmokeLauncherMag",macro_new_mag(aat_mbt,10), macro_new_mag(aat_mbt,10),"1000Rnd_Laser_Cannon_EWEBSWBF","1000Rnd_Laser_Cannon_EWEBSWBF"};
+				weapons[] = {"SmokeLauncher",macro_new_weapon(generic,aircraft_laser),macro_new_weapon(aat_cannon,king)};
+				magazines[] = {"SmokeLauncherMag",macro_new_mag(aat_mbt,10), macro_new_mag(aat_mbt,10),macro_new_mag(generic_aircraft_gun,1000),macro_new_mag(generic_aircraft_gun,1000)};
 			};
 		};

addons - Copy/RD501_Vehicles/static/bacta/config.cpp

@@ -26,7 +26,8 @@ class CfgPatches
 		requiredVersion=0.1;
 		units[]=
 		{
-			macro_new_vehicle(bacta,healing)
+			macro_new_vehicle(bacta,healing),
+			"RD501_Squad_Shield"
 		};
 		weapons[]=
 		{
@@ -80,5 +81,29 @@ class CfgVehicles
         };
 		
 	};
+	class Land_House_Small_03_V1_ruins_F;
+	class RD501_Squad_Shield: Land_House_Small_03_V1_ruins_F
+	{
+		author="$STR_A3_Bohemia_Interactive";
+		mapSize=21.1;
+		class SimpleObject
+		{
+			eden=0;
+			animate[]={};
+			hide[]={};
+			verticalOffset=-0.023;
+			verticalOffsetWorld=0;
+			init="''";
+		};
+		editorPreview="\A3\EditorPreviews_F\Data\CfgVehicles\Land_House_Small_03_V1_ruins_F.jpg";
+		_generalMacro="Land_House_Small_03_V1_ruins_F";
+		scope=2;
+		scopeCurator=2;
+		displayName="Squad Shield";
+		model="\RD501_Vehicles\static\bubble.p3d";
+		icon="iconObject_1x1";
+		editorCategory="EdCat_Ruins_Altis";
+		editorSubcategory="EdSubcat_Residential_City";
+	};
 	
 };

addons - Copy/RD501_Vehicles/static/model.cfg

@@ -0,0 +1,33 @@
+class CfgSkeletons {
+	class 501st_bubble_skeleton {
+		isDiscrete = 1;
+		skeletonInherit = "";
+		skeletonBones[] = {
+			"shield", ""
+		};
+	};
+};
+
+class CfgModels {
+	class bubble {
+		skeletonName = "501st_bubble_skeleton";
+		sectionsInherit = "";
+		sections[] = {
+			"camo1"
+		};
+		class Animations {
+			class shield_rotation {
+				type = "rotationY";
+				source = "time";
+				sourceAddress = "loop";
+				selection = "shield";
+				memory = 1;
+				minValue = 0;
+				maxValue = 6;
+				angle0 = 0;
+				angle1 = "rad 360";
+				axis = "shield_axis";
+			};
+		};
+	};
+};

addons - Copy/RD501_Vehicles/static/shield.bisurf

@@ -0,0 +1,12 @@
+Density=8600;
+Thickness=110;
+rough=0.1;
+dust=0;
+bulletPenetrabilityWithThickness=15;
+soundEnviron="Water";
+isWater="false";
+friction=0.69999999;
+restitution=0.30000001;
+impact="hitWater";
+soundHit="Rubber";
+deflection=2;

addons - Copy/RD501_Vehicles/static/shield.rvmat

@@ -0,0 +1,9 @@
+surfaceInfo="RD501_Vehicles\static\shield.bisurf";
+ambient[]={0.15000001,0.15000001,0.34999999,1};
+diffuse[]={0.15000001,0.15000001,0.34999999,1};
+forcedDiffuse[]={0,0,0,0};
+emmisive[]={0,0,0,1};
+specular[]={0,0,0,1};
+specularPower=1;
+PixelShaderID="Normal";
+VertexShaderID="Basic";

addons - Copy/RD501_Weapons/Grenades/data/icecream.rvmat

@@ -0,0 +1,78 @@
+ambient[]={0.5,0.5,0.5,1};
+diffuse[]={0.69999999,0.69999999,0.69999999,1};
+forcedDiffuse[]={0,0,0,0};
+emmisive[]={0,0,0,1};
+specular[]={0.7,0.7,0.7,0.1};
+specularPower=25;
+PixelShaderID="Super";
+VertexShaderID="Super";
+class Stage1
+{
+	texture="RD501_Weapons\Grenades\data\icecream_nohq.paa";
+	uvSource="tex";
+	class uvTransform
+	{
+		aside[]={1,0,0};
+		up[]={0,1,0};
+		dir[]={0,0,1};
+		pos[]={0,0,0};
+	};
+};
+class Stage2
+{
+	texture="#(argb,8,8,3)color(0.5,0.5,0.5,1,DT)";
+	uvSource="tex";
+	class uvTransform
+	{
+		aside[]={1,0,0};
+		up[]={0,1,0};
+		dir[]={0,0,1};
+		pos[]={0,0,0};
+	};
+};
+class Stage3
+{
+	texture="#(argb,8,8,3)color(0,0,0,0,MC)";
+	uvSource="tex";
+	class uvTransform
+	{
+		aside[]={1,0,0};
+		up[]={0,1,0};
+		dir[]={0,0,1};
+		pos[]={0,0,0};
+	};
+};
+class Stage4
+{
+	texture="RD501_Weapons\Grenades\data\icecream_as.paa";
+	uvSource="tex";
+	class uvTransform
+	{
+		aside[]={1,0,0};
+		up[]={0,1,0};
+		dir[]={0,0,1};
+		pos[]={0,0,0};
+	};
+};
+class Stage5
+{
+	texture="RD501_Weapons\Grenades\data\icecream_smdi.paa";
+	uvSource="tex";
+	class uvTransform
+	{
+		aside[]={1,0,0};
+		up[]={0,1,0};
+		dir[]={0,0,1};
+		pos[]={0,0,0};
+	};
+};
+class Stage6
+{
+	texture="#(ai,64,64,1)fresnel(1,1)";
+	uvSource="none";
+};
+class Stage7
+{
+	texture="a3\data_f\env_co.paa";
+	uvSource="none";
+};

addons - Copy/RD501_Weapons/_ammo/config.cpp

@@ -268,7 +268,8 @@ class CfgAmmo
 		hit=18;
 		indirectHit=14;
 		indirectHitRange=8;
-	}
+		model="\RD501_Weapons\Grenades\data\icecream.p3d";
+	};
 ///////////////////////////////////////////////////////////////////////
 /////////////////////////Shotgun///////////////////////////////////////
 //////////////////////////////////////////////////////////////////////