Merge pull request #133 from 501st-Aux-Mod-Team/SWOPBGONE

Swopbgone

addons - Copy/RD501_Droids/droid_macros.hpp

@@ -13,8 +13,8 @@
 #define macro_e5_mag "JLTS_E5_mag"
 #define macro_e5_mags _8(macro_e5_mag)
 
-#define macro_lmg "RD501_e5_C"
-#define macro_lmg_mag "RD501_20mw_x90_mag"
+#define macro_lmg "JLTS_E5C"
+#define macro_lmg_mag "JLTS_E5C_mag"
 #define macro_lmg_mags _8(macro_lmg_mag)
 
 #define macro_at_heavy "JLTS_E60R_AT"

addons - Copy/RD501_Helmets/aviation/config.cpp

@@ -7,7 +7,7 @@ class CfgPatches
 {
 	class macro_patch_name(aviation_helmets)
 	{
-		author=DANKAUTHORS
+		author=RD501
 		addonRootClass= macro_patch_name(helmets)
 		requiredAddons[]=
 		{
@@ -66,13 +66,11 @@ class CfgWeapons
 	NEW_501_Pilot_HELM(keryl,Keryl,pilots\keryl.paa)
 	NEW_501_Pilot_HELM(kaj,Kaj,pilots\Kaj.paa)
 	NEW_501_Pilot_HELM(kitty,Kitty,pilots\kitty.paa)
-	NEW_501_Pilot_HELM(koop,Koop,pilots\Koop.paa)
 	NEW_501_Pilot_HELM(kushiban,Kushiban,pilots\Kushiban.paa)
 	NEW_501_Pilot_HELM(orange,Orange,pilots\orange.paa)
 	NEW_501_Pilot_HELM(nocturnal,Warbird,pilots\Nocturnal.paa)
 	NEW_501_Pilot_HELM(aspect,Aspect,pilots\Aspect.paa)
 	NEW_501_Pilot_HELM(Galaxy,Galaxy,pilots\Galaxy.paa)
-	NEW_501_Pilot_HELM(Halligan,Halligan,pilots\Halligan.paa)
 	NEW_501_Pilot_HELM(Floff,Floff,pilots\Floff.paa)
 	NEW_501_Pilot_HELM(Gothic,Gothic,pilots\Gothic.paa)
 	NEW_501_Pilot_HELM(Shnuffles,Shnuffles,pilots\Shnuffles.paa)
@@ -118,66 +116,6 @@ class CfgWeapons
 			"\501st_Helmets\AB\data\red_glow.rvmat"//"swop_clones\data\helmpilot.rvmat"//  \501st_Helmets\AB\data\white_glow.rvmat
 		};
 	};
-	class macro_new_helmet(pilot,lord_krayt): macro_new_helmet(pilot,base)
-	{
-		scope = 2;
-		displayName = "Clone pilot helmet (501st legion) Lord Krayt";
-		hiddenSelectionsTextures[] = {macro_custom_helmet_textures\aviation\pilots\LordKrayt.paa};
-		subItems[] = {"G_B_Diving"};
-
-		#include "memenai.hpp"
-
-	};
-
-	class macro_new_helmet(pilot,king_krayt): macro_new_helmet(pilot,lum_base)
-	{
-		scope = 2;
-		displayName = "Clone pilot helmet (501st legion) King Krayt";
-		hiddenSelectionsTextures[] = {macro_custom_helmet_textures\aviation\pilots\KingKrayt.paa};
-		subItems[] = {"G_B_Diving"};
-		#include "memenai.hpp"
-
-		hiddenSelectionsMaterials[]=
-		{
-			"",
-			"\501st_Helmets\AB\data\white_glow.rvmat"//"swop_clones\data\helmpilot.rvmat"//  \501st_Helmets\AB\data\white_glow.rvmat
-		};
-	};
-
-	class macro_new_helmet(pilot,royal_krayt): macro_new_helmet(pilot,king_krayt)
-	{
-		displayName = "Clone pilot helmet (501st legion) Royal Krayt";
-		hiddenSelectionsTextures[] = {macro_custom_helmet_textures\aviation\pilots\purple.paa};
-	}
-
-	class macro_new_helmet(pilot,cold_krayt): macro_new_helmet(pilot,king_krayt)
-	{
-			displayName = "Clone pilot helmet (501st legion) Ice Krayt";
-		hiddenSelectionsTextures[] = {macro_custom_helmet_textures\aviation\pilots\blue.paa};
-	}
-
-	class macro_new_helmet(pilot,angrr_krayt): macro_new_helmet(pilot,king_krayt)
-	{
-		displayName = "Clone pilot helmet (501st legion) Angrr Krayt";
-		hiddenSelectionsTextures[] = {macro_custom_helmet_textures\aviation\pilots\red.paa};
-	}
-
-	//gollddd
-	// class macro_new_helmet(pilot,midas_lrayt): macro_new_helmet(pilot,lum_base)
-	// {
-	// 	scope = 2;
-	// 	displayName = "Clone pilot helmet (501st legion) Midas Krayt";
-	// 	hiddenSelectionsTextures[] = {macro_custom_helmet_textures\aviation\pilots\KingKrayt.paa};
-	// 	subItems[] = {"G_B_Diving"};
-	// 	#include "memenai.hpp"
-
-	// 	hiddenSelectionsMaterials[]=
-	// 	{
-	// 		"", //RD501_Laat\textures\gold.rvmat
-	// 		"RD501_Helmets\_materials\gold.rvmat",//"\501st_Helmets\AB\data\white_glow.rvmat"//"swop_clones\data\helmpilot.rvmat"//  \501st_Helmets\AB\data\white_glow.rvmat
-	// 	};
-	// };
-
 
 
 	class 212th_Engineer_Helmet_501st;

addons - Copy/RD501_Helmets/aviation/memenai.hpp

@@ -1,24 +0,0 @@
-class ItemInfo: ItemInfo
-{
-    mass = 30;
-    uniformmodel = "\501st_helmets\AB\AB_helmet_p1.p3d";//"SWOP_clones\helmet\CloneHelmetPilot.p3d";
-    modelSides[] = {6};
-    hiddenSelections[] = {
-        "camo1",
-        "mat"
-    };
-    material = -1;
-    explosionShielding = 200.2;
-    minimalHit = 550.01;
-    passThrough = 0.001;
-    armor=100000;
-    class HitpointsProtectionInfo
-    {
-        class Head
-        {
-            hitpointName = "HitHead";
-            armor = 10000;
-            passThrough = 0.6;
-        };
-    };
-};

addons - Copy/RD501_Helmets/infantry/config.cpp

@@ -29,12 +29,8 @@ class CfgWeapons
 	NEW_501_Inf_Helm_JLTS(Pilot,Pilot,Pilot.paa)
 	
 	NEW_501_Inf_Helm_JLTS(Archaic,Archaic,Archaic.paa)
-	NEW_501_Inf_Helm_JLTS(Blade,Blade,Blade.paa)
-	NEW_501_Inf_Helm_JLTS(Delaney,Delaney,Delaney.paa)
-	NEW_501_Inf_Helm_JLTS(Fallout,Fallout,Fallout.paa)
 	NEW_501_Inf_Helm_JLTS(Hosed,Hosed,Hosed.paa)
 	NEW_501_Inf_Helm_JLTS(Kestrel,Kestrel,Kestrel.paa)
-	NEW_501_Inf_Helm_JLTS(Lantern,Lantern,Lantern.paa)
 	NEW_501_Inf_Helm_JLTS(Odin,Odin,Odin.paa)
 	NEW_501_Inf_Helm_JLTS(Player,Player,Player.paa)
 	NEW_501_Inf_Helm_JLTS(Roster,Roster,Roster.paa)
@@ -57,23 +53,16 @@ class CfgWeapons
 	NEW_501_Inf_Helm_JLTS(Chaser,Chaser,Chaser.paa)
 	NEW_501_Inf_Helm_JLTS(Reck,Reck,Reck.paa)
 	NEW_501_Inf_Helm_JLTS(Cursed,Cursed,Cursed.paa)
-	NEW_501_Inf_Helm_JLTS(Kahn,Kahn,Kahn.paa)
-	NEW_501_Inf_Helm_JLTS(Weaver,Weaver,Weaver.paa)
 	NEW_501_Inf_Helm_JLTS(Alistair,Alistair,Alistair.paa)
 	NEW_501_Inf_Helm_JLTS(Dimitri,Dimitri,Dimitri.paa)
-	NEW_501_Inf_Helm_JLTS(Loki,Loki,Loki.paa)
 	NEW_501_Inf_Helm_JLTS(Money,Money,Money.paa)
-	NEW_501_Inf_Helm_JLTS(Nightingale,Nightingale,Nightingale.paa)
-	NEW_501_Inf_Helm_JLTS(Point,Point,Point.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)
-	NEW_501_Inf_Helm_JLTS(Strill,Strill,Strill.paa)
 	NEW_501_Inf_Helm_JLTS(Husky,Husky,Husky.paa)
-	NEW_501_Inf_Helm_JLTS(Parrott,Parrott,Parrott.paa)
 	NEW_501_Inf_Helm_JLTS(Jay,Jay,Jay.paa)
 	NEW_501_Inf_Helm_JLTS(Drifter,Drifter,Drifter.paa)
 	NEW_501_Inf_Helm_JLTS(Weiss,Weiss,Weiss.paa)
@@ -84,9 +73,7 @@ class CfgWeapons
 	NEW_501_Inf_Helm_JLTS(Delta,Delta,Delta.paa)
 	NEW_501_Inf_Helm_JLTS(Moist,Moist,Moist.paa)
 	NEW_501_Inf_Helm_JLTS(Richard,Richard,Richard.paa)
-	NEW_501_Inf_Helm_JLTS(Zen,Zen,Zen.paa)
 	NEW_501_Inf_Helm_JLTS(Zulu,Zulu,Zulu.paa)
-	NEW_501_Inf_Helm_JLTS(Bronson,Bronson,Bronson.paa)
 	NEW_501_Inf_Helm_JLTS(Chan,Chan,Chan.paa)
 	NEW_501_Inf_Helm_JLTS(Guide,Guide,Guide.paa)
 	NEW_501_Inf_Helm_JLTS(Ford,Ford,Ford.paa)
@@ -95,26 +82,18 @@ class CfgWeapons
 	NEW_501_Inf_Helm_JLTS(Crisis,Crisis,Crisis.paa)
 	NEW_501_Inf_Helm_JLTS(Deus,Deus,Deus.paa)
 	NEW_501_Inf_Helm_JLTS(Osprey,Osprey,Osprey.paa)
-	NEW_501_Inf_Helm_JLTS(Shade,Shade,Shade.paa)
 	NEW_501_Inf_Helm_JLTS(Clock,Clock,Clock.paa)
 	NEW_501_Inf_Helm_JLTS(Habas,Habas,Habas.paa)
 	NEW_501_Inf_Helm_JLTS(Koda,Koda,Koda.paa)
 	NEW_501_Inf_Helm_JLTS(Nuwisha,Nuwisha,Nuwisha.paa)
 	NEW_501_Inf_Helm_JLTS(Swanny,Swanny,Swanny.paa)
 	NEW_501_Inf_Helm_JLTS(Fluorite,Fluorite,Fluorite.paa)
-	NEW_501_Inf_Helm_JLTS(Jupiter,Jupiter,Jupiter.paa)
 	NEW_501_Inf_Helm_JLTS(Slyder,Slyder,Slyder.paa)
-	NEW_501_Inf_Helm_JLTS(Tim,Tim,Tim.paa)
 	NEW_501_Inf_Helm_JLTS(Sticks,Sticks,Sticks.paa)
-	NEW_501_Inf_Helm_JLTS(Weepier,Weepier,Weepier.paa)
-	NEW_501_Inf_Helm_JLTS(Sense,Sense,Sense.paa)
 	NEW_501_Inf_Helm_JLTS(Twine,Twine,Twine.paa)
-	NEW_501_Inf_Helm_JLTS(Toast,Toast,Toast.paa)
 	NEW_501_Inf_Helm_JLTS(Bishop,Bishop,Bishop.paa)
-	NEW_501_Inf_Helm_JLTS(Fancy,Fancy,Fancy.paa)
 	NEW_501_Inf_Helm_JLTS(Pro,Pro,Pro.paa)
 	NEW_501_Inf_Helm_JLTS(Shape,Shape,Shape.paa)
-	NEW_501_Inf_Helm_JLTS(Klown,Klown,Klown.paa)
 	NEW_501_Inf_Helm_JLTS(Drammon,Drammon,Drammon.paa)
 	NEW_501_Inf_Helm_JLTS(Spectre,Spectre,Spectre.paa)
 	NEW_501_Inf_Helm_JLTS(Andromeda,Andromeda,Andromeda.paa)
@@ -122,34 +101,21 @@ class CfgWeapons
 	NEW_501_Inf_Helm_JLTS(Flux,Flux,Flux.paa)
 	NEW_501_Inf_Helm_JLTS(Goddest,Goddest,Goddest.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)
-	NEW_501_Inf_Helm_JLTS(Strill,Strill,Strill.paa)
 	NEW_501_Inf_Helm_JLTS(Bjorn,Bjorn,Bjorn.paa)
 	NEW_501_Inf_Helm_JLTS(Doug,Doug,Doug.paa)
 	NEW_501_Inf_Helm_JLTS(Dragon,Dragon,Dragon.paa)
 	NEW_501_Inf_Helm_JLTS(Fixit,Fixit,Fixit.paa)
 	NEW_501_Inf_Helm_JLTS(Legia,Legia,Legia.paa)
-	NEW_501_Inf_Helm_JLTS(Scruff,Scruff,Scruff.paa)
 	NEW_501_Inf_Helm_JLTS(Shadow,Shadow,Shadow.paa)
 	NEW_501_Inf_Helm_JLTS(Simon,Simon,Simon.paa)
 	NEW_501_Inf_Helm_JLTS(Sour,Sour,Sour.paa)
 	NEW_501_Inf_Helm_JLTS(Adhock,Adhock,Adhock.paa)
-	NEW_501_Inf_Helm_JLTS(Akaan,Akaan,Akaan.paa)
-	NEW_501_Inf_Helm_JLTS(Corey,Corey,Corey.paa)
 	NEW_501_Inf_Helm_JLTS(Koda,Koda,Koda.paa)
-	NEW_501_Inf_Helm_JLTS(Duke,Duke,Duke.paa)
 	NEW_501_Inf_Helm_JLTS(Rebellion,Rebellion,Rebellion.paa)
 	NEW_501_Inf_Helm_JLTS(Dadecoy,Dadecoy,Dadecoy.paa)
-	NEW_501_Inf_Helm_JLTS(Juggernaut,Juggernaut,Juggernaut.paa)
-	NEW_501_Inf_Helm_JLTS(Reck,Reck,Reck.paa)
-	NEW_501_Inf_Helm_JLTS(Archaic,Archaic,Archaic.paa)
-	NEW_501_Inf_Helm_JLTS(Kahn,Kahn,Kahn.paa)
 	NEW_501_Inf_Helm_JLTS(Cursed,Cursed,Cursed.paa)
-	NEW_501_Inf_Helm_JLTS(Zulu,Zulu,Zulu.paa)
 	NEW_501_Inf_Helm_JLTS(Compo,Compo,Compo.paa)
 	NEW_501_Inf_Helm_JLTS(Shape,Shape,Shape.paa)
-	NEW_501_Inf_Helm_JLTS(Klown,Klown,Klown.paa)
 	NEW_501_Inf_Helm_JLTS(Drammon,Drammon,Drammon.paa)
 	NEW_501_Inf_Helm_JLTS(Spectre,Spectre,Spectre.paa)
 	NEW_501_Inf_Helm_JLTS(Hackett,Hackett,Hackett.paa)
@@ -168,6 +134,15 @@ class CfgWeapons
 	NEW_501_Inf_Helm_JLTS(Bacon,Bacon,Bacon.paa)
 	NEW_501_Inf_Helm_JLTS(Aedan,Aedan,Aedan.paa)
 	NEW_501_Inf_Helm_JLTS(Midnight,Midnight,Midnight.paa)
+	NEW_501_Inf_Helm_JLTS(Versa,Versa,Versa.paa)
+	NEW_501_Inf_Helm_JLTS(Dakota,Dakota,Dakota.paa)
+	NEW_501_Inf_Helm_JLTS(Narrator,Narrator,Narrator.paa)
+	NEW_501_Inf_Helm_JLTS(Silver,Silver,Silver.paa)
+	NEW_501_Inf_Helm_JLTS(Sunshine,Sunshine,Sunshine.paa)
+	NEW_501_Inf_Helm_JLTS(Fenrir,Fenrir,Fenrir.paa)
+	NEW_501_Inf_Helm_JLTS(Kyrie,Kyrie,Kyrie.paa)
+	NEW_501_Inf_Helm_JLTS(Power,Power,Power.paa)
+	NEW_501_Inf_Helm_JLTS(Vulpes,Vulpes,Vulpes.paa)
 	NEW_501_ARC_Helm_JLTS(Duke,Duke,Duke.paa)
 	NEW_501_ARC_Helm_JLTS(Bronson,Bronson,Bronson.paa)
 	NEW_501_ARC_Helm_JLTS(Rayne,Rayne,Rayne.paa)

addons - Copy/RD501_Main/functions/magclamp/magclamp.sqf

@@ -13,7 +13,7 @@ macro_grp_fnc_name(magclamp,handle_universal) = {
     private _attached = _vehicle getVariable[_attached_var,objNull];
 
     if(isNull _attached) then {
-    	private _objects = nearestObjects [player, ["Car","Tank","Motorcycle","StaticWeapon","Air","Ship","Object"], 20];
+    	private _objects = nearestObjects [player, ["Car","Tank","Motorcycle","StaticWeapon","Air","Ship","Object","Thing"], 20];
 
     	private _target_index = 0;
 	    private _target = _objects select _target_index;

addons - Copy/RD501_Vehicles/air/HMP/config.cpp

@@ -42,11 +42,11 @@ class CfgPatches
 
 class CfgVehicles
 {
-	class swop_HMP_droidgunship;
+	class 442_hmp;//swop_HMP_droidgunship;
 
-	class swop_HMP_droidgunship_transport;
+	class 442_hmp_transport;//swop_HMP_droidgunship_transport;
 
-	class macro_new_vehicle(HMP,gunship):swop_HMP_droidgunship
+	class macro_new_vehicle(HMP,gunship):442_hmp//swop_HMP_droidgunship
 	{
 		scope=2;
 		scopeCurator=2;
@@ -75,7 +75,7 @@ class CfgVehicles
 
 	};
 
-	class macro_new_vehicle(HMP,transport): swop_HMP_droidgunship_transport//macro_new_vehicle(HMP,gunship)
+	class macro_new_vehicle(HMP,transport): 442_hmp_transport//swop_HMP_droidgunship_transport
 	{
 		displayName = "H.M.P Transport Mk.I";
 		forceInGarage = 1;

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

@@ -55,19 +55,11 @@ class CfgPatches
 		requiredVersion=0.1;
 		units[]=
 		{
-			macro_new_vehicle(AAT,Light_MkIII),
-			macro_new_vehicle(AAT,Medium_MkIII_Snow),
-			macro_new_vehicle(AAT,Medium_MkIII_Tropical),
 			macro_new_vehicle(AAT,King_MkIII),
 			macro_new_vehicle(AAT,King_MkIII_Urban),
-			macro_new_vehicle(AAT,Light_MkII),
-			macro_new_vehicle(AAT,Medium_MkII),
-			macro_new_vehicle(AAT,King_MkII),
-			macro_new_vehicle(AAT,Medium_tropical_MkII),
-			macro_new_vehicle(AAT,Medium_urban_MkII),
-			macro_new_vehicle(AAT,Medium_snow_MkII),
-			macro_new_vehicle(AAT,King_red_MkII),
-			macro_new_vehicle(AAT,King_green_MkII)
+			macro_new_vehicle(AAT,Medium_MkIII_Snow),
+			macro_new_vehicle(AAT,Medium_MkIII_Tropical),
+			macro_new_vehicle(AAT,Light_MkIII)
 		};
 		weapons[]=
 		{
@@ -82,166 +74,6 @@ class DefaultEventhandlers;
 class CfgVehicles
 {
 	#include "inheritance.hpp"
-	class macro_new_vehicle(AAT,Light_MkII):O_SWOP_AAT_1
-	{
-		scope=2
-		armor = 250;
-		forceInGarage = 1;
-		displayName="Light AAT Mk.II";
-		hiddenSelectionsTextures[] = {
-				macro_vehicle_textures\AAT\light_aat\saturated\king_AAT_body.paa,
-				macro_vehicle_textures\AAT\light_aat\saturated\king_AAT_gun.paa
-			};\
-
-		faction = macro_cis_faction
-		editorSubcategory = macro_editor_cat(tank)
-		vehicleClass = macro_editor_vehicle_type(tank)
-
-		crew=macro_new_unit_class(opfor,B1_crew)
-
-		class Turrets:Turrets
-		{
-			class MainTurret:MainTurret
-			{
-				class Turrets:Turrets
-				{
-					class CommanderOptics:CommanderOptics
-					{
-						weapons[] = {"Cannon_AAT_mc"};
-						magazines[] = {"100Rnd_Laser_Cannon_AAT_m", "100Rnd_Laser_Cannon_AAT_m", "100Rnd_Laser_Cannon_AAT_m"};
-						macro_enable_rotation
-					};	
-				};
-				maxHorizontalRotSpeed = 1.2*2;
-				maxVerticalRotSpeed = 1.2*2;
-				weapons[] = {"Cannon_EWEBSWBFgun"};
-				magazines[] = 
-				{
-					 "1000Rnd_Laser_Cannon_EWEBSWBF",
-					 "1000Rnd_Laser_Cannon_EWEBSWBF",
-					 "1000Rnd_Laser_Cannon_EWEBSWBF",
-					 "1000Rnd_Laser_Cannon_EWEBSWBF"
-				};
-				
-			};
-		};
-		class EventHandlers :DefaultEventhandlers {};
-	};
-	
-
-	class macro_new_vehicle(AAT,Medium_MkII):O_SWOP_AAT_1
-	{
-		scope=2
-		forceInGarage = 1;
-		displayName="Medium AAT Mk.II";
-		armor = 500;
-		maxSpeed = 75;
-
-		crew=macro_new_unit_class(opfor,B1_crew)
-
-		faction = macro_cis_faction
-		editorSubcategory = macro_editor_cat(tank)
-		vehicleClass = macro_editor_vehicle_type(tank)
-		class Turrets:Turrets
-		{
-			class MainTurret:MainTurret
-			{
-				class Turrets:Turrets
-				{
-					//commanders guns,the side ones
-					class CommanderOptics:CommanderOptics
-					{
-						weapons[] = {"Cannon_ITTLaser"};
-						magazines[] = {"10000Rnd_ITTLaser_Cannon_Minigun","10000Rnd_ITTLaser_Cannon_Minigun"};
-						macro_enable_rotation	
-					};
-					
-				};
-				//main turret guns
-				weapons[] = {
-					macro_new_weapon(aat_cannon,mbt),
-					"Cannon_ITTLaser"
-				};
-				magazines[] = 
-				{
-					macro_new_mag(aat_mbt,50),
-					macro_new_mag(aat_mbt,50),
-					macro_new_mag(aat_mbt,50),
-					macro_new_mag(aat_mbt,50),
-					"10000Rnd_ITTLaser_Cannon_Minigun"
-				};
-				maxHorizontalRotSpeed = 1.2;
-				maxVerticalRotSpeed = 1.2;
-				
-			};
-		};
-		class EventHandlers :DefaultEventhandlers {};
-
-	};
-
-	class macro_new_vehicle(AAT,King_MkII):O_SWOP_AAT_1
-	{
-		scope=2
-		forceInGarage = 1;
-		displayName="King AAT Mk.II";
-		armor = 1000;
-		//enginePower = 4;//405
-		maxSpeed = 30;//75
-
-		crew=macro_new_unit_class(opfor,B1_crew)
-
-		faction = macro_cis_faction
-		editorSubcategory = macro_editor_cat(tank)
-		vehicleClass = macro_editor_vehicle_type(tank)
-		class Turrets:Turrets
-		{
-			class MainTurret:MainTurret
-			{
-				class Turrets:Turrets
-				{
-					class CommanderOptics:CommanderOptics
-					{
-						maxHorizontalRotSpeed = .1;//1.8
-						maxVerticalRotSpeed = .1;//1.8
-						macro_enable_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;
-				maxVerticalRotSpeed = 1.2/3;
-				weapons[] = {
-					macro_new_weapon(aat_cannon,king),
-					"Cannon_EWEBSWBFgun"
-				};
-				magazines[] = {
-					"1000Rnd_Laser_Cannon_EWEBSWBF",
-					macro_new_mag(aat_mbt,10),
-					macro_new_mag(aat_mbt,10),
-					macro_new_mag(aat_mbt,10)
-				};
-					
-				
-			};
-		};
-
-		hiddenSelectionsTextures[] = {
-				macro_vehicle_textures\AAT\king_AAT\blue\king_AAT_body.paa,
-				macro_vehicle_textures\AAT\king_AAT\blue\king_AAT_gun.paa
-		};
-		class EventHandlers :DefaultEventhandlers {};
-	};
-
-	macro_new_medium_aat(macro_new_vehicle(AAT,Medium_tropical_MkII),"Medium (Tropical Thunder) AAT MKII",medium_aat\tropical\Trop_aat2.paa,medium_aat\tropical\Trop_aat1.paa)
-	macro_new_medium_aat(macro_new_vehicle(AAT,Medium_urban_MkII),"Medium (Urban Warfighter) AAT MKII",medium_aat\urban\king_AAT_body.paa,medium_aat\urban\king_AAT_gun.paa)
-	macro_new_medium_aat(macro_new_vehicle(AAT,Medium_snow_MkII),"Medium (Snow White) AAT MKII",medium_aat\white\king_AAT_body.paa,medium_aat\white\king_AAT_gun.paa)
-
-	macro_new_king_aat(macro_new_vehicle(AAT,King_red_MkII),"King (Red Bull) AAT MKII",king_AAT\red\king_AAT_body.paa,king_AAT\red\king_AAT_gun.paa)
-	macro_new_king_aat(macro_new_vehicle(AAT,King_green_MkII),"King (Green Bean) AAT MKII",king_AAT\green\king_AAT_body.paa,king_AAT\green\king_AAT_gun.paa)
-
 	/*		--------	*/
 	/*	  | 3AS AATs |	*/
 	/*		--------	*/

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

@@ -35,7 +35,7 @@ class CfgPatches
 class DefaultEventhandlers;
 class CfgVehicles
 {
-	class SWOP_Droideka;
+	class k_CIS_Droideka;
 
 	// REMOVE FROM HERE
 	/*class macro_new_vehicle(droideka,base_depr) :SWOP_Droideka
@@ -97,7 +97,7 @@ class CfgVehicles
 
 
 
-	class macro_new_vehicle(droideka,base): SWOP_Droideka
+	class macro_new_vehicle(droideka,base): k_CIS_Droideka
 	{
 		scope=2;
 		displayName = "Static Droideka";

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

@@ -30,7 +30,8 @@ class CfgPatches
 			macro_new_vehicle(resuppy_box,platoon_joint),
 			macro_new_vehicle(resuppy_box,small_medical),
 			macro_new_vehicle(resuppy_box,small_ammo),
-			macro_new_vehicle(resuppy_box,small_joint)
+			macro_new_vehicle(resuppy_box,small_joint),
+			macro_new_vehicle(resuppy_box,platoon_medical_tent)
 		};
 		weapons[]=
 		{
@@ -64,6 +65,26 @@ class CfgVehicles
 		};
 		class EventHandlers :DefaultEventhandlers{};
 	};
+	class macro_new_vehicle(resuppy_box,platoon_medical_tent): plp_ct_HighSecContBlack
+	{
+		scope = 2;
+		scopeCurator = 2;
+		displayName = "Republic M*A*S*H";
+		hiddenSelections[] = {"camo", "camoB", "camo1", "camo2"};
+		hiddenSelectionsTextures[] = {"\plp_containers\StcHighSec\plp_ct_HighSecContRed.paa", "", "\plp_containers\StcHighSec\plp_ct_HighSec_LightOrange_co.paa", ""};
+		hiddenSelectionsMaterials[] = {"\plp_containers\StcHighSec\plp_ct_HighSecCont_Metal.rvmat", "\plp_containers\StcHighSec\plp_ct_HighSecCont_MetalB.rvmat", "\plp_containers\StcHighSec\plp_ct_HighSec_Light.rvmat", ""};
+		editorCategory = macro_editor_cat(suppplies)
+		editorSubcategory = macro_editor_cat(resupply)
+		class TransportItems{};
+		class EventHandlers :DefaultEventhandlers{};
+		class assembleInfo
+		{
+			dissasembleTo[]=
+			{
+				"Land_Medevac_house_V1_F";
+			};
+		};
+	};
 
 	class macro_new_vehicle(resuppy_box,platoon_ammo): plp_ct_HighSecContBlack
 	{
@@ -78,17 +99,17 @@ class CfgVehicles
 
 		class TransportItems
 		{
-			#include "ammo_platoon_items.hpp"
+			//#include "ammo_platoon_items.hpp"
 		};
 
 		class TransportMagazines
 		{
-			#include"ammo_platoon_mag.hpp"
+			//#include"ammo_platoon_mag.hpp"
 		};	
 
 		class TransportWeapons
 		{
-			#include "ammo_platoon_weap.hpp"
+			//#include "ammo_platoon_weap.hpp"
 		};
 
 		class EventHandlers :DefaultEventhandlers{};
@@ -105,18 +126,18 @@ class CfgVehicles
 
 		class TransportItems
 		{
-			#include "ammo_platoon_items.hpp"
-			#include "medical_platoon_items.hpp"
+			//#include "ammo_platoon_items.hpp"
+			//#include "medical_platoon_items.hpp"
 		};
 
 		class TransportMagazines
 		{
-			#include"ammo_platoon_mag.hpp"
+			//#include"ammo_platoon_mag.hpp"
 		};	
 
 		class TransportWeapons
 		{
-			#include "ammo_platoon_weap.hpp"
+			//#include "ammo_platoon_weap.hpp"
 		};
 
 		class EventHandlers :DefaultEventhandlers{};
@@ -216,17 +237,17 @@ class CfgVehicles
 		ace_cargo_canLoad = 1;  
 		class TransportItems
         {
-        	#include "ammo_small_items.hpp"
+        	//#include "ammo_small_items.hpp"
         };
 			
 		class TransportMagazines
         {
-        	#include "ammo_small_mag.hpp"	
+        	//#include "ammo_small_mag.hpp"	
         };	
 		
 		class TransportWeapons
         {
-        	#include "ammo_small_weap.hpp"
+        	//#include "ammo_small_weap.hpp"
         };
 		
 

addons - Copy/RD501_Weapons/Consumables/config.cpp

@@ -0,0 +1,59 @@
+class cfgPatches
+{
+    class RD501_ACE_Medical
+    {
+        requiredAddons[] = {};
+		units[]={};
+		weapons[]={"RD501_Painkiller"};
+    };
+};
+class CfgWeapons
+{
+    class ACE_ItemCore;
+	class CBA_MiscItem_ItemInfo;
+    class RD501_Painkiller: ACE_ItemCore
+    {
+        scope = 2;
+		displayName = "Painkiller Autoinjector";
+		picture = "\z\ace\addons\medical_treatment\ui\morphine_ca.paa";
+		model = "\z\ace\addons\medical_treatment\data\morphine.p3d";
+		descriptionShort = "Drink some water and Rest";
+		descriptionUse = "Inbuilt Clone Armor injector for easy pain relief";
+		class ItemInfo: CBA_MiscItem_ItemInfo
+		{
+			mass = 0.1;
+		};
+	};  
+};
+class ACE_Medical_Treatment
+{
+    class Morphine;
+    
+    class Medication
+    {
+        class RD501_Painkiller: Morphine
+        {
+            painReduce = 0.3;
+            hrIncreaseLow[] = {-2,-4};
+            hrIncreaseNormal[] = {-2,-6};
+            hrIncreaseHigh[] = {-2,-7};
+            timeInSystem = 600;
+            timeTillMaxEffect = 30;
+            maxDose = 10;
+            incompatibleMedication[] = {};
+            viscosityChange = -2;
+        };
+    };
+};
+class ACE_Medical_Treatment_Actions
+{
+    class Morphine;
+    class RD501_Painkiller:Morphine
+    {
+        displayName = "Painkiller Autoinjector";
+        displayNameProgress = "Injecting Painkillers";
+        allowedSelections[] = {"LeftArm", "RightArm", "LeftLeg", "RightLeg"};
+        items[] = {"RD501_Painkiller"};
+        treatmentTime = 1;
+    };
+};

addons - Copy/RD501_Weapons/RAMER/config.cpp

@@ -21,21 +21,6 @@ class CfgPatches
 };
 class cfgWeapons
 {
-	/*class SWOP_T21BlasterRifle;
-	class RD501_RAMER: SWOP_T21BlasterRifle
-	{
-		baseWeapon="RD501_RAMER";
-		author="RD501";
-		scope=2;
-		scopecurator=2;
-		scopearsenal=2;
-		displayname="Republic Anti Material Energy Rifle";
-		descriptionShort="(R.A.M.E.R)";
-		magazines[]=
-		{
-			"RD501_RAMER_x6_mag"
-		};
-	};*/
 	class arifle_MX_Base_F;
 	class JLTS_EPL2:arifle_MX_Base_F
 	{
@@ -47,7 +32,7 @@ class cfgWeapons
 		displayname="T21 R.A.M.E.R."
 		magazines[]=
 		{
-			macro_new_mag(RAMER,6)
+			macro_new_mag(50mw,10)
 		};
 		class Single : Single
 		{

addons - Copy/RD501_Weapons/config.cpp

@@ -162,24 +162,6 @@ class CfgMagazines
 		initSpeed = 310;
 	};
 
-	class macro_new_mag(z6,400): SWOP_e11_Mag
-	{
-		author = "rd501";
-		model = "\SW_ExtraWeapons\PICKUPS\power_cell.p3d";
-		ammo = macro_new_ammo(z6);
-		displayName = "400Rnd Z6 Rotary Blaster Magazine";
-		descriptionShort = "400Rnd Z6 Magazine";
-		count = 400;
-		weight = 100;
-		mass = 30;
-		ACE_isBelt = 1;
-		initSpeed = 500;//360;
-		picture = "\SW_CloneWarsWeapons\SW_Z6\UI\SW_Z6-mag.paa";
-		
-	};
-
-	
-	#include "_mag/flare_mag.hpp"
 	class 1Rnd_HE_Grenade_shell;
 	class macro_new_mag(AT_GL,2): CA_Magazine
 	{
@@ -241,84 +223,6 @@ class CfgMagazines
 		initSpeed = 310;
 	};
 
-	class SWOP_DC15ABlasterRifle_Mag;
-	class macro_new_mag(DC15a_Med,30): SWOP_DC15ABlasterRifle_Mag
-	{
-		author = "RD501";
-		scope = 2;
-		model = "\SW_ExtraWeapons\PICKUPS\energy_cell.p3d";
-		picture = "\SW_ExtraWeapons\PICKUPS\UI\icons\energycell_X_ca.paa";
-		displayName = "30Rnd DC-15A Mid Energy Rounds";
-		ammo = macro_new_ammo(dc15a_med);
-		tracersEvery = 1;
-		count = 30;
-		descriptionShort = "30Rnd DC15A Mid Energy";
-		mass = 20;
-		initSpeed = 380;
-	};
-
-	class macro_new_mag(DC15a_High,15): macro_new_mag(DC15a_Med,30)
-	{
-		displayName = "15Rnd DC-15A High Energy Rounds";
-		ammo = macro_new_ammo(dc15a_high);
-		count = 15;
-		descriptionShort = "15Rnd DC15A High Energy Rounds";
-		mass = 35;
-		initSpeed = 1200;
-	};
-	 
-	class macro_new_mag(DC15a_Low,60): macro_new_mag(DC15a_Med,30)
-	{
-		displayName = "60Rnd DC-15A Low Energy Rounds";
-		ammo = macro_new_ammo(dc15a_low);
-		count = 60;
-		descriptionShort = "60Rnd DC15A Low Energy";
-		mass = 30;
-	};
-
-	class  macro_new_mag(DC15a_box_mag,240): CA_Magazine
-	{
-		author = "RD501";
-		scope = 2;
-		model = "\SW_ExtraWeapons\PICKUPS\energy_cell.p3d";
-		picture = "\SW_ExtraWeapons\PICKUPS\UI\icons\energycell_X_ca.paa";
-		displayName = "240Rnd Box DC-15A Low Energy Rounds";
-		ammo =  macro_new_ammo(dc15a_low);
-		tracersEvery = 1;
-		count =240;
-		descriptionShort = "240Rnd DC15A Low Energy";
-		mass = 40;
-		initSpeed = 300;
-		ACE_isBelt = 1;
-	};
-
-	class SWOP_DC17Pistol_Mag;
-	class macro_new_mag(DC17,20): SWOP_DC17Pistol_Mag
-	{
-		scope = 2;
-		model = "\SW_ExtraWeapons\PICKUPS\energy_cell.p3d";
-		picture = "\SW_ExtraWeapons\PICKUPS\UI\icons\energycell_X_ca.paa";
-		displayName = "20Rnd DC17 Magazine.";
-		ammo = macro_new_ammo(dc_17);
-		tracersEvery = 1;
-		type = 16;
-		count = 20;
-		descriptionShort = "20Rnd DC17 Magazine";
-		mass = 6;
-		initSpeed = 310;
-		//initSpeed = 110;
-	};
-
-
-	class macro_new_mag(DC17,40): macro_new_mag(DC17,20)
-	{
-		displayName = "40Rnd DC17 Magazine.";
-		tracersEvery = 1;
-		count = 40;
-		descriptionShort = "40Rnd DC17 Magazine";
-		mass = 13;
-	};
-
 	class Titan_AA;
 	class CA_LauncherMagazine;
 	class Titan_AT;
@@ -372,30 +276,6 @@ class CfgMagazines
 		nameSound = "missiles";
 	};
 
-	class SWOP_E5C_Mag;
-	class SWOP_E5_Mag;
-	class macro_new_mag(E5c_aqua,90): SWOP_E5C_Mag
-	{
-		author = "RD501";
-		scope = 2;
-		displayName = "90Rnd E5C-Aqua Magazine";
-		ammo = macro_new_ammo(E5c_Aqua);
-		tracersEvery = 1;
-		count = 90;
-		descriptionShort = "90Rnd E5-Aqua Magazine";
-	};
-
-	class macro_new_mag(E5_aqua,60): SWOP_E5_Mag
-	{
-		author = "RD501";
-		scope = 2;
-		displayName = "60Rnd E5-Aqua Magazine";
-		ammo = macro_new_ammo(E5_Aqua);
-		tracersEvery = 1;
-		count = 60;
-		descriptionShort = "60Rnd E5-A Magazine";
-	};
-
 	class SW_iondisruptor_BlasterRifle_Mag;
 	class macro_new_mag(RAMER,6):SW_iondisruptor_BlasterRifle_Mag
 	{
@@ -411,21 +291,6 @@ class CfgMagazines
 		initSpeed = 310;
 		author = "RD501";
 	};
-	class macro_new_mag(DC15a_LE,15): CA_Magazine
-	{
-		author = "RD501";
-		scope = 2;
-		model = "\SW_ExtraWeapons\PICKUPS\energy_cell.p3d";
-		picture = "\SW_ExtraWeapons\PICKUPS\UI\icons\energycell_X_ca.paa";
-		displayName = "15Rnd DC-15 LE Mag";
-		ammo = macro_new_ammo(dc15_LE);
-		tracersEvery = 1;
-		//count = 10;
-		count = 15;
-		descriptionShort = "15Rnd DC-15 LE Mag";
-		mass = 20;
-		initSpeed = 1200;
-	};
 
 
 	class SWOP_DC15SAPistol_Mag;
@@ -457,25 +322,6 @@ class CfgMagazines
 		displayName = "[]M18 Smoke Grenade (Yeet)";
 	};
 
-	 
-
-	class macro_new_mag(DC15_underwater,40): CA_Magazine
-	{
-		author = "RD501";
-		scope = 2;
-		model = "\SW_ExtraWeapons\PICKUPS\energy_cell.p3d";
-		picture = "\SW_ExtraWeapons\PICKUPS\UI\icons\energycell_X_ca.paa";
-		displayName = "40Rnd Republic Aqua Rounds";
-		ammo = macro_new_ammo(dc15_underwater);
-		tracersEvery = 1;
-		type = 16;
-		count = 40;
-		descriptionShort = "40Rnd Republic Aqua Rounds";
-		//mass = 15;
-		mass = 20;
-		initSpeed = 310;
-	};
-
 	class 3AS_Chaingun_Drum_Mag;
 	class macro_new_mag(z1000,3000) : 3AS_Chaingun_Drum_Mag
 	{
@@ -494,18 +340,12 @@ class CfgMagazines
 class CfgAmmo
 {	
 	class GrenadeHand;
-	class SWOP_DC17_Ammo;
 	class M_Titan_AT;
 	class R_PG32V_F;
 	class R_TBG32V_F;
 	class LaserAmmo_Minigun;
 	class FlareBase;
 	class G_40mm_HE;
-	class SWOP_dc15xBlasterRifle_Ammo;
-	class SWOP_DC15ABlasterRifle_Ammo;
-	class SWOP_DC15ABlasterRifle_Full_Ammo;
-	class SWOP_DC15ABlasterRifle_L_Ammo;
-	class SWOP_DC15_Ammo;
 
 	class ATMine_Range_Ammo;
 	class PipeBombBase;
@@ -514,25 +354,6 @@ class CfgAmmo
 	class DH17_Blaster_Ammo;
 	class 3AS_Chaingun_Ammo;
 	class M_Titan_AT;
-
-	class macro_new_ammo(westar_35):SWOP_DC17_Ammo
-	{
-		hit = pistol_hit_high;
-		indirectHit = 0.0;
-		indirectHitRange = 0.0;
-		explosive = 0.0;
-		caliber = pistol_cali_high;
-	};
-
-	class macro_new_ammo(dc_17): SWOP_DC17_Ammo
-	{
-		hit = 10;
-		waterFriction = -0.001;//
-		indirectHit = 0.2;
-		indirectHitRange = 0.2;
-		explosive = 0.05;
-		caliber = 2.8;//7
-	};
 	
 	class macro_new_ammo(z6):LaserAmmo_Minigun
 	{
@@ -544,8 +365,6 @@ class CfgAmmo
 		ACE_caliber = 0;
 	};
 
-	#include "_ammo/40mm_flare.hpp"
-
 	class  macro_new_ammo(GL_AT): G_40mm_HE
 	{
 		hit = 350;
@@ -580,78 +399,7 @@ class CfgAmmo
 
 		
 	};
-	
-	class macro_new_ammo(DC15x): SWOP_dc15xBlasterRifle_Ammo
-	{
-		hit = 55;//35
-		indirectHit = 0;
-		indirectHitRange = 0;
-		explosive = 0.0;
-		caliber = 6;//15
-		waterFriction = -0.001;//
-		timeToLive = 5;
-		
-	};
-
-	
-	class macro_new_ammo(dc15s_carbine):SWOP_DC15_Ammo
-	{
-		waterFriction = -0.001;//
-		hit = 7;
-		indirectHit = 0.1;
-		indirectHitRange = 0.2;
-		explosive = 0.1;//.4
-		caliber = 2;//5
-		timeToLive = 4;
-	};
-
-	class macro_new_ammo(dc15_underwater):macro_new_ammo(dc15s_carbine)
-	{
-		waterFriction = -0.001;//
-		hit = 7;
-		indirectHit = 0.1;
-		indirectHitRange = 0.2;
-		explosive = 0.1;//.4
-		caliber = 2;//5
-		timeToLive = 4;
-	
-		effectFly = "AmmoUnderwater";
-		nvgOnly = 1;
-		aiAmmoUsageFlags = "64 + 32";
-	};
-
-	class macro_new_ammo(dc15a_med):SWOP_DC15ABlasterRifle_Ammo
-	{
-		hit = 8;
-		waterFriction = -0.001;
-		indirectHit = 0.1;
-		indirectHitRange = 0.2;
-		explosive = 0.4;
-		caliber = 3;//7
-		timeToLive = 4;
-	};
-	
-	class macro_new_ammo(dc15a_high):SWOP_DC15ABlasterRifle_Full_Ammo
-	{
-		hit = 20;
-		waterFriction = -0.001;
-		indirectHit = 0.5;
-		indirectHitRange = 0.4;
-		explosive = 0.2;
-		caliber = 4;//10
-		timeToLive = 4;
-	};
 
-	class macro_new_ammo(dc15a_low):SWOP_DC15ABlasterRifle_L_Ammo
-	{
-		hit = 6;
-		waterFriction = -0.001;//
-		indirectHit = 0.1;
-		indirectHitRange = 0.2;
-		explosive = 0.4;
-		caliber = 2;//5
-		timeToLive = 4;
-	};
 
 	class UNSC_Mine_Ammo: ATMine_Range_Ammo
 	{
@@ -696,58 +444,6 @@ class CfgAmmo
 		indirectHitRange = 1;
 	};
 
-	
-	class macro_new_ammo(E5c_Aqua): DH17_Blaster_Ammo
-	{
-		airFriction = 0;
-		waterFriction = 0;
-		effectFly = "AmmoUnderwater";
-	};
-
-	class macro_new_ammo(E5_Aqua): DH17_Blaster_Ammo
-	{
-		airFriction = 0;
-		waterFriction = 0;
-		effectFly = "AmmoUnderwater";
-	};
-
-	class SWOP_bactagammo:GrenadeHand
-	{
-		soundFly[] = {"\thermalD\diox1.ogg", 1, 1, 60};
-		class NVGMarkers
-		{
-			class Blinking1
-			{
-				name = "blinkpos1";
-				color[] = {0.01, 0.01, 0.01, 1};
-				ambient[] = {0.005, 0.005, 0.005, 1};
-				blinking = 1;
-				brightness = 0.002;
-				onlyInNvg = 1;
-			};
-			class Blinking2
-			{
-				color[] = {0.9, 0.1, 0.1};
-				ambient[] = {0.1, 0.1, 0.1};
-				name = "blinkpos2";
-				blinking = 1;
-				blinkingStartsOn = 1;
-				blinkingPattern[] = {0.1, 0.9};
-				blinkingPatternGuarantee = 1;
-				drawLightSize = 0.35;
-				drawLightCenterSize = 0.05;
-				brightness = 0.002;
-				dayLight = 1;
-				onlyInNvg = 0;
-				intensity = 75;
-				drawLight = 1;
-				activeLight = 0;
-				useFlare = 0;
-			};
-		};
-	};
-
-
 	//212th stuff
 	class SCI_PLX1_R : M_Titan_AT
 	{
@@ -767,58 +463,9 @@ class CfgAmmo
 		indirectHit = 60;
 		indirectHitRange = 8;
 	};
-
-	class macro_new_ammo(dc15_LE): SWOP_DC15ABlasterRifle_Full_Ammo
-	{
-	
-		//hit = 15;
-		hit = 33;
-		waterFriction = -0.001;//
-		indirectHit = 0.5;
-		indirectHitRange = 0.4;
-		//explosive = 0.45;
-		explosive = 0.4;
-		caliber = 5;//10
-		cartridge = "";
-		cost = 1;
-		model = "\SWOP_Main\Effects\Tracer\laserblue";
-		tracerScale = 1.5;
-		tracerStartTime = 0;
-		tracerEndTime = 2;
-		//timeToLive = 2;
-		timeToLive = 4;
-		nvgOnly = 0;
-		typicalSpeed = 70;
-		visibleFire = 3;
-		audibleFire = 5;
-		visibleFireTime = 4;
-		dangerRadiusBulletClose = 16;
-		dangerRadiusHit = 40;
-		suppressionRadiusBulletClose = 10;
-		suppressionRadiusHit = 14;
-	};
-
-	class SWOP_DC15SA_Ammo;
-
-	class macro_new_ammo(DC15_Razor_Blade):SWOP_DC15SA_Ammo
-	{
-		hit = 50;
-		indirectHit = 0.0;
-		indirectHitRange = 0.0;
-		explosive = 0;
-		caliber = 5;
-		CraterEffects = "ExploAmmoLaserCrater";
-	
-	};
 	
 
 	class B_127x108_APDS;
-	class SW_iondisruptor_BlasterRifle_Ammo: B_127x108_APDS
-	{
-		timeToLive = 2;
-	};
-
-	
 	class SmokeShell;
 	class smoke_meme: SmokeShell
 	{