Merge pull request #597 from ColdEvul/qof

Quality of life changes
7Cav · May 10, 2020 · 08dd4e4 · 08dd4e4
2 parents 43bed4e + 5cb01b5
commit 08dd4e4
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 2 deletions.
diff --git a/cScripts/CavFnc/functions/documents/fn_Doc_MissionControl.sqf b/cScripts/CavFnc/functions/documents/fn_Doc_MissionControl.sqf
@@ -18,6 +18,6 @@ if !(_variableName in _missionController) exitWith {};
 
 player createDiaryRecord["7Cav",
     ["S3 Mission Control",
-        "Oh! This tab is under redevelopment!"
+        '<executeClose expression="openCuratorInterface">Open Zeus Interface</executeClose>'
     ]
 ];
diff --git a/cScripts/CavFnc/functions/logistics/fn_doStarterCrate.sqf b/cScripts/CavFnc/functions/logistics/fn_doStarterCrate.sqf
@@ -37,13 +37,25 @@ params [
     [formatText["Starter Crate system applied to %1.", _object]] call FUNC(logInfo);
 #endif
 
+// Lowercase
+_quickSelectScale = toLower(_quickSelectScale);
+
 // If isServer call equipBase
 if (isServer) then {
     [_object, _quickSelectScale] call FUNC(doStarterCrateSupplies);
 };
 
 // Make addAction Topic
-_object addAction ["<img image='cScripts\Data\Icon\icon_00.paa' /> 7th Cavalry Equipment Crate", {}, [], 1.5, true, true, "", "true", 5];
+private _fullLableCheck = (_quickSelectScale == 'none' || _quickSelectScale == 'all' || _quickSelectScale == 'full');
+private _CoLableCheck = (_quickSelectScale == 'alpha' || _quickSelectScale == 'bravo' || _quickSelectScale == 'charlie');
+private _crateName = if ( !(_fullLableCheck) ) then {
+    if ( _CoLableCheck ) then {
+        format [" %1 Co ", [_quickSelectScale] call CBA_fnc_capitalize];
+    } else {
+        format [" %1 ", [_quickSelectScale] call CBA_fnc_capitalize];
+    };
+} else { ' ' };
+_object addAction [format ["<img image='cScripts\Data\Icon\icon_00.paa' /> 7th Cavalry%1Equipment Crate", _crateName], {}, [], 1.5, true, true, "", "true", 5];
 
 if (_arsenal) then {
     [_object, _quickSelectScale] call FUNC(addArsenal);

diff --git a/cScripts/CavFnc/functions/players/fn_setPostInitPlayerSettings.sqf b/cScripts/CavFnc/functions/players/fn_setPostInitPlayerSettings.sqf
@@ -133,6 +133,9 @@ if (EGVAR(Settings,setMissionType) != 3) then {
     [_player] call FUNC(doPlayerAnnouncement);
 };
 
+// Reload a magazine if empty
+if (needReload _player == 1) then {reload _player};
+
 if (isNil {_unit getVariable QEGVAR(Player,Unit)}) then {
     [formatText["%1 have no unit variable defined", _player], "LoadoutPostInit", true] call FUNC(logWarning);
 };