- Improved marker collision detection.

- Added a basic ability to play video clues alongside questions.
2025-06-28 23:40:45 -04:00
parent cb0709a60e
commit 615ef7de5b
17 changed files with 4053 additions and 8390 deletions
@@ -44,7 +44,7 @@ MonoBehaviour:
      Data: 
    - Name: 
      Entry: 12
-      Data: 8
+      Data: 10
    - Name: 
      Entry: 7
      Data: 
@@ -416,25 +416,19 @@ MonoBehaviour:
      Data: 
    - Name: $k
      Entry: 1
-      Data: _CaseFile
+      Data: _CaseFileCluesURL
    - Name: $v
      Entry: 7
      Data: 27|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
    - Name: <Name>k__BackingField
      Entry: 1
-      Data: _CaseFile
+      Data: _CaseFileCluesURL
    - Name: <UserType>k__BackingField
-      Entry: 7
-      Data: 28|System.RuntimeType, mscorlib
-    - Name: 
-      Entry: 1
-      Data: CaseManagerListEntry, Assembly-CSharp
-    - Name: 
-      Entry: 8
-      Data: 
+      Entry: 9
+      Data: 3
    - Name: <SystemType>k__BackingField
      Entry: 9
-      Data: 8
+      Data: 3
    - Name: <SyncMode>k__BackingField
      Entry: 7
      Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
@@ -449,7 +443,109 @@ MonoBehaviour:
      Data: false
    - Name: _fieldAttributes
      Entry: 7
-      Data: 29|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
+      Data: 28|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: 
+    - Name: $k
+      Entry: 1
+      Data: _CaseFileMaps
+    - Name: $v
+      Entry: 7
+      Data: 29|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
+    - Name: <Name>k__BackingField
+      Entry: 1
+      Data: _CaseFileMaps
+    - Name: <UserType>k__BackingField
+      Entry: 7
+      Data: 30|System.RuntimeType, mscorlib
+    - Name: 
+      Entry: 1
+      Data: VRC.SDKBase.VRCUrl[], VRCSDKBase
+    - Name: 
+      Entry: 8
+      Data: 
+    - Name: <SystemType>k__BackingField
+      Entry: 9
+      Data: 30
+    - 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: 31|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: 
+    - Name: $k
+      Entry: 1
+      Data: _CaseFileVideos
+    - Name: $v
+      Entry: 7
+      Data: 32|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
+    - Name: <Name>k__BackingField
+      Entry: 1
+      Data: _CaseFileVideos
+    - Name: <UserType>k__BackingField
+      Entry: 9
+      Data: 30
+    - Name: <SystemType>k__BackingField
+      Entry: 9
+      Data: 30
+    - 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: 33|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
    - Name: 
      Entry: 12
      Data: 0
@@ -473,13 +569,13 @@ MonoBehaviour:
      Data: _CaseFileDictionary
    - Name: $v
      Entry: 7
-      Data: 30|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
+      Data: 34|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
    - Name: <Name>k__BackingField
      Entry: 1
      Data: _CaseFileDictionary
    - Name: <UserType>k__BackingField
      Entry: 7
-      Data: 31|System.RuntimeType, mscorlib
+      Data: 35|System.RuntimeType, mscorlib
    - Name: 
      Entry: 1
      Data: VRC.SDK3.Data.DataDictionary, VRCSDK3
@@ -488,7 +584,7 @@ MonoBehaviour:
      Data: 
    - Name: <SystemType>k__BackingField
      Entry: 9
-      Data: 31
+      Data: 35
    - Name: <SyncMode>k__BackingField
      Entry: 7
      Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
@@ -503,7 +599,7 @@ MonoBehaviour:
      Data: false
    - Name: _fieldAttributes
      Entry: 7
-      Data: 32|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
@@ -37,14 +37,19 @@ public class CaseManager : UdonSharpBehaviour

 	[SerializeField] private Texture[] CrookPortraits;

-	private CaseManagerListEntry _CaseFile;
+	private VRCUrl _CaseFileCluesURL;
+	private VRCUrl[] _CaseFileMaps;
+	private VRCUrl[] _CaseFileVideos;
 	private DataDictionary _CaseFileDictionary;


 	public void LoadCaseFile(CaseManagerListEntry CaseFile)
 	{
-		_CaseFile = CaseFile;
-		VRCStringDownloader.LoadUrl(_CaseFile.CaseFileURL, (IUdonEventReceiver)this);
+		_CaseFileCluesURL = CaseFile.CaseFileURL;
+		_CaseFileMaps = CaseFile.MapFiles;
+		_CaseFileVideos = CaseFile.VideoFiles;
+
+		VRCStringDownloader.LoadUrl(_CaseFileCluesURL, (IUdonEventReceiver)this);
 	}

 	public override void OnStringLoadSuccess(IVRCStringDownload DownloadedString)
@@ -89,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.";
 					}

-					ContinueToRound3();
+					ContinueToRound1();
 				}
 				else
 				{
@@ -137,6 +142,10 @@ public class CaseManager : UdonSharpBehaviour
 	{
 		return _CaseFileDictionary["Case Title"].ToString();
 	}
+	public string GetCaseDescription()
+	{
+		return _CaseFileDictionary["Case Description"].ToString();
+	}
 	public string GetLoot()
 	{
 		return _CaseFileDictionary["Stolen Loot"].ToString();
@@ -146,6 +155,24 @@ public class CaseManager : UdonSharpBehaviour
 		return (AccusedCrook)_CaseFileDictionary["Accused Crook"].Number;
 	}

+	public VRCUrl GetMap(int MapIndex)
+	{
+		return _CaseFileMaps[MapIndex];
+	}
+
+	public VRCUrl GetIntroVideo()
+	{
+		return _CaseFileVideos[0];
+	}
+	public VRCUrl GetVideo(int VideoIndex)
+	{
+		return _CaseFileVideos[VideoIndex];
+	}
+	public int GetVideoCount()
+	{
+		return _CaseFileVideos.Length;
+	}
+

 	public string CrookToString(AccusedCrook Crook)
 	{
@@ -44,7 +44,7 @@ MonoBehaviour:
      Data: 
    - Name: 
      Entry: 12
-      Data: 15
+      Data: 17
    - Name: 
      Entry: 7
      Data: 
@@ -230,10 +230,76 @@ MonoBehaviour:
      Data: 
    - Name: $k
      Entry: 1
-      Data: _GameHasBegun
+      Data: _VideoPlayer
    - Name: $v
      Entry: 7
      Data: 14|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
+    - Name: <Name>k__BackingField
+      Entry: 1
+      Data: _VideoPlayer
+    - Name: <UserType>k__BackingField
+      Entry: 7
+      Data: 15|System.RuntimeType, mscorlib
+    - Name: 
+      Entry: 1
+      Data: VRC.SDK3.Video.Components.VRCUnityVideoPlayer, VRCSDK3
+    - Name: 
+      Entry: 8
+      Data: 
+    - Name: <SystemType>k__BackingField
+      Entry: 7
+      Data: 16|System.RuntimeType, mscorlib
+    - Name: 
+      Entry: 1
+      Data: VRC.SDK3.Video.Components.Base.BaseVRCVideoPlayer, VRCSDK3
+    - Name: 
+      Entry: 8
+      Data: 
+    - 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: 17|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
+    - Name: 
+      Entry: 12
+      Data: 1
+    - Name: 
+      Entry: 7
+      Data: 18|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: 7
+      Data: 
+    - Name: $k
+      Entry: 1
+      Data: _GameHasBegun
+    - Name: $v
+      Entry: 7
+      Data: 19|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
    - Name: <Name>k__BackingField
      Entry: 1
      Data: _GameHasBegun
@@ -257,13 +323,13 @@ MonoBehaviour:
      Data: false
    - Name: _fieldAttributes
      Entry: 7
-      Data: 15|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
+      Data: 20|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
    - Name: 
      Entry: 12
      Data: 1
    - Name: 
      Entry: 7
-      Data: 16|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime
+      Data: 21|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime
    - Name: 
      Entry: 8
      Data: 
@@ -287,13 +353,13 @@ MonoBehaviour:
      Data: _QuestionIndex
    - Name: $v
      Entry: 7
-      Data: 17|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
+      Data: 22|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
    - Name: <Name>k__BackingField
      Entry: 1
      Data: _QuestionIndex
    - Name: <UserType>k__BackingField
      Entry: 7
-      Data: 18|System.RuntimeType, mscorlib
+      Data: 23|System.RuntimeType, mscorlib
    - Name: 
      Entry: 1
      Data: System.Int32, mscorlib
@@ -302,7 +368,7 @@ MonoBehaviour:
      Data: 
    - Name: <SystemType>k__BackingField
      Entry: 9
-      Data: 18
+      Data: 23
    - Name: <SyncMode>k__BackingField
      Entry: 7
      Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
@@ -317,13 +383,13 @@ MonoBehaviour:
      Data: false
    - Name: _fieldAttributes
      Entry: 7
-      Data: 19|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
+      Data: 24|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
    - Name: 
      Entry: 12
      Data: 1
    - Name: 
      Entry: 7
-      Data: 20|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime
+      Data: 25|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime
    - Name: 
      Entry: 8
      Data: 
@@ -347,16 +413,16 @@ MonoBehaviour:
      Data: _QuestionStage
    - Name: $v
      Entry: 7
-      Data: 21|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
+      Data: 26|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
    - Name: <Name>k__BackingField
      Entry: 1
      Data: _QuestionStage
    - Name: <UserType>k__BackingField
      Entry: 9
-      Data: 18
+      Data: 23
    - Name: <SystemType>k__BackingField
      Entry: 9
-      Data: 18
+      Data: 23
    - Name: <SyncMode>k__BackingField
      Entry: 7
      Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
@@ -371,13 +437,67 @@ MonoBehaviour:
      Data: false
    - Name: _fieldAttributes
      Entry: 7
-      Data: 22|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
+      Data: 27|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
    - Name: 
      Entry: 12
      Data: 1
    - Name: 
      Entry: 7
-      Data: 23|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime
+      Data: 28|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime
+    - Name: 
+      Entry: 8
+      Data: 
+    - Name: 
+      Entry: 13
+      Data: 
+    - Name: 
+      Entry: 8
+      Data: 
+    - Name: 
+      Entry: 8
+      Data: 
+    - Name: 
+      Entry: 8
+      Data: 
+    - Name: 
+      Entry: 7
+      Data: 
+    - Name: $k
+      Entry: 1
+      Data: _QuestionSubstage
+    - Name: $v
+      Entry: 7
+      Data: 29|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
+    - Name: <Name>k__BackingField
+      Entry: 1
+      Data: _QuestionSubstage
+    - Name: <UserType>k__BackingField
+      Entry: 9
+      Data: 23
+    - Name: <SystemType>k__BackingField
+      Entry: 9
+      Data: 23
+    - Name: <SyncMode>k__BackingField
+      Entry: 7
+      Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
+    - Name: 
+      Entry: 3
+      Data: 1
+    - Name: 
+      Entry: 8
+      Data: 
+    - Name: <IsSerialized>k__BackingField
+      Entry: 5
+      Data: false
+    - Name: _fieldAttributes
+      Entry: 7
+      Data: 30|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
+    - Name: 
+      Entry: 12
+      Data: 1
+    - Name: 
+      Entry: 7
+      Data: 31|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime
    - Name: 
      Entry: 8
      Data: 
@@ -401,16 +521,16 @@ MonoBehaviour:
      Data: _QuestionCorrectResponse
    - Name: $v
      Entry: 7
-      Data: 24|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
+      Data: 32|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
    - Name: <Name>k__BackingField
      Entry: 1
      Data: _QuestionCorrectResponse
    - Name: <UserType>k__BackingField
      Entry: 9
-      Data: 18
+      Data: 23
    - Name: <SystemType>k__BackingField
      Entry: 9
-      Data: 18
+      Data: 23
    - Name: <SyncMode>k__BackingField
      Entry: 7
      Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
@@ -425,13 +545,13 @@ MonoBehaviour:
      Data: false
    - Name: _fieldAttributes
      Entry: 7
-      Data: 25|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
+      Data: 33|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
    - Name: 
      Entry: 12
      Data: 1
    - Name: 
      Entry: 7
-      Data: 26|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime
+      Data: 34|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime
    - Name: 
      Entry: 8
      Data: 
@@ -455,13 +575,13 @@ MonoBehaviour:
      Data: _QuestionsList
    - Name: $v
      Entry: 7
-      Data: 27|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
+      Data: 35|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
    - Name: <Name>k__BackingField
      Entry: 1
      Data: _QuestionsList
    - Name: <UserType>k__BackingField
      Entry: 7
-      Data: 28|System.RuntimeType, mscorlib
+      Data: 36|System.RuntimeType, mscorlib
    - Name: 
      Entry: 1
      Data: VRC.SDK3.Data.DataList, VRCSDK3
@@ -470,7 +590,7 @@ MonoBehaviour:
      Data: 
    - Name: <SystemType>k__BackingField
      Entry: 9
-      Data: 28
+      Data: 36
    - Name: <SyncMode>k__BackingField
      Entry: 7
      Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
@@ -485,7 +605,7 @@ MonoBehaviour:
      Data: false
    - Name: _fieldAttributes
      Entry: 7
-      Data: 29|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
+      Data: 37|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
    - Name: 
      Entry: 12
      Data: 0
@@ -509,13 +629,13 @@ MonoBehaviour:
      Data: _CurrentQuestion
    - Name: $v
      Entry: 7
-      Data: 30|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
+      Data: 38|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
    - Name: <Name>k__BackingField
      Entry: 1
      Data: _CurrentQuestion
    - Name: <UserType>k__BackingField
      Entry: 7
-      Data: 31|System.RuntimeType, mscorlib
+      Data: 39|System.RuntimeType, mscorlib
    - Name: 
      Entry: 1
      Data: VRC.SDK3.Data.DataDictionary, VRCSDK3
@@ -524,7 +644,7 @@ MonoBehaviour:
      Data: 
    - Name: <SystemType>k__BackingField
      Entry: 9
-      Data: 31
+      Data: 39
    - Name: <SyncMode>k__BackingField
      Entry: 7
      Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
@@ -539,7 +659,7 @@ MonoBehaviour:
      Data: false
    - Name: _fieldAttributes
      Entry: 7
-      Data: 32|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
+      Data: 40|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
    - Name: 
      Entry: 12
      Data: 0
@@ -563,7 +683,7 @@ MonoBehaviour:
      Data: _BuzzInAllowed
    - Name: $v
      Entry: 7
-      Data: 33|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
+      Data: 41|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
    - Name: <Name>k__BackingField
      Entry: 1
      Data: _BuzzInAllowed
@@ -587,13 +707,13 @@ MonoBehaviour:
      Data: false
    - Name: _fieldAttributes
      Entry: 7
-      Data: 34|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
+      Data: 42|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
    - Name: 
      Entry: 12
      Data: 1
    - Name: 
      Entry: 7
-      Data: 35|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime
+      Data: 43|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime
    - Name: 
      Entry: 8
      Data: 
@@ -617,13 +737,13 @@ MonoBehaviour:
      Data: _PlayerBuzzInAllowed
    - Name: $v
      Entry: 7
-      Data: 36|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
+      Data: 44|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
    - Name: <Name>k__BackingField
      Entry: 1
      Data: _PlayerBuzzInAllowed
    - Name: <UserType>k__BackingField
      Entry: 7
-      Data: 37|System.RuntimeType, mscorlib
+      Data: 45|System.RuntimeType, mscorlib
    - Name: 
      Entry: 1
      Data: System.Boolean[], mscorlib
@@ -632,7 +752,7 @@ MonoBehaviour:
      Data: 
    - Name: <SystemType>k__BackingField
      Entry: 9
-      Data: 37
+      Data: 45
    - Name: <SyncMode>k__BackingField
      Entry: 7
      Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
@@ -647,13 +767,13 @@ MonoBehaviour:
      Data: false
    - Name: _fieldAttributes
      Entry: 7
-      Data: 38|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
+      Data: 46|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
    - Name: 
      Entry: 12
      Data: 1
    - Name: 
      Entry: 7
-      Data: 39|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime
+      Data: 47|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime
    - Name: 
      Entry: 8
      Data: 
@@ -677,16 +797,16 @@ MonoBehaviour:
      Data: _BuzzedInPlayer
    - Name: $v
      Entry: 7
-      Data: 40|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
+      Data: 48|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
    - Name: <Name>k__BackingField
      Entry: 1
      Data: _BuzzedInPlayer
    - Name: <UserType>k__BackingField
      Entry: 9
-      Data: 18
+      Data: 23
    - Name: <SystemType>k__BackingField
      Entry: 9
-      Data: 18
+      Data: 23
    - Name: <SyncMode>k__BackingField
      Entry: 7
      Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
@@ -701,13 +821,13 @@ MonoBehaviour:
      Data: false
    - Name: _fieldAttributes
      Entry: 7
-      Data: 41|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
+      Data: 49|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
    - Name: 
      Entry: 12
      Data: 1
    - Name: 
      Entry: 7
-      Data: 42|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime
+      Data: 50|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime
    - Name: 
      Entry: 8
      Data: 
@@ -731,13 +851,13 @@ MonoBehaviour:
      Data: _FinalRoundPlayersSortedByScore
    - Name: $v
      Entry: 7
-      Data: 43|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
+      Data: 51|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
    - Name: <Name>k__BackingField
      Entry: 1
      Data: _FinalRoundPlayersSortedByScore
    - Name: <UserType>k__BackingField
      Entry: 7
-      Data: 44|System.RuntimeType, mscorlib
+      Data: 52|System.RuntimeType, mscorlib
    - Name: 
      Entry: 1
      Data: System.Int32[], mscorlib
@@ -746,7 +866,7 @@ MonoBehaviour:
      Data: 
    - Name: <SystemType>k__BackingField
      Entry: 9
-      Data: 44
+      Data: 52
    - Name: <SyncMode>k__BackingField
      Entry: 7
      Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
@@ -761,7 +881,7 @@ MonoBehaviour:
      Data: false
    - Name: _fieldAttributes
      Entry: 7
-      Data: 45|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
+      Data: 53|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
    - Name: 
      Entry: 12
      Data: 0
@@ -785,13 +905,13 @@ MonoBehaviour:
      Data: _PlayerPodiums
    - Name: $v
      Entry: 7
-      Data: 46|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
+      Data: 54|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
    - Name: <Name>k__BackingField
      Entry: 1
      Data: _PlayerPodiums
    - Name: <UserType>k__BackingField
      Entry: 7
-      Data: 47|System.RuntimeType, mscorlib
+      Data: 55|System.RuntimeType, mscorlib
    - Name: 
      Entry: 1
      Data: PlayerPodium[], Assembly-CSharp
@@ -800,7 +920,7 @@ MonoBehaviour:
      Data: 
    - Name: <SystemType>k__BackingField
      Entry: 7
-      Data: 48|System.RuntimeType, mscorlib
+      Data: 56|System.RuntimeType, mscorlib
    - Name: 
      Entry: 1
      Data: UnityEngine.Component[], UnityEngine.CoreModule
@@ -821,13 +941,13 @@ MonoBehaviour:
      Data: true
    - Name: _fieldAttributes
      Entry: 7
-      Data: 49|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
+      Data: 57|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
    - Name: 
      Entry: 12
      Data: 1
    - Name: 
      Entry: 7
-      Data: 50|UnityEngine.SerializeField, UnityEngine.CoreModule
+      Data: 58|UnityEngine.SerializeField, UnityEngine.CoreModule
    - Name: 
      Entry: 8
      Data: 
@@ -851,13 +971,13 @@ MonoBehaviour:
      Data: _AudioManager
    - Name: $v
      Entry: 7
-      Data: 51|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
+      Data: 59|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
    - Name: <Name>k__BackingField
      Entry: 1
      Data: _AudioManager
    - Name: <UserType>k__BackingField
      Entry: 7
-      Data: 52|System.RuntimeType, mscorlib
+      Data: 60|System.RuntimeType, mscorlib
    - Name: 
      Entry: 1
      Data: AudioManager, Assembly-CSharp
@@ -881,13 +1001,13 @@ MonoBehaviour:
      Data: true
    - Name: _fieldAttributes
      Entry: 7
-      Data: 53|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
+      Data: 61|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
    - Name: 
      Entry: 12
      Data: 1
    - Name: 
      Entry: 7
-      Data: 54|UnityEngine.SerializeField, UnityEngine.CoreModule
+      Data: 62|UnityEngine.SerializeField, UnityEngine.CoreModule
    - Name: 
      Entry: 8
      Data: 
@@ -5,17 +5,28 @@ using VRC.SDK3.Data;
 using VRC.SDK3.UdonNetworkCalling;
 using VRC.Udon.Common.Interfaces;
 using VRC.SDKBase;
+using VRC.SDK3.Video.Components;
+
+
+public enum PresentationMedium
+{
+	VideoClue,
+	VideoMusicClue,
+	ACMECrimenetComputer
+}


 [UdonBehaviourSyncMode(BehaviourSyncMode.Manual)]
 public class GameManagerRound1 : GameManagerBase
 {
 	[SerializeField] private CaseManager _CaseManager;
+	[SerializeField] private VRCUnityVideoPlayer _VideoPlayer;

 	[UdonSynced] protected bool _GameHasBegun = false;

 	[UdonSynced] private int _QuestionIndex = 0;
 	[UdonSynced] private int _QuestionStage = 0;
+	[UdonSynced] private int _QuestionSubstage = 0;
 	[UdonSynced] private int _QuestionCorrectResponse = 0;
 	private DataList _QuestionsList = new DataList();
 	private DataDictionary _CurrentQuestion;
@@ -84,7 +95,108 @@ public class GameManagerRound1 : GameManagerBase
 	}


-	private void NewMultipleChoiceQuestion()
+	private void PlayIntroVideo()
+	{
+		//HostCardIntroInterface Interface =
+		//	(HostCardIntroInterface)GetHostCardInterface(RoundSegmentType.Intro);
+		//Interface.HeaderUI.text = _CaseManager.GetCaseTitle();
+		//Interface.IntroUI.text = _CaseManager.GetCaseDescription();
+
+		_VideoPlayer.PlayURL(_CaseManager.GetIntroVideo());
+
+		EnableInteraction("Assign Points");
+	}
+
+	private void AssignStarterPoints()
+	{
+		_CurrentQuestion = _QuestionsList[_QuestionIndex].DataDictionary;
+		_QuestionStage = 0;
+
+		for (int i = 0; i < _PlayerPodiums.Length; i++)
+		{
+			NetworkCalling.SendCustomNetworkEvent(
+				(IUdonEventReceiver)_PlayerPodiums[i],
+				NetworkEventTarget.All,
+				"DisplayScore");
+		}
+
+		NetworkCalling.SendCustomNetworkEvent((IUdonEventReceiver)_AudioManager, NetworkEventTarget.All,
+			"PlaySFXAtPitch", SFXEventType.Ding, AudioManager.D6);
+
+		ShowBetweenQuestionsInterface();
+
+		DisableChoiceCards();
+		DisableRiskCards();
+		DisableBuzzers();
+
+		EnableInteraction("Show First Question");
+
+		_GameHasBegun = true;
+	}
+
+
+	private void MultipleChoiceInitialisePresentation()
+	{
+		HostCardBetweenRoundsInterface Interface;
+		if (!_CurrentQuestion.ContainsKey("Presentation") ||
+			_CurrentQuestion["Presentation"].TokenType != TokenType.DataDictionary ||
+			!_CurrentQuestion["Presentation"].DataDictionary.ContainsKey("Medium"))
+		{
+			Interface = (HostCardBetweenRoundsInterface)GetHostCardInterface(RoundSegmentType.BetweenSegments);
+			Interface.HeaderUI.text = "No special presentation available. Continuing on...";
+
+			EnableInteraction("Reveal Question");
+			return;
+		}
+
+		DataDictionary Presentation = _CurrentQuestion["Presentation"].DataDictionary;
+		switch ((PresentationMedium)(int)Presentation["Medium"].Number)
+		{
+			case PresentationMedium.VideoClue:				MultipleChoiceInitialiseVideoClue(Presentation);			break;
+			case PresentationMedium.VideoMusicClue:			MultipleChoiceInitialiseVideoMusicClue(Presentation);		break;
+			case PresentationMedium.ACMECrimenetComputer:	MultipleChoiceInitialiseACMECrimenetComputer(Presentation);	break;
+		}
+	}
+
+	private void MultipleChoiceInitialiseVideoClue(DataDictionary Presentation)
+	{
+		DataList Videos = Presentation["Videos"].DataList;
+		if (_QuestionSubstage < Videos.Count)
+		{
+			HostCardBetweenRoundsInterface Interface =
+				(HostCardBetweenRoundsInterface)GetHostCardInterface(RoundSegmentType.BetweenSegments);
+			Interface.HeaderUI.text = "Playing video...";
+
+			_VideoPlayer.PlayURL(_CaseManager.GetVideo((int)Videos[_QuestionSubstage].Number));
+
+			_QuestionSubstage++;
+			EnableInteraction("Play Video");
+		}
+		else
+		{
+			_QuestionSubstage = 0;
+			MultipleChoiceRevealQuestion();
+		}
+	}
+
+	private void MultipleChoiceInitialiseVideoMusicClue(DataDictionary Presentation)
+	{
+		// The full presentation is not ready yet, so temporarily treat it as
+		// a regular video clue.
+		MultipleChoiceInitialiseVideoClue(Presentation);
+	}
+
+	private void MultipleChoiceInitialiseACMECrimenetComputer(DataDictionary Presentation)
+	{
+		HostCardBetweenRoundsInterface Interface =
+			(HostCardBetweenRoundsInterface)GetHostCardInterface(RoundSegmentType.BetweenSegments);
+		Interface.HeaderUI.text = "This part isn't done yet. This will eventually have a really cool computer give you the clue.";
+
+		_QuestionSubstage = 0;
+		MultipleChoiceRevealQuestion();
+	}
+
+	private void MultipleChoiceRevealQuestion()
 	{
 		HostCardMultipleChoiceInterface Interface =
 			(HostCardMultipleChoiceInterface)GetHostCardInterface(RoundSegmentType.MultipleChoice);
@@ -116,6 +228,7 @@ public class GameManagerRound1 : GameManagerBase
 		SendCustomEventDelayedSeconds(nameof(MultipleChoiceRevealChoice2), 1.25f);
 		SendCustomEventDelayedSeconds(nameof(MultipleChoiceRevealChoice3), 2.5f);
 	}
+
 	private void MultipleChoiceRevealChoice1()
 	{
 		HostCardMultipleChoiceInterface Interface =
@@ -699,8 +812,7 @@ public class GameManagerRound1 : GameManagerBase
 		DisableRiskCards();
 		DisableBuzzers();

-		HostCardBetweenRoundsInterface Interface =
-			(HostCardBetweenRoundsInterface)GetHostCardInterface(RoundSegmentType.BetweenSegments);
+		HostCardBetweenRoundsInterface Interface = ShowBetweenQuestionsInterface();

 		_QuestionIndex++;
 		if (_QuestionIndex >= _QuestionsList.Count)
@@ -853,13 +965,25 @@ public class GameManagerRound1 : GameManagerBase
 		// Disable interaction until we unlock it again later.
 		DisableInteraction();

-		_QuestionStage++;
+		// Only advance to the next stage if we aren't in the middle of a substage
+		if (_QuestionSubstage <= 0)
+		{
+			_QuestionStage++;
+		}

-		// TO-DO: Ask someone at either Microsoft or VRChat why the VM crashes if you cast an int
-		// to an enum in a switch parameter, but not if you cast an enum to an int in a case
-		// statement. I'm starting to wonder if either C# or U# are just fucking terrible
-		// languages. C++ figured this problem out in at least 1985, and it turns out the proper
-		// solution was "it's not a problem, it's two numbers, they're the same fucking thing".
+		// Handle the intro until the game properly begins.
+		if (!_GameHasBegun)
+		{
+			AdvanceIntro();
+			return;
+		}
+
+		// TO-DO: Ask someone at either Microsoft or VRChat why the VM crashes if you
+		// cast an int to an enum in a switch parameter, but not if you cast an enum
+		// to an int in a case statement. I'm starting to wonder if either C# or U#
+		// are just fucking terrible languages. C++ figured this problem out in at
+		// least 1985, and it turns out the proper solution was "it's not a problem,
+		// it's two numbers, they're the same fucking thing".
 		switch ((int)_CurrentQuestion["Type"].Number)
 		{
 			case (int)RoundSegmentType.MultipleChoice:	AdvanceMultipleChoiceStage();		break;
@@ -871,11 +995,21 @@ public class GameManagerRound1 : GameManagerBase
 		RequestSerialization();
 	}

+	private void AdvanceIntro()
+	{
+		switch(_QuestionStage)
+		{
+			case 1:		PlayIntroVideo();		break;
+			case 2:		AssignStarterPoints();	break;
+			default:	break;
+		}
+	}
+
 	private void AdvanceMultipleChoiceStage()
 	{
 		switch(_QuestionStage)
 		{
-			case 1:		NewMultipleChoiceQuestion();					break;
+			case 1:		MultipleChoiceInitialisePresentation();			break;
 			case 2:		MultipleChoiceRevealChoice1();					break;
 			case 3:		MultipleChoiceRevealChoice2();					break;
 			case 4:		MultipleChoiceRevealChoice3();					break;
@@ -939,29 +1073,6 @@ public class GameManagerRound1 : GameManagerBase

 	protected override void _HostCardUseButtonDown_Internal()
 	{
-		if (!_GameHasBegun)
-		{
-			for (int i = 0; i < _PlayerPodiums.Length; i++)
-			{
-				NetworkCalling.SendCustomNetworkEvent(
-					(IUdonEventReceiver)_PlayerPodiums[i],
-					NetworkEventTarget.All,
-					"DisplayScore");
-			}
-
-			NetworkCalling.SendCustomNetworkEvent((IUdonEventReceiver)_AudioManager, NetworkEventTarget.All,
-				"PlaySFXAtPitch", SFXEventType.Ding, AudioManager.D6);
-
-			_CurrentQuestion = _QuestionsList[_QuestionIndex].DataDictionary;
-
-			HostCardBetweenRoundsInterface Interface =
-				(HostCardBetweenRoundsInterface)GetHostCardInterface(RoundSegmentType.BetweenSegments);
-			Interface.HeaderUI.text = "Upcoming Question: " + RoundSegmentTypeToString((RoundSegmentType)((int)_CurrentQuestion["Type"].Number));
-
-			_GameHasBegun = true;
-			return;
-		}
-
 		AdvanceQuestion();
 	}

@@ -969,4 +1080,12 @@ public class GameManagerRound1 : GameManagerBase
 	{
 		return _HostCard.EnableHostCardDisplay(RoundType.LocateTheCrook, Question);
 	}
+
+	private HostCardBetweenRoundsInterface ShowBetweenQuestionsInterface()
+	{
+		HostCardBetweenRoundsInterface Interface =
+			(HostCardBetweenRoundsInterface)GetHostCardInterface(RoundSegmentType.BetweenSegments);
+		Interface.HeaderUI.text = "Upcoming Question: " + RoundSegmentTypeToString((RoundSegmentType)((int)_CurrentQuestion["Type"].Number));
+		return Interface;
+	}
 }
@@ -104,7 +104,6 @@ public class GameManagerRound3 : GameManagerBase

 		FloorMapMarker Marker = GetCurrentMarker();
 		Marker.EnablePickup(true);
-		Marker.LocationFindingEnabled = true;

 		StartTimer();
 	}
@@ -144,7 +143,6 @@ public class GameManagerRound3 : GameManagerBase

 		FloorMapMarker Marker = GetCurrentMarker();
 		Marker.EnablePickup(false);
-		Marker.LocationFindingEnabled = false;

 		_FailureCounter = 0;
 		_SuccessCounter++;
@@ -170,7 +168,6 @@ public class GameManagerRound3 : GameManagerBase
 			_FailureCounter = 0;
 			FloorMapMarker Marker = GetCurrentMarker();
 			Marker.EnablePickup(false);
-			Marker.LocationFindingEnabled = false;

 			SetUpNextCountry();
 		}
@@ -210,8 +207,8 @@ public class GameManagerRound3 : GameManagerBase
 				nameof(GameHasBeenLost), true);
 			return;
 		}
-		_Markers[NextCountry].EnablePickup(true);
-		_Markers[NextCountry].LocationFindingEnabled = true;
+		FloorMapMarker Marker = GetCurrentMarker();
+		Marker.EnablePickup(true);
 		UpdateInterface();
 	}