Mission initialization overhaul

Missionframework/KPLIB_functions.hpp

@@ -4,7 +4,7 @@
     File: KPLIB_functions.hpp
     Author: KP Liberation Dev Team - https://github.com/KillahPotatoes
     Date: 2017-10-16
-    Last Update: 2018-08-03
+    Last Update: 2018-08-31
     License: GNU General Public License v3.0 - https://www.gnu.org/licenses/gpl-3.0.html
 
     Description:
@@ -17,7 +17,7 @@ class CfgFunctions {
         #include "modules\00_init\functions.hpp"
         #include "modules\01_core\functions.hpp"
         #include "modules\02_build\functions.hpp"
-        #include "modules\99_adminMenu\functions.hpp"
-        #include "modules\99_playerMenu\functions.hpp"
+        #include "modules\99_adm\functions.hpp"
+        #include "modules\99_plm\functions.hpp"
     };
 };

Missionframework/KPLIB_ui.hpp

@@ -4,7 +4,7 @@
     File: KPLIB_ui.hpp
     Author: KP Liberation Dev Team - https://github.com/KillahPotatoes
     Date: 2017-10-16
-    Last Update: 2018-08-03
+    Last Update: 2018-08-31
     License: GNU General Public License v3.0 - https://www.gnu.org/licenses/gpl-3.0.html
 
     Description:
@@ -15,5 +15,5 @@
 #include "modules\00_init\ui.hpp"
 #include "modules\01_core\ui.hpp"
 #include "modules\02_build\ui.hpp"
-#include "modules\99_adminMenu\ui.hpp"
-#include "modules\99_playerMenu\ui.hpp"
+#include "modules\99_adm\ui.hpp"
+#include "modules\99_plm\ui.hpp"

Missionframework/KP_GUI/KP_uiDefines.hpp

@@ -4,7 +4,7 @@
     File: KP_uiDefines.hpp
     Author: Wyqer - https://github.com/KillahPotatoes
     Date: 2018-07-10
-    Last Update: 2018-08-04
+    Last Update: 2018-08-31
     License: GNU General Public License v3.0 - https://www.gnu.org/licenses/gpl-3.0.html
 
     Description:
@@ -334,7 +334,7 @@ class KP_DialogTitleC: KP_Title {
 
 // Cross symbol
 class KP_DialogCrossC: KP_CloseCross {
-    x = safeZoneX + safeZoneW * (KP_X_VAL_C + KP_WIDTH_VAL_C - 0.02)
+    x = safeZoneX + safeZoneW * (KP_X_VAL_C + KP_WIDTH_VAL_C - 0.02);
     y = KP_GETY_CROSS(KP_Y_VAL_C);
 };
 

Missionframework/modules/00_init/fnc/fn_init_configGuard.sqf

@@ -4,7 +4,7 @@
     File: fn_init_configGuard.sqf
     Author: KP Liberation Dev Team - https://github.com/KillahPotatoes
     Date: 2018-06-19
-    Last Update: 2018-07-01
+    Last Update: 2018-08-31
     License: GNU General Public License v3.0 - https://www.gnu.org/licenses/gpl-3.0.html
 
     Description:
@@ -17,7 +17,8 @@
     Returns:
     NOTHING
 */
-                // We can't use our params vars here as this will be ran before all other functions
+
+// We can't use our params vars here as this will be ran before all other functions
 if(!isServer || (["DebugConfigGuard", 1] call BIS_fnc_getParamValue) == 0) exitWith {};
 
 // Create validation namespace on server
@@ -36,18 +37,31 @@ KPLIB_validationNamespace setVariable ["resistance", false];
 // Delay all checks unitl all initialization is done
 [] spawn {
     waitUntil{time > 0 && count call KPLIB_fnc_common_getAllPlayers > 0};
-    diag_log "[KP LIBERATION] [CFG GUARD] Validating configuration files";
+    diag_log format ["[KP LIBERATION] [%1] [CFG GUARD] Validating configuration files...", diag_tickTime];
 
     // Get array of variables to check
     private _toValidate = allVariables KPLIB_validationNamespace;
     // If there is any "false" variable this means one of the guarded config files is invalid
     private _invalidConfig = (_toValidate findIf {!(KPLIB_validationNamespace getVariable _x)}) != -1;
 
     if(_invalidConfig) exitWith {
-        diag_log "[KP LIBERATION] [CFG GUARD] Invalid configuration files present. Ending mission for everyone";
+        diag_log format ["[KP LIBERATION] [%1] [CFG GUARD] Invalid configuration files present. Ending mission for everyone", diag_tickTime];
 
         "KPLIB_configError" call BIS_fnc_endMissionServer;
     };
 
-    diag_log "[KP LIBERATION] [CFG GUARD] All configuration files seem to be OK";
+    diag_log format ["[KP LIBERATION] [%1] [CFG GUARD] Configuration files are valid", diag_tickTime];
+
+    diag_log format [
+        "[KP LIBERATION] [MISSIONSTART] Missionfile: %1 - World Name: %2 - Version: %3 - Blufor: %4 - Opfor: %5 - Resistance: %6 - Civilians: %7 - Arsenal: %8 - ACE: %9",
+        (localize "STR_MISSION_TITLE"),
+        worldName,
+        (localize "STR_MISSION_VERSION"),
+        KPLIB_preset_blufor,
+        KPLIB_preset_opfor,
+        KPLIB_preset_resistance,
+        KPLIB_preset_civilians,
+        KPLIB_preset_arsenal,
+        KPLIB_ace_enabled
+    ];
 };

Missionframework/modules/00_init/fnc/fn_init_load.sqf

@@ -4,7 +4,7 @@
     File: fn_init_load.sqf
     Author: KP Liberation Dev Team - https://github.com/KillahPotatoes
     Date: 2018-03-29
-    Last Update: 2018-03-29
+    Last Update: 2018-08-31
     License: GNU General Public License v3.0 - https://www.gnu.org/licenses/gpl-3.0.html
 
     Description:
@@ -26,19 +26,19 @@ if (KPLIB_param_wipeSave1 > 0 && KPLIB_param_wipeSave2 > 0) then {
 KPLIB_save_data = profileNamespace getVariable KPLIB_save_key;
 
 if !(isNil "KPLIB_save_data") then {
-    if (KPLIB_param_debugSave > 0) then {diag_log format ["[KP LIBERATION] [SAVE] ----- Time: %1 - Saved data loading -----", diag_tickTime];};
+    if (KPLIB_param_debugSave > 0) then {diag_log format ["[KP LIBERATION] [%1] [SAVE] ----- Saved data loading -----", diag_tickTime];};
 
     // Load data via module specific data load functions
     [KPLIB_save_data select 0] call KPLIB_fnc_init_loadData;
 
-    if (KPLIB_param_debugSave > 0) then {diag_log format ["[KP LIBERATION] [SAVE] ----- Time: %1 - Saved data loaded -----", diag_tickTime];};
+    if (KPLIB_param_debugSave > 0) then {diag_log format ["[KP LIBERATION] [%1] [SAVE] ----- Saved data loaded -----", diag_tickTime];};
 } else {
-    if (KPLIB_param_debugSave > 0) then {diag_log format ["[KP LIBERATION] [SAVE] ----- Time: %1 - New campaign initializing -----", diag_tickTime];};
+    if (KPLIB_param_debugSave > 0) then {diag_log format ["[KP LIBERATION] [%1] [SAVE] ----- New campaign initializing -----", diag_tickTime];};
 
     // Call the load functions, which will generate a fresh campaign
     call KPLIB_fnc_init_loadData;
 
-    if (KPLIB_param_debugSave > 0) then {diag_log format ["[KP LIBERATION] [SAVE] ----- Time: %1 - New campaign initialized -----", diag_tickTime];};
+    if (KPLIB_param_debugSave > 0) then {diag_log format ["[KP LIBERATION] [%1] [SAVE] ----- New campaign initialized -----", diag_tickTime];};
 };
 
 KPLIB_save_loaded = true;

Missionframework/modules/00_init/initModule.sqf → Missionframework/modules/00_init/fnc/fn_init_postInitModule.sqf

@@ -1,19 +1,14 @@
 /*
-    KP LIBERATION MODULE INITIALIZATION
+    KPLIB_fnc_init_postInitModule
 
-    File: initModule.sqf
+    File: fn_init_postInitModule.sqf
     Author: KP Liberation Dev Team - https://github.com/KillahPotatoes
-    Date: 2017-10-16
-    Last Update: 2018-03-29
+    Date: 2017-08-31
+    Last Update: 2018-08-31
     License: GNU General Public License v3.0 - https://www.gnu.org/licenses/gpl-3.0.html
 
     Description:
-    This module initialize basically everything that should be done before the player passes the briefing screen.
     Tasks of this module are:
-        * Fetch parameters
-        * Fetch config values
-        * Define basic ui values
-        * Fetch, check and distribute preset data
         * Sort sector markers to specific arrays
         * Initialize the save manager
         * Connect unlockable vehicles to military sectors
@@ -23,22 +18,14 @@
 
     Dependencies:
     NONE
+
+    Returns:
+    BOOL
 */
-if(isServer) then {
-    DEBUG_EVENTS = [
-            "KPLIB_vehicle_spawned",
-            "KPLIB_fob_built",
-            "KPLIB_sector_activated",
-            "KPLIB_sector_captured",
-            "KPLIB_sector_deactivated",
-            "KPLIB_player_fob"
-        ];
-
-    {
-        [_x, compile ("diag_log 'eventCalled " + _x + "'; diag_log _this;")] call CBA_fnc_addEventHandler;
-        [_x, compile ("systemChat 'eventCalled " + _x + "'; systemChat format['%1', _this];")] call CBA_fnc_addEventHandler;
-    } forEach DEBUG_EVENTS;
-};
+
+if (!isServer) exitWith {};
+
+diag_log format ["[KP LIBERATION] [%1] [POST INIT] Module initializing...", diag_tickTime];
 
 // Read the module globals
 call compile preprocessFileLineNumbers "modules\00_init\globals.sqf";
@@ -58,3 +45,7 @@ execVM "modules\00_init\scripts\server\saveTimer\timer.sqf";
 
 // Create locked vehicle markers
 call KPLIB_fnc_init_createLockedVehMarkers;
+
+diag_log format ["[KP LIBERATION] [%1] [POST INIT] Module initialized", diag_tickTime];
+
+true

Missionframework/modules/00_init/fnc/fn_init_preInitModule.sqf

@@ -0,0 +1,46 @@
+/*
+    KPLIB_fnc_init_preInitModule
+
+    File: fn_init_preInitModule.sqf
+    Author: KP Liberation Dev Team - https://github.com/KillahPotatoes
+    Date: 2017-08-31
+    Last Update: 2018-08-31
+    License: GNU General Public License v3.0 - https://www.gnu.org/licenses/gpl-3.0.html
+
+    Description:
+    Tasks of this module are:
+        * Fetch parameters
+        * Fetch config values
+        * Define basic ui values
+        * Fetch, check and distribute preset data
+
+    Dependencies:
+    NONE
+
+    Returns:
+    BOOL
+*/
+
+diag_log format ["[KP LIBERATION] [%1] [PRE INIT] Module initializing...", diag_tickTime];
+
+// Check for ACE
+KPLIB_ace_enabled = isClass (configFile >> "CfgPatches" >> "ace_main");
+KPLIB_ace_medical = isClass (configfile >> "CfgPatches" >> "ace_medical");
+
+// Check for KP Ranks
+KPLIB_kpr_enabled = isClass (configFile >> "CfgPatches" >> "KP_Ranks");
+
+// Parameter processing and vanilla save deactivation on the server only
+if (isServer) then {
+    enableSaving [false, false];
+
+    KPLIB_param_source = ["LoadSaveParams", 1] call BIS_fnc_getParamValue;
+    call KPLIB_fnc_init_paramFetchAll;
+};
+
+// Read the KPLIB_config.sqf file
+call compile preprocessFileLineNumbers "KPLIB_config.sqf";
+
+diag_log format ["[KP LIBERATION] [%1] [PRE INIT] Module initialized", diag_tickTime];
+
+true