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

Remove events from survival (#289)

Browse Source 
* Survival

* Remove events
This commit is contained in:
Aviu00
2023-08-10 15:37:55 +03:00
committed by Aviu00
parent 8b3361a52a
commit bcfe04ebee
3 changed files with 32 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -13,9 +13,16 @@ public sealed class CargoGiftsRule : StationEventSystem<CargoGiftsRuleComponent>
[Dependency] private readonly CargoSystem _cargoSystem = default!;
[Dependency] private readonly IPrototypeManager _prototypeManager = default!;
[Dependency] private readonly GameTicker _ticker = default!;
[Dependency] private readonly RampingStationEventSchedulerSystem _rampingEventSystem = default!; // WD
protected override void Added(EntityUid uid, CargoGiftsRuleComponent component, GameRuleComponent gameRule, GameRuleAddedEvent args)
{
if (_rampingEventSystem.CheckRampingEventRule()) // WD START
{
ForceEndSelf(uid, gameRule);
return;
} // WD END
base.Added(uid, component, gameRule, args);
var str = Loc.GetString(component.Announce,

18
Content.Server/StationEvents/Events/VentClogRule.cs
View File

@@ -15,11 +15,18 @@ namespace Content.Server.StationEvents.Events;
public sealed class VentClogRule : StationEventSystem<VentClogRuleComponent>
{
[Dependency] private readonly SmokeSystem _smoke = default!;
[Dependency] private readonly RampingStationEventSchedulerSystem _rampingEventSystem = default!; // WD
protected override void Started(EntityUid uid, VentClogRuleComponent component, GameRuleComponent gameRule, GameRuleStartedEvent args)
{
base.Started(uid, component, gameRule, args);
if (_rampingEventSystem.CheckRampingEventRule()) // WD START
{
ForceEndSelf(uid, gameRule);
return;
} // WD END
if (!TryGetRandomStation(out var chosenStation))
return;
@@ -56,4 +63,15 @@ public sealed class VentClogRule : StationEventSystem<VentClogRuleComponent>
Audio.PlayPvs(component.Sound, transform.Coordinates);
}
}
protected override void Added(EntityUid uid, VentClogRuleComponent component, GameRuleComponent gameRule, GameRuleAddedEvent args) // WD
{
if (_rampingEventSystem.CheckRampingEventRule()) // WD START
{
ForceEndSelf(uid, gameRule);
return;
} // WD END
base.Added(uid, component, gameRule, args);
}
}

8
Content.Server/StationEvents/RampingStationEventSchedulerSystem.cs
View File

@@ -1,4 +1,5 @@
using Content.Server.GameTicking;
using System.Linq;
using Content.Server.GameTicking;
using Content.Server.GameTicking.Rules;
using Content.Server.GameTicking.Rules.Components;
using Content.Server.StationEvents.Components;
@@ -93,4 +94,9 @@ public sealed class RampingStationEventSchedulerSystem : GameRuleSystem<RampingS
// 4-12 minutes baseline. Will get faster over time as the chaos mod increases.
component.TimeUntilNextEvent = _random.NextFloat(240f / mod, 720f / mod);
}
public bool CheckRampingEventRule() // WD
{
return EntityQuery<RampingStationEventSchedulerComponent>().Any();
}
}