Adding player tracking as we work our way to making round 3 markers better.

Assets/UdonSharp/Maps/FloorMapMarker.asset

@@ -44,7 +44,7 @@ MonoBehaviour:
       Data: 
     - Name: 
       Entry: 12
-      Data: 14
+      Data: 15
     - Name: 
       Entry: 7
       Data: 
@@ -476,13 +476,13 @@ MonoBehaviour:
       Data: 
     - Name: $k
       Entry: 1
-      Data: _CollisionCheckCounter
+      Data: _FailureCounter
     - Name: $v
       Entry: 7
       Data: 31|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
     - Name: <Name>k__BackingField
       Entry: 1
-      Data: _CollisionCheckCounter
+      Data: _FailureCounter
     - Name: <UserType>k__BackingField
       Entry: 7
       Data: 32|System.RuntimeType, mscorlib
@@ -499,8 +499,8 @@ MonoBehaviour:
       Entry: 7
       Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
     - Name: 
-      Entry: 6
-      Data: 
+      Entry: 3
+      Data: 1
     - Name: 
       Entry: 8
       Data: 
@@ -512,7 +512,13 @@ MonoBehaviour:
       Data: 33|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
     - Name: 
       Entry: 12
-      Data: 0
+      Data: 1
+    - Name: 
+      Entry: 7
+      Data: 34|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime
+    - Name: 
+      Entry: 8
+      Data: 
     - Name: 
       Entry: 13
       Data: 
@@ -530,13 +536,13 @@ MonoBehaviour:
       Data: 
     - Name: $k
       Entry: 1
-      Data: _NoCollisionCounter
+      Data: _CollisionCheckCounter
     - Name: $v
       Entry: 7
-      Data: 34|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
+      Data: 35|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
     - Name: <Name>k__BackingField
       Entry: 1
-      Data: _NoCollisionCounter
+      Data: _CollisionCheckCounter
     - Name: <UserType>k__BackingField
       Entry: 9
       Data: 32
@@ -557,7 +563,7 @@ MonoBehaviour:
       Data: false
     - Name: _fieldAttributes
       Entry: 7
-      Data: 35|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
+      Data: 36|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
     - Name: 
       Entry: 12
       Data: 0
@@ -578,25 +584,19 @@ MonoBehaviour:
       Data: 
     - Name: $k
       Entry: 1
-      Data: _CollidingLocations
+      Data: _NoCollisionCounter
     - Name: $v
       Entry: 7
-      Data: 36|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
+      Data: 37|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
     - Name: <Name>k__BackingField
       Entry: 1
-      Data: _CollidingLocations
+      Data: _NoCollisionCounter
     - Name: <UserType>k__BackingField
-      Entry: 7
-      Data: 37|System.RuntimeType, mscorlib
-    - Name: 
-      Entry: 1
-      Data: VRC.SDK3.Data.DataList, VRCSDK3
-    - Name: 
-      Entry: 8
-      Data: 
+      Entry: 9
+      Data: 32
     - Name: <SystemType>k__BackingField
       Entry: 9
-      Data: 37
+      Data: 32
     - Name: <SyncMode>k__BackingField
       Entry: 7
       Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
@@ -632,19 +632,19 @@ MonoBehaviour:
       Data: 
     - Name: $k
       Entry: 1
-      Data: _RigidBodyComponent
+      Data: _CollidingLocations
     - Name: $v
       Entry: 7
       Data: 39|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
     - Name: <Name>k__BackingField
       Entry: 1
-      Data: _RigidBodyComponent
+      Data: _CollidingLocations
     - Name: <UserType>k__BackingField
       Entry: 7
       Data: 40|System.RuntimeType, mscorlib
     - Name: 
       Entry: 1
-      Data: UnityEngine.Rigidbody, UnityEngine.PhysicsModule
+      Data: VRC.SDK3.Data.DataList, VRCSDK3
     - Name: 
       Entry: 8
       Data: 
@@ -686,25 +686,25 @@ MonoBehaviour:
       Data: 
     - Name: $k
       Entry: 1
-      Data: _ObjectSync
+      Data: _RigidBodyComponent
     - Name: $v
       Entry: 7
       Data: 42|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
     - Name: <Name>k__BackingField
       Entry: 1
-      Data: _ObjectSync
+      Data: _RigidBodyComponent
     - Name: <UserType>k__BackingField
       Entry: 7
       Data: 43|System.RuntimeType, mscorlib
     - Name: 
       Entry: 1
-      Data: MMMaellon.LightSync.LightSync, com.mmmaellon.lightsync
+      Data: UnityEngine.Rigidbody, UnityEngine.PhysicsModule
     - Name: 
       Entry: 8
       Data: 
     - Name: <SystemType>k__BackingField
       Entry: 9
-      Data: 4
+      Data: 43
     - Name: <SyncMode>k__BackingField
       Entry: 7
       Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
@@ -740,25 +740,25 @@ MonoBehaviour:
       Data: 
     - Name: $k
       Entry: 1
-      Data: _PickupComponent
+      Data: _ObjectSync
     - Name: $v
       Entry: 7
       Data: 45|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
     - Name: <Name>k__BackingField
       Entry: 1
-      Data: _PickupComponent
+      Data: _ObjectSync
     - Name: <UserType>k__BackingField
       Entry: 7
       Data: 46|System.RuntimeType, mscorlib
     - Name: 
       Entry: 1
-      Data: VRC.SDK3.Components.VRCPickup, VRCSDK3
+      Data: MMMaellon.LightSync.LightSync, com.mmmaellon.lightsync
     - Name: 
       Entry: 8
       Data: 
     - Name: <SystemType>k__BackingField
       Entry: 9
-      Data: 46
+      Data: 4
     - Name: <SyncMode>k__BackingField
       Entry: 7
       Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
@@ -794,19 +794,19 @@ MonoBehaviour:
       Data: 
     - Name: $k
       Entry: 1
-      Data: _MarkerMesh
+      Data: _PickupComponent
     - Name: $v
       Entry: 7
       Data: 48|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
     - Name: <Name>k__BackingField
       Entry: 1
-      Data: _MarkerMesh
+      Data: _PickupComponent
     - Name: <UserType>k__BackingField
       Entry: 7
       Data: 49|System.RuntimeType, mscorlib
     - Name: 
       Entry: 1
-      Data: UnityEngine.MeshRenderer, UnityEngine.CoreModule
+      Data: VRC.SDK3.Components.VRCPickup, VRCSDK3
     - Name: 
       Entry: 8
       Data: 
@@ -843,6 +843,60 @@ MonoBehaviour:
     - Name: 
       Entry: 8
       Data: 
+    - Name: 
+      Entry: 7
+      Data: 
+    - Name: $k
+      Entry: 1
+      Data: _MarkerMesh
+    - Name: $v
+      Entry: 7
+      Data: 51|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
+    - Name: <Name>k__BackingField
+      Entry: 1
+      Data: _MarkerMesh
+    - Name: <UserType>k__BackingField
+      Entry: 7
+      Data: 52|System.RuntimeType, mscorlib
+    - Name: 
+      Entry: 1
+      Data: UnityEngine.MeshRenderer, UnityEngine.CoreModule
+    - Name: 
+      Entry: 8
+      Data: 
+    - Name: <SystemType>k__BackingField
+      Entry: 9
+      Data: 52
+    - Name: <SyncMode>k__BackingField
+      Entry: 7
+      Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
+    - Name: 
+      Entry: 6
+      Data: 
+    - Name: 
+      Entry: 8
+      Data: 
+    - Name: <IsSerialized>k__BackingField
+      Entry: 5
+      Data: false
+    - Name: _fieldAttributes
+      Entry: 7
+      Data: 53|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
+    - Name: 
+      Entry: 12
+      Data: 0
+    - Name: 
+      Entry: 13
+      Data: 
+    - Name: 
+      Entry: 8
+      Data: 
+    - Name: 
+      Entry: 8
+      Data: 
+    - Name: 
+      Entry: 8
+      Data: 
     - Name: 
       Entry: 13
       Data: 

Assets/UdonSharp/Maps/FloorMapMarker.cs

@@ -22,6 +22,7 @@ public class FloorMapMarker : UdonSharpBehaviour
 	[UdonSynced, FieldChangeCallback(nameof(IsLit))] private bool _IsLit = false;
 	[UdonSynced] private bool _LocationFindingEnabled = false;
 
+	[UdonSynced] private int _FailureCounter = 0;
 	private int _CollisionCheckCounter = 0;
 	private int _NoCollisionCounter = 0;
 	private DataList _CollidingLocations = new DataList();
@@ -31,6 +32,7 @@ public class FloorMapMarker : UdonSharpBehaviour
 	private VRCPickup _PickupComponent;
 	private MeshRenderer _MarkerMesh;
 
+	private const int MAX_FAILURE_COUNT = 2;
 	private const int MAX_REPEAT_COLLISION_CHECKS = 3;
 	private const int MAX_TIME_WITH_NO_COLLISIONS = 8;
 	private const float TIME_BETWEEN_REPEAT_COLLISION_CHECKS = 0.15f;
@@ -160,7 +162,7 @@ public class FloorMapMarker : UdonSharpBehaviour
 					bool FoundCorrectResponse = ConfirmChoice(Location.Country, Location.City);
 					if (FoundCorrectResponse)
 					{
-						SendCustomNetworkEvent(NetworkEventTarget.All,
+						SendCustomNetworkEvent(NetworkEventTarget.Owner,
 							nameof(SendCorrectResponse), Location.transform.position);
 						return;
 					}
@@ -175,7 +177,7 @@ public class FloorMapMarker : UdonSharpBehaviour
 			}
 			else
 			{
-				SendCustomNetworkEvent(NetworkEventTarget.All, nameof(SendIncorrectResponse));
+				SendCustomNetworkEvent(NetworkEventTarget.Owner, nameof(SendIncorrectResponse));
 			}
 			_CollisionCheckCounter++;
 		}
@@ -184,7 +186,7 @@ public class FloorMapMarker : UdonSharpBehaviour
 			_NoCollisionCounter++;
 			if (_NoCollisionCounter >= MAX_TIME_WITH_NO_COLLISIONS)
 			{
-				SendCustomNetworkEvent(NetworkEventTarget.All, nameof(SendIncorrectResponse));
+				SendCustomNetworkEvent(NetworkEventTarget.Owner, nameof(SendIncorrectResponse));
 			}
 			else
 			{
@@ -213,8 +215,11 @@ public class FloorMapMarker : UdonSharpBehaviour
 		DisableMovementCompletely(CorrectLocation);
 
 		IsLit = true;
+		Active = false;
 
 		RequestSerialization();
+
+		_GameManager.PlayCorrectSound();
 		_GameManager.CorrectResponse();
 	}
 
@@ -223,15 +228,21 @@ public class FloorMapMarker : UdonSharpBehaviour
 	{
 		DisableMovementCompletely();
 
-		_GameManager.IncorrectResponse();
-
 		_CollisionCheckCounter = 0;
 		_CollidingLocations.Clear();
 
+		_FailureCounter++;
+		if (_FailureCounter >= MAX_FAILURE_COUNT)
+		{
+			Active = false;
+			_GameManager.IncorrectResponse();
+		}
+
+		_GameManager.PlayIncorrectSound();
+
 		RequestSerialization();
 	}
 
-	[NetworkCallable]
 	public void Activated(bool SetActive)
 	{
 		Active = SetActive;