update fix first sign

tbox1911 · Oct 24, 2024 · d75e1ca · d75e1ca
1 parent 7049d76
commit d75e1ca
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 13 deletions.
diff --git a/core.liberation/scripts/client/init_client.sqf b/core.liberation/scripts/client/init_client.sqf
@@ -224,12 +224,12 @@ addMissionEventHandler ["Draw3D",{
 	private _near_sign = nearestObjects [player, [FOB_sign], 5];
 	if (count (_near_sign) > 0 && (player distance2D lhd > GRLIB_fob_range)) then {
 		private _sign = _near_sign select 0;
-		private _gid = _sign getVariable ["GRLIB_vehicle_owner", "public"];
+		private _gid = _sign getVariable ["GRLIB_vehicle_owner", ""];
 		private _type = "FOB";
 		private _near_outpost = ([_sign, "OUTPOST", 30] call F_check_near);
 		if (_near_outpost) then { _type = "Outpost" };
 		private _name = "- LRX";
-		if (_gid != "public") then {
+		if (_gid != "") then {
 			_name = GRLIB_player_scores select { _x select 0 == _gid } select 0 select 5;
 		};
 		drawIcon3D ["", [1,1,1,1], (ASLToAGL getPosASL _sign) vectorAdd [0, 0, 2.5], 0, 0, 0, format ["- %1 %2 -", _type, _name], 2, 0.07, "RobotoCondensed", "center"];

diff --git a/core.liberation/scripts/client/spawn/redeploy_manager.sqf b/core.liberation/scripts/client/spawn/redeploy_manager.sqf
@@ -189,10 +189,16 @@ if (deploy == 1) then {
 	cinematic_camera_started = false;
 };
 
+sleep 2;
+if (player distance2D (markerPos GRLIB_respawn_marker) < GRLIB_capture_size) then {
+	_spawn_str = _basenamestr;
+	player setPosATL ((getPosATL lhd) vectorAdd [floor(random 5), floor(random 5), 1]);
+};
+
 if (alive player && deploy == 1) then {
 	if (isNil "_spawn_str") then {_spawn_str = "Somewhere."};
 	[_spawn_str, _mobile] spawn spawn_camera;
 };
 
-sleep 10;
+sleep 8;
 player setVariable ["GRLIB_action_inuse", false, true];
diff --git a/core.liberation/scripts/server/base/fob_init.sqf b/core.liberation/scripts/server/base/fob_init.sqf
@@ -47,9 +47,7 @@ _sign setPosASL _sign_pos;
 _sign enableSimulationGlobal false;
 _sign setObjectTextureGlobal [0, getMissionPath "res\splash_libe2.paa"];
 _sign setVariable ["GRLIB_fob_type", _fob_class, true];
-if (count GRLIB_all_fobs == 0) then {
-	_sign setVariable ["GRLIB_vehicle_owner", "public", true];
-} else {
+if (count GRLIB_all_fobs > 0) then {
 	_sign setVariable ["GRLIB_vehicle_owner", _owner, true];
 };
 

diff --git a/core.liberation/scripts/server/game/save_game_mp.sqf b/core.liberation/scripts/server/game/save_game_mp.sqf
@@ -91,16 +91,13 @@ if ( GRLIB_endgame >= 1 || GRLIB_global_stop == 1 ) then {
 			if (side group _x != GRLIB_side_enemy) then {
 				_owner = _x getVariable ["GRLIB_vehicle_owner", ""];
 				_hascrew = _x getVariable ["GRLIB_vehicle_manned", false];
-				if (_owner == "") then {
-					buildings_to_save pushback [ _nextclass, _savedpos, _nextdir ];
-				};
-				if (_nextclass == FOB_sign) then {
+				if (_nextclass == FOB_sign) exitWith {
 					_hascrew = _x getVariable ["GRLIB_fob_type", FOB_typename];
-				};
-				if (_owner == "public") then {
 					buildings_to_save pushback [ _nextclass, _savedpos, _nextdir, _hascrew, _owner ];
 				};
-
+				if (_owner == "") exitWith {
+					buildings_to_save pushback [ _nextclass, _savedpos, _nextdir ];
+				};
 				if (_owner in _keep_score_id) then {
 					if (_nextclass in GRLIB_vehicles_light) then {
 						private _default = true;

diff --git a/core.liberation/whitelist.sqf b/core.liberation/whitelist.sqf
@@ -13,6 +13,8 @@ GRLIB_whitelisted_moderators = [
 
 // Forbiden player names.
 GRLIB_blacklisted_names = [
+    "server",
+    "public",
     "admin",
     "administrator",
     "administrateur",