Merge pull request #209 from StingMcRay/Preset_3_4_Palace_Fix

Fixed wrongly placed Palace Building in Anno 1800 tree menu (#208)
AnnoDesigner · Jun 27, 2020 · 44b1445 · 44b1445
2 parents 1c78a6f + c607256
commit 44b1445
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/PresetParser/Anno1800/NewOrnamentsGroup1800.cs b/PresetParser/Anno1800/NewOrnamentsGroup1800.cs
@@ -88,7 +88,7 @@ public static (string Faction, string Group, string Template) GetNewOrnamentsGro
             if (identifierName.IsPartOf(ChangeOrnamentToParkFountains_1800)) { factionName = "Ornaments"; groupName = "04 Park Fountains"; templateName = "OrnamentalBuilding_Park"; }
             if (identifierName.IsPartOf(ChangeOrnamentToParkStatues_1800)) { factionName = "Ornaments"; groupName = "05 Park Statues"; templateName = "OrnamentalBuilding_Park"; }
             if (identifierName.IsPartOf(ChangeOrnamentToParkDecorations_1800)) { factionName = "Ornaments"; groupName = "06 Park Decorations"; templateName = "OrnamentalBuilding_Park"; }
-            if (identifierName.IsPartOf(ChangeOrnamentToCityPaths_1800)) { factionName = "Ornaments"; groupName = "07 City Paths"; }
+            if (identifierName.IsPartOf(ChangeOrnamentToCityPaths_1800) && identifierName != "Palace") { factionName = "Ornaments"; groupName = "07 City Paths"; }
             if (identifierName.IsPartOf(ChangeOrnamentToCityFences_1800)) { factionName = "Ornaments"; groupName = "08 City Fences"; }
             if (identifierName.IsPartOf(ChangeOrnamentToCityStatues_1800)) { factionName = "Ornaments"; groupName = "09 City Statues"; }
             if (identifierName.IsPartOf(ChangeOrnamentToCityDecorations_1800)) { factionName = "Ornaments"; groupName = "10 City Decorations"; }

diff --git a/PresetParser/Program.cs b/PresetParser/Program.cs
@@ -31,7 +31,7 @@ public class Program
         public static bool isExcludedGUID = false; /*only for Anno 1800 */
 
         private static Dictionary<string, Dictionary<string, PathRef[]>> VersionSpecificPaths { get; set; }
-        private const string BUILDING_PRESETS_VERSION = "3.3";
+        private const string BUILDING_PRESETS_VERSION = "3.4";
         // Initalisizing Language Directory's and Filenames
         private static readonly string[] Languages = new[] { "eng", "ger", "fra", "pol", "rus" };
         private static readonly string[] LanguagesFiles2205 = new[] { "english", "german", "french", "polish", "russian" };

diff --git a/Presets/presets.json b/Presets/presets.json