Presets v5.1 Update (GU15) (#441)

- Presets v5.1 Update - Updated Presets for GU15 - Updated Translation Tree Menu's - Added GU15 Icons - Updated Color.json - Fixed #407 (Missing Influence Distance) - Program Only: - Fixed NewTreeMenu's (IsPartOf to IsMatch) - Fixed PPTN File (Included XPaths now) Thanks to: DuxVitea for checking Missing Buildings - Fixed Version Number of Colors.json - optimized images with zopflipng (from 2.715.704 bytes to 2.407.123) Co-authored-by: FroggieFrog <[email protected]>
AnnoDesigner · Sep 27, 2022 · 044a4ba · 044a4ba
1 parent d6ba549
commit 044a4ba
Show file tree

Hide file tree

Showing 121 changed files with 301 additions and 95 deletions.
diff --git a/AnnoDesigner/icons/A7_airport_arrivals_nw.png b/AnnoDesigner/icons/A7_airport_arrivals_nw.png
diff --git a/AnnoDesigner/icons/A7_airport_arrivals_ow.png b/AnnoDesigner/icons/A7_airport_arrivals_ow.png
diff --git a/AnnoDesigner/icons/A7_airport_cafe_nw.png b/AnnoDesigner/icons/A7_airport_cafe_nw.png
diff --git a/AnnoDesigner/icons/A7_airport_cafe_ow.png b/AnnoDesigner/icons/A7_airport_cafe_ow.png
diff --git a/AnnoDesigner/icons/A7_airport_cafetables_nw.png b/AnnoDesigner/icons/A7_airport_cafetables_nw.png
diff --git a/AnnoDesigner/icons/A7_airport_cafetables_ow.png b/AnnoDesigner/icons/A7_airport_cafetables_ow.png
diff --git a/AnnoDesigner/icons/A7_airport_clock_nw.png b/AnnoDesigner/icons/A7_airport_clock_nw.png
diff --git a/AnnoDesigner/icons/A7_airport_clock_ow.png b/AnnoDesigner/icons/A7_airport_clock_ow.png
diff --git a/AnnoDesigner/icons/A7_airport_departures_nw.png b/AnnoDesigner/icons/A7_airport_departures_nw.png
diff --git a/AnnoDesigner/icons/A7_airport_departures_ow.png b/AnnoDesigner/icons/A7_airport_departures_ow.png
diff --git a/AnnoDesigner/icons/A7_airport_flag_01_nw.png b/AnnoDesigner/icons/A7_airport_flag_01_nw.png
diff --git a/AnnoDesigner/icons/A7_airport_flag_01_ow.png b/AnnoDesigner/icons/A7_airport_flag_01_ow.png
diff --git a/AnnoDesigner/icons/A7_airport_flag_02_nw.png b/AnnoDesigner/icons/A7_airport_flag_02_nw.png
diff --git a/AnnoDesigner/icons/A7_airport_flag_02_ow.png b/AnnoDesigner/icons/A7_airport_flag_02_ow.png
diff --git a/AnnoDesigner/icons/A7_airport_flag_03_nw.png b/AnnoDesigner/icons/A7_airport_flag_03_nw.png
diff --git a/AnnoDesigner/icons/A7_airport_flag_03_ow.png b/AnnoDesigner/icons/A7_airport_flag_03_ow.png
diff --git a/AnnoDesigner/icons/A7_airport_flag_04_nw.png b/AnnoDesigner/icons/A7_airport_flag_04_nw.png
diff --git a/AnnoDesigner/icons/A7_airport_flag_04_ow.png b/AnnoDesigner/icons/A7_airport_flag_04_ow.png
diff --git a/AnnoDesigner/icons/A7_airport_flag_05_nw.png b/AnnoDesigner/icons/A7_airport_flag_05_nw.png
diff --git a/AnnoDesigner/icons/A7_airport_flag_05_ow.png b/AnnoDesigner/icons/A7_airport_flag_05_ow.png
diff --git a/AnnoDesigner/icons/A7_airport_flag_06_nw.png b/AnnoDesigner/icons/A7_airport_flag_06_nw.png
diff --git a/AnnoDesigner/icons/A7_airport_flag_06_ow.png b/AnnoDesigner/icons/A7_airport_flag_06_ow.png
diff --git a/AnnoDesigner/icons/A7_airport_seats_large_nw.png b/AnnoDesigner/icons/A7_airport_seats_large_nw.png
diff --git a/AnnoDesigner/icons/A7_airport_seats_large_ow.png b/AnnoDesigner/icons/A7_airport_seats_large_ow.png
diff --git a/AnnoDesigner/icons/A7_airport_seats_nw.png b/AnnoDesigner/icons/A7_airport_seats_nw.png
diff --git a/AnnoDesigner/icons/A7_airport_seats_ow.png b/AnnoDesigner/icons/A7_airport_seats_ow.png
diff --git a/AnnoDesigner/icons/A7_airport_sign_nw.png b/AnnoDesigner/icons/A7_airport_sign_nw.png
diff --git a/AnnoDesigner/icons/A7_airport_sign_ow.png b/AnnoDesigner/icons/A7_airport_sign_ow.png
diff --git a/AnnoDesigner/icons/A7_airship.png b/AnnoDesigner/icons/A7_airship.png
diff --git a/AnnoDesigner/icons/A7_airship_artic.png b/AnnoDesigner/icons/A7_airship_artic.png
diff --git a/AnnoDesigner/icons/A7_airship_cargo_large_a.png b/AnnoDesigner/icons/A7_airship_cargo_large_a.png
diff --git a/AnnoDesigner/icons/A7_airship_cargo_large_b.png b/AnnoDesigner/icons/A7_airship_cargo_large_b.png
diff --git a/AnnoDesigner/icons/A7_airship_cargo_medium_b.png b/AnnoDesigner/icons/A7_airship_cargo_medium_b.png
diff --git a/AnnoDesigner/icons/A7_airship_cargo_small.png b/AnnoDesigner/icons/A7_airship_cargo_small.png
diff --git a/AnnoDesigner/icons/A7_airship_cargo_small_b.png b/AnnoDesigner/icons/A7_airship_cargo_small_b.png
diff --git a/AnnoDesigner/icons/A7_airship_gg_queen.png b/AnnoDesigner/icons/A7_airship_gg_queen.png
diff --git a/AnnoDesigner/icons/A7_airship_hangar_southamerica.png b/AnnoDesigner/icons/A7_airship_hangar_southamerica.png
diff --git a/AnnoDesigner/icons/A7_airship_hunter.png b/AnnoDesigner/icons/A7_airship_hunter.png
diff --git a/AnnoDesigner/icons/A7_airship_hunter_light.png b/AnnoDesigner/icons/A7_airship_hunter_light.png
diff --git a/AnnoDesigner/icons/A7_airship_paloma_quest_reward.png b/AnnoDesigner/icons/A7_airship_paloma_quest_reward.png
diff --git a/AnnoDesigner/icons/A7_airship_paloma_quest_reward_2.png b/AnnoDesigner/icons/A7_airship_paloma_quest_reward_2.png
diff --git a/AnnoDesigner/icons/A7_airship_paloma_quest_reward_3.png b/AnnoDesigner/icons/A7_airship_paloma_quest_reward_3.png
diff --git a/AnnoDesigner/icons/A7_airship_platform_items.png b/AnnoDesigner/icons/A7_airship_platform_items.png
diff --git a/AnnoDesigner/icons/A7_airship_platform_passengers.png b/AnnoDesigner/icons/A7_airship_platform_passengers.png
diff --git a/AnnoDesigner/icons/A7_airship_platform_post.png b/AnnoDesigner/icons/A7_airship_platform_post.png
diff --git a/AnnoDesigner/icons/A7_airship_platform_southamerica.png b/AnnoDesigner/icons/A7_airship_platform_southamerica.png
diff --git a/AnnoDesigner/icons/A7_airship_platform_workforce.png b/AnnoDesigner/icons/A7_airship_platform_workforce.png
diff --git a/AnnoDesigner/icons/A7_airship_skin_01.png b/AnnoDesigner/icons/A7_airship_skin_01.png
diff --git a/AnnoDesigner/icons/A7_airship_skin_02.png b/AnnoDesigner/icons/A7_airship_skin_02.png
diff --git a/AnnoDesigner/icons/A7_airship_skin_03.png b/AnnoDesigner/icons/A7_airship_skin_03.png
diff --git a/AnnoDesigner/icons/A7_airship_skin_variation.png b/AnnoDesigner/icons/A7_airship_skin_variation.png
diff --git a/AnnoDesigner/icons/A7_airship_variation.png b/AnnoDesigner/icons/A7_airship_variation.png
diff --git a/AnnoDesigner/icons/A7_aluminium.png b/AnnoDesigner/icons/A7_aluminium.png
diff --git a/AnnoDesigner/icons/A7_bauxit.png b/AnnoDesigner/icons/A7_bauxit.png
diff --git a/AnnoDesigner/icons/A7_dropgood_bomb_a.png b/AnnoDesigner/icons/A7_dropgood_bomb_a.png
diff --git a/AnnoDesigner/icons/A7_dropgood_bomb_a_ori.png b/AnnoDesigner/icons/A7_dropgood_bomb_a_ori.png
diff --git a/AnnoDesigner/icons/A7_dropgood_bomb_b.png b/AnnoDesigner/icons/A7_dropgood_bomb_b.png
diff --git a/AnnoDesigner/icons/A7_dropgood_bomb_b_ori.png b/AnnoDesigner/icons/A7_dropgood_bomb_b_ori.png
diff --git a/AnnoDesigner/icons/A7_dropgood_bomb_c.png b/AnnoDesigner/icons/A7_dropgood_bomb_c.png
diff --git a/AnnoDesigner/icons/A7_dropgood_bomb_c_ori.png b/AnnoDesigner/icons/A7_dropgood_bomb_c_ori.png
diff --git a/AnnoDesigner/icons/A7_dropgood_care_packages.png b/AnnoDesigner/icons/A7_dropgood_care_packages.png
diff --git a/AnnoDesigner/icons/A7_dropgood_care_packages_ori.png b/AnnoDesigner/icons/A7_dropgood_care_packages_ori.png
diff --git a/AnnoDesigner/icons/A7_dropgood_pamphlets.png b/AnnoDesigner/icons/A7_dropgood_pamphlets.png
diff --git a/AnnoDesigner/icons/A7_dropgood_pamphlets_ori.png b/AnnoDesigner/icons/A7_dropgood_pamphlets_ori.png
diff --git a/AnnoDesigner/icons/A7_dropgood_seamines.png b/AnnoDesigner/icons/A7_dropgood_seamines.png
diff --git a/AnnoDesigner/icons/A7_dropgood_seamines_ori.png b/AnnoDesigner/icons/A7_dropgood_seamines_ori.png
diff --git a/AnnoDesigner/icons/A7_dropgood_water.png b/AnnoDesigner/icons/A7_dropgood_water.png
diff --git a/AnnoDesigner/icons/A7_dropgood_water_ori.png b/AnnoDesigner/icons/A7_dropgood_water_ori.png
diff --git a/AnnoDesigner/icons/A7_expedition_paloma.png b/AnnoDesigner/icons/A7_expedition_paloma.png
diff --git a/AnnoDesigner/icons/A7_flack_tower.png b/AnnoDesigner/icons/A7_flack_tower.png
diff --git a/AnnoDesigner/icons/A7_flak_tower.png b/AnnoDesigner/icons/A7_flak_tower.png
diff --git a/AnnoDesigner/icons/A7_flame_tower.png b/AnnoDesigner/icons/A7_flame_tower.png
diff --git a/AnnoDesigner/icons/A7_he_guntower.png b/AnnoDesigner/icons/A7_he_guntower.png
diff --git a/AnnoDesigner/icons/A7_helium.png b/AnnoDesigner/icons/A7_helium.png
diff --git a/AnnoDesigner/icons/A7_industrial_lubricant_a.png b/AnnoDesigner/icons/A7_industrial_lubricant_a.png
diff --git a/AnnoDesigner/icons/A7_letter_delivered.png b/AnnoDesigner/icons/A7_letter_delivered.png
diff --git a/AnnoDesigner/icons/A7_letter_lost.png b/AnnoDesigner/icons/A7_letter_lost.png
diff --git a/AnnoDesigner/icons/A7_letter_normal.png b/AnnoDesigner/icons/A7_letter_normal.png
diff --git a/AnnoDesigner/icons/A7_letter_oversea.png b/AnnoDesigner/icons/A7_letter_oversea.png
diff --git a/AnnoDesigner/icons/A7_lost_sister.png b/AnnoDesigner/icons/A7_lost_sister.png
diff --git a/AnnoDesigner/icons/A7_oldnate_base.png b/AnnoDesigner/icons/A7_oldnate_base.png
diff --git a/AnnoDesigner/icons/A7_oldnate_crane.png b/AnnoDesigner/icons/A7_oldnate_crane.png
diff --git a/AnnoDesigner/icons/A7_oldnate_crane2.png b/AnnoDesigner/icons/A7_oldnate_crane2.png
diff --git a/AnnoDesigner/icons/A7_oldnate_dumppile_big.png b/AnnoDesigner/icons/A7_oldnate_dumppile_big.png
diff --git a/AnnoDesigner/icons/A7_oldnate_dumppile_small.png b/AnnoDesigner/icons/A7_oldnate_dumppile_small.png
diff --git a/AnnoDesigner/icons/A7_oldnate_fence_1.png b/AnnoDesigner/icons/A7_oldnate_fence_1.png
diff --git a/AnnoDesigner/icons/A7_oldnate_fence_2.png b/AnnoDesigner/icons/A7_oldnate_fence_2.png
diff --git a/AnnoDesigner/icons/A7_oldnate_gas_platform.png b/AnnoDesigner/icons/A7_oldnate_gas_platform.png
diff --git a/AnnoDesigner/icons/A7_oldnate_helium_platform.png b/AnnoDesigner/icons/A7_oldnate_helium_platform.png
diff --git a/AnnoDesigner/icons/A7_oldnate_oil.png b/AnnoDesigner/icons/A7_oldnate_oil.png
diff --git a/AnnoDesigner/icons/A7_oldnate_platform.png b/AnnoDesigner/icons/A7_oldnate_platform.png
diff --git a/AnnoDesigner/icons/A7_oldnate_platform_big.png b/AnnoDesigner/icons/A7_oldnate_platform_big.png
diff --git a/AnnoDesigner/icons/A7_oldnate_wall_1.png b/AnnoDesigner/icons/A7_oldnate_wall_1.png
diff --git a/AnnoDesigner/icons/A7_oldnate_wall_2.png b/AnnoDesigner/icons/A7_oldnate_wall_2.png
diff --git a/AnnoDesigner/icons/A7_passengers_delivered.png b/AnnoDesigner/icons/A7_passengers_delivered.png
diff --git a/AnnoDesigner/icons/A7_passengers_undelivered.png b/AnnoDesigner/icons/A7_passengers_undelivered.png
diff --git a/AnnoDesigner/icons/A7_pile_of_letters.png b/AnnoDesigner/icons/A7_pile_of_letters.png
diff --git a/AnnoDesigner/icons/A7_post_office_dlc11.png b/AnnoDesigner/icons/A7_post_office_dlc11.png
diff --git a/AnnoDesigner/icons/A7_postbox_a.png b/AnnoDesigner/icons/A7_postbox_a.png
diff --git a/AnnoDesigner/icons/A7_postbox_b.png b/AnnoDesigner/icons/A7_postbox_b.png
diff --git a/AnnoDesigner/icons/A7_rocket_barrage_epic.png b/AnnoDesigner/icons/A7_rocket_barrage_epic.png
diff --git a/AnnoDesigner/icons/A7_rocket_barrage_normal.png b/AnnoDesigner/icons/A7_rocket_barrage_normal.png
diff --git a/AnnoDesigner/icons/A7_ship_fire_monitor_blue.png b/AnnoDesigner/icons/A7_ship_fire_monitor_blue.png
diff --git a/AnnoDesigner/icons/A7_ship_fire_monitor_red.png b/AnnoDesigner/icons/A7_ship_fire_monitor_red.png
diff --git a/AnnoDesigner/icons/A7_ship_flak_monitor.png b/AnnoDesigner/icons/A7_ship_flak_monitor.png
diff --git a/AnnoDesigner/icons/A7_ship_liner_gg_queen.png b/AnnoDesigner/icons/A7_ship_liner_gg_queen.png
diff --git a/AnnoDesigner/icons/A7_ship_liner_vasco_bronze.png b/AnnoDesigner/icons/A7_ship_liner_vasco_bronze.png
diff --git a/AnnoDesigner/icons/A7_ship_liner_vasco_silver.png b/AnnoDesigner/icons/A7_ship_liner_vasco_silver.png
diff --git a/AnnoDesigner/icons/A7_ship_repair_2.png b/AnnoDesigner/icons/A7_ship_repair_2.png
diff --git a/AnnoDesigner/icons/A7_spotlight.png b/AnnoDesigner/icons/A7_spotlight.png
diff --git a/AnnoDesigner/icons/A7_stamp_narrative.png b/AnnoDesigner/icons/A7_stamp_narrative.png
diff --git a/AnnoDesigner/icons/A7_ticket_booth.png b/AnnoDesigner/icons/A7_ticket_booth.png
diff --git a/AnnoDesigner/icons/A7_valuable_sketches_b.png b/AnnoDesigner/icons/A7_valuable_sketches_b.png
diff --git a/AnnoDesigner/icons/A7_valuable_sketches_c.png b/AnnoDesigner/icons/A7_valuable_sketches_c.png
diff --git a/AnnoDesigner/icons/A7_vegetable_oil.png b/AnnoDesigner/icons/A7_vegetable_oil.png
diff --git a/PresetParser/Anno1800/NewFactionAndGroup1800.cs b/PresetParser/Anno1800/NewFactionAndGroup1800.cs
@@ -4,6 +4,7 @@
 using System.Text;
 using System.Threading.Tasks;
 using AnnoDesigner.Core.Extensions;
+using PresetParser.Extensions;
 
 namespace PresetParser.Anno1800
 {
@@ -34,7 +35,7 @@ public static class NewFactionAndGroup1800
         private static readonly List<string> ChangeBuildingsToNW1_Public_1800 = new List<string> { "Institution_colony01_02 (Fire Department)", "Institution_colony01_01 (Police)", "Service_colony01_01 (Marketplace)", "Service_colony01_02 (Chapel)" };
         private static readonly List<string> ChangeBuildingsToNW2_Public_1800 = new List<string> { "Institution_colony01_03 (Hospital)", "Service_colony01_03 (Boxing Arena)" };
         private static readonly List<string> ChangeBuildingsToAT1_Public_1800 = new List<string> { "Service_arctic_01 (Canteen)", "Institution_arctic_01 (Ranger Station)" };
-        private static readonly List<string> ChangeBuildingsToAT2_Public_1800 = new List<string> { "Service_arctic_02 (Post Office)" };
+        private static readonly List<string> ChangeBuildingsToAT2_Public_1800 = new List<string> { "Service_arctic_02 (Post Office)"};
         private static readonly List<string> ChangeBuildingsToAF1_Public_1800 = new List<string> { "Service_colony02_01 (Bazaar)", "Service_colony02_02 (Music Plaza)", "Institution_colony02_01 (Fire Station)" };
         private static readonly List<string> ChangeBuildingsToAF2_Public_1800 = new List<string> { "Institution_colony02_02 (Police)", "Institution_colony02_03 (Hospital)", "Service_colony02_03 (Monastery)" };
 
@@ -91,57 +92,57 @@ public static (string Faction, string Group, string Template) GetNewFactionAndGr
             }
 
             //public buildings
-            //if (identifierName.IsPartOf(ChangeBuildingsToAW_Public_1800)) { factionName = "All Worlds"; groupName = "Public Buildings"; }
-            if (identifierName.IsPartOf(ChangeBuildingsToOW1_Public_1800)) { factionName = "(01) Farmers"; groupName = "Public Buildings"; }
-            if (identifierName.IsPartOf(ChangeBuildingsToOW2_Public_1800)) { factionName = "(02) Workers"; groupName = "Public Buildings"; }
-            if (identifierName.IsPartOf(ChangeBuildingsToOW3_Public_1800)) { factionName = "(03) Artisans"; groupName = "Public Buildings"; }
-            if (identifierName.IsPartOf(ChangeBuildingsToOW4_Public_1800)) { factionName = "(04) Engineers"; groupName = "Public Buildings"; }
-            if (identifierName.IsPartOf(ChangeBuildingsToOW5_Public_1800)) { factionName = "(05) Investors"; groupName = "Public Buildings"; }
-            if (identifierName.IsPartOf(ChangeBuildingsToOW6_Public_1800)) { factionName = "(13) Scholars"; groupName = "Public Buildings"; }
-            if (identifierName.IsPartOf(ChangeBuildingsToNW1_Public_1800)) { factionName = "(07) Jornaleros"; groupName = "Public Buildings"; }
-            if (identifierName.IsPartOf(ChangeBuildingsToNW2_Public_1800)) { factionName = "(08) Obreros"; groupName = "Public Buildings"; }
-            if (identifierName.IsPartOf(ChangeBuildingsToAT1_Public_1800)) { factionName = "(10) Explorers"; groupName = "Public Buildings"; }
-            if (identifierName.IsPartOf(ChangeBuildingsToAT2_Public_1800)) { factionName = "(11) Technicians"; groupName = "Public Buildings"; }
-            if (identifierName.IsPartOf(ChangeBuildingsToAF1_Public_1800)) { factionName = "(14) Shepherds"; groupName = "Public Buildings"; }
-            if (identifierName.IsPartOf(ChangeBuildingsToAF2_Public_1800)) { factionName = "(15) Elders"; groupName = "Public Buildings"; }
+            //if (identifierName.IsMatch(ChangeBuildingsToAW_Public_1800)) { factionName = "All Worlds"; groupName = "Public Buildings"; }
+            if (identifierName.IsMatch(ChangeBuildingsToOW1_Public_1800)) { factionName = "(01) Farmers"; groupName = "Public Buildings"; }
+            if (identifierName.IsMatch(ChangeBuildingsToOW2_Public_1800)) { factionName = "(02) Workers"; groupName = "Public Buildings"; }
+            if (identifierName.IsMatch(ChangeBuildingsToOW3_Public_1800)) { factionName = "(03) Artisans"; groupName = "Public Buildings"; }
+            if (identifierName.IsMatch(ChangeBuildingsToOW4_Public_1800)) { factionName = "(04) Engineers"; groupName = "Public Buildings"; }
+            if (identifierName.IsMatch(ChangeBuildingsToOW5_Public_1800)) { factionName = "(05) Investors"; groupName = "Public Buildings"; }
+            if (identifierName.IsMatch(ChangeBuildingsToOW6_Public_1800)) { factionName = "(13) Scholars"; groupName = "Public Buildings"; }
+            if (identifierName.IsMatch(ChangeBuildingsToNW1_Public_1800)) { factionName = "(07) Jornaleros"; groupName = "Public Buildings"; }
+            if (identifierName.IsMatch(ChangeBuildingsToNW2_Public_1800)) { factionName = "(08) Obreros"; groupName = "Public Buildings"; }
+            if (identifierName.IsMatch(ChangeBuildingsToAT1_Public_1800)) { factionName = "(10) Explorers"; groupName = "Public Buildings"; }
+            if (identifierName.IsMatch(ChangeBuildingsToAT2_Public_1800)) { factionName = "(11) Technicians"; groupName = "Public Buildings"; }
+            if (identifierName.IsMatch(ChangeBuildingsToAF1_Public_1800)) { factionName = "(14) Shepherds"; groupName = "Public Buildings"; }
+            if (identifierName.IsMatch(ChangeBuildingsToAF2_Public_1800)) { factionName = "(15) Elders"; groupName = "Public Buildings"; }
 
             //Production buildings
-            //if (identifierName.IsPartOf(ChangeBuildingsToAW_Productions_1800)) { factionName = "All Worlds"; groupName = "Public Buildings"; }
-            if (identifierName.IsPartOf(ChangeBuildingsToOW1_Productions_1800)) { factionName = "(01) Farmers"; groupName = "Production Buildings"; }
-            if (identifierName.IsPartOf(ChangeBuildingsToOW2_Productions_1800)) { factionName = "(02) Workers"; groupName = "Production Buildings"; }
-            if (identifierName.IsPartOf(ChangeBuildingsToOW3_Productions_1800)) { factionName = "(03) Artisans"; groupName = "Production Buildings"; }
-            if (identifierName.IsPartOf(ChangeBuildingsToOW4_Productions_1800)) { factionName = "(04) Engineers"; groupName = "Production Buildings"; }
-            if (identifierName.IsPartOf(ChangeBuildingsToOW5_Productions_1800)) { factionName = "(05) Investors"; groupName = "Production Buildings"; }
-            if (identifierName.IsPartOf(ChangeBuildingsToOW6_Productions_1800)) { factionName = "(13) Scholars"; groupName = "Production Buildings"; } 
-            if (identifierName.IsPartOf(ChangeBuildingsToNW1_Productions_1800)) { factionName = "(07) Jornaleros"; groupName = "Production Buildings"; }
-            if (identifierName.IsPartOf(ChangeBuildingsToNW2_Productions_1800)) { factionName = "(08) Obreros"; groupName = "Production Buildings"; }
-            if (identifierName.IsPartOf(ChangeBuildingsToAT1_Productions_1800)) { factionName = "(10) Explorers"; groupName = "Production Buildings"; templateName = "FactoryBuilding7"; }
-            if (identifierName.IsPartOf(ChangeBuildingsToAT2_Productions_1800)) { factionName = "(11) Technicians"; groupName = "Production Buildings"; templateName = "FactoryBuilding7"; }
-            if (identifierName.IsPartOf(ChangeBuildingsToAF1_Productions_1800)) { factionName = "(14) Shepherds"; groupName = "Production Buildings"; }
-            if (identifierName.IsPartOf(ChangeBuildingsToAF2_Productions_1800)) { factionName = "(15) Elders"; groupName = "Production Buildings"; }
-            if (identifierName.IsPartOf(ChangeBuildingsToTou_Productions_1800)) { factionName = "(17) Tourists"; groupName = "Production Buildings"; }
+            //if (identifierName.IsMatch(ChangeBuildingsToAW_Productions_1800)) { factionName = "All Worlds"; groupName = "Public Buildings"; }
+            if (identifierName.IsMatch(ChangeBuildingsToOW1_Productions_1800)) { factionName = "(01) Farmers"; groupName = "Production Buildings"; }
+            if (identifierName.IsMatch(ChangeBuildingsToOW2_Productions_1800)) { factionName = "(02) Workers"; groupName = "Production Buildings"; }
+            if (identifierName.IsMatch(ChangeBuildingsToOW3_Productions_1800)) { factionName = "(03) Artisans"; groupName = "Production Buildings"; }
+            if (identifierName.IsMatch(ChangeBuildingsToOW4_Productions_1800)) { factionName = "(04) Engineers"; groupName = "Production Buildings"; }
+            if (identifierName.IsMatch(ChangeBuildingsToOW5_Productions_1800)) { factionName = "(05) Investors"; groupName = "Production Buildings"; }
+            if (identifierName.IsMatch(ChangeBuildingsToOW6_Productions_1800)) { factionName = "(13) Scholars"; groupName = "Production Buildings"; } 
+            if (identifierName.IsMatch(ChangeBuildingsToNW1_Productions_1800)) { factionName = "(07) Jornaleros"; groupName = "Production Buildings"; }
+            if (identifierName.IsMatch(ChangeBuildingsToNW2_Productions_1800)) { factionName = "(08) Obreros"; groupName = "Production Buildings"; }
+            if (identifierName.IsMatch(ChangeBuildingsToAT1_Productions_1800)) { factionName = "(10) Explorers"; groupName = "Production Buildings"; templateName = "FactoryBuilding7"; }
+            if (identifierName.IsMatch(ChangeBuildingsToAT2_Productions_1800)) { factionName = "(11) Technicians"; groupName = "Production Buildings"; templateName = "FactoryBuilding7"; }
+            if (identifierName.IsMatch(ChangeBuildingsToAF1_Productions_1800)) { factionName = "(14) Shepherds"; groupName = "Production Buildings"; }
+            if (identifierName.IsMatch(ChangeBuildingsToAF2_Productions_1800)) { factionName = "(15) Elders"; groupName = "Production Buildings"; }
+            if (identifierName.IsMatch(ChangeBuildingsToTou_Productions_1800)) { factionName = "(17) Tourists"; groupName = "Production Buildings"; }
 
             //Farm buildings
-            //if (identifierName.IsPartOf(ChangeBuildingsToAW_FarmBuilding_1800)) { factionName = "All Worlds"; groupName = "Farm Buildings"; }
-            if (identifierName.IsPartOf(ChangeBuildingsToOW1_FarmBuilding_1800)) { factionName = "(01) Farmers"; groupName = "Farm Buildings"; }
-            if (identifierName.IsPartOf(ChangeBuildingsToOW2_FarmBuilding_1800)) { factionName = "(02) Workers"; groupName = "Farm Buildings"; }
-            if (identifierName.IsPartOf(ChangeBuildingsToOW3_FarmBuilding_1800)) { factionName = "(03) Artisans"; groupName = "Farm Buildings"; }
-            if (identifierName.IsPartOf(ChangeBuildingsToOW5_FarmBuilding_1800)) { factionName = "(05) Investors"; groupName = "Farm Buildings"; }
-            if (identifierName.IsPartOf(ChangeBuildingsToNW1_FarmBuilding_1800)) { factionName = "(07) Jornaleros"; groupName = "Farm Buildings"; }
-            if (identifierName.IsPartOf(ChangeBuildingsToNW2_FarmBuilding_1800)) { factionName = "(08) Obreros"; groupName = "Farm Buildings"; }
-            if (identifierName.IsPartOf(ChangeBuildingsToAT1_FarmBuilding_1800)) { factionName = "(10) Explorers"; groupName = "Farm Buildings"; }
-            if (identifierName.IsPartOf(ChangeBuildingsToAT2_FarmBuilding_1800)) { factionName = "(11) Technicians"; groupName = "Farm Buildings"; }
-            if (identifierName.IsPartOf(ChangeBuildingsToAF1_FarmBuilding_1800)) { factionName = "(14) Shepherds"; groupName = "Farm Buildings"; }
-            if (identifierName.IsPartOf(ChangeBuildingsToAF2_FarmBuilding_1800)) { factionName = "(15) Elders"; groupName = "Farm Buildings"; }
+            //if (identifierName.IsMatch(ChangeBuildingsToAW_FarmBuilding_1800)) { factionName = "All Worlds"; groupName = "Farm Buildings"; }
+            if (identifierName.IsMatch(ChangeBuildingsToOW1_FarmBuilding_1800)) { factionName = "(01) Farmers"; groupName = "Farm Buildings"; }
+            if (identifierName.IsMatch(ChangeBuildingsToOW2_FarmBuilding_1800)) { factionName = "(02) Workers"; groupName = "Farm Buildings"; }
+            if (identifierName.IsMatch(ChangeBuildingsToOW3_FarmBuilding_1800)) { factionName = "(03) Artisans"; groupName = "Farm Buildings"; }
+            if (identifierName.IsMatch(ChangeBuildingsToOW5_FarmBuilding_1800)) { factionName = "(05) Investors"; groupName = "Farm Buildings"; }
+            if (identifierName.IsMatch(ChangeBuildingsToNW1_FarmBuilding_1800)) { factionName = "(07) Jornaleros"; groupName = "Farm Buildings"; }
+            if (identifierName.IsMatch(ChangeBuildingsToNW2_FarmBuilding_1800)) { factionName = "(08) Obreros"; groupName = "Farm Buildings"; }
+            if (identifierName.IsMatch(ChangeBuildingsToAT1_FarmBuilding_1800)) { factionName = "(10) Explorers"; groupName = "Farm Buildings"; }
+            if (identifierName.IsMatch(ChangeBuildingsToAT2_FarmBuilding_1800)) { factionName = "(11) Technicians"; groupName = "Farm Buildings"; }
+            if (identifierName.IsMatch(ChangeBuildingsToAF1_FarmBuilding_1800)) { factionName = "(14) Shepherds"; groupName = "Farm Buildings"; }
+            if (identifierName.IsMatch(ChangeBuildingsToAF2_FarmBuilding_1800)) { factionName = "(15) Elders"; groupName = "Farm Buildings"; }
 
             //River Buildings (Only Africa DLC 06)
-            //if (identifierName.IsPartOf(ChangeBuildingsToAF1_RiverBuilding_1800)) { factionName = "(14) Shepherds"; groupName = "River Buildings"; }
-            if (identifierName.IsPartOf(ChangeBuildingsToAF2_RiverBuilding_1800)) { factionName = "(15) Elders"; groupName = "River Buildings"; }
+            //if (identifierName.IsMatch(ChangeBuildingsToAF1_RiverBuilding_1800)) { factionName = "(14) Shepherds"; groupName = "River Buildings"; }
+            if (identifierName.IsMatch(ChangeBuildingsToAF2_RiverBuilding_1800)) { factionName = "(15) Elders"; groupName = "River Buildings"; }
 
             //Special Buildings
-            if (identifierName.IsPartOf(ChangeBuildingsToAW_SpecialBuilding_1800)) { factionName = "All Worlds"; groupName = "Special Buildings"; }
+            if (identifierName.IsMatch(ChangeBuildingsToAW_SpecialBuilding_1800)) { factionName = "All Worlds"; groupName = "Special Buildings"; }
             //Ornamentals 
-            //if (identifierName.IsPartOf(ChangeBuildingsToAW_Ornamentals_1800)) { factionName = "All Worlds"; }
+            //if (identifierName.IsMatch(ChangeBuildingsToAW_Ornamentals_1800)) { factionName = "All Worlds"; }
 
             return (factionName, groupName, templateName);
         }