diff --git a/Content.Client/_Amour/Crawl/CrawlSystem.cs b/Content.Client/_Amour/Crawl/CrawlSystem.cs deleted file mode 100644 index 1a340f7e61..0000000000 --- a/Content.Client/_Amour/Crawl/CrawlSystem.cs +++ /dev/null @@ -1,8 +0,0 @@ -using Content.Shared._Amour.Crawl; - -namespace Content.Client._Amour.Crawl; - -public sealed class CrawlSystem : SharedCrawlSystem -{ - -} diff --git a/Content.Server/_Amour/Crawl/CrawlSystem.cs b/Content.Server/_Amour/Crawl/CrawlSystem.cs deleted file mode 100644 index 98510c8a05..0000000000 --- a/Content.Server/_Amour/Crawl/CrawlSystem.cs +++ /dev/null @@ -1,26 +0,0 @@ -using Content.Server.Chat.Systems; -using Content.Shared._Amour.Crawl; - -namespace Content.Server._Amour.Crawl; - -public sealed class CrawlSystem : SharedCrawlSystem -{ - public override void Initialize() - { - base.Initialize(); - SubscribeLocalEvent(OnEmote); - } - - private void OnEmote(EntityUid uid, CrawlableComponent component,ref EmoteEvent args) - { - switch (args.Emote.ID) - { - case "EmoteCrawl": - EnableCrawl(uid); - break; - case "EmoteCrawlUp": - DisableCrawl(uid); - break; - } - } -} diff --git a/Content.Shared/_Amour/Crawl/CrawlComponent.cs b/Content.Shared/_Amour/Crawl/CrawlComponent.cs deleted file mode 100644 index cb72034a33..0000000000 --- a/Content.Shared/_Amour/Crawl/CrawlComponent.cs +++ /dev/null @@ -1,10 +0,0 @@ -using Robust.Shared.GameStates; - -namespace Content.Shared._Amour.Crawl; - -[RegisterComponent, NetworkedComponent] -public sealed partial class CrawlComponent : Component -{ - public float SprintSpeedModifier { get; set; } = 0.4f; - public float WalkSpeedModifier { get; set; } = 0.4f; -} diff --git a/Content.Shared/_Amour/Crawl/CrawlableComponent.cs b/Content.Shared/_Amour/Crawl/CrawlableComponent.cs deleted file mode 100644 index 8201639b5c..0000000000 --- a/Content.Shared/_Amour/Crawl/CrawlableComponent.cs +++ /dev/null @@ -1,7 +0,0 @@ -namespace Content.Shared._Amour.Crawl; - -[RegisterComponent] -public sealed partial class CrawlableComponent : Component -{ - -} diff --git a/Content.Shared/_Amour/Crawl/SharedCrawlSystem.cs b/Content.Shared/_Amour/Crawl/SharedCrawlSystem.cs deleted file mode 100644 index 454238b749..0000000000 --- a/Content.Shared/_Amour/Crawl/SharedCrawlSystem.cs +++ /dev/null @@ -1,70 +0,0 @@ -using Content.Shared.Buckle; -using Content.Shared.Movement.Systems; -using Content.Shared.Standing; -using Content.Shared.StatusEffect; - -namespace Content.Shared._Amour.Crawl; - -public abstract class SharedCrawlSystem : EntitySystem -{ - [Dependency] private readonly StatusEffectsSystem _statusEffectsSystem = default!; - [Dependency] private readonly MovementSpeedModifierSystem _speed = default!; - [Dependency] private readonly StandingStateSystem _standingStateSystem = default!; - [Dependency] private readonly SharedBuckleSystem _buckle = default!; - - public override void Initialize() - { - SubscribeLocalEvent(OnInit); - SubscribeLocalEvent(OnShutdown); - SubscribeLocalEvent(OnCrawlShutdown); - SubscribeLocalEvent(OnStood); - SubscribeLocalEvent(OnRefresh); - } - - private void OnRefresh(EntityUid uid, CrawlComponent component, RefreshMovementSpeedModifiersEvent args) - { - args.ModifySpeed(component.WalkSpeedModifier, component.SprintSpeedModifier); - } - - private void OnInit(EntityUid uid, CrawlComponent component, ComponentInit args) - { - if (_buckle.TryUnbuckle(uid, uid) || !_standingStateSystem.Down(uid, true, false)) - { - DisableCrawl(uid); - return; - } - - _speed.RefreshMovementSpeedModifiers(uid); - } - - private void OnCrawlShutdown(EntityUid uid, CrawlableComponent component, ComponentShutdown args) - { - DisableCrawl(uid); - } - - private void OnStood(EntityUid uid, CrawlComponent component, StoodEvent args) - { - if (component.LifeStage == ComponentLifeStage.Stopping) - return; - - DisableCrawl(uid); - } - - private void OnShutdown(EntityUid uid, CrawlComponent component, ComponentShutdown args) - { - _standingStateSystem.Stand(uid); - component.SprintSpeedModifier = 1f; - component.WalkSpeedModifier = 1f; - _speed.RefreshMovementSpeedModifiers(uid); - } - - public void EnableCrawl(EntityUid uid) - { - EnsureComp(uid); - } - - public void DisableCrawl(EntityUid uid) - { - RemComp(uid); - } -} diff --git a/Resources/Prototypes/Entities/Mobs/Species/base.yml b/Resources/Prototypes/Entities/Mobs/Species/base.yml index afcaeefc29..f8b3218bcc 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/base.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/base.yml @@ -269,7 +269,6 @@ - type: Mood - type: HoleContainer - type: Arousal - - type: Crawlable - type: InteractionPanel actionListPrototype: Humanoid - type: RoleplayInfo diff --git a/Resources/Prototypes/_Amour/Actions/crawl_action.yml b/Resources/Prototypes/_Amour/Actions/crawl_action.yml deleted file mode 100644 index d9e1c5066e..0000000000 --- a/Resources/Prototypes/_Amour/Actions/crawl_action.yml +++ /dev/null @@ -1,30 +0,0 @@ -- type: emote - id: EmoteCrawl - buttonText: Ползти - chatMessages: [падает] - chatTriggers: - - падает - - ползет - - упала - - упало - - лежит - - улегся - - улеглась - - улеглось - - упал - - лёг - allowMenu: true - -- type: emote - id: EmoteCrawlUp - buttonText: Встать - chatMessages: [встает] - chatTriggers: - - встает - - встал - - встала - - встало - - поднялась - - поднялось - - поднялся - allowMenu: true