Assets/Materials/Characters/Player 1.mat

@@ -75,6 +75,6 @@ Material:
     - _UVSec: 0
     - _ZWrite: 1
     m_Colors:
-    - _Color: {r: 0.30817598, g: 0, b: 0, a: 1}
+    - _Color: {r: 0.9716981, g: 0, b: 0, a: 1}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
   m_BuildTextureStacks: []

Assets/Materials/Characters/Player 2.mat

@@ -75,6 +75,6 @@ Material:
     - _UVSec: 0
     - _ZWrite: 1
     m_Colors:
-    - _Color: {r: 0, g: 0.28930807, b: 0.058237344, a: 1}
+    - _Color: {r: 0.02055893, g: 0.6226415, b: 0.140847, a: 1}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
   m_BuildTextureStacks: []

Assets/Materials/Characters/Player 3.mat

@@ -75,6 +75,6 @@ Material:
     - _UVSec: 0
     - _ZWrite: 1
     m_Colors:
-    - _Color: {r: 0.8050314, g: 0.5910357, b: 0, a: 1}
+    - _Color: {r: 0.9339623, g: 0.68642676, b: 0.004405493, a: 1}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
   m_BuildTextureStacks: []

Assets/Materials/Characters/Player 4.mat

@@ -75,6 +75,6 @@ Material:
     - _UVSec: 0
     - _ZWrite: 1
     m_Colors:
-    - _Color: {r: 0, g: 0.14507334, b: 0.21383637, a: 1}
+    - _Color: {r: 0, g: 0.6765175, b: 1, a: 1}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
   m_BuildTextureStacks: []

Assets/PlayerBaseHandler.cs

@@ -5,7 +5,7 @@ using UnityEngine;
 [System.Serializable]
 public class PlayerBaseData
 {
-    public PlayerType playerType;
+    public PlayerTypes playerType;
     public PlayerBase playerBase;
 }
 
@@ -13,21 +13,14 @@ public class PlayerBaseHandler : MonoBehaviour
 {
     [SerializeField] private PlayerBase[] playerBases;
 
-    private Dictionary<PlayerType, PlayerBase> playerBasesDict = new Dictionary<PlayerType, PlayerBase>();
+    public void InitPlayerTypes(List<PlayerTypes> playerTypes)
-
-    public void InitPlayerTypes(List<PlayerType> playerTypes)
     {
         foreach (PlayerBase playerBase in playerBases)
         {
             if (playerTypes.Contains(playerBase.GetPlayerType()))
             {
-                playerBase.InitPlayerData();
+                playerBase.InitPlayerIds();
                 playerBase.gameObject.SetActive(true);
-
-                if (!playerBasesDict.ContainsKey(playerBase.GetPlayerType()))
-                    playerBasesDict.Add(playerBase.GetPlayerType(), playerBase);
-                else 
-                    playerBasesDict[playerBase.GetPlayerType()] = playerBase;
             }
             else
             {
@@ -36,8 +29,8 @@ public class PlayerBaseHandler : MonoBehaviour
         }
     }
 
-    public PlayerBase GetPlayerBase(PlayerType playerType)
+    public void GetPlayerBase()
     {
-        return playerBasesDict[playerType];
+        
     }
 }

Assets/Prefabs/Characters/Player1Mesh.prefab

@@ -42,7 +42,7 @@ MeshFilter:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7993275380040288456}
-  m_Mesh: {fileID: 10208, guid: 0000000000000000e000000000000000, type: 0}
+  m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
 --- !u!23 &7993275380040288453
 MeshRenderer:
   m_ObjectHideFlags: 0

Assets/Prefabs/Characters/Player2Mesh.prefab

@@ -42,7 +42,7 @@ MeshFilter:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7993275380040288456}
-  m_Mesh: {fileID: 10208, guid: 0000000000000000e000000000000000, type: 0}
+  m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
 --- !u!23 &7993275380040288453
 MeshRenderer:
   m_ObjectHideFlags: 0

Assets/Prefabs/Characters/Player3Mesh.prefab

@@ -42,7 +42,7 @@ MeshFilter:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7993275380040288456}
-  m_Mesh: {fileID: 10208, guid: 0000000000000000e000000000000000, type: 0}
+  m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
 --- !u!23 &7993275380040288453
 MeshRenderer:
   m_ObjectHideFlags: 0

Assets/Prefabs/Characters/Player4Mesh.prefab

@@ -42,7 +42,7 @@ MeshFilter:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7993275380040288456}
-  m_Mesh: {fileID: 10208, guid: 0000000000000000e000000000000000, type: 0}
+  m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
 --- !u!23 &7993275380040288453
 MeshRenderer:
   m_ObjectHideFlags: 0

Assets/Prefabs/Tile/SafeTile.prefab

@@ -24,7 +24,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 141183527}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -1.06, y: 1, z: -1.03}
+  m_LocalPosition: {x: -1.06, y: 0, z: -1.03}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -55,7 +55,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 165064736}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0.89, y: 1, z: -0.92}
+  m_LocalPosition: {x: 0.89, y: 0, z: -0.92}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -86,7 +86,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 172566720}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0.88, y: 1, z: 1.12}
+  m_LocalPosition: {x: 0.88, y: 0, z: 1.12}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -183,7 +183,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1619171258}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -1.09, y: 1, z: 1.26}
+  m_LocalPosition: {x: -1.09, y: 0, z: 1.26}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []

Assets/Scenes/Game.unity

@@ -319,108 +319,6 @@ Transform:
   m_CorrespondingSourceObject: {fileID: 2960581183699728426, guid: 094ea6ce63e654b22964fec2f6344c8a, type: 3}
   m_PrefabInstance: {fileID: 77922092}
   m_PrefabAsset: {fileID: 0}
---- !u!1 &86529552
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 86529556}
-  - component: {fileID: 86529555}
-  - component: {fileID: 86529554}
-  - component: {fileID: 86529553}
-  m_Layer: 5
-  m_Name: Canvas
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!114 &86529553
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 86529552}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_IgnoreReversedGraphics: 1
-  m_BlockingObjects: 0
-  m_BlockingMask:
-    serializedVersion: 2
-    m_Bits: 4294967295
---- !u!114 &86529554
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 86529552}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_UiScaleMode: 1
-  m_ReferencePixelsPerUnit: 100
-  m_ScaleFactor: 1
-  m_ReferenceResolution: {x: 800, y: 600}
-  m_ScreenMatchMode: 0
-  m_MatchWidthOrHeight: 0
-  m_PhysicalUnit: 3
-  m_FallbackScreenDPI: 96
-  m_DefaultSpriteDPI: 96
-  m_DynamicPixelsPerUnit: 1
-  m_PresetInfoIsWorld: 0
---- !u!223 &86529555
-Canvas:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 86529552}
-  m_Enabled: 1
-  serializedVersion: 3
-  m_RenderMode: 0
-  m_Camera: {fileID: 0}
-  m_PlaneDistance: 100
-  m_PixelPerfect: 0
-  m_ReceivesEvents: 1
-  m_OverrideSorting: 0
-  m_OverridePixelPerfect: 0
-  m_SortingBucketNormalizedSize: 0
-  m_VertexColorAlwaysGammaSpace: 0
-  m_AdditionalShaderChannelsFlag: 25
-  m_SortingLayerID: 0
-  m_SortingOrder: 0
-  m_TargetDisplay: 0
---- !u!224 &86529556
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 86529552}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 0, y: 0, z: 0}
-  m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 953941043}
-  m_Father: {fileID: 0}
-  m_RootOrder: 15
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
-  m_Pivot: {x: 0, y: 0}
 --- !u!1001 &101156877
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -1178,21 +1076,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 789d50d84a2014dedb8aa0bb22261a7e, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  playerType: 1
+  basePlacementDatas: []
-  basePlacementDatas:
-  - playerBaseId: 1
-    placementTransform: {fileID: 965030346}
-  - playerBaseId: 2
-    placementTransform: {fileID: 728473895}
-  - playerBaseId: 3
-    placementTransform: {fileID: 2023317272}
-  - playerBaseId: 4
-    placementTransform: {fileID: 1097779050}
-  playerPawns:
-  - {fileID: 867499714}
-  - {fileID: 1284410036}
-  - {fileID: 713878048}
-  - {fileID: 1900156994}
 --- !u!1 &257080519
 GameObject:
   m_ObjectHideFlags: 0
@@ -1217,7 +1101,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 257080519}
   m_LocalRotation: {x: 0, y: -0.7071068, z: 0, w: 0.7071068}
-  m_LocalPosition: {x: 3.38, y: 1, z: -2.87}
+  m_LocalPosition: {x: 3.4300003, y: 0, z: -2.369999}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -1248,7 +1132,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 272998680}
   m_LocalRotation: {x: 0, y: 1, z: 0, w: 0}
-  m_LocalPosition: {x: -2.54, y: 1, z: 3.43}
+  m_LocalPosition: {x: -2.63, y: 0, z: 4.4399986}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -1383,17 +1267,6 @@ Transform:
   m_CorrespondingSourceObject: {fileID: 7993275380040288459, guid: 9ae10e3fa7db64f47af31a5f0ebbecdc, type: 3}
   m_PrefabInstance: {fileID: 285587083}
   m_PrefabAsset: {fileID: 0}
---- !u!114 &285587085 stripped
-MonoBehaviour:
-  m_CorrespondingSourceObject: {fileID: 8373871663967812526, guid: 9ae10e3fa7db64f47af31a5f0ebbecdc, type: 3}
-  m_PrefabInstance: {fileID: 285587083}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: da493b8dbb3aa475abf11f31549b9293, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
 --- !u!1001 &320946490
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -1533,17 +1406,6 @@ Transform:
   m_CorrespondingSourceObject: {fileID: 7993275380040288459, guid: 9ae10e3fa7db64f47af31a5f0ebbecdc, type: 3}
   m_PrefabInstance: {fileID: 332604772}
   m_PrefabAsset: {fileID: 0}
---- !u!114 &332604774 stripped
-MonoBehaviour:
-  m_CorrespondingSourceObject: {fileID: 8373871663967812526, guid: 9ae10e3fa7db64f47af31a5f0ebbecdc, type: 3}
-  m_PrefabInstance: {fileID: 332604772}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: da493b8dbb3aa475abf11f31549b9293, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
 --- !u!1001 &333337580
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -1703,7 +1565,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 385834240}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 3.4699993, y: 1, z: 4.49}
+  m_LocalPosition: {x: 3.4699993, y: 0, z: 4.49}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -1917,7 +1779,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 426836277}
   m_LocalRotation: {x: 0, y: 1, z: 0, w: 0}
-  m_LocalPosition: {x: 3.4300003, y: 1, z: -2.63}
+  m_LocalPosition: {x: 3.4300003, y: 0, z: -2.37}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -1933,7 +1795,6 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 433034050}
-  - component: {fileID: 433034051}
   m_Layer: 0
   m_Name: PlayerBases
   m_TagString: Untagged
@@ -1960,23 +1821,6 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 13
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &433034051
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 433034049}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 647207b7c72d24ccaaebc10900c23d2b, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  playerBases:
-  - {fileID: 574007536}
-  - {fileID: 241691681}
-  - {fileID: 987201645}
-  - {fileID: 1251876828}
 --- !u!1001 &465243407
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -2171,7 +2015,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 501600305}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: -2.6600008, y: 1, z: -2.2400007}
+  m_LocalPosition: {x: -2.6600008, y: 0, z: -2.2400007}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -2317,17 +2161,6 @@ Transform:
   m_CorrespondingSourceObject: {fileID: 7993275380040288459, guid: 195e8a45a36974637bff1dab6791e632, type: 3}
   m_PrefabInstance: {fileID: 515214452}
   m_PrefabAsset: {fileID: 0}
---- !u!114 &515214454 stripped
-MonoBehaviour:
-  m_CorrespondingSourceObject: {fileID: -2904904340618941697, guid: 195e8a45a36974637bff1dab6791e632, type: 3}
-  m_PrefabInstance: {fileID: 515214452}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: da493b8dbb3aa475abf11f31549b9293, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
 --- !u!1 &574007534
 GameObject:
   m_ObjectHideFlags: 0
@@ -2374,21 +2207,15 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 789d50d84a2014dedb8aa0bb22261a7e, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  playerType: 0
   basePlacementDatas:
-  - playerBaseId: 1
+  - baseId: 1
-    placementTransform: {fileID: 1460070747}
+    placementTransform: {fileID: 0}
-  - playerBaseId: 2
+  - baseId: 2
-    placementTransform: {fileID: 385834241}
+    placementTransform: {fileID: 0}
-  - playerBaseId: 3
+  - baseId: 3
-    placementTransform: {fileID: 501600306}
+    placementTransform: {fileID: 0}
-  - playerBaseId: 4
+  - baseId: 4
-    placementTransform: {fileID: 1301684855}
+    placementTransform: {fileID: 0}
-  playerPawns:
-  - {fileID: 579170960}
-  - {fileID: 332604774}
-  - {fileID: 285587085}
-  - {fileID: 942393773}
 --- !u!1001 &574642922
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -2528,17 +2355,6 @@ Transform:
   m_CorrespondingSourceObject: {fileID: 7993275380040288459, guid: 195e8a45a36974637bff1dab6791e632, type: 3}
   m_PrefabInstance: {fileID: 575958118}
   m_PrefabAsset: {fileID: 0}
---- !u!114 &575958120 stripped
-MonoBehaviour:
-  m_CorrespondingSourceObject: {fileID: -2904904340618941697, guid: 195e8a45a36974637bff1dab6791e632, type: 3}
-  m_PrefabInstance: {fileID: 575958118}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: da493b8dbb3aa475abf11f31549b9293, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
 --- !u!1001 &579170958
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -2601,17 +2417,6 @@ Transform:
   m_CorrespondingSourceObject: {fileID: 7993275380040288459, guid: 9ae10e3fa7db64f47af31a5f0ebbecdc, type: 3}
   m_PrefabInstance: {fileID: 579170958}
   m_PrefabAsset: {fileID: 0}
---- !u!114 &579170960 stripped
-MonoBehaviour:
-  m_CorrespondingSourceObject: {fileID: 8373871663967812526, guid: 9ae10e3fa7db64f47af31a5f0ebbecdc, type: 3}
-  m_PrefabInstance: {fileID: 579170958}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: da493b8dbb3aa475abf11f31549b9293, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
 --- !u!1 &583407430
 GameObject:
   m_ObjectHideFlags: 0
@@ -3252,17 +3057,6 @@ Transform:
   m_CorrespondingSourceObject: {fileID: 7993275380040288459, guid: 81ea53750af48479785425335304fdc7, type: 3}
   m_PrefabInstance: {fileID: 713878046}
   m_PrefabAsset: {fileID: 0}
---- !u!114 &713878048 stripped
-MonoBehaviour:
-  m_CorrespondingSourceObject: {fileID: 8543619722873780761, guid: 81ea53750af48479785425335304fdc7, type: 3}
-  m_PrefabInstance: {fileID: 713878046}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: da493b8dbb3aa475abf11f31549b9293, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
 --- !u!1 &720024726
 GameObject:
   m_ObjectHideFlags: 0
@@ -3323,7 +3117,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 728473894}
   m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068}
-  m_LocalPosition: {x: 3.4300003, y: 1, z: -2.37}
+  m_LocalPosition: {x: 3.4300003, y: 0, z: -2.37}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -3614,17 +3408,6 @@ Transform:
   m_CorrespondingSourceObject: {fileID: 7993275380040288459, guid: 195e8a45a36974637bff1dab6791e632, type: 3}
   m_PrefabInstance: {fileID: 861446745}
   m_PrefabAsset: {fileID: 0}
---- !u!114 &861446747 stripped
-MonoBehaviour:
-  m_CorrespondingSourceObject: {fileID: -2904904340618941697, guid: 195e8a45a36974637bff1dab6791e632, type: 3}
-  m_PrefabInstance: {fileID: 861446745}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: da493b8dbb3aa475abf11f31549b9293, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
 --- !u!1001 &867499712
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -3687,17 +3470,6 @@ Transform:
   m_CorrespondingSourceObject: {fileID: 7993275380040288459, guid: 81ea53750af48479785425335304fdc7, type: 3}
   m_PrefabInstance: {fileID: 867499712}
   m_PrefabAsset: {fileID: 0}
---- !u!114 &867499714 stripped
-MonoBehaviour:
-  m_CorrespondingSourceObject: {fileID: 8543619722873780761, guid: 81ea53750af48479785425335304fdc7, type: 3}
-  m_PrefabInstance: {fileID: 867499712}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: da493b8dbb3aa475abf11f31549b9293, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
 --- !u!1 &868479584
 GameObject:
   m_ObjectHideFlags: 0
@@ -3938,37 +3710,39 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 0483b263e22fc433caab31141efbe319, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  diceText: {fileID: 953941044}
   pointerDebug: {fileID: 102349503}
   pointerMeshRend: {fileID: 102349501}
   turnMat: {fileID: 2100000, guid: fa9603494d90e4aa594a90f433060426, type: 2}
   selectMat: {fileID: 2100000, guid: ede151fd0a67d4100beffc2314392f38, type: 2}
   playerGameDatas:
   - playerType: 0
+    playerCornerEntity: {fileID: 574007534}
     startIndex: 0
     endIndex: 46
     playersParent: {fileID: 1373272158}
     playerPawnsDict: []
     totalPawnsFinished: 0
   - playerType: 1
+    playerCornerEntity: {fileID: 241691679}
     startIndex: 12
     endIndex: 10
     playersParent: {fileID: 1841959051}
     playerPawnsDict: []
     totalPawnsFinished: 0
   - playerType: 2
+    playerCornerEntity: {fileID: 987201643}
     startIndex: 24
     endIndex: 22
     playersParent: {fileID: 1934858463}
     playerPawnsDict: []
     totalPawnsFinished: 0
   - playerType: 3
+    playerCornerEntity: {fileID: 1251876826}
     startIndex: 36
     endIndex: 34
     playersParent: {fileID: 1094154913}
     playerPawnsDict: []
     totalPawnsFinished: 0
-  playerBaseHandler: {fileID: 433034051}
 --- !u!1001 &923111009
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -4159,17 +3933,6 @@ Transform:
   m_CorrespondingSourceObject: {fileID: 7993275380040288459, guid: 9ae10e3fa7db64f47af31a5f0ebbecdc, type: 3}
   m_PrefabInstance: {fileID: 942393771}
   m_PrefabAsset: {fileID: 0}
---- !u!114 &942393773 stripped
-MonoBehaviour:
-  m_CorrespondingSourceObject: {fileID: 8373871663967812526, guid: 9ae10e3fa7db64f47af31a5f0ebbecdc, type: 3}
-  m_PrefabInstance: {fileID: 942393771}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: da493b8dbb3aa475abf11f31549b9293, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
 --- !u!1001 &953003986
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -4232,141 +3995,6 @@ Transform:
   m_CorrespondingSourceObject: {fileID: 2960581183699728426, guid: 094ea6ce63e654b22964fec2f6344c8a, type: 3}
   m_PrefabInstance: {fileID: 953003986}
   m_PrefabAsset: {fileID: 0}
---- !u!1 &953941042
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 953941043}
-  - component: {fileID: 953941045}
-  - component: {fileID: 953941044}
-  m_Layer: 5
-  m_Name: Text (TMP)
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &953941043
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 953941042}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 86529556}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 15, y: -11}
-  m_SizeDelta: {x: 67.2485, y: 58.1276}
-  m_Pivot: {x: 0, y: 1}
---- !u!114 &953941044
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 953941042}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_text: 0
-  m_isRightToLeft: 0
-  m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
-  m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
-  m_fontSharedMaterials: []
-  m_fontMaterial: {fileID: 0}
-  m_fontMaterials: []
-  m_fontColor32:
-    serializedVersion: 2
-    rgba: 4294967295
-  m_fontColor: {r: 1, g: 1, b: 1, a: 1}
-  m_enableVertexGradient: 0
-  m_colorMode: 3
-  m_fontColorGradient:
-    topLeft: {r: 1, g: 1, b: 1, a: 1}
-    topRight: {r: 1, g: 1, b: 1, a: 1}
-    bottomLeft: {r: 1, g: 1, b: 1, a: 1}
-    bottomRight: {r: 1, g: 1, b: 1, a: 1}
-  m_fontColorGradientPreset: {fileID: 0}
-  m_spriteAsset: {fileID: 0}
-  m_tintAllSprites: 0
-  m_StyleSheet: {fileID: 0}
-  m_TextStyleHashCode: -1183493901
-  m_overrideHtmlColors: 0
-  m_faceColor:
-    serializedVersion: 2
-    rgba: 4294967295
-  m_fontSize: 36
-  m_fontSizeBase: 36
-  m_fontWeight: 400
-  m_enableAutoSizing: 0
-  m_fontSizeMin: 18
-  m_fontSizeMax: 72
-  m_fontStyle: 0
-  m_HorizontalAlignment: 1
-  m_VerticalAlignment: 256
-  m_textAlignment: 65535
-  m_characterSpacing: 0
-  m_wordSpacing: 0
-  m_lineSpacing: 0
-  m_lineSpacingMax: 0
-  m_paragraphSpacing: 0
-  m_charWidthMaxAdj: 0
-  m_enableWordWrapping: 1
-  m_wordWrappingRatios: 0.4
-  m_overflowMode: 0
-  m_linkedTextComponent: {fileID: 0}
-  parentLinkedComponent: {fileID: 0}
-  m_enableKerning: 1
-  m_enableExtraPadding: 0
-  checkPaddingRequired: 0
-  m_isRichText: 1
-  m_parseCtrlCharacters: 1
-  m_isOrthographic: 1
-  m_isCullingEnabled: 0
-  m_horizontalMapping: 0
-  m_verticalMapping: 0
-  m_uvLineOffset: 0
-  m_geometrySortingOrder: 0
-  m_IsTextObjectScaleStatic: 0
-  m_VertexBufferAutoSizeReduction: 0
-  m_useMaxVisibleDescender: 1
-  m_pageToDisplay: 1
-  m_margin: {x: 0, y: 0, z: 0, w: 0}
-  m_isUsingLegacyAnimationComponent: 0
-  m_isVolumetricText: 0
-  m_hasFontAssetChanged: 0
-  m_baseMaterial: {fileID: 0}
-  m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
---- !u!222 &953941045
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 953941042}
-  m_CullTransparentMesh: 1
 --- !u!1 &963194225
 GameObject:
   m_ObjectHideFlags: 0
@@ -4475,7 +4103,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 965030345}
   m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068}
-  m_LocalPosition: {x: 3.4699993, y: 1, z: 4.49}
+  m_LocalPosition: {x: 3.4699993, y: 0, z: 4.49}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -4674,21 +4302,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 789d50d84a2014dedb8aa0bb22261a7e, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  playerType: 2
+  basePlacementDatas: []
-  basePlacementDatas:
-  - playerBaseId: 1
-    placementTransform: {fileID: 426836278}
-  - playerBaseId: 2
-    placementTransform: {fileID: 1795608037}
-  - playerBaseId: 3
-    placementTransform: {fileID: 1742932127}
-  - playerBaseId: 4
-    placementTransform: {fileID: 272998681}
-  playerPawns:
-  - {fileID: 1073809820}
-  - {fileID: 861446747}
-  - {fileID: 515214454}
-  - {fileID: 575958120}
 --- !u!1001 &987559890
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -5093,7 +4707,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1070491403}
   m_LocalRotation: {x: 0, y: -0.7071068, z: 0, w: 0.7071068}
-  m_LocalPosition: {x: -2.6600008, y: 1, z: -2.91}
+  m_LocalPosition: {x: -2.6600008, y: 0, z: -2.2400017}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -5162,17 +4776,6 @@ Transform:
   m_CorrespondingSourceObject: {fileID: 7993275380040288459, guid: 195e8a45a36974637bff1dab6791e632, type: 3}
   m_PrefabInstance: {fileID: 1073809818}
   m_PrefabAsset: {fileID: 0}
---- !u!114 &1073809820 stripped
-MonoBehaviour:
-  m_CorrespondingSourceObject: {fileID: -2904904340618941697, guid: 195e8a45a36974637bff1dab6791e632, type: 3}
-  m_PrefabInstance: {fileID: 1073809818}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: da493b8dbb3aa475abf11f31549b9293, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
 --- !u!1001 &1079000207
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -5378,7 +4981,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1097779049}
   m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068}
-  m_LocalPosition: {x: -2.6600008, y: 1, z: -2.2400007}
+  m_LocalPosition: {x: -2.6600008, y: 0, z: -2.2400007}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -6015,7 +5618,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1207327330}
   m_LocalRotation: {x: 0, y: -0.7071068, z: 0, w: 0.7071068}
-  m_LocalPosition: {x: 3.48, y: 1, z: 3.99}
+  m_LocalPosition: {x: 3.4699993, y: 0, z: 4.4900017}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -6141,21 +5744,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 789d50d84a2014dedb8aa0bb22261a7e, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  playerType: 3
+  basePlacementDatas: []
-  basePlacementDatas:
-  - playerBaseId: 1
-    placementTransform: {fileID: 1070491404}
-  - playerBaseId: 2
-    placementTransform: {fileID: 1586816317}
-  - playerBaseId: 3
-    placementTransform: {fileID: 257080520}
-  - playerBaseId: 4
-    placementTransform: {fileID: 1207327331}
-  playerPawns:
-  - {fileID: 1665297695}
-  - {fileID: 1266600969}
-  - {fileID: 1691461918}
-  - {fileID: 1974955952}
 --- !u!1001 &1266600967
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -6177,15 +5766,15 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 7993275380040288459, guid: 28a2e17f2aa28459099c180350293bf6, type: 3}
       propertyPath: m_LocalPosition.x
-      value: -2.95
+      value: -3.26
       objectReference: {fileID: 0}
     - target: {fileID: 7993275380040288459, guid: 28a2e17f2aa28459099c180350293bf6, type: 3}
       propertyPath: m_LocalPosition.y
-      value: 0.89
+      value: 0.94
       objectReference: {fileID: 0}
     - target: {fileID: 7993275380040288459, guid: 28a2e17f2aa28459099c180350293bf6, type: 3}
       propertyPath: m_LocalPosition.z
-      value: 4.08
+      value: -3.36
       objectReference: {fileID: 0}
     - target: {fileID: 7993275380040288459, guid: 28a2e17f2aa28459099c180350293bf6, type: 3}
       propertyPath: m_LocalRotation.w
@@ -6222,17 +5811,6 @@ Transform:
   m_CorrespondingSourceObject: {fileID: 7993275380040288459, guid: 28a2e17f2aa28459099c180350293bf6, type: 3}
   m_PrefabInstance: {fileID: 1266600967}
   m_PrefabAsset: {fileID: 0}
---- !u!114 &1266600969 stripped
-MonoBehaviour:
-  m_CorrespondingSourceObject: {fileID: 6504614332953282164, guid: 28a2e17f2aa28459099c180350293bf6, type: 3}
-  m_PrefabInstance: {fileID: 1266600967}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: da493b8dbb3aa475abf11f31549b9293, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
 --- !u!1001 &1284410034
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -6299,17 +5877,6 @@ Transform:
   m_CorrespondingSourceObject: {fileID: 7993275380040288459, guid: 81ea53750af48479785425335304fdc7, type: 3}
   m_PrefabInstance: {fileID: 1284410034}
   m_PrefabAsset: {fileID: 0}
---- !u!114 &1284410036 stripped
-MonoBehaviour:
-  m_CorrespondingSourceObject: {fileID: 8543619722873780761, guid: 81ea53750af48479785425335304fdc7, type: 3}
-  m_PrefabInstance: {fileID: 1284410034}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: da493b8dbb3aa475abf11f31549b9293, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
 --- !u!1 &1285580626
 GameObject:
   m_ObjectHideFlags: 0
@@ -6438,7 +6005,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1301684854}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 3.4300003, y: 1, z: -2.37}
+  m_LocalPosition: {x: 3.4300003, y: 0, z: -2.37}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -6689,7 +6256,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1460070746}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: -2.63, y: 1, z: 4.4399996}
+  m_LocalPosition: {x: -2.63, y: 0, z: 4.4399996}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -7036,7 +6603,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1586816316}
   m_LocalRotation: {x: 0, y: -0.7071068, z: 0, w: 0.7071068}
-  m_LocalPosition: {x: -2.73, y: 1, z: 3.93}
+  m_LocalPosition: {x: -2.63, y: 0, z: 4.4399986}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -7206,15 +6773,15 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 7993275380040288459, guid: 28a2e17f2aa28459099c180350293bf6, type: 3}
       propertyPath: m_LocalPosition.x
-      value: -2.78
+      value: -3.18
       objectReference: {fileID: 0}
     - target: {fileID: 7993275380040288459, guid: 28a2e17f2aa28459099c180350293bf6, type: 3}
       propertyPath: m_LocalPosition.y
-      value: 0.89
+      value: 0.94000006
       objectReference: {fileID: 0}
     - target: {fileID: 7993275380040288459, guid: 28a2e17f2aa28459099c180350293bf6, type: 3}
       propertyPath: m_LocalPosition.z
-      value: -2.56
+      value: 3.41
       objectReference: {fileID: 0}
     - target: {fileID: 7993275380040288459, guid: 28a2e17f2aa28459099c180350293bf6, type: 3}
       propertyPath: m_LocalRotation.w
@@ -7251,17 +6818,6 @@ Transform:
   m_CorrespondingSourceObject: {fileID: 7993275380040288459, guid: 28a2e17f2aa28459099c180350293bf6, type: 3}
   m_PrefabInstance: {fileID: 1665297693}
   m_PrefabAsset: {fileID: 0}
---- !u!114 &1665297695 stripped
-MonoBehaviour:
-  m_CorrespondingSourceObject: {fileID: 6504614332953282164, guid: 28a2e17f2aa28459099c180350293bf6, type: 3}
-  m_PrefabInstance: {fileID: 1665297693}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: da493b8dbb3aa475abf11f31549b9293, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
 --- !u!1001 &1691461916
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -7283,15 +6839,15 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 7993275380040288459, guid: 28a2e17f2aa28459099c180350293bf6, type: 3}
       propertyPath: m_LocalPosition.x
-      value: 3.21
+      value: 2.4799998
       objectReference: {fileID: 0}
     - target: {fileID: 7993275380040288459, guid: 28a2e17f2aa28459099c180350293bf6, type: 3}
       propertyPath: m_LocalPosition.y
-      value: 0.89
+      value: 0.94000006
       objectReference: {fileID: 0}
     - target: {fileID: 7993275380040288459, guid: 28a2e17f2aa28459099c180350293bf6, type: 3}
       propertyPath: m_LocalPosition.z
-      value: -2.91
+      value: 3.41
       objectReference: {fileID: 0}
     - target: {fileID: 7993275380040288459, guid: 28a2e17f2aa28459099c180350293bf6, type: 3}
       propertyPath: m_LocalRotation.w
@@ -7328,17 +6884,6 @@ Transform:
   m_CorrespondingSourceObject: {fileID: 7993275380040288459, guid: 28a2e17f2aa28459099c180350293bf6, type: 3}
   m_PrefabInstance: {fileID: 1691461916}
   m_PrefabAsset: {fileID: 0}
---- !u!114 &1691461918 stripped
-MonoBehaviour:
-  m_CorrespondingSourceObject: {fileID: 6504614332953282164, guid: 28a2e17f2aa28459099c180350293bf6, type: 3}
-  m_PrefabInstance: {fileID: 1691461916}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: da493b8dbb3aa475abf11f31549b9293, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
 --- !u!1001 &1691649118
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -7456,7 +7001,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1742932126}
   m_LocalRotation: {x: 0, y: 1, z: 0, w: 0}
-  m_LocalPosition: {x: 3.22, y: 1, z: 4.06}
+  m_LocalPosition: {x: 3.4699993, y: 0, z: 4.49}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -7657,7 +7202,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1795608036}
   m_LocalRotation: {x: 0, y: 1, z: 0, w: 0}
-  m_LocalPosition: {x: -2.6600008, y: 1, z: -2.71}
+  m_LocalPosition: {x: -2.6600008, y: 0, z: -2.2400007}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -7800,17 +7345,6 @@ Transform:
   m_CorrespondingSourceObject: {fileID: 7993275380040288459, guid: 81ea53750af48479785425335304fdc7, type: 3}
   m_PrefabInstance: {fileID: 1900156992}
   m_PrefabAsset: {fileID: 0}
---- !u!114 &1900156994 stripped
-MonoBehaviour:
-  m_CorrespondingSourceObject: {fileID: 8543619722873780761, guid: 81ea53750af48479785425335304fdc7, type: 3}
-  m_PrefabInstance: {fileID: 1900156992}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: da493b8dbb3aa475abf11f31549b9293, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
 --- !u!1 &1934858462
 GameObject:
   m_ObjectHideFlags: 0
@@ -8042,15 +7576,15 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 7993275380040288459, guid: 28a2e17f2aa28459099c180350293bf6, type: 3}
       propertyPath: m_LocalPosition.x
-      value: 3.25
+      value: 2.4
       objectReference: {fileID: 0}
     - target: {fileID: 7993275380040288459, guid: 28a2e17f2aa28459099c180350293bf6, type: 3}
       propertyPath: m_LocalPosition.y
-      value: 0.89
+      value: 0.94000006
       objectReference: {fileID: 0}
     - target: {fileID: 7993275380040288459, guid: 28a2e17f2aa28459099c180350293bf6, type: 3}
       propertyPath: m_LocalPosition.z
-      value: 4.09
+      value: -3.36
       objectReference: {fileID: 0}
     - target: {fileID: 7993275380040288459, guid: 28a2e17f2aa28459099c180350293bf6, type: 3}
       propertyPath: m_LocalRotation.w
@@ -8087,17 +7621,6 @@ Transform:
   m_CorrespondingSourceObject: {fileID: 7993275380040288459, guid: 28a2e17f2aa28459099c180350293bf6, type: 3}
   m_PrefabInstance: {fileID: 1974955950}
   m_PrefabAsset: {fileID: 0}
---- !u!114 &1974955952 stripped
-MonoBehaviour:
-  m_CorrespondingSourceObject: {fileID: 6504614332953282164, guid: 28a2e17f2aa28459099c180350293bf6, type: 3}
-  m_PrefabInstance: {fileID: 1974955950}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: da493b8dbb3aa475abf11f31549b9293, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
 --- !u!1001 &1999665427
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -8257,7 +7780,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2023317271}
   m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068}
-  m_LocalPosition: {x: -2.63, y: 1, z: 4.4399996}
+  m_LocalPosition: {x: -2.63, y: 0, z: 4.4399996}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -8483,74 +8006,6 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: be69a8cfb3b2940308cbac570565e629, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
---- !u!1 &2072781016
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 2072781019}
-  - component: {fileID: 2072781018}
-  - component: {fileID: 2072781017}
-  m_Layer: 0
-  m_Name: EventSystem
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!114 &2072781017
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2072781016}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_SendPointerHoverToParent: 1
-  m_HorizontalAxis: Horizontal
-  m_VerticalAxis: Vertical
-  m_SubmitButton: Submit
-  m_CancelButton: Cancel
-  m_InputActionsPerSecond: 10
-  m_RepeatDelay: 0.5
-  m_ForceModuleActive: 0
---- !u!114 &2072781018
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2072781016}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_FirstSelected: {fileID: 0}
-  m_sendNavigationEvents: 1
-  m_DragThreshold: 10
---- !u!4 &2072781019
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2072781016}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 0}
-  m_RootOrder: 16
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1001 &2090781612
 PrefabInstance:
   m_ObjectHideFlags: 0

Assets/Scripts/Gameplay/GameplayManager.cs

@@ -1,10 +1,9 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using TMPro;
 using UnityEngine;
 
-public enum PlayerType
+public enum PlayerTypes
 {
     Player1 = 0,
     Player2 = 1,
@@ -15,34 +14,16 @@ public enum PlayerType
 [System.Serializable]
 public class PlayerGameData
 {
-    public PlayerType playerType;
+    public PlayerTypes playerType;
     public int startIndex;
     public int endIndex;
     public Transform playersParent;
-    public Dictionary<int, PlayerPawn> playerPawnsDict;
+    public List<PlayerPawn> playerPawnsDict;
     public int totalPawnsFinished = 0;
 }
 
-[System.Serializable]
-public enum MatchType
-{
-    PVP,
-    Bot
-}
-
-public enum BotMove
-{
-    FinishingPathMove = 0,
-    SafeMove = 1,
-    AttackMove = 2,
-    NormalMove = 3,
-    NoMoves = 4
-}
-
 public class GameplayManager : MonoBehaviour, IBase, IBootLoader, IDataLoader
 {
-    [SerializeField] private TextMeshProUGUI diceText;
-
     [SerializeField] private Transform pointerDebug;
     [SerializeField] private MeshRenderer pointerMeshRend;
     [SerializeField] private Material turnMat;
@@ -51,18 +32,14 @@ public class GameplayManager : MonoBehaviour, IBase, IBootLoader, IDataLoader
     [SerializeField] private PlayerGameData[] playerGameDatas;
     [SerializeField] private PlayerBaseHandler playerBaseHandler;
 
-    private PlayerType currentPlayerTypeTurn;
+    private PlayerTypes currentPlayerTypeTurn;
     private int currentPlayerTurnIndex = 0;
-    private List<PlayerType> allPlayerTypes = new List<PlayerType>();
+    private List<PlayerTypes> playerTypes = new List<PlayerTypes>();
-    private List<PlayerType> botTypesInGame = new List<PlayerType>();
 
-    public List<PlayerType> PlayerTypesCollection => allPlayerTypes;
+    public List<PlayerTypes> PlayerTypesCollection => playerTypes;
 
     // private Dictionary<PlayerTypes, > playerPawnsDict = new Dictionary<PlayerTypes, List<PlayerPawn>>();
-    private Dictionary<PlayerType, PlayerGameData> playerGameDatasDict = new Dictionary<PlayerType, PlayerGameData>();
+    private Dictionary<PlayerTypes, PlayerGameData> playerGameDatasDict = new Dictionary<PlayerTypes, PlayerGameData>();
-
-    // botRuntimeMovementData: where can the bot move if a particular dice value is thrown, and based on the value set the bot move for each using a predictive approach and select based on the the priority
-    private Dictionary<PlayerType, Dictionary<int, BotMove>> botRuntimeMovementData = new Dictionary<PlayerType, Dictionary<int, BotMove>>(); 
 
     private TilesManager tilesManager;
 
@@ -84,121 +61,31 @@ public class GameplayManager : MonoBehaviour, IBase, IBootLoader, IDataLoader
         tilesManager = InterfaceManager.Instance.GetInterfaceInstance<TilesManager>();
 
         CanRollDice = true;
+        playerTypes = new List<PlayerTypes> { PlayerTypes.Player1, PlayerTypes.Player2, PlayerTypes.Player3, PlayerTypes.Player4 };    
 
-        // initialize the player list from UI.
+        playerBaseHandler.InitPlayerTypes(playerTypes);
-        // InitPlayerTypesForLAN(null);
-        InitPlayerTypesForBotMatch(PlayerType.Player1, 1);
-    }
-
-    // TODO :: Call when the UI selection is made and game starts
-    public void InitPlayerTypesForLAN(List<PlayerType> types)
-    {
-        // TODO :: 2P, 3P, 4P
-        allPlayerTypes = new List<PlayerType> { PlayerType.Player1, PlayerType.Player2, PlayerType.Player3, PlayerType.Player4 };
-
-        playerBaseHandler.InitPlayerTypes(allPlayerTypes);
         InitCurrentGamePlayerInfo();
     }
 
-    public void InitPlayerTypesForBotMatch(PlayerType selectedPlayerType, int botCount)
-    {
-        botTypesInGame.Clear();
-        allPlayerTypes.Clear();
-        AssignBotTypes(selectedPlayerType, botCount);
-        InitBotRuntimeData();
-
-        allPlayerTypes.Add(selectedPlayerType);
-        allPlayerTypes.AddRange(botTypesInGame);
-
-        playerBaseHandler.InitPlayerTypes(allPlayerTypes);
-        InitCurrentGamePlayerInfo();
-        AssignPlayerAndBotStates(selectedPlayerType);
-    }
-
-    private void InitBotRuntimeData()
-    {
-        botRuntimeMovementData.Clear();
-
-        foreach (var botType in botTypesInGame)
-        {
-            PlayerGameData playerGameData = playerGameDatasDict[botType];
-            if (!botRuntimeMovementData.ContainsKey(botType))
-            {
-                botRuntimeMovementData.Add(botType, new Dictionary<int, BotMove>());
-            }
-
-            foreach (var pawn in playerGameData.playerPawnsDict)
-            {
-                botRuntimeMovementData[botType].Add(pawn.Value.PlayerId, BotMove.SafeMove);
-            }
-        }
-    }
-
-    private void AssignPlayerAndBotStates(PlayerType selectedPlayerType)
-    {
-        PlayerBase playerBase = playerBaseHandler.GetPlayerBase(selectedPlayerType);
-        playerBase.AssignBotState(PawnType.User);
-
-        foreach (PlayerType playerType in botTypesInGame)
-        {
-            playerBase = playerBaseHandler.GetPlayerBase(playerType);
-            playerBase.AssignBotState(PawnType.Bot);
-        }
-    }
-
-    private void AssignBotTypes(PlayerType selectedPlayerType, int botCount)
-    {
-        int addedBots = 0;
-        if (botCount == 1)
-        {
-            var playerType = (PlayerType)((int)selectedPlayerType + 2 < Enum.GetValues(typeof(PlayerType)).Length ?
-                                                                    (int)selectedPlayerType + 2 : (int)selectedPlayerType - 2);
-            botTypesInGame.Add(playerType);
-        }
-        else if (botCount == 2)
-        {
-            foreach (PlayerType enumType in Enum.GetValues(typeof(PlayerType)))
-            {
-                if (enumType == selectedPlayerType) continue;
-
-                botTypesInGame.Add(enumType);
-                addedBots++;
-
-                if (addedBots == botCount) break;
-            }
-        }
-        else
-        {
-            foreach (PlayerType enumType in Enum.GetValues(typeof(PlayerType)))
-            {
-                if (enumType == selectedPlayerType) continue;
-
-                botTypesInGame.Add(enumType);
-            }
-        }
-    }
-
     // TODO :: Call based on 2P/3P/4P
     public void InitCurrentGamePlayerInfo()
     {
-        currentPlayerTypeTurn = allPlayerTypes[currentPlayerTurnIndex];
+        currentPlayerTypeTurn = playerTypes[currentPlayerTurnIndex];
 
         // initialize the board based on the player types
         foreach (PlayerGameData playerGameData in playerGameDatas)
         {
-            if (!allPlayerTypes.Contains(playerGameData.playerType))
+            if (!playerTypes.Contains(playerGameData.playerType))
                 continue;
 
-            Debug.Log($"playerGameData.playerType: {playerGameData.playerType}");
             playerGameDatasDict.Add(playerGameData.playerType, playerGameData);
-            playerGameDatasDict[playerGameData.playerType].playerPawnsDict = new Dictionary<int, PlayerPawn>();
+            playerGameDatasDict[playerGameData.playerType].playerPawnsDict = new List<PlayerPawn>();
 
             foreach (Transform playerPawnChild in playerGameData.playersParent)
             {
                 if (!playerPawnChild.gameObject.activeInHierarchy) continue;
                 
-                var pawn = playerPawnChild.GetComponent<PlayerPawn>();
+                playerGameDatasDict[playerGameData.playerType].playerPawnsDict.Add(playerPawnChild.GetComponent<PlayerPawn>());
-                playerGameDatasDict[playerGameData.playerType].playerPawnsDict.Add(pawn.PlayerId, pawn);
             }
         }
     }
@@ -207,9 +94,9 @@ public class GameplayManager : MonoBehaviour, IBase, IBootLoader, IDataLoader
     {
         foreach (var playerPawn in playerGameDatasDict[currentPlayerTypeTurn].playerPawnsDict)
         {
-            if (playerPawn.Value.GetPlayerState() == PlayerState.InFinishingPath) continue;
+            if (playerPawn.GetPlayerState() == PlayerState.InFinishingPath) continue;
 
-            playerPawn.Value.SetPlayerSelectionState(state);
+            playerPawn.SetPlayerSelectionState(state);
         }
     }
 
@@ -220,16 +107,29 @@ public class GameplayManager : MonoBehaviour, IBase, IBootLoader, IDataLoader
         // add core dice logic here
         Debug.Log($"Tile Index :: LUDO :: rolledVal: {rolledVal} :: {currentPlayerTypeTurn}");
         diceRolledValue = rolledVal;
-        diceText.text = $"{diceRolledValue}";
         
         if (rolledVal == Ludo_3D_Constants.Max_Dice_Rolls)
         {
             // provide option to select a pawn from the list
             // also play a simple animation before selecting
             EnablePlayerSelectionStates(true);
+
             CanRollDiceAgain = true;
 
-            if (AreAllPawnsInFinishingPath())
+            bool AreAllPawnsInFinishingPath = false;
+            foreach (var pawn in playerGameDatasDict[currentPlayerTypeTurn].playerPawnsDict)
+            {
+                if (pawn.GetPlayerState() == PlayerState.InFinishingPath && pawn.GetPlayerState() != PlayerState.HasFinished)
+                {
+                    AreAllPawnsInFinishingPath = true;
+                    continue;
+                }
+                
+                AreAllPawnsInFinishingPath = false;
+                break;
+            }
+
+            if (AreAllPawnsInFinishingPath)
                 CanRollDice = true;
 
             pointerMeshRend.material = selectMat;
@@ -238,7 +138,7 @@ public class GameplayManager : MonoBehaviour, IBase, IBootLoader, IDataLoader
         else // if there are any other pawns that are in safe or moving state
         {
             // for player's logic
-            IEnumerable<PlayerPawn> availPlayers = playerGameDatasDict[currentPlayerTypeTurn].playerPawnsDict.Values.Select(pawn => pawn)
+            IEnumerable<PlayerPawn> availPlayers = playerGameDatasDict[currentPlayerTypeTurn].playerPawnsDict.Select(pawn => pawn)
                                                                                 .Where(pawn => pawn.GetPlayerState() == PlayerState.InSafeZone || 
                                                                                                 pawn.GetPlayerState() == PlayerState.Moving || 
                                                                                                 pawn.GetPlayerState() == PlayerState.InFinishingPath);
@@ -268,7 +168,6 @@ public class GameplayManager : MonoBehaviour, IBase, IBootLoader, IDataLoader
             Debug.Log($"CustomAvailablePlayers: {customAvailPlayers}");
             if (customAvailPlayers < 1)
             {
-                // TODO :: Switch the player once the dice rolling has completed
                 SwitchPlayer();
                 CanRollDice = true;
             }
@@ -277,30 +176,11 @@ public class GameplayManager : MonoBehaviour, IBase, IBootLoader, IDataLoader
         }
     }
 
-    private bool AreAllPawnsInFinishingPath()
-    {
-        bool areAllPawnsInFinishingPath = false;
-        foreach (var pawn in playerGameDatasDict[currentPlayerTypeTurn].playerPawnsDict)
-        {
-            if (pawn.Value.GetPlayerState() == PlayerState.InFinishingPath && pawn.Value.GetPlayerState() != PlayerState.HasFinished)
-            {
-                areAllPawnsInFinishingPath = true;
-                continue;
-            }
-
-            areAllPawnsInFinishingPath = false;
-            break;
-        }
-
-        return areAllPawnsInFinishingPath;
-    }
-
     public void OnPawnSelected(PlayerPawn playerPawn)
     {
         EnablePlayerSelectionStates(false);
 
         PlayerGameData playerGameData = playerGameDatasDict[currentPlayerTypeTurn];
-        Debug.Log($"playerPawn.GetPlayerState(): {playerPawn.GetPlayerState()}");
 
         if (playerPawn.GetPlayerState() == PlayerState.InHome)
         {
@@ -344,17 +224,13 @@ public class GameplayManager : MonoBehaviour, IBase, IBootLoader, IDataLoader
 
                 if (safeTile.PlayerTypesCount == 1)
                 {
-                    PlayerType playerType = safeTile.GetFirstPlayerType();
+                    PlayerTypes playerType = safeTile.GetFirstPlayerType();
 
                     var playerPawns = safeTile.GetPlayerPawns(playerType);
                     foreach (var pawn in playerPawns)
                         pawn.MoveToCustomTilePosition(safeTile.CenterPlacementPosition);
                 }
             }
-            else
-            {
-                currentSittingTile.ResetPlayerPawn();
-            }
 
             MoveThroughTiles(playerPawn, nextTileIdx, targetIndex: targetIdx);
         }
@@ -377,93 +253,32 @@ public class GameplayManager : MonoBehaviour, IBase, IBootLoader, IDataLoader
             Debug.Log($"currentPlayerTurn: {currentPlayerTypeTurn}");
             Debug.Log($"currentPlayerTurnIndex: {currentPlayerTurnIndex}");
 
-            if (allPlayerTypes.Count == 1)
+            if (playerTypes.Count == 1)
             {
                 Debug.LogError($"GAME IS OVER");
                 return;
             }
 
-            if (currentPlayerTypeTurn == allPlayerTypes[allPlayerTypes.Count - 1])
+            if (currentPlayerTypeTurn == playerTypes[playerTypes.Count - 1])
             {
                 currentPlayerTurnIndex = 0;
-                currentPlayerTypeTurn = allPlayerTypes[currentPlayerTurnIndex];
+                currentPlayerTypeTurn = playerTypes[currentPlayerTurnIndex];
             }
             else
             {
                 currentPlayerTurnIndex++;
-                currentPlayerTypeTurn = allPlayerTypes[currentPlayerTurnIndex];
+                currentPlayerTypeTurn = playerTypes[currentPlayerTurnIndex];
             }
-
-            diceText.text = $"{0}";
         }
 
-        Debug.Log($"CurrentPlayerTurn: {currentPlayerTypeTurn}");
+        // var tempPos = playerGameDatasDict[currentPlayerTypeTurn].playerCornerEntity.transform.position;
-        var tempPos = playerBaseHandler.GetPlayerBase(currentPlayerTypeTurn).transform.position;
+        // pointerDebug.position = new Vector3(tempPos.x, 3f, tempPos.z);
-        pointerDebug.position = new Vector3(tempPos.x, 3f, tempPos.z);
 
         pointerMeshRend.material = turnMat;
         // pointerMeshRend.materials[0] = turnMat;
 
         if (playerPawn)
             playerPawn.SetPlayerState(tilesManager.RetrieveTileBasedOnIndex(playerPawn.CurrentTileIndex).IsSafeZone ? PlayerState.InSafeZone : PlayerState.Moving);
-
-        Debug.Log($"botTypesInGame.Contains(currentPlayerTypeTurn): {botTypesInGame.Contains(currentPlayerTypeTurn)}");
-
-        if (!CanRollDiceAgain && botTypesInGame.Contains(currentPlayerTypeTurn)) // TODO :: Double check calling of the function
-        {
-            Invoke(nameof(RollDiceForBot), 1f);
-        }
-    }
-
-    private void RollDiceForBot()
-    {
-        Debug.Log($"RollDiceForBot");
-
-        OnDiceRolled(UnityEngine.Random.Range(1, Ludo_3D_Constants.Max_Dice_Rolls + 1));
-    }
-
-    // TODO :: Call right after the dice is rolled with the animation
-    // What happens when you get a 6
-    private void SelectPawnFromBotBase()
-    {
-        var botPawnsDict = botRuntimeMovementData[currentPlayerTypeTurn]; // set the data inside this dict
-        
-        // check the data from the playerGameDataDict
-        // change playerPawnsDict to list
-
-        // only select the pawns that are active
-        // if no pawns have left the home select the first pawn inside the base
-        // 
-        foreach (var keyValuePair in playerGameDatasDict[currentPlayerTypeTurn].playerPawnsDict)
-        {
-            var playerPawn = keyValuePair.Value;
-            var possibleLandingIndex = playerPawn.CurrentTileIndex + diceRolledValue;
-
-            if (playerPawn.GetPlayerState() == PlayerState.HasFinished)
-            {
-                botPawnsDict.Remove(playerPawn.PlayerId); // TODO :: Double check logic
-                continue;
-            }
-
-            Tile tileData = tilesManager.RetrieveTileBasedOnIndex(possibleLandingIndex);
-            if (playerPawn.GetPlayerState() == PlayerState.InFinishingPath || possibleLandingIndex > playerGameDatasDict[currentPlayerTypeTurn].endIndex)
-            {
-                botPawnsDict[playerPawn.PlayerId] = BotMove.FinishingPathMove;
-                continue;
-            }
-            else if (tileData.IsSafeZone || playerPawn.GetPlayerState() == PlayerState.InHome)
-            {
-                botPawnsDict[playerPawn.PlayerId] = BotMove.SafeMove;
-            }
-            else if (tileData.PlayerPawn != null)
-            {
-                botPawnsDict[playerPawn.PlayerId] = BotMove.AttackMove;
-            }
-            else
-            {
-                botPawnsDict[playerPawn.PlayerId] = BotMove.NormalMove;
-            }
-        }
     }
 
     private void MoveThroughTiles(PlayerPawn playerPawn, int index, int targetIndex)
@@ -512,20 +327,12 @@ public class GameplayManager : MonoBehaviour, IBase, IBootLoader, IDataLoader
                 else
                 {
                      // TODO :: Improve this logic, use a collection
-                    Debug.Log($"nextTile.IsSafeZone: {nextTile.IsSafeZone}");
                     if (!nextTile.IsSafeZone)
                     {
-                        Debug.Log($"nextTile.PlayerPawn: {nextTile.PlayerPawn}, {nextTile.transform.name}");
                         if (nextTile.PlayerPawn != null)
                         {
-                            // play animation for moving back to base.
                             // TODO :: Send existing pawn back to base.
                             // means there's already a pawn there, move him back to the base.
-                            var playerBasePos = playerBaseHandler.GetPlayerBase(nextTile.PlayerPawn.PlayerType)
-                                                                .GetBasePlacementDataPosition(nextTile.PlayerPawn.PlayerId - 1).position;
-                            Debug.Log($"playerBasePos: {playerBasePos}");
-                            nextTile.PlayerPawn.transform.position = playerBasePos;
-                            nextTile.PlayerPawn.SetPlayerState(PlayerState.InHome);
                         }
 
                         nextTile.InitPlayerPawn(playerPawn, currentPlayerTypeTurn);
@@ -548,7 +355,7 @@ public class GameplayManager : MonoBehaviour, IBase, IBootLoader, IDataLoader
             Debug.Log($"targetSafeTile.ContainsPlayerType(currentPlayerTypeTurn): {targetSafeTile.ContainsPlayerType(currentPlayerTypeTurn)}");
             if (!targetSafeTile.ContainsPlayerType(currentPlayerTypeTurn)) // means it is a new player type, the second one
             {
-                PlayerType initialPlayerType = targetSafeTile.GetFirstPlayerType();
+                PlayerTypes initialPlayerType = targetSafeTile.GetFirstPlayerType();
 
                 // rearrange already existing player from center position to it's saved transform
                 var playerPawns = targetSafeTile.GetPlayerPawns(initialPlayerType);
@@ -627,10 +434,10 @@ public class GameplayManager : MonoBehaviour, IBase, IBootLoader, IDataLoader
                             CanRollDiceAgain = false;
                             
                             SwitchPlayer();
-                            if (allPlayerTypes.Contains(currentPlayerTypeTurn))
+                            if (playerTypes.Contains(currentPlayerTypeTurn))
-                                allPlayerTypes.Remove(currentPlayerTypeTurn);
+                                playerTypes.Remove(currentPlayerTypeTurn);
 
-                            Debug.Log($"PlayerTypes: {allPlayerTypes.Count}");
+                            Debug.Log($"PlayerTypes: {playerTypes.Count}");
                         }
                         else
                         {

Assets/Scripts/Gameplay/Player/PlayerBase.cs

@@ -9,36 +9,22 @@ public class BasePlacementData
 
 public class PlayerBase : MonoBehaviour
 {
-    [SerializeField] private PlayerType playerType;
+    [SerializeField] private PlayerTypes playerType;
     [SerializeField] private BasePlacementData[] basePlacementDatas;
     [SerializeField] private PlayerPawn[] playerPawns;
 
-    public bool IsBotBase
+    public PlayerTypes GetPlayerType() => playerType;
-    {
-        get; private set;
-    }
 
-    public PlayerType GetPlayerType() => playerType;
+    public void InitPlayerIds()
-
-    public void InitPlayerData()
     {
         for (int idx = 0; idx < basePlacementDatas.Length; idx++)
         {
-            playerPawns[idx].Init(basePlacementDatas[idx].playerBaseId, playerType);
+            playerPawns[idx].InitId(basePlacementDatas[idx].playerBaseId);
         }
     }
 
-    public void AssignBotState(PawnType pawnType)
+    public BasePlacementData GetBasePlacementData(int idx)
     {
-        IsBotBase = pawnType == PawnType.Bot;
+        return basePlacementDatas[idx];
-        for (int idx = 0; idx < playerPawns.Length; idx++)
-        {
-            playerPawns[idx].AssignBotPlayerState(IsBotBase);
-        }
-    }
-
-    public Transform GetBasePlacementDataPosition(int idx)
-    {
-        return basePlacementDatas[idx].placementTransform;
     }
 }

Assets/Scripts/Gameplay/Player/PlayerPawn.cs

@@ -11,19 +11,11 @@ public enum PlayerState
     HasFinished
 }
 
-public enum PawnType
-{
-    User,
-    Bot
-}
-
 public class PlayerPawn : MonoBehaviour
 {
     [SerializeField] private PlayerState playerState;
 
     private bool canSelectPlayerFromHome;
-    private GameplayManager gameplayManager;
-
     public int CurrentTileIndex
     {
         get; private set;
@@ -34,30 +26,27 @@ public class PlayerPawn : MonoBehaviour
         get; private set;
     }
 
-    public PlayerType PlayerType
+    public int BaseId
     {
         get; private set;
     }
 
-    public bool IsBotPlayer
+    private GameplayManager gameplayManager;
-    {
-        get; private set;
-    }
-
-    public void AssignBotPlayerState(bool state)
-    {
-        IsBotPlayer = state;
-    }
 
     public void SetPlayerSelectionState(bool state)
     {
         canSelectPlayerFromHome = state;
         if (canSelectPlayerFromHome)
         {
-            // TODO :: Play animation for selecting any of the players
+            // Play animation for selecting any of the players
         }
     }
 
+    public void SetCurrentTileIndex(int tileIndex)
+    {
+        CurrentTileIndex = tileIndex;
+    }
+
     public void MoveToTile(Vector3 startingPoint, Action onComplete, int tileIndex)
     {
         CurrentTileIndex = tileIndex;
@@ -84,7 +73,7 @@ public class PlayerPawn : MonoBehaviour
 
     private void OnMouseDown()
     {
-        if (IsBotPlayer || !canSelectPlayerFromHome) return;
+        if (!canSelectPlayerFromHome) return;
 
         SetGameplayManager();
         gameplayManager.OnPawnSelected(this);
@@ -95,9 +84,8 @@ public class PlayerPawn : MonoBehaviour
         gameplayManager = gameplayManager ?? InterfaceManager.Instance.GetInterfaceInstance<GameplayManager>();
     }
 
-    public void Init(int id, PlayerType playerType)
+    public void InitId(int id)
     {
         PlayerId = id;
-        PlayerType = playerType;
     }
 }

Assets/Scripts/Input/DiceRoller.cs

@@ -27,8 +27,7 @@ public class DiceRoller : MonoBehaviour
 
     private void OnDiceRolled()
     {
-        int currentRolledVal = Random.Range(1, Ludo_3D_Constants.Max_Dice_Rolls + 1);
+        int currentRolledVal = diceTestValue != 0 ? diceTestValue : Random.Range(1, Ludo_3D_Constants.Max_Dice_Rolls + 1);
-        // diceTestValue != 0 ? diceTestValue : Random.Range(1, Ludo_3D_Constants.Max_Dice_Rolls + 1);
         inputManager.SetDiceRollValue(currentRolledVal);
     }
 }

Assets/Scripts/Tile/SafeTile.cs

@@ -8,13 +8,13 @@ public class SafeTile : Tile
     [SerializeField] private Transform[] placementPoints;
 
     protected Queue<Transform> placementQueue = new Queue<Transform>();
-    protected Dictionary<PlayerType, PlayerTileData> playerTypesDict = new Dictionary<PlayerType, PlayerTileData>();
+    protected Dictionary<PlayerTypes, PlayerTileData> playerTypesDict = new Dictionary<PlayerTypes, PlayerTileData>();
 
     public int PlayerTypesCount => playerTypesDict.Count;
     public bool HasMoreThanOnePlayerType => playerTypesDict.Count > 1;
-    public List<PlayerPawn> GetPlayerPawns(PlayerType playerType) => playerTypesDict[playerType].playerPawns.Values.ToList();
+    public List<PlayerPawn> GetPlayerPawns(PlayerTypes playerType) => playerTypesDict[playerType].playerPawns.Values.ToList();
 
-    public bool ContainsPlayerType(PlayerType playerType) => playerTypesDict.ContainsKey(playerType);
+    public bool ContainsPlayerType(PlayerTypes playerType) => playerTypesDict.ContainsKey(playerType);
 
     private void Awake()
     {
@@ -24,7 +24,7 @@ public class SafeTile : Tile
         }
     }
 
-    public override void InitPlayerPawn(PlayerPawn playerPawn, PlayerType playerType)
+    public override void InitPlayerPawn(PlayerPawn playerPawn, PlayerTypes playerType)
     {
         // PlayerPawn = playerPawn;
         if (!playerTypesDict.ContainsKey(playerType))
@@ -48,7 +48,7 @@ public class SafeTile : Tile
         }
     }
 
-    public void UpdateSafeZonePlayerData(PlayerType playerType, PlayerPawn playerPawn)
+    public void UpdateSafeZonePlayerData(PlayerTypes playerType, PlayerPawn playerPawn)
     {
         if (playerTypesDict.ContainsKey(playerType))
         {
@@ -70,19 +70,19 @@ public class SafeTile : Tile
         }
     }
 
-    public PlayerType GetFirstPlayerType() => playerTypesDict.Keys.FirstOrDefault();
+    public PlayerTypes GetFirstPlayerType() => playerTypesDict.Keys.FirstOrDefault();
 
-    public int GetPlayerPawnsCountInTile(PlayerType playerType)
+    public int GetPlayerPawnsCountInTile(PlayerTypes playerType)
     {
         return playerTypesDict[playerType].playerPawns.Count;
     }
 
-    public PlayerPawn IterateAndGetPlayerPawn(PlayerType playerType, int index)
+    public PlayerPawn IterateAndGetPlayerPawn(PlayerTypes playerType, int index)
     {
         return playerTypesDict[playerType].playerPawns[index + 1];
     }
 
-    public Transform GetPlacementPoint(PlayerType playerType)
+    public Transform GetPlacementPoint(PlayerTypes playerType)
     {
         return playerTypesDict[playerType].commonPlacementTransform;
     }

Assets/Scripts/Tile/Tile.cs

@@ -22,7 +22,7 @@ public class Tile : MonoBehaviour
 
     public bool IsSafeZone => isSafeZone;
 
-    public Vector3 CenterPlacementPosition => new Vector3(transform.position.x, 1f, transform.position.z);
+    public Vector3 CenterPlacementPosition => transform.position;
 
     protected int lastOccupiedIndex = 0;
 
@@ -31,13 +31,8 @@ public class Tile : MonoBehaviour
         get; private set;
     }
 
-    public virtual void InitPlayerPawn(PlayerPawn playerPawn, PlayerType playerType)
+    public virtual void InitPlayerPawn(PlayerPawn playerPawn, PlayerTypes playerType)
     {
         PlayerPawn = playerPawn;
     }
-
-    public void ResetPlayerPawn()
-    {
-        PlayerPawn = null;
-    }
 }

Assets/Scripts/Tile/TilesManager.cs

@@ -7,7 +7,7 @@ using UnityEngine.Tilemaps;
 [System.Serializable]
 public struct TileData
 {
-    public PlayerType playerType;
+    public PlayerTypes playerType;
     public Transform playerFinishingTileParent;
 }
 
@@ -18,7 +18,7 @@ public class TilesManager : MonoBehaviour, IBootLoader, IDataLoader, IBase
 
     private GameplayManager gameplayManager;
 
-    private Dictionary<PlayerType, List<Transform>> finishingTileDataPairs = new Dictionary<PlayerType, List<Transform>>();
+    private Dictionary<PlayerTypes, List<Transform>> finishingTileDataPairs = new Dictionary<PlayerTypes, List<Transform>>();
 
     public void Initialize()
     {
@@ -40,7 +40,7 @@ public class TilesManager : MonoBehaviour, IBootLoader, IDataLoader, IBase
         }
     }
 
-    public int GetFinishingTileDataLength(PlayerType playerType) => finishingTileDataPairs[playerType].Count;
+    public int GetFinishingTileDataLength(PlayerTypes playerType) => finishingTileDataPairs[playerType].Count;
 
     public int GetGeneralTilesLength() => generalTiles.Length;
 
@@ -57,7 +57,7 @@ public class TilesManager : MonoBehaviour, IBootLoader, IDataLoader, IBase
         return tile;
     }
 
-    public Transform RetrievePositionForFinishingTile(PlayerType playerType, int index)
+    public Transform RetrievePositionForFinishingTile(PlayerTypes playerType, int index)
     {
         return finishingTileDataPairs[playerType][index];
     }

ProjectSettings/ProjectSettings.asset

@@ -806,23 +806,7 @@ PlayerSettings:
   webGLThreadsSupport: 0
   webGLDecompressionFallback: 0
   webGLPowerPreference: 2
-  scriptingDefineSymbols:
+  scriptingDefineSymbols: {}
-    Android: DOTWEEN
-    EmbeddedLinux: DOTWEEN
-    GameCoreScarlett: DOTWEEN
-    GameCoreXboxOne: DOTWEEN
-    LinuxHeadlessSimulation: DOTWEEN
-    Lumin: DOTWEEN
-    Nintendo Switch: DOTWEEN
-    PS4: DOTWEEN
-    PS5: DOTWEEN
-    Stadia: DOTWEEN
-    Standalone: DOTWEEN
-    WebGL: DOTWEEN
-    Windows Store Apps: DOTWEEN
-    XboxOne: DOTWEEN
-    iPhone: DOTWEEN
-    tvOS: DOTWEEN
   additionalCompilerArguments: {}
   platformArchitecture: {}
   scriptingBackend: {}