Merge pull request #170 from 501st-Aux-Mod-Team/patch1321

Patch1321

addons - Copy/RD501_Helmets/aviation/config.cpp

@@ -113,26 +113,27 @@ class CfgWeapons
 	};
 
 
-	class 212th_Engineer_Helmet_501st;
+	class 3as_Engineer_Helmet;
+	class 212th_Engineer_helm;
 
-	class macro_new_helmet(warden,501st):212th_Engineer_Helmet_501st
+	class macro_new_helmet(warden,501st):212th_Engineer_helm
 	{
 		author="RD501"
 		scopeArsenal = 2;
 		DisplayName="[501st] WRDN HELM (Base)";
 		picture="RD501_Helmets\_textures\aviation\warden_ico.paa"
-		hiddenSelections[]=
+		/*hiddenSelections[]=
 		{
-			"Camo"
-		};
+			"camo"
+		};*/
 		hiddenSelectionsTextures[]=
 		{
 			macro_custom_helmet_textures\aviation\warden\Warden.paa
 		};
-		hiddenSelectionsMaterials[] = 
+		/*hiddenSelectionsMaterials[] = 
         {
             "RD501_Helmets\_materials\aviation\wardenMaterial.rvmat"
-        };
+        };*/
 		subItems[] = {"G_B_Diving"};
 	};
 

addons - Copy/RD501_Helmets/infantry/config.cpp

@@ -58,7 +58,6 @@ class CfgWeapons
 	NEW_501_Inf_Helm_JLTS(Money,Money,Money.paa)
 	NEW_501_Inf_Helm_JLTS(Tee,Tee,Tee.paa)
 	NEW_501_Inf_Helm_JLTS(Tideend,Tideend,Tideend.paa)
-	NEW_501_Inf_Helm_JLTS(Dadecoy,Dadecoy,Dadecoy.paa)
 	NEW_501_Inf_Helm_JLTS(Muzzer,Muzzer,Muzzer.paa)
 	NEW_501_Inf_Helm_JLTS(Biscuit,Biscuit,Biscuit.paa)
 	NEW_501_Inf_Helm_JLTS(Goldarp,Goldarp,Goldarp.paa)
@@ -161,6 +160,9 @@ class CfgWeapons
 	NEW_501_Inf_Helm_JLTS(Mirror,Mirror,Mirror.paa)
 	NEW_501_Inf_Helm_JLTS(Waylander,Waylander,Waylander.paa)
 	NEW_501_Inf_Helm_JLTS(Young,Young,Young.paa)
+	NEW_501_Inf_Helm_JLTS(Smiley,Smiley,Smiley.paa)
+	NEW_501_Inf_Helm_JLTS(Knight,Knight,Knight.paa)
+	NEW_501_Inf_Helm_JLTS(Deceiving,Deceiving,Deceiving.paa)
 	NEW_501_ARC_Helm_JLTS(Rayne,Rayne,Rayne.paa)
 	NEW_501_ARC_Helm_JLTS(Archaic,Archaic,Archaic.paa)
 	NEW_501_Inf_Helm_JLTS(Anta,Anta,Anta.paa)

addons - Copy/RD501_Particle_Effects/config.cpp

@@ -6,7 +6,7 @@ class CfgPatches
 {
 	class macro_patch_name(particle_effects)
 	{
-		author=DANKAUTHORS;
+		author="RD501";
 		requiredAddons[]=
 		{
 			//macro_root_req
@@ -19,3 +19,498 @@ class CfgPatches
 		};
 	};
 };
+class CfgAmmo
+{
+	class Default;
+	class RD501_BlueFuelExplosion: Default
+	{
+		hit=1300;
+		indirectHit=1100;
+		indirectHitRange=10
+		model="";
+		simulation="";
+		cost=1;
+		SoundSetExplosion[]=
+		{
+			"ExplosiveCharge_Exp_SoundSet",
+			"ExplosiveCharge_Tail_SoundSet",
+			"Explosion_Debris_SoundSet"
+		};
+		explosionSoundEffect="DefaultExplosion";
+		soundFly[]=
+		{
+			"",
+			1,
+			1
+		};
+		soundEngine[]=
+		{
+			"",
+			1,
+			4
+		};
+		explosionEffects="RD501_BlueFuelExplosionEffects";
+	};
+};
+class CfgCloudlets
+{
+	class Default;
+	class RD501_BlueFireBallBrightSmall: Default
+	{
+		interval="0.05 * interval + 0.05";
+		circleRadius=0;
+		circleVelocity[]={0,0,0};
+		particleShape="\RD501_Particle_Effects\particle_effects\universal_blue";
+		particleFSNtieth=16;
+		particleFSIndex=0;
+		particleFSFrameCount=32;
+		particleFSLoop=0;
+		angleVar=360;
+		animationName="";
+		particleType="Billboard";
+		timerPeriod=1;
+		lifeTime=0.80000001;
+		moveVelocity[]={0,0.5,0};
+		rotationVelocity=0;
+		weight=0.039999999;
+		volume=0.039999999;
+		rubbing=0.1;
+		size[]=
+		{
+			"0.0125 * intensity + 2",
+			"0.0125 * intensity + 6"
+		};
+		color[]=
+		{
+			{1,1,1,-4},
+			{1,1,1,-3},
+			{1,1,1,-2},
+			{1,1,1,-1},
+			{1,1,1,0}
+		};
+		animationSpeed[]={0.5};
+		randomDirectionPeriod=0.2;
+		randomDirectionIntensity=0.2;
+		onTimerScript="";
+		beforeDestroyScript="";
+		lifeTimeVar=0.5;
+		positionVar[]={0.60000002,1,0.60000002};
+		MoveVelocityVar[]={1,1,1};
+		rotationVelocityVar=0;
+		sizeVar=0.2;
+		colorVar[]={0,0,0,2};
+		randomDirectionPeriodVar=0;
+		randomDirectionIntensityVar=0;
+	};
+	class RD501_SuperSmoke: Default
+	{
+		animationSpeedCoef=1;
+		colorCoef[]=
+		{
+			"colorR",
+			"colorG",
+			"colorB",
+			"colorA"
+		};
+		sizeCoef=1;
+		position[]={0,0,0};
+		interval=0.029999999;
+		circleRadius=0;
+		circleVelocity[]={0,0,0};
+		particleShape="\A3\data_f\ParticleEffects\Universal\Universal";
+		particleFSNtieth=16;
+		particleFSIndex=7;
+		particleFSFrameCount=48;
+		particleFSLoop=1;
+		angleVar=0.1;
+		animationName="";
+		particleType="Billboard";
+		timerPeriod=1;
+		lifeTime=20;
+		moveVelocity[]={0.2,0.1,0.4};
+		rotationVelocity=1;
+		weight=1.227;
+		volume=1;
+		rubbing=0.025;
+		size[]={0.5, 8, 12, 15};
+		color[]=
+		{
+			{1, 1, 1, 0.7},
+			{1, 1, 1, 0.5},
+			{1, 1, 1, 0.25},
+			{1, 1, 1, 0}
+		};
+		animationSpeed[]={1.5,0.5};
+		randomDirectionPeriod=1;
+		randomDirectionIntensity=0.04;
+		onTimerScript="";
+		beforeDestroyScript="";
+		destroyOnWaterSurface=1;
+		destroyOnWaterSurfaceOffset=-0.60000002;
+		lifeTimeVar=2;
+		positionVar[]={0,0,0};
+		MoveVelocityVar[]={0.25,0.25,0.25};
+		rotationVelocityVar=20;
+		sizeVar=0.5;
+		colorVar[]={0,0,0,0.34999999};
+		randomDirectionPeriodVar=0;
+		randomDirectionIntensityVar=0;
+	};
+	class RD501_Dioxis:RD501_SuperSmoke
+	{
+		moveVelocity[]={0.2,0.1,0.1};
+		size[]={0.4, 3, 9};
+		damageType="Fire";					// damage type, only available option is "Fire" so far
+		coreIntensity = 5;			    	// damage coeficient in the center of fire
+		coreDistance = 5.0;					// how far can unit get damage
+		damageTime = 0.1;					// how often is unit getting damage 
+	}
+	class RD501_BlueVehExplosionParticlesSmall: Default
+	{
+		interval="0.03 * interval + 0.03";
+		circleRadius=0;
+		circleVelocity[]={0,0,0};
+		particleShape="\RD501_Particle_Effects\particle_effects\universal_blue";
+		particleFSNtieth=16;
+		particleFSIndex=2;
+		particleFSFrameCount=80;
+		particleFSLoop=0;
+		angleVar=360;
+		animationName="";
+		particleType="Billboard";
+		timerPeriod=1;
+		lifeTime=0.25;
+		moveVelocity[]={0,4,0};
+		rotationVelocity=0;
+		weight=0.056000002;
+		volume=0.039999999;
+		rubbing=0.1;
+		size[]={3,4.5};
+		color[]=
+		{
+			{1,1,1,-4},
+			{1,1,1,-3},
+			{1,1,1,-2},
+			{1,1,1,-1},
+			{1,1,1,0}
+		};
+		animationSpeed[]={0.33000001};
+		randomDirectionPeriod=0.5;
+		randomDirectionIntensity=0.1;
+		onTimerScript="";
+		beforeDestroyScript="";
+		lifeTimeVar=0;
+		positionVar[]={2,1,2};
+		MoveVelocityVar[]={3,3,3};
+		rotationVelocityVar=25;
+		sizeVar=0.2;
+		colorVar[]={0,0,0,2};
+		randomDirectionPeriodVar=0;
+		randomDirectionIntensityVar=0;
+	};
+	class RD501_BlueExploLight
+	{
+		name="$STR_A3_CfgLights_ExploLight0";
+		diffuse[]={0.031,0.573,0.816};
+		color[]={0.031,0.573,0.816};
+		ambient[]={0,0,0,0};
+		brightness=200;
+		size=1;
+		intensity=100000;
+		drawLight=0;
+		blinking=0;
+		class Attenuation
+		{
+			start=4;
+			constant=0;
+			linear=0;
+			quadratic=0.2;
+			hardLimitStart=1000;
+			hardLimitEnd=2000;
+		};
+		position[]={0,4.5,0};
+	};
+	class RD501_BlueObjectDestructionFire1Small: Default
+	{
+		interval=0.0099999998;
+		circleRadius=0;
+		circleVelocity[]={0,0,0};
+		particleFSNtieth=16;
+		particleFSIndex=10;
+		particleFSFrameCount=32;
+		particleFSLoop=1;
+		angleVar=0.1;
+		particleShape="\RD501_Particle_Effects\particle_effects\universal_blue";
+		animationName="";
+		particleType="Billboard";
+		timerPeriod=1;
+		lifeTime=1.5;
+		moveVelocity[]={0,1,0};
+		rotationVelocity=0;
+		weight=0.045000002;
+		volume=0.039999999;
+		rubbing=0.050000001;
+		size[]=
+		{
+			"1.2 * intensity + 1",
+			"0.1 * intensity + 0.2"
+		};
+		color[]=
+		{
+			{1,1,1,-1}
+		};
+		animationSpeed[]={0.5,1};
+		randomDirectionPeriod=0;
+		randomDirectionIntensity=0;
+		onTimerScript="";
+		beforeDestroyScript="";
+		lifeTimeVar=0.40000001;
+		positionVar[]={0.1,0.30000001,0.1};
+		moveVelocityVar[]={0.1,0.5,0.1};
+		rotationVelocityVar=10;
+		sizeVar=0.5;
+		colorVar[]={0.1,0.1,0.1,0};
+		randomDirectionPeriodVar=0;
+		randomDirectionIntensityVar=0;
+		coreIntensity=1.25;
+		coreDistance=1;
+		damageTime=0.1;
+		constantDistance=1;
+		damageType="Fire";
+	};
+};
+class RD501_BlueFuelExplosionEffects
+{
+	class ExpSparks
+	{
+		simulation="particles";
+		type="ExpSparks";
+		position[]={0,0,0};
+		intensity=1;
+		interval=1;
+		lifeTime=0.5;
+	};
+	class Shards
+	{
+		simulation="particles";
+		type="ObjectDestructionShardsSmall";
+		position="";
+		intensity=1;
+		interval=1;
+		lifeTime=1;
+	};
+	class Shards1
+	{
+		simulation="particles";
+		type="ObjectDestructionShardsSmall1";
+		position="";
+		intensity=1;
+		interval=1;
+		lifeTime=1;
+	};
+	class Shards2
+	{
+		simulation="particles";
+		type="ObjectDestructionShardsSmall2";
+		position="";
+		intensity=1;
+		interval=1;
+		lifeTime=1;
+	};
+	class Shards3
+	{
+		simulation="particles";
+		type="ObjectDestructionShardsSmall3";
+		position="";
+		intensity=1;
+		interval=1;
+		lifeTime=1;
+	};
+	class ShardsBurn
+	{
+		simulation="particles";
+		type="ObjectDestructionShardsBurningSmall";
+		position="";
+		intensity=1;
+		interval=1;
+		lifeTime=1;
+	};
+	class ShardsBurn1
+	{
+		simulation="particles";
+		type="ObjectDestructionShardsBurningSmall1";
+		position="";
+		intensity=1;
+		interval=1;
+		lifeTime=1;
+	};
+	class ShardsBurn2
+	{
+		simulation="particles";
+		type="ObjectDestructionShardsBurningSmall2";
+		position="";
+		intensity=1;
+		interval=1;
+		lifeTime=1;
+	};
+	class ShardsBurn3
+	{
+		simulation="particles";
+		type="ObjectDestructionShardsBurningSmall3";
+		position="";
+		intensity=1;
+		interval=1;
+		lifeTime=1;
+	};
+	class Shards2_0
+	{
+		simulation="particles";
+		type="ObjectDestructionShards";
+		position="";
+		intensity=1;
+		interval=1;
+		lifeTime=1;
+	};
+	class Shards2_1
+	{
+		simulation="particles";
+		type="ObjectDestructionShards1";
+		position="";
+		intensity=1;
+		interval=1;
+		lifeTime=1;
+	};
+	class Shards2_2
+	{
+		simulation="particles";
+		type="ObjectDestructionShards2";
+		position="";
+		intensity=1;
+		interval=1;
+		lifeTime=1;
+	};
+	class Shards2_3
+	{
+		simulation="particles";
+		type="ObjectDestructionShards3";
+		position="";
+		intensity=1;
+		interval=1;
+		lifeTime=1;
+	};
+	class LightExp
+	{
+		simulation="light";
+		type="RD501_BlueExploLight";
+		position[]={0,1.5,0};
+		intensity=0.001;
+		interval=1;
+		lifeTime=0.5;
+	};
+	class Explosion1
+	{
+		simulation="particles";
+		type="RD501_BlueVehExplosionParticlesSmall";
+		position[]={0,0,0};
+		intensity=1;
+		interval=1;
+		lifeTime=0.2;
+	};
+	class Explosion2
+	{
+		simulation="particles";
+		type="RD501_BlueFireBallBrightSmall";
+		position[]={0,0,0};
+		intensity=1;
+		interval=1;
+		lifeTime=0.30000001;
+	};
+	class Smoke1
+	{
+		simulation="particles";
+		type="VehExpSmokeSmall";
+		position[]={0,0,0};
+		intensity=1;
+		interval=1;
+		lifeTime=1;
+	};
+	class SmallSmoke1
+	{
+		simulation="particles";
+		type="VehExpSmoke2Small";
+		position[]={0,0,0};
+		intensity=1;
+		interval=1;
+		lifeTime=1;
+	};
+};
+class RD501_ThickSmokeShellWhiteEffect
+{
+	class SmokeShell
+	{
+		simulation="particles";
+		type="RD501_SuperSmoke";
+		position[]={0,0,0};
+		intensity=1;
+		interval=1;
+	};
+	/*class SmokeShell2
+	{
+		simulation="particles";
+		type="SmokeShellWhite2";
+		position[]={0,0,0};
+		intensity=1;
+		interval=1;
+	};
+	class SmokeShellUW
+	{
+		simulation="particles";
+		type="SmokeShellWhiteUW";
+		position[]={0,0,0};
+		intensity=1;
+		interval=1;
+	};
+	class SmokeShell2UW
+	{
+		simulation="particles";
+		type="SmokeShellWhite2UW";
+		position[]={0,0,0};
+		intensity=1;
+		interval=1;
+	};*/
+};
+class RD501_DioxisSmokeShellEffect
+{
+	class SmokeShell
+	{
+		simulation="particles";
+		type="RD501_Dioxis";
+		position[]={0,0,0};
+		intensity=1;
+		interval=1;
+	};
+	/*class SmokeShell2
+	{
+		simulation="particles";
+		type="SmokeShellWhite2";
+		position[]={0,0,0};
+		intensity=1;
+		interval=1;
+	};
+	class SmokeShellUW
+	{
+		simulation="particles";
+		type="SmokeShellWhiteUW";
+		position[]={0,0,0};
+		intensity=1;
+		interval=1;
+	};
+	class SmokeShell2UW
+	{
+		simulation="particles";
+		type="SmokeShellWhite2UW";
+		position[]={0,0,0};
+		intensity=1;
+		interval=1;
+	};*/
+};

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

@@ -20,7 +20,8 @@ class CfgPatches
 		requiredVersion=0.1;
 		units[]={
 			macro_new_unit_class(opfor,B2_droid_Standard),
-			macro_new_unit_class(opfor,B2_droid_Super)
+			macro_new_unit_class(opfor,B2_droid_Super),
+			macro_new_unit_class(opfor,B2_droid_Standard_mk2)
 		};
 		weapons[]=
 		{
@@ -43,6 +44,7 @@ class Extended_Init_EventHandlers
 class CfgVehicles
 {
 	class SWOP_B2_superdroid;
+	class O_Soldier_F;
 	class macro_new_unit_class(opfor,B2_droid_Standard): SWOP_B2_superdroid
 	{
 		faction=macro_cis_faction
@@ -252,6 +254,217 @@ class CfgVehicles
         weapons[] = {"SWOP_B2gun","Throw","Put"};
         linkedItems[] = {"ItemMap","ItemCompass","ItemWatch","ItemRadio","NVGoggles"};
 	};
+class macro_new_unit_class(opfor,B2_droid_Standard_mk2): O_Soldier_F
+	{
+		faction=macro_cis_faction
+		editorSubcategory=macro_editor_cat(B2)
+		displayname = "B2 Mk2";
+		scope=2;
+		class HitPoints
+		{
+			class HitFace
+			{
+				armor=6;
+				material=-1;
+				name="face_hub";
+				passThrough=0.013;
+				radius=0.079999998;
+				explosionShielding=1;
+				minimalHit=0.0099999998;
+			};
+			class HitNeck: HitFace
+			{
+				armor=6;
+				material=-1;
+				name="neck";
+				passThrough=0.013;
+				radius=0.1;
+				explosionShielding=1;
+				minimalHit=0.0099999998;
+			};
+			class HitHead: HitNeck
+			{
+				armor=6;
+				material=-1;
+				name="head";
+				passThrough=0.13;
+				radius=0.2;
+				explosionShielding=1;
+				minimalHit=0.0099999998;
+				depends="HitFace max HitNeck";
+			};
+			class HitPelvis: HitHead
+			{
+				armor=8;
+				material=-1;
+				name="pelvis";
+				passThrough=0.44;
+				radius=0.23999999;
+				explosionShielding=1;
+				visual="injury_body";
+				minimalHit=0.0099999998;
+				depends="0";
+			};
+			class HitAbdomen: HitPelvis
+			{
+				armor=8;
+				material=-1;
+				name="spine1";
+				passThrough=0.44;
+				radius=0.16;
+				explosionShielding=1;
+				visual="injury_body";
+				minimalHit=0.0099999998;
+			};
+			class HitDiaphragm: HitAbdomen
+			{
+				armor=8;
+				material=-1;
+				name="spine2";
+				passThrough=0.44;
+				radius=0.18000001;
+				explosionShielding=1.5;
+				visual="injury_body";
+				minimalHit=0.0099999998;
+			};
+			class HitChest: HitDiaphragm
+			{
+				armor=8;
+				material=-1;
+				name="spine3";
+				passThrough=0.44;
+				radius=0.18000001;
+				explosionShielding=1.5;
+				visual="injury_body";
+				minimalHit=0.0099999998;
+			};
+			class HitBody: HitChest
+			{
+				armor=1000;
+				material=-1;
+				name="body";
+				passThrough=1;
+				radius=0;
+				explosionShielding=1.5;
+				visual="injury_body";
+				minimalHit=0.0099999998;
+				depends="HitPelvis max HitAbdomen max HitDiaphragm max HitChest";
+			};
+			class HitArms: HitBody
+			{
+				armor=6;
+				material=-1;
+				name="arms";			
+				passThrough=0.13;
+				radius=0.1;
+				explosionShielding=0.4;
+				visual="injury_hands";
+				minimalHit=0.0099999998;
+				depends="0";
+			};
+			class HitRightHand :HitArms
+			{
+				armor = 8;
+				explosionShielding = 0.25;
+				material = -1;
+				minimalHit = 0.01;
+				name = "hand_r";
+				passThrough = 0.1;
+				radius = 0.1;
+				visual = "injury_hands";
+			};
+			class HitLeftHand :HitArms
+			{
+				armor = 8;
+				explosionShielding = 0.25;
+				material = -1;
+				minimalHit = 0.01;
+				name = "hand_l";
+				passThrough = 0.1;
+				radius = 0.1;
+				visual = "injury_hands";
+			};
+			class HitHands: HitArms
+			{
+				armor=6;
+				material=-1;
+				name="hands";
+				passThrough=0.13;
+				radius=0.1;
+				explosionShielding=0.30000001;
+				visual="injury_hands";
+				minimalHit=0.0099999998;
+				depends="HitArms";
+			};
+			class HitLegs: HitHands
+			{
+				armor=6;
+				material=-1;
+				name="legs";
+				passThrough=0.13;
+				radius=0.1;
+				explosionShielding=0.30000001;
+				visual="injury_legs";
+				minimalHit=0.0099999998;
+				depends="0";
+			};
+			class HitLeftLeg :HitLegs
+			{
+				armor = 8;
+				explosionShielding = 0.25;
+				material = -1;
+				minimalHit = 0.01;
+				name = "leg_l";
+				passThrough = 0.1;
+				radius = 0.1;
+				visual = "injury_legs";
+			};
+			class HitRightLeg :HitLegs
+			{
+				armor = 8;
+				explosionShielding = 0.25;
+				material = -1;
+				minimalHit = 0.01;
+				name = "leg_r";
+				passThrough = 0.1;
+				radius = 0.1;
+				visual = "injury_leg";
+			};
+			class Incapacitated: HitLegs
+			{
+				armor=1000;
+				material=-1;
+				name="body";
+				passThrough=1;
+				radius=0;
+				explosionShielding=1;
+				visual="";
+				minimalHit=0;
+				depends="(((Total - 0.25) max 0) + ((HitHead - 0.25) max 0) + ((HitBody - 0.25) max 0)) * 2";
+			};
+		};
+		armor=15;
+		armorStructural=1;
+		explosionShielding=0.40000001;
+		model="\101st_Aux_Mod\Addons\DBA_CIS\Assets\B2.p3d";
+		uniformClass=macro_new_uniform_class(opfor,B2_Armor_mk2)
+		class EventHandlers;
+		hiddenSelections[]=
+		{
+			"Camo1","Camo2","Camo3"
+		};
+		hiddenSelectionsTextures[]=
+		{
+        "RD501_Units\textures\CIS\B2\rocket\Reskinb2_chest.paa",
+        "RD501_Units\textures\CIS\B2\rocket\ReskinB2_waist.paa",
+        "RD501_Units\textures\CIS\B2\rocket\ReskinB2_legs.paa"
+		};
+		respawnWeapons[] = {macro_new_weapon(b2,standard),"Put"};
+        magazines[] = {macro_new_mag(b2gun,40),macro_new_mag(b2gun,40),macro_new_mag(b2gun,40),macro_new_mag(b2gun,40),macro_new_mag(b2rocket,3),macro_new_mag(b2rocket,3)};
+        weapons[] = {macro_new_weapon(b2,standard),"Put"};
+		respawnMagazines[]= {macro_new_mag(b2gun,40),macro_new_mag(b2gun,40),macro_new_mag(b2gun,40),macro_new_mag(b2gun,40),macro_new_mag(b2rocket,3),macro_new_mag(b2rocket,3)};
+        linkedItems[] = {"ItemMap","ItemCompass","ItemWatch","ItemRadio","NVGoggles"};
+	};
 	class macro_new_unit_class(opfor,B2_droid_Super) : macro_new_unit_class(opfor,B2_droid_Standard)
 	{
 		displayname = "Super B2";
@@ -477,6 +690,24 @@ class CfgWeapons
 		JLTS_deathSounds = "DeathDroid";
 		class EventHandlers : DefaultEventhandlers {};
 	};
+	class macro_new_uniform_class(opfor,B2_Armor_mk2): UniformItem
+	{
+		scope=2;
+		displayName="RD501 B2";
+		picture = "\SWOP_droids\data\ico\B2ico.paa"
+		model = "\A3\Characters_F\Common\Suitpacks\suitpack_blufor_diver";
+		class ItemInfo: UniformItem
+		{
+			uniformModel="-";
+			uniformClass=macro_new_unit_class(opfor,B2_droid_Standard_mk2)
+			containerClass="Supply40";
+			mass=80;
+		};
+		JLTS_isDroid = 1; 
+		JLTS_hasEMPProtection = 0; 
+		JLTS_deathSounds = "DeathDroid";
+		class EventHandlers : DefaultEventhandlers {};
+	};
 	class macro_new_uniform_class(opfor,B2_SuperArmor): SWOP_B2_superdroid_F_Spec
 	{
 		scope=2;

addons - Copy/RD501_Vehicles/land/bantha/config.cpp

@@ -191,8 +191,8 @@ class CfgVehicles
 		{
 			class MainTurret:MainTurret
 			{
-				weapons[] = {"SCI_autocannon_Z20_HBB","missiles_DAGR","missiles_titan"};
-				magazines[] = {"SCI_500Rnd_Z20_HBB","SCI_500Rnd_Z20_HBB","SCI_500Rnd_Z20_HBB","SCI_500Rnd_Z20_HBB","12Rnd_PG_missiles","2Rnd_GAT_missiles"};
+				weapons[] = {"212th_autocannon_Z20_HBB","missiles_DAGR","missiles_titan"};
+				magazines[] = {"212th_500Rnd_Z20_HBB","212th_500Rnd_Z20_HBB","212th_500Rnd_Z20_HBB","212th_500Rnd_Z20_HBB","12Rnd_PG_missiles","2Rnd_GAT_missiles"};
 				class HitPoints:HitPoints
 				{
 					class HitTurret:HitTurret

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

@@ -101,6 +101,84 @@ class CfgVehicles
 				radius = 3;
 			};
 		};
+		destrType = "DestructBuilding";
+		explosionEffect="FuelExplosion";
+		class DestructionEffects
+		{
+			class Dust
+			{
+				intensity = 0.1;
+				interval = 1;
+				lifeTime = 0.01;
+				position = "destructionEffect2";
+				simulation = "particles";
+				type = "HousePartDust";
+			};
+			class Light1
+			{
+				enabled = "distToWater";
+				intensity = 0.1;
+				interval = 1;
+				lifeTime = 3;
+				position = "destructionEffect";
+				simulation = "light";
+				type = "ObjectDestructionLightSmall";
+			};
+			class Fire1
+			{
+				intensity = 0.15;
+				interval = 1;
+				lifeTime = 3;
+				position = "destructionEffect";
+				simulation = "particles";
+				type = "ObjectDestructionFire1Small";
+			};
+			class Refract1
+			{
+				intensity = 1;
+				interval = 1;
+				lifeTime = 3;
+				position = "destructionEffect";
+				simulation = "particles";
+				type = "SmallFireFRefract";
+			};
+			class Sound
+			{
+				intensity = 1;
+				interval = 1;
+				lifeTime = 1;
+				position = "destructionEffect";
+				simulation = "sound";
+				type = "Fire";
+			};
+			class sparks1
+			{
+				intensity = 0.5;
+				interval = 1;
+				lifeTime = 0;
+				position = "destructionEffect2";
+				simulation = "particles";
+				type = "ObjectDestructionSparks";
+			};
+			class Smoke1
+			{
+				simulation="particles";
+				type="BarelDestructionSmoke";
+				position[]={0,0,0};
+				intensity=0.2;
+				interval=1;
+				lifeTime=1;
+			};
+			class HouseDestr
+			{
+				intensity=1;
+				interval=1;
+				lifeTime=5;
+				position="";
+				simulation="destroy";
+				type="DelayedDestruction";
+			};
+		};
 	};
 
 	class macro_new_vehicle(dwarf_spider_droid,Movable_MkII): macro_new_vehicle(dwarf_spider_droid,MkII)
@@ -154,6 +232,84 @@ class CfgVehicles
 				};
 			};
 		};
+		destrType = "DestructBuilding";
+		explosionEffect="FuelExplosion";
+		class DestructionEffects
+		{
+			class Dust
+			{
+				intensity = 0.1;
+				interval = 1;
+				lifeTime = 0.01;
+				position = "destructionEffect2";
+				simulation = "particles";
+				type = "HousePartDust";
+			};
+			class Light1
+			{
+				enabled = "distToWater";
+				intensity = 0.1;
+				interval = 1;
+				lifeTime = 3;
+				position = "destructionEffect";
+				simulation = "light";
+				type = "ObjectDestructionLightSmall";
+			};
+			class Fire1
+			{
+				intensity = 0.15;
+				interval = 1;
+				lifeTime = 3;
+				position = "destructionEffect";
+				simulation = "particles";
+				type = "ObjectDestructionFire1Small";
+			};
+			class Refract1
+			{
+				intensity = 1;
+				interval = 1;
+				lifeTime = 3;
+				position = "destructionEffect";
+				simulation = "particles";
+				type = "SmallFireFRefract";
+			};
+			class Sound
+			{
+				intensity = 1;
+				interval = 1;
+				lifeTime = 1;
+				position = "destructionEffect";
+				simulation = "sound";
+				type = "Fire";
+			};
+			class sparks1
+			{
+				intensity = 0.5;
+				interval = 1;
+				lifeTime = 0;
+				position = "destructionEffect2";
+				simulation = "particles";
+				type = "ObjectDestructionSparks";
+			};
+			class Smoke1
+			{
+				simulation="particles";
+				type="BarelDestructionSmoke";
+				position[]={0,0,0};
+				intensity=0.2;
+				interval=1;
+				lifeTime=1;
+			};
+			class HouseDestr
+			{
+				intensity=1;
+				interval=1;
+				lifeTime=5;
+				position="";
+				simulation="destroy";
+				type="DelayedDestruction";
+			};
+		}
 	};
 	class macro_new_vehicle(crab_droid,Movable_MkII): macro_new_vehicle(crab_droid,MkII)
 	{

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

@@ -90,6 +90,84 @@ class CfgVehicles
 				};
 			};
 		};
+		destrType = "DestructBuilding";
+		explosionEffect="FuelExplosion";
+		class DestructionEffects
+		{
+			class Dust
+			{
+				intensity = 0.1;
+				interval = 1;
+				lifeTime = 0.01;
+				position = "destructionEffect2";
+				simulation = "particles";
+				type = "HousePartDust";
+			};
+			class Light1
+			{
+				enabled = "distToWater";
+				intensity = 0.1;
+				interval = 1;
+				lifeTime = 3;
+				position = "destructionEffect";
+				simulation = "light";
+				type = "ObjectDestructionLightSmall";
+			};
+			class Fire1
+			{
+				intensity = 0.15;
+				interval = 1;
+				lifeTime = 3;
+				position = "destructionEffect";
+				simulation = "particles";
+				type = "ObjectDestructionFire1Small";
+			};
+			class Refract1
+			{
+				intensity = 1;
+				interval = 1;
+				lifeTime = 3;
+				position = "destructionEffect";
+				simulation = "particles";
+				type = "SmallFireFRefract";
+			};
+			class Sound
+			{
+				intensity = 1;
+				interval = 1;
+				lifeTime = 1;
+				position = "destructionEffect";
+				simulation = "sound";
+				type = "Fire";
+			};
+			class sparks1
+			{
+				intensity = 0.5;
+				interval = 1;
+				lifeTime = 0;
+				position = "destructionEffect2";
+				simulation = "particles";
+				type = "ObjectDestructionSparks";
+			};
+			class Smoke1
+			{
+				simulation="particles";
+				type="BarelDestructionSmoke";
+				position[]={0,0,0};
+				intensity=0.2;
+				interval=1;
+				lifeTime=1;
+			};
+			class HouseDestr
+			{
+				intensity=1;
+				interval=1;
+				lifeTime=5;
+				position="";
+				simulation="destroy";
+				type="DelayedDestruction";
+			};
+		};
 	};
 	class 3as_ParticleCannon_Base: StaticMGWeapon
 	{
@@ -122,6 +200,84 @@ class CfgVehicles
 				magazines[]={macro_new_mag(generic_aircraft_gun,1000),macro_new_mag(generic_aircraft_gun,1000),macro_new_mag(generic_aircraft_gun,1000),macro_new_mag(generic_aircraft_gun,1000),macro_new_mag(generic_aircraft_gun,1000)};
 			};
 		};
+		destrType = "DestructBuilding";
+		explosionEffect="FuelExplosion";
+		class DestructionEffects
+		{
+			class Dust
+			{
+				intensity = 0.1;
+				interval = 1;
+				lifeTime = 0.01;
+				position = "destructionEffect2";
+				simulation = "particles";
+				type = "HousePartDust";
+			};
+			class Light1
+			{
+				enabled = "distToWater";
+				intensity = 0.1;
+				interval = 1;
+				lifeTime = 3;
+				position = "destructionEffect";
+				simulation = "light";
+				type = "ObjectDestructionLightSmall";
+			};
+			class Fire1
+			{
+				intensity = 0.15;
+				interval = 1;
+				lifeTime = 3;
+				position = "destructionEffect";
+				simulation = "particles";
+				type = "ObjectDestructionFire1Small";
+			};
+			class Refract1
+			{
+				intensity = 1;
+				interval = 1;
+				lifeTime = 3;
+				position = "destructionEffect";
+				simulation = "particles";
+				type = "SmallFireFRefract";
+			};
+			class Sound
+			{
+				intensity = 1;
+				interval = 1;
+				lifeTime = 1;
+				position = "destructionEffect";
+				simulation = "sound";
+				type = "Fire";
+			};
+			class sparks1
+			{
+				intensity = 0.5;
+				interval = 1;
+				lifeTime = 0;
+				position = "destructionEffect2";
+				simulation = "particles";
+				type = "ObjectDestructionSparks";
+			};
+			class Smoke1
+			{
+				simulation="particles";
+				type="BarelDestructionSmoke";
+				position[]={0,0,0};
+				intensity=0.2;
+				interval=1;
+				lifeTime=1;
+			};
+			class HouseDestr
+			{
+				intensity=1;
+				interval=1;
+				lifeTime=5;
+				position="";
+				simulation="destroy";
+				type="DelayedDestruction";
+			};
+		};
 	};
 	/*class StaticMortar: StaticWeapon
 	{

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

@@ -39,7 +39,7 @@ class CfgVehicles
 		ace_dragging_canDrag = 1;
 		armor=25;
 		destrType = "DestructBuilding";
-		explosionEffect="FuelExplosionBig";
+		explosionEffect="RD501_BlueFuelExplosion";
 		class ACE_Actions {
             class ACE_MainActions {
                 displayName = "Interact";
@@ -51,7 +51,7 @@ class CfgVehicles
 		transportFuel=1000;
 		class DestructionEffects
 		{
-			class Smoke1
+			/*class Smoke1
 			{
 				intensity=1;
 				interval=1;
@@ -60,7 +60,7 @@ class CfgVehicles
 				simulation="particles";
 				type="ObjectDestructionSmokeSmall";
 			};
-			class Smoke2
+			/*class Smoke2
 			{
 				intensity=1;
 				interval=1;
@@ -68,7 +68,7 @@ class CfgVehicles
 				position="";
 				simulation="particles";
 				type="ObjectDestructionSmoke2";
-			};
+			};*/
 			class Fire1
 			{
 				intensity=0.5;
@@ -76,7 +76,7 @@ class CfgVehicles
 				lifeTime=2;
 				position="";
 				simulation="particles";
-				type="ObjectDestructionFire1Small";
+				type="RD501_BlueObjectDestructionFire1Small";
 			};
 			class HouseDestr
 			{

addons - Copy/RD501_Weapons/Droid_weapons/B2/config.cpp

@@ -0,0 +1,120 @@
+#define COMPONENT E5
+#include "../../../RD501_main/config_macros.hpp"
+#include "../../_common/common.hpp"
+
+
+
+class CfgPatches
+{
+	class macro_patch_name(b2)
+	{
+		author=DANKAUTHORS;
+		addonRootClass= macro_patch_name(weapons)
+		requiredAddons[]=
+		{
+			macro_patch_name(weapons)
+		};
+		requiredVersion=0.1;
+		units[]={};
+		weapons[]={
+			macro_new_weapon(b2,standard)
+		};
+	};
+};
+
+class CfgWeapons
+{
+	class Rifle_Base_F;
+	class Rifle_Long_Base_F: Rifle_Base_F
+	{};
+	class DBA_B2_Weapon: Rifle_Long_Base_F
+	{class Secondary: Rifle_Long_Base_F{};};
+	class macro_new_weapon(b2,standard):DBA_B2_Weapon
+	{
+		magazines[]=
+		{
+			macro_new_mag(b2gun,40)
+		};	
+	reloadAction="";
+	class Secondary: Secondary
+		{
+		muzzles[]=
+			{
+				"this"
+			};
+			magazines[]=
+			{
+				macro_new_mag(b2rocket,3)
+			};
+		};
+	
+	};
+};
+
+class CfgMagazines
+{
+	class CA_Magazine;
+	class 101st_B2_Rocket: CA_Magazine{};
+	class macro_new_mag(b2rocket,3):101st_B2_Rocket
+	{
+		descriptionShort="Wrist Rockets";
+		displayName="B2 Wrist Rockets";
+		count=3;
+		ammo=macro_new_ammo(b2rocket)
+	};
+	class 101st_B2_Mag: CA_Magazine{}
+	class macro_new_mag(b2gun,40):101st_B2_Mag
+	{
+		descriptionShort="B2 Droid Magazine";
+		displayName="B2 Droid Magazine";
+		count=40;
+		ammo=macro_new_ammo(b2gun)
+		tracersEvery=1;
+	};
+};
+
+class CfgAmmo
+{
+	class JLTS_bullet_carbine_red;
+	class 101st_Wrist_Rocket_Ammo: JLTS_bullet_carbine_red{}
+	class macro_new_ammo(b2rocket):101st_Wrist_Rocket_Ammo
+	{
+		cost=50;
+		caliber=3;
+		dangerRadiusBulletClose=16;
+		dangerRadiusHit=40;
+		effectFly="b2rockets_Effect";
+		explosionAngle=60;
+		explosive=0.80000001;
+		hit=100;
+		effectFlare="FlareShell";
+		effectsFire="CannonFire";
+		explosionDir="explosionDir";
+		explosionEffects="ATMissileExplosion";
+		explosionEffectsDir="explosionDir";
+		explosionPos="explosionPos";
+		explosionType="explosive";
+		indirectHit=5;
+		indirectHitRange=3;
+		model="\A3\Weapons_F\Ammo\ugl_slug";
+		muzzleEffect="BIS_fnc_effectFiredRocket";
+	};
+	class 101st_B2_Ammo: JLTS_bullet_carbine_red{}
+	class macro_new_ammo(b2gun):101st_B2_Ammo
+	{
+		cost=1;
+		caliber=3;
+		dangerRadiusBulletClose=16;
+		dangerRadiusHit=40;
+		explosionAngle=60;
+		explosive=0;
+		hit=20;
+		model="\RD501_Vehicle_Weapons\_ammo\data\laser_small_red.p3d";
+		tracerScale=1;
+		tracerStartTime=0;
+		tracerEndTime=10;
+		explosionSoundEffect="DefaultExplosion";
+		explosionEffects="ExploAmmoExplosionPlaneCAS";
+		craterEffects="ExploAmmoCrater";
+	};
+};

addons - Copy/RD501_Weapons/Grenades/config.cpp

@@ -51,44 +51,6 @@ class Shadow_Smoke
 		lifeTime = 25;
 	};
 };
-class CfgAmmo
-{
-	class SmokeShell;
-	class SWOP_SCAR_Dioxis;
-	class GrenadeHand_stone;
-	class RD501_ShadowMag: SWOP_SCAR_Dioxis
-	{
-		model = "\thermalD\Dioxis.p3d";
-		hit = 4;
-		class NVGMarkers
-		{
-			class Blinking1;
-			class Blinking2;
-		};
-		smokeColor[] = {0.2125,0.6258,0.48909998,1};
-		effectsSmoke = "Shadow_Smoke";
-	};
-};
-class CfgMagazines
-{
-	class SmokeShell;
-	class EGLM;
-	class RD501_BlueShadow_Grenade: SmokeShell
-	{
-		model = "\thermalD\Dioxis.p3d";
-		displayName = "1Rnd Blue Shadow Grenade";
-		picture = "\thermalD\dioxisgp_x_ca.paa";
-		displayNameShort = "Blue Shadow Grenade";
-		descriptionShort = "Blue Shadow Grenade";
-		ammo = "RD501_ShadowMag";
-		mass = 3;
-		class Library
-		{
-			libTextDesc = "";
-		};
-	};
-
-};
 class CfgWeapons
 {
 	class Default;
@@ -98,14 +60,14 @@ class CfgWeapons
 	};
 	class Throw: GrenadeLauncher
 	{
-		muzzles[] += {"Shadow_Muzzle","Imploder_Muzzle","Thermaldet_Muzzle","Squad_Shield_Muzzle","Squad_Shield_Trench_Muzzle","Personal_Shield_Muzzle", "Throwable_C_Type_Muzzle"};
+		muzzles[] += {"Shadow_Muzzle","Imploder_Muzzle","Thermaldet_Muzzle","Squad_Shield_Muzzle","Squad_Shield_Trench_Muzzle","Personal_Shield_Muzzle", "Throwable_C_Type_Muzzle","SuperSmoke_Muzzle","Dioxis_Muzzle"};
 		class Shadow_Muzzle: ThrowMuzzle
 		{
-			magazines[] = {"RD501_BlueShadow_Grenade"};
+			magazines[] = {macro_new_mag(blueshadow,1)};
 		};
 		class Imploder_Muzzle: ThrowMuzzle
 		{
-			magazines[] = {,macro_new_mag(imploder,1)};
+			magazines[] = {macro_new_mag(imploder,1)};
 		};
 		class Thermaldet_Muzzle: ThrowMuzzle
 		{
@@ -127,5 +89,13 @@ class CfgWeapons
 		{
 			magazines[] = {macro_new_mag(throwable_c_type,1)};
 		};
+		class SuperSmoke_Muzzle: ThrowMuzzle
+		{
+			magazines[] = {macro_new_mag(super_smoke,1)};
+		};
+		class Dioxis_Muzzle: ThrowMuzzle
+		{
+			magazines[] = {macro_new_mag(dioxis,1)};
+		};
 	};
 };

addons - Copy/RD501_Weapons/RAMER/config.cpp

@@ -30,7 +30,7 @@ class cfgWeapons
 		baseWeapon=macro_new_weapon_nofam(t21)
 		displayname="Republic T21 R.A.M.E.R."
 		ACE_Overheating_mrbs = 300000;
-		
+		ace_overheating_allowSwapBarrel = 1;
 		magazines[]=
 		{
 			macro_new_mag(50mw,10)

addons - Copy/RD501_Weapons/_acc/config.cpp

@@ -584,7 +584,7 @@ class RD501_DMS_TI: optic_DMS
 		};
 		inertia=0.2;
 	};
-	class RD501_DMS_2_TI: RD501_DMS
+	class RD501_DMS_2_TI: RD501_DMS_TI
 	{
 		picture="\RD501_weapons\_acc\data\rd501_ico_lr_02_ca.paa";
 		model="\RD501_weapons\_acc\data\rd501_dms_2.p3d";
@@ -594,7 +594,7 @@ class RD501_DMS_TI: optic_DMS
 			modelOptics="\RD501_weapons\_acc\data\RD501_scope2_DMS";
 		};
 	};
-	class RD501_DMS_3_TI: RD501_DMS
+	class RD501_DMS_3_TI: RD501_DMS_TI
 	{
 		picture="\RD501_weapons\_acc\data\rd501_ico_lr_03_ca.paa";
 		model="\RD501_weapons\_acc\data\rd501_dms_3.p3d";
@@ -604,7 +604,7 @@ class RD501_DMS_TI: optic_DMS
 			modelOptics="\RD501_weapons\_acc\data\RD501_scope3_DMS";
 		};
 	};
-	class RD501_DMS_4_TI: RD501_DMS
+	class RD501_DMS_4_TI: RD501_DMS_TI
 	{
 		picture="\RD501_weapons\_acc\data\rd501_ico_lr_03_ca.paa";
 		model="\RD501_weapons\_acc\data\rd501_dms_4.p3d";

addons - Copy/RD501_Weapons/_ammo/config.cpp

@@ -32,6 +32,7 @@ class CfgAmmo
 	class B_12Gauge_Pellets_Submunition;
 	class B_12Gauge_Pellets_Submunition_Deploy;
 	class FlareBase;
+	class SmokeShell;
 	class JLTS_bullet_stun;
 	class macro_new_ammo(surrender_stun): JLTS_bullet_stun
 	{
@@ -331,7 +332,21 @@ class CfgAmmo
         rd501_fired_deployable_personal_offset[] = {0.1, 0.9, 0.4};
         rd501_fired_deployable_personal_bone = "pelvis";
 		simulation="shotShell";
-	}
+	};
+	class macro_new_ammo(super_smoke) : SmokeShell
+	{
+		effectsSmoke="RD501_ThickSmokeShellWhiteEffect";
+	};
+	class macro_new_ammo(dioxis) : SmokeShell
+	{
+		effectsSmoke="RD501_DioxisSmokeShellEffect";
+		smokeColor[]={0.21250001,0.75580001,0.35909998,1};
+	};
+	class macro_new_ammo(blueshadow) : SmokeShell
+	{
+		effectsSmoke="RD501_DioxisSmokeShellEffect";
+		smokeColor[] = {0.2125,0.3,0.8,1};
+	};
 ///////////////////////////////////////////////////////////////////////
 /////////////////////////Shotgun///////////////////////////////////////
 //////////////////////////////////////////////////////////////////////

addons - Copy/RD501_Weapons/_mag/config.cpp

@@ -27,6 +27,7 @@ class CfgMagazines
 	class 3AS_ThermalDetonator;
 	class 3AS_BaridumCore;
 	class 2Rnd_12Gauge_Pellets;
+	class SmokeShell;
 
 	////////////////////////////////////////////////////
 	/////////////Rifle/Pistol Magazines/////////////////
@@ -392,7 +393,33 @@ class CfgMagazines
 		descriptionShort = "Personal Shield";
 		picture="\RD501_Weapons\_mag\data\rd501_icon_mag_imploder.paa";
 	};
-
+	class macro_new_mag(super_smoke,1):SmokeShell
+	{
+		author="RD501"
+		scope=2;
+		displayName = "Republic J00-L VapeNation"
+		displayNameShort = "VapeNation"
+		count=1;
+		ammo=macro_new_ammo(super_smoke)
+	};
+	class macro_new_mag(dioxis,1):SmokeShell
+	{
+		author="RD501"
+		scope=2;
+		displayName = "Dioxis Grenade"
+		displayNameShort = "Dioxis"
+		count=1;
+		ammo=macro_new_ammo(dioxis)
+	};
+	class macro_new_mag(blueshadow,1):SmokeShell
+	{
+		author="RD501"
+		scope=2;
+		displayName = "Blue Shadow Grenade"
+		displayNameShort = "Blue Shadow"
+		count=1;
+		ammo=macro_new_ammo(blueshadow)
+	};
 	////////////////////////////////////////////////////
 	/////////////Missile  Magazines/////////////////////
 	////////////////////////////////////////////////////