From 65521696c83ad695244726a8d1a04fe93653db24 Mon Sep 17 00:00:00 2001 From: Killerqu00 <47712032+Killerqu00@users.noreply.github.com> Date: Sun, 11 Aug 2024 20:01:00 +0200 Subject: [PATCH] Remove rest of Geras files (#30912) remove remaining geras stuff --- Content.Server/Geras/GerasComponent.cs | 18 ------- Content.Server/Geras/GerasSystem.cs | 51 ------------------- Content.Shared/Geras/SharedGerasSystem.cs | 16 ------ Resources/Locale/en-US/geras/geras.ftl | 2 - Resources/Prototypes/Actions/types.yml | 16 ------ .../Prototypes/Entities/Mobs/NPCs/slimes.yml | 35 ------------- Resources/Prototypes/Polymorphs/polymorph.yml | 11 ---- 7 files changed, 149 deletions(-) delete mode 100644 Content.Server/Geras/GerasComponent.cs delete mode 100644 Content.Server/Geras/GerasSystem.cs delete mode 100644 Content.Shared/Geras/SharedGerasSystem.cs delete mode 100644 Resources/Locale/en-US/geras/geras.ftl diff --git a/Content.Server/Geras/GerasComponent.cs b/Content.Server/Geras/GerasComponent.cs deleted file mode 100644 index df1fccd718..0000000000 --- a/Content.Server/Geras/GerasComponent.cs +++ /dev/null @@ -1,18 +0,0 @@ -using Content.Shared.Actions; -using Content.Shared.Polymorph; -using Robust.Shared.Prototypes; - -namespace Content.Server.Geras; - -/// -/// This component assigns the entity with a polymorph action. -/// -[RegisterComponent] -public sealed partial class GerasComponent : Component -{ - [DataField] public ProtoId GerasPolymorphId = "SlimeMorphGeras"; - - [DataField] public EntProtoId GerasAction = "ActionMorphGeras"; - - [DataField] public EntityUid? GerasActionEntity; -} diff --git a/Content.Server/Geras/GerasSystem.cs b/Content.Server/Geras/GerasSystem.cs deleted file mode 100644 index f83f7c1999..0000000000 --- a/Content.Server/Geras/GerasSystem.cs +++ /dev/null @@ -1,51 +0,0 @@ -using Content.Server.Polymorph.Systems; -using Content.Shared.Zombies; -using Content.Server.Actions; -using Content.Server.Popups; -using Content.Shared.Geras; -using Robust.Shared.Player; - -namespace Content.Server.Geras; - -/// -public sealed class GerasSystem : SharedGerasSystem -{ - [Dependency] private readonly PolymorphSystem _polymorphSystem = default!; - [Dependency] private readonly ActionsSystem _actionsSystem = default!; - [Dependency] private readonly PopupSystem _popupSystem = default!; - - /// - public override void Initialize() - { - SubscribeLocalEvent(OnMorphIntoGeras); - SubscribeLocalEvent(OnMapInit); - SubscribeLocalEvent(OnZombification); - } - - private void OnZombification(EntityUid uid, GerasComponent component, EntityZombifiedEvent args) - { - _actionsSystem.RemoveAction(uid, component.GerasActionEntity); - } - - private void OnMapInit(EntityUid uid, GerasComponent component, MapInitEvent args) - { - // try to add geras action - _actionsSystem.AddAction(uid, ref component.GerasActionEntity, component.GerasAction); - } - - private void OnMorphIntoGeras(EntityUid uid, GerasComponent component, MorphIntoGeras args) - { - if (HasComp(uid)) - return; // i hate zomber. - - var ent = _polymorphSystem.PolymorphEntity(uid, component.GerasPolymorphId); - - if (!ent.HasValue) - return; - - _popupSystem.PopupEntity(Loc.GetString("geras-popup-morph-message-others", ("entity", ent.Value)), ent.Value, Filter.PvsExcept(ent.Value), true); - _popupSystem.PopupEntity(Loc.GetString("geras-popup-morph-message-user"), ent.Value, ent.Value); - - args.Handled = true; - } -} diff --git a/Content.Shared/Geras/SharedGerasSystem.cs b/Content.Shared/Geras/SharedGerasSystem.cs deleted file mode 100644 index 8c998371b6..0000000000 --- a/Content.Shared/Geras/SharedGerasSystem.cs +++ /dev/null @@ -1,16 +0,0 @@ -using Content.Shared.Actions; - -namespace Content.Shared.Geras; - -/// -/// Geras is the god of old age, and A geras is the small morph of a slime. This system allows the slimes to have the morphing action. -/// -public abstract class SharedGerasSystem : EntitySystem -{ - -} - -public sealed partial class MorphIntoGeras : InstantActionEvent -{ - -} diff --git a/Resources/Locale/en-US/geras/geras.ftl b/Resources/Locale/en-US/geras/geras.ftl deleted file mode 100644 index 3cd3f101ff..0000000000 --- a/Resources/Locale/en-US/geras/geras.ftl +++ /dev/null @@ -1,2 +0,0 @@ -geras-popup-morph-message-user = You shift and morph into a small version of you! -geras-popup-morph-message-others = {CAPITALIZE(THE($entity))} shifts and morphs into a blob of slime! diff --git a/Resources/Prototypes/Actions/types.yml b/Resources/Prototypes/Actions/types.yml index af1333e14c..4fa9ed3135 100644 --- a/Resources/Prototypes/Actions/types.yml +++ b/Resources/Prototypes/Actions/types.yml @@ -161,22 +161,6 @@ state: icon event: !type:UseDnaScramblerImplantEvent -- type: entity - id: ActionMorphGeras - name: Morph into Geras - description: Morphs you into a Geras - a miniature version of you which allows you to move fast, at the cost of your inventory. - components: - - type: ConfirmableAction - popup: gera-transformation-popup - - type: InstantAction - itemIconStyle: BigAction - useDelay: 10 # prevent spam - priority: -20 - icon: - sprite: Mobs/Aliens/slimes.rsi - state: blue_adult_slime - event: !type:MorphIntoGeras - - type: entity id: ActionToggleSuitPiece name: Toggle Suit Piece diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml b/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml index b5929620ee..9d8a851551 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/slimes.yml @@ -143,41 +143,6 @@ rootTask: task: SimpleHostileCompound -- type: entity - name: geras - description: A geras of a slime - the name is ironic, isn't it? - id: MobSlimesGeras - parent: BaseMobAdultSlimes - categories: [ HideSpawnMenu ] - components: - # they portable... - - type: MovementSpeedModifier - baseWalkSpeed: 3 - baseSprintSpeed: 5 # +.5 from normal movement speed - - type: MobThresholds - thresholds: - 0: Alive - 80: Dead # weak af tho - - type: NpcFactionMember - factions: - - NanoTrasen - - type: MultiHandedItem - - type: Item - size: Huge - - type: Sprite - color: "#FFFFFF55" - - type: MeleeWeapon - attackRate: 2 - damage: - types: - Blunt: 4 - - type: DamageStateVisuals - states: - Alive: - Base: blue_adult_slime - Dead: - Base: blue_adult_slime_dead - - type: entity name: blue slime id: MobAdultSlimesBlue diff --git a/Resources/Prototypes/Polymorphs/polymorph.yml b/Resources/Prototypes/Polymorphs/polymorph.yml index a1a805c74f..96739a50d3 100644 --- a/Resources/Prototypes/Polymorphs/polymorph.yml +++ b/Resources/Prototypes/Polymorphs/polymorph.yml @@ -75,17 +75,6 @@ inventory: Transfer revertOnDeath: true -- type: polymorph - id: SlimeMorphGeras - configuration: - entity: MobSlimesGeras - transferName: true - transferHumanoidAppearance: false - inventory: Drop - transferDamage: true - revertOnDeath: true - revertOnCrit: true - # this is a test for transferring some visual appearance stuff - type: polymorph id: TestHumanMorph -- 2.52.0