Merge branch 'master' of https://github.com/Zatama/Aux-Mod-501st

addons - Copy/RD501_Droid_Dispenser/XEH_postInit.sqf

@@ -0,0 +1,24 @@
+#include "config_macros.hpp"
+
+// The time between each droid spawn on a droid dispenser. Is copied so will only effect new dispensers.
+GVAR(spawnTime) = 8;
+
+// How many units can be alive for any given droid dispenser.  Is copied so will only effect new dispensers.
+GVAR(droidDispenserMaxUnitsGlobal) = 20;
+
+// What units can be spawned Is copied so will only effect new dispensers.
+GVAR(droidDispenserPossibleUnitsGlobal) = [
+	"RD501_opfor_unit_B2_droid_Standard",
+	"RD501_opfor_unit_b1_grenadier",
+	"RD501_opfor_unit_B1_AT_heavy",
+	"RD501_opfor_unit_B1",
+	"RD501_opfor_unit_B1_marksman",
+	"RD501_opfor_unit_B1_AT_light"
+];
+
+// Orbital Dispenser Module Specific
+//The object to spawn for orbital missions, Is copied so will only effect new dispensers.
+GVAR(spawnerDefaultObject) = "Land_Cargo_House_V1_F";
+
+// The time to delay spawning the dispenser object for orbital missions
+GVAR(fireSupportSpawnDelay) = 8;

addons - Copy/RD501_Droid_Dispenser/XEH_preInit.sqf

@@ -0,0 +1,3 @@
+#include "config_macros.hpp"
+#include "XEH_prep.hpp"
+diag_log format["%1 PREP COMPLETE", QUOTE(ADDON)];

addons - Copy/RD501_Droid_Dispenser/XEH_prep.hpp

@@ -0,0 +1,6 @@
+#include "config_macros.hpp"
+#define PREP(name) FUNC(name) = compile preProcessFileLineNumbers QUOTE(ADDON\functions\CONCAT(fnc_,name).sqf)
+PREP(droidDispenserPFH);
+PREP(droidDispenserInit);
+PREP(moduleOrbitalDroidDispenser);
+PREP(moduleDroidDispenser);

addons - Copy/RD501_Droid_Dispenser/config.cpp

@@ -0,0 +1,92 @@
+#include "config_macros.hpp"
+#define COMPILE_FILE(name) compile preprocessFileLineNumbers SQUOTE(ADDON\name.sqf)
+//Land_Cargo_House_V1_F
+class CfgPatches {
+	class ADDON
+	{
+		name = QUOTE(Droid Dispenser);
+		author = "RD501";
+		requiredAddons[] = {};
+		units[] = { 
+			QGVAR(moduleOrdnanceDroidDispenser),
+			GVAR(moduleDroidDispenser)
+		};
+		weapons[] = {};
+	};
+};
+class CfgFactionClasses {
+    class GVAR(DroidDispenser) {
+        displayName = "Droid Factories";
+        priority = 2;
+        side = 7;
+    };
+};
+class CfgVehicles
+{
+	class Module_F;
+	class ModuleOrdnance_F;
+	class GVAR(moduleOrdnanceDroidDispenser): ModuleOrdnance_F
+	{
+		author = "RD501";
+		isGlobal = 1;
+		scope = 1;
+		scopeCurator = 2;
+		simulation = "house";
+		category = QGVAR(DroidDispenser);
+		model = "\a3\Modules_F_Curator\Ordnance\surfacehowitzer.p3d";
+        function = QUOTE(FUNC(moduleOrbitalDroidDispenser));
+        functionPriority = 1;
+		displayName = QUOTE(Orbital Drop Droid Factory);
+		portrait = "\a3\Modules_F_Curator\Data\portraitOrdnanceMortar_ca.paa";
+		ammo = QGVAR(DroidDispenser_Round);
+		delete Arguments;
+	};
+    class GVAR(moduleDroidDispenser): Module_F {
+		author = "RD501";
+        curatorCanAttach = 1;
+		isGlobal = 1;
+		scope = 1;
+		scopeCurator = 2;
+        isTriggerActivated = 0;
+        category = QGVAR(DroidDispenser);
+		displayName = QUOTE(Droid Factory);
+        function = QUOTE(FUNC(moduleDroidDispenser));
+		portrait = QUOTE(\ADDON\textures\icons\zeus\droid_dispenser_icon.paa);
+    };
+};
+class CfgAmmo
+{
+	class ModuleOrdnanceHowitzer_F_ammo;
+	class ModuleOrdnanceMortar_F_ammo;
+	class ModuleOrdnanceRocket_F_ammo;
+	class GVAR(DroidDispenser_Round) : ModuleOrdnanceHowitzer_F_ammo
+	{
+		caliber = 950;
+		hit = 5000;
+		allowAgainstInfantry = 1;
+		canLock = 0;
+		explosive = 1;
+		fuseDistance = 30;
+		indirectHit = 500;
+		indirectHitRange = 2;
+		maxSpeed = 1100;
+		typicalSpeed = 1050;
+		sideAirFriction = 0;
+		submunitionAmmo = "";
+		submunitionConeAngle = 30;
+		simulation = "shotshell";
+		model="\A3\Structures_F\Mil\Cargo\Cargo_House_V1_F.p3d";
+	};
+};
+
+class Extended_PreInit_EventHandlers {
+    class ADDON {
+        init = QUOTE(call COMPILE_FILE(XEH_preInit));
+    };
+};
+
+class Extended_PostInit_EventHandlers {
+    class ADDON {
+        init = QUOTE(call COMPILE_FILE(XEH_postInit));
+    };
+};

addons - Copy/RD501_Droid_Dispenser/config_macros.hpp

@@ -0,0 +1,17 @@
+#ifndef RD501_DROID_DISPENSER
+	#define RD501_DROID_DISPENSER
+	#define ADDON RD501_Droid_Dispenser
+	#define PREFIX rd501
+	#define QUOTE(target) #target
+	#define SQUOTE(target) 'target'
+	#define CONCAT(a,b) a##b
+	#define CONCAT_3(a,b,c) CONCAT(a,CONCAT(b,c))
+	#define FUNC(name) CONCAT_3(PREFIX,_fnc_,name)
+	#define ARR_2(a,b) a,b
+	#define ARR_3(a,b,c) a,b,c
+	#define ARR_4(a,b,c,d) a,b,c,d
+	#define GVAR(name) CONCAT_3(PREFIX,_,name)
+	#define QGVAR(name) QUOTE(GVAR(name))
+	#define UNIT_NAME(side,name) CONCAT_3(PREFIX,_,CONCAT_3(side,_unit_,name))
+	#define ORDNANCE(name) CONCAT_3(PREFIX,_Ordnance_,name)
+#endif

addons - Copy/RD501_Droid_Dispenser/functions/fnc_droidDispenserInit.sqf

@@ -0,0 +1,17 @@
+#include "function_macros.hpp"
+params ["_target"];
+
+if(!isServer) exitWith
+{	
+	LOG_ERROR("Not Server, Exiting PFH"); 
+};
+
+LOGF_1("Initialising spawner %1",_target);
+// TODO: Read these vars from config, maybe CfgVehicles to allow placement of vehicles, although may be better to use static object with HP and destroyed mesh rather
+_target setVariable [QGVAR(group), createGroup [opfor, true]]; // group that units will be spawned into
+_target setVariable [QGVAR(maxUnits),GVAR(droidDispenserMaxUnitsGlobal)]; // max units that can be alive at any time from this spawner
+_target setVariable [QGVAR(possibleUnits),GVAR(droidDispenserPossibleUnitsGlobal)];
+// Start PFH
+LOGF_1("Attempting to start PFH on %1",_target);
+_params= [_target];
+ _handle = [FUNC(droidDispenserPFH), GVAR(spawnTime), _params] call CBA_fnc_addPerFrameHandler;

addons - Copy/RD501_Droid_Dispenser/functions/fnc_droidDispenserPFH.sqf

@@ -0,0 +1,45 @@
+#include "function_macros.hpp"
+params ["_args", "_handle"];
+_args params ["_target"];
+
+LOGF_1("Evaluating PFH %1",_handle);
+
+if(isNil "_target") exitWith {
+	LOGF_1("Removing PFH %1, Reason: Null Target",_handle);
+	[_handle] call CBA_fnc_removePerFrameHandler;
+};
+
+if(!isServer) exitWith {
+	LOGF_1("Removing PFH %1, Reason: Not Server",_handle);
+	[_handle] call CBA_fnc_removePerFrameHandler;
+}; 
+
+if(!alive _target) exitWith {
+	LOGF_1("Removing PFH %1, Reason: Droid Dispenser Dead",_handle);
+	[_handle] call CBA_fnc_removePerFrameHandler;
+};
+
+_group = _target getVariable QGVAR(group);
+
+if(isNil "_group") then 
+{
+	LOGF_1("PFH %1 Group empty, creating new",_handle);
+	_target setVariable [QGVAR(group), createGroup [opfor, true]];
+	_group = _target getVariable QGVAR(group);
+};
+
+_aliveUnits = ({alive _x} count (units _group));
+LOGF_2("Alive units for Droid Dispenser %1 :: %2",_target,_aliveUnits);
+if(_aliveUnits < _target getVariable QGVAR(maxUnits)) exitWith 
+{
+	_possibleUnits = _target getVariable QGVAR(possibleUnits);
+	_selectedUnit = selectRandom _possibleUnits;
+	if(_selectedUnit == _possibleUnits select 0) then {
+		_selectedUnit = selectRandom _possibleUnits; // if its a b2, (first be default atm) random again (requires 2 rolls on b2 to spawn one)
+	};
+	LOGF_2("%1 spawning in %2",_target,_selectedUnit);
+	_unit = _group createUnit [_selectedUnit, position _target, [], 0, "NONE"];
+	_unit call ace_common_fnc_fixPosition;
+	_unit commandMove (_unit getPos [25, 0]);
+};
+LOGF_1("%1 not spawning anything",_target);

addons - Copy/RD501_Droid_Dispenser/functions/fnc_moduleDroidDispenser.sqf

@@ -0,0 +1,8 @@
+#include "function_macros.hpp"
+params["_logic"];
+if !(local _logic) exitWith {};
+private _unit = attachedTo _logic;
+
+_unit call FUNC(droidDispenserInit);
+
+deleteVehicle _logic;

addons - Copy/RD501_Droid_Dispenser/functions/fnc_moduleOrbitalDroidDispenser.sqf

@@ -0,0 +1,16 @@
+#include "function_macros.hpp"
+
+LOG("Triggered Orbital Drop Droid Dispenser");
+//wait for projectile to land and then spawn vehicle
+params["_logic"];
+_position = position _logic;
+LOGF_2("Firing Droid Dispenser Artillery at '%1', for '%2'",_postition,_unit);
+[{
+	params["_position"];
+	_spawner = GVAR(spawnerDefaultObject) createVehicle _position;
+	LOGF_2("Created Droid Dispenser Object '%1' at '%2'",_spawner,position _spawner);
+	[_spawner] call FUNC(droidDispenserInit);
+}, [_position], GVAR(fireSupportSpawnDelay)] call CBA_fnc_waitAndExecute;
+
+// fire projectile
+_this call ace_zeus_fnc_bi_moduleProjectile;

addons - Copy/RD501_Droid_Dispenser/functions/function_macros.hpp

@@ -0,0 +1,23 @@
+#include "../config_macros.hpp";
+#ifdef DEBUG
+#define LOG_BASE(level,msg) diag_log text format[QUOTE(ADDON[level]: %1), msg]
+#define LOG(msg) LOG_BASE(DEBUG, LOG_FILENUMBER(msg))
+#define LOGF_1(msg,arg0) LOG(format[ARR_2(msg,arg0)])
+#define LOGF_2(msg,arg0,arg1) LOG(format[ARR_3(msg,arg0,arg1)])
+#define LOGF_3(msg,arg0,arg1,arg2) LOG(format[ARR_4(msg,arg0,arg1,arg2)])
+#define LOG_ERROR(msg) LOG_BASE(ERR,LOG_FILENUMBER(msg))
+#define LOG_ERRORF_1(msg,arg0) LOG_ERROR(format[ARR_2(msg,arg0)])
+#define LOG_ERRORF_2(msg,arg0,arg1) LOG_ERROR(format[ARR_3(msg,arg0,arg1)])
+#define LOG_FILENUMBER(msg) format [ARR_4('%1 at %2:%3',msg,__FILE__,__LINE__ + 1)]
+#endif
+#ifndef DEBUG
+#define LOG_BASE(level,msg) diag_log text format[QUOTE(ADDON[level]: %1), msg]
+#define LOG_FILENUMBER(msg) format [ARR_4('%1 at %2:%3',msg,__FILE__,__LINE__ + 1)]
+#define LOG_ERROR(msg) LOG_BASE(ERR,LOG_FILENUMBER(msg))
+#define LOG_ERRORF_1(msg,arg0) LOG_ERROR(format[ARR_2(msg,arg0)])
+#define LOG_ERRORF_2(msg,arg0,arg1) LOG_ERROR(format[ARR_3(msg,arg0,arg1)])
+#define LOG(msg) //not debug
+#define LOGF_1(msg,arg0) //not debug
+#define LOGF_2(msg,arg0,arg1) //not debug
+#define LOGF_3(msg,arg0,arg1,arg2) //not debug
+#endif

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

@@ -10,7 +10,10 @@ class CfgPatches
 		};
 		requiredVersion = 0.1;
 		units[] = {
-			macro_new_unit_class(opfor,Tactical_Droid),
+			macro_new_unit_class(opfor,Tactical_Droid_black),
+			macro_new_unit_class(opfor,Tactical_Droid_blue),
+			macro_new_unit_class(opfor,Tactical_Droid_green),
+			macro_new_unit_class(opfor,Tactical_Droid_red),
 		};
 	};
 };
@@ -62,4 +65,4 @@ class CfgVehicles
 		editorSubcategory = macro_editor_cat(CIS_SpecOps)
 		cost = 10;
 	};
-}
+}

addons - Copy/RD501_Weapons/DC_Family/DC_15gl/config.cpp

@@ -42,7 +42,7 @@ class CfgWeapons
 		{
 			macro_new_mag(10mw,30)
 		};
-		modes[] = {"Single", "Burst","EGLM"};
+		modes[] = {"Single", "Burst"};
 		muzzles[]=
 		{
 			"this",

addons - Copy/RD501_Weapons/DC_Family/DC_15x/config.cpp

@@ -112,7 +112,8 @@ class cfgWeapons
 		baseWeapon=macro_new_weapon(DC,r15x)
 		magazines[]=
 		{
-			macro_new_mag(40mw,5)
+			macro_new_mag(40mw,5),
+			macro_new_mag(40mwemp,1)
 		};
 		class Single:Single
 		{

addons - Copy/RD501_Weapons/_ammo/config.cpp

@@ -112,6 +112,16 @@ class CfgAmmo
 		airFriction=0;
 		explosive = 0.4;
 	};
+	class macro_new_ammo(40mwemp) : 3AS_EC70_BluePlasma
+	{
+		hit=0.01;
+		airLock=1;
+		typicalSpeed=1100;
+		caliber=1;
+		airFriction=0;
+		explosive = 0;
+		JLTS_isEMPAmmo=1;
+	};
 	class macro_new_ammo(50mw) : 3AS_EC80_BluePlasma
 	{
 		hit=300;

addons - Copy/RD501_Weapons/_mag/config.cpp

@@ -131,6 +131,14 @@ class CfgMagazines
 		typicalSpeed=1100;
 		descriptionShort="High power magazine";
 	};
+	class macro_new_mag(40mwemp,1) : 3AS_45Rnd_EC50_Mag
+	{
+		displayName="1 Round 40MW EMP Cell";
+		count = 1;
+		ammo=macro_new_ammo(40mwemp)
+		typicalSpeed=1100;
+		descriptionShort="EMP Round";
+	};
 	class macro_new_mag(50mw,10) : 3AS_45Rnd_EC50_Mag
 	{
 		displayName="10 Round 50MW Cell";

addons - Copy/RD501_Weapons/_scopes/DC_15A_LE_x4_x8.hpp

@@ -98,7 +98,7 @@ class macro_new_weapon(scope,valken_6_12x): itemCore
                 opticsZoomMin = scope_magnification(12);
                 opticsZoomMax = scope_magnification(1);
                 opticsZoomInit = scope_magnification(1);
-                discretefov[] = {scope_magnification(1),scope_magnification(4),scope_magnification(12)};
+                discretefov[] = {scope_magnification(4),scope_magnification(12)};
                 discreteinitIndex = 0;
                 discreteDistance[] = {100, 300, 400, 500, 600, 700, 800, 900, 1000, 1100, 1200, 1300, 1400, 1500, 1600, 1700, 1800, 1900, 2000,4000};
                 discreteDistanceInitIndex = 1;