Actual Alpha Build

2022-08-21 01:59:54 -07:00
parent 6e3dbb516b
commit 41530d5ba4
10 changed files with 1286 additions and 67 deletions
--- a/Assets/Player/Player.prefab
+++ b/Assets/Player/Player.prefab
@@ -1038,7 +1038,7 @@ CharacterController:
  serializedVersion: 2
  m_Height: 3
  m_Radius: 1
-  m_SlopeLimit: 75
+  m_SlopeLimit: 75.01
  m_StepOffset: 1.5
  m_SkinWidth: 0.08
  m_MinMoveDistance: 0
--- a/Assets/Scenes/Mountain.unity
+++ b/Assets/Scenes/Mountain.unity
@@ -492,7 +492,7 @@ Transform:
  m_ConstrainProportionsScale: 0
  m_Children: []
  m_Father: {fileID: 436779933}
-  m_RootOrder: 2
+  m_RootOrder: 3
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!64 &366952851
 MeshCollider:
@@ -592,8 +592,8 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 392546070}
  m_LocalRotation: {x: -0, y: 0.93505573, z: -0, w: 0.35450074}
-  m_LocalPosition: {x: -1401.5497, y: -101.23, z: -3266.0686}
-  m_LocalScale: {x: 25.01164, y: 2.501164, z: 25.01164}
+  m_LocalPosition: {x: -1394.2, y: -101.23, z: -3265.1}
+  m_LocalScale: {x: 28.92346, y: 2.892346, z: 28.92346}
  m_ConstrainProportionsScale: 1
  m_Children: []
  m_Father: {fileID: 2077331998}
@@ -1104,10 +1104,10 @@ Transform:
  m_ConstrainProportionsScale: 0
  m_Children:
  - {fileID: 872275959}
-  - {fileID: 672092648}
-  - {fileID: 366952850}
-  - {fileID: 1651078844}
  - {fileID: 437583651}
+  - {fileID: 1651078844}
+  - {fileID: 366952850}
+  - {fileID: 672092648}
  m_Father: {fileID: 2077331998}
  m_RootOrder: 4
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -1143,7 +1143,7 @@ Transform:
  m_ConstrainProportionsScale: 0
  m_Children: []
  m_Father: {fileID: 436779933}
-  m_RootOrder: 4
+  m_RootOrder: 1
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!64 &437583652
 MeshCollider:
@@ -1557,7 +1557,7 @@ Transform:
  m_ConstrainProportionsScale: 0
  m_Children: []
  m_Father: {fileID: 436779933}
-  m_RootOrder: 1
+  m_RootOrder: 4
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!64 &672092649
 MeshCollider:
@@ -2008,6 +2008,103 @@ Camera:
  m_OcclusionCulling: 1
  m_StereoConvergence: 10
  m_StereoSeparation: 0.022
+--- !u!1 &909201194
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 909201195}
+  - component: {fileID: 909201198}
+  - component: {fileID: 909201197}
+  - component: {fileID: 909201196}
+  m_Layer: 0
+  m_Name: Cube
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &909201195
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 909201194}
+  m_LocalRotation: {x: -0, y: -0.35973576, z: -0, w: 0.93305427}
+  m_LocalPosition: {x: -1359.4, y: -104.134674, z: -3273.3}
+  m_LocalScale: {x: 10.02, y: 75.8934, z: 133.91023}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 2077331998}
+  m_RootOrder: 9
+  m_LocalEulerAnglesHint: {x: 0, y: -42.168, z: 0}
+--- !u!65 &909201196
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 909201194}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 1, y: 1, z: 1}
+  m_Center: {x: 0, y: 0, z: 0}
+--- !u!23 &909201197
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 909201194}
+  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 &909201198
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 909201194}
+  m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
 --- !u!1 &925009686
 GameObject:
  m_ObjectHideFlags: 0
@@ -2434,6 +2531,103 @@ Transform:
  m_Father: {fileID: 2082500391}
  m_RootOrder: 1
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &1431375352
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1431375353}
+  - component: {fileID: 1431375356}
+  - component: {fileID: 1431375355}
+  - component: {fileID: 1431375354}
+  m_Layer: 0
+  m_Name: Cube (2)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1431375353
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1431375352}
+  m_LocalRotation: {x: -0, y: -0.86631376, z: -0, w: 0.49950033}
+  m_LocalPosition: {x: -1356.4, y: -104.134674, z: -3328.2}
+  m_LocalScale: {x: 10.02, y: 75.8934, z: 133.91023}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 2077331998}
+  m_RootOrder: 11
+  m_LocalEulerAnglesHint: {x: 0, y: -120.066, z: 0}
+--- !u!65 &1431375354
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1431375352}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 1, y: 1, z: 1}
+  m_Center: {x: 0, y: 0, z: 0}
+--- !u!23 &1431375355
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1431375352}
+  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 &1431375356
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1431375352}
+  m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
 --- !u!1 &1561401313
 GameObject:
  m_ObjectHideFlags: 0
@@ -2959,6 +3153,103 @@ Rigidbody:
  m_Interpolate: 0
  m_Constraints: 0
  m_CollisionDetection: 0
+--- !u!1 &1617412154
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1617412155}
+  - component: {fileID: 1617412158}
+  - component: {fileID: 1617412157}
+  - component: {fileID: 1617412156}
+  m_Layer: 0
+  m_Name: Cube (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1617412155
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1617412154}
+  m_LocalRotation: {x: -0, y: -0.35973576, z: -0, w: 0.93305427}
+  m_LocalPosition: {x: -1386.8, y: -104.134674, z: -3324.3}
+  m_LocalScale: {x: 10.02, y: 75.8934, z: 133.91023}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 2077331998}
+  m_RootOrder: 10
+  m_LocalEulerAnglesHint: {x: 0, y: -42.168, z: 0}
+--- !u!65 &1617412156
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1617412154}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 1, y: 1, z: 1}
+  m_Center: {x: 0, y: 0, z: 0}
+--- !u!23 &1617412157
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1617412154}
+  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 &1617412158
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1617412154}
+  m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
 --- !u!1 &1620235925
 GameObject:
  m_ObjectHideFlags: 0
@@ -3201,7 +3492,7 @@ Transform:
  m_ConstrainProportionsScale: 0
  m_Children: []
  m_Father: {fileID: 436779933}
-  m_RootOrder: 3
+  m_RootOrder: 2
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!64 &1651078845
 MeshCollider:
@@ -3294,14 +3585,14 @@ Transform:
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1716491135}
-  m_LocalRotation: {x: 0.68841404, y: -0.000000048428777, z: 0.09282742, w: 0.7193533}
-  m_LocalPosition: {x: -1373.3, y: -97.803635, z: -3332.4}
-  m_LocalScale: {x: 6.2758, y: 6.2758, z: 6.2758}
+  m_LocalRotation: {x: 0.65049183, y: -0.16008838, z: 0.24370272, w: 0.70131385}
+  m_LocalPosition: {x: -1368.1, y: -97.803635, z: -3316.6}
+  m_LocalScale: {x: 9.233585, y: 9.233585, z: 9.233585}
  m_ConstrainProportionsScale: 1
  m_Children: []
  m_Father: {fileID: 57368836}
  m_RootOrder: 1
-  m_LocalEulerAnglesHint: {x: 82.065, y: 67.794, z: 75.339}
+  m_LocalEulerAnglesHint: {x: 82.065, y: 42.077, z: 75.339}
 --- !u!114 &1716491137
 MonoBehaviour:
  m_ObjectHideFlags: 0
@@ -3315,6 +3606,7 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  scene: WorldMap
+  _spawnPoint: {fileID: 4255233373611660781, guid: 844f61aa5905adc408915b1af9c53fab, type: 3}
 --- !u!64 &1716491138
 MeshCollider:
  m_ObjectHideFlags: 0
@@ -4118,6 +4410,9 @@ Transform:
  - {fileID: 35772942}
  - {fileID: 57368836}
  - {fileID: 165937104}
+  - {fileID: 909201195}
+  - {fileID: 1617412155}
+  - {fileID: 1431375353}
  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
@@ -3299,7 +3299,7 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 887465837}
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 802.6505, y: 12.510616, z: -152}
+  m_LocalPosition: {x: 198, y: 12.510616, z: 23}
  m_LocalScale: {x: 347.2, y: 347.2, z: 347.2}
  m_ConstrainProportionsScale: 1
  m_Children: []
@@ -4185,6 +4185,7 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  scene: WorldMap
+  _spawnPoint: {fileID: 6871527874556698278, guid: 0ca0511f2f28a4b438abd5c1f711bfbc, type: 3}
 --- !u!1 &1207374167 stripped
 GameObject:
  m_CorrespondingSourceObject: {fileID: 8371988295430097843, guid: 51f29eb6c8a88234f818b1d46a1616c5, type: 3}
@@ -6422,9 +6423,7 @@ GameObject:
  - component: {fileID: 1683568855}
  - component: {fileID: 1683568854}
  - component: {fileID: 1683568853}
-  - component: {fileID: 1683568852}
  - component: {fileID: 1683568856}
-  - component: {fileID: 1683568857}
  m_Layer: 0
  m_Name: Temple D Zone
  m_TagString: Untagged
@@ -6441,24 +6440,12 @@ Transform:
  m_GameObject: {fileID: 1683568850}
  m_LocalRotation: {x: -0, y: 0.59908956, z: -0, w: 0.80068207}
  m_LocalPosition: {x: 450.61426, y: 423.38245, z: -441.3246}
-  m_LocalScale: {x: 39.46, y: 39.46, z: 39.46}
+  m_LocalScale: {x: 94.64862, y: 94.64862, z: 94.64862}
  m_ConstrainProportionsScale: 1
  m_Children: []
  m_Father: {fileID: 583349410}
  m_RootOrder: 2
  m_LocalEulerAnglesHint: {x: 0, y: 73.609, z: 0}
--- !u!114 &1683568852
-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: 8d750c023dab0b040a63e345c8b2830d, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
 --- !u!65 &1683568853
 BoxCollider:
  m_ObjectHideFlags: 0
@@ -6535,18 +6522,6 @@ MonoBehaviour:
  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: 
 --- !u!1 &1696556166 stripped
 GameObject:
  m_CorrespondingSourceObject: {fileID: 9133296873901943786, guid: 51f29eb6c8a88234f818b1d46a1616c5, type: 3}
--- a/Assets/Scenes/TitleScreen.unity
+++ b/Assets/Scenes/TitleScreen.unity
--- a/Assets/Scripts/GameManager/GameManager.cs
+++ b/Assets/Scripts/GameManager/GameManager.cs
@@ -7,7 +7,6 @@ namespace Scampz.GameJam
  public class GameManager : MonoBehaviour
  {
    public static GameManager Instance;
-    private LevelChanger _levelChanger;

    private void Awake()
    {
@@ -16,20 +15,26 @@ namespace Scampz.GameJam
        Destroy(this);
        return;
      }
-
      Instance = this;
-      _levelChanger = GetComponentInChildren<LevelChanger>();
    }


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

-    private IEnumerator LoadSceneAsync(string sceneName, LoadSceneMode loadSceneMode)
+    public void LoadFromWorldMap(LoadSceneMode loadSceneMode)
    {
-      _levelChanger.FadeAnimation();
+      SceneManager.LoadScene("WorldMap", loadSceneMode);
+    }
+
+    private IEnumerator LoadSceneAsync(string sceneName, Transform spawnPoint, LoadSceneMode loadSceneMode)
+    {
+      yield return null;
+      var player = GameObject.FindGameObjectWithTag("Player");
+      var levelChanger = GetComponentInChildren<LevelChanger>();
+      levelChanger.FadeAnimation();
      yield return null;
      var loadSceneOperation = SceneManager.LoadSceneAsync(sceneName, loadSceneMode);
      yield return new WaitForSeconds(3f);
@@ -44,6 +49,11 @@ namespace Scampz.GameJam

      loadSceneOperation.allowSceneActivation = true;
      yield return loadSceneOperation;
+      var cc = player.GetComponent<CharacterController>();
+      cc.enabled = false;
+      player.transform.position = spawnPoint.position;
+      player.transform.rotation = spawnPoint.rotation;
+      yield return null;
    }
  }
 }
--- a/Assets/Scripts/Player/PlayerState.cs
+++ b/Assets/Scripts/Player/PlayerState.cs
@@ -1,4 +1,5 @@
 using UnityEngine;
+using UnityEngine.SceneManagement;

 namespace Scampz.GameJam.Assets.Scripts.Player
 {
@@ -21,7 +22,7 @@ namespace Scampz.GameJam.Assets.Scripts.Player
      _canMove = true;
      _animator.SetFloat("Speed", _characterController.velocity.magnitude);
      var rayCasterExists = TryGetComponent<RayCaster>(out var rayCaster);
-      if (rayCasterExists)
+      if (SceneManager.GetActiveScene().name.Equals("WorldMap") && rayCasterExists)
        _canMove = rayCaster.IsWithinBoundsWithRay();
    }

--- a/Assets/Scripts/SceneManagement/LoadScene.cs
+++ b/Assets/Scripts/SceneManagement/LoadScene.cs
@@ -8,13 +8,15 @@ 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;
-        GameManager.Instance.LoadScene(scene, LoadSceneMode.Single);
+        GameManager.Instance.LoadScene(scene, _spawnPoint, 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("WorldMap", LoadSceneMode.Single);
+        GameManager.Instance.LoadFromWorldMap(LoadSceneMode.Single);
      }
    }
  }
--- a/Assets/Singleton/SingletonManager.prefab
+++ b/Assets/Singleton/SingletonManager.prefab
@@ -459,7 +459,7 @@ GameObject:
  serializedVersion: 6
  m_Component:
  - component: {fileID: 3584299648992395886}
-  - component: {fileID: 7941352839808612940}
+  - component: {fileID: 2037842046}
  m_Layer: 0
  m_Name: Game Manager
  m_TagString: Untagged
@@ -483,7 +483,7 @@ Transform:
  m_Father: {fileID: 3584299649024768172}
  m_RootOrder: 1
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &7941352839808612940
+--- !u!114 &2037842046
 MonoBehaviour:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}