From b0a38c1d2dcfed73f6122296f0e9b978d94cc386 Mon Sep 17 00:00:00 2001 From: RadioActivitii Date: Sun, 1 Nov 2020 07:07:11 +0000 Subject: [PATCH] More fixes for the costume parser --- StoDemoLauncher/Parser/CostumeParser.cs | 10 ++++++++++ StoDemoLauncher/Patchnotes.txt | 6 +++++- StoDemoLauncher/Properties/AssemblyInfo.cs | 6 +++--- 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/StoDemoLauncher/Parser/CostumeParser.cs b/StoDemoLauncher/Parser/CostumeParser.cs index 2cff708..d5ce9e2 100644 --- a/StoDemoLauncher/Parser/CostumeParser.cs +++ b/StoDemoLauncher/Parser/CostumeParser.cs @@ -57,6 +57,11 @@ public override void NewLine(string line, int lineNumber) this.Costumetype = "Psubstitutecostume"; this.Costumename = line.Trim().Substring(15); } + if (inCostumev5Section && Costumetype.Equals("") && line.Trim().StartsWith("Pcdestructibleobjectcostume")) + { + this.Costumetype = "Pcdestructibleobjectcostume"; + this.Costumename = line.Trim().Substring(28); + } if (line.Trim().StartsWith("CostumeV5")) { @@ -84,6 +89,11 @@ public override void NewLine(string line, int lineNumber) this.Costumetype = "pSubstituteCostume"; this.Costumename = line.Trim().Substring(15); } + if (inCostumev5Section && Costumetype.Equals("") && line.Trim().StartsWith("pcDestructibleObjectCostume")) + { + this.Costumetype = "pcDestructibleObjectCostume"; + this.Costumename = line.Trim().Substring(28) + " (Ignore This)"; + } if (inCostumev5Section && line.Trim().StartsWith("}") && braceLevel - 1 == lastCostumev5BraceLevel) { diff --git a/StoDemoLauncher/Patchnotes.txt b/StoDemoLauncher/Patchnotes.txt index fd11ad2..c87984a 100644 --- a/StoDemoLauncher/Patchnotes.txt +++ b/StoDemoLauncher/Patchnotes.txt @@ -1,4 +1,8 @@ -2.11.0 +2.11.1 + +- More fixes for the costume parser + +2.11.0 - Fixed issue stopping old pre-House Shattered Demos from appearing - Added option to launch demos without the demorecord UI (hint: the gold button!) diff --git a/StoDemoLauncher/Properties/AssemblyInfo.cs b/StoDemoLauncher/Properties/AssemblyInfo.cs index 893e48c..9630452 100644 --- a/StoDemoLauncher/Properties/AssemblyInfo.cs +++ b/StoDemoLauncher/Properties/AssemblyInfo.cs @@ -9,7 +9,7 @@ [assembly: AssemblyTitle("Star Trek Online Demo Launcher")] [assembly: AssemblyDescription("Runs demo files recorded with Star Trek Online.")] [assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Thon's Eternal Nightmares")] +[assembly: AssemblyCompany("twitter.com/radioactivitii")] [assembly: AssemblyProduct("Star Trek Online Demo Launcher")] [assembly: AssemblyCopyright("Public Domain")] [assembly: AssemblyTrademark("This application is not affiliated, developed or endorsed by Cryptic Studios or Perfect World. All trademarks are the property of their respective owners.")] @@ -33,6 +33,6 @@ // Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern // übernehmen, indem Sie "*" eingeben: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.11.0.0")] -[assembly: AssemblyFileVersion("2.11.0.0")] +[assembly: AssemblyVersion("2.11.1.0")] +[assembly: AssemblyFileVersion("2.11.1.0")] [assembly: NeutralResourcesLanguageAttribute("en-US")]