From 077996ed5bc9a9761b94b490db8519db10da4b9a Mon Sep 17 00:00:00 2001 From: deltanedas <@deltanedas:kde.org> Date: Sun, 22 Sep 2024 14:24:37 +0100 Subject: [PATCH] 2 lines of sec --- .../DeltaV/Chapel/SacraficialAltarSystem.cs | 2 +- .../DeltaV/Chapel/SacraficialAltarSystem.cs | 24 +++++++++---------- .../Chapel/SacraficialAltarComponent.cs | 22 ++++++++--------- .../Chapel/SharedSacraficialAltarSystem.cs | 20 ++++++++-------- .../Locale/en-US/deltav/chapel/altar.ftl | 6 ++--- .../Entities/Structures/Furniture/altar.yml | 4 ++-- .../Nyanotrasen/psionicArtifacts.yml | 4 ++-- .../Guidebook/Epistemics/Altar.xml | 4 ++-- 8 files changed, 43 insertions(+), 43 deletions(-) diff --git a/Content.Client/DeltaV/Chapel/SacraficialAltarSystem.cs b/Content.Client/DeltaV/Chapel/SacraficialAltarSystem.cs index da2b022d875..7b9b3757e32 100644 --- a/Content.Client/DeltaV/Chapel/SacraficialAltarSystem.cs +++ b/Content.Client/DeltaV/Chapel/SacraficialAltarSystem.cs @@ -2,4 +2,4 @@ namespace Content.Client.DeltaV.Chapel; -public sealed class SacraficialAltarSystem : SharedSacraficialAltarSystem; +public sealed class SacrificialAltarSystem : SharedSacrificialAltarSystem; diff --git a/Content.Server/DeltaV/Chapel/SacraficialAltarSystem.cs b/Content.Server/DeltaV/Chapel/SacraficialAltarSystem.cs index fddb3d91bae..a903d4124da 100644 --- a/Content.Server/DeltaV/Chapel/SacraficialAltarSystem.cs +++ b/Content.Server/DeltaV/Chapel/SacraficialAltarSystem.cs @@ -19,7 +19,7 @@ namespace Content.Server.DeltaV.Chapel; -public sealed class SacraficialAltarSystem : SharedSacraficialAltarSystem +public sealed class SacrificialAltarSystem : SharedSacrificialAltarSystem { [Dependency] private readonly EntityTableSystem _entityTable = default!; [Dependency] private readonly GlimmerSystem _glimmer = default!; @@ -35,12 +35,12 @@ public override void Initialize() { base.Initialize(); - SubscribeLocalEvent(OnDoAfter); + SubscribeLocalEvent(OnDoAfter); } - private void OnDoAfter(Entity ent, ref SacraficeDoAfterEvent args) + private void OnDoAfter(Entity ent, ref SacrificeDoAfterEvent args) { - ent.Comp.SacraficeStream = _audio.Stop(ent.Comp.SacraficeStream); + ent.Comp.SacrificeStream = _audio.Stop(ent.Comp.SacrificeStream); ent.Comp.DoAfter = null; var user = args.Args.User; @@ -55,7 +55,7 @@ private void OnDoAfter(Entity ent, ref SacraficeDoAft if (!HasComp(target)) return; - _adminLogger.Add(LogType.Action, LogImpact.Extreme, $"{ToPrettyString(user):player} sacraficed {ToPrettyString(target):target} on {ToPrettyString(ent):altar}"); + _adminLogger.Add(LogType.Action, LogImpact.Extreme, $"{ToPrettyString(user):player} sacrificed {ToPrettyString(target):target} on {ToPrettyString(ent):altar}"); // lower glimmer by a random amount _glimmer.Glimmer -= ent.Comp.GlimmerReduction.Next(_random); @@ -77,12 +77,12 @@ private void OnDoAfter(Entity ent, ref SacraficeDoAft QueueDel(target); } - protected override void AttemptSacrafice(Entity ent, EntityUid user, EntityUid target) + protected override void AttemptSacrifice(Entity ent, EntityUid user, EntityUid target) { if (ent.Comp.DoAfter != null) return; - // can't sacrafice yourself + // can't sacrifice yourself if (user == target) { _popup.PopupEntity(Loc.GetString("altar-failure-reason-self"), ent, user, PopupType.SmallCaution); @@ -104,7 +104,7 @@ protected override void AttemptSacrafice(Entity ent, } // prevent psichecking SSD people... - // notably there is no check in OnDoAfter so you can't alt f4 to survive being sacraficed + // notably there is no check in OnDoAfter so you can't alt f4 to survive being sacrificed if (!HasComp(target) || _mind.GetMind(target) == null) { _popup.PopupEntity(Loc.GetString("altar-failure-reason-target-catatonic", ("target", target)), ent, user, PopupType.SmallCaution); @@ -124,12 +124,12 @@ protected override void AttemptSacrafice(Entity ent, return; } - _popup.PopupEntity(Loc.GetString("altar-sacrafice-popup", ("user", user), ("target", target)), ent, PopupType.LargeCaution); + _popup.PopupEntity(Loc.GetString("altar-sacrifice-popup", ("user", user), ("target", target)), ent, PopupType.LargeCaution); - ent.Comp.SacraficeStream = _audio.PlayPvs(ent.Comp.SacraficeSound, ent)?.Entity; + ent.Comp.SacrificeStream = _audio.PlayPvs(ent.Comp.SacrificeSound, ent)?.Entity; - var ev = new SacraficeDoAfterEvent(); - var args = new DoAfterArgs(EntityManager, user, ent.Comp.SacraficeTime, ev, target: target, eventTarget: ent) + var ev = new SacrificeDoAfterEvent(); + var args = new DoAfterArgs(EntityManager, user, ent.Comp.SacrificeTime, ev, target: target, eventTarget: ent) { BreakOnDamage = true, NeedHand = true diff --git a/Content.Shared/DeltaV/Chapel/SacraficialAltarComponent.cs b/Content.Shared/DeltaV/Chapel/SacraficialAltarComponent.cs index 6125a77632c..54c6ec35618 100644 --- a/Content.Shared/DeltaV/Chapel/SacraficialAltarComponent.cs +++ b/Content.Shared/DeltaV/Chapel/SacraficialAltarComponent.cs @@ -9,29 +9,29 @@ namespace Content.Shared.DeltaV.Chapel; /// -/// Altar that lets you sacrafice psionics to lower glimmer by a large amount. +/// Altar that lets you sacrifice psionics to lower glimmer by a large amount. /// -[RegisterComponent, NetworkedComponent, Access(typeof(SharedSacraficialAltarSystem))] -public sealed partial class SacraficialAltarComponent : Component +[RegisterComponent, NetworkedComponent, Access(typeof(SharedSacrificialAltarSystem))] +public sealed partial class SacrificialAltarComponent : Component { /// - /// DoAfter for an active sacrafice. + /// DoAfter for an active sacrifice. /// [DataField] public DoAfterId? DoAfter; /// - /// How long it takes to sacrafice someone once they die. - /// This is the window to interrupt a sacrafice if you want glimmer to stay high, or need the psionic to be revived. + /// How long it takes to sacrifice someone once they die. + /// This is the window to interrupt a sacrifice if you want glimmer to stay high, or need the psionic to be revived. /// [DataField] - public TimeSpan SacraficeTime = TimeSpan.FromSeconds(8.35); + public TimeSpan SacrificeTime = TimeSpan.FromSeconds(8.35); [DataField] - public SoundSpecifier SacraficeSound = new SoundPathSpecifier("/Audio/DeltaV/Effects/clang2.ogg"); + public SoundSpecifier SacrificeSound = new SoundPathSpecifier("/Audio/DeltaV/Effects/clang2.ogg"); [DataField] - public EntityUid? SacraficeStream; + public EntityUid? SacrificeStream; /// /// Random amount to reduce glimmer by. @@ -40,8 +40,8 @@ public sealed partial class SacraficialAltarComponent : Component public MinMax GlimmerReduction = new(30, 60); [DataField] - public ProtoId RewardPool = "PsionicSacraficeRewards"; + public ProtoId RewardPool = "PsionicSacrificeRewards"; } [Serializable, NetSerializable] -public sealed partial class SacraficeDoAfterEvent : SimpleDoAfterEvent; +public sealed partial class SacrificeDoAfterEvent : SimpleDoAfterEvent; diff --git a/Content.Shared/DeltaV/Chapel/SharedSacraficialAltarSystem.cs b/Content.Shared/DeltaV/Chapel/SharedSacraficialAltarSystem.cs index 04585f3e59e..fe647c7d20c 100644 --- a/Content.Shared/DeltaV/Chapel/SharedSacraficialAltarSystem.cs +++ b/Content.Shared/DeltaV/Chapel/SharedSacraficialAltarSystem.cs @@ -6,7 +6,7 @@ namespace Content.Shared.DeltaV.Chapel; -public abstract class SharedSacraficialAltarSystem : EntitySystem +public abstract class SharedSacrificialAltarSystem : EntitySystem { [Dependency] private readonly SharedBuckleSystem _buckle = default!; [Dependency] protected readonly SharedDoAfterSystem DoAfter = default!; @@ -15,17 +15,17 @@ public override void Initialize() { base.Initialize(); - SubscribeLocalEvent(OnExamined); - SubscribeLocalEvent(OnUnstrapped); - SubscribeLocalEvent>(OnGetVerbs); + SubscribeLocalEvent(OnExamined); + SubscribeLocalEvent(OnUnstrapped); + SubscribeLocalEvent>(OnGetVerbs); } - private void OnExamined(Entity ent, ref ExaminedEvent args) + private void OnExamined(Entity ent, ref ExaminedEvent args) { args.PushMarkup(Loc.GetString("altar-examine")); } - private void OnUnstrapped(Entity ent, ref UnstrappedEvent args) + private void OnUnstrapped(Entity ent, ref UnstrappedEvent args) { if (ent.Comp.DoAfter is {} id) { @@ -34,7 +34,7 @@ private void OnUnstrapped(Entity ent, ref UnstrappedE } } - private void OnGetVerbs(Entity ent, ref GetVerbsEvent args) + private void OnGetVerbs(Entity ent, ref GetVerbsEvent args) { if (!args.CanAccess || !args.CanInteract || ent.Comp.DoAfter != null) return; @@ -48,8 +48,8 @@ private void OnGetVerbs(Entity ent, ref GetVerbsEvent var user = args.User; args.Verbs.Add(new AlternativeVerb() { - Act = () => AttemptSacrafice(ent, user, target), - Text = Loc.GetString("altar-sacrafice-verb"), + Act = () => AttemptSacrifice(ent, user, target), + Text = Loc.GetString("altar-sacrifice-verb"), Priority = 2 }); } @@ -64,7 +64,7 @@ private void OnGetVerbs(Entity ent, ref GetVerbsEvent return null; } - protected virtual void AttemptSacrafice(Entity ent, EntityUid user, EntityUid target) + protected virtual void AttemptSacrifice(Entity ent, EntityUid user, EntityUid target) { } } diff --git a/Resources/Locale/en-US/deltav/chapel/altar.ftl b/Resources/Locale/en-US/deltav/chapel/altar.ftl index ed1d6b7fee1..ed031d638ac 100644 --- a/Resources/Locale/en-US/deltav/chapel/altar.ftl +++ b/Resources/Locale/en-US/deltav/chapel/altar.ftl @@ -1,5 +1,5 @@ -altar-examine = [color=purple]This altar can be used to sacrafice Psionics.[/color] -altar-sacrafice-verb = Sacrafice +altar-examine = [color=purple]This altar can be used to sacrifice Psionics.[/color] +altar-sacrifice-verb = Sacrifice altar-failure-reason-self = You can't sacrifice yourself! altar-failure-reason-user = You are not psionic or clerically trained! @@ -8,4 +8,4 @@ altar-failure-reason-target = {CAPITALIZE(THE($target))} {CONJUGATE-BE($target)} altar-failure-reason-target-humanoid = {CAPITALIZE(THE($target))} {CONJUGATE-BE($target)} not a humanoid! altar-failure-reason-target-catatonic = {CAPITALIZE(THE($target))} {CONJUGATE-BE($target)} braindead! -altar-sacrafice-popup = {$user} starts to sacrafice {$target}! +altar-sacrifice-popup = {$user} starts to sacrifice {$target}! diff --git a/Resources/Prototypes/Entities/Structures/Furniture/altar.yml b/Resources/Prototypes/Entities/Structures/Furniture/altar.yml index 7c6509ebc5c..7f21707670d 100644 --- a/Resources/Prototypes/Entities/Structures/Furniture/altar.yml +++ b/Resources/Prototypes/Entities/Structures/Furniture/altar.yml @@ -27,8 +27,8 @@ snapCardinals: true #- type: Climbable # DeltaV: remove climbable since it conflicts with strap - type: Clickable - # Begin DeltaV additions: Sacraficing psionics - - type: SacraficialAltar + # Begin DeltaV additions: Sacrificing psionics + - type: SacrificialAltar - type: Strap position: Down rotation: -90 diff --git a/Resources/Prototypes/Nyanotrasen/psionicArtifacts.yml b/Resources/Prototypes/Nyanotrasen/psionicArtifacts.yml index e7fa8df5aba..954d72761e9 100644 --- a/Resources/Prototypes/Nyanotrasen/psionicArtifacts.yml +++ b/Resources/Prototypes/Nyanotrasen/psionicArtifacts.yml @@ -1,6 +1,6 @@ -# Items to spawn when sacraficing a psionic +# Items to spawn when sacrificing a psionic - type: entityTable - id: PsionicSacraficeRewards + id: PsionicSacrificeRewards table: !type:AllSelector children: - id: MaterialBluespace1 diff --git a/Resources/ServerInfo/Nyanotrasen/Guidebook/Epistemics/Altar.xml b/Resources/ServerInfo/Nyanotrasen/Guidebook/Epistemics/Altar.xml index 724c51d0d2a..540e15a7245 100644 --- a/Resources/ServerInfo/Nyanotrasen/Guidebook/Epistemics/Altar.xml +++ b/Resources/ServerInfo/Nyanotrasen/Guidebook/Epistemics/Altar.xml @@ -7,9 +7,9 @@ It appears in the context menu on the altar, which can be opened with the right -As a reward for sacraficing a psionic, glimmer will be lowered substantially and you will be given some loot. +As a reward for sacrificing a psionic, glimmer will be lowered substantially and you will be given some loot. Usually this is a few bluespace crystals, but you can also get a powerful psionic item. ## Golemancy -[color=red]Note: Golemancy is not implemented yet. Once you sacrafice a psionic you can borg them with an MMI.[/color] +[color=red]Note: Golemancy is not implemented yet. Once you sacrifice a psionic you can borg them with an MMI.[/color]