diff --git a/Assets/Audio/Master.strings.bank b/Assets/Audio/Master.strings.bank index 45623644..3992afa1 100644 Binary files a/Assets/Audio/Master.strings.bank and b/Assets/Audio/Master.strings.bank differ diff --git a/Assets/Audio/Music.bank b/Assets/Audio/Music.bank index beabe885..7a1390c6 100644 Binary files a/Assets/Audio/Music.bank and b/Assets/Audio/Music.bank differ diff --git a/Assets/Audio/SFX.bank b/Assets/Audio/SFX.bank index e1a85b71..8656abd6 100644 Binary files a/Assets/Audio/SFX.bank and b/Assets/Audio/SFX.bank differ diff --git a/Assets/Audio/UI.bank b/Assets/Audio/UI.bank index 78ed9460..44f05317 100644 Binary files a/Assets/Audio/UI.bank and b/Assets/Audio/UI.bank differ diff --git a/Assets/Scenes/MainGame.shade b/Assets/Scenes/MainGame.shade index 82cfce3e..29cfdda0 100644 --- a/Assets/Scenes/MainGame.shade +++ b/Assets/Scenes/MainGame.shade @@ -8562,7 +8562,7 @@ NumberOfChildren: 0 Components: Transform Component: - Translate: {x: 2.47664404, y: 0.904378593, z: -4.45292473} + Translate: {x: 0.00604016334, y: 1.34554219, z: -4.45292473} Rotate: {x: -0, y: 0, z: -0} Scale: {x: 1, y: 1, z: 1} IsActive: true diff --git a/Assets/Scripts/AIPrototype.cs b/Assets/Scripts/AIPrototype.cs deleted file mode 100644 index 62255778..00000000 --- a/Assets/Scripts/AIPrototype.cs +++ /dev/null @@ -1,183 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Runtime.CompilerServices; -using System.Security.Cryptography.X509Certificates; -using System.Text; -using System.Threading.Tasks; -using SHADE; - -public class AIPrototype : Script -{ - //This object's relevant components - private Transform transform; - private RigidBody rb; - - /*[SerializeField] - [Tooltip("The list of waypoints that the object will move around on")] - private Vector3[] waypoints;*/ - - private Vector3[] waypoints = { new Vector3(-8.0f, -2.0f, 3.5f), new Vector3(-8.0f, -2.0f, -13.0f), new Vector3(8.0f, -2.0f, -13.0f), new Vector3(8.0f, -2.0f, 3.5f) }; - - [SerializeField] - [Tooltip("How much force is applied in movement")] - private float movementForceMultiplier = 100.0f; - - [SerializeField] - [Tooltip("How fast the object moves about waypoints")] - private float patrolSpeed = 0.4f; - - [SerializeField] - [Tooltip("How fast the object moves while chasing")] - private float chaseSpeed = 0.8f; - - [SerializeField] - [Tooltip("How near the player must be to the AI for capture")] - private float distanceToCapture = 1.2f; - - [SerializeField] - [Tooltip("How near the player must be for the chase to begin. Should be less than distanceToEndChase")] - private float distanceToStartChase = 2.0f; - - [SerializeField] - [Tooltip("How far the player must be for the chase to end. Should be greater than distanceToStartChase")] - private float distanceToEndChase = 2.5f; - - //Whether the AI is chasing or not - private bool chaseMode; - - //To cycle depending on the length of waypoints - private int currentTargetWaypointIndex; - - private GameObject? player; - - - protected override void awake() - { - transform = GetComponent(); - if (transform == null) - { - Debug.LogError("Transform is NULL!"); - } - - rb = GetComponent(); - if (rb == null) - { - Debug.LogError("Rigidbody is NULL!"); - } - - currentTargetWaypointIndex = 0; - - player = GameObject.Find("Player"); - if (player == null) - { - Debug.LogError("Player is NULL!"); - } - - chaseMode = false; - } - - protected override void fixedUpdate() - { - //Patrolling - if (!chaseMode) - { - //Head towards the next target - Vector3 normalisedDifference = waypoints[currentTargetWaypointIndex] - transform.GlobalPosition; - normalisedDifference /= normalisedDifference.GetMagnitude(); - - //transform.GlobalPosition += normalisedDifference * moveSpeed * (float)Time.DeltaTime; - //rb.LinearVelocity = normalisedDifference * patrolSpeed; - - //ORIGINAL INTENDED CODE - /*rb.AddForce(new Vector3(normalisedDifference.x, 0.0f, normalisedDifference.z) * movementForceMultiplier); - float currentSpeed = MathF.Sqrt(rb.LinearVelocity.x * rb.LinearVelocity.x + rb.LinearVelocity.z * rb.LinearVelocity.z); - if (currentSpeed > patrolSpeed) - { - float adjustmentFactor = patrolSpeed / currentSpeed; - Vector3 adjustedVelocity = rb.LinearVelocity; - //adjustedVelocity *= adjustmentFactor; - adjustedVelocity.x = patrolSpeed; - adjustedVelocity.z = patrolSpeed; - rb.LinearVelocity = adjustedVelocity; - }*/ - - //TODO delete this when original intended code above works with velocity being limited correctly - rb.LinearVelocity = normalisedDifference * patrolSpeed; - - //transform.GlobalRotation.SetLookRotation(waypoints[currentTargetWaypointIndex], Vector3.Up); - - //Cycle to next waypoint if near enough current waypoint - if ((waypoints[currentTargetWaypointIndex] - transform.GlobalPosition).GetSqrMagnitude() <= 0.5f) - { - ++currentTargetWaypointIndex; - if (currentTargetWaypointIndex >= waypoints.Length) - { - currentTargetWaypointIndex = 0; //Recycle - } - } - - //Go chase if near enough to player - if (player != null) - { - Transform pTransform = player.GetValueOrDefault().GetComponent(); - if ((pTransform.GlobalPosition - transform.GlobalPosition).GetMagnitude() <= distanceToStartChase) - { - //Start the chase - chaseMode = true; - } - } - } - else //Chasing - { - if (player != null) - { - Transform pTransform = player.GetValueOrDefault().GetComponent(); - - //Chase the player - Vector3 normalisedDifference = pTransform.GlobalPosition - transform.GlobalPosition; - normalisedDifference /= normalisedDifference.GetMagnitude(); - - //transform.GlobalPosition += normalisedDifference * moveSpeed * (float)Time.DeltaTime; - - //ORIGINAL INTENDED CODE - /*rb.AddForce(new Vector3(normalisedDifference.x, 0.0f, normalisedDifference.z) * movementForceMultiplier); - float currentSpeed = MathF.Sqrt(rb.LinearVelocity.x * rb.LinearVelocity.x + rb.LinearVelocity.z * rb.LinearVelocity.z); - if (currentSpeed > chaseSpeed) - { - float adjustmentFactor = chaseSpeed / currentSpeed; - Vector3 adjustedVelocity = rb.LinearVelocity; - adjustedVelocity *= adjustmentFactor; - rb.LinearVelocity = adjustedVelocity; - }*/ - - //TODO delete this when original intended code above works with velocity being limited correctly - rb.LinearVelocity = normalisedDifference * chaseSpeed; - - //Capture player if near enough - if ((pTransform.GlobalPosition - transform.GlobalPosition).GetMagnitude() <= distanceToCapture) - { - player.GetValueOrDefault().GetScript().currentState = PlayerController.RaccoonStates.CAUGHT; - } - - //End chase if too far - if ((pTransform.GlobalPosition - transform.GlobalPosition).GetMagnitude() >= distanceToEndChase) - { - //Stop the chase - chaseMode = false; - - //Find the nearest waypoint to go instead - float nearestWaypointDistance = 99999999999999.9f; - for (int i = 0; i < waypoints.Length; ++i) - { - if ((waypoints[i] - transform.GlobalPosition).GetSqrMagnitude() < nearestWaypointDistance) - { - nearestWaypointDistance = waypoints[i].GetSqrMagnitude(); - currentTargetWaypointIndex = i; - } - } - } - } - } - } -} \ No newline at end of file diff --git a/Assets/Scripts/AIPrototype.cs.shmeta b/Assets/Scripts/AIPrototype.cs.shmeta deleted file mode 100644 index 80a7d4b4..00000000 --- a/Assets/Scripts/AIPrototype.cs.shmeta +++ /dev/null @@ -1,3 +0,0 @@ -Name: AIPrototype -ID: 163215061 -Type: 9 diff --git a/Assets/Scripts/AIBehaviour/BehaviourTree/Core/BehaviourTree.cs b/Assets/Scripts/Gameplay/AIBehaviour/BehaviourTree/Core/BehaviourTree.cs similarity index 100% rename from Assets/Scripts/AIBehaviour/BehaviourTree/Core/BehaviourTree.cs rename to Assets/Scripts/Gameplay/AIBehaviour/BehaviourTree/Core/BehaviourTree.cs diff --git a/Assets/Scripts/AIBehaviour/BehaviourTree/Core/BehaviourTree.cs.shmeta b/Assets/Scripts/Gameplay/AIBehaviour/BehaviourTree/Core/BehaviourTree.cs.shmeta similarity index 100% rename from Assets/Scripts/AIBehaviour/BehaviourTree/Core/BehaviourTree.cs.shmeta rename to Assets/Scripts/Gameplay/AIBehaviour/BehaviourTree/Core/BehaviourTree.cs.shmeta diff --git a/Assets/Scripts/AIBehaviour/BehaviourTree/Core/BehaviourTreeEvents.cs b/Assets/Scripts/Gameplay/AIBehaviour/BehaviourTree/Core/BehaviourTreeEvents.cs similarity index 100% rename from Assets/Scripts/AIBehaviour/BehaviourTree/Core/BehaviourTreeEvents.cs rename to Assets/Scripts/Gameplay/AIBehaviour/BehaviourTree/Core/BehaviourTreeEvents.cs diff --git a/Assets/Scripts/AIBehaviour/BehaviourTree/Core/BehaviourTreeEvents.cs.shmeta b/Assets/Scripts/Gameplay/AIBehaviour/BehaviourTree/Core/BehaviourTreeEvents.cs.shmeta similarity index 100% rename from Assets/Scripts/AIBehaviour/BehaviourTree/Core/BehaviourTreeEvents.cs.shmeta rename to Assets/Scripts/Gameplay/AIBehaviour/BehaviourTree/Core/BehaviourTreeEvents.cs.shmeta diff --git a/Assets/Scripts/AIBehaviour/BehaviourTree/Core/BehaviourTreeNode.cs b/Assets/Scripts/Gameplay/AIBehaviour/BehaviourTree/Core/BehaviourTreeNode.cs similarity index 100% rename from Assets/Scripts/AIBehaviour/BehaviourTree/Core/BehaviourTreeNode.cs rename to Assets/Scripts/Gameplay/AIBehaviour/BehaviourTree/Core/BehaviourTreeNode.cs diff --git a/Assets/Scripts/AIBehaviour/BehaviourTree/Core/BehaviourTreeNode.cs.shmeta b/Assets/Scripts/Gameplay/AIBehaviour/BehaviourTree/Core/BehaviourTreeNode.cs.shmeta similarity index 100% rename from Assets/Scripts/AIBehaviour/BehaviourTree/Core/BehaviourTreeNode.cs.shmeta rename to Assets/Scripts/Gameplay/AIBehaviour/BehaviourTree/Core/BehaviourTreeNode.cs.shmeta diff --git a/Assets/Scripts/AIBehaviour/BehaviourTree/Flow/BehaviourTreeSelector.cs b/Assets/Scripts/Gameplay/AIBehaviour/BehaviourTree/Flow/BehaviourTreeSelector.cs similarity index 100% rename from Assets/Scripts/AIBehaviour/BehaviourTree/Flow/BehaviourTreeSelector.cs rename to Assets/Scripts/Gameplay/AIBehaviour/BehaviourTree/Flow/BehaviourTreeSelector.cs diff --git a/Assets/Scripts/AIBehaviour/BehaviourTree/Flow/BehaviourTreeSelector.cs.shmeta b/Assets/Scripts/Gameplay/AIBehaviour/BehaviourTree/Flow/BehaviourTreeSelector.cs.shmeta similarity index 100% rename from Assets/Scripts/AIBehaviour/BehaviourTree/Flow/BehaviourTreeSelector.cs.shmeta rename to Assets/Scripts/Gameplay/AIBehaviour/BehaviourTree/Flow/BehaviourTreeSelector.cs.shmeta diff --git a/Assets/Scripts/AIBehaviour/BehaviourTree/Flow/BehaviourTreeSequence.cs b/Assets/Scripts/Gameplay/AIBehaviour/BehaviourTree/Flow/BehaviourTreeSequence.cs similarity index 100% rename from Assets/Scripts/AIBehaviour/BehaviourTree/Flow/BehaviourTreeSequence.cs rename to Assets/Scripts/Gameplay/AIBehaviour/BehaviourTree/Flow/BehaviourTreeSequence.cs diff --git a/Assets/Scripts/AIBehaviour/BehaviourTree/Flow/BehaviourTreeSequence.cs.shmeta b/Assets/Scripts/Gameplay/AIBehaviour/BehaviourTree/Flow/BehaviourTreeSequence.cs.shmeta similarity index 100% rename from Assets/Scripts/AIBehaviour/BehaviourTree/Flow/BehaviourTreeSequence.cs.shmeta rename to Assets/Scripts/Gameplay/AIBehaviour/BehaviourTree/Flow/BehaviourTreeSequence.cs.shmeta diff --git a/Assets/Scripts/AIBehaviour/Implemented/Homeowner1.cs b/Assets/Scripts/Gameplay/AIBehaviour/Implemented/Homeowner1.cs similarity index 100% rename from Assets/Scripts/AIBehaviour/Implemented/Homeowner1.cs rename to Assets/Scripts/Gameplay/AIBehaviour/Implemented/Homeowner1.cs diff --git a/Assets/Scripts/AIBehaviour/Implemented/Homeowner1.cs.shmeta b/Assets/Scripts/Gameplay/AIBehaviour/Implemented/Homeowner1.cs.shmeta similarity index 100% rename from Assets/Scripts/AIBehaviour/Implemented/Homeowner1.cs.shmeta rename to Assets/Scripts/Gameplay/AIBehaviour/Implemented/Homeowner1.cs.shmeta diff --git a/Assets/Scripts/AIBehaviour/Implemented/Homeowner1Events.cs b/Assets/Scripts/Gameplay/AIBehaviour/Implemented/Homeowner1Events.cs similarity index 100% rename from Assets/Scripts/AIBehaviour/Implemented/Homeowner1Events.cs rename to Assets/Scripts/Gameplay/AIBehaviour/Implemented/Homeowner1Events.cs diff --git a/Assets/Scripts/AIBehaviour/Implemented/Homeowner1Events.cs.shmeta b/Assets/Scripts/Gameplay/AIBehaviour/Implemented/Homeowner1Events.cs.shmeta similarity index 100% rename from Assets/Scripts/AIBehaviour/Implemented/Homeowner1Events.cs.shmeta rename to Assets/Scripts/Gameplay/AIBehaviour/Implemented/Homeowner1Events.cs.shmeta diff --git a/Assets/Scripts/AIBehaviour/Implemented/LeafNodes/LeafAttack.cs b/Assets/Scripts/Gameplay/AIBehaviour/Implemented/LeafNodes/LeafAttack.cs similarity index 100% rename from Assets/Scripts/AIBehaviour/Implemented/LeafNodes/LeafAttack.cs rename to Assets/Scripts/Gameplay/AIBehaviour/Implemented/LeafNodes/LeafAttack.cs diff --git a/Assets/Scripts/AIBehaviour/Implemented/LeafNodes/LeafAttack.cs.shmeta b/Assets/Scripts/Gameplay/AIBehaviour/Implemented/LeafNodes/LeafAttack.cs.shmeta similarity index 100% rename from Assets/Scripts/AIBehaviour/Implemented/LeafNodes/LeafAttack.cs.shmeta rename to Assets/Scripts/Gameplay/AIBehaviour/Implemented/LeafNodes/LeafAttack.cs.shmeta diff --git a/Assets/Scripts/AIBehaviour/Implemented/LeafNodes/LeafChase.cs b/Assets/Scripts/Gameplay/AIBehaviour/Implemented/LeafNodes/LeafChase.cs similarity index 100% rename from Assets/Scripts/AIBehaviour/Implemented/LeafNodes/LeafChase.cs rename to Assets/Scripts/Gameplay/AIBehaviour/Implemented/LeafNodes/LeafChase.cs diff --git a/Assets/Scripts/AIBehaviour/Implemented/LeafNodes/LeafChase.cs.shmeta b/Assets/Scripts/Gameplay/AIBehaviour/Implemented/LeafNodes/LeafChase.cs.shmeta similarity index 100% rename from Assets/Scripts/AIBehaviour/Implemented/LeafNodes/LeafChase.cs.shmeta rename to Assets/Scripts/Gameplay/AIBehaviour/Implemented/LeafNodes/LeafChase.cs.shmeta diff --git a/Assets/Scripts/AIBehaviour/Implemented/LeafNodes/LeafPatrol.cs b/Assets/Scripts/Gameplay/AIBehaviour/Implemented/LeafNodes/LeafPatrol.cs similarity index 100% rename from Assets/Scripts/AIBehaviour/Implemented/LeafNodes/LeafPatrol.cs rename to Assets/Scripts/Gameplay/AIBehaviour/Implemented/LeafNodes/LeafPatrol.cs diff --git a/Assets/Scripts/AIBehaviour/Implemented/LeafNodes/LeafPatrol.cs.shmeta b/Assets/Scripts/Gameplay/AIBehaviour/Implemented/LeafNodes/LeafPatrol.cs.shmeta similarity index 100% rename from Assets/Scripts/AIBehaviour/Implemented/LeafNodes/LeafPatrol.cs.shmeta rename to Assets/Scripts/Gameplay/AIBehaviour/Implemented/LeafNodes/LeafPatrol.cs.shmeta diff --git a/Assets/Scripts/AIBehaviour/Implemented/LeafNodes/LeafSearch.cs b/Assets/Scripts/Gameplay/AIBehaviour/Implemented/LeafNodes/LeafSearch.cs similarity index 100% rename from Assets/Scripts/AIBehaviour/Implemented/LeafNodes/LeafSearch.cs rename to Assets/Scripts/Gameplay/AIBehaviour/Implemented/LeafNodes/LeafSearch.cs diff --git a/Assets/Scripts/AIBehaviour/Implemented/LeafNodes/LeafSearch.cs.shmeta b/Assets/Scripts/Gameplay/AIBehaviour/Implemented/LeafNodes/LeafSearch.cs.shmeta similarity index 100% rename from Assets/Scripts/AIBehaviour/Implemented/LeafNodes/LeafSearch.cs.shmeta rename to Assets/Scripts/Gameplay/AIBehaviour/Implemented/LeafNodes/LeafSearch.cs.shmeta diff --git a/Assets/Scripts/Gameplay/Breakable.cs.shmeta b/Assets/Scripts/Gameplay/Breakable.cs.shmeta deleted file mode 100644 index e8d90963..00000000 --- a/Assets/Scripts/Gameplay/Breakable.cs.shmeta +++ /dev/null @@ -1,3 +0,0 @@ -Name: Breakable -ID: 154790613 -Type: 9 diff --git a/Assets/Scripts/Gameplay/Breakable.cs b/Assets/Scripts/Gameplay/Item/SC_Breakable.cs similarity index 100% rename from Assets/Scripts/Gameplay/Breakable.cs rename to Assets/Scripts/Gameplay/Item/SC_Breakable.cs diff --git a/Assets/Scripts/Gameplay/Item/SC_Breakable.cs.shmeta b/Assets/Scripts/Gameplay/Item/SC_Breakable.cs.shmeta new file mode 100644 index 00000000..b0e30491 --- /dev/null +++ b/Assets/Scripts/Gameplay/Item/SC_Breakable.cs.shmeta @@ -0,0 +1,3 @@ +Name: SC_Breakable +ID: 161935110 +Type: 9 diff --git a/Assets/Scripts/Gameplay/SC_Item.cs b/Assets/Scripts/Gameplay/Item/SC_Item.cs similarity index 100% rename from Assets/Scripts/Gameplay/SC_Item.cs rename to Assets/Scripts/Gameplay/Item/SC_Item.cs diff --git a/Assets/Scripts/Gameplay/SC_Item.cs.shmeta b/Assets/Scripts/Gameplay/Item/SC_Item.cs.shmeta similarity index 100% rename from Assets/Scripts/Gameplay/SC_Item.cs.shmeta rename to Assets/Scripts/Gameplay/Item/SC_Item.cs.shmeta diff --git a/Assets/Scripts/Gameplay/Player/UT_PlayerCaughtState.cs b/Assets/Scripts/Gameplay/Player/PlayerStates/UT_PlayerCaughtState.cs similarity index 100% rename from Assets/Scripts/Gameplay/Player/UT_PlayerCaughtState.cs rename to Assets/Scripts/Gameplay/Player/PlayerStates/UT_PlayerCaughtState.cs diff --git a/Assets/Scripts/Gameplay/Player/UT_PlayerCaughtState.cs.shmeta b/Assets/Scripts/Gameplay/Player/PlayerStates/UT_PlayerCaughtState.cs.shmeta similarity index 100% rename from Assets/Scripts/Gameplay/Player/UT_PlayerCaughtState.cs.shmeta rename to Assets/Scripts/Gameplay/Player/PlayerStates/UT_PlayerCaughtState.cs.shmeta diff --git a/Assets/Scripts/Gameplay/Player/UT_PlayerFallState.cs b/Assets/Scripts/Gameplay/Player/PlayerStates/UT_PlayerFallState.cs similarity index 100% rename from Assets/Scripts/Gameplay/Player/UT_PlayerFallState.cs rename to Assets/Scripts/Gameplay/Player/PlayerStates/UT_PlayerFallState.cs diff --git a/Assets/Scripts/Gameplay/Player/UT_PlayerFallState.cs.shmeta b/Assets/Scripts/Gameplay/Player/PlayerStates/UT_PlayerFallState.cs.shmeta similarity index 100% rename from Assets/Scripts/Gameplay/Player/UT_PlayerFallState.cs.shmeta rename to Assets/Scripts/Gameplay/Player/PlayerStates/UT_PlayerFallState.cs.shmeta diff --git a/Assets/Scripts/Gameplay/Player/UT_PlayerIdleState.cs b/Assets/Scripts/Gameplay/Player/PlayerStates/UT_PlayerIdleState.cs similarity index 100% rename from Assets/Scripts/Gameplay/Player/UT_PlayerIdleState.cs rename to Assets/Scripts/Gameplay/Player/PlayerStates/UT_PlayerIdleState.cs diff --git a/Assets/Scripts/Gameplay/Player/UT_PlayerIdleState.cs.shmeta b/Assets/Scripts/Gameplay/Player/PlayerStates/UT_PlayerIdleState.cs.shmeta similarity index 100% rename from Assets/Scripts/Gameplay/Player/UT_PlayerIdleState.cs.shmeta rename to Assets/Scripts/Gameplay/Player/PlayerStates/UT_PlayerIdleState.cs.shmeta diff --git a/Assets/Scripts/Gameplay/Player/UT_PlayerJumpState.cs b/Assets/Scripts/Gameplay/Player/PlayerStates/UT_PlayerJumpState.cs similarity index 100% rename from Assets/Scripts/Gameplay/Player/UT_PlayerJumpState.cs rename to Assets/Scripts/Gameplay/Player/PlayerStates/UT_PlayerJumpState.cs diff --git a/Assets/Scripts/Gameplay/Player/UT_PlayerJumpState.cs.shmeta b/Assets/Scripts/Gameplay/Player/PlayerStates/UT_PlayerJumpState.cs.shmeta similarity index 100% rename from Assets/Scripts/Gameplay/Player/UT_PlayerJumpState.cs.shmeta rename to Assets/Scripts/Gameplay/Player/PlayerStates/UT_PlayerJumpState.cs.shmeta diff --git a/Assets/Scripts/Gameplay/Player/UT_PlayerLandState.cs b/Assets/Scripts/Gameplay/Player/PlayerStates/UT_PlayerLandState.cs similarity index 100% rename from Assets/Scripts/Gameplay/Player/UT_PlayerLandState.cs rename to Assets/Scripts/Gameplay/Player/PlayerStates/UT_PlayerLandState.cs diff --git a/Assets/Scripts/Gameplay/Player/UT_PlayerLandState.cs.shmeta b/Assets/Scripts/Gameplay/Player/PlayerStates/UT_PlayerLandState.cs.shmeta similarity index 100% rename from Assets/Scripts/Gameplay/Player/UT_PlayerLandState.cs.shmeta rename to Assets/Scripts/Gameplay/Player/PlayerStates/UT_PlayerLandState.cs.shmeta diff --git a/Assets/Scripts/Gameplay/Player/UT_PlayerRunState.cs b/Assets/Scripts/Gameplay/Player/PlayerStates/UT_PlayerRunState.cs similarity index 100% rename from Assets/Scripts/Gameplay/Player/UT_PlayerRunState.cs rename to Assets/Scripts/Gameplay/Player/PlayerStates/UT_PlayerRunState.cs diff --git a/Assets/Scripts/Gameplay/Player/UT_PlayerRunState.cs.shmeta b/Assets/Scripts/Gameplay/Player/PlayerStates/UT_PlayerRunState.cs.shmeta similarity index 100% rename from Assets/Scripts/Gameplay/Player/UT_PlayerRunState.cs.shmeta rename to Assets/Scripts/Gameplay/Player/PlayerStates/UT_PlayerRunState.cs.shmeta diff --git a/Assets/Scripts/Gameplay/Player/UT_PlayerWalkState.cs b/Assets/Scripts/Gameplay/Player/PlayerStates/UT_PlayerWalkState.cs similarity index 100% rename from Assets/Scripts/Gameplay/Player/UT_PlayerWalkState.cs rename to Assets/Scripts/Gameplay/Player/PlayerStates/UT_PlayerWalkState.cs diff --git a/Assets/Scripts/Gameplay/Player/UT_PlayerWalkState.cs.shmeta b/Assets/Scripts/Gameplay/Player/PlayerStates/UT_PlayerWalkState.cs.shmeta similarity index 100% rename from Assets/Scripts/Gameplay/Player/UT_PlayerWalkState.cs.shmeta rename to Assets/Scripts/Gameplay/Player/PlayerStates/UT_PlayerWalkState.cs.shmeta diff --git a/Assets/Scripts/Gameplay/Player/ThirdPersonCamera.cs b/Assets/Scripts/Gameplay/Player/SC_ThirdPersonCamera.cs similarity index 100% rename from Assets/Scripts/Gameplay/Player/ThirdPersonCamera.cs rename to Assets/Scripts/Gameplay/Player/SC_ThirdPersonCamera.cs diff --git a/Assets/Scripts/Gameplay/Player/SC_ThirdPersonCamera.cs.shmeta b/Assets/Scripts/Gameplay/Player/SC_ThirdPersonCamera.cs.shmeta new file mode 100644 index 00000000..c88897d1 --- /dev/null +++ b/Assets/Scripts/Gameplay/Player/SC_ThirdPersonCamera.cs.shmeta @@ -0,0 +1,3 @@ +Name: SC_ThirdPersonCamera +ID: 166247489 +Type: 9 diff --git a/Assets/Scripts/Gameplay/Player/ThirdPersonCamera.cs.shmeta b/Assets/Scripts/Gameplay/Player/ThirdPersonCamera.cs.shmeta deleted file mode 100644 index 2f18c2fb..00000000 --- a/Assets/Scripts/Gameplay/Player/ThirdPersonCamera.cs.shmeta +++ /dev/null @@ -1,3 +0,0 @@ -Name: ThirdPersonCamera -ID: 154161201 -Type: 9 diff --git a/Assets/Scripts/Gameplay/SC_GameManager.cs b/Assets/Scripts/Gameplay/SC_GameManager.cs index e2f1b45f..23ef00e3 100644 --- a/Assets/Scripts/Gameplay/SC_GameManager.cs +++ b/Assets/Scripts/Gameplay/SC_GameManager.cs @@ -38,6 +38,7 @@ public class GameManager : Script protected override void awake() { Audio.PlayBGMOnce2D("event:/Music/player_undetected"); + Audio.PlayBGMOnce2D("event:/Ambience/roomtone_kitchen"); totalItemCount = 0; Score = 0; currGameState = GameState.START; diff --git a/Assets/Scripts/SC_EndScene.cs b/Assets/Scripts/UI/SC_EndScene.cs similarity index 67% rename from Assets/Scripts/SC_EndScene.cs rename to Assets/Scripts/UI/SC_EndScene.cs index 8d3104c5..3b8c6bf0 100644 --- a/Assets/Scripts/SC_EndScene.cs +++ b/Assets/Scripts/UI/SC_EndScene.cs @@ -11,16 +11,24 @@ public class EndScene : Script } protected override void update() { - if (Input.GetKey(Input.KeyCode.R)) + if (Input.GetKeyDown(Input.KeyCode.R)) { Audio.PlaySFXOnce2D("event:/UI/mouse_down_element"); + } + if (Input.GetKeyUp(Input.KeyCode.R)) + { + Audio.PlaySFXOnce2D("event:/UI/success"); Audio.StopAllSounds(); SceneManager.ChangeScene(mainGameScene); } - if (Input.GetKey(Input.KeyCode.M)) + if (Input.GetKeyDown(Input.KeyCode.M)) { Audio.PlaySFXOnce2D("event:/UI/mouse_down_element"); + } + if (Input.GetKeyUp(Input.KeyCode.M)) + { + Audio.PlaySFXOnce2D("event:/UI/success"); Audio.StopAllSounds(); SceneManager.ChangeScene(mainMainScene); } diff --git a/Assets/Scripts/SC_EndScene.cs.shmeta b/Assets/Scripts/UI/SC_EndScene.cs.shmeta similarity index 100% rename from Assets/Scripts/SC_EndScene.cs.shmeta rename to Assets/Scripts/UI/SC_EndScene.cs.shmeta diff --git a/Assets/Scripts/SC_MainMenu.cs b/Assets/Scripts/UI/SC_MainMenu.cs similarity index 82% rename from Assets/Scripts/SC_MainMenu.cs rename to Assets/Scripts/UI/SC_MainMenu.cs index cd2caf3f..4f9320ee 100644 --- a/Assets/Scripts/SC_MainMenu.cs +++ b/Assets/Scripts/UI/SC_MainMenu.cs @@ -12,6 +12,11 @@ public class MainMenu : Script if (Input.GetKeyDown(Input.KeyCode.Space)) { Audio.PlaySFXOnce2D("event:/UI/mouse_down_element"); + } + + if (Input.GetKeyUp(Input.KeyCode.Space)) + { + Audio.PlaySFXOnce2D("event:/UI/success"); SceneManager.ChangeScene(86098106); Audio.StopAllSounds(); } diff --git a/Assets/Scripts/SC_MainMenu.cs.shmeta b/Assets/Scripts/UI/SC_MainMenu.cs.shmeta similarity index 100% rename from Assets/Scripts/SC_MainMenu.cs.shmeta rename to Assets/Scripts/UI/SC_MainMenu.cs.shmeta