Fix World Camera

2022-08-20 15:38:13 -07:00
parent 15a7e16650
commit 349c4dc4b6
26 changed files with 4085 additions and 2158 deletions
--- a/Assets/Player/Player.prefab
+++ b/Assets/Player/Player.prefab
@@ -1022,7 +1022,6 @@ Transform:
  m_Children:
  - {fileID: 1696202146803246503}
  - {fileID: 5524351645895762446}
-  - {fileID: 4482373298588310163}
  m_Father: {fileID: 0}
  m_RootOrder: 0
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -1042,7 +1041,7 @@ CharacterController:
  m_SlopeLimit: 75
  m_StepOffset: 1
  m_SkinWidth: 0.08
-  m_MinMoveDistance: 0.001
+  m_MinMoveDistance: 0
  m_Center: {x: 0, y: 0, z: 0}
 --- !u!95 &8519787470769432157
 Animator:
@@ -1551,85 +1550,3 @@ Transform:
  m_Father: {fileID: 7613678624619983085}
  m_RootOrder: 0
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &8555830955448573346
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 7726711927591515449}
-    m_Modifications:
-    - target: {fileID: 1211748312, guid: a5e5791664234584f83f75a413dd78b6, type: 3}
-      propertyPath: lookAtTarget
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1211748312, guid: a5e5791664234584f83f75a413dd78b6, type: 3}
-      propertyPath: targetObject
-      value: 
-      objectReference: {fileID: 7726711927591515449}
-    - target: {fileID: 1211748312, guid: a5e5791664234584f83f75a413dd78b6, type: 3}
-      propertyPath: cameraOffset.y
-      value: 5
-      objectReference: {fileID: 0}
-    - target: {fileID: 1211748312, guid: a5e5791664234584f83f75a413dd78b6, type: 3}
-      propertyPath: cameraOffset.z
-      value: -7
-      objectReference: {fileID: 0}
-    - target: {fileID: 549891546226503298, guid: a5e5791664234584f83f75a413dd78b6, type: 3}
-      propertyPath: m_Name
-      value: WorldMapCamera
-      objectReference: {fileID: 0}
-    - target: {fileID: 549891546226503298, guid: a5e5791664234584f83f75a413dd78b6, type: 3}
-      propertyPath: m_IsActive
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5226704618116925233, guid: a5e5791664234584f83f75a413dd78b6, type: 3}
-      propertyPath: m_RootOrder
-      value: 2
-      objectReference: {fileID: 0}
-    - target: {fileID: 5226704618116925233, guid: a5e5791664234584f83f75a413dd78b6, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5226704618116925233, guid: a5e5791664234584f83f75a413dd78b6, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5226704618116925233, guid: a5e5791664234584f83f75a413dd78b6, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5226704618116925233, guid: a5e5791664234584f83f75a413dd78b6, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 5226704618116925233, guid: a5e5791664234584f83f75a413dd78b6, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5226704618116925233, guid: a5e5791664234584f83f75a413dd78b6, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5226704618116925233, guid: a5e5791664234584f83f75a413dd78b6, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5226704618116925233, guid: a5e5791664234584f83f75a413dd78b6, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5226704618116925233, guid: a5e5791664234584f83f75a413dd78b6, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5226704618116925233, guid: a5e5791664234584f83f75a413dd78b6, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: a5e5791664234584f83f75a413dd78b6, type: 3}
--- !u!4 &4482373298588310163 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: 5226704618116925233, guid: a5e5791664234584f83f75a413dd78b6, type: 3}
-  m_PrefabInstance: {fileID: 8555830955448573346}
-  m_PrefabAsset: {fileID: 0}
--- a/Assets/Scenes/Mountain.unity
+++ b/Assets/Scenes/Mountain.unity
@@ -173,8 +173,10 @@ GameObject:
  - component: {fileID: 35772945}
  - component: {fileID: 35772944}
  - component: {fileID: 35772943}
+  - component: {fileID: 35772947}
+  - component: {fileID: 35772948}
  m_Layer: 0
-  m_Name: Mountain A Camera Zone
+  m_Name: Mountain A Zone
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
@@ -274,6 +276,32 @@ MeshFilter:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 35772941}
  m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!114 &35772947
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 35772941}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 62078f3dc064b304a9a033d66fa1157a, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  backgroundMusic: {fileID: 8300000, guid: 269192823cbbfdd46bac8719d24d4b28, type: 3}
+--- !u!114 &35772948
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 35772941}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e569519f096090547aafb2a539705467, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  useGroundChecking: 0
 --- !u!1 &57368835
 GameObject:
  m_ObjectHideFlags: 0
@@ -301,7 +329,8 @@ Transform:
  m_LocalPosition: {x: 0, y: 0, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_ConstrainProportionsScale: 0
-  m_Children: []
+  m_Children:
+  - {fileID: 1561401314}
  m_Father: {fileID: 2077331998}
  m_RootOrder: 5
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -884,14 +913,34 @@ MonoBehaviour:
  m_EditorClassIdentifier: 
  dialogue:
    Sentences:
-    - hey dude
-    - just testing stuff out
+    - oh, it's you.
+    - "she mentioned the child would be here one day.\r"
+    - it's kinda funny that a youth would symbolize death for us.
+    - "you are almost to the peak of the mountain. \ni bet you are excited to reach
+      the top."
+    - mountains, volcanos, everyone is excited to reach the top.
+    - "i think that the real beauty can be found down here.\r"
+    - 'the snow, the rocks, whole worlds are built on it.
+
+'
+    - but nobody gives a shit about it.
+    - "kinda ironic that it's all going to be gone soon anyway.\r"
+    - 'well here, take this. that''s why you are here.
+
+'
+    - 'took me forever to harvest it from this snow,
+
+      i bet i did it faster
+      than the others though.'
+    - alright, you got what you needed.
+    - now just let me die alone.
    SoundEffect:
      audioClip: {fileID: 8300000, guid: cde99aa876cd4a948a9f0ab587d8254f, type: 3}
      pitchMin: 1
      pitchMax: 1
      volumeMin: 1
      volumeMax: 1
+    TextSpeed: 0.07
 --- !u!114 &514570066
 MonoBehaviour:
  m_ObjectHideFlags: 0
@@ -992,7 +1041,7 @@ MeshRenderer:
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 550186600}
-  m_Enabled: 1
+  m_Enabled: 0
  m_CastShadows: 1
  m_ReceiveShadows: 1
  m_DynamicOccludee: 1
@@ -1048,8 +1097,10 @@ GameObject:
  - component: {fileID: 651040294}
  - component: {fileID: 651040293}
  - component: {fileID: 651040292}
+  - component: {fileID: 651040296}
+  - component: {fileID: 651040297}
  m_Layer: 0
-  m_Name: Mountain B Camera Zone
+  m_Name: Mountain B Zone
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
@@ -1149,6 +1200,32 @@ MeshFilter:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 651040290}
  m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!114 &651040296
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 651040290}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 62078f3dc064b304a9a033d66fa1157a, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  backgroundMusic: {fileID: 8300000, guid: 269192823cbbfdd46bac8719d24d4b28, type: 3}
+--- !u!114 &651040297
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 651040290}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e569519f096090547aafb2a539705467, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  useGroundChecking: 0
 --- !u!1 &669402557
 GameObject:
  m_ObjectHideFlags: 0
@@ -1778,104 +1855,6 @@ Camera:
  m_OcclusionCulling: 1
  m_StereoConvergence: 10
  m_StereoSeparation: 0.022
--- !u!1 &972708774
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 972708775}
-  - component: {fileID: 972708778}
-  - component: {fileID: 972708777}
-  - component: {fileID: 972708776}
-  m_Layer: 0
-  m_Name: Plane
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
--- !u!4 &972708775
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 972708774}
-  m_LocalRotation: {x: -0.44441098, y: 0.17095697, z: 0.07170412, w: 0.8764309}
-  m_LocalPosition: {x: 1.2059708, y: 1.8049988, z: -2.6442382}
-  m_LocalScale: {x: 0.03, y: 0.31409, z: 0.26457998}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 1614487505}
-  m_RootOrder: 4
-  m_LocalEulerAnglesHint: {x: -53.466, y: 23.349, z: -2.529}
--- !u!64 &972708776
-MeshCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 972708774}
-  m_Material: {fileID: 0}
-  m_IsTrigger: 0
-  m_Enabled: 1
-  serializedVersion: 4
-  m_Convex: 0
-  m_CookingOptions: 30
-  m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
--- !u!23 &972708777
-MeshRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 972708774}
-  m_Enabled: 1
-  m_CastShadows: 1
-  m_ReceiveShadows: 1
-  m_DynamicOccludee: 1
-  m_StaticShadowCaster: 0
-  m_MotionVectors: 1
-  m_LightProbeUsage: 1
-  m_ReflectionProbeUsage: 1
-  m_RayTracingMode: 2
-  m_RayTraceProcedural: 0
-  m_RenderingLayerMask: 1
-  m_RendererPriority: 0
-  m_Materials:
-  - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
-  m_StaticBatchInfo:
-    firstSubMesh: 0
-    subMeshCount: 0
-  m_StaticBatchRoot: {fileID: 0}
-  m_ProbeAnchor: {fileID: 0}
-  m_LightProbeVolumeOverride: {fileID: 0}
-  m_ScaleInLightmap: 1
-  m_ReceiveGI: 1
-  m_PreserveUVs: 0
-  m_IgnoreNormalsForChartDetection: 0
-  m_ImportantGI: 0
-  m_StitchLightmapSeams: 1
-  m_SelectedEditorRenderState: 3
-  m_MinimumChartSize: 4
-  m_AutoUVMaxDistance: 0.5
-  m_AutoUVMaxAngle: 89
-  m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
-  m_SortingOrder: 0
-  m_AdditionalVertexStreams: {fileID: 0}
--- !u!33 &972708778
-MeshFilter:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 972708774}
-  m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
 --- !u!1 &1009805972
 GameObject:
  m_ObjectHideFlags: 0
@@ -2209,9 +2188,9 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 743cce483f727904a87ef002d24ec8d6, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  _player: {fileID: 0}
+  Player: {fileID: 0}
  _playerPrefab: {fileID: 6949365541298368387, guid: 6ebbe09c2673d744faf84db54d3d12ed, type: 3}
-  _spawnLocation: {fileID: 696198452}
+  _spawnLocation: {fileID: 2126766553}
 --- !u!4 &1349856017
 Transform:
  m_ObjectHideFlags: 0
@@ -2241,7 +2220,7 @@ GameObject:
  - component: {fileID: 1561401315}
  - component: {fileID: 1561401318}
  m_Layer: 0
-  m_Name: Plane
+  m_Name: ToMountainB
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
@@ -2254,13 +2233,13 @@ Transform:
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1561401313}
-  m_LocalRotation: {x: 0.28049785, y: 0.63171977, z: -0.67300755, w: 0.2632717}
-  m_LocalPosition: {x: -1412.5696, y: -77.2, z: -3236.0596}
-  m_LocalScale: {x: 1.5817199, y: 1.5817199, z: 1.5817199}
+  m_LocalRotation: {x: 0.28049788, y: 0.63171977, z: -0.67300755, w: 0.2632717}
+  m_LocalPosition: {x: -1412.5691, y: -77.2, z: -3236.0593}
+  m_LocalScale: {x: 1.5817199, y: 1.58172, z: 1.5817199}
  m_ConstrainProportionsScale: 1
  m_Children: []
-  m_Father: {fileID: 2077331998}
-  m_RootOrder: 6
+  m_Father: {fileID: 57368836}
+  m_RootOrder: 0
  m_LocalEulerAnglesHint: {x: 93.62601, y: 134.728, z: -0.022003174}
 --- !u!64 &1561401315
 MeshCollider:
@@ -2338,7 +2317,7 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: ce44efba2e7898048a76f03b184fd342, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  _spawnPoint: {fileID: 0}
+  _spawnPoint: {fileID: 728462891}
 --- !u!1001 &1595843826
 PrefabInstance:
  m_ObjectHideFlags: 0
@@ -2434,11 +2413,6 @@ GameObject:
  m_CorrespondingSourceObject: {fileID: -391268320553695201, guid: e72a0706702deec48925ee98f7374a45, type: 3}
  m_PrefabInstance: {fileID: 1595843826}
  m_PrefabAsset: {fileID: 0}
--- !u!1 &1595843829 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 65702495048144492, guid: e72a0706702deec48925ee98f7374a45, type: 3}
-  m_PrefabInstance: {fileID: 1595843826}
-  m_PrefabAsset: {fileID: 0}
 --- !u!64 &1595843830
 MeshCollider:
  m_ObjectHideFlags: 0
@@ -2469,14 +2443,6 @@ Rigidbody:
  m_Interpolate: 0
  m_Constraints: 0
  m_CollisionDetection: 0
--- !u!81 &1595843832
-AudioListener:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1595843829}
-  m_Enabled: 1
 --- !u!20 &1595843837 stripped
 Camera:
  m_CorrespondingSourceObject: {fileID: -1853094968961178454, guid: e72a0706702deec48925ee98f7374a45, type: 3}
@@ -3186,8 +3152,10 @@ GameObject:
  - component: {fileID: 1805221251}
  - component: {fileID: 1805221250}
  - component: {fileID: 1805221253}
+  - component: {fileID: 1805221254}
+  - component: {fileID: 1805221255}
  m_Layer: 0
-  m_Name: Mountain C Camera Zone
+  m_Name: Mountain C Zone
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
@@ -3286,6 +3254,32 @@ MonoBehaviour:
  cameras:
  - {fileID: 1009805974}
  - {fileID: 1996453977}
+--- !u!114 &1805221254
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1805221248}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 62078f3dc064b304a9a033d66fa1157a, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  backgroundMusic: {fileID: 8300000, guid: 79a5e6bec678bf847a3ee6852890a652, type: 3}
+--- !u!114 &1805221255
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1805221248}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e569519f096090547aafb2a539705467, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  useGroundChecking: 0
 --- !u!1 &1974776453
 GameObject:
  m_ObjectHideFlags: 0
@@ -3792,7 +3786,6 @@ Transform:
  - {fileID: 1624670643}
  - {fileID: 35772942}
  - {fileID: 57368836}
-  - {fileID: 1561401314}
  m_Father: {fileID: 0}
  m_RootOrder: 1
  m_LocalEulerAnglesHint: {x: 0, y: -172.32, z: 0}
--- a/Assets/Scenes/Temple.unity
+++ b/Assets/Scenes/Temple.unity
@@ -694,7 +694,7 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 743cce483f727904a87ef002d24ec8d6, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  _player: {fileID: 0}
+  Player: {fileID: 0}
  _playerPrefab: {fileID: 6949365541298368387, guid: 6ebbe09c2673d744faf84db54d3d12ed, type: 3}
  _spawnLocation: {fileID: 1892337346}
 --- !u!4 &294425620
@@ -884,8 +884,10 @@ GameObject:
  - component: {fileID: 310258528}
  - component: {fileID: 310258527}
  - component: {fileID: 310258526}
+  - component: {fileID: 310258530}
+  - component: {fileID: 310258531}
  m_Layer: 0
-  m_Name: Sanctum Camera Zone
+  m_Name: Sanctum Zone
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
@@ -984,6 +986,32 @@ MeshFilter:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 310258524}
  m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!114 &310258530
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 310258524}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 62078f3dc064b304a9a033d66fa1157a, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  backgroundMusic: {fileID: 8300000, guid: 7ec6116eaa70bb64d9b0e30763c77adb, type: 3}
+--- !u!114 &310258531
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 310258524}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e569519f096090547aafb2a539705467, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  useGroundChecking: 0
 --- !u!54 &312982516
 Rigidbody:
  m_ObjectHideFlags: 0
@@ -3952,8 +3980,10 @@ GameObject:
  - component: {fileID: 860413836}
  - component: {fileID: 860413835}
  - component: {fileID: 860413834}
+  - component: {fileID: 860413838}
+  - component: {fileID: 860413839}
  m_Layer: 0
-  m_Name: Temple B Camera Zone
+  m_Name: Temple B Zone
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
@@ -4052,6 +4082,32 @@ MeshFilter:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 860413832}
  m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!114 &860413838
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 860413832}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 62078f3dc064b304a9a033d66fa1157a, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  backgroundMusic: {fileID: 8300000, guid: 3b5765e9830162448a81b1ba84c5dd91, type: 3}
+--- !u!114 &860413839
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 860413832}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e569519f096090547aafb2a539705467, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  useGroundChecking: 1
 --- !u!54 &862491693
 Rigidbody:
  m_ObjectHideFlags: 0
@@ -4155,8 +4211,10 @@ GameObject:
  - component: {fileID: 887465841}
  - component: {fileID: 887465840}
  - component: {fileID: 887465839}
+  - component: {fileID: 887465843}
+  - component: {fileID: 887465844}
  m_Layer: 0
-  m_Name: Temple C Camera Zone
+  m_Name: Temple C Zone
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
@@ -4255,6 +4313,32 @@ MeshFilter:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 887465837}
  m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!114 &887465843
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 887465837}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 62078f3dc064b304a9a033d66fa1157a, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  backgroundMusic: {fileID: 8300000, guid: 3b5765e9830162448a81b1ba84c5dd91, type: 3}
+--- !u!114 &887465844
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 887465837}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e569519f096090547aafb2a539705467, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  useGroundChecking: 1
 --- !u!54 &889289043
 Rigidbody:
  m_ObjectHideFlags: 0
@@ -5234,7 +5318,7 @@ GameObject:
  - component: {fileID: 1197244087}
  - component: {fileID: 1197244086}
  - component: {fileID: 1197244085}
-  - component: {fileID: 1197244084}
+  - component: {fileID: 1197244088}
  m_Layer: 0
  m_Name: ToWorldMap
  m_TagString: Untagged
@@ -5257,19 +5341,6 @@ Transform:
  m_Father: {fileID: 694668890}
  m_RootOrder: 1
  m_LocalEulerAnglesHint: {x: 90, y: 120, z: 0}
--- !u!114 &1197244084
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1197244082}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: ce44efba2e7898048a76f03b184fd342, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  _spawnPoint: {fileID: 6871527874556698278, guid: 0ca0511f2f28a4b438abd5c1f711bfbc, type: 3}
 --- !u!64 &1197244085
 MeshCollider:
  m_ObjectHideFlags: 0
@@ -5334,6 +5405,19 @@ MeshFilter:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1197244082}
  m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!114 &1197244088
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1197244082}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 2f7cf3b0e87656149a3acee1198cb0e0, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  scene: WorldMap
 --- !u!54 &1200965082
 Rigidbody:
  m_ObjectHideFlags: 0
@@ -5638,24 +5722,11 @@ MeshCollider:
  m_Convex: 0
  m_CookingOptions: 30
  m_Mesh: {fileID: 7634206507412756569, guid: 115376e935da499418654d7d4a03d748, type: 3}
--- !u!1 &1222111489 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 3584299649024768175, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3}
-  m_PrefabInstance: {fileID: 1361923644}
-  m_PrefabAsset: {fileID: 0}
 --- !u!4 &1222111490 stripped
 Transform:
  m_CorrespondingSourceObject: {fileID: 3584299649024768172, guid: 8ceeae119e95aeb46b0ece6d23daffbd, type: 3}
  m_PrefabInstance: {fileID: 1361923644}
  m_PrefabAsset: {fileID: 0}
--- !u!81 &1222111491
-AudioListener:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1222111489}
-  m_Enabled: 1
 --- !u!54 &1245753907
 Rigidbody:
  m_ObjectHideFlags: 0
@@ -6959,13 +7030,22 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  dialogue:
-    sentences:
+    Sentences:
    - My child
-    - "The land beyond these walls is just a whisper of what it once was.\r"
-    - Our own sanctuary far from the poison of Luaria.
+    - 'The land beyond these walls is just a whisper of
+
+      what it once was.'
+    - "Our own sanctuary far from the poison of Luaria.\r"
    - "Myself and my creations are dying because of her.\r"
-    - But you will be our answer, help make our existence be felt forever.
-    - Learn what they have to say, what they have to give.
+    - "But you will be our answer, help make our existence \nbe felt forever."
+    - "Learn what they have to say, what they have to give.\r"
+    SoundEffect:
+      audioClip: {fileID: 8300000, guid: 034b9a0779610324c9d164e622d2bfb0, type: 3}
+      pitchMin: 1
+      pitchMax: 1
+      volumeMin: 1
+      volumeMax: 1
+    TextSpeed: 0.1
 --- !u!114 &1496508331
 MonoBehaviour:
  m_ObjectHideFlags: 0
@@ -7085,8 +7165,10 @@ GameObject:
  - component: {fileID: 1510650686}
  - component: {fileID: 1510650685}
  - component: {fileID: 1510650684}
+  - component: {fileID: 1510650688}
+  - component: {fileID: 1510650689}
  m_Layer: 0
-  m_Name: Temple A Camera Zone
+  m_Name: Temple A Zone
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
@@ -7185,6 +7267,32 @@ MeshFilter:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1510650682}
  m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!114 &1510650688
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1510650682}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 62078f3dc064b304a9a033d66fa1157a, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  backgroundMusic: {fileID: 8300000, guid: 3b5765e9830162448a81b1ba84c5dd91, type: 3}
+--- !u!114 &1510650689
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1510650682}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e569519f096090547aafb2a539705467, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  useGroundChecking: 1
 --- !u!1 &1527842954
 GameObject:
  m_ObjectHideFlags: 0
@@ -8309,8 +8417,10 @@ GameObject:
  - component: {fileID: 1683568854}
  - component: {fileID: 1683568853}
  - component: {fileID: 1683568852}
+  - component: {fileID: 1683568856}
+  - component: {fileID: 1683568857}
  m_Layer: 0
-  m_Name: Temple D Camera Zone
+  m_Name: Temple D Zone
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
@@ -8409,6 +8519,32 @@ MeshFilter:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1683568850}
  m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!114 &1683568856
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1683568850}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 62078f3dc064b304a9a033d66fa1157a, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  backgroundMusic: {fileID: 8300000, guid: 3b5765e9830162448a81b1ba84c5dd91, type: 3}
+--- !u!114 &1683568857
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1683568850}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e569519f096090547aafb2a539705467, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  useGroundChecking: 1
 --- !u!54 &1691950228
 Rigidbody:
  m_ObjectHideFlags: 0
--- a/Assets/Scenes/World
+++ b/Assets/Scenes/World
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 5d3fcf4039199134b97f1ebe03cd1036
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/Scenes/World
+++ b/Assets/Scenes/World
--- a/Assets/Scenes/WorldMap.unity
+++ b/Assets/Scenes/WorldMap.unity
--- a/Assets/Scenes/WorldMap.unity.meta
+++ b/Assets/Scenes/WorldMap.unity.meta
--- a/Assets/Scripts/Audio/BGM.cs
+++ b/Assets/Scripts/Audio/BGM.cs
@@ -1,33 +1,19 @@
 using UnityEngine;
-using UnityEngine.SceneManagement;

 namespace Scampz.GameJam.Assets.Scripts.Audio
 {
  public class BGM : MonoBehaviour
  {
    [SerializeField]
-    private AudioClip[] backgroundMusic;
+    public AudioClip backgroundMusic;

-    public AudioClip GetClipFromSceneType(Scene scene)
+    private void OnTriggerEnter(Collider collider)
    {
-      AudioClip audioClipToPlay = null;
-
-      if (scene.name.Contains("Temple"))
-        audioClipToPlay = backgroundMusic[0];
-      if (scene.name.Contains("Sanctum"))
-        audioClipToPlay = backgroundMusic[1];
-      if (scene.name.Contains("Snow"))
-        audioClipToPlay = backgroundMusic[2];
-      if (scene.name.Equals("SnowC"))
-        audioClipToPlay = backgroundMusic[3];
-      if (scene.name.Contains("Airship"))
-        audioClipToPlay = backgroundMusic[4];
-      if (scene.name.Equals("AirshipInside"))
-        audioClipToPlay = backgroundMusic[5];
-      if (scene.name.Contains("Void"))
-        audioClipToPlay = backgroundMusic[6];
-
-      return audioClipToPlay;
+      if (collider.CompareTag("Player"))
+      {
+        var bgmManager = FindObjectOfType<BGMManager>();
+        bgmManager.PlayBGM(backgroundMusic);
+      }
    }
  }
 }
--- a/Assets/Scripts/Audio/BGMManager.cs
+++ b/Assets/Scripts/Audio/BGMManager.cs
@@ -1,16 +1,10 @@
-using Scampz.GameJam.Assets.Scripts.Audio;
-using UnityEngine;
-using UnityEngine.SceneManagement;
+using UnityEngine;

 namespace Scampz.GameJam.Assets.Scripts
 {
  [RequireComponent(typeof(AudioSource))]
  public class BGMManager : MonoBehaviour
  {
-
-    [SerializeField]
-    private BGM _backgroundMusic;
-
    private static AudioSource _audioSource;

    private void Awake()
@@ -21,47 +15,11 @@ namespace Scampz.GameJam.Assets.Scripts
        _audioSource.loop = true;
        DontDestroyOnLoad(_audioSource.gameObject);
      }
-
-      if (_backgroundMusic == null)
-      {
-        Instantiate(_backgroundMusic);
-        DontDestroyOnLoad(_backgroundMusic.gameObject);
-      }
-    }
-
-    private void OnEnable()
-    {
-      SceneManager.activeSceneChanged += PlayNextSongIfAreaChange;
-    }
-
-    private void OnDisable()
-    {
-      SceneManager.activeSceneChanged -= PlayNextSongIfAreaChange;
-    }
-
-    private void PlayNextSongIfAreaChange(Scene oldScene, Scene newScene)
-    {
-      if (_audioSource.clip == null)
-      {
-        var newMusic = _backgroundMusic.GetClipFromSceneType(newScene);
-        PlayBGM(newMusic);
-        return;
-      }
-
-      Debug.Log($"Changed scenes to " + newScene.name);
-      var newAudioClip = _backgroundMusic.GetClipFromSceneType(newScene);
-
-      if (_audioSource.clip.name != newAudioClip.name)
-      {
-        PlayBGM(newAudioClip);
-      }
-      Debug.Log($"Playing BGM: " + _backgroundMusic.name);
-
    }

    public void PlayBGM(AudioClip audioClip)
    {
-      if (_audioSource == null && _audioSource.clip == audioClip)
+      if (_audioSource == null || _audioSource.clip == audioClip)
        return;

      _audioSource.Stop();
--- a/Assets/Scripts/Audio/SFXManager.cs
+++ b/Assets/Scripts/Audio/SFXManager.cs
@@ -26,7 +26,8 @@ namespace Scampz.GameJam.Assets.Scripts.Audio
    public void PlaySoundEffect(string soundEffect)
    {
      var audioClip = GetClipFromName(soundEffect);
-      _audioSource.PlayOneShot(audioClip);
+      _audioSource.clip = audioClip;
+      _audioSource.Play();
    }

    public void StopSoundEffect()
--- a/Assets/Scripts/Camera/CameraFollow.cs
+++ b/Assets/Scripts/Camera/CameraFollow.cs
@@ -1,4 +1,3 @@
-using System;
 using UnityEngine;

 namespace Scampz.GameJam
@@ -13,20 +12,19 @@ namespace Scampz.GameJam
    private float smoothFactor = 0.5f;
    [SerializeField]
    private bool lookAtTarget = false;
+    [SerializeField]
+    private float _cameraYPosition = 45f;

    private void Start()
    {
-      //cameraOffset = transform.position - targetObject.transform.position;
+      transform.position = targetObject.transform.position - cameraOffset;
    }

    private void LateUpdate()
    {
-      if (lookAtTarget)
-        transform.LookAt(targetObject);
-
-      var newPosition = targetObject.transform.position + cameraOffset;
-      var absTransform = new Vector3(newPosition.x, Math.Abs(newPosition.y), newPosition.z);
-      transform.position = Vector3.Slerp(transform.position, newPosition, smoothFactor);
+      var lockedInYPosition = new Vector3(targetObject.transform.position.x - cameraOffset.x, _cameraYPosition, targetObject.transform.position.z - cameraOffset.z);
+      transform.position = lockedInYPosition;
+      transform.LookAt(transform);
    }
  }
 }
--- a/Assets/Scripts/Dialogue/Dialogue.cs
+++ b/Assets/Scripts/Dialogue/Dialogue.cs
@@ -7,8 +7,7 @@ namespace Scampz.GameJam
  {
    [TextArea(3, 10)]
    public string[] Sentences;
-
-    [SerializeField]
    public SFXClip SoundEffect;
+    public float TextSpeed;
  }
 }
--- a/Assets/Scripts/Dialogue/DialogueManager.cs
+++ b/Assets/Scripts/Dialogue/DialogueManager.cs
@@ -16,11 +16,6 @@ namespace Scampz.GameJam
    private Animator _animator;
    [SerializeField]
    private TextMeshProUGUI _dialogueTextGUI;
-    [SerializeField]
-    private float _defaultTextSpeed = 0.1f;
-
-    private float _currentTextSpeed;
-

    private Queue<string> sentences;

@@ -48,8 +43,6 @@ namespace Scampz.GameJam
    {
      if (IsTalking && Input.GetButtonDown(InputOptions.Cancel))
        EndDialogue();
-
-      _currentTextSpeed = _defaultTextSpeed;
    }

    public void StartDialogue(Dialogue dialogue)
@@ -93,10 +86,12 @@ namespace Scampz.GameJam
      {
        _dialogueTextGUI.text += letter;
        yield return null;
-        yield return new WaitForSeconds(_currentTextSpeed);
+        yield return new WaitForSeconds(dialogue.TextSpeed);
      }

-      yield return new WaitForSeconds(1f);
+      yield return null;
+      SFXManager.Instance.StopSoundEffect();
+      yield return new WaitForSeconds(0.3f);
      yield return new WaitForKeyDown(InputOptions.Submit);
      SFXManager.Instance.PlaySoundEffect(SoundEffectName.Ok);
      DisplayNextSentence(dialogue);
@@ -104,6 +99,7 @@ namespace Scampz.GameJam

    private void EndDialogue()
    {
+      StopAllCoroutines();
      _animator.SetBool("IsOpen", false);
      _dialogueTextGUI.text = string.Empty;
      IsTalking = false;
--- a/Assets/Scripts/GameManager/GameManager.cs
+++ b/Assets/Scripts/GameManager/GameManager.cs
@@ -1,5 +1,4 @@
 using System.Collections;
-using Scampz.GameJam.Assets.Scripts;
 using UnityEngine;
 using UnityEngine.SceneManagement;

@@ -8,7 +7,7 @@ namespace Scampz.GameJam
  public class GameManager : MonoBehaviour
  {
    public static GameManager Instance;
-    private LevelChanger _levelChanger;
+    //private LevelChanger _levelChanger;

    private void Awake()
    {
@@ -19,16 +18,16 @@ namespace Scampz.GameJam
      }

      Instance = this;
-      _levelChanger = GetComponentInChildren<LevelChanger>();
+      //_levelChanger = GetComponentInChildren<LevelChanger>();
    }


-    public void LoadScene(string sceneName, Transform spawnPoint, LoadSceneMode loadSceneMode)
+    public void LoadScene(string sceneName, LoadSceneMode loadSceneMode)
    {
-      StartCoroutine(LoadSceneAsync(sceneName, spawnPoint, loadSceneMode));
+      StartCoroutine(LoadSceneAsync(sceneName, loadSceneMode));
    }

-    private IEnumerator LoadSceneAsync(string sceneName, Transform spawnPoint, LoadSceneMode loadSceneMode)
+    private IEnumerator LoadSceneAsync(string sceneName, LoadSceneMode loadSceneMode)
    {
      yield return null;
      var loadSceneOperation = SceneManager.LoadSceneAsync(sceneName, loadSceneMode);
@@ -42,19 +41,6 @@ namespace Scampz.GameJam

      loadSceneOperation.allowSceneActivation = true;
      yield return loadSceneOperation;
-
-      if (SceneManager.GetActiveScene().name == sceneName)
-      {
-        var player = GameObject.FindGameObjectWithTag("Player");
-        player.transform.position = spawnPoint.transform.position;
-        player.transform.rotation = spawnPoint.transform.rotation;
-
-        var camera = player.GetComponentInChildren<Camera>();
-        if (SceneManager.GetActiveScene().name == SceneNames.WorldMap)
-          camera.enabled = true;
-        else
-          camera.enabled = false;
-      }
    }
  }
 }
--- a/Assets/Scripts/GameManager/PlayerSpawnController.cs
+++ b/Assets/Scripts/GameManager/PlayerSpawnController.cs
@@ -1,41 +1,19 @@
-using System.Linq;
 using UnityEngine;

 public class PlayerSpawnController : MonoBehaviour
 {
-  [SerializeField]
-  private GameObject _player;
+  public GameObject Player;
  [SerializeField]
  private GameObject _playerPrefab;
  [SerializeField]
  private GameObject _spawnLocation;

-
-  private void Awake()
-  {
-    var otherSpawnControllers = FindObjectsOfType<PlayerSpawnController>().Except(new[] { this });
-    if (otherSpawnControllers.Any())
-      Destroy(this);
-    else
-      DontDestroyOnLoad(this.gameObject);
-  }
-
  private void Start()
  {
-    if (GameObject.FindGameObjectWithTag("Player") != null)
-    {
-      _player = GameObject.FindGameObjectWithTag("Player");
-      _player.transform.position = _spawnLocation.transform.position;
-      _player.transform.rotation = _spawnLocation.transform.rotation;
-
-    }
-    else
-    {
-      _player = Instantiate(_playerPrefab);
-      _player.transform.position = _spawnLocation.transform.position;
-      _player.transform.rotation = _spawnLocation.transform.rotation;
-      DontDestroyOnLoad(_player);
-    }
+    Player = Instantiate(_playerPrefab);
+    Player.transform.position = _spawnLocation.transform.position;
+    Player.transform.rotation = _spawnLocation.transform.rotation;
+    DontDestroyOnLoad(Player);
  }

 }
--- a/Assets/Scripts/Input/RayCaster.cs
+++ b/Assets/Scripts/Input/RayCaster.cs
@@ -13,12 +13,6 @@ namespace Scampz.GameJam.Assets.Scripts

    private float currentHitDistance;

-    //public bool IsWithinBounds()
-    //{
-    //  var offsetAngle = Quaternion.AngleAxis(rayCastAngle, transform.right);
-    //  return Physics.Raycast(transform.position, offsetAngle * transform.forward);
-    //}
-
    public bool IsWithinBounds()
    {
      var offsetAngleRight = Quaternion.AngleAxis(rayCastAngle, transform.right);
--- a/Assets/Scripts/Input/UseGroundChecking.cs
+++ b/Assets/Scripts/Input/UseGroundChecking.cs
@@ -0,0 +1,21 @@
+using UnityEngine;
+
+namespace Scampz.GameJam.Assets.Scripts
+{
+  public class UseGroundChecking : MonoBehaviour
+  {
+    [SerializeField]
+    private bool useGroundChecking;
+
+    private void OnTriggerEnter(Collider collider)
+    {
+      if (collider.CompareTag("Player"))
+      {
+        var playerSpawnController = FindObjectOfType<PlayerSpawnController>();
+        var player = playerSpawnController.Player;
+        var rayCaster = player.GetComponent<RayCaster>();
+        rayCaster.enabled = useGroundChecking;
+      }
+    }
+  }
+}
--- a/Assets/Scripts/Input/UseGroundChecking.cs.meta
+++ b/Assets/Scripts/Input/UseGroundChecking.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: e569519f096090547aafb2a539705467
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Scripts/Player/PlayerState.cs
+++ b/Assets/Scripts/Player/PlayerState.cs
@@ -22,7 +22,8 @@ namespace Scampz.GameJam.Assets.Scripts.Player
    private void Update()
    {
      _animator.SetFloat("Speed", _characterController.velocity.magnitude);
-      _canMove = _rayCaster.IsWithinBounds();
+      if (_rayCaster.enabled)
+        _canMove = _rayCaster.IsWithinBounds();
    }

    public bool CanMove => _canMove;
--- a/Assets/Scripts/SceneManagement/LoadScene.cs
+++ b/Assets/Scripts/SceneManagement/LoadScene.cs
@@ -8,19 +8,13 @@ namespace Scampz.GameJam
    private bool loaded = false;
    [SerializeField]
    private string scene;
-    [SerializeField]
-    private Transform _spawnPoint;

    void OnTriggerEnter(Collider collider)
    {
      if (!loaded && collider.CompareTag("Player"))
      {
        loaded = true;
-        var player = GameObject.FindGameObjectWithTag("Player");
-        var cc = player.GetComponent<CharacterController>();
-        cc.enabled = false;
-        GameManager.Instance.LoadScene(scene, _spawnPoint, LoadSceneMode.Single);
-        cc.enabled = true;
+        GameManager.Instance.LoadScene(scene, LoadSceneMode.Single);
      }
    }
  }
--- a/Assets/Scripts/TitleScreen/TitleScreen.cs
+++ b/Assets/Scripts/TitleScreen/TitleScreen.cs
@@ -10,7 +10,7 @@ namespace Scampz.GameJam
    {
      if (Input.GetButtonDown(InputOptions.Submit))
      {
-        GameManager.Instance.LoadScene(SceneNames.TempleA, transform, LoadSceneMode.Single);
+        GameManager.Instance.LoadScene(SceneNames.TempleA, LoadSceneMode.Single);
      }
    }
  }
--- a/Assets/Singleton/SingletonManager.prefab
+++ b/Assets/Singleton/SingletonManager.prefab
@@ -282,6 +282,7 @@ GameObject:
  serializedVersion: 6
  m_Component:
  - component: {fileID: 3584299649024768172}
+  - component: {fileID: 1222111491}
  m_Layer: 0
  m_Name: SingletonManager
  m_TagString: Untagged
@@ -308,6 +309,14 @@ Transform:
  m_Father: {fileID: 0}
  m_RootOrder: 0
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!81 &1222111491
+AudioListener:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3584299649024768175}
+  m_Enabled: 1
 --- !u!1 &3584299649035273206
 GameObject:
  m_ObjectHideFlags: 0
@@ -353,7 +362,6 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 978ba66c51f1aa942bb951304a3dc54d, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  _backgroundMusic: {fileID: 2471171845959243506, guid: bc4dd6e772668d64f95ce6ea28022290, type: 3}
 --- !u!82 &7607175870710481519
 AudioSource:
  m_ObjectHideFlags: 0
@@ -784,7 +792,7 @@ AudioSource:
  m_PlayOnAwake: 0
  m_Volume: 1
  m_Pitch: 1
-  Loop: 0
+  Loop: 1
  Mute: 0
  Spatialize: 0
  SpatializePostEffects: 0
--- a/Assets/SpawnPoints/Airship
+++ b/Assets/SpawnPoints/Airship
@@ -93,7 +93,7 @@ SphereCollider:
  m_GameObject: {fileID: 4485874007059686765}
  m_Material: {fileID: 0}
  m_IsTrigger: 0
-  m_Enabled: 1
+  m_Enabled: 0
  serializedVersion: 2
  m_Radius: 0.5
  m_Center: {x: 0, y: 0, z: 0}
--- a/Assets/SpawnPoints/Snow
+++ b/Assets/SpawnPoints/Snow
@@ -26,7 +26,7 @@ Transform:
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 4255233373611660780}
-  m_LocalRotation: {x: -0, y: 0.3014355, z: -0, w: 0.9534866}
+  m_LocalRotation: {x: 0, y: 0.3014381, z: 0, w: 0.9534858}
  m_LocalPosition: {x: 15.6, y: 35.33, z: -27.64}
  m_LocalScale: {x: 0.6051534, y: 0.6051534, z: 0.6051534}
  m_ConstrainProportionsScale: 1
@@ -93,7 +93,7 @@ SphereCollider:
  m_GameObject: {fileID: 4255233373611660780}
  m_Material: {fileID: 0}
  m_IsTrigger: 0
-  m_Enabled: 1
+  m_Enabled: 0
  serializedVersion: 2
  m_Radius: 0.5
  m_Center: {x: 0, y: 0, z: 0}
--- a/Assets/SpawnPoints/Temple
+++ b/Assets/SpawnPoints/Temple
@@ -26,7 +26,7 @@ Transform:
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 6871527874556698274}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
  m_LocalPosition: {x: 42.385, y: 38.829, z: -7.6204}
  m_LocalScale: {x: 0.18086, y: 0.18086, z: 0.18086}
  m_ConstrainProportionsScale: 1
@@ -93,7 +93,7 @@ SphereCollider:
  m_GameObject: {fileID: 6871527874556698274}
  m_Material: {fileID: 0}
  m_IsTrigger: 0
-  m_Enabled: 1
+  m_Enabled: 0
  serializedVersion: 2
  m_Radius: 0.5
  m_Center: {x: 0, y: 0, z: 0}