Merge remote-tracking branch 'upstream/main'

matigramirez · Dec 11, 2024 · 95dad3f · 95dad3f
2 parents 9ade55c + caaeb7f
commit 95dad3f
Show file tree

Hide file tree

Showing 54 changed files with 588 additions and 391 deletions.
diff --git a/README.md b/README.md
@@ -8,8 +8,8 @@
 `Parsec` is a simple .NET parsing library for `Shaiya` file formats which provides easy to use APIs
 for serialization and deserialization of the game's file formats, including JSON and CSV support.
 
-Parsec works on any .NET Standard 2.0 compliant platform, including .NET 7.0, .NET Framework 4.6.1+, .NET Core 2.0+,
-Unity's Mono and Godot.
+Parsec works on any .NET Standard 2.0 compliant platform, including .NET 5+, .NET Framework 4.6.1+, .NET Core 2.0+,
+Unity and Godot.
 
 ## Supported file formats
 
@@ -26,6 +26,7 @@ Unity's Mono and Godot.
 - `NpcSkill.SData`
 - `svmap`
 - `WLD`
+- `dg`
 - `ANI`
 - `3DC`
 - `3DO`
@@ -72,7 +73,7 @@ might not work with them.
 
 ### Prerequisites
 
-- `.NET 7 SDK (recommended)` or any `.NET Standard 2.0` compliant platform
+- `.NET 8 SDK (recommended)` or any `.NET Standard 2.0` compliant platform
 
 ## Documentation
 

diff --git a/samples/Data/Sample.Data.csproj b/samples/Data/Sample.Data.csproj
@@ -2,8 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
-    <LangVersion>10</LangVersion>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/samples/Files/Program.cs b/samples/Files/Program.cs
@@ -1,19 +1,34 @@
-using Parsec;
-using Parsec.Shaiya.SData;
-using Parsec.Shaiya.Skill;
+using System;
+using Parsec;
+using Parsec.Shaiya.Svmap;
 
 namespace Sample.Files;
 
 internal static class Program
 {
     private static void Main(string[] args)
     {
-        SData.DecryptFile("/home/matias/Desktop/DBSkillData.SData", "/home/matias/Desktop/DBSkillData.dec.SData");
+        // This sample shows how you can convert a shaiya file format (in this case svmap) into json to be able to
+        // edit its properties as plain text, and then, convert it back to its original format
 
-        var skillData = ParsecReader.FromFile<DBSkillData>("/home/matias/Desktop/DBSkillData.dec.SData");
+        // Step 1: Read a svmap from a file
+        var svmap = ParsecReader.FromFile<Svmap>("2.svmap");
 
-        skillData.Write("/home/matias/Desktop/DBSkillData.dec.new.SData");
+        // You can go through and modify its properties here too
+        foreach (var npc in svmap.Npcs)
+        {
+            Console.WriteLine($"NpcId: {npc.NpcId}, Type: {npc.NpcType}");
+        }
 
-        var newSkillData = ParsecReader.FromFile<DBSkillData>("/home/matias/Desktop/DBSkillData.dec.new.SData");
+        // Step 2: Export svmap as JSON
+        svmap.WriteJson("2.svmap.json");
+
+        // Step 3: Modify the json file in any text editor
+
+        // Step 4: Read svmap from the modified JSON file
+        var svmapFromJson = ParsecReader.FromJsonFile<Svmap>("2.svmap.json");
+
+        // Step 5: Write the edited instance as .svmap
+        svmapFromJson.Write("2.edited.svmap");
     }
 }
diff --git a/samples/Files/Sample.Files.csproj b/samples/Files/Sample.Files.csproj
@@ -2,8 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
-    <LangVersion>10</LangVersion>
+    <TargetFramework>net8.0</TargetFramework>
     <RootNamespace>Sample.Files</RootNamespace>
   </PropertyGroup>
 

diff --git a/samples/Godot/Mob_Elk_01.3DC b/samples/Godot/Mob_Elk_01.3DC
diff --git a/samples/Godot/Mob_Elk_01.dds b/samples/Godot/Mob_Elk_01.dds
diff --git a/samples/Godot/README.md b/samples/Godot/README.md
diff --git a/samples/Godot/Scene.tscn b/samples/Godot/Scene.tscn
diff --git a/samples/Godot/Shaiya.png b/samples/Godot/Shaiya.png
diff --git a/samples/Godot/ShaiyaGodotProject.csproj b/samples/Godot/ShaiyaGodotProject.csproj
diff --git a/samples/Godot/ShaiyaGodotProject.sln b/samples/Godot/ShaiyaGodotProject.sln
diff --git a/samples/Godot/ShaiyaMeshInstance.cs b/samples/Godot/ShaiyaMeshInstance.cs
diff --git a/samples/Godot/camera.gd b/samples/Godot/camera.gd
diff --git a/samples/Godot/default_env.tres b/samples/Godot/default_env.tres
diff --git a/samples/Godot/project.godot b/samples/Godot/project.godot