Fix adaptive bgm not changing on alert

AI fix
Merge pull request #456 from SHADE-DP/Navigation
2023-04-02 18:16:25 +08:00 · 2023-04-02 13:32:21 +08:00 · 2023-04-02 12:48:39 +08:00 · 2023-04-02 12:34:47 +08:00 · 2023-04-01 21:30:18 +08:00 · 2023-04-01 21:06:12 +08:00
369 changed files with 29343 additions and 25745 deletions
--- a/Clips/MD_HomeownerV2Anims.shanimcontainer
+++ b/Clips/MD_HomeownerV2Anims.shanimcontainer
--- a/Clips/MD_HomeownerV2Anims.shanimcontainer.shmeta
+++ b/Clips/MD_HomeownerV2Anims.shanimcontainer.shmeta
@ -5,3 +5,63 @@ Sub Assets:
 Name: Full
 ID: 227644717
 Type: 13
+Name: TPose
+ID: 221337587
+Type: 13
+Name: Idle
+ID: 224442713
+Type: 13
+Name: Walk
+ID: 229189609
+Type: 13
+Name: Alerted_by_Racoon
+ID: 227890696
+Type: 13
+Name: Alerted_Idle
+ID: 234046577
+Type: 13
+Name: Alerted_Run
+ID: 230172366
+Type: 13
+Name: Interact
+ID: 220088098
+Type: 13
+Name: Distracted
+ID: 229108322
+Type: 13
+Name: StunStartFront
+ID: 223296233
+Type: 13
+Name: StunLoopFront
+ID: 230129276
+Type: 13
+Name: StunEndFront
+ID: 224141761
+Type: 13
+Name: StunStartBack
+ID: 218547923
+Type: 13
+Name: StunLoopBack
+ID: 219563559
+Type: 13
+Name: StunEndBack
+ID: 226668516
+Type: 13
+Name: React_to_Broken_Stuff
+ID: 228323560
+Type: 13
+Name: Pickup_Item
+ID: 227002263
+Type: 13
+Name: Return_Item
+ID: 222655168
+Type: 13
+Name: Attack_Windup
+ID: 223078653
+Type: 13
+Name: Attack_Hold
+ID: 228250554
+Type: 13
+Name: Attack_Sequence
+ID: 226129627
+Type: 13
--- a/Assets/Animation
+++ b/Assets/Animation
--- a/Assets/Audio/Master.bank
+++ b/Assets/Audio/Master.bank
--- a/Assets/Audio/Master.strings.bank
+++ b/Assets/Audio/Master.strings.bank
--- a/Assets/Audio/Music.bank
+++ b/Assets/Audio/Music.bank
--- a/Assets/Audio/SFX.bank
+++ b/Assets/Audio/SFX.bank
--- a/Assets/CollisionTags.SHConfig
+++ b/Assets/CollisionTags.SHConfig
@ -1,14 +1,14 @@
-0 StaticObject 1100000000000000
-1 Player 1100000000000000
+0 StaticObject 1101000000000000
+1 Furniture 1101000000000000
 2 Food 1000000000000000
 3 Breakable 1100000000000000
 4 ScoringWallCollider 0110000000000000
 5 Homeowner 1100000000000000
 6 Camera 0010000000000000
-7 StaticWithCameraCollision 1110000000000000
-8 9 0000000000000000
-9 10 0000000000000000
-10 11 0000000000000000
+7 StaticWithCameraCollision 1111000000000000
+8 Floor 1100000000000000
+9 Navigation 0001000000000000
+10 Player 1100000000000000
 11 12 0000000000000000
 12 13 0000000000000000
 13 14 0000000000000000
--- a/Assets/Materials/CutScene/CutScene_04a.shmat
+++ b/Assets/Materials/CutScene/CutScene_04a.shmat
@ -3,6 +3,6 @@
  SubPass: UI
  Properties:
    data.color: {x: 1, y: 1, z: 1, w: 1}
-    data.textureIndex: 51238312
+    data.textureIndex: 59076169
    data.alpha: 1
    data.beta: {x: 1, y: 1, z: 1}
--- a/Assets/Materials/CutScene/CutScene_04b.shmat
+++ b/Assets/Materials/CutScene/CutScene_04b.shmat
@ -3,6 +3,6 @@
  SubPass: UI
  Properties:
    data.color: {x: 1, y: 1, z: 1, w: 1}
-    data.textureIndex: 61471971
+    data.textureIndex: 66572525
    data.alpha: 1
    data.beta: {x: 1, y: 1, z: 1}
--- a/Assets/Materials/CutScene/CutScene_04c.shmat
+++ b/Assets/Materials/CutScene/CutScene_04c.shmat
@ -3,6 +3,6 @@
  SubPass: UI
  Properties:
    data.color: {x: 1, y: 1, z: 1, w: 1}
-    data.textureIndex: 58217538
+    data.textureIndex: 66182834
    data.alpha: 1
    data.beta: {x: 1, y: 1, z: 1}
--- a/Assets/Materials/CutScene/CutScene_05a.shmat
+++ b/Assets/Materials/CutScene/CutScene_05a.shmat
@ -3,6 +3,6 @@
  SubPass: UI
  Properties:
    data.color: {x: 1, y: 1, z: 1, w: 1}
-    data.textureIndex: 61980534
+    data.textureIndex: 58009216
    data.alpha: 1
    data.beta: {x: 1, y: 1, z: 1}
--- a/Assets/Materials/CutScene/CutScene_05b.shmat
+++ b/Assets/Materials/CutScene/CutScene_05b.shmat
@ -3,6 +3,6 @@
  SubPass: UI
  Properties:
    data.color: {x: 1, y: 1, z: 1, w: 1}
-    data.textureIndex: 51561286
+    data.textureIndex: 55022275
    data.alpha: 1
    data.beta: {x: 1, y: 1, z: 1}
--- a/Assets/Materials/UI/UIMat_MainMenu.shmat
+++ b/Assets/Materials/UI/UIMat_MainMenu.shmat
@ -3,6 +3,6 @@
  SubPass: UI
  Properties:
    data.color: {x: 1, y: 1, z: 1, w: 1}
-    data.textureIndex: 58181851
+    data.textureIndex: 56004904
    data.alpha: 1
    data.beta: {x: 1, y: 1, z: 1}
--- a/Assets/Materials/UIMat_Credits.shmat
+++ b/Assets/Materials/UIMat_Credits.shmat
@ -3,6 +3,6 @@
  SubPass: UI
  Properties:
    data.color: {x: 1, y: 1, z: 1, w: 1}
-    data.textureIndex: 59379300
+    data.textureIndex: 55278388
    data.alpha: 1
    data.beta: {x: 1, y: 1, z: 1}
--- a/Assets/Materials/UIMat_MenuBG.shmat
+++ b/Assets/Materials/UIMat_MenuBG.shmat
@ -0,0 +1,8 @@
+- VertexShader: 46580970
+  FragmentShader: 35983630
+  SubPass: UI
+  Properties:
+    data.color: {x: 1, y: 1, z: 1, w: 1}
+    data.textureIndex: 60776650
+    data.alpha: 1
+    data.beta: {x: 1, y: 1, z: 1}
--- a/Assets/Materials/UIMat_MenuBG.shmat.shmeta
+++ b/Assets/Materials/UIMat_MenuBG.shmat.shmeta
@ -0,0 +1,3 @@
+Name: UIMat_MenuBG
+ID: 130823048
+Type: 7
--- a/Assets/Materials/UIMat_SliderBG.shmat
+++ b/Assets/Materials/UIMat_SliderBG.shmat
@ -0,0 +1,8 @@
+- VertexShader: 46580970
+  FragmentShader: 35983630
+  SubPass: UI
+  Properties:
+    data.color: {x: 1, y: 1, z: 1, w: 1}
+    data.textureIndex: 64816540
+    data.alpha: 1
+    data.beta: {x: 1, y: 1, z: 1}
--- a/Assets/Materials/UIMat_SliderBG.shmat.shmeta
+++ b/Assets/Materials/UIMat_SliderBG.shmat.shmeta
@ -0,0 +1,3 @@
+Name: UIMat_SliderBG
+ID: 117587364
+Type: 7
--- a/Assets/Materials/UIMat_Slider_BGM.shmat
+++ b/Assets/Materials/UIMat_Slider_BGM.shmat
@ -0,0 +1,11 @@
+- VertexShader: 46580970
+  FragmentShader: 43211183
+  SubPass: UI
+  Properties:
+    data.color: {x: 1, y: 1, z: 1, w: 1}
+    data.textureIndex: 50370514
+    data.alpha: 1
+    data.beta: {x: 1, y: 1, z: 1}
+    data.sliderThreshold: 1
+    data.sliderStartColor: {x: 0.36500001, y: 0.783999979, z: 0.878000021, w: 1}
+    data.sliderBarColor: {x: 1, y: 1, z: 1, w: 1}
--- a/Assets/Materials/UIMat_Slider_BGM.shmat.shmeta
+++ b/Assets/Materials/UIMat_Slider_BGM.shmat.shmeta
@ -0,0 +1,3 @@
+Name: UIMat_Slider_BGM
+ID: 129354037
+Type: 7
--- a/Assets/Materials/UIMat_Slider_FOV.shmat
+++ b/Assets/Materials/UIMat_Slider_FOV.shmat
@ -0,0 +1,11 @@
+- VertexShader: 46580970
+  FragmentShader: 43211183
+  SubPass: UI
+  Properties:
+    data.color: {x: 1, y: 1, z: 1, w: 1}
+    data.textureIndex: 50370514
+    data.alpha: 1
+    data.beta: {x: 1, y: 1, z: 1}
+    data.sliderThreshold: 1
+    data.sliderStartColor: {x: 0.624000013, y: 0.211999997, z: 0.949000001, w: 1}
+    data.sliderBarColor: {x: 1, y: 1, z: 1, w: 1}
--- a/Assets/Materials/UIMat_Slider_FOV.shmat.shmeta
+++ b/Assets/Materials/UIMat_Slider_FOV.shmat.shmeta
@ -0,0 +1,3 @@
+Name: UIMat_Slider_FOV
+ID: 117651669
+Type: 7
--- a/Assets/Materials/UIMat_Slider_SFX.shmat
+++ b/Assets/Materials/UIMat_Slider_SFX.shmat
@ -0,0 +1,11 @@
+- VertexShader: 46580970
+  FragmentShader: 43211183
+  SubPass: UI
+  Properties:
+    data.color: {x: 1, y: 1, z: 1, w: 1}
+    data.textureIndex: 50370514
+    data.alpha: 1
+    data.beta: {x: 1, y: 1, z: 1}
+    data.sliderThreshold: 1
+    data.sliderStartColor: {x: 0.949000001, y: 0.689999998, z: 0.211999997, w: 1}
+    data.sliderBarColor: {x: 1, y: 1, z: 1, w: 1}
--- a/Assets/Materials/UIMat_Slider_SFX.shmat.shmeta
+++ b/Assets/Materials/UIMat_Slider_SFX.shmat.shmeta
@ -0,0 +1,3 @@
+Name: UIMat_Slider_SFX
+ID: 122820018
+Type: 7
--- a/Assets/Materials/UIMat_Slider_Textured.shmat
+++ b/Assets/Materials/UIMat_Slider_Textured.shmat
@ -3,7 +3,9 @@
  SubPass: UI
  Properties:
    data.color: {x: 1, y: 1, z: 1, w: 1}
-    data.textureIndex: 51995224
+    data.textureIndex: 50370514
    data.alpha: 1
    data.beta: {x: 1, y: 1, z: 1}
-    data.sliderThreshold: 1
+    data.sliderThreshold: 1
+    data.sliderStartColor: {x: 0.254901886, y: 0.321500003, z: 0.909799993, w: 1}
+    data.sliderBarColor: {x: 1, y: 1, z: 1, w: 1}
--- a/Assets/Materials/UIMat_Transistion.shmat
+++ b/Assets/Materials/UIMat_Transistion.shmat
@ -0,0 +1,8 @@
+- VertexShader: 46580970
+  FragmentShader: 40208610
+  SubPass: UI
+  Properties:
+    data.color: {x: 1, y: 1, z: 1, w: 1}
+    data.textureIndex: 50770098
+    data.alpha: 1
+    data.beta: {x: 1, y: 1, z: 1}
--- a/Assets/Materials/UIMat_Transistion.shmat.shmeta
+++ b/Assets/Materials/UIMat_Transistion.shmat.shmeta
@ -0,0 +1,3 @@
+Name: UIMat_Transistion
+ID: 132131066
+Type: 7
--- a/Assets/Materials/UI_Result.shmat
+++ b/Assets/Materials/UI_Result.shmat
@ -0,0 +1,8 @@
+- VertexShader: 46580970
+  FragmentShader: 35983630
+  SubPass: UI
+  Properties:
+    data.color: {x: 1, y: 1, z: 1, w: 1}
+    data.textureIndex: 55490391
+    data.alpha: 1
+    data.beta: {x: 1, y: 1, z: 1}
--- a/Assets/Materials/UI_Result.shmat.shmeta
+++ b/Assets/Materials/UI_Result.shmat.shmeta
@ -0,0 +1,3 @@
+Name: UI_Result
+ID: 130179375
+Type: 7
--- a/Assets/Models/MD_Birdnest.gltf
+++ b/Assets/Models/MD_Birdnest.gltf
--- a/Assets/Models/MD_Birdnest.shmodel
+++ b/Assets/Models/MD_Birdnest.shmodel
--- a/Assets/Models/MD_Birdnest.shmodel.shmeta
+++ b/Assets/Models/MD_Birdnest.shmodel.shmeta
@ -0,0 +1,7 @@
+Name: MD_Birdnest
+ID: 75951674
+Type: 4
+Sub Assets:
+Name: Birdnest
+ID: 148793058
+Type: 8
--- a/Assets/Models/MD_CeilingFan.gltf
+++ b/Assets/Models/MD_CeilingFan.gltf
--- a/Assets/Models/MD_CeilingFan.shmodel
+++ b/Assets/Models/MD_CeilingFan.shmodel
--- a/Assets/Models/MD_CeilingFan.shmodel.shmeta
+++ b/Assets/Models/MD_CeilingFan.shmodel.shmeta
@ -0,0 +1,7 @@
+Name: MD_CeilingFan
+ID: 73062062
+Type: 4
+Sub Assets:
+Name: Sphere.005
+ID: 135521751
+Type: 8
--- a/Assets/Models/MD_DarkCorridor.gltf
+++ b/Assets/Models/MD_DarkCorridor.gltf
--- a/Assets/Models/MD_DarkCorridor.shmodel
+++ b/Assets/Models/MD_DarkCorridor.shmodel
--- a/Assets/Models/MD_DarkCorridor.shmodel.shmeta
+++ b/Assets/Models/MD_DarkCorridor.shmodel.shmeta
@ -0,0 +1,7 @@
+Name: MD_DarkCorridor
+ID: 83188665
+Type: 4
+Sub Assets:
+Name: CorridorPiece
+ID: 136332265
+Type: 8
--- a/Assets/Models/MD_HomeownerV2.gltf
+++ b/Assets/Models/MD_HomeownerV2.gltf
--- a/Assets/Models/MD_HomeownerV2.shmodel
+++ b/Assets/Models/MD_HomeownerV2.shmodel
--- a/Assets/Models/MD_RubbishBinV2.gltf
+++ b/Assets/Models/MD_RubbishBinV2.gltf
--- a/Assets/Models/MD_RubbishBinV2.shmodel
+++ b/Assets/Models/MD_RubbishBinV2.shmodel
--- a/Assets/Models/MD_RubbishBinV2.shmodel.shmeta
+++ b/Assets/Models/MD_RubbishBinV2.shmodel.shmeta
@ -0,0 +1,7 @@
+Name: MD_RubbishBinV2
+ID: 71821168
+Type: 4
+Sub Assets:
+Name: RubbishBin02
+ID: 141767450
+Type: 8
--- a/Assets/Models/MD_ShelvesItems.gltf
+++ b/Assets/Models/MD_ShelvesItems.gltf
--- a/Assets/Models/MD_ShelvesItems.shmodel
+++ b/Assets/Models/MD_ShelvesItems.shmodel
--- a/Assets/Models/MD_ShelvesItems.shmodel.shmeta
+++ b/Assets/Models/MD_ShelvesItems.shmodel.shmeta
@ -0,0 +1,28 @@
+Name: MD_ShelvesItems
+ID: 80837524
+Type: 4
+Sub Assets:
+Name: Cube.026
+ID: 149990626
+Type: 8
+Name: Cube.033
+ID: 148931934
+Type: 8
+Name: Cube.043
+ID: 150010583
+Type: 8
+Name: PottedPlant
+ID: 136851231
+Type: 8
+Name: Cube.140
+ID: 141518062
+Type: 8
+Name: Cube.079
+ID: 139864675
+Type: 8
+Name: Cube.061
+ID: 147649979
+Type: 8
+Name: Cube.062
+ID: 137537688
+Type: 8
--- a/Data/Level1_NavData.shnav
+++ b/Data/Level1_NavData.shnav
--- a/Data/Level1_NavData.shnav.shmeta
+++ b/Data/Level1_NavData.shnav.shmeta
@ -0,0 +1,3 @@
+Name: Level1_NavData
+ID: 257298636
+Type: 15
--- a/Data/Level2_AITest_NavData.shnav
+++ b/Data/Level2_AITest_NavData.shnav
--- a/Data/Level2_AITest_NavData.shnav.shmeta
+++ b/Data/Level2_AITest_NavData.shnav.shmeta
@ -0,0 +1,3 @@
+Name: Level2_AITest_NavData
+ID: 254149790
+Type: 15
--- a/Data/Level2_NavData.shnav
+++ b/Data/Level2_NavData.shnav
--- a/Data/Level2_NavData.shnav.shmeta
+++ b/Data/Level2_NavData.shnav.shmeta
@ -0,0 +1,3 @@
+Name: Level2_NavData
+ID: 260674210
+Type: 15
--- a/Data/Level3_NavData.shnav
+++ b/Data/Level3_NavData.shnav
--- a/Data/Level3_NavData.shnav.shmeta
+++ b/Data/Level3_NavData.shnav.shmeta
@ -0,0 +1,3 @@
+Name: Level3_NavData
+ID: 252819653
+Type: 15
--- a/Assets/Scenes/Breakables.shade
+++ b/Assets/Scenes/Breakables.shade
@ -1,276 +0,0 @@
- EID: 0
-  Name: Main Camera
-  IsActive: true
-  NumberOfChildren: 0
-  Components:
-    Transform Component:
-      Translate: {x: 0, y: 0.472120881, z: 2.53064919}
-      Rotate: {x: 0, y: 0, z: 0}
-      Scale: {x: 1, y: 1, z: 1}
-      IsActive: true
-    Camera Component:
-      Position: {x: 0, y: 0.472120881, z: 2.53064919}
-      Pitch: 0
-      Yaw: 0
-      Roll: 0
-      Width: 1920
-      Height: 1080
-      Near: 0.00999999978
-      Far: 10000
-      Perspective: true
-      IsActive: true
-  Scripts: ~
- EID: 2
-  Name: Light
-  IsActive: true
-  NumberOfChildren: 0
-  Components:
-    Light Component:
-      Position: {x: 0, y: 0, z: 0}
-      Type: Directional
-      Direction: {x: 0, y: 0, z: 1}
-      Color: {x: 1, y: 1, z: 1, w: 1}
-      Layer: 4294967295
-      Strength: 0
-      IsActive: true
-  Scripts: ~
- EID: 1
-  Name: Plate
-  IsActive: true
-  NumberOfChildren: 4
-  Components:
-    Transform Component:
-      Translate: {x: 0.00451920554, y: 0.829197884, z: 1.75}
-      Rotate: {x: -0, y: 0, z: -0}
-      Scale: {x: 0.999979734, y: 1, z: 0.999979734}
-      IsActive: true
-    Renderable Component:
-      Mesh: 140964851
-      Material: 126974645
-      IsActive: true
-    RigidBody Component:
-      Type: Dynamic
-      Drag: 0.00999999978
-      Angular Drag: 0.00999999978
-      Use Gravity: true
-      Interpolate: true
-      Sleeping Enabled: true
-      Freeze Position X: false
-      Freeze Position Y: false
-      Freeze Position Z: false
-      Freeze Rotation X: false
-      Freeze Rotation Y: false
-      Freeze Rotation Z: false
-      IsActive: true
-    Collider Component:
-      Colliders:
-        - Is Trigger: false
-          Type: Box
-          Half Extents: {x: 0.200000003, y: 0.100000001, z: 0.200000003}
-          Friction: 0.400000006
-          Bounciness: 0
-          Density: 1
-          Position Offset: {x: 0, y: 0, z: 0}
-          Rotation Offset: {x: 0, y: 0, z: 0}
-      IsActive: true
-  Scripts:
-    - Type: Breakable
-      Enabled: true
-      threshHold: 0
-      force: 1
- EID: 4
-  Name: Piece1
-  IsActive: true
-  NumberOfChildren: 0
-  Components:
-    Transform Component:
-      Translate: {x: 3.2922253e-07, y: 0, z: -0.0171992779}
-      Rotate: {x: -1.31316483e-07, y: 3.60887498e-09, z: 5.27542454e-11}
-      Scale: {x: 1, y: 1, z: 1}
-      IsActive: true
-    Renderable Component:
-      Mesh: 146557542
-      Material: 124370424
-      IsActive: true
-    RigidBody Component:
-      Type: Dynamic
-      Drag: 0.00999999978
-      Angular Drag: 0.00999999978
-      Use Gravity: true
-      Interpolate: true
-      Sleeping Enabled: true
-      Freeze Position X: false
-      Freeze Position Y: false
-      Freeze Position Z: false
-      Freeze Rotation X: false
-      Freeze Rotation Y: false
-      Freeze Rotation Z: false
-      IsActive: true
-    Collider Component:
-      Colliders:
-        - Is Trigger: false
-          Type: Box
-          Half Extents: {x: 0.100000001, y: 0.0500000007, z: 0.150000006}
-          Friction: 0.400000006
-          Bounciness: 0
-          Density: 1
-          Position Offset: {x: 0, y: 0, z: 0}
-          Rotation Offset: {x: 0, y: 0, z: 0}
-      IsActive: true
-  Scripts: ~
- EID: 5
-  Name: Piece2
-  IsActive: true
-  NumberOfChildren: 0
-  Components:
-    Transform Component:
-      Translate: {x: 2.47731805e-07, y: 0, z: 0.0325666666}
-      Rotate: {x: 0, y: 0, z: 0}
-      Scale: {x: 1, y: 1, z: 1}
-      IsActive: true
-    Renderable Component:
-      Mesh: 145439064
-      Material: 124370424
-      IsActive: true
-    RigidBody Component:
-      Type: Dynamic
-      Drag: 0.00999999978
-      Angular Drag: 0.00999999978
-      Use Gravity: true
-      Interpolate: true
-      Sleeping Enabled: true
-      Freeze Position X: false
-      Freeze Position Y: false
-      Freeze Position Z: false
-      Freeze Rotation X: false
-      Freeze Rotation Y: false
-      Freeze Rotation Z: false
-      IsActive: true
-    Collider Component:
-      Colliders:
-        - Is Trigger: false
-          Type: Box
-          Half Extents: {x: 0.100000001, y: 0.0500000007, z: 0.200000003}
-          Friction: 0.400000006
-          Bounciness: 0
-          Density: 1
-          Position Offset: {x: 0, y: 0, z: 0}
-          Rotation Offset: {x: 0, y: 0, z: 0}
-      IsActive: true
-  Scripts: ~
- EID: 6
-  Name: Piece3
-  IsActive: true
-  NumberOfChildren: 0
-  Components:
-    Transform Component:
-      Translate: {x: -0.0502781346, y: 1.18017197e-05, z: 6.97374344e-05}
-      Rotate: {x: 0.021297913, y: 0.00146768149, z: -5.48749846e-08}
-      Scale: {x: 1, y: 1, z: 1}
-      IsActive: true
-    Renderable Component:
-      Mesh: 139411134
-      Material: 124370424
-      IsActive: true
-    RigidBody Component:
-      Type: Dynamic
-      Drag: 0.00999999978
-      Angular Drag: 0.00999999978
-      Use Gravity: true
-      Interpolate: true
-      Sleeping Enabled: true
-      Freeze Position X: false
-      Freeze Position Y: false
-      Freeze Position Z: false
-      Freeze Rotation X: false
-      Freeze Rotation Y: false
-      Freeze Rotation Z: false
-      IsActive: true
-    Collider Component:
-      Colliders:
-        - Is Trigger: false
-          Type: Box
-          Half Extents: {x: 0.100000001, y: 0.0500000007, z: 0.150000006}
-          Friction: 0.400000006
-          Bounciness: 0
-          Density: 1
-          Position Offset: {x: 0, y: 0, z: 0}
-          Rotation Offset: {x: 0, y: 0, z: 0}
-      IsActive: true
-  Scripts: ~
- EID: 7
-  Name: Piece4
-  IsActive: true
-  NumberOfChildren: 0
-  Components:
-    Transform Component:
-      Translate: {x: 0.0364143178, y: 7.39097595e-06, z: 6.61611557e-05}
-      Rotate: {x: 0, y: 0, z: 0}
-      Scale: {x: 1, y: 1, z: 1}
-      IsActive: true
-    Renderable Component:
-      Mesh: 136742160
-      Material: 124370424
-      IsActive: true
-    RigidBody Component:
-      Type: Dynamic
-      Drag: 0.00999999978
-      Angular Drag: 0.00999999978
-      Use Gravity: true
-      Interpolate: true
-      Sleeping Enabled: true
-      Freeze Position X: false
-      Freeze Position Y: false
-      Freeze Position Z: false
-      Freeze Rotation X: false
-      Freeze Rotation Y: false
-      Freeze Rotation Z: false
-      IsActive: true
-    Collider Component:
-      Colliders:
-        - Is Trigger: false
-          Type: Box
-          Half Extents: {x: 0.100000001, y: 0.0500000007, z: 0.150000006}
-          Friction: 0.400000006
-          Bounciness: 0
-          Density: 1
-          Position Offset: {x: 0, y: 0, z: 0}
-          Rotation Offset: {x: 0, y: 0, z: 0}
-      IsActive: true
-  Scripts: ~
- EID: 3
-  Name: Ground
-  IsActive: true
-  NumberOfChildren: 0
-  Components:
-    Transform Component:
-      Translate: {x: 0, y: -0.414889663, z: 0}
-      Rotate: {x: -0, y: 0, z: -0}
-      Scale: {x: 5, y: 1, z: 5}
-      IsActive: true
-    RigidBody Component:
-      Type: Static
-      Drag: 0.00999999978
-      Angular Drag: 0.00999999978
-      Use Gravity: true
-      Interpolate: true
-      Sleeping Enabled: true
-      Freeze Position X: false
-      Freeze Position Y: false
-      Freeze Position Z: false
-      Freeze Rotation X: false
-      Freeze Rotation Y: false
-      Freeze Rotation Z: false
-      IsActive: true
-    Collider Component:
-      Colliders:
-        - Is Trigger: false
-          Type: Box
-          Half Extents: {x: 1, y: 1, z: 1}
-          Friction: 0.400000006
-          Bounciness: 0
-          Density: 1
-          Position Offset: {x: 0, y: 0, z: 0}
-          Rotation Offset: {x: 0, y: 0, z: 0}
-      IsActive: true
-  Scripts: ~
--- a/Assets/Scenes/Breakables.shade.shmeta
+++ b/Assets/Scenes/Breakables.shade.shmeta
@ -1,3 +0,0 @@
-Name: Breakables
-ID: 85040588
-Type: 5
--- a/Assets/Scenes/CreditsScene.shade
+++ b/Assets/Scenes/CreditsScene.shade
@ -0,0 +1,174 @@
+- NavData: 0
+- EID: 0
+  Name: Camera
+  IsActive: true
+  NumberOfChildren: 0
+  Components:
+    Transform Component:
+      Translate: {x: 0, y: 0, z: 0}
+      Rotate: {x: 0, y: 0, z: 0}
+      Scale: {x: 1, y: 1, z: 1}
+      IsActive: true
+    Camera Component:
+      Position: {x: 0, y: 0, z: 0}
+      Pitch: 0
+      Yaw: 0
+      Roll: 0
+      Width: 1920
+      Near: 0.00999999978
+      Far: 10000
+      Perspective: true
+      FOV: 90
+      IsActive: true
+  Scripts: ~
+- EID: 46
+  Name: Credits Canvas
+  IsActive: true
+  NumberOfChildren: 3
+  Components:
+    Canvas Component:
+      Canvas Width: 1920
+      Canvas Height: 1080
+      Scale by canvas width: false
+      IsActive: true
+  Scripts: ~
+- EID: 47
+  Name: Scrolling Credits
+  IsActive: true
+  NumberOfChildren: 0
+  Components:
+    Transform Component:
+      Translate: {x: 0, y: -3800, z: 1.5}
+      Rotate: {x: 0, y: 0, z: 0}
+      Scale: {x: 1920, y: 8026, z: 1}
+      IsActive: true
+    Renderable Component:
+      Mesh: 141771688
+      Material: 120332672
+      IsActive: true
+    UI Component:
+      Canvas ID: 46
+      Hovered: false
+      Clicked: false
+      IsActive: true
+  Scripts:
+    - Type: SHADE_Scripting.UI.ScrollingCredits
+      Enabled: true
+      endY: 4300
+      duration: 27
+      levelTransition: 619
+    - Type: SHADE_Scripting.UI.TransitToMainMenu
+      Enabled: true
+      timeToTransit: 27
+      sceneToChange: 97158628
+- EID: 49
+  Name: Credits Title Text
+  IsActive: false
+  NumberOfChildren: 0
+  Components:
+    Transform Component:
+      Translate: {x: -150, y: 400, z: 0.100000001}
+      Rotate: {x: 0, y: 0, z: 0}
+      Scale: {x: 100, y: 100, z: 1}
+      IsActive: false
+    Text Renderer Component:
+      Text: Credits
+      Font: 174412429
+      Color: {x: 0, y: 0, z: 0, w: 1}
+      Text Size: {x: 1, y: 1, z: 1}
+      IsActive: false
+    UI Component:
+      Canvas ID: 46
+      Hovered: false
+      Clicked: false
+      IsActive: false
+  Scripts: ~
+- EID: 55
+  Name: BackGround
+  IsActive: false
+  NumberOfChildren: 0
+  Components:
+    Transform Component:
+      Translate: {x: 0, y: 0, z: 1.5}
+      Rotate: {x: 0, y: 0, z: 0}
+      Scale: {x: 1920, y: 1080, z: 1}
+      IsActive: false
+    Renderable Component:
+      Mesh: 141771688
+      Material: 121834459
+      IsActive: false
+    UI Component:
+      Canvas ID: 46
+      Hovered: false
+      Clicked: false
+      IsActive: false
+  Scripts: ~
+- EID: 54
+  Name: TweenManager
+  IsActive: true
+  NumberOfChildren: 0
+  Components: ~
+  Scripts:
+    - Type: TweenManager
+      Enabled: true
+- EID: 619
+  Name: LevelTransistionCanvas
+  IsActive: true
+  NumberOfChildren: 2
+  Components:
+    Canvas Component:
+      Canvas Width: 1920
+      Canvas Height: 1080
+      Scale by canvas width: false
+      IsActive: true
+  Scripts:
+    - Type: LevelTransistion
+      Enabled: true
+      logo: 618
+      bg: 617
+      duration: 0.5
+      bgEndPositionX: 3000
+      logoEndPositionX: 3000
+      rotAndScale: false
+      rotationAmt: 360
+      scaleAmt: 631
+- EID: 618
+  Name: LevelTransistionLogo
+  IsActive: true
+  NumberOfChildren: 0
+  Components:
+    Transform Component:
+      Translate: {x: 0, y: 0, z: 0.100000001}
+      Rotate: {x: 0, y: 0, z: 0}
+      Scale: {x: 631, y: 631, z: 1}
+      IsActive: true
+    Renderable Component:
+      Mesh: 141771688
+      Material: 126117259
+      IsActive: true
+    UI Component:
+      Canvas ID: 619
+      Hovered: false
+      Clicked: false
+      IsActive: true
+  Scripts: ~
+- EID: 617
+  Name: LevelTransistionBG
+  IsActive: true
+  NumberOfChildren: 0
+  Components:
+    Transform Component:
+      Translate: {x: 0, y: 0, z: 0.200000003}
+      Rotate: {x: 0, y: 0, z: 0}
+      Scale: {x: 4000, y: 4000, z: 1}
+      IsActive: true
+    Renderable Component:
+      Mesh: 141771688
+      Material: 132131066
+      IsActive: true
+    UI Component:
+      Canvas ID: 619
+      Hovered: false
+      Clicked: false
+      IsActive: true
+  Scripts: ~
--- a/Assets/Scenes/CreditsScene.shade.shmeta
+++ b/Assets/Scenes/CreditsScene.shade.shmeta
@ -0,0 +1,3 @@
+Name: CreditsScene
+ID: 97376761
+Type: 5
--- a/Assets/Scenes/CutSceneEnd.shade
+++ b/Assets/Scenes/CutSceneEnd.shade
@ -1,3 +1,4 @@
+- NavData: 0
 - EID: 1
  Name: Canvas4
  IsActive: true
@ -152,7 +153,7 @@
  Scripts:
    - Type: CutsceneEnd
      Enabled: true
-      nextScene: 92009475
+      nextScene: 97376761
      duration: 1
      skipDuration: 0.100000001
      cutscene4Points: 4
@ -161,6 +162,7 @@
      cutscene5Pics: 15
      canvas4: 1
      canvas5: 14
+      levelTransition: 619
 - EID: 4
  Name: CutScene4Points
  IsActive: true
@ -288,7 +290,7 @@
  NumberOfChildren: 0
  Components:
    Transform Component:
-      Translate: {x: 250, y: -500, z: 0.100000001}
+      Translate: {x: 250, y: -500, z: 0.300000012}
      Rotate: {x: 0, y: 0, z: 0}
      Scale: {x: 50, y: 50, z: 50}
      IsActive: true
@ -331,4 +333,73 @@
      Rotate: {x: 0, y: 0, z: 0}
      Scale: {x: 1, y: 1, z: 1}
      IsActive: true
-  Scripts: ~
+  Scripts: ~
+- EID: 619
+  Name: LevelTransistionCanvas
+  IsActive: true
+  NumberOfChildren: 2
+  Components:
+    Canvas Component:
+      Canvas Width: 1920
+      Canvas Height: 1080
+      Scale by canvas width: false
+      IsActive: true
+  Scripts:
+    - Type: LevelTransistion
+      Enabled: true
+      logo: 618
+      bg: 617
+      duration: 0.5
+      bgEndPositionX: 3000
+      logoEndPositionX: 3000
+      rotAndScale: false
+      rotationAmt: 360
+      scaleAmt: 631
+- EID: 618
+  Name: LevelTransistionLogo
+  IsActive: true
+  NumberOfChildren: 0
+  Components:
+    Transform Component:
+      Translate: {x: 0, y: 0, z: 0.100000001}
+      Rotate: {x: 0, y: 0, z: 0}
+      Scale: {x: 631, y: 631, z: 1}
+      IsActive: true
+    Renderable Component:
+      Mesh: 141771688
+      Material: 126117259
+      IsActive: true
+    UI Component:
+      Canvas ID: 619
+      Hovered: false
+      Clicked: false
+      IsActive: true
+  Scripts: ~
+- EID: 617
+  Name: LevelTransistionBG
+  IsActive: true
+  NumberOfChildren: 0
+  Components:
+    Transform Component:
+      Translate: {x: 0, y: 0, z: 0.200000003}
+      Rotate: {x: 0, y: 0, z: 0}
+      Scale: {x: 4000, y: 4000, z: 1}
+      IsActive: true
+    Renderable Component:
+      Mesh: 141771688
+      Material: 132131066
+      IsActive: true
+    UI Component:
+      Canvas ID: 619
+      Hovered: false
+      Clicked: false
+      IsActive: true
+  Scripts: ~
+- EID: 616
+  Name: TweenManager
+  IsActive: true
+  NumberOfChildren: 0
+  Components: ~
+  Scripts:
+    - Type: TweenManager
+      Enabled: true
--- a/Assets/Scenes/CutSceneIntro.shade
+++ b/Assets/Scenes/CutSceneIntro.shade
@ -1,3 +1,4 @@
+- NavData: 0
 - EID: 1
  Name: Canvas1
  IsActive: true
@ -164,6 +165,7 @@
      canvas1: 1
      canvas2: 13
      canvas3: 24
+      levelTransition: 619
 - EID: 4
  Name: CutScene1Points
  IsActive: true
@ -177,7 +179,7 @@
  Components:
    Transform Component:
      Translate: {x: -550, y: 0, z: 0.5}
-      Rotate: {x: 0, y: 0, z: 0}
+      Rotate: {x: 500.5, y: -274.5, z: 0.600000024}
      Scale: {x: 1, y: 1, z: 1}
      IsActive: true
  Scripts: ~
@ -394,7 +396,7 @@
  NumberOfChildren: 0
  Components:
    Transform Component:
-      Translate: {x: -1375, y: 250, z: 0.5}
+      Translate: {x: -1375, y: 250, z: 0.899999976}
      Rotate: {x: 0, y: 0, z: 0}
      Scale: {x: 982, y: 527, z: 1}
      IsActive: true
@ -414,7 +416,7 @@
  NumberOfChildren: 0
  Components:
    Transform Component:
-      Translate: {x: 200, y: 1200, z: 0.400000006}
+      Translate: {x: 200, y: 1200, z: 0.800000012}
      Rotate: {x: 0, y: 0, z: 0}
      Scale: {x: 625, y: 579, z: 1}
      IsActive: true
@ -434,7 +436,7 @@
  NumberOfChildren: 0
  Components:
    Transform Component:
-      Translate: {x: 1700, y: 200, z: 0.300000012}
+      Translate: {x: 1700, y: 200, z: 0.699999988}
      Rotate: {x: 0, y: 0, z: 0}
      Scale: {x: 529, y: 670, z: 1}
      IsActive: true
@ -454,7 +456,7 @@
  NumberOfChildren: 0
  Components:
    Transform Component:
-      Translate: {x: -1600, y: -200, z: 0.5}
+      Translate: {x: -1600, y: -200, z: 0.899999976}
      Rotate: {x: 0, y: 0, z: 0}
      Scale: {x: 1299, y: 575, z: 1}
      IsActive: true
@ -474,7 +476,7 @@
  NumberOfChildren: 0
  Components:
    Transform Component:
-      Translate: {x: 500, y: -1275, z: 0.5}
+      Translate: {x: 500, y: -1275, z: 0.899999976}
      Rotate: {x: 0, y: 0, z: 0}
      Scale: {x: 866, y: 483, z: 1}
      IsActive: true
@ -494,7 +496,7 @@
  NumberOfChildren: 0
  Components:
    Transform Component:
-      Translate: {x: 0, y: 0, z: 0.699999988}
+      Translate: {x: 0, y: 0, z: 0.99000001}
      Rotate: {x: 0, y: 0, z: 0}
      Scale: {x: 1920, y: 1080, z: 1}
      IsActive: true
@ -514,7 +516,7 @@
  NumberOfChildren: 0
  Components:
    Transform Component:
-      Translate: {x: 250, y: -500, z: 0.100000001}
+      Translate: {x: 250, y: -500, z: 0.400000006}
      Rotate: {x: 0, y: 0, z: 0}
      Scale: {x: 50, y: 50, z: 50}
      IsActive: true
@ -542,7 +544,7 @@
  NumberOfChildren: 0
  Components:
    Transform Component:
-      Translate: {x: -375, y: 250, z: 0.5}
+      Translate: {x: -375, y: 250, z: 0.899999976}
      Rotate: {x: 0, y: 0, z: 0}
      Scale: {x: 1, y: 1, z: 1}
      IsActive: true
@ -553,7 +555,7 @@
  NumberOfChildren: 0
  Components:
    Transform Component:
-      Translate: {x: 200, y: 200, z: 0.400000006}
+      Translate: {x: 200, y: 200, z: 0.800000012}
      Rotate: {x: 0, y: 0, z: 0}
      Scale: {x: 1, y: 1, z: 1}
      IsActive: true
@ -564,7 +566,7 @@
  NumberOfChildren: 0
  Components:
    Transform Component:
-      Translate: {x: 700, y: 200, z: 0.300000012}
+      Translate: {x: 700, y: 200, z: 0.699999988}
      Rotate: {x: 0, y: 0, z: 0}
      Scale: {x: 1, y: 1, z: 1}
      IsActive: true
@ -575,7 +577,7 @@
  NumberOfChildren: 0
  Components:
    Transform Component:
-      Translate: {x: -225, y: -200, z: 0.200000003}
+      Translate: {x: -225, y: -200, z: 0.600000024}
      Rotate: {x: 0, y: 0, z: 0}
      Scale: {x: 1, y: 1, z: 1}
      IsActive: true
@ -586,8 +588,77 @@
  NumberOfChildren: 0
  Components:
    Transform Component:
-      Translate: {x: 500, y: -275, z: 0.100000001}
+      Translate: {x: 500, y: -275, z: 0.5}
      Rotate: {x: 0, y: 0, z: 0}
      Scale: {x: 1, y: 1, z: 1}
      IsActive: true
-  Scripts: ~
+  Scripts: ~
+- EID: 619
+  Name: LevelTransistionCanvas
+  IsActive: true
+  NumberOfChildren: 2
+  Components:
+    Canvas Component:
+      Canvas Width: 1920
+      Canvas Height: 1080
+      Scale by canvas width: false
+      IsActive: true
+  Scripts:
+    - Type: LevelTransistion
+      Enabled: true
+      logo: 618
+      bg: 617
+      duration: 0.5
+      bgEndPositionX: 3000
+      logoEndPositionX: 3000
+      rotAndScale: false
+      rotationAmt: 360
+      scaleAmt: 631
+- EID: 618
+  Name: LevelTransistionLogo
+  IsActive: true
+  NumberOfChildren: 0
+  Components:
+    Transform Component:
+      Translate: {x: 0, y: 0, z: 0.100000001}
+      Rotate: {x: 0, y: 0, z: 0}
+      Scale: {x: 631, y: 631, z: 1}
+      IsActive: true
+    Renderable Component:
+      Mesh: 141771688
+      Material: 126117259
+      IsActive: true
+    UI Component:
+      Canvas ID: 619
+      Hovered: false
+      Clicked: false
+      IsActive: true
+  Scripts: ~
+- EID: 617
+  Name: LevelTransistionBG
+  IsActive: true
+  NumberOfChildren: 0
+  Components:
+    Transform Component:
+      Translate: {x: 0, y: 0, z: 0.200000003}
+      Rotate: {x: 0, y: 0, z: 0}
+      Scale: {x: 4000, y: 4000, z: 1}
+      IsActive: true
+    Renderable Component:
+      Mesh: 141771688
+      Material: 132131066
+      IsActive: true
+    UI Component:
+      Canvas ID: 619
+      Hovered: false
+      Clicked: false
+      IsActive: true
+  Scripts: ~
+- EID: 616
+  Name: TweenManager
+  IsActive: true
+  NumberOfChildren: 0
+  Components: ~
+  Scripts:
+    - Type: TweenManager
+      Enabled: true
--- a/Assets/Scenes/Environment.shade.shmeta
+++ b/Assets/Scenes/Environment.shade.shmeta
@ -1,3 +0,0 @@
-Name: Environment
-ID: 91553073
-Type: 5
--- a/Assets/Scenes/Level1.shade
+++ b/Assets/Scenes/Level1.shade
--- a/Assets/Scenes/Level2.shade
+++ b/Assets/Scenes/Level2.shade
--- a/Assets/Scenes/Level2_AITest.shade
+++ b/Assets/Scenes/Level2_AITest.shade
--- a/Assets/Scenes/Level2_AITest.shade.shmeta
+++ b/Assets/Scenes/Level2_AITest.shade.shmeta
@ -0,0 +1,3 @@
+Name: Level2_AITest
+ID: 86300248
+Type: 5
--- a/Assets/Scenes/Level3.shade
+++ b/Assets/Scenes/Level3.shade
--- a/Assets/Scenes/M2Scene.shade
+++ b/Assets/Scenes/M2Scene.shade
@ -1,376 +0,0 @@
- EID: 0
-  Name: Camera
-  IsActive: true
-  NumberOfChildren: 0
-  Components:
-    Camera Component:
-      Position: {x: 0, y: 3, z: 8}
-      Pitch: 0
-      Yaw: 0
-      Roll: 0
-      Width: 1920
-      Height: 1080
-      Near: 0.00999999978
-      Far: 10000
-      Perspective: true
-      IsActive: true
-    Light Component:
-      Position: {x: 0, y: 0, z: 0}
-      Type: Directional
-      Direction: {x: 1.79999995, y: 0, z: 1}
-      Color: {x: 0.951541841, y: 0.921719015, z: 0.553319454, w: 1}
-      Layer: 4294967295
-      Strength: 0
-      IsActive: true
-  Scripts: ~
- EID: 7
-  Name: BigBoi
-  IsActive: true
-  NumberOfChildren: 0
-  Components:
-    Transform Component:
-      Translate: {x: 0, y: -16.8647861, z: -14.039052}
-      Rotate: {x: -0, y: 0, z: -0}
-      Scale: {x: 28.1434975, y: 28.1434975, z: 28.1434975}
-      IsActive: true
-    Renderable Component:
-      Mesh: 149697411
-      Material: 126974645
-      IsActive: true
-  Scripts: ~
- EID: 8
-  Name: AmbientLight
-  IsActive: true
-  NumberOfChildren: 0
-  Components:
-    Light Component:
-      Position: {x: 0, y: 0, z: 0}
-      Type: Ambient
-      Direction: {x: 0, y: 0, z: 1}
-      Color: {x: 1, y: 1, z: 1, w: 1}
-      Layer: 4294967295
-      Strength: 0.25
-      IsActive: true
-  Scripts: ~
- EID: 65542
-  Name: Default
-  IsActive: true
-  NumberOfChildren: 0
-  Components:
-    Transform Component:
-      Translate: {x: 2.5, y: 0.5, z: -2.5}
-      Rotate: {x: 0, y: 0, z: 0}
-      Scale: {x: 5, y: 0.5, z: 5}
-      IsActive: true
-    Collider Component:
-      Colliders:
-        - Is Trigger: false
-          Type: Box
-          Half Extents: {x: 1, y: 1, z: 1}
-          Friction: 0.400000006
-          Bounciness: 0
-          Density: 1
-          Position Offset: {x: 0, y: 0, z: 0}
-          Rotation Offset: {x: 0, y: 0, z: 0}
-      IsActive: true
-  Scripts: ~
- EID: 65538
-  Name: Movable
-  IsActive: true
-  NumberOfChildren: 0
-  Components:
-    Transform Component:
-      Translate: {x: 0, y: 4.28833103, z: 0}
-      Rotate: {x: -0, y: 0, z: -0}
-      Scale: {x: 1, y: 0, z: 1}
-      IsActive: true
-    RigidBody Component:
-      Type: Dynamic
-      Drag: 0.00999999978
-      Angular Drag: 0.00999999978
-      Use Gravity: true
-      Interpolate: true
-      Sleeping Enabled: true
-      Freeze Position X: false
-      Freeze Position Y: false
-      Freeze Position Z: false
-      Freeze Rotation X: false
-      Freeze Rotation Y: false
-      Freeze Rotation Z: false
-      IsActive: true
-    Collider Component:
-      Colliders:
-        - Is Trigger: false
-          Type: Box
-          Half Extents: {x: 1, y: 1, z: 1}
-          Friction: 0.400000006
-          Bounciness: 0
-          Density: 1
-          Position Offset: {x: 0, y: 0, z: 0}
-          Rotation Offset: {x: 0, y: 0, z: 0}
-      IsActive: true
-  Scripts: ~
- EID: 65537
-  Name: Default
-  IsActive: true
-  NumberOfChildren: 0
-  Components:
-    Transform Component:
-      Translate: {x: 5.25, y: 2.75, z: 2.5}
-      Rotate: {x: 0, y: 0, z: 1.57079637}
-      Scale: {x: 5, y: 0.5, z: 5}
-      IsActive: true
-    Collider Component:
-      Colliders:
-        - Is Trigger: false
-          Type: Box
-          Half Extents: {x: 1, y: 1, z: 1}
-          Friction: 0.400000006
-          Bounciness: 0
-          Density: 1
-          Position Offset: {x: 0, y: 0, z: 0}
-          Rotation Offset: {x: 0, y: 0, z: 0}
-      IsActive: true
-  Scripts: ~
- EID: 9
-  Name: Default
-  IsActive: true
-  NumberOfChildren: 0
-  Components:
-    Transform Component:
-      Translate: {x: 5.25, y: 2.75, z: -2.5}
-      Rotate: {x: 0, y: 0, z: 1.57079637}
-      Scale: {x: 5, y: 0.5, z: 5}
-      IsActive: true
-    Collider Component:
-      Colliders:
-        - Is Trigger: false
-          Type: Box
-          Half Extents: {x: 1, y: 1, z: 1}
-          Friction: 0.400000006
-          Bounciness: 0
-          Density: 1
-          Position Offset: {x: 0, y: 0, z: 0}
-          Rotation Offset: {x: 0, y: 0, z: 0}
-      IsActive: true
-  Scripts: ~
- EID: 10
-  Name: Default
-  IsActive: true
-  NumberOfChildren: 0
-  Components:
-    Transform Component:
-      Translate: {x: -5.25, y: 2.75, z: 2.5}
-      Rotate: {x: 0, y: 0, z: 1.57079637}
-      Scale: {x: 5, y: 0.5, z: 5}
-      IsActive: true
-    Collider Component:
-      Colliders:
-        - Is Trigger: false
-          Type: Box
-          Half Extents: {x: 1, y: 1, z: 1}
-          Friction: 0.400000006
-          Bounciness: 0
-          Density: 1
-          Position Offset: {x: 0, y: 0, z: 0}
-          Rotation Offset: {x: 0, y: 0, z: 0}
-      IsActive: true
-  Scripts: ~
- EID: 11
-  Name: Default
-  IsActive: true
-  NumberOfChildren: 0
-  Components:
-    Transform Component:
-      Translate: {x: -5.25, y: 2.75, z: -2.5}
-      Rotate: {x: 0, y: 0, z: 1.57079637}
-      Scale: {x: 5, y: 0.5, z: 5}
-      IsActive: true
-    Collider Component:
-      Colliders:
-        - Is Trigger: false
-          Type: Box
-          Half Extents: {x: 1, y: 1, z: 1}
-          Friction: 0.400000006
-          Bounciness: 0
-          Density: 1
-          Position Offset: {x: 0, y: 0, z: 0}
-          Rotation Offset: {x: 0, y: 0, z: 0}
-      IsActive: true
-  Scripts: ~
- EID: 12
-  Name: Default
-  IsActive: true
-  NumberOfChildren: 0
-  Components:
-    Transform Component:
-      Translate: {x: 2.5, y: 2.75, z: 5.25}
-      Rotate: {x: 7.15255737e-07, y: 1.57079566, z: 1.57079589}
-      Scale: {x: 4.99999809, y: 0.499999762, z: 4.99999809}
-      IsActive: true
-    Collider Component:
-      Colliders:
-        - Is Trigger: false
-          Type: Box
-          Half Extents: {x: 1, y: 1, z: 1}
-          Friction: 0.400000006
-          Bounciness: 0
-          Density: 1
-          Position Offset: {x: 0, y: 0, z: 0}
-          Rotation Offset: {x: 0, y: 0, z: 0}
-      IsActive: true
-  Scripts: ~
- EID: 65551
-  Name: Default
-  IsActive: true
-  NumberOfChildren: 0
-  Components:
-    Transform Component:
-      Translate: {x: -2.5, y: 2.75, z: 5.25}
-      Rotate: {x: 7.15255737e-07, y: 1.57079566, z: 1.57079589}
-      Scale: {x: 4.99999809, y: 0.499999762, z: 4.99999809}
-      IsActive: true
-    Collider Component:
-      Colliders:
-        - Is Trigger: false
-          Type: Box
-          Half Extents: {x: 1, y: 1, z: 1}
-          Friction: 0.400000006
-          Bounciness: 0
-          Density: 1
-          Position Offset: {x: 0, y: 0, z: 0}
-          Rotation Offset: {x: 0, y: 0, z: 0}
-      IsActive: true
-  Scripts: ~
- EID: 65550
-  Name: Default
-  IsActive: true
-  NumberOfChildren: 0
-  Components:
-    Transform Component:
-      Translate: {x: -2.5, y: 2.75, z: -5.25}
-      Rotate: {x: 7.15255737e-07, y: 1.57079566, z: 1.57079589}
-      Scale: {x: 4.99999809, y: 0.499999762, z: 4.99999809}
-      IsActive: true
-    Collider Component:
-      Colliders:
-        - Is Trigger: false
-          Type: Box
-          Half Extents: {x: 1, y: 1, z: 1}
-          Friction: 0.400000006
-          Bounciness: 0
-          Density: 1
-          Position Offset: {x: 0, y: 0, z: 0}
-          Rotation Offset: {x: 0, y: 0, z: 0}
-      IsActive: true
-  Scripts: ~
- EID: 65549
-  Name: Default
-  IsActive: true
-  NumberOfChildren: 0
-  Components:
-    Transform Component:
-      Translate: {x: 2.5, y: 2.75, z: -5.25}
-      Rotate: {x: 7.15255737e-07, y: 1.57079566, z: 1.57079589}
-      Scale: {x: 4.99999809, y: 0.499999762, z: 4.99999809}
-      IsActive: true
-    Collider Component:
-      Colliders:
-        - Is Trigger: false
-          Type: Box
-          Half Extents: {x: 1, y: 1, z: 1}
-          Friction: 0.400000006
-          Bounciness: 0
-          Density: 1
-          Position Offset: {x: 0, y: 0, z: 0}
-          Rotation Offset: {x: 0, y: 0, z: 0}
-      IsActive: true
-  Scripts: ~
- EID: 16
-  Name: Default
-  IsActive: true
-  NumberOfChildren: 0
-  Components:
-    Transform Component:
-      Translate: {x: 0, y: 2.5, z: 0}
-      Rotate: {x: 0, y: 0, z: 0}
-      Scale: {x: 2.5, y: 0.5, z: 2.5}
-      IsActive: true
-    Collider Component:
-      Colliders:
-        - Is Trigger: false
-          Type: Box
-          Half Extents: {x: 1, y: 1, z: 1}
-          Friction: 0.400000006
-          Bounciness: 0
-          Density: 1
-          Position Offset: {x: 0, y: 0, z: 0}
-          Rotation Offset: {x: 0, y: 0, z: 0}
-      IsActive: true
-  Scripts: ~
- EID: 5
-  Name: Default
-  IsActive: true
-  NumberOfChildren: 0
-  Components:
-    Transform Component:
-      Translate: {x: 2.5, y: 0.5, z: 2.5}
-      Rotate: {x: 0, y: 0, z: 0}
-      Scale: {x: 5, y: 0.5, z: 5}
-      IsActive: true
-    Collider Component:
-      Colliders:
-        - Is Trigger: false
-          Type: Box
-          Half Extents: {x: 1, y: 1, z: 1}
-          Friction: 0.400000006
-          Bounciness: 0
-          Density: 1
-          Position Offset: {x: 0, y: 0, z: 0}
-          Rotation Offset: {x: 0, y: 0, z: 0}
-      IsActive: true
-  Scripts: ~
- EID: 4
-  Name: Default
-  IsActive: true
-  NumberOfChildren: 0
-  Components:
-    Transform Component:
-      Translate: {x: -2.5, y: 0.5, z: -2.5}
-      Rotate: {x: 0, y: 0, z: 0}
-      Scale: {x: 5, y: 0.5, z: 5}
-      IsActive: true
-    Collider Component:
-      Colliders:
-        - Is Trigger: false
-          Type: Box
-          Half Extents: {x: 1, y: 1, z: 1}
-          Friction: 0.400000006
-          Bounciness: 0
-          Density: 1
-          Position Offset: {x: 0, y: 0, z: 0}
-          Rotation Offset: {x: 0, y: 0, z: 0}
-      IsActive: true
-  Scripts: ~
- EID: 3
-  Name: Default
-  IsActive: true
-  NumberOfChildren: 0
-  Components:
-    Transform Component:
-      Translate: {x: -2.5, y: 0.5, z: 2.5}
-      Rotate: {x: 0, y: 0, z: 0}
-      Scale: {x: 5, y: 0.5, z: 5}
-      IsActive: true
-    Collider Component:
-      Colliders:
-        - Is Trigger: false
-          Type: Box
-          Half Extents: {x: 1, y: 1, z: 1}
-          Friction: 0.400000006
-          Bounciness: 0
-          Density: 1
-          Position Offset: {x: 0, y: 0, z: 0}
-          Rotation Offset: {x: 0, y: 0, z: 0}
-      IsActive: true
-  Scripts: ~
--- a/Assets/Scenes/M2Scene.shade.shmeta
+++ b/Assets/Scenes/M2Scene.shade.shmeta
@ -1,3 +0,0 @@
-Name: M2Scene
-ID: 94283040
-Type: 5
--- a/Assets/Scenes/MainGameWithAI.shade
+++ b/Assets/Scenes/MainGameWithAI.shade
--- a/Assets/Scenes/MainGameWithAI.shade.shmeta
+++ b/Assets/Scenes/MainGameWithAI.shade.shmeta
@ -1,3 +0,0 @@
-Name: MainGameWithAI
-ID: 96052853
-Type: 5
--- a/Assets/Scenes/MainGameWithAIFixed.shade
+++ b/Assets/Scenes/MainGameWithAIFixed.shade
--- a/Assets/Scenes/MainGameWithAIFixed.shade.shmeta
+++ b/Assets/Scenes/MainGameWithAIFixed.shade.shmeta
@ -1,3 +0,0 @@
-Name: MainGameWithAIFixed
-ID: 89830755
-Type: 5
--- a/Assets/Scenes/MainMenu.shade
+++ b/Assets/Scenes/MainMenu.shade
@ -1,3 +1,4 @@
+- NavData: 0
 - EID: 0
  Name: Main Menu Canvas
  IsActive: true
@ -35,9 +36,9 @@
  NumberOfChildren: 0
  Components:
    Transform Component:
-      Translate: {x: -700, y: 350, z: 0.300000012}
+      Translate: {x: 0, y: 100, z: 0.300000012}
      Rotate: {x: 0, y: 0, z: 0}
-      Scale: {x: 355.756439, y: 355.756439, z: 1.18585491}
+      Scale: {x: 631.577454, y: 631.577454, z: 1.24826539}
      IsActive: true
    Renderable Component:
      Mesh: 141771688
@ -54,15 +55,16 @@
      minScale: 1
      maxScale: 1.20000005
      duration: 1.5
+      isActive: true
 - EID: 54
  Name: Main Menu Button Group
  IsActive: true
  NumberOfChildren: 6
  Components:
    Transform Component:
-      Translate: {x: -60, y: 0, z: 0}
+      Translate: {x: 0, y: -400, z: 0}
      Rotate: {x: 0, y: 0, z: 0}
-      Scale: {x: 0.899999976, y: 0.899999976, z: 1}
+      Scale: {x: 0.800000012, y: 0.800000012, z: 1}
      IsActive: true
    UI Component:
      Canvas ID: 0
@ -76,9 +78,9 @@
  NumberOfChildren: 0
  Components:
    Transform Component:
-      Translate: {x: -700, y: 100, z: 0.400000006}
+      Translate: {x: 0, y: 0, z: 0.400000006}
      Rotate: {x: 0, y: 0, z: 0}
-      Scale: {x: 450, y: 100, z: 1}
+      Scale: {x: 400, y: 100, z: 1}
      IsActive: true
    Renderable Component:
      Mesh: 141771688
@ -95,9 +97,6 @@
      Clicked: false
      IsActive: true
  Scripts:
-    - Type: ChangeSceneButton
-      Enabled: true
-      sceneID: 91947920
    - Type: SHADE_Scripting.UI.ButtonFX
      Enabled: true
      onHoverEnterSound: event:/UI/botton_hover
@ -106,15 +105,18 @@
      onReleaseSound: event:/UI/button_fail
      hoverScale: 1.10000002
      clickScale: 0.899999976
+    - Type: SHADE_Scripting.UI.ChangeCanvasButton
+      Enabled: true
+      canvasToActivate: 50
 - EID: 6
  Name: Quit Game Button
  IsActive: true
  NumberOfChildren: 0
  Components:
    Transform Component:
-      Translate: {x: -700, y: -525, z: 0.400000006}
+      Translate: {x: 900, y: 0, z: 0.400000006}
      Rotate: {x: 0, y: 0, z: 0}
-      Scale: {x: 450, y: 100, z: 1}
+      Scale: {x: 400, y: 100, z: 1}
      IsActive: true
    Renderable Component:
      Mesh: 141771688
@ -143,28 +145,28 @@
      clickScale: 0.899999976
 - EID: 7
  Name: Level Select Button
-  IsActive: true
+  IsActive: false
  NumberOfChildren: 0
  Components:
    Transform Component:
-      Translate: {x: -700, y: -25, z: 0.400000006}
+      Translate: {x: 0, y: 0, z: 0.400000006}
      Rotate: {x: 0, y: 0, z: 0}
-      Scale: {x: 450, y: 100, z: 1}
-      IsActive: true
+      Scale: {x: 400, y: 100, z: 1}
+      IsActive: false
    Renderable Component:
      Mesh: 141771688
      Material: 129340704
-      IsActive: true
+      IsActive: false
    Button Component:
      Default Texture: 66852025
      Hovered Texture: 65992947
      Clicked Texture: 57197441
-      IsActive: true
+      IsActive: false
    UI Component:
      Canvas ID: 0
      Hovered: false
      Clicked: false
-      IsActive: true
+      IsActive: false
  Scripts:
    - Type: SHADE_Scripting.UI.ButtonFX
      Enabled: true
@ -183,9 +185,9 @@
  NumberOfChildren: 0
  Components:
    Transform Component:
-      Translate: {x: -700, y: -150, z: 0.400000006}
+      Translate: {x: -450, y: 0, z: 0.400000006}
      Rotate: {x: 0, y: 0, z: 0}
-      Scale: {x: 450, y: 100, z: 1}
+      Scale: {x: 400, y: 100, z: 1}
      IsActive: true
    Renderable Component:
      Mesh: 141771688
@ -219,9 +221,9 @@
  NumberOfChildren: 0
  Components:
    Transform Component:
-      Translate: {x: -700, y: -275, z: 0.400000006}
+      Translate: {x: -900, y: 0, z: 0.400000006}
      Rotate: {x: 0, y: 0, z: 0}
-      Scale: {x: 450, y: 100, z: 1}
+      Scale: {x: 400, y: 100, z: 1}
      IsActive: true
    Renderable Component:
      Mesh: 141771688
@ -255,9 +257,9 @@
  NumberOfChildren: 0
  Components:
    Transform Component:
-      Translate: {x: -700, y: -400, z: 0.400000006}
+      Translate: {x: 450, y: 0, z: 0.400000006}
      Rotate: {x: 0, y: 0, z: 0}
-      Scale: {x: 450, y: 100, z: 1}
+      Scale: {x: 389.627228, y: 97.4068069, z: 0.974068105}
      IsActive: true
    Renderable Component:
      Mesh: 141771688
@ -343,7 +345,7 @@
 - EID: 13
  Name: How To Play Canvas
  IsActive: false
-  NumberOfChildren: 5
+  NumberOfChildren: 6
  Components:
    Canvas Component:
      Canvas Width: 1920
@ -479,17 +481,17 @@
  Components:
    Transform Component:
      Translate: {x: -800, y: 450, z: 0}
-      Rotate: {x: 0, y: 0, z: 3.14159274}
-      Scale: {x: 100, y: 100, z: 1}
+      Rotate: {x: 0, y: 0, z: 0}
+      Scale: {x: 273, y: 100, z: 1}
      IsActive: true
    Renderable Component:
      Mesh: 141771688
      Material: 129340704
      IsActive: true
    Button Component:
-      Default Texture: 55358401
-      Hovered Texture: 59400474
-      Clicked Texture: 52333376
+      Default Texture: 59813125
+      Hovered Texture: 59813125
+      Clicked Texture: 59813125
      IsActive: true
    UI Component:
      Canvas ID: 13
@ -508,10 +510,32 @@
      onReleaseSound: event:/UI/button_fail
      hoverScale: 1.10000002
      clickScale: 0.899999976
+- EID: 444
+  Name: SubMenuBackGround
+  IsActive: true
+  NumberOfChildren: 0
+  Components:
+    Transform Component:
+      Translate: {x: 0, y: 0, z: 2}
+      Rotate: {x: 0, y: 0, z: 0}
+      Scale: {x: 1920, y: 1080, z: 1}
+      IsActive: true
+    Renderable Component:
+      Mesh: 141771688
+      Material: 130823048
+      IsActive: true
+    UI Component:
+      Canvas ID: 13
+      Hovered: false
+      Clicked: false
+      IsActive: true
+  Scripts:
+    - Type: SHADE_Scripting.UI.FadeInOnActive
+      Enabled: true
 - EID: 19
  Name: Options Canvas
  IsActive: false
-  NumberOfChildren: 11
+  NumberOfChildren: 12
  Components:
    Canvas Component:
      Canvas Width: 1920
@ -525,7 +549,6 @@
      sfxVolSlider: 30
      bgmVolSlider: 31
      fovSlider: 37
-      sensitivitySlider: 38
 - EID: 20
  Name: BackGround
  IsActive: true
@ -553,17 +576,17 @@
  Components:
    Transform Component:
      Translate: {x: -800, y: 450, z: 0}
-      Rotate: {x: 0, y: 0, z: 3.14159274}
-      Scale: {x: 100, y: 100, z: 1}
+      Rotate: {x: 0, y: 0, z: 0}
+      Scale: {x: 273, y: 100, z: 1}
      IsActive: true
    Renderable Component:
      Mesh: 141771688
      Material: 129340704
      IsActive: true
    Button Component:
-      Default Texture: 55358401
-      Hovered Texture: 59400474
-      Clicked Texture: 52333376
+      Default Texture: 59813125
+      Hovered Texture: 59813125
+      Clicked Texture: 59813125
      IsActive: true
    UI Component:
      Canvas ID: 19
@ -727,16 +750,16 @@
 - EID: 29
  Name: Master Volume Slider
  IsActive: true
-  NumberOfChildren: 0
+  NumberOfChildren: 1
  Components:
    Transform Component:
      Translate: {x: 0, y: 0, z: 0}
      Rotate: {x: 0, y: 0, z: 0}
-      Scale: {x: 1000, y: 75, z: 1}
+      Scale: {x: 1004, y: 46, z: 1}
      IsActive: true
    Renderable Component:
      Mesh: 141771688
-      Material: 128676209
+      Material: 127128823
      IsActive: true
    Slider Component:
      Slider Value: 1
@ -748,20 +771,44 @@
      Hovered: false
      Clicked: false
      IsActive: true
+  Scripts:
+    - Type: SHADE_Scripting.UI.SliderFX
+      Enabled: true
+      onClickSound: event:/UI/button_success
+      onReleaseSound: event:/UI/button_fail
+- EID: 437
+  Name: Slider BG
+  IsActive: true
+  NumberOfChildren: 0
+  Components:
+    Transform Component:
+      Translate: {x: 0, y: 0, z: 0.100000001}
+      Rotate: {x: 0, y: 0, z: 0}
+      Scale: {x: 1.01992035, y: 1.39130437, z: 1}
+      IsActive: true
+    Renderable Component:
+      Mesh: 141771688
+      Material: 117587364
+      IsActive: true
+    UI Component:
+      Canvas ID: 19
+      Hovered: false
+      Clicked: false
+      IsActive: true
  Scripts: ~
 - EID: 30
  Name: SFX Volume Slider
  IsActive: true
-  NumberOfChildren: 0
+  NumberOfChildren: 1
  Components:
    Transform Component:
      Translate: {x: 0, y: -100, z: 0}
      Rotate: {x: 0, y: 0, z: 0}
-      Scale: {x: 1000, y: 75, z: 1}
+      Scale: {x: 1004, y: 46, z: 1}
      IsActive: true
    Renderable Component:
      Mesh: 141771688
-      Material: 128676209
+      Material: 122820018
      IsActive: true
    Slider Component:
      Slider Value: 1
@ -773,20 +820,44 @@
      Hovered: false
      Clicked: false
      IsActive: true
-  Scripts: ~
- EID: 31
-  Name: BGM Volume Slider
+  Scripts:
+    - Type: SHADE_Scripting.UI.SliderFX
+      Enabled: true
+      onClickSound: event:/UI/button_success
+      onReleaseSound: event:/UI/button_fail
+- EID: 436
+  Name: Slider BG
  IsActive: true
  NumberOfChildren: 0
  Components:
    Transform Component:
-      Translate: {x: 0, y: -200, z: 0}
+      Translate: {x: 0, y: 0, z: 0.100000001}
      Rotate: {x: 0, y: 0, z: 0}
-      Scale: {x: 1000, y: 75, z: 1}
+      Scale: {x: 1.01992035, y: 1.39130437, z: 1}
      IsActive: true
    Renderable Component:
      Mesh: 141771688
-      Material: 128676209
+      Material: 117587364
+      IsActive: true
+    UI Component:
+      Canvas ID: 19
+      Hovered: false
+      Clicked: false
+      IsActive: true
+  Scripts: ~
+- EID: 31
+  Name: BGM Volume Slider
+  IsActive: true
+  NumberOfChildren: 1
+  Components:
+    Transform Component:
+      Translate: {x: 0, y: -200, z: 0}
+      Rotate: {x: 0, y: 0, z: 0}
+      Scale: {x: 1004, y: 46, z: 1}
+      IsActive: true
+    Renderable Component:
+      Mesh: 141771688
+      Material: 129354037
      IsActive: true
    Slider Component:
      Slider Value: 1
@ -798,6 +869,30 @@
      Hovered: false
      Clicked: false
      IsActive: true
+  Scripts:
+    - Type: SHADE_Scripting.UI.SliderFX
+      Enabled: true
+      onClickSound: event:/UI/button_success
+      onReleaseSound: event:/UI/button_fail
+- EID: 435
+  Name: Slider BG
+  IsActive: true
+  NumberOfChildren: 0
+  Components:
+    Transform Component:
+      Translate: {x: 0, y: 0, z: 0.100000001}
+      Rotate: {x: 0, y: 0, z: 0}
+      Scale: {x: 1.01992035, y: 1.39130437, z: 1}
+      IsActive: true
+    Renderable Component:
+      Mesh: 141771688
+      Material: 117587364
+      IsActive: true
+    UI Component:
+      Canvas ID: 19
+      Hovered: false
+      Clicked: false
+      IsActive: true
  Scripts: ~
 - EID: 32
  Name: Camera Title Text
@ -824,7 +919,7 @@
 - EID: 33
  Name: Camera Text Group
  IsActive: true
-  NumberOfChildren: 4
+  NumberOfChildren: 3
  Components:
    Transform Component:
      Translate: {x: -900, y: -220, z: 0}
@ -859,76 +954,54 @@
      Clicked: false
      IsActive: true
  Scripts: ~
- EID: 35
-  Name: Sensitivity Text
-  IsActive: true
-  NumberOfChildren: 0
-  Components:
-    Transform Component:
-      Translate: {x: 0, y: -100, z: 0.100000001}
-      Rotate: {x: 0, y: 0, z: 0}
-      Scale: {x: 75, y: 75, z: 1}
-      IsActive: true
-    Text Renderer Component:
-      Text: Sensitivity
-      Font: 174412429
-      Color: {x: 0, y: 0, z: 0, w: 1}
-      Text Size: {x: 1, y: 1, z: 1}
-      IsActive: true
-    UI Component:
-      Canvas ID: 19
-      Hovered: false
-      Clicked: false
-      IsActive: true
-  Scripts: ~
 - EID: 449
  Name: Camera Invert X Text
-  IsActive: false
+  IsActive: true
  NumberOfChildren: 0
  Components:
    Transform Component:
      Translate: {x: 0, y: -200, z: 0.100000001}
      Rotate: {x: 0, y: 0, z: 0}
      Scale: {x: 75, y: 75, z: 1}
-      IsActive: false
+      IsActive: true
    Text Renderer Component:
      Text: "Camera Invert    X:"
      Font: 174412429
      Color: {x: 0, y: 0, z: 0, w: 1}
      Text Size: {x: 1, y: 1, z: 1}
-      IsActive: false
+      IsActive: true
    UI Component:
      Canvas ID: 19
      Hovered: false
      Clicked: false
-      IsActive: false
+      IsActive: true
  Scripts: ~
 - EID: 447
  Name: Camera Invert Y Text
-  IsActive: false
+  IsActive: true
  NumberOfChildren: 0
  Components:
    Transform Component:
      Translate: {x: 800, y: -200, z: 0.100000001}
      Rotate: {x: 0, y: 0, z: 0}
      Scale: {x: 75, y: 75, z: 1}
-      IsActive: false
+      IsActive: true
    Text Renderer Component:
      Text: "Y:"
      Font: 174412429
      Color: {x: 0, y: 0, z: 0, w: 1}
      Text Size: {x: 1, y: 1, z: 1}
-      IsActive: false
+      IsActive: true
    UI Component:
      Canvas ID: 19
      Hovered: false
      Clicked: false
-      IsActive: false
+      IsActive: true
  Scripts: ~
 - EID: 36
  Name: Camera Slider Group
  IsActive: true
-  NumberOfChildren: 4
+  NumberOfChildren: 3
  Components:
    Transform Component:
      Translate: {x: 100, y: -200, z: 0}
@ -944,20 +1017,20 @@
 - EID: 37
  Name: FOV Slider
  IsActive: true
-  NumberOfChildren: 0
+  NumberOfChildren: 1
  Components:
    Transform Component:
      Translate: {x: 0, y: 0, z: 0}
      Rotate: {x: 0, y: 0, z: 0}
-      Scale: {x: 1000, y: 75, z: 1}
+      Scale: {x: 1004, y: 46, z: 1}
      IsActive: true
    Renderable Component:
      Mesh: 141771688
-      Material: 128676209
+      Material: 117651669
      IsActive: true
    Slider Component:
-      Slider Value: 1
-      Min Value: 45
+      Slider Value: 0.889483869
+      Min Value: 30
      Max Value: 120
      IsActive: true
    UI Component:
@ -965,25 +1038,24 @@
      Hovered: false
      Clicked: false
      IsActive: true
-  Scripts: ~
- EID: 38
-  Name: Sensitivity Slider
+  Scripts:
+    - Type: SHADE_Scripting.UI.SliderFX
+      Enabled: true
+      onClickSound: event:/UI/button_success
+      onReleaseSound: event:/UI/button_fail
+- EID: 434
+  Name: Slider BG
  IsActive: true
  NumberOfChildren: 0
  Components:
    Transform Component:
-      Translate: {x: 0, y: -100, z: 0}
+      Translate: {x: 0, y: 0, z: 0.100000001}
      Rotate: {x: 0, y: 0, z: 0}
-      Scale: {x: 1000, y: 75, z: 1}
+      Scale: {x: 1.01992035, y: 1.39130437, z: 1}
      IsActive: true
    Renderable Component:
      Mesh: 141771688
-      Material: 128676209
-      IsActive: true
-    Slider Component:
-      Slider Value: 1
-      Min Value: 0
-      Max Value: 100
+      Material: 117587364
      IsActive: true
    UI Component:
      Canvas ID: 19
@ -993,54 +1065,78 @@
  Scripts: ~
 - EID: 448
  Name: Invert X Toggle Button
-  IsActive: false
+  IsActive: true
  NumberOfChildren: 0
  Components:
    Transform Component:
      Translate: {x: -300, y: -200, z: 0}
      Rotate: {x: 0, y: 0, z: 0}
-      Scale: {x: 75, y: 75, z: 1}
-      IsActive: false
+      Scale: {x: 150, y: 150, z: 1}
+      IsActive: true
    Renderable Component:
      Mesh: 141771688
      Material: 129340704
-      IsActive: false
+      IsActive: true
    Toggle Button Component:
-      Non Toggled Texture: 55358401
-      Toggled Texture: 52333376
+      Non Toggled Texture: 50439604
+      Toggled Texture: 64389107
      Value: false
-      IsActive: false
+      IsActive: true
    UI Component:
      Canvas ID: 19
      Hovered: false
      Clicked: false
-      IsActive: false
-  Scripts: ~
+      IsActive: true
+  Scripts:
+    - Type: InverseCamera
+      Enabled: true
+      inverseX: true
+      inverseY: false
+    - Type: SHADE_Scripting.UI.ButtonFX
+      Enabled: true
+      onHoverEnterSound: event:/UI/botton_hover
+      onHoverExitSound: Empty
+      onClickSound: event:/UI/button_success
+      onReleaseSound: event:/UI/button_fail
+      hoverScale: 1.25
+      clickScale: 0.899999976
 - EID: 445
  Name: Invert Y Toggle Button
-  IsActive: false
+  IsActive: true
  NumberOfChildren: 0
  Components:
    Transform Component:
      Translate: {x: -50, y: -200, z: 0}
      Rotate: {x: 0, y: 0, z: 0}
-      Scale: {x: 75, y: 75, z: 1}
-      IsActive: false
+      Scale: {x: 150, y: 150, z: 1}
+      IsActive: true
    Renderable Component:
      Mesh: 141771688
      Material: 129340704
-      IsActive: false
+      IsActive: true
    Toggle Button Component:
-      Non Toggled Texture: 55358401
-      Toggled Texture: 52333376
+      Non Toggled Texture: 50439604
+      Toggled Texture: 64389107
      Value: false
-      IsActive: false
+      IsActive: true
    UI Component:
      Canvas ID: 19
      Hovered: false
      Clicked: false
-      IsActive: false
-  Scripts: ~
+      IsActive: true
+  Scripts:
+    - Type: InverseCamera
+      Enabled: true
+      inverseX: false
+      inverseY: true
+    - Type: SHADE_Scripting.UI.ButtonFX
+      Enabled: true
+      onHoverEnterSound: event:/UI/botton_hover
+      onHoverExitSound: Empty
+      onClickSound: event:/UI/button_success
+      onReleaseSound: event:/UI/button_fail
+      hoverScale: 1.25
+      clickScale: 0.899999976
 - EID: 39
  Name: Audio Slider Text Group
  IsActive: true
@ -1135,7 +1231,7 @@
 - EID: 43
  Name: Camera Slider Text Group
  IsActive: true
-  NumberOfChildren: 2
+  NumberOfChildren: 1
  Components:
    Transform Component:
      Translate: {x: 700, y: -225, z: -0.5}
@ -1159,7 +1255,7 @@
      Scale: {x: 75, y: 75, z: 1}
      IsActive: true
    Text Renderer Component:
-      Text: 100
+      Text: 60
      Font: 174412429
      Color: {x: 0, y: 0, z: 0, w: 1}
      Text Size: {x: 1, y: 1, z: 1}
@ -1173,21 +1269,19 @@
    - Type: SHADE_Scripting.UI.SliderText
      Enabled: true
      sliderObj: 37
- EID: 45
-  Name: Sensitivity Slider Text
+- EID: 443
+  Name: SubMenuBackGround
  IsActive: true
  NumberOfChildren: 0
  Components:
    Transform Component:
-      Translate: {x: 0, y: -100, z: 1}
+      Translate: {x: 0, y: 0, z: 1}
      Rotate: {x: 0, y: 0, z: 0}
-      Scale: {x: 75, y: 75, z: 1}
+      Scale: {x: 1920, y: 1080, z: 1}
      IsActive: true
-    Text Renderer Component:
-      Text: 100
-      Font: 174412429
-      Color: {x: 0, y: 0, z: 0, w: 1}
-      Text Size: {x: 1, y: 1, z: 1}
+    Renderable Component:
+      Mesh: 141771688
+      Material: 130823048
      IsActive: true
    UI Component:
      Canvas ID: 19
@ -1195,9 +1289,8 @@
      Clicked: false
      IsActive: true
  Scripts:
-    - Type: SHADE_Scripting.UI.SliderText
+    - Type: SHADE_Scripting.UI.FadeInOnActive
      Enabled: true
-      sliderObj: 38
 - EID: 46
  Name: Credits Canvas
  IsActive: false
@ -1231,8 +1324,8 @@
  Scripts:
    - Type: SHADE_Scripting.UI.ScrollingCredits
      Enabled: true
-      endY: 4000
-      duration: 20
+      endY: 4500
+      duration: 32
 - EID: 48
  Name: BackButton
  IsActive: true
@ -1240,17 +1333,17 @@
  Components:
    Transform Component:
      Translate: {x: -800, y: 450, z: 0}
-      Rotate: {x: 0, y: 0, z: 3.14159274}
-      Scale: {x: 100, y: 100, z: 1}
+      Rotate: {x: 0, y: 0, z: 0}
+      Scale: {x: 273, y: 100, z: 1}
      IsActive: true
    Renderable Component:
      Mesh: 141771688
      Material: 129340704
      IsActive: true
    Button Component:
-      Default Texture: 55358401
-      Hovered Texture: 59400474
-      Clicked Texture: 52333376
+      Default Texture: 59813125
+      Hovered Texture: 59813125
+      Clicked Texture: 59813125
      IsActive: true
    UI Component:
      Canvas ID: 46
@ -1314,7 +1407,7 @@
 - EID: 50
  Name: Level Select Canvas
  IsActive: false
-  NumberOfChildren: 3
+  NumberOfChildren: 5
  Components:
    Canvas Component:
      Canvas Width: 1920
@ -1348,18 +1441,18 @@
  NumberOfChildren: 0
  Components:
    Transform Component:
-      Translate: {x: -800, y: 450, z: 0}
-      Rotate: {x: 0, y: 0, z: 3.14159274}
-      Scale: {x: 100, y: 100, z: 1}
+      Translate: {x: -800, y: 450, z: 0.300000012}
+      Rotate: {x: 0, y: 0, z: 0}
+      Scale: {x: 273, y: 100, z: 1}
      IsActive: true
    Renderable Component:
      Mesh: 141771688
      Material: 129340704
      IsActive: true
    Button Component:
-      Default Texture: 55358401
-      Hovered Texture: 59400474
-      Clicked Texture: 52333376
+      Default Texture: 59813125
+      Hovered Texture: 59813125
+      Clicked Texture: 59813125
      IsActive: true
    UI Component:
      Canvas ID: 50
@ -1384,7 +1477,7 @@
  NumberOfChildren: 0
  Components:
    Transform Component:
-      Translate: {x: -150, y: 400, z: 0.100000001}
+      Translate: {x: -250, y: 400, z: 0.300000012}
      Rotate: {x: 0, y: 0, z: 0}
      Scale: {x: 100, y: 100, z: 1}
      IsActive: true
@ -1400,6 +1493,155 @@
      Clicked: false
      IsActive: true
  Scripts: ~
+- EID: 442
+  Name: SubMenuBackGround
+  IsActive: true
+  NumberOfChildren: 0
+  Components:
+    Transform Component:
+      Translate: {x: 0, y: 0, z: 0.5}
+      Rotate: {x: 0, y: 0, z: 0}
+      Scale: {x: 1920, y: 1080, z: 1}
+      IsActive: true
+    Renderable Component:
+      Mesh: 141771688
+      Material: 130823048
+      IsActive: true
+    UI Component:
+      Canvas ID: 50
+      Hovered: false
+      Clicked: false
+      IsActive: true
+  Scripts:
+    - Type: SHADE_Scripting.UI.FadeInOnActive
+      Enabled: true
+- EID: 441
+  Name: Level Select Buttons
+  IsActive: true
+  NumberOfChildren: 3
+  Components:
+    Transform Component:
+      Translate: {x: 0, y: -75, z: 0.100000001}
+      Rotate: {x: 0, y: 0, z: 0}
+      Scale: {x: 1, y: 1, z: 1}
+      IsActive: true
+    UI Component:
+      Canvas ID: 50
+      Hovered: false
+      Clicked: false
+      IsActive: true
+  Scripts: ~
+- EID: 440
+  Name: Level 1 Button
+  IsActive: true
+  NumberOfChildren: 0
+  Components:
+    Transform Component:
+      Translate: {x: -600, y: 0, z: 0.300000012}
+      Rotate: {x: 0, y: 0, z: 0}
+      Scale: {x: 345, y: 800, z: 1}
+      IsActive: true
+    Renderable Component:
+      Mesh: 141771688
+      Material: 129340704
+      IsActive: true
+    Button Component:
+      Default Texture: 55897117
+      Hovered Texture: 56658801
+      Clicked Texture: 58281309
+      IsActive: true
+    UI Component:
+      Canvas ID: 50
+      Hovered: false
+      Clicked: false
+      IsActive: true
+  Scripts:
+    - Type: ChangeSceneButton
+      Enabled: true
+      sceneID: 91947920
+      levelTransistion: 433
+    - Type: SHADE_Scripting.UI.ButtonFX
+      Enabled: true
+      onHoverEnterSound: event:/UI/botton_hover
+      onHoverExitSound: Empty
+      onClickSound: event:/UI/button_success
+      onReleaseSound: event:/UI/button_fail
+      hoverScale: 1.10000002
+      clickScale: 0.899999976
+- EID: 439
+  Name: Level 2 Button
+  IsActive: true
+  NumberOfChildren: 0
+  Components:
+    Transform Component:
+      Translate: {x: 0, y: 0, z: 0.300000012}
+      Rotate: {x: 0, y: 0, z: 0}
+      Scale: {x: 345, y: 800, z: 1}
+      IsActive: true
+    Renderable Component:
+      Mesh: 141771688
+      Material: 129340704
+      IsActive: true
+    Button Component:
+      Default Texture: 52151774
+      Hovered Texture: 66730012
+      Clicked Texture: 59730316
+      IsActive: true
+    UI Component:
+      Canvas ID: 50
+      Hovered: false
+      Clicked: false
+      IsActive: true
+  Scripts:
+    - Type: ChangeSceneButton
+      Enabled: true
+      sceneID: 86098106
+      levelTransistion: 433
+    - Type: SHADE_Scripting.UI.ButtonFX
+      Enabled: true
+      onHoverEnterSound: event:/UI/botton_hover
+      onHoverExitSound: Empty
+      onClickSound: event:/UI/button_success
+      onReleaseSound: event:/UI/button_fail
+      hoverScale: 1.10000002
+      clickScale: 0.899999976
+- EID: 438
+  Name: Level 3 Button
+  IsActive: true
+  NumberOfChildren: 0
+  Components:
+    Transform Component:
+      Translate: {x: 600, y: 0, z: 0.300000012}
+      Rotate: {x: 0, y: 0, z: 0}
+      Scale: {x: 345, y: 800, z: 1}
+      IsActive: true
+    Renderable Component:
+      Mesh: 141771688
+      Material: 129340704
+      IsActive: true
+    Button Component:
+      Default Texture: 51704639
+      Hovered Texture: 66852283
+      Clicked Texture: 53081657
+      IsActive: true
+    UI Component:
+      Canvas ID: 50
+      Hovered: false
+      Clicked: false
+      IsActive: true
+  Scripts:
+    - Type: ChangeSceneButton
+      Enabled: true
+      sceneID: 88928066
+      levelTransistion: 433
+    - Type: SHADE_Scripting.UI.ButtonFX
+      Enabled: true
+      onHoverEnterSound: event:/UI/botton_hover
+      onHoverExitSound: Empty
+      onClickSound: event:/UI/button_success
+      onReleaseSound: event:/UI/button_fail
+      hoverScale: 1.10000002
+      clickScale: 0.899999976
 - EID: 450
  Name: TransitionCanvas
  IsActive: true
@ -1433,6 +1675,67 @@
  Scripts:
    - Type: SHADE_Scripting.UI.SceneFadeInOut
      Enabled: true
-      alphaValue: 1
+      alphaValue: 0
      fadeInTime: 0.5
-      fadeOutTime: 0.5
+      fadeOutTime: 0.5
+- EID: 433
+  Name: LevelTransistionCanvas
+  IsActive: false
+  NumberOfChildren: 2
+  Components:
+    Canvas Component:
+      Canvas Width: 1920
+      Canvas Height: 1080
+      Scale by canvas width: false
+      IsActive: false
+  Scripts:
+    - Type: LevelTransistion
+      Enabled: true
+      logo: 431
+      bg: 432
+      duration: 0.800000012
+      bgEndPositionX: 0
+      logoEndPositionX: 0
+      rotAndScale: true
+      rotationAmt: 360
+      scaleAmt: 631
+- EID: 431
+  Name: LevelTransistionLogo
+  IsActive: true
+  NumberOfChildren: 0
+  Components:
+    Transform Component:
+      Translate: {x: 0, y: 0, z: 0.100000001}
+      Rotate: {x: 0, y: 0, z: 0}
+      Scale: {x: 0, y: 0, z: 1}
+      IsActive: true
+    Renderable Component:
+      Mesh: 141771688
+      Material: 126117259
+      IsActive: true
+    UI Component:
+      Canvas ID: 433
+      Hovered: false
+      Clicked: false
+      IsActive: true
+  Scripts: ~
+- EID: 432
+  Name: LevelTransistionBG
+  IsActive: true
+  NumberOfChildren: 0
+  Components:
+    Transform Component:
+      Translate: {x: -2500, y: 0, z: 0.200000003}
+      Rotate: {x: 0, y: 0, z: 0}
+      Scale: {x: 4000, y: 4000, z: 1}
+      IsActive: true
+    Renderable Component:
+      Mesh: 141771688
+      Material: 132131066
+      IsActive: true
+    UI Component:
+      Canvas ID: 433
+      Hovered: false
+      Clicked: false
+      IsActive: true
+  Scripts: ~
--- a/Assets/Scenes/MeshImport.shade
+++ b/Assets/Scenes/MeshImport.shade
@ -1,74 +0,0 @@
- EID: 0
-  Name: Mesh_Homeowner
-  IsActive: true
-  NumberOfChildren: 0
-  Components:
-    Transform Component:
-      Translate: {x: 0, y: 0, z: -1}
-      Rotate: {x: -0, y: 0, z: -0}
-      Scale: {x: 1, y: 1, z: 1}
-      IsActive: true
-    Renderable Component:
-      Mesh: 140697366
-      Material: 129495479
-      IsActive: true
-  Scripts: ~
- EID: 1
-  Name: Light_Ambient
-  IsActive: true
-  NumberOfChildren: 0
-  Components:
-    Light Component:
-      Position: {x: 0, y: 0, z: 0}
-      Type: Ambient
-      Direction: {x: 0, y: 0, z: 1}
-      Color: {x: 1, y: 1, z: 1, w: 1}
-      Layer: 4294967295
-      Strength: 1
-      IsActive: true
-  Scripts: ~
- EID: 2
-  Name: Mesh_Apple
-  IsActive: true
-  NumberOfChildren: 0
-  Components:
-    Transform Component:
-      Translate: {x: 0, y: 0, z: 0}
-      Rotate: {x: 0, y: 0, z: 0}
-      Scale: {x: 1, y: 1, z: 1}
-      IsActive: true
-    Renderable Component:
-      Mesh: 144128170
-      Material: 131956078
-      IsActive: true
-  Scripts: ~
- EID: 3
-  Name: Mesh_Cheese
-  IsActive: true
-  NumberOfChildren: 0
-  Components:
-    Transform Component:
-      Translate: {x: 2.5, y: 0, z: 0}
-      Rotate: {x: -0, y: 0, z: -0}
-      Scale: {x: 1, y: 1, z: 1}
-      IsActive: true
-    Renderable Component:
-      Mesh: 141841143
-      Material: 131956078
-      IsActive: true
-  Scripts: ~
- EID: 4
-  Name: Mesh_Meat
-  IsActive: true
-  NumberOfChildren: 0
-  Components:
-    Transform Component:
-      Translate: {x: 1, y: 0, z: 0}
-      Rotate: {x: -0, y: 0, z: -0}
-      Scale: {x: 1, y: 1, z: 1}
-      IsActive: true
-    Renderable Component:
-      Mesh: 136892700
-      Material: 131956078
-      IsActive: true
-  Scripts: ~
--- a/Assets/Scenes/MeshImport.shade.shmeta
+++ b/Assets/Scenes/MeshImport.shade.shmeta
@ -1,3 +0,0 @@
-Name: MeshImport
-ID: 95609584
-Type: 5
--- a/Assets/Scenes/NavigationTest.shade
+++ b/Assets/Scenes/NavigationTest.shade
@ -0,0 +1,320 @@
+- EID: 0
+  Name: Camera
+  IsActive: true
+  NumberOfChildren: 0
+  Components:
+    Transform Component:
+      Translate: {x: 0, y: 10.2736483, z: 0}
+      Rotate: {x: -1.48352981, y: 1.5, z: 0.5}
+      Scale: {x: 1, y: 1, z: 1}
+      IsActive: true
+  Scripts: ~
+- EID: 1
+  Name: Floor
+  IsActive: true
+  NumberOfChildren: 0
+  Components:
+    Transform Component:
+      Translate: {x: 0, y: 0, z: 0}
+      Rotate: {x: -0, y: 0, z: -0}
+      Scale: {x: 12.8000002, y: 1, z: 12.8000002}
+      IsActive: true
+    Renderable Component:
+      Mesh: 142686872
+      Material: 126223465
+      IsActive: true
+  Scripts: ~
+- EID: 2
+  Name: Light
+  IsActive: true
+  NumberOfChildren: 0
+  Components:
+    Light Component:
+      Position: {x: 0, y: 0, z: 0}
+      Type: Directional
+      Direction: {x: 0, y: -1, z: 1}
+      Color: {x: 1, y: 1, z: 1, w: 1}
+      Layer: 4294967295
+      Strength: 0
+      Casting Shadows: false
+      IsActive: true
+  Scripts: ~
+- EID: 3
+  Name: Wall
+  IsActive: true
+  NumberOfChildren: 0
+  Components:
+    Transform Component:
+      Translate: {x: 11, y: 0, z: 0}
+      Rotate: {x: -0, y: 1.57079637, z: -0}
+      Scale: {x: 10.6225176, y: 1, z: 1}
+      IsActive: true
+    Renderable Component:
+      Mesh: 142652392
+      Material: 126223465
+      IsActive: true
+    Collider Component:
+      Colliders:
+        - Is Trigger: false
+          Collision Tag: 0
+          Type: Box
+          Half Extents: {x: 2.5, y: 1, z: 1.60000002}
+          Friction: 0.400000006
+          Bounciness: 0
+          Density: 1
+          Position Offset: {x: 0, y: 0, z: 0}
+          Rotation Offset: {x: 0, y: 0, z: 0}
+      IsActive: true
+  Scripts: ~
+- EID: 4
+  Name: Wall
+  IsActive: true
+  NumberOfChildren: 0
+  Components:
+    Transform Component:
+      Translate: {x: 0, y: 0, z: -11.2958097}
+      Rotate: {x: -0, y: 0, z: -0}
+      Scale: {x: 10.6225176, y: 1, z: 1}
+      IsActive: true
+    Renderable Component:
+      Mesh: 142652392
+      Material: 126223465
+      IsActive: true
+    Collider Component:
+      Colliders:
+        - Is Trigger: false
+          Collision Tag: 0
+          Type: Box
+          Half Extents: {x: 2.5, y: 1, z: 1.60000002}
+          Friction: 0.400000006
+          Bounciness: 0
+          Density: 1
+          Position Offset: {x: 0, y: 0, z: 0}
+          Rotation Offset: {x: 0, y: 0, z: 0}
+      IsActive: true
+  Scripts: ~
+- EID: 5
+  Name: Wall
+  IsActive: true
+  NumberOfChildren: 0
+  Components:
+    Transform Component:
+      Translate: {x: 0, y: 0, z: 11}
+      Rotate: {x: -0, y: 0, z: -0}
+      Scale: {x: 10.6225176, y: 1, z: 1}
+      IsActive: true
+    Renderable Component:
+      Mesh: 142652392
+      Material: 126223465
+      IsActive: true
+    Collider Component:
+      Colliders:
+        - Is Trigger: false
+          Collision Tag: 0
+          Type: Box
+          Half Extents: {x: 2.5, y: 1, z: 1.60000002}
+          Friction: 0.400000006
+          Bounciness: 0
+          Density: 1
+          Position Offset: {x: 0, y: 0, z: 0}
+          Rotation Offset: {x: 0, y: 0, z: 0}
+      IsActive: true
+  Scripts: ~
+- EID: 6
+  Name: Wall
+  IsActive: true
+  NumberOfChildren: 0
+  Components:
+    Transform Component:
+      Translate: {x: 6.06437206, y: 0, z: -5.60716629}
+      Rotate: {x: -0, y: 1.57079601, z: -0}
+      Scale: {x: 4.99989605, y: 1, z: 0.999986947}
+      IsActive: true
+    Renderable Component:
+      Mesh: 142652392
+      Material: 126223465
+      IsActive: true
+    Collider Component:
+      Colliders:
+        - Is Trigger: false
+          Collision Tag: 0
+          Type: Box
+          Half Extents: {x: 2.5, y: 1, z: 1.60000002}
+          Friction: 0.400000006
+          Bounciness: 0
+          Density: 1
+          Position Offset: {x: 0, y: 0, z: 0}
+          Rotation Offset: {x: 0, y: 0, z: 0}
+      IsActive: true
+  Scripts: ~
+- EID: 7
+  Name: Wall
+  IsActive: true
+  NumberOfChildren: 0
+  Components:
+    Transform Component:
+      Translate: {x: -11, y: 0, z: 0}
+      Rotate: {x: -0, y: 1.57079637, z: -0}
+      Scale: {x: 10.6225176, y: 1, z: 1}
+      IsActive: true
+    Renderable Component:
+      Mesh: 142652392
+      Material: 126223465
+      IsActive: true
+    Collider Component:
+      Colliders:
+        - Is Trigger: false
+          Collision Tag: 0
+          Type: Box
+          Half Extents: {x: 2.5, y: 1, z: 1.60000002}
+          Friction: 0.400000006
+          Bounciness: 0
+          Density: 1
+          Position Offset: {x: 0, y: 0, z: 0}
+          Rotation Offset: {x: 0, y: 0, z: 0}
+      IsActive: true
+  Scripts: ~
+- EID: 8
+  Name: Wall
+  IsActive: true
+  NumberOfChildren: 0
+  Components:
+    Transform Component:
+      Translate: {x: -4.70212746, y: 0, z: -0.00226712227}
+      Rotate: {x: -0, y: 1.57079601, z: -0}
+      Scale: {x: 4.99982977, y: 1, z: 0.999978602}
+      IsActive: true
+    Renderable Component:
+      Mesh: 142652392
+      Material: 126223465
+      IsActive: true
+    Collider Component:
+      Colliders:
+        - Is Trigger: false
+          Collision Tag: 0
+          Type: Box
+          Half Extents: {x: 2.5, y: 1, z: 1.60000002}
+          Friction: 0.400000006
+          Bounciness: 0
+          Density: 1
+          Position Offset: {x: 0, y: 0, z: 0}
+          Rotation Offset: {x: 0, y: 0, z: 0}
+      IsActive: true
+  Scripts: ~
+- EID: 9
+  Name: Wall
+  IsActive: true
+  NumberOfChildren: 0
+  Components:
+    Transform Component:
+      Translate: {x: 1.46194017, y: 0, z: 0.71579361}
+      Rotate: {x: -0, y: 0, z: -0}
+      Scale: {x: 4.99985838, y: 1, z: 0.999982238}
+      IsActive: true
+    Renderable Component:
+      Mesh: 142652392
+      Material: 126223465
+      IsActive: true
+    Collider Component:
+      Colliders:
+        - Is Trigger: false
+          Collision Tag: 0
+          Type: Box
+          Half Extents: {x: 2.5, y: 1, z: 1.60000002}
+          Friction: 0.400000006
+          Bounciness: 0
+          Density: 1
+          Position Offset: {x: 0, y: 0, z: 0}
+          Rotation Offset: {x: 0, y: 0, z: 0}
+      IsActive: true
+  Scripts: ~
+- EID: 10
+  Name: Wall
+  IsActive: true
+  NumberOfChildren: 0
+  Components:
+    Transform Component:
+      Translate: {x: -2.30867815, y: 0, z: -6.02849674}
+      Rotate: {x: -0, y: 0, z: -0}
+      Scale: {x: 4, y: 1, z: 0.999974966}
+      IsActive: true
+    Renderable Component:
+      Mesh: 142652392
+      Material: 126223465
+      IsActive: true
+    Collider Component:
+      Colliders:
+        - Is Trigger: false
+          Collision Tag: 0
+          Type: Box
+          Half Extents: {x: 2.5, y: 1, z: 1.60000002}
+          Friction: 0.400000006
+          Bounciness: 0
+          Density: 1
+          Position Offset: {x: 0, y: 0, z: 0}
+          Rotation Offset: {x: 0, y: 0, z: 0}
+      IsActive: true
+  Scripts: ~
+- EID: 11
+  Name: TestAI
+  IsActive: true
+  NumberOfChildren: 0
+  Components:
+    Transform Component:
+      Translate: {x: 8.5, y: -1, z: -6.41661787}
+      Rotate: {x: -0, y: 0, z: -0}
+      Scale: {x: 5, y: 5, z: 5}
+      IsActive: true
+    Renderable Component:
+      Mesh: 140639624
+      Material: 131956078
+      IsActive: true
+    Navigation Component:
+      Target: {x: 0, y: 0, z: 0}
+      Forward: {x: 0, y: 0, z: 0}
+      Recalculate Path: true
+      Unreachable Target: false
+      Acceptance threshold: 1
+      IsActive: true
+  Scripts:
+    - Type: SHADE_Scripting.Gameplay.AIBehaviour.AIRework.NavigationTestScript
+      Enabled: true
+      endPoint: 12
+      speed: 3
+- EID: 12
+  Name: EndPoint
+  IsActive: true
+  NumberOfChildren: 0
+  Components:
+    Transform Component:
+      Translate: {x: -0.853474855, y: -1, z: 0.354041398}
+      Rotate: {x: -0, y: 0, z: -0}
+      Scale: {x: 5, y: 5, z: 5}
+      IsActive: true
+    Renderable Component:
+      Mesh: 140639624
+      Material: 131956078
+      IsActive: true
+  Scripts: ~
+- EID: 13
+  Name: Camera
+  IsActive: true
+  NumberOfChildren: 0
+  Components:
+    Transform Component:
+      Translate: {x: 0, y: 10.2736483, z: 0}
+      Rotate: {x: -1.48352981, y: 0, z: 0}
+      Scale: {x: 1, y: 1, z: 1}
+      IsActive: true
+    Camera Component:
+      Position: {x: 0, y: 0, z: 0}
+      Pitch: -85
+      Yaw: 0
+      Roll: 0
+      Width: 1920
+      Near: 0.00999999978
+      Far: 10000
+      Perspective: true
+      FOV: 90
+      IsActive: true
+  Scripts: ~
--- a/Assets/Scenes/NavigationTest.shade.shmeta
+++ b/Assets/Scenes/NavigationTest.shade.shmeta
@ -0,0 +1,3 @@
+Name: NavigationTest
+ID: 100246336
+Type: 5
--- a/Assets/Scenes/PlayerControllerTest.shade
+++ b/Assets/Scenes/PlayerControllerTest.shade
@ -1,526 +0,0 @@
- EID: 0
-  Name: ScoreZone
-  IsActive: true
-  NumberOfChildren: 0
-  Components:
-    Camera Component:
-      Position: {x: 0, y: 0, z: 0}
-      Pitch: 0
-      Yaw: 0
-      Roll: 0
-      Width: 1920
-      Height: 1080
-      Near: 0.00999999978
-      Far: 10000
-      Perspective: true
-      IsActive: true
-    Light Component:
-      Position: {x: 0, y: 0, z: 0}
-      Type: Directional
-      Direction: {x: 1.79999995, y: 0, z: 1}
-      Color: {x: 0.951541841, y: 0.921719015, z: 0.553319454, w: 1}
-      Layer: 4294967295
-      Strength: 0
-      IsActive: true
-  Scripts: ~
- EID: 1
-  Name: Default
-  IsActive: true
-  NumberOfChildren: 0
-  Components:
-    Transform Component:
-      Translate: {x: -1.440328, y: -4.41369677, z: -5}
-      Rotate: {x: -0, y: 0, z: -0}
-      Scale: {x: 49.4798889, y: 0.5, z: 17.5}
-      IsActive: true
-    Renderable Component:
-      Mesh: 149697411
-      Material: 126974645
-      IsActive: true
-    RigidBody Component:
-      Type: Static
-      Drag: 0.00999999978
-      Angular Drag: 0.00999999978
-      Use Gravity: true
-      Interpolate: true
-      Sleeping Enabled: true
-      Freeze Position X: false
-      Freeze Position Y: false
-      Freeze Position Z: false
-      Freeze Rotation X: false
-      Freeze Rotation Y: false
-      Freeze Rotation Z: false
-      IsActive: true
-    Collider Component:
-      Colliders:
-        - Is Trigger: false
-          Type: Box
-          Half Extents: {x: 1, y: 1, z: 1}
-          Friction: 0.400000006
-          Bounciness: 0
-          Density: 1
-          Position Offset: {x: 0, y: 0, z: 0}
-          Rotation Offset: {x: 0, y: 0, z: 0}
-      IsActive: true
-  Scripts: ~
- EID: 2
-  Name: Player
-  IsActive: true
-  NumberOfChildren: 3
-  Components:
-    Transform Component:
-      Translate: {x: -0.0897406489, y: -4.07369709, z: 3.6087606}
-      Rotate: {x: 0, y: -0.19268477, z: 0}
-      Scale: {x: 1, y: 1, z: 1}
-      IsActive: true
-    Renderable Component:
-      Mesh: 149697411
-      Material: 126974645
-      IsActive: true
-    RigidBody Component:
-      Type: Dynamic
-      Drag: 2
-      Angular Drag: 0
-      Use Gravity: false
-      Interpolate: true
-      Sleeping Enabled: true
-      Freeze Position X: false
-      Freeze Position Y: false
-      Freeze Position Z: false
-      Freeze Rotation X: true
-      Freeze Rotation Y: true
-      Freeze Rotation Z: true
-      IsActive: true
-    Collider Component:
-      Colliders:
-        - Is Trigger: false
-          Type: Box
-          Half Extents: {x: 0.5, y: 0.699999988, z: 0.5}
-          Friction: 0.400000006
-          Bounciness: 0
-          Density: 1
-          Position Offset: {x: 0, y: 0.300000012, z: 0}
-          Rotation Offset: {x: 0, y: 0, z: 0}
-      IsActive: true
-  Scripts:
-    - Type: PlayerController
-      Enabled: true
-      currentState: 0
-      maxMoveVel: 4
-      moveForce: 50
-      sprintMultiplier: 1.5
-      rotationFactorPerFrame: 4
-      maxJumpHeight: 4
-      maxJumpTime: 0.75
-      fallMultipler: 2
-      lightMultiper: 0.75
-      mediumMultiper: 0.5
-      heavyMultiper: 0.25
-    - Type: PickAndThrow
-      Enabled: true
-      throwForce: [300, 300, 300]
-      delayTimer: 1
-      aimingLength: 1.5
-    - Type: StateMachine
-      Enabled: true
-      currentStateName: ""
-      currentAnimName: ""
- EID: 3
-  Name: HoldingPoint
-  IsActive: true
-  NumberOfChildren: 0
-  Components:
-    Transform Component:
-      Translate: {x: 0, y: 1.20000005, z: 0.5}
-      Rotate: {x: 0, y: 0, z: -0}
-      Scale: {x: 1, y: 1, z: 1}
-      IsActive: true
-  Scripts: ~
- EID: 4
-  Name: Default
-  IsActive: true
-  NumberOfChildren: 0
-  Components:
-    Transform Component:
-      Translate: {x: 0, y: 0, z: 0}
-      Rotate: {x: -0.738241911, y: 0.48064509, z: 0}
-      Scale: {x: 1, y: 1, z: 1}
-      IsActive: true
-    Camera Component:
-      Position: {x: -0.0897406489, y: -4.07369709, z: 3.6087606}
-      Pitch: -42.2981453
-      Yaw: 16.4989109
-      Roll: 0
-      Width: 1920
-      Height: 1080
-      Near: 0.00999999978
-      Far: 10000
-      Perspective: true
-      IsActive: true
-  Scripts:
-    - Type: SHADE_Scripting.ThirdPersonCamera
-      Enabled: true
-      armLength: 2
-      turnSpeedPitch: 0.300000012
-      turnSpeedYaw: 0.5
-      pitchClamp: 45
- EID: 9
-  Name: Default
-  IsActive: true
-  NumberOfChildren: 0
-  Components:
-    Transform Component:
-      Translate: {x: 0, y: 0, z: 0}
-      Rotate: {x: 0, y: 0, z: 0}
-      Scale: {x: 1, y: 1, z: 1}
-      IsActive: true
-    Renderable Component:
-      Mesh: 144838771
-      Material: 123745521
-      IsActive: true
-  Scripts: ~
- EID: 6
-  Name: AI
-  IsActive: true
-  NumberOfChildren: 0
-  Components:
-    Transform Component:
-      Translate: {x: -8, y: -4.42369699, z: 3.65323806}
-      Rotate: {x: -0, y: 0, z: -0}
-      Scale: {x: 1, y: 1, z: 1}
-      IsActive: true
-    Renderable Component:
-      Mesh: 149697411
-      Material: 126974645
-      IsActive: true
-    RigidBody Component:
-      Type: Dynamic
-      Drag: 0
-      Angular Drag: 0
-      Use Gravity: true
-      Interpolate: false
-      Sleeping Enabled: true
-      Freeze Position X: false
-      Freeze Position Y: false
-      Freeze Position Z: false
-      Freeze Rotation X: true
-      Freeze Rotation Y: true
-      Freeze Rotation Z: true
-      IsActive: true
-    Collider Component:
-      Colliders:
-        - Is Trigger: false
-          Type: Box
-          Half Extents: {x: 0.5, y: 0.5, z: 0.5}
-          Friction: 0.400000006
-          Bounciness: 0
-          Density: 1
-          Position Offset: {x: 0, y: 0.5, z: 0}
-          Rotation Offset: {x: 0, y: 0, z: 0}
-      IsActive: true
-  Scripts: ~
- EID: 7
-  Name: Default
-  IsActive: true
-  NumberOfChildren: 0
-  Components:
-    Transform Component:
-      Translate: {x: 0, y: -16.8647861, z: -14.039052}
-      Rotate: {x: -0, y: 0, z: -0}
-      Scale: {x: 28.1434975, y: 28.1434975, z: 28.1434975}
-      IsActive: true
-    Renderable Component:
-      Mesh: 149697411
-      Material: 126974645
-      IsActive: true
-  Scripts: ~
- EID: 8
-  Name: Default
-  IsActive: true
-  NumberOfChildren: 0
-  Components:
-    Light Component:
-      Position: {x: 0, y: 0, z: 0}
-      Type: Ambient
-      Direction: {x: 0, y: 0, z: 1}
-      Color: {x: 1, y: 1, z: 1, w: 1}
-      Layer: 4294967295
-      Strength: 0.25
-      IsActive: true
-  Scripts: ~
- EID: 11
-  Name: GameManager
-  IsActive: true
-  NumberOfChildren: 0
-  Components:
-    Transform Component:
-      Translate: {x: 0, y: 0, z: 0}
-      Rotate: {x: 0, y: 0, z: 0}
-      Scale: {x: 1, y: 1, z: 1}
-      IsActive: true
-    RigidBody Component:
-      Type: Static
-      Drag: 0.00999999978
-      Angular Drag: 0.00999999978
-      Use Gravity: true
-      Interpolate: true
-      Sleeping Enabled: true
-      Freeze Position X: false
-      Freeze Position Y: false
-      Freeze Position Z: false
-      Freeze Rotation X: false
-      Freeze Rotation Y: false
-      Freeze Rotation Z: false
-      IsActive: true
-    Collider Component:
-      Colliders: ~
-      IsActive: true
-  Scripts:
-    - Type: GameManager
-      Enabled: true
-      itemPool: 12
-      zonePool: 15
-      currGameState: 0
-      totalItemCount: 0
-      Score: 0
-      timer: 50
- EID: 12
-  Name: ItemPool
-  IsActive: true
-  NumberOfChildren: 3
-  Components: ~
-  Scripts: ~
- EID: 10
-  Name: item
-  IsActive: true
-  NumberOfChildren: 0
-  Components:
-    Transform Component:
-      Translate: {x: 3.19896913, y: -3.66431332, z: -4.99997139}
-      Rotate: {x: -1.57956983e-05, y: 2.20007223e-06, z: -0.000548519194}
-      Scale: {x: 2, y: 2, z: 2}
-      IsActive: true
-    Renderable Component:
-      Mesh: 144838771
-      Material: 123745521
-      IsActive: true
-    RigidBody Component:
-      Type: Dynamic
-      Drag: 0.100000001
-      Angular Drag: 0.100000001
-      Use Gravity: true
-      Interpolate: true
-      Sleeping Enabled: true
-      Freeze Position X: false
-      Freeze Position Y: false
-      Freeze Position Z: false
-      Freeze Rotation X: false
-      Freeze Rotation Y: false
-      Freeze Rotation Z: false
-      IsActive: true
-    Collider Component:
-      Colliders:
-        - Is Trigger: false
-          Type: Box
-          Half Extents: {x: 1, y: 1, z: 1}
-          Friction: 0.400000006
-          Bounciness: 0
-          Density: 1
-          Position Offset: {x: 0, y: 0.5, z: 0}
-          Rotation Offset: {x: 0, y: 0, z: 0}
-        - Is Trigger: true
-          Type: Box
-          Half Extents: {x: 2, y: 2, z: 2}
-          Friction: 0.400000006
-          Bounciness: 0
-          Density: 1
-          Position Offset: {x: 0, y: 0.5, z: 0}
-          Rotation Offset: {x: 0, y: 0, z: 0}
-      IsActive: true
-  Scripts:
-    - Type: Item
-      Enabled: true
-      Score: 1
-      currCategory: 0
- EID: 5
-  Name: item
-  IsActive: true
-  NumberOfChildren: 0
-  Components:
-    Transform Component:
-      Translate: {x: -5.02078056, y: -4.17369747, z: -2.14891005}
-      Rotate: {x: -2.95397289e-08, y: 0.00065473502, z: -4.44611992e-08}
-      Scale: {x: 1.99998975, y: 2, z: 1.99998975}
-      IsActive: true
-    Renderable Component:
-      Mesh: 144838771
-      Material: 123745521
-      IsActive: true
-    RigidBody Component:
-      Type: Dynamic
-      Drag: 0.100000001
-      Angular Drag: 0.100000001
-      Use Gravity: true
-      Interpolate: true
-      Sleeping Enabled: true
-      Freeze Position X: false
-      Freeze Position Y: false
-      Freeze Position Z: false
-      Freeze Rotation X: false
-      Freeze Rotation Y: false
-      Freeze Rotation Z: false
-      IsActive: true
-    Collider Component:
-      Colliders:
-        - Is Trigger: false
-          Type: Box
-          Half Extents: {x: 0.5, y: 0.5, z: 0.5}
-          Friction: 0.400000006
-          Bounciness: 0
-          Density: 1
-          Position Offset: {x: 0, y: 0.5, z: 0}
-          Rotation Offset: {x: 0, y: 0, z: 0}
-        - Is Trigger: true
-          Type: Box
-          Half Extents: {x: 1, y: 1, z: 1}
-          Friction: 0.400000006
-          Bounciness: 0
-          Density: 1
-          Position Offset: {x: 0, y: 0.5, z: 0}
-          Rotation Offset: {x: 0, y: 0, z: 0}
-      IsActive: true
-  Scripts:
-    - Type: Item
-      Enabled: true
-      Score: 1
-      currCategory: 0
- EID: 16
-  Name: Mesh_Apple
-  IsActive: true
-  NumberOfChildren: 0
-  Components:
-    Transform Component:
-      Translate: {x: -2.57231402, y: -3.27855849, z: 0}
-      Rotate: {x: -0, y: 0, z: -0}
-      Scale: {x: 1, y: 1, z: 1}
-      IsActive: true
-    Renderable Component:
-      Mesh: 144128170
-      Material: 131956078
-      IsActive: true
-    RigidBody Component:
-      Type: Dynamic
-      Drag: 0.00999999978
-      Angular Drag: 0.00999999978
-      Use Gravity: true
-      Interpolate: true
-      Sleeping Enabled: true
-      Freeze Position X: false
-      Freeze Position Y: false
-      Freeze Position Z: false
-      Freeze Rotation X: false
-      Freeze Rotation Y: false
-      Freeze Rotation Z: false
-      IsActive: true
-    Collider Component:
-      Colliders:
-        - Is Trigger: false
-          Type: Box
-          Half Extents: {x: 0.100000001, y: 0.100000001, z: 0.100000001}
-          Friction: 0.400000006
-          Bounciness: 0
-          Density: 1
-          Position Offset: {x: 0, y: 0, z: 0}
-          Rotation Offset: {x: 0, y: 0, z: 0}
-        - Is Trigger: true
-          Type: Box
-          Half Extents: {x: 0.300000012, y: 0.300000012, z: 0.300000012}
-          Friction: 0.400000006
-          Bounciness: 0
-          Density: 1
-          Position Offset: {x: 0, y: 0, z: 0}
-          Rotation Offset: {x: 0, y: 0, z: 0}
-      IsActive: true
-  Scripts: ~
- EID: 15
-  Name: ScoreZonePool
-  IsActive: true
-  NumberOfChildren: 2
-  Components: ~
-  Scripts: ~
- EID: 13
-  Name: ScoreZone
-  IsActive: true
-  NumberOfChildren: 0
-  Components:
-    Transform Component:
-      Translate: {x: -24.4654179, y: -3.15127993, z: -3.29243231}
-      Rotate: {x: -0, y: 0, z: -0}
-      Scale: {x: 1, y: 1, z: 1}
-      IsActive: true
-    RigidBody Component:
-      Type: Static
-      Drag: 0.00999999978
-      Angular Drag: 0.00999999978
-      Use Gravity: true
-      Interpolate: true
-      Sleeping Enabled: true
-      Freeze Position X: false
-      Freeze Position Y: false
-      Freeze Position Z: false
-      Freeze Rotation X: false
-      Freeze Rotation Y: false
-      Freeze Rotation Z: false
-      IsActive: true
-    Collider Component:
-      Colliders:
-        - Is Trigger: true
-          Type: Box
-          Half Extents: {x: 1, y: 20, z: 20}
-          Friction: 0.400000006
-          Bounciness: 0
-          Density: 1
-          Position Offset: {x: 0, y: 0, z: 0}
-          Rotation Offset: {x: 0, y: 0, z: 0}
-      IsActive: true
-  Scripts:
-    - Type: ScoringZone
-      Enabled: true
- EID: 14
-  Name: ScoreZone
-  IsActive: true
-  NumberOfChildren: 0
-  Components:
-    Transform Component:
-      Translate: {x: -6.64785767, y: 0, z: -14.217104}
-      Rotate: {x: -0, y: 0, z: -0}
-      Scale: {x: 1, y: 1, z: 1}
-      IsActive: true
-    RigidBody Component:
-      Type: Static
-      Drag: 0.00999999978
-      Angular Drag: 0.00999999978
-      Use Gravity: true
-      Interpolate: true
-      Sleeping Enabled: true
-      Freeze Position X: false
-      Freeze Position Y: false
-      Freeze Position Z: false
-      Freeze Rotation X: false
-      Freeze Rotation Y: false
-      Freeze Rotation Z: false
-      IsActive: true
-    Collider Component:
-      Colliders:
-        - Is Trigger: true
-          Type: Box
-          Half Extents: {x: 20, y: 20, z: 1}
-          Friction: 0.400000006
-          Bounciness: 0
-          Density: 1
-          Position Offset: {x: 0, y: 0, z: 0}
-          Rotation Offset: {x: 0, y: 0, z: 0}
-      IsActive: true
-  Scripts:
-    - Type: ScoringZone
-      Enabled: true
--- a/Assets/Scenes/PlayerControllerTest.shade.shmeta
+++ b/Assets/Scenes/PlayerControllerTest.shade.shmeta
@ -1,3 +0,0 @@
-Name: PlayerControllerTest
-ID: 92100024
-Type: 5
--- a/Assets/Scenes/Scene2.shade
+++ b/Assets/Scenes/Scene2.shade
@ -1,3 +1,4 @@
+- NavData: 0
 - EID: 0
  Name: Default
  IsActive: true
@ -22,18 +23,18 @@
  Scripts: ~
 - EID: 1
  Name: Raccoon
-  IsActive: true
+  IsActive: false
  NumberOfChildren: 1
  Components:
    Transform Component:
      Translate: {x: 0, y: 0.201105013, z: 0}
      Rotate: {x: 0.00523597933, y: -2.96353412, z: -6.40293041e-10}
      Scale: {x: 1.00000191, y: 1, z: 1.00000191}
-      IsActive: true
+      IsActive: false
    Renderable Component:
      Mesh: 149697411
      Material: 126974645
-      IsActive: true
+      IsActive: false
  Scripts: ~
 - EID: 3
  Name: Bag
@ -87,18 +88,18 @@
  Scripts: ~
 - EID: 5
  Name: Floor
-  IsActive: true
+  IsActive: false
  NumberOfChildren: 0
  Components:
    Transform Component:
      Translate: {x: 0, y: 0.0810000002, z: 0}
      Rotate: {x: -1.57079625, y: 0, z: -0}
      Scale: {x: 50, y: 49.9999924, z: 49.9999924}
-      IsActive: true
+      IsActive: false
    Renderable Component:
      Mesh: 141771688
      Material: 124370424
-      IsActive: true
+      IsActive: false
  Scripts: ~
 - EID: 6
  Name: TrajectoryTest
@ -145,4 +146,38 @@
      End Alpha: 1
      "Color Eval Rate ": 0.192000002
      IsActive: true
+  Scripts: ~
+- EID: 7
+  Name: ParticleTest
+  IsActive: true
+  NumberOfChildren: 0
+  Components:
+    Transform Component:
+      Translate: {x: 0, y: 0.823412895, z: -4.31447983}
+      Rotate: {x: -0, y: 0, z: -0}
+      Scale: {x: 1, y: 1, z: 1}
+      IsActive: true
+    classSHADE::SHParticleEmitterComponent:
+      Emission Count: 15
+      Is Passive: true
+      Emission Interval: 0.0939999968
+      Min Life: 2
+      Max Life: 3
+      Minimum Speed: 3
+      Maximum Speed: 6
+      Minimum Size: 0
+      Maximum Size: 0.5
+      Size Decay: 0.990999997
+      Angular Ranges And Offset: {x: 6.19999981, y: 1.10000002, z: 0, w: 0.100000001}
+      Rotation Speed: 0.0309999995
+      Rotation Decay: 0.0199999996
+      Texture Asset ID: 0
+      Custom Vertex Shader Asset ID: 44202416
+      Custom Fragment Shader Asset ID: 42315398
+      Custom Update Shader Asset ID: 0
+      Color Tint: {x: 0.46696043, y: 1, z: 0, w: 1}
+      Color Tint Range: {x: 1, y: 0, z: 0, w: 0}
+      Color Decay: {x: -1, y: -1, z: -1, w: 0}
+      Acceleration: {x: 0, y: 0, z: 0}
+      IsActive: true
  Scripts: ~
--- a/Assets/Scenes/Scene2.shade.shmeta
+++ b/Assets/Scenes/Scene2.shade.shmeta
@ -1,3 +1,3 @@
 Name: Scene2
-ID: 87285316
+ID: 89281126
 Type: 5
--- a/Assets/Scenes/UI_Test.shade
+++ b/Assets/Scenes/UI_Test.shade
@ -1,104 +0,0 @@
- EID: 0
-  Name: Canvas
-  IsActive: true
-  NumberOfChildren: 2
-  Components:
-    Canvas Component:
-      Canvas Width: 10
-      Canvas Height: 10
-      IsActive: true
-  Scripts: ~
- EID: 6
-  Name: Default
-  IsActive: true
-  NumberOfChildren: 0
-  Components:
-    Transform Component:
-      Translate: {x: 0, y: 0, z: 0}
-      Rotate: {x: 0, y: 0, z: 0}
-      Scale: {x: 1, y: 1, z: 1}
-      IsActive: true
-    Renderable Component:
-      Mesh: 141771688
-      Material: 129340704
-      IsActive: true
-    Button Component:
-      Default Texture: 0
-      Hovered Texture: 0
-      Clicked Texture: 0
-      IsActive: true
-  Scripts: ~
- EID: 5
-  Name: Default
-  IsActive: true
-  NumberOfChildren: 0
-  Components:
-    Transform Component:
-      Translate: {x: 0, y: -3.9000001, z: 0}
-      Rotate: {x: 0, y: 0, z: 0}
-      Scale: {x: 1, y: 1, z: 1}
-      IsActive: true
-    Renderable Component:
-      Mesh: 141771688
-      Material: 129340704
-      IsActive: true
-    Toggle Button Component:
-      Non Toggled Texture: 0
-      Toggled Texture: 0
-      Value: true
-      IsActive: true
-  Scripts: ~
- EID: 1
-  Name: Camera
-  IsActive: true
-  NumberOfChildren: 0
-  Components:
-    Camera Component:
-      Position: {x: 0, y: 3, z: 8}
-      Pitch: 0
-      Yaw: 0
-      Roll: 0
-      Width: 1920
-      Height: 1080
-      Near: 0.00999999978
-      Far: 10000
-      Perspective: true
-      IsActive: true
-    Light Component:
-      Position: {x: 0, y: 0, z: 0}
-      Type: Directional
-      Direction: {x: 1.79999995, y: 0, z: 1}
-      Color: {x: 0.951541841, y: 0.921719015, z: 0.553319454, w: 1}
-      Layer: 4294967295
-      Strength: 0
-      IsActive: true
-  Scripts: ~
- EID: 7
-  Name: BigBoi
-  IsActive: true
-  NumberOfChildren: 0
-  Components:
-    Transform Component:
-      Translate: {x: 0, y: -16.8647861, z: -14.039052}
-      Rotate: {x: -0, y: 0, z: -0}
-      Scale: {x: 28.1434975, y: 28.1434975, z: 28.1434975}
-      IsActive: true
-    Renderable Component:
-      Mesh: 149697411
-      Material: 126974645
-      IsActive: true
-  Scripts: ~
- EID: 8
-  Name: AmbientLight
-  IsActive: true
-  NumberOfChildren: 0
-  Components:
-    Light Component:
-      Position: {x: 0, y: 0, z: 0}
-      Type: Ambient
-      Direction: {x: 0, y: 0, z: 1}
-      Color: {x: 1, y: 1, z: 1, w: 1}
-      Layer: 4294967295
-      Strength: 0.25
-      IsActive: true
-  Scripts: ~
--- a/Assets/Scenes/UI_Test.shade.shmeta
+++ b/Assets/Scenes/UI_Test.shade.shmeta
@ -1,3 +0,0 @@
-Name: UI_Test
-ID: 87244611
-Type: 5
--- a/Assets/Scripts/Gameplay/AIBehaviour/AIRework/AILineOfSight.cs
+++ b/Assets/Scripts/Gameplay/AIBehaviour/AIRework/AILineOfSight.cs
@ -0,0 +1,107 @@
+using SHADE;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace SHADE_Scripting.Gameplay.AIBehaviour.AIRework
+{
+    public class AILineOfSight:Script
+    {
+        public GameObject player;
+
+        public float range = 2.0f;
+        [Tooltip("Angle between player and forward to be within sight")]
+        public float angle = 30.0f;
+
+        [Tooltip("For debug")]
+        public float angleBetween = 0.0f;
+
+        [Tooltip("For debug")]
+        public float distance = 0.0f;
+
+        public float heightLimit = 1.0f;
+
+        public Vector3 rayOffset;
+
+        
+        public bool withinRange;
+        public bool withinSight;
+
+
+        public Vector3 lastFoundPos;
+        public float lastFoundTimer = 0.0f;
+
+        protected override void update()
+        {
+            if (player == GameObject.Null)
+                return;
+
+            Transform transform = GetComponent<Transform>();
+            Transform playerTransform = player.GetComponent<Transform>();
+            Collider playerCollider = player.GetComponent<Collider>();
+
+            withinRange = false;
+            withinSight = false;
+            
+
+            if(transform && playerTransform && playerCollider)
+            {
+                Vector3 pos = transform.GlobalPosition + rayOffset;
+                Vector3 playerPos = playerTransform.GlobalPosition ;
+                Vector3 d = playerPos - pos;
+                distance = d.GetMagnitude();
+                if(distance < range)
+                {
+                    Vector3 fwdHorizontal = transform.Forward;
+                    fwdHorizontal.y = 0;
+                    fwdHorizontal.Normalise();
+
+                    Vector3 dHorizontal = d;
+                    dHorizontal.y = 0;
+                    
+
+                    float dot = Vector3.Dot(fwdHorizontal, dHorizontal);
+                    angleBetween = SHADE.Math.Rad2Deg * MathF.Acos(dot / (dHorizontal.GetMagnitude()));
+                    if (angleBetween < angle && playerPos.y < pos.y + heightLimit)
+                    {
+                        withinRange = true;
+                        withinSight = true;
+                        Ray sightRay = new Ray(pos, d.GetNormalised());
+                        List<RaycastHit> hitResults = Physics.Raycast(sightRay, distance,false, (ushort)65535);
+
+                        foreach(RaycastHit hit in hitResults)
+                        {
+                            if (hit.Hit && hit.Other != player)
+                            {
+                                //Debug.Log("AI LOS: HIT OTHER");
+                                withinSight = false;
+                                break;
+                            }
+                        }
+                    }
+                }
+
+                if (withinSight == true)
+                {
+                    lastFoundPos = playerTransform.GlobalPosition;
+                    lastFoundTimer = 0.0f;
+                }
+                else
+                {
+                    lastFoundTimer += Time.DeltaTimeF;
+                }
+
+            }
+
+
+            
+
+
+        }
+
+
+
+    }
+}
--- a/Assets/Scripts/Gameplay/AIBehaviour/AIRework/AILineOfSight.cs.shmeta
+++ b/Assets/Scripts/Gameplay/AIBehaviour/AIRework/AILineOfSight.cs.shmeta
@ -0,0 +1,3 @@
+Name: AILineOfSight
+ID: 152074687
+Type: 9
--- a/Assets/Scripts/Gameplay/AIBehaviour/AIRework/BaseState.cs.shmeta
+++ b/Assets/Scripts/Gameplay/AIBehaviour/AIRework/BaseState.cs.shmeta
@ -0,0 +1,3 @@
+Name: BaseState
+ID: 167091082
+Type: 9
--- a/Assets/Scripts/Gameplay/AIBehaviour/AIRework/HomeOwnerAI.cs
+++ b/Assets/Scripts/Gameplay/AIBehaviour/AIRework/HomeOwnerAI.cs
@ -0,0 +1,176 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using SHADE;
+using SHADE_Scripting.Audio;
+using SHADE_Scripting.Gameplay.AIBehaviour.AIRework.States;
+
+namespace SHADE_Scripting.Gameplay.AIBehaviour.AIRework
+{
+  public class HomeOwnerAI : Script
+  {
+    public float idleDuration = 1.0f;
+    public float caughtDuration = 2.0f;
+    public float timeoutDuration = 2.0f;
+    public GameObject patrolPointParent;
+
+    public float patrolSpeed = 2.0f;
+    public float chaseSpeed = 3.0f;
+
+    public float alertCooldown = 0.0f;
+
+    public GameObject player;
+    public GameObject attackHitbox;
+
+    public AnimationClipAsset walkingAnim;
+    public AnimationClipAsset idleAnim;
+    public AnimationClipAsset alertAnim;
+    public AnimationClipAsset alertRunAnim;
+    public AnimationClipAsset alertIdleAnim;
+    public AnimationClipAsset timeoutAnim;
+    public AnimationClipAsset atkWindupAnim;
+    public AnimationClipAsset atkHoldAnim;
+    public AnimationClipAsset atkSeqAnim;
+
+
+    
+
+    private Vector3 startPos;
+    public bool atk { get; set; }
+
+    [NonSerialized]
+    public IEnumerable<Transform> patrolPointPool;
+
+    private List<Transform> pppList;
+
+    private Transform transform;
+
+    [NonSerialized]
+    public HomeOwnerAttackHitbox hitboxScript;
+
+    public void Reset()
+    {
+      StateMachine machine = GetScript<StateMachine>();
+      if (transform && machine)
+      {
+        transform.GlobalPosition = startPos;
+        machine.SetState(typeof(IdleState));
+      }
+    }
+
+
+
+    protected override void awake()
+    {
+      StateMachine machine = GetScript<StateMachine>();
+      if (machine)
+      {
+        Dictionary<Type, BaseState> dictionary = new Dictionary<Type, BaseState>();
+        dictionary.Add(typeof(IdleState), new IdleState(machine));
+        dictionary.Add(typeof(PatrolState), new PatrolState(machine));
+        dictionary.Add(typeof(TimeoutState), new TimeoutState(machine));
+        dictionary.Add(typeof(ChaseState), new ChaseState(machine));
+        dictionary.Add(typeof(AlertState), new AlertState(machine));
+        dictionary.Add(typeof(AttackState), new AttackState(machine));
+        dictionary.Add(typeof(CaughtRaccoonState), new CaughtRaccoonState(machine));
+
+        machine.InitStateMachine(dictionary);
+      }
+
+      AudioHandler.audioClipHandlers["HO_footsteps"] = SHADE.Audio.CreateAudioClip("event:/Homeowner/homeowner_footsteps");
+			SHADE.Audio.AttachAudioClipToObject(AudioHandler.audioClipHandlers["HO_footsteps"], GameObject.EntityId);
+
+      AudioHandler.audioClipHandlers["HO_bark"] = SHADE.Audio.CreateAudioClip("event:/Homeowner/homeowner_bark");
+			SHADE.Audio.AttachAudioClipToObject(AudioHandler.audioClipHandlers["HO_bark"], GameObject.EntityId);
+
+			AudioHandler.audioClipHandlers["HO_humming"] = SHADE.Audio.CreateAudioClip("event:/Homeowner/homeowner_humming");
+			SHADE.Audio.AttachAudioClipToObject(AudioHandler.audioClipHandlers["HO_humming"], GameObject.EntityId);
+
+			patrolPointPool = patrolPointParent.GetComponentsInChildren<Transform>();
+      pppList = patrolPointPool.ToList<Transform>();
+      transform = GetComponent<Transform>();
+
+      atk = false;
+
+    }
+
+    protected override void start()
+    {
+      //attackHitbox.SetActive(false);
+      if (pppList != null)
+        startPos = pppList[0].LocalPosition;
+
+      if (attackHitbox)
+        hitboxScript = attackHitbox.GetScript<HomeOwnerAttackHitbox>();
+
+
+    }
+
+
+    protected override void update()
+    {
+      if (alertCooldown > 0.0f)
+      {
+        alertCooldown -= Time.DeltaTimeF;
+      }
+      else
+      {
+        alertCooldown = 0.0f;
+      }
+      AICheat();
+    }
+
+    public bool ShouldTransitAlert()
+    {
+      AILineOfSight los = GetScript<AILineOfSight>();
+      if (los)
+      {
+        if (los.withinSight && alertCooldown <= 0.0f)
+        {
+          return true;
+        }
+      }
+      return false;
+    }
+
+    public void RotateToPlayer()
+    {
+
+      //Transform playerTransform = player.GetComponent<Transform>();
+
+      ////Rotate to face player.
+      //Transform aiTransform = GetComponent<Transform>();
+      //if(playerTransform && aiTransform)
+      //{
+      //    Vector3 direction = playerTransform.GlobalPosition - aiTransform.GlobalPosition;
+      //    Quaternion currentRotation = aiTransform.LocalRotation;
+      //    Quaternion targetRotation = Quaternion.Euler(0.0f, MathF.Atan2(direction.x, direction.z), 0.0f);
+      //    aiTransform.LocalRotation = Quaternion.Slerp(currentRotation, targetRotation, 5.0f * (float)Time.FixedDeltaTime);
+      //}
+
+    }
+
+    private void AICheat()
+    {
+      StateMachine machine = GetScript<StateMachine>();
+      AILineOfSight los = GetScript<AILineOfSight>();
+      if (machine && los)
+      {
+        if (Input.GetKeyDown(Input.KeyCode.K))
+        {
+          los.range = 5.0f;
+          machine.SetState(typeof(AlertState));
+        }
+        if (Input.GetKeyDown(Input.KeyCode.L))
+        {
+          los.range = 0.0f;
+          machine.SetState(typeof(IdleState));
+        }
+
+      }
+
+    }
+
+
+  }
+}
--- a/Assets/Scripts/Gameplay/AIBehaviour/AIRework/HomeOwnerAI.cs.shmeta
+++ b/Assets/Scripts/Gameplay/AIBehaviour/AIRework/HomeOwnerAI.cs.shmeta
@ -0,0 +1,3 @@
+Name: HomeOwnerAI
+ID: 162553450
+Type: 9
--- a/Assets/Scripts/Gameplay/AIBehaviour/AIRework/HomeOwnerAttackHitbox.cs
+++ b/Assets/Scripts/Gameplay/AIBehaviour/AIRework/HomeOwnerAttackHitbox.cs
@ -0,0 +1,65 @@
+using SHADE;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using static PlayerController;
+
+namespace SHADE_Scripting.Gameplay.AIBehaviour.AIRework
+{
+  public class HomeOwnerAttackHitbox : Script
+  {
+    public GameObject aiGO;
+
+    public bool raccoonFound = false;
+    Transform transform;
+    Transform aiTransform;
+
+    [NonSerialized]
+    public PlayerController pc;
+    private HomeOwnerAI ai;
+
+    protected override void start()
+    {
+      transform = GetComponent<Transform>();
+      aiTransform = aiGO.GetComponent<Transform>();
+      ai = aiGO.GetScript<HomeOwnerAI>();
+    }
+
+    protected override void update()
+    {
+      if (transform && aiTransform)
+      {
+
+        transform.GlobalPosition = aiTransform.GlobalPosition + aiTransform.Forward * 0.7f;
+        transform.GlobalEulerAngles = aiTransform.GlobalEulerAngles;
+
+      }
+
+      if (raccoonFound && pc && ai)
+      {
+        if (!ai.atk)
+            raccoonFound = false;
+
+      }
+      
+    }
+
+
+    protected override void onTriggerStay(CollisionInfo info)
+    {
+      if (info.GameObject.GetScript<PlayerController>())
+      { 
+        pc = info.GameObject.GetScript<PlayerController>();
+        if (ai && ai.atk && pc)
+        {
+          raccoonFound = true;
+        }
+      }
+    }
+
+
+  }
+}
--- a/Assets/Scripts/Gameplay/AIBehaviour/AIRework/HomeOwnerAttackHitbox.cs.shmeta
+++ b/Assets/Scripts/Gameplay/AIBehaviour/AIRework/HomeOwnerAttackHitbox.cs.shmeta
@ -0,0 +1,3 @@
+Name: HomeOwnerAttackHitbox
+ID: 164649501
+Type: 9
--- a/Assets/Scripts/Gameplay/AIBehaviour/AIRework/NavigationTestScript.cs
+++ b/Assets/Scripts/Gameplay/AIBehaviour/AIRework/NavigationTestScript.cs
@ -0,0 +1,52 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using SHADE;
+
+namespace SHADE_Scripting.Gameplay.AIBehaviour.AIRework
+{
+
+    
+
+    public class NavigationTestScript :Script
+    {
+        public GameObject endPoint;
+
+        public float speed = 1.0f;
+        float timer = 0.0f;
+
+        protected override void start()
+        {
+
+            Navigation nav = GetComponent<Navigation>();
+            Transform endTransform = endPoint.GetComponent<Transform>();
+            if (endTransform)
+                nav.MoveTo(endTransform.GlobalPosition);
+        }
+
+        protected override void update()
+        {
+            timer += Time.DeltaTimeF;
+            Navigation nav = GetComponent<Navigation>();
+            Transform transform = GetComponent<Transform>();
+            if (timer >= 1.0f)
+            {
+                timer = 0.0f;
+                
+                Transform endTransform = endPoint.GetComponent<Transform>();
+                if (endTransform)
+                    nav.MoveTo(endTransform.GlobalPosition);
+            }
+
+
+            if (nav && transform)
+            {
+                transform.LocalPosition = transform.LocalPosition + ( nav.GetForward() * Time.DeltaTimeF * speed);
+                
+            }
+        }
+
+    }
+}
--- a/Assets/Scripts/Gameplay/AIBehaviour/AIRework/NavigationTestScript.cs.shmeta
+++ b/Assets/Scripts/Gameplay/AIBehaviour/AIRework/NavigationTestScript.cs.shmeta
@ -0,0 +1,3 @@
+Name: NavigationTestScript
+ID: 162476480
+Type: 9
--- a/Assets/Scripts/Gameplay/AIBehaviour/AIRework/RotateToVelocity.cs
+++ b/Assets/Scripts/Gameplay/AIBehaviour/AIRework/RotateToVelocity.cs
@ -0,0 +1,90 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using SHADE;
+
+namespace SHADE_Scripting.Gameplay.AIBehaviour.AIRework
+{
+    public class RotateToVelocity : Script
+    {
+        public float rotationPerSecond = 2.0f;
+
+        public bool active = true;
+        public bool rotateToPlayerLastKnown = false;
+
+        public bool lookAround = false;
+        private bool left = true;
+        private float lookOffset = 0.0f;
+        private float lookAroundAngle = 30.0f;
+
+        protected override void start()
+        {
+            rotateToPlayerLastKnown = false;
+            active = true;
+        }
+
+
+        protected override void update()
+        {
+            if (!active)
+                return;
+
+            RigidBody rigid = GetComponent<RigidBody>();
+            Transform transform = GetComponent<Transform>();
+            if(!lookAround)
+            {
+                lookOffset = 0.0f;
+            }
+            //else
+            //{
+            //    if(left )
+            //    {
+            //        if (lookOffset > -lookAroundAngle)
+            //            lookOffset -= rotationPerSecond * Time.DeltaTimeF;
+            //        else
+            //            left = false;
+            //    }
+            //    if (!left)
+            //    {
+            //        if (lookOffset < lookAroundAngle)
+            //            lookOffset += rotationPerSecond * Time.DeltaTimeF;
+            //        else
+            //            left = false;
+            //    }
+            //}
+
+
+
+            if(rigid && transform)
+            {
+                Vector3 vel = rigid.LinearVelocity;
+                rigid.AngularVelocity = Vector3.Zero;
+
+
+                AILineOfSight los = GetScript<AILineOfSight>();
+                if(los && rotateToPlayerLastKnown)
+                {
+                    Vector3 direction = los.lastFoundPos - transform.GlobalPosition;
+                    Quaternion currentRotation = transform.LocalRotation;
+                    Quaternion targetRotation = Quaternion.Euler(0.0f, MathF.Atan2(direction.x, direction.z) + lookOffset, 0.0f);
+                    transform.LocalRotation = Quaternion.Slerp(currentRotation, targetRotation, rotationPerSecond * (float)Time.DeltaTimeF);
+                    return;
+                }
+                if(vel.GetMagnitude() > 0.01f)
+                {
+                    Quaternion currentRotation = transform.LocalRotation;
+                    Quaternion targetRotation = Quaternion.Euler(0.0f, MathF.Atan2(vel.x, vel.z) +  lookOffset, 0.0f);
+                    transform.LocalRotation = Quaternion.Slerp(currentRotation, targetRotation, rotationPerSecond * (float)Time.DeltaTimeF);
+                }
+            }
+
+
+
+        }
+
+
+
+    }
+}
--- a/Assets/Scripts/Gameplay/AIBehaviour/AIRework/RotateToVelocity.cs.shmeta
+++ b/Assets/Scripts/Gameplay/AIBehaviour/AIRework/RotateToVelocity.cs.shmeta
@ -0,0 +1,3 @@
+Name: RotateToVelocity
+ID: 163814533
+Type: 9
--- a/Assets/Scripts/Gameplay/AIBehaviour/AIRework/StateMachine.cs.shmeta
+++ b/Assets/Scripts/Gameplay/AIBehaviour/AIRework/StateMachine.cs.shmeta
@ -0,0 +1,3 @@
+Name: StateMachine
+ID: 165140157
+Type: 9
--- a/Assets/Scripts/Gameplay/AIBehaviour/AIRework/States/AIBaseState.cs
+++ b/Assets/Scripts/Gameplay/AIBehaviour/AIRework/States/AIBaseState.cs
@ -0,0 +1,24 @@
+using SHADE;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace SHADE_Scripting.Gameplay.AIBehaviour.AIRework.States
+{
+    public abstract class AIBaseState: BaseState
+    {
+
+        protected HomeOwnerAI ai;
+        protected Animator animator;
+        public AIBaseState(StateMachine stateMachine): base(stateMachine, "")
+        {
+            stateName = "AI Base State";
+            ai = stateMachine.GetScript<HomeOwnerAI>();
+            animator = stateMachine.GetComponent<Animator>();
+        }
+
+
+    }
+}
--- a/Assets/Scripts/Gameplay/AIBehaviour/AIRework/States/AIBaseState.cs.shmeta
+++ b/Assets/Scripts/Gameplay/AIBehaviour/AIRework/States/AIBaseState.cs.shmeta
@ -0,0 +1,3 @@
+Name: AIBaseState
+ID: 160233845
+Type: 9
--- a/Assets/Scripts/Gameplay/AIBehaviour/AIRework/States/AlertState.cs
+++ b/Assets/Scripts/Gameplay/AIBehaviour/AIRework/States/AlertState.cs
@ -0,0 +1,82 @@
+using SHADE;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using SHADE_Scripting.Audio;
+
+namespace SHADE_Scripting.Gameplay.AIBehaviour.AIRework.States
+{
+  public class AlertState : AIBaseState
+  {
+    const float alertDuration = 16.0f / 30.0f + 1.0f;
+    float alertTimer = alertDuration;
+    bool firstDetection;
+    public AlertState(StateMachine machine) : base(machine)
+    {
+      stateName = "Alert";
+      AudioHandler.audioClipHandlers["raccoondetected"] = SHADE.Audio.CreateAudioClip("event:/Raccoon/raccoon_detected");
+      firstDetection = true;
+    }
+
+    public override void OnEnter()
+    {
+      alertTimer = alertDuration;
+      if (animator)
+      {
+        animator.PlayOneShot(ai.alertAnim);
+
+      }
+
+      if(firstDetection)
+      {
+				SHADE.Audio.SetParameterWithLabel("HomeownerBark", "DetectFirst");
+				AudioHandler.audioClipHandlers["HO_bark"].Play();
+        firstDetection = false;
+			}
+      else
+      {
+
+        PlayerController pc = ai.player.GetScript<PlayerController>();
+
+				if (pc && pc.holdItem)
+        {
+					SHADE.Audio.SetParameterWithLabel("HomeownerBark", "DetectFood");
+					AudioHandler.audioClipHandlers["HO_bark"].Play();
+				}
+        else
+        {
+					SHADE.Audio.SetParameterWithLabel("HomeownerBark", "DetectAgain");
+					AudioHandler.audioClipHandlers["HO_bark"].Play();
+				}
+				
+			}
+      SHADE.Audio.SetParameterWithLabel("PlayerDetection", "Detected");
+
+		}
+    public override void OnExit()
+    {
+      animator.Stop();
+    }
+
+    public override void update()
+    {
+      alertTimer -= Time.DeltaTimeF;
+      if (alertTimer <= 0.0f)
+      {
+        machine.SetState(typeof(ChaseState));
+      }
+
+    }
+
+
+
+
+    public override void fixedUpdate()
+    {
+
+    }
+
+  }
+}
--- a/Assets/Scripts/Gameplay/AIBehaviour/AIRework/States/AlertState.cs.shmeta
+++ b/Assets/Scripts/Gameplay/AIBehaviour/AIRework/States/AlertState.cs.shmeta
@ -0,0 +1,3 @@
+Name: AlertState
+ID: 159828775
+Type: 9
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Sri Sham Haran	0f7d86543f	Fix adaptive bgm not changing on alert	2023-04-02 18:16:25 +08:00
Glence	8ffca03f16	AI fix	2023-04-02 13:32:21 +08:00
XiaoQiDigipen	724f8ae2cf	Merge pull request #456 from SHADE-DP/Navigation adjusted hitbox timing	2023-04-02 12:48:39 +08:00
maverickdgg	f495dfe4fd	adjusted hitbox timing	2023-04-02 12:34:47 +08:00
Glence	e5c8f4c380	fix camera jittering	2023-04-01 21:30:18 +08:00
Glence	f114a7f59a	Scene changes for level preview	2023-04-01 21:06:12 +08:00
XiaoQiDigipen	273bdfcdcc	Merge pull request #455 from SHADE-DP/PlayerController bug fixes	2023-04-01 19:18:29 +08:00
Glence	9b55d69f9a	Merge branch 'main' into PlayerController	2023-04-01 19:14:38 +08:00
Glence	716087d15c	small bug fixes	2023-04-01 19:14:30 +08:00
Xiao Qi	5c79bb7f9f	Recompiled all shaders	2023-04-01 18:55:25 +08:00
XiaoQiDigipen	f54448b5eb	Merge pull request #454 from SHADE-DP/PlayerController Credits and Transition done	2023-04-01 18:09:04 +08:00
Glence	51f426868e	credits and transition done	2023-04-01 18:07:22 +08:00
Glence	51867f0c5e	Merge branch 'main' into PlayerController	2023-04-01 17:23:04 +08:00
Glence	96fd8295aa	audio	2023-04-01 17:22:51 +08:00
XiaoQiDigipen	a3c1993576	Merge pull request #453 from SHADE-DP/PlayerController Level changes and bug fix	2023-04-01 16:43:19 +08:00
maverickdgg	483d8c7066	Added AI Humming	2023-04-01 16:41:38 +08:00
maverickdgg	c643bd64f3	Added a space to skip	2023-04-01 16:32:56 +08:00
maverickdgg	d5240b420d	Credits scene	2023-04-01 16:31:23 +08:00
Glence	cc9b7c20c4	Merge branch 'main' into PlayerController	2023-04-01 16:30:43 +08:00
Glence	ce6288880a	other stuff	2023-04-01 16:30:33 +08:00
Glence	b2e38df969	Merge branch 'main' into PlayerController	2023-04-01 16:11:09 +08:00
XiaoQiDigipen	0dad2e9e9f	Merge pull request #451 from SHADE-DP/PlayerController Scene changes	2023-04-01 16:11:08 +08:00
XiaoQiDigipen	e9d0b01972	Merge pull request #452 from SHADE-DP/Navigation Added HomeOwner VO and Raccoon Caught effect	2023-04-01 16:09:44 +08:00
Glence	f70a41a9dc	transition for level is done along with bug fix	2023-04-01 16:08:32 +08:00
maverickdgg	43c6a62186	Added UI changes to other scenes	2023-04-01 15:37:12 +08:00
maverickdgg	2e20b295b5	Added Homeowner VO and small UI changes	2023-04-01 15:36:02 +08:00
Glence	3e4794cebc	Merge branch 'main' into PlayerController	2023-04-01 00:51:27 +08:00
Glence	191ed7de43	scene changes	2023-04-01 00:51:15 +08:00
XiaoQiDigipen	fada41174d	Merge pull request #450 from SHADE-DP/PlayerController New features done	2023-04-01 00:42:19 +08:00
Glence	a76f2eca87	level clear done	2023-04-01 00:35:16 +08:00
Glence	5ed0219a0b	WIP for level clear	2023-03-31 18:37:28 +08:00
XiaoQiDigipen	1c6def8e70	Merge pull request #449 from SHADE-DP/Navigation Added CaughtRaccoon state to AI FSM	2023-03-31 17:05:28 +08:00
maverickdgg	9d8b94a5ab	Merge branch 'main' into Navigation	2023-03-31 16:51:12 +08:00
XiaoQiDigipen	1838209ec2	Merge pull request #448 from SHADE-DP/SP3-20-UI-System Gameplay and Main Menu UI Update	2023-03-31 15:07:19 +08:00
maverickdgg	c335f58702	Updated Gameplay UI	2023-03-31 15:02:31 +08:00
maverickdgg	af9e523da9	Gameplay UI Update	2023-03-31 14:50:25 +08:00
maverickdgg	6ee619d26e	Added Slider SFX	2023-03-31 14:18:09 +08:00
maverickdgg	b123cd83f8	Updated Main menu with correct slider scale and added fx for buttons	2023-03-31 14:14:44 +08:00
maverickdgg	fdc261749e	Merge branch 'main' into SP3-20-UI-System	2023-03-31 14:06:33 +08:00
XiaoQiDigipen	125f88bcac	Merge pull request #447 from SHADE-DP/SP3-1-Rendering Implemented color decay, color range emission and custom VS and FS for particles	2023-03-30 19:37:33 +08:00
Brandon Mak	83955e4618	Merge remote-tracking branch 'origin/main' into SP3-1-Rendering	2023-03-30 19:15:12 +08:00
Brandon Mak	4d145bbc43	Added support for custom VS and FS for particles	2023-03-30 19:15:03 +08:00
maverickdgg	c2a8c86483	Slider textures updated	2023-03-30 17:09:18 +08:00
maverickdgg	12bbce33e8	Slider WIP	2023-03-30 16:56:41 +08:00
XiaoQiDigipen	3fc69890e4	Revert "Merge pull request #446 from SHADE-DP/Fix-ResourceHubCrashOnExit" This reverts commit `5ab7cbe5f3`.	2023-03-30 16:25:05 +08:00
maverickdgg	3fef57f88a	Merge branch 'Navigation' of https://github.com/SHADE-DP/SHADE_Y3 into Navigation	2023-03-30 15:37:46 +08:00
maverickdgg	3f7522d76f	Revert "Merge pull request #446 from SHADE-DP/Fix-ResourceHubCrashOnExit" This reverts commit `5ab7cbe5f3`, reversing changes made to `ffc638e14b`.	2023-03-30 15:37:42 +08:00
maverickdgg	c6faeeb282	Added CaughtRaccoon State.	2023-03-30 15:26:15 +08:00
Brandon Mak	9c19d178db	Implemented color decay and color tint range support for particles	2023-03-30 15:19:54 +08:00
maverickdgg	8c5bf82aa5	Added CaughtRaccoon State.	2023-03-30 15:16:18 +08:00
XiaoQiDigipen	5ab7cbe5f3	Merge pull request #446 from SHADE-DP/Fix-ResourceHubCrashOnExit "Fixed" crash from ResourceHub on engine exit	2023-03-30 14:24:21 +08:00
Brandon Mak	8aa5c681e3	Merge branch 'main' into SP3-1-Rendering	2023-03-30 14:03:36 +08:00
Kah Wei	6cf20d414e	"Fixed" crash from ResourceHub on engine exit	2023-03-29 22:20:20 +08:00
Glence	ffc638e14b	using waypoint to store startpos	2023-03-26 20:50:49 +08:00
Glence	2abb1ce697	safety checks	2023-03-26 20:38:03 +08:00
Sri Sham Haran	0f9afc2a18	Merge remote-tracking branch 'origin/main' into main	2023-03-26 20:29:41 +08:00
Sri Sham Haran	0890bd8d3f	safety checks	2023-03-26 20:29:38 +08:00
Brandon Mak	fed76708bd	Particle bug fix	2023-03-26 20:28:04 +08:00
Glence	2fd4e51cd0	added food particles and small bug fix	2023-03-26 18:10:58 +08:00
Glence	2da73f12d0	ai fix along wit new music	2023-03-26 13:27:42 +08:00
Sri Sham Haran	44bbdf5f82	Merge remote-tracking branch 'origin/main' into main	2023-03-26 10:19:29 +08:00
Sri Sham Haran	c6172be3ad	Set detected parameters in AI states Increase size of score zone in level 1	2023-03-26 10:19:22 +08:00
Brandon Mak	e685f8ebaf	Quick fix for Silhouette	2023-03-26 10:18:19 +08:00
Glence	92de505af4	made egg heavier so they dont fly so far	2023-03-25 21:46:33 +08:00
maverickdgg	cf41fe245e	AI added for Level 1	2023-03-25 19:41:40 +08:00
XiaoQiDigipen	bc1167267c	Merge pull request #445 from SHADE-DP/Navigation Navigation and AI merge for level 3	2023-03-25 18:49:20 +08:00
maverickdgg	e7ec24c15a	fixed AI not resetting	2023-03-25 18:47:42 +08:00
maverickdgg	89bfbf3100	WIP	2023-03-25 18:18:29 +08:00
maverickdgg	72bbc72531	Merge branch 'main' into Navigation	2023-03-25 17:29:13 +08:00
maverickdgg	6c1f0162e9	Attack hitbox change	2023-03-25 17:29:03 +08:00
Glence	270cab64e2	raccoon new tag	2023-03-25 17:28:42 +08:00
maverickdgg	2d9b7f3a5d	Merge branch 'main' into Navigation	2023-03-25 17:20:49 +08:00
maverickdgg	4a149508c9	Level 3 generated	2023-03-25 17:20:42 +08:00
Glence	ce24a1efb0	player caught bug fix	2023-03-25 17:20:35 +08:00
XiaoQiDigipen	4f84736599	Merge pull request #444 from SHADE-DP/Navigation Added Attack animation, Fix Edge case for path finding. Added footsteps. Level 2 merge	2023-03-25 16:54:30 +08:00
maverickdgg	75f38f4e36	Merge branch 'main' into Navigation	2023-03-25 16:52:34 +08:00
maverickdgg	485d8cc38b	AI Level 2 merge	2023-03-25 16:52:26 +08:00
XiaoQiDigipen	3affd446f3	Merge pull request #443 from SHADE-DP/ShaderCompilerMigrate Removed shader compiler to external executable	2023-03-25 16:52:02 +08:00
Xiao Qi	47a78de609	Added dependencies pull for shader compiler	2023-03-25 16:41:49 +08:00
maverickdgg	749cedfae2	Merge branch 'main' into Navigation	2023-03-25 16:13:03 +08:00
maverickdgg	c1544b0b51	Merge branch 'main' into Navigation	2023-03-25 16:12:42 +08:00
XiaoQiDigipen	cd04a93df9	Merge pull request #442 from SHADE-DP/PlayerController Bug fixes	2023-03-25 16:11:55 +08:00
Glence	429674c16e	Merge branch 'main' into PlayerController	2023-03-25 16:10:01 +08:00
Glence	9b6a0d112e	remove density	2023-03-25 16:09:40 +08:00
maverickdgg	291c9d044e	Added footsteps. Fix path forward to not get stuck as much	2023-03-25 16:09:20 +08:00
Xiao Qi	f21f235980	Moved out all native shader compiler code Replaced call to internal classes with system calls to external executable	2023-03-25 15:58:06 +08:00
XiaoQiDigipen	a40c59872c	Merge pull request #441 from SHADE-DP/SP3-6-c-scripting Fixed issues where scripts cannot be loaded if another instance of the engine is using it	2023-03-25 15:52:51 +08:00
Glence	82fd4e2149	dont ask me	2023-03-25 15:52:22 +08:00
Kah Wei	52d27ae6bd	Fixed issues where scripts cannot be loaded if another instance of the engine is using it	2023-03-25 14:59:42 +08:00
maverickdgg	47f195e998	HomeOwner attack and animations	2023-03-25 14:51:28 +08:00
maverickdgg	ab4493822a	Fix edge case of starting node being a wall	2023-03-25 10:52:50 +08:00
XiaoQiDigipen	c28e874626	Merge pull request #440 from SHADE-DP/PlayerController Scene changes and bug fixes	2023-03-25 02:44:16 +08:00
Glence	98d9683995	dont ask me	2023-03-25 02:38:56 +08:00
Glence	4f44435823	Merge branch 'main' into PlayerController	2023-03-25 00:17:10 +08:00
Glence	6ce807b878	added upwards force on jumpPad	2023-03-24 21:28:33 +08:00
Glence	33ba73c298	particle bug fix	2023-03-24 20:58:22 +08:00
Glence	ff6a49e0a7	dont ask me	2023-03-24 20:30:01 +08:00
XiaoQiDigipen	0b5f602a0e	Merge pull request #439 from SHADE-DP/Navigation Saved Navigation Data as Asset and load on scene load	2023-03-24 18:05:55 +08:00
maverickdgg	af77bd4812	Saved Nav Data	2023-03-24 18:04:44 +08:00
maverickdgg	38d3040a04	Merge remote-tracking branch 'origin/NavData' into Navigation	2023-03-24 16:47:09 +08:00
maverickdgg	2382f11628	Merge branch 'main' into Navigation	2023-03-24 16:34:22 +08:00
maverickdgg	86593fd602	Merge branch 'Navigation' of https://github.com/SHADE-DP/SHADE_Y3 into Navigation	2023-03-24 16:34:14 +08:00
maverickdgg	4f7d1850af	Added editor window for generating nav data	2023-03-24 16:33:45 +08:00
XiaoQiDigipen	346f2b2fac	Merge pull request #438 from SHADE-DP/Navigation Added Navigation System. Added basic AI FSM	2023-03-24 16:11:13 +08:00
XiaoQiDigipen	0892322049	Merge branch 'main' into Navigation	2023-03-24 16:10:58 +08:00
XiaoQiDigipen	6d1b793831	Merge pull request #437 from SHADE-DP/PlayerController Added particle and bug fixes	2023-03-24 16:09:43 +08:00
maverickdgg	78d30cb051	fix rotation	2023-03-24 16:06:35 +08:00
maverickdgg	b32dba0694	basic FSM	2023-03-24 13:26:18 +08:00
maverickdgg	9dd180c1e6	Fix for when end point is unreachable. Find closest reachable point	2023-03-24 07:41:05 +08:00
maverickdgg	a785a972e4	Navigation Fix	2023-03-24 04:22:51 +08:00
Glence	01cbba1f1f	added item score multiplier	2023-03-23 18:20:42 +08:00
Glence	64bbc4d67a	scenes update, setActive message removed, expose Emitcount	2023-03-23 16:49:41 +08:00
Glence	5cd0de1960	Merge branch 'main' into PlayerController	2023-03-23 00:38:31 +08:00
Glence	6ddc5c35cb	did left and right foot smoke	2023-03-23 00:38:25 +08:00
maverickdgg	267793e3cc	Merge branch 'main' into Navigation	2023-03-22 23:27:32 +08:00
maverickdgg	38d7e49976	WIP	2023-03-22 23:27:30 +08:00
Brandon Mak	f4d361e1e9	Particle bug fix and raccoon dust particle fix	2023-03-22 22:52:43 +08:00
XiaoQiDigipen	744e66eeb6	Merge pull request #436 from SHADE-DP/SP3-2-Physics Fixed consistency of Trajectories with different time steps	2023-03-22 22:33:23 +08:00
Diren D Bharwani	2737113a84	forces are cleared after first iteration	2023-03-22 22:25:11 +08:00
Diren D Bharwani	e02e3f5faf	silly mistake	2023-03-22 22:21:39 +08:00
Glence	364da8ea85	added ceiling fan and new AI model, WIP for player particles	2023-03-22 21:31:40 +08:00
Diren D Bharwani	ae213ed05d	Merge branch 'main' into SP3-2-Physics	2023-03-22 20:48:27 +08:00
Diren D Bharwani	31dd3390c2	Fixed consistency of simulating ghost bodies	2023-03-22 20:41:40 +08:00
maverickdgg	2724c58efb	Merge branch 'main' into Navigation	2023-03-22 19:17:03 +08:00
XiaoQiDigipen	ebfe58aa0e	Merge pull request #435 from SHADE-DP/SP3-6-c-scripting Scripts csproj file is now always generated on launch to fix common script build issues	2023-03-22 14:51:02 +08:00
Kah Wei	adac12a309	Scripts csproj fileis now always generated on launch to fix common script build issues	2023-03-22 00:38:02 +08:00
Diren D Bharwani	8108d92ee2	Merge branch 'main' into SP3-2-Physics	2023-03-22 00:06:50 +08:00
Glence	179740f4bf	updated scene and added traj	2023-03-21 17:55:19 +08:00
XiaoQiDigipen	43984e8861	Merge pull request #434 from SHADE-DP/SP3-1-Rendering Improved particles and tested on some objects	2023-03-21 15:30:13 +08:00
Xiao Qi	e951d275f9	Homeowner clips	2023-03-21 15:29:59 +08:00
Brandon Mak	7216c1c3dd	Particles test on level 1 food	2023-03-21 15:27:42 +08:00
XiaoQiDigipen	c6eb689e60	Merge pull request #433 from SHADE-DP/SP3-20-UI-System Updated MainMenu and Gameplay UI	2023-03-21 14:48:59 +08:00
maverickdgg	9886250d19	scene merge	2023-03-21 14:47:14 +08:00
maverickdgg	cb791b6390	Merge branch 'main' into SP3-20-UI-System	2023-03-21 14:41:14 +08:00
maverickdgg	bc15721c0a	Updated Main Menu UI and gameplay UI	2023-03-21 14:40:30 +08:00
Brandon Mak	e7b128d521	Merge branch 'main' into SP3-1-Rendering	2023-03-21 14:35:32 +08:00
XiaoQiDigipen	997c115043	Merge pull request #432 from SHADE-DP/SP3-13-Assets-Manager Enhanced functionality of animation clip container creation	2023-03-21 14:31:16 +08:00
Brandon Mak	712c4c24b8	Color tinting and scripting support for particles	2023-03-20 20:43:50 +08:00
XiaoQiDigipen	e387c7fe6c	Merge pull request #431 from SHADE-DP/PlayerController Scene Changes and bug fixes	2023-03-20 17:42:41 +08:00
Glence	66986e179b	Merge branch 'main' into PlayerController	2023-03-20 17:34:26 +08:00
Glence	ae186e7d86	new scene changes	2023-03-20 17:05:43 +08:00
XiaoQiDigipen	600013bb82	Merge pull request #430 from SHADE-DP/SP3-1-Rendering Improved particles and trajectory rendering	2023-03-20 16:55:28 +08:00
maverickdgg	e88f5c9d1c	Main Menu update	2023-03-20 16:47:34 +08:00
Brandon Mak	ba732ea64c	Fixed trajectory renderable	2023-03-20 16:38:15 +08:00
Xiao Qi	6527634839	Fixed nav data load bug	2023-03-20 16:28:08 +08:00
Xiao Qi	85a92ce871	New nav data asset type recognition Binary write/load for nav data	2023-03-20 16:03:47 +08:00
maverickdgg	dddc1c5542	Merge branch 'main' into SP3-20-UI-System	2023-03-20 15:55:52 +08:00
maverickdgg	221e6bde85	Textures update	2023-03-20 15:55:50 +08:00
Brandon Mak	49106683c4	Merge remote-tracking branch 'origin/main' into SP3-1-Rendering	2023-03-20 15:03:27 +08:00
Brandon Mak	9ead2b6b12	Added if statement for particle texture check	2023-03-20 15:03:18 +08:00
XiaoQiDigipen	f6864419be	Merge pull request #429 from SHADE-DP/SP3-2-Physics Reworked Physics Simulate Body	2023-03-20 14:56:29 +08:00
Diren D Bharwani	11878d4cc2	reworked simulate body	2023-03-20 14:53:36 +08:00
Diren D Bharwani	8e7bfa465d	Merge branch 'main' into SP3-2-Physics	2023-03-20 13:44:11 +08:00
Brandon Mak	b8a2e206f7	Added rotation and size decay support for particles	2023-03-20 12:19:27 +08:00
maverickdgg	07a702c972	initial	2023-03-20 12:17:24 +08:00
Brandon Mak	aa0c9d08e0	Updated particle shaders to include rotation - Fixed compute shader hot reloading - Vertex/Fragment shader hot reloading still broken :/	2023-03-20 10:50:18 +08:00
Brandon Mak	565126c4ba	Enabled custom update shaders for particles	2023-03-20 09:33:04 +08:00
Brandon Mak	6a1ae5fac8	SSAO shader looks better on racoon now It still looks a little off but its better than before	2023-03-20 00:37:46 +08:00
Brandon Mak	468a032fad	Merge remote-tracking branch 'origin/main' into SP3-1-Rendering	2023-03-19 20:11:36 +08:00
Brandon Mak	f787f2b782	particles WIP	2023-03-19 20:11:29 +08:00
Glence	7510f8aa5b	bug fixes	2023-03-17 00:31:30 +08:00
Glence	77907841b1	player floating when jumping	2023-03-16 17:14:57 +08:00
Glence	132629306e	clean up scene/scripts files and updates scene	2023-03-16 14:54:18 +08:00
Brandon Mak	2eed7428d8	Fixed emitting angles for particles	2023-03-16 10:44:03 +08:00
Brandon Mak	a08e538895	Added Texture support for particles	2023-03-16 09:34:42 +08:00
Brandon Mak	32ef4d8c55	Updated particle interfaces and added more barriers	2023-03-15 21:09:55 +08:00
Glence	e53636bc4a	tweening camera arm and picking	2023-03-15 19:39:12 +08:00
Glence	a633bd64d8	update scene 3 to have the bird nest and rubbish bin	2023-03-15 17:14:35 +08:00
Brandon Mak	ab2710da4b	Solved particles flickering (I hope) - Good reminder how strict Vulkan is with memory accesses	2023-03-15 10:28:51 +08:00
Brandon Mak	0bfe350477	Particles WIP	2023-03-14 19:37:34 +08:00
Brandon Mak	69fc997361	Particles WIP	2023-03-14 19:34:26 +08:00
Glence	cc0116ac53	Merge branch 'main' into PlayerController	2023-03-14 17:19:26 +08:00
Glence	9218b7b993	player animation completed	2023-03-14 17:18:52 +08:00
Brandon Mak	070f01bf67	Particles WIP	2023-03-14 10:55:53 +08:00
Brandon Mak	8fac6fd911	Particles WIP	2023-03-13 22:23:15 +08:00
Brandon Mak	2f4a316a09	Particles WIP	2023-03-13 11:41:23 +08:00
Brandon Mak	eeaa642f30	Merge remote-tracking branch 'origin/main' into SP3-1-Rendering	2023-03-12 17:36:28 +08:00
maverickdgg	ed6c05dea1	Merge branch 'main' into SP3-20-UI-System	2023-03-11 01:10:59 +08:00
maverickdgg	1914270a3f	Fixed pause menu not showing	2023-03-10 20:03:05 +08:00
Diren D Bharwani	d4158faed1	Merge branch 'main' into SP3-2-Physics	2023-03-09 21:18:18 +08:00
Diren D Bharwani	97013ba73c	Added override for simulating gravity in SimulateBody method	2023-03-09 21:18:05 +08:00