update framework version, add 0a opcode, fix unknown10 unknown2 opcod…

…e creation
krogenth · Jan 21, 2024 · 46894ff · 46894ff
1 parent 2b8a51a
commit 46894ff
Show file tree

Hide file tree

Showing 12 changed files with 94 additions and 10 deletions.
diff --git a/src/G2DataGUI.Common/Data/Maps/MapDialogueOpcodes/DialogueOpcodes.cs b/src/G2DataGUI.Common/Data/Maps/MapDialogueOpcodes/DialogueOpcodes.cs
@@ -45,6 +45,12 @@ public enum DialogueOpcode : byte
 	/// </summary>
 	Unknown09 = 0x09,
 
+	/// <summary>
+	/// Seems to be associated with Textbox Options Opcode,
+	/// links options to function handling
+	/// </summary>
+	Unknown0A = 0x0A,
+
 	/// <summary>
 	/// Seems to deal with camera movement
 	/// </summary>

diff --git a/src/G2DataGUI.Common/Data/Maps/MapDialogueOpcodes/ParseDialogueOpcode.cs b/src/G2DataGUI.Common/Data/Maps/MapDialogueOpcodes/ParseDialogueOpcode.cs
@@ -20,6 +20,7 @@ public static IMapDialogueOpcode ParseNextOpcode(Stream reader, byte opcode)
 			DialogueOpcode.Unknown07 => Unknown07Opcode.ReadOpcode(reader),
 			DialogueOpcode.Unknown08 => Unknown08Opcode.ReadOpcode(reader),
 			DialogueOpcode.Unknown09 => Unknown09Opcode.ReadOpcode(reader),
+			DialogueOpcode.Unknown0A => Unknown0AOpcode.ReadOpcode(reader),
 			DialogueOpcode.CameraMove => CameraMoveOpcode.ReadOpcode(reader),
 			DialogueOpcode.Unknown0C => Unknown0COpcode.ReadOpcode(reader),
 			DialogueOpcode.Unknown0D => Unknown0DOpcode.ReadOpcode(reader),

diff --git a/src/G2DataGUI.Common/Data/Maps/MapDialogueOpcodes/Unknown0AOpcode.cs b/src/G2DataGUI.Common/Data/Maps/MapDialogueOpcodes/Unknown0AOpcode.cs
@@ -0,0 +1,28 @@
+using System.IO;
+using G2DataGUI.IO.Streams;
+
+namespace G2DataGUI.Common.Data.Maps.MapDialogueOpcodes;
+
+public class Unknown0AOpcode : IMapDialogueOpcode
+{
+	public DialogueOpcode Opcode { get; set; } = DialogueOpcode.Unknown0A;
+	public byte Unknown1 { get; set; }
+	public byte Unknown2 { get; set; }
+	public byte Unknown3 { get; set; }
+	public byte Unknown4 { get; set; }
+	public byte Unknown5 { get; set; }
+	public byte Unknown6 { get; set; }
+
+	public static IMapDialogueOpcode ReadOpcode(Stream reader)
+	{
+		return new Unknown0AOpcode()
+		{
+			Unknown1 = reader.ReadRawByte(),
+			Unknown2 = reader.ReadRawByte(),
+			Unknown3 = reader.ReadRawByte(),
+			Unknown4 = reader.ReadRawByte(),
+			Unknown5 = reader.ReadRawByte(),
+			Unknown6 = reader.ReadRawByte(),
+		};
+	}
+}
diff --git a/src/G2DataGUI.Common/Data/Maps/MapDialogueOpcodes/Unknown10/Unknown10Unknown2Opcode.cs b/src/G2DataGUI.Common/Data/Maps/MapDialogueOpcodes/Unknown10/Unknown10Unknown2Opcode.cs
@@ -7,5 +7,5 @@ public class Unknown10Unknown2Opcode : IUnknown10Opcode
 	public DialogueOpcode Opcode { get; set; } = DialogueOpcode.Unknown10;
 	public Unknown10Option Option { get; set; } = Unknown10Option.Unknown2;
 
-	public static IMapDialogueOpcode ReadOpcode(Stream reader) => new Unknown10Unknown1Opcode();
+	public static IMapDialogueOpcode ReadOpcode(Stream reader) => new Unknown10Unknown2Opcode();
 }
diff --git a/src/G2DataGUI.Common/Data/Maps/Maps.cs b/src/G2DataGUI.Common/Data/Maps/Maps.cs
@@ -51,9 +51,6 @@ private void ReadMaps()
 		{
 			reader?.Dispose();
 		}
-
-		using var vorbis = new NVorbis.VorbisReader("F:\\Steam\\steamapps\\common\\Grandia II Anniversary Edition\\content\\data\\sound\\staffrollus.ogg");
-		var channels = vorbis.Channels;
 	}
 
 	private void WriteMaps()

diff --git a/src/G2DataGUI.Common/G2DataGUI.Common.csproj b/src/G2DataGUI.Common/G2DataGUI.Common.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <BaseOutputPath>..\..\build</BaseOutputPath>
 	<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
   </PropertyGroup>

diff --git a/src/G2DataGUI.IO/G2DataGUI.IO.csproj b/src/G2DataGUI.IO/G2DataGUI.IO.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <BaseOutputPath>..\..\build</BaseOutputPath>
 	<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
   </PropertyGroup>

diff --git a/src/G2DataGUI.Tests.Common/G2DataGUI.Tests.Common.csproj b/src/G2DataGUI.Tests.Common/G2DataGUI.Tests.Common.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
 	<BaseOutputPath>..\..\build</BaseOutputPath>
 	<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
   </PropertyGroup>

diff --git a/src/G2DataGUI.Tests.Integration/G2DataGUI.Tests.Integration.csproj b/src/G2DataGUI.Tests.Integration/G2DataGUI.Tests.Integration.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 

diff --git a/src/G2DataGUI.UI.Common/G2DataGUI.UI.Common.csproj b/src/G2DataGUI.UI.Common/G2DataGUI.UI.Common.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <BaseOutputPath>..\..\build</BaseOutputPath>
 	<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
   </PropertyGroup>

diff --git a/src/G2DataGUI/G2DataGUI.csproj b/src/G2DataGUI/G2DataGUI.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
 	<OutputType>WinExe</OutputType>
-	<TargetFramework>net7.0</TargetFramework>
+	<TargetFramework>net8.0</TargetFramework>
 	<Nullable>disable</Nullable>
 	<PublishSingleFile>True</PublishSingleFile>
 	<BuiltInComInteropSupport>true</BuiltInComInteropSupport>

diff --git a/src/G2DataGUI/UI/Views/Content/MapDialogue.axaml b/src/G2DataGUI/UI/Views/Content/MapDialogue.axaml
@@ -715,6 +715,58 @@
 				</Border>
 			</TreeDataTemplate>
 
+			<TreeDataTemplate x:Key="Unknown0AOpcode"
+							  DataType="{x:Type opcodes:Unknown0AOpcode}">
+				<Border Classes="BorderedGrid LightCurve">
+					<StackPanel>
+						<Grid Margin="0,5">
+							<Grid.ColumnDefinitions>
+								<ColumnDefinition Width="Auto" />
+							</Grid.ColumnDefinitions>
+							<StackPanel Grid.Column="0"
+										Margin="5,0">
+								<TextBlock Text="Opcode:" />
+								<TextBox Text="{Binding Opcode}" />
+							</StackPanel>
+						</Grid>
+						<Grid Margin="0,5">
+							<Grid.ColumnDefinitions>
+								<ColumnDefinition Width="Auto" />
+								<ColumnDefinition Width="Auto" />
+								<ColumnDefinition Width="Auto" />
+								<ColumnDefinition Width="Auto" />
+								<ColumnDefinition Width="Auto" />
+							</Grid.ColumnDefinitions>
+							<StackPanel Grid.Column="0"
+										Margin="5,0">
+								<TextBlock Text="Unknown #1:" />
+								<TextBox Text="{Binding Unknown1}" />
+							</StackPanel>
+							<StackPanel Grid.Column="1"
+										Margin="5,0">
+								<TextBlock Text="Unknown #2:" />
+								<TextBox Text="{Binding Unknown2}" />
+							</StackPanel>
+							<StackPanel Grid.Column="2"
+										Margin="5,0">
+								<TextBlock Text="Unknown #3:" />
+								<TextBox Text="{Binding Unknown3}" />
+							</StackPanel>
+							<StackPanel Grid.Column="3"
+										Margin="5,0">
+								<TextBlock Text="Unknown #4:" />
+								<TextBox Text="{Binding Unknown4}" />
+							</StackPanel>
+							<StackPanel Grid.Column="4"
+										Margin="5,0">
+								<TextBlock Text="Unknown #5:" />
+								<TextBox Text="{Binding Unknown5}" />
+							</StackPanel>
+						</Grid>
+					</StackPanel>
+				</Border>
+			</TreeDataTemplate>
+
 			<TreeDataTemplate x:Key="Unknown0COpcode"
 						      DataType="{x:Type opcodes:Unknown0COpcode}">
 				<Border Classes="BorderedGrid LightCurve">