V097S6 - Respawn refactor

Missionframework/KPLIB_functions.hpp

@@ -16,6 +16,7 @@ class KPLIB {
     #include "modules\00_init\functions.hpp"
     #include "modules\01_core\functions.hpp"
     #include "modules\02_build\functions.hpp"
+    #include "modules\02_respawn\functions.hpp"
     #include "modules\99_adm\functions.hpp"
     #include "modules\99_plm\functions.hpp"
 };

Missionframework/KPLIB_ui.hpp

@@ -15,5 +15,6 @@
 #include "modules\00_init\ui.hpp"
 #include "modules\01_core\ui.hpp"
 #include "modules\02_build\ui.hpp"
+#include "modules\02_respawn\ui.hpp"
 #include "modules\99_adm\ui.hpp"
 #include "modules\99_plm\ui.hpp"

Missionframework/description.ext

@@ -26,10 +26,20 @@ class Header {
     maxPlayers = 37;
 };
 
-respawn = 3;
-respawndelay = 5;
 respawnButton = 1;
 respawnDialog = 0;
+respawnTemplates[] = {"KPLIB_respawn"};
+
+class CfgRespawnTemplates
+{
+    class KPLIB_respawn
+    {
+        onPlayerKilled = "KPLIB_fnc_respawn_onKilled";
+        onPlayerRespawn = "KPLIB_fnc_respawn_onRespawn";
+        respawnOnStart = 1;
+    };
+};
+
 disabledAI = true;
 enableDebugConsole = 1;
 allowFunctionsLog = 0;
@@ -58,3 +68,4 @@ class CfgDebriefing {
 };
 
 #include "KPLIB_ui.hpp"
+

Missionframework/modules/01_core/fnc/common/fn_common_getPos.sqf

@@ -0,0 +1,40 @@
+/*
+    KPLIB_fnc_common_getPos
+
+    File: fn_common_getPos.sqf
+    Author: KP Liberation Dev Team - https://github.com/KillahPotatoes
+    Date: 2018-09-12
+    Last Update: 2018-09-15
+    License: GNU General Public License v3.0 - https://www.gnu.org/licenses/gpl-3.0.html
+
+    Description:
+    Returns position of given marker, object or array.
+    In case array is given it is returned directly. For objects pos ATL is returned.
+
+    Parameter(s):
+        0: STRING/OBJECT/ARRAY - Position
+
+    Returns:
+    ARRAY - Position
+*/
+params [["_item", nil, ["",objNull,[],0], 3]];
+
+// Get position depending of type of respawn item
+switch (typeName _item) do {
+    case "STRING": {
+        getMarkerPos _item;
+    };
+
+    case "OBJECT": {
+        getPosATL _item;
+    };
+
+    // If someone forgots to wrap position array into an array.
+    case "SCALAR": {
+        +_this;
+    };
+
+    case "ARRAY": {
+       +_item;
+    };
+};

Missionframework/modules/01_core/fnc/common/functions.hpp

@@ -0,0 +1,28 @@
+/*
+    KP LIBERATION CORE FUNCTIONS
+
+    File: functions.hpp
+    Author: KP Liberation Dev Team - https://github.com/KillahPotatoes
+    Date: 2018-09-15
+    Last Update: 2018-09-15
+    License: GNU General Public License v3.0 - https://www.gnu.org/licenses/gpl-3.0.html
+
+    Description:
+    Defines for all common utility functions
+*/
+
+class common {
+    file = "modules\01_core\fnc\common";
+
+    // Clears vehicle cargo
+    class common_clearVehicleCargo;
+
+    // Generate positions in circle
+    class common_getCirclePositions {};
+
+    // getPos wrapper for ATL positions
+    class common_getPos {};
+
+    // Spawning of a vehicle at given position with given direction
+    class common_spawnVehicle {};
+};

Missionframework/modules/01_core/fnc/fn_core_getMobSpawns.sqf

@@ -4,7 +4,7 @@
     File: fn_core_getMobSpawns.sqf
     Author: KP Liberation Dev Team - https://github.com/KillahPotatoes
     Date: 2017-10-30
-    Last Update: 2018-01-05
+    Last Update: 2018-09-13
     License: GNU General Public License v3.0 - https://www.gnu.org/licenses/gpl-3.0.html
 
     Description:
@@ -18,10 +18,12 @@
 */
 
 private _return = vehicles select {
-    (typeOf _x == KPLIB_preset_respawnTruck || typeOf _x == KPLIB_preset_potato) &&
+    private _pos = getPos _x;
+
+    (_x getVariable ["KPLIB_respawn", false]) &&
     ((_x distance KPLIB_eden_startbase) > 500) &&
-    !surfaceIsWater (getPos _x) &&
-    ((getPos _x) select 2) < 5 &&
+    ( (surfaceIsWater _pos  && _x isKindOf "Ship") || (!surfaceIsWater _pos && !(_x isKindOf "Ship")) ) &&
+    (_pos select 2) < 5 &&
     alive _x &&
     speed _x < 5
 };

Missionframework/modules/01_core/fnc/fn_core_handleVehicleSpawn.sqf

@@ -4,7 +4,7 @@
     File: fn_core_handleVehicleSpawn.sqf
     Author: KP Liberation Dev Team - https://github.com/KillahPotatoes
     Date: 2018-09-10
-    Last Update: 2018-09-10
+    Last Update: 2018-09-13
     License: GNU General Public License v3.0 - https://www.gnu.org/licenses/gpl-3.0.html
 
     Description:
@@ -28,11 +28,14 @@ switch(typeOf _vehicle) do {
         ] remoteExecCall ["addAction", 0, true];
     };
 
+    case KPLIB_preset_respawnTruck;
     case KPLIB_preset_potato: {
+        // Set vehicle as mobile respawn
+        _vehicle setVariable ["KPLIB_respawn", true, true];
         // Add redeploy action globaly and for JIP
         [
             _vehicle,
-            [localize "STR_ACTION_REDEPLOY", {[] spawn KPLIB_fnc_core_redeploy}, nil, -801, false, true, "", "_this == vehicle _this", 10]
+            [localize "STR_ACTION_REDEPLOY", {["KPLIB_respawn_requested", _this] call CBA_fnc_localEvent}, nil, -801, false, true, "", "_this == vehicle _this", 10]
         ] remoteExecCall ["addAction", 0, true];
     };
 };

Missionframework/modules/01_core/fnc/fn_core_initModule.sqf

@@ -4,14 +4,13 @@
     File: fn_core_initModule.sqf
     Author: KP Liberation Dev Team - https://github.com/KillahPotatoes
     Date: 2017-08-31
-    Last Update: 2018-08-31
+    Last Update: 2018-09-11
     License: GNU General Public License v3.0 - https://www.gnu.org/licenses/gpl-3.0.html
 
     Description:
     This module provides the very basic functions and mechanics for the general gameplay of the mission.
     Tasks of this module are:
         * Provide basic functions.
-        * Manage respawn / redeploy dialog.
         * Show respawn, spawn and intro cinematics.
         * Spawning of Little Birds and Rubber Dinghies.
         * Spawning and respawn handling of Potato 01.