diff --git a/Content.Client/Chapel/SacrificialAltarSystem.cs b/Content.Client/Chapel/SacrificialAltarSystem.cs new file mode 100644 index 0000000000..5b694e4b4e --- /dev/null +++ b/Content.Client/Chapel/SacrificialAltarSystem.cs @@ -0,0 +1,5 @@ +using Content.Shared.Chapel; + +namespace Content.Client.Chapel; + +public sealed class SacrificialAltarSystem : SharedSacrificialAltarSystem; diff --git a/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs b/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs index 7b02f1591e..2eddea1014 100644 --- a/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs +++ b/Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs @@ -639,6 +639,7 @@ public void SetProfile(HumanoidCharacterProfile? profile, int? slot) UpdateGenderControls(); UpdateSkinColor(); UpdateSpawnPriorityControls(); + UpdateFlavorTextEdit(); UpdateAgeEdit(); UpdateEyePickers(); UpdateSaveButton(); diff --git a/Content.Server/Chapel/SacrificialAltarSystem.cs b/Content.Server/Chapel/SacrificialAltarSystem.cs new file mode 100644 index 0000000000..e7144e1185 --- /dev/null +++ b/Content.Server/Chapel/SacrificialAltarSystem.cs @@ -0,0 +1,129 @@ +using Content.Server.Bible.Components; +using Content.Shared.Abilities.Psionics; +using Content.Shared.Administration.Logs; +using Content.Shared.Body.Components; +using Content.Shared.Body.Systems; +using Content.Shared.Database; +using Content.Shared.Chapel; +using Content.Shared.DoAfter; +using Content.Shared.Humanoid; +using Content.Shared.Mind; +using Content.Shared.Popups; +using Content.Shared.Psionics.Glimmer; +using Robust.Shared.Audio.Systems; +using Robust.Shared.Player; +using Robust.Shared.Prototypes; +using Robust.Shared.Random; + +namespace Content.Server.Chapel; + +public sealed class SacrificialAltarSystem : SharedSacrificialAltarSystem +{ + [Dependency] private readonly GlimmerSystem _glimmer = default!; + [Dependency] private readonly IPrototypeManager _proto = default!; + [Dependency] private readonly IRobustRandom _random = default!; + [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!; + [Dependency] private readonly SharedAudioSystem _audio = default!; + [Dependency] private readonly SharedBodySystem _body = default!; + [Dependency] private readonly SharedMindSystem _mind = default!; + [Dependency] private readonly SharedPopupSystem _popup = default!; + + public override void Initialize() + { + base.Initialize(); + + SubscribeLocalEvent(OnDoAfter); + } + + private void OnDoAfter(Entity ent, ref SacrificeDoAfterEvent args) + { + ent.Comp.SacrificeStream = _audio.Stop(ent.Comp.SacrificeStream); + ent.Comp.DoAfter = null; + + if (args.Cancelled || args.Handled || args.Args.Target is not { } target + || !TryComp(target, out var psionic) + || !_mind.TryGetMind(target, out var _, out var _)) + return; + + _adminLogger.Add(LogType.Action, LogImpact.Extreme, $"{ToPrettyString(args.Args.User):player} sacrificed {ToPrettyString(target):target} on {ToPrettyString(ent):altar}"); + + // lower glimmer by a random amount + _glimmer.Glimmer -= (int) (ent.Comp.GlimmerReduction * psionic.CurrentAmplification); + + if (ent.Comp.RewardPool is not null && _random.Prob(ent.Comp.BaseItemChance * psionic.CurrentDampening)) + { + var proto = _proto.Index(_random.Pick(ent.Comp.RewardPool)); + Spawn(proto.ToString(), Transform(ent).Coordinates); + } + // TODO GOLEMS: create a soul crystal and transfer mind into it + + // finally gib the targets old body + if (TryComp(target, out var body)) + _body.GibBody(target, gibOrgans: false, body, launchGibs: true); + else + QueueDel(target); + } + + protected override void AttemptSacrifice(Entity ent, EntityUid user, EntityUid target) + { + if (ent.Comp.DoAfter != null) + return; + + // can't sacrifice yourself + if (user == target) + { + _popup.PopupEntity(Loc.GetString("altar-failure-reason-self"), ent, user, PopupType.SmallCaution); + return; + } + + // you need to be psionic OR bible user + if (!HasComp(user) && !HasComp(user)) + { + _popup.PopupEntity(Loc.GetString("altar-failure-reason-user"), ent, user, PopupType.SmallCaution); + return; + } + + // and no golems or familiars or whatever should be sacrificing + if (!HasComp(user)) + { + _popup.PopupEntity(Loc.GetString("altar-failure-reason-user-humanoid"), ent, user, PopupType.SmallCaution); + return; + } + + // prevent psichecking SSD people... + // 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); + return; + } + + // TODO: there should be a penalty to the user for psichecking like this + if (!HasComp(target)) + { + _popup.PopupEntity(Loc.GetString("altar-failure-reason-target", ("target", target)), ent, user, PopupType.SmallCaution); + return; + } + + if (!HasComp(target)) + { + _popup.PopupEntity(Loc.GetString("altar-failure-reason-target-humanoid", ("target", target)), ent, user, PopupType.SmallCaution); + return; + } + + _popup.PopupEntity(Loc.GetString("altar-sacrifice-popup", ("user", user), ("target", target)), ent, PopupType.LargeCaution); + + ent.Comp.SacrificeStream = _audio.PlayPvs(ent.Comp.SacrificeSound, ent)?.Entity; + + var ev = new SacrificeDoAfterEvent(); + var args = new DoAfterArgs(EntityManager, user, ent.Comp.SacrificeTime, ev, target: target, eventTarget: ent) + { + BreakOnDamage = true, + BreakOnUserMove = true, + BreakOnTargetMove = true, + BreakOnWeightlessMove = true, + NeedHand = true + }; + DoAfter.TryStartDoAfter(args, out ent.Comp.DoAfter); + } +} diff --git a/Content.Shared/Chapel/SacrificeDoAfterEvent.cs b/Content.Shared/Chapel/SacrificeDoAfterEvent.cs index 444871a2fc..f730bab883 100644 --- a/Content.Shared/Chapel/SacrificeDoAfterEvent.cs +++ b/Content.Shared/Chapel/SacrificeDoAfterEvent.cs @@ -2,8 +2,6 @@ using Content.Shared.DoAfter; namespace Content.Shared.Chapel; -[Serializable, NetSerializable] -public sealed partial class SacrificeDoAfterEvent : SimpleDoAfterEvent -{ -} +[Serializable, NetSerializable] +public sealed partial class SacrificeDoAfterEvent : SimpleDoAfterEvent { } diff --git a/Content.Shared/Chapel/SacrificialAltarComponent.cs b/Content.Shared/Chapel/SacrificialAltarComponent.cs new file mode 100644 index 0000000000..c3db338861 --- /dev/null +++ b/Content.Shared/Chapel/SacrificialAltarComponent.cs @@ -0,0 +1,48 @@ +using Content.Shared.Random; +using Content.Shared.DoAfter; +using Robust.Shared.Audio; +using Robust.Shared.GameStates; +using Robust.Shared.Prototypes; + +namespace Content.Shared.Chapel; + +/// +/// Altar that lets you sacrifice psionics to lower glimmer by a large amount. +/// +[RegisterComponent, NetworkedComponent, Access(typeof(SharedSacrificialAltarSystem))] +public sealed partial class SacrificialAltarComponent : Component +{ + /// + /// DoAfter for an active sacrifice. + /// + [DataField] + public DoAfterId? DoAfter; + + /// + /// 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 SacrificeTime = TimeSpan.FromSeconds(8.35); + + [DataField] + public SoundSpecifier SacrificeSound = new SoundPathSpecifier("/Audio/Psionics/heartbeat_fast.ogg"); + + [DataField] + public EntityUid? SacrificeStream; + + /// + /// Base amount to reduce glimmer by, multiplied by the victim's Amplification stat. + /// + [DataField] + public float GlimmerReduction = 25; + + [DataField] + public List>? RewardPool; + + /// + /// The base chance to generate an item of power, multiplied by the victim's Dampening stat. + /// + [DataField] + public float BaseItemChance = 0.1f; +} diff --git a/Content.Shared/Chapel/SharedSacrificialAltarSystem.cs b/Content.Shared/Chapel/SharedSacrificialAltarSystem.cs new file mode 100644 index 0000000000..92df7e0f6b --- /dev/null +++ b/Content.Shared/Chapel/SharedSacrificialAltarSystem.cs @@ -0,0 +1,61 @@ +using System.Linq; +using Content.Shared.Buckle.Components; +using Content.Shared.DoAfter; +using Content.Shared.Examine; +using Content.Shared.Verbs; + +namespace Content.Shared.Chapel; + +public abstract partial class SharedSacrificialAltarSystem : EntitySystem +{ + [Dependency] protected readonly SharedDoAfterSystem DoAfter = default!; + + public override void Initialize() + { + base.Initialize(); + + SubscribeLocalEvent(OnExamined); + SubscribeLocalEvent(OnUnstrapped); + SubscribeLocalEvent>(OnGetVerbs); + } + + private void OnExamined(Entity ent, ref ExaminedEvent args) + { + args.PushMarkup(Loc.GetString("altar-examine")); + } + + private void OnUnstrapped(Entity ent, ref BuckleChangeEvent args) + { + if (ent.Comp.DoAfter is not { } id) + return; + + DoAfter.Cancel(id); + ent.Comp.DoAfter = null; + } + + private void OnGetVerbs(Entity ent, ref GetVerbsEvent args) + { + if (!args.CanAccess || !args.CanInteract || ent.Comp.DoAfter != null + || !TryComp(ent, out var strap) + || GetFirstBuckled(strap) is not { } target) + return; + + var user = args.User; + args.Verbs.Add(new AlternativeVerb() + { + Act = () => AttemptSacrifice(ent, user, target), + Text = Loc.GetString("altar-sacrifice-verb"), + Priority = 2 + }); + } + + private EntityUid? GetFirstBuckled(StrapComponent strap) + { + if (strap.BuckledEntities.Count <= 0) + return null; + + return strap.BuckledEntities.First(); + } + + protected virtual void AttemptSacrifice(Entity ent, EntityUid user, EntityUid target) { } +} diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 2238e15475..1c2fb5e088 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -7492,3 +7492,36 @@ Entries: id: 6477 time: '2024-10-20T19:28:35.0000000+00:00' url: https://github.com/Simple-Station/Einstein-Engines/pull/1113 +- author: VMSolidus + changes: + - type: Add + message: >- + Sacrificing Psions has been added. Psions can be sacrificed by + Epistemics upon an altar in order to dramatically reduce glimmer. The + more powerful the Psion to be sacrificed, the more glimmer is reduced. + id: 6478 + time: '2024-10-20T21:34:05.0000000+00:00' + url: https://github.com/Simple-Station/Einstein-Engines/pull/1110 +- author: Aidenkrz + changes: + - type: Fix + message: Flavor text can be updated again. + id: 6479 + time: '2024-10-21T00:24:18.0000000+00:00' + url: https://github.com/Simple-Station/Einstein-Engines/pull/1119 +- author: VMSolidus + changes: + - type: Add + message: Glacier is now on a planetary surface + id: 6480 + time: '2024-10-21T00:41:02.0000000+00:00' + url: https://github.com/Simple-Station/Einstein-Engines/pull/1115 +- author: VMSolidus + changes: + - type: Fix + message: >- + Asterisk Station no longer spawns entombed in snow, and is now on top of + an ice sheet. + id: 6481 + time: '2024-10-21T00:41:18.0000000+00:00' + url: https://github.com/Simple-Station/Einstein-Engines/pull/1118 diff --git a/Resources/Locale/en-US/chapel/altar.ftl b/Resources/Locale/en-US/chapel/altar.ftl new file mode 100644 index 0000000000..ed031d638a --- /dev/null +++ b/Resources/Locale/en-US/chapel/altar.ftl @@ -0,0 +1,11 @@ +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! +altar-failure-reason-user-humanoid = You are not a humanoid! +altar-failure-reason-target = {CAPITALIZE(THE($target))} {CONJUGATE-BE($target)} not psionic! +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-sacrifice-popup = {$user} starts to sacrifice {$target}! diff --git a/Resources/Maps/asterisk.yml b/Resources/Maps/asterisk.yml index 156fb2de6e..bfd8a71261 100644 --- a/Resources/Maps/asterisk.yml +++ b/Resources/Maps/asterisk.yml @@ -63,7 +63,29 @@ entities: - type: Broadphase - type: OccluderTree - type: Parallax - parallax: AngleStation + parallax: Snow + - type: MapAtmosphere + space: False + mixture: + volume: 2500 + immutable: True + temperature: 213.15 + moles: + - 21.824879 + - 82.10312 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - 0 + - type: Gravity + enabled: true + inherent: true - type: LoadedMap - uid: 2 components: @@ -71,6 +93,9 @@ entities: - type: Transform pos: -0.5104167,-0.4739367 parent: 1 + - type: PassiveDampening + linearDampening: 1 + angularDampening: 1 - type: MapGrid chunks: 0,0: diff --git a/Resources/Maps/glacier.yml b/Resources/Maps/glacier.yml index 572aca8582..5cf7518212 100644 --- a/Resources/Maps/glacier.yml +++ b/Resources/Maps/glacier.yml @@ -72,7 +72,10 @@ entities: - type: GridTree - type: MovedGrids - type: Parallax - parallax: Sky + parallax: Snow + - type: Gravity + enabled: true + inherent: true - type: MapAtmosphere space: False mixture: @@ -100,6 +103,9 @@ entities: - type: MetaData - type: Transform parent: 1 + - type: PassiveDampening + linearDampening: 1 + angularDampening: 1 - type: MapGrid chunks: -1,-1: @@ -69877,13 +69883,6 @@ entities: - type: Transform pos: 63.191357,-49.411076 parent: 2 -- proto: GravityGenerator - entities: - - uid: 9482 - components: - - type: Transform - pos: 27.5,54.5 - parent: 2 - proto: GravityGeneratorMini entities: - uid: 9483 diff --git a/Resources/Prototypes/Entities/Structures/Furniture/altar.yml b/Resources/Prototypes/Entities/Structures/Furniture/altar.yml index 117967ef30..1153d5b7cc 100644 --- a/Resources/Prototypes/Entities/Structures/Furniture/altar.yml +++ b/Resources/Prototypes/Entities/Structures/Furniture/altar.yml @@ -25,8 +25,14 @@ - TableLayer - type: Sprite snapCardinals: true - - type: Climbable - type: Clickable + - type: SacrificialAltar + - type: Strap + position: Down + rotation: -90 + - type: GuideHelp + guides: + - AltarsGolemancy - type: entity id: AltarNanotrasen diff --git a/Resources/Prototypes/Guidebook/science.yml b/Resources/Prototypes/Guidebook/science.yml index a3f3f71ec3..bceaaa6b0c 100644 --- a/Resources/Prototypes/Guidebook/science.yml +++ b/Resources/Prototypes/Guidebook/science.yml @@ -8,8 +8,8 @@ - Xenoarchaeology - Robotics - MachineUpgrading - # - AltarsGolemancy # When it's added # Nyanotrasen - Golemancy guidebook - - ReverseEngineering # Nyanotrasen - Reverse Engineering guidebook + - AltarsGolemancy + - ReverseEngineering - type: guideEntry id: Technologies diff --git a/Resources/Prototypes/Maps/asterisk.yml b/Resources/Prototypes/Maps/asterisk.yml index cf57fa2725..3ef57dd490 100644 --- a/Resources/Prototypes/Maps/asterisk.yml +++ b/Resources/Prototypes/Maps/asterisk.yml @@ -8,8 +8,6 @@ Asterisk: stationProto: StandardNanotrasenStation components: - - type: StationBiome - biome: Snow - type: StationRandomTransform enableStationRotation: false maxStationOffset: null diff --git a/Resources/Prototypes/Nyanotrasen/Guidebook/epistemics.yml b/Resources/Prototypes/Nyanotrasen/Guidebook/epistemics.yml index adfbc8ce72..2ae051100b 100644 --- a/Resources/Prototypes/Nyanotrasen/Guidebook/epistemics.yml +++ b/Resources/Prototypes/Nyanotrasen/Guidebook/epistemics.yml @@ -1,7 +1,7 @@ -# - type: guideEntry # When it's added -# id: AltarsGolemancy -# name: guide-entry-altars-golemancy -# text: "/ServerInfo/Nyanotrasen/Guidebook/Epistemics/Altar.xml" +- type: guideEntry + id: AltarsGolemancy + name: guide-entry-altars-golemancy + text: "/ServerInfo/Nyanotrasen/Guidebook/Epistemics/Altar.xml" - type: guideEntry id: ReverseEngineering diff --git a/Resources/Prototypes/Nyanotrasen/psionicArtifacts.yml b/Resources/Prototypes/Nyanotrasen/psionicArtifacts.yml deleted file mode 100644 index 8f952b3905..0000000000 --- a/Resources/Prototypes/Nyanotrasen/psionicArtifacts.yml +++ /dev/null @@ -1,21 +0,0 @@ -- type: weightedRandom - id: PsionicArtifactPool - weights: - ClothingHandsDispelGloves: 1 - ClothingEyesTelegnosisSpectacles: 1 - ClothingHandsGlovesColorYellowUnsulated: 1 - PonderingOrbTelepathic: 1 - ClothingShoesBootsMagBlinding: 0.5 - LidOSaws: 0.25 - BedsheetInvisibilityCloak: 0.15 - # WeaponWandPolymorphCarp: 0.05 - # WeaponWandPolymorphMonkey: 0.05 - # WeaponWandFireball: 0.025 - # WeaponWandDeath: 0.001 - # WeaponWandPolymorphDoor: 0.05 - SpawnSpellbook: 0.025 - ForceWallSpellbook: 0.025 - BlinkBook: 0.025 - SmiteBook: 0.00025 - KnockSpellbook: 0.025 - FireballSpellbook: 0.01 diff --git a/Resources/ServerInfo/Nyanotrasen/Guidebook/Epistemics/Altar.xml b/Resources/ServerInfo/Nyanotrasen/Guidebook/Epistemics/Altar.xml index c3b211d296..540e15a724 100644 --- a/Resources/ServerInfo/Nyanotrasen/Guidebook/Epistemics/Altar.xml +++ b/Resources/ServerInfo/Nyanotrasen/Guidebook/Epistemics/Altar.xml @@ -5,18 +5,11 @@ The chapel has a [color=#a4885c]sacrificial altar[/color]. To use it, a psionic humanoid must be placed on it, and someone with either psionics or clerical training must initiate the sacrifice. It appears in the context menu on the altar, which can be opened with the right mouse button by default. - -Once sacrificed, the psionic humanoid's soul is trapped inside a [color=#a4885c]soul crystal[/color]. This is not the end for them; they can still talk both vocally and telepathically, and this form is much harder to destroy. - - -10% of the time, the altar will spawn a powerful psionic item along with the soul crystal. This chance increases to 50% if the sacrifice was performed by someone with clerical training, such as the [color=#a4885c]chaplain[/color] or [color=#a4885c]mystagogue[/color]. + + +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 - - - - -Soul crystals can be installed into [color=#a4885c]golems[/color] to give the soul a new body. Golems are bound to serve their master. As constructs, they do not need to eat, drink, or breathe. -Note that for wood golems, if plants are planted on top of their head, the plants will still need those things. - +[color=red]Note: Golemancy is not implemented yet. Once you sacrifice a psionic you can borg them with an MMI.[/color]