From 350dbbcbbf8b0e375f7ab69d72abd0035b0acd38 Mon Sep 17 00:00:00 2001 From: yubie <24496817+yubie-re@users.noreply.github.com> Date: Fri, 4 Oct 2024 19:43:35 -0400 Subject: [PATCH] xbox series extension fix (#23) * feat(series): fix xbox series extension * fix duplicate --- GTA V Script Decompiler/MainForm.cs | 8 ++-- GTA V Script Decompiler/Options.cs | 2 +- GTA V Script Decompiler/Program.cs | 62 ++++++++++++++++++++++++----- 3 files changed, 56 insertions(+), 16 deletions(-) diff --git a/GTA V Script Decompiler/MainForm.cs b/GTA V Script Decompiler/MainForm.cs index 33f0443..c974057 100644 --- a/GTA V Script Decompiler/MainForm.cs +++ b/GTA V Script Decompiler/MainForm.cs @@ -113,7 +113,7 @@ private async void openToolStripMenuItem_Click(object sender, EventArgs e) { OpenFileDialog ofd = new() { - Filter = "GTA V Script Files|*.ysc;*.osc;*.dsc;*.psc;*.ssc;*.ysc.full;*.osc.full;*.dsc.full;*.psc.full;*.ssc.full" + Filter = "GTA V Script Files|*.ysc;*.osc;*.dsc;*.psc;*.zsc;*.ysc.full;*.osc.full;*.dsc.full;*.psc.full;*.zsc.full" }; if (ofd.ShowDialog() == DialogResult.OK) @@ -215,7 +215,7 @@ private async Task BatchDecompile(string dirPath) CompileList.Enqueue(file); } - foreach (var file in Directory.GetFiles(dirPath, "*.ssc")) + foreach (var file in Directory.GetFiles(dirPath, "*.zsc")) { CompileList.Enqueue(file); } @@ -240,7 +240,7 @@ private async Task BatchDecompile(string dirPath) CompileList.Enqueue(file); } - foreach (var file in Directory.GetFiles(dirPath, "*.ssc.full")) + foreach (var file in Directory.GetFiles(dirPath, "*.zsc.full")) { CompileList.Enqueue(file); } @@ -306,7 +306,7 @@ private async void fileToolStripMenuItem1_Click(object sender, EventArgs e) { OpenFileDialog ofd = new() { - Filter = "GTA V Script Files|*.ysc;*.osc;*.dsc;*.psc;*.ssc;*.ysc.full;*.osc.full;*.dsc.full;*.psc.full;*.ssc.full" + Filter = "GTA V Script Files|*.ysc;*.osc;*.dsc;*.psc;*.zsc;*.ysc.full;*.osc.full;*.dsc.full;*.psc.full;*.zsc.full" }; if (ofd.ShowDialog() == DialogResult.OK) diff --git a/GTA V Script Decompiler/Options.cs b/GTA V Script Decompiler/Options.cs index e754b6e..0722b87 100644 --- a/GTA V Script Decompiler/Options.cs +++ b/GTA V Script Decompiler/Options.cs @@ -13,7 +13,7 @@ class Options [Option('n', "native_tables", HelpText = "Don't extract native tables.")] public bool DontExtractNativeTables { get; set; } - [Option('v', "verbose", HelpText = "Show wich file is currently being decompiled.")] + [Option('v', "verbose", HelpText = "Show which file is currently being decompiled.")] public bool Verbose { get; set; } } } \ No newline at end of file diff --git a/GTA V Script Decompiler/Program.cs b/GTA V Script Decompiler/Program.cs index 7bb1181..711fb8f 100644 --- a/GTA V Script Decompiler/Program.cs +++ b/GTA V Script Decompiler/Program.cs @@ -120,17 +120,57 @@ static void BatchDecompile(string dirPath, bool extractNativeTables, bool verbos if (!Directory.Exists(saveDirectory)) Directory.CreateDirectory(saveDirectory); - foreach (var file in Directory.GetFiles(dirPath, "*.ysc")) - { - CompileList.Enqueue(file); - } - - foreach (var file in Directory.GetFiles(dirPath, "*.ysc.full")) - { - CompileList.Enqueue(file); - } - - while (CompileList.Count > 0) + foreach (var file in Directory.GetFiles(dirPath, "*.ysc")) + { + CompileList.Enqueue(file); + } + + foreach (var file in Directory.GetFiles(dirPath, "*.osc")) + { + CompileList.Enqueue(file); + } + + foreach (var file in Directory.GetFiles(dirPath, "*.dsc")) + { + CompileList.Enqueue(file); + } + + foreach (var file in Directory.GetFiles(dirPath, "*.psc")) + { + CompileList.Enqueue(file); + } + + foreach (var file in Directory.GetFiles(dirPath, "*.zsc")) + { + CompileList.Enqueue(file); + } + + foreach (var file in Directory.GetFiles(dirPath, "*.ysc.full")) + { + CompileList.Enqueue(file); + } + + foreach (var file in Directory.GetFiles(dirPath, "*.osc.full")) + { + CompileList.Enqueue(file); + } + + foreach (var file in Directory.GetFiles(dirPath, "*.dsc.full")) + { + CompileList.Enqueue(file); + } + + foreach (var file in Directory.GetFiles(dirPath, "*.psc.full")) + { + CompileList.Enqueue(file); + } + + foreach (var file in Directory.GetFiles(dirPath, "*.zsc.full")) + { + CompileList.Enqueue(file); + } + + while (CompileList.Count > 0) { ScriptFile fileopen; string scriptToDecode;