Merge pull request #56 from jakobharder/devel/5.4-fixes

fix Harborlife compatibility
jakobharder · Jan 22, 2023 · 24b73fd · 24b73fd
2 parents 50ae40f + ad2f4ab
commit 24b73fd
Show file tree

Hide file tree

Showing 17 changed files with 69 additions and 57 deletions.
diff --git a/doc/CHANGELOG.md b/doc/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 5.4.1
+
+- Fix Harborlife compatibility
+
 ## 5.4
 
 ### New Content

diff --git a/doc/README.bbcode b/doc/README.bbcode
@@ -14,48 +14,29 @@ Rebalancing of productions may only happen when the first version number changes
 
 See full [url=https://github.com/jakobharder/anno-1800-jakobs-mods/blob/main/doc/CHANGELOG.md]changelog[/url].
 
-[size=5]v5 Update Guide[/size]
-
-[size=4]Install[/size]
-
-Mod names have changed, most notably they got `(Jakob)` at the end to help you manage bigger collections.
-
-That unfortunately means you need to take extra care updating this time.
-
-[list][*] Easy way: Install via [url=https://github.com/anno-mods/iModYourAnno/releases]iModYourAnno[/url].
-
-[*] Manual way: Delete all v4 mods before you install v5, mostly because folder names have changed.[/list]
-
-[size=4]In-game Changes[/size]
-
-In-game changes, that need your attention:
-
-[list][*] Upgradable Workers now have Tea as mandatory need with Cheese moving to alternative needs.
-[*] Pescatarians have changed and rebalanced needs. Check your islands if you need to adjust your productions.[/list]
-
 [size=5]Population Tier Mods[/size]
 
 [img]https://github.com/jakobharder/anno-1800-jakobs-mods/raw/main/doc/population-tiers.jpg[/img]
 
 [list][*] [url=https://github.com/jakobharder/anno-1800-jakobs-mods/blob/main/mods/addon-upgradable/README.md][Addon] Upgradable Workers[/url]
-  
+
   Adds "skyscraper" levels to workers and artisans with more residents and new needs.
 
 [*] [url=https://github.com/jakobharder/anno-1800-jakobs-mods/blob/main/mods/addon-pescatarians/README.md][Addon] Pescatarians[/url]
 
-  Adds Old World population with 3 tiers and new needs. They provide additional farmer workforce also in worker and artisan houses.
-
-[*] [url=https://github.com/jakobharder/anno-1800-jakobs-mods/blob/main/mods/shared-goods/README.md][Shared] Extra Goods[/url]
-
-  Adds production chains for Upgradable Workers and Pescatarians: milk, cheese, olives, canned Fish, (mass produced) suits, tools, ...
+  Adds Old World population new tiers and needs. They provide 1 farmer, 1 worker and 1 artisan per 3 residents.
 
 [*] [url=https://github.com/jakobharder/anno-1800-jakobs-mods/blob/main/mods/addon-new-world-cities/README.md][Addon] New World Cities[/url]
 
-  Adds steel beams, windows and concrete factories to the New World.
+  Adds gapless Artista residences.
+
+  Makes construction buildings (steel beams, windows and concrete) available in the New World.
 
   Enables `Windmill` and `Small Power Plants` mods in the New World.
+
+[*] [url=https://github.com/jakobharder/anno-1800-jakobs-mods/blob/main/mods/shared-goods/README.md][Shared] Extra Goods[/url]
 
-  New residences are coming soon...[/list]
+  Adds production chains for Upgradable Workers and Pescatarians: milk, cheese, olives, canned Fish, (mass produced) suits, tools, ...[/list]
 
 [size=5]Service Building Variation Mods[/size]
 
@@ -86,7 +67,7 @@ In-game changes, that need your attention:
 
 [img]https://github.com/jakobharder/anno-1800-jakobs-mods/raw/main/doc/industrial-variations.jpg[/img]
 
-[list][*] [url=https://github.com/jakobharder/anno-1800-jakobs-mods/blob/main/mods/production-variations/README.md][Skin] Factory Variants[/url]
+[list][*] [url=https://github.com/jakobharder/anno-1800-jakobs-mods/blob/main/mods/skin-factories/README.md][Skin] Factory Variants[/url]
   (Shift+V variations)
 
   Adds variations to vanilla production buildings.
@@ -145,7 +126,7 @@ In-game changes, that need your attention:
 
 [img]https://github.com/jakobharder/anno-1800-jakobs-mods/raw/main/doc/streets.jpg[/img]
 
-[list][*] [url=https://github.com/jakobharder/anno-1800-jakobs-mods/blob/main/mods/improved-streets/README.md][Skin] Improved Streets[/url]
+[list][*] [url=https://github.com/jakobharder/anno-1800-jakobs-mods/blob/main/mods/skin-streets/README.md][Skin] Improved Streets[/url]
 
   Replaces railroads and NW streets with more fitting textures.[/list]
 
@@ -158,10 +139,11 @@ Available: English, German, (Russian, Korean, French, Polish, Chinese).
 
 [size=5]Special Thanks[/size]
 
-[*] @taubenangriff for sharing some assets
-[*] @taludas for playtest feedback
-[*] @m_belonosov, redzmey1 for Russian translation
+[*] m_belonosov, redzmey1 for Russian translation
 [*] MSHS for Korean translation
-[*] @Petritant for French translation
+[*] Tonton Yip, Petritant for French translation
 [*] HeroOfOlympus, Aveneger432 for Polish translation
 [*] darknesswei for Chinese translation
+[*] Taubenangriff for sharing some assets
+[*] Taludas, Ionovia for playtest feedback
+[*] Ricky for being Ricky

diff --git a/mods/addon-new-world-cities/README.md b/mods/addon-new-world-cities/README.md
@@ -49,6 +49,7 @@ Some buildings are a bit slower than their Old World counterpart.
 
 ### 1.3
 
+- 1.3.1: fix Harborlife compatibility
 - Added gapless Artista residences with 3 skins
 
 ### 1.2

diff --git a/mods/addon-new-world-cities/annomod.json b/mods/addon-new-world-cities/annomod.json
@@ -41,7 +41,7 @@
     }
   ],
   "modinfo": {
-    "Version": "1.3",
+    "Version": "1.3.1",
     "ModID": "jakob_new_world_cities",
     "DeprecateIds": [ "jakob_nw_construction", "jakob_bugfix_celluloid", "jakob_power_nw" ],
     "IncompatibleIds": [],

diff --git a/mods/addon-new-world-cities/data/config/export/main/asset/assets_.xml b/mods/addon-new-world-cities/data/config/export/main/asset/assets_.xml
@@ -1,3 +1,28 @@
 <ModOps>
   <Include File="../../../../../features.include.xml" />
+
+  <ModOp Type="addNextSibling" GUID='120055'>
+    <Asset>
+      <!-- fallback dump -->
+      <Template>none</Template>
+      <Values>
+        <Standard>
+          <GUID>1500010221</GUID>
+        </Standard>
+        <ignore></ignore>
+        <Upgradable />
+      </Values>
+    </Asset>
+  </ModOp>
+
+  <!-- # Harborlife Fix -->
+  <!-- just in case people didn't update and blame upgradable worker for it -->
+  <ModOp Type="replace" GUID="1440137000" Path="/Values/Upgradable | //Asset[Standard/GUID='1500010221']/Values/Upgradable">
+    <Upgradable>
+      <NextGUID>0</NextGUID>
+    </Upgradable>
+  </ModOp>
+
+  <!-- # cleanup -->
+  <ModOp Type="remove" GUID='1500010221' />
 </ModOps>
diff --git a/mods/addon-new-world-cities/data/config/gui/texts_chinese.xml b/mods/addon-new-world-cities/data/config/gui/texts_chinese.xml
@@ -195,11 +195,11 @@
   <ModOp Type="add" Path="/TextExport/Texts">
     <Text>
       <GUID>1500011043</GUID>
-      <Text>Gapless Obrero Residence</Text> <!-- Building: Gapless Obrero Residence -->
+      <Text>Terraced Obrero Residence</Text> <!-- Building: Terraced Obrero Residence -->
     </Text>
     <Text>
       <GUID>1500011044</GUID>
-      <Text>Gapless Artista Residence</Text> <!-- Building: Gapless Artista Residence -->
+      <Text>Terraced Artista Residence</Text> <!-- Building: Terraced Artista Residence -->
     </Text>
     <Text>
       <GUID>1500011087</GUID>

diff --git a/mods/addon-new-world-cities/data/config/gui/texts_english.xml b/mods/addon-new-world-cities/data/config/gui/texts_english.xml
@@ -195,11 +195,11 @@
   <ModOp Type="add" Path="/TextExport/Texts">
     <Text>
       <GUID>1500011043</GUID>
-      <Text>Gapless Obrero Residence</Text> <!-- Building: Gapless Obrero Residence -->
+      <Text>Terraced Obrero Residence</Text> <!-- Building: Terraced Obrero Residence -->
     </Text>
     <Text>
       <GUID>1500011044</GUID>
-      <Text>Gapless Artista Residence</Text> <!-- Building: Gapless Artista Residence -->
+      <Text>Terraced Artista Residence</Text> <!-- Building: Terraced Artista Residence -->
     </Text>
     <Text>
       <GUID>1500011087</GUID>

diff --git a/mods/addon-new-world-cities/data/config/gui/texts_french.xml b/mods/addon-new-world-cities/data/config/gui/texts_french.xml
@@ -195,11 +195,11 @@
   <ModOp Type="add" Path="/TextExport/Texts">
     <Text>
       <GUID>1500011043</GUID>
-      <Text>Gapless Obrero Residence</Text> <!-- Building: Gapless Obrero Residence -->
+      <Text>Terraced Obrero Residence</Text> <!-- Building: Terraced Obrero Residence -->
     </Text>
     <Text>
       <GUID>1500011044</GUID>
-      <Text>Gapless Artista Residence</Text> <!-- Building: Gapless Artista Residence -->
+      <Text>Terraced Artista Residence</Text> <!-- Building: Terraced Artista Residence -->
     </Text>
     <Text>
       <GUID>1500011087</GUID>

diff --git a/mods/addon-new-world-cities/data/config/gui/texts_german.xml b/mods/addon-new-world-cities/data/config/gui/texts_german.xml
@@ -195,11 +195,11 @@
   <ModOp Type="add" Path="/TextExport/Texts">
     <Text>
       <GUID>1500011043</GUID>
-      <Text>Lückenloses Obrero-Haus</Text> <!-- Building: Gapless Obrero Residence -->
+      <Text>Obrero-Reihenhaus</Text> <!-- Building: Terraced Obrero Residence -->
     </Text>
     <Text>
       <GUID>1500011044</GUID>
-      <Text>Lückenloses Artista-Haus</Text> <!-- Building: Gapless Artista Residence -->
+      <Text>Artista-Reihenhaus</Text> <!-- Building: Terraced Artista Residence -->
     </Text>
     <Text>
       <GUID>1500011087</GUID>

diff --git a/mods/addon-new-world-cities/data/config/gui/texts_italian.xml b/mods/addon-new-world-cities/data/config/gui/texts_italian.xml
@@ -195,11 +195,11 @@
   <ModOp Type="add" Path="/TextExport/Texts">
     <Text>
       <GUID>1500011043</GUID>
-      <Text>Gapless Obrero Residence</Text> <!-- Building: Gapless Obrero Residence -->
+      <Text>Terraced Obrero Residence</Text> <!-- Building: Terraced Obrero Residence -->
     </Text>
     <Text>
       <GUID>1500011044</GUID>
-      <Text>Gapless Artista Residence</Text> <!-- Building: Gapless Artista Residence -->
+      <Text>Terraced Artista Residence</Text> <!-- Building: Terraced Artista Residence -->
     </Text>
     <Text>
       <GUID>1500011087</GUID>

diff --git a/mods/addon-new-world-cities/data/config/gui/texts_japanese.xml b/mods/addon-new-world-cities/data/config/gui/texts_japanese.xml
@@ -195,11 +195,11 @@
   <ModOp Type="add" Path="/TextExport/Texts">
     <Text>
       <GUID>1500011043</GUID>
-      <Text>Gapless Obrero Residence</Text> <!-- Building: Gapless Obrero Residence -->
+      <Text>Terraced Obrero Residence</Text> <!-- Building: Terraced Obrero Residence -->
     </Text>
     <Text>
       <GUID>1500011044</GUID>
-      <Text>Gapless Artista Residence</Text> <!-- Building: Gapless Artista Residence -->
+      <Text>Terraced Artista Residence</Text> <!-- Building: Terraced Artista Residence -->
     </Text>
     <Text>
       <GUID>1500011087</GUID>

diff --git a/mods/addon-new-world-cities/data/config/gui/texts_korean.xml b/mods/addon-new-world-cities/data/config/gui/texts_korean.xml
@@ -195,11 +195,11 @@
   <ModOp Type="add" Path="/TextExport/Texts">
     <Text>
       <GUID>1500011043</GUID>
-      <Text>Gapless Obrero Residence</Text> <!-- Building: Gapless Obrero Residence -->
+      <Text>Terraced Obrero Residence</Text> <!-- Building: Terraced Obrero Residence -->
     </Text>
     <Text>
       <GUID>1500011044</GUID>
-      <Text>Gapless Artista Residence</Text> <!-- Building: Gapless Artista Residence -->
+      <Text>Terraced Artista Residence</Text> <!-- Building: Terraced Artista Residence -->
     </Text>
     <Text>
       <GUID>1500011087</GUID>

diff --git a/mods/addon-new-world-cities/data/config/gui/texts_polish.xml b/mods/addon-new-world-cities/data/config/gui/texts_polish.xml
@@ -195,11 +195,11 @@
   <ModOp Type="add" Path="/TextExport/Texts">
     <Text>
       <GUID>1500011043</GUID>
-      <Text>Gapless Obrero Residence</Text> <!-- Building: Gapless Obrero Residence -->
+      <Text>Terraced Obrero Residence</Text> <!-- Building: Terraced Obrero Residence -->
     </Text>
     <Text>
       <GUID>1500011044</GUID>
-      <Text>Gapless Artista Residence</Text> <!-- Building: Gapless Artista Residence -->
+      <Text>Terraced Artista Residence</Text> <!-- Building: Terraced Artista Residence -->
     </Text>
     <Text>
       <GUID>1500011087</GUID>

diff --git a/mods/addon-new-world-cities/data/config/gui/texts_russian.xml b/mods/addon-new-world-cities/data/config/gui/texts_russian.xml
@@ -195,11 +195,11 @@
   <ModOp Type="add" Path="/TextExport/Texts">
     <Text>
       <GUID>1500011043</GUID>
-      <Text>Gapless Obrero Residence</Text> <!-- Building: Gapless Obrero Residence -->
+      <Text>Terraced Obrero Residence</Text> <!-- Building: Terraced Obrero Residence -->
     </Text>
     <Text>
       <GUID>1500011044</GUID>
-      <Text>Gapless Artista Residence</Text> <!-- Building: Gapless Artista Residence -->
+      <Text>Terraced Artista Residence</Text> <!-- Building: Terraced Artista Residence -->
     </Text>
     <Text>
       <GUID>1500011087</GUID>

diff --git a/mods/addon-new-world-cities/data/config/gui/texts_spanish.xml b/mods/addon-new-world-cities/data/config/gui/texts_spanish.xml
@@ -195,11 +195,11 @@
   <ModOp Type="add" Path="/TextExport/Texts">
     <Text>
       <GUID>1500011043</GUID>
-      <Text>Gapless Obrero Residence</Text> <!-- Building: Gapless Obrero Residence -->
+      <Text>Terraced Obrero Residence</Text> <!-- Building: Terraced Obrero Residence -->
     </Text>
     <Text>
       <GUID>1500011044</GUID>
-      <Text>Gapless Artista Residence</Text> <!-- Building: Gapless Artista Residence -->
+      <Text>Terraced Artista Residence</Text> <!-- Building: Terraced Artista Residence -->
     </Text>
     <Text>
       <GUID>1500011087</GUID>

diff --git a/mods/addon-new-world-cities/data/config/gui/texts_taiwanese.xml b/mods/addon-new-world-cities/data/config/gui/texts_taiwanese.xml
@@ -195,11 +195,11 @@
   <ModOp Type="add" Path="/TextExport/Texts">
     <Text>
       <GUID>1500011043</GUID>
-      <Text>Gapless Obrero Residence</Text> <!-- Building: Gapless Obrero Residence -->
+      <Text>Terraced Obrero Residence</Text> <!-- Building: Terraced Obrero Residence -->
     </Text>
     <Text>
       <GUID>1500011044</GUID>
-      <Text>Gapless Artista Residence</Text> <!-- Building: Gapless Artista Residence -->
+      <Text>Terraced Artista Residence</Text> <!-- Building: Terraced Artista Residence -->
     </Text>
     <Text>
       <GUID>1500011087</GUID>

diff --git a/mods/addon-new-world-cities/features.include.xml b/mods/addon-new-world-cities/features.include.xml
@@ -19,6 +19,6 @@
   <!-- Enclosed greenery uses InternalID 100 -->
   <Include File="./data/jakob/nw-enclosed-greenery/assets.include.xml" />
 
-  <!-- Artista Gapless / Skyscraper -->
+  <!-- Terraced Artista / Skyscraper -->
   <Include File="./data/jakob/gapless-artista/assets.include.xml" />
 </ModOps>
-Original file line number
+Diff line change
@@ Expand Up @@
     ### 1.3
+    - 1.3.1: fix Harborlife compatibility
     - Added gapless Artista residences with 3 skins
     ### 1.2
@@ Expand Down @@