From d7ceb5ea02c921e3ba6471a7125a4b07544033cf Mon Sep 17 00:00:00 2001 From: Doublechest Date: Mon, 5 Aug 2024 16:54:20 +0300 Subject: [PATCH] changes to partners items & changes to lightsabers & rename namespaces --- Content.Client/Stories/Empire/EmpireSystem.cs | 4 +- .../Stories/Nightvision/NightvisionOverlay.cs | 4 +- .../Stories/Nightvision/NightvisionSystem.cs | 4 +- .../BlockMeleeAttackComponent.cs | 2 +- .../BlockMeleeAttackSystem.cs | 2 +- .../BlockMeleeAttackUserComponent.cs | 2 +- Content.Server/Stories/Empire/EmpireSystem.cs | 4 +- .../Components/FrozeBulletsComponent.cs | 2 +- .../Components/PassiveGhostBooComponent.cs | 2 +- .../Components/SithGhostComponent.cs | 2 +- .../Systems/HypnosisConditionSystem.cs | 2 +- .../ForceUserSystem.Actions.LifeSteal.cs | 4 +- .../ForceUserSystem.Actions.Lightning.cs | 4 +- .../ForceUserSystem.Actions.Polymorph.cs | 6 +- ...orceUserSystem.Actions.ProtectiveBubble.cs | 8 +- ...ForceUserSystem.Actions.RecallEquipment.cs | 12 +- ...orceUserSystem.Actions.RecallLightSaber.cs | 30 ++-- .../ForceUserSystem.Actions.Strangle.cs | 4 +- .../ForceUserSystem.Actions.TetherHand.cs | 6 +- .../Actions/ForceUserSystem.Actions.cs | 10 +- .../Actions/ForceUserSystem.LightSaber.cs | 53 +++--- .../Systems/Actions/ForceUserSystem.cs | 17 +- .../ForceUser/Systems/FrozeBulletsSystem.cs | 4 +- .../Systems/PassiveGhostBooSystem.cs | 4 +- .../ForceUser/Systems/SithGhostSystem.cs | 4 +- .../Stories/Nightvision/NightvisionSystem.cs | 4 +- .../Partners/Commands/PickAntagCommands.cs | 2 +- .../ProtectedByProtectiveBubbleComponent.cs | 2 +- .../Components/ProtectiveBubbleComponent.cs | 2 +- .../ProtectiveBubbleUserComponent.cs | 2 +- .../Systems/ProtectiveBubbleSystem.Protect.cs | 4 +- .../ProtectiveBubbleSystem.Protected.cs | 4 +- .../Systems/ProtectiveBubbleSystem.User.cs | 12 +- .../Systems/ProtectiveBubbleSystem.cs | 4 +- .../Stories/TetherGun/TetherGunSystem.cs | 2 +- .../DoAfter/SharedDoAfterTargetSystem.cs | 2 +- .../Empire/Components/EmpireComponent.cs | 2 +- .../Components/EmpireMemberRoleComponent.cs | 2 +- .../Components/HypnotizedEmpireComponent.cs | 2 +- .../HypnotizedEmpireMemberRoleComponent.cs | 2 +- .../Stories/Force/ForceComponent.cs | 2 +- Content.Shared/Stories/Force/ForceSystem.cs | 8 +- .../Components/ForceUserComponent.cs | 4 +- .../Components/LightSaberComponent.cs | 6 +- .../Prototypes/ForcePresetPrototype.cs | 4 +- .../Systems/ForceUserSystem.Actions.Events.cs | 28 +++- .../ForceUser/Systems/ForceUserSystem.cs | 38 ++--- .../Systems/ForseUserSystem.Actions.cs | 10 +- .../Systems/ForseUserSystem.Lightsaber.cs | 155 ++++++++++++++++++ .../InjectReagents/InjectReagentsSystem.cs | 2 +- .../Nightvision/NightvisionComponent.cs | 2 +- .../PullTo/Components/PulledToComponent.cs | 2 +- Content.Shared/Stories/PullTo/PullToSystem.cs | 8 +- .../PushOnCollide/PushOnCollideComponent.cs | 2 +- .../PushOnCollide/PushOnCollideSystem.cs | 4 +- .../objects/weapons/melee/lightsaber.ftl | 2 +- Resources/Locale/ru-RU/stories/lightsaber.ftl | 3 + .../Stories/Actions/force/general.yml | 4 +- .../Stories/Catalog/general_catalog.yml | 4 +- .../Stories/Entities/Clothing/Belt/belts.yml | 4 +- .../Stories/Entities/Clothing/Shoes/boots.yml | 5 - .../Objects/Weapons/Melee/lightsaber.yml | 47 +----- .../Prototypes/Stories/Force/presets.yml | 2 +- .../Stories/Roles/Jobs/Security/jedi_nt.yml | 4 +- 64 files changed, 349 insertions(+), 245 deletions(-) create mode 100644 Content.Shared/Stories/ForceUser/Systems/ForseUserSystem.Lightsaber.cs create mode 100644 Resources/Locale/ru-RU/stories/lightsaber.ftl diff --git a/Content.Client/Stories/Empire/EmpireSystem.cs b/Content.Client/Stories/Empire/EmpireSystem.cs index effaf81cba..9c71c21608 100644 --- a/Content.Client/Stories/Empire/EmpireSystem.cs +++ b/Content.Client/Stories/Empire/EmpireSystem.cs @@ -1,9 +1,9 @@ using Content.Shared.StatusIcon.Components; using Content.Shared.StatusIcon; using Robust.Shared.Prototypes; -using Content.Shared.SpaceStories.Empire.Components; +using Content.Shared.Stories.Empire.Components; -namespace Content.Client.SpaceStories.Empire; +namespace Content.Client.Stories.Empire; public sealed class EmpireSystem : SharedStatusIconSystem { [Dependency] private readonly IPrototypeManager _prototype = default!; diff --git a/Content.Client/Stories/Nightvision/NightvisionOverlay.cs b/Content.Client/Stories/Nightvision/NightvisionOverlay.cs index 0a75005b9c..2360f25287 100644 --- a/Content.Client/Stories/Nightvision/NightvisionOverlay.cs +++ b/Content.Client/Stories/Nightvision/NightvisionOverlay.cs @@ -2,9 +2,9 @@ using Robust.Client.Player; using Robust.Shared.Enums; using Robust.Shared.Prototypes; -using Content.Shared.SpaceStories.Nightvision; +using Content.Shared.Stories.Nightvision; -namespace Content.Client.SpaceStories.Nightvision; +namespace Content.Client.Stories.Nightvision; public sealed class NightvisionOverlay : Overlay { [Dependency] private readonly IPrototypeManager _prototypeManager = default!; diff --git a/Content.Client/Stories/Nightvision/NightvisionSystem.cs b/Content.Client/Stories/Nightvision/NightvisionSystem.cs index df81360016..0c1cc134ef 100644 --- a/Content.Client/Stories/Nightvision/NightvisionSystem.cs +++ b/Content.Client/Stories/Nightvision/NightvisionSystem.cs @@ -1,10 +1,10 @@ using Robust.Client.Graphics; using Robust.Client.Player; -using Content.Shared.SpaceStories.Nightvision; +using Content.Shared.Stories.Nightvision; using Content.Shared.GameTicking; using Robust.Shared.Player; -namespace Content.Client.SpaceStories.Nightvision; +namespace Content.Client.Stories.Nightvision; public sealed class NightvisionSystem : EntitySystem { diff --git a/Content.Server/Stories/BlockMeleeAttack/BlockMeleeAttackComponent.cs b/Content.Server/Stories/BlockMeleeAttack/BlockMeleeAttackComponent.cs index 37499acd28..7940bcfe28 100644 --- a/Content.Server/Stories/BlockMeleeAttack/BlockMeleeAttackComponent.cs +++ b/Content.Server/Stories/BlockMeleeAttack/BlockMeleeAttackComponent.cs @@ -5,7 +5,7 @@ using Robust.Shared.Prototypes; using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype; -namespace Content.Server.SpaceStories.BlockMeleeAttack; +namespace Content.Server.Stories.BlockMeleeAttack; /// /// This component goes on an item that you want to use to block diff --git a/Content.Server/Stories/BlockMeleeAttack/BlockMeleeAttackSystem.cs b/Content.Server/Stories/BlockMeleeAttack/BlockMeleeAttackSystem.cs index 6627f456a7..23d166c7ba 100644 --- a/Content.Server/Stories/BlockMeleeAttack/BlockMeleeAttackSystem.cs +++ b/Content.Server/Stories/BlockMeleeAttack/BlockMeleeAttackSystem.cs @@ -6,7 +6,7 @@ using Robust.Shared.Timing; using Content.Shared.Item.ItemToggle.Components; -namespace Content.Server.SpaceStories.BlockMeleeAttack; +namespace Content.Server.Stories.BlockMeleeAttack; public sealed partial class BlockMeleeAttackSystem : EntitySystem { diff --git a/Content.Server/Stories/BlockMeleeAttack/BlockMeleeAttackUserComponent.cs b/Content.Server/Stories/BlockMeleeAttack/BlockMeleeAttackUserComponent.cs index dfccb9c548..f96b6b69dd 100644 --- a/Content.Server/Stories/BlockMeleeAttack/BlockMeleeAttackUserComponent.cs +++ b/Content.Server/Stories/BlockMeleeAttack/BlockMeleeAttackUserComponent.cs @@ -1,6 +1,6 @@ using Robust.Shared.Physics; -namespace Content.Server.SpaceStories.BlockMeleeAttack; +namespace Content.Server.Stories.BlockMeleeAttack; [RegisterComponent] public sealed partial class BlockMeleeAttackUserComponent : Component diff --git a/Content.Server/Stories/Empire/EmpireSystem.cs b/Content.Server/Stories/Empire/EmpireSystem.cs index decaf21950..69eb25f3f5 100644 --- a/Content.Server/Stories/Empire/EmpireSystem.cs +++ b/Content.Server/Stories/Empire/EmpireSystem.cs @@ -1,6 +1,6 @@ using Content.Shared.IdentityManagement; using Content.Shared.Popups; -using Content.Shared.SpaceStories.Empire.Components; +using Content.Shared.Stories.Empire.Components; using Content.Shared.Stunnable; using Content.Shared.Chat; using Content.Shared.Mind; @@ -12,7 +12,7 @@ using Robust.Shared.Audio; using Content.Shared.Stories.Mindshield; -namespace Content.Server.SpaceStories.Empire; +namespace Content.Server.Stories.Empire; public sealed class EmpireSystem : EntitySystem { diff --git a/Content.Server/Stories/ForceUser/Components/FrozeBulletsComponent.cs b/Content.Server/Stories/ForceUser/Components/FrozeBulletsComponent.cs index 1bc5d31254..87ac2998cd 100644 --- a/Content.Server/Stories/ForceUser/Components/FrozeBulletsComponent.cs +++ b/Content.Server/Stories/ForceUser/Components/FrozeBulletsComponent.cs @@ -1,4 +1,4 @@ -namespace Content.Server.SpaceStories.ForceUser.Components; +namespace Content.Server.Stories.ForceUser.Components; [RegisterComponent] public sealed partial class FrozeBulletsComponent : Component diff --git a/Content.Server/Stories/ForceUser/Components/PassiveGhostBooComponent.cs b/Content.Server/Stories/ForceUser/Components/PassiveGhostBooComponent.cs index bc84021681..fa7844f3b5 100644 --- a/Content.Server/Stories/ForceUser/Components/PassiveGhostBooComponent.cs +++ b/Content.Server/Stories/ForceUser/Components/PassiveGhostBooComponent.cs @@ -1,4 +1,4 @@ -namespace Content.Server.SpaceStories.ForceUser.Components; +namespace Content.Server.Stories.ForceUser.Components; [RegisterComponent] public sealed partial class PassiveGhostBooComponent : Component diff --git a/Content.Server/Stories/ForceUser/Components/SithGhostComponent.cs b/Content.Server/Stories/ForceUser/Components/SithGhostComponent.cs index 9e6a457a73..5fb4a350a3 100644 --- a/Content.Server/Stories/ForceUser/Components/SithGhostComponent.cs +++ b/Content.Server/Stories/ForceUser/Components/SithGhostComponent.cs @@ -1,6 +1,6 @@ using Robust.Shared.Prototypes; -namespace Content.Server.SpaceStories.ForceUser.Components; +namespace Content.Server.Stories.ForceUser.Components; [RegisterComponent] public sealed partial class SithGhostComponent : Component diff --git a/Content.Server/Stories/ForceUser/Objectives/Systems/HypnosisConditionSystem.cs b/Content.Server/Stories/ForceUser/Objectives/Systems/HypnosisConditionSystem.cs index f7fd03e592..c50849ac29 100644 --- a/Content.Server/Stories/ForceUser/Objectives/Systems/HypnosisConditionSystem.cs +++ b/Content.Server/Stories/ForceUser/Objectives/Systems/HypnosisConditionSystem.cs @@ -2,7 +2,7 @@ using Content.Server.Objectives.Components; using Content.Server.Roles; using Content.Shared.Objectives.Components; -using Content.Shared.SpaceStories.Empire.Components; +using Content.Shared.Stories.Empire.Components; namespace Content.Server.Objectives.Systems; diff --git a/Content.Server/Stories/ForceUser/Systems/Actions/ForceUserSystem.Actions.LifeSteal.cs b/Content.Server/Stories/ForceUser/Systems/Actions/ForceUserSystem.Actions.LifeSteal.cs index ffe7e50b94..29d2f024ef 100644 --- a/Content.Server/Stories/ForceUser/Systems/Actions/ForceUserSystem.Actions.LifeSteal.cs +++ b/Content.Server/Stories/ForceUser/Systems/Actions/ForceUserSystem.Actions.LifeSteal.cs @@ -1,4 +1,4 @@ -using Content.Shared.SpaceStories.ForceUser.Actions.Events; +using Content.Shared.Stories.ForceUser.Actions.Events; using Robust.Shared.Map; using System.Numerics; using Content.Shared.DoAfter; @@ -10,7 +10,7 @@ using Content.Shared.Damage; using Robust.Shared.Random; -namespace Content.Server.SpaceStories.ForceUser; +namespace Content.Server.Stories.ForceUser; public sealed partial class ForceUserSystem { public void InitializeSteal() diff --git a/Content.Server/Stories/ForceUser/Systems/Actions/ForceUserSystem.Actions.Lightning.cs b/Content.Server/Stories/ForceUser/Systems/Actions/ForceUserSystem.Actions.Lightning.cs index 291b3d001a..176e53a6a9 100644 --- a/Content.Server/Stories/ForceUser/Systems/Actions/ForceUserSystem.Actions.Lightning.cs +++ b/Content.Server/Stories/ForceUser/Systems/Actions/ForceUserSystem.Actions.Lightning.cs @@ -1,8 +1,8 @@ -using Content.Shared.SpaceStories.ForceUser.Actions.Events; +using Content.Shared.Stories.ForceUser.Actions.Events; using Robust.Shared.Map; using System.Numerics; -namespace Content.Server.SpaceStories.ForceUser; +namespace Content.Server.Stories.ForceUser; public sealed partial class ForceUserSystem { public void InitializeLightning() diff --git a/Content.Server/Stories/ForceUser/Systems/Actions/ForceUserSystem.Actions.Polymorph.cs b/Content.Server/Stories/ForceUser/Systems/Actions/ForceUserSystem.Actions.Polymorph.cs index 1c4a46d529..d4dd6777e0 100644 --- a/Content.Server/Stories/ForceUser/Systems/Actions/ForceUserSystem.Actions.Polymorph.cs +++ b/Content.Server/Stories/ForceUser/Systems/Actions/ForceUserSystem.Actions.Polymorph.cs @@ -1,10 +1,10 @@ -using Content.Shared.SpaceStories.ForceUser; -using Content.Shared.SpaceStories.ForceUser.Actions.Events; +using Content.Shared.Stories.ForceUser; +using Content.Shared.Stories.ForceUser.Actions.Events; using Content.Shared.Chemistry.Components; using Content.Shared.Coordinates.Helpers; using Content.Shared.Maps; -namespace Content.Server.SpaceStories.ForceUser; +namespace Content.Server.Stories.ForceUser; public sealed partial class ForceUserSystem { public void InitializePolymorph() diff --git a/Content.Server/Stories/ForceUser/Systems/Actions/ForceUserSystem.Actions.ProtectiveBubble.cs b/Content.Server/Stories/ForceUser/Systems/Actions/ForceUserSystem.Actions.ProtectiveBubble.cs index 233446925d..c8a8bf64c4 100644 --- a/Content.Server/Stories/ForceUser/Systems/Actions/ForceUserSystem.Actions.ProtectiveBubble.cs +++ b/Content.Server/Stories/ForceUser/Systems/Actions/ForceUserSystem.Actions.ProtectiveBubble.cs @@ -1,11 +1,11 @@ -using Content.Shared.SpaceStories.ForceUser; -using Content.Shared.SpaceStories.ForceUser.Actions.Events; +using Content.Shared.Stories.ForceUser; +using Content.Shared.Stories.ForceUser.Actions.Events; using Content.Shared.Chemistry.Components; using Content.Shared.Coordinates.Helpers; using Content.Shared.Maps; -using Content.Server.SpaceStories.ForceUser.ProtectiveBubble.Components; +using Content.Server.Stories.ForceUser.ProtectiveBubble.Components; -namespace Content.Server.SpaceStories.ForceUser; +namespace Content.Server.Stories.ForceUser; public sealed partial class ForceUserSystem { public void InitializeProtectiveBubble() diff --git a/Content.Server/Stories/ForceUser/Systems/Actions/ForceUserSystem.Actions.RecallEquipment.cs b/Content.Server/Stories/ForceUser/Systems/Actions/ForceUserSystem.Actions.RecallEquipment.cs index 0beb6022ec..e3ad69bc67 100644 --- a/Content.Server/Stories/ForceUser/Systems/Actions/ForceUserSystem.Actions.RecallEquipment.cs +++ b/Content.Server/Stories/ForceUser/Systems/Actions/ForceUserSystem.Actions.RecallEquipment.cs @@ -1,4 +1,4 @@ -using Content.Shared.SpaceStories.ForceUser; +using Content.Shared.Stories.ForceUser; using Content.Shared.Actions; using Content.Shared.Popups; using Content.Shared.Hands.EntitySystems; @@ -6,13 +6,13 @@ using Robust.Shared.Timing; using Content.Shared.Throwing; using Content.Shared.Weapons.Misc; -using Content.Server.SpaceStories.TetherGun; -using Content.Shared.SpaceStories.ForceUser.Actions.Events; -using Content.Shared.SpaceStories.PullTo; -using Content.Shared.SpaceStories.Force.LightSaber; +using Content.Server.Stories.TetherGun; +using Content.Shared.Stories.ForceUser.Actions.Events; +using Content.Shared.Stories.PullTo; +using Content.Shared.Stories.Force.Lightsaber; using Content.Shared.Inventory.Events; -namespace Content.Server.SpaceStories.ForceUser; +namespace Content.Server.Stories.ForceUser; public sealed partial class ForceUserSystem { public void InitializeRecallEquipment() diff --git a/Content.Server/Stories/ForceUser/Systems/Actions/ForceUserSystem.Actions.RecallLightSaber.cs b/Content.Server/Stories/ForceUser/Systems/Actions/ForceUserSystem.Actions.RecallLightSaber.cs index 91090f0734..ba2e3239b9 100644 --- a/Content.Server/Stories/ForceUser/Systems/Actions/ForceUserSystem.Actions.RecallLightSaber.cs +++ b/Content.Server/Stories/ForceUser/Systems/Actions/ForceUserSystem.Actions.RecallLightSaber.cs @@ -1,4 +1,4 @@ -using Content.Shared.SpaceStories.ForceUser; +using Content.Shared.Stories.ForceUser; using Content.Shared.Actions; using Content.Shared.Popups; using Content.Shared.Hands.EntitySystems; @@ -6,38 +6,38 @@ using Robust.Shared.Timing; using Content.Shared.Throwing; using Content.Shared.Weapons.Misc; -using Content.Server.SpaceStories.TetherGun; -using Content.Shared.SpaceStories.ForceUser.Actions.Events; -using Content.Shared.SpaceStories.PullTo; -using Content.Shared.SpaceStories.Force.LightSaber; +using Content.Server.Stories.TetherGun; +using Content.Shared.Stories.ForceUser.Actions.Events; +using Content.Shared.Stories.PullTo; +using Content.Shared.Stories.Force.Lightsaber; -namespace Content.Server.SpaceStories.ForceUser; +namespace Content.Server.Stories.ForceUser; public sealed partial class ForceUserSystem { public void InitializeRecall() { - SubscribeLocalEvent(OnRecall); - SubscribeLocalEvent(OnTimeOut); + SubscribeLocalEvent(OnRecall); + SubscribeLocalEvent(OnTimeOut); } - private void OnTimeOut(EntityUid uid, LightSaberComponent comp, PulledToTimeOutEvent args) + private void OnTimeOut(EntityUid uid, LightsaberComponent comp, PulledToTimeOutEvent args) { - if (args.Handled || comp.LightSaberOwner != args.Component.PulledTo || args.Component.PulledTo == null) + if (args.Handled || comp.LightsaberOwner != args.Component.PulledTo || args.Component.PulledTo == null) return; _popup.PopupEntity(Loc.GetString(_hands.TryPickupAnyHand(args.Component.PulledTo.Value, uid) ? "Ваш световой меч телепортируется вам в руку!" : "ninja-hands-full"), args.Component.PulledTo.Value, args.Component.PulledTo.Value); } - private void OnRecall(EntityUid uid, ForceUserComponent comp, RecallLightSaberEvent args) + private void OnRecall(EntityUid uid, ForceUserComponent comp, RecallLightsaberEvent args) { - if (args.Handled || comp.LightSaber == null) + if (args.Handled || comp.Lightsaber == null) return; - if (_container.IsEntityInContainer(comp.LightSaber.Value) && !_container.TryRemoveFromContainer(comp.LightSaber.Value)) + if (_container.IsEntityInContainer(comp.Lightsaber.Value) && !_container.TryRemoveFromContainer(comp.Lightsaber.Value)) return; - if (TryComp(comp.LightSaber.Value, out var tetheredComponent)) + if (TryComp(comp.Lightsaber.Value, out var tetheredComponent)) _tetherGunSystem.StopTether(tetheredComponent.Tetherer, EnsureComp(tetheredComponent.Tetherer)); - _pullTo.TryPullTo(comp.LightSaber.Value, uid, PulledToOnEnter.PickUp, duration: 10f); + _pullTo.TryPullTo(comp.Lightsaber.Value, uid, PulledToOnEnter.PickUp, duration: 10f); args.Handled = true; } diff --git a/Content.Server/Stories/ForceUser/Systems/Actions/ForceUserSystem.Actions.Strangle.cs b/Content.Server/Stories/ForceUser/Systems/Actions/ForceUserSystem.Actions.Strangle.cs index 12052bcecf..bc665e3c27 100644 --- a/Content.Server/Stories/ForceUser/Systems/Actions/ForceUserSystem.Actions.Strangle.cs +++ b/Content.Server/Stories/ForceUser/Systems/Actions/ForceUserSystem.Actions.Strangle.cs @@ -2,10 +2,10 @@ using Content.Shared.Standing; using Content.Shared.Gravity; using Content.Shared.Speech.Muting; -using Content.Shared.SpaceStories.ForceUser.Actions.Events; +using Content.Shared.Stories.ForceUser.Actions.Events; using Content.Shared.Movement.Components; -namespace Content.Server.SpaceStories.ForceUser; +namespace Content.Server.Stories.ForceUser; public sealed partial class ForceUserSystem { public const float DamageLimit = 100f; diff --git a/Content.Server/Stories/ForceUser/Systems/Actions/ForceUserSystem.Actions.TetherHand.cs b/Content.Server/Stories/ForceUser/Systems/Actions/ForceUserSystem.Actions.TetherHand.cs index 0419601ebb..ac16ba0c7d 100644 --- a/Content.Server/Stories/ForceUser/Systems/Actions/ForceUserSystem.Actions.TetherHand.cs +++ b/Content.Server/Stories/ForceUser/Systems/Actions/ForceUserSystem.Actions.TetherHand.cs @@ -1,8 +1,8 @@ -using Content.Shared.SpaceStories.ForceUser; +using Content.Shared.Stories.ForceUser; using Content.Shared.Weapons.Misc; -using Content.Shared.SpaceStories.ForceUser.Actions.Events; +using Content.Shared.Stories.ForceUser.Actions.Events; -namespace Content.Server.SpaceStories.ForceUser; +namespace Content.Server.Stories.ForceUser; public sealed partial class ForceUserSystem { public const string HandTetherGunProto = "HandTetherGun"; diff --git a/Content.Server/Stories/ForceUser/Systems/Actions/ForceUserSystem.Actions.cs b/Content.Server/Stories/ForceUser/Systems/Actions/ForceUserSystem.Actions.cs index 21027630b4..b325c8041f 100644 --- a/Content.Server/Stories/ForceUser/Systems/Actions/ForceUserSystem.Actions.cs +++ b/Content.Server/Stories/ForceUser/Systems/Actions/ForceUserSystem.Actions.cs @@ -1,16 +1,16 @@ using Content.Shared.Cuffs.Components; using Content.Shared.Mindshield.Components; -using Content.Shared.SpaceStories.ForceUser.Actions.Events; +using Content.Shared.Stories.ForceUser.Actions.Events; using Content.Server.Store.Components; -using Content.Shared.SpaceStories.ForceUser; +using Content.Shared.Stories.ForceUser; using Robust.Shared.Physics.Components; using Content.Shared.Physics; using Content.Shared.Mobs; -using Content.Shared.SpaceStories.Empire.Components; -using Content.Server.SpaceStories.ForceUser.ProtectiveBubble.Components; +using Content.Shared.Stories.Empire.Components; +using Content.Server.Stories.ForceUser.ProtectiveBubble.Components; using Content.Shared.Store.Components; -namespace Content.Server.SpaceStories.ForceUser; +namespace Content.Server.Stories.ForceUser; public sealed partial class ForceUserSystem { public void InitializeSimpleActions() diff --git a/Content.Server/Stories/ForceUser/Systems/Actions/ForceUserSystem.LightSaber.cs b/Content.Server/Stories/ForceUser/Systems/Actions/ForceUserSystem.LightSaber.cs index b2ea298909..8377f1ca63 100644 --- a/Content.Server/Stories/ForceUser/Systems/Actions/ForceUserSystem.LightSaber.cs +++ b/Content.Server/Stories/ForceUser/Systems/Actions/ForceUserSystem.LightSaber.cs @@ -1,12 +1,12 @@ using Content.Shared.Inventory.Events; -using Content.Shared.SpaceStories.ForceUser; +using Content.Shared.Stories.ForceUser; using Content.Shared.Interaction.Events; using Content.Shared.Popups; using Content.Shared.Item; using Content.Shared.Weapons.Misc; -using Content.Shared.SpaceStories.Force.LightSaber; +using Content.Shared.Stories.Force.Lightsaber; using Content.Server.Weapons.Melee.EnergySword; -using Content.Server.SpaceStories.TetherGun; +using Content.Server.Stories.TetherGun; using Content.Shared.Damage; using Robust.Shared.Random; using Content.Shared.Throwing; @@ -15,38 +15,27 @@ using Content.Shared.Hands.EntitySystems; using Content.Shared.Physics; using Content.Shared.Interaction; -using Content.Server.SpaceStories.ForceUser; +using Content.Server.Stories.ForceUser; +using Content.Shared.Verbs; +using Content.Shared.Stories.ForceUser.Actions.Events; -namespace Content.Server.SpaceStories.ForceUser; +namespace Content.Server.Stories.ForceUser; public sealed partial class ForceUserSystem { - public void InitializeLightSaber() + public void InitializeLightsaber() { - SubscribeLocalEvent(OnDamage); - SubscribeLocalEvent(OnActivateAttempt); - SubscribeLocalEvent(OnEquipped); - SubscribeLocalEvent(OnTryPickUp); + SubscribeLocalEvent(OnDamage); + SubscribeLocalEvent(OnActivateAttempt); + SubscribeLocalEvent(OnEquipped); + SubscribeLocalEvent(OnTryPickUp); } - private void OnEquipped(EntityUid uid, LightSaberComponent comp, GotEquippedEvent args) + private void OnEquipped(EntityUid uid, LightsaberComponent comp, GotEquippedEvent args) { - if (!TryComp(args.Equipee, out var force) || force.LightSaber != null) + if (!TryComp(args.Equipee, out var force) || force.Lightsaber != null) return; - BindLightSaber(args.Equipee, uid, force); + BindLightsaber(args.Equipee, uid, force); } - public void UpdateLightSaber(float frameTime) - { - var query = EntityQueryEnumerator(); - while (query.MoveNext(out var uid, out var comp)) - { - //FIXME: Это дерьмо реально вызывает лаги. - if (comp.LightSaberOwner != null && !_interaction.InRangeUnobstructed(comp.LightSaberOwner.Value, _xform.GetMapCoordinates(uid), range: 10f)) - { - _tetherGunSystem.StopTether(uid); - return; - } - } - } - private void OnDamage(EntityUid uid, LightSaberComponent component, DamageChangedEvent args) + private void OnDamage(EntityUid uid, LightsaberComponent component, DamageChangedEvent args) { if (!HasComp(uid) || args.DamageDelta == null) return; if (args.DamageDelta.GetTotal() <= 0) return; @@ -64,17 +53,17 @@ private void OnDamage(EntityUid uid, LightSaberComponent component, DamageChange if (args.Origin != uid && args.Origin != null) _throwing.TryThrow(uid, _xform.GetWorldPosition(uid, GetEntityQuery()) - _xform.GetWorldPosition(Transform(args.Origin.Value), GetEntityQuery()), 10, uid, 0); } - private void OnTryPickUp(EntityUid uid, LightSaberComponent component, GettingPickedUpAttemptEvent args) + private void OnTryPickUp(EntityUid uid, LightsaberComponent component, GettingPickedUpAttemptEvent args) { - if (component.LightSaberOwner != null && args.User != component.LightSaberOwner && HasComp(uid)) + if (component.LightsaberOwner != null && args.User != component.LightsaberOwner && HasComp(uid)) args.Cancel(); - if (component.LightSaberOwner != args.User && _toggleSystem.IsActivated(uid)) + if (component.LightsaberOwner != args.User && _toggleSystem.IsActivated(uid)) _toggleSystem.TryDeactivate(uid); } - private void OnActivateAttempt(EntityUid uid, LightSaberComponent comp, ref ItemToggleActivateAttemptEvent args) + private void OnActivateAttempt(EntityUid uid, LightsaberComponent comp, ref ItemToggleActivateAttemptEvent args) { - if (comp.LightSaberOwner != args.User) // TODO: Черт, как его включить, если меня клонировали? + if (comp.LightsaberOwner != args.User) // TODO: Черт, как его включить, если меня клонировали? args.Cancelled = true; } } diff --git a/Content.Server/Stories/ForceUser/Systems/Actions/ForceUserSystem.cs b/Content.Server/Stories/ForceUser/Systems/Actions/ForceUserSystem.cs index ed5d463498..a98e5d7464 100644 --- a/Content.Server/Stories/ForceUser/Systems/Actions/ForceUserSystem.cs +++ b/Content.Server/Stories/ForceUser/Systems/Actions/ForceUserSystem.cs @@ -1,8 +1,8 @@ -using Content.Shared.SpaceStories.ForceUser; +using Content.Shared.Stories.ForceUser; using Content.Shared.Popups; using Content.Shared.Hands.EntitySystems; using Content.Shared.Throwing; -using Content.Server.SpaceStories.TetherGun; +using Content.Server.Stories.TetherGun; using Content.Server.Flash; using Content.Server.Emp; using Content.Server.Cuffs; @@ -19,24 +19,24 @@ using Content.Shared.Movement.Systems; using Content.Server.Popups; using Content.Shared.Inventory; -using Content.Server.SpaceStories.Empire; +using Content.Server.Stories.Empire; using Content.Server.Store.Systems; -using Content.Shared.SpaceStories.Force; +using Content.Shared.Stories.Force; using Content.Server.Polymorph.Systems; using Content.Shared.Tag; using Robust.Shared.Map; using Content.Server.Fluids.EntitySystems; using Content.Server.Administration.Systems; -using Content.Shared.SpaceStories.PullTo; +using Content.Shared.Stories.PullTo; using Robust.Shared.Random; using Content.Shared.Item.ItemToggle; using Content.Shared.Interaction; using Content.Server.Beam; -using Content.Server.SpaceStories.ForceUser.ProtectiveBubble.Systems; +using Content.Server.Stories.ForceUser.ProtectiveBubble.Systems; using Robust.Shared.Prototypes; using Content.Server.Stories.Conversion; -namespace Content.Server.SpaceStories.ForceUser; +namespace Content.Server.Stories.ForceUser; public sealed partial class ForceUserSystem : SharedForceUserSystem { [Dependency] private readonly IMapManager _mapManager = default!; @@ -89,13 +89,12 @@ public override void Initialize() InitializeStrangle(); InitializePolymorph(); InitializeProtectiveBubble(); - InitializeLightSaber(); + InitializeLightsaber(); InitializeLightning(); InitializeSteal(); } public override void Update(float frameTime) { base.Update(frameTime); - UpdateLightSaber(frameTime); } } diff --git a/Content.Server/Stories/ForceUser/Systems/FrozeBulletsSystem.cs b/Content.Server/Stories/ForceUser/Systems/FrozeBulletsSystem.cs index 5e830af2f5..7ea34dd6e3 100644 --- a/Content.Server/Stories/ForceUser/Systems/FrozeBulletsSystem.cs +++ b/Content.Server/Stories/ForceUser/Systems/FrozeBulletsSystem.cs @@ -1,11 +1,11 @@ -using Content.Server.SpaceStories.ForceUser.Components; +using Content.Server.Stories.ForceUser.Components; using Content.Shared.Projectiles; using Content.Shared.Popups; using Robust.Shared.Random; using Content.Shared.Explosion.Components.OnTrigger; using Content.Server.Explosion.EntitySystems; -namespace Content.Server.SpaceStories.ForceUser.Systems; +namespace Content.Server.Stories.ForceUser.Systems; public sealed class FrozeBulletsSystem : EntitySystem { diff --git a/Content.Server/Stories/ForceUser/Systems/PassiveGhostBooSystem.cs b/Content.Server/Stories/ForceUser/Systems/PassiveGhostBooSystem.cs index ca1e69afc4..05c8d9e2b9 100644 --- a/Content.Server/Stories/ForceUser/Systems/PassiveGhostBooSystem.cs +++ b/Content.Server/Stories/ForceUser/Systems/PassiveGhostBooSystem.cs @@ -1,7 +1,7 @@ -using Content.Server.SpaceStories.ForceUser.Components; +using Content.Server.Stories.ForceUser.Components; using Content.Server.Ghost; -namespace Content.Server.SpaceStories.ForceUser.Systems; +namespace Content.Server.Stories.ForceUser.Systems; public sealed class PassiveGhostBooSystem : EntitySystem { [Dependency] private readonly EntityLookupSystem _lookup = default!; diff --git a/Content.Server/Stories/ForceUser/Systems/SithGhostSystem.cs b/Content.Server/Stories/ForceUser/Systems/SithGhostSystem.cs index 794120a8f1..2000f1d553 100644 --- a/Content.Server/Stories/ForceUser/Systems/SithGhostSystem.cs +++ b/Content.Server/Stories/ForceUser/Systems/SithGhostSystem.cs @@ -2,11 +2,11 @@ using Content.Shared.Actions; using Content.Server.Light.Components; using Content.Shared.Polymorph; -using Content.Server.SpaceStories.ForceUser.Components; +using Content.Server.Stories.ForceUser.Components; using Content.Shared.Mind; using Content.Shared.Mind.Components; -namespace Content.Server.SpaceStories.ForceUser.Systems; +namespace Content.Server.Stories.ForceUser.Systems; public sealed partial class SithGhostSystem : EntitySystem { [Dependency] private readonly SharedActionsSystem _actions = default!; diff --git a/Content.Server/Stories/Nightvision/NightvisionSystem.cs b/Content.Server/Stories/Nightvision/NightvisionSystem.cs index 40619da79f..d5e5d9db9f 100644 --- a/Content.Server/Stories/Nightvision/NightvisionSystem.cs +++ b/Content.Server/Stories/Nightvision/NightvisionSystem.cs @@ -2,9 +2,9 @@ using Content.Shared.Inventory.Events; using Robust.Shared.Player; using Robust.Shared.Timing; -using Content.Shared.SpaceStories.Nightvision; +using Content.Shared.Stories.Nightvision; -namespace Content.Server.SpaceStories.Nightvision; +namespace Content.Server.Stories.Nightvision; public sealed class NightvisionSystem : EntitySystem { diff --git a/Content.Server/Stories/Partners/Commands/PickAntagCommands.cs b/Content.Server/Stories/Partners/Commands/PickAntagCommands.cs index db1127689f..3c28f2b426 100644 --- a/Content.Server/Stories/Partners/Commands/PickAntagCommands.cs +++ b/Content.Server/Stories/Partners/Commands/PickAntagCommands.cs @@ -3,7 +3,7 @@ using Content.Server.Communications; using Content.Shared.Administration; using Content.Shared.Communications; -using Content.Shared.SpaceStories.ForceUser; +using Content.Shared.Stories.ForceUser; using JetBrains.Annotations; using Robust.Server; using Robust.Server.GameObjects; diff --git a/Content.Server/Stories/ProtectiveBubble/Components/ProtectedByProtectiveBubbleComponent.cs b/Content.Server/Stories/ProtectiveBubble/Components/ProtectedByProtectiveBubbleComponent.cs index 8772ca4b9f..532f249d39 100644 --- a/Content.Server/Stories/ProtectiveBubble/Components/ProtectedByProtectiveBubbleComponent.cs +++ b/Content.Server/Stories/ProtectiveBubble/Components/ProtectedByProtectiveBubbleComponent.cs @@ -1,4 +1,4 @@ -namespace Content.Server.SpaceStories.ForceUser.ProtectiveBubble.Components; +namespace Content.Server.Stories.ForceUser.ProtectiveBubble.Components; [RegisterComponent] public sealed partial class ProtectedByProtectiveBubbleComponent : Component diff --git a/Content.Server/Stories/ProtectiveBubble/Components/ProtectiveBubbleComponent.cs b/Content.Server/Stories/ProtectiveBubble/Components/ProtectiveBubbleComponent.cs index 095b7bf3ea..d48b9a720a 100644 --- a/Content.Server/Stories/ProtectiveBubble/Components/ProtectiveBubbleComponent.cs +++ b/Content.Server/Stories/ProtectiveBubble/Components/ProtectiveBubbleComponent.cs @@ -5,7 +5,7 @@ using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom; using Robust.Shared.Prototypes; -namespace Content.Server.SpaceStories.ForceUser.ProtectiveBubble.Components; +namespace Content.Server.Stories.ForceUser.ProtectiveBubble.Components; [RegisterComponent] public sealed partial class ProtectiveBubbleComponent : Component diff --git a/Content.Server/Stories/ProtectiveBubble/Components/ProtectiveBubbleUserComponent.cs b/Content.Server/Stories/ProtectiveBubble/Components/ProtectiveBubbleUserComponent.cs index 4ac6d80f27..66e3e49ecf 100644 --- a/Content.Server/Stories/ProtectiveBubble/Components/ProtectiveBubbleUserComponent.cs +++ b/Content.Server/Stories/ProtectiveBubble/Components/ProtectiveBubbleUserComponent.cs @@ -5,7 +5,7 @@ using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom; using Robust.Shared.Prototypes; -namespace Content.Server.SpaceStories.ForceUser.ProtectiveBubble.Components; +namespace Content.Server.Stories.ForceUser.ProtectiveBubble.Components; [RegisterComponent] public sealed partial class ProtectiveBubbleUserComponent : Component diff --git a/Content.Server/Stories/ProtectiveBubble/Systems/ProtectiveBubbleSystem.Protect.cs b/Content.Server/Stories/ProtectiveBubble/Systems/ProtectiveBubbleSystem.Protect.cs index 2811bce8cb..c6a093d115 100644 --- a/Content.Server/Stories/ProtectiveBubble/Systems/ProtectiveBubbleSystem.Protect.cs +++ b/Content.Server/Stories/ProtectiveBubble/Systems/ProtectiveBubbleSystem.Protect.cs @@ -1,12 +1,12 @@ using Robust.Shared.Physics.Events; -using Content.Server.SpaceStories.ForceUser.ProtectiveBubble.Components; +using Content.Server.Stories.ForceUser.ProtectiveBubble.Components; using Content.Shared.Projectiles; using Content.Shared.Damage; using Content.Shared.Rounding; using SixLabors.ImageSharp.Processing; using Content.Shared.Alert; -namespace Content.Server.SpaceStories.ForceUser.ProtectiveBubble.Systems; +namespace Content.Server.Stories.ForceUser.ProtectiveBubble.Systems; public sealed partial class ProtectiveBubbleSystem { diff --git a/Content.Server/Stories/ProtectiveBubble/Systems/ProtectiveBubbleSystem.Protected.cs b/Content.Server/Stories/ProtectiveBubble/Systems/ProtectiveBubbleSystem.Protected.cs index b651d82487..778d3eb70a 100644 --- a/Content.Server/Stories/ProtectiveBubble/Systems/ProtectiveBubbleSystem.Protected.cs +++ b/Content.Server/Stories/ProtectiveBubble/Systems/ProtectiveBubbleSystem.Protected.cs @@ -1,9 +1,9 @@ using Content.Shared.Explosion; using Content.Shared.Temperature; using Content.Shared.Interaction.Events; -using Content.Server.SpaceStories.ForceUser.ProtectiveBubble.Components; +using Content.Server.Stories.ForceUser.ProtectiveBubble.Components; -namespace Content.Server.SpaceStories.ForceUser.ProtectiveBubble.Systems; +namespace Content.Server.Stories.ForceUser.ProtectiveBubble.Systems; public sealed partial class ProtectiveBubbleSystem { diff --git a/Content.Server/Stories/ProtectiveBubble/Systems/ProtectiveBubbleSystem.User.cs b/Content.Server/Stories/ProtectiveBubble/Systems/ProtectiveBubbleSystem.User.cs index 8dae7931f3..ea7983ae2f 100644 --- a/Content.Server/Stories/ProtectiveBubble/Systems/ProtectiveBubbleSystem.User.cs +++ b/Content.Server/Stories/ProtectiveBubble/Systems/ProtectiveBubbleSystem.User.cs @@ -1,19 +1,19 @@ -using Content.Shared.SpaceStories.ForceUser.Actions.Events; -using Content.Shared.SpaceStories.ForceUser; -using Content.Server.SpaceStories.ForceUser.ProtectiveBubble.Components; +using Content.Shared.Stories.ForceUser.Actions.Events; +using Content.Shared.Stories.ForceUser; +using Content.Server.Stories.ForceUser.ProtectiveBubble.Components; using Content.Shared.Weapons.Melee.Events; using Content.Shared.Actions; using Content.Shared.Popups; using Content.Shared.Weapons.Ranged.Events; -using Content.Shared.SpaceStories.Force.LightSaber; +using Content.Shared.Stories.Force.Lightsaber; using Robust.Shared.Prototypes; using Content.Shared.Alert; using Robust.Shared.Serialization.Manager; -using Content.Shared.SpaceStories.Force; +using Content.Shared.Stories.Force; using Content.Shared.Rounding; using Content.Shared.Damage; -namespace Content.Server.SpaceStories.ForceUser.ProtectiveBubble.Systems; +namespace Content.Server.Stories.ForceUser.ProtectiveBubble.Systems; public sealed partial class ProtectiveBubbleSystem { diff --git a/Content.Server/Stories/ProtectiveBubble/Systems/ProtectiveBubbleSystem.cs b/Content.Server/Stories/ProtectiveBubble/Systems/ProtectiveBubbleSystem.cs index 1504b8df19..0a682fbf46 100644 --- a/Content.Server/Stories/ProtectiveBubble/Systems/ProtectiveBubbleSystem.cs +++ b/Content.Server/Stories/ProtectiveBubble/Systems/ProtectiveBubbleSystem.cs @@ -1,10 +1,10 @@ using Content.Shared.StatusEffect; using Content.Shared.Actions; using Content.Shared.Damage; -using Content.Shared.SpaceStories.Force; +using Content.Shared.Stories.Force; using Content.Server.Weapons.Melee; using Content.Shared.Alert; -namespace Content.Server.SpaceStories.ForceUser.ProtectiveBubble.Systems; +namespace Content.Server.Stories.ForceUser.ProtectiveBubble.Systems; public sealed partial class ProtectiveBubbleSystem : EntitySystem { diff --git a/Content.Server/Stories/TetherGun/TetherGunSystem.cs b/Content.Server/Stories/TetherGun/TetherGunSystem.cs index c8d4784c1d..933a3bd6aa 100644 --- a/Content.Server/Stories/TetherGun/TetherGunSystem.cs +++ b/Content.Server/Stories/TetherGun/TetherGunSystem.cs @@ -1,7 +1,7 @@ using Content.Shared.Pulling.Events; using Content.Shared.Weapons.Misc; -namespace Content.Server.SpaceStories.TetherGun; +namespace Content.Server.Stories.TetherGun; public sealed class TetherGunSystem : SharedTetherGunSystem { diff --git a/Content.Shared/Stories/DoAfter/SharedDoAfterTargetSystem.cs b/Content.Shared/Stories/DoAfter/SharedDoAfterTargetSystem.cs index 23039506e7..c2c5342aa9 100644 --- a/Content.Shared/Stories/DoAfter/SharedDoAfterTargetSystem.cs +++ b/Content.Shared/Stories/DoAfter/SharedDoAfterTargetSystem.cs @@ -3,7 +3,7 @@ using Robust.Shared.Serialization; using Content.Shared.FixedPoint; -namespace Content.Shared.SpaceStories.DoAfter; +namespace Content.Shared.Stories.DoAfter; public sealed partial class SharedDoAfterTargetSystem : EntitySystem { [Dependency] private readonly SharedDoAfterSystem _doAfterSystem = default!; diff --git a/Content.Shared/Stories/Empire/Components/EmpireComponent.cs b/Content.Shared/Stories/Empire/Components/EmpireComponent.cs index 5c7f6f8c3a..e8d5b04486 100644 --- a/Content.Shared/Stories/Empire/Components/EmpireComponent.cs +++ b/Content.Shared/Stories/Empire/Components/EmpireComponent.cs @@ -3,7 +3,7 @@ using Robust.Shared.Prototypes; using Content.Shared.Antag; -namespace Content.Shared.SpaceStories.Empire.Components; +namespace Content.Shared.Stories.Empire.Components; [RegisterComponent, NetworkedComponent] public sealed partial class EmpireComponent : Component diff --git a/Content.Shared/Stories/Empire/Components/EmpireMemberRoleComponent.cs b/Content.Shared/Stories/Empire/Components/EmpireMemberRoleComponent.cs index 9a55732343..70dd59fcd8 100644 --- a/Content.Shared/Stories/Empire/Components/EmpireMemberRoleComponent.cs +++ b/Content.Shared/Stories/Empire/Components/EmpireMemberRoleComponent.cs @@ -1,6 +1,6 @@ using Content.Shared.Roles; -namespace Content.Shared.SpaceStories.Empire.Components; +namespace Content.Shared.Stories.Empire.Components; [RegisterComponent] public sealed partial class EmpireMemberRoleComponent : AntagonistRoleComponent { } diff --git a/Content.Shared/Stories/Empire/Components/HypnotizedEmpireComponent.cs b/Content.Shared/Stories/Empire/Components/HypnotizedEmpireComponent.cs index 3c15c239a6..9fae04ca87 100644 --- a/Content.Shared/Stories/Empire/Components/HypnotizedEmpireComponent.cs +++ b/Content.Shared/Stories/Empire/Components/HypnotizedEmpireComponent.cs @@ -1,6 +1,6 @@ using Robust.Shared.GameStates; -namespace Content.Shared.SpaceStories.Empire.Components; +namespace Content.Shared.Stories.Empire.Components; [RegisterComponent, NetworkedComponent] public sealed partial class HypnotizedEmpireComponent : Component { } diff --git a/Content.Shared/Stories/Empire/Components/HypnotizedEmpireMemberRoleComponent.cs b/Content.Shared/Stories/Empire/Components/HypnotizedEmpireMemberRoleComponent.cs index 8596844c9d..bebc7f1523 100644 --- a/Content.Shared/Stories/Empire/Components/HypnotizedEmpireMemberRoleComponent.cs +++ b/Content.Shared/Stories/Empire/Components/HypnotizedEmpireMemberRoleComponent.cs @@ -1,6 +1,6 @@ using Content.Shared.Roles; -namespace Content.Shared.SpaceStories.Empire.Components; +namespace Content.Shared.Stories.Empire.Components; [RegisterComponent] public sealed partial class HypnotizedEmpireMemberRoleComponent : AntagonistRoleComponent { } diff --git a/Content.Shared/Stories/Force/ForceComponent.cs b/Content.Shared/Stories/Force/ForceComponent.cs index ed2f46c4f9..a57bf63d2a 100644 --- a/Content.Shared/Stories/Force/ForceComponent.cs +++ b/Content.Shared/Stories/Force/ForceComponent.cs @@ -1,6 +1,6 @@ using Content.Shared.FixedPoint; -namespace Content.Shared.SpaceStories.Force; +namespace Content.Shared.Stories.Force; [RegisterComponent] public sealed partial class ForceComponent : Component diff --git a/Content.Shared/Stories/Force/ForceSystem.cs b/Content.Shared/Stories/Force/ForceSystem.cs index c1b20792d2..2960f703a6 100644 --- a/Content.Shared/Stories/Force/ForceSystem.cs +++ b/Content.Shared/Stories/Force/ForceSystem.cs @@ -3,22 +3,22 @@ using Content.Shared.Weapons.Melee.Events; using Content.Shared.Weapons.Ranged.Events; using Content.Shared.Hands.EntitySystems; -using Content.Shared.SpaceStories.Force.LightSaber; +using Content.Shared.Stories.Force.Lightsaber; using Robust.Shared.Physics.Events; using Content.Shared.Weapons.Misc; using Robust.Shared.Prototypes; using Robust.Shared.Serialization.Manager; -using Content.Shared.SpaceStories.ForceUser.Actions.Events; +using Content.Shared.Stories.ForceUser.Actions.Events; using Robust.Shared.Timing; using Content.Shared.Atmos.Piping; using Content.Shared.Body.Components; -using Content.Shared.SpaceStories.ForceUser; +using Content.Shared.Stories.ForceUser; using Robust.Shared.Utility; using Content.Shared.FixedPoint; using Content.Shared.Alert; using Content.Shared.Mobs.Systems; -namespace Content.Shared.SpaceStories.Force; +namespace Content.Shared.Stories.Force; public sealed partial class ForceSystem : EntitySystem // TODO: Навести порядок с Float и FixedPoint2 { [Dependency] private readonly AlertsSystem _alerts = default!; diff --git a/Content.Shared/Stories/ForceUser/Components/ForceUserComponent.cs b/Content.Shared/Stories/ForceUser/Components/ForceUserComponent.cs index 32ccdfce69..78917561f0 100644 --- a/Content.Shared/Stories/ForceUser/Components/ForceUserComponent.cs +++ b/Content.Shared/Stories/ForceUser/Components/ForceUserComponent.cs @@ -9,7 +9,7 @@ using Robust.Shared.Prototypes; using Content.Shared.Alert; -namespace Content.Shared.SpaceStories.ForceUser; +namespace Content.Shared.Stories.ForceUser; [RegisterComponent, AutoGenerateComponentState] [Access(typeof(SharedForceUserSystem))] @@ -24,7 +24,7 @@ public sealed partial class ForceUserComponent : Component public string AlertType() => _proto.TryIndex(Preset, out var proto) ? proto.AlertType : "ForceVolume"; [DataField("lightsaber"), AutoNetworkedField] - public EntityUid? LightSaber { get; set; } = null; + public EntityUid? Lightsaber { get; set; } = null; [DataField("equipments")] public Dictionary? Equipments { get; set; } = null; diff --git a/Content.Shared/Stories/ForceUser/Components/LightSaberComponent.cs b/Content.Shared/Stories/ForceUser/Components/LightSaberComponent.cs index 46ce219dc9..53cca148f8 100644 --- a/Content.Shared/Stories/ForceUser/Components/LightSaberComponent.cs +++ b/Content.Shared/Stories/ForceUser/Components/LightSaberComponent.cs @@ -1,12 +1,12 @@ using Robust.Shared.GameStates; -namespace Content.Shared.SpaceStories.Force.LightSaber; +namespace Content.Shared.Stories.Force.Lightsaber; [RegisterComponent, AutoGenerateComponentState] -public sealed partial class LightSaberComponent : Component +public sealed partial class LightsaberComponent : Component { [DataField("lightSaberOwner"), AutoNetworkedField] - public EntityUid? LightSaberOwner; + public EntityUid? LightsaberOwner; [DataField("deactivateProb")] public float DeactivateProb = 0.5f; diff --git a/Content.Shared/Stories/ForceUser/Prototypes/ForcePresetPrototype.cs b/Content.Shared/Stories/ForceUser/Prototypes/ForcePresetPrototype.cs index 99ff6e5ae8..22ae457242 100644 --- a/Content.Shared/Stories/ForceUser/Prototypes/ForcePresetPrototype.cs +++ b/Content.Shared/Stories/ForceUser/Prototypes/ForcePresetPrototype.cs @@ -1,7 +1,7 @@ using Robust.Shared.Prototypes; using Content.Shared.Alert; -namespace Content.Shared.SpaceStories.ForceUser; +namespace Content.Shared.Stories.ForceUser; [Prototype("forcePreset"), DataDefinition] public sealed partial class ForcePresetPrototype : IPrototype @@ -33,7 +33,7 @@ public sealed partial class ForcePresetPrototype : IPrototype [DataField("componentsToRemove")] [AlwaysPushInheritance] - public HashSet ToRemove = new(); + public ComponentRegistry ToRemove = new(); } public enum ForceSide : byte { diff --git a/Content.Shared/Stories/ForceUser/Systems/ForceUserSystem.Actions.Events.cs b/Content.Shared/Stories/ForceUser/Systems/ForceUserSystem.Actions.Events.cs index b3c851ed73..d73ae6884a 100644 --- a/Content.Shared/Stories/ForceUser/Systems/ForceUserSystem.Actions.Events.cs +++ b/Content.Shared/Stories/ForceUser/Systems/ForceUserSystem.Actions.Events.cs @@ -3,15 +3,15 @@ using Content.Shared.Damage; using Robust.Shared.Serialization; using Content.Shared.Actions; -using Content.Shared.SpaceStories.Force; +using Content.Shared.Stories.Force; using Content.Shared.Polymorph; using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype; using Content.Shared.Chemistry.Components; using Robust.Shared.Prototypes; -namespace Content.Shared.SpaceStories.ForceUser.Actions.Events; +namespace Content.Shared.Stories.ForceUser.Actions.Events; -// "Простые" события, которые не нуждаются в Content.Shared.SpaceStories.ForceUser.Components +// "Простые" события, которые не нуждаются в Content.Shared.Stories.ForceUser.Components // ? Возможно стоит их убрать отсюда? #region Simple public sealed partial class LightningStrikeEvent : EntityTargetActionEvent { } @@ -86,7 +86,7 @@ public sealed partial class CreateProtectiveBubbleEvent : InstantActionEvent public sealed partial class StopProtectiveBubbleEvent : InstantActionEvent { } #endregion -// События работа которых завязана на Content.Shared.SpaceStories.ForceUser.Components +// События работа которых завязана на Content.Shared.Stories.ForceUser.Components #region ForceUser public sealed partial class ForceShopActionEvent : InstantActionEvent { } public sealed partial class ForceLookUpActionEvent : InstantActionEvent @@ -99,7 +99,7 @@ public sealed partial class FrozeBulletsActionEvent : InstantActionEvent [DataField("seconds")] public float Seconds = 10; } -public sealed partial class RecallLightSaberEvent : InstantActionEvent { } +public sealed partial class RecallLightsaberEvent : InstantActionEvent { } public sealed partial class RecallEquipmentsEvent : InstantActionEvent { } public sealed partial class SithPolymorphEvent : InstantActionEvent { @@ -233,3 +233,21 @@ public sealed partial class WorldTargetForceUserActionEvent : WorldTargetActionE [NonSerialized] public WorldTargetActionEvent? Event = null; } + +[Serializable, NetSerializable] +public sealed partial class LightsaberDetachedEvent : SimpleDoAfterEvent +{ + +} + +[Serializable, NetSerializable] +public sealed partial class LightsaberConnectedEvent : SimpleDoAfterEvent +{ + +} + +[Serializable, NetSerializable] +public sealed partial class LightsaberHackedEvent : SimpleDoAfterEvent +{ + +} diff --git a/Content.Shared/Stories/ForceUser/Systems/ForceUserSystem.cs b/Content.Shared/Stories/ForceUser/Systems/ForceUserSystem.cs index f510180b2c..1e9116a6cb 100644 --- a/Content.Shared/Stories/ForceUser/Systems/ForceUserSystem.cs +++ b/Content.Shared/Stories/ForceUser/Systems/ForceUserSystem.cs @@ -1,14 +1,16 @@ using Content.Shared.Actions; using Content.Shared.Popups; using Content.Shared.Weapons.Ranged.Events; -using Content.Shared.SpaceStories.Force.LightSaber; +using Content.Shared.Stories.Force.Lightsaber; using Robust.Shared.Prototypes; using Content.Shared.Alert; using Robust.Shared.Serialization.Manager; -using Content.Shared.SpaceStories.Force; +using Content.Shared.Stories.Force; using Content.Shared.Rounding; +using Content.Shared.DoAfter; +using Content.Shared.Mobs.Systems; -namespace Content.Shared.SpaceStories.ForceUser; +namespace Content.Shared.Stories.ForceUser; public abstract partial class SharedForceUserSystem : EntitySystem { [Dependency] private readonly SharedPopupSystem _popup = default!; @@ -18,6 +20,8 @@ public abstract partial class SharedForceUserSystem : EntitySystem [Dependency] private readonly IComponentFactory _compFact = default!; [Dependency] private readonly ISerializationManager _seriMan = default!; [Dependency] private readonly AlertsSystem _alerts = default!; + [Dependency] private readonly SharedDoAfterSystem _doAfter = default!; + [Dependency] private readonly MobStateSystem _mobState = default!; private ISawmill _sawmill = default!; public override void Initialize() { @@ -29,6 +33,7 @@ public override void Initialize() SubscribeLocalEvent(OnShotAttempted); SubscribeLocalEvent(OnVolume); InitializeActions(); + InitializeLightsaber(); } private void OnVolume(EntityUid uid, ForceUserComponent component, VolumeChangedEvent args) { @@ -46,22 +51,8 @@ private void OnStart(EntityUid uid, ForceUserComponent component, ComponentStart if (!_force.SetVolume(uid, proto.Volume, proto.PassiveVolume, proto.MaxVolume)) _sawmill.Error($"{ToPrettyString(uid)} failed to set force volume"); - foreach (var toRemove in proto.ToRemove) - { - if (_compFact.TryGetRegistration(toRemove, out var registration)) - RemComp(uid, registration.Type); - } - - foreach (var (name, data) in proto.ToAdd) - { - if (HasComp(uid, data.Component.GetType())) - continue; - - var comp = (Component) _compFact.GetComponent(name); - var temp = (object) comp; - _seriMan.CopyTo(data.Component, ref temp); - EntityManager.AddComponent(uid, (Component) temp!); - } + EntityManager.RemoveComponents(uid, proto.ToRemove); + EntityManager.AddComponents(uid, proto.ToAdd); } private void OnInit(EntityUid uid, ForceUserComponent component, ComponentInit args) { @@ -72,15 +63,6 @@ private void OnShutdown(EntityUid uid, ForceUserComponent component, ComponentSh { Del(component.ShopActionEntity); } - public void BindLightSaber(EntityUid uid, EntityUid? lightsaber, ForceUserComponent? comp = null) - { - if (!Resolve(uid, ref comp) || comp.LightSaber == lightsaber || !TryComp(lightsaber, out var saber) || saber.LightSaberOwner != null) - return; - _popup.PopupEntity(Loc.GetString("Вы чувствуете связь с мечом..."), uid, uid); - - comp.LightSaber = lightsaber; - saber.LightSaberOwner = uid; - } private void OnShotAttempted(EntityUid uid, ForceUserComponent comp, ref ShotAttemptedEvent args) { _popup.PopupEntity(Loc.GetString("gun-disabled"), uid, uid); diff --git a/Content.Shared/Stories/ForceUser/Systems/ForseUserSystem.Actions.cs b/Content.Shared/Stories/ForceUser/Systems/ForseUserSystem.Actions.cs index c706183da5..a3707e5a41 100644 --- a/Content.Shared/Stories/ForceUser/Systems/ForseUserSystem.Actions.cs +++ b/Content.Shared/Stories/ForceUser/Systems/ForseUserSystem.Actions.cs @@ -3,15 +3,15 @@ using Content.Shared.Weapons.Melee.Events; using Content.Shared.Weapons.Ranged.Events; using Content.Shared.Hands.EntitySystems; -using Content.Shared.SpaceStories.Force.LightSaber; +using Content.Shared.Stories.Force.Lightsaber; using Robust.Shared.Physics.Events; using Content.Shared.Weapons.Misc; using Robust.Shared.Prototypes; using Robust.Shared.Serialization.Manager; -using Content.Shared.SpaceStories.ForceUser.Actions.Events; -using Content.Shared.SpaceStories.Force; +using Content.Shared.Stories.ForceUser.Actions.Events; +using Content.Shared.Stories.Force; -namespace Content.Shared.SpaceStories.ForceUser; +namespace Content.Shared.Stories.ForceUser; public abstract partial class SharedForceUserSystem { private void InitializeActions() @@ -65,7 +65,7 @@ private void OnForceAction(EntityUid uid, ForceComponent component, IForceAction _popup.PopupEntity("Недостаточно сил!", uid, uid, PopupType.SmallCaution); return; } - RaiseLocalEvent(eventToRaise.Performer, (object) eventToRaise, true); + RaiseLocalEvent(eventToRaise.Performer, (object)eventToRaise, true); argsBaseAction.Handled = true; } diff --git a/Content.Shared/Stories/ForceUser/Systems/ForseUserSystem.Lightsaber.cs b/Content.Shared/Stories/ForceUser/Systems/ForseUserSystem.Lightsaber.cs new file mode 100644 index 0000000000..d4da57efac --- /dev/null +++ b/Content.Shared/Stories/ForceUser/Systems/ForseUserSystem.Lightsaber.cs @@ -0,0 +1,155 @@ +using Content.Shared.Actions; +using Content.Shared.Popups; +using Content.Shared.Weapons.Melee.Events; +using Content.Shared.Weapons.Ranged.Events; +using Content.Shared.Hands.EntitySystems; +using Content.Shared.Stories.Force.Lightsaber; +using Robust.Shared.Physics.Events; +using Content.Shared.Weapons.Misc; +using Robust.Shared.Prototypes; +using Robust.Shared.Serialization.Manager; +using Content.Shared.Stories.ForceUser.Actions.Events; +using Content.Shared.Stories.Force; +using Content.Shared.Verbs; + +namespace Content.Shared.Stories.ForceUser; +public abstract partial class SharedForceUserSystem +{ + private void InitializeLightsaber() + { + SubscribeLocalEvent>(OnGetVerbs); + SubscribeLocalEvent(OnConnected); + SubscribeLocalEvent(OnDetached); + SubscribeLocalEvent(OnHacked); + } + private void OnGetVerbs(EntityUid uid, LightsaberComponent component, GetVerbsEvent args) + { + if (!args.CanAccess || !args.CanInteract) + return; + + if (!HasComp(args.User)) + return; + + if (component.LightsaberOwner == null) + { + args.Verbs.Add(new InteractionVerb() + { + Text = Loc.GetString("lightsaber-tie"), + Act = () => + { + var doAfterEventArgs = new Shared.DoAfter.DoAfterArgs(EntityManager, args.User, TimeSpan.FromSeconds(10f), new LightsaberConnectedEvent(), uid, uid) + { + BreakOnMove = true, + BreakOnDamage = true, + NeedHand = true, + }; + + _doAfter.TryStartDoAfter(doAfterEventArgs); + } + }); + } + else if (component.LightsaberOwner is { } owner && _mobState.IsAlive(owner)) + { + args.Verbs.Add(new InteractionVerb() + { + Text = Loc.GetString("lightsaber-untie"), + Act = () => + { + var doAfterEventArgs = new Shared.DoAfter.DoAfterArgs(EntityManager, args.User, TimeSpan.FromSeconds(10f), new LightsaberDetachedEvent(), uid, uid) + { + BreakOnMove = true, + BreakOnDamage = true, + NeedHand = true, + }; + + _doAfter.TryStartDoAfter(doAfterEventArgs); + } + }); + } + else + { + args.Verbs.Add(new InteractionVerb() + { + Text = Loc.GetString("lightsaber-break"), + Act = () => + { + var doAfterEventArgs = new Shared.DoAfter.DoAfterArgs(EntityManager, args.User, TimeSpan.FromSeconds(10f), new LightsaberHackedEvent(), uid, uid) + { + BreakOnMove = true, + BreakOnDamage = true, + NeedHand = true, + }; + + _doAfter.TryStartDoAfter(doAfterEventArgs); + } + }); + } + } + + private void OnConnected(EntityUid uid, LightsaberComponent component, LightsaberConnectedEvent args) + { + if (args.Cancelled || args.Handled) + return; + + BindLightsaber(args.User, uid); + + args.Handled = true; + } + + private void OnDetached(EntityUid uid, LightsaberComponent component, LightsaberDetachedEvent args) + { + if (args.Cancelled || args.Handled) + return; + + UnbindLightsaber(args.User); + + args.Handled = true; + } + + private void OnHacked(EntityUid uid, LightsaberComponent component, LightsaberHackedEvent args) + { + if (args.Cancelled || args.Handled) + return; + + BindLightsaber(args.User, uid); + + args.Handled = true; + } + + protected void BindLightsaber(EntityUid uid, EntityUid lightsaber, ForceUserComponent? forceUserComponent = null, LightsaberComponent? lightsaberComponent = null) + { + if (!Resolve(uid, ref forceUserComponent)) + return; + + if (!Resolve(lightsaber, ref lightsaberComponent)) + return; + + if (lightsaberComponent.LightsaberOwner == uid) + return; + + if (lightsaberComponent.LightsaberOwner != null) + UnbindLightsaber(lightsaberComponent.LightsaberOwner.Value); + + _popup.PopupEntity(Loc.GetString("Вы чувствуете связь с мечом..."), uid, uid); // FIXME: Hardcode + + forceUserComponent.Lightsaber = lightsaber; + lightsaberComponent.LightsaberOwner = uid; + } + + protected void UnbindLightsaber(EntityUid uid, ForceUserComponent? forceUserComponent = null) + { + if (!Resolve(uid, ref forceUserComponent)) + return; + + if (!(forceUserComponent.Lightsaber is { } lightsaber)) + return; + + var lightsaberComponent = Comp(lightsaber); + + _popup.PopupEntity(Loc.GetString("Вы чувствуете разрыв связи с мечом..."), uid, uid); // FIXME: Hardcode + + forceUserComponent.Lightsaber = null; + lightsaberComponent.LightsaberOwner = null; + } + +} diff --git a/Content.Shared/Stories/InjectReagents/InjectReagentsSystem.cs b/Content.Shared/Stories/InjectReagents/InjectReagentsSystem.cs index a83ac5ddb5..20832372b0 100644 --- a/Content.Shared/Stories/InjectReagents/InjectReagentsSystem.cs +++ b/Content.Shared/Stories/InjectReagents/InjectReagentsSystem.cs @@ -4,7 +4,7 @@ using Content.Shared.Whitelist; using Content.Shared.Chemistry.Components.SolutionManager; -namespace Content.Shared.SpaceStories.InjectReagents; +namespace Content.Shared.Stories.InjectReagents; public sealed partial class InjectReagentsSystem : EntitySystem { [Dependency] private readonly SharedSolutionContainerSystem _solutions = default!; diff --git a/Content.Shared/Stories/Nightvision/NightvisionComponent.cs b/Content.Shared/Stories/Nightvision/NightvisionComponent.cs index 96fa4f8820..2a6003e849 100644 --- a/Content.Shared/Stories/Nightvision/NightvisionComponent.cs +++ b/Content.Shared/Stories/Nightvision/NightvisionComponent.cs @@ -1,7 +1,7 @@ using Content.Shared.Eye.Blinding.Systems; using Robust.Shared.GameStates; -namespace Content.Shared.SpaceStories.Nightvision; +namespace Content.Shared.Stories.Nightvision; [RegisterComponent] [NetworkedComponent, AutoGenerateComponentState] diff --git a/Content.Shared/Stories/PullTo/Components/PulledToComponent.cs b/Content.Shared/Stories/PullTo/Components/PulledToComponent.cs index 6907886ffd..9ab843b3c3 100644 --- a/Content.Shared/Stories/PullTo/Components/PulledToComponent.cs +++ b/Content.Shared/Stories/PullTo/Components/PulledToComponent.cs @@ -1,4 +1,4 @@ -namespace Content.Shared.SpaceStories.PullTo; +namespace Content.Shared.Stories.PullTo; [RegisterComponent, AutoGenerateComponentState] [Access(typeof(PullToSystem))] diff --git a/Content.Shared/Stories/PullTo/PullToSystem.cs b/Content.Shared/Stories/PullTo/PullToSystem.cs index e5084e4933..bf3108a82b 100644 --- a/Content.Shared/Stories/PullTo/PullToSystem.cs +++ b/Content.Shared/Stories/PullTo/PullToSystem.cs @@ -3,20 +3,20 @@ using Content.Shared.Weapons.Melee.Events; using Content.Shared.Weapons.Ranged.Events; using Content.Shared.Hands.EntitySystems; -using Content.Shared.SpaceStories.Force.LightSaber; +using Content.Shared.Stories.Force.Lightsaber; using Robust.Shared.Physics.Events; using Content.Shared.Weapons.Misc; using Robust.Shared.Prototypes; using Robust.Shared.Serialization.Manager; -using Content.Shared.SpaceStories.ForceUser.Actions.Events; -using Content.Shared.SpaceStories.Force; +using Content.Shared.Stories.ForceUser.Actions.Events; +using Content.Shared.Stories.Force; using Content.Shared.Throwing; using Content.Shared.Inventory; using Robust.Shared.Physics.Systems; using Robust.Shared.Physics.Components; using System.Numerics; -namespace Content.Shared.SpaceStories.PullTo; +namespace Content.Shared.Stories.PullTo; public sealed partial class PullToSystem : EntitySystem { [Dependency] private readonly ThrowingSystem _throwing = default!; diff --git a/Content.Shared/Stories/PushOnCollide/PushOnCollideComponent.cs b/Content.Shared/Stories/PushOnCollide/PushOnCollideComponent.cs index ca26a0e738..29b9d1bd08 100644 --- a/Content.Shared/Stories/PushOnCollide/PushOnCollideComponent.cs +++ b/Content.Shared/Stories/PushOnCollide/PushOnCollideComponent.cs @@ -1,6 +1,6 @@ using Robust.Shared.Audio; -namespace Content.Shared.SpaceStories.Damage.Components; +namespace Content.Shared.Stories.Damage.Components; [RegisterComponent] public sealed partial class PushOnCollideComponent : Component diff --git a/Content.Shared/Stories/PushOnCollide/PushOnCollideSystem.cs b/Content.Shared/Stories/PushOnCollide/PushOnCollideSystem.cs index b0d989932e..6d57de762f 100644 --- a/Content.Shared/Stories/PushOnCollide/PushOnCollideSystem.cs +++ b/Content.Shared/Stories/PushOnCollide/PushOnCollideSystem.cs @@ -1,8 +1,8 @@ -using Content.Shared.SpaceStories.Damage.Components; +using Content.Shared.Stories.Damage.Components; using Content.Shared.Projectiles; using Content.Shared.Throwing; -namespace Content.Shared.SpaceStories.Damage.Systems; +namespace Content.Shared.Stories.Damage.Systems; public sealed partial class PushOnCollideSystem : EntitySystem { // TODO: Добавить откидывание при контакте с кем-то и значения в компонент diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/stories/entities/objects/weapons/melee/lightsaber.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/stories/entities/objects/weapons/melee/lightsaber.ftl index 1cd50a19d4..5d4c0ee5a3 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/stories/entities/objects/weapons/melee/lightsaber.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/stories/entities/objects/weapons/melee/lightsaber.ftl @@ -1,2 +1,2 @@ -ent-LightSaberJediNt = световой меч +ent-LightsaberJediNt = световой меч .desc = Особенное оружие, созданное сколь для элегантного боя, сколь и для церемонний, его работа связана с кайбер-кристаллом внутри. diff --git a/Resources/Locale/ru-RU/stories/lightsaber.ftl b/Resources/Locale/ru-RU/stories/lightsaber.ftl new file mode 100644 index 0000000000..48dac7d5c1 --- /dev/null +++ b/Resources/Locale/ru-RU/stories/lightsaber.ftl @@ -0,0 +1,3 @@ +lightsaber-tie = Связать меч +lightsaber-untie = Отвязать меч +lightsaber-break = Взломать меч diff --git a/Resources/Prototypes/Stories/Actions/force/general.yml b/Resources/Prototypes/Stories/Actions/force/general.yml index 0866df403f..6d2912e18d 100644 --- a/Resources/Prototypes/Stories/Actions/force/general.yml +++ b/Resources/Prototypes/Stories/Actions/force/general.yml @@ -51,7 +51,7 @@ event: !type:ForceLookUpActionEvent - type: entity - id: ActionRecallLightSaber + id: ActionRecallLightsaber name: Призвать световой меч description: Телепортируйте свой световой меч к себе. Чем дальше меч, тем больше времени понадобится, чтобы притянуть меч во второй раз. noSpawn: true @@ -62,7 +62,7 @@ itemIconStyle: NoItem event: !type:InstantForceUserActionEvent volume: 25 - event: !type:RecallLightSaberEvent {} + event: !type:RecallLightsaberEvent {} - type: entity id: ActionTelekinesis diff --git a/Resources/Prototypes/Stories/Catalog/general_catalog.yml b/Resources/Prototypes/Stories/Catalog/general_catalog.yml index 76642a9dce..9fcd9619ac 100644 --- a/Resources/Prototypes/Stories/Catalog/general_catalog.yml +++ b/Resources/Prototypes/Stories/Catalog/general_catalog.yml @@ -38,10 +38,10 @@ stock: 1 - type: listing - id: ActionRecallLightSaber + id: ActionRecallLightsaber name: Призвать световой меч description: Призовите ваш световой меч к себе. Если он не сможет настигнуть вас, то телепортируется к вам. - productAction: ActionRecallLightSaber + productAction: ActionRecallLightsaber cost: SkillPoint: 2 categories: diff --git a/Resources/Prototypes/Stories/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/Stories/Entities/Clothing/Belt/belts.yml index 3301622f05..b3b33f0ced 100644 --- a/Resources/Prototypes/Stories/Entities/Clothing/Belt/belts.yml +++ b/Resources/Prototypes/Stories/Entities/Clothing/Belt/belts.yml @@ -48,10 +48,10 @@ ejectVerbText: sheath-eject-verb whitelist: components: - - LightSaber + - Lightsaber - type: ItemMapper mapLayers: sheath-sabre: whitelist: components: - - LightSaber + - Lightsaber diff --git a/Resources/Prototypes/Stories/Entities/Clothing/Shoes/boots.yml b/Resources/Prototypes/Stories/Entities/Clothing/Shoes/boots.yml index 1fe6d1de97..caf2f2ef06 100644 --- a/Resources/Prototypes/Stories/Entities/Clothing/Shoes/boots.yml +++ b/Resources/Prototypes/Stories/Entities/Clothing/Shoes/boots.yml @@ -74,11 +74,6 @@ sprite: Stories/Clothing/Shoes/Boots/exe_boots.rsi - type: Magboots toggleAction: ActionToggleMagbootsAdvanced - - type: ClothingSpeedModifier - walkModifier: 1 - sprintModifier: 1 - enabled: false - - type: NoSlip - type: Tag tags: - WhitelistChameleon diff --git a/Resources/Prototypes/Stories/Entities/Objects/Weapons/Melee/lightsaber.yml b/Resources/Prototypes/Stories/Entities/Objects/Weapons/Melee/lightsaber.yml index 8952537ccc..8b430a9b66 100644 --- a/Resources/Prototypes/Stories/Entities/Objects/Weapons/Melee/lightsaber.yml +++ b/Resources/Prototypes/Stories/Entities/Objects/Weapons/Melee/lightsaber.yml @@ -10,7 +10,7 @@ path: /Audio/Weapons/eblademiss.ogg params: variation: 0.125 - - type: LightSaber + - type: Lightsaber - type: ItemToggleDamageContacts activatedSoundOnHit: path: /Audio/Weapons/eblade1.ogg @@ -225,7 +225,7 @@ friction: 0.2 - type: MeleeWeapon wideAnimationRotation: -135 - attackRate: 3 + attackRate: 2 damage: types: Blunt: 4.5 @@ -247,7 +247,7 @@ types: Slash: 7.5 Heat: 7.5 - Structural: 10 + Structural: 5 - type: Reflect enabled: false reflectProb: 0.25 @@ -278,17 +278,6 @@ id: LightsaberCrossguard description: Особенное оружие, созданное сколь для элегантного боя, сколь и для церемонний, его работа связана с кайбер-кристаллом внутри. components: - - type: Reflect - enabled: false - reflectProb: 0.75 - spread: 90 - reflects: - - Energy - - type: BlockMeleeAttack - enabled: false - blockProb: 0.75 - blockSound: - path: /Audio/Weapons/eblade1.ogg - type: Item size: Small sprite: Stories/Objects/Weapons/Melee/e_sword_kylo_inhand.rsi @@ -329,26 +318,6 @@ Slash: 7.5 Heat: 7.5 Structural: 15 - - type: BlockMeleeAttack - enabled: false - blockSound: - path: /Audio/Weapons/eblade1.ogg - - type: DamageOtherOnHit - soundHit: - path: /Audio/Weapons/eblade1.ogg - damage: - types: - Blunt: 0 - - type: DamageContacts - soundHit: - path: /Audio/Weapons/eblade1.ogg - onlyTethered: true - damage: - types: - Structural: 0 - ignoreWhitelist: - components: - - ForceUser # Чувствительные к силе отражают это, так как иначе бы это было имбой против них. - type: ItemToggleMeleeWeapon activatedSoundOnSwing: path: /Audio/Weapons/eblademiss.ogg @@ -357,8 +326,8 @@ variation: 0.250 activatedDamage: types: - Slash: 12 - Heat: 12 + Slash: 11.25 + Heat: 11.25 Structural: 15 - type: ItemToggleActiveSound activeSound: @@ -384,12 +353,6 @@ - type: Item size: Small sprite: Stories/Objects/Weapons/Melee/e_sword_double-inhands.rsi - - type: Reflect - enabled: false - reflectProb: 0.75 - spread: 90 - reflects: - - Energy # Red diff --git a/Resources/Prototypes/Stories/Force/presets.yml b/Resources/Prototypes/Stories/Force/presets.yml index c21116c5ca..9c45f0ad18 100644 --- a/Resources/Prototypes/Stories/Force/presets.yml +++ b/Resources/Prototypes/Stories/Force/presets.yml @@ -43,7 +43,7 @@ currencyWhitelist: - SkillPoint componentsToRemove: - - Strippable + - type: Strippable - type: forcePreset id: Jedi diff --git a/Resources/Prototypes/Stories/Roles/Jobs/Security/jedi_nt.yml b/Resources/Prototypes/Stories/Roles/Jobs/Security/jedi_nt.yml index abf725cc13..2cb0b580fa 100644 --- a/Resources/Prototypes/Stories/Roles/Jobs/Security/jedi_nt.yml +++ b/Resources/Prototypes/Stories/Roles/Jobs/Security/jedi_nt.yml @@ -47,7 +47,7 @@ # eyes: ClothingEyesGlassesSecurity # jumpsuit: ClothingUniformJumpsuitJediNt # shoes: ClothingShoesBootsJackJediNt - # pocket1: LightSaberJediNt + # pocket1: LightsaberJediNt # outerClothing: ClothingOuterVestJediNt # neck: ClothingNeckMantleJediNt @@ -58,7 +58,7 @@ # # back: ClothingBackpackJediNtFilled # shoes: ClothingShoesBootsJackJedi # # eyes: ClothingEyesGlassesSunglasses -# pocket1: LightSaberJediNt +# pocket1: LightsaberJediNt # outerClothing: ClothingOuterCoatJediFilled # id: JediNtPDA # ears: ClothingHeadsetJediNtAlt