Advanced Settings get/set rather than pushback

theace0296 · Oct 27, 2021 · 038e454 · 038e454
1 parent 4a4fe44
commit 038e454
Show file tree

Hide file tree

Showing 16 changed files with 128 additions and 145 deletions.
diff --git a/RandFramework/Client/camera/fn_missionOverAnimation.sqf b/RandFramework/Client/camera/fn_missionOverAnimation.sqf
@@ -39,7 +39,7 @@ while {!_bEnd} do {
         sleep 8;
         ["<t font='PuristaMedium' align='center' size='2.9' color='#ffffff'>" + localize "STR_TRGM2_Description_Name" + "</t><br/><t font='PuristaMedium' align='center' size='1' color='#ffffff'>" + localize "STR_TRGM2_TRGMInitPlayerLocal_TRGM2Title" + "</t>",-1,0.2,6,1,0,789] spawn BIS_fnc_dynamicText;
         sleep 10;
-        ["<t font='PuristaMedium' align='center' size='2.9' color='#ffffff'>" + (TRGM_VAR_AdvancedSettings select TRGM_VAR_ADVSET_GROUP_NAME_IDX) + "</t><br/><t font='PuristaMedium' align='center' size='1' color='#ffffff'><br />" + localize "STR_TRGM2_TRGMInitPlayerLocal_RTBDebreif" + "</t>",-1,0.2,6,1,0,789] spawn BIS_fnc_dynamicText;
+        ["<t font='PuristaMedium' align='center' size='2.9' color='#ffffff'>" + (call TRGM_GETTER_fnc_sGroupName) + "</t><br/><t font='PuristaMedium' align='center' size='1' color='#ffffff'><br />" + localize "STR_TRGM2_TRGMInitPlayerLocal_RTBDebreif" + "</t>",-1,0.2,6,1,0,789] spawn BIS_fnc_dynamicText;
         sleep 10;
         private _stars = "";
         private _iCount = 0;

diff --git a/RandFramework/Client/camera/fn_postStartMissionCamera.sqf b/RandFramework/Client/camera/fn_postStartMissionCamera.sqf
@@ -75,7 +75,7 @@ if (hasInterface && {!((player getVariable ["TRGM_postStartMissionCamRunning", "
     _texta = "<t font ='EtelkaMonospaceProBold' align = 'center' size='0.8' color='#Ffffff'>" + _LineOne +"</t>";
     [_texta, -0, 0.150, 7, 1,0,_txt5Layer] spawn BIS_fnc_dynamicText;
 
-    _texta = "<t font ='EtelkaMonospaceProBold' align = 'center' size='0.8' color='#Ffffff'>" + (TRGM_VAR_AdvancedSettings select TRGM_VAR_ADVSET_GROUP_NAME_IDX) + "</t>";
+    _texta = "<t font ='EtelkaMonospaceProBold' align = 'center' size='0.8' color='#Ffffff'>" + (call TRGM_GETTER_fnc_sGroupName) + "</t>";
     [_texta, -0, 0.350, 7, 1,0,_txt6Layer] spawn BIS_fnc_dynamicText;
 
     showcinemaborder true;

diff --git a/RandFramework/Client/init/fn_generalPlayerLoop.sqf b/RandFramework/Client/init/fn_generalPlayerLoop.sqf
@@ -19,7 +19,7 @@ while {true} do {
                };
             };
         };
-        if (leader (group (vehicle player)) isEqualTo player && TRGM_VAR_AdvancedSettings select TRGM_VAR_ADVSET_SUPPORT_OPTION_IDX isEqualTo 1) then {
+        if (leader (group (vehicle player)) isEqualTo player && (call TRGM_GETTER_fnc_bSupportOption)) then {
             if (TRGM_VAR_iMissionIsCampaign) then {
                 if (TRGM_VAR_CampaignInitiated) then {
 

diff --git a/RandFramework/Client/init/fn_main.sqf b/RandFramework/Client/init/fn_main.sqf
@@ -117,15 +117,14 @@ if (call TRGM_GLOBAL_fnc_isCbaLoaded && call TRGM_GLOBAL_fnc_isAceLoaded) then {
     playMusic "";
 };
 
-private _iEnableGroupManagement = TRGM_VAR_AdvancedSettings select TRGM_VAR_ADVSET_GROUP_MANAGE_IDX;
-if (_iEnableGroupManagement isEqualTo 1) then {
+if (call TRGM_GETTER_fnc_bEnableGroupManagement) then {
     ["InitializePlayer", [player]] call BIS_fnc_dynamicGroups;//Exec on client
 };
 
 [] spawn TRGM_CLIENT_fnc_playerScripts;
 player addEventHandler ["Respawn", { [] spawn TRGM_CLIENT_fnc_playerScripts; }];
 
-if (TRGM_VAR_AdvancedSettings select TRGM_VAR_ADVSET_VIRTUAL_ARSENAL_IDX isEqualTo 1) then {
+if (call TRGM_GETTER_fnc_bEnableVirtualArsenal) then {
     box1 addAction [localize "STR_TRGM2_startInfMission_VirtualArsenal", {["Open",true] spawn BIS_fnc_arsenal}];
 };
 
@@ -153,11 +152,8 @@ if (_isTraining) then {
 
 }
 else {
-    private _iTicketCount = TRGM_VAR_AdvancedSettings select TRGM_VAR_ADVSET_RESPAWN_TICKET_COUNT_IDX;
-    [player, _iTicketCount] call BIS_fnc_respawnTickets;
-
-    private _iRespawnTimer = TRGM_VAR_AdvancedSettings select TRGM_VAR_ADVSET_RESPAWN_TIMER_IDX;
-    setPlayerRespawnTime _iRespawnTimer;
+    [player, call TRGM_GETTER_fnc_iTicketCount] call BIS_fnc_respawnTickets;
+    setPlayerRespawnTime (call TRGM_GETTER_fnc_iRespawnTimer);
 };
 
 

diff --git a/RandFramework/Client/init/fn_onlyAllowDirectMapDraw.sqf b/RandFramework/Client/init/fn_onlyAllowDirectMapDraw.sqf
@@ -2,7 +2,7 @@
 format[localize "STR_TRGM2_debugFunctionString", _fnc_scriptName, _fnc_scriptNameParent, (["Client", "Server"] select isServer)] call TRGM_GLOBAL_fnc_log;
 
 
-while {isMultiplayer && (TRGM_VAR_AdvancedSettings select TRGM_VAR_ADVSET_MAP_DRAW_DIRECT_ONLY_IDX isEqualTo 1)} do {
+while {isMultiplayer && (call TRGM_GETTER_fnc_bMapDrawDirectOnly)} do {
     waitUntil { ({private _ret = false; private _sTest = _x splitString "/"; if (count _sTest > 2 && {str(_sTest select 2) != str("5")}) then {_ret = true}; ret; } count allMapMarkers) > 0; };
     {
         deleteMarker _x;

diff --git a/RandFramework/GUI/fn_openDialogAdvancedMissionSettings.sqf b/RandFramework/GUI/fn_openDialogAdvancedMissionSettings.sqf
@@ -48,7 +48,9 @@ _lblctrlTitle ctrlCommit 0;
     private _inpXPos = ([0, ((2 * _ctrlWidth) + 0.1)] select (_forEachIndex > 12)) + (0.4 * safezoneW + safezoneX);
     private _ctrlYPos = ((0.27 + _currentLinePos) * safezoneH + safezoneY);
 
-    _x params ["_lblCtrlID", "_lblText", "_lnpCtrlType", "_Options", "_Values", "_DefaultValue", "_toolTip", "_appendText"];
+    _x params ["_index", "_lblText", "_lnpCtrlType", "_Options", "_Values", "_DefaultValue", "_toolTip", "_appendText"];
+    #define ADVCTRLIDC(IDX) 6001 + (2 * IDX)
+    private _lblCtrlID = ADVCTRLIDC(_index);
     private _InpCtrlID = _lblCtrlID + 1;
 
     _display ctrlCreate ["RscText", _lblCtrlID];
@@ -65,23 +67,27 @@ _lblctrlTitle ctrlCommit 0;
         {
             _inpctrl lbAdd _x;
         } forEach _Options;
-        private _savedValue = _Values find (TRGM_VAR_AdvancedSettings select _forEachIndex);
+        private _savedValue = _Values find (TRGM_VAR_AdvancedSettings select _index);
         _inpctrl lbSetCurSel ([_savedValue, _DefaultValue] select (isNil "_savedValue"));
     };
     if (_lnpCtrlType isEqualTo "RscEdit") then {
-        private _savedValue = (TRGM_VAR_AdvancedSettings select _forEachIndex);
+        private _savedValue = (TRGM_VAR_AdvancedSettings select _index);
         _inpctrl ctrlSetText ([_savedValue, _DefaultValue] select (isNil "_savedValue"));
     };
     if (_lnpCtrlType isEqualTo "RscXSliderH") then {
         _inpctrl sliderSetRange [_Options, _Values];
         _inpctrl sliderSetSpeed [(_Values / _Options), 1];
-        private _savedValue = (TRGM_VAR_AdvancedSettings select _forEachIndex);
+        private _savedValue = (TRGM_VAR_AdvancedSettings select _index);
         _inpctrl sliderSetPosition ([_savedValue, _DefaultValue] select (isNil "_savedValue"));
 
         _display ctrlCreate ["ctrlEdit", (_InpCtrlID+500)];
         private _valctrl = _display displayCtrl (_InpCtrlID+500);
         _valctrl ctrlSetPosition [_inpXPos+(.75*_ctrlWidth), _ctrlYPos,.25*_ctrlWidth,_ctrlHeight];
-        _valctrl ctrlSetText (str(round ([_savedValue, _DefaultValue] select (isNil "_savedValue"))) + "s");
+        private _ctrlText = str(round ([_savedValue, _DefaultValue] select (isNil "_savedValue")));
+        if !(isNil "_appendText") then {
+            _ctrlText = format ["%1%2", _ctrlText, _appendText];
+        };
+        _ctrlVal ctrlSetText _ctrlText;
         _valctrl ctrlCommit 0;
 
         _inpctrl ctrlAddEventHandler ["SliderPosChanged", {

diff --git a/RandFramework/GUI/fn_openDialogMissionSelection.sqf b/RandFramework/GUI/fn_openDialogMissionSelection.sqf
@@ -46,61 +46,13 @@ if (isNil "TRGM_VAR_InitialLoadedPreviousSettings" && !TRGM_VAR_ForceMissionSetu
         TRGM_VAR_IsFullMap               = _IsFullMap; publicVariable "TRGM_VAR_IsFullMap";
     };
 
-    if (count TRGM_VAR_AdvancedSettings < 6) then {
-        TRGM_VAR_AdvancedSettings pushBack 10;
-    };
-
-    if (count TRGM_VAR_AdvancedSettings < 7) then {
-        TRGM_VAR_AdvancedSettings pushBack (TRGM_VAR_DefaultEnemyFactionValue select 0);
-    };
-
-    if (TRGM_VAR_AdvancedSettings select 6 isEqualTo 0) then { //we had an issue with some being set to zero (due to a bad published version, this makes sure any zeros are adjusted to correct id)
-        TRGM_VAR_AdvancedSettings set [6,TRGM_VAR_DefaultEnemyFactionValue select 0];
-    };
-
-    if (count TRGM_VAR_AdvancedSettings < 8) then {
-        TRGM_VAR_AdvancedSettings pushBack (TRGM_VAR_DefaultMilitiaFactionValue select 0);
-    };
-
-    if (count TRGM_VAR_AdvancedSettings < 9) then {
-        TRGM_VAR_AdvancedSettings pushBack (TRGM_VAR_DefaultFriendlyFactionValue select 0);
-    };
-
-    if !(TRGM_VAR_AdvancedSettings select 6 in TRGM_VAR_DefaultEnemyFactionArray) then {
-        private _bFound = false;
-        {
-            if (!_bFound && _x in TRGM_VAR_DefaultEnemyFactionArray) then {
-                _bFound = true;
-                TRGM_VAR_AdvancedSettings set [6,_x];
-            };
-        } forEach TRGM_VAR_DefaultEnemyFactionValue;
-    };
-
-    if !(TRGM_VAR_AdvancedSettings select 7 in TRGM_VAR_DefaultMilitiaFactionArray) then {
-        private _bFound = false;
-        {
-            if (!_bFound && _x in TRGM_VAR_DefaultMilitiaFactionArray) then {
-                _bFound = true;
-                TRGM_VAR_AdvancedSettings set [7,_x];
-            };
-        } forEach TRGM_VAR_DefaultMilitiaFactionValue;
-    };
-
-    if !(TRGM_VAR_AdvancedSettings select 8 in TRGM_VAR_DefaultFriendlyFactionArray) then {
-        private _bFound = false;
-        {
-            if (!_bFound && _x in TRGM_VAR_DefaultFriendlyFactionArray) then {
-                _bFound = true;
-                TRGM_VAR_AdvancedSettings set [8,_x];
-            };
-        } forEach TRGM_VAR_DefaultFriendlyFactionValue;
-    };
-
-    for [{private _i = 9}, {_i < count TRGM_VAR_DefaultAdvancedSettings}, {_i = _i + 1}] do {
-        if (count TRGM_VAR_AdvancedSettings < (_i + 1)) then {
-            TRGM_VAR_AdvancedSettings pushBack (TRGM_VAR_DefaultAdvancedSettings select _i);
+    {
+        private _index = _x select 0;
+        private _defaultValue = _x select 5;
+        if (count TRGM_VAR_AdvancedSettings <= _index) then {
+            TRGM_VAR_AdvancedSettings set [_index, _defaultValue];
         };
-    };
+    } forEach TRGM_VAR_AdvControls;
 
     if (isClass(configFile >> "CfgPatches" >> "ace_medical")) then {
         if (TRGM_VAR_iUseRevive != 0) then { //Ace is active, so need to make sure "no revive" is selected
@@ -113,25 +65,25 @@ if (isNil "TRGM_VAR_InitialLoadedPreviousSettings" && !TRGM_VAR_ForceMissionSetu
 if (!isNull (findDisplay 6000)) then {
     TRGM_VAR_AdvancedSettings = [];
     {
-        private _CurrentControl = _x;
-        private _lnpCtrlType = _x select 2;
-        private _ThisControlOptions = (_x select 4);
-        private _ThisControlIDX = (_x select 0) + 1;
-        private _ctrlItem = (findDisplay 6000) displayCtrl _ThisControlIDX;
+        _x params ["_index", "_lblText", "_lnpCtrlType", "_Options", "_Values", "_DefaultValue", "_toolTip", "_appendText"];
+        #define ADVCTRLIDC(IDX) 6001 + (2 * IDX)
+        private _lblCtrlID = ADVCTRLIDC(_index);
+        private _InpCtrlID = _lblCtrlID + 1;
+        private _ctrlItem = (findDisplay 6000) displayCtrl _InpCtrlID;
         TRGM_VAR_debugMessages = TRGM_VAR_debugMessages + "\n\n" + str(lbCurSel _ctrlItem);
         publicVariable "TRGM_VAR_debugMessages";
         private _value = nil;
         if (_lnpCtrlType isEqualTo "RscCombo") then {
             TRGM_VAR_debugMessages = TRGM_VAR_debugMessages + "\n\nHERE80:" + str(lbCurSel _ctrlItem);
-            _value = _ThisControlOptions select ([lbCurSel _ctrlItem, 0] select (lbCurSel _ctrlItem isEqualTo -1));
+            _value = _Options select ([lbCurSel _ctrlItem, 0] select (lbCurSel _ctrlItem isEqualTo -1));
         };
         if (_lnpCtrlType isEqualTo "RscEdit") then {
-            _value = ctrlText _ThisControlIDX;
+            _value = ctrlText _InpCtrlID;
         };
         if (_lnpCtrlType isEqualTo "RscXSliderH") then {
-            _value = sliderPosition _ThisControlIDX;
+            _value = sliderPosition _InpCtrlID;
         };
-        TRGM_VAR_AdvancedSettings pushBack _value;
+        TRGM_VAR_AdvancedSettings set [_index, _value];
     } forEach TRGM_VAR_AdvControls;
     publicVariable "TRGM_VAR_AdvancedSettings";
 };

diff --git a/RandFramework/Global/factions/fn_buildEnemyFaction.sqf b/RandFramework/Global/factions/fn_buildEnemyFaction.sqf
@@ -3,7 +3,7 @@ format[localize "STR_TRGM2_debugFunctionString", _fnc_scriptName, _fnc_scriptNam
 
 
 
-private _enemyFactionIndex = TRGM_VAR_AdvancedSettings select TRGM_VAR_ADVSET_ENEMY_FACTIONS_IDX;
+private _enemyFactionIndex = call TRGM_GETTER_fnc_enemyFactionIndex;
 (TRGM_VAR_AvailableFactions select _enemyFactionIndex) params ["_eastClassName", "_eastDisplayName"];
 
 private _eastData = TRGM_VAR_AllFactionMap get _eastClassName;
@@ -68,7 +68,7 @@ EnemyBaseChoppers           = { _veh = ["O_Heli_Light_02_unarmed_F"]; if (count
 
 
 
-private _guerFactionIndex = TRGM_VAR_AdvancedSettings select TRGM_VAR_ADVSET_MILITIA_FACTIONS_IDX;
+private _guerFactionIndex = call TRGM_GETTER_fnc_militiaFactionIndex;
 (TRGM_VAR_AvailableFactions select _guerFactionIndex) params ["_guerClassName", "_guerDisplayName"];
 
 private _guerData = TRGM_VAR_AllFactionMap get _guerClassName;

diff --git a/RandFramework/Global/factions/fn_buildFriendlyFaction.sqf b/RandFramework/Global/factions/fn_buildFriendlyFaction.sqf
@@ -3,7 +3,7 @@ format[localize "STR_TRGM2_debugFunctionString", _fnc_scriptName, _fnc_scriptNam
 
 
 
-private _friendlyFactionIndex = TRGM_VAR_AdvancedSettings select TRGM_VAR_ADVSET_FRIENDLY_FACTIONS_IDX;
+private _friendlyFactionIndex = call TRGM_GETTER_fnc_friendlyFactionIndex;
 (TRGM_VAR_AvailableFactions select _friendlyFactionIndex) params ["_westClassName", "_westDisplayName"];
 
 private _westData = TRGM_VAR_AllFactionMap get _westClassName;

diff --git a/RandFramework/Global/init/fn_initGlobalVars.sqf b/RandFramework/Global/init/fn_initGlobalVars.sqf
@@ -228,7 +228,6 @@ if (isNil "TRGM_VAR_AODetails")                               then {TRGM_VAR_AOD
 if (isNil "TRGM_VAR_ATFieldPos")                              then {TRGM_VAR_ATFieldPos = [];                                         publicVariable "TRGM_VAR_ATFieldPos";};
 if (isNil "TRGM_VAR_ActiveTasks")                             then {TRGM_VAR_ActiveTasks = [];                                        publicVariable "TRGM_VAR_ActiveTasks";};
 if (isNil "TRGM_VAR_AdminPlayer")                             then {TRGM_VAR_AdminPlayer = objNull;                                   publicVariable "TRGM_VAR_AdminPlayer";};
-if (isNil "TRGM_VAR_AdvancedSettings")                        then {TRGM_VAR_AdvancedSettings = TRGM_VAR_DefaultAdvancedSettings;     publicVariable "TRGM_VAR_AdvancedSettings";};
 if (isNil "TRGM_VAR_AllowAOFires")                            then {TRGM_VAR_AllowAOFires =   true;                                   publicVariable "TRGM_VAR_AllowAOFires";};
 if (isNil "TRGM_VAR_AllowUAVLocateHelp")                      then {TRGM_VAR_AllowUAVLocateHelp = false;                              publicVariable "TRGM_VAR_AllowUAVLocateHelp";};
 if (isNil "TRGM_VAR_BadPoints")                               then {TRGM_VAR_BadPoints = 0;                                           publicVariable "TRGM_VAR_BadPoints";};

diff --git a/RandFramework/Missions/defuseIEDsMission.sqf b/RandFramework/Missions/defuseIEDsMission.sqf
@@ -39,13 +39,7 @@ MISSION_fnc_CustomMission = { //This function is the main script for your missio
     params ["_markerType","_objectiveMainBuilding","_centralAO_x","_centralAO_y","_roadSearchRange", "_bCreateTask", "_iTaskIndex", "_bIsMainObjective", ["_args", []]];
     if (_markerType != "empty") then { _markerType = "hd_unknown"; }; // Set marker type here...
 
-    _compactIedTargets = false;
-    if (TRGM_VAR_AdvancedSettings select TRGM_VAR_ADVSET_IEDTARGET_COMPACT_SPACING_IDX isEqualTo 1) then {
-        _compactIedTargets = true;
-    };
-    if (TRGM_VAR_AdvancedSettings select TRGM_VAR_ADVSET_IEDTARGET_COMPACT_SPACING_IDX isEqualTo 0) then {
-        _compactIedTargets = random 1 < .50;
-    };
+    _compactIedTargets = call TRGM_GETTER_fnc_bCompactTargetMissions;
 
     _spacingBetweenTargets = 1500;
     if (_compactIedTargets) then {_spacingBetweenTargets = 150};

diff --git a/RandFramework/Missions/searchAndDestroyMission.sqf b/RandFramework/Missions/searchAndDestroyMission.sqf
@@ -39,13 +39,7 @@ MISSION_fnc_CustomMission = { //This function is the main script for your missio
     params ["_markerType","_objectiveMainBuilding","_centralAO_x","_centralAO_y","_roadSearchRange", "_bCreateTask", "_iTaskIndex", "_bIsMainObjective", ["_args", []]];
     if (_markerType != "empty") then { _markerType = "hd_unknown"; }; // Set marker type here...
 
-    _compactIedTargets = false;
-    if (TRGM_VAR_AdvancedSettings select TRGM_VAR_ADVSET_IEDTARGET_COMPACT_SPACING_IDX isEqualTo 1) then {
-        _compactIedTargets = true;
-    };
-    if (TRGM_VAR_AdvancedSettings select TRGM_VAR_ADVSET_IEDTARGET_COMPACT_SPACING_IDX isEqualTo 0) then {
-        _compactIedTargets = random 1 < .50;
-    };
+    _compactIedTargets = call TRGM_GETTER_fnc_bCompactTargetMissions;
 
     _spacingBetweenTargets = 1500;
     if (_compactIedTargets) then {_spacingBetweenTargets = 150};