fix broken ch2-3-4 conversion in some cases, added warnings

InvoxiPlayGames · InvoxiPlayGames · commit 33b2751ccc20 · 2025-06-18T15:10:47.000+01:00
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -0,0 +1,25 @@
+name: Build
+
+on:
+  push:
+    branches: [ "master" ]
+
+jobs:
+  build:
+    strategy:
+        matrix:
+            rid: [win-x64, osx-arm64, linux-x64]
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+    - name: Setup .NET
+      uses: actions/setup-dotnet@v4
+      with:
+        dotnet-version: 8.0.x
+    - name: Build and Publish
+      run: dotnet publish -c Release -r ${{ matrix.rid }}
+    - name: Upload
+      uses: actions/upload-artifact@v4
+      with:
+        name: DeltaruneSaveConverter-${{ matrix.rid }}-${{ github.sha }}
+        path: bin/Release/net8.0/${{ matrix.rid }}/publish/
diff --git a/DeltaruneCh1.cs b/DeltaruneCh1.cs
@@ -589,5 +589,17 @@ public void WriteToConsoleFile(string ConsoleFilePath)
             filelines[line] = time.ToString();
             File.WriteAllText(ConsoleFilePath, string.Join("\r\n", filelines));
         }
+
+        public static bool IsPCSaveFile(string filename)
+        {
+            string[] lines = File.ReadAllLines(filename);
+            return lines.Length == 10318;
+        }
+
+        public static bool IsConsoleSaveFile(string filename)
+        {
+            string[] lines = File.ReadAllLines(filename);
+            return lines.Length == 223;
+        }
     }
 }
diff --git a/DeltaruneCh2.cs b/DeltaruneCh2.cs
@@ -27,7 +27,7 @@ class DeltaruneCh2
         public double[] charweapon = new double[5];
         public double[] chararmor1 = new double[5];
         public double[] chararmor2 = new double[5];
-        public string[] weaponstyle = new string[5];
+        public double[] weaponstyle = new double[5];
         public double[,] itemat = new double[5, 4];
         public double[,] itemdf = new double[5, 4];
         public double[,] itemmag = new double[5, 4];
@@ -115,7 +115,7 @@ public void ReadFromPCFile(string PCFilePath)
                 line++;
                 chararmor2[i] = Convert.ToDouble(filelines[line]);
                 line++;
-                weaponstyle[i] = filelines[line];
+                weaponstyle[i] = Convert.ToDouble(filelines[line]);
                 line++;
                 for (int q = 0; q < 4; q++)
                 {
@@ -264,7 +264,7 @@ public void WriteToPCFile(string PCFilePath)
                 line++;
                 filelines[line] = chararmor2[i].ToString();
                 line++;
-                filelines[line] = weaponstyle[i];
+                filelines[line] = weaponstyle[i].ToString();
                 line++;
                 for (int q = 0; q < 4; q++)
                 {
@@ -410,7 +410,7 @@ public void ReadFromConsoleFile(string ConsoleFilePath)
             line++;
             new GMSListDecoder(filelines[line]).ToRealArray(ref chararmor2, 5);
             line++;
-            new GMSListDecoder(filelines[line]).ToStringArray(ref weaponstyle, 5);
+            new GMSListDecoder(filelines[line]).ToRealArray(ref weaponstyle, 5);
             line++;
             for (int i = 0; i < 5; i++)
             {
@@ -630,5 +630,17 @@ public void WriteToConsoleFile(string ConsoleFilePath)
             //File.WriteAllLines(ConsoleFilePath, filelines); - trailing newline
             File.WriteAllText(ConsoleFilePath, string.Join("\r\n", filelines));
         }
+
+        public static bool IsPCSaveFile(string filename)
+        {
+            string[] lines = File.ReadAllLines(filename);
+            return lines.Length == 3055;
+        }
+
+        public static bool IsConsoleSaveFile(string filename)
+        {
+            string[] lines = File.ReadAllLines(filename);
+            return lines.Length == 308;
+        }
     }
 }
diff --git a/Program.cs b/Program.cs
@@ -1,5 +1,6 @@
 ﻿using System;
 using System.IO;
+using System.Runtime;
 using System.Text.Json;
 
 namespace DeltaruneSaveConverter
@@ -14,11 +15,6 @@ static void PrintUsage()
             Console.WriteLine("commands:");
             Console.WriteLine("ConvertFromConsole: extracts a SAV file from path1 into path2 and converts the save files into PC format");
             Console.WriteLine("ConvertFromPC: converts save files from path1 into console format and packs them into a SAV at path2");
-            Console.WriteLine("ExtractSAV: extracts a SAV file from path1 into path2 - supports UNDERTALE");
-            Console.WriteLine("PackSAV: packs a SAV file with files from path1 into path2 - supports UNDERTALE");
-            Console.WriteLine("ConvertFileFromConsole: converts the save file at path1 into PC format and saves it at path2");
-            Console.WriteLine("ConvertFileFromPC: converts the save file at path1 into console format and saves it at path2");
-            Console.WriteLine("BuildINI: builds a dr.ini file from a folder containing PC-format save files");
             Console.WriteLine();
             Console.WriteLine("example:");
             Console.WriteLine("DeltaruneSaveConverter ConvertFromConsole deltarune_ch1.sav ./pcsave/");
@@ -63,8 +59,50 @@ static void Main(string[] args)
             return;
         }
 
+        /*
+         * Okay, this one's annoying.
+         * DELTARUNE Chapter 1&2 DEMO, at least on Switch, has leftover files that are outdated and broken.
+         * Only deltarune_ch1.sav is good, EVEN FOR CHAPTER 2 SAVES. This has been the cause of too much confusion.
+         * No, ChatGPT doesn't know this.
+         */
+        static bool DetectIfDemoSavegameWithOldStuff(string consoleSAV)
+        {
+            if (Path.GetFileName(consoleSAV) == "deltarune_ch2.sav")
+            {
+                string possibleCh1Path = consoleSAV.Replace("deltarune_ch2.sav", "deltarune_ch1.sav");
+                if (File.Exists(possibleCh1Path))
+                    return true;
+            }
+            else if (Path.GetFileName(consoleSAV) == "deltarune.sav")
+            {
+                string possibleCh1Path = consoleSAV.Replace("deltarune.sav", "deltarune_ch1.sav");
+                if (File.Exists(possibleCh1Path))
+                    return true;
+            }
+            return false;
+        }
+
         static void ConvertFromConsole(string consoleSAV, string pcPath)
         {
+            if (DetectIfDemoSavegameWithOldStuff(consoleSAV))
+            {
+                Console.WriteLine("!! WARNING !! If you're extracting from Chapter 1 & 2 DEMO, use \"deltarune_ch1.sav\" instead!");
+                Console.WriteLine("Press Y to continue conversion, press any other button to cancel.");
+                ConsoleKeyInfo cki = Console.ReadKey(true);
+                if (cki.KeyChar != 'Y' && cki.KeyChar != 'y')
+                    return;
+                Console.WriteLine("");
+            }
+            if (Directory.Exists(pcPath))
+            {
+                Console.WriteLine("!! WARNING !! You're extracting to a folder that already contains save files.");
+                Console.WriteLine("You will overwrite any existing save data.");
+                Console.WriteLine("Press Y to continue conversion, press any other button to cancel.");
+                ConsoleKeyInfo cki = Console.ReadKey(true);
+                if (cki.KeyChar != 'Y' && cki.KeyChar != 'y')
+                    return;
+                Console.WriteLine("");
+            }
             Console.Write("Extracting console SAV file... ");
             try
             {
@@ -83,11 +121,15 @@ static void ConvertFromConsole(string consoleSAV, string pcPath)
                 {
                     try
                     {
-                        Console.Write($"Converting save file {filename} from console to PC... ");
-                        DeltaruneCh1 save = new();
-                        save.ReadFromConsoleFile(file);
-                        save.WriteToPCFile(file);
-                        Console.WriteLine("done!");
+                        if (DeltaruneCh1.IsConsoleSaveFile(file)) {
+                            Console.Write($"Converting save file {filename} from console to PC... ");
+                            DeltaruneCh1 save = new();
+                            save.ReadFromConsoleFile(file);
+                            save.WriteToPCFile(file);
+                            Console.WriteLine("done!");
+                        } else {
+                            Console.WriteLine($"{filename} is already PC format, skipping...!");
+                        }
                     } catch (Exception ex)
                     {
                         Console.WriteLine($"error: {ex.Message}");
@@ -98,11 +140,15 @@ static void ConvertFromConsole(string consoleSAV, string pcPath)
                 {
                     try
                     {
-                        Console.Write($"Converting save file {filename} from console to PC... ");
-                        DeltaruneCh2 save = new();
-                        save.ReadFromConsoleFile(file);
-                        save.WriteToPCFile(file);
-                        Console.WriteLine("done!");
+                        if (DeltaruneCh2.IsConsoleSaveFile(file)) {
+                            Console.Write($"Converting save file {filename} from console to PC... ");
+                            DeltaruneCh2 save = new();
+                            save.ReadFromConsoleFile(file);
+                            save.WriteToPCFile(file);
+                            Console.WriteLine("done!");
+                        } else {
+                            Console.WriteLine($"{filename} is already PC format, skipping...!");
+                        }
                     }
                     catch (Exception ex)
                     {
diff --git a/README.md b/README.md
@@ -1,26 +1,24 @@
 # DeltaruneSaveConverter
 
-A C#.NET command line tool to convert DELTARUNE Chapter 1 & 2 save files between PC and console editions of the game. This tool can also, in theory, be used to extract and pack UNDERTALE save files between consoles.
+A C#.NET command line tool to convert DELTARUNE save files between PC and console editions of the game.
 
-This program is a work in progress and may not work in all situations - this has only been tested converting 1 file from the Nintendo Switch version of DELTARUNE to the PC version and back.
-
-I am not responsible if you lose any progress if using this tool.
+This program is a work in progress and may not work in all situations - this has not been extensively tested. I am not responsible if you lose any progress if using this tool.
 
 ## Usage
 
 Requires [.NET 8.0 Runtime](https://dotnet.microsoft.com/en-us/download/dotnet/8.0/runtime) installed.
 
+Download and extract the latest release ZIP from [the releases page](https://github.com/InvoxiPlayGames/DeltaruneSaveConverter/releases).
+
+Open a command prompt to the window containing DeltaruneSaveConverter.exe.
+
 ```
 DeltaruneSaveConverter [command] [path1] [path2]
 
 Commands:
 ---------
 ConvertFromConsole: extracts a SAV file from path1 into path2 and converts the save files into PC format
 ConvertFromPC: converts save files from path1 into console format and packs them into a SAV at path2
-ExtractSAV: extracts a SAV file from path1 into path2 - supports UNDERTALE
-PackSAV: packs a SAV file with files from path1 into path2 - supports UNDERTALE
-ConvertFileFromConsole: converts the save file at path1 into PC format and saves it at path2
-ConvertFileFromPC: converts the save file at path1 into console format and saves it at path2
 
 Examples:
 ---------
@@ -29,20 +27,6 @@ DeltaruneSaveConverter ConvertFromConsole deltarune_ch1.sav ./pcsave/
 
 DeltaruneSaveConverter ConvertFromPC ./pcsave/ deltarune_ch1.sav
 - Converts the save files from ./pcsave/ into console format, packs it into deltarune_ch1.sav
-
-DeltaruneSaveConverter ExtractSAV deltarune_ch1.sav ./consolesave/
-- Extracts the save file from deltarune_ch1.sav and saves it into ./consolesave/
-- This should also work for extracting UNDERTALE save files. (No conversion required.)
-
-DeltaruneSaveConverter PackSAV ./consolesave/ deltarune_ch1.sav
-- Packs the save file contents from ./consolesave/ into deltarune_ch1.sav
-- This should also work for packing UNDERTALE save files. (No conversion required.)
-
-DeltaruneSaveConverter ConvertFileFromConsole ./consolesave/filech1_0 ./pcsave/filech1_0
-- Converts the console save file ./consolesave/filech1_0 into PC format and saves it into ./pcsave/filech1_0
-
-DeltaruneSaveConverter ConvertFileFromPC ./pcsave/filech1_0 ./consolesave/filech1_0 
-- Converts the PC save file ./pcsave/filech1_0 into console format and saves it into /consolesave/filech1_0
 ```
 
 **Notice:** When converting from Chapter1&2 DEMO, you will still be converting `deltarune_ch1.sav` to get your Chapter 2 saves. **The other .sav files must be ignored.**
@@ -55,10 +39,9 @@ Compiling the program requires the [.NET 8.0 SDK](https://dotnet.microsoft.com/d
 
 (in no particular order)
 
-- Chapter 3/4 support - Chapter 3 seems to be identical to Chapter 2.
+- Properly test Chapter 4
 - Test conversion between PS4/PS5 and PC.
 - Test making sure "weird route"/"SideB"(?) information is preserved.
-- macOS/Linux support, NativeAOT stuff?
 - Friendlier user interface (+ GUI/web edition?)
 
 ## License

Original file line number	Diff line number	Diff line change
`@@ -589,5 +589,17 @@ public void WriteToConsoleFile(string ConsoleFilePath)`
`589`	`589`	`filelines[line] = time.ToString();`
`590`	`590`	`File.WriteAllText(ConsoleFilePath, string.Join("\r\n", filelines));`
`591`	`591`	`}`
	`592`	`+`
	`593`	`+ public static bool IsPCSaveFile(string filename)`
	`594`	`+ {`
	`595`	`+ string[] lines = File.ReadAllLines(filename);`
	`596`	`+ return lines.Length == 10318;`
	`597`	`+ }`
	`598`	`+`
	`599`	`+ public static bool IsConsoleSaveFile(string filename)`
	`600`	`+ {`
	`601`	`+ string[] lines = File.ReadAllLines(filename);`
	`602`	`+ return lines.Length == 223;`
	`603`	`+ }`
`592`	`604`	`}`
`593`	`605`	`}`