tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Dragon rift fixes (#10428)

Browse Source
This commit is contained in:
metalgearsloth
2022-08-08 14:19:53 +10:00
committed by GitHub
parent fcd005cf06
commit 3f5a5d46b6
4 changed files with 30 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
Content.Server/Dragon/DragonSystem.cs
View File

@@ -33,6 +33,13 @@ namespace Content.Server.Dragon
[Dependency] private readonly SharedContainerSystem _containerSystem = default!;
[Dependency] private readonly SharedAudioSystem _audioSystem = default!;
/// <summary>
/// Minimum distance between 2 rifts allowed.
/// </summary>
private const int RiftRange = 15;
private const int RiftsAllowed = 3;
public override void Initialize()
{
base.Initialize();
@@ -75,7 +82,7 @@ namespace Content.Server.Dragon
}
// At max rifts
if (comp.Rifts.Count >= 3)
if (comp.Rifts.Count >= RiftsAllowed)
{
continue;
}
@@ -121,7 +128,7 @@ namespace Content.Server.Dragon
comp.SpawnAccumulator += frameTime;
if (comp.State < DragonRiftState.AlmostFinished && comp.SpawnAccumulator > comp.MaxAccumulator / 2f)
if (comp.State < DragonRiftState.AlmostFinished && comp.Accumulator > comp.MaxAccumulator / 2f)
{
comp.State = DragonRiftState.AlmostFinished;
Dirty(comp);
@@ -197,7 +204,7 @@ namespace Content.Server.Dragon
return;
}
if (component.Rifts.Count >= 3)
if (component.Rifts.Count >= RiftsAllowed)
{
_popupSystem.PopupEntity(Loc.GetString("carp-rift-max"), uid, Filter.Entities(uid));
return;
@@ -218,6 +225,15 @@ namespace Content.Server.Dragon
return;
}
foreach (var (_, riftXform) in EntityQuery<DragonRiftComponent, TransformComponent>(true))
{
if (riftXform.Coordinates.InRange(EntityManager, xform.Coordinates, RiftRange))
{
_popupSystem.PopupEntity(Loc.GetString("carp-rift-proximity", ("proximity", RiftRange)), uid, Filter.Entities(uid));
return;
}
}
var carpUid = Spawn(component.RiftPrototype, xform.MapPosition);
component.Rifts.Add(carpUid);
Comp<DragonRiftComponent>(carpUid).Dragon = uid;
@@ -244,6 +260,13 @@ namespace Content.Server.Dragon
_audioSystem.PlayPvs(component.SoundDeath, uid, component.SoundDeath.Params);
component.DragonStomach.EmptyContainer();
foreach (var rift in component.Rifts)
{
QueueDel(rift);
}
component.Rifts.Clear();
}
}