-
Notifications
You must be signed in to change notification settings - Fork 48
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #212 from Mnemotechnician/floof-upstream-merge-202…
…4-09-26 Upstream Merge 2024-09-26
- Loading branch information
Showing
147 changed files
with
3,673 additions
and
915 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -57,4 +57,3 @@ public async Task ChangeMachine() | |
| AssertPrototype("Autolathe"); | ||
| } | ||
| } | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
164 changes: 164 additions & 0 deletions
164
Content.Server/Abilities/Psionics/Abilities/HealOtherPowerSystem.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,164 @@ | ||
| using Robust.Shared.Player; | ||
| using Content.Server.DoAfter; | ||
| using Content.Shared.Abilities.Psionics; | ||
| using Content.Shared.Damage; | ||
| using Content.Shared.DoAfter; | ||
| using Content.Shared.Popups; | ||
| using Content.Shared.Psionics.Events; | ||
| using Content.Shared.Examine; | ||
| using static Content.Shared.Examine.ExamineSystemShared; | ||
| using Robust.Shared.Timing; | ||
| using Content.Shared.Actions.Events; | ||
| using Robust.Server.Audio; | ||
| using Content.Server.Atmos.Rotting; | ||
| using Content.Shared.Mobs.Systems; | ||
| using Content.Shared.Mobs; | ||
| using Content.Shared.Mobs.Components; | ||
| using Content.Shared.Psionics.Glimmer; | ||
|
|
||
| namespace Content.Server.Abilities.Psionics; | ||
|
|
||
| public sealed class RevivifyPowerSystem : EntitySystem | ||
| { | ||
| [Dependency] private readonly AudioSystem _audioSystem = default!; | ||
| [Dependency] private readonly DoAfterSystem _doAfterSystem = default!; | ||
| [Dependency] private readonly SharedPopupSystem _popupSystem = default!; | ||
| [Dependency] private readonly SharedPsionicAbilitiesSystem _psionics = default!; | ||
| [Dependency] private readonly IGameTiming _gameTiming = default!; | ||
| [Dependency] private readonly ExamineSystemShared _examine = default!; | ||
| [Dependency] private readonly DamageableSystem _damageable = default!; | ||
| [Dependency] private readonly RottingSystem _rotting = default!; | ||
| [Dependency] private readonly MobThresholdSystem _mobThreshold = default!; | ||
| [Dependency] private readonly MobStateSystem _mobState = default!; | ||
| [Dependency] private readonly GlimmerSystem _glimmer = default!; | ||
|
|
||
|
|
||
| public override void Initialize() | ||
| { | ||
| base.Initialize(); | ||
|
|
||
| SubscribeLocalEvent<PsionicComponent, PsionicHealOtherPowerActionEvent>(OnPowerUsed); | ||
| SubscribeLocalEvent<PsionicComponent, DispelledEvent>(OnDispelled); | ||
| SubscribeLocalEvent<PsionicComponent, PsionicHealOtherDoAfterEvent>(OnDoAfter); | ||
| } | ||
|
|
||
|
|
||
| private void OnPowerUsed(EntityUid uid, PsionicComponent component, PsionicHealOtherPowerActionEvent args) | ||
| { | ||
| if (component.DoAfter is not null) | ||
| return; | ||
|
|
||
| if (!args.Immediate) | ||
| AttemptDoAfter(uid, component, args); | ||
| else ActivatePower(uid, component, args); | ||
|
|
||
| if (args.PopupText is not null | ||
| && _glimmer.Glimmer > args.GlimmerPopupThreshold * component.CurrentDampening) | ||
| _popupSystem.PopupEntity(Loc.GetString(args.PopupText, ("entity", uid)), uid, | ||
| Filter.Pvs(uid).RemoveWhereAttachedEntity(entity => !_examine.InRangeUnOccluded(uid, entity, ExamineRange, null)), | ||
| true, | ||
| args.PopupType); | ||
|
|
||
| if (args.PlaySound | ||
| && _glimmer.Glimmer > args.GlimmerSoundThreshold * component.CurrentDampening) | ||
| _audioSystem.PlayPvs(args.SoundUse, uid, args.AudioParams); | ||
|
|
||
| // Sanitize the Glimmer inputs because otherwise the game will crash if someone makes MaxGlimmer lower than MinGlimmer. | ||
| var minGlimmer = (int) Math.Round(MathF.MinMagnitude(args.MinGlimmer, args.MaxGlimmer) | ||
| + component.CurrentAmplification - component.CurrentDampening); | ||
| var maxGlimmer = (int) Math.Round(MathF.MaxMagnitude(args.MinGlimmer, args.MaxGlimmer) | ||
| + component.CurrentAmplification - component.CurrentDampening); | ||
|
|
||
| _psionics.LogPowerUsed(uid, args.PowerName, minGlimmer, maxGlimmer); | ||
| args.Handled = true; | ||
| } | ||
|
|
||
| private void AttemptDoAfter(EntityUid uid, PsionicComponent component, PsionicHealOtherPowerActionEvent args) | ||
| { | ||
| var ev = new PsionicHealOtherDoAfterEvent(_gameTiming.CurTime); | ||
| if (args.HealingAmount is not null) | ||
| ev.HealingAmount = args.HealingAmount; | ||
| if (args.RotReduction is not null) | ||
| ev.RotReduction = args.RotReduction.Value; | ||
| ev.DoRevive = args.DoRevive; | ||
| var doAfterArgs = new DoAfterArgs(EntityManager, uid, args.UseDelay, ev, uid, target: args.Target) | ||
| { | ||
| BreakOnUserMove = args.BreakOnUserMove, | ||
| BreakOnTargetMove = args.BreakOnTargetMove, | ||
| Hidden = _glimmer.Glimmer > args.GlimmerDoAfterVisibilityThreshold * component.CurrentDampening, | ||
| }; | ||
|
|
||
| if (!_doAfterSystem.TryStartDoAfter(doAfterArgs, out var doAfterId)) | ||
| return; | ||
|
|
||
| component.DoAfter = doAfterId; | ||
| } | ||
|
|
||
| private void OnDispelled(EntityUid uid, PsionicComponent component, DispelledEvent args) | ||
| { | ||
| if (component.DoAfter is null) | ||
| return; | ||
|
|
||
| _doAfterSystem.Cancel(component.DoAfter); | ||
| component.DoAfter = null; | ||
| args.Handled = true; | ||
| } | ||
|
|
||
| private void OnDoAfter(EntityUid uid, PsionicComponent component, PsionicHealOtherDoAfterEvent args) | ||
| { | ||
| // It's entirely possible for the caster to stop being Psionic(due to mindbreaking) mid cast | ||
| if (component is null | ||
| || args.Cancelled) | ||
| return; | ||
| component.DoAfter = null; | ||
|
|
||
| // The target can also cease existing mid-cast | ||
| if (args.Target is null) | ||
| return; | ||
|
|
||
| if (args.RotReduction is not null) | ||
| _rotting.ReduceAccumulator(args.Target.Value, TimeSpan.FromSeconds(args.RotReduction.Value * component.CurrentAmplification)); | ||
|
|
||
| if (!TryComp<DamageableComponent>(args.Target.Value, out var damageableComponent)) | ||
| return; | ||
|
|
||
| if (args.HealingAmount is not null) | ||
| _damageable.TryChangeDamage(args.Target.Value, args.HealingAmount * component.CurrentAmplification, true, false, damageableComponent, uid); | ||
|
|
||
| if (!args.DoRevive | ||
| || _rotting.IsRotten(args.Target.Value) | ||
| || !TryComp<MobStateComponent>(args.Target.Value, out var mob) | ||
| || !_mobState.IsDead(args.Target.Value, mob) | ||
| || !_mobThreshold.TryGetThresholdForState(args.Target.Value, MobState.Dead, out var threshold) | ||
| || damageableComponent.TotalDamage > threshold) | ||
| return; | ||
|
|
||
| _mobState.ChangeMobState(args.Target.Value, MobState.Critical, mob, uid); | ||
| } | ||
|
|
||
| // This would be the same thing as OnDoAfter, except that here the target isn't nullable, so I have to reuse code with different arguments. | ||
| private void ActivatePower(EntityUid uid, PsionicComponent component, PsionicHealOtherPowerActionEvent args) | ||
| { | ||
| if (component is null) | ||
| return; | ||
|
|
||
| if (args.RotReduction is not null) | ||
| _rotting.ReduceAccumulator(args.Target, TimeSpan.FromSeconds(args.RotReduction.Value * component.CurrentAmplification)); | ||
|
|
||
| if (!TryComp<DamageableComponent>(args.Target, out var damageableComponent)) | ||
| return; | ||
|
|
||
| if (args.HealingAmount is not null) | ||
| _damageable.TryChangeDamage(args.Target, args.HealingAmount * component.CurrentAmplification, true, false, damageableComponent, uid); | ||
|
|
||
| if (!args.DoRevive | ||
| || _rotting.IsRotten(args.Target) | ||
| || !TryComp<MobStateComponent>(args.Target, out var mob) | ||
| || !_mobState.IsDead(args.Target, mob) | ||
| || !_mobThreshold.TryGetThresholdForState(args.Target, MobState.Dead, out var threshold) | ||
| || damageableComponent.TotalDamage > threshold) | ||
| return; | ||
|
|
||
| _mobState.ChangeMobState(args.Target, MobState.Critical, mob, uid); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.