Update Presets to v5.0 #432

StingMcRay · 2022-07-04T19:20:51Z

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 Small Warehouse not present on Enbesan Tiers (Shepherds and Elders) #389 (Missing Warehouses)
Fixed issue Enbesan harbour production buildings wrong icon/harbor area #390 (wrongly icon salt works africa (Anno 1800).
Fixed issue Enbesan harbour production buildings wrong icon/harbor area #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. (file will not be included to the sources)
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)

Thanks to DuxVitae for cooperation missing buildings/Guid's and for pointing/learn me to pinpoint chocks
Thanks to Banan for translating the new Menu's to Polish (Deepl was bugging)

* 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)

Request for whitesmoke colored Plaza Pavings

FroggieFrog · 2022-07-07T06:42:10Z

You are deleting/removing a lot of icons with this PR.
As to my knowledge this would "break" exisiting layouts. By break I mean the icons will be missing in the designer.

Are those icons replaced with other ones (new names)?
Maybe this requires some kind of mapping information for the designer like "This old icon is now this new icon. Try to load the new one."
Just so a user does not need to redo the layout.

FroggieFrog · 2022-07-07T07:31:30Z

PresetParser/BuildingBlockProvider.cs

            try
            {
-                XmlNode node = ifoDocument.FirstChild[BUILDBLOCKER]?.FirstChild;
+                XmlNode node = ifoDocument.FirstChild[BUILDBLOCKER]?.FirstChild; 
+                building.BuildBlocker = new SerializableDictionary<int>();


Is there a need for an empty SerializableDictionary when the result is false?
Before this change the result could be false and the building.BuildBlocker was null. There is a failing test because of this change.
I don't know if the test has to change or if the new logic is wrong.

The return should still be false (see lines 223 to 235), if the node is still null he returns false if it is not repairing the anno 2205 module x/z values, however i had to move it up to set the anno 2205 repair lines for that Module where and that i not could place else where as the Node would be null (no build blockers information in the ifo files) but i had to set this values and repair that module.

StingMcRay · 2022-07-07T12:36:10Z

You are deleting/removing a lot of icons with this PR. As to my knowledge this would "break" exisiting layouts. By break I mean the icons will be missing in the designer.

Are those icons replaced with other ones (new names)? Maybe this requires some kind of mapping information for the designer like "This old icon is now this new icon. Try to load the new one." Just so a user does not need to redo the layout.

No, there would no problems with existing layouts, as i only removed not used ones and double ones (anno 2205) that had the same name, only with caps what was NOT in the presets.
For anno 1800, i had to remove the icons, as something went wrong on my PC, no icons are changed names or are missing, i check all buildings.. i have to check all ornamental, but as i have a backup directory for all icons (separated for all anno's) in case something like this happens

StingMcRay

seams oke for me
I will take better looks on the tests next time, sorry i missed that

FroggieFrog · 2022-07-15T10:04:06Z

AnnoDesigner.Core/Extensions/StringExtensions.cs

+        // This checker is made so it is a 100% sure same Identifiers in name and length of the string.
+        // i discovered that .Contains .startWith and .IsPartOff was not good enough to check this.
+        // (11-06-2022)
+        public static bool IsMatch(this string IdentifierToCheck, List<IBuildingInfo> buildingsToCheck)


Those 2 new methods (IsMatch and IsMatchString) are only used inside of PresetParser.
Is there a possible future use inside of AnnoDesigner?
If not, I would move them to PresetParser and adjust some of the naming to comply with the existing conventions.

well, i put it there to keep it nice in the programing stuff, so all those commands are in a single file...
But if you want me to make a hole new file for only those 2 then let me know...

- added some tests

StingMcRay requested a review from FroggieFrog July 4, 2022 20:02

Small Color.json update

517d3ee

Request for whitesmoke colored Plaza Pavings

FroggieFrog reviewed Jul 7, 2022

View reviewed changes

fix some failing tests

676ced2

StingMcRay commented Jul 7, 2022

View reviewed changes

FroggieFrog added 2 commits July 8, 2022 15:50

optimized images with zopflipng

76059b0

adjusted tests

e321eff

FroggieFrog reviewed Jul 15, 2022

View reviewed changes

FroggieFrog added 3 commits July 15, 2022 12:20

adjust documentaion comment

6c83f72

- moved extension methods

3f4af9d

- added some tests

Merge branch 'master' into pr/432-update-presets-to-v5-0

9ee2ec8

This was linked to issues Jul 18, 2022

Enbesan harbour production buildings wrong icon/harbor area #390

Closed

New Presets 5.0 in progress, but delayed #406

Closed

Small Warehouse not present on Enbesan Tiers (Shepherds and Elders) #389

Closed

FroggieFrog added this to the Presets v5.0 milestone Jul 18, 2022

FroggieFrog merged commit ccc750f into AnnoDesigner:master Jul 18, 2022

StingMcRay deleted the Presets_5_0_GU14-ConvertingTool branch July 21, 2022 08:45

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update Presets to v5.0 #432

Update Presets to v5.0 #432

StingMcRay commented Jul 4, 2022

FroggieFrog commented Jul 7, 2022

FroggieFrog Jul 7, 2022

StingMcRay Jul 7, 2022

StingMcRay commented Jul 7, 2022

StingMcRay left a comment

FroggieFrog Jul 15, 2022 •

edited

Loading

StingMcRay Jul 16, 2022

Update Presets to v5.0 #432

Update Presets to v5.0 #432

Conversation

StingMcRay commented Jul 4, 2022

FroggieFrog commented Jul 7, 2022

FroggieFrog Jul 7, 2022

Choose a reason for hiding this comment

StingMcRay Jul 7, 2022

Choose a reason for hiding this comment

StingMcRay commented Jul 7, 2022

StingMcRay left a comment

Choose a reason for hiding this comment

FroggieFrog Jul 15, 2022 • edited Loading

Choose a reason for hiding this comment

StingMcRay Jul 16, 2022

Choose a reason for hiding this comment

FroggieFrog Jul 15, 2022 •

edited

Loading