diff --git a/Content.Server/StationEvents/Components/MeteorSwarmComponent.cs b/Content.Server/StationEvents/Components/MeteorSwarmComponent.cs index cca4465154..088bd03d43 100644 --- a/Content.Server/StationEvents/Components/MeteorSwarmComponent.cs +++ b/Content.Server/StationEvents/Components/MeteorSwarmComponent.cs @@ -48,11 +48,11 @@ public sealed partial class MeteorSwarmComponent : Component public Dictionary Meteors = new(); [DataField] - public MinMax Waves = new(3, 3); + public MinMax Waves = new(2, 4); [DataField] public MinMax MeteorsPerWave = new(3, 4); [DataField] - public MinMax WaveCooldown = new (10, 60); + public MinMax WaveCooldown = new (30, 60); } diff --git a/Content.Shared/CCVar/CCVars.cs b/Content.Shared/CCVar/CCVars.cs index c8660fa445..974b35dfd3 100644 --- a/Content.Shared/CCVar/CCVars.cs +++ b/Content.Shared/CCVar/CCVars.cs @@ -125,13 +125,13 @@ namespace Content.Shared.CCVar /// Minimum time between meteor swarms in minutes. /// public static readonly CVarDef - MeteorSwarmMinTime = CVarDef.Create("events.meteor_swarm_min_time", 12.5f, CVar.ARCHIVE | CVar.SERVERONLY); + MeteorSwarmMinTime = CVarDef.Create("events.meteor_swarm_min_time", 20f, CVar.ARCHIVE | CVar.SERVERONLY); /// /// Maximum time between meteor swarms in minutes. /// public static readonly CVarDef - MeteorSwarmMaxTime = CVarDef.Create("events.meteor_swarm_max_time", 17.5f, CVar.ARCHIVE | CVar.SERVERONLY); + MeteorSwarmMaxTime = CVarDef.Create("events.meteor_swarm_max_time", 30f, CVar.ARCHIVE | CVar.SERVERONLY); /* * Game diff --git a/Resources/Prototypes/game_presets.yml b/Resources/Prototypes/game_presets.yml index 3a41de0e53..0a48d7faae 100644 --- a/Resources/Prototypes/game_presets.yml +++ b/Resources/Prototypes/game_presets.yml @@ -8,6 +8,7 @@ rules: - RampingStationEventScheduler - BasicRoundstartVariation + - GameRuleMeteorScheduler - type: gamePreset id: AllAtOnce @@ -24,6 +25,7 @@ - Cult - Wizard - BasicRoundstartVariation + - GameRuleMeteorScheduler - type: gamePreset id: Extended @@ -175,6 +177,7 @@ - Pirates - BasicStationEventScheduler - BasicRoundstartVariation + - GameRuleMeteorScheduler #WD EDIT START - type: gamePreset @@ -190,6 +193,7 @@ - SubGamemodesRule - BasicStationEventScheduler - BasicRoundstartVariation + - GameRuleMeteorScheduler - type: gamePreset id: Changeling @@ -204,6 +208,7 @@ - SubGamemodesRule - BasicStationEventScheduler - BasicRoundstartVariation + - GameRuleMeteorScheduler - type: gamePreset id: Wizard @@ -219,4 +224,5 @@ - SubGamemodesRule - BasicStationEventScheduler - BasicRoundstartVariation + - GameRuleMeteorScheduler #WD EDIT END