diff --git a/Content.Server/StationEvents/Components/MeteorSchedulerComponent.cs b/Content.Server/StationEvents/Components/MeteorSchedulerComponent.cs index e71a284a89..a56592831e 100644 --- a/Content.Server/StationEvents/Components/MeteorSchedulerComponent.cs +++ b/Content.Server/StationEvents/Components/MeteorSchedulerComponent.cs @@ -25,11 +25,11 @@ public sealed partial class MeteorSchedulerComponent : Component /// The minimum time between swarms /// [DataField] - public TimeSpan MinSwarmDelay = TimeSpan.FromMinutes(7.5f); + public TimeSpan MinSwarmDelay = TimeSpan.FromMinutes(20.0f); /// /// The maximum time between swarms /// [DataField] - public TimeSpan MaxSwarmDelay = TimeSpan.FromMinutes(12.5f); + public TimeSpan MaxSwarmDelay = TimeSpan.FromMinutes(25.0f); } diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/meteors.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/meteors.yml index 3468cade76..f526138e91 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/meteors.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/meteors.yml @@ -69,7 +69,7 @@ thresholds: - trigger: !type:DamageTrigger - damage: 100 + damage: 25 behaviors: - !type:DoActsBehavior acts: [ "Destruction" ] @@ -104,7 +104,7 @@ thresholds: - trigger: !type:DamageTrigger - damage: 1250 + damage: 300 behaviors: - !type:DoActsBehavior acts: [ "Destruction" ] @@ -139,7 +139,7 @@ thresholds: - trigger: !type:DamageTrigger - damage: 1750 + damage: 435 behaviors: - !type:DoActsBehavior acts: [ "Destruction" ] @@ -161,7 +161,7 @@ thresholds: - trigger: !type:DamageTrigger - damage: 2500 + damage: 625 behaviors: - !type:DoActsBehavior acts: [ "Destruction" ] @@ -192,7 +192,7 @@ thresholds: - trigger: !type:DamageTrigger - damage: 3000 + damage: 750 behaviors: - !type:DoActsBehavior acts: [ "Destruction" ] diff --git a/Resources/Prototypes/GameRules/meteorswarms.yml b/Resources/Prototypes/GameRules/meteorswarms.yml index 17ed82f0cb..e6cd4fd26d 100644 --- a/Resources/Prototypes/GameRules/meteorswarms.yml +++ b/Resources/Prototypes/GameRules/meteorswarms.yml @@ -10,9 +10,9 @@ - type: weightedRandomEntity id: DefaultConfig weights: - GameRuleSpaceDustMinor: 44 - GameRuleSpaceDustMajor: 22 - GameRuleMeteorSwarmSmall: 18 + GameRuleSpaceDustMinor: 50 + GameRuleSpaceDustMajor: 20 + GameRuleMeteorSwarmSmall: 15 GameRuleMeteorSwarmMedium: 10 GameRuleMeteorSwarmLarge: 5 GameRuleUristSwarm: 0.05 @@ -37,7 +37,7 @@ meteors: MeteorSpaceDust: 1 waves: - min: 2 + min: 1 max: 3 meteorsPerWave: min: 3 @@ -58,8 +58,8 @@ min: 2 max: 3 meteorsPerWave: - min: 8 - max: 12 + min: 6 + max: 10 - type: entity parent: GameRuleMeteorSwarm @@ -78,8 +78,8 @@ components: - type: MeteorSwarm meteors: - MeteorSmall: 3 - MeteorMedium: 6 + MeteorSmall: 1 + MeteorMedium: 4 MeteorLarge: 1 - type: entity @@ -89,9 +89,9 @@ components: - type: MeteorSwarm meteors: - MeteorSmall: 2 - MeteorMedium: 4 - MeteorLarge: 4 + MeteorSmall: 1 + MeteorMedium: 2 + MeteorLarge: 3 - type: entity parent: GameRuleMeteorSwarm @@ -104,8 +104,8 @@ meteors: MeteorUrist: 1 waves: - min: 3 + min: 1 max: 3 meteorsPerWave: - min: 10 - max: 10 + min: 6 + max: 8