merge fixes

Assets/ownScripts/Menu/ControlMenu.cs

@@ -37,7 +37,7 @@ public class ControlMenu : MonoBehaviour
             evaluationWalkingBackground.GetComponent<Renderer>().material.mainTexture = textures[MenuDataHolder.ChosenScene - 1];
         }
 
-        float roundedDistance = Mathf.Round(MenuDataHolder.walkedDistance * 100f) / 100f;
+        float roundedDistance = Mathf.Round(MenuDataHolder.WalkedDistance * 100f) / 100f;
         evalDistance.GetComponent<TextMeshProUGUI>().text = roundedDistance.ToString() + " m";
         evalMisbCount.GetComponent<TextMeshProUGUI>().text = MenuDataHolder.MisbehaviourCount.ToString();
         evalMisbSolved.GetComponent<TextMeshProUGUI>().text = MenuDataHolder.MisbehaviourSolved.ToString();

Assets/ownScripts/Menu/MenuDataHolder.cs

@@ -30,8 +30,12 @@ public static class MenuDataHolder
 
     public static int MisbehaviourSeen { get; set; } = 0;
 
+    public static float TotalInterventionTime { get; set; } = 0;
+
     public static int RepetitionCount { get; set; } = 0;
 
+    public static int[] PositionDistribution = new int[4];
+
     public static bool TimerActive { get; set; } = false;
 
     public static int TimerSeconds { get; set; } = 0;

Assets/ownScripts/Menu/MenuMethods.cs

@@ -43,9 +43,9 @@ public class MenuMethods
         // You can add up the values in as many cells as you want.
         for (int i = 0; i < MenuDataHolder.EvaluationMap.Count - 1; i++)
         {
-            if (MenuDataHolder.evaluationMap[i].x <= 2.45f)
+            if (MenuDataHolder.EvaluationMap[i].x <= 2.45f)
             {
-                if (MenuDataHolder.evaluationMap[i].y <= 2.45f)
+                if (MenuDataHolder.EvaluationMap[i].y <= 2.45f)
                 {
                     MenuDataHolder.PositionDistribution[0] += 1;
                 } 
@@ -53,7 +53,7 @@ public class MenuMethods
             }
             else
             {
-                if (MenuDataHolder.evaluationMap[i].y <= 2.45f)
+                if (MenuDataHolder.EvaluationMap[i].y <= 2.45f)
                 {
                     MenuDataHolder.PositionDistribution[2] += 1;
                 }
@@ -65,7 +65,7 @@ public class MenuMethods
             rowDataTemp[2] = "" + MenuDataHolder.EvaluationMap[i].y; // PositionY
             rowData.Add(rowDataTemp);
             
-            MenuDataHolder.walkedDistance += Vector2.Distance(MenuDataHolder.evaluationMap[i], MenuDataHolder.evaluationMap[i + 1]) / 2f; // devided by 2 to get more or less distance in meters
+            MenuDataHolder.WalkedDistance += Vector2.Distance(MenuDataHolder.EvaluationMap[i], MenuDataHolder.EvaluationMap[i + 1]) / 2f; // devided by 2 to get more or less distance in meters
         }
 
         var output = new string[rowData.Count][];
@@ -96,9 +96,9 @@ public class MenuMethods
     #if UNITY_EDITOR
     if (MenuDataHolder.isExperiment)
     {
-        return Application.dataPath + "/Student_Movement/" + MenuDataHolder.repetitionCount + "_" + DateTime.Today.Date.Year + " " + DateTime.Today.Date.Month + " " + DateTime.Today.Date.Day + "_" + DateTime.Now.Hour + " " + DateTime.Now.Minute + ".csv";
+        return Application.dataPath + "/Student_Movement/" + MenuDataHolder.RepetitionCount + "_" + DateTime.Today.Date.Year + " " + DateTime.Today.Date.Month + " " + DateTime.Today.Date.Day + "_" + DateTime.Now.Hour + " " + DateTime.Now.Minute + ".csv";
     }
-    else {  return Application.dataPath + "/Student_Movement/" + "Student" + MenuDataHolder.repetitionCount + ".csv"; }
+    else {  return Application.dataPath + "/Student_Movement/" + "Student" + MenuDataHolder.RepetitionCount + ".csv"; }
     #elif UNITY_ANDROID
     return Application.persistentDataPath+"Saved_data.csv";
     #elif UNITY_IPHONE