From 28c8b45eec5534c9d19a4226258b6b665ee58c82 Mon Sep 17 00:00:00 2001 From: Cinka Date: Tue, 20 Feb 2024 14:28:01 +0300 Subject: [PATCH] - add: interface for interaction --- .../Humanoid/HumanoidAppearanceSystem.cs | 16 +++--- .../InteractionPanel/InteractionPanelEui.cs | 27 ++++++++++ .../InteractionPanelWindow.xaml | 51 ++++++++++++++++++ .../InteractionPanelWindow.xaml.cs | 16 ++++++ .../Systems/HumanoidAppearanceSystem.cs | 16 ++++-- .../_Amour/Hole/HoleSystem.Solution.cs | 37 +++++++++++++ .../InteractionPanel/InteractionPanelEui.cs | 11 ++++ .../InteractionPanelSystem.cs | 27 ++++++++++ Content.Shared/Alert/AlertCategory.cs | 1 + Content.Shared/Alert/AlertType.cs | 1 + .../_Amour/Arousal/ArousalComponent.cs | 9 ++++ .../_Amour/Arousal/ArousalEvents.cs | 5 ++ .../_Amour/Arousal/ArousalSystem.cs | 51 ++++++++++++++++++ .../_Amour/Hole/HoleSystem.Container.cs | 13 ++++- Content.Shared/_Amour/Hole/HoleSystem.cs | 7 ++- .../HumanoidAppearanceLoading.cs | 13 +++++ Resources/Prototypes/Alerts/alerts.yml | 1 + .../Prototypes/Entities/Mobs/Species/base.yml | 1 + .../Prototypes/_Amour/Alerts/arosual.yml | 30 +++++++++++ .../{Alarm => Alerts}/arousal.rsi/arousal.png | Bin .../arousal.rsi/arousal0.png | Bin .../arousal.rsi/arousal10.png | Bin .../arousal.rsi/arousal100.png | Bin .../arousal.rsi/arousal20.png | Bin .../arousal.rsi/arousal30.png | Bin .../arousal.rsi/arousal40.png | Bin .../arousal.rsi/arousal50.png | Bin .../arousal.rsi/arousal60.png | Bin .../arousal.rsi/arousal70.png | Bin .../arousal.rsi/arousal80.png | Bin .../arousal.rsi/arousal90.png | Bin .../{Alarm => Alerts}/arousal.rsi/meta.json | 0 32 files changed, 319 insertions(+), 14 deletions(-) create mode 100644 Content.Client/_Amour/InteractionPanel/InteractionPanelEui.cs create mode 100644 Content.Client/_Amour/InteractionPanel/InteractionPanelWindow.xaml create mode 100644 Content.Client/_Amour/InteractionPanel/InteractionPanelWindow.xaml.cs create mode 100644 Content.Server/_Amour/InteractionPanel/InteractionPanelEui.cs create mode 100644 Content.Server/_Amour/InteractionPanel/InteractionPanelSystem.cs create mode 100644 Content.Shared/_Amour/Arousal/ArousalComponent.cs create mode 100644 Content.Shared/_Amour/Arousal/ArousalEvents.cs create mode 100644 Content.Shared/_Amour/Arousal/ArousalSystem.cs create mode 100644 Content.Shared/_Amour/HumanoidAppearanceExtension/HumanoidAppearanceLoading.cs create mode 100644 Resources/Prototypes/_Amour/Alerts/arosual.yml rename Resources/Textures/_Amour/{Alarm => Alerts}/arousal.rsi/arousal.png (100%) rename Resources/Textures/_Amour/{Alarm => Alerts}/arousal.rsi/arousal0.png (100%) rename Resources/Textures/_Amour/{Alarm => Alerts}/arousal.rsi/arousal10.png (100%) rename Resources/Textures/_Amour/{Alarm => Alerts}/arousal.rsi/arousal100.png (100%) rename Resources/Textures/_Amour/{Alarm => Alerts}/arousal.rsi/arousal20.png (100%) rename Resources/Textures/_Amour/{Alarm => Alerts}/arousal.rsi/arousal30.png (100%) rename Resources/Textures/_Amour/{Alarm => Alerts}/arousal.rsi/arousal40.png (100%) rename Resources/Textures/_Amour/{Alarm => Alerts}/arousal.rsi/arousal50.png (100%) rename Resources/Textures/_Amour/{Alarm => Alerts}/arousal.rsi/arousal60.png (100%) rename Resources/Textures/_Amour/{Alarm => Alerts}/arousal.rsi/arousal70.png (100%) rename Resources/Textures/_Amour/{Alarm => Alerts}/arousal.rsi/arousal80.png (100%) rename Resources/Textures/_Amour/{Alarm => Alerts}/arousal.rsi/arousal90.png (100%) rename Resources/Textures/_Amour/{Alarm => Alerts}/arousal.rsi/meta.json (100%) diff --git a/Content.Client/Humanoid/HumanoidAppearanceSystem.cs b/Content.Client/Humanoid/HumanoidAppearanceSystem.cs index 754aeb84da..82c9c6088b 100644 --- a/Content.Client/Humanoid/HumanoidAppearanceSystem.cs +++ b/Content.Client/Humanoid/HumanoidAppearanceSystem.cs @@ -1,4 +1,5 @@ using Content.Client._Amour.Hole; +using Content.Shared._Amour.HumanoidAppearanceExtension; using Content.Shared.Humanoid; using Content.Shared.Humanoid.Markings; using Content.Shared.Humanoid.Prototypes; @@ -117,6 +118,11 @@ public sealed class HumanoidAppearanceSystem : SharedHumanoidAppearanceSystem return; } + // AMOUR START + var ev = new HumanoidAppearanceLoadingEvent(new Entity(uid, humanoid), profile); + RaiseLocalEvent(uid, ev); + // AMOUR END + var customBaseLayers = new Dictionary(); var speciesPrototype = _prototypeManager.Index(profile.Species); @@ -197,12 +203,10 @@ public sealed class HumanoidAppearanceSystem : SharedHumanoidAppearanceSystem humanoid.SkinColor = profile.Appearance.SkinColor; humanoid.EyeColor = profile.Appearance.EyeColor; - //AMOUR - foreach (var genitals in profile.Appearance.Genitals) - { - Log.Debug("CHLEN! " + genitals.GenitalId); - _holeSystem.AddHole(uid,genitals.GenitalId,genitals.Color); - } + // AMOUR START + var ev2 = new HumanoidAppearanceLoadedEvent(new Entity(uid, humanoid), profile); + RaiseLocalEvent(uid, ev2); + // AMOUR END UpdateSprite(humanoid, Comp(uid)); } diff --git a/Content.Client/_Amour/InteractionPanel/InteractionPanelEui.cs b/Content.Client/_Amour/InteractionPanel/InteractionPanelEui.cs new file mode 100644 index 0000000000..bc6aa4c42d --- /dev/null +++ b/Content.Client/_Amour/InteractionPanel/InteractionPanelEui.cs @@ -0,0 +1,27 @@ +using Content.Client.Eui; +using Content.Shared.Eui; + +namespace Content.Client._Amour.InteractionPanel; + +public sealed class InteractionPanelEui : BaseEui +{ + private InteractionPanelWindow _interactionPanelWindow; + + public InteractionPanelEui() + { + _interactionPanelWindow = new InteractionPanelWindow(); + _interactionPanelWindow.OnClose += () => SendMessage(new CloseEuiMessage()); + } + + public override void Closed() + { + base.Closed(); + _interactionPanelWindow.Close(); + } + + public override void Opened() + { + base.Opened(); + _interactionPanelWindow.OpenCentered(); + } +} diff --git a/Content.Client/_Amour/InteractionPanel/InteractionPanelWindow.xaml b/Content.Client/_Amour/InteractionPanel/InteractionPanelWindow.xaml new file mode 100644 index 0000000000..65bfbb025b --- /dev/null +++ b/Content.Client/_Amour/InteractionPanel/InteractionPanelWindow.xaml @@ -0,0 +1,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Content.Client/_Amour/InteractionPanel/InteractionPanelWindow.xaml.cs b/Content.Client/_Amour/InteractionPanel/InteractionPanelWindow.xaml.cs new file mode 100644 index 0000000000..a0f59a42c9 --- /dev/null +++ b/Content.Client/_Amour/InteractionPanel/InteractionPanelWindow.xaml.cs @@ -0,0 +1,16 @@ +using Robust.Client.AutoGenerated; +using Robust.Client.UserInterface; +using Robust.Client.UserInterface.CustomControls; +using Robust.Client.UserInterface.XAML; + +namespace Content.Client._Amour.InteractionPanel; + +[GenerateTypedNameReferences] +public sealed partial class InteractionPanelWindow : DefaultWindow +{ + public InteractionPanelWindow() + { + RobustXamlLoader.Load(this); + } +} + diff --git a/Content.Server/Humanoid/Systems/HumanoidAppearanceSystem.cs b/Content.Server/Humanoid/Systems/HumanoidAppearanceSystem.cs index 48b673ef81..a9e51a7d32 100644 --- a/Content.Server/Humanoid/Systems/HumanoidAppearanceSystem.cs +++ b/Content.Server/Humanoid/Systems/HumanoidAppearanceSystem.cs @@ -1,5 +1,6 @@ using System.Linq; using Content.Server._Amour.Hole; +using Content.Shared._Amour.HumanoidAppearanceExtension; using Content.Shared.Examine; using Content.Shared.Humanoid; using Content.Shared.Humanoid.Markings; @@ -49,17 +50,17 @@ public sealed partial class HumanoidAppearanceSystem : SharedHumanoidAppearanceS return; } + // AMOUR START + var ev = new HumanoidAppearanceLoadingEvent(new Entity(uid, humanoid), profile); + RaiseLocalEvent(uid, ev); + // AMOUR END + SetSpecies(uid, profile.Species, false, humanoid); SetSex(uid, profile.Sex, false, humanoid); humanoid.EyeColor = profile.Appearance.EyeColor; SetSkinColor(uid, profile.Appearance.SkinColor, false); - //AMOUR - foreach (var genitals in profile.Appearance.Genitals) - { - _holeSystem.AddHole(uid,genitals.GenitalId,genitals.Color); - } humanoid.MarkingSet.Clear(); @@ -124,6 +125,11 @@ public sealed partial class HumanoidAppearanceSystem : SharedHumanoidAppearanceS humanoid.Age = profile.Age; + // AMOUR START + var ev2 = new HumanoidAppearanceLoadedEvent(new Entity(uid, humanoid), profile); + RaiseLocalEvent(uid, ev2); + // AMOUR END + Dirty(humanoid); } diff --git a/Content.Server/_Amour/Hole/HoleSystem.Solution.cs b/Content.Server/_Amour/Hole/HoleSystem.Solution.cs index e79175e48c..d2e1b3d449 100644 --- a/Content.Server/_Amour/Hole/HoleSystem.Solution.cs +++ b/Content.Server/_Amour/Hole/HoleSystem.Solution.cs @@ -1,5 +1,7 @@ using Content.Server.Chemistry.Containers.EntitySystems; +using Content.Shared._Amour.Arousal; using Content.Shared._Amour.Hole; +using Content.Shared.Chemistry.Components; namespace Content.Server._Amour.Hole; @@ -11,6 +13,7 @@ public sealed partial class HoleSystem { SubscribeLocalEvent(OnSolutionInit); SubscribeLocalEvent(OnUnpaused); + SubscribeLocalEvent(OnSplash); } private void OnSolutionInit(EntityUid uid, HoleSolutionComponent component, ComponentInit args) @@ -25,6 +28,40 @@ public sealed partial class HoleSystem component.NextGenerationTime += args.PausedTime; } + public void SplitSolution(Entity entity, Entity? to = null) + { + if(!Resolve(entity,ref entity.Comp)) + return; + + if (!to.HasValue) + { + entity.Comp.Solution.SplitSolution(entity.Comp.Solution.Volume); + } + else + { + var entityUid = to.Value; + if(Resolve(entityUid, ref entityUid.Comp)) + { + _solutionContainer.AddSolution( + new Entity(entityUid.Owner,entityUid.Comp) + , entity.Comp.Solution); + } + } + } + + private void OnSplash(EntityUid uid, HoleSolutionComponent component, ref ArousalSplash args) + { + if(!TryComp(uid,out var holeContainer)) + return; + + var holeUid = GetEntity(holeContainer.MainHole); + + if(!TryComp(holeUid,out var holeComponent)) + return; + + SplitSolution(holeUid.Value); + } + private void UpdateSolution(float frameTime) { return; diff --git a/Content.Server/_Amour/InteractionPanel/InteractionPanelEui.cs b/Content.Server/_Amour/InteractionPanel/InteractionPanelEui.cs new file mode 100644 index 0000000000..5dc718272d --- /dev/null +++ b/Content.Server/_Amour/InteractionPanel/InteractionPanelEui.cs @@ -0,0 +1,11 @@ +using Content.Server.EUI; + +namespace Content.Server._Amour.InteractionPanel; + +public sealed class InteractionPanelEui : BaseEui +{ + public InteractionPanelEui() + { + IoCManager.InjectDependencies(this); + } +} diff --git a/Content.Server/_Amour/InteractionPanel/InteractionPanelSystem.cs b/Content.Server/_Amour/InteractionPanel/InteractionPanelSystem.cs new file mode 100644 index 0000000000..df4d4f0a93 --- /dev/null +++ b/Content.Server/_Amour/InteractionPanel/InteractionPanelSystem.cs @@ -0,0 +1,27 @@ +using Content.Server.EUI; +using Content.Shared._Amour.Hole; +using Content.Shared.Verbs; +using Robust.Server.Player; + +namespace Content.Server._Amour.InteractionPanel; + +public sealed class InteractionPanelSystem : EntitySystem +{ + [Dependency] private readonly EuiManager _eui = default!; + [Dependency] private readonly IPlayerManager _playerManager = default!; + public override void Initialize() + { + SubscribeLocalEvent>(OnVerb); + } + + private void OnVerb(EntityUid uid, HoleContainerComponent component, GetVerbsEvent args) + { + if(!_playerManager.TryGetSessionByEntity(uid, out var session)) + return; + args.Verbs.Add(new Verb() + { + Text = "MEOW", + Act = () => _eui.OpenEui(new InteractionPanelEui(), session) + }); + } +} diff --git a/Content.Shared/Alert/AlertCategory.cs b/Content.Shared/Alert/AlertCategory.cs index a769e88355..b7e74b75cf 100644 --- a/Content.Shared/Alert/AlertCategory.cs +++ b/Content.Shared/Alert/AlertCategory.cs @@ -11,6 +11,7 @@ public enum AlertCategory Buckled, Health, Mood, //WD-edit + Arousal, //AMOUR-edit Internals, Stamina, Piloting, diff --git a/Content.Shared/Alert/AlertType.cs b/Content.Shared/Alert/AlertType.cs index 76d31a2168..f78375fd73 100644 --- a/Content.Shared/Alert/AlertType.cs +++ b/Content.Shared/Alert/AlertType.cs @@ -38,6 +38,7 @@ namespace Content.Shared.Alert VeryGood, VeryVeryGood, MoodDead, + Arousal, //AMOUR //WD end CultBuffed, PilotingShuttle, diff --git a/Content.Shared/_Amour/Arousal/ArousalComponent.cs b/Content.Shared/_Amour/Arousal/ArousalComponent.cs new file mode 100644 index 0000000000..26c5fc63fd --- /dev/null +++ b/Content.Shared/_Amour/Arousal/ArousalComponent.cs @@ -0,0 +1,9 @@ +namespace Content.Shared._Amour.Arousal; + +[RegisterComponent] +public sealed partial class ArousalComponent : Component +{ + [ViewVariables] public short Arousal; + [DataField] public short ArousalExide; +} + diff --git a/Content.Shared/_Amour/Arousal/ArousalEvents.cs b/Content.Shared/_Amour/Arousal/ArousalEvents.cs new file mode 100644 index 0000000000..f8fe391f83 --- /dev/null +++ b/Content.Shared/_Amour/Arousal/ArousalEvents.cs @@ -0,0 +1,5 @@ +namespace Content.Shared._Amour.Arousal; + +public record struct ArousalUpdated(Entity Entity); + +public record struct ArousalSplash(Entity Entity); diff --git a/Content.Shared/_Amour/Arousal/ArousalSystem.cs b/Content.Shared/_Amour/Arousal/ArousalSystem.cs new file mode 100644 index 0000000000..b61043d025 --- /dev/null +++ b/Content.Shared/_Amour/Arousal/ArousalSystem.cs @@ -0,0 +1,51 @@ +using Content.Shared.Alert; + +namespace Content.Shared._Amour.Arousal; + +public sealed class ArousalSystem : EntitySystem +{ + [Dependency] private readonly AlertsSystem _alerts = default!; + + public override void Initialize() + { + base.Initialize(); + SubscribeLocalEvent(OnComponentInit); + } + + private void OnComponentInit(EntityUid uid, ArousalComponent component, ComponentInit args) + { + UpdateAlarm(new Entity(uid,component)); + } + + private void UpdateAlarm(Entity entity) + { + if(!Resolve(entity,ref entity.Comp)) + return; + + if (entity.Comp.Arousal is > 100 or < 0) + { + entity.Comp.Arousal = 0; + RaiseLocalEvent(entity,new ArousalSplash(new Entity(entity,entity.Comp))); + } + RaiseLocalEvent(entity,new ArousalUpdated(new Entity(entity,entity.Comp))); + + _alerts.ShowAlert(entity,AlertType.Arousal,(short)(entity.Comp.Arousal/10)); + } + + public void SetArousal(Entity entity, short count) + { + if(!Resolve(entity,ref entity.Comp)) + return; + + entity.Comp.Arousal = count; + UpdateAlarm(entity); + } + + public void AddArousal(Entity entity, short count) + { + if(!Resolve(entity,ref entity.Comp)) + return; + + SetArousal(entity,(short) (entity.Comp.Arousal + count)); + } +} diff --git a/Content.Shared/_Amour/Hole/HoleSystem.Container.cs b/Content.Shared/_Amour/Hole/HoleSystem.Container.cs index 0a827ce7f7..35a011be6d 100644 --- a/Content.Shared/_Amour/Hole/HoleSystem.Container.cs +++ b/Content.Shared/_Amour/Hole/HoleSystem.Container.cs @@ -1,4 +1,6 @@ -using Robust.Shared.Containers; +using Content.Shared._Amour.Arousal; +using Content.Shared._Amour.HumanoidAppearanceExtension; +using Robust.Shared.Containers; using Robust.Shared.Prototypes; namespace Content.Shared._Amour.Hole; @@ -10,6 +12,15 @@ public abstract partial class SharedHoleSystem public void InitializeContainer() { SubscribeLocalEvent(OnContainerInit); + SubscribeLocalEvent(OnAppearanceLoaded); + } + + private void OnAppearanceLoaded(EntityUid uid, HoleContainerComponent component, HumanoidAppearanceLoadedEvent args) + { + foreach (var genitals in args.Profile.Appearance.Genitals) + { + AddHole(new Entity(uid,component),genitals.GenitalId,genitals.Color); + } } private void OnContainerInit(EntityUid uid, HoleContainerComponent component, ComponentInit args) diff --git a/Content.Shared/_Amour/Hole/HoleSystem.cs b/Content.Shared/_Amour/Hole/HoleSystem.cs index 489c856c1d..e6b45b36ae 100644 --- a/Content.Shared/_Amour/Hole/HoleSystem.cs +++ b/Content.Shared/_Amour/Hole/HoleSystem.cs @@ -1,4 +1,5 @@ -using Robust.Shared.Containers; +using Content.Shared._Amour.Arousal; +using Robust.Shared.Containers; using Robust.Shared.GameStates; namespace Content.Shared._Amour.Hole; @@ -24,7 +25,9 @@ public abstract partial class SharedHoleSystem : EntitySystem public virtual void Exide(Entity entity, bool value = true) { - if(!Resolve(entity.Owner,ref entity.Comp)) return; + if(!Resolve(entity.Owner,ref entity.Comp)) + return; + entity.Comp.IsExcited = value; Dirty(entity); } diff --git a/Content.Shared/_Amour/HumanoidAppearanceExtension/HumanoidAppearanceLoading.cs b/Content.Shared/_Amour/HumanoidAppearanceExtension/HumanoidAppearanceLoading.cs new file mode 100644 index 0000000000..504d764349 --- /dev/null +++ b/Content.Shared/_Amour/HumanoidAppearanceExtension/HumanoidAppearanceLoading.cs @@ -0,0 +1,13 @@ +using Content.Shared.Humanoid; +using Content.Shared.Preferences; +using Robust.Shared.Serialization; + +namespace Content.Shared._Amour.HumanoidAppearanceExtension; + +public record struct HumanoidAppearanceLoadingEvent( + Entity Entity, + HumanoidCharacterProfile Profile); + +public record struct HumanoidAppearanceLoadedEvent( + Entity Entity, + HumanoidCharacterProfile Profile); diff --git a/Resources/Prototypes/Alerts/alerts.yml b/Resources/Prototypes/Alerts/alerts.yml index 57040cc9be..8a7745c543 100644 --- a/Resources/Prototypes/Alerts/alerts.yml +++ b/Resources/Prototypes/Alerts/alerts.yml @@ -7,6 +7,7 @@ - category: Health - alertType: Bleeding - category: Mood # WD edit + - category: Arousal # Amour edit - category: Stamina - alertType: SuitPower - category: Internals diff --git a/Resources/Prototypes/Entities/Mobs/Species/base.yml b/Resources/Prototypes/Entities/Mobs/Species/base.yml index aa9361e416..fcd9dae591 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/base.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/base.yml @@ -264,6 +264,7 @@ - type: Penetrated - type: Mood - type: HoleContainer + - type: Arousal - type: entity save: false diff --git a/Resources/Prototypes/_Amour/Alerts/arosual.yml b/Resources/Prototypes/_Amour/Alerts/arosual.yml new file mode 100644 index 0000000000..17d269ca18 --- /dev/null +++ b/Resources/Prototypes/_Amour/Alerts/arosual.yml @@ -0,0 +1,30 @@ +- type: alert + id: Arousal + category: Arousal + icons: + - sprite: /Textures/_Amour/Alerts/arousal.rsi + state: arousal0 + - sprite: /Textures/_Amour/Alerts/arousal.rsi + state: arousal10 + - sprite: /Textures/_Amour/Alerts/arousal.rsi + state: arousal20 + - sprite: /Textures/_Amour/Alerts/arousal.rsi + state: arousal30 + - sprite: /Textures/_Amour/Alerts/arousal.rsi + state: arousal40 + - sprite: /Textures/_Amour/Alerts/arousal.rsi + state: arousal50 + - sprite: /Textures/_Amour/Alerts/arousal.rsi + state: arousal60 + - sprite: /Textures/_Amour/Alerts/arousal.rsi + state: arousal70 + - sprite: /Textures/_Amour/Alerts/arousal.rsi + state: arousal80 + - sprite: /Textures/_Amour/Alerts/arousal.rsi + state: arousal90 + - sprite: /Textures/_Amour/Alerts/arousal.rsi + state: arousal100 + name: alerts-arousal-name + description: alerts-arousal-desc + minSeverity: 0 + maxSeverity: 10 diff --git a/Resources/Textures/_Amour/Alarm/arousal.rsi/arousal.png b/Resources/Textures/_Amour/Alerts/arousal.rsi/arousal.png similarity index 100% rename from Resources/Textures/_Amour/Alarm/arousal.rsi/arousal.png rename to Resources/Textures/_Amour/Alerts/arousal.rsi/arousal.png diff --git a/Resources/Textures/_Amour/Alarm/arousal.rsi/arousal0.png b/Resources/Textures/_Amour/Alerts/arousal.rsi/arousal0.png similarity index 100% rename from Resources/Textures/_Amour/Alarm/arousal.rsi/arousal0.png rename to Resources/Textures/_Amour/Alerts/arousal.rsi/arousal0.png diff --git a/Resources/Textures/_Amour/Alarm/arousal.rsi/arousal10.png b/Resources/Textures/_Amour/Alerts/arousal.rsi/arousal10.png similarity index 100% rename from Resources/Textures/_Amour/Alarm/arousal.rsi/arousal10.png rename to Resources/Textures/_Amour/Alerts/arousal.rsi/arousal10.png diff --git a/Resources/Textures/_Amour/Alarm/arousal.rsi/arousal100.png b/Resources/Textures/_Amour/Alerts/arousal.rsi/arousal100.png similarity index 100% rename from Resources/Textures/_Amour/Alarm/arousal.rsi/arousal100.png rename to Resources/Textures/_Amour/Alerts/arousal.rsi/arousal100.png diff --git a/Resources/Textures/_Amour/Alarm/arousal.rsi/arousal20.png b/Resources/Textures/_Amour/Alerts/arousal.rsi/arousal20.png similarity index 100% rename from Resources/Textures/_Amour/Alarm/arousal.rsi/arousal20.png rename to Resources/Textures/_Amour/Alerts/arousal.rsi/arousal20.png diff --git a/Resources/Textures/_Amour/Alarm/arousal.rsi/arousal30.png b/Resources/Textures/_Amour/Alerts/arousal.rsi/arousal30.png similarity index 100% rename from Resources/Textures/_Amour/Alarm/arousal.rsi/arousal30.png rename to Resources/Textures/_Amour/Alerts/arousal.rsi/arousal30.png diff --git a/Resources/Textures/_Amour/Alarm/arousal.rsi/arousal40.png b/Resources/Textures/_Amour/Alerts/arousal.rsi/arousal40.png similarity index 100% rename from Resources/Textures/_Amour/Alarm/arousal.rsi/arousal40.png rename to Resources/Textures/_Amour/Alerts/arousal.rsi/arousal40.png diff --git a/Resources/Textures/_Amour/Alarm/arousal.rsi/arousal50.png b/Resources/Textures/_Amour/Alerts/arousal.rsi/arousal50.png similarity index 100% rename from Resources/Textures/_Amour/Alarm/arousal.rsi/arousal50.png rename to Resources/Textures/_Amour/Alerts/arousal.rsi/arousal50.png diff --git a/Resources/Textures/_Amour/Alarm/arousal.rsi/arousal60.png b/Resources/Textures/_Amour/Alerts/arousal.rsi/arousal60.png similarity index 100% rename from Resources/Textures/_Amour/Alarm/arousal.rsi/arousal60.png rename to Resources/Textures/_Amour/Alerts/arousal.rsi/arousal60.png diff --git a/Resources/Textures/_Amour/Alarm/arousal.rsi/arousal70.png b/Resources/Textures/_Amour/Alerts/arousal.rsi/arousal70.png similarity index 100% rename from Resources/Textures/_Amour/Alarm/arousal.rsi/arousal70.png rename to Resources/Textures/_Amour/Alerts/arousal.rsi/arousal70.png diff --git a/Resources/Textures/_Amour/Alarm/arousal.rsi/arousal80.png b/Resources/Textures/_Amour/Alerts/arousal.rsi/arousal80.png similarity index 100% rename from Resources/Textures/_Amour/Alarm/arousal.rsi/arousal80.png rename to Resources/Textures/_Amour/Alerts/arousal.rsi/arousal80.png diff --git a/Resources/Textures/_Amour/Alarm/arousal.rsi/arousal90.png b/Resources/Textures/_Amour/Alerts/arousal.rsi/arousal90.png similarity index 100% rename from Resources/Textures/_Amour/Alarm/arousal.rsi/arousal90.png rename to Resources/Textures/_Amour/Alerts/arousal.rsi/arousal90.png diff --git a/Resources/Textures/_Amour/Alarm/arousal.rsi/meta.json b/Resources/Textures/_Amour/Alerts/arousal.rsi/meta.json similarity index 100% rename from Resources/Textures/_Amour/Alarm/arousal.rsi/meta.json rename to Resources/Textures/_Amour/Alerts/arousal.rsi/meta.json