From af0aab450bfe0bb29d515aa6d5ed6300d21cc3f7 Mon Sep 17 00:00:00 2001 From: Chris Date: Sat, 4 Oct 2025 01:05:37 -0400 Subject: [PATCH] maint: renamed player folder to units to match namespaces. added unit class as well. --- Assets/Scripts/{Player.meta => Units.meta} | 0 .../{Player => Units}/CameraSettingData.cs | 0 .../{Player => Units}/CameraSettingData.cs.meta | 0 .../{Player => Units}/CameraSettingsProcessor.cs | 0 .../CameraSettingsProcessor.cs.meta | 0 Assets/Scripts/{Player => Units}/Combat.meta | 0 .../{Player => Units}/Combat/IDamageable.cs | 0 .../{Player => Units}/Combat/IDamageable.cs.meta | 0 .../{Player => Units}/Combat/UnitCombat.cs | 16 +++++++++++++--- .../{Player => Units}/Combat/UnitCombat.cs.meta | 0 .../{Player => Units}/CustomInputHandler.cs | 0 .../{Player => Units}/CustomInputHandler.cs.meta | 0 Assets/Scripts/{Player => Units}/IKillable.cs | 0 .../Scripts/{Player => Units}/IKillable.cs.meta | 0 .../{Player => Units}/InteractionHandler.cs | 0 .../{Player => Units}/InteractionHandler.cs.meta | 0 Assets/Scripts/{Player => Units}/Inventory.cs | 0 .../Scripts/{Player => Units}/Inventory.cs.meta | 0 Assets/Scripts/{Player => Units}/Player.cs | 5 ++--- Assets/Scripts/{Player => Units}/Player.cs.meta | 0 Assets/Scripts/{Player => Units}/PlayerCamera.cs | 0 .../{Player => Units}/PlayerCamera.cs.meta | 0 .../Scripts/{Player => Units}/PlayerControls.cs | 0 .../{Player => Units}/PlayerControls.cs.meta | 0 .../PlayerEnvironmentManager.cs | 0 .../PlayerEnvironmentManager.cs.meta | 0 .../{Player => Units}/PlayerFacingDirection.cs | 0 .../PlayerFacingDirection.cs.meta | 0 .../{Player => Units}/ResolvedMovement.cs | 0 .../{Player => Units}/ResolvedMovement.cs.meta | 0 Assets/Scripts/{Player => Units}/SettingValue.cs | 0 .../{Player => Units}/SettingValue.cs.meta | 0 Assets/Scripts/Units/Unit.cs | 4 ++++ Assets/Scripts/Units/Unit.cs.meta | 3 +++ .../{Player => Units}/UnitMovementData.cs | 0 .../{Player => Units}/UnitMovementData.cs.meta | 0 .../{Player => Units}/UnitMovementHandler.cs | 0 .../UnitMovementHandler.cs.meta | 0 38 files changed, 22 insertions(+), 6 deletions(-) rename Assets/Scripts/{Player.meta => Units.meta} (100%) rename Assets/Scripts/{Player => Units}/CameraSettingData.cs (100%) rename Assets/Scripts/{Player => Units}/CameraSettingData.cs.meta (100%) rename Assets/Scripts/{Player => Units}/CameraSettingsProcessor.cs (100%) rename Assets/Scripts/{Player => Units}/CameraSettingsProcessor.cs.meta (100%) rename Assets/Scripts/{Player => Units}/Combat.meta (100%) rename Assets/Scripts/{Player => Units}/Combat/IDamageable.cs (100%) rename Assets/Scripts/{Player => Units}/Combat/IDamageable.cs.meta (100%) rename Assets/Scripts/{Player => Units}/Combat/UnitCombat.cs (81%) rename Assets/Scripts/{Player => Units}/Combat/UnitCombat.cs.meta (100%) rename Assets/Scripts/{Player => Units}/CustomInputHandler.cs (100%) rename Assets/Scripts/{Player => Units}/CustomInputHandler.cs.meta (100%) rename Assets/Scripts/{Player => Units}/IKillable.cs (100%) rename Assets/Scripts/{Player => Units}/IKillable.cs.meta (100%) rename Assets/Scripts/{Player => Units}/InteractionHandler.cs (100%) rename Assets/Scripts/{Player => Units}/InteractionHandler.cs.meta (100%) rename Assets/Scripts/{Player => Units}/Inventory.cs (100%) rename Assets/Scripts/{Player => Units}/Inventory.cs.meta (100%) rename Assets/Scripts/{Player => Units}/Player.cs (95%) rename Assets/Scripts/{Player => Units}/Player.cs.meta (100%) rename Assets/Scripts/{Player => Units}/PlayerCamera.cs (100%) rename Assets/Scripts/{Player => Units}/PlayerCamera.cs.meta (100%) rename Assets/Scripts/{Player => Units}/PlayerControls.cs (100%) rename Assets/Scripts/{Player => Units}/PlayerControls.cs.meta (100%) rename Assets/Scripts/{Player => Units}/PlayerEnvironmentManager.cs (100%) rename Assets/Scripts/{Player => Units}/PlayerEnvironmentManager.cs.meta (100%) rename Assets/Scripts/{Player => Units}/PlayerFacingDirection.cs (100%) rename Assets/Scripts/{Player => Units}/PlayerFacingDirection.cs.meta (100%) rename Assets/Scripts/{Player => Units}/ResolvedMovement.cs (100%) rename Assets/Scripts/{Player => Units}/ResolvedMovement.cs.meta (100%) rename Assets/Scripts/{Player => Units}/SettingValue.cs (100%) rename Assets/Scripts/{Player => Units}/SettingValue.cs.meta (100%) create mode 100644 Assets/Scripts/Units/Unit.cs create mode 100644 Assets/Scripts/Units/Unit.cs.meta rename Assets/Scripts/{Player => Units}/UnitMovementData.cs (100%) rename Assets/Scripts/{Player => Units}/UnitMovementData.cs.meta (100%) rename Assets/Scripts/{Player => Units}/UnitMovementHandler.cs (100%) rename Assets/Scripts/{Player => Units}/UnitMovementHandler.cs.meta (100%) diff --git a/Assets/Scripts/Player.meta b/Assets/Scripts/Units.meta similarity index 100% rename from Assets/Scripts/Player.meta rename to Assets/Scripts/Units.meta diff --git a/Assets/Scripts/Player/CameraSettingData.cs b/Assets/Scripts/Units/CameraSettingData.cs similarity index 100% rename from Assets/Scripts/Player/CameraSettingData.cs rename to Assets/Scripts/Units/CameraSettingData.cs diff --git a/Assets/Scripts/Player/CameraSettingData.cs.meta b/Assets/Scripts/Units/CameraSettingData.cs.meta similarity index 100% rename from Assets/Scripts/Player/CameraSettingData.cs.meta rename to Assets/Scripts/Units/CameraSettingData.cs.meta diff --git a/Assets/Scripts/Player/CameraSettingsProcessor.cs b/Assets/Scripts/Units/CameraSettingsProcessor.cs similarity index 100% rename from Assets/Scripts/Player/CameraSettingsProcessor.cs rename to Assets/Scripts/Units/CameraSettingsProcessor.cs diff --git a/Assets/Scripts/Player/CameraSettingsProcessor.cs.meta b/Assets/Scripts/Units/CameraSettingsProcessor.cs.meta similarity index 100% rename from Assets/Scripts/Player/CameraSettingsProcessor.cs.meta rename to Assets/Scripts/Units/CameraSettingsProcessor.cs.meta diff --git a/Assets/Scripts/Player/Combat.meta b/Assets/Scripts/Units/Combat.meta similarity index 100% rename from Assets/Scripts/Player/Combat.meta rename to Assets/Scripts/Units/Combat.meta diff --git a/Assets/Scripts/Player/Combat/IDamageable.cs b/Assets/Scripts/Units/Combat/IDamageable.cs similarity index 100% rename from Assets/Scripts/Player/Combat/IDamageable.cs rename to Assets/Scripts/Units/Combat/IDamageable.cs diff --git a/Assets/Scripts/Player/Combat/IDamageable.cs.meta b/Assets/Scripts/Units/Combat/IDamageable.cs.meta similarity index 100% rename from Assets/Scripts/Player/Combat/IDamageable.cs.meta rename to Assets/Scripts/Units/Combat/IDamageable.cs.meta diff --git a/Assets/Scripts/Player/Combat/UnitCombat.cs b/Assets/Scripts/Units/Combat/UnitCombat.cs similarity index 81% rename from Assets/Scripts/Player/Combat/UnitCombat.cs rename to Assets/Scripts/Units/Combat/UnitCombat.cs index 6cc022b..ec8f410 100644 --- a/Assets/Scripts/Player/Combat/UnitCombat.cs +++ b/Assets/Scripts/Units/Combat/UnitCombat.cs @@ -30,23 +30,33 @@ public class UnitCombat : MonoBehaviour{ // Update is called once per frame void Update(){ + DragAttackedUnits(); + } + + void DragAttackedUnits(){ + // Get the original difference in position for speed and direction positionDelta = Vector3.Lerp(positionDelta, lastPosition.DirectionTo(transform.position), 5f * Time.deltaTime); speedDelta = Vector3.Distance(lastPosition, transform.position) / Time.deltaTime; + // Add some randomness to the movements based on small offsets float sinVal = Mathf.Sin(2f + sinOffset) * sinAmplitude; speedDelta += sinVal; - // Test - speedDelta *= 1.0f; + // Set a floor to prevent them from not moving enough speedDelta = Mathf.Max(3f, speedDelta); + + // Multiply the speed to be lower when further, and faster when close float speedDiff = Mathf.Lerp(.2f, 1.4f, speedDelta); speedDelta *= speedDiff; + // Debug DebugOverlayDrawer.ChangeValue($"Combat - {name}", "Position Delta", positionDelta); DebugOverlayDrawer.ChangeValue($"Combat - {name}", "Speed Delta", speedDelta); - + + // Update last known position lastPosition = transform.position; + // Apply the speed, direction, and rotation to each unit foreach (Collider draggedUnit in draggedUnits) { UnitMovementHandler draggedUnitMovement = draggedUnit.GetComponent(); if (!draggedUnitMovement) { diff --git a/Assets/Scripts/Player/Combat/UnitCombat.cs.meta b/Assets/Scripts/Units/Combat/UnitCombat.cs.meta similarity index 100% rename from Assets/Scripts/Player/Combat/UnitCombat.cs.meta rename to Assets/Scripts/Units/Combat/UnitCombat.cs.meta diff --git a/Assets/Scripts/Player/CustomInputHandler.cs b/Assets/Scripts/Units/CustomInputHandler.cs similarity index 100% rename from Assets/Scripts/Player/CustomInputHandler.cs rename to Assets/Scripts/Units/CustomInputHandler.cs diff --git a/Assets/Scripts/Player/CustomInputHandler.cs.meta b/Assets/Scripts/Units/CustomInputHandler.cs.meta similarity index 100% rename from Assets/Scripts/Player/CustomInputHandler.cs.meta rename to Assets/Scripts/Units/CustomInputHandler.cs.meta diff --git a/Assets/Scripts/Player/IKillable.cs b/Assets/Scripts/Units/IKillable.cs similarity index 100% rename from Assets/Scripts/Player/IKillable.cs rename to Assets/Scripts/Units/IKillable.cs diff --git a/Assets/Scripts/Player/IKillable.cs.meta b/Assets/Scripts/Units/IKillable.cs.meta similarity index 100% rename from Assets/Scripts/Player/IKillable.cs.meta rename to Assets/Scripts/Units/IKillable.cs.meta diff --git a/Assets/Scripts/Player/InteractionHandler.cs b/Assets/Scripts/Units/InteractionHandler.cs similarity index 100% rename from Assets/Scripts/Player/InteractionHandler.cs rename to Assets/Scripts/Units/InteractionHandler.cs diff --git a/Assets/Scripts/Player/InteractionHandler.cs.meta b/Assets/Scripts/Units/InteractionHandler.cs.meta similarity index 100% rename from Assets/Scripts/Player/InteractionHandler.cs.meta rename to Assets/Scripts/Units/InteractionHandler.cs.meta diff --git a/Assets/Scripts/Player/Inventory.cs b/Assets/Scripts/Units/Inventory.cs similarity index 100% rename from Assets/Scripts/Player/Inventory.cs rename to Assets/Scripts/Units/Inventory.cs diff --git a/Assets/Scripts/Player/Inventory.cs.meta b/Assets/Scripts/Units/Inventory.cs.meta similarity index 100% rename from Assets/Scripts/Player/Inventory.cs.meta rename to Assets/Scripts/Units/Inventory.cs.meta diff --git a/Assets/Scripts/Player/Player.cs b/Assets/Scripts/Units/Player.cs similarity index 95% rename from Assets/Scripts/Player/Player.cs rename to Assets/Scripts/Units/Player.cs index 995d434..fcbda7f 100644 --- a/Assets/Scripts/Player/Player.cs +++ b/Assets/Scripts/Units/Player.cs @@ -10,9 +10,8 @@ using Sirenix.OdinInspector; using Sirenix.Serialization; using Unity.Netcode; -public class Player : NetworkBehaviour, IKillable{ +public class Player : Unit, IKillable{ [HideInInspector] public PlayerControls controls; - [HideInInspector] public PlayerCamera camera; float IKillable.maxHealth{ get; set; } float IKillable.currentHealth{ get; set; } @@ -89,4 +88,4 @@ public class Player : NetworkBehaviour, IKillable{ throw new NotImplementedException(); } -} +} \ No newline at end of file diff --git a/Assets/Scripts/Player/Player.cs.meta b/Assets/Scripts/Units/Player.cs.meta similarity index 100% rename from Assets/Scripts/Player/Player.cs.meta rename to Assets/Scripts/Units/Player.cs.meta diff --git a/Assets/Scripts/Player/PlayerCamera.cs b/Assets/Scripts/Units/PlayerCamera.cs similarity index 100% rename from Assets/Scripts/Player/PlayerCamera.cs rename to Assets/Scripts/Units/PlayerCamera.cs diff --git a/Assets/Scripts/Player/PlayerCamera.cs.meta b/Assets/Scripts/Units/PlayerCamera.cs.meta similarity index 100% rename from Assets/Scripts/Player/PlayerCamera.cs.meta rename to Assets/Scripts/Units/PlayerCamera.cs.meta diff --git a/Assets/Scripts/Player/PlayerControls.cs b/Assets/Scripts/Units/PlayerControls.cs similarity index 100% rename from Assets/Scripts/Player/PlayerControls.cs rename to Assets/Scripts/Units/PlayerControls.cs diff --git a/Assets/Scripts/Player/PlayerControls.cs.meta b/Assets/Scripts/Units/PlayerControls.cs.meta similarity index 100% rename from Assets/Scripts/Player/PlayerControls.cs.meta rename to Assets/Scripts/Units/PlayerControls.cs.meta diff --git a/Assets/Scripts/Player/PlayerEnvironmentManager.cs b/Assets/Scripts/Units/PlayerEnvironmentManager.cs similarity index 100% rename from Assets/Scripts/Player/PlayerEnvironmentManager.cs rename to Assets/Scripts/Units/PlayerEnvironmentManager.cs diff --git a/Assets/Scripts/Player/PlayerEnvironmentManager.cs.meta b/Assets/Scripts/Units/PlayerEnvironmentManager.cs.meta similarity index 100% rename from Assets/Scripts/Player/PlayerEnvironmentManager.cs.meta rename to Assets/Scripts/Units/PlayerEnvironmentManager.cs.meta diff --git a/Assets/Scripts/Player/PlayerFacingDirection.cs b/Assets/Scripts/Units/PlayerFacingDirection.cs similarity index 100% rename from Assets/Scripts/Player/PlayerFacingDirection.cs rename to Assets/Scripts/Units/PlayerFacingDirection.cs diff --git a/Assets/Scripts/Player/PlayerFacingDirection.cs.meta b/Assets/Scripts/Units/PlayerFacingDirection.cs.meta similarity index 100% rename from Assets/Scripts/Player/PlayerFacingDirection.cs.meta rename to Assets/Scripts/Units/PlayerFacingDirection.cs.meta diff --git a/Assets/Scripts/Player/ResolvedMovement.cs b/Assets/Scripts/Units/ResolvedMovement.cs similarity index 100% rename from Assets/Scripts/Player/ResolvedMovement.cs rename to Assets/Scripts/Units/ResolvedMovement.cs diff --git a/Assets/Scripts/Player/ResolvedMovement.cs.meta b/Assets/Scripts/Units/ResolvedMovement.cs.meta similarity index 100% rename from Assets/Scripts/Player/ResolvedMovement.cs.meta rename to Assets/Scripts/Units/ResolvedMovement.cs.meta diff --git a/Assets/Scripts/Player/SettingValue.cs b/Assets/Scripts/Units/SettingValue.cs similarity index 100% rename from Assets/Scripts/Player/SettingValue.cs rename to Assets/Scripts/Units/SettingValue.cs diff --git a/Assets/Scripts/Player/SettingValue.cs.meta b/Assets/Scripts/Units/SettingValue.cs.meta similarity index 100% rename from Assets/Scripts/Player/SettingValue.cs.meta rename to Assets/Scripts/Units/SettingValue.cs.meta diff --git a/Assets/Scripts/Units/Unit.cs b/Assets/Scripts/Units/Unit.cs new file mode 100644 index 0000000..4a60172 --- /dev/null +++ b/Assets/Scripts/Units/Unit.cs @@ -0,0 +1,4 @@ +using Unity.Netcode; + +public class Unit : NetworkBehaviour{ +} \ No newline at end of file diff --git a/Assets/Scripts/Units/Unit.cs.meta b/Assets/Scripts/Units/Unit.cs.meta new file mode 100644 index 0000000..7f7e2a8 --- /dev/null +++ b/Assets/Scripts/Units/Unit.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: d9f5c0c9bf384882925c15b3c93fff1b +timeCreated: 1759554015 \ No newline at end of file diff --git a/Assets/Scripts/Player/UnitMovementData.cs b/Assets/Scripts/Units/UnitMovementData.cs similarity index 100% rename from Assets/Scripts/Player/UnitMovementData.cs rename to Assets/Scripts/Units/UnitMovementData.cs diff --git a/Assets/Scripts/Player/UnitMovementData.cs.meta b/Assets/Scripts/Units/UnitMovementData.cs.meta similarity index 100% rename from Assets/Scripts/Player/UnitMovementData.cs.meta rename to Assets/Scripts/Units/UnitMovementData.cs.meta diff --git a/Assets/Scripts/Player/UnitMovementHandler.cs b/Assets/Scripts/Units/UnitMovementHandler.cs similarity index 100% rename from Assets/Scripts/Player/UnitMovementHandler.cs rename to Assets/Scripts/Units/UnitMovementHandler.cs diff --git a/Assets/Scripts/Player/UnitMovementHandler.cs.meta b/Assets/Scripts/Units/UnitMovementHandler.cs.meta similarity index 100% rename from Assets/Scripts/Player/UnitMovementHandler.cs.meta rename to Assets/Scripts/Units/UnitMovementHandler.cs.meta