Merge pull request #665 from Nicky-Nice-Games/TimeTrialDataFix

Time trial data fix

Author: LRLogan

GGK/Assets/Scripts/API/PlayerInfo.cs

@@ -44,6 +44,7 @@ public class PlayerInfo : ScriptableObject
     public PlayerKart PlayerCharacter; // should probably be an enum referencing each character
     public Color PlayerColor;
     public ulong clientID;
+    public GameModes curGameMode;
 
     //Default constructor
     public PlayerInfo()
@@ -159,10 +160,27 @@ public PlayerInfo(PlayerInfo other)
         collisionWithWalls = other.collisionWithWalls;
         characterUsed = other.characterUsed;
         fellOffMap = other.fellOffMap;
+        curGameMode = other.curGameMode;
 
         boostUsage = new Dictionary<string, int>(other.boostUsage);
         offenceUsage = new Dictionary<string, int>(other.offenceUsage);
         trapUsage = new Dictionary<string, int>(other.trapUsage);
         defenseUsage = new Dictionary<string, int>(other.defenseUsage);
     }
+
+    /// <summary>
+    /// Gets rid of unneeded data for time trial
+    /// </summary>
+    public void DeleteDataForTimeTrial()
+    {
+        Debug.Log("Called DeleteDataForTimeTrial");
+        racePos = 0;
+        collisionsWithPlayers = 0;
+        collisionWithWalls = 0;
+        fellOffMap = 0;
+        boostUsage.Clear();
+        offenceUsage.Clear();
+        trapUsage.Clear();  
+        defenseUsage.Clear();
+    }
 }

GGK/Assets/Scripts/DriverScripts/NEWDriver.cs

@@ -1140,9 +1140,11 @@ public void Recover()
     public void SendThisPlayerData()
     {
         //client sending their own data
-        if (!playerInfo.isGuest) 
+        if (!playerInfo.isGuest ) 
         {
             playerInfo.fellOffMap /= 2;
+            Debug.Log("Is on time trial? " + playerInfo.curGameMode);
+            if (playerInfo.curGameMode == GameModes.timeTrial) { playerInfo.DeleteDataForTimeTrial(); }
             gameManagerObj.GetComponent<APIManager>().PostPlayerData(playerInfo); 
         }
 

GGK/Assets/Scripts/GameManagers/GameManager.cs

@@ -197,7 +197,9 @@ public void LoadedGameModeRpc()
 
     public void ChangeGameMode(GameModes gameMode)
     {
+        playerInfo.curGameMode = gameMode;
         curGameMode = gameMode;
+        Debug.Log("Changing game mode to " + gameMode);
     }
 
     /// <summary>
@@ -428,22 +430,30 @@ public void FillMapRaced(NEWDriver player)
     {
         switch (SceneManager.GetActiveScene().name)
         {
-            case "LD_RITOuterLoop":
+            case "TT_RITOuterLoop":
+            case "LD_RITOuterLoop-Backup":
                 Debug.Log("Map data: Outer Loop (1)");
                 player.playerInfo.mapRaced = 1;
                 break;
-            case "LD_RITDorm":
+
+            case "TT_RITDorm":
+            case "GSP_RITDorm":
                 Debug.Log("Map data: Dorm (2)");
                 player.playerInfo.mapRaced = 2;
                 break;
+
+            case "TT_Golisano":
             case "GSP_Golisano":
                 Debug.Log("Map data: Golisano (3)");
                 player.playerInfo.mapRaced = 3;
                 break;
+
+            case "TT_FinalsBrickRoad":
             case "GSP_FinalsBrickRoad":
                 Debug.Log("Map data: Finals Brick (4)");
                 player.playerInfo.mapRaced = 4;
                 break;
+
             default:
                 break;
         }