Bugfixes

Assets/Prefabs/Game Manager.prefab

@@ -3453,7 +3453,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   time: 180
-  offset: 1
+  offset: 0.5
   gameOver: 0
   gameTimer: {fileID: 4832072825095962115}
   spawnPosition: {x: -10.25, y: 20}

Assets/Scenes/Platform3 (MOUNTAIN).unity

@@ -728,19 +728,19 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 571414325634037365, guid: e3c570bb90d434e809aca2a339dadf5d, type: 3}
       propertyPath: m_LocalPosition.x
-      value: 3337.9
+      value: 3337.33
       objectReference: {fileID: 0}
     - target: {fileID: 571414325634037365, guid: e3c570bb90d434e809aca2a339dadf5d, type: 3}
       propertyPath: m_LocalPosition.y
-      value: -1195.6
+      value: -1188.23
       objectReference: {fileID: 0}
     - target: {fileID: 912213889251959308, guid: e3c570bb90d434e809aca2a339dadf5d, type: 3}
       propertyPath: m_LocalPosition.x
-      value: 3338.48
+      value: 3310.98
       objectReference: {fileID: 0}
     - target: {fileID: 912213889251959308, guid: e3c570bb90d434e809aca2a339dadf5d, type: 3}
       propertyPath: m_LocalPosition.y
-      value: -1187.96
+      value: -1175.96
       objectReference: {fileID: 0}
     - target: {fileID: 1044159204125992194, guid: e3c570bb90d434e809aca2a339dadf5d, type: 3}
       propertyPath: m_text
@@ -814,6 +814,18 @@ PrefabInstance:
       propertyPath: m_AnchoredPosition.y
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 2186267228133796722, guid: e3c570bb90d434e809aca2a339dadf5d, type: 3}
+      propertyPath: m_Size.x
+      value: 1.3040133
+      objectReference: {fileID: 0}
+    - target: {fileID: 2186267228133796722, guid: e3c570bb90d434e809aca2a339dadf5d, type: 3}
+      propertyPath: m_Size.y
+      value: 1.6232014
+      objectReference: {fileID: 0}
+    - target: {fileID: 2186267228133796722, guid: e3c570bb90d434e809aca2a339dadf5d, type: 3}
+      propertyPath: m_Offset.y
+      value: 0.3116007
+      objectReference: {fileID: 0}
     - target: {fileID: 2396754106601062846, guid: e3c570bb90d434e809aca2a339dadf5d, type: 3}
       propertyPath: TimerCanvas
       value: 
@@ -832,15 +844,15 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 2396754106601062846, guid: e3c570bb90d434e809aca2a339dadf5d, type: 3}
       propertyPath: hatSpawnPositions.Array.size
-      value: 7
+      value: 8
       objectReference: {fileID: 0}
     - target: {fileID: 2396754106601062846, guid: e3c570bb90d434e809aca2a339dadf5d, type: 3}
       propertyPath: obstacleCourseSpawnPosition.x
-      value: 12.57
+      value: 18.16
       objectReference: {fileID: 0}
     - target: {fileID: 2396754106601062846, guid: e3c570bb90d434e809aca2a339dadf5d, type: 3}
       propertyPath: obstacleCourseSpawnPosition.y
-      value: -2.91
+      value: 3.11
       objectReference: {fileID: 0}
     - target: {fileID: 2396754106601062846, guid: e3c570bb90d434e809aca2a339dadf5d, type: 3}
       propertyPath: hatSpawnPositions.Array.data[0].x
@@ -898,6 +910,14 @@ PrefabInstance:
       propertyPath: hatSpawnPositions.Array.data[6].y
       value: 11.49
       objectReference: {fileID: 0}
+    - target: {fileID: 2396754106601062846, guid: e3c570bb90d434e809aca2a339dadf5d, type: 3}
+      propertyPath: hatSpawnPositions.Array.data[7].x
+      value: 12.57
+      objectReference: {fileID: 0}
+    - target: {fileID: 2396754106601062846, guid: e3c570bb90d434e809aca2a339dadf5d, type: 3}
+      propertyPath: hatSpawnPositions.Array.data[7].y
+      value: -2.93
+      objectReference: {fileID: 0}
     - target: {fileID: 2931591312562416945, guid: e3c570bb90d434e809aca2a339dadf5d, type: 3}
       propertyPath: m_AnchorMax.y
       value: 0
@@ -1004,11 +1024,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 4682083114220027504, guid: e3c570bb90d434e809aca2a339dadf5d, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 101.600006
+      value: 101.6001
       objectReference: {fileID: 0}
     - target: {fileID: 4682083114220027504, guid: e3c570bb90d434e809aca2a339dadf5d, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -19.699997
+      value: -19.699951
       objectReference: {fileID: 0}
     - target: {fileID: 4832072825095962115, guid: e3c570bb90d434e809aca2a339dadf5d, type: 3}
       propertyPath: timer
@@ -1752,6 +1772,37 @@ Transform:
   m_CorrespondingSourceObject: {fileID: 3112094464486095581, guid: 7ed7f487004eb4aecb4b68152600f459, type: 3}
   m_PrefabInstance: {fileID: 956247816}
   m_PrefabAsset: {fileID: 0}
+--- !u!1 &958632159
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 958632160}
+  m_Layer: 0
+  m_Name: HELPER_1
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &958632160
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 958632159}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 18.16, y: 3.11, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1001 &975586122
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -1766,7 +1817,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 3112094464486095581, guid: 7ed7f487004eb4aecb4b68152600f459, type: 3}
       propertyPath: m_LocalPosition.y
-      value: -3.45157
+      value: -3.20157
       objectReference: {fileID: 0}
     - target: {fileID: 3112094464486095581, guid: 7ed7f487004eb4aecb4b68152600f459, type: 3}
       propertyPath: m_LocalPosition.z
@@ -7612,7 +7663,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 4664891637007210485, guid: e659ce6dc4d58ff4f9726fa05e1bab20, type: 3}
       propertyPath: m_LocalPosition.x
-      value: 0
+      value: -6.3
       objectReference: {fileID: 0}
     - target: {fileID: 4664891637007210485, guid: e659ce6dc4d58ff4f9726fa05e1bab20, type: 3}
       propertyPath: m_LocalPosition.y
@@ -7620,7 +7671,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 4664891637007210485, guid: e659ce6dc4d58ff4f9726fa05e1bab20, type: 3}
       propertyPath: m_LocalPosition.z
-      value: -30
+      value: -35
       objectReference: {fileID: 0}
     - target: {fileID: 4664891637007210485, guid: e659ce6dc4d58ff4f9726fa05e1bab20, type: 3}
       propertyPath: m_LocalRotation.w
@@ -7673,3 +7724,4 @@ SceneRoots:
   - {fileID: 346911101}
   - {fileID: 1719470813}
   - {fileID: 1467444428}
+  - {fileID: 958632160}

Assets/Scenes/Title Screen.unity

@@ -3195,16 +3195,9 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_text: "Needs work:\nReset confirmation\nSound effects in game\nPlatform friction\nFacing
+  m_text: 'Needs work:
-    angle not velocity-based\nDead player constant velocity\n\nComplete:\n#Player
+
-    Join screen update (clarify map select)\n#Player card players\n#Join screen titles\n#Implement
+    Reset confirmation'
-    music\n#Mountain music\n#Make city playable\n#One way platform mountain\n#Get
-    rid of placeholder start stop obstacle course\n#Respawn after game over (ALL
-    GAMEMODES)\n#Fix Time Left! text\n#Obstacle course end only works on correct
-    gamemode\n#Obstacle course end for mountain\n#Correct time limits for keep away
-    maps \n#Obstacle course flag\n#Health bar persists after death\n#Create white
-    border on hat sprite\n#Leaderboard scaling city obstacle course\n#Keep away map\n#User
-    guide in game\n#More comments on the code\n"
   m_isRightToLeft: 0
   m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
   m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}

Assets/Scripts/Game/GameManager.cs

@@ -231,7 +231,14 @@ namespace Game
             {
                 foreach (GameObject player in players)
                 {
-                    player.transform.position = spawnPosition;
+                    if (obstacleCourseSpawnPosition == Vector2.zero)
+                    {
+                        obstacleCourseSpawnPosition = spawnPosition + (offset * players.IndexOf(player) * Vector2.right);
+                    }
+                    else
+                    {
+                        player.transform.position = obstacleCourseSpawnPosition + (offset * players.IndexOf(player) * Vector2.right);
+                    }
                     player.GetComponent<Damageable>().lives = 0;
                 }
             }
@@ -280,7 +287,15 @@ namespace Game
             RespawnOnTriggerEnter respawnScript = player.GetComponent<RespawnOnTriggerEnter>();
             if (respawnScript != null)
             {
-                player.transform.position = respawnScript.spawnPoint;
+                //player.transform.position = respawnScript.spawnPoint;
+                if (GameManager.gameMode == GameMode.obstacleCourse)
+                {
+                    player.transform.position = obstacleCourseSpawnPosition + (offset * players.IndexOf(player) * Vector2.right);
+                }
+                else
+                {
+                    player.transform.position = spawnPosition + (offset * players.IndexOf(player) * Vector2.right);
+                }
                 player.GetComponent<Damageable>().ResetDamage();
                 player.GetComponent<Damageable>().Respawn();
             }

Assets/Scripts/Player/Damageable.cs

@@ -211,7 +211,7 @@ namespace Player
         /// </summary>
         public void Respawn()
         {
-            transform.position = GameManager.Instance.spawnPosition;
+            //transform.position = GameManager.Instance.spawnPosition;
 
             // Reset the player's velocity
             if (TryGetComponent<Rigidbody2D>(out var rb))