Merge pull request #1 from Kexanone/dev

Hotfix 0.3.1
Kexanone · Jan 20, 2023 · a226c9f · a226c9f
2 parents 65a5ba4 + e286786
commit a226c9f
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 14 deletions.
diff --git a/components/garbageCollector/config.hpp b/components/garbageCollector/config.hpp
@@ -1,12 +1,12 @@
 // Corpse management
 corpseManagerMode = 1;
-corpseLimit = 50;
+corpseLimit = 24;
 corpseRemovalMinTime = 300;
-corpseRemovalMaxTime = 1800;
+corpseRemovalMaxTime = 900;
 
 // Wreck management
 wreckManagerMode = 3;
-wreckLimit = 10;
-wreckRemovalMinTime = 30;
-wreckRemovalMaxTime = 60;
+wreckLimit = 8;
+wreckRemovalMinTime = 300;
+wreckRemovalMaxTime = 360;
 minPlayerDistance = 50;
diff --git a/components/playerMarker/functions/fn_playerMarker_preInit.sqf b/components/playerMarker/functions/fn_playerMarker_preInit.sqf
@@ -4,17 +4,18 @@ if ((["PlayerMarker", 1] call BIS_fnc_getParamValue) isEqualTo 0) exitWith {};
 
 // Client side pre init
 if (hasInterface) then {
-    TLD_playerMarker_players = [];
+    TLD_playerMarker_prevIds = [];
     [
         {
-            private _players = allPlayers;
+            private _playerMarkerIds = [];
             {
                 private _markerId = getPlayerUID _x;
                 private _playerName = name _x;
                 private _vehicle = vehicle _x;
 
                 // If player on foot or driver
                 if (_x isEqualTo effectiveCommander _vehicle) then {
+                    _playerMarkerIds pushBack _markerId;
                     if (markerShape _markerId isEqualTo "") then {
                         createMarkerLocal [_markerId, _vehicle];
                     };
@@ -54,13 +55,13 @@ if (hasInterface) then {
                         _markerId setMarkerColorLocal "colorBLUFOR";
                     };
                 };
-            } forEach _players;
+            } forEach allPlayers;
 
             // Remove players that left
             {
-                deleteMarkerLocal (getPlayerUID _x);
-            } forEach (TLD_playerMarker_players - _players);
-            TLD_playerMarker_players = _players;
+                deleteMarkerLocal _x;
+            } forEach (TLD_playerMarker_prevIds - _playerMarkerIds);
+            TLD_playerMarker_prevIds = _playerMarkerIds;
         },
         TLD_PLAYER_MARKER_HANDLER_TIMEOUT
     ] call TLD_fnc_perFrameHandler_add;
@@ -69,7 +70,7 @@ if (hasInterface) then {
         {
             {
                 (getPlayerUID _x) setMarkerPosLocal (vehicle _x);
-            } forEach TLD_playerMarker_players;
+            } forEach allPlayers;
         }
     ] call TLD_fnc_perFrameHandler_add;
 };
diff --git a/components/revive/config.hpp b/components/revive/config.hpp
@@ -2,7 +2,7 @@ reviveMode = 1; // Enable revive
 reviveUnconsciousStateMode = 0; // Basic revive mode
 reviveRequiredTrait = 1; // Require medic for revive
 reviveRequiredItems = 1; // Medkit required for revive
-reviveRequiredItemsFakConsumed = 0; // No items consumed for revive
+reviveRequiredItemsFakConsumed = 1; // FAK consumed for revive
 reviveMedicSpeedMultiplier = 1; // No revive speed-up for medics
 reviveForceRespawnDelay = 3;
 reviveBleedOutDelay = 300; // Dies after 5 minutes
diff --git a/components/skill/params.hpp b/components/skill/params.hpp
@@ -48,5 +48,5 @@ class Skill
         "95 %",
         "100 %"
     };
-    default = 75;
+    default = 50;
 };
-Original file line number
+Diff line change
@@ Expand Up / @@ -48,5 +48,5 @@ class Skill @@
             "95 %",
             "100 %"
         };
-        default = 75;
+        default = 50;
     };