Merge branch 'Gameplay/ashby-gameplay' into Gameplay/main-gameplay

While selecting PvsAI and selecting green, got a null ref due to wrong currentPlayerTurnIndex be passed on.

Assets/Scripts/Gameplay/GameplayManager.cs

@@ -264,7 +264,7 @@ public class GameplayManager : MonoBehaviour, IBase, IBootLoader, IDataLoader
             // SetCanRollDiceForUser(!isBotTurn); // TODO :: Need to change
             if (isBotTurn)
             {
-                currentPlayerTurnTimer.KillTimer();
+                currentPlayerTurnTimer?.KillTimer();
                 uIManager.UpdatePlayerTurnText(currentPlayerTypeTurn);
                 return;
             }
@@ -302,11 +302,12 @@ public class GameplayManager : MonoBehaviour, IBase, IBootLoader, IDataLoader
 
     private void ResetCurrentPlayerTurnTimer()
     {
-        currentPlayerTurnTimer.KillTimer();
+        currentPlayerTurnTimer?.KillTimer();
     }
 
     public void InitCurrentGamePlayerInfo()
     {
+        currentPlayerTurnIndex = 0;
         UpdateCurrentPlayerTurn(allPlayerTypes[currentPlayerTurnIndex]);
         SetCanRollDiceForUser(IsUsersTurn());
         UpdateDiceView();

Assets/Scripts/Gameplay/Player/PlayerBaseHandler.cs

@@ -56,6 +56,7 @@ public class PlayerBaseHandler : MonoBehaviour
 
     public void ShowSelectedPlayerBase(PlayerType playerType, bool state)
     {
+        if (playerBasesDict.ContainsKey(playerType))
             playerBasesDict[playerType].ShowPlayerBaseEffect(state);
     }
 }