Enemy Commander FSM and patrols

.vscode/settings.json

@@ -10,9 +10,9 @@
         "_thisId",
         "_thisType",
         "BIS_fnc_reviveInit",
-        "CBA_Settings_fnc_init",
         "CBA_fnc_compatibleMagazines",
         "CBA_fnc_notify",
+        "CBA_Settings_fnc_init",
         "KPLIB_eden_boxspawn",
         "KPLIB_eden_potatospawn",
         "KPLIB_eden_startbase",
@@ -30,6 +30,7 @@
         "KPLIB_param_crateVolume",
         "KPLIB_param_damageInfluence",
         "KPLIB_param_debug",
+        "KPLIB_param_enemyDebug",
         "KPLIB_param_fobRange",
         "KPLIB_param_fuelInfluence",
         "KPLIB_param_limitedZeusCeiling",
@@ -44,9 +45,9 @@
         "KPLIB_param_presetF",
         "KPLIB_param_presetR",
         "KPLIB_param_recycleFactor",
-        "KPLIB_param_refundSupply",
         "KPLIB_param_refundAmmo",
         "KPLIB_param_refundFuel",
+        "KPLIB_param_refundSupply",
         "KPLIB_param_resupplyAmmoCost",
         "KPLIB_param_resupplyFuelCost",
         "KPLIB_param_resupplyGallCost",
@@ -116,13 +117,13 @@
         "KPLIB_preset_lockedVehPlF",
         "KPLIB_preset_logiBuildingE",
         "KPLIB_preset_logiBuildingF",
-        "KPLIB_preset_logiTruckE",
-        "KPLIB_preset_logiTruckF",
         "KPLIB_preset_logisticE",
         "KPLIB_preset_logisticF",
         "KPLIB_preset_logisticPlC",
         "KPLIB_preset_logisticPlE",
         "KPLIB_preset_logisticPlF",
+        "KPLIB_preset_logiTruckE",
+        "KPLIB_preset_logiTruckF",
         "KPLIB_preset_mortarE",
         "KPLIB_preset_mortarF",
         "KPLIB_preset_nameC",

CHANGELOG.md

@@ -10,6 +10,7 @@
 * Added: Mission configuration completely via CBA Settings.
 * Added: Logistic station with cratefiller, vehicle resupply and recycle functionality.
 * Added: Garrison dialog for the commander to manage his own sector garrisons.
+* Added: Enemy Commander decision making and (re)action triggering via a FSM.
 * Updated: Traditional Chinese Localization. Thanks to [dustin902001](https://github.com/dustin902001)
 * Removed: Mission configuration via mission parameters.
 * Tweaked: License changed from MIT to GPLv3.

Missionframework/KPGUI/KPGUI_classes.hpp

@@ -4,7 +4,7 @@
     File: KPGUI_classes.hpp
     Author: Wyqer - https://github.com/KillahPotatoes
     Date: 2018-09-13
-    Last Update: 2019-05-04
+    Last Update: 2019-05-19
     License: GNU General Public License v3.0 - https://www.gnu.org/licenses/gpl-3.0.html
 
     Description:
@@ -57,7 +57,6 @@ class KPGUI_PRE_ScrollBar {
 class KPGUI_PRE_Title {
     deletable = 0;
     fade = 0;
-    access = 0;
     type = 0;
     idc = -1;
     colorBackground[] = KP_COLOR_PLAYERDEFINE;
@@ -83,7 +82,6 @@ class KPGUI_PRE_Title {
 class KPGUI_PRE_CloseCross {
     deletable = 0;
     fade = 0;
-    access = 0;
     type = 11;
     style = 48 + 2048;
     color[] = {1, 1, 1, 0.75};
@@ -124,7 +122,6 @@ class KPGUI_PRE_VersionIcon: KPGUI_PRE_CloseCross {
 class KPGUI_PRE_Background {
     deletable = 0;
     fade = 0;
-    access = 0;
     type = 0;
     idc = -1;
     colorBackground[] = KP_COLOR_BACKGROUND;
@@ -150,7 +147,6 @@ class KPGUI_PRE_Background {
 class KPGUI_PRE_Text {
     deletable = 0;
     fade = 0;
-    access = 0;
     type = 0;
     idc = -1;
     colorBackground[] = {0, 0, 0, 0};
@@ -182,7 +178,6 @@ class KPGUI_PRE_InlineTitle: KPGUI_PRE_Text {
 class KPGUI_PRE_ActiveText {
     deletable = 0;
     fade = 0;
-    access = 0;
     type = 11;
     style = 2;
     color[] = {0, 0, 0, 1};
@@ -234,7 +229,6 @@ class KPGUI_PRE_PictureRatio: KPGUI_PRE_Picture {
 class KPGUI_PRE_Button {
     deletable = 0;
     fade = 0;
-    access = 0;
     type = 1;
     text = "";
     colorText[] = {1, 1, 1, 1};
@@ -316,7 +310,6 @@ class KPGUI_PRE_ControlsGroupNoScrollbars: KPGUI_PRE_ControlsGroup
 class KPGUI_PRE_Combo {
     deletable = 0;
     fade = 0;
-    access = 0;
     type = 4;
     colorSelect[] = {0, 0, 0, 1};
     colorText[] = {1, 1, 1, 1};
@@ -401,7 +394,6 @@ class KPGUI_PRE_CheckBox {
 class KPGUI_PRE_ListBox {
     deletable = 0;
     fade = 0;
-    access = 0;
     type = 5;
     rowHeight = 0;
     colorText[] = {1, 1, 1, 1};
@@ -451,7 +443,6 @@ class KPGUI_PRE_ListBox {
 class KPGUI_PRE_ListNBox {
     deletable = 0;
     fade = 0;
-    access = 0;
     type = 102;
     rowHeight = 0;
     colorText[] = {1, 1, 1, 1};
@@ -553,7 +544,6 @@ class KPGUI_PRE_Slider {
 class KPGUI_PRE_EditBox {
     deletable = 0;
     fade = 0;
-    access = 0;
     type = 2;
     x = 0;
     y = 0;
@@ -595,7 +585,6 @@ class KPGUI_PRE_ProgressBar
 class KPGUI_PRE_MapControl {
     deletable = 0;
     fade = 0;
-    access = 0;
     type = 101;
     idc = 51;
     style = 16 + 32;
@@ -1195,7 +1184,7 @@ class KPGUI_PRE_DialogTitleSR: KPGUI_PRE_Title {
 
 // Cross symbol
 class KPGUI_PRE_DialogCrossSR: KPGUI_PRE_CloseCross {
-    x = safeZoneX + safeZoneW * (KP_X_VAL_SR + KP_WIDTH_VAL_SR - 0.02)
+    x = safeZoneX + safeZoneW * (KP_X_VAL_SR + KP_WIDTH_VAL_SR - 0.02);
     y = KP_GETY_CROSS(KP_Y_VAL_SR);
 };
 
@@ -1219,7 +1208,7 @@ class KPGUI_PRE_DialogButtonSR: KPGUI_PRE_Button {
 */
 
 class KPGUI_PRE_LogoRightCorner: KPGUI_PRE_PictureRatio {
-    text = "KPGUI\res\kp512_CA.paa";
+    text = "KPGUI\res\kp512_ca.paa";
     x = "safezoneX + safezoneW - 5.3 * (((safezoneW / safezoneH) min 1.2) / 40)";
     y = "safezoneY + safezoneH - 4.5 * ((((safezoneW / safezoneH) min 1.2) / 1.2) / 25)";
     w = "3.5 * (((safezoneW / safezoneH) min 1.2) / 40)";

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

@@ -4,7 +4,7 @@
     File: fn_init_loadData.sqf
     Author: KP Liberation Dev Team - https://github.com/KillahPotatoes
     Date: 2017-10-16
-    Last Update: 2019-04-22
+    Last Update: 2019-06-08
     License: GNU General Public License v3.0 - https://www.gnu.org/licenses/gpl-3.0.html
     Public: No
 
@@ -35,8 +35,8 @@ if (_moduleData isEqualTo []) then {
     private _nextVehicle = "";
     private _nextBase = "";
     while {((count _assignedVehicles) < (count KPLIB_preset_lockedVehPlF)) && ((count _assignedBases) < (count KPLIB_sectors_military))} do {
-        _nextVehicle =  selectRandom (KPLIB_preset_lockedVehPlF select {!(_x in _assignedVehicles)});
-        _nextBase =  selectRandom (KPLIB_sectors_military select {!(_x in _assignedBases)});
+        _nextVehicle =  selectRandom (KPLIB_preset_lockedVehPlF - _assignedVehicles);
+        _nextBase =  selectRandom (KPLIB_sectors_military - _assignedBases);
         _assignedVehicles pushBack _nextVehicle;
         _assignedBases pushBack _nextBase;
         KPLIB_sectors_lockedVeh pushBack [_nextVehicle, _nextBase];
@@ -75,8 +75,8 @@ if (_moduleData isEqualTo []) then {
         } forEach KPLIB_sectors_lockedVeh;
 
         while {((count _assignedVehicles) < (count KPLIB_preset_lockedVehPlF)) && ((count _assignedBases) < (count KPLIB_sectors_military))} do {
-            _nextVehicle =  selectRandom (KPLIB_preset_lockedVehPlF select {!(_x in _assignedVehicles)});
-            _nextBase =  selectRandom (KPLIB_sectors_military select {!(_x in _assignedBases)});
+            _nextVehicle =  selectRandom (KPLIB_preset_lockedVehPlF - _assignedVehicles);
+            _nextBase =  selectRandom (KPLIB_sectors_military - _assignedBases);
             _assignedVehicles pushBack _nextVehicle;
             _assignedBases pushBack _nextBase;
             KPLIB_sectors_lockedVeh pushBack [_nextVehicle, _nextBase];

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

@@ -4,7 +4,7 @@
     File: fn_init_settings.sqf
     Author: KP Liberation Dev Team - https://github.com/KillahPotatoes
     Date: 2018-11-09
-    Last Update: 2019-04-27
+    Last Update: 2019-06-15
     License: GNU General Public License v3.0 - https://www.gnu.org/licenses/gpl-3.0.html
     Public: No
 
@@ -18,7 +18,6 @@
         Function reached the end [BOOL]
 */
 
-
 /*
     ----- GENERAL SETTINGS -----
 */
@@ -119,7 +118,6 @@
     ----- PRESET SETTINGS -----
 */
 
-
 // KPLIB_param_presetF
 // Selection for the units, vehicles, etc. for the player side.
 // Default: Custom West Army

Missionframework/modules/01_common/fnc/fn_common_fps.sqf

@@ -0,0 +1,29 @@
+/*
+    KPLIB_fnc_common_fps
+
+    File: fn_common_fps.sqf
+    Author: KP Liberation Dev Team - https://github.com/KillahPotatoes
+    Date: 2019-06-08
+    Last Update: 2019-06-08
+    License: GNU General Public License v3.0 - https://www.gnu.org/licenses/gpl-3.0.html
+    Public: Yes
+
+    Description:
+        Returns the current FPS or, if a number is given, if the FPS are above or equal given number.
+
+    Parameter(s):
+        _fps - Value to check if FPS are equal or above. -1 to get current FPS. [NUMBER, defaults to -1]
+
+    Returns:
+        Current FPS above given number or current FPS value [BOOL or NUMBER]
+*/
+
+params [
+    ["_fps", -1, [0]]
+];
+
+if (_fps > -1) then {
+    diag_fps >= _fps
+} else {
+    parseNumber (diag_fps toFixed 2)
+};

Missionframework/modules/01_common/fnc/fn_common_getPresetClass.sqf

@@ -4,7 +4,7 @@
     File: fn_common_getPresetClass.sqf
     Author: KP Liberation Dev Team - https://github.com/KillahPotatoes
     Date: 2018-12-08
-    Last Update: 2019-04-22
+    Last Update: 2019-06-09
     License: GNU General Public License v3.0 - https://www.gnu.org/licenses/gpl-3.0.html
     Public: Yes
 
@@ -13,7 +13,7 @@
 
     Parameter(s):
         _type       - Preset type name                                          [STRING, defaults to ""]
-        _side       - Preset side                                               [SIDE, defaults to KPLIB_preset_sideEnemy]
+        _side       - Preset side                                               [SIDE, defaults to KPLIB_preset_sideE]
         _isArray    - Array of classnames (true) or single classname (false)    [BOOL, defaults to false]
 
     Returns:

Missionframework/modules/01_common/functions.hpp

@@ -4,7 +4,7 @@
     File: functions.hpp
     Author: KP Liberation Dev Team - https://github.com/KillahPotatoes
     Date: 2018-09-15
-    Last Update: 2019-04-22
+    Last Update: 2019-06-08
     License: GNU General Public License v3.0 - https://www.gnu.org/licenses/gpl-3.0.html
 
     Description:
@@ -38,6 +38,9 @@ class common {
     // Creates a vehicle at given position with given direction
     class common_createVehicle {};
 
+    // Check current FPS or if they are higher or equal than given number
+    class common_fps {};
+
     // Generate positions in circle
     class common_getCirclePositions {};
 

Missionframework/modules/02_core/fnc/fn_core_getNearestMarker.sqf

@@ -4,7 +4,7 @@
     File: fn_core_getNearestMarker.sqf
     Author: KP Liberation Dev Team - https://github.com/KillahPotatoes
     Date: 2017-11-26
-    Last Update: 2019-04-22
+    Last Update: 2019-06-08
     License: GNU General Public License v3.0 - https://www.gnu.org/licenses/gpl-3.0.html
     Public: Yes
 
@@ -27,8 +27,8 @@ params [
 ];
 
 
-private _markersWithinRange =  _markers select {((markerPos _x) distance _centerPos) < _range};
-private _markersAscByRange = [_markersWithinRange, [_centerPos], {(markerPos _x) distance _input0}, "ASCEND"] call BIS_fnc_sortBy;
+private _markersWithinRange =  _markers select {((markerPos _x) distance2D _centerPos) < _range};
+private _markersAscByRange = [_markersWithinRange, [_centerPos], {(markerPos _x) distance2D _input0}, "ASCEND"] call BIS_fnc_sortBy;
 // Return nearest marker
 if !(_markersAscByRange isEqualTo []) then {
     _markersAscByRange select 0

Missionframework/modules/02_core/fnc/fn_core_settings.sqf

@@ -4,7 +4,7 @@
     File: fn_core_settings.sqf
     Author: KP Liberation Dev Team - https://github.com/KillahPotatoes
     Date: 2018-11-11
-    Last Update: 2019-04-22
+    Last Update: 2019-06-15
     License: GNU General Public License v3.0 - https://www.gnu.org/licenses/gpl-3.0.html
     Public: No
 
@@ -18,7 +18,6 @@
         Function reached the end [BOOL]
 */
 
-
 /*
     ----- SECTOR SETTINGS -----
 */

Missionframework/modules/04_respawn/fnc/fn_respawn_settings.sqf

@@ -4,7 +4,7 @@
     File: fn_respawn_settings.sqf
     Author: KP Liberation Dev Team - https://github.com/KillahPotatoes
     Date: 2018-11-11
-    Last Update: 2019-04-22
+    Last Update: 2019-06-15
     License: GNU General Public License v3.0 - https://www.gnu.org/licenses/gpl-3.0.html
     Public: No
 
@@ -18,6 +18,10 @@
         Function reached the end [BOOL]
 */
 
+/*
+    ----- RESPAWN SETTINGS -----
+*/
+
 // KPLIB_param_mobileRespawn
 // Enables/Disables the mobile respawn functionality of certain vehicles.
 // Default: true

Missionframework/modules/10_resources/fnc/fn_resources_preInit.sqf

@@ -4,7 +4,7 @@
     File: fn_resources_preInit.sqf
     Author: KP Liberation Dev Team - https://github.com/KillahPotatoes
     Date: 2018-12-13
-    Last Update: 2019-04-22
+    Last Update: 2019-06-08
     License: GNU General Public License v3.0 - https://www.gnu.org/licenses/gpl-3.0.html
     Public: No
 
@@ -147,10 +147,7 @@ if (isServer) then {
     ]] call KPLIB_fnc_init_filterMods;
 
     // Plain transport vehicle classnames array
-    KPLIB_resources_transportVehicles = [];
-    {
-        KPLIB_resources_transportVehicles pushBack (_x select 0);
-    } forEach KPLIB_resources_transportConfigs;
+    KPLIB_resources_transportVehicles = KPLIB_resources_transportConfigs apply {_x select 0};
 
     // Send filtered lists to clients
     publicVariable "KPLIB_resources_transportConfigs";

Missionframework/modules/10_resources/fnc/fn_resources_settings.sqf

@@ -4,7 +4,7 @@
     File: fn_resources_settings.sqf
     Author: KP Liberation Dev Team - https://github.com/KillahPotatoes
     Date: 2018-12-14
-    Last Update: 2019-05-04
+    Last Update: 2019-06-15
     License: GNU General Public License v3.0 - https://www.gnu.org/licenses/gpl-3.0.html
     Public: No
 
@@ -18,7 +18,6 @@
         Function reached the end [BOOL]
 */
 
-
 /*
     ----- RESOURCES SETTINGS -----
 */