From 5cbf935cf0943779190708779a382116fe8c8fcf Mon Sep 17 00:00:00 2001 From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Date: Wed, 22 Nov 2023 15:36:38 +1100 Subject: [PATCH] Wrap gateway generator in cvar for dev (#21758) --- .../Gateway/Systems/GatewayGeneratorSystem.cs | 12 ++++++++++-- Content.Server/Parallax/BiomeSystem.cs | 1 - Content.Shared/CCVar/CCVars.cs | 7 +++++++ Resources/ConfigPresets/Build/development.toml | 3 +++ 4 files changed, 20 insertions(+), 3 deletions(-) diff --git a/Content.Server/Gateway/Systems/GatewayGeneratorSystem.cs b/Content.Server/Gateway/Systems/GatewayGeneratorSystem.cs index 2350e62ebf..184c1cf313 100644 --- a/Content.Server/Gateway/Systems/GatewayGeneratorSystem.cs +++ b/Content.Server/Gateway/Systems/GatewayGeneratorSystem.cs @@ -3,12 +3,14 @@ using System.Numerics; using Content.Server.Gateway.Components; using Content.Server.Parallax; using Content.Server.Procedural; +using Content.Shared.CCVar; using Content.Shared.Dataset; using Content.Shared.Movement.Components; using Content.Shared.Parallax.Biomes; using Content.Shared.Physics; using Content.Shared.Procedural; using Content.Shared.Salvage; +using Robust.Shared.Configuration; using Robust.Shared.Map; using Robust.Shared.Map.Components; using Robust.Shared.Physics.Collision.Shapes; @@ -26,6 +28,7 @@ namespace Content.Server.Gateway.Systems; /// public sealed class GatewayGeneratorSystem : EntitySystem { + [Dependency] private readonly IConfigurationManager _cfgManager = default!; [Dependency] private readonly IGameTiming _timing = default!; [Dependency] private readonly IMapManager _mapManager = default!; [Dependency] private readonly IPrototypeManager _protoManager = default!; @@ -87,6 +90,9 @@ public sealed class GatewayGeneratorSystem : EntitySystem private void OnGeneratorMapInit(EntityUid uid, GatewayGeneratorComponent generator, MapInitEvent args) { + if (!_cfgManager.GetCVar(CCVars.GatewayGeneratorEnabled)) + return; + generator.NextUnlock = TimeSpan.FromMinutes(5); for (var i = 0; i < 3; i++) @@ -109,6 +115,10 @@ public sealed class GatewayGeneratorSystem : EntitySystem var random = new Random(seed); var mapId = _mapManager.CreateMap(); var mapUid = _mapManager.GetMapEntityId(mapId); + + var gatewayName = SharedSalvageSystem.GetFTLName(_protoManager.Index(PlanetNames), seed); + _metadata.SetEntityName(mapUid, gatewayName); + var origin = new Vector2i(random.Next(-MaxOffset, MaxOffset), random.Next(-MaxOffset, MaxOffset)); var restriction = AddComp(mapUid); restriction.Origin = origin; @@ -127,8 +137,6 @@ public sealed class GatewayGeneratorSystem : EntitySystem // Clear area nearby as a sort of landing pad. _maps.SetTiles(mapUid, grid, tiles); - var gatewayName = SharedSalvageSystem.GetFTLName(_protoManager.Index(PlanetNames), seed); - _metadata.SetEntityName(mapUid, gatewayName); var originCoords = new EntityCoordinates(mapUid, origin); diff --git a/Content.Server/Parallax/BiomeSystem.cs b/Content.Server/Parallax/BiomeSystem.cs index 9a2357e708..8f6e0730b9 100644 --- a/Content.Server/Parallax/BiomeSystem.cs +++ b/Content.Server/Parallax/BiomeSystem.cs @@ -38,7 +38,6 @@ public sealed partial class BiomeSystem : SharedBiomeSystem [Dependency] private readonly IParallelManager _parallel = default!; [Dependency] private readonly IPlayerManager _playerManager = default!; [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly ISerializationManager _serManager = default!; [Dependency] private readonly AtmosphereSystem _atmos = default!; [Dependency] private readonly DecalSystem _decals = default!; [Dependency] private readonly SharedMapSystem _mapSystem = default!; diff --git a/Content.Shared/CCVar/CCVars.cs b/Content.Shared/CCVar/CCVars.cs index cc71c6191f..5918729147 100644 --- a/Content.Shared/CCVar/CCVars.cs +++ b/Content.Shared/CCVar/CCVars.cs @@ -1812,5 +1812,12 @@ namespace Content.Shared.CCVar /// public static readonly CVarDef ReplayAutoRecordTempDir = CVarDef.Create("replay.auto_record_temp_dir", "", CVar.SERVERONLY); + + /* + * Miscellaneous + */ + + public static readonly CVarDef GatewayGeneratorEnabled = + CVarDef.Create("gateway.generator_enabled", true); } } diff --git a/Resources/ConfigPresets/Build/development.toml b/Resources/ConfigPresets/Build/development.toml index 82833fe2d5..da3a413026 100644 --- a/Resources/ConfigPresets/Build/development.toml +++ b/Resources/ConfigPresets/Build/development.toml @@ -5,6 +5,9 @@ lobbyenabled = false map = "Dev" role_timers = false +[gateway] +generator_enabled = false + [physics] # Makes mapping annoying grid_splitting = false -- 2.51.2