Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Don't double-dip survival intensity scaling (#25570)

Browse Source
This commit is contained in:
Kara
2024-02-25 15:04:51 -07:00
committed by GitHub
parent 4e16034240
commit de36ebe2df
9 changed files with 12 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Content.Server/StationEvents/Events/MeteorSwarmRule.cs
View File

@@ -17,8 +17,7 @@ namespace Content.Server.StationEvents.Events
{
base.Started(uid, component, gameRule, args);
var mod = Math.Sqrt(GetSeverityModifier());
component.WaveCounter = (int) (RobustRandom.Next(component.MinimumWaves, component.MaximumWaves) * mod);
component.WaveCounter = RobustRandom.Next(component.MinimumWaves, component.MaximumWaves);
}
protected override void ActiveTick(EntityUid uid, MeteorSwarmRuleComponent component, GameRuleComponent gameRule, float frameTime)
@@ -29,8 +28,6 @@ namespace Content.Server.StationEvents.Events
return;
}
var mod = GetSeverityModifier();
component.Cooldown -= frameTime;
if (component.Cooldown > 0f)
@@ -38,7 +35,7 @@ namespace Content.Server.StationEvents.Events
component.WaveCounter--;
component.Cooldown += (component.MaximumCooldown - component.MinimumCooldown) * RobustRandom.NextFloat() / mod + component.MinimumCooldown;
component.Cooldown += (component.MaximumCooldown - component.MinimumCooldown) * RobustRandom.NextFloat() + component.MinimumCooldown;
Box2? playableArea = null;
var mapId = GameTicker.DefaultMap;