Change moduleGarrsion from Custom Selection box to Combo Dropdown (#159)

Author: jokoho48

addons/wp/Cfg3DEN.hpp

@@ -27,22 +27,6 @@ class Cfg3DEN {
                 };
             };
         };
-        class GVAR(ExitConditions): Title {
-            attributeLoad = QUOTE((_this controlsGroupCtrl 100) lbSetCurSel (0 max _value min 5));
-            attributeSave = QUOTE(lbCurSel (_this controlsGroupCtrl 100));
-            class Controls: Controls {
-                class Title: Title {};
-                class Value: ctrlToolbox {
-                    idc = 100;
-                    x = QUOTE(48 * GRID_3DEN_W);
-                    w = QUOTE(82 * GRID_3DEN_W);
-                    h = QUOTE(5  * GRID_3DEN_H);
-                    rows = 1;
-                    columns = 6;
-                    strings[] = { CSTRING(Random), CSTRING(All), CSTRING(FiredNear), CSTRING(Fired), CSTRING(Hit), CSTRING(None) };
-                };
-            };
-        };
     };
     class Object {
         class AttributeCategories {

addons/wp/functions/Modules/fnc_moduleGarrison.sqf

@@ -96,7 +96,7 @@ switch (_mode) do {
             private _exitCondition = _logic getVariable [QGVAR(ExitConditions), TASK_GARRISON_EXITCONDITIONS];
             private _patrol = _logic getVariable [QGVAR(Patrol), TASK_GARRISON_PATROL];
             {
-                [_x, getPos _logic, _range, _area, _teleport, _sortByHeight, _exitCondition - 2, _patrol] remoteExec [QFUNC(taskGarrison), leader _x];
+                [_x, getPos _logic, _range, _area, _teleport, _sortByHeight, _exitCondition, _patrol] remoteExec [QFUNC(taskGarrison), leader _x];
             } forEach _groups;
 
             deleteVehicle _logic;

addons/wp/modules.hpp

@@ -237,17 +237,40 @@ class GVAR(TaskGarrison) : GVAR(BaseModule) {
         isRectangle = 0;
     };
     class Attributes: AttributesBase {
-        class GVAR(ExitConditions) {
+        class GVAR(ExitConditions): Combo {
             displayName = CSTRING(Module_TaskGarrison_ExitCondition_DisplayName);
             tooltip = CSTRING(Module_TaskGarrison_ExitCondition_Tooltip);
             property = QGVAR(ExitConditions);
             defaultValue = QUOTE(TASK_GARRISON_EXITCONDITIONS);
             unique = 0;
-            validate = "number";
             condition = "0";
-            typeName = "NUMBER";
-            control = QGVAR(ExitConditions);
             expression = "_this setVariable ['%s', _value, true];";
+            class Values {
+                class Random {
+                    name = CSTRING(Random);
+                    value = -2;
+                };
+                class All {
+                    name = CSTRING(All);
+                    value = -1;
+                };
+                class FiredNear {
+                    name = CSTRING(FiredNear);
+                    value = 2;
+                };
+                class Fired {
+                    name = CSTRING(Fired);
+                    value = 1;
+                };
+                class Hit {
+                    name = CSTRING(Hit);
+                    value = 0;
+                };
+                class None {
+                    name = CSTRING(None);
+                    value = 3;
+                };
+            };
         };
         class GVAR(SortByHeight): Checkbox {
             displayName = CSTRING(Module_TaskGarrison_SortByHeight_DisplayName);