Added - Zeus Module: Add Filtered Arsenal ability to spawn object

What
=================
Added: ability for the existing Zeus arsenal to now spawn an object from
a dropdown list if module is not placed on an object. Bear in mind that,
it the selection list is kept blank, the module will fall back to
allowing a selection of multiple objects on which to apply the arsenal.

End result: A completely flexible module.

Issue ID: #27

Author: Saborknight

addons/core/XEH_preInit.sqf

@@ -27,6 +27,13 @@ private _bnb_e_settings = [
 		"2BNB Utilities",
 		false
 	],
+	[
+		"bnb_e_arsenal_objects",
+		"EDITBOX",
+		["Arsenal Objects", "Classnames, separated by commas and without double quotations, of objects that are spawnable by ""Add Filtered Arsenal"" module"],
+		["2BNB Zeus", "Arsenal"],
+		"C_supplyCrate_F,B_Slingload_01_Ammo_F"
+	],
 	[
 		"bnb_e_contam_aiDamage",
 		"CHECKBOX",

addons/core/functions/zeus_modules/fn_addArsenal.sqf

@@ -6,13 +6,14 @@ Description:
 	to an object.
 
 Parameters:
-	None
+	0: _position - of the module <ARRAY>
+	1: _objectUnderCursor - object the module was placed on <OBJECT>
 
 Returns:
 	Nothing
 
 Examples:
-	call bnb_e_core_fnc_addArsenal;
+	[_position, _objectUnderCursor] call bnb_e_core_fnc_addArsenal;
 
 Author:
 	Arend
@@ -21,14 +22,6 @@ params [["_position", [0,0,0], [[]], 3], ["_objectUnderCursor", objNull, [objNul
 
 private _objects = [_objectUnderCursor];
 
-// Check if module placed on an object!
-if (isNull (_objects select 0)) then
-{
-	_objects = [localize "STR_AMAE_OBJECTS"] call Achilles_fnc_SelectUnits;
-};
-if (isNil "_objects") exitWith {};
-if (_objects isEqualTo []) exitWith {[localize "STR_AMAE_NO_OBJECT_SELECTED"] call Achilles_fnc_ShowZeusErrorMessage};
-
 // Show Filter Dialog
 private _availableFilters = [
 	"None",
@@ -39,18 +32,50 @@ private _availableFilters = [
 	"Mission"
 ];
 
-private _dialogResult = [
-	"Add Contaminated Area", [["Filter", _availableFilters, 0]]
-] call Ares_fnc_showChooseDialog;
+private _arsenalObjects = [bnb_e_arsenal_objects, true] call bnb_e_core_fnc_strToArray;
+
+private _dialogOptions = [["Filter", _availableFilters, 0]];
+private _dialogControls = [["_filter", 0]];
+
+if (isNull (_objects select 0)) then {
+	_dialogOptions = [[
+		"Select object to spawn",
+		[""] + (_arsenalObjects apply {getText (configfile >> "CfgVehicles" >> _x >> "displayName")})
+	]] + _dialogOptions;
+
+	_dialogControls = [["_arsenalObject", 0]] + _dialogControls;
+};
+
+private _dialogResult = ["Add Filtered Arsenal", _dialogOptions] call Ares_fnc_showChooseDialog;
 
 // If the dialog was closed.
 if (_dialogResult isEqualTo []) exitWith {};
 
 // Get the selected data
-_dialogResult params [["_filter", 0]];
+_dialogResult params _dialogControls;
+
+
+// Check if module placed on an object
+if (isNull (_objects select 0)) then {
+	if (_arsenalObject == 0) then {
+		// No object selected to be spawned
+		_objects = [localize "STR_AMAE_OBJECTS"] call Achilles_fnc_SelectUnits;
+		if (_objects isEqualTo []) exitWith {[localize "STR_AMAE_NO_OBJECT_SELECTED"] call Achilles_fnc_ShowZeusErrorMessage};
+
+	} else {
+		// Object selected to be spawned
+		private _type = _arsenalObjects select (_arsenalObject - 1);
+		_object = _type createVehicle _position;
+		[[_object]] call Ares_fnc_AddUnitsToCurator;
+		_objects = [_object];
+	};
+};
+
+if (_objects isEqualTo []) exitWith {};
 
 // Add Arsenal - Remotely, since only the server has 2BNB Framework loaded
 [[_availableFilters select _filter, _objects], bnb_f_core_fnc_arsenal, 2] call Achilles_fnc_spawn;
+[format ["Added %1 filtered arsenal to %2",_availableFilters select _filter, _objects], "core\functions\zeus_modules\fn_addArsenal.sqf"] call bnb_e_core_fnc_log;
 
 // Show Message
 [localize "STR_AMAE_ARSENAL_ADDED"] call Ares_fnc_ShowZeusMessage;

addons/core/functions/zeus_modules/fn_addContaminationArea.sqf

@@ -6,7 +6,7 @@ Description:
 
 Parameters:
 	0: _position - of the module <ARRAY>
-	0: _objectUnderCursor - object the module was placed on <OBJECT>
+	1: _objectUnderCursor - object the module was placed on <OBJECT>
 
 Returns:
 	Nothing