From a71d615505e53da2a82994645d723781a1ebcc8b Mon Sep 17 00:00:00 2001 From: Pyrdacor Date: Thu, 16 Sep 2021 10:59:44 +0200 Subject: [PATCH] New tool versions with fixed lob packing --- .../AmbermoonDiskExtract/AmbermoonDiskExtract.csproj | 4 ++-- .../AmbermoonEventEditor/AmbermoonEventEditor.csproj | 4 ++-- .../AmbermoonMapEditor2D/AmbermoonMapEditor2D.csproj | 4 ++-- .../AmbermoonMonsterValueChanger.csproj | 4 ++-- AmbermoonTools/AmbermoonPack/AmbermoonPack.csproj | 4 ++-- AmbermoonTools/AmbermoonPack/Program.cs | 3 ++- AmbermoonTools/AmbermoonTextImport/AmbermoonTextImport.csproj | 4 ++-- AmbermoonTools/AmbermoonTextImport/Program.cs | 2 +- 8 files changed, 15 insertions(+), 14 deletions(-) diff --git a/AmbermoonTools/AmbermoonDiskExtract/AmbermoonDiskExtract.csproj b/AmbermoonTools/AmbermoonDiskExtract/AmbermoonDiskExtract.csproj index fe743c05a..1151729ee 100644 --- a/AmbermoonTools/AmbermoonDiskExtract/AmbermoonDiskExtract.csproj +++ b/AmbermoonTools/AmbermoonDiskExtract/AmbermoonDiskExtract.csproj @@ -9,13 +9,13 @@ https://github.com/Pyrdacor/Ambermoon Github Ambermoon ADF Extract File Legacy Amiga Disk - 1.0.8 + 1.0.9 win-x64;win-x86;linux-x64 Debug;Release;ReleaseLinux - + diff --git a/AmbermoonTools/AmbermoonEventEditor/AmbermoonEventEditor.csproj b/AmbermoonTools/AmbermoonEventEditor/AmbermoonEventEditor.csproj index 9460c32b3..34ac037bb 100644 --- a/AmbermoonTools/AmbermoonEventEditor/AmbermoonEventEditor.csproj +++ b/AmbermoonTools/AmbermoonEventEditor/AmbermoonEventEditor.csproj @@ -6,7 +6,7 @@ Robert Schneckenhaus Command line tool to edit map or NPC events. win-x64;win-x86;linux-x64 - 1.0.8 + 1.0.9 https://github.com/Pyrdacor/Ambermoon https://github.com/Pyrdacor/Ambermoon Github @@ -16,7 +16,7 @@ - + diff --git a/AmbermoonTools/AmbermoonMapEditor2D/AmbermoonMapEditor2D.csproj b/AmbermoonTools/AmbermoonMapEditor2D/AmbermoonMapEditor2D.csproj index f709ca915..541948eb5 100644 --- a/AmbermoonTools/AmbermoonMapEditor2D/AmbermoonMapEditor2D.csproj +++ b/AmbermoonTools/AmbermoonMapEditor2D/AmbermoonMapEditor2D.csproj @@ -5,7 +5,7 @@ netcoreapp3.1 true Debug;Release;ReleaseLinux - 1.0.8 + 1.0.9 Robert Schneckenhaus @@ -25,7 +25,7 @@ - + diff --git a/AmbermoonTools/AmbermoonMonsterValueChanger/AmbermoonMonsterValueChanger.csproj b/AmbermoonTools/AmbermoonMonsterValueChanger/AmbermoonMonsterValueChanger.csproj index 81d526987..94e3bc1d6 100644 --- a/AmbermoonTools/AmbermoonMonsterValueChanger/AmbermoonMonsterValueChanger.csproj +++ b/AmbermoonTools/AmbermoonMonsterValueChanger/AmbermoonMonsterValueChanger.csproj @@ -10,12 +10,12 @@ Robert Schneckenhaus Command line tool to show and edit monster values of legacy Ambermoon game data. win-x64;win-x86;linux-x64 - 1.0.8 + 1.0.9 Debug;Release;ReleaseLinux - + diff --git a/AmbermoonTools/AmbermoonPack/AmbermoonPack.csproj b/AmbermoonTools/AmbermoonPack/AmbermoonPack.csproj index 664291a1e..0a7aa3840 100644 --- a/AmbermoonTools/AmbermoonPack/AmbermoonPack.csproj +++ b/AmbermoonTools/AmbermoonPack/AmbermoonPack.csproj @@ -10,12 +10,12 @@ Github Ambermoon Packer File Legacy Amiga Compression Encryption win-x64;win-x86;linux-x64 - 1.0.8 + 1.0.9 Debug;Release;ReleaseLinux - + diff --git a/AmbermoonTools/AmbermoonPack/Program.cs b/AmbermoonTools/AmbermoonPack/Program.cs index 6f2813faa..50b9e9fdb 100644 --- a/AmbermoonTools/AmbermoonPack/Program.cs +++ b/AmbermoonTools/AmbermoonPack/Program.cs @@ -153,9 +153,10 @@ static void Main(string[] args) break; } } - catch + catch (Exception ex) { Console.WriteLine("Invalid source file for REPACK."); + Console.WriteLine("Error: " + ex.Message); Environment.Exit(ERROR_INVALID_SOURCE_FILE); return; } diff --git a/AmbermoonTools/AmbermoonTextImport/AmbermoonTextImport.csproj b/AmbermoonTools/AmbermoonTextImport/AmbermoonTextImport.csproj index b7403aea6..8e2a75555 100644 --- a/AmbermoonTools/AmbermoonTextImport/AmbermoonTextImport.csproj +++ b/AmbermoonTools/AmbermoonTextImport/AmbermoonTextImport.csproj @@ -10,12 +10,12 @@ Robert Schneckenhaus Command line tool to export and import texts from/into legacy Ambermoon game data. win-x64;win-x86;linux-x64 - 1.0.8 + 1.0.9 Debug;Release;ReleaseLinux - + diff --git a/AmbermoonTools/AmbermoonTextImport/Program.cs b/AmbermoonTools/AmbermoonTextImport/Program.cs index 0ecac05e3..b4dcde9a8 100644 --- a/AmbermoonTools/AmbermoonTextImport/Program.cs +++ b/AmbermoonTools/AmbermoonTextImport/Program.cs @@ -394,7 +394,7 @@ static void Import(string gameDataPath, string file, string inputPath, List { var dataWriter = new Ambermoon.Data.Legacy.Serialization.DataWriter(); - Ambermoon.Data.Legacy.Serialization.TextWriter.WriteTexts(dataWriter, f.Value, TrimCharsFromOptions(options)); + Ambermoon.Data.Legacy.Serialization.TextWriter.WriteTexts(dataWriter, f.Value, TrimCharsFromOptions(options), true); return new KeyValuePair((uint)f.Key, dataWriter.ToArray()); }).ToDictionary(x => x.Key, x => x.Value); }