14 changed files with 431 additions and 3259 deletions
--- a/.plastic/plastic.changes
+++ b/.plastic/plastic.changes
--- a/.plastic/plastic.wktree
+++ b/.plastic/plastic.wktree
--- a/Assets/Scenes/DeathScreen.unity
+++ b/Assets/Scenes/DeathScreen.unity
@ -226,19 +226,6 @@ RectTransform:
  m_AnchoredPosition: {x: 0, y: 0}
  m_SizeDelta: {x: 0, y: 0}
  m_Pivot: {x: 0, y: 0}
--- !u!114 &28337891
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 28337886}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 5827ef60d322c73468e816b5411af65a, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  restartButton: {fileID: 0}
 --- !u!1 &344149854
 GameObject:
  m_ObjectHideFlags: 0
@ -321,8 +308,8 @@ MonoBehaviour:
  m_OnClick:
    m_PersistentCalls:
      m_Calls:
-      - m_Target: {fileID: 934295243}
-        m_TargetAssemblyTypeName: Assets.Scripts.GameSession.GoToScene, Assembly-CSharp
+      - m_Target: {fileID: 934295240}
+        m_TargetAssemblyTypeName: GameSession, Assembly-CSharp
        m_MethodName: GoToSoloMode
        m_Mode: 1
        m_Arguments:
@ -549,7 +536,8 @@ GameObject:
  serializedVersion: 6
  m_Component:
  - component: {fileID: 934295242}
-  - component: {fileID: 934295243}
+  - component: {fileID: 934295241}
+  - component: {fileID: 934295240}
  m_Layer: 0
  m_Name: GameManager
  m_TagString: Untagged
@ -557,6 +545,37 @@ GameObject:
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
  m_IsActive: 1
+--- !u!114 &934295240
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 934295239}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 412e4ad20c347ce47b62391fe298974c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  player1: {fileID: 0}
+  player2: {fileID: 0}
+  scoreboard: {fileID: 0}
+  isDuoMode: 0
+--- !u!114 &934295241
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 934295239}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 8c734ff3b010f1640a238a992583af1f, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  <CurveStrengthY>k__BackingField: 0
+  <CurveStrengthX>k__BackingField: 0
+  curveOrigin: {fileID: 0}
 --- !u!4 &934295242
 Transform:
  m_ObjectHideFlags: 0
@ -572,18 +591,19 @@ Transform:
  m_Children: []
  m_Father: {fileID: 0}
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &934295243
+--- !u!114 &28337891
 MonoBehaviour:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 934295239}
+  m_GameObject: {fileID: 28337886}
  m_Enabled: 1
  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 90560e670cf9430d920225316b227914, type: 3}
+  m_Script: {fileID: 11500000, guid: 5827ef60d322c73468e816b5411af65a, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
+  restartButton: {fileID: 585937283}
 --- !u!1 &963194225
 GameObject:
  m_ObjectHideFlags: 0
@ -684,79 +704,98 @@ PrefabInstance:
    serializedVersion: 3
    m_TransformParent: {fileID: 0}
    m_Modifications:
-    - target: {fileID: 3596407935928064896, guid: 01fa89ab9028c864b8560621b7d51f50, type: 3}
+    - target: {fileID: 3596407935928064896, guid: 01fa89ab9028c864b8560621b7d51f50,
+        type: 3}
      propertyPath: m_Controller
      value: 
      objectReference: {fileID: 9100000, guid: 104b61ba2d831c84e9200f18cdf2cd2f, type: 2}
-    - target: {fileID: 6031424829095203416, guid: 01fa89ab9028c864b8560621b7d51f50, type: 3}
+    - target: {fileID: 6031424829095203416, guid: 01fa89ab9028c864b8560621b7d51f50,
+        type: 3}
      propertyPath: m_Enabled
      value: 1
      objectReference: {fileID: 0}
-    - target: {fileID: 6456075115708800826, guid: 01fa89ab9028c864b8560621b7d51f50, type: 3}
+    - target: {fileID: 6456075115708800826, guid: 01fa89ab9028c864b8560621b7d51f50,
+        type: 3}
      propertyPath: healthBarView
      value: 
      objectReference: {fileID: 0}
-    - target: {fileID: 6873339892592015098, guid: 01fa89ab9028c864b8560621b7d51f50, type: 3}
+    - target: {fileID: 6873339892592015098, guid: 01fa89ab9028c864b8560621b7d51f50,
+        type: 3}
      propertyPath: m_RootOrder
      value: 1
      objectReference: {fileID: 0}
-    - target: {fileID: 6873339892592015098, guid: 01fa89ab9028c864b8560621b7d51f50, type: 3}
+    - target: {fileID: 6873339892592015098, guid: 01fa89ab9028c864b8560621b7d51f50,
+        type: 3}
      propertyPath: m_LocalScale.x
      value: 104.64
      objectReference: {fileID: 0}
-    - target: {fileID: 6873339892592015098, guid: 01fa89ab9028c864b8560621b7d51f50, type: 3}
+    - target: {fileID: 6873339892592015098, guid: 01fa89ab9028c864b8560621b7d51f50,
+        type: 3}
      propertyPath: m_LocalScale.y
      value: 129.97945
      objectReference: {fileID: 0}
-    - target: {fileID: 6873339892592015098, guid: 01fa89ab9028c864b8560621b7d51f50, type: 3}
+    - target: {fileID: 6873339892592015098, guid: 01fa89ab9028c864b8560621b7d51f50,
+        type: 3}
      propertyPath: m_LocalPosition.x
      value: 1991
      objectReference: {fileID: 0}
-    - target: {fileID: 6873339892592015098, guid: 01fa89ab9028c864b8560621b7d51f50, type: 3}
+    - target: {fileID: 6873339892592015098, guid: 01fa89ab9028c864b8560621b7d51f50,
+        type: 3}
      propertyPath: m_LocalPosition.y
      value: 52
      objectReference: {fileID: 0}
-    - target: {fileID: 6873339892592015098, guid: 01fa89ab9028c864b8560621b7d51f50, type: 3}
+    - target: {fileID: 6873339892592015098, guid: 01fa89ab9028c864b8560621b7d51f50,
+        type: 3}
      propertyPath: m_LocalPosition.z
      value: -176
      objectReference: {fileID: 0}
-    - target: {fileID: 6873339892592015098, guid: 01fa89ab9028c864b8560621b7d51f50, type: 3}
+    - target: {fileID: 6873339892592015098, guid: 01fa89ab9028c864b8560621b7d51f50,
+        type: 3}
      propertyPath: m_LocalRotation.w
      value: 0
      objectReference: {fileID: 0}
-    - target: {fileID: 6873339892592015098, guid: 01fa89ab9028c864b8560621b7d51f50, type: 3}
+    - target: {fileID: 6873339892592015098, guid: 01fa89ab9028c864b8560621b7d51f50,
+        type: 3}
      propertyPath: m_LocalRotation.x
      value: 0
      objectReference: {fileID: 0}
-    - target: {fileID: 6873339892592015098, guid: 01fa89ab9028c864b8560621b7d51f50, type: 3}
+    - target: {fileID: 6873339892592015098, guid: 01fa89ab9028c864b8560621b7d51f50,
+        type: 3}
      propertyPath: m_LocalRotation.y
      value: 1
      objectReference: {fileID: 0}
-    - target: {fileID: 6873339892592015098, guid: 01fa89ab9028c864b8560621b7d51f50, type: 3}
+    - target: {fileID: 6873339892592015098, guid: 01fa89ab9028c864b8560621b7d51f50,
+        type: 3}
      propertyPath: m_LocalRotation.z
      value: 0
      objectReference: {fileID: 0}
-    - target: {fileID: 6873339892592015098, guid: 01fa89ab9028c864b8560621b7d51f50, type: 3}
+    - target: {fileID: 6873339892592015098, guid: 01fa89ab9028c864b8560621b7d51f50,
+        type: 3}
      propertyPath: m_LocalEulerAnglesHint.x
      value: 0
      objectReference: {fileID: 0}
-    - target: {fileID: 6873339892592015098, guid: 01fa89ab9028c864b8560621b7d51f50, type: 3}
+    - target: {fileID: 6873339892592015098, guid: 01fa89ab9028c864b8560621b7d51f50,
+        type: 3}
      propertyPath: m_LocalEulerAnglesHint.y
      value: 180
      objectReference: {fileID: 0}
-    - target: {fileID: 6873339892592015098, guid: 01fa89ab9028c864b8560621b7d51f50, type: 3}
+    - target: {fileID: 6873339892592015098, guid: 01fa89ab9028c864b8560621b7d51f50,
+        type: 3}
      propertyPath: m_LocalEulerAnglesHint.z
      value: 0
      objectReference: {fileID: 0}
-    - target: {fileID: 7509186232753540492, guid: 01fa89ab9028c864b8560621b7d51f50, type: 3}
+    - target: {fileID: 7509186232753540492, guid: 01fa89ab9028c864b8560621b7d51f50,
+        type: 3}
      propertyPath: laneSystem
      value: 
      objectReference: {fileID: 0}
-    - target: {fileID: 7581911058254726377, guid: 01fa89ab9028c864b8560621b7d51f50, type: 3}
+    - target: {fileID: 7581911058254726377, guid: 01fa89ab9028c864b8560621b7d51f50,
+        type: 3}
      propertyPath: m_Name
      value: Player
      objectReference: {fileID: 0}
-    - target: {fileID: 7896966939631641298, guid: 01fa89ab9028c864b8560621b7d51f50, type: 3}
+    - target: {fileID: 7896966939631641298, guid: 01fa89ab9028c864b8560621b7d51f50,
+        type: 3}
      propertyPath: PlayerHUD
      value: 
      objectReference: {fileID: 0}
@ -1108,8 +1147,8 @@ MonoBehaviour:
  m_OnClick:
    m_PersistentCalls:
      m_Calls:
-      - m_Target: {fileID: 934295243}
-        m_TargetAssemblyTypeName: Assets.Scripts.GameSession.GoToScene, Assembly-CSharp
+      - m_Target: {fileID: 934295240}
+        m_TargetAssemblyTypeName: GameSession, Assembly-CSharp
        m_MethodName: GoToMainMenu
        m_Mode: 1
        m_Arguments:
--- a/Assets/Scenes/DeathScreen1VS1.unity
+++ b/Assets/Scenes/DeathScreen1VS1.unity
@ -249,7 +249,8 @@ GameObject:
  serializedVersion: 6
  m_Component:
  - component: {fileID: 533191358}
-  - component: {fileID: 533191359}
+  - component: {fileID: 533191357}
+  - component: {fileID: 533191356}
  m_Layer: 0
  m_Name: GameManager
  m_TagString: Untagged
@ -257,6 +258,37 @@ GameObject:
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
  m_IsActive: 1
+--- !u!114 &533191356
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 533191355}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 412e4ad20c347ce47b62391fe298974c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  player1: {fileID: 0}
+  player2: {fileID: 0}
+  scoreboard: {fileID: 0}
+  isDuoMode: 0
+--- !u!114 &533191357
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 533191355}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 8c734ff3b010f1640a238a992583af1f, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  <CurveStrengthY>k__BackingField: 0
+  <CurveStrengthX>k__BackingField: 0
+  curveOrigin: {fileID: 0}
 --- !u!4 &533191358
 Transform:
  m_ObjectHideFlags: 0
@ -272,18 +304,6 @@ Transform:
  m_Children: []
  m_Father: {fileID: 0}
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &533191359
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 533191355}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 90560e670cf9430d920225316b227914, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
 --- !u!1 &565350509
 GameObject:
  m_ObjectHideFlags: 0
@ -456,7 +476,7 @@ RectTransform:
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 0.5}
  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 114, y: -143.3}
+  m_AnchoredPosition: {x: 101.906845, y: -143.3}
  m_SizeDelta: {x: 132.7723, y: 148.15}
  m_Pivot: {x: 0.5, y: 0.50000006}
 --- !u!114 &641718692
@ -503,8 +523,8 @@ MonoBehaviour:
  m_OnClick:
    m_PersistentCalls:
      m_Calls:
-      - m_Target: {fileID: 533191359}
-        m_TargetAssemblyTypeName: Assets.Scripts.GameSession.GoToScene, Assembly-CSharp
+      - m_Target: {fileID: 533191356}
+        m_TargetAssemblyTypeName: GameSession, Assembly-CSharp
        m_MethodName: GoToMainMenu
        m_Mode: 1
        m_Arguments:
@ -1258,7 +1278,7 @@ RectTransform:
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 0.5}
  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -92, y: -143.30191}
+  m_AnchoredPosition: {x: -114.46594, y: -143.30191}
  m_SizeDelta: {x: 136.9507, y: 148.1487}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &2040053554
@ -1305,8 +1325,8 @@ MonoBehaviour:
  m_OnClick:
    m_PersistentCalls:
      m_Calls:
-      - m_Target: {fileID: 533191359}
-        m_TargetAssemblyTypeName: Assets.Scripts.GameSession.GoToScene, Assembly-CSharp
+      - m_Target: {fileID: 533191356}
+        m_TargetAssemblyTypeName: GameSession, Assembly-CSharp
        m_MethodName: GoToDuoMode
        m_Mode: 1
        m_Arguments:
--- a/Assets/Scenes/MainMenu.unity
+++ b/Assets/Scenes/MainMenu.unity
@ -506,7 +506,8 @@ GameObject:
  serializedVersion: 6
  m_Component:
  - component: {fileID: 533191358}
-  - component: {fileID: 533191359}
+  - component: {fileID: 533191357}
+  - component: {fileID: 533191356}
  m_Layer: 0
  m_Name: GameManager
  m_TagString: Untagged
@ -514,6 +515,36 @@ GameObject:
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
  m_IsActive: 1
+--- !u!114 &533191356
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 533191355}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 412e4ad20c347ce47b62391fe298974c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  currentPlayer: {fileID: 0}
+  scoreboard: {fileID: 0}
+  isPlayer2: 0
+--- !u!114 &533191357
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 533191355}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 8c734ff3b010f1640a238a992583af1f, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  <CurveStrengthY>k__BackingField: 0
+  <CurveStrengthX>k__BackingField: 0
+  curveOrigin: {fileID: 963194228}
 --- !u!4 &533191358
 Transform:
  m_ObjectHideFlags: 0
@ -529,18 +560,6 @@ Transform:
  m_Children: []
  m_Father: {fileID: 0}
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &533191359
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 533191355}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 90560e670cf9430d920225316b227914, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
 --- !u!1 &565350509
 GameObject:
  m_ObjectHideFlags: 0
@ -575,7 +594,7 @@ RectTransform:
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0, y: 0}
  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: -16}
+  m_AnchoredPosition: {x: 0, y: 0}
  m_SizeDelta: {x: 0, y: 0}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &565350511
@ -713,8 +732,8 @@ RectTransform:
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 0.5}
  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -410, y: -72}
-  m_SizeDelta: {x: 195, y: 400}
+  m_AnchoredPosition: {x: -273.40057, y: -40.693207}
+  m_SizeDelta: {x: 127.3032, y: 299.7355}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &585937283
 MonoBehaviour:
@ -760,8 +779,8 @@ MonoBehaviour:
  m_OnClick:
    m_PersistentCalls:
      m_Calls:
-      - m_Target: {fileID: 533191359}
-        m_TargetAssemblyTypeName: Assets.Scripts.GameSession.GoToScene, Assembly-CSharp
+      - m_Target: {fileID: 533191356}
+        m_TargetAssemblyTypeName: GameSession, Assembly-CSharp
        m_MethodName: GoToSoloMode
        m_Mode: 1
        m_Arguments:
@ -893,7 +912,7 @@ MonoBehaviour:
  m_OnClick:
    m_PersistentCalls:
      m_Calls:
-      - m_Target: {fileID: 0}
+      - m_Target: {fileID: 533191356}
        m_TargetAssemblyTypeName: GameSession, Assembly-CSharp
        m_MethodName: GoToSoloMode
        m_Mode: 1
@ -1423,7 +1442,7 @@ MonoBehaviour:
  m_OnClick:
    m_PersistentCalls:
      m_Calls:
-      - m_Target: {fileID: 0}
+      - m_Target: {fileID: 533191356}
        m_TargetAssemblyTypeName: GameSession, Assembly-CSharp
        m_MethodName: GoToSoloMode
        m_Mode: 1
@ -1510,7 +1529,7 @@ RectTransform:
  m_AnchorMin: {x: 0.5, y: 0.5}
  m_AnchorMax: {x: 0.5, y: 0.5}
  m_AnchoredPosition: {x: -112, y: -45.2294}
-  m_SizeDelta: {x: 195, y: 400}
+  m_SizeDelta: {x: 201.0648, y: 364.0289}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &2040053554
 MonoBehaviour:
@ -1556,8 +1575,8 @@ MonoBehaviour:
  m_OnClick:
    m_PersistentCalls:
      m_Calls:
-      - m_Target: {fileID: 533191359}
-        m_TargetAssemblyTypeName: Assets.Scripts.GameSession.GoToScene, Assembly-CSharp
+      - m_Target: {fileID: 533191356}
+        m_TargetAssemblyTypeName: GameSession, Assembly-CSharp
        m_MethodName: GoToDuoMode
        m_Mode: 1
        m_Arguments:
--- a/Assets/Scenes/SoloGameScene.unity
+++ b/Assets/Scenes/SoloGameScene.unity
@ -2001,7 +2001,7 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  target: {fileID: 2249596435903131709}
-  defaultDistance: {x: 0, y: 5.99, z: -7}
+  defaultDistance: {x: 0, y: 5.9, z: -4}
  distanceDamp: 0.15
 --- !u!114 &1053166413
 MonoBehaviour:
--- a/Assets/Scripts/GameSession/GameSession.cs
+++ b/Assets/Scripts/GameSession/GameSession.cs
@ -1,7 +1,6 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using Assets.Scripts.GameSession;
 using JetBrains.Annotations;
 using UnityEngine;
 using UnityEngine.SceneManagement;
@ -163,21 +162,20 @@ public class GameSession : MonoBehaviour,IResettable
        SceneManager.LoadScene("DeathScreen1VS1");
    }
    
-    public void PausePlayAgain()
+    public void GoToSoloMode()
    {
-        if (isDuoMode)
-        {
-            GoToScene.GoToDuoMode();
-        }
-        else
-        {
-            GoToScene.GoToSoloMode();
-        }
+        SceneManager.LoadScene("SoloGameScene", LoadSceneMode.Single);
        ResetToDefault();
    }
-    public void PauseBackToMainMenu()
+    
+    public void GoToDuoMode()
    {
-        GoToScene.GoToMainMenu();
+        SceneManager.LoadScene("DuoGameScene", LoadSceneMode.Single);
+        ResetToDefault();
+    }
+    public void GoToMainMenu()
+    {
+        SceneManager.LoadScene("MainMenu", LoadSceneMode.Single);
        ResetToDefault();
    }

--- a/Assets/Scripts/GameSession/GoToScene.cs
+++ b/Assets/Scripts/GameSession/GoToScene.cs
@ -1,30 +0,0 @@
-using UnityEngine;
-using UnityEngine.SceneManagement;
-
-namespace Assets.Scripts.GameSession
-{
-    public class GoToScene : MonoBehaviour
-    {
-        public static void GoToSoloMode()
-        {
-            SceneManager.LoadScene("SoloGameScene", LoadSceneMode.Single);
-        }
-    
-        public static void GoToDuoMode()
-        {
-            SceneManager.LoadScene("DuoGameScene", LoadSceneMode.Single);
-        }
-        public static void GoToMainMenu()
-        {
-            SceneManager.LoadScene("MainMenu", LoadSceneMode.Single);
-        }
-        public static void GoToDeathScreenSolo()
-        {
-            SceneManager.LoadScene("DeathScreen", LoadSceneMode.Single);
-        }
-        public static void GoToDeathScreen1VS1()
-        {
-            SceneManager.LoadScene("DeathScreen1VS1", LoadSceneMode.Single);
-        }
-    }
-}
--- a/Assets/Scripts/GameSession/GoToScene.cs.meta
+++ b/Assets/Scripts/GameSession/GoToScene.cs.meta
@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: 90560e670cf9430d920225316b227914
-timeCreated: 1736947730
--- a/Assets/Scripts/Player/Health.cs
+++ b/Assets/Scripts/Player/Health.cs
@ -41,15 +41,15 @@ public class Health : MonoBehaviour, IDamageable,IHealable, IResettable
    } 
    public void TakeDamage(int amount)
    {
-        if (CurrentHealth > 0)
-        {
-            CurrentHealth -= amount;
-            if (CurrentHealth <= 0){
-                CurrentHealth = 0;
-                OnOutOfHealth?.Invoke();
-            }
-            OnHealthChanged(this, healthArgs.GetUpdatedArgs(CurrentHealth, MaxHealth));
-        }
+        // if (CurrentHealth > 0)
+        // {
+        //     CurrentHealth -= amount;
+        //     if (CurrentHealth <= 0){
+        //         CurrentHealth = 0;
+        //         OnOutOfHealth?.Invoke();
+        //     }
+        //     OnHealthChanged(this, healthArgs.GetUpdatedArgs(CurrentHealth, MaxHealth));
+        // }
    }
    public void Heal(int amount)
    {
--- a/Assets/Scripts/Player/Player.cs
+++ b/Assets/Scripts/Player/Player.cs
@ -89,6 +89,11 @@ public class Player : MonoBehaviour, IResettable, ICommandTranslator
    {
        PlayerHealth.OnOutOfHealth += Die;
    }
+
+    // private void OnDisable()
+    // {
+    //     PlayerHealth.OnOutOfHealth -= Die;
+    // }
    private void Start()
    {
        PlayerStateMachine.SetState(PlayerStateMachine.PlayerStartingIdleState);
--- a/Assets/Scripts/Road/ChunkGenerator.cs
+++ b/Assets/Scripts/Road/ChunkGenerator.cs
@ -30,6 +30,11 @@ public class ChunkGenerator : MonoBehaviour
                transform.localPosition.y,
                transform.localPosition.z
            );
+            //TODO: A enlever (pour fix bug)
+            // if (obstacle.IsOnAllLanes)
+            // {
+            //     obstacle.transform.localPosition = new Vector3(LaneSystem.CenterLane * LaneSystem.LaneWidth, transform.localPosition.y, transform.localPosition.z);
+            // }
        }
        return chunkToFill;
    }
--- a/Assets/Scripts/UI/Views/PausedView.cs
+++ b/Assets/Scripts/UI/Views/PausedView.cs
@ -26,12 +26,12 @@ public class PausedView : BaseView

        mainMenuButton.onClick.AddListener(() =>
        {
-            GameSession.Instance.PauseBackToMainMenu();
+            GameSession.Instance.GoToMainMenu();
        });

        restartButton.onClick.AddListener(() =>
        {
-            GameSession.Instance.PausePlayAgain();
+            GameSession.Instance.GoToSoloMode();
        });
        base.Init();
    }
--- a/Extras/Resources/Fonts
+++ b/Extras/Resources/Fonts