From 648bfcdb238c3e1f64659b399816303884fad92c Mon Sep 17 00:00:00 2001 From: Nilton Constantino Date: Tue, 9 Jun 2026 13:09:18 +0100 Subject: [PATCH] added UI and a few components --- .../Intrepid/Gameplay/Entities/Player.meta | 3 +++ .../{Sentinel => Player}/ActionBelt.meta | 0 .../ActionBelt/ActionBeltBoot.cs | 6 ++--- .../ActionBelt/ActionBeltBoot.cs.meta | 0 .../ActionBelt/ActionBeltManager.cs | 6 ++--- .../ActionBelt/ActionBeltManager.cs.meta | 0 .../ActionBelt/ActionBeltTrigger.cs | 10 ++++----- .../ActionBelt/ActionBeltTrigger.cs.meta | 0 .../ActionBelt/ActionCategory.cs | 2 +- .../ActionBelt/ActionCategory.cs.meta | 0 .../ActionBelt/ActionEnvelope.cs | 2 +- .../ActionBelt/ActionEnvelope.cs.meta | 0 .../ActionBelt/ActionIdentifier.cs | 2 +- .../ActionBelt/ActionIdentifier.cs.meta | 0 .../ActionBelt/ActionStackBelt.cs | 2 +- .../ActionBelt/ActionStackBelt.cs.meta | 0 .../ActionBelt/Events.meta | 0 .../ActionBelt/Events/ActionBeltAddEvent.cs | 2 +- .../Events/ActionBeltAddEvent.cs.meta | 0 .../ActionBelt/Events/ActionBeltBaseEvent.cs | 4 ++-- .../Events/ActionBeltBaseEvent.cs.meta | 0 .../ActionBelt/Events/ActionBeltClearEvent.cs | 2 +- .../Events/ActionBeltClearEvent.cs.meta | 0 .../Events/ActionBeltDisableEvent.cs | 2 +- .../Events/ActionBeltDisableEvent.cs.meta | 0 .../ActionBelt/Events/ActionBeltDropEvent.cs | 2 +- .../Events/ActionBeltDropEvent.cs.meta | 0 .../Events/ActionBeltEnableEvent.cs | 2 +- .../Events/ActionBeltEnableEvent.cs.meta | 0 .../Events/ActionBeltNextLeftEvent.cs | 2 +- .../Events/ActionBeltNextLeftEvent.cs.meta | 0 .../Events/ActionBeltNextRightEvent.cs | 2 +- .../Events/ActionBeltNextRightEvent.cs.meta | 0 .../Events/ActionBeltRefreshEvent.cs | 2 +- .../Events/ActionBeltRefreshEvent.cs.meta | 0 .../ActionBeltRemoveByIdAndTypeEvent.cs | 2 +- .../ActionBeltRemoveByIdAndTypeEvent.cs.meta | 0 .../Events/ActionBeltRemoveByIdEvent.cs | 2 +- .../Events/ActionBeltRemoveByIdEvent.cs.meta | 0 .../Events/ActionBeltRemoveByTypeEvent.cs | 2 +- .../ActionBeltRemoveByTypeEvent.cs.meta | 0 .../Events/ActionBeltTakeActionEvent.cs | 2 +- .../Events/ActionBeltTakeActionEvent.cs.meta | 0 .../Events/ActionBeltUICloseEvent.cs | 2 +- .../Events/ActionBeltUICloseEvent.cs.meta | 0 .../Events/ActionBeltUIDropEvent.cs | 2 +- .../Events/ActionBeltUIDropEvent.cs.meta | 0 .../Events/ActionBeltUIOpenEvent.cs | 2 +- .../Events/ActionBeltUIOpenEvent.cs.meta | 0 .../Events/ActionBeltUITakeActionEvent.cs | 2 +- .../ActionBeltUITakeActionEvent.cs.meta | 0 .../Events/ActionBeltUIToLeftEvent.cs | 2 +- .../Events/ActionBeltUIToLeftEvent.cs.meta | 0 .../Events/ActionBeltUIToRightEvent.cs | 2 +- .../Events/ActionBeltUIToRightEvent.cs.meta | 0 .../{Sentinel => Player}/ActionBelt/UI.meta | 0 .../ActionBelt/UI/ActionBeltUI.cs | 4 ++-- .../ActionBelt/UI/ActionBeltUI.cs.meta | 0 .../Entities/{ => Player}/Sentinel.meta | 0 .../{ => Player}/Sentinel/SentinelBrain.cs | 4 ++-- .../Sentinel/SentinelBrain.cs.meta | 0 .../Sentinel/SentinelConstants.cs | 2 +- .../Sentinel/SentinelConstants.cs.meta | 0 .../{ => Player}/Sentinel/SentinelControls.cs | 2 +- .../Sentinel/SentinelControls.cs.meta | 0 .../{ => Player}/Sentinel/SentinelEntity.cs | 2 +- .../Sentinel/SentinelEntity.cs.meta | 0 .../{ => Player}/Sentinel/SentinelInputs.cs | 2 +- .../Sentinel/SentinelInputs.cs.meta | 0 .../Sentinel/SentinelStateType.cs | 2 +- .../Sentinel/SentinelStateType.cs.meta | 0 .../{ => Player}/Sentinel/StateMachine.meta | 0 .../Sentinel/StateMachine/SentinelState.cs | 2 +- .../StateMachine/SentinelState.cs.meta | 0 .../StateMachine/SentinelStateMachine.cs | 2 +- .../StateMachine/SentinelStateMachine.cs.meta | 0 .../Sentinel/StateMachine/States.meta | 0 .../StateMachine/States/SentinelStateDash.cs | 2 +- .../States/SentinelStateDash.cs.meta | 0 .../States/SentinelStateDashBreaking.cs | 2 +- .../States/SentinelStateDashBreaking.cs.meta | 0 .../States/SentinelStateDashWindow.cs | 2 +- .../States/SentinelStateDashWindow.cs.meta | 0 .../StateMachine/States/SentinelStateFall.cs | 2 +- .../States/SentinelStateFall.cs.meta | 0 .../States/SentinelStateFallLanding.cs | 2 +- .../States/SentinelStateFallLanding.cs.meta | 0 .../States/SentinelStateFallToAbyss.cs | 2 +- .../States/SentinelStateFallToAbyss.cs.meta | 0 .../StateMachine/States/SentinelStateIdle.cs | 2 +- .../States/SentinelStateIdle.cs.meta | 0 .../States/SentinelStateKnockdown.cs | 2 +- .../States/SentinelStateKnockdown.cs.meta | 0 .../StateMachine/States/SentinelStateRun.cs | 2 +- .../States/SentinelStateRun.cs.meta | 0 .../StateMachine/States/SentinelStateWalk.cs | 2 +- .../States/SentinelStateWalk.cs.meta | 0 .../Entities/{Sentinel => Player}/Tags.meta | 0 .../Tags/ActionBeltManagerTag.cs | 2 +- .../Tags/ActionBeltManagerTag.cs.meta | 0 .../{Sentinel => Player}/Tags/PlayerTag.cs | 2 +- .../Tags/PlayerTag.cs.meta | 0 .../Sentinel/SentinelModelAnimationType.cs | 22 ------------------- .../SentinelModelAnimationType.cs.meta | 3 --- .../Integration/Input/InputService.cs | 2 +- 105 files changed, 62 insertions(+), 84 deletions(-) create mode 100644 Assets/Scripts/Intrepid/Gameplay/Entities/Player.meta rename Assets/Scripts/Intrepid/Gameplay/Entities/{Sentinel => Player}/ActionBelt.meta (100%) rename Assets/Scripts/Intrepid/Gameplay/Entities/{Sentinel => Player}/ActionBelt/ActionBeltBoot.cs (84%) rename Assets/Scripts/Intrepid/Gameplay/Entities/{Sentinel => Player}/ActionBelt/ActionBeltBoot.cs.meta (100%) rename Assets/Scripts/Intrepid/Gameplay/Entities/{Sentinel => Player}/ActionBelt/ActionBeltManager.cs (97%) rename Assets/Scripts/Intrepid/Gameplay/Entities/{Sentinel => Player}/ActionBelt/ActionBeltManager.cs.meta (100%) rename Assets/Scripts/Intrepid/Gameplay/Entities/{Sentinel => Player}/ActionBelt/ActionBeltTrigger.cs (91%) rename Assets/Scripts/Intrepid/Gameplay/Entities/{Sentinel => Player}/ActionBelt/ActionBeltTrigger.cs.meta (100%) rename Assets/Scripts/Intrepid/Gameplay/Entities/{Sentinel => Player}/ActionBelt/ActionCategory.cs (61%) rename Assets/Scripts/Intrepid/Gameplay/Entities/{Sentinel => Player}/ActionBelt/ActionCategory.cs.meta (100%) rename Assets/Scripts/Intrepid/Gameplay/Entities/{Sentinel => Player}/ActionBelt/ActionEnvelope.cs (94%) rename Assets/Scripts/Intrepid/Gameplay/Entities/{Sentinel => Player}/ActionBelt/ActionEnvelope.cs.meta (100%) rename Assets/Scripts/Intrepid/Gameplay/Entities/{Sentinel => Player}/ActionBelt/ActionIdentifier.cs (60%) rename Assets/Scripts/Intrepid/Gameplay/Entities/{Sentinel => Player}/ActionBelt/ActionIdentifier.cs.meta (100%) rename Assets/Scripts/Intrepid/Gameplay/Entities/{Sentinel => Player}/ActionBelt/ActionStackBelt.cs (97%) rename Assets/Scripts/Intrepid/Gameplay/Entities/{Sentinel => Player}/ActionBelt/ActionStackBelt.cs.meta (100%) rename Assets/Scripts/Intrepid/Gameplay/Entities/{Sentinel => Player}/ActionBelt/Events.meta (100%) rename Assets/Scripts/Intrepid/Gameplay/Entities/{Sentinel => Player}/ActionBelt/Events/ActionBeltAddEvent.cs (67%) rename Assets/Scripts/Intrepid/Gameplay/Entities/{Sentinel => Player}/ActionBelt/Events/ActionBeltAddEvent.cs.meta (100%) rename Assets/Scripts/Intrepid/Gameplay/Entities/{Sentinel => Player}/ActionBelt/Events/ActionBeltBaseEvent.cs (60%) rename Assets/Scripts/Intrepid/Gameplay/Entities/{Sentinel => Player}/ActionBelt/Events/ActionBeltBaseEvent.cs.meta (100%) rename Assets/Scripts/Intrepid/Gameplay/Entities/{Sentinel => Player}/ActionBelt/Events/ActionBeltClearEvent.cs (53%) rename Assets/Scripts/Intrepid/Gameplay/Entities/{Sentinel => Player}/ActionBelt/Events/ActionBeltClearEvent.cs.meta (100%) rename Assets/Scripts/Intrepid/Gameplay/Entities/{Sentinel => Player}/ActionBelt/Events/ActionBeltDisableEvent.cs (54%) rename Assets/Scripts/Intrepid/Gameplay/Entities/{Sentinel => Player}/ActionBelt/Events/ActionBeltDisableEvent.cs.meta (100%) rename Assets/Scripts/Intrepid/Gameplay/Entities/{Sentinel => Player}/ActionBelt/Events/ActionBeltDropEvent.cs (53%) rename Assets/Scripts/Intrepid/Gameplay/Entities/{Sentinel => Player}/ActionBelt/Events/ActionBeltDropEvent.cs.meta (100%) rename Assets/Scripts/Intrepid/Gameplay/Entities/{Sentinel => Player}/ActionBelt/Events/ActionBeltEnableEvent.cs (54%) rename Assets/Scripts/Intrepid/Gameplay/Entities/{Sentinel => Player}/ActionBelt/Events/ActionBeltEnableEvent.cs.meta (100%) rename Assets/Scripts/Intrepid/Gameplay/Entities/{Sentinel => Player}/ActionBelt/Events/ActionBeltNextLeftEvent.cs (54%) rename Assets/Scripts/Intrepid/Gameplay/Entities/{Sentinel => Player}/ActionBelt/Events/ActionBeltNextLeftEvent.cs.meta (100%) rename Assets/Scripts/Intrepid/Gameplay/Entities/{Sentinel => Player}/ActionBelt/Events/ActionBeltNextRightEvent.cs (55%) rename Assets/Scripts/Intrepid/Gameplay/Entities/{Sentinel => Player}/ActionBelt/Events/ActionBeltNextRightEvent.cs.meta (100%) rename Assets/Scripts/Intrepid/Gameplay/Entities/{Sentinel => Player}/ActionBelt/Events/ActionBeltRefreshEvent.cs (54%) rename Assets/Scripts/Intrepid/Gameplay/Entities/{Sentinel => Player}/ActionBelt/Events/ActionBeltRefreshEvent.cs.meta (100%) rename Assets/Scripts/Intrepid/Gameplay/Entities/{Sentinel => Player}/ActionBelt/Events/ActionBeltRemoveByIdAndTypeEvent.cs (74%) rename Assets/Scripts/Intrepid/Gameplay/Entities/{Sentinel => Player}/ActionBelt/Events/ActionBeltRemoveByIdAndTypeEvent.cs.meta (100%) rename Assets/Scripts/Intrepid/Gameplay/Entities/{Sentinel => Player}/ActionBelt/Events/ActionBeltRemoveByIdEvent.cs (66%) rename Assets/Scripts/Intrepid/Gameplay/Entities/{Sentinel => Player}/ActionBelt/Events/ActionBeltRemoveByIdEvent.cs.meta (100%) rename Assets/Scripts/Intrepid/Gameplay/Entities/{Sentinel => Player}/ActionBelt/Events/ActionBeltRemoveByTypeEvent.cs (68%) rename Assets/Scripts/Intrepid/Gameplay/Entities/{Sentinel => Player}/ActionBelt/Events/ActionBeltRemoveByTypeEvent.cs.meta (100%) rename Assets/Scripts/Intrepid/Gameplay/Entities/{Sentinel => Player}/ActionBelt/Events/ActionBeltTakeActionEvent.cs (55%) rename Assets/Scripts/Intrepid/Gameplay/Entities/{Sentinel => Player}/ActionBelt/Events/ActionBeltTakeActionEvent.cs.meta (100%) rename Assets/Scripts/Intrepid/Gameplay/Entities/{Sentinel => Player}/ActionBelt/Events/ActionBeltUICloseEvent.cs (60%) rename Assets/Scripts/Intrepid/Gameplay/Entities/{Sentinel => Player}/ActionBelt/Events/ActionBeltUICloseEvent.cs.meta (100%) rename Assets/Scripts/Intrepid/Gameplay/Entities/{Sentinel => Player}/ActionBelt/Events/ActionBeltUIDropEvent.cs (62%) rename Assets/Scripts/Intrepid/Gameplay/Entities/{Sentinel => Player}/ActionBelt/Events/ActionBeltUIDropEvent.cs.meta (100%) rename Assets/Scripts/Intrepid/Gameplay/Entities/{Sentinel => Player}/ActionBelt/Events/ActionBeltUIOpenEvent.cs (85%) rename Assets/Scripts/Intrepid/Gameplay/Entities/{Sentinel => Player}/ActionBelt/Events/ActionBeltUIOpenEvent.cs.meta (100%) rename Assets/Scripts/Intrepid/Gameplay/Entities/{Sentinel => Player}/ActionBelt/Events/ActionBeltUITakeActionEvent.cs (63%) rename Assets/Scripts/Intrepid/Gameplay/Entities/{Sentinel => Player}/ActionBelt/Events/ActionBeltUITakeActionEvent.cs.meta (100%) rename Assets/Scripts/Intrepid/Gameplay/Entities/{Sentinel => Player}/ActionBelt/Events/ActionBeltUIToLeftEvent.cs (62%) rename Assets/Scripts/Intrepid/Gameplay/Entities/{Sentinel => Player}/ActionBelt/Events/ActionBeltUIToLeftEvent.cs.meta (100%) rename Assets/Scripts/Intrepid/Gameplay/Entities/{Sentinel => Player}/ActionBelt/Events/ActionBeltUIToRightEvent.cs (63%) rename Assets/Scripts/Intrepid/Gameplay/Entities/{Sentinel => Player}/ActionBelt/Events/ActionBeltUIToRightEvent.cs.meta (100%) rename Assets/Scripts/Intrepid/Gameplay/Entities/{Sentinel => Player}/ActionBelt/UI.meta (100%) rename Assets/Scripts/Intrepid/Gameplay/Entities/{Sentinel => Player}/ActionBelt/UI/ActionBeltUI.cs (98%) rename Assets/Scripts/Intrepid/Gameplay/Entities/{Sentinel => Player}/ActionBelt/UI/ActionBeltUI.cs.meta (100%) rename Assets/Scripts/Intrepid/Gameplay/Entities/{ => Player}/Sentinel.meta (100%) rename Assets/Scripts/Intrepid/Gameplay/Entities/{ => Player}/Sentinel/SentinelBrain.cs (95%) rename Assets/Scripts/Intrepid/Gameplay/Entities/{ => Player}/Sentinel/SentinelBrain.cs.meta (100%) rename Assets/Scripts/Intrepid/Gameplay/Entities/{ => Player}/Sentinel/SentinelConstants.cs (91%) rename Assets/Scripts/Intrepid/Gameplay/Entities/{ => Player}/Sentinel/SentinelConstants.cs.meta (100%) rename Assets/Scripts/Intrepid/Gameplay/Entities/{ => Player}/Sentinel/SentinelControls.cs (92%) rename Assets/Scripts/Intrepid/Gameplay/Entities/{ => Player}/Sentinel/SentinelControls.cs.meta (100%) rename Assets/Scripts/Intrepid/Gameplay/Entities/{ => Player}/Sentinel/SentinelEntity.cs (98%) rename Assets/Scripts/Intrepid/Gameplay/Entities/{ => Player}/Sentinel/SentinelEntity.cs.meta (100%) rename Assets/Scripts/Intrepid/Gameplay/Entities/{ => Player}/Sentinel/SentinelInputs.cs (82%) rename Assets/Scripts/Intrepid/Gameplay/Entities/{ => Player}/Sentinel/SentinelInputs.cs.meta (100%) rename Assets/Scripts/Intrepid/Gameplay/Entities/{ => Player}/Sentinel/SentinelStateType.cs (86%) rename Assets/Scripts/Intrepid/Gameplay/Entities/{ => Player}/Sentinel/SentinelStateType.cs.meta (100%) rename Assets/Scripts/Intrepid/Gameplay/Entities/{ => Player}/Sentinel/StateMachine.meta (100%) rename Assets/Scripts/Intrepid/Gameplay/Entities/{ => Player}/Sentinel/StateMachine/SentinelState.cs (91%) rename Assets/Scripts/Intrepid/Gameplay/Entities/{ => Player}/Sentinel/StateMachine/SentinelState.cs.meta (100%) rename Assets/Scripts/Intrepid/Gameplay/Entities/{ => Player}/Sentinel/StateMachine/SentinelStateMachine.cs (67%) rename Assets/Scripts/Intrepid/Gameplay/Entities/{ => Player}/Sentinel/StateMachine/SentinelStateMachine.cs.meta (100%) rename Assets/Scripts/Intrepid/Gameplay/Entities/{ => Player}/Sentinel/StateMachine/States.meta (100%) rename Assets/Scripts/Intrepid/Gameplay/Entities/{ => Player}/Sentinel/StateMachine/States/SentinelStateDash.cs (96%) rename Assets/Scripts/Intrepid/Gameplay/Entities/{ => Player}/Sentinel/StateMachine/States/SentinelStateDash.cs.meta (100%) rename Assets/Scripts/Intrepid/Gameplay/Entities/{ => Player}/Sentinel/StateMachine/States/SentinelStateDashBreaking.cs (96%) rename Assets/Scripts/Intrepid/Gameplay/Entities/{ => Player}/Sentinel/StateMachine/States/SentinelStateDashBreaking.cs.meta (100%) rename Assets/Scripts/Intrepid/Gameplay/Entities/{ => Player}/Sentinel/StateMachine/States/SentinelStateDashWindow.cs (97%) rename Assets/Scripts/Intrepid/Gameplay/Entities/{ => Player}/Sentinel/StateMachine/States/SentinelStateDashWindow.cs.meta (100%) rename Assets/Scripts/Intrepid/Gameplay/Entities/{ => Player}/Sentinel/StateMachine/States/SentinelStateFall.cs (93%) rename Assets/Scripts/Intrepid/Gameplay/Entities/{ => Player}/Sentinel/StateMachine/States/SentinelStateFall.cs.meta (100%) rename Assets/Scripts/Intrepid/Gameplay/Entities/{ => Player}/Sentinel/StateMachine/States/SentinelStateFallLanding.cs (94%) rename Assets/Scripts/Intrepid/Gameplay/Entities/{ => Player}/Sentinel/StateMachine/States/SentinelStateFallLanding.cs.meta (100%) rename Assets/Scripts/Intrepid/Gameplay/Entities/{ => Player}/Sentinel/StateMachine/States/SentinelStateFallToAbyss.cs (91%) rename Assets/Scripts/Intrepid/Gameplay/Entities/{ => Player}/Sentinel/StateMachine/States/SentinelStateFallToAbyss.cs.meta (100%) rename Assets/Scripts/Intrepid/Gameplay/Entities/{ => Player}/Sentinel/StateMachine/States/SentinelStateIdle.cs (96%) rename Assets/Scripts/Intrepid/Gameplay/Entities/{ => Player}/Sentinel/StateMachine/States/SentinelStateIdle.cs.meta (100%) rename Assets/Scripts/Intrepid/Gameplay/Entities/{ => Player}/Sentinel/StateMachine/States/SentinelStateKnockdown.cs (97%) rename Assets/Scripts/Intrepid/Gameplay/Entities/{ => Player}/Sentinel/StateMachine/States/SentinelStateKnockdown.cs.meta (100%) rename Assets/Scripts/Intrepid/Gameplay/Entities/{ => Player}/Sentinel/StateMachine/States/SentinelStateRun.cs (96%) rename Assets/Scripts/Intrepid/Gameplay/Entities/{ => Player}/Sentinel/StateMachine/States/SentinelStateRun.cs.meta (100%) rename Assets/Scripts/Intrepid/Gameplay/Entities/{ => Player}/Sentinel/StateMachine/States/SentinelStateWalk.cs (96%) rename Assets/Scripts/Intrepid/Gameplay/Entities/{ => Player}/Sentinel/StateMachine/States/SentinelStateWalk.cs.meta (100%) rename Assets/Scripts/Intrepid/Gameplay/Entities/{Sentinel => Player}/Tags.meta (100%) rename Assets/Scripts/Intrepid/Gameplay/Entities/{Sentinel => Player}/Tags/ActionBeltManagerTag.cs (83%) rename Assets/Scripts/Intrepid/Gameplay/Entities/{Sentinel => Player}/Tags/ActionBeltManagerTag.cs.meta (100%) rename Assets/Scripts/Intrepid/Gameplay/Entities/{Sentinel => Player}/Tags/PlayerTag.cs (89%) rename Assets/Scripts/Intrepid/Gameplay/Entities/{Sentinel => Player}/Tags/PlayerTag.cs.meta (100%) delete mode 100644 Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/SentinelModelAnimationType.cs delete mode 100644 Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/SentinelModelAnimationType.cs.meta diff --git a/Assets/Scripts/Intrepid/Gameplay/Entities/Player.meta b/Assets/Scripts/Intrepid/Gameplay/Entities/Player.meta new file mode 100644 index 0000000..fa7f3d8 --- /dev/null +++ b/Assets/Scripts/Intrepid/Gameplay/Entities/Player.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 54f7a0c8663b4aa8ad10020a91ce7a1d +timeCreated: 1781006733 \ No newline at end of file diff --git a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/ActionBelt.meta b/Assets/Scripts/Intrepid/Gameplay/Entities/Player/ActionBelt.meta similarity index 100% rename from Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/ActionBelt.meta rename to Assets/Scripts/Intrepid/Gameplay/Entities/Player/ActionBelt.meta diff --git a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/ActionBelt/ActionBeltBoot.cs b/Assets/Scripts/Intrepid/Gameplay/Entities/Player/ActionBelt/ActionBeltBoot.cs similarity index 84% rename from Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/ActionBelt/ActionBeltBoot.cs rename to Assets/Scripts/Intrepid/Gameplay/Entities/Player/ActionBelt/ActionBeltBoot.cs index 60a7e7a..460dbcc 100644 --- a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/ActionBelt/ActionBeltBoot.cs +++ b/Assets/Scripts/Intrepid/Gameplay/Entities/Player/ActionBelt/ActionBeltBoot.cs @@ -1,11 +1,11 @@ using Intrepid.GameManagers; -using Intrepid.Gameplay.Entities.Sentinel.ActionBelt.Events; -using Intrepid.Gameplay.Entities.Sentinel.Tags; +using Intrepid.Gameplay.Entities.Player.ActionBelt.Events; +using Intrepid.Gameplay.Entities.Player.Tags; using Intrepid.Utilities; using Sirenix.OdinInspector; using UnityEngine; -namespace Intrepid.Gameplay.Entities.Sentinel.ActionBelt +namespace Intrepid.Gameplay.Entities.Player.ActionBelt { public class ActionBeltBoot : MonoBehaviour { diff --git a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/ActionBelt/ActionBeltBoot.cs.meta b/Assets/Scripts/Intrepid/Gameplay/Entities/Player/ActionBelt/ActionBeltBoot.cs.meta similarity index 100% rename from Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/ActionBelt/ActionBeltBoot.cs.meta rename to Assets/Scripts/Intrepid/Gameplay/Entities/Player/ActionBelt/ActionBeltBoot.cs.meta diff --git a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/ActionBelt/ActionBeltManager.cs b/Assets/Scripts/Intrepid/Gameplay/Entities/Player/ActionBelt/ActionBeltManager.cs similarity index 97% rename from Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/ActionBelt/ActionBeltManager.cs rename to Assets/Scripts/Intrepid/Gameplay/Entities/Player/ActionBelt/ActionBeltManager.cs index 393067e..51e0c35 100644 --- a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/ActionBelt/ActionBeltManager.cs +++ b/Assets/Scripts/Intrepid/Gameplay/Entities/Player/ActionBelt/ActionBeltManager.cs @@ -1,12 +1,12 @@ using Intrepid.GameManagers; -using Intrepid.Gameplay.Entities.Sentinel.ActionBelt.Events; -using Intrepid.Gameplay.Entities.Sentinel.Tags; +using Intrepid.Gameplay.Entities.Player.ActionBelt.Events; +using Intrepid.Gameplay.Entities.Player.Tags; using Intrepid.SimpleEvents; using Intrepid.Utilities; using Sirenix.OdinInspector; using UnityEngine; -namespace Intrepid.Gameplay.Entities.Sentinel.ActionBelt +namespace Intrepid.Gameplay.Entities.Player.ActionBelt { public class ActionBeltManager : EventListener { diff --git a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/ActionBelt/ActionBeltManager.cs.meta b/Assets/Scripts/Intrepid/Gameplay/Entities/Player/ActionBelt/ActionBeltManager.cs.meta similarity index 100% rename from Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/ActionBelt/ActionBeltManager.cs.meta rename to Assets/Scripts/Intrepid/Gameplay/Entities/Player/ActionBelt/ActionBeltManager.cs.meta diff --git a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/ActionBelt/ActionBeltTrigger.cs b/Assets/Scripts/Intrepid/Gameplay/Entities/Player/ActionBelt/ActionBeltTrigger.cs similarity index 91% rename from Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/ActionBelt/ActionBeltTrigger.cs rename to Assets/Scripts/Intrepid/Gameplay/Entities/Player/ActionBelt/ActionBeltTrigger.cs index 760544e..5e8db0e 100644 --- a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/ActionBelt/ActionBeltTrigger.cs +++ b/Assets/Scripts/Intrepid/Gameplay/Entities/Player/ActionBelt/ActionBeltTrigger.cs @@ -2,15 +2,15 @@ using System.Collections.Generic; using Intrepid.Core.Entities; using Intrepid.Core.Tags; using Intrepid.GameManagers; -using Intrepid.Gameplay.Entities.Sentinel.ActionBelt.Events; -using Intrepid.Gameplay.Entities.Sentinel.Tags; +using Intrepid.Gameplay.Entities.Player.ActionBelt.Events; +using Intrepid.Gameplay.Entities.Player.Tags; using Intrepid.Localization; using Intrepid.Utilities; using Sirenix.OdinInspector; using UnityEngine; using UnityEngine.Events; -namespace Intrepid.Gameplay.Entities.Sentinel.ActionBelt +namespace Intrepid.Gameplay.Entities.Player.ActionBelt { [RequireComponent(typeof(SphereCollider))] public class ActionBeltTrigger : EntityTrigger @@ -50,9 +50,9 @@ namespace Intrepid.Gameplay.Entities.Sentinel.ActionBelt ActionLocalization = actionLocalization, DescriptionLocalization = descriptionLocalization, DescriptionParams = Functions.GetParams(parameters), - Callback = actionInfo => + Callback = ActionIdentifier => { - callback?.Invoke(actionInfo); + callback?.Invoke(ActionIdentifier); return ActionCategory.Terminal.Equals(actionCategory) || shouldDropFromBeltWhenActivated; } } diff --git a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/ActionBelt/ActionBeltTrigger.cs.meta b/Assets/Scripts/Intrepid/Gameplay/Entities/Player/ActionBelt/ActionBeltTrigger.cs.meta similarity index 100% rename from Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/ActionBelt/ActionBeltTrigger.cs.meta rename to Assets/Scripts/Intrepid/Gameplay/Entities/Player/ActionBelt/ActionBeltTrigger.cs.meta diff --git a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/ActionBelt/ActionCategory.cs b/Assets/Scripts/Intrepid/Gameplay/Entities/Player/ActionBelt/ActionCategory.cs similarity index 61% rename from Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/ActionBelt/ActionCategory.cs rename to Assets/Scripts/Intrepid/Gameplay/Entities/Player/ActionBelt/ActionCategory.cs index 6e083dc..c677eb4 100644 --- a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/ActionBelt/ActionCategory.cs +++ b/Assets/Scripts/Intrepid/Gameplay/Entities/Player/ActionBelt/ActionCategory.cs @@ -1,4 +1,4 @@ -namespace Intrepid.Gameplay.Entities.Sentinel.ActionBelt +namespace Intrepid.Gameplay.Entities.Player.ActionBelt { public enum ActionCategory { diff --git a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/ActionBelt/ActionCategory.cs.meta b/Assets/Scripts/Intrepid/Gameplay/Entities/Player/ActionBelt/ActionCategory.cs.meta similarity index 100% rename from Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/ActionBelt/ActionCategory.cs.meta rename to Assets/Scripts/Intrepid/Gameplay/Entities/Player/ActionBelt/ActionCategory.cs.meta diff --git a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/ActionBelt/ActionEnvelope.cs b/Assets/Scripts/Intrepid/Gameplay/Entities/Player/ActionBelt/ActionEnvelope.cs similarity index 94% rename from Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/ActionBelt/ActionEnvelope.cs rename to Assets/Scripts/Intrepid/Gameplay/Entities/Player/ActionBelt/ActionEnvelope.cs index 6a842cc..bd534dc 100644 --- a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/ActionBelt/ActionEnvelope.cs +++ b/Assets/Scripts/Intrepid/Gameplay/Entities/Player/ActionBelt/ActionEnvelope.cs @@ -4,7 +4,7 @@ using Intrepid.Structures; using Intrepid.Utilities; using Sirenix.OdinInspector; -namespace Intrepid.Gameplay.Entities.Sentinel.ActionBelt +namespace Intrepid.Gameplay.Entities.Player.ActionBelt { [Serializable, DisplayAsString] public class ActionEnvelope diff --git a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/ActionBelt/ActionEnvelope.cs.meta b/Assets/Scripts/Intrepid/Gameplay/Entities/Player/ActionBelt/ActionEnvelope.cs.meta similarity index 100% rename from Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/ActionBelt/ActionEnvelope.cs.meta rename to Assets/Scripts/Intrepid/Gameplay/Entities/Player/ActionBelt/ActionEnvelope.cs.meta diff --git a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/ActionBelt/ActionIdentifier.cs b/Assets/Scripts/Intrepid/Gameplay/Entities/Player/ActionBelt/ActionIdentifier.cs similarity index 60% rename from Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/ActionBelt/ActionIdentifier.cs rename to Assets/Scripts/Intrepid/Gameplay/Entities/Player/ActionBelt/ActionIdentifier.cs index 9aba224..3cb63c7 100644 --- a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/ActionBelt/ActionIdentifier.cs +++ b/Assets/Scripts/Intrepid/Gameplay/Entities/Player/ActionBelt/ActionIdentifier.cs @@ -1,4 +1,4 @@ -namespace Intrepid.Gameplay.Entities.Sentinel.ActionBelt +namespace Intrepid.Gameplay.Entities.Player.ActionBelt { public class ActionIdentifier { diff --git a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/ActionBelt/ActionIdentifier.cs.meta b/Assets/Scripts/Intrepid/Gameplay/Entities/Player/ActionBelt/ActionIdentifier.cs.meta similarity index 100% rename from Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/ActionBelt/ActionIdentifier.cs.meta rename to Assets/Scripts/Intrepid/Gameplay/Entities/Player/ActionBelt/ActionIdentifier.cs.meta diff --git a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/ActionBelt/ActionStackBelt.cs b/Assets/Scripts/Intrepid/Gameplay/Entities/Player/ActionBelt/ActionStackBelt.cs similarity index 97% rename from Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/ActionBelt/ActionStackBelt.cs rename to Assets/Scripts/Intrepid/Gameplay/Entities/Player/ActionBelt/ActionStackBelt.cs index ee7ed49..72ec2aa 100644 --- a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/ActionBelt/ActionStackBelt.cs +++ b/Assets/Scripts/Intrepid/Gameplay/Entities/Player/ActionBelt/ActionStackBelt.cs @@ -1,7 +1,7 @@ using System.Linq; using Intrepid.Structures; -namespace Intrepid.Gameplay.Entities.Sentinel.ActionBelt +namespace Intrepid.Gameplay.Entities.Player.ActionBelt { public class ActionStackBelt : StackBelt { diff --git a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/ActionBelt/ActionStackBelt.cs.meta b/Assets/Scripts/Intrepid/Gameplay/Entities/Player/ActionBelt/ActionStackBelt.cs.meta similarity index 100% rename from Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/ActionBelt/ActionStackBelt.cs.meta rename to Assets/Scripts/Intrepid/Gameplay/Entities/Player/ActionBelt/ActionStackBelt.cs.meta diff --git a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/ActionBelt/Events.meta b/Assets/Scripts/Intrepid/Gameplay/Entities/Player/ActionBelt/Events.meta similarity index 100% rename from Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/ActionBelt/Events.meta rename to Assets/Scripts/Intrepid/Gameplay/Entities/Player/ActionBelt/Events.meta diff --git a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/ActionBelt/Events/ActionBeltAddEvent.cs b/Assets/Scripts/Intrepid/Gameplay/Entities/Player/ActionBelt/Events/ActionBeltAddEvent.cs similarity index 67% rename from Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/ActionBelt/Events/ActionBeltAddEvent.cs rename to Assets/Scripts/Intrepid/Gameplay/Entities/Player/ActionBelt/Events/ActionBeltAddEvent.cs index dd06f60..26f60d4 100644 --- a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/ActionBelt/Events/ActionBeltAddEvent.cs +++ b/Assets/Scripts/Intrepid/Gameplay/Entities/Player/ActionBelt/Events/ActionBeltAddEvent.cs @@ -1,4 +1,4 @@ -namespace Intrepid.Gameplay.Entities.Sentinel.ActionBelt.Events +namespace Intrepid.Gameplay.Entities.Player.ActionBelt.Events { public class ActionBeltAddEvent : ActionBeltBaseEvent { diff --git a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/ActionBelt/Events/ActionBeltAddEvent.cs.meta b/Assets/Scripts/Intrepid/Gameplay/Entities/Player/ActionBelt/Events/ActionBeltAddEvent.cs.meta similarity index 100% rename from Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/ActionBelt/Events/ActionBeltAddEvent.cs.meta rename to Assets/Scripts/Intrepid/Gameplay/Entities/Player/ActionBelt/Events/ActionBeltAddEvent.cs.meta diff --git a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/ActionBelt/Events/ActionBeltBaseEvent.cs b/Assets/Scripts/Intrepid/Gameplay/Entities/Player/ActionBelt/Events/ActionBeltBaseEvent.cs similarity index 60% rename from Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/ActionBelt/Events/ActionBeltBaseEvent.cs rename to Assets/Scripts/Intrepid/Gameplay/Entities/Player/ActionBelt/Events/ActionBeltBaseEvent.cs index efc7e66..78a97d5 100644 --- a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/ActionBelt/Events/ActionBeltBaseEvent.cs +++ b/Assets/Scripts/Intrepid/Gameplay/Entities/Player/ActionBelt/Events/ActionBeltBaseEvent.cs @@ -1,7 +1,7 @@ -using Intrepid.Gameplay.Entities.Sentinel.Tags; +using Intrepid.Gameplay.Entities.Player.Tags; using Intrepid.SimpleEvents; -namespace Intrepid.Gameplay.Entities.Sentinel.ActionBelt.Events +namespace Intrepid.Gameplay.Entities.Player.ActionBelt.Events { public abstract class ActionBeltBaseEvent : IEventBase { diff --git a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/ActionBelt/Events/ActionBeltBaseEvent.cs.meta b/Assets/Scripts/Intrepid/Gameplay/Entities/Player/ActionBelt/Events/ActionBeltBaseEvent.cs.meta similarity index 100% rename from Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/ActionBelt/Events/ActionBeltBaseEvent.cs.meta rename to Assets/Scripts/Intrepid/Gameplay/Entities/Player/ActionBelt/Events/ActionBeltBaseEvent.cs.meta diff --git a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/ActionBelt/Events/ActionBeltClearEvent.cs b/Assets/Scripts/Intrepid/Gameplay/Entities/Player/ActionBelt/Events/ActionBeltClearEvent.cs similarity index 53% rename from Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/ActionBelt/Events/ActionBeltClearEvent.cs rename to Assets/Scripts/Intrepid/Gameplay/Entities/Player/ActionBelt/Events/ActionBeltClearEvent.cs index 8be8f95..f1f1495 100644 --- a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/ActionBelt/Events/ActionBeltClearEvent.cs +++ b/Assets/Scripts/Intrepid/Gameplay/Entities/Player/ActionBelt/Events/ActionBeltClearEvent.cs @@ -1,4 +1,4 @@ -namespace Intrepid.Gameplay.Entities.Sentinel.ActionBelt.Events +namespace Intrepid.Gameplay.Entities.Player.ActionBelt.Events { public class ActionBeltClearEvent : ActionBeltBaseEvent { diff --git a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/ActionBelt/Events/ActionBeltClearEvent.cs.meta b/Assets/Scripts/Intrepid/Gameplay/Entities/Player/ActionBelt/Events/ActionBeltClearEvent.cs.meta similarity index 100% rename from Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/ActionBelt/Events/ActionBeltClearEvent.cs.meta rename to Assets/Scripts/Intrepid/Gameplay/Entities/Player/ActionBelt/Events/ActionBeltClearEvent.cs.meta diff --git a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/ActionBelt/Events/ActionBeltDisableEvent.cs b/Assets/Scripts/Intrepid/Gameplay/Entities/Player/ActionBelt/Events/ActionBeltDisableEvent.cs similarity index 54% rename from Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/ActionBelt/Events/ActionBeltDisableEvent.cs rename to Assets/Scripts/Intrepid/Gameplay/Entities/Player/ActionBelt/Events/ActionBeltDisableEvent.cs index 43617d6..9fce2b4 100644 --- a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/ActionBelt/Events/ActionBeltDisableEvent.cs +++ b/Assets/Scripts/Intrepid/Gameplay/Entities/Player/ActionBelt/Events/ActionBeltDisableEvent.cs @@ -1,4 +1,4 @@ -namespace Intrepid.Gameplay.Entities.Sentinel.ActionBelt.Events +namespace Intrepid.Gameplay.Entities.Player.ActionBelt.Events { public class ActionBeltDisableEvent : ActionBeltBaseEvent { diff --git a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/ActionBelt/Events/ActionBeltDisableEvent.cs.meta b/Assets/Scripts/Intrepid/Gameplay/Entities/Player/ActionBelt/Events/ActionBeltDisableEvent.cs.meta similarity index 100% rename from Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/ActionBelt/Events/ActionBeltDisableEvent.cs.meta rename to Assets/Scripts/Intrepid/Gameplay/Entities/Player/ActionBelt/Events/ActionBeltDisableEvent.cs.meta diff --git a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/ActionBelt/Events/ActionBeltDropEvent.cs b/Assets/Scripts/Intrepid/Gameplay/Entities/Player/ActionBelt/Events/ActionBeltDropEvent.cs similarity index 53% rename from Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/ActionBelt/Events/ActionBeltDropEvent.cs rename to Assets/Scripts/Intrepid/Gameplay/Entities/Player/ActionBelt/Events/ActionBeltDropEvent.cs index 9f097a4..8386cd2 100644 --- a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/ActionBelt/Events/ActionBeltDropEvent.cs +++ b/Assets/Scripts/Intrepid/Gameplay/Entities/Player/ActionBelt/Events/ActionBeltDropEvent.cs @@ -1,4 +1,4 @@ -namespace Intrepid.Gameplay.Entities.Sentinel.ActionBelt.Events +namespace Intrepid.Gameplay.Entities.Player.ActionBelt.Events { public class ActionBeltDropEvent : ActionBeltBaseEvent { diff --git a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/ActionBelt/Events/ActionBeltDropEvent.cs.meta b/Assets/Scripts/Intrepid/Gameplay/Entities/Player/ActionBelt/Events/ActionBeltDropEvent.cs.meta similarity index 100% rename from Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/ActionBelt/Events/ActionBeltDropEvent.cs.meta rename to Assets/Scripts/Intrepid/Gameplay/Entities/Player/ActionBelt/Events/ActionBeltDropEvent.cs.meta diff --git a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/ActionBelt/Events/ActionBeltEnableEvent.cs b/Assets/Scripts/Intrepid/Gameplay/Entities/Player/ActionBelt/Events/ActionBeltEnableEvent.cs similarity index 54% rename from Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/ActionBelt/Events/ActionBeltEnableEvent.cs rename to Assets/Scripts/Intrepid/Gameplay/Entities/Player/ActionBelt/Events/ActionBeltEnableEvent.cs index 4511896..2cc047c 100644 --- a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/ActionBelt/Events/ActionBeltEnableEvent.cs +++ b/Assets/Scripts/Intrepid/Gameplay/Entities/Player/ActionBelt/Events/ActionBeltEnableEvent.cs @@ -1,4 +1,4 @@ -namespace Intrepid.Gameplay.Entities.Sentinel.ActionBelt.Events +namespace Intrepid.Gameplay.Entities.Player.ActionBelt.Events { public class ActionBeltEnableEvent : ActionBeltBaseEvent { diff --git a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/ActionBelt/Events/ActionBeltEnableEvent.cs.meta b/Assets/Scripts/Intrepid/Gameplay/Entities/Player/ActionBelt/Events/ActionBeltEnableEvent.cs.meta similarity index 100% rename from Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/ActionBelt/Events/ActionBeltEnableEvent.cs.meta rename to Assets/Scripts/Intrepid/Gameplay/Entities/Player/ActionBelt/Events/ActionBeltEnableEvent.cs.meta diff --git a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/ActionBelt/Events/ActionBeltNextLeftEvent.cs b/Assets/Scripts/Intrepid/Gameplay/Entities/Player/ActionBelt/Events/ActionBeltNextLeftEvent.cs similarity index 54% rename from Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/ActionBelt/Events/ActionBeltNextLeftEvent.cs rename to Assets/Scripts/Intrepid/Gameplay/Entities/Player/ActionBelt/Events/ActionBeltNextLeftEvent.cs index ffde670..1d9314b 100644 --- a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/ActionBelt/Events/ActionBeltNextLeftEvent.cs +++ b/Assets/Scripts/Intrepid/Gameplay/Entities/Player/ActionBelt/Events/ActionBeltNextLeftEvent.cs @@ -1,4 +1,4 @@ -namespace Intrepid.Gameplay.Entities.Sentinel.ActionBelt.Events +namespace Intrepid.Gameplay.Entities.Player.ActionBelt.Events { public class ActionBeltNextLeftEvent : ActionBeltBaseEvent { diff --git a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/ActionBelt/Events/ActionBeltNextLeftEvent.cs.meta b/Assets/Scripts/Intrepid/Gameplay/Entities/Player/ActionBelt/Events/ActionBeltNextLeftEvent.cs.meta similarity index 100% rename from Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/ActionBelt/Events/ActionBeltNextLeftEvent.cs.meta rename to Assets/Scripts/Intrepid/Gameplay/Entities/Player/ActionBelt/Events/ActionBeltNextLeftEvent.cs.meta diff --git a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/ActionBelt/Events/ActionBeltNextRightEvent.cs b/Assets/Scripts/Intrepid/Gameplay/Entities/Player/ActionBelt/Events/ActionBeltNextRightEvent.cs similarity index 55% rename from Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/ActionBelt/Events/ActionBeltNextRightEvent.cs rename to Assets/Scripts/Intrepid/Gameplay/Entities/Player/ActionBelt/Events/ActionBeltNextRightEvent.cs index 5a5f9c6..edbc510 100644 --- a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/ActionBelt/Events/ActionBeltNextRightEvent.cs +++ b/Assets/Scripts/Intrepid/Gameplay/Entities/Player/ActionBelt/Events/ActionBeltNextRightEvent.cs @@ -1,4 +1,4 @@ -namespace Intrepid.Gameplay.Entities.Sentinel.ActionBelt.Events +namespace Intrepid.Gameplay.Entities.Player.ActionBelt.Events { public class ActionBeltNextRightEvent : ActionBeltBaseEvent { diff --git a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/ActionBelt/Events/ActionBeltNextRightEvent.cs.meta b/Assets/Scripts/Intrepid/Gameplay/Entities/Player/ActionBelt/Events/ActionBeltNextRightEvent.cs.meta similarity index 100% rename from Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/ActionBelt/Events/ActionBeltNextRightEvent.cs.meta rename to Assets/Scripts/Intrepid/Gameplay/Entities/Player/ActionBelt/Events/ActionBeltNextRightEvent.cs.meta diff --git a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/ActionBelt/Events/ActionBeltRefreshEvent.cs b/Assets/Scripts/Intrepid/Gameplay/Entities/Player/ActionBelt/Events/ActionBeltRefreshEvent.cs similarity index 54% rename from Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/ActionBelt/Events/ActionBeltRefreshEvent.cs rename to Assets/Scripts/Intrepid/Gameplay/Entities/Player/ActionBelt/Events/ActionBeltRefreshEvent.cs index 7c4845c..050a5ff 100644 --- a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/ActionBelt/Events/ActionBeltRefreshEvent.cs +++ b/Assets/Scripts/Intrepid/Gameplay/Entities/Player/ActionBelt/Events/ActionBeltRefreshEvent.cs @@ -1,4 +1,4 @@ -namespace Intrepid.Gameplay.Entities.Sentinel.ActionBelt.Events +namespace Intrepid.Gameplay.Entities.Player.ActionBelt.Events { public class ActionBeltRefreshEvent : ActionBeltBaseEvent { diff --git a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/ActionBelt/Events/ActionBeltRefreshEvent.cs.meta b/Assets/Scripts/Intrepid/Gameplay/Entities/Player/ActionBelt/Events/ActionBeltRefreshEvent.cs.meta similarity index 100% rename from Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/ActionBelt/Events/ActionBeltRefreshEvent.cs.meta rename to Assets/Scripts/Intrepid/Gameplay/Entities/Player/ActionBelt/Events/ActionBeltRefreshEvent.cs.meta diff --git a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/ActionBelt/Events/ActionBeltRemoveByIdAndTypeEvent.cs b/Assets/Scripts/Intrepid/Gameplay/Entities/Player/ActionBelt/Events/ActionBeltRemoveByIdAndTypeEvent.cs similarity index 74% rename from Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/ActionBelt/Events/ActionBeltRemoveByIdAndTypeEvent.cs rename to Assets/Scripts/Intrepid/Gameplay/Entities/Player/ActionBelt/Events/ActionBeltRemoveByIdAndTypeEvent.cs index 7fe6d91..0683bfe 100644 --- a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/ActionBelt/Events/ActionBeltRemoveByIdAndTypeEvent.cs +++ b/Assets/Scripts/Intrepid/Gameplay/Entities/Player/ActionBelt/Events/ActionBeltRemoveByIdAndTypeEvent.cs @@ -1,4 +1,4 @@ -namespace Intrepid.Gameplay.Entities.Sentinel.ActionBelt.Events +namespace Intrepid.Gameplay.Entities.Player.ActionBelt.Events { public class ActionBeltRemoveByIdAndTypeEvent : ActionBeltBaseEvent { diff --git a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/ActionBelt/Events/ActionBeltRemoveByIdAndTypeEvent.cs.meta b/Assets/Scripts/Intrepid/Gameplay/Entities/Player/ActionBelt/Events/ActionBeltRemoveByIdAndTypeEvent.cs.meta similarity index 100% rename from Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/ActionBelt/Events/ActionBeltRemoveByIdAndTypeEvent.cs.meta rename to Assets/Scripts/Intrepid/Gameplay/Entities/Player/ActionBelt/Events/ActionBeltRemoveByIdAndTypeEvent.cs.meta diff --git a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/ActionBelt/Events/ActionBeltRemoveByIdEvent.cs b/Assets/Scripts/Intrepid/Gameplay/Entities/Player/ActionBelt/Events/ActionBeltRemoveByIdEvent.cs similarity index 66% rename from Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/ActionBelt/Events/ActionBeltRemoveByIdEvent.cs rename to Assets/Scripts/Intrepid/Gameplay/Entities/Player/ActionBelt/Events/ActionBeltRemoveByIdEvent.cs index b0ee415..cb3a771 100644 --- a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/ActionBelt/Events/ActionBeltRemoveByIdEvent.cs +++ b/Assets/Scripts/Intrepid/Gameplay/Entities/Player/ActionBelt/Events/ActionBeltRemoveByIdEvent.cs @@ -1,4 +1,4 @@ -namespace Intrepid.Gameplay.Entities.Sentinel.ActionBelt.Events +namespace Intrepid.Gameplay.Entities.Player.ActionBelt.Events { public class ActionBeltRemoveByIdEvent : ActionBeltBaseEvent { diff --git a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/ActionBelt/Events/ActionBeltRemoveByIdEvent.cs.meta b/Assets/Scripts/Intrepid/Gameplay/Entities/Player/ActionBelt/Events/ActionBeltRemoveByIdEvent.cs.meta similarity index 100% rename from Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/ActionBelt/Events/ActionBeltRemoveByIdEvent.cs.meta rename to Assets/Scripts/Intrepid/Gameplay/Entities/Player/ActionBelt/Events/ActionBeltRemoveByIdEvent.cs.meta diff --git a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/ActionBelt/Events/ActionBeltRemoveByTypeEvent.cs b/Assets/Scripts/Intrepid/Gameplay/Entities/Player/ActionBelt/Events/ActionBeltRemoveByTypeEvent.cs similarity index 68% rename from Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/ActionBelt/Events/ActionBeltRemoveByTypeEvent.cs rename to Assets/Scripts/Intrepid/Gameplay/Entities/Player/ActionBelt/Events/ActionBeltRemoveByTypeEvent.cs index e145df6..5a6ef0a 100644 --- a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/ActionBelt/Events/ActionBeltRemoveByTypeEvent.cs +++ b/Assets/Scripts/Intrepid/Gameplay/Entities/Player/ActionBelt/Events/ActionBeltRemoveByTypeEvent.cs @@ -1,4 +1,4 @@ -namespace Intrepid.Gameplay.Entities.Sentinel.ActionBelt.Events +namespace Intrepid.Gameplay.Entities.Player.ActionBelt.Events { public class ActionBeltRemoveByTypeEvent : ActionBeltBaseEvent { diff --git a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/ActionBelt/Events/ActionBeltRemoveByTypeEvent.cs.meta b/Assets/Scripts/Intrepid/Gameplay/Entities/Player/ActionBelt/Events/ActionBeltRemoveByTypeEvent.cs.meta similarity index 100% rename from Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/ActionBelt/Events/ActionBeltRemoveByTypeEvent.cs.meta rename to Assets/Scripts/Intrepid/Gameplay/Entities/Player/ActionBelt/Events/ActionBeltRemoveByTypeEvent.cs.meta diff --git a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/ActionBelt/Events/ActionBeltTakeActionEvent.cs b/Assets/Scripts/Intrepid/Gameplay/Entities/Player/ActionBelt/Events/ActionBeltTakeActionEvent.cs similarity index 55% rename from Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/ActionBelt/Events/ActionBeltTakeActionEvent.cs rename to Assets/Scripts/Intrepid/Gameplay/Entities/Player/ActionBelt/Events/ActionBeltTakeActionEvent.cs index 9a16d51..d9b08c5 100644 --- a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/ActionBelt/Events/ActionBeltTakeActionEvent.cs +++ b/Assets/Scripts/Intrepid/Gameplay/Entities/Player/ActionBelt/Events/ActionBeltTakeActionEvent.cs @@ -1,4 +1,4 @@ -namespace Intrepid.Gameplay.Entities.Sentinel.ActionBelt.Events +namespace Intrepid.Gameplay.Entities.Player.ActionBelt.Events { public class ActionBeltTakeActionEvent : ActionBeltBaseEvent { diff --git a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/ActionBelt/Events/ActionBeltTakeActionEvent.cs.meta b/Assets/Scripts/Intrepid/Gameplay/Entities/Player/ActionBelt/Events/ActionBeltTakeActionEvent.cs.meta similarity index 100% rename from Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/ActionBelt/Events/ActionBeltTakeActionEvent.cs.meta rename to Assets/Scripts/Intrepid/Gameplay/Entities/Player/ActionBelt/Events/ActionBeltTakeActionEvent.cs.meta diff --git a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/ActionBelt/Events/ActionBeltUICloseEvent.cs b/Assets/Scripts/Intrepid/Gameplay/Entities/Player/ActionBelt/Events/ActionBeltUICloseEvent.cs similarity index 60% rename from Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/ActionBelt/Events/ActionBeltUICloseEvent.cs rename to Assets/Scripts/Intrepid/Gameplay/Entities/Player/ActionBelt/Events/ActionBeltUICloseEvent.cs index 9fd819c..6ebfba0 100644 --- a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/ActionBelt/Events/ActionBeltUICloseEvent.cs +++ b/Assets/Scripts/Intrepid/Gameplay/Entities/Player/ActionBelt/Events/ActionBeltUICloseEvent.cs @@ -1,6 +1,6 @@ using Intrepid.SimpleEvents; -namespace Intrepid.Gameplay.Entities.Sentinel.ActionBelt.Events +namespace Intrepid.Gameplay.Entities.Player.ActionBelt.Events { public class ActionBeltUICloseEvent : IEventBase { diff --git a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/ActionBelt/Events/ActionBeltUICloseEvent.cs.meta b/Assets/Scripts/Intrepid/Gameplay/Entities/Player/ActionBelt/Events/ActionBeltUICloseEvent.cs.meta similarity index 100% rename from Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/ActionBelt/Events/ActionBeltUICloseEvent.cs.meta rename to Assets/Scripts/Intrepid/Gameplay/Entities/Player/ActionBelt/Events/ActionBeltUICloseEvent.cs.meta diff --git a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/ActionBelt/Events/ActionBeltUIDropEvent.cs b/Assets/Scripts/Intrepid/Gameplay/Entities/Player/ActionBelt/Events/ActionBeltUIDropEvent.cs similarity index 62% rename from Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/ActionBelt/Events/ActionBeltUIDropEvent.cs rename to Assets/Scripts/Intrepid/Gameplay/Entities/Player/ActionBelt/Events/ActionBeltUIDropEvent.cs index 2bf8651..05d6104 100644 --- a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/ActionBelt/Events/ActionBeltUIDropEvent.cs +++ b/Assets/Scripts/Intrepid/Gameplay/Entities/Player/ActionBelt/Events/ActionBeltUIDropEvent.cs @@ -1,6 +1,6 @@ using Intrepid.SimpleEvents; -namespace Intrepid.Gameplay.Entities.Sentinel.ActionBelt.Events +namespace Intrepid.Gameplay.Entities.Player.ActionBelt.Events { public class ActionBeltUIDropEvent : IEventBase { diff --git a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/ActionBelt/Events/ActionBeltUIDropEvent.cs.meta b/Assets/Scripts/Intrepid/Gameplay/Entities/Player/ActionBelt/Events/ActionBeltUIDropEvent.cs.meta similarity index 100% rename from Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/ActionBelt/Events/ActionBeltUIDropEvent.cs.meta rename to Assets/Scripts/Intrepid/Gameplay/Entities/Player/ActionBelt/Events/ActionBeltUIDropEvent.cs.meta diff --git a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/ActionBelt/Events/ActionBeltUIOpenEvent.cs b/Assets/Scripts/Intrepid/Gameplay/Entities/Player/ActionBelt/Events/ActionBeltUIOpenEvent.cs similarity index 85% rename from Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/ActionBelt/Events/ActionBeltUIOpenEvent.cs rename to Assets/Scripts/Intrepid/Gameplay/Entities/Player/ActionBelt/Events/ActionBeltUIOpenEvent.cs index 1c4a7e8..50fd1cc 100644 --- a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/ActionBelt/Events/ActionBeltUIOpenEvent.cs +++ b/Assets/Scripts/Intrepid/Gameplay/Entities/Player/ActionBelt/Events/ActionBeltUIOpenEvent.cs @@ -1,7 +1,7 @@ using System; using Intrepid.SimpleEvents; -namespace Intrepid.Gameplay.Entities.Sentinel.ActionBelt.Events +namespace Intrepid.Gameplay.Entities.Player.ActionBelt.Events { public class ActionBeltUIOpenEvent : IEventBase { diff --git a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/ActionBelt/Events/ActionBeltUIOpenEvent.cs.meta b/Assets/Scripts/Intrepid/Gameplay/Entities/Player/ActionBelt/Events/ActionBeltUIOpenEvent.cs.meta similarity index 100% rename from Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/ActionBelt/Events/ActionBeltUIOpenEvent.cs.meta rename to Assets/Scripts/Intrepid/Gameplay/Entities/Player/ActionBelt/Events/ActionBeltUIOpenEvent.cs.meta diff --git a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/ActionBelt/Events/ActionBeltUITakeActionEvent.cs b/Assets/Scripts/Intrepid/Gameplay/Entities/Player/ActionBelt/Events/ActionBeltUITakeActionEvent.cs similarity index 63% rename from Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/ActionBelt/Events/ActionBeltUITakeActionEvent.cs rename to Assets/Scripts/Intrepid/Gameplay/Entities/Player/ActionBelt/Events/ActionBeltUITakeActionEvent.cs index 973e7a2..908ffc6 100644 --- a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/ActionBelt/Events/ActionBeltUITakeActionEvent.cs +++ b/Assets/Scripts/Intrepid/Gameplay/Entities/Player/ActionBelt/Events/ActionBeltUITakeActionEvent.cs @@ -1,6 +1,6 @@ using Intrepid.SimpleEvents; -namespace Intrepid.Gameplay.Entities.Sentinel.ActionBelt.Events +namespace Intrepid.Gameplay.Entities.Player.ActionBelt.Events { public class ActionBeltUITakeActionEvent : IEventBase { diff --git a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/ActionBelt/Events/ActionBeltUITakeActionEvent.cs.meta b/Assets/Scripts/Intrepid/Gameplay/Entities/Player/ActionBelt/Events/ActionBeltUITakeActionEvent.cs.meta similarity index 100% rename from Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/ActionBelt/Events/ActionBeltUITakeActionEvent.cs.meta rename to Assets/Scripts/Intrepid/Gameplay/Entities/Player/ActionBelt/Events/ActionBeltUITakeActionEvent.cs.meta diff --git a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/ActionBelt/Events/ActionBeltUIToLeftEvent.cs b/Assets/Scripts/Intrepid/Gameplay/Entities/Player/ActionBelt/Events/ActionBeltUIToLeftEvent.cs similarity index 62% rename from Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/ActionBelt/Events/ActionBeltUIToLeftEvent.cs rename to Assets/Scripts/Intrepid/Gameplay/Entities/Player/ActionBelt/Events/ActionBeltUIToLeftEvent.cs index 5a3afd6..e630da7 100644 --- a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/ActionBelt/Events/ActionBeltUIToLeftEvent.cs +++ b/Assets/Scripts/Intrepid/Gameplay/Entities/Player/ActionBelt/Events/ActionBeltUIToLeftEvent.cs @@ -1,6 +1,6 @@ using Intrepid.SimpleEvents; -namespace Intrepid.Gameplay.Entities.Sentinel.ActionBelt.Events +namespace Intrepid.Gameplay.Entities.Player.ActionBelt.Events { public class ActionBeltUIToLeftEvent : IEventBase { diff --git a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/ActionBelt/Events/ActionBeltUIToLeftEvent.cs.meta b/Assets/Scripts/Intrepid/Gameplay/Entities/Player/ActionBelt/Events/ActionBeltUIToLeftEvent.cs.meta similarity index 100% rename from Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/ActionBelt/Events/ActionBeltUIToLeftEvent.cs.meta rename to Assets/Scripts/Intrepid/Gameplay/Entities/Player/ActionBelt/Events/ActionBeltUIToLeftEvent.cs.meta diff --git a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/ActionBelt/Events/ActionBeltUIToRightEvent.cs b/Assets/Scripts/Intrepid/Gameplay/Entities/Player/ActionBelt/Events/ActionBeltUIToRightEvent.cs similarity index 63% rename from Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/ActionBelt/Events/ActionBeltUIToRightEvent.cs rename to Assets/Scripts/Intrepid/Gameplay/Entities/Player/ActionBelt/Events/ActionBeltUIToRightEvent.cs index 6e8ccb3..3a42dd8 100644 --- a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/ActionBelt/Events/ActionBeltUIToRightEvent.cs +++ b/Assets/Scripts/Intrepid/Gameplay/Entities/Player/ActionBelt/Events/ActionBeltUIToRightEvent.cs @@ -1,6 +1,6 @@ using Intrepid.SimpleEvents; -namespace Intrepid.Gameplay.Entities.Sentinel.ActionBelt.Events +namespace Intrepid.Gameplay.Entities.Player.ActionBelt.Events { public class ActionBeltUIToRightEvent : IEventBase { diff --git a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/ActionBelt/Events/ActionBeltUIToRightEvent.cs.meta b/Assets/Scripts/Intrepid/Gameplay/Entities/Player/ActionBelt/Events/ActionBeltUIToRightEvent.cs.meta similarity index 100% rename from Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/ActionBelt/Events/ActionBeltUIToRightEvent.cs.meta rename to Assets/Scripts/Intrepid/Gameplay/Entities/Player/ActionBelt/Events/ActionBeltUIToRightEvent.cs.meta diff --git a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/ActionBelt/UI.meta b/Assets/Scripts/Intrepid/Gameplay/Entities/Player/ActionBelt/UI.meta similarity index 100% rename from Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/ActionBelt/UI.meta rename to Assets/Scripts/Intrepid/Gameplay/Entities/Player/ActionBelt/UI.meta diff --git a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/ActionBelt/UI/ActionBeltUI.cs b/Assets/Scripts/Intrepid/Gameplay/Entities/Player/ActionBelt/UI/ActionBeltUI.cs similarity index 98% rename from Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/ActionBelt/UI/ActionBeltUI.cs rename to Assets/Scripts/Intrepid/Gameplay/Entities/Player/ActionBelt/UI/ActionBeltUI.cs index d8367e9..7ef09c3 100644 --- a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/ActionBelt/UI/ActionBeltUI.cs +++ b/Assets/Scripts/Intrepid/Gameplay/Entities/Player/ActionBelt/UI/ActionBeltUI.cs @@ -3,7 +3,7 @@ using Intrepid.Core.Themes; using Intrepid.Core.UI; using Intrepid.Core.UI.Dialog; using Intrepid.GameManagers; -using Intrepid.Gameplay.Entities.Sentinel.ActionBelt.Events; +using Intrepid.Gameplay.Entities.Player.ActionBelt.Events; using Intrepid.SimpleEvents; using Intrepid.Utilities; using Intrepid.Utilities.Sprite; @@ -11,7 +11,7 @@ using Sirenix.OdinInspector; using TMPro; using UnityEngine; -namespace Intrepid.Gameplay.Entities.Sentinel.ActionBelt.UI +namespace Intrepid.Gameplay.Entities.Player.ActionBelt.UI { public class ActionBeltUI : EventListener { diff --git a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/ActionBelt/UI/ActionBeltUI.cs.meta b/Assets/Scripts/Intrepid/Gameplay/Entities/Player/ActionBelt/UI/ActionBeltUI.cs.meta similarity index 100% rename from Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/ActionBelt/UI/ActionBeltUI.cs.meta rename to Assets/Scripts/Intrepid/Gameplay/Entities/Player/ActionBelt/UI/ActionBeltUI.cs.meta diff --git a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel.meta b/Assets/Scripts/Intrepid/Gameplay/Entities/Player/Sentinel.meta similarity index 100% rename from Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel.meta rename to Assets/Scripts/Intrepid/Gameplay/Entities/Player/Sentinel.meta diff --git a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/SentinelBrain.cs b/Assets/Scripts/Intrepid/Gameplay/Entities/Player/Sentinel/SentinelBrain.cs similarity index 95% rename from Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/SentinelBrain.cs rename to Assets/Scripts/Intrepid/Gameplay/Entities/Player/Sentinel/SentinelBrain.cs index e7c1a93..eeaf315 100644 --- a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/SentinelBrain.cs +++ b/Assets/Scripts/Intrepid/Gameplay/Entities/Player/Sentinel/SentinelBrain.cs @@ -1,13 +1,13 @@ using System; using Intrepid.Core.Entities; using Intrepid.Core.Entities.Messages; -using Intrepid.Gameplay.Entities.Sentinel.StateMachine; +using Intrepid.Gameplay.Entities.Player.Sentinel.StateMachine; using Intrepid.Integration.Input; using Intrepid.Structures; using Intrepid.Utilities; using UnityEngine; -namespace Intrepid.Gameplay.Entities.Sentinel +namespace Intrepid.Gameplay.Entities.Player.Sentinel { public class SentinelBrain : EntityBrain { diff --git a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/SentinelBrain.cs.meta b/Assets/Scripts/Intrepid/Gameplay/Entities/Player/Sentinel/SentinelBrain.cs.meta similarity index 100% rename from Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/SentinelBrain.cs.meta rename to Assets/Scripts/Intrepid/Gameplay/Entities/Player/Sentinel/SentinelBrain.cs.meta diff --git a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/SentinelConstants.cs b/Assets/Scripts/Intrepid/Gameplay/Entities/Player/Sentinel/SentinelConstants.cs similarity index 91% rename from Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/SentinelConstants.cs rename to Assets/Scripts/Intrepid/Gameplay/Entities/Player/Sentinel/SentinelConstants.cs index 172b420..96fcab1 100644 --- a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/SentinelConstants.cs +++ b/Assets/Scripts/Intrepid/Gameplay/Entities/Player/Sentinel/SentinelConstants.cs @@ -1,4 +1,4 @@ -namespace Intrepid.Gameplay.Entities.Sentinel +namespace Intrepid.Gameplay.Entities.Player.Sentinel { public static class SentinelConstants { diff --git a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/SentinelConstants.cs.meta b/Assets/Scripts/Intrepid/Gameplay/Entities/Player/Sentinel/SentinelConstants.cs.meta similarity index 100% rename from Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/SentinelConstants.cs.meta rename to Assets/Scripts/Intrepid/Gameplay/Entities/Player/Sentinel/SentinelConstants.cs.meta diff --git a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/SentinelControls.cs b/Assets/Scripts/Intrepid/Gameplay/Entities/Player/Sentinel/SentinelControls.cs similarity index 92% rename from Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/SentinelControls.cs rename to Assets/Scripts/Intrepid/Gameplay/Entities/Player/Sentinel/SentinelControls.cs index e997ee0..d0f078f 100644 --- a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/SentinelControls.cs +++ b/Assets/Scripts/Intrepid/Gameplay/Entities/Player/Sentinel/SentinelControls.cs @@ -1,7 +1,7 @@ using Intrepid.Utilities; using UnityEngine; -namespace Intrepid.Gameplay.Entities.Sentinel +namespace Intrepid.Gameplay.Entities.Player.Sentinel { public class SentinelControls : MonoBehaviour { diff --git a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/SentinelControls.cs.meta b/Assets/Scripts/Intrepid/Gameplay/Entities/Player/Sentinel/SentinelControls.cs.meta similarity index 100% rename from Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/SentinelControls.cs.meta rename to Assets/Scripts/Intrepid/Gameplay/Entities/Player/Sentinel/SentinelControls.cs.meta diff --git a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/SentinelEntity.cs b/Assets/Scripts/Intrepid/Gameplay/Entities/Player/Sentinel/SentinelEntity.cs similarity index 98% rename from Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/SentinelEntity.cs rename to Assets/Scripts/Intrepid/Gameplay/Entities/Player/Sentinel/SentinelEntity.cs index 8690d48..551ee80 100644 --- a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/SentinelEntity.cs +++ b/Assets/Scripts/Intrepid/Gameplay/Entities/Player/Sentinel/SentinelEntity.cs @@ -4,7 +4,7 @@ using Intrepid.Gameplay.Messages.Events; using Intrepid.Utilities; using UnityEngine; -namespace Intrepid.Gameplay.Entities.Sentinel +namespace Intrepid.Gameplay.Entities.Player.Sentinel { public class SentinelEntity : Entity { diff --git a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/SentinelEntity.cs.meta b/Assets/Scripts/Intrepid/Gameplay/Entities/Player/Sentinel/SentinelEntity.cs.meta similarity index 100% rename from Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/SentinelEntity.cs.meta rename to Assets/Scripts/Intrepid/Gameplay/Entities/Player/Sentinel/SentinelEntity.cs.meta diff --git a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/SentinelInputs.cs b/Assets/Scripts/Intrepid/Gameplay/Entities/Player/Sentinel/SentinelInputs.cs similarity index 82% rename from Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/SentinelInputs.cs rename to Assets/Scripts/Intrepid/Gameplay/Entities/Player/Sentinel/SentinelInputs.cs index 1628b44..1703c74 100644 --- a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/SentinelInputs.cs +++ b/Assets/Scripts/Intrepid/Gameplay/Entities/Player/Sentinel/SentinelInputs.cs @@ -1,7 +1,7 @@ using System; using UnityEngine; -namespace Intrepid.Gameplay.Entities.Sentinel +namespace Intrepid.Gameplay.Entities.Player.Sentinel { public class SentinelInputs { diff --git a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/SentinelInputs.cs.meta b/Assets/Scripts/Intrepid/Gameplay/Entities/Player/Sentinel/SentinelInputs.cs.meta similarity index 100% rename from Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/SentinelInputs.cs.meta rename to Assets/Scripts/Intrepid/Gameplay/Entities/Player/Sentinel/SentinelInputs.cs.meta diff --git a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/SentinelStateType.cs b/Assets/Scripts/Intrepid/Gameplay/Entities/Player/Sentinel/SentinelStateType.cs similarity index 86% rename from Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/SentinelStateType.cs rename to Assets/Scripts/Intrepid/Gameplay/Entities/Player/Sentinel/SentinelStateType.cs index 7f89001..1878731 100644 --- a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/SentinelStateType.cs +++ b/Assets/Scripts/Intrepid/Gameplay/Entities/Player/Sentinel/SentinelStateType.cs @@ -1,4 +1,4 @@ -namespace Intrepid.Gameplay.Entities.Sentinel +namespace Intrepid.Gameplay.Entities.Player.Sentinel { public enum SentinelStateType { diff --git a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/SentinelStateType.cs.meta b/Assets/Scripts/Intrepid/Gameplay/Entities/Player/Sentinel/SentinelStateType.cs.meta similarity index 100% rename from Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/SentinelStateType.cs.meta rename to Assets/Scripts/Intrepid/Gameplay/Entities/Player/Sentinel/SentinelStateType.cs.meta diff --git a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/StateMachine.meta b/Assets/Scripts/Intrepid/Gameplay/Entities/Player/Sentinel/StateMachine.meta similarity index 100% rename from Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/StateMachine.meta rename to Assets/Scripts/Intrepid/Gameplay/Entities/Player/Sentinel/StateMachine.meta diff --git a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/StateMachine/SentinelState.cs b/Assets/Scripts/Intrepid/Gameplay/Entities/Player/Sentinel/StateMachine/SentinelState.cs similarity index 91% rename from Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/StateMachine/SentinelState.cs rename to Assets/Scripts/Intrepid/Gameplay/Entities/Player/Sentinel/StateMachine/SentinelState.cs index 631d8fc..ac93926 100644 --- a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/StateMachine/SentinelState.cs +++ b/Assets/Scripts/Intrepid/Gameplay/Entities/Player/Sentinel/StateMachine/SentinelState.cs @@ -1,6 +1,6 @@ using Intrepid.Core.Entities; -namespace Intrepid.Gameplay.Entities.Sentinel.StateMachine +namespace Intrepid.Gameplay.Entities.Player.Sentinel.StateMachine { public abstract class SentinelState : EntityState, IControllableEntityBrain { diff --git a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/StateMachine/SentinelState.cs.meta b/Assets/Scripts/Intrepid/Gameplay/Entities/Player/Sentinel/StateMachine/SentinelState.cs.meta similarity index 100% rename from Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/StateMachine/SentinelState.cs.meta rename to Assets/Scripts/Intrepid/Gameplay/Entities/Player/Sentinel/StateMachine/SentinelState.cs.meta diff --git a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/StateMachine/SentinelStateMachine.cs b/Assets/Scripts/Intrepid/Gameplay/Entities/Player/Sentinel/StateMachine/SentinelStateMachine.cs similarity index 67% rename from Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/StateMachine/SentinelStateMachine.cs rename to Assets/Scripts/Intrepid/Gameplay/Entities/Player/Sentinel/StateMachine/SentinelStateMachine.cs index d098ea8..85c4493 100644 --- a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/StateMachine/SentinelStateMachine.cs +++ b/Assets/Scripts/Intrepid/Gameplay/Entities/Player/Sentinel/StateMachine/SentinelStateMachine.cs @@ -1,6 +1,6 @@ using Intrepid.Core.Entities; -namespace Intrepid.Gameplay.Entities.Sentinel.StateMachine +namespace Intrepid.Gameplay.Entities.Player.Sentinel.StateMachine { public class SentinelStateMachine : EntityStateMachine { diff --git a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/StateMachine/SentinelStateMachine.cs.meta b/Assets/Scripts/Intrepid/Gameplay/Entities/Player/Sentinel/StateMachine/SentinelStateMachine.cs.meta similarity index 100% rename from Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/StateMachine/SentinelStateMachine.cs.meta rename to Assets/Scripts/Intrepid/Gameplay/Entities/Player/Sentinel/StateMachine/SentinelStateMachine.cs.meta diff --git a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/StateMachine/States.meta b/Assets/Scripts/Intrepid/Gameplay/Entities/Player/Sentinel/StateMachine/States.meta similarity index 100% rename from Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/StateMachine/States.meta rename to Assets/Scripts/Intrepid/Gameplay/Entities/Player/Sentinel/StateMachine/States.meta diff --git a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/StateMachine/States/SentinelStateDash.cs b/Assets/Scripts/Intrepid/Gameplay/Entities/Player/Sentinel/StateMachine/States/SentinelStateDash.cs similarity index 96% rename from Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/StateMachine/States/SentinelStateDash.cs rename to Assets/Scripts/Intrepid/Gameplay/Entities/Player/Sentinel/StateMachine/States/SentinelStateDash.cs index 2013a28..f7fccc6 100644 --- a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/StateMachine/States/SentinelStateDash.cs +++ b/Assets/Scripts/Intrepid/Gameplay/Entities/Player/Sentinel/StateMachine/States/SentinelStateDash.cs @@ -3,7 +3,7 @@ using Intrepid.Structures; using Intrepid.Utilities; using UnityEngine; -namespace Intrepid.Gameplay.Entities.Sentinel.StateMachine.States +namespace Intrepid.Gameplay.Entities.Player.Sentinel.StateMachine.States { public class SentinelStateDash : SentinelState { diff --git a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/StateMachine/States/SentinelStateDash.cs.meta b/Assets/Scripts/Intrepid/Gameplay/Entities/Player/Sentinel/StateMachine/States/SentinelStateDash.cs.meta similarity index 100% rename from Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/StateMachine/States/SentinelStateDash.cs.meta rename to Assets/Scripts/Intrepid/Gameplay/Entities/Player/Sentinel/StateMachine/States/SentinelStateDash.cs.meta diff --git a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/StateMachine/States/SentinelStateDashBreaking.cs b/Assets/Scripts/Intrepid/Gameplay/Entities/Player/Sentinel/StateMachine/States/SentinelStateDashBreaking.cs similarity index 96% rename from Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/StateMachine/States/SentinelStateDashBreaking.cs rename to Assets/Scripts/Intrepid/Gameplay/Entities/Player/Sentinel/StateMachine/States/SentinelStateDashBreaking.cs index d3fded1..715107a 100644 --- a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/StateMachine/States/SentinelStateDashBreaking.cs +++ b/Assets/Scripts/Intrepid/Gameplay/Entities/Player/Sentinel/StateMachine/States/SentinelStateDashBreaking.cs @@ -2,7 +2,7 @@ using Intrepid.Structures; using Intrepid.Utilities; using UnityEngine; -namespace Intrepid.Gameplay.Entities.Sentinel.StateMachine.States +namespace Intrepid.Gameplay.Entities.Player.Sentinel.StateMachine.States { public class SentinelStateDashBreaking : SentinelState { diff --git a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/StateMachine/States/SentinelStateDashBreaking.cs.meta b/Assets/Scripts/Intrepid/Gameplay/Entities/Player/Sentinel/StateMachine/States/SentinelStateDashBreaking.cs.meta similarity index 100% rename from Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/StateMachine/States/SentinelStateDashBreaking.cs.meta rename to Assets/Scripts/Intrepid/Gameplay/Entities/Player/Sentinel/StateMachine/States/SentinelStateDashBreaking.cs.meta diff --git a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/StateMachine/States/SentinelStateDashWindow.cs b/Assets/Scripts/Intrepid/Gameplay/Entities/Player/Sentinel/StateMachine/States/SentinelStateDashWindow.cs similarity index 97% rename from Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/StateMachine/States/SentinelStateDashWindow.cs rename to Assets/Scripts/Intrepid/Gameplay/Entities/Player/Sentinel/StateMachine/States/SentinelStateDashWindow.cs index 83c456c..8ff230c 100644 --- a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/StateMachine/States/SentinelStateDashWindow.cs +++ b/Assets/Scripts/Intrepid/Gameplay/Entities/Player/Sentinel/StateMachine/States/SentinelStateDashWindow.cs @@ -2,7 +2,7 @@ using Intrepid.Structures; using Intrepid.Utilities; using UnityEngine; -namespace Intrepid.Gameplay.Entities.Sentinel.StateMachine.States +namespace Intrepid.Gameplay.Entities.Player.Sentinel.StateMachine.States { public class SentinelStateDashWindow : SentinelState { diff --git a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/StateMachine/States/SentinelStateDashWindow.cs.meta b/Assets/Scripts/Intrepid/Gameplay/Entities/Player/Sentinel/StateMachine/States/SentinelStateDashWindow.cs.meta similarity index 100% rename from Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/StateMachine/States/SentinelStateDashWindow.cs.meta rename to Assets/Scripts/Intrepid/Gameplay/Entities/Player/Sentinel/StateMachine/States/SentinelStateDashWindow.cs.meta diff --git a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/StateMachine/States/SentinelStateFall.cs b/Assets/Scripts/Intrepid/Gameplay/Entities/Player/Sentinel/StateMachine/States/SentinelStateFall.cs similarity index 93% rename from Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/StateMachine/States/SentinelStateFall.cs rename to Assets/Scripts/Intrepid/Gameplay/Entities/Player/Sentinel/StateMachine/States/SentinelStateFall.cs index 0599354..c9b9957 100644 --- a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/StateMachine/States/SentinelStateFall.cs +++ b/Assets/Scripts/Intrepid/Gameplay/Entities/Player/Sentinel/StateMachine/States/SentinelStateFall.cs @@ -4,7 +4,7 @@ using Intrepid.Structures; using Intrepid.Utilities; using UnityEngine; -namespace Intrepid.Gameplay.Entities.Sentinel.StateMachine.States +namespace Intrepid.Gameplay.Entities.Player.Sentinel.StateMachine.States { public class SentinelStateFall : SentinelState { diff --git a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/StateMachine/States/SentinelStateFall.cs.meta b/Assets/Scripts/Intrepid/Gameplay/Entities/Player/Sentinel/StateMachine/States/SentinelStateFall.cs.meta similarity index 100% rename from Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/StateMachine/States/SentinelStateFall.cs.meta rename to Assets/Scripts/Intrepid/Gameplay/Entities/Player/Sentinel/StateMachine/States/SentinelStateFall.cs.meta diff --git a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/StateMachine/States/SentinelStateFallLanding.cs b/Assets/Scripts/Intrepid/Gameplay/Entities/Player/Sentinel/StateMachine/States/SentinelStateFallLanding.cs similarity index 94% rename from Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/StateMachine/States/SentinelStateFallLanding.cs rename to Assets/Scripts/Intrepid/Gameplay/Entities/Player/Sentinel/StateMachine/States/SentinelStateFallLanding.cs index da0bd1e..97154fe 100644 --- a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/StateMachine/States/SentinelStateFallLanding.cs +++ b/Assets/Scripts/Intrepid/Gameplay/Entities/Player/Sentinel/StateMachine/States/SentinelStateFallLanding.cs @@ -2,7 +2,7 @@ using Intrepid.Structures; using Intrepid.Utilities; using UnityEngine; -namespace Intrepid.Gameplay.Entities.Sentinel.StateMachine.States +namespace Intrepid.Gameplay.Entities.Player.Sentinel.StateMachine.States { public class SentinelStateFallLanding : SentinelState { diff --git a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/StateMachine/States/SentinelStateFallLanding.cs.meta b/Assets/Scripts/Intrepid/Gameplay/Entities/Player/Sentinel/StateMachine/States/SentinelStateFallLanding.cs.meta similarity index 100% rename from Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/StateMachine/States/SentinelStateFallLanding.cs.meta rename to Assets/Scripts/Intrepid/Gameplay/Entities/Player/Sentinel/StateMachine/States/SentinelStateFallLanding.cs.meta diff --git a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/StateMachine/States/SentinelStateFallToAbyss.cs b/Assets/Scripts/Intrepid/Gameplay/Entities/Player/Sentinel/StateMachine/States/SentinelStateFallToAbyss.cs similarity index 91% rename from Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/StateMachine/States/SentinelStateFallToAbyss.cs rename to Assets/Scripts/Intrepid/Gameplay/Entities/Player/Sentinel/StateMachine/States/SentinelStateFallToAbyss.cs index 502d46e..c5acba5 100644 --- a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/StateMachine/States/SentinelStateFallToAbyss.cs +++ b/Assets/Scripts/Intrepid/Gameplay/Entities/Player/Sentinel/StateMachine/States/SentinelStateFallToAbyss.cs @@ -2,7 +2,7 @@ using Intrepid.Structures; using Intrepid.Utilities; using UnityEngine; -namespace Intrepid.Gameplay.Entities.Sentinel.StateMachine.States +namespace Intrepid.Gameplay.Entities.Player.Sentinel.StateMachine.States { public class SentinelStateFallToAbyss : SentinelState { diff --git a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/StateMachine/States/SentinelStateFallToAbyss.cs.meta b/Assets/Scripts/Intrepid/Gameplay/Entities/Player/Sentinel/StateMachine/States/SentinelStateFallToAbyss.cs.meta similarity index 100% rename from Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/StateMachine/States/SentinelStateFallToAbyss.cs.meta rename to Assets/Scripts/Intrepid/Gameplay/Entities/Player/Sentinel/StateMachine/States/SentinelStateFallToAbyss.cs.meta diff --git a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/StateMachine/States/SentinelStateIdle.cs b/Assets/Scripts/Intrepid/Gameplay/Entities/Player/Sentinel/StateMachine/States/SentinelStateIdle.cs similarity index 96% rename from Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/StateMachine/States/SentinelStateIdle.cs rename to Assets/Scripts/Intrepid/Gameplay/Entities/Player/Sentinel/StateMachine/States/SentinelStateIdle.cs index 3f4471f..53161c3 100644 --- a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/StateMachine/States/SentinelStateIdle.cs +++ b/Assets/Scripts/Intrepid/Gameplay/Entities/Player/Sentinel/StateMachine/States/SentinelStateIdle.cs @@ -2,7 +2,7 @@ using Intrepid.Structures; using Intrepid.Utilities; using UnityEngine; -namespace Intrepid.Gameplay.Entities.Sentinel.StateMachine.States +namespace Intrepid.Gameplay.Entities.Player.Sentinel.StateMachine.States { public class SentinelStateIdle : SentinelState { diff --git a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/StateMachine/States/SentinelStateIdle.cs.meta b/Assets/Scripts/Intrepid/Gameplay/Entities/Player/Sentinel/StateMachine/States/SentinelStateIdle.cs.meta similarity index 100% rename from Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/StateMachine/States/SentinelStateIdle.cs.meta rename to Assets/Scripts/Intrepid/Gameplay/Entities/Player/Sentinel/StateMachine/States/SentinelStateIdle.cs.meta diff --git a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/StateMachine/States/SentinelStateKnockdown.cs b/Assets/Scripts/Intrepid/Gameplay/Entities/Player/Sentinel/StateMachine/States/SentinelStateKnockdown.cs similarity index 97% rename from Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/StateMachine/States/SentinelStateKnockdown.cs rename to Assets/Scripts/Intrepid/Gameplay/Entities/Player/Sentinel/StateMachine/States/SentinelStateKnockdown.cs index 105d93b..68b5f69 100644 --- a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/StateMachine/States/SentinelStateKnockdown.cs +++ b/Assets/Scripts/Intrepid/Gameplay/Entities/Player/Sentinel/StateMachine/States/SentinelStateKnockdown.cs @@ -2,7 +2,7 @@ using Intrepid.Structures; using Intrepid.Utilities; using UnityEngine; -namespace Intrepid.Gameplay.Entities.Sentinel.StateMachine.States +namespace Intrepid.Gameplay.Entities.Player.Sentinel.StateMachine.States { public class SentinelStateKnockdown : SentinelState { diff --git a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/StateMachine/States/SentinelStateKnockdown.cs.meta b/Assets/Scripts/Intrepid/Gameplay/Entities/Player/Sentinel/StateMachine/States/SentinelStateKnockdown.cs.meta similarity index 100% rename from Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/StateMachine/States/SentinelStateKnockdown.cs.meta rename to Assets/Scripts/Intrepid/Gameplay/Entities/Player/Sentinel/StateMachine/States/SentinelStateKnockdown.cs.meta diff --git a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/StateMachine/States/SentinelStateRun.cs b/Assets/Scripts/Intrepid/Gameplay/Entities/Player/Sentinel/StateMachine/States/SentinelStateRun.cs similarity index 96% rename from Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/StateMachine/States/SentinelStateRun.cs rename to Assets/Scripts/Intrepid/Gameplay/Entities/Player/Sentinel/StateMachine/States/SentinelStateRun.cs index 62d49ad..ba5f131 100644 --- a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/StateMachine/States/SentinelStateRun.cs +++ b/Assets/Scripts/Intrepid/Gameplay/Entities/Player/Sentinel/StateMachine/States/SentinelStateRun.cs @@ -2,7 +2,7 @@ using Intrepid.Structures; using Intrepid.Utilities; using UnityEngine; -namespace Intrepid.Gameplay.Entities.Sentinel.StateMachine.States +namespace Intrepid.Gameplay.Entities.Player.Sentinel.StateMachine.States { public class SentinelStateRun : SentinelState { diff --git a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/StateMachine/States/SentinelStateRun.cs.meta b/Assets/Scripts/Intrepid/Gameplay/Entities/Player/Sentinel/StateMachine/States/SentinelStateRun.cs.meta similarity index 100% rename from Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/StateMachine/States/SentinelStateRun.cs.meta rename to Assets/Scripts/Intrepid/Gameplay/Entities/Player/Sentinel/StateMachine/States/SentinelStateRun.cs.meta diff --git a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/StateMachine/States/SentinelStateWalk.cs b/Assets/Scripts/Intrepid/Gameplay/Entities/Player/Sentinel/StateMachine/States/SentinelStateWalk.cs similarity index 96% rename from Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/StateMachine/States/SentinelStateWalk.cs rename to Assets/Scripts/Intrepid/Gameplay/Entities/Player/Sentinel/StateMachine/States/SentinelStateWalk.cs index 8a39aca..f3de584 100644 --- a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/StateMachine/States/SentinelStateWalk.cs +++ b/Assets/Scripts/Intrepid/Gameplay/Entities/Player/Sentinel/StateMachine/States/SentinelStateWalk.cs @@ -2,7 +2,7 @@ using Intrepid.Structures; using Intrepid.Utilities; using UnityEngine; -namespace Intrepid.Gameplay.Entities.Sentinel.StateMachine.States +namespace Intrepid.Gameplay.Entities.Player.Sentinel.StateMachine.States { public class SentinelStateWalk : SentinelState { diff --git a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/StateMachine/States/SentinelStateWalk.cs.meta b/Assets/Scripts/Intrepid/Gameplay/Entities/Player/Sentinel/StateMachine/States/SentinelStateWalk.cs.meta similarity index 100% rename from Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/StateMachine/States/SentinelStateWalk.cs.meta rename to Assets/Scripts/Intrepid/Gameplay/Entities/Player/Sentinel/StateMachine/States/SentinelStateWalk.cs.meta diff --git a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/Tags.meta b/Assets/Scripts/Intrepid/Gameplay/Entities/Player/Tags.meta similarity index 100% rename from Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/Tags.meta rename to Assets/Scripts/Intrepid/Gameplay/Entities/Player/Tags.meta diff --git a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/Tags/ActionBeltManagerTag.cs b/Assets/Scripts/Intrepid/Gameplay/Entities/Player/Tags/ActionBeltManagerTag.cs similarity index 83% rename from Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/Tags/ActionBeltManagerTag.cs rename to Assets/Scripts/Intrepid/Gameplay/Entities/Player/Tags/ActionBeltManagerTag.cs index ee54263..fbd1b48 100644 --- a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/Tags/ActionBeltManagerTag.cs +++ b/Assets/Scripts/Intrepid/Gameplay/Entities/Player/Tags/ActionBeltManagerTag.cs @@ -2,7 +2,7 @@ using System; using Intrepid.TagSystem; using UnityEngine; -namespace Intrepid.Gameplay.Entities.Sentinel.Tags +namespace Intrepid.Gameplay.Entities.Player.Tags { [Serializable] [CreateAssetMenu(fileName = "New Action Belt Manager Tag", menuName = "GON/Tags/Action Belt Manager Tag")] diff --git a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/Tags/ActionBeltManagerTag.cs.meta b/Assets/Scripts/Intrepid/Gameplay/Entities/Player/Tags/ActionBeltManagerTag.cs.meta similarity index 100% rename from Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/Tags/ActionBeltManagerTag.cs.meta rename to Assets/Scripts/Intrepid/Gameplay/Entities/Player/Tags/ActionBeltManagerTag.cs.meta diff --git a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/Tags/PlayerTag.cs b/Assets/Scripts/Intrepid/Gameplay/Entities/Player/Tags/PlayerTag.cs similarity index 89% rename from Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/Tags/PlayerTag.cs rename to Assets/Scripts/Intrepid/Gameplay/Entities/Player/Tags/PlayerTag.cs index 3f0397b..b6cfb6f 100644 --- a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/Tags/PlayerTag.cs +++ b/Assets/Scripts/Intrepid/Gameplay/Entities/Player/Tags/PlayerTag.cs @@ -3,7 +3,7 @@ using Intrepid.Core.Tags; using Intrepid.Utilities; using UnityEngine; -namespace Intrepid.Gameplay.Entities.Sentinel.Tags +namespace Intrepid.Gameplay.Entities.Player.Tags { [Serializable] [CreateAssetMenu(fileName = "New Player Tag", menuName = "GON/Tags/Player Tag")] diff --git a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/Tags/PlayerTag.cs.meta b/Assets/Scripts/Intrepid/Gameplay/Entities/Player/Tags/PlayerTag.cs.meta similarity index 100% rename from Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/Tags/PlayerTag.cs.meta rename to Assets/Scripts/Intrepid/Gameplay/Entities/Player/Tags/PlayerTag.cs.meta diff --git a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/SentinelModelAnimationType.cs b/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/SentinelModelAnimationType.cs deleted file mode 100644 index b1b9185..0000000 --- a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/SentinelModelAnimationType.cs +++ /dev/null @@ -1,22 +0,0 @@ -namespace Intrepid.Gameplay.Entities.Sentinel -{ - public enum SentinelModelAnimationType - { - None = 0, - - IdleFaceDown = 10, - IdleFaceLeft = 11, - IdleFaceRight = 12, - IdleFaceUp = 13, - - WalkFaceDown = 20, - WalkFaceLeft = 21, - WalkFaceRight = 22, - WalkFaceUp = 23, - - RunFaceDown = 30, - RunFaceLeft = 31, - RunFaceRight = 32, - RunFaceUp = 33, - } -} \ No newline at end of file diff --git a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/SentinelModelAnimationType.cs.meta b/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/SentinelModelAnimationType.cs.meta deleted file mode 100644 index bb5bddc..0000000 --- a/Assets/Scripts/Intrepid/Gameplay/Entities/Sentinel/SentinelModelAnimationType.cs.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: a31719a70e244ef8be1446d88fb3c05b -timeCreated: 1779259726 \ No newline at end of file diff --git a/Assets/Scripts/Intrepid/Integration/Input/InputService.cs b/Assets/Scripts/Intrepid/Integration/Input/InputService.cs index 7ef9836..e247ee3 100644 --- a/Assets/Scripts/Intrepid/Integration/Input/InputService.cs +++ b/Assets/Scripts/Intrepid/Integration/Input/InputService.cs @@ -1,5 +1,5 @@ using Intrepid.Diagnostics; -using Intrepid.Gameplay.Entities.Sentinel; +using Intrepid.Gameplay.Entities.Player.Sentinel; using Intrepid.Utilities; using UnityEngine; using UnityEngine.InputSystem;