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

prevents revenant harvesting and soul searching from stacking (#10567)

Browse Source 
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
This commit is contained in:
Nemanja
2022-08-14 01:59:26 -04:00
committed by GitHub
parent 572a4f7fb3
commit 71e5f34d84
2 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Content.Server/Revenant/EntitySystems/RevenantSystem.Abilities.cs
View File

@@ -43,6 +43,7 @@ public sealed partial class RevenantSystem : EntitySystem
{
SubscribeLocalEvent<RevenantComponent, InteractNoHandEvent>(OnInteract);
SubscribeLocalEvent<RevenantComponent, SoulSearchDoAfterComplete>(OnSoulSearchComplete);
SubscribeLocalEvent<RevenantComponent, SoulSearchDoAfterCancelled>(OnSoulSearchCancelled);
SubscribeLocalEvent<RevenantComponent, HarvestDoAfterComplete>(OnHarvestComplete);
SubscribeLocalEvent<RevenantComponent, HarvestDoAfterCancelled>(OnHarvestCancelled);
@@ -84,6 +85,9 @@ public sealed partial class RevenantSystem : EntitySystem
private void BeginSoulSearchDoAfter(EntityUid uid, EntityUid target, RevenantComponent revenant)
{
if (revenant.SoulSearchCancelToken != null)
return;
_popup.PopupEntity(Loc.GetString("revenant-soul-searching", ("target", target)), uid, Filter.Entities(uid), PopupType.Medium);
revenant.SoulSearchCancelToken = new();
var searchDoAfter = new DoAfterEventArgs(uid, revenant.SoulSearchDuration, revenant.SoulSearchCancelToken.Token, target)
@@ -91,6 +95,7 @@ public sealed partial class RevenantSystem : EntitySystem
BreakOnUserMove = true,
DistanceThreshold = 2,
UserFinishedEvent = new SoulSearchDoAfterComplete(target),
UserCancelledEvent = new SoulSearchDoAfterCancelled(),
};
_doAfter.DoAfter(searchDoAfter);
}
@@ -99,6 +104,7 @@ public sealed partial class RevenantSystem : EntitySystem
{
if (!TryComp<EssenceComponent>(args.Target, out var essence))
return;
component.SoulSearchCancelToken = null;
essence.SearchComplete = true;
string message;
@@ -117,8 +123,16 @@ public sealed partial class RevenantSystem : EntitySystem
_popup.PopupEntity(Loc.GetString(message, ("target", args.Target)), args.Target, Filter.Entities(uid), PopupType.Medium);
}
private void OnSoulSearchCancelled(EntityUid uid, RevenantComponent component, SoulSearchDoAfterCancelled args)
{
component.SoulSearchCancelToken = null;
}
private void BeginHarvestDoAfter(EntityUid uid, EntityUid target, RevenantComponent revenant, EssenceComponent essence)
{
if (revenant.HarvestCancelToken != null)
return;
if (essence.Harvested)
{
_popup.PopupEntity(Loc.GetString("revenant-soul-harvested"), target, Filter.Entities(uid), PopupType.SmallCaution);
@@ -152,6 +166,7 @@ public sealed partial class RevenantSystem : EntitySystem
private void OnHarvestComplete(EntityUid uid, RevenantComponent component, HarvestDoAfterComplete args)
{
component.HarvestCancelToken = null;
_appearance.SetData(uid, RevenantVisuals.Harvesting, false);
if (!TryComp<EssenceComponent>(args.Target, out var essence))
@@ -184,6 +199,7 @@ public sealed partial class RevenantSystem : EntitySystem
private void OnHarvestCancelled(EntityUid uid, RevenantComponent component, HarvestDoAfterCancelled args)
{
component.HarvestCancelToken = null;
_appearance.SetData(uid, RevenantVisuals.Harvesting, false);
}