Merge pull request #567 from KillahPotatoes/v0.97S10-533

Logistic module pt1

Author: Dubjunk

.vscode/settings.json

@@ -14,13 +14,17 @@
         "KPLIB_eden_boxspawn",
         "KPLIB_eden_potatospawn",
         "KPLIB_eden_startbase",
+        "KPLIB_param_aceResupply",
+        "KPLIB_param_ammoInfluence",
         "KPLIB_param_arsenalType",
         "KPLIB_param_clearVehicleCargo",
         "KPLIB_param_commanderZeusMode",
         "KPLIB_param_copyDistance",
         "KPLIB_param_crateVolume",
+        "KPLIB_param_damageInfluence",
         "KPLIB_param_debug",
         "KPLIB_param_fobRange",
+        "KPLIB_param_fuelInfluence",
         "KPLIB_param_limitedZeusCeiling",
         "KPLIB_param_limitedZeusRadius",
         "KPLIB_param_mobileRespawn",
@@ -29,6 +33,14 @@
         "KPLIB_param_presetE",
         "KPLIB_param_presetF",
         "KPLIB_param_presetR",
+        "KPLIB_param_recycleFactor",
+        "KPLIB_param_refundSupply",
+        "KPLIB_param_refundAmmo",
+        "KPLIB_param_refundFuel",
+        "KPLIB_param_resupplyAmmoCost",
+        "KPLIB_param_resupplyFuelCost",
+        "KPLIB_param_resupplyGallCost",
+        "KPLIB_param_resupplyMagCost",
         "KPLIB_param_reviveBleedOutDuration",
         "KPLIB_param_reviveDuration",
         "KPLIB_param_reviveForceRespawnDuration",

Missionframework/KPLIB_functions.hpp

@@ -26,5 +26,6 @@ class KPLIB {
     #include "modules\14_virtual\functions.hpp"
     #include "modules\15_build\functions.hpp"
     #include "modules\16_garrison\functions.hpp"
+    #include "modules\23_logistic\functions.hpp"
     #include "modules\24_enemy\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-12-14
+    Last Update: 2019-01-16
     License: GNU General Public License v3.0 - https://www.gnu.org/licenses/gpl-3.0.html
 
     Description:
@@ -22,3 +22,4 @@
 #include "modules\13_plm\ui.hpp"
 #include "modules\14_virtual\ui.hpp"
 #include "modules\15_build\ui.hpp"
+#include "modules\23_logistic\ui.hpp"

Missionframework/modules/01_common/README.md

@@ -36,6 +36,10 @@ This module uses no data or functions from other modules.
 
   *Gets path for className icon.*
 
+* KPLIB_fnc_common_getPlayerFob
+
+  *Returns the FOB of the given player.*
+
 * KPLIB_fnc_common_getPos
 
   *getPos wrapper for ATL positions.*

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

@@ -0,0 +1,24 @@
+/*
+    KPLIB_fnc_common_getPlayerFob
+
+    File: fn_common_getPlayerFob.sqf
+    Author: KP Liberation Dev Team - https://github.com/KillahPotatoes
+    Date: 2019-02-24
+    Last Update: 2019-02-24
+    License: GNU General Public License v3.0 - https://www.gnu.org/licenses/gpl-3.0.html
+
+    Description:
+        Returns the FOB of the given player.
+
+    Parameter(s):
+        _player - Player which should be checked [OBJECT, defaults player]
+
+    Returns:
+        FOB of the player to check
+*/
+
+params [
+    ["_player", player, [objNull]]
+];
+
+(_player getVariable ["KPLIB_fob", ""])

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: 2018-12-11
+    Last Update: 2019-02-24
     License: GNU General Public License v3.0 - https://www.gnu.org/licenses/gpl-3.0.html
 
     Description:
@@ -41,6 +41,9 @@ class common {
     // Gets path for className icon
     class common_getIcon {};
 
+    // Returns the FOB of the given player
+    class common_getPlayerFob {};
+
     // getPos wrapper for ATL positions
     class common_getPos {};
 

Missionframework/modules/12_arsenal/ui/KPLIB_arsenal.hpp

@@ -4,7 +4,7 @@
     File: KPLIB_arsenal.hpp
     Author: KP Liberation Dev Team - https://github.com/KillahPotatoes
     Date: 2018-11-12
-    Last Update: 2018-12-14
+    Last Update: 2019-02-24
     License: GNU General Public License v3.0 - https://www.gnu.org/licenses/gpl-3.0.html
 
     Description:
@@ -65,7 +65,7 @@ class KPLIB_arsenal {
             y = KP_GETCY(KP_Y_VAL_C,KP_HEIGHT_VAL_C,39,48);
             w = KP_GETW(KP_WIDTH_VAL_C,12);
             h = KP_GETH(KP_HEIGHT_VAL_C,24);
-            tooltip = "$STR_KPLIB_DIALOG_ARSENAL_REFRESH_TT";
+            tooltip = "$STR_KPLIB_REFRESH";
             action = "[] call KPLIB_fnc_arsenal_getNearPlayers";
         };
 

Missionframework/modules/23_logistic/README.md

@@ -0,0 +1,20 @@
+# KP Liberation Module Description
+
+## Logistic Module
+
+
+### Dependencies
+* Init
+* Common
+
+### Consumed events
+
+
+### Emitted events
+
+
+### Functions
+
+
+### Scripts
+No scripts will be started by this module

Missionframework/modules/23_logistic/fnc/fn_logistic_addActions.sqf

@@ -0,0 +1,31 @@
+/*
+    KPLIB_fnc_logistic_addActions
+
+    File: fn_logistic_addActions.sqf
+    Author: KP Liberation Dev Team - https://github.com/KillahPotatoes
+    Date: 2019-01-16
+    Last Update: 2019-02-24
+    License: GNU General Public License v3.0 - https://www.gnu.org/licenses/gpl-3.0.html
+
+    Description:
+        Adds all actions to the spawned logistic building.
+
+    Parameter(s):
+        _object - Spawned object to take care of [OBJECT, defaults to objNull]
+
+    Returns:
+        Function reached the end [BOOL]
+*/
+
+params [
+    ["_object", objNull, [objNull]]
+];
+
+if ((typeOf _object) isEqualTo KPLIB_logistic_building) then {
+    // Add main menu dialog action to object
+    [
+        _object,
+        "STR_KPLIB_ACTION_LOGISTIC",
+        [{[] call KPLIB_fnc_logistic_openDialog;}, nil, -500, false, true, "", "", 4]
+    ] remoteExecCall ["KPLIB_fnc_common_addAction", 0, true];
+}

Missionframework/modules/23_logistic/fnc/fn_logistic_addMenu.sqf

@@ -0,0 +1,35 @@
+/*
+    KPLIB_fnc_logistic_addMenu
+
+    File: fn_logistic_addMenu.sqf
+    Author: KP Liberation Dev Team - https://github.com/KillahPotatoes
+    Date: 2019-01-17
+    Last Update: 2019-02-24
+    License: GNU General Public License v3.0 - https://www.gnu.org/licenses/gpl-3.0.html
+
+    Description:
+        Adds a new menu to the logistic main menu.
+
+    Parameter(s):
+        _menu       - Menu name                                 [STRING, defaults to ""]
+        _condition  - Code which is executed on button click    [CODE, defaults to {false}]
+        _string     - Menu name stringtable path                [STRING, defaults to ""]
+
+    Returns:
+        Function reached the end [BOOL]
+*/
+
+params [
+    ["_menu", "", [""]],
+    ["_code", {false}, [{}]],
+    ["_string", "", [""]]
+];
+
+// Read the registered menus
+private _menus = KPLIB_logistic_data getVariable ["menus", []];
+
+// Append the new menu and save the variable
+_menus pushBack [_menu, _code, _string];
+KPLIB_logistic_data setVariable ["menus", _menus, true];
+
+true