Update Presets to v5.0 (#432)

* Update Presets to v5.0 * Add GU13 to GU14.3 Buildings (Anno 1800). * Renewed all and Added icons for Anno 1800. * Removed, Renewed and Added Icons for Anno 2205 * Added missing icons for Anno 1404 and Anno 2070 * Fixed Issue #389 (Missing Warehouses) * Fixed issue #390 (wrongly icon salt works africa (Anno 1800). * Fixed issue #390 (Blocked Area for Lobster Fishery) * Fixed "Palace Wing - Gate" wrong measurements (Anno 1800). * Added Missing Buildings for Anno 1404 and 2070 * Fixed Missing Translations (DLC's) for Anno 1404 and 2070 * Fixed translation Residence Building Names (Anno 2205) * Updated / Redone color.json to version 1.0.3.0 * Updated treeLocalization.json (1.0.0.7) Program Only: * Removed Excluded Templates to be showed in the Preset Tree (AD need to be update before users notice this) * Made GUID into Presets file only (not used by Users, Canvas or Preset Tree). * Made GUID replace CSV File for DuxVitae's Tool. * Added extra Icons for Duxvitae Tool. * Solved Performance issues (Translation on Anno 2205 and Anno 1800). * Made a text file for Missing IconFIleNames, to easier check the missing or not given ones. * made some coloring output lines, to distinguish the difference between normal text, errors and no error (only for Anno 1800 outputs). * Fixed assets Translations Override Tag (GUID) for missing Translations (Anno 1800). Known Issues: Some icons of Anno 2205 are missing (#408) Scenario 2 Buildings can be missing, still working on a solution. Its a twisted linked Assets file All Fields for Region's Mining Slot Buildings are missing (Anno 2205, No Buildblocker information in files, would not be fixed) * Small Color.json update Request for whitesmoke colored Plaza Pavings * fix some failing tests * optimized images with zopflipng * adjusted tests * adjust documentaion comment * moved extension methods * added some tests Co-authored-by: FroggieFrog <[email protected]>
AnnoDesigner · Jul 18, 2022 · ccc750f · ccc750f
1 parent a520712
commit ccc750f
Show file tree

Hide file tree

Showing 764 changed files with 1,728 additions and 495 deletions.
diff --git a/AnnoDesigner.Core/Extensions/StringExtensions.cs b/AnnoDesigner.Core/Extensions/StringExtensions.cs
@@ -1,22 +1,15 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace AnnoDesigner.Core.Extensions
 {
     public static class StringExtensions
     {
-        //private static readonly Logger logger = LogManager.GetCurrentClassLogger();
-
         public static bool Contains(this string s, string token, StringComparison stringComparison)
         {
 
             if (string.IsNullOrWhiteSpace(s) || string.IsNullOrWhiteSpace(token))
             {
-                //logger.Trace($"{nameof(s)}: {s} | {nameof(token)}: {token}");
-
                 return false;//or throw error?
             }
 

diff --git a/AnnoDesigner.Core/Presets/Models/BuildingInfo.cs b/AnnoDesigner.Core/Presets/Models/BuildingInfo.cs
@@ -41,7 +41,7 @@ public class BuildingInfo : IBuildingInfo
         public string Identifier { get; set; }
 
         /// <summary>
-        /// The name of the iconof this building.
+        /// The name of the icon of this building.
         /// </summary>
         [DataMember(Order = 4)]
         public string IconFileName { get; set; }
@@ -100,15 +100,23 @@ public class BuildingInfo : IBuildingInfo
         [DataMember(Order = 13)]
         public GridDirection Direction { get; set; } = GridDirection.Down;
 
+        /// <summary>
+        /// Game Unit ID number (GUID)
+        /// </summary>
+        /// <remarks>
+        /// It is needed for the tool "Anno1800SavegameVisualizer": game saves -> layout files (by DuxVitae)<br/>
+        /// It is only needed for creating the presets, not in the layout files itself.
+        /// </remarks>
+        [DataMember(Order = 14)]
+        public int Guid { get; set; }
+
         /// <summary>
         /// The localized names of this building.
         /// </summary>
         [DataMember(Order = 99)]
         public SerializableDictionary<string> Localization { get; set; }
 
         // technical information
-        //[DataMember(Name = "GUID")]
-        //public int Guid { get; set; }
         //[DataMember(Name = ".ifo")]
         //public int IfoFile { get; set; }
 

diff --git a/AnnoDesigner.Core/Presets/Models/IBuildingInfo.cs b/AnnoDesigner.Core/Presets/Models/IBuildingInfo.cs
@@ -16,6 +16,7 @@ public interface IBuildingInfo
         bool Borderless { get; set; }
         bool Road { get; set; }
         SerializableDictionary<string> Localization { get; set; }
+        int Guid { get; set; }
         double BlockedAreaLength { get; set; }
         double BlockedAreaWidth { get; set; }
         GridDirection Direction { get; set; }

diff --git a/AnnoDesigner/ViewModels/PresetsTreeViewModel.cs b/AnnoDesigner/ViewModels/PresetsTreeViewModel.cs
@@ -173,8 +173,7 @@ public void LoadItems(BuildingPresets buildingPresets)
 
             //prepare data
             var headerAnno2205 = "(A6) Anno 2205";
-
-            var excludedTemplates = new[] { "Ark", "Harbour", "OrnamentBuilding" };
+            var excludedTemplates = new[] { "Ark", "DefColFace", "RoofColDef", "RoofColFace" }; //Removed "Harbour" and "OrnamentBuilding" missing buidlings in those 2 Template Groups (18-06-2022)
             var excludedFactions = new[] { "third party", "Facility Modules" };
 
             var filteredBuildingList = buildingPresets.Buildings

diff --git a/AnnoDesigner/icons/A6_Bioenhancers.png b/AnnoDesigner/icons/A6_Bioenhancers.png
diff --git a/AnnoDesigner/icons/A6_Biopolymer.png b/AnnoDesigner/icons/A6_Biopolymer.png
diff --git a/AnnoDesigner/icons/A6_Bioresin.png b/AnnoDesigner/icons/A6_Bioresin.png
diff --git a/AnnoDesigner/icons/A6_Canned Food.png b/AnnoDesigner/icons/A6_Canned Food.png
diff --git a/AnnoDesigner/icons/A6_Community Center.png b/AnnoDesigner/icons/A6_Community Center.png
diff --git a/AnnoDesigner/icons/A6_Construct-O-Bots.png b/AnnoDesigner/icons/A6_Construct-O-Bots.png
diff --git a/AnnoDesigner/icons/A6_Fusion Power Cells.png b/AnnoDesigner/icons/A6_Fusion Power Cells.png
diff --git a/AnnoDesigner/icons/A6_Fusion Reactor.png b/AnnoDesigner/icons/A6_Fusion Reactor.png
diff --git a/AnnoDesigner/icons/A6_Gas Power Station.png b/AnnoDesigner/icons/A6_Gas Power Station.png
diff --git a/AnnoDesigner/icons/A6_HQ Intersection.png b/AnnoDesigner/icons/A6_HQ Intersection.png
diff --git a/AnnoDesigner/icons/A6_HQ Terminal 1.png b/AnnoDesigner/icons/A6_HQ Terminal 1.png
diff --git a/AnnoDesigner/icons/A6_HQ Terminal 2.png b/AnnoDesigner/icons/A6_HQ Terminal 2.png
diff --git a/AnnoDesigner/icons/A6_HQ Wing 1.png b/AnnoDesigner/icons/A6_HQ Wing 1.png
diff --git a/AnnoDesigner/icons/A6_HQ Wing 2.png b/AnnoDesigner/icons/A6_HQ Wing 2.png
diff --git a/AnnoDesigner/icons/A6_Health Center.png b/AnnoDesigner/icons/A6_Health Center.png
diff --git a/AnnoDesigner/icons/A6_Infodrome.png b/AnnoDesigner/icons/A6_Infodrome.png
diff --git a/AnnoDesigner/icons/A6_Intelliwear.png b/AnnoDesigner/icons/A6_Intelliwear.png
diff --git a/AnnoDesigner/icons/A6_Large Shield Generator.png b/AnnoDesigner/icons/A6_Large Shield Generator.png
diff --git a/AnnoDesigner/icons/A6_Lunar Lunch.png b/AnnoDesigner/icons/A6_Lunar Lunch.png
diff --git a/AnnoDesigner/icons/A6_Luxury Food.png b/AnnoDesigner/icons/A6_Luxury Food.png
diff --git a/AnnoDesigner/icons/A6_Metal Foam.png b/AnnoDesigner/icons/A6_Metal Foam.png
diff --git a/AnnoDesigner/icons/A6_Metro Station.png b/AnnoDesigner/icons/A6_Metro Station.png
diff --git a/AnnoDesigner/icons/A6_Moon Crops.png b/AnnoDesigner/icons/A6_Moon Crops.png
diff --git a/AnnoDesigner/icons/A6_Multispec Prisms.png b/AnnoDesigner/icons/A6_Multispec Prisms.png
diff --git a/AnnoDesigner/icons/A6_Neuro Implants.png b/AnnoDesigner/icons/A6_Neuro Implants.png
diff --git a/AnnoDesigner/icons/A6_Quantum Computers.png b/AnnoDesigner/icons/A6_Quantum Computers.png
diff --git a/AnnoDesigner/icons/A6_Qubit Processors.png b/AnnoDesigner/icons/A6_Qubit Processors.png
diff --git a/AnnoDesigner/icons/A6_Soy Beans.png b/AnnoDesigner/icons/A6_Soy Beans.png
diff --git a/AnnoDesigner/icons/A6_Synaptic Circuits.png b/AnnoDesigner/icons/A6_Synaptic Circuits.png
diff --git a/AnnoDesigner/icons/A6_Synthcells.png b/AnnoDesigner/icons/A6_Synthcells.png
diff --git a/AnnoDesigner/icons/A6_Titanium Plating.png b/AnnoDesigner/icons/A6_Titanium Plating.png
diff --git a/AnnoDesigner/icons/A6_Transportation Center (Arctic).png b/AnnoDesigner/icons/A6_Transportation Center (Arctic).png
diff --git a/AnnoDesigner/icons/A6_Transportation Center (Lunar).png b/AnnoDesigner/icons/A6_Transportation Center (Lunar).png
diff --git a/AnnoDesigner/icons/A6_Transportation Center (Temperate).png b/AnnoDesigner/icons/A6_Transportation Center (Temperate).png
diff --git a/AnnoDesigner/icons/A6_Wind Park.png b/AnnoDesigner/icons/A6_Wind Park.png
diff --git a/AnnoDesigner/icons/A6_aerogel_module.png b/AnnoDesigner/icons/A6_aerogel_module.png
diff --git a/AnnoDesigner/icons/A6_algae_module.png b/AnnoDesigner/icons/A6_algae_module.png
diff --git a/AnnoDesigner/icons/A6_androids_module.png b/AnnoDesigner/icons/A6_androids_module.png
diff --git a/AnnoDesigner/icons/A6_beef_module.png b/AnnoDesigner/icons/A6_beef_module.png
diff --git a/AnnoDesigner/icons/A6_bio_enhancers_module.png b/AnnoDesigner/icons/A6_bio_enhancers_module.png
diff --git a/AnnoDesigner/icons/A6_biocatalysts_4_module.png b/AnnoDesigner/icons/A6_biocatalysts_4_module.png
diff --git a/AnnoDesigner/icons/A6_biocomposites_module.png b/AnnoDesigner/icons/A6_biocomposites_module.png
diff --git a/AnnoDesigner/icons/A6_bioresigns_module.png b/AnnoDesigner/icons/A6_bioresigns_module.png
diff --git a/AnnoDesigner/icons/A6_canned_food_module.png b/AnnoDesigner/icons/A6_canned_food_module.png
diff --git a/AnnoDesigner/icons/A6_deep_water_corals_module.png b/AnnoDesigner/icons/A6_deep_water_corals_module.png
diff --git a/AnnoDesigner/icons/A6_deuterium_module.png b/AnnoDesigner/icons/A6_deuterium_module.png
diff --git a/AnnoDesigner/icons/A6_empty_module.png b/AnnoDesigner/icons/A6_empty_module.png
diff --git a/AnnoDesigner/icons/A6_fish_module.png b/AnnoDesigner/icons/A6_fish_module.png
diff --git a/AnnoDesigner/icons/A6_fruit_drink_module.png b/AnnoDesigner/icons/A6_fruit_drink_module.png
diff --git a/AnnoDesigner/icons/A6_fruit_module.png b/AnnoDesigner/icons/A6_fruit_module.png
diff --git a/AnnoDesigner/icons/A6_fusion_accumulators_module.png b/AnnoDesigner/icons/A6_fusion_accumulators_module.png
diff --git a/AnnoDesigner/icons/A6_fusion_power_plant_module.png b/AnnoDesigner/icons/A6_fusion_power_plant_module.png
diff --git a/AnnoDesigner/icons/A6_gas_power_plant_module.png b/AnnoDesigner/icons/A6_gas_power_plant_module.png
diff --git a/AnnoDesigner/icons/A6_gravity_generators_module.png b/AnnoDesigner/icons/A6_gravity_generators_module.png
diff --git a/AnnoDesigner/icons/A6_intelli_clothes_module.png b/AnnoDesigner/icons/A6_intelli_clothes_module.png
diff --git a/AnnoDesigner/icons/A6_luxury_food_module.png b/AnnoDesigner/icons/A6_luxury_food_module.png
diff --git a/AnnoDesigner/icons/A6_medibots_module.png b/AnnoDesigner/icons/A6_medibots_module.png
diff --git a/AnnoDesigner/icons/A6_metal_foam_module.png b/AnnoDesigner/icons/A6_metal_foam_module.png
diff --git a/AnnoDesigner/icons/A6_methan_clathrate_module.png b/AnnoDesigner/icons/A6_methan_clathrate_module.png
diff --git a/AnnoDesigner/icons/A6_microchips_module.png b/AnnoDesigner/icons/A6_microchips_module.png
diff --git a/AnnoDesigner/icons/A6_moon_crops_module.png b/AnnoDesigner/icons/A6_moon_crops_module.png
diff --git a/AnnoDesigner/icons/A6_moss_2_module.png b/AnnoDesigner/icons/A6_moss_2_module.png
diff --git a/AnnoDesigner/icons/A6_multispectral_prisms_module.png b/AnnoDesigner/icons/A6_multispectral_prisms_module.png
diff --git a/AnnoDesigner/icons/A6_nanowave_sensors_module.png b/AnnoDesigner/icons/A6_nanowave_sensors_module.png
diff --git a/AnnoDesigner/icons/A6_natural_gas_module.png b/AnnoDesigner/icons/A6_natural_gas_module.png
diff --git a/AnnoDesigner/icons/A6_natural_space_food_module.png b/AnnoDesigner/icons/A6_natural_space_food_module.png
diff --git a/AnnoDesigner/icons/A6_neuro_implants_2_module.png b/AnnoDesigner/icons/A6_neuro_implants_2_module.png
diff --git a/AnnoDesigner/icons/A6_oxygen-48_module.png b/AnnoDesigner/icons/A6_oxygen-48_module.png
diff --git a/AnnoDesigner/icons/A6_oxygen.png b/AnnoDesigner/icons/A6_oxygen.png
diff --git a/AnnoDesigner/icons/A6_plant_fibres_module.png b/AnnoDesigner/icons/A6_plant_fibres_module.png
diff --git a/AnnoDesigner/icons/A6_quantum_computers_module.png b/AnnoDesigner/icons/A6_quantum_computers_module.png
diff --git a/AnnoDesigner/icons/A6_qubit_processors_module.png b/AnnoDesigner/icons/A6_qubit_processors_module.png
diff --git a/AnnoDesigner/icons/A6_recreation_4.png b/AnnoDesigner/icons/A6_recreation_4.png
diff --git a/AnnoDesigner/icons/A6_rejuvenators_module.png b/AnnoDesigner/icons/A6_rejuvenators_module.png
diff --git a/AnnoDesigner/icons/A6_replicators_module.png b/AnnoDesigner/icons/A6_replicators_module.png
diff --git a/AnnoDesigner/icons/A6_rice_dish_module.png b/AnnoDesigner/icons/A6_rice_dish_module.png
diff --git a/AnnoDesigner/icons/A6_robots_module.png b/AnnoDesigner/icons/A6_robots_module.png
diff --git a/AnnoDesigner/icons/A6_smart_drones_module.png b/AnnoDesigner/icons/A6_smart_drones_module.png
diff --git a/AnnoDesigner/icons/A6_soy_beans_module.png b/AnnoDesigner/icons/A6_soy_beans_module.png
diff --git a/AnnoDesigner/icons/A6_starbig.png b/AnnoDesigner/icons/A6_starbig.png
diff --git a/AnnoDesigner/icons/A6_stimulants_module.png b/AnnoDesigner/icons/A6_stimulants_module.png
diff --git a/AnnoDesigner/icons/A6_super_alloys_module.png b/AnnoDesigner/icons/A6_super_alloys_module.png
diff --git a/AnnoDesigner/icons/A6_super_coolants_module.png b/AnnoDesigner/icons/A6_super_coolants_module.png
diff --git a/AnnoDesigner/icons/A6_synaptic_circuits_module.png b/AnnoDesigner/icons/A6_synaptic_circuits_module.png
diff --git a/AnnoDesigner/icons/A6_synth_cells_module.png b/AnnoDesigner/icons/A6_synth_cells_module.png
diff --git a/AnnoDesigner/icons/A6_thermal_wear_module.png b/AnnoDesigner/icons/A6_thermal_wear_module.png
diff --git a/AnnoDesigner/icons/A6_tidal_power_station_module.png b/AnnoDesigner/icons/A6_tidal_power_station_module.png
diff --git a/AnnoDesigner/icons/A6_titan_plating_module.png b/AnnoDesigner/icons/A6_titan_plating_module.png
diff --git a/AnnoDesigner/icons/A6_water_module.png b/AnnoDesigner/icons/A6_water_module.png
diff --git a/AnnoDesigner/icons/A6_windpark_module.png b/AnnoDesigner/icons/A6_windpark_module.png
diff --git a/AnnoDesigner/icons/A6_wine_module.png b/AnnoDesigner/icons/A6_wine_module.png
diff --git a/AnnoDesigner/icons/A6_wool_module.png b/AnnoDesigner/icons/A6_wool_module.png
diff --git a/AnnoDesigner/icons/A7_Bank.png b/AnnoDesigner/icons/A7_Bank.png
diff --git a/AnnoDesigner/icons/A7_Beer.png b/AnnoDesigner/icons/A7_Beer.png
diff --git a/AnnoDesigner/icons/A7_Brass.png b/AnnoDesigner/icons/A7_Brass.png
diff --git a/AnnoDesigner/icons/A7_Bread.png b/AnnoDesigner/icons/A7_Bread.png
diff --git a/AnnoDesigner/icons/A7_Bricks.png b/AnnoDesigner/icons/A7_Bricks.png
diff --git a/AnnoDesigner/icons/A7_Caoutchouc.png b/AnnoDesigner/icons/A7_Caoutchouc.png
diff --git a/AnnoDesigner/icons/A7_Cement.png b/AnnoDesigner/icons/A7_Cement.png
diff --git a/AnnoDesigner/icons/A7_Champagne.png b/AnnoDesigner/icons/A7_Champagne.png
diff --git a/AnnoDesigner/icons/A7_Chassis.png b/AnnoDesigner/icons/A7_Chassis.png
diff --git a/AnnoDesigner/icons/A7_Chocolate.png b/AnnoDesigner/icons/A7_Chocolate.png
diff --git a/AnnoDesigner/icons/A7_Church.png b/AnnoDesigner/icons/A7_Church.png
diff --git a/AnnoDesigner/icons/A7_Cigars.png b/AnnoDesigner/icons/A7_Cigars.png
diff --git a/AnnoDesigner/icons/A7_Clay.png b/AnnoDesigner/icons/A7_Clay.png
diff --git a/AnnoDesigner/icons/A7_Cocoa.png b/AnnoDesigner/icons/A7_Cocoa.png
diff --git a/AnnoDesigner/icons/A7_Copper.png b/AnnoDesigner/icons/A7_Copper.png
diff --git a/AnnoDesigner/icons/A7_Corn.png b/AnnoDesigner/icons/A7_Corn.png
diff --git a/AnnoDesigner/icons/A7_Cotton.png b/AnnoDesigner/icons/A7_Cotton.png
diff --git a/AnnoDesigner/icons/A7_Depot.png b/AnnoDesigner/icons/A7_Depot.png
diff --git a/AnnoDesigner/icons/A7_Dynamite.png b/AnnoDesigner/icons/A7_Dynamite.png
diff --git a/AnnoDesigner/icons/A7_Felt.png b/AnnoDesigner/icons/A7_Felt.png
diff --git a/AnnoDesigner/icons/A7_Fish.png b/AnnoDesigner/icons/A7_Fish.png
diff --git a/AnnoDesigner/icons/A7_Flour.png b/AnnoDesigner/icons/A7_Flour.png
diff --git a/AnnoDesigner/icons/A7_Glass.png b/AnnoDesigner/icons/A7_Glass.png
diff --git a/AnnoDesigner/icons/A7_Glasses.png b/AnnoDesigner/icons/A7_Glasses.png
diff --git a/AnnoDesigner/icons/A7_Gold.png b/AnnoDesigner/icons/A7_Gold.png
diff --git a/AnnoDesigner/icons/A7_Grapes.png b/AnnoDesigner/icons/A7_Grapes.png
diff --git a/AnnoDesigner/icons/A7_Hops.png b/AnnoDesigner/icons/A7_Hops.png
diff --git a/AnnoDesigner/icons/A7_Hospital.png b/AnnoDesigner/icons/A7_Hospital.png
diff --git a/AnnoDesigner/icons/A7_Iron.png b/AnnoDesigner/icons/A7_Iron.png
diff --git a/AnnoDesigner/icons/A7_Malt.png b/AnnoDesigner/icons/A7_Malt.png
diff --git a/AnnoDesigner/icons/A7_Marketplace.png b/AnnoDesigner/icons/A7_Marketplace.png
diff --git a/AnnoDesigner/icons/A7_Museum.png b/AnnoDesigner/icons/A7_Museum.png
diff --git a/AnnoDesigner/icons/A7_Oil.png b/AnnoDesigner/icons/A7_Oil.png
diff --git a/AnnoDesigner/icons/A7_Pearls.png b/AnnoDesigner/icons/A7_Pearls.png
diff --git a/AnnoDesigner/icons/A7_Pier.png b/AnnoDesigner/icons/A7_Pier.png
diff --git a/AnnoDesigner/icons/A7_Pigs.png b/AnnoDesigner/icons/A7_Pigs.png
diff --git a/AnnoDesigner/icons/A7_Potatoes.png b/AnnoDesigner/icons/A7_Potatoes.png
diff --git a/AnnoDesigner/icons/A7_Pub.png b/AnnoDesigner/icons/A7_Pub.png
diff --git a/AnnoDesigner/icons/A7_School.png b/AnnoDesigner/icons/A7_School.png
diff --git a/AnnoDesigner/icons/A7_Steel.png b/AnnoDesigner/icons/A7_Steel.png
diff --git a/AnnoDesigner/icons/A7_Sugar.png b/AnnoDesigner/icons/A7_Sugar.png
diff --git a/AnnoDesigner/icons/A7_Tallow.png b/AnnoDesigner/icons/A7_Tallow.png
diff --git a/AnnoDesigner/icons/A7_Tobacco.png b/AnnoDesigner/icons/A7_Tobacco.png
diff --git a/AnnoDesigner/icons/A7_University.png b/AnnoDesigner/icons/A7_University.png
diff --git a/AnnoDesigner/icons/A7_Warehouse.png b/AnnoDesigner/icons/A7_Warehouse.png
diff --git a/AnnoDesigner/icons/A7_Weapons.png b/AnnoDesigner/icons/A7_Weapons.png
diff --git a/AnnoDesigner/icons/A7_Wool.png b/AnnoDesigner/icons/A7_Wool.png
diff --git a/AnnoDesigner/icons/A7_Zoo.png b/AnnoDesigner/icons/A7_Zoo.png
diff --git a/AnnoDesigner/icons/A7_advanced_weaponry.png b/AnnoDesigner/icons/A7_advanced_weaponry.png
diff --git a/AnnoDesigner/icons/A7_agerian_book.png b/AnnoDesigner/icons/A7_agerian_book.png
diff --git a/AnnoDesigner/icons/A7_alpaca_wool.png b/AnnoDesigner/icons/A7_alpaca_wool.png
diff --git a/AnnoDesigner/icons/A7_ammonia.png b/AnnoDesigner/icons/A7_ammonia.png
diff --git a/AnnoDesigner/icons/A7_amusement_park_ornament.png b/AnnoDesigner/icons/A7_amusement_park_ornament.png
diff --git a/AnnoDesigner/icons/A7_anarchist.png b/AnnoDesigner/icons/A7_anarchist.png
diff --git a/AnnoDesigner/icons/A7_aqua_well.png b/AnnoDesigner/icons/A7_aqua_well.png
diff --git a/AnnoDesigner/icons/A7_atole.png b/AnnoDesigner/icons/A7_atole.png
diff --git a/AnnoDesigner/icons/A7_attack_mode.png b/AnnoDesigner/icons/A7_attack_mode.png
diff --git a/AnnoDesigner/icons/A7_autumn_barrel_table.png b/AnnoDesigner/icons/A7_autumn_barrel_table.png
diff --git a/AnnoDesigner/icons/A7_autumn_bonfire.png b/AnnoDesigner/icons/A7_autumn_bonfire.png
diff --git a/AnnoDesigner/icons/A7_autumn_cider_stall.png b/AnnoDesigner/icons/A7_autumn_cider_stall.png
diff --git a/AnnoDesigner/icons/A7_autumn_gate_01.png b/AnnoDesigner/icons/A7_autumn_gate_01.png
diff --git a/AnnoDesigner/icons/A7_autumn_gate_02.png b/AnnoDesigner/icons/A7_autumn_gate_02.png
diff --git a/AnnoDesigner/icons/A7_autumn_pumpkin_competition.png b/AnnoDesigner/icons/A7_autumn_pumpkin_competition.png
diff --git a/AnnoDesigner/icons/A7_autumn_wagon_01.png b/AnnoDesigner/icons/A7_autumn_wagon_01.png
diff --git a/AnnoDesigner/icons/A7_autumn_wagon_02.png b/AnnoDesigner/icons/A7_autumn_wagon_02.png
diff --git a/AnnoDesigner/icons/A7_balloon_seller.png b/AnnoDesigner/icons/A7_balloon_seller.png
diff --git a/AnnoDesigner/icons/A7_banana.png b/AnnoDesigner/icons/A7_banana.png
diff --git a/AnnoDesigner/icons/A7_barrel_organ_player.png b/AnnoDesigner/icons/A7_barrel_organ_player.png
diff --git a/AnnoDesigner/icons/A7_basin.png b/AnnoDesigner/icons/A7_basin.png
diff --git a/AnnoDesigner/icons/A7_beams.png b/AnnoDesigner/icons/A7_beams.png
diff --git a/AnnoDesigner/icons/A7_bear_fur_brown.png b/AnnoDesigner/icons/A7_bear_fur_brown.png
diff --git a/AnnoDesigner/icons/A7_bear_trap.png b/AnnoDesigner/icons/A7_bear_trap.png
diff --git a/AnnoDesigner/icons/A7_beef.png b/AnnoDesigner/icons/A7_beef.png
diff --git a/AnnoDesigner/icons/A7_beef_potatoes.png b/AnnoDesigner/icons/A7_beef_potatoes.png
diff --git a/AnnoDesigner/icons/A7_beer_2.png b/AnnoDesigner/icons/A7_beer_2.png
diff --git a/AnnoDesigner/icons/A7_benches.png b/AnnoDesigner/icons/A7_benches.png
diff --git a/AnnoDesigner/icons/A7_beta_reward_2x2.png b/AnnoDesigner/icons/A7_beta_reward_2x2.png
diff --git a/AnnoDesigner/icons/A7_black_muscovy.png b/AnnoDesigner/icons/A7_black_muscovy.png
diff --git a/AnnoDesigner/icons/A7_botanic_garden.png b/AnnoDesigner/icons/A7_botanic_garden.png
diff --git a/AnnoDesigner/icons/A7_botanic_garden_module.png b/AnnoDesigner/icons/A7_botanic_garden_module.png
diff --git a/AnnoDesigner/icons/A7_botanica_blueflower.png b/AnnoDesigner/icons/A7_botanica_blueflower.png
diff --git a/AnnoDesigner/icons/A7_botanica_darkpinkflower.png b/AnnoDesigner/icons/A7_botanica_darkpinkflower.png
diff --git a/AnnoDesigner/icons/A7_botanica_hedgespath.png b/AnnoDesigner/icons/A7_botanica_hedgespath.png
diff --git a/AnnoDesigner/icons/A7_botanica_labybrinth.png b/AnnoDesigner/icons/A7_botanica_labybrinth.png
diff --git a/AnnoDesigner/icons/A7_botanica_orangeflower.png b/AnnoDesigner/icons/A7_botanica_orangeflower.png
diff --git a/AnnoDesigner/icons/A7_botanica_pinkflower.png b/AnnoDesigner/icons/A7_botanica_pinkflower.png
diff --git a/AnnoDesigner/icons/A7_botanica_purpleflower.png b/AnnoDesigner/icons/A7_botanica_purpleflower.png
diff --git a/AnnoDesigner/icons/A7_botanica_redandwhiteflower.png b/AnnoDesigner/icons/A7_botanica_redandwhiteflower.png
diff --git a/AnnoDesigner/icons/A7_botanica_treesculptures.png b/AnnoDesigner/icons/A7_botanica_treesculptures.png
diff --git a/AnnoDesigner/icons/A7_botanica_whiteflower.png b/AnnoDesigner/icons/A7_botanica_whiteflower.png
diff --git a/AnnoDesigner/icons/A7_botanica_yellowflower.png b/AnnoDesigner/icons/A7_botanica_yellowflower.png
diff --git a/AnnoDesigner/icons/A7_bowler_hat.png b/AnnoDesigner/icons/A7_bowler_hat.png
diff --git a/AnnoDesigner/icons/A7_box_arena.png b/AnnoDesigner/icons/A7_box_arena.png
diff --git a/AnnoDesigner/icons/A7_brass_tube.png b/AnnoDesigner/icons/A7_brass_tube.png
diff --git a/AnnoDesigner/icons/A7_brick_road.png b/AnnoDesigner/icons/A7_brick_road.png
diff --git a/AnnoDesigner/icons/A7_brick_street_africa.png b/AnnoDesigner/icons/A7_brick_street_africa.png
diff --git a/AnnoDesigner/icons/A7_burrito.png b/AnnoDesigner/icons/A7_burrito.png
diff --git a/AnnoDesigner/icons/A7_bush01.png b/AnnoDesigner/icons/A7_bush01.png
diff --git a/AnnoDesigner/icons/A7_bush02.png b/AnnoDesigner/icons/A7_bush02.png
diff --git a/AnnoDesigner/icons/A7_bush03.png b/AnnoDesigner/icons/A7_bush03.png
diff --git a/AnnoDesigner/icons/A7_bush04.png b/AnnoDesigner/icons/A7_bush04.png
diff --git a/AnnoDesigner/icons/A7_bush05.png b/AnnoDesigner/icons/A7_bush05.png
diff --git a/AnnoDesigner/icons/A7_cabaret.png b/AnnoDesigner/icons/A7_cabaret.png
diff --git a/AnnoDesigner/icons/A7_caffee.png b/AnnoDesigner/icons/A7_caffee.png
diff --git a/AnnoDesigner/icons/A7_camera.png b/AnnoDesigner/icons/A7_camera.png
diff --git a/AnnoDesigner/icons/A7_cane_sugar_1.png b/AnnoDesigner/icons/A7_cane_sugar_1.png
diff --git a/AnnoDesigner/icons/A7_canned_food.png b/AnnoDesigner/icons/A7_canned_food.png
diff --git a/AnnoDesigner/icons/A7_canned_goulash.png b/AnnoDesigner/icons/A7_canned_goulash.png
diff --git a/AnnoDesigner/icons/A7_carbon_filament.png b/AnnoDesigner/icons/A7_carbon_filament.png
diff --git a/AnnoDesigner/icons/A7_castaway.png b/AnnoDesigner/icons/A7_castaway.png
diff --git a/AnnoDesigner/icons/A7_cattle.png b/AnnoDesigner/icons/A7_cattle.png
diff --git a/AnnoDesigner/icons/A7_cereals_2.png b/AnnoDesigner/icons/A7_cereals_2.png
diff --git a/AnnoDesigner/icons/A7_charity_tree.png b/AnnoDesigner/icons/A7_charity_tree.png
diff --git a/AnnoDesigner/icons/A7_citrus.png b/AnnoDesigner/icons/A7_citrus.png
diff --git a/AnnoDesigner/icons/A7_city_1x1_01.png b/AnnoDesigner/icons/A7_city_1x1_01.png
diff --git a/AnnoDesigner/icons/A7_city_1x1_02.png b/AnnoDesigner/icons/A7_city_1x1_02.png
diff --git a/AnnoDesigner/icons/A7_city_1x1_03.png b/AnnoDesigner/icons/A7_city_1x1_03.png
diff --git a/AnnoDesigner/icons/A7_city_2x2_02.png b/AnnoDesigner/icons/A7_city_2x2_02.png
diff --git a/AnnoDesigner/icons/A7_city_2x2_03.png b/AnnoDesigner/icons/A7_city_2x2_03.png
diff --git a/AnnoDesigner/icons/A7_city_2x2_04.png b/AnnoDesigner/icons/A7_city_2x2_04.png
diff --git a/AnnoDesigner/icons/A7_city_3x3_02.png b/AnnoDesigner/icons/A7_city_3x3_02.png
diff --git a/AnnoDesigner/icons/A7_city_3x3_03.png b/AnnoDesigner/icons/A7_city_3x3_03.png
diff --git a/AnnoDesigner/icons/A7_city_ornament_base.png b/AnnoDesigner/icons/A7_city_ornament_base.png
diff --git a/AnnoDesigner/icons/A7_city_ornament_club_base.png b/AnnoDesigner/icons/A7_city_ornament_club_base.png
diff --git a/AnnoDesigner/icons/A7_city_ornament_large.png b/AnnoDesigner/icons/A7_city_ornament_large.png
diff --git a/AnnoDesigner/icons/A7_city_ornament_medium.png b/AnnoDesigner/icons/A7_city_ornament_medium.png
diff --git a/AnnoDesigner/icons/A7_city_ornament_small.png b/AnnoDesigner/icons/A7_city_ornament_small.png
diff --git a/AnnoDesigner/icons/A7_cloth.png b/AnnoDesigner/icons/A7_cloth.png
diff --git a/AnnoDesigner/icons/A7_club_house.png b/AnnoDesigner/icons/A7_club_house.png
diff --git a/AnnoDesigner/icons/A7_clubrewards_pond_2x2.png b/AnnoDesigner/icons/A7_clubrewards_pond_2x2.png
diff --git a/AnnoDesigner/icons/A7_clubrewards_statue_1x2.png b/AnnoDesigner/icons/A7_clubrewards_statue_1x2.png
diff --git a/AnnoDesigner/icons/A7_coal.png b/AnnoDesigner/icons/A7_coal.png
diff --git a/AnnoDesigner/icons/A7_coal_2.png b/AnnoDesigner/icons/A7_coal_2.png
diff --git a/AnnoDesigner/icons/A7_coal_burn.png b/AnnoDesigner/icons/A7_coal_burn.png
diff --git a/AnnoDesigner/icons/A7_coal_habour.png b/AnnoDesigner/icons/A7_coal_habour.png
diff --git a/AnnoDesigner/icons/A7_coal_storage.png b/AnnoDesigner/icons/A7_coal_storage.png
diff --git a/AnnoDesigner/icons/A7_coconut.png b/AnnoDesigner/icons/A7_coconut.png
diff --git a/AnnoDesigner/icons/A7_coconut_palm_trees.png b/AnnoDesigner/icons/A7_coconut_palm_trees.png
diff --git a/AnnoDesigner/icons/A7_coffe_cup.png b/AnnoDesigner/icons/A7_coffe_cup.png
diff --git a/AnnoDesigner/icons/A7_coffee_beans.png b/AnnoDesigner/icons/A7_coffee_beans.png
diff --git a/AnnoDesigner/icons/A7_col_park_props_1x1_20.png b/AnnoDesigner/icons/A7_col_park_props_1x1_20.png
diff --git a/AnnoDesigner/icons/A7_col_park_props_1x1_21.png b/AnnoDesigner/icons/A7_col_park_props_1x1_21.png
diff --git a/AnnoDesigner/icons/A7_col_park_props_1x1_22.png b/AnnoDesigner/icons/A7_col_park_props_1x1_22.png
diff --git a/AnnoDesigner/icons/A7_col_park_props_1x1_23.png b/AnnoDesigner/icons/A7_col_park_props_1x1_23.png
diff --git a/AnnoDesigner/icons/A7_col_park_props_1x1_24.png b/AnnoDesigner/icons/A7_col_park_props_1x1_24.png
diff --git a/AnnoDesigner/icons/A7_col_park_props_system_1x1_16_back.png b/AnnoDesigner/icons/A7_col_park_props_system_1x1_16_back.png
diff --git a/AnnoDesigner/icons/A7_col_park_props_system_1x1_17_front.png b/AnnoDesigner/icons/A7_col_park_props_system_1x1_17_front.png
diff --git a/AnnoDesigner/icons/A7_col_park_props_system_1x1_21_back.png b/AnnoDesigner/icons/A7_col_park_props_system_1x1_21_back.png
diff --git a/AnnoDesigner/icons/A7_col_park_props_system_1x1_23_back.png b/AnnoDesigner/icons/A7_col_park_props_system_1x1_23_back.png
diff --git a/AnnoDesigner/icons/A7_col_park_props_system_1x1_24_back.png b/AnnoDesigner/icons/A7_col_park_props_system_1x1_24_back.png
diff --git a/AnnoDesigner/icons/A7_col_park_props_system_1x1_35_front.png b/AnnoDesigner/icons/A7_col_park_props_system_1x1_35_front.png
diff --git a/AnnoDesigner/icons/A7_col_park_props_system_2x2_03_back.png b/AnnoDesigner/icons/A7_col_park_props_system_2x2_03_back.png
diff --git a/AnnoDesigner/icons/A7_col_park_props_system_3x3_02_front.png b/AnnoDesigner/icons/A7_col_park_props_system_3x3_02_front.png
diff --git a/AnnoDesigner/icons/A7_col_park_props_system_3x3_03_back.png b/AnnoDesigner/icons/A7_col_park_props_system_3x3_03_back.png
diff --git a/AnnoDesigner/icons/A7_col_props_1x1_03_back.png b/AnnoDesigner/icons/A7_col_props_1x1_03_back.png
diff --git a/AnnoDesigner/icons/A7_col_props_1x1_05_back.png b/AnnoDesigner/icons/A7_col_props_1x1_05_back.png
diff --git a/AnnoDesigner/icons/A7_col_props_1x1_06_front.png b/AnnoDesigner/icons/A7_col_props_1x1_06_front.png
diff --git a/AnnoDesigner/icons/A7_col_props_1x1_07_back.png b/AnnoDesigner/icons/A7_col_props_1x1_07_back.png
diff --git a/AnnoDesigner/icons/A7_col_props_1x1_08_front.png b/AnnoDesigner/icons/A7_col_props_1x1_08_front.png
diff --git a/AnnoDesigner/icons/A7_col_props_1x1_09_back.png b/AnnoDesigner/icons/A7_col_props_1x1_09_back.png
diff --git a/AnnoDesigner/icons/A7_col_props_1x1_11_back.png b/AnnoDesigner/icons/A7_col_props_1x1_11_back.png
diff --git a/AnnoDesigner/icons/A7_col_props_1x1_12_back.png b/AnnoDesigner/icons/A7_col_props_1x1_12_back.png
diff --git a/AnnoDesigner/icons/A7_col_props_1x1_13_back.png b/AnnoDesigner/icons/A7_col_props_1x1_13_back.png
diff --git a/AnnoDesigner/icons/A7_col_props_1x1_14_back.png b/AnnoDesigner/icons/A7_col_props_1x1_14_back.png
diff --git a/AnnoDesigner/icons/A7_concrete.png b/AnnoDesigner/icons/A7_concrete.png
diff --git a/AnnoDesigner/icons/A7_construction_crane.png b/AnnoDesigner/icons/A7_construction_crane.png
diff --git a/AnnoDesigner/icons/A7_construction_site.png b/AnnoDesigner/icons/A7_construction_site.png
diff --git a/AnnoDesigner/icons/A7_construction_trailer.png b/AnnoDesigner/icons/A7_construction_trailer.png
diff --git a/AnnoDesigner/icons/A7_copper_pipes.png b/AnnoDesigner/icons/A7_copper_pipes.png
diff --git a/AnnoDesigner/icons/A7_cotton_fur.png b/AnnoDesigner/icons/A7_cotton_fur.png
diff --git a/AnnoDesigner/icons/A7_cultural_1x1_01.png b/AnnoDesigner/icons/A7_cultural_1x1_01.png
diff --git a/AnnoDesigner/icons/A7_cultural_1x1_02.png b/AnnoDesigner/icons/A7_cultural_1x1_02.png
diff --git a/AnnoDesigner/icons/A7_cultural_1x1_03.png b/AnnoDesigner/icons/A7_cultural_1x1_03.png
diff --git a/AnnoDesigner/icons/A7_cultural_1x1_04.png b/AnnoDesigner/icons/A7_cultural_1x1_04.png
diff --git a/AnnoDesigner/icons/A7_cultural_1x1_05.png b/AnnoDesigner/icons/A7_cultural_1x1_05.png
diff --git a/AnnoDesigner/icons/A7_cultural_1x1_06.png b/AnnoDesigner/icons/A7_cultural_1x1_06.png
diff --git a/AnnoDesigner/icons/A7_cultural_1x1_07.png b/AnnoDesigner/icons/A7_cultural_1x1_07.png
diff --git a/AnnoDesigner/icons/A7_cultural_1x1_08.png b/AnnoDesigner/icons/A7_cultural_1x1_08.png
diff --git a/AnnoDesigner/icons/A7_cultural_1x1_09.png b/AnnoDesigner/icons/A7_cultural_1x1_09.png
diff --git a/AnnoDesigner/icons/A7_cultural_1x1_10.png b/AnnoDesigner/icons/A7_cultural_1x1_10.png
diff --git a/AnnoDesigner/icons/A7_cultural_1x1_11.png b/AnnoDesigner/icons/A7_cultural_1x1_11.png
diff --git a/AnnoDesigner/icons/A7_cultural_1x1_12.png b/AnnoDesigner/icons/A7_cultural_1x1_12.png
diff --git a/AnnoDesigner/icons/A7_cultural_1x1_13.png b/AnnoDesigner/icons/A7_cultural_1x1_13.png
diff --git a/AnnoDesigner/icons/A7_cultural_1x1_14.png b/AnnoDesigner/icons/A7_cultural_1x1_14.png
diff --git a/AnnoDesigner/icons/A7_cultural_props_1x1_01.png b/AnnoDesigner/icons/A7_cultural_props_1x1_01.png
diff --git a/AnnoDesigner/icons/A7_cultural_props_1x1_02.png b/AnnoDesigner/icons/A7_cultural_props_1x1_02.png
diff --git a/AnnoDesigner/icons/A7_cultural_props_1x1_03.png b/AnnoDesigner/icons/A7_cultural_props_1x1_03.png
diff --git a/AnnoDesigner/icons/A7_cultural_props_1x1_04.png b/AnnoDesigner/icons/A7_cultural_props_1x1_04.png
diff --git a/AnnoDesigner/icons/A7_cultural_props_1x1_05.png b/AnnoDesigner/icons/A7_cultural_props_1x1_05.png
diff --git a/AnnoDesigner/icons/A7_cultural_props_1x1_05_front.png b/AnnoDesigner/icons/A7_cultural_props_1x1_05_front.png
diff --git a/AnnoDesigner/icons/A7_cultural_props_1x1_06.png b/AnnoDesigner/icons/A7_cultural_props_1x1_06.png
diff --git a/AnnoDesigner/icons/A7_cultural_props_1x1_06_back.png b/AnnoDesigner/icons/A7_cultural_props_1x1_06_back.png
diff --git a/AnnoDesigner/icons/A7_cultural_props_1x1_07.png b/AnnoDesigner/icons/A7_cultural_props_1x1_07.png
diff --git a/AnnoDesigner/icons/A7_cultural_props_1x1_08.png b/AnnoDesigner/icons/A7_cultural_props_1x1_08.png
diff --git a/AnnoDesigner/icons/A7_cultural_props_1x1_09.png b/AnnoDesigner/icons/A7_cultural_props_1x1_09.png
diff --git a/AnnoDesigner/icons/A7_cultural_props_1x1_10.png b/AnnoDesigner/icons/A7_cultural_props_1x1_10.png
diff --git a/AnnoDesigner/icons/A7_cultural_props_1x1_11.png b/AnnoDesigner/icons/A7_cultural_props_1x1_11.png
diff --git a/AnnoDesigner/icons/A7_cultural_props_1x1_12.png b/AnnoDesigner/icons/A7_cultural_props_1x1_12.png
diff --git a/AnnoDesigner/icons/A7_cultural_props_1x1_13.png b/AnnoDesigner/icons/A7_cultural_props_1x1_13.png
diff --git a/AnnoDesigner/icons/A7_cultural_props_1x1_14.png b/AnnoDesigner/icons/A7_cultural_props_1x1_14.png
diff --git a/AnnoDesigner/icons/A7_cultural_props_1x1_15.png b/AnnoDesigner/icons/A7_cultural_props_1x1_15.png
diff --git a/AnnoDesigner/icons/A7_cultural_props_1x1_16_front.png b/AnnoDesigner/icons/A7_cultural_props_1x1_16_front.png
diff --git a/AnnoDesigner/icons/A7_cyanide_leacher.png b/AnnoDesigner/icons/A7_cyanide_leacher.png
diff --git a/AnnoDesigner/icons/A7_dam_a.png b/AnnoDesigner/icons/A7_dam_a.png