jakobharder · jakobharder · Nov 25, 2023 · Nov 16, 2023 · Nov 16, 2023 · Nov 16, 2023
diff --git a/.github/package.js b/.github/package.js
@@ -7,7 +7,8 @@ function readMeta(filePath) {
   const modinfo = JSON.parse(fs.readFileSync(filePath));
   return {
     name: modinfo.ModName.English.replace(' (Jakob)', '').replace(/ /g, '-').replace(',', '').replace('\'', ''),
-    folder: `[${modinfo.Category.English}] ${modinfo.ModName.English}`,
+    // folder: `[${modinfo.Category.English}] ${modinfo.ModName.English}`,
+    path: path.dirname(filePath),
     version: modinfo.Version,
     id: modinfo.ModID,
     dependencies: modinfo.ModDependencies
@@ -45,7 +46,7 @@ const idsToPackage = [
   "jakob_compact_menus"
 ];
 
-const modsToPackage = glob.sync("./mods/**/modinfo.json")
+const modsToPackage = glob.sync("./out/*/modinfo.json")
   .map(e => readMeta(e))
   // .filter(e => fs.existsSync(path.join('out', e.folder)));
   .filter(e => idsToPackage.indexOf(e.id) >= 0);
@@ -55,12 +56,7 @@ const modsToInclude = glob.sync("./{mods,shared}/**/modinfo.json")
 for (mod of modsToPackage) {
   // const sharedMods = modsToInclude.filter(e => mod.ModDependencies?.indexOf(e.id) >= 0);
   console.log(`Package ${mod.name}-${mod.version}.zip`);
-  // for (shared of sharedMods) {
-  //   copyFolderSync(path.join('out', shared.folder), path.join('out', mod.folder, shared.folder));
-  // }
-  child_process.execFileSync('tar', [
-      '-ca',
-      '-f', path.join(process.cwd(), `out/${mod.name}-${mod.version}.zip`),
-      '-C', path.join(process.cwd(), 'out/'), `"${mod.folder}"`
-    ]);
+
+  child_process.execSync(
+    `tar -ca -f ${path.join(process.cwd(), `out/${mod.name}-${mod.version}.zip`)} -C ${path.join(process.cwd(), path.dirname(mod.path))} "${path.basename(mod.path)}"`);
 }
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -1,7 +1,7 @@
 on:
   push:
     tags:
-      - "*"
+      - "v*"
 permissions:
   contents: write
 name: Publish

diff --git a/.github/workflows/pullrequest.yml b/.github/workflows/pullrequest.yml
@@ -20,9 +20,10 @@ jobs:
       - name: build mods
         run: |
           npm run build-changed
-      - name: upload mods
-        uses: actions/upload-artifact@v2
-        with:
-          name: changed-mods
-          path: out/**
-          if-no-files-found: error
+          npm run package
+      # - name: upload mods
+      #   uses: actions/upload-artifact@v2
+      #   with:
+      #     name: changed-mods
+      #     path: out/*.zip
+      #     if-no-files-found: error
diff --git a/doc/CHANGELOG.md b/doc/CHANGELOG.md
@@ -2,6 +2,20 @@
 
 You can simply overwrite older version. The modloader automatically takes the right versions.
 
+## 6.4 - Quality Update
+
+- Industrial Cities, 3.2:
+  - Add cross-progression between terraced and vanilla residences
+  - Unlock floor upgrade button in construction menu (only with DLC `The High Life`)
+  - Fixed fuel pump station showing no warehouse connection warning in the New World
+- New World Cities, 2.1:
+  - Floor upgrade button to upgrade from vanilla to terraced residences
+  - Unlock floor upgrade button in construction menu (only with DLC `The High Life`)
+  - Fixed residences being unlocked too early
+- Alternative Needs, 2.1:
+  - Improve alternative needs infotips
+- Updated Korean translations (thanks to modpark817)
+
 ## 6.3 - Narrow Investors
 
 - Diagonal Residences, 1.9:

diff --git a/doc/residence-costs.md b/doc/residence-costs.md
@@ -0,0 +1,24 @@
+# Residence Costs and Cross-Progression
+
+## Old World
+
+Residence | Build Cost | Upgrade | Upgrade Floor
+--- | --- | --- | ---
+Worker | 6 Timber | 6 Timber, 2 Bricks, 2 Steel Beams | 500 Coins, 3 Timber, 2 Bricks, 1 Steel Beams, 1 Windows
+Terraced Worker I | 500 Coins, 9 Timber, 4 Bricks, 3 Steel Beams, 1 Windows | 1000 Coins, 8 Tmiber, 2 Bricks, 2 Steel Beams, 1 Windows | 500 Coins, 3 Timber, 2 Bricks, 1 Steel Beams, 1 Windows
+Terraced Worker II | 1000 Coins, 12 Timber, 6 Bricks, 4 Steel Beams, 2 Windows | 500 Coins, 5 Timber, 1 Steel Beams | -
+Artisans | 12 Timber, 2 Bricks, 2 Steel Beams | 8 Timber, 3 Bricks, 2 Steel Beams, 2 Windows | 1500 Coins, 5 Timber, 4 Bricks, 3 Steel Beams, 2 Windows
+Terraced Artisans I | 1500 Coins, 17 Timber, 6 Bricks, 5 Steel Beams, 2 Windows | 500 Coins, 2 Timber, 2 Bricks, 1 Window | 1500 Coins, 5 Timber, 4 Bricks, 3 Steel Beams, 2 Windows
+Terraced Artisans II | 3000 Coins, 22 Timber, 10 Bricks, 8 Steel Beams, 4 Windows | 500 Coins, 2 Timber, 2 Bricks, 1 Window | -
+
+## New World
+
+Residence | Build Cost | Upgrade | Upgrade Floor
+--- | --- | --- | ---
+Jornalero | 1 Timber | 2 Timber | 1 Timber, 1 Brick
+Terraced Jornalero | 2 Timber, 1 Brick | 2 Timber, 1 Brick | -
+Obrero | 3 Timber | 3 Timber, 2 Bricks | 1 Timber, 2 Bricks
+Terraced Obrero | 4 Timber, 2 Bricks | 4 Timber, 2 Bricks, 1 Aluminium | -
+Artista | 6 Timber, 2 Bricks | - | 2 Timber, 2 Bricks, 1 Aluminium
+Terraced Artista | 8 Timber, 4 Bricks, 1 Aluminium | - | 2 Timber, 2 Bricks, 2 Steel Beams, 2 Windows, 1 Aluminium
+Artista Skyscraper | 10 Timber, 6 Bricks, 2 Steel Beams, 2 Windows, 2 Aluminium | - | -
diff --git a/mods/addon-city-variations/README.md b/mods/addon-city-variations/README.md
@@ -71,9 +71,11 @@ The roofs are colored in realtime for reduced memory usage and better performanc
 
 ## Changes
 
-- 1.0.1: fixed missing hotels, commercial street icons
+- 1.0.2: Updated Korean translations (thanks to modpark817)
+- 1.0.2: Fixed New World hotel unhide
+- 1.0.1: Fixed missing hotels, commercial street icons
 
 ## Credits
 
-Thanks to MSHS, Aveneger432, darknesswei, Tonton Yip, mfuegar, DrD_AVEL for translations!
+Thanks to MSHS, Aveneger432, darknesswei, Tonton Yip, mfuegar, DrD_AVEL, modpark817 for translations!
 
diff --git a/mods/addon-city-variations/modinfo.json b/mods/addon-city-variations/modinfo.json
@@ -1,11 +1,12 @@
 {
-  "Version": "1.0.1",
+  "Version": "1.0.2",
   "ModID": "jakob-city-variations",
+  "ModioResourceId": 3229836,
   "DeprecatedIds": [
     "skin-everything-skin-pack-jakob"
   ],
   "bundle": [
-    "https://github.com/jakobharder/anno1800-shared-mods/releases/download/v3.2.5/shared-ground-textures-industry-jakob.zip",
+    "https://github.com/jakobharder/anno1800-shared-mods/releases/download/v3.4/shared-ground-textures-industry-jakob.zip",
     "../../shared/jakob-diagonal-ornaments",
     "../../shared/jakob-small-post"
   ],

diff --git a/mods/addon-industrial-cities/README.md b/mods/addon-industrial-cities/README.md
@@ -8,7 +8,7 @@ You find more dense farmer workforce population in `[Addon] Pescatarians (Jakob)
 
 ## Content
 
-### 1 - Industrial Complex
+### 1 - Industrial Factory Complex
 
 *Unlocks at 250 artisans - or creative mode*
 
@@ -97,13 +97,18 @@ Smaller **power plants** and additional energy options.
 
 ## Notes and Known Issues
 
-- There is no cross progression from upgraded residences to their next population tier.
-You have to downgrade to normal residences first - just like the skyscrapers handle it. This is due to technical reasons.
 - (workers only) The game always prefers one direction when building a single row of houses. You have to rotate such a building everytime you place or upgrade it or its neighbors.
 - The arrows for skyscraper upgrade don't show sometimes. The buildings will upgrade if you click anyway.
 
 ## Changes
 
+### 3.2
+
+- Add cross-progression between terraced and vanilla residences
+- Unlock floor upgrade button in construction menu (only with DLC `The High Life`)
+- Updated Korean translations (thanks to modpark817)
+- Fixed fuel pump station showing no warehouse connection warning in the New World
+
 ### 3.1
 
 - Added industrial soap factory and rendering works
@@ -128,4 +133,4 @@ You have to downgrade to normal residences first - just like the skyscrapers han
 
 ## Credits
 
-Thanks to m_belonosov, redzmey1, MSHS, Petritant, Aveneger432, darknesswei, Tonton Yip, mfuegar, DrD_AVEL for the translations!
+Thanks to m_belonosov, redzmey1, MSHS, Petritant, Aveneger432, darknesswei, Tonton Yip, mfuegar, DrD_AVEL, modpark817 for the translations!
diff --git a/mods/addon-industrial-cities/data/config/gui/texts_english.xml b/mods/addon-industrial-cities/data/config/gui/texts_english.xml
@@ -17,5 +17,13 @@
       <GUID>1500011281</GUID>
       <Text>Industrial Cities</Text>
     </Text>
+    <Text>
+      <GUID>1500011282</GUID>
+      <Text>Upgrade Terraced House</Text>
+    </Text>
+    <Text>
+      <GUID>1500011289</GUID>
+      <Text>Provide additional living space to increase your city's population.</Text>
+    </Text>
   </ModOp>
 </ModOps>
diff --git a/mods/addon-industrial-cities/modinfo.json b/mods/addon-industrial-cities/modinfo.json
@@ -1,22 +1,24 @@
 {
   "out": "${annoMods}/[Addon] Industrial Cities (Jakob)",
-  "Version": "3.1",
+  "Version": "3.2",
   "ModID": "jakob_industrial_cities",
+  "ModioResourceId": 3227009,
   "ModDependencies": [
-    "https://github.com/anno-mods/shared-resources/releases/download/v8.1/shared-pools-and-definitions.zip",
-    "https://github.com/jakobharder/anno1800-shared-mods/releases/download/v3.3/shared-products-jakob.zip",
-    "https://github.com/jakobharder/anno1800-shared-mods/releases/download/v3.3/shared-ground-textures-city-jakob.zip",
-    "https://github.com/jakobharder/anno1800-shared-mods/releases/download/v3.3/shared-ground-textures-industry-jakob.zip",
-    "https://github.com/jakobharder/anno1800-shared-mods/releases/download/v3.3/production-cans-and-suits-jakob.zip",
-    "https://github.com/jakobharder/anno1800-shared-mods/releases/download/v3.3/production-tools-jakob.zip",
-    "https://github.com/jakobharder/anno1800-shared-mods/releases/download/v3.3/production-import-tea-jakob.zip"
+    "https://github.com/anno-mods/shared-resources/releases/download/v8.2/shared-pools-and-definitions.zip",
+    "https://github.com/jakobharder/anno1800-shared-mods/releases/download/v3.4/shared-products-jakob.zip",
+    "https://github.com/jakobharder/anno1800-shared-mods/releases/download/v3.4/shared-ground-textures-city-jakob.zip",
+    "https://github.com/jakobharder/anno1800-shared-mods/releases/download/v3.4/shared-ground-textures-industry-jakob.zip",
+    "https://github.com/jakobharder/anno1800-shared-mods/releases/download/v3.4/production-cans-and-suits-jakob.zip",
+    "https://github.com/jakobharder/anno1800-shared-mods/releases/download/v3.4/production-tools-jakob.zip",
+    "https://github.com/jakobharder/anno1800-shared-mods/releases/download/v3.4/production-import-tea-jakob.zip"
   ],
   "DeprecateIds": [
     "jakob_extra_goods"
   ],
   "bundle": [
     "../../shared/jakob-power-plants",
-    "../../shared/shared-extra-goods"
+    "../../shared/shared-extra-goods",
+    "../../shared/jakob-skyscraper-button"
   ],
   "Category": {
     "Chinese": "插件",

diff --git a/mods/addon-new-world-cities/README.md b/mods/addon-new-world-cities/README.md
@@ -85,6 +85,13 @@ Only with DLC `New World Rising`.
 
 ## Changes
 
+### 2.1
+
+- Floor upgrade button to upgrade from vanilla to terraced residences
+- Unlock floor upgrade button in construction menu (only with DLC `The High Life`)
+- Fixed residences being unlocked too early
+- Updated Korean translations (thanks to modpark817)
+
 ### 2.0
 
 - 2.0.2: fixed missing obrero -> artista upgrade
@@ -99,4 +106,4 @@ Only with DLC `New World Rising`.
 
 Thanks to Lordy for the milking parlor model.
 
-Thanks to HeroOfOlympus, darknesswei, mfuegar, DrD_AVEL for the translations!
+Thanks to HeroOfOlympus, darknesswei, mfuegar, DrD_AVEL, modpark817 for the translations!
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
@@ -65,4 +65,117 @@
       <NextGUID>0</NextGUID>
     </Upgradable>
   </ModOp> -->
+
+  <!-- # Neighbors -->
+  <Group>
+    <!--
+      Note: upgrading between different templates can crash.
+      A custom template can deviate from the base if another mod modifies the base.
+      It's better to copy over instead of using a template in that case.
+    -->
+    <ModOp Type="merge" GUID="1500011250,1500011043,1500011044"
+      Path="/Values/Building">
+      <Building>
+        <InfluencedByNeighbors>
+          <Item>
+            <Building>101255</Building>
+          </Item>
+          <Item>
+            <Building>5405</Building>
+          </Item>
+          <Item>
+            <Building>1500011250</Building>
+          </Item>
+          <Item>
+            <Building>1500011043</Building>
+          </Item>
+          <Item>
+            <Building>1500011044</Building>
+          </Item>
+          <Item>
+            <Building>1500011090</Building>
+          </Item>
+        </InfluencedByNeighbors>
+        <InfluencedVariationDirection>
+          <!--
+            Direction rotates counter clock wise.
+            Default facing is X towards NW, Y towards NE.
+          -->
+          <Item>
+            <!-- single -->
+            <Type>DontCare</Type>
+          </Item>
+          <Item>
+            <!-- end, south-west -->
+            <Direction>1</Direction>
+            <Type>End</Type>
+          </Item>
+          <Item>
+            <!-- end, south-east -->
+            <Direction>2</Direction>
+            <Type>End</Type>
+          </Item>
+          <Item>
+            <!-- corner, south -->
+            <Direction>2</Direction>
+            <Type>Corner</Type>
+          </Item>
+          <Item>
+            <!-- end, north-east -->
+            <Direction>3</Direction>
+            <Type>End</Type>
+          </Item>
+          <Item>
+            <!-- mid, south-west to north-east -->
+            <Direction>1</Direction>
+            <Type>Mid</Type>
+          </Item>
+          <Item>
+            <!-- corner, east -->
+            <Direction>3</Direction>
+            <Type>Corner</Type>
+          </Item>
+          <Item>
+            <!-- T, front facing south-east -->
+            <Direction>3</Direction>
+            <Type>Mid</Type>
+          </Item>
+          <Item>
+            <!-- end, north-west -->
+            <Type>End</Type>
+          </Item>
+          <Item>
+            <!-- corner, west -->
+            <Direction>1</Direction>
+            <Type>Corner</Type>
+          </Item>
+          <Item>
+            <!-- mid, north-west to south-east -->
+            <Type>Mid</Type>
+          </Item>
+          <Item>
+            <!-- T, front facing south-west  -->
+            <Direction>2</Direction>
+            <Type>Mid</Type>
+          </Item>
+          <Item>
+            <!-- corner, north -->
+            <Type>Corner</Type>
+          </Item>
+          <Item>
+            <!-- T, front facing north-west -->
+            <Direction>1</Direction>
+            <Type>Mid</Type>
+          </Item>
+          <Item>
+            <!-- T, front facing north-east -->
+            <Type>Mid</Type>
+          </Item>
+          <Item>
+            <!-- cross -->
+          </Item>
+        </InfluencedVariationDirection>
+      </Building>
+    </ModOp>
+  </Group>
 </ModOps>