- Maps now properly reset when randomised.

- Some countries are now "hard mode" options, and are not chosen by default.
- Map dot switched to a quad to save on triangles.
- Map borders SDF updated to be more repeatable when making new maps.
- Added looping options to SFX.
- Added a "Carmen In Jail" SFX event.
- Added a curved TV monitor model for video player.
- Added a loot image URL setting for the case list entries.

Assets/UdonSharp/AudioManager.asset

@@ -44,7 +44,7 @@ MonoBehaviour:
       Data: 
     - Name: 
       Entry: 12
-      Data: 28
+      Data: 29
     - Name: 
       Entry: 7
       Data: 
@@ -1052,13 +1052,13 @@ MonoBehaviour:
       Data: 
     - Name: $k
       Entry: 1
-      Data: _CrookTheme_Contessa
+      Data: _CarmenInJail
     - Name: $v
       Entry: 7
       Data: 60|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
     - Name: <Name>k__BackingField
       Entry: 1
-      Data: _CrookTheme_Contessa
+      Data: _CarmenInJail
     - Name: <UserType>k__BackingField
       Entry: 9
       Data: 10
@@ -1082,19 +1082,10 @@ MonoBehaviour:
       Data: 61|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
     - Name: 
       Entry: 12
-      Data: 2
+      Data: 1
     - Name: 
       Entry: 7
-      Data: 62|UnityEngine.HeaderAttribute, UnityEngine.CoreModule
-    - Name: header
-      Entry: 1
-      Data: Crook Themes
-    - Name: 
-      Entry: 8
-      Data: 
-    - Name: 
-      Entry: 7
-      Data: 63|UnityEngine.SerializeField, UnityEngine.CoreModule
+      Data: 62|UnityEngine.SerializeField, UnityEngine.CoreModule
     - Name: 
       Entry: 8
       Data: 
@@ -1115,13 +1106,13 @@ MonoBehaviour:
       Data: 
     - Name: $k
       Entry: 1
-      Data: _CrookTheme_DoubleTrouble
+      Data: _CrookTheme_Contessa
     - Name: $v
       Entry: 7
-      Data: 64|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
+      Data: 63|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
     - Name: <Name>k__BackingField
       Entry: 1
-      Data: _CrookTheme_DoubleTrouble
+      Data: _CrookTheme_Contessa
     - Name: <UserType>k__BackingField
       Entry: 9
       Data: 10
@@ -1142,10 +1133,19 @@ MonoBehaviour:
       Data: true
     - Name: _fieldAttributes
       Entry: 7
-      Data: 65|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
+      Data: 64|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
     - Name: 
       Entry: 12
-      Data: 1
+      Data: 2
+    - Name: 
+      Entry: 7
+      Data: 65|UnityEngine.HeaderAttribute, UnityEngine.CoreModule
+    - Name: header
+      Entry: 1
+      Data: Crook Themes
+    - Name: 
+      Entry: 8
+      Data: 
     - Name: 
       Entry: 7
       Data: 66|UnityEngine.SerializeField, UnityEngine.CoreModule
@@ -1169,13 +1169,13 @@ MonoBehaviour:
       Data: 
     - Name: $k
       Entry: 1
-      Data: _CrookTheme_EarthaBrute
+      Data: _CrookTheme_DoubleTrouble
     - Name: $v
       Entry: 7
       Data: 67|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
     - Name: <Name>k__BackingField
       Entry: 1
-      Data: _CrookTheme_EarthaBrute
+      Data: _CrookTheme_DoubleTrouble
     - Name: <UserType>k__BackingField
       Entry: 9
       Data: 10
@@ -1223,13 +1223,13 @@ MonoBehaviour:
       Data: 
     - Name: $k
       Entry: 1
-      Data: _CrookTheme_Kneemoi
+      Data: _CrookTheme_EarthaBrute
     - Name: $v
       Entry: 7
       Data: 70|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
     - Name: <Name>k__BackingField
       Entry: 1
-      Data: _CrookTheme_Kneemoi
+      Data: _CrookTheme_EarthaBrute
     - Name: <UserType>k__BackingField
       Entry: 9
       Data: 10
@@ -1277,13 +1277,13 @@ MonoBehaviour:
       Data: 
     - Name: $k
       Entry: 1
-      Data: _CrookTheme_PattyLarceny
+      Data: _CrookTheme_Kneemoi
     - Name: $v
       Entry: 7
       Data: 73|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
     - Name: <Name>k__BackingField
       Entry: 1
-      Data: _CrookTheme_PattyLarceny
+      Data: _CrookTheme_Kneemoi
     - Name: <UserType>k__BackingField
       Entry: 9
       Data: 10
@@ -1331,13 +1331,13 @@ MonoBehaviour:
       Data: 
     - Name: $k
       Entry: 1
-      Data: _CrookTheme_Robocrook
+      Data: _CrookTheme_PattyLarceny
     - Name: $v
       Entry: 7
       Data: 76|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
     - Name: <Name>k__BackingField
       Entry: 1
-      Data: _CrookTheme_Robocrook
+      Data: _CrookTheme_PattyLarceny
     - Name: <UserType>k__BackingField
       Entry: 9
       Data: 10
@@ -1385,13 +1385,13 @@ MonoBehaviour:
       Data: 
     - Name: $k
       Entry: 1
-      Data: _CrookTheme_SarahNade
+      Data: _CrookTheme_Robocrook
     - Name: $v
       Entry: 7
       Data: 79|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
     - Name: <Name>k__BackingField
       Entry: 1
-      Data: _CrookTheme_SarahNade
+      Data: _CrookTheme_Robocrook
     - Name: <UserType>k__BackingField
       Entry: 9
       Data: 10
@@ -1439,13 +1439,13 @@ MonoBehaviour:
       Data: 
     - Name: $k
       Entry: 1
-      Data: _CrookTheme_TopGrunge
+      Data: _CrookTheme_SarahNade
     - Name: $v
       Entry: 7
       Data: 82|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
     - Name: <Name>k__BackingField
       Entry: 1
-      Data: _CrookTheme_TopGrunge
+      Data: _CrookTheme_SarahNade
     - Name: <UserType>k__BackingField
       Entry: 9
       Data: 10
@@ -1493,13 +1493,13 @@ MonoBehaviour:
       Data: 
     - Name: $k
       Entry: 1
-      Data: _CrookTheme_VicTheSlick
+      Data: _CrookTheme_TopGrunge
     - Name: $v
       Entry: 7
       Data: 85|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
     - Name: <Name>k__BackingField
       Entry: 1
-      Data: _CrookTheme_VicTheSlick
+      Data: _CrookTheme_TopGrunge
     - Name: <UserType>k__BackingField
       Entry: 9
       Data: 10
@@ -1547,13 +1547,13 @@ MonoBehaviour:
       Data: 
     - Name: $k
       Entry: 1
-      Data: _CrookTheme_WonderRat
+      Data: _CrookTheme_VicTheSlick
     - Name: $v
       Entry: 7
       Data: 88|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
     - Name: <Name>k__BackingField
       Entry: 1
-      Data: _CrookTheme_WonderRat
+      Data: _CrookTheme_VicTheSlick
     - Name: <UserType>k__BackingField
       Entry: 9
       Data: 10
@@ -1596,6 +1596,60 @@ MonoBehaviour:
     - Name: 
       Entry: 8
       Data: 
+    - Name: 
+      Entry: 7
+      Data: 
+    - Name: $k
+      Entry: 1
+      Data: _CrookTheme_WonderRat
+    - Name: $v
+      Entry: 7
+      Data: 91|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
+    - Name: <Name>k__BackingField
+      Entry: 1
+      Data: _CrookTheme_WonderRat
+    - Name: <UserType>k__BackingField
+      Entry: 9
+      Data: 10
+    - Name: <SystemType>k__BackingField
+      Entry: 9
+      Data: 10
+    - 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: true
+    - Name: _fieldAttributes
+      Entry: 7
+      Data: 92|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
+    - Name: 
+      Entry: 12
+      Data: 1
+    - Name: 
+      Entry: 7
+      Data: 93|UnityEngine.SerializeField, UnityEngine.CoreModule
+    - Name: 
+      Entry: 8
+      Data: 
+    - Name: 
+      Entry: 13
+      Data: 
+    - Name: 
+      Entry: 8
+      Data: 
+    - Name: 
+      Entry: 8
+      Data: 
+    - Name: 
+      Entry: 8
+      Data: 
     - Name: 
       Entry: 13
       Data: 

Assets/UdonSharp/AudioManager.cs

@@ -36,7 +36,8 @@ public enum SFXEventType
 	InJail,
 
 	MapCorrect,
-	MapIncorrect
+	MapIncorrect,
+	CarmenInJail
 }
 
 
@@ -71,6 +72,7 @@ public class AudioManager : UdonSharpBehaviour
 
 	[SerializeField] private AudioClip _MapCorrect = null;
 	[SerializeField] private AudioClip _MapIncorrect = null;
+	[SerializeField] private AudioClip _CarmenInJail = null;
 
 	[Header("Crook Themes")]
 	[SerializeField] private AudioClip _CrookTheme_Contessa = null;
@@ -139,12 +141,30 @@ public class AudioManager : UdonSharpBehaviour
 	}
 
 	[NetworkCallable]
-	public void PlaySFXAtPitch(SFXEventType SFXEvent, float Pitch)
+	public void PlaySFXLoop(SFXEventType SFXEvent)
 	{
-		_PlaySFX_Internal(SFXEvent, Pitch);
+		_PlaySFX_Internal(SFXEvent, true);
 	}
 
-	private void _PlaySFX_Internal(SFXEventType SFXEvent, float Pitch = 1.0f)
+	[NetworkCallable]
+	public void PlaySFXAtPitch(SFXEventType SFXEvent, float Pitch)
+	{
+		_PlaySFX_Internal(SFXEvent, false, Pitch);
+	}
+
+	[NetworkCallable]
+	public void PlaySFXLoopAtPitch(SFXEventType SFXEvent, float Pitch)
+	{
+		_PlaySFX_Internal(SFXEvent, true, Pitch);
+	}
+
+	[NetworkCallable]
+	public void StopSFX()
+	{
+		_PlaySFX_Internal(SFXEventType.None);
+	}
+
+	private void _PlaySFX_Internal(SFXEventType SFXEvent, bool Loop = false, float Pitch = 1.0f)
 	{
 		_SFXPlayer.Stop();
 
@@ -159,10 +179,13 @@ public class AudioManager : UdonSharpBehaviour
 
 			case SFXEventType.MapCorrect:	_SFXPlayer.clip = _MapCorrect;		break;
 			case SFXEventType.MapIncorrect:	_SFXPlayer.clip = _MapIncorrect;	break;
+			case SFXEventType.CarmenInJail:	_SFXPlayer.clip = _CarmenInJail;	break;
 
 			default:						_SFXPlayer.clip = null;				break;
 		}
 
+		_SFXPlayer.loop = Loop;
+
 		if (_SFXPlayer.clip != null)
 		{
 			_SFXPlayer.pitch = Pitch;

Assets/UdonSharp/Game Managers/CaseManager.cs

@@ -94,7 +94,7 @@ public class CaseManager : UdonSharpBehaviour
 						ErrorString = "Ensure the 'Round 3' dictionary entry is a dictionary with a key called 'Continent' and an integer value.";
 					}
 
-					ContinueToRound1();
+					ContinueToRound3();
 				}
 				else
 				{

Assets/UdonSharp/Game Managers/CaseManagerListEntry.asset

@@ -170,25 +170,19 @@ MonoBehaviour:
       Data: 
     - Name: $k
       Entry: 1
-      Data: MapFiles
+      Data: LootImage
     - Name: $v
       Entry: 7
       Data: 10|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
     - Name: <Name>k__BackingField
       Entry: 1
-      Data: MapFiles
+      Data: LootImage
     - Name: <UserType>k__BackingField
-      Entry: 7
-      Data: 11|System.RuntimeType, mscorlib
-    - Name: 
-      Entry: 1
-      Data: VRC.SDKBase.VRCUrl[], VRCSDKBase
-    - Name: 
-      Entry: 8
-      Data: 
+      Entry: 9
+      Data: 8
     - Name: <SystemType>k__BackingField
       Entry: 9
-      Data: 11
+      Data: 8
     - Name: <SyncMode>k__BackingField
       Entry: 7
       Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
@@ -203,7 +197,7 @@ MonoBehaviour:
       Data: true
     - Name: _fieldAttributes
       Entry: 7
-      Data: 12|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
+      Data: 11|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
     - Name: 
       Entry: 12
       Data: 0
@@ -224,19 +218,25 @@ MonoBehaviour:
       Data: 
     - Name: $k
       Entry: 1
-      Data: VideoFiles
+      Data: MapFiles
     - Name: $v
       Entry: 7
-      Data: 13|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
+      Data: 12|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
     - Name: <Name>k__BackingField
       Entry: 1
-      Data: VideoFiles
+      Data: MapFiles
     - Name: <UserType>k__BackingField
-      Entry: 9
-      Data: 11
+      Entry: 7
+      Data: 13|System.RuntimeType, mscorlib
+    - Name: 
+      Entry: 1
+      Data: VRC.SDKBase.VRCUrl[], VRCSDKBase
+    - Name: 
+      Entry: 8
+      Data: 
     - Name: <SystemType>k__BackingField
       Entry: 9
-      Data: 11
+      Data: 13
     - Name: <SyncMode>k__BackingField
       Entry: 7
       Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
@@ -272,25 +272,19 @@ MonoBehaviour:
       Data: 
     - Name: $k
       Entry: 1
-      Data: _DeserialisedData
+      Data: VideoFiles
     - Name: $v
       Entry: 7
       Data: 15|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
     - Name: <Name>k__BackingField
       Entry: 1
-      Data: _DeserialisedData
+      Data: VideoFiles
     - Name: <UserType>k__BackingField
-      Entry: 7
-      Data: 16|System.RuntimeType, mscorlib
-    - Name: 
-      Entry: 1
-      Data: VRC.SDK3.Data.DataDictionary, VRCSDK3
-    - Name: 
-      Entry: 8
-      Data: 
+      Entry: 9
+      Data: 13
     - Name: <SystemType>k__BackingField
       Entry: 9
-      Data: 16
+      Data: 13
     - Name: <SyncMode>k__BackingField
       Entry: 7
       Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
@@ -302,10 +296,10 @@ MonoBehaviour:
       Data: 
     - Name: <IsSerialized>k__BackingField
       Entry: 5
-      Data: false
+      Data: true
     - Name: _fieldAttributes
       Entry: 7
-      Data: 17|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
+      Data: 16|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
     - Name: 
       Entry: 12
       Data: 0

Assets/UdonSharp/Game Managers/CaseManagerListEntry.cs

@@ -10,11 +10,10 @@ public class CaseManagerListEntry : UdonSharpBehaviour
 
 	public VRCUrl CaseFileURL;
 
+	public VRCUrl LootImage;
 	public VRCUrl[] MapFiles;
 	public VRCUrl[] VideoFiles;
 
-	private DataDictionary _DeserialisedData;
-
 
 	public void LoadCaseFile()
 	{

Assets/UdonSharp/Game Managers/GameManagerRound3.cs

@@ -42,7 +42,7 @@ public class GameManagerRound3 : GameManagerBase
 
 	[UdonSynced] private GameStatus _GameStatus = GameStatus.Pregame;
 	[UdonSynced] private int _Timer = TIMER_LENGTH;
-	private const float LENGTH_OF_ONE_SECOND = 1.04444444444444444f;
+	private const float LENGTH_OF_ONE_SECOND = 1.022222222222222222222f;
 	private const int TIMER_LENGTH = 45;
 
 	[UdonSynced] private int _SuccessCounter = 0;
@@ -75,8 +75,7 @@ public class GameManagerRound3 : GameManagerBase
 			}
 
 			FloorMap CurrentMap = GetCurrentMap();
-			NetworkCalling.SendCustomNetworkEvent((IUdonEventReceiver)CurrentMap,
-				NetworkEventTarget.Owner,
+			NetworkCalling.SendCustomNetworkEvent((IUdonEventReceiver)CurrentMap, NetworkEventTarget.Owner,
 				"RandomiseCountries");
 		}
 		else
@@ -110,8 +109,7 @@ public class GameManagerRound3 : GameManagerBase
 
 	private void StartTimer()
 	{
-		NetworkCalling.SendCustomNetworkEvent((IUdonEventReceiver)_AudioManager,
-			NetworkEventTarget.All,
+		NetworkCalling.SendCustomNetworkEvent((IUdonEventReceiver)_AudioManager, NetworkEventTarget.All,
 			"PlayMusicLoop", MusicEventType.CarmenChaseMusic);
 
 		_GameStatus = GameStatus.Begin;
@@ -126,8 +124,7 @@ public class GameManagerRound3 : GameManagerBase
 		_Timer--;
 		if (_Timer < 0)
 		{
-			NetworkCalling.SendCustomNetworkEvent((IUdonEventReceiver)this,
-				NetworkEventTarget.Owner,
+			NetworkCalling.SendCustomNetworkEvent((IUdonEventReceiver)this, NetworkEventTarget.Owner,
 				nameof(GameHasBeenLost), false);
 			return;
 		}
@@ -148,8 +145,7 @@ public class GameManagerRound3 : GameManagerBase
 		_SuccessCounter++;
 		if (_SuccessCounter >= MAX_SUCCESS_COUNT)
 		{
-			NetworkCalling.SendCustomNetworkEvent((IUdonEventReceiver)this,
-				NetworkEventTarget.Owner,
+			NetworkCalling.SendCustomNetworkEvent((IUdonEventReceiver)this, NetworkEventTarget.Owner,
 				nameof(GameHasBeenWon));
 		}
 		else
@@ -202,8 +198,7 @@ public class GameManagerRound3 : GameManagerBase
 		if (NextCountry < 0)
 		{
 			// If we ran out of countries, lose the game here.
-			NetworkCalling.SendCustomNetworkEvent((IUdonEventReceiver)this,
-				NetworkEventTarget.Owner,
+			NetworkCalling.SendCustomNetworkEvent((IUdonEventReceiver)this, NetworkEventTarget.Owner,
 				nameof(GameHasBeenLost), true);
 			return;
 		}
@@ -223,11 +218,23 @@ public class GameManagerRound3 : GameManagerBase
 				(HostCardBetweenRoundsInterface)GetHostCardInterface(RoundSegmentType.BetweenSegments);
 			GameWinInterface.HeaderUI.text = "The player has won the game. " + _Timer + " seconds to spare.";
 
-			NetworkCalling.SendCustomNetworkEvent((IUdonEventReceiver)_AudioManager,
-				NetworkEventTarget.All,
-				"PlayMusicLoop", MusicEventType.CarmenSandiegoWindDown);
+			NetworkCalling.SendCustomNetworkEvent((IUdonEventReceiver)_AudioManager, NetworkEventTarget.All,
+				"PlaySFXLoop", SFXEventType.CarmenInJail);
+
+			SendCustomEventDelayedSeconds(nameof(PlayWindDownMusic), 5.0f);
 		}
 	}
+	public void PlayWindDownMusic()
+	{
+		NetworkCalling.SendCustomNetworkEvent((IUdonEventReceiver)_AudioManager, NetworkEventTarget.All,
+			"PlayMusicLoop", MusicEventType.CarmenSandiegoWindDown);
+
+		SendCustomEventDelayedSeconds(nameof(EndCarmenInJailSFX), 2.0f);
+	}
+	public void EndCarmenInJailSFX()
+	{
+		NetworkCalling.SendCustomNetworkEvent((IUdonEventReceiver)_AudioManager, NetworkEventTarget.All, "StopSFX");
+	}
 
 	[NetworkCallable]
 	public void GameHasBeenLost(bool RanOutOfMarkers)
@@ -245,8 +252,7 @@ public class GameManagerRound3 : GameManagerBase
 				(HostCardBetweenRoundsInterface)GetHostCardInterface(RoundSegmentType.BetweenSegments);
 			GameLossInterface.HeaderUI.text = "The player has lost. " + _SuccessCounter + " countries in " + TIMER_LENGTH + " seconds.";
 
-			NetworkCalling.SendCustomNetworkEvent((IUdonEventReceiver)_AudioManager,
-				NetworkEventTarget.All,
+			NetworkCalling.SendCustomNetworkEvent((IUdonEventReceiver)_AudioManager, NetworkEventTarget.All,
 				"StopMusic");
 		}
 	}
@@ -264,12 +270,16 @@ public class GameManagerRound3 : GameManagerBase
 
 	public void PlayCorrectSound()
 	{
-		_AudioManager.PlaySFX(SFXEventType.MapCorrect);
+		NetworkCalling.SendCustomNetworkEvent((IUdonEventReceiver)_AudioManager, NetworkEventTarget.All,
+			"PlaySFX", SFXEventType.MapCorrect);
+		//_AudioManager.PlaySFX(SFXEventType.MapCorrect);
 	}
 
 	public void PlayIncorrectSound()
 	{
-		_AudioManager.PlaySFX(SFXEventType.MapIncorrect);
+		NetworkCalling.SendCustomNetworkEvent((IUdonEventReceiver)_AudioManager, NetworkEventTarget.All,
+			"PlaySFX", SFXEventType.MapIncorrect);
+		//_AudioManager.PlaySFX(SFXEventType.MapIncorrect);
 	}
 
 	private void UpdateInterface()

Assets/UdonSharp/Maps/FloorMap.cs

@@ -21,13 +21,17 @@ public class FloorMap : UdonSharpBehaviour
 	public void RandomiseCountries()
 	{
 		_CurrentCountry = 0;
+		for (int i = 0; i < Countries.Length; i++)
+		{
+			Countries[i].gameObject.SetActive(false);
+		}
 
 		UnityEngine.Random.InitState(Networking.GetServerTimeInMilliseconds());
 
 		int[] NewRandomCountries = new int[MAX_SELECTED_COUNTRIES];
 		int[] NewRandomCities = new int[MAX_SELECTED_COUNTRIES];
 
-		// Fill the countries array with values too big to be considered valid.
+		// Fill the countries array with a value too big to be valid.
 		int NumberOfCountries = Countries.Length;
 		for (int i = 0; i < MAX_SELECTED_COUNTRIES; i++)
 		{
@@ -37,7 +41,7 @@ public class FloorMap : UdonSharpBehaviour
 		for (int i = 0; i < MAX_SELECTED_COUNTRIES; i++)
 		{
 			int NewPulledIndex = NumberOfCountries;
-			while (CountryIsAlreadyInArray(NewRandomCountries, NewPulledIndex))
+			while (CountryIsAlreadyInArray(NewRandomCountries, NewPulledIndex) || Countries[NewPulledIndex].HardModeSelection)
 			{
 				NewPulledIndex = UnityEngine.Random.Range(0, NumberOfCountries);
 			}

Assets/UdonSharp/Maps/FloorMapCountry.asset

@@ -44,7 +44,61 @@ MonoBehaviour:
       Data: 
     - Name: 
       Entry: 12
-      Data: 1
+      Data: 2
+    - Name: 
+      Entry: 7
+      Data: 
+    - Name: $k
+      Entry: 1
+      Data: HardModeSelection
+    - Name: $v
+      Entry: 7
+      Data: 2|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
+    - Name: <Name>k__BackingField
+      Entry: 1
+      Data: HardModeSelection
+    - Name: <UserType>k__BackingField
+      Entry: 7
+      Data: 3|System.RuntimeType, mscorlib
+    - Name: 
+      Entry: 1
+      Data: System.Boolean, mscorlib
+    - Name: 
+      Entry: 8
+      Data: 
+    - Name: <SystemType>k__BackingField
+      Entry: 9
+      Data: 3
+    - 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: true
+    - Name: _fieldAttributes
+      Entry: 7
+      Data: 4|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: 7
       Data: 
@@ -53,13 +107,13 @@ MonoBehaviour:
       Data: Locations
     - Name: $v
       Entry: 7
-      Data: 2|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
+      Data: 5|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
     - Name: <Name>k__BackingField
       Entry: 1
       Data: Locations
     - Name: <UserType>k__BackingField
       Entry: 7
-      Data: 3|System.RuntimeType, mscorlib
+      Data: 6|System.RuntimeType, mscorlib
     - Name: 
       Entry: 1
       Data: FloorMapLocation[], Assembly-CSharp
@@ -68,7 +122,7 @@ MonoBehaviour:
       Data: 
     - Name: <SystemType>k__BackingField
       Entry: 7
-      Data: 4|System.RuntimeType, mscorlib
+      Data: 7|System.RuntimeType, mscorlib
     - Name: 
       Entry: 1
       Data: UnityEngine.Component[], UnityEngine.CoreModule
@@ -89,7 +143,7 @@ MonoBehaviour:
       Data: true
     - Name: _fieldAttributes
       Entry: 7
-      Data: 5|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
+      Data: 8|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
     - Name: 
       Entry: 12
       Data: 0

Assets/UdonSharp/Maps/FloorMapCountry.cs

@@ -8,5 +8,6 @@ using VRC.Udon;
 [UdonBehaviourSyncMode(BehaviourSyncMode.None)]
 public class FloorMapCountry : UdonSharpBehaviour
 {
+    public bool HardModeSelection = false;
     public FloorMapLocation[] Locations;
 }

Assets/UdonSharp/Maps/FloorMapMarker.cs

@@ -204,6 +204,8 @@ public class FloorMapMarker : UdonSharpBehaviour
 		{
 			transform.position = CorrectLocation;
 		}
+
+		LocationFindingEnabled = false;
 	}
 
 	private bool IsUpright()

Assets/UdonSharp/UtilityScripts/BoneFollower.asset

@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3}
   m_Name: BoneFollower
   m_EditorClassIdentifier: 
-  serializedUdonProgramAsset: {fileID: 11400000, guid: 52ecc8a73071e8e40928c3609699fcf4,
+  serializedUdonProgramAsset: {fileID: 11400000, guid: ccbda9bf23e2f714c9226283c77a92e5,
     type: 2}
   udonAssembly: 
   assemblyError: 

Assets/UdonSharp/UtilityScripts/InteractToggle.asset

@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3}
   m_Name: InteractToggle
   m_EditorClassIdentifier: 
-  serializedUdonProgramAsset: {fileID: 11400000, guid: 873dfce61b1514e429c92e0d2fded7de,
+  serializedUdonProgramAsset: {fileID: 11400000, guid: 405e38d3dfb2f514daeed0e28fbb4864,
     type: 2}
   udonAssembly: 
   assemblyError: 

Assets/UdonSharp/UtilityScripts/PlayerModSetter.asset

@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3}
   m_Name: PlayerModSetter
   m_EditorClassIdentifier: 
-  serializedUdonProgramAsset: {fileID: 11400000, guid: e81558796a212ab4d88e305e2010f24b,
+  serializedUdonProgramAsset: {fileID: 11400000, guid: f938e6c4ff027a74da405a1f9353fd2b,
     type: 2}
   udonAssembly: 
   assemblyError: 

Assets/UdonSharp/UtilityScripts/Synced/GlobalToggleObject.asset

@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3}
   m_Name: GlobalToggleObject
   m_EditorClassIdentifier: 
-  serializedUdonProgramAsset: {fileID: 11400000, guid: 2fe8ced6184000f49bca526cd2c5891c,
+  serializedUdonProgramAsset: {fileID: 11400000, guid: c49c9265a3ef24642a6a4465d0a78872,
     type: 2}
   udonAssembly: 
   assemblyError: 

Assets/UdonSharp/UtilityScripts/Synced/MasterToggleObject.asset

@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3}
   m_Name: MasterToggleObject
   m_EditorClassIdentifier: 
-  serializedUdonProgramAsset: {fileID: 11400000, guid: a2d01d9f36ac6df49831be249e48ecc4,
+  serializedUdonProgramAsset: {fileID: 11400000, guid: 04024a76ab1924042ba521e11cb76d91,
     type: 2}
   udonAssembly: 
   assemblyError: 

Assets/UdonSharp/UtilityScripts/TrackingDataFollower.asset

@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3}
   m_Name: TrackingDataFollower
   m_EditorClassIdentifier: 
-  serializedUdonProgramAsset: {fileID: 11400000, guid: 1b89d4552983c0448a7389decec3b555,
+  serializedUdonProgramAsset: {fileID: 11400000, guid: 17f8fbbe6cc186d4f8dbb057b01a4ec2,
     type: 2}
   udonAssembly: 
   assemblyError: 

Assets/UdonSharp/UtilityScripts/WorldAudioSettings.asset

@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3}
   m_Name: WorldAudioSettings
   m_EditorClassIdentifier: 
-  serializedUdonProgramAsset: {fileID: 11400000, guid: 994b559b0f158b4499f8937980ed8694,
+  serializedUdonProgramAsset: {fileID: 11400000, guid: 128d924a3066b7546b2d1c73e61006ab,
     type: 2}
   udonAssembly: 
   assemblyError: