LibDat2: Fix reading array of unknown type when using schema.min.json

VisualGGPK2 now use schema.min.json by default
RainKeyBoy · Feb 11, 2023 · b4939cf · b4939cf
1 parent 6eab41e
commit b4939cf
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 8 deletions.
diff --git a/LibDat2/DatContainer.cs b/LibDat2/DatContainer.cs
@@ -51,6 +51,8 @@ public static void DownloadSchemaMin() {
 					foreach (var field in columns.EnumerateArray()) {
 						var name = field.GetProperty("name").GetString() ?? "Unknown" + Unknown++.ToString();
 						var type = field.GetProperty("type").GetString()!;
+						if (type == "array")
+							type = "i32"; // Array of unknown type
 						if (field.GetProperty("array").GetBoolean())
 							type = "array|" + type;
 						array[index++] = new(name, type);

diff --git a/LibDat2/DatDefinitions.json b/LibDat2/DatDefinitions.json
@@ -4362,7 +4362,7 @@
 		"Domain": "i32",
 		"Name": "string",
 		"GenerationType": "i32",
-		"CorrectGroup": "array|foreignrow",
+		"Families": "array|foreignrow",
 		"Stat1Min": "i32",
 		"Stat1Max": "i32",
 		"Stat2Min": "i32",
@@ -4404,9 +4404,9 @@
 		"Heist_AddStatValue1": "i32",
 		"Heist_AddStatValue2": "i32",
 		"InfluenceTypes": "i32",
-		"Unknown4": "array|foreignrow",
+		"ImplicitTagsKeys": "array|foreignrow",
+		"Unknown4": "bool",
 		"Unknown5": "i32",
-		"Flag0": "bool",
 		"Unknown6": "i32",
 		"Unknown7": "i32",
 		"Unknown8": "i32",
@@ -4422,10 +4422,12 @@
 		"Unknown18": "i32",
 		"Unknown19": "i32",
 		"Unknown20": "i32",
-		"BuffTemplateKey0": "row",
+		"BuffTemplate": "row",
 		"ArchnemesisMinionMod": "foreignrow",
 		"HASH32": "u32",
-		"BuffTemplateKey1": "array|foreignrow"
+		"Unknown21": "array|foreignrow",
+		"Unknown22": "i32",
+		"Unknown23": "array|foreignrow"
 	},
 	"ModSellPriceTypes": {
 		"Id": "string"

diff --git a/LibDat2/LibDat2.csproj b/LibDat2/LibDat2.csproj
@@ -5,7 +5,7 @@
     <Nullable>enable</Nullable>
     <Authors>aianlinb</Authors>
     <Copyright>Copyright © 2020-2022 aianlinb</Copyright>
-    <Version>0.15.4</Version>
+    <Version>0.15.5</Version>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <DebugType>embedded</DebugType>
   </PropertyGroup>

diff --git a/VisualGGPK2/MainWindow.xaml b/VisualGGPK2/MainWindow.xaml
@@ -81,7 +81,7 @@
 				<RowDefinition MinHeight="10"/>
 				<RowDefinition MinHeight="10"/>
 			</Grid.RowDefinitions>
-			<CheckBox x:Name="SchemaMin" Content="Use schema.min.json" VerticalContentAlignment="Center" Margin="5,0,0,0" Checked="OnSchemaMinChecked" Unchecked="OnSchemaMinChecked"/>
+			<CheckBox x:Name="SchemaMin" Content="Use schema.min.json" VerticalContentAlignment="Center" Margin="5,0,0,0" Checked="OnSchemaMinChecked" Unchecked="OnSchemaMinChecked" IsChecked="True"/>
 			<Button Content="Save" Click="OnSaveDatClicked" Padding="5,0" HorizontalAlignment="Right" Margin="0,0,350,0"/>
 			<Button Content="Reload DatDefinitions" Click="OnReloadClicked" Padding="5,0" HorizontalAlignment="Right" Margin="0,0,210,0"/>
 			<Button Content="Import from .csv" Click="OnImportClicked" Padding="5,0" HorizontalAlignment="Right" Margin="0,0,90,0"/>

diff --git a/VisualGGPK2/VisualGGPK2.csproj b/VisualGGPK2/VisualGGPK2.csproj
@@ -4,7 +4,7 @@
     <TargetFramework>net6.0-windows</TargetFramework>
     <Authors>aianlinb</Authors>
     <Copyright>Copyright © 2020-2022 aianlinb</Copyright>
-    <Version>0.15.4</Version>
+    <Version>0.15.5</Version>
     <OutputType>WinExe</OutputType>
     <UseWPF>true</UseWPF>
     <UseWindowsForms>true</UseWindowsForms>