From 07af8958e97d2f74ed18dd6f576f11d26851d5ef Mon Sep 17 00:00:00 2001 From: TheVVaS Date: Mon, 29 Jun 2026 17:46:44 +0200 Subject: [PATCH] =?UTF-8?q?[#13]=20uniezale=C5=BCnienie=20modu=C5=82u=20Mo?= =?UTF-8?q?vement=20od=20innych?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- RPGCore.Movement/Runtime/MovementSettings.cs | 13 ------------- RPGCore.Movement/Runtime/MovementSettings.cs.meta | 3 --- .../UnitMovement/Actions/DirectionMoveAction.cs | 11 ++--------- .../UnitMovement/Actions/JumpAction.cs | 4 +--- .../UnitMovement/Actions/PointMoveAction.cs | 4 +--- .../UnitMovement/Actions/RotateAction.cs | 3 +-- RPGCore.Movement/Runtime/RPGCore.Movement.asmdef | 2 -- 7 files changed, 5 insertions(+), 35 deletions(-) delete mode 100644 RPGCore.Movement/Runtime/MovementSettings.cs delete mode 100644 RPGCore.Movement/Runtime/MovementSettings.cs.meta diff --git a/RPGCore.Movement/Runtime/MovementSettings.cs b/RPGCore.Movement/Runtime/MovementSettings.cs deleted file mode 100644 index fd2ae06..0000000 --- a/RPGCore.Movement/Runtime/MovementSettings.cs +++ /dev/null @@ -1,13 +0,0 @@ -using RPGCore.StatusEffect.ObjectModules.StatusObjectModule; -using RPGCoreCommon.Settings; -using UnityEngine; - -namespace RPGCore.Movement -{ - [CustomSettings("RPG Core/Movement")] - public class MovementSettings : CustomSettingsSO - { - [Header("Statuses Definitions")] - public StatusDefinitionSO runStatusDefinitionSO; - } -} \ No newline at end of file diff --git a/RPGCore.Movement/Runtime/MovementSettings.cs.meta b/RPGCore.Movement/Runtime/MovementSettings.cs.meta deleted file mode 100644 index ca4f083..0000000 --- a/RPGCore.Movement/Runtime/MovementSettings.cs.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: ed5576b120bd480796129f99e38965a5 -timeCreated: 1772991814 \ No newline at end of file diff --git a/RPGCore.Movement/Runtime/ObjectModules/UnitMovement/Actions/DirectionMoveAction.cs b/RPGCore.Movement/Runtime/ObjectModules/UnitMovement/Actions/DirectionMoveAction.cs index 883b5d0..aed959b 100644 --- a/RPGCore.Movement/Runtime/ObjectModules/UnitMovement/Actions/DirectionMoveAction.cs +++ b/RPGCore.Movement/Runtime/ObjectModules/UnitMovement/Actions/DirectionMoveAction.cs @@ -2,9 +2,6 @@ using System.Collections; using RPGCore.Movement.ObjectModules.UnitMovement.Events; using RPGCore.ObjectModules.ActionObjectModule; -using RPGCore.ObjectModules.EventObjectModule; -using RPGCore.StatusEffect.ObjectModules.StatusObjectModule; -using RPGCoreCommon.Settings; using UnityEngine; namespace RPGCore.Movement.ObjectModules.UnitMovement.Actions @@ -13,8 +10,6 @@ namespace RPGCore.Movement.ObjectModules.UnitMovement.Actions { private readonly Func _directionGetter; - private StatusDefinitionSO _runStatusDefinitionSO; - private StatusModule _unitStatus; private UnitMovementModule _unitMovement; public DirectionMoveAction(Func directionGetter) @@ -25,14 +20,12 @@ namespace RPGCore.Movement.ObjectModules.UnitMovement.Actions public override void CanDoIt() { Check( - unit.GetComponent().IsControllable(), + unit.GetComponent().isControllable, UnitIsBusyMessage); } protected override void OnDoIt() { - _runStatusDefinitionSO = SettingsManager.Get().runStatusDefinitionSO; - _unitStatus = unit.GetComponent(); _unitMovement = unit.GetComponent(); var moveStartEvent = new MoveStartEvent{ unit = unit }; @@ -56,7 +49,7 @@ namespace RPGCore.Movement.ObjectModules.UnitMovement.Actions protected override void OnEndIt() { _unitMovement.moveInput = Vector2.zero; - _unitStatus.Remove(_runStatusDefinitionSO); + _unitMovement.isSprinting = false; unit.events.Invoke(new MoveEndEvent{ unit = unit }); } diff --git a/RPGCore.Movement/Runtime/ObjectModules/UnitMovement/Actions/JumpAction.cs b/RPGCore.Movement/Runtime/ObjectModules/UnitMovement/Actions/JumpAction.cs index c057337..3747186 100644 --- a/RPGCore.Movement/Runtime/ObjectModules/UnitMovement/Actions/JumpAction.cs +++ b/RPGCore.Movement/Runtime/ObjectModules/UnitMovement/Actions/JumpAction.cs @@ -1,7 +1,5 @@ using RPGCore.Movement.ObjectModules.UnitMovement.Events; using RPGCore.ObjectModules.ActionObjectModule; -using RPGCore.ObjectModules.EventObjectModule; -using RPGCore.StatusEffect.ObjectModules.StatusObjectModule; using RPGCoreCommon.Helpers; namespace RPGCore.Movement.ObjectModules.UnitMovement.Actions @@ -11,7 +9,7 @@ namespace RPGCore.Movement.ObjectModules.UnitMovement.Actions public override void CanDoIt() { Check( - unit.GetComponent().IsControllable(), + unit.GetComponent().isControllable, UnitIsBusyMessage); Check( unit.GetComponent().isOnGround, diff --git a/RPGCore.Movement/Runtime/ObjectModules/UnitMovement/Actions/PointMoveAction.cs b/RPGCore.Movement/Runtime/ObjectModules/UnitMovement/Actions/PointMoveAction.cs index 4d3a6aa..cbd0ede 100644 --- a/RPGCore.Movement/Runtime/ObjectModules/UnitMovement/Actions/PointMoveAction.cs +++ b/RPGCore.Movement/Runtime/ObjectModules/UnitMovement/Actions/PointMoveAction.cs @@ -1,8 +1,6 @@ using System.Collections; using RPGCore.Movement.ObjectModules.UnitMovement.Events; using RPGCore.ObjectModules.ActionObjectModule; -using RPGCore.ObjectModules.EventObjectModule; -using RPGCore.StatusEffect.ObjectModules.StatusObjectModule; using UnityEngine; using UnityEngine.AI; @@ -22,7 +20,7 @@ namespace RPGCore.Movement.ObjectModules.UnitMovement.Actions public override void CanDoIt() { Check( - unit.GetComponent().IsControllable(), + unit.GetComponent().isControllable, UnitIsBusyMessage); } diff --git a/RPGCore.Movement/Runtime/ObjectModules/UnitMovement/Actions/RotateAction.cs b/RPGCore.Movement/Runtime/ObjectModules/UnitMovement/Actions/RotateAction.cs index 14fbbe9..3761712 100644 --- a/RPGCore.Movement/Runtime/ObjectModules/UnitMovement/Actions/RotateAction.cs +++ b/RPGCore.Movement/Runtime/ObjectModules/UnitMovement/Actions/RotateAction.cs @@ -1,6 +1,5 @@ using System.Collections; using RPGCore.ObjectModules.ActionObjectModule; -using RPGCore.StatusEffect.ObjectModules.StatusObjectModule; using UnityEngine; namespace RPGCore.Movement.ObjectModules.UnitMovement.Actions @@ -50,7 +49,7 @@ namespace RPGCore.Movement.ObjectModules.UnitMovement.Actions public override void CanDoIt() { Check( - _isForced || unit.GetComponent().IsControllable(), + _isForced || unit.GetComponent().isControllable, UnitIsBusyMessage); } diff --git a/RPGCore.Movement/Runtime/RPGCore.Movement.asmdef b/RPGCore.Movement/Runtime/RPGCore.Movement.asmdef index 08e6aa9..5421078 100644 --- a/RPGCore.Movement/Runtime/RPGCore.Movement.asmdef +++ b/RPGCore.Movement/Runtime/RPGCore.Movement.asmdef @@ -3,10 +3,8 @@ "rootNamespace": "RPGCore.Movement", "references": [ "RPGCore", - "RPGCore.StatusEffect", "RPGCoreCommon.Settings", "RPGCoreCommon.Helpers", - "RPGCoreCommon.DynamicValues", "Unity.InputSystem" ], "includePlatforms": [],