more merge fixes

Assets/ownScripts/Menu/ControlMenu.cs

@@ -56,7 +56,6 @@ public class ControlMenu : MonoBehaviour
             new ExperimentParameters(1, 30, true, true, 1),
             new ExperimentParameters(2, 30, true, true, 1),
             new ExperimentParameters(3, 30, true, true, 1),
-            new ExperimentParameters(1, 30, true, true, 1),
 
             new ExperimentParameters(0, 10, false, true, 1),
             new ExperimentParameters(1, 10, false, true, 1),
@@ -66,7 +65,6 @@ public class ControlMenu : MonoBehaviour
             new ExperimentParameters(1, 30, false, true, 1),
             new ExperimentParameters(2, 30, false, true, 1),
             new ExperimentParameters(3, 30, false, true, 1),
-            new ExperimentParameters(1, 30, false, true, 1),
 
             new ExperimentParameters(0, 15, true, true, 2),
             new ExperimentParameters(0, 30, true, true, 2)

Assets/ownScripts/Menu/InGameShortcuts.cs

@@ -96,11 +96,11 @@ public class InGameShortcuts : MonoBehaviour
             SceneManager.LoadScene(0);
         }
         
-        /*if (LaserPointerActivate.GetStateDown(SteamVR_Input_Sources.Any))
+        if (LaserPointerActivate.GetStateDown(SteamVR_Input_Sources.Any))
         {
             isActive = !isActive;
             LaserPointerGameObject.SetActive(isActive);
-        }*/
+        }
         
         /* checks any controller for SteamVR_Action_Vector2 properties to GetAxis and save in touchpadValue
         Vector2 touchpadValue = touchPadAction.GetAxis(SteamVR_Input_Sources.Any);

Assets/ownScripts/Menu/MenuDataHolder.cs

@@ -34,7 +34,7 @@ public static class MenuDataHolder
 
     public static int RepetitionCount { get; set; } = 0;
 
-    public static int[] PositionDistribution = new int[4];
+    public static int[] PositionDistribution = { 0, 0, 0, 0 };
 
     public static bool TimerActive { get; set; } = false;
 

Assets/ownScripts/Students/OneStudent/BehaviourController.cs

@@ -80,7 +80,6 @@ public class BehaviourController : MonoBehaviour
     {
         MenuDataHolder.MisbehaviourSolved++;
         MenuDataHolder.TotalInterventionTime += Time.time - distortionStartTimePoint;
-        Debug.Log(MenuDataHolder.TotalInterventionTime);
         IsDistorting = false;
         TimeDelayToLastMisbehaviour = 0f; // DateTime.Now.Minute * 60 + DateTime.Now.Second; // TODO Where/How is this actually used?
         Behave();