Browse Source

Erasing all SWOP

Erliens 3 years ago
parent
commit
2184a65255
29 changed files with 12 additions and 2551 deletions
  1. 0 1
      addons - Copy/RD501_Main/config.cpp
  2. 0 1
      addons - Copy/RD501_Main/config_swop_macro.cpp
  3. 0 13
      addons - Copy/RD501_Main/functions/init/e_web_shield.sqf
  4. 2 2
      addons - Copy/RD501_Units/blufor/clones/_headwear.hpp
  5. 4 99
      addons - Copy/RD501_Vehicle_Weapons/_ammo/config.cpp
  6. 0 1
      addons - Copy/RD501_Vehicle_Weapons/aircraft/y_wing_gau/config.cpp
  7. 0 43
      addons - Copy/RD501_Vehicle_Weapons/land/artillery/config.cpp
  8. 1 31
      addons - Copy/RD501_Vehicles/air/HMP/common.hpp
  9. 0 9
      addons - Copy/RD501_Vehicles/air/drones/config.cpp
  10. 1 131
      addons - Copy/RD501_Vehicles/config.cpp
  11. 0 305
      addons - Copy/RD501_Vehicles/land/ATTE/config.cpp
  12. 0 190
      addons - Copy/RD501_Vehicles/land/E_Web/config.cpp
  13. 0 124
      addons - Copy/RD501_Vehicles/land/artillery/config.cpp
  14. 0 17
      addons - Copy/RD501_Vehicles/land/artillery/inheritance.hpp
  15. 0 370
      addons - Copy/RD501_Vehicles/land/artillery/sounds.hpp
  16. 0 195
      addons - Copy/RD501_Vehicles/land/shield_wall/config.cpp
  17. 0 2
      addons - Copy/RD501_Vehicles/land/speeders/barc_mass.sqf
  18. 0 99
      addons - Copy/RD501_Vehicles/land/speeders/config.cpp
  19. 0 1
      addons - Copy/RD501_Vehicles/static/bacta/config.cpp
  20. 1 2
      addons - Copy/RD501_Weapons/Bounty Hunters/config.cpp
  21. 0 107
      addons - Copy/RD501_Weapons/DC_Family/DC_17/config.cpp
  22. 0 195
      addons - Copy/RD501_Weapons/NVG/config.cpp
  23. 0 312
      addons - Copy/RD501_Weapons/NVG/swop_edit.hpp
  24. 0 60
      addons - Copy/RD501_Weapons/Westar/common.hpp
  25. 0 37
      addons - Copy/RD501_Weapons/Westar/config.cpp
  26. 0 39
      addons - Copy/RD501_Weapons/Westar/westar_pistol.hpp
  27. 0 43
      addons - Copy/RD501_Weapons/Westar/westar_rifle.hpp
  28. 0 108
      addons - Copy/RD501_Weapons/config.cpp
  29. 3 14
      addons - Copy/RD501_Zeus/config.cpp

+ 0 - 1
addons - Copy/RD501_Main/config.cpp

@@ -1,5 +1,4 @@
 #define COMPONENT main
 #define COMPONENT main
-#include "config_swop_macro.cpp" // Imports the config macro that has all of swop pbos.
 #include "config_macros.hpp" // my config macro lib
 #include "config_macros.hpp" // my config macro lib
 #include "_cba_patches.hpp"
 #include "_cba_patches.hpp"
 
 

File diff suppressed because it is too large
+ 0 - 1
addons - Copy/RD501_Main/config_swop_macro.cpp


+ 0 - 13
addons - Copy/RD501_Main/functions/init/e_web_shield.sqf

@@ -1,13 +0,0 @@
-params[
-	["_vic",objNull ,[player]]
-];
-
-if(isNull _vic) exitWith {
-	
-};
-//if not the server,exit
-if (!isServer) exitWith {};
-_sheild = "SW_halfshieldObject" createVehicle (position _vic);
-_sheild attachTo [_vic, [0, 0, 1.5] ];
-
-

+ 2 - 2
addons - Copy/RD501_Units/blufor/clones/_headwear.hpp

@@ -11,7 +11,7 @@ class JLTS_CloneBinocular;
 class JLTS_CloneBinocular_black;
 class JLTS_CloneBinocular_black;
 class JLTS_NVG_droid_chip_1;
 class JLTS_NVG_droid_chip_1;
 
 
-class rd501_swop_nvchipclean: JLTS_NVG_droid_chip_1
+class rd501_jlts_nvchipclean: JLTS_NVG_droid_chip_1
 {
 {
     displayname = "Operator Class Vision Enhancement Chip";
     displayname = "Operator Class Vision Enhancement Chip";
     modelOptics="";
     modelOptics="";
@@ -172,7 +172,7 @@ class macro_new_weapon(nvg,shock_trooper) : JLTS_NVG_droid_chip_1
 	visionMode[] = {"Normal","NVG"};
 	visionMode[] = {"Normal","NVG"};
 	dlc = "rd501";
 	dlc = "rd501";
 	author= "RD501";
 	author= "RD501";
-	displayName = "SW NVG Chip(Clear)";
+	displayName = "NVG Chip(Clear)";
 	macro_thermal_nvg_default
 	macro_thermal_nvg_default
 };
 };
 
 

+ 4 - 99
addons - Copy/RD501_Vehicle_Weapons/_ammo/config.cpp

@@ -17,37 +17,12 @@ class CfgAmmo
 {
 {
 
 
 	class B_35mm_AA_Tracer_Red;
 	class B_35mm_AA_Tracer_Red;
-	class LaserAmmo_Minigun;
-	class TurboLaser_Laserx2;
 	class M_Air_AA;
 	class M_Air_AA;
 	class Rocket_04_AP_F;
 	class Rocket_04_AP_F;
 	class ammo_Missile_rim162;
 	class ammo_Missile_rim162;
 	class M_PG_AT;
 	class M_PG_AT;
 	class M_Jian_AT;
 	class M_Jian_AT;
-	class ammo_Missile_rim116;
 	class 3AS_ATT_redPlasma_AT;
 	class 3AS_ATT_redPlasma_AT;
-	//#include "_ammo/tank_cannons.hpp"
-
-	class macro_new_ammo(homing_spider): TurboLaser_Laserx2//og9_Laser
-	{
-		hit = 185;
-		indirectHit = 75;
-		indirectHitRange = 1;
-		visibleFire = 32;
-		audibleFire = 32;
-		visibleFireTime = 6;
-
-		explosionSoundEffect = "DefaultExplosion";
-		effectFly = "og9_Laser_Effect";
-		explosive = 0.5;
-		airLock = 1;
-		CraterEffects = "ExploAmmoLaserCrater";
-		explosionEffects = "ExploAmmoLaserCannon";
-		model = "\SpiderDroid\Laserog9";
-
-		caliber = 20;
-	};
-
 
 
 	//#include "_ammo/missiles.hpp"
 	//#include "_ammo/missiles.hpp"
 
 
@@ -156,7 +131,7 @@ class CfgAmmo
 		indirectHit =650;
 		indirectHit =650;
 		indirectHitRange = 25;
 		indirectHitRange = 25;
 	};
 	};
-	class macro_new_ammo(laat_cannon): B_35mm_AA_Tracer_Red//TurboLaser_Laserx2//SW_SpeederBikeCanon_Ammo//swop_bywingCannonammo//LAAT_Laser
+	class macro_new_ammo(laat_cannon): B_35mm_AA_Tracer_Red
 	{
 	{
 		explosive = 0.5;
 		explosive = 0.5;
 		hit = 1000;
 		hit = 1000;
@@ -214,34 +189,6 @@ class CfgAmmo
 		allowAgainstInfantry = 1;
 		allowAgainstInfantry = 1;
 		airLock=1;
 		airLock=1;
 	};
 	};
-
-	class macro_new_ammo(ball_turret):TurboLaser_Laserx2//SW_SpeederBikeCanon_Ammo//Vwing_ammo
-	{
-		hit = 600;
-		timeToLive = 5;
-		indirectHit = 400;
-		indirectHitRange = 1;
-		explosive = 1;
-		caliber = 6;
-		ACE_caliber = 0;
-		tracerScale = 1;
-		aiAmmoUsageFlags = "64 + 128 + 256 + 512";
-		allowAgainstInfantry = 1;
-	
-		model = "\SWOP_Main\Effects\Tracer\Lasergreen";
-	
-		cost = 1;
-	
-		CraterEffects = "-";
-		CraterWaterEffects = "ImpactEffectsWaterHE";
-		ExplosionEffects ="SWOP_LaserExploSmallblue2";
-		soundHit1[] = {"SWOP_Main\FlyBy\impactosheavy\impactosheavy1.ogg", 1.2, 1, 50};
-		soundHit2[] = {"SWOP_Main\FlyBy\impactosheavy\impactosheavy2.ogg", 1.2, 1, 50};
-		soundHit3[] = {"SWOP_Main\FlyBy\impactosheavy\impactosheavy3.ogg", 1.2, 1, 50};
-		soundHit4[] = {"SWOP_Main\FlyBy\impactosheavy\impactosheavy4.ogg", 1.2, 1, 50};
-		multiSoundHit[] = {"soundHit1", 0.25, "soundHit2", 0.25, "soundHit3", 0.25, "soundHit4", 0.25};
-	};
-
 	class Bo_Mk82;
 	class Bo_Mk82;
 	class macro_new_ammo(carpet_I_bomb): Bo_Mk82
 	class macro_new_ammo(carpet_I_bomb): Bo_Mk82
 	{
 	{
@@ -294,14 +241,14 @@ class CfgAmmo
 		suppressionRadiusHit = 14;
 		suppressionRadiusHit = 14;
 		craterEffects = "";
 		craterEffects = "";
 		craterShape = "";
 		craterShape = "";
-		explosionEffects = "ExploAmmoLaserCannon";//ExplosionEffects = "SWOP_LaserExploSmall";
+		explosionEffects = "ExploAmmoLaserCannon";
 		airFriction = 0;
 		airFriction = 0;
 		muzzleEffect = "";
 		muzzleEffect = "";
 		deflecting = 0;
 		deflecting = 0;
 		initTime = 0;
 		initTime = 0;
 		weaponLockSystem = 0; 
 		weaponLockSystem = 0; 
 		gravityFactor = 0;
 		gravityFactor = 0;
-		ACE_caliber=1; // SWOP_SC_blaster_SoundSet | SWOP_HEAVYBullet_FlyBy_SoundSet | CAA_SC_Bullet_FlyBy_SoundSet | SWOP_155mm_Shot_SoundSet
+		ACE_caliber=1;
 
 
 	   class Components
 	   class Components
 		{
 		{
@@ -540,14 +487,12 @@ class CfgAmmo
 		indirectHitRange = 0;
 		indirectHitRange = 0;
 		caliber = 1;
 		caliber = 1;
 		explosive = 0.6;
 		explosive = 0.6;
-		ExplosionEffects = "SWOP_LaserExploSmall";
 	};
 	};
 	class macro_new_ammo(generic_aircraft_laser_cannon_plasma_red) : macro_new_ammo(generic_aircraft_laser_gun_red)
 	class macro_new_ammo(generic_aircraft_laser_cannon_plasma_red) : macro_new_ammo(generic_aircraft_laser_gun_red)
 	{
 	{
 		hit = 150;
 		hit = 150;
 		indirecthit = 20;
 		indirecthit = 20;
 		indirecthitrange = 0;
 		indirecthitrange = 0;
-		ExplosionEffects = "SWOP_LaserExploSmall";
 		caliber = 1;
 		caliber = 1;
 		explosive = 0.6;
 		explosive = 0.6;
 	};
 	};
@@ -556,7 +501,6 @@ class CfgAmmo
 		hit = 150;
 		hit = 150;
 		indirecthit = 20;
 		indirecthit = 20;
 		indirecthitrange = 0;
 		indirecthitrange = 0;
-		ExplosionEffects = "SWOP_LaserExploSmall";
 		caliber = 1;
 		caliber = 1;
 		explosive = 0.6;
 		explosive = 0.6;
 	};
 	};
@@ -629,10 +573,6 @@ class CfgAmmo
 		muzzleEffect = "";
 		muzzleEffect = "";
 		cmimmunity = 0.6;
 		cmimmunity = 0.6;
 		effectsSmoke = "RD501_Effect_Violet";
 		effectsSmoke = "RD501_Effect_Violet";
-		//soundFly[] = {"\xt\SWionrocketloop.ogg",3,1,800};
-		//lockedTargetSound[] = {"TIE\LockedOn_2.ogg",0.7,1};
-		//lockingTargetSound[] = {"TIE\Locking_Beep1.ogg",1,1};
-		//model = "\SWOP_Main\Effects\Tracer\laserred";
 		tracerColor[] = {"blue"};
 		tracerColor[] = {"blue"};
 		brightness = 20000;
 		brightness = 20000;
 		lightColor[] = {0, 0, 1, 1};
 		lightColor[] = {0, 0, 1, 1};
@@ -654,10 +594,6 @@ class CfgAmmo
 		effectsMissile = "RD501_FX_Missile_AA_Violet";
 		effectsMissile = "RD501_FX_Missile_AA_Violet";
 		muzzleEffect = "";
 		muzzleEffect = "";
 		effectsSmoke = "RD501_Effect_Violet";
 		effectsSmoke = "RD501_Effect_Violet";
-		//soundfly[] = {"\xt\SWionrocketloop.ogg",3,1,800};
-		//lockedTargetSound[] = {"TIE\LockedOn_2.ogg",0.7,1};
-		//lockingTargetSound[] = {"TIE\Locking_Beep1.ogg",1,1};
-		//model = "\SWOP_Main\Effects\Tracer\laserred";
 		tracerColor[] = {"blue"};
 		tracerColor[] = {"blue"};
 		canLock = 2;
 		canLock = 2;
 		weaponLockSystem = "1 + 2 + 4 + 8"; 
 		weaponLockSystem = "1 + 2 + 4 + 8"; 
@@ -684,8 +620,6 @@ class CfgAmmo
 		effectsMissile = "RD501_FX_Missile_AA_Violet";
 		effectsMissile = "RD501_FX_Missile_AA_Violet";
 		muzzleEffect = "";
 		muzzleEffect = "";
 		effectsSmoke = "RD501_Effect_Violet";
 		effectsSmoke = "RD501_Effect_Violet";
-		//soundfly[] = {"\xt\SWionrocketloop.ogg",3,1,800};
-		//model = "\SWOP_Main\Effects\Tracer\laserred";
 		tracerColor[] = {"blue"};
 		tracerColor[] = {"blue"};
 		brightness = 20000;
 		brightness = 20000;
 		lightColor[] = {0, 0, 1, 1};
 		lightColor[] = {0, 0, 1, 1};
@@ -712,8 +646,6 @@ class CfgAmmo
 		};
 		};
 		muzzleEffect = "";
 		muzzleEffect = "";
 		effectsSmoke = "RD501_Effect_Violet";
 		effectsSmoke = "RD501_Effect_Violet";
-		//soundfly[] = {"\xt\SWionrocketloop.ogg",3,1,800};
-		//model = "\SWOP_Main\Effects\Tracer\laserred";
 		tracerColor[] = {"blue"};
 		tracerColor[] = {"blue"};
 		brightness = 20000;
 		brightness = 20000;
 		lightColor[] = {0, 0, 1, 1};
 		lightColor[] = {0, 0, 1, 1};
@@ -745,7 +677,6 @@ class CfgAmmo
 		muzzleEffect = "";
 		muzzleEffect = "";
 		effectsSmoke = "RD501_Effect_Violet";
 		effectsSmoke = "RD501_Effect_Violet";
 		soundfly[] = {"\rd501_vehicle_weapons\_sounds\proton_torp.ogg",3,1,800};
 		soundfly[] = {"\rd501_vehicle_weapons\_sounds\proton_torp.ogg",3,1,800};
-		//model = "\SWOP_Main\Effects\Tracer\laserblue";
 		tracerColor[] = {"blue"};
 		tracerColor[] = {"blue"};
 		brightness = 20000;
 		brightness = 20000;
 		lightColor[] = {0, 0, 1, 1};
 		lightColor[] = {0, 0, 1, 1};
@@ -907,8 +838,7 @@ class CfgAmmo
 		cost = 22;
 		cost = 22;
 		CraterEffects = "ATMissileCrater";
 		CraterEffects = "ATMissileCrater";
 		explosionEffects = "IEDMineSmallExplosion";
 		explosionEffects = "IEDMineSmallExplosion";
-		model="RD501_Vehicle_Weapons\_ammo\data\laser_big_purple.p3d";		
-		effectFly = "SWOP_BlueLaserEffect";
+		model="RD501_Vehicle_Weapons\_ammo\data\laser_big_purple.p3d";
 		tracerStartTime = 0;
 		tracerStartTime = 0;
 		tracerEndTime = 10;
 		tracerEndTime = 10;
 		airFriction = 0;
 		airFriction = 0;
@@ -945,29 +875,4 @@ class CfgAmmo
 		allowAgainstInfantry = 1;
 		allowAgainstInfantry = 1;
 		timeToLive=10;
 		timeToLive=10;
 	};
 	};
-	class ATTE_Laser;
-	class macro_new_ammo(atte):ATTE_Laser
-	{
-		hit = 1600;
-		indirectHit = 400;
-		indirectHitRange = 15;
-		visibleFire = 42;
-		audibleFire = 42;
-		visibleFireTime = 6;
-		typicalSpeed = 1400;
-		explosive = 0.4;
-		cost = 42;
-		deflecting = 15;
-		timeToLive = 15;
-		explosionEffects = "IEDMineSmallExplosion";
-		model = "SW_AV7\ion.p3d";
-		tracerScale = 2;
-		effectFly = "SWOP_BlueLaserEffect";
-		tracerStartTime = 0;
-		tracerEndTime = 10;
-		airFriction = 0;
-		muzzleEffect = "";
-		caliber = 8;
-		CraterEffects = "ExploAmmoLaserCrater";
-	};
 };
 };

+ 0 - 1
addons - Copy/RD501_Vehicle_Weapons/aircraft/y_wing_gau/config.cpp

@@ -57,7 +57,6 @@ class CfgWeapons
 			sounds[] = {"StandardSound"};
 			sounds[] = {"StandardSound"};
 			class BaseSoundModeType
 			class BaseSoundModeType
 			{
 			{
-				closure[] = {"SW_CloneWarsWeapons\SW_Z6\sound\closure.wav", 2, 1, 30};
 				soundClosure[] = {"closure", 1};
 				soundClosure[] = {"closure", 1};
 			};
 			};
 			class StandardSound
 			class StandardSound

+ 0 - 43
addons - Copy/RD501_Vehicle_Weapons/land/artillery/config.cpp

@@ -1,43 +0,0 @@
-
-#include "../../../RD501_main/config_macros.hpp"
-#include "../../_common/common.hpp"
-
-
-class CfgPatches
-{
-	class macro_patch_name(artillery_cannons)
-	{
-		author=DANKAUTHORS;
-		addonRootClass= macro_patch_name(vehicle_weapons)
-		requiredAddons[]=
-		{
-			macro_patch_name(vehicle_weapons)
-		};
-		requiredVersion=0.1;
-		units[]={};
-		weapons[]={
-			macro_new_weapon(artillery,av76)
-		};
-	};
-};
-
-class CfgWeapons
-{
-
-	class SW_155mm_AMOS;
-	class macro_new_weapon(artillery,av76):SW_155mm_AMOS
-	{
-		magazines[] = {
-			"32Rnd_155mm_Mo_shells",
-			"4Rnd_155mm_Mo_guided",
-			"6Rnd_155mm_Mo_mine",
-			"2Rnd_155mm_Mo_Cluster",
-			"6Rnd_155mm_Mo_smoke",
-			"2Rnd_155mm_Mo_LG",
-			"6Rnd_155mm_Mo_AT_mine"
-		};
-	}
-	
-
-}; 
-

+ 1 - 31
addons - Copy/RD501_Vehicles/air/HMP/common.hpp

@@ -3,34 +3,4 @@ editorSubcategory = macro_editor_cat_air(CIS_heli)
 vehicleClass = macro_editor_vehicle_type_air(CIS)
 vehicleClass = macro_editor_vehicle_type_air(CIS)
 airBrakeFrictionCoef = 80.4;
 airBrakeFrictionCoef = 80.4;
 
 
-class EventHandlers{};
-
-class UserActions
-{
-    class ThrusterEngage
-    {
-        condition = "(!(this getvariable [""impulsorStatus"",false]) AND (player == driver this) AND (alive this) AND (speed this >50) )";
-        displayName = "<t color='#4C9900'>[Impulsor On]</t>";
-        displayNameDefault = "<t color='#4C9900'>[Impulsor On]</t>";
-        onlyForPlayer = 0;
-        position = "pilotview";
-        priority = 1e+008;
-        radius = 6;
-        statement = "this execVM ""\SW_Droides_2\DroidGunship\initTE.sqf""";
-        textToolTip = "<t color='#4C9900'>[Impulsor On]</t>";
-        userActionID = 64;
-    };
-    class ThrusterDisngage : ThrusterEngage
-    {
-        condition = "((this getvariable [""impulsorStatus"",false]) AND (player == driver this) AND (alive this))";
-        displayName = "<t color='#FF9933'>[RepulsorBrake On]</t>";
-        displayNameDefault = "<t color='#FF9933'>[RepulsorBrake On]</t>";
-        onlyForPlayer = 0;
-        position = "pilotview";
-        priority = 1e+008;
-        radius = 6;
-        statement = "this execVM ""\SW_Droides_2\DroidGunship\initTD.sqf""";
-        textToolTip = "<t color='#FF9933'>[RepulsorBrake On]</t>";
-        userActionID = 65;
-    };	
-};
+class EventHandlers{};

+ 0 - 9
addons - Copy/RD501_Vehicles/air/drones/config.cpp

@@ -99,15 +99,6 @@ class CfgVehicles
         fuelCapacity = 90;
         fuelCapacity = 90;
         fuelConsumptionRate = 1;
         fuelConsumptionRate = 1;
 		faction = macro_republic_faction;
 		faction = macro_republic_faction;
-/*		model = "\SW_CloneWarsWeapons\Recon\swclonerecon.p3d";
-		hiddenSelections[]=
-        {
-            "camo"
-        };
-        hiddenSelectionsTextures[]=
-        {
-            "\SW_CloneWarsWeapons\Recon\com_weap_probedroid.paa"
-        };*/
 		class ACE_Actions {
 		class ACE_Actions {
             distance = 4;
             distance = 4;
             condition = macro_quote(true);
             condition = macro_quote(true);

+ 1 - 131
addons - Copy/RD501_Vehicles/config.cpp

@@ -39,45 +39,6 @@ class CfgPatches
 
 
 class Extended_Init_EventHandlers 
 class Extended_Init_EventHandlers 
 {
 {
-    class SW_SpeederBike_base
-    {
-        class anti_wobble
-        {
-            init = "(_this select 0) setVelocity [0,0,1]";
-        };
-    };
-
-    class SW_BARC
-    {
-        class anti_wobble
-        {
-            init = "(_this select 0) setVelocity [0,0,1]";
-        };
-    }
-	
-    class macro_new_vehicle(homing_spider_droid,Moveable_MKII)
-    {
-        class movable_script 
-        {
-            init = [_this select 0] spawn macro_fnc_name(og10_move);
-        };
-    };
-
-    class O_SWOP_Hailfire_base
-    {
-        class hailfire_aa_script 
-        {
-             init = [_this select 0] spawn macro_fnc_name(hailfire_init);
-        };
-    };
-
-    class macro_new_vehicle(e_web,shield)
-    {
-        class shield 
-        {
-            init = [_this select 0] spawn macro_fnc_name(eweb_shield);
-        };
-    };
 
 
     class macro_new_vehicle(droideka,normal)
     class macro_new_vehicle(droideka,normal)
     {
     {
@@ -86,14 +47,6 @@ class Extended_Init_EventHandlers
             init = [_this select 0] spawn macro_fnc_name(droidekka_move);
             init = [_this select 0] spawn macro_fnc_name(droidekka_move);
         };
         };
     };
     };
-	class macro_new_vehicle(droideka,camo_depr)
-	{
-		class droideka_movable
-		{
-			init = [_this select 0] spawn macro_fnc_name(droidekka_move);
-		};
-	};
-
     class macro_new_vehicle(dwarf_spider_droid,Movable_MkII)
     class macro_new_vehicle(dwarf_spider_droid,Movable_MkII)
     {
     {
         class dwarf_movable 
         class dwarf_movable 
@@ -108,23 +61,6 @@ class macro_new_vehicle(crab_droid,Movable_MkII)
             init = [_this select 0] spawn macro_fnc_name(dwarf_move);
             init = [_this select 0] spawn macro_fnc_name(dwarf_move);
         };	                               
         };	                               
     };
     };
-
-    class macro_new_vehicle(marid,MkII_CIS)// not ran
-    {
-        class Lock_this_shit 
-        {
-            init = "(_this select 0) setVehicleLock ""LOCKED""";
-        };                                 
-    };
-
-    class macro_new_vehicle(artillery,CIS_Arty)
-    {
-        class Add_arty 
-        {
-            init = [_this select 0] spawn macro_fnc_name(hemtt_rocket_arty);
-        };                                 
-    };
-
     class macro_new_vehicle(bacta,healing)//add doggo to spell,no heal
     class macro_new_vehicle(bacta,healing)//add doggo to spell,no heal
     {
     {
         class add_heal
         class add_heal
@@ -137,30 +73,6 @@ class macro_new_vehicle(crab_droid,Movable_MkII)
         // }
         // }
     };
     };
 
 
-    class macro_new_vehicle(ATTE,MkII)
-    {
-        class set_mass
-        {
-             init = [_this select 0,72800] spawn macro_fnc_name(set_mass);
-        };
-    }
-
-    class macro_new_vehicle(ATTE,uav_MkII)//good
-    {
-        class set_mass
-        {
-             init = [_this select 0,72800] spawn macro_fnc_name(set_mass);
-        };
-    };
-
-    class macro_new_vehicle(turret_ATTE,Stomper)
-    {
-        class atte_uav_init
-        {
-             init = [_this select 0] spawn macro_fnc_name(atte_uav_init);
-        };
-    };
-
     class macro_new_vehicle(warden_tank,mobile)
     class macro_new_vehicle(warden_tank,mobile)
     {
     {
         class adsd_tow
         class adsd_tow
@@ -168,23 +80,9 @@ class macro_new_vehicle(crab_droid,Movable_MkII)
              init = [_this select 0] spawn macro_fnc_name(warden_tow);
              init = [_this select 0] spawn macro_fnc_name(warden_tow);
         };
         };
     };  
     };  
-    class O_SWOP_AAT_1
-    {
-        class lock_me_in_hamachi
-        {
-            init = [_this select 0] spawn macro_fnc_name(aatInit);
-        }
-    };
-
-    #include "_init_functions/cis_aircraft_turrets.hpp"
-
-    #include "_init_functions/empire_aircraft_turrets.hpp"
 
 
-    #include "_init_functions/rebel_aircraft_turrets.hpp"
 
 
-    #include "_init_functions/republic_aircraft_turrets.hpp"
-
-    #include "_init_functions/resistance_aircraft_turrets.hpp"
+    #include "_init_functions/cis_aircraft_turrets.hpp"
 
 
 };
 };
 
 
@@ -196,40 +94,12 @@ class Extended_Deleted_EventHandlers
     	macro_remove_attached_stuff_XEH
     	macro_remove_attached_stuff_XEH
     };
     };
 
 
-    class O_SWOP_Hailfire_base //error
-    {
-       macro_remove_attached_stuff_XEH
-    };
-
-    class macro_new_vehicle(homing_spider_droid,Moveable_MKII)
-    {
-    	macro_remove_attached_stuff_XEH
-    };
 
 
     class macro_new_vehicle(dwarf_spider_droid,Movable_MkII)
     class macro_new_vehicle(dwarf_spider_droid,Movable_MkII)
     {
     {
         macro_remove_attached_stuff_XEH
         macro_remove_attached_stuff_XEH
     };
     };
 
 
-    class macro_new_vehicle(artillery,CIS_Arty)
-    {
-        macro_remove_attached_stuff_XEH                           
-    };
-
-    class macro_new_vehicle(ATTE,MkII)
-    {
-       macro_remove_attached_stuff_XEH
-    }
-
-    class macro_new_vehicle(turret_ATTE,Stomper)
-    {
-        macro_remove_attached_stuff_XEH
-    }
-
-    class macro_new_vehicle(e_web,shield)
-    {
-    	macro_remove_attached_stuff_XEH
-    };
 
 
     #include "_delete_functions/remove_aircraft_turret.hpp"
     #include "_delete_functions/remove_aircraft_turret.hpp"
     };
     };

+ 0 - 305
addons - Copy/RD501_Vehicles/land/ATTE/config.cpp

@@ -1,305 +0,0 @@
-//Get this addons macro
-
-//get the macro for the air macro_patch_name(vehicles)
-
-//get generlized macros
-#include "../../../RD501_main/config_macros.hpp"
-
-//General name of the vehicle
-#define vehicle_addon ATTE
-#define patch_name MODNAME##vehicle_addon##_Patches
-#define vehicle_classname MODNAME##_##vehicle_addon
-
-#define new_atte_class(name) vehicle_classname##_##name
-
-
-class CfgPatches
-{
-	class macro_patch_name(ATTE)
-	{
-		addonRootClass=macro_patch_name(vehicles)
-
-		requiredAddons[]=
-		{
-			macro_patch_name(vehicles)
-		};
-		requiredVersion=0.1;
-		units[]=
-		{
-			macro_new_vehicle(ATTE,MkII),
-			//macro_new_vehicle(ATTE,uav_MkII),
-			macro_new_vehicle(turret_ATTE,Stomper),
-			macro_new_vehicle(turret_ATTE,Front_Left_UAV),
-			macro_new_vehicle(turret_ATTE,Front_Right_UAV),
-			macro_new_vehicle(turret_ATTE,Rear_UAV),
-			macro_new_vehicle(atte_itt,cabin)
-		};
-		weapons[]=
-		{
-			
-		};
-	};
-};
-
-
-#include "../../common/sensor_templates.hpp"
-class DefaultEventhandlers;
-class CfgVehicles
-{
-	class StaticWeapon;	
-	class StaticCannon:StaticWeapon
-	{
-		class Turrets;
-		class HitPoints;
-	};
-	class Republic_ATTE:StaticCannon
-	{
-		scope=0;
-		class EventHandlers;
-
-		class Turrets:Turrets
-		{
-			class MainTurret;
-			class CargoTurret_01;
-		};
-		class HitPoints
-		{
-			class HitGun;
-			
-			class HitTurret;
-		};
-	};
-
-	class macro_new_vehicle(ATTE,MkII):Republic_ATTE
-	{
-		scope=2
-		forceInGarage = 1;
-		displayName = "AT-TE Mk.II";
-
-		class EventHandlers: DefaultEventhandlers {}; 
-
-		slingLoadCargoMemoryPoints[] = {"SlingLoadCargo1", "SlingLoadCargo2", "SlingLoadCargo3", "SlingLoadCargo4"};
-		supplyRadius = 40;
-
-		faction = macro_republic_faction
-		editorSubcategory = macro_editor_cat(Tank)
-		vehicleClass = macro_editor_vehicle_type(Tank)
-
-		armor = 700;
-		armorStructural = 4;
-		armorLights = 4;
-
-		class Turrets: Turrets
-		{
-			class MainTurret: MainTurret
-			{
-				optics = 1;
-				discreteDistance[] = {100, 200, 300, 400, 600, 800, 1000, 1200, 1500};
-				discreteDistanceInitIndex = 2;
-				gunnerOpticsModel = "\A3\weapons_f\reticle\Optics_Gunner_AAA_01_w_F";
-				minTurn = -180;
-				maxTurn = 180;
-				minelev = -5;
-				maxelev = 17;
-				initTurn = 0;
-				initelev = 0;
-				startEngine = 0;
-				turretinfotype = "RscOptics_APC_Tracked_01_gunner";
-				
-				ejectDeadGunner = 0;
-				gunnerHasFlares = 1;
-				hideProxyInCombat = 0;
-				stabilizedInAxes = 3;
-				maxHorizontalRotSpeed = 1//0.5;
-				maxVerticalRotSpeed = 1//0.5;
-				gunnerCompartments = "Compartment2";
-				memoryPointGun[] = {"cannon1"};
-				
-				class OpticsIn
-				{
-					class Wide
-					{
-						opticsDisplayName = "W";
-						initAngleX = 0;
-						minAngleX = 0;
-						maxAngleX = 40;
-						initAngleY = 0;
-						minAngleY = -20;
-						maxAngleY = 20;
-						initFov = 0.466;
-						minFov = 0.466;
-						maxFov = 0.466;
-						visionMode[] = {"Normal", "NVG", "Ti"};
-						thermalMode[] = {0, 1};
-						gunnerOpticsModel = "\A3\weapons_f\reticle\Optics_Gunner_AAA_01_w_F";
-					};
-					class Medium: Wide
-					{
-						opticsDisplayName = "M";
-						initFov = 0.093;
-						minFov = 0.093;
-						maxFov = 0.093;
-						gunnerOpticsModel = "\A3\weapons_f\reticle\Optics_Gunner_AAA_01_m_F";
-					};
-					class Narrow: Wide
-					{
-						opticsDisplayName = "N";
-						gunnerOpticsModel = "\A3\weapons_f\reticle\Optics_Gunner_AAA_01_n_F";
-						initFov = 0.029;
-						minFov = 0.029;
-						maxFov = 0.029;
-					};
-				};
-				weapons[] = {"Laserdesignator_pilotCamera",macro_new_weapon(atte,mbt)};
-				magazines[] = 
-				{
-					macro_new_mag(atte_mbt,10),
-					macro_new_mag(atte_mbt,10),
-					macro_new_mag(atte_mbt,10),
-					macro_new_mag(atte_mbt,10),
-					macro_new_mag(atte_mbt,10),
-					"Laserbatteries"
-				};
-			};
-			class CargoTurret_01: CargoTurret_01
-			{
-				
-			};
-		};
-		class HitPoints:HitPoints
-		{
-			class HitGun:HitGun
-			{
-				armor = 4;//0.9;
-				material = -1;
-				name = "gun";
-				visual = "autonomous_unhide";
-				passThrough = 0;
-				radius = 0.2;
-			};
-			class HitTurret: HitTurret
-			{
-				armor = 5;//0.3;
-			};
-		};
-	};
-
-
-	class UGV_01_base_F;
-	class UGV_01_rcws_base_F:UGV_01_base_F
-	{
-		class Turrets;
-	};
-	class B_UGV_01_rcws_F:UGV_01_rcws_base_F
-	{
-		class Turrets:Turrets
-		{
-			class MainTurret;
-		};
-	};
-
-	class macro_new_vehicle(turret_ATTE,Stomper) : B_UGV_01_rcws_F
-	{
-		Scope = 2;
-		displayname = "AT-TE (Moveable)";
-		maxSpeed = 30;
-
-		armor=9999999;
-		faction = macro_republic_faction
-		editorSubcategory = macro_editor_cat(Tank)
-		vehicleClass = macro_editor_vehicle_type(Tank)
-
-		hiddenSelectionsTextures[] = {
-			"",//"\A3\Drones_F\soft_f_gamma\UGV_01\data\UGV_01_ext_co.paa",
-			"",//"\A3\Drones_F\soft_f_gamma\UGV_01\data\UGV_01_int_co.paa",
-			""//"\A3\Data_F\Vehicles\Turret_co.paa"
-		};
-	
-		icon = "\SW_Droides_2\ATTE\ATTE128_ca.paa";
-		class Turrets:Turrets
-		{
-			class MainTurret:MainTurret
-			{
-				weapons[] = {"SmokeLauncher", "Laserdesignator_mounted"};
-				magazines[] = {
-					"Laserbatteries",
-					"smokelaunchermag",
-					"smokelaunchermag",
-					"smokelaunchermag",
-					"smokelaunchermag",
-					"smokelaunchermag",
-					"smokelaunchermag",
-					"smokelaunchermag",
-					"smokelaunchermag"
-				};
-			};
-		};
-	};
-
-	class HMG_01_base_F;
-	class HMG_01_A_base_F:HMG_01_base_F
-	{
-		class Turrets;
-	};
-	class B_HMG_01_A_F:HMG_01_A_base_F
-	{
-		class Turrets: Turrets
-		{
-			class MainTurret;
-		};
-	}
-	class macro_new_vehicle(turret_ATTE,Front_Left_UAV):B_HMG_01_A_F
-	{
-		Scope = 2;
-		displayname = "AT-TE Gun Front Left";
-		armor = 300;
-
-		class Turrets: Turrets
-		{
-			class MainTurret: MainTurret
-			{
-				weapons[] = {
-					"Laserdesignator_mounted",
-					"Cannon_LAAT"
-				};
-				magazines[] = {
-					"Laserbatteries",
-					"1000Rnd_Laser_Cannon_LAAT",
-					"1000Rnd_Laser_Cannon_LAAT",
-					"1000Rnd_Laser_Cannon_LAAT",
-					"1000Rnd_Laser_Cannon_LAAT"
-				};
-			};
-		};
-	};
-
-	class macro_new_vehicle(turret_ATTE,Front_Right_UAV):macro_new_vehicle(turret_ATTE,Front_Left_UAV)
-	{
-		Scope = 2;
-		displayname = "AT-TE Gun Front Right";
-		armor = 300;
-	};
-
-
-	class macro_new_vehicle(turret_ATTE,Rear_UAV):macro_new_vehicle(turret_ATTE,Front_Left_UAV)
-	{
-		Scope = 2;
-		displayname = "AT-TE Gun Rear";
-		armor = 300;
-	};
-
-	class O_SWOP_HoverTa_2;
-
-	class macro_new_vehicle(atte_itt,cabin):O_SWOP_HoverTa_2
-	{
-		Scope = 2;
-		displayname = "AT-TE Cabin ITT";
-		armor = 300;
-		hiddenSelections[] = {"Camo1"};
-		hiddenSelectionsTextures[] = {""};
-		author= "RD501"
-		crew = "SWOP_Clonetrooper_P1";
-	};
-
-
-};

+ 0 - 190
addons - Copy/RD501_Vehicles/land/E_Web/config.cpp

@@ -1,190 +0,0 @@
-//get generlized macros
-#include "../../../RD501_main/config_macros.hpp"
-
-//General name of the vehicle
-#define vehicle_addon E_Web
-#define patch_name MODNAME##vehicle_addon##_Patches
-#define vehicle_classname MODNAME##_##vehicle_addon
-
-#define macro_new_E_Web_class(name) vehicle_classname##_##name
-
-class CfgPatches
-{
-	class macro_patch_name(E_Web)
-	{
-		addonRootClass=macro_patch_name(vehicles)
-
-		requiredAddons[]=
-		{
-			macro_patch_name(vehicles)
-		};
-		requiredVersion=0.1;
-		units[]=
-		{
-			macro_new_vehicle(e_web,shield_uav),
-			macro_new_vehicle(e_web,shield),
-			macro_new_vehicle(e_web,uav),
-			"SW_halfshieldObject",
-			macro_new_vehicle(e_web,cis),
-			macro_new_vehicle(e_web,heavy)
-		};
-		weapons[]=
-		{
-			
-		};
-	};
-};
-
-#include "../../common/sensor_templates.hpp"
-class DefaultEventhandlers;
-
-class CfgVehicles
-{
-
-	class House_F;
-	class StaticMGWeapon
-	{
-		class turrets;
-	};
-	class EWEBSWBF: StaticMGWeapon
-	{
-		class turrets: turrets
-		{
-			class mainturret;
-		};
-	};
-	class SW_halfshieldObject:House_F
-	{
-		faction = "Default";
-		side = 3;
-		scope = 2;
-		scopeCurator = 2;
-		displayName = "Half Shield";
-		editorCategory = "SWOP_EditorCategory_Objects";
-		editorSubcategory = "SWOP_EditorSubcategory_Other";	
-	
-	};
-	class macro_new_vehicle(e_web,shield): EWEBSWBF
-	{
-		
-		author = "RD501";
-		armor = 90;
-		displayName = "Shielded E-Web";
-
-		faction = macro_cis_faction
-		editorSubcategory = macro_editor_cat(turrets)
-		vehicleClass = macro_editor_vehicle_type(turrets)
-
-		crew=macro_new_unit_class(opfor,B1_crew)
-		typicalCargo[] = {"SWOP_CIS_droid_crew"};
-
-		
-		class EventHandlers :DefaultEventhandlers {};
-
-	};
-
-
-	class macro_new_vehicle(e_web,shield_uav) : macro_new_vehicle(e_web,shield)
-	{
-		displayName = "Shielded E-Web (UAV)";
-		crew = "O_UAV_AI";
-		typicalCargo[] = {"O_UAV_AI"};
-	    isUav=1;
-		uavCameraGunnerPos = "PiP0_pos";
-		uavCameraGunnerDir = "PiP0_dir";
-
-		class EventHandlers :DefaultEventhandlers {};
-	};
-	
-
-	class macro_new_vehicle(e_web,uav): EWEBSWBF
-	{
-		displayName = "E-Web (UAV)";
-		crew = "O_UAV_AI";
-		typicalCargo[] = {"O_UAV_AI"};
-	    isUav=1;
-		uavCameraGunnerPos = "PiP0_pos";
-		uavCameraGunnerDir = "PiP0_dir";
-		author = "RD501";
-
-		faction = macro_cis_faction
-		editorSubcategory = macro_editor_cat(turrets)
-		vehicleClass = macro_editor_vehicle_type(turrets)
-
-		class EventHandlers :DefaultEventhandlers {};
-	};
-
-	class macro_new_vehicle(e_web,cis): EWEBSWBF
-	{
-		author = "RD501";
-		scope = 2;
-		displayname =" E-WEB (CIS)";
-		scopeCurator = 2;
-		mapSize = 4;
-
-		crew=macro_new_unit_class(opfor,B1_crew)
-		
-		faction = macro_cis_faction
-		editorSubcategory = macro_editor_cat(turrets)
-		vehicleClass = macro_editor_vehicle_type(turrets)
-
-		class assembleInfo
-		{
-			primary = 1;
-			base = "";
-			assembleTo = "";
-			displayName = "";
-			dissasembleTo[] = {macro_new_vehicle(blufor,eweb_bag)};
-		};
-
-		class EventHandlers :DefaultEventhandlers {};
-	};
-	
-	class macro_new_vehicle(e_web,heavy): EWEBSWBF
-	{
-		author = "RD501";
-		scope = 2;
-		side = 1;
-		displayname = "[PROTOTYPE] Heavy E-WEB Cannon";
-		scopeCurator = 2;
-		mapSize = 4;
-		crew = "SWOP_L501P1_Fives";
-
-		class turrets: turrets
-		{
-			class mainturret: mainturret
-			{
-				weapons[] = 
-				{
-					"RD501_RAMER"
-				};
-				magazines[] = 
-				{
-					"RD501_RAMER_x6_mag",
-					"RD501_RAMER_x6_mag",
-					"RD501_RAMER_x6_mag",
-					"RD501_RAMER_x6_mag",
-					"RD501_RAMER_x6_mag",
-					"RD501_RAMER_x6_mag",
-					"RD501_RAMER_x6_mag",
-					"RD501_RAMER_x6_mag",
-					"RD501_RAMER_x6_mag",
-					"RD501_RAMER_x6_mag",
-					"RD501_RAMER_x6_mag",
-					"RD501_RAMER_x6_mag"
-				};
-			};
-		};
-		faction = macro_republic_faction
-		editorSubcategory = macro_editor_cat(turrets)
-		vehicleClass = macro_editor_vehicle_type(turrets)
-		class assembleInfo
-		{
-			primary = 1;
-			base = "";
-			assembleTo = "";
-			displayName = "E-Web Cannon Backpack";
-			dissasembleTo[] = {macro_new_backpack_class(blufor,eweb_bag)};
-		};
-	};
-};

+ 0 - 124
addons - Copy/RD501_Vehicles/land/artillery/config.cpp

@@ -1,124 +0,0 @@
-//Get this addons macro
-
-//get the macro for the air macro_patch_name(vehicles)
-
-//get generlized macros
-#include "../../../RD501_main/config_macros.hpp"
-
-//General name of the vehicle
-#define vehicle_addon artillery
-#define patch_name MODNAME##vehicle_addon##_Patches
-#define vehicle_classname MODNAME##_##vehicle_addon
-
-#define macro_new_arty_class(name) vehicle_classname##_##name
-
-class CfgPatches
-{
-	class macro_patch_name(artillery)
-	{
-		addonRootClass=macro_patch_name(vehicles)
-
-		requiredAddons[]=
-		{
-			macro_patch_name(vehicles)
-		};
-		requiredVersion=0.1;
-		units[]=
-		{
-			macro_new_vehicle(artillery,CIS_Arty),
-			macro_new_vehicle(artillery,av76)
-		};
-		weapons[]=
-		{
-			
-		};
-	};
-};
-
-
-#include "../../common/sensor_templates.hpp"
-class DefaultEventhandlers;
-class CfgVehicles
-{
-
-	#include "inheritance.hpp"
-
-	class macro_new_vehicle(artillery,CIS_Arty): O_Truck_03_device_F
-	{
-		displayName = "CIS Rocket Truck";
-		
-		scope = 0;
-		scopeCurator=0;
-		
-		forceInGarage = 1;
-
-		faction = macro_cis_faction
-		editorSubcategory = macro_editor_cat(arty)
-		vehicleClass = macro_editor_cat(arty)
-
-		crew=macro_new_unit_class(opfor,B1_crew)
-
-	    typicalCargo[] = {"SWOP_CIS_droid_crew"};
-	    side=0;
-	   	attenuationEffectType = "TankAttenuation";
-		#include "sounds.hpp"
-		textureList[] = {};
-		hiddenSelections[] = {"Camo1", "Camo2", "Camo3", "Camo4"};
-		hiddenSelectionsTextures[] = 
-		{
-			macro_vehicle_textures\Tempest\CIS_Tempest_Ext.paa,
-			"",
-			macro_vehicle_textures\Tempest\CIS_Tempest_Cover.paa
-		};
-
-		class EventHandlers: DefaultEventhandlers {}; 
-
-		
-	};
-	
-
-	
-
-	class macro_new_vehicle(artillery,av76):SW_AV7//MBT_01_arty_base_F
-	{
-		scope=0;
-		scopeCurator=0;
-		scopeArsenal=2;
-		forceInGarage=1;
-		displayName="AV-76";
-		side=1;
-
-		RD501_magclamp_small_forbidden = 1;
-		RD501_magclamp_large_offset[] = {0.0,-6.0,-9.5};
-
-		faction = macro_republic_faction
-		editorSubcategory = macro_editor_cat(arty)
-		vehicleClass = macro_editor_cat(arty)
-		
-		forceInGarage = 1;
-		class Turrets:Turrets
-		{
-			class MainTurret:MainTurret
-			{	
-				weapons[] = {
-					macro_new_weapon(artillery,av76)
-				};
-				magazines[] = {
-					"32Rnd_155mm_Mo_shells",
-					"4Rnd_155mm_Mo_guided",
-					"6Rnd_155mm_Mo_mine",
-					"2Rnd_155mm_Mo_Cluster",
-					"6Rnd_155mm_Mo_smoke",
-					"2Rnd_155mm_Mo_LG",
-					"6Rnd_155mm_Mo_AT_mine"
-				};
-				maxHorizontalRotSpeed = 0.78;
-				maxVerticalRotSpeed = 0.26;
-				memoryPointGunnerOptics = "gunnerview";
-				cameraDir = "look";
-				elevationMode=3;
-			
-			};
-		};
-	};
-};

+ 0 - 17
addons - Copy/RD501_Vehicles/land/artillery/inheritance.hpp

@@ -1,17 +0,0 @@
-class O_Truck_03_device_F;
-
-
-
-class StaticWeapon;
-class StaticMGWeapon:StaticWeapon
-{
-	class Turrets;
-}
-
-class SW_AV7: StaticMGWeapon
-{
-	class Turrets: Turrets
-	{
-		class MainTurret;
-	}
-};

+ 0 - 370
addons - Copy/RD501_Vehicles/land/artillery/sounds.hpp

@@ -1,370 +0,0 @@
-soundGetIn[] = {"A3\sounds_f\vehicles\armor\noises\get_in_out", 0.562341, 1};
-		soundGetOut[] = {"A3\sounds_f\vehicles\armor\noises\get_in_out", 0.562341, 1, 70};
-		soundDammage[] = {"", 0.562341, 1};
-		soundEngineOnInt[] = {"ITT\ABRAMS_engine_int_start", "db+1", 1.5, 200};
-		soundEngineOffInt[] = {"ITT\ABRAMS_engine_int_stop", "db+1", 1.5, 200};
-		soundEngineOnExt[] = {"ITT\ABRAMS_engine_ext_start", "db+1", 1.5, 200};
-		soundEngineOffExt[] = {"ITT\ABRAMS_engine_ext_stop", "db+1", 1.5, 200};
-		soundBushCollision1[] = {"A3\Sounds_F\vehicles\crashes\helis\Heli_coll_bush_int_1", 0.177828, 1, 100};
-		soundBushCollision2[] = {"A3\Sounds_F\vehicles\crashes\helis\Heli_coll_bush_int_2", 0.177828, 1, 100};
-		soundBushCollision3[] = {"A3\Sounds_F\vehicles\crashes\helis\Heli_coll_bush_int_3", 0.177828, 1, 100};
-		soundBushCrash[] = {"soundBushCollision1", 0.33, "soundBushCollision2", 0.33, "soundBushCollision3", 0.33};
-		soundGeneralCollision1[] = {"A3\Sounds_F\vehicles\crashes\armors\tank_crash_default_1", 1, 1, 100};
-		soundGeneralCollision2[] = {"A3\Sounds_F\vehicles\crashes\armors\tank_crash_default_2", 1, 1, 100};
-		soundGeneralCollision3[] = {"A3\Sounds_F\vehicles\crashes\armors\tank_crash_default_3", 1, 1, 100};
-		soundGeneralCollision4[] = {"A3\Sounds_F\vehicles\crashes\armors\tank_crash_default_4", 1, 1, 100};
-		soundCrashes[] = {"soundGeneralCollision1", 0.25, "soundGeneralCollision2", 0.25, "soundGeneralCollision3", 0.25, "soundGeneralCollision4", 0.25};
-		buildCrash0[] = {"A3\Sounds_F\vehicles\crashes\armors\tank_coll_building_1", 1, 1, 200};
-		buildCrash1[] = {"A3\Sounds_F\vehicles\crashes\armors\tank_coll_building_2", 1, 1, 200};
-		buildCrash2[] = {"A3\Sounds_F\vehicles\crashes\armors\tank_coll_building_3", 1, 1, 200};
-		buildCrash3[] = {"A3\Sounds_F\vehicles\crashes\armors\tank_coll_building_4", 1, 1, 200};
-		soundBuildingCrash[] = {"buildCrash0", 0.25, "buildCrash1", 0.25, "buildCrash2", 0.25, "buildCrash3", 0.25};
-		WoodCrash0[] = {"A3\Sounds_F\vehicles\crashes\armors\tank_coll_wood_1", 1, 1, 200};
-		WoodCrash1[] = {"A3\Sounds_F\vehicles\crashes\armors\tank_coll_wood_2", 1, 1, 200};
-		WoodCrash2[] = {"A3\Sounds_F\vehicles\crashes\armors\tank_coll_wood_3", 1, 1, 200};
-		WoodCrash3[] = {"A3\Sounds_F\vehicles\crashes\armors\tank_coll_wood_4", 1, 1, 200};
-		soundWoodCrash[] = {"woodCrash0", 0.166, "woodCrash1", 0.166, "woodCrash2", 0.166, "woodCrash3", 0.166};
-		ArmorCrash0[] = {"A3\Sounds_F\vehicles\crashes\armors\tank_coll_armor_1", 1, 1, 200};
-		ArmorCrash1[] = {"A3\Sounds_F\vehicles\crashes\armors\tank_coll_armor_2", 1, 1, 200};
-		ArmorCrash2[] = {"A3\Sounds_F\vehicles\crashes\armors\tank_coll_armor_3", 1, 1, 200};
-		ArmorCrash3[] = {"A3\Sounds_F\vehicles\crashes\armors\tank_coll_armor_4", 1, 1, 200};
-		soundArmorCrash[] = {"ArmorCrash0", 0.25, "ArmorCrash1", 0.25, "ArmorCrash2", 0.25, "ArmorCrash3", 0.25};
-		class Sounds
-		{
-			class Idle_ext
-			{
-				sound[] = {"SWOP_vehiclecommon\Speeder\Speederbike\Sounds\Engine_Idle", 1.51623, 0.5, 100};
-				frequency = 1;
-				volume = "engineOn*camPos*(((rpm/ 2000) factor[(200/ 2000),(400/ 2000)]) * ((rpm/ 2000) factor[(750/ 2000),( 600/ 2000)]))";
-			};
-			class Engine
-			{
-				sound[] = {"SWOP_vehiclecommon\Speeder\Speederbike\Sounds\Engine_Idle", 1.55481, 0.51, 200};
-				frequency = "0.9 + ((rpm/ 2000) factor[(600/ 2000),(1000/ 2000)])*0.2";
-				volume = "engineOn*camPos*(((rpm/ 2000) factor[(600/ 2000),(730/ 2000)]) * ((rpm/ 2000) factor[(1020/ 2000),( 800/ 2000)]))";
-			};
-			class Engine1_ext
-			{
-				sound[] = {"", 0.398107, 1, 200};
-				frequency = "0.9 + ((rpm/ 2000) factor[(800/ 2000),(1300/ 2000)])*0.2";
-				volume = "engineOn*camPos*(((rpm/ 2000) factor[(780/ 2000),(1000/ 2000)]) * ((rpm/ 2000) factor[(1300/ 2000),( 1100/ 2000)]))";
-			};
-			class Engine2_ext
-			{
-				sound[] = {"", 0.446684, 1, 250};
-				frequency = "0.9 + ((rpm/ 2000) factor[(1080/ 2000),(1560/ 2000)])*0.2";
-				volume = "engineOn*camPos*(((rpm/ 2000) factor[(1100/ 2000),(1280/ 2000)]) * ((rpm/ 2000) factor[(1570/ 2000),( 1380/ 2000)]))";
-			};
-			class Engine3_ext
-			{
-				sound[] = {"", 0.501187, 1, 250};
-				frequency = "0.95 + ((rpm/ 2000) factor[(1380/ 2000),(1860/ 2000)])*0.2";
-				volume = "engineOn*camPos*(((rpm/ 2000) factor[(1350/ 2000),(1550/ 2000)]) * ((rpm/ 2000) factor[(1870/ 2000),( 1630/ 2000)]))";
-			};
-			class Engine4_ext
-			{
-				sound[] = {"", 0.562341, 1, 300};
-				frequency = "0.95 + ((rpm/ 2000) factor[(1630/ 2000),(2000/ 2000)]) *0.2";
-				volume = "engineOn*camPos*((rpm/ 2000) factor[(1650/ 2000),(1900/ 2000)])";
-			};
-			class IdleThrust
-			{
-				sound[] = {"SWOP_vehiclecommon\Speeder\Speederbike\Sounds\SpeederBike_rpm1", 0.562341, 0.51, 150};
-				frequency = 1;
-				volume = "engineOn*camPos*(0.4+(0.6*(thrust factor[0.1,1])))*(((rpm/ 2000) factor[(200/ 2000),(400/ 2000)]) * ((rpm/ 2000) factor[(750/ 2000),( 600/ 2000)]))";
-			};
-			class EngineThrust
-			{
-				sound[] = {"", 0.630957, 1, 200};
-				frequency = "0.9 + ((rpm/ 2000) factor[(600/ 2000),(1000/ 2000)])*0.2";
-				volume = "engineOn*camPos*(0.4+(0.6*(thrust factor[0.1,1])))*(((rpm/ 2000) factor[(600/ 2000),(730/ 2000)]) * ((rpm/ 2000) factor[(1020/ 2000),( 800/ 2000)]))";
-			};
-			class Engine1_Thrust_ext
-			{
-				sound[] = {"SWOP_vehiclecommon\Speeder\Speederbike\Sounds\SpeederBike_rpm2", 0.707946, 0.51, 250};
-				frequency = "0.9 + ((rpm/ 2000) factor[(800/ 2000),(1300/ 2000)])*0.2";
-				volume = "engineOn*camPos*(0.4+(0.6*(thrust factor[0.1,1])))*(((rpm/ 2000) factor[(780/ 2000),(1000/ 2000)]) * ((rpm/ 2000) factor[(1300/ 2000),( 1100/ 2000)]))";
-			};
-			class Engine2_Thrust_ext
-			{
-				sound[] = {"SWOP_vehiclecommon\Speeder\Speederbike\Sounds\SpeederBike_rpm3", 0.794328, 0.5, 300};
-				frequency = "0.9 + ((rpm/ 2000) factor[(1080/ 2000),(1560/ 2000)])*0.2";
-				volume = "engineOn*camPos*(0.4+(0.6*(thrust factor[0.1,1])))*(((rpm/ 2000) factor[(1100/ 2000),(1280/ 2000)]) * ((rpm/ 2000) factor[(1570/ 2000),( 1380/ 2000)]))";
-			};
-			class Engine3_Thrust_ext
-			{
-				sound[] = {"SWOP_vehiclecommon\Speeder\Speederbike\Sounds\SpeederBike_rpm4", 0.891251, 0.51, 350};
-				frequency = "0.95 + ((rpm/ 2000) factor[(1380/ 2000),(1860/ 2000)])*0.2";
-				volume = "engineOn*camPos*(0.4+(0.6*(thrust factor[0.1,1])))*(((rpm/ 2000) factor[(1350/ 2000),(1550/ 2000)]) * ((rpm/ 2000) factor[(1870/ 2000),( 1630/ 2000)]))";
-			};
-			class Engine4_Thrust_ext
-			{
-				sound[] = {"SWOP_vehiclecommon\Speeder\Speederbike\Sounds\SpeederBike_rpm5", 1, 0.51, 400};
-				frequency = "0.95 + ((rpm/ 2000) factor[(1630/ 2000),(2000/ 2000)]) *0.2";
-				volume = "engineOn*camPos*(0.4+(0.6*(thrust factor[0.1,1])))*((rpm/ 2000) factor[(1650/ 2000),(1900/ 2000)])";
-			};
-			class Idle_int
-			{
-				sound[] = {"SWOP_vehiclecommon\Speeder\Speederbike\Sounds\Engine_Idle", 0.251189, 0.51};
-				frequency = 1;
-				volume = "engineOn*(1-camPos)*(((rpm/ 2000) factor[(200/ 2000),(400/ 2000)]) * ((rpm/ 2000) factor[(750/ 2000),( 600/ 2000)]))";
-			};
-			class Engine_int
-			{
-				sound[] = {"SWOP_vehiclecommon\Speeder\Speederbike\Sounds\Engine_Idle", 0.281838, 0.51};
-				frequency = "0.9 + ((rpm/ 2000) factor[(600/ 2000),(1000/ 2000)])*0.2";
-				volume = "engineOn*(1-camPos)*(((rpm/ 2000) factor[(600/ 2000),(730/ 2000)]) * ((rpm/ 2000) factor[(1020/ 2000),( 800/ 2000)]))";
-			};
-			class Engine1_int
-			{
-				sound[] = {"", 0.316228, 1};
-				frequency = "0.9 + ((rpm/ 2000) factor[(800/ 2000),(1300/ 2000)])*0.2";
-				volume = "engineOn*(1-camPos)*(((rpm/ 2000) factor[(780/ 2000),(1000/ 2000)]) * ((rpm/ 2000) factor[(1300/ 2000),( 1100/ 2000)]))";
-			};
-			class Engine2_int
-			{
-				sound[] = {"", 0.354813, 1};
-				frequency = "0.9 + ((rpm/ 2000) factor[(1080/ 2000),(1560/ 2000)])*0.2";
-				volume = "engineOn*(1-camPos)*(((rpm/ 2000) factor[(1100/ 2000),(1280/ 2000)]) * ((rpm/ 2000) factor[(1570/ 2000),( 1380/ 2000)]))";
-			};
-			class Engine3_int
-			{
-				sound[] = {"", 0.398107, 1};
-				frequency = "0.95 + ((rpm/ 2000) factor[(1380/ 2000),(1860/ 2000)])*0.2";
-				volume = "engineOn*(1-camPos)*(((rpm/ 2000) factor[(1350/ 2000),(1550/ 2000)]) * ((rpm/ 2000) factor[(1870/ 2000),( 1630/ 2000)]))";
-			};
-			class Engine4_int
-			{
-				sound[] = {"", 0.446684, 1};
-				frequency = "0.95 + ((rpm/ 2000) factor[(1630/ 2000),(2000/ 2000)]) *0.2";
-				volume = "engineOn*(1-camPos)*((rpm/ 2000) factor[(1650/ 2000),(1900/ 2000)])";
-			};
-			class IdleThrust_Int
-			{
-				sound[] = {"", 0.562341, 1};
-				frequency = 1;
-				volume = "engineOn*(1-camPos)*(0.4+(0.6*(thrust factor[0.1,1])))*(((rpm/ 2000) factor[(200/ 2000),(400/ 2000)]) * ((rpm/ 2000) factor[(750/ 2000),( 600/ 2000)]))";
-			};
-			class EngineThrust_Int
-			{
-				sound[] = {"SWOP_vehiclecommon\Speeder\Speederbike\Sounds\SpeederBike_rpm1", 0.630957, 0.51};
-				frequency = "0.9 + ((rpm/ 2000) factor[(600/ 2000),(1000/ 2000)])*0.2";
-				volume = "engineOn*(1-camPos)*(0.4+(0.6*(thrust factor[0.1,1])))*(((rpm/ 2000) factor[(600/ 2000),(730/ 2000)]) * ((rpm/ 2000) factor[(1020/ 2000),( 800/ 2000)]))";
-			};
-			class Engine1_Thrust_int
-			{
-				sound[] = {"SWOP_vehiclecommon\Speeder\Speederbike\Sounds\SpeederBike_rpm2", 0.707946, 0.51};
-				frequency = "0.9 + ((rpm/ 2000) factor[(800/ 2000),(1300/ 2000)])*0.2";
-				volume = "engineOn*(1-camPos)*(0.4+(0.6*(thrust factor[0.1,1])))*(((rpm/ 2000) factor[(780/ 2000),(1000/ 2000)]) * ((rpm/ 2000) factor[(1300/ 2000),( 1100/ 2000)]))";
-			};
-			class Engine2_Thrust_int
-			{
-				sound[] = {"SWOP_vehiclecommon\Speeder\Speederbike\Sounds\SpeederBike_rpm3", 0.794328, 0.51};
-				frequency = "0.9 + ((rpm/ 2000) factor[(1080/ 2000),(1560/ 2000)])*0.2";
-				volume = "engineOn*(1-camPos)*(0.4+(0.6*(thrust factor[0.1,1])))*(((rpm/ 2000) factor[(1100/ 2000),(1280/ 2000)]) * ((rpm/ 2000) factor[(1570/ 2000),( 1380/ 2000)]))";
-			};
-			class Engine3_Thrust_int
-			{
-				sound[] = {"SWOP_vehiclecommon\Speeder\Speederbike\Sounds\SpeederBike_rpm4", 0.891251, 0.51};
-				frequency = "0.95 + ((rpm/ 2000) factor[(1380/ 2000),(1860/ 2000)])*0.2";
-				volume = "engineOn*(1-camPos)*(0.4+(0.6*(thrust factor[0.1,1])))*(((rpm/ 2000) factor[(1350/ 2000),(1550/ 2000)]) * ((rpm/ 2000) factor[(1870/ 2000),( 1630/ 2000)]))";
-			};
-			class Engine4_Thrust_int
-			{
-				sound[] = {"SWOP_vehiclecommon\Speeder\Speederbike\Sounds\SpeederBike_rpm5", 1, 0.51};
-				frequency = "0.95 + ((rpm/ 2000) factor[(1630/ 2000),(2000/ 2000)]) *0.2";
-				volume = "engineOn*(1-camPos)*(0.4+(0.6*(thrust factor[0.1,1])))*((rpm/ 2000) factor[(1650/ 2000),(1900/ 2000)])";
-			};
-			class NoiseInt
-			{
-				sound[] = {"A3\sounds_f\vehicles\armor\noises\noise_tank_int_1", 0.501187, 1};
-				frequency = "1";
-				volume = "(1-camPos)*(angVelocity max 0.04)*(speed factor[4, 15])";
-			};
-			class NoiseExt
-			{
-				sound[] = {"A3\sounds_f\vehicles\armor\noises\noise_tank_ext_1", 0.630957, 1, 150};
-				frequency = "1";
-				volume = "camPos*(angVelocity max 0.04)*(speed factor[4, 15])";
-			};
-			class TiresRockOut
-			{
-				sound[] = {"", 1, 1, 60};
-				frequency = "1";
-				volume = "camPos*rock*(speed factor[2, 20])";
-			};
-			class TiresSandOut
-			{
-				sound[] = {"", 1, 1, 60};
-				frequency = "1";
-				volume = "camPos*sand*(speed factor[2, 20])";
-			};
-			class TiresGrassOut
-			{
-				sound[] = {"", 1, 1, 60};
-				frequency = "1";
-				volume = "camPos*grass*(speed factor[2, 20])";
-			};
-			class TiresMudOut
-			{
-				sound[] = {"", 1, 1, 60};
-				frequency = "1";
-				volume = "camPos*mud*(speed factor[2, 20])";
-			};
-			class TiresGravelOut
-			{
-				sound[] = {"", 1, 1, 60};
-				frequency = "1";
-				volume = "camPos*gravel*(speed factor[2, 20])";
-			};
-			class TiresAsphaltOut
-			{
-				sound[] = {"", 1, 1, 60};
-				frequency = "1";
-				volume = "camPos*asphalt*(speed factor[2, 20])";
-			};
-			class NoiseOut
-			{
-				sound[] = {"A3\Sounds_F\vehicles\soft\noises\noise_int_car_3", 1.25893, 1, 90};
-				frequency = "1";
-				volume = "camPos*(damper0 max 0.02)*(speed factor[0, 8])";
-			};
-			class TiresRockIn
-			{
-				sound[] = {"", 1, 1, 60};
-				frequency = "1";
-				volume = "(1-camPos)*rock*(speed factor[2, 20])";
-			};
-			class TiresSandIn
-			{
-				sound[] = {"", 1, 1, 60};
-				frequency = "1";
-				volume = "(1-camPos)*sand*(speed factor[2, 20])";
-			};
-			class TiresGrassIn
-			{
-				sound[] = {"", 1, 1, 60};
-				frequency = "1";
-				volume = "(1-camPos)*grass*(speed factor[2, 20])";
-			};
-			class TiresMudIn
-			{
-				sound[] = {"", 1, 1, 60};
-				frequency = "1";
-				volume = "(1-camPos)*mud*(speed factor[2, 20])";
-			};
-			class TiresGravelIn
-			{
-				sound[] = {"", 1, 1, 60};
-				frequency = "1";
-				volume = "(1-camPos)*gravel*(speed factor[2, 20])";
-			};
-			class TiresAsphaltIn
-			{
-				sound[] = {"", 1, 1, 60};
-				frequency = "1";
-				volume = "(1-camPos)*asphalt*(speed factor[2, 20])";
-			};
-			class NoiseIn
-			{
-				sound[] = {"A3\Sounds_F\vehicles\soft\noises\noise_int_car_3", 0.501187, 1};
-				frequency = "1";
-				volume = "(damper0 max 0.1)*(speed factor[0, 8])*(1-camPos)";
-			};
-			class breaking_ext_road
-			{
-				sound[] = {"", 1, 1, 60};
-				frequency = 1;
-				volume = "engineOn*camPos*(LongSlipDrive Factor[-0.2, -0.5])*(Speed Factor[2, 10])";
-			};
-			class acceleration_ext_road
-			{
-				sound[] = {"", 1, 1, 60};
-				frequency = 1;
-				volume = "engineOn*camPos*(LongSlipDrive Factor[0.2, 0.5])*(Speed Factor[10, 1])";
-			};
-			class turn_left_ext_road
-			{
-				sound[] = {"", 1, 1, 60};
-				frequency = 1;
-				volume = "engineOn*camPos*(latSlipDrive Factor[0.15, 0.5])*(Speed Factor[0, 10])";
-			};
-			class turn_right_ext_road
-			{
-				sound[] = {"", 1, 1, 60};
-				frequency = 1;
-				volume = "engineOn*camPos*(latSlipDrive Factor[-0.15, -0.5])*(Speed Factor[0, 10])";
-			};
-			class breaking_ext_dirt
-			{
-				sound[] = {"", 1, 1, 60};
-				frequency = 1;
-				volume = "engineOn*camPos*(LongSlipDrive Factor[-0.2, -0.5])*(Speed Factor[2, 10])";
-			};
-			class acceleration_ext_dirt
-			{
-				sound[] = {"", 1, 1, 60};
-				frequency = 1;
-				volume = "engineOn*camPos*(LongSlipDrive Factor[0.2, 0.5])*(Speed Factor[10, 1])";
-			};
-			class turn_left_ext_dirt
-			{
-				sound[] = {"", 1, 1, 60};
-				frequency = 1;
-				volume = "engineOn*camPos*(latSlipDrive Factor[0.15, 0.5])*(Speed Factor[0, 10])";
-			};
-			class turn_right_ext_dirt
-			{
-				sound[] = {"", 1, 1, 60};
-				frequency = 1;
-				volume = "engineOn*camPos*(latSlipDrive Factor[-0.15, -0.5])*(Speed Factor[0, 10])";
-			};
-			class breaking_int_road
-			{
-				sound[] = {"", 1, 1, 60};
-				frequency = 1;
-				volume = "engineOn*(1-camPos)*(LongSlipDrive Factor[-0.4, -0.6])*(Speed Factor[2, 6])";
-			};
-			class acceleration_int_road
-			{
-				sound[] = {"", 1, 1, 60};
-				frequency = 1;
-				volume = "engineOn*(1-camPos)*(LongSlipDrive Factor[0.4, 0.6])*(Speed Factor[10, 1])";
-			};
-			class turn_left_int_road
-			{
-				sound[] = {"", 1, 1, 60};
-				frequency = 1;
-				volume = "engineOn*(1-camPos)*(latSlipDrive Factor[0.4, 0.6])*(Speed Factor[1, 10])";
-			};
-			class turn_right_int_road
-			{
-				sound[] = {"", 1, 1, 60};
-				frequency = 1;
-				volume = "engineOn*(1-camPos)*(latSlipDrive Factor[-0.4, -0.6])*(Speed Factor[1, 10])";
-			};
-			class breaking_int_dirt
-			{
-				sound[] = {"", 1, 1, 60};
-				frequency = 1;
-				volume = "engineOn*(1-camPos)*(LongSlipDrive Factor[-0.4, -0.6])*(Speed Factor[2, 6])";
-			};
-			class acceleration_int_dirt
-			{
-				sound[] = {"", 1, 1, 60};
-				frequency = 1;
-				volume = "engineOn*(1-camPos)*(LongSlipDrive Factor[0.4, 0.6])*(Speed Factor[10, 1])";
-			};
-			class turn_left_int_dirt
-			{
-				sound[] = {"", 1, 1, 60};
-				frequency = 1;
-				volume = "engineOn*(1-camPos)*(latSlipDrive Factor[0.4, 0.6])*(Speed Factor[1, 10])";
-			};
-			class turn_right_int_dirt
-			{
-				sound[] = {"", 1, 1, 60};
-				frequency = 1;
-				volume = "engineOn*(1-camPos)*(latSlipDrive Factor[-0.4, -0.6])*(Speed Factor[1, 10])";
-			};
-		};

+ 0 - 195
addons - Copy/RD501_Vehicles/land/shield_wall/config.cpp

@@ -1,195 +0,0 @@
-//Get this addons macro
-
-//get the macro for the air macro_patch_name(vehicles)
-
-//get generlized macros
-#include "../../../RD501_main/config_macros.hpp"
-
-//General name of the vehicle
-#define vehicle_addon energy_shield_wall
-#define patch_name MODNAME##vehicle_addon##_Patches
-#define vehicle_classname MODNAME##_##vehicle_addon
-
-#define new_energy_sheild_wall_class(name) vehicle_classname##_##name
-
-class CfgPatches
-{
-	class macro_patch_name(energy_shield_wall)
-	{
-		addonRootClass=macro_patch_name(vehicles)
-
-		requiredAddons[]=
-		{
-			macro_patch_name(vehicles)
-		};
-		requiredVersion=0.1;
-		units[]=
-		{
-			macro_new_vehicle(shield,object_1),
-			macro_new_vehicle(shield,object_2),
-			macro_new_vehicle(shield,object_3),
-			macro_new_vehicle(shield,object_4),
-			macro_new_vehicle(shield,object_5),
-			macro_new_vehicle(shield,object_6)
-		};
-		weapons[]=
-		{
-			
-		};
-	};
-};
-
-
-#include "../../common/sensor_templates.hpp"
-
-class DefaultEventhandlers;
-class CfgVehicles
-{
-	//O_JM_TX130_1  empire command
-	//O_JM_TX130m1_1 normal
-	//O_JM_TX130m2_1 super
-
-	class House_F;
-	class macro_new_vehicle(shield,object_1): House_F
-	{
-		scope = 2;
-		scopeCurator = 2;
-		author = "RD501";
-		model = "\BlasterWallShield\SW_WallShield1.p3d";
-		displayName = "501st  Wall Energy Shield 1";
-		vehicleClass = macro_editor_vehicle_type(statics)
-		editorCategory =  macro_editor_cat(statics)
-	
-		editorSubcategory = macro_editor_cat(wall)
-		armor = 12000;
-		mapSize = 0.1;
-		picture = "";
-		icon = "\BlastersquadShield\UI\icon_squadshield_ca.paa";
-		accuracy = 1000;
-		simulation = "fire";
-		class DestructionEffects
-		{
-		};
-		destrType = "DestructNo";
-		keepHorizontalPlacement = 1;
-		cost = 0;
-		class EventHandlers : DefaultEventhandlers
-		{
-			init = "(_this select 0) inflame true";
-			
-		};
-		
-		class MarkerLights
-		{
-			class Light_1
-			{
-				color[] = {0, 0, 1};
-				ambient[] = {0, 0, 0.01};
-				intensity = 800;
-				name = "Light_1_pos";
-				blinking = 1;
-				blinkingPattern[] = {2, 1};
-				blinkingStartsOn = 1;
-				blinkingPatternGuarantee = 1;
-				useFlare = 1;
-				flareSize = 1.5;
-				flareMaxDistance = 1000;
-				activeLight = 1;
-				dayLight = 1;
-				drawLight = 0;
-				class Attenuation
-				{
-					start = 0;
-					constant = 2;
-					linear = 10;
-					quadratic = 20;
-					hardLimitStart = 5;
-					hardLimitEnd = 6;
-				};
-			};
-		};
-		aggregateReflectors[] = {{"Light_1"}};
-		class Reflectors
-		{
-			class Light_1
-			{
-				color[] = {2000, 2000, 7000};
-				ambient[] = {2, 2, 7};
-				intensity = 2;
-				size = 1;
-				innerAngle = 100;
-				outerAngle = 165;
-				coneFadeCoef = 4;
-				position = "Light_1_pos";
-				direction = "Light_1_dir";
-				hitpoint = "Light_1_hide";
-				selection = "Light_1_hide";
-				activeLight = 1;
-				dayLight = 1;
-				drawLight = 0;
-				useFlare = 1;
-				flareSize = 2;
-				flareMaxDistance = 130;
-				class Attenuation
-				{
-					start = 0;
-					constant = 0;
-					linear = 0;
-					quadratic = 0.3;
-					hardLimitStart = 50;
-					hardLimitEnd = 65;
-				};
-			};
-		};
-		class Damage
-		{
-			tex[] = {};
-			mat[] = {};
-		};
-	};
-
-	class macro_new_vehicle(shield,object_2): macro_new_vehicle(shield,object_1)
-	{
-		scope = 2;
-		scopeCurator = 2;
-		author = "RD501";
-		model = "\BlasterWallShield\SW_WallShield2.p3d";
-		displayName = "501st Wall Energy Shield 2";
-	};
-	class macro_new_vehicle(shield,object_3): macro_new_vehicle(shield,object_1)
-	{
-		scope = 2;
-		scopeCurator = 2;
-		author = "RD501";
-		model = "\BlasterWallShield\SW_WallShield3.p3d";
-		displayName = "501st Wall Energy Shield 3";
-	};
-	class macro_new_vehicle(shield,object_4): macro_new_vehicle(shield,object_1)
-	{
-		scope = 2;
-		scopeCurator = 2;
-		author = "RD501";
-		model = "\BlasterWallShield\SW_WallShield4.p3d";
-		displayName = "501st Wall Energy Shield 4";
-	};
-	class macro_new_vehicle(shield,object_5): macro_new_vehicle(shield,object_1)
-	{
-		scope = 2;
-		scopeCurator = 2;
-		author = "RD501";
-		model = "\BlasterWallShield\SW_WallShield5.p3d";
-		displayName = "501st Wall Energy Shield 5";
-	};
-	class macro_new_vehicle(shield,object_6): macro_new_vehicle(shield,object_1)
-	{
-		scope = 2;
-		scopeCurator = 2;
-		author = "RD501";
-		model = "\BlasterWallShield\SW_WallShield6.p3d";
-		displayName = "501st Wall Energy Shield 6";
-	};
-
-	
-
-
-};

+ 0 - 2
addons - Copy/RD501_Vehicles/land/speeders/barc_mass.sqf

@@ -1,2 +0,0 @@
-params["_this"];
-_this setmass 100;

+ 0 - 99
addons - Copy/RD501_Vehicles/land/speeders/config.cpp

@@ -1,99 +0,0 @@
-//Get this addons macro
-
-//get the macro for the air macro_patch_name(vehicles)
-
-//get generlized macros
-#include "../../../RD501_main/config_macros.hpp"
-
-//General name of the vehicle
-#define vehicle_addon speeders
-#define patch_name MODNAME##vehicle_addon##_Patches
-#define vehicle_classname MODNAME##_##vehicle_addon
-
-#define macro_new_speeder_class(name) vehicle_classname##_##name
-
-
-class CfgPatches
-{
-	class macro_patch_name(speeders)
-	{
-		addonRootClass=macro_patch_name(vehicles)
-
-		requiredAddons[]=
-		{
-			macro_patch_name(vehicles)
-		};
-		requiredVersion=0.1;
-		units[]=
-		{
-			"SW_SPCIS",
-			"rd501_sw_barc"
-		};
-		weapons[]=
-		{
-			
-		};
-	};
-};
-
-
-#include "../../common/sensor_templates.hpp"
-class CBA_Extended_EventHandlers_base;
-class CfgVehicles
-{
-	class  Car_F;
-	class SW_SpeederBike_base: Car_F
-	{
-		ace_cargo_size = 4;  
-		ace_cargo_canLoad = 1;
-	};
-
-	class SW_SpeederBike;
-
-
-	class SW_SPCIS: SW_SpeederBike
-	{
-		faction = macro_cis_faction
-		editorSubcategory = macro_editor_cat(CIS_speeders)
-		//editorCategory= "";
-		vehicleClass = macro_editor_vehicle_type(speeders)
-		
-		side=0;
-		
-		scope = 2;
-		model = "\SW_SpeederBike\SW_SpeederBike";
-		displayName = "CIS Combat speeder MK2";
-		author = "Rexi";
-		crew=macro_new_unit_class(opfor,B1_crew)
-		typicalCargo[] = {"SWOP_CIS_droid_mg","SWOP_CIS_droid_mg"};
-		side = 0;
-		//faction = "RD501FactionOpfor";
-		vehicleClass = "GroundVehicles";
-		weapons[] = {"SW_SpeederBikeCanon"};
-		magazines[] = {"SW_SpeederBikeCanon_Mag"};
-		class EventHandlers
-		{
-	
-			class CBA_Extended_EventHandlers: CBA_Extended_EventHandlers_base {};
-		};
-	};
-	class sw_barc;
-	class rd501_sw_barc: sw_barc
-	{
-		author = "Zatama";
-		displayname = "Barc Speeder"
-		ace_cargo_size = 2;
-		ace_cargo_canLoad = 1;
-		faction = macro_republic_faction;
-		editorSubcategory = macro_editor_cat(Transport);
-		vehicleClass = macro_editor_vehicle_type(Transport);
-		weapons[] = {macro_new_weapon(generic,plasma_aircraft_cannon)};
-		magazines[] = {macro_new_mag(generic_aircraft_cannon_plasma_red,1000),macro_new_mag(generic_aircraft_cannon_plasma_red,1000)};
-		class EventHandlers
-		{
-			init = "[_this select 0] execVM 'rd501_vehicles\land\speeders\barc_mass.sqf';";
-		}
-	}
-
-
-};

+ 0 - 1
addons - Copy/RD501_Vehicles/static/bacta/config.cpp

@@ -51,7 +51,6 @@ class CfgVehicles
 		hiddenSelections[] = {};
 		hiddenSelections[] = {};
 		hiddenSelectionsTextures[] = {};
 		hiddenSelectionsTextures[] = {};
 		//vehicleClass = "Objects";
 		//vehicleClass = "Objects";
-		icon = "\SW_medical\data\bt_icon.paa";
 
 
 		vehicleClass = macro_editor_vehicle_type(statics)
 		vehicleClass = macro_editor_vehicle_type(statics)
 		editorCategory =  macro_editor_cat(statics)
 		editorCategory =  macro_editor_cat(statics)

+ 1 - 2
addons - Copy/RD501_Weapons/Bounty Hunters/config.cpp

@@ -2,7 +2,7 @@
 #include "../_common/common.hpp"
 #include "../_common/common.hpp"
 class CfgPatches
 class CfgPatches
 {
 {
-	class RD501_patch_bountyhunter_eapons
+	class RD501_patch_bountyhunter_weapons
 	{
 	{
 		author="RD501";
 		author="RD501";
 		addonRootClass="RD501_patch_weapons";
 		addonRootClass="RD501_patch_weapons";
@@ -23,7 +23,6 @@ class cfgWeapons
 {
 {
 	class arifle_MSBS65_GL_black_F;
 	class arifle_MSBS65_GL_black_F;
 	class srifle_DMR_04_F;
 	class srifle_DMR_04_F;
-	class Mode_SemiAuto;
 	class UGL_F;
 	class UGL_F;
 	class macro_new_weapon_nofam(Devastator):arifle_MSBS65_GL_black_F
 	class macro_new_weapon_nofam(Devastator):arifle_MSBS65_GL_black_F
 	{
 	{

+ 0 - 107
addons - Copy/RD501_Weapons/DC_Family/DC_17/config.cpp

@@ -274,112 +274,5 @@ class cfgWeapons
 			};
 			};
 		};
 		};
 	};
 	};
-/*
-	class RD501_DC_15_RB:SWOP_DC15SAPistol
-	{
-		scope=2;
-		author = "RD501";
-		displayname = "DC-15 'Razor Blade'";
-		descriptionShort = "Namenai is here";
-		recoil = macro_new_recoil(dc15_rb)
-		magazines[] = {
-			macro_new_mag(DC15_razor_blade,9)
-		};
-		fireSpreadAngle = 3;
-		class FlashLight
-		{
-			color[] = {7000, 7500, 20000};//{7000, 7500, 10000};
-			ambient[] = {6, 9, 9};
-			intensity = 5;//2.5;
-			size = 1;
-			innerAngle = 20;
-			outerAngle = 80;
-			coneFadeCoef = 10;
-			position = "flash_dir";
-			direction = "flash_pos";
-			useFlare = 1;
-			flareSize = 1.5;
-			flareMaxDistance = "600.0f";
-			dayLight = 1;
-			class Attenuation
-			{
-				start = 2;//0.5;
-				constant = 1;
-				linear = 0;
-				quadratic = 0;//1
-				hardLimitStart = 200;
-				hardLimitEnd = 300;
-			};
-			scale[] = {0};
-		};
-
-		class Single: Single
-		{
-			sounds[] = {"StandardSound"};
-			class BaseSoundModeType
-			{
-				closure1[] = {"A3\Sounds_F\arsenal\weapons\Pistols\Rook40\Closure_Rook40_01", 0.158489, 1, 10};
-				closure2[] = {"A3\Sounds_F\arsenal\weapons\Pistols\Rook40\Closure_Rook40_02", 0.158489, 1.1, 10};
-				soundClosure[] = {"closure1", 0.5, "closure2", 0.5};
-			};
-			class StandardSound: BaseSoundModeType
-			{
-				weaponSoundEffect = "DefaultRifle";
-				begin1[] = {"SW_CloneWarsWeapons\DC17M\dc17msniper1.ogg",1.2,1,2000};
-				begin2[] = {"SW_CloneWarsWeapons\DC17M\dc17msniper2.ogg",1.2,1,2000};
-				begin3[] = {"SW_CloneWarsWeapons\DC17M\dc17msniper3.ogg",1.2,1,2000};
-				soundBegin[] = {"begin1", 0.5, "begin2", 0.5, "begin3", 0.5};
-				class SoundTails
-				{
-					class TailInterior
-					{
-						sound[] = {"A3\Sounds_F\arsenal\weapons\Pistols\Rook40\Rook40_tail_interior", 1.41254, 1, 1200};
-						frequency = 1;
-						volume = "interior";
-					};
-					class TailTrees
-					{
-						sound[] = {"A3\Sounds_F\arsenal\weapons\Pistols\Rook40\Rook40_tail_trees", 1, 1, 1200};
-						frequency = 1;
-						volume = "(1-interior/1.4)*trees";
-					};
-					class TailForest
-					{
-						sound[] = {"A3\Sounds_F\arsenal\weapons\Pistols\Rook40\Rook40_tail_forest", 1, 1, 1200};
-						frequency = 1;
-						volume = "(1-interior/1.4)*forest";
-					};
-					class TailMeadows
-					{
-						sound[] = {"A3\Sounds_F\arsenal\weapons\Pistols\Rook40\Rook40_tail_meadows", 1, 1, 1200};
-						frequency = 1;
-						volume = "(1-interior/1.4)*(meadows/2 max sea/2)";
-					};
-					class TailHouses
-					{
-						sound[] = {"A3\Sounds_F\arsenal\weapons\Pistols\Rook40\Rook40_tail_houses", 1, 1, 1200};
-						frequency = 1;
-						volume = "(1-interior/1.4)*houses";
-					};
-				};
-			};
-
-			// recoil = "DC_15_RB_Recoil";
-			// recoilProne = "DC_15_RB_Recoil";
-			reloadTime = 0.5;
-			minRange = 5;
-			minRangeProbab = 0.3;
-			midRange = 25;
-			midRangeProbab = 0.6;
-			maxRange = 50;
-			maxRangeProbab = 0.1;
-			aiRateOfFire = 2;
-			aiRateOfFireDistance = 25;
-
-			dispersion = 0.0001;
-		};
-	};*/
-
-	
 };
 };
 
 

+ 0 - 195
addons - Copy/RD501_Weapons/NVG/config.cpp

@@ -1,195 +0,0 @@
-/*#define COMPONENT nvg
-#include "../../RD501_main/config_macros.hpp"
-#include "../_common/common.hpp"
-
-class CfgPatches
-{
-	class macro_patch_name(nvg)
-	{
-		author=DANKAUTHORS;
-		addonRootClass= macro_patch_name(weapons)
-		requiredAddons[]=
-		{
-			macro_patch_name(weapons)
-		};
-		requiredVersion=0.1;
-		units[]={};
-		weapons[]={
-			macro_new_weapon(nvg_integrated,pilot),
-			macro_new_weapon(nvg_integrated,infantry),
-			macro_new_weapon(nvg,visor),
-			macro_new_weapon(nvg,visor_perma_down),
-			macro_new_weapon(nvg,antenna),
-			macro_new_weapon(nvg,501_antenna),
-			macro_new_weapon(nvg,501_visor_perma_down),
-			macro_new_weapon(nvg_integrated,pilot_test)
-		};
-	};
-};
-
-class cfgWeapons 
-{	
-	class Integrated_NVG_TI_1_F;
-	class NVGoggles;
-
-	class macro_new_weapon(nvg_integrated,pilot): Integrated_NVG_TI_1_F
-	{
-		scope = 1;
-		visionMode[] = {"Normal", "NVG", "TI"};
-		
-		modelOptics = "";
-
-		macro_thermal_nvg_default
-
-	};
-
-	class macro_new_weapon(nvg_integrated,pilot_test): macro_new_weapon(nvg_integrated,pilot)
-	{
-		scope = 1;
-		visionMode[] = {"Normal", "NVG", "TI"};
-		thermalMode[] = {8};
-		modelOptics = "";
-
-	};
-
-	class macro_new_weapon(nvg_integrated,pilot_erlien): macro_new_weapon(nvg_integrated,pilot)
-	{
-		scope = 1;
-		visionMode[] = {"Normal", "NVG", "TI"};
-		thermalMode[] = {4,8};
-		modelOptics = "";
-
-	};
-
-
-	class macro_new_weapon(nvg_integrated,infantry): Integrated_NVG_TI_1_F
-	{
-		scope = 1;
-		visionMode[] = {"Normal", "NVG"};
-		thermalMode[] = {};
-		modelOptics = "";
-
-	};
-
-	#include "swop_edit.hpp"
-
-	class macro_new_weapon(nvg,visor) : SWOP_visor_w
-	{
-		modelOptics = "";
-		useModelOptics = 1;
-		opticsDisablePeripherialVision = 0;
-		visionMode[] = {"Normal","NVG","TI"};
-		macro_thermal_nvg_default
-		dlc = "rd501";
-		author= "RD501";
-		displayName = "Clone Visor 501";
-		hiddenSelections[] = {"Camo1"};
-		hiddenSelectionsTextures[] = {
-			texturepath\nvg\visor_501_co.paa
-		};
-	};
-	
-	
-	class macro_new_weapon(nvg,visor_perma_down) : macro_new_weapon(nvg,visor)
-   	{
-   		displayName = "Clone Visor 501 (perma down)";
-		macro_thermal_nvg_default
-        class ItemInfo
-        {
-            type = 616;
-            hmdType = 0;
-            uniformModel = "SWOP_clones\nvg\visor.p3d";
-            modelOff = "SWOP_clones\nvg\visor.p3d";
-            mass = 4;
-		hiddenSelections[] = {"Camo1"};
-		hiddenSelectionsTextures[] = {texturepath\nvg\visor_501_co.paa};
-   	    };
-   	  hiddenSelections[] = {"Camo1"};
-		hiddenSelectionsTextures[] = {texturepath\nvg\visor_501_co.paa};		
- 	};	
-
-	class macro_new_weapon(nvg,antenna) : SWOP_visor_antenna
-	{
-		modelOptics = "";
-		useModelOptics = 1;
-		opticsDisablePeripherialVision = 0;
-		visionMode[] = {"Normal","NVG","TI"};
-		macro_thermal_nvg_default
-		opticsZoomMin = 1;
-		opticsZoomMax = 1300;
-		opticsZoomInit = 1305;
-		distanceZoomMin = 100;
-		distanceZoomMax = 1300;
-		dlc = "rd501";
-		author= "RD501";
-		displayName = "Clone Visor Down + antenna";
-		   class ItemInfo
-        {
-            type = 616;
-            hmdType = 0;
-			uniformModel = "SWOP_clones\nvg\visor_antenna.p3d";
-            modelOff = "SWOP_clones\nvg\visor_antenna.p3d";
-            mass = 4;
-		hiddenSelections[] = {"Camo1"};
-		hiddenSelectionsTextures[] = {
-			texturepath\nvg\visor_501_co.paa
-			};
-   	    };
-		   	  hiddenSelections[] = {"Camo1"};
-		hiddenSelectionsTextures[] = {
-			texturepath\nvg\visor_501_co.paa
-			};	
-		
-		
-	};	
-
-	class macro_new_weapon(nvg,501_antenna) : SWOP_visor_antenna
-	{
-		modelOptics = "";
-		useModelOptics = 1;
-		opticsDisablePeripherialVision = 0;
-		visionMode[] = {"Normal","NVG","TI"};
-		macro_thermal_nvg_default
-		dlc = "rd501";
-		author= "RD501";
-		displayName = "Clone Visor 501 + antenna";
-		class ItemInfo
-        {
-            type = 616;
-            hmdType = 0;
-            uniformModel = "SWOP_clones\nvg\visor_antenna.p3d";
-            modelOff = "SWOP_clones\nvg\visorOff_antenna.p3d";
-            mass = 4;
-		hiddenSelections[] = {"Camo1"};
-		hiddenSelectionsTextures[] = {
-			texturepath\nvg\visor_501_co.paa
-			};
-   	    };
-		   	  hiddenSelections[] = {"Camo1"};
-		hiddenSelectionsTextures[] = {
-			texturepath\nvg\visor_501_co.paa
-			};	
-		
-		
-	};
-
-	class macro_new_weapon(nvg,501_visor_perma_down) : macro_new_weapon(nvg,visor)
-   	{
-   		displayName = "Clone Visor (perma down)";
-        class ItemInfo
-        {
-            type = 616;
-            hmdType = 0;
-            uniformModel = "SWOP_clones\nvg\visor.p3d";
-            modelOff = "SWOP_clones\nvg\visor.p3d";
-            mass = 4;
-   	    };
-   	   	hiddenSelections[] = {"Camo1"};
-		hiddenSelectionsTextures[] = {"SWOP_clones\data\spec\Spec2_co.paa"};
-		macro_thermal_nvg_default
- 	};
-
-
-};
-
-*/

+ 0 - 312
addons - Copy/RD501_Weapons/NVG/swop_edit.hpp

@@ -1,312 +0,0 @@
-class SWOP_tankerfacemask : NVGoggles
-{
-	modelOptics = "";
-	useModelOptics = 1;
-	opticsDisablePeripherialVision = 0;
-	visionMode[] = {"Normal","NVG","TI"};
-	
-	dlc = "rd501";
-	author= "Opposition Team + RD501";
-	displayName = "Clone Commander Face-Mask";
-	macro_thermal_nvg_default
-};
-
-class SWOP_ciberimplant : NVGoggles
-{
-	modelOptics = "";
-	useModelOptics = 1;
-	opticsDisablePeripherialVision = 0;
-	visionMode[] = {"Normal","NVG","TI"};
-	
-	dlc = "rd501";
-	author= "Opposition Team + RD501";
-	displayName = "Clone Ciber-Implant";
-	macro_thermal_nvg_default
-};
-
-class SWOP_visor_w : NVGoggles
-{
-	modelOptics = "";
-	useModelOptics = 1;
-	opticsDisablePeripherialVision = 0;
-	visionMode[] = {"Normal","NVG","TI"};
-	
-	dlc = "rd501";
-	author= "Opposition Team + RD501";
-	displayName = "Clone Visor";
-	macro_thermal_nvg_default
-};
-
-class SWOP_visor_antenna : NVGoggles
-{
-	modelOptics = "";
-	useModelOptics = 1;
-	opticsDisablePeripherialVision = 0;
-	visionMode[] = {"Normal","NVG","TI"};
-	
-	dlc = "rd501";
-	author= "Opposition Team + RD501";
-	displayName = "Clone Visor + antenna";
-	macro_thermal_nvg_default
-};
-
-class SWOP_NVChip : NVGoggles
-{
-	visionMode[] = {"Normal","NVG"};
-	dlc = "rd501";
-	author= "Opposition Team + RD501";
-	displayName = "SW NVG Chip(v1)";
-	macro_thermal_nvg_default
-};
-
-class SWOP_NVChipClean : NVGoggles
-{
-	visionMode[] = {"Normal","NVG"};
-	dlc = "rd501";
-	author= "Opposition Team + RD501";
-	displayName = "SW NVG Chip(Clear)";
-	macro_thermal_nvg_default
-};
-
-class SWOP_NVChip2 : NVGoggles
-{
-	visionMode[] = {"Normal","NVG"};
-	dlc = "rd501";
-	author= "Opposition Team + RD501";
-	displayName = "SW NVG Chip(v2)";
-	macro_thermal_nvg_default
-};
-
-class SWOP_cosir1f : NVGoggles
-{
-	modelOptics = "";
-	useModelOptics = 1;
-	opticsDisablePeripherialVision = 0;
-	dlc = "rd501";
-	author= "Opposition Team + RD501";
-	displayName = "Clone commander visor full";
-	macro_thermal_nvg_default
-};
-
-class SWOP_cosir2f : NVGoggles
-{
-	modelOptics = "";
-	useModelOptics = 1;
-	opticsDisablePeripherialVision = 0;
-	dlc = "rd501";
-	author= "Opposition Team + RD501";
-	displayName = "Clone commander visor full(Orange)";
-	macro_thermal_nvg_default
-};
-
-class SWOP_cosir3f : NVGoggles
-{
-	modelOptics = "";
-	useModelOptics = 1;
-	opticsDisablePeripherialVision = 0;
-	dlc = "rd501";
-	author= "Opposition Team + RD501";
-	displayName = "Clone commander visor full(Spec)";
-	macro_thermal_nvg_default
-};
-
-class SWOP_cosir4f : NVGoggles
-{
-	modelOptics = "";
-	useModelOptics = 1;
-	opticsDisablePeripherialVision = 0;
-	dlc = "rd501";
-	author= "Opposition Team + RD501";
-	displayName = "Clone commander visor full(black)";
-	macro_thermal_nvg_default
-};
-
-class SWOP_cosir5f : NVGoggles
-{
-	modelOptics = "";
-	useModelOptics = 1;
-	opticsDisablePeripherialVision = 0;
-	dlc = "rd501";
-	author= "Opposition Team + RD501";
-	displayName = "Clone commander visor full(geonosis)";
-	macro_thermal_nvg_default
-};	
-
-class SWOP_cosir1 : NVGoggles
-{
-	modelOptics = "";
-	useModelOptics = 1;
-	opticsDisablePeripherialVision = 0;
-	dlc = "rd501";
-	author= "Opposition Team + RD501";
-	displayName = "Clone commander visor";
-	macro_thermal_nvg_default
-};	
-
-class SWOP_cosir2 : NVGoggles
-{
-	modelOptics = "";
-	useModelOptics = 1;
-	opticsDisablePeripherialVision = 0;
-	dlc = "rd501";
-	author= "Opposition Team + RD501";
-	displayName = "Clone commander visor (Black)";
-	macro_thermal_nvg_default
-};
-
-class SWOP_cosir3 : NVGoggles
-{
-	modelOptics = "";
-	useModelOptics = 1;
-	opticsDisablePeripherialVision = 0;
-	dlc = "rd501";
-	author= "Opposition Team + RD501";
-	displayName = "Clone commander visor (10st Legion)";
-	macro_thermal_nvg_default
-};	
-
-class SWOP_cosir4 : NVGoggles
-{
-	modelOptics = "";
-	useModelOptics = 1;
-	opticsDisablePeripherialVision = 0;
-	dlc = "rd501";
-	author= "Opposition Team + RD501";
-	displayName = "Clone commander visor (Red)";
-	macro_thermal_nvg_default
-};	
-
-class SWOP_cosir5 : NVGoggles
-{
-	modelOptics = "";
-	useModelOptics = 1;
-	opticsDisablePeripherialVision = 0;
-	dlc = "rd501";
-	author= "Opposition Team + RD501";
-	displayName = "Clone commander visor (geonosis)";
-	macro_thermal_nvg_default
-};
-
-class SWOP_cosir1a : NVGoggles
-{
-	modelOptics = "";
-	useModelOptics = 1;
-	opticsDisablePeripherialVision = 0;
-	dlc = "rd501";
-	author= "Opposition Team + RD501";
-	displayName = "Clone commander visor + antenna";
-	macro_thermal_nvg_default
-};	
-
-class SWOP_cosir2a : NVGoggles
-{
-	modelOptics = "";
-	useModelOptics = 1;
-	opticsDisablePeripherialVision = 0;
-	dlc = "rd501";
-	author= "Opposition Team + RD501";
-	displayName = "Clone commander visor + antenna (Black)";
-	macro_thermal_nvg_default
-};	
-
-class SWOP_cosir3a : NVGoggles
-{
-	modelOptics = "";
-	useModelOptics = 1;
-	opticsDisablePeripherialVision = 0;
-	dlc = "rd501";
-	author= "Opposition Team + RD501";
-	displayName = "Clone commander visor + antenna (101st Legion)";
-	macro_thermal_nvg_default
-};	
-
-class SWOP_cosir4a : NVGoggles
-{
-	modelOptics = "";
-	useModelOptics = 1;
-	opticsDisablePeripherialVision = 0;
-	dlc = "rd501";
-	author= "Opposition Team + RD501";
-	displayName = "Clone commander visor + antenna (red)";
-	macro_thermal_nvg_default
-};	
-
-class SWOP_cosir5a : NVGoggles
-{
-	modelOptics = "";
-	useModelOptics = 1;
-	opticsDisablePeripherialVision = 0;
-	dlc = "rd501";
-	author= "Opposition Team + RD501";
-	displayName = "Clone commander visor + antenna (geonosis)";
-	macro_thermal_nvg_default
-};	
-
-class SWOP_cosir1_P1 : NVGoggles
-{
-	modelOptics = "";
-	useModelOptics = 1;
-	opticsDisablePeripherialVision = 0;
-	dlc = "rd501";
-	author= "Opposition Team + RD501";
-	displayName = "Clone P1 commander visor";
-	macro_thermal_nvg_default
-};	
-
-class SWOP_cosir2_P1 : NVGoggles
-{
-	modelOptics = "";
-	useModelOptics = 1;
-	opticsDisablePeripherialVision = 0;
-	dlc = "rd501";
-	author= "Opposition Team + RD501";
-	displayName = "Clone P1 commander visor (Black)";
-	macro_thermal_nvg_default
-};	
-
-class SWOP_cosir3_P1 : NVGoggles
-{
-	modelOptics = "";
-	useModelOptics = 1;
-	opticsDisablePeripherialVision = 0;
-	dlc = "rd501";
-	author= "Opposition Team + RD501";
-	displayName = "Clone P1 commander visor (Red)";
-	macro_thermal_nvg_default
-};	
-
-class SWOP_cosir4_P1 : NVGoggles
-{
-	modelOptics = "";
-	useModelOptics = 1;
-	opticsDisablePeripherialVision = 0;
-	dlc = "rd501";
-	author= "Opposition Team + RD501";
-	displayName = "Clone P1 commander visor (Orange)";
-	macro_thermal_nvg_default
-};		
-
-class SWOP_range : NVGoggles
-{
-	modelOptics = "";
-	useModelOptics = 1;
-	opticsDisablePeripherialVision = 0;
-	visionMode[] = {"Normal","NVG","TI"};
-	dlc = "rd501";
-	author= "Opposition Team + RD501";
-	displayName = "Clone rangefinder";
-	macro_thermal_nvg_default
-};	
-
-class SWOP_rangeARC : NVGoggles
-{
-	modelOptics = "";
-	useModelOptics = 1;
-	opticsDisablePeripherialVision = 0;
-	visionMode[] = {"Normal","NVG","TI"};
-	//thermalMode[] = {0,1};
-	dlc = "rd501";
-	author= "Opposition Team + RD501";
-	displayName = "Clone ARC rangefinder";
-	macro_thermal_nvg_default
-};

+ 0 - 60
addons - Copy/RD501_Weapons/Westar/common.hpp

@@ -1,60 +0,0 @@
-scope=2;
-scopeArsenal=2;
-dlc = "RD501";
-author= "RD501";
-
-DC_Family_Flashlight
-
-ACE_Overheating_Dispersion = DC15a_Overheat_Dispersion
-ACE_Overheating_SlowdownFactor = DC15a_Overheat_SlowdownFactor
-ACE_Overheating_JamChance = DC15a_Overheat_JamChance
-ACE_overheating_mrbs = DC15a_Overheat_mrbs
-ACE_overheating_allowSwapBarrel = 1;
-ACE_clearJamAction = "ReloadMagazine";
-
-magazines[] = {"SWOP_WESTARM5_Mag","DCStun_Mag"};
-
-modelOptics = "Scope\4x_xm8.p3d";
-class OpticsModes:OpticsModes
-{
-	class Snip:Snip
-	{
-		modelOptics = "Scope\4x_xm8.p3d";
-		opticsZoomMin =  scope_magnification(8);
-		discretefov[] = {scope_magnification(1),scope_magnification(4),scope_magnification(8)};
-	};
-	class Iron
-	{
-		opticsID = 2;
-		opticsDisplayName = "";
-		useModelOptics = 0;
-		opticsPPEffects[] = {"",""};
-		opticsFlare = 0;
-		opticsDisablePeripherialVision = 0;
-		opticsZoomMin = 0.25;
-		opticsZoomMax = 1.25;
-		opticsZoomInit = 0.75;
-		memoryPointCamera = "eye";
-		modelOptics = "\A3\Weapons_F\empty";
-		visionMode[] = {};
-		discretefov[] = {};
-		discreteDistance[] = {200};
-		discreteDistanceInitIndex = 0;
-		distanceZoomMin = 200;
-		distanceZoomMax = 200;
-		discreteInitIndex = 0;
-	};
-	
-	
-};
-
-class Single:Single
-{
-	dispersion = wester_m5_accuracy;
-	reloadTime = wester_m5_reloadtime;
-};
-class FullAuto:FullAuto
-{
-	dispersion = wester_m5_accuracy;
-	reloadTime = wester_m5_auto_reloadtime
-};

+ 0 - 37
addons - Copy/RD501_Weapons/Westar/config.cpp

@@ -26,43 +26,6 @@ class CfgPatches
 
 
 class cfgWeapons 
 class cfgWeapons 
 {	
 {	
-	/*class Rifle_Long_Base_F;
-	class SWOP_BlasterRifle_Base :Rifle_Long_Base_F
-	{
-		
-	};
-	class SWOP_WESTARM5_rifle: SWOP_BlasterRifle_Base
-	{
-		
-		class OpticsModes;
-		
-		class Single;
-		class FullAuto;
-	};
-
-	class SWOP_WESTARM5_GL: SWOP_BlasterRifle_Base
-	{
-	
-		class OpticsModes;
-
-		class Single;
-		class FullAuto;
-		class EGLM;
-		
-	};
-
-	#include "westar_rifle.hpp"
-
-
-	class Pistol_Base_F;
-	class SWOP_Westar35Pistol: Pistol_Base_F
-	{
-		
-		class Single;
-	};
-
-	#include "westar_pistol.hpp"
-	*/
 	class 3AS_WestarM5_Base_F;
 	class 3AS_WestarM5_Base_F;
 	class 3AS_WestarM5_F:3AS_WestarM5_Base_F
 	class 3AS_WestarM5_F:3AS_WestarM5_Base_F
 	{
 	{

+ 0 - 39
addons - Copy/RD501_Weapons/Westar/westar_pistol.hpp

@@ -1,39 +0,0 @@
-class macro_new_weapon(westar,35):SWOP_Westar35Pistol
-{
-    scopeArsenal=2;
-    dlc = "RD501";
-
-    author= "RD501";
-    baseWeapon = macro_new_weapon(westar,35);
-	modes[] = {"Single","Full", "close", "short", "medium"};
-
-    magazines[] = {macro_new_mag(westar_35,20)};
-
-    class Single:Single
-    {
-        class BaseSoundModeType
-        {
-            weaponSoundEffect = "DefaultRifle";
-            closure1[] = {};
-            closure2[] = {};
-            soundClosure[] = {};
-        };
-        class StandardSound: BaseSoundModeType
-        {
-            weaponSoundEffect = "DefaultRifle";
-            begin1[] = {"sw_extraweapons\SW_Westar35\westar35.ogg", 1.5, .5, 1200};
-            begin2[] = {"sw_extraweapons\SW_Westar35\westar35.ogg", 1.5, .5, 1200};
-            soundBegin[] = {"begin1", 0.5, "begin2", 0.5};
-        };
-
-        //autoFire=1;
-        dispersion = westar_35_accuracy;
-        reloadTime = wester_35_reloadtime
-    };
-	class Full:Single
-	{
-		autoFire=1;
-		textureType="fullAuto"
-	};
-    recoil = macro_new_recoil(westar_pistol)
-};

+ 0 - 43
addons - Copy/RD501_Weapons/Westar/westar_rifle.hpp

@@ -1,43 +0,0 @@
-class macro_new_weapon(westar,m5_base):SWOP_WESTARM5_rifle
-{
-	scope=0;
-	scopeArsenal=0;
-	class OpticsModes:OpticsModes
-	{
-		class Snip;
-		
-	};
-};
-
-class macro_new_weapon(westar,m5):macro_new_weapon(westar,m5_base)
-{	
-	displayName="Westar M-5";
-	baseWeapon = macro_new_weapon(westar,m5);
-	
-	#include "common.hpp"
-};
-
-
-class macro_new_weapon(westar,m5_gl_base):SWOP_WESTARM5_GL
-{
-	scope=0;
-	scopeArsenal=0;
-	class OpticsModes:OpticsModes
-	{
-		class Snip;
-		
-	};
-};
-
-class macro_new_weapon(westar,m5_gl):macro_new_weapon(westar,m5_gl_base)
-{	
-	displayName="Westar M-5 GL";
-	baseWeapon = macro_new_weapon(westar,m5_gl);
-
-	#include "common.hpp"
-
-	class EGLM:EGLM
-	{
-		magazineWell[] += {macro_new_magwell(GL_Mags)};
-	};
-};

+ 0 - 108
addons - Copy/RD501_Weapons/config.cpp

@@ -130,23 +130,7 @@ class CfgMagazineWells
 class CfgMagazines
 class CfgMagazines
 {
 {
 	class CA_Magazine;
 	class CA_Magazine;
-	class SWOP_e11_Mag;
 	class UGL_FlareWhite_F;
 	class UGL_FlareWhite_F;
-	class macro_new_mag(westar_35,20): CA_Magazine
-	{
-		scope = 2;
-		model = "SW_CloneWarsWeapons\ammo.p3d";
-		displayName = "20Rnd WESTAR-35 Magazine";
-		picture = "\SWOP_Main\swop_Pistols\ui\M_SB_EnergyCell_CA.paa";
-		ammo = macro_new_ammo(westar_35);
-		//ammo = "SWOP_DC17_Ammo_low_RD501";
-		tracersEvery = 1;
-		type = 16;
-		count = 20;
-		descriptionShort = "20 Round WESTAR-35 Magazine";
-		mass = 6;
-		initSpeed = 310;
-	};
 
 
 	class 1Rnd_HE_Grenade_shell;
 	class 1Rnd_HE_Grenade_shell;
 	class macro_new_mag(AT_GL,2): CA_Magazine
 	class macro_new_mag(AT_GL,2): CA_Magazine
@@ -176,39 +160,6 @@ class CfgMagazines
 		initSpeed = 120;
 		initSpeed = 120;
 	};
 	};
 
 
-	class SWOP_dc15xBlasterRifle_Mag;
-	class macro_new_mag(DC15x,6): SWOP_dc15xBlasterRifle_Mag
-	{
-		author = "RD501";
-		scope = 2;
-		model = "\SW_ExtraWeapons\PICKUPS\power_cell.p3d";
-		picture = "\SW_ExtraWeapons\PICKUPS\UI\icons\powercell_X_ca.paa";
-		displayName = "6Rnd DC-15X Magazine";
-		ammo =macro_new_ammo(DC15x);
-		tracersEvery = 1;
-		count = 6;
-		descriptionShort = "6Rnd DC15X Magazine";
-		mass = 20;
-		initSpeed = 4000;
-	};
-
-	class macro_new_mag(DC15s,60): CA_Magazine
-	{
-		author = "RD501";
-		scope = 2;
-		model = "\SW_ExtraWeapons\PICKUPS\energy_cell.p3d";
-		picture = "\SW_ExtraWeapons\PICKUPS\UI\icons\energycell_X_ca.paa";
-		displayName = "60Rnd DC-15S Carbine Magazine";
-		ammo = macro_new_ammo(dc15s_carbine);
-		tracersEvery = 1;
-		type = 16;
-		count = 60;
-		descriptionShort = "60Rnd DC15 Blaster Magazine";
-		//mass = 15;
-		mass = 20;
-		initSpeed = 310;
-	};
-
 	class Titan_AA;
 	class Titan_AA;
 	class CA_LauncherMagazine;
 	class CA_LauncherMagazine;
 	class Titan_AT;
 	class Titan_AT;
@@ -245,55 +196,6 @@ class CfgMagazines
 		mass = 100;
 		mass = 100;
 	};
 	};
 
 
-	/*class SWOP_b2rocket_Mag: CA_Magazine
-	{
-		scope = 2;
-		displayName = "5Rnd B2 Wrist Rockets";
-		model = "\SW_ExtraWeapons\PICKUPS\bolts.p3d";
-		picture = "\SW_ExtraWeapons\PICKUPS\UI\icons\bolts_X_ca.paa";
-		ammo = "R_WristRocket_F";
-		tracersEvery = 1;
-		type = 16;
-		count = 5;
-		descriptionShort = "5Rnd Wrist Rockets";
-		mass = 3;
-		initSpeed = 100;
-		soundFly[] = {"A3\Sounds_F\weapons\Rockets\rocket_fly_2", 0.501187, 1.3, 400};
-		nameSound = "missiles";
-	};*/
-
-	class SW_iondisruptor_BlasterRifle_Mag;
-	class macro_new_mag(RAMER,6):SW_iondisruptor_BlasterRifle_Mag
-	{
-		scope = 2;
-		model = "\SW_ExtraWeapons\PICKUPS\power_cell.p3d";
-		displayName = "6Rnd ION Magazine";
-		picture = "\SWOP_Main\SWOP_Rifles\SWOP_Blaster\data\ui\E11_Mag.paa";
-		ammo = "SW_iondisruptor_BlasterRifle_Ammo";
-		tracersEvery = 1;
-		count = 6;
-		descriptionShort = "6Rnd ION Magazine";
-		mass = 50;
-		initSpeed = 310;
-		author = "RD501";
-	};
-
-
-	class SWOP_DC15SAPistol_Mag;
-	class macro_new_mag(DC15_razor_blade,9): SWOP_DC15SAPistol_Mag
-	{
-		scope = 2;
-		model = "\SW_ExtraWeapons\PICKUPS\energy_cell.p3d";
-		picture = "\SW_ExtraWeapons\PICKUPS\UI\icons\energycell_X_ca.paa";
-		displayName = "9Rnd DC15-SA Magazine";
-		ammo =macro_new_ammo(DC15_Razor_Blade);
-		tracersEvery = 1;
-		type = 16;
-		count = 9;
-		descriptionShort = "9Rnd DC15SA Magazine";
-		mass =4;
-		initSpeed = 310;
-	};
 
 
 
 
 	class SmokeShell;
 	class SmokeShell;
@@ -340,16 +242,6 @@ class CfgAmmo
 	class DH17_Blaster_Ammo;
 	class DH17_Blaster_Ammo;
 	class 3AS_Chaingun_Ammo;
 	class 3AS_Chaingun_Ammo;
 	class M_Titan_AT;
 	class M_Titan_AT;
-	
-	class macro_new_ammo(z6):LaserAmmo_Minigun
-	{
-		hit = mg_hit_high;
-		indirectHit = 0.0;
-		indirectHitRange = 0.0;
-		explosive = 0.0;
-		caliber = mg_cali_high;
-		ACE_caliber = 0;
-	};
 
 
 	class  macro_new_ammo(GL_AT): G_40mm_HE
 	class  macro_new_ammo(GL_AT): G_40mm_HE
 	{
 	{

+ 3 - 14
addons - Copy/RD501_Zeus/config.cpp

@@ -118,7 +118,7 @@ class CfgVehicles
 		category = "Ordnance";
 		category = "Ordnance";
 		displayName = "Squad Shield";
 		displayName = "Squad Shield";
 		portrait = "RD501_Zeus\ui\wide_kite_64.paa";
 		portrait = "RD501_Zeus\ui\wide_kite_64.paa";
-		ammo = "SW_SquadShield_ammoCARGA";
+		ammo = macro_new_ammo(squad_shield_sigma)
 		delete Arguments;
 		delete Arguments;
 	};
 	};
 	class macro_new_ordnance(ModuleDioxis): ModuleChemlight_F
 	class macro_new_ordnance(ModuleDioxis): ModuleChemlight_F
@@ -193,17 +193,8 @@ class CfgAmmo
 	class ModuleOrdnanceHowitzer_F_ammo;
 	class ModuleOrdnanceHowitzer_F_ammo;
 	class ModuleOrdnanceMortar_F_ammo;
 	class ModuleOrdnanceMortar_F_ammo;
 	class ModuleOrdnanceRocket_F_ammo;
 	class ModuleOrdnanceRocket_F_ammo;
-	class SWOP_SCAR_Dioxis;
 	class RD501_ShadowMag;
 	class RD501_ShadowMag;
-	
-	class macro_new_ordnance_ammo(Dioxis_long): SWOP_SCAR_Dioxis
-	{
-		timeToLive = 300;
-	};
-	class macro_new_ordnance_ammo(Shadow_long): RD501_ShadowMag
-	{
-		timeToLive = 300;
-	};
+
 	class macro_new_ordnance_ammo(IonBomb): ModuleOrdnanceMortar_F_ammo
 	class macro_new_ordnance_ammo(IonBomb): ModuleOrdnanceMortar_F_ammo
 	{
 	{
 		caliber = 1100;
 		caliber = 1100;
@@ -239,14 +230,13 @@ class CfgAmmo
 		canLock = 0;
 		canLock = 0;
 		explosive = 1;
 		explosive = 1;
 		fuseDistance = 35;
 		fuseDistance = 35;
-		model = "SW_AV7\ion.p3d";
 		indirectHit = 3;
 		indirectHit = 3;
 		indirectHitRange = 50;
 		indirectHitRange = 50;
 		maxSpeed = 1100;
 		maxSpeed = 1100;
 		typicalSpeed = 1050;
 		typicalSpeed = 1050;
 		sideAirFriction = 0;
 		sideAirFriction = 0;
 		submunitionConeType[] = {"poissonDisc", 10};
 		submunitionConeType[] = {"poissonDisc", 10};
-		submunitionAmmo[] = {"SWOP_SCAR_Dioxis",1};
+		submunitionAmmo[] = {macro_new_ammo(dioxis),1};
 		submunitionConeAngle = 50;
 		submunitionConeAngle = 50;
 		simulation = "shotSubmunitions";
 		simulation = "shotSubmunitions";
 		timeToLive = 120;
 		timeToLive = 120;
@@ -269,7 +259,6 @@ class CfgAmmo
 		canLock = 0;
 		canLock = 0;
 		explosive = 1;
 		explosive = 1;
 		fuseDistance = 30;
 		fuseDistance = 30;
-		model = "SW_AV7\ion.p3d";
 		indirectHit = 300;
 		indirectHit = 300;
 		indirectHitRange = 30;
 		indirectHitRange = 30;
 		maxSpeed = 1100;
 		maxSpeed = 1100;

Some files were not shown because too many files changed in this diff