diff --git a/.github/package.js b/.github/package.js index 050a4969..3fe1a0a4 100644 --- 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 deleted file mode 100644 index e58a51b1..00000000 --- a/.github/workflows/main.yml +++ /dev/null @@ -1,25 +0,0 @@ -on: - push: - branches: - - main - -name: Full build - -jobs: - release: - runs-on: windows-latest - steps: - - uses: actions/checkout@v2 - - uses: actions/setup-node@v2 - with: - node-version: '16' - - name: install dependencies - run: npm install . - - name: build mods - run: npm run build - - name: upload mods - uses: actions/upload-artifact@v2 - with: - name: jakobs-mods - path: out/** - if-no-files-found: error diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 85900d55..e71f36ae 100644 --- 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 index 3b45c797..6ba8c870 100644 --- 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 index 0d059876..e8879275 100644 --- 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 new file mode 100644 index 00000000..f5f9dcd5 --- /dev/null +++ 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 | - | - \ No newline at end of file diff --git a/mods/addon-city-variations/README.md b/mods/addon-city-variations/README.md index 9747b909..ca21dabb 100644 --- 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 index 78a19f5e..6ebc7390 100644 --- 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 index 70cccdd2..e6c34d16 100644 --- 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 index 68628f45..f868057f 100644 --- 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 @@ 1500011281 Industrial Cities + + 1500011282 + Upgrade Terraced House + + + 1500011289 + Provide additional living space to increase your city's population. + diff --git a/mods/addon-industrial-cities/modinfo.json b/mods/addon-industrial-cities/modinfo.json index 479c7270..810b213c 100644 --- 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 index 62f885d5..1ce19be6 100644 --- 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 index 04a0847a..10647da3 100644 --- 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 @@ 0 --> + + + + + + + + + 101255 + + + 5405 + + + 1500011250 + + + 1500011043 + + + 1500011044 + + + 1500011090 + + + + + + + DontCare + + + + 1 + End + + + + 2 + End + + + + 2 + Corner + + + + 3 + End + + + + 1 + Mid + + + + 3 + Corner + + + + 3 + Mid + + + + End + + + + 1 + Corner + + + + Mid + + + + 2 + Mid + + + + Corner + + + + 1 + Mid + + + + Mid + + + + + + + + diff --git a/mods/addon-new-world-cities/data/config/export/main/asset/templates.xml b/mods/addon-new-world-cities/data/config/export/main/asset/templates.xml index 2a18e0fe..2f3098ee 100644 --- a/mods/addon-new-world-cities/data/config/export/main/asset/templates.xml +++ b/mods/addon-new-world-cities/data/config/export/main/asset/templates.xml @@ -1,217 +1,12 @@ - - + + + + + + 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 index ae8f684f..74bb2723 100644 --- a/mods/addon-new-world-cities/data/config/gui/texts_korean.xml +++ b/mods/addon-new-world-cities/data/config/gui/texts_korean.xml @@ -72,27 +72,27 @@ 1500011049 - Stone Paving + 돌 포장재(Stone Paving) 1500011050 - Walls on Dirt + 흙위의 벽(Walls on Dirt) 1500011051 - "New World Cities" Ornaments + "신대륙 도시" 장식 1500011052 - Dirt + 흙(Dirt) 1500011053 - Walls on Grass + 잔디위의 벽(Walls on Grass) 1500011054 - Tree with Bench + 벤치가 있는 나무(Tree with Bench) 1500011055 @@ -192,41 +192,41 @@ 1500011043 - Terraced Obrero Residence + 테라스 식민지 직공 주택 1500011044 - Terraced Artista Residence + 테라스 아티스타 주택 1500011087 - Terraced Houses + 테라스 주거지 1500011090 - Artista Skyscraper + 아티스타 마천루 1500011100 - White Walls Skin + 하얀 벽 양식 1500011101 - Tile roofs to match with your Obrero residences. + 식민지 거주지와 어울리는 기와 지붕입니다. 1500011102 - Tile Roof Skin + 기와 지붕 양식 1500011097 - Artista Skyscraper Buff + 아티스타 마천루 버프 1500011250 - Terraced Jornalero House + 테라스 식민지 노동자 주택 @@ -255,7 +255,7 @@ 1500011237 - Cheese Dairy + 치즈 제조소 @@ -265,36 +265,33 @@ 1500011240 - Milking Parlour + 착유장 1500011241 - Milking Parlour + 착유장 1500011243 - Cattle farms in range produce milk. + 범위 안의 목장은 우유를 생산합니다. - 1500011260 - Terraced Houses + 테라스 주거지 - 1500011261 - Materials and Electricity + 재료와 전기 - 1500011262 - Terraced Artista Houses + 테라스 아티스타 주택 \ No newline at end of file diff --git a/mods/addon-new-world-cities/data/jakob/gapless-artista/_assets.include.xml b/mods/addon-new-world-cities/data/jakob/gapless-artista/_assets.include.xml index d16e727b..e5575117 100644 --- a/mods/addon-new-world-cities/data/jakob/gapless-artista/_assets.include.xml +++ b/mods/addon-new-world-cities/data/jakob/gapless-artista/_assets.include.xml @@ -1,18 +1,8 @@ - - - + 1500011044 @@ -21,6 +11,11 @@ GUIDs: https://github.com/anno-mods/GuidRanges 163059 + Residence + 0 + Colony01 + 100004 + 1 - + + + 1500011044 + 1010196 2 @@ -651,14 +666,14 @@ GUIDs: https://github.com/anno-mods/GuidRanges 838 1 - - + + 30 - --> + diff --git a/mods/addon-new-world-cities/data/jakob/terraced-jornalero/_assets.include.xml b/mods/addon-new-world-cities/data/jakob/terraced-jornalero/_assets.include.xml index bf4a6aa1..ad656775 100644 --- a/mods/addon-new-world-cities/data/jakob/terraced-jornalero/_assets.include.xml +++ b/mods/addon-new-world-cities/data/jakob/terraced-jornalero/_assets.include.xml @@ -3,7 +3,7 @@ - + 1500011250 @@ -12,6 +12,11 @@ 163059 + Residence + 0 + Colony01 + 100004 + 1 + + + + 1500011250 + + + 1010196 + 2 + + + 1010205 + 1 + + + + diff --git a/mods/addon-new-world-cities/data/jakob/terraced-obrero/_assets.include.xml b/mods/addon-new-world-cities/data/jakob/terraced-obrero/_assets.include.xml index dd8a5153..8695178c 100644 --- a/mods/addon-new-world-cities/data/jakob/terraced-obrero/_assets.include.xml +++ b/mods/addon-new-world-cities/data/jakob/terraced-obrero/_assets.include.xml @@ -2,7 +2,7 @@ - + 1500011043 @@ -11,6 +11,11 @@ 163059 + Residence + 0 + Colony01 + 100004 + 1 + + + + 1500011043 + + + 1010196 + 1 + + + 1010205 + 2 + + + + diff --git a/mods/addon-new-world-cities/modinfo.json b/mods/addon-new-world-cities/modinfo.json index 099703fa..9a29671b 100644 --- a/mods/addon-new-world-cities/modinfo.json +++ b/mods/addon-new-world-cities/modinfo.json @@ -1,15 +1,16 @@ { "out": "${annoMods}/[Addon] New World Cities (Jakob)", - "Version": "2.0.2", + "Version": "2.1", "ModID": "jakob_new_world_cities", + "ModioResourceId": 3229897, "DeprecateIds": [ "jakob_nw_construction", "jakob_bugfix_celluloid", "jakob_power_nw" ], "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.2.5/shared-products-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" ], "LoadAfterIds": [ "shared-pools-and-definitions", @@ -18,7 +19,8 @@ "shared-products-jakob" ], "bundle": [ - "../../shared/jakob-diagonal-ornaments" + "../../shared/jakob-diagonal-ornaments", + "../../shared/jakob-skyscraper-button" ], "Category": { "Chinese": "插件", diff --git a/mods/addon-pescatarians/README.md b/mods/addon-pescatarians/README.md index 407bd697..2f09f0cd 100644 --- a/mods/addon-pescatarians/README.md +++ b/mods/addon-pescatarians/README.md @@ -51,6 +51,7 @@ All products come with new production buildings. ### 2.1 +- 2.1.10: Updated Korean translations (thanks to modpark817) - 2.1.9: Fixed vegetable farm sometimes disappearing - 2.1.7: Freshly upgraded artisan house has now same population as full worker houses - 2.1.7: Fixed various missing and broken text issues @@ -66,4 +67,4 @@ All products come with new production buildings. ## Credits -Thanks to @m_belonosov, redzmey1, MSHS, @Petritant, HeroOfOlympus, Aveneger432, darknesswei, mfuegar, DrD_AVEL for the translations! +Thanks to m_belonosov, redzmey1, MSHS, Petritant, HeroOfOlympus, Aveneger432, darknesswei, mfuegar, DrD_AVEL, modpark817 for the translations! diff --git a/mods/addon-pescatarians/data/config/gui/texts_korean.xml b/mods/addon-pescatarians/data/config/gui/texts_korean.xml index 909f7bef..85a07ad3 100644 --- a/mods/addon-pescatarians/data/config/gui/texts_korean.xml +++ b/mods/addon-pescatarians/data/config/gui/texts_korean.xml @@ -4,7 +4,7 @@ 601382 - 페스카테리언 + 페스카테리안 1500010100 @@ -20,7 +20,7 @@ 1500010134 - 페스카테리언 + 페스카테리안 1500010136 @@ -32,35 +32,35 @@ 1500010142 - 페스카테리언 농부 주거지 + 페스카테리안 농부 주거지 1500010143 - 페스카테리언 노동자 주거지 + 페스카테리안 노동자 주거지 1500010144 - 페스카테리언 직공 주거지 + 페스카테리안 직공 주거지 1500010145 - 페스카테리언 기술자 주거지 + 페스카테리안 기술자 주거지 1500010146 - 페스카테리언 주민들이 사는 곳입니다. 주민은 수입과 노동력을 제공합니다. + 페스카테리안 주민들이 사는 곳입니다. 주민은 수입과 노동력을 제공합니다. 1500010147 - 페스카테리언 주거지 + 페스카테리안 주거지 1500010148 - 페스카테리언 주거지 + 페스카테리안 주거지 1500010169 - Mixed Engineer and Artisan residences. + 기술자와 직공이 혼합된 주거지입니다. 1500010170 @@ -69,7 +69,7 @@ 1500010173 - Taller Artisan residences. + 더 높은 직공 주거지입니다. 1500010186 @@ -81,11 +81,11 @@ 1500010189 - Mixed Artisan and Worker residences. + 직공과 노동자가 혼합된 주거지입니다. 1500010282 - 페스카테리언 주거지 + 페스카테리안 주거지 1500010800 @@ -97,43 +97,43 @@ 1500010804 - Mixed Workforce + 혼합된 노동력 1500010806 - Pescatarians + 페스카테리안 1500010810 - Angry Pescatarian + 성난 페스카테리안 1500010811 - Unhappy Pescatarian + 불행한 페스카테리안 1500010812 - Content Pescatarian + 만족하는 페스카테리안 1500010813 - Happy Pescatarian + 행복한 페스카테리안 1500010814 - Euphoric Pescatarian + 행복에 취한 페스카테리안 1500010321 - Tall Red Skin + 높은 빨간 양식(Tall Red Skin) 1500010833 - Dark Skin + 검은 양식(Dark Skin) 1500010311 - Tall Blue Skin + 높은 파란 양식(Tall Blue Skin) @@ -141,33 +141,33 @@ 1500010816 - Library + 도서관 1500010818 - Library + 도서관 1500010841 - Yellow Skin + 노란 양식(Yellow Skin) 1500010842 - School Skin + 학교 양식(School Skin) 1500010817 - Small Post Office + 작은 우체국 1500010819 - Seafood Restaurant + 해산물 식당 1500010820 - Seafood Restaurant + 해산물 식당 @@ -175,7 +175,7 @@ 1500010821 - 3 Mast Schooner + 3 돛 소형 범선 @@ -183,27 +183,27 @@ 1500010822 - Rope Maker + 밧줄 제작소(Rope Maker) 1500010824 - Ropes + 밧줄 1500010825 - Ropes + 밧줄 1500010827 - Fishernets + 어망(Fishernets) 1500010828 - Fishernet Maker + 어망 제작소(Fishernet Maker) 1500010829 - Fishernets + 어망(Fishernets) \ No newline at end of file diff --git a/mods/addon-pescatarians/modinfo.json b/mods/addon-pescatarians/modinfo.json index 532d47f1..1e7d0a60 100644 --- a/mods/addon-pescatarians/modinfo.json +++ b/mods/addon-pescatarians/modinfo.json @@ -1,17 +1,18 @@ { - "Version": "2.1.9", + "Version": "2.1.10", "ModID": "jakob_pescatarians", + "ModioResourceId": 3229941, "DeprecateIds": [ "jakob_extra_goods" ], "ModDependencies": [ "../../shared/production-olive-soap-jakob", "../../shared/production-pickles-jakob", - "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-vegetables-and-cheese-jakob.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-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-vegetables-and-cheese-jakob.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-industry-jakob.zip" ], "bundle": [ "../../shared/shared-extra-goods", diff --git a/mods/building-biogas-production/README.md b/mods/building-biogas-production/README.md index da8ec50d..35dbd805 100644 --- a/mods/building-biogas-production/README.md +++ b/mods/building-biogas-production/README.md @@ -30,10 +30,11 @@ You find the biogas production in the material menu, and in the gas electricity ### 1.6 +- 1.6.3: Updated Korean translations (thanks to modpark817) - 1.6.2: Russian translation - 1.6.1: Fixed blurry icons - Immediately unlock in creative mode ## Credits -Thanks to darknesswei, Tonton Yip for, mfuegar, DrD_AVEL translations! +Thanks to darknesswei, Tonton Yip, mfuegar, DrD_AVEL, modpark817 for the translations! diff --git a/mods/building-biogas-production/data/config/gui/texts_korean.xml b/mods/building-biogas-production/data/config/gui/texts_korean.xml index e9db2c8a..6b89a77a 100644 --- a/mods/building-biogas-production/data/config/gui/texts_korean.xml +++ b/mods/building-biogas-production/data/config/gui/texts_korean.xml @@ -7,7 +7,7 @@ 1500010036 - 가스 소비량 1/2로 감소. + 가스 소비량이 1/2로 감소되면서 범위도 감소했습니다. 1500010456 @@ -23,11 +23,11 @@ 1500010010 - 바이오가스 공장 + 바이오가스 발전소 1500010011 - 가축 농장의 폐기물로 가스를 생산합니다. + 가축 농장의 분변으로 가스를 생산합니다. 1500010012 @@ -35,11 +35,11 @@ 1500010013 - 폐기물 저장소 주변의 가축 농장은 추가 처리를 위해 농장 폐기물을 저장합니다. + 분변 저장소 주변의 가축 농장은 추가 처리를 위해 분변을 저장합니다. 1500010015 - 폐기물 저장소 + 분변 저장소 1500010018 diff --git a/mods/building-biogas-production/modinfo.json b/mods/building-biogas-production/modinfo.json index 1601745a..8f220fa1 100644 --- a/mods/building-biogas-production/modinfo.json +++ b/mods/building-biogas-production/modinfo.json @@ -1,6 +1,7 @@ { - "Version": "1.6.2", + "Version": "1.6.3", "ModID": "jakob_biogas", + "ModioResourceId": 3229958, "DeprecateIds": [ "jakob_Biogas_Plant" ], diff --git a/mods/building-commercial/modinfo.json b/mods/building-commercial/modinfo.json index 6dda397f..2e33d793 100644 --- a/mods/building-commercial/modinfo.json +++ b/mods/building-commercial/modinfo.json @@ -5,7 +5,7 @@ "DeprecateIds": [ ], "ModDependencies": [ - "https://github.com/jakobharder/anno1800-shared-mods/releases/download/v3.2.5/shared-ground-textures-city-jakob.zip" + "https://github.com/jakobharder/anno1800-shared-mods/releases/download/v3.4/shared-ground-textures-city-jakob.zip" ], "Category": { "Chinese": "建筑", diff --git a/mods/building-diagonal-residences/README.md b/mods/building-diagonal-residences/README.md index 43aceb46..ff6b8ae2 100644 --- a/mods/building-diagonal-residences/README.md +++ b/mods/building-diagonal-residences/README.md @@ -43,6 +43,8 @@ Known issues: ### 1.9 +- 1.9.1: Move unlock after first engineer/investor has been built +- 1.9.1: Updated Korean translations (thanks to modpark817) - Added narrow 3x1 tiles investor residence - Added `Vibrant City` skins to narrow engineer residence - Reduce lifestyle needs of narrow residences to 1/3 population @@ -60,8 +62,6 @@ Known issues: - Added greenery wall with diagonal skin - Added corner variations skins to fences, park paths -## Translations +## Credits -Available: Chinese, French, English, German, Polish, Spanish - -Thanks go to Aveneger432, HeroOfOlympus, darknesswei, Tonton Yip, mfuegar, DrD_AVEL for the translations! +Thanks go to Aveneger432, HeroOfOlympus, darknesswei, Tonton Yip, mfuegar, DrD_AVEL, modpark817 for the translations! diff --git a/mods/building-diagonal-residences/data/config/export/main/asset/assets_.xml b/mods/building-diagonal-residences/data/config/export/main/asset/assets_.xml index 829ecbe2..0c373b72 100644 --- a/mods/building-diagonal-residences/data/config/export/main/asset/assets_.xml +++ b/mods/building-diagonal-residences/data/config/export/main/asset/assets_.xml @@ -1,3 +1,6 @@ + @@ -111,6 +114,7 @@ + diff --git a/mods/building-diagonal-residences/data/config/export/main/asset/unlocks.include.xml b/mods/building-diagonal-residences/data/config/export/main/asset/unlocks.include.xml new file mode 100644 index 00000000..2e10279f --- /dev/null +++ b/mods/building-diagonal-residences/data/config/export/main/asset/unlocks.include.xml @@ -0,0 +1,374 @@ + + + + + + + + 1500010427 + + + + @ 1 Engineer built + + + + + + + + ObjectBuilt + 1010346 + 1 + + + + + + + + + + + + + 1500010401 + + + 1500010402 + + + 1500010403 + + + + + + + + + + 0 + + + + + + + + 1500011119 + + + @ 1 Investor built + + + + + + + + ObjectBuilt + 1010347 + 1 + + + + + + + + + + + + + 1500011110 + + + + + + + + + + 0 + + + + + + + + 1500011359 + @ 1 Engineer built + + + + + + + + ObjectBuilt + 1010346 + 1 + + + + + + + + + + + + + 1500010415 + + + + + + + + + + 0 + + + + + + + + 1500011351 + @ 1 Investor built + + + + + + + + ObjectBuilt + 1010347 + 1 + + + + + + + + + + + + + 1500011350 + + + + + + + + + + 0 + + + + + + + + + + + + 1500011363 + @ Skyscraper Unlocked + + + + + + + + 601888 + + + + + + + + + + + + + + 1500010401 + + + 1500010402 + + + 1500010403 + + + 1500011110 + + + + + + + + + + 0 + + + + + + + + 1500011364 + @ Skyscraper Unlocked + + + + + + + + 601888 + + + + + + + + + + + + + + 1500010415 + + + 1500011350 + + + + + + + + + + 0 + + + + + + + + + + + + 1500011367 + Creative Mode + + + + + + + + + + + + + + + + + + + 1500010401 + + + 1500010402 + + + 1500010403 + + + 1500011110 + + + + + + + + + + 0 + + + + + + + + 1500011368 + Creative Mode + + + + + + + + + + + + + + + + + + + 1500010415 + + + 1500011350 + + + + + + + + + + 0 + + + + + \ No newline at end of file diff --git a/mods/building-diagonal-residences/data/config/gui/texts_korean.xml b/mods/building-diagonal-residences/data/config/gui/texts_korean.xml index 5c69a911..44dd7875 100644 --- a/mods/building-diagonal-residences/data/config/gui/texts_korean.xml +++ b/mods/building-diagonal-residences/data/config/gui/texts_korean.xml @@ -1,70 +1,57 @@ - 1500010401 - Diagonal Engineer Residence + 대각선 기술자 주택 - 1500010402 - Diagonal End + 대각선 말단 - 1500010403 - Diagonal Residences + 대각선 거주지 - 1500010426 - Resist the grid! + 격자에 저항하라! - 1500010424 - Use [ShortcutManager ShortcutTooltip(changevariation)] to cycle through variations before you place it. You need to relocate if you want to change an existing building. + 배치하기 전에 [ShortcutManager ShortcutTooltip(changevariation)]를 사용하여 변형을 순환하세요. 기존 건물을 변경하려면 이전해야 합니다. - 1500010425 - Use this ornament to prevent people walking through the corners of a diagonal building. Only needed if you have diagonal sides without neighbours. + 사람들이 대각선 건물의 모퉁이를 통과하는 것을 방지하려면 이 장식물을 사용하십시오. 이웃이 없는 대각선 측면이 있는 경우에만 필요합니다. - 1500010415 - Narrow Residence + 좁은 거주지 - 1500010306 - Green Roofs + 초록 지붕 - 1500010307 - From 'Colored Roofs, Residences'. + '채색된 지붕, 거주지'로부터. - 1500010310 - Dark Roofs + 검은 지붕 - 1500010318 - Red Roofs + 빨간 지붕 - 1500010319 - Dark Red Roofs + 짙은 붉은 지붕 - 1500011110 - Diagonal Investor Residence + 대각선 투자가 주택 \ No newline at end of file diff --git a/mods/building-diagonal-residences/data/jakob/diagonal-engineers/assets.include.xml b/mods/building-diagonal-residences/data/jakob/diagonal-engineers/assets.include.xml index ae34be4f..1a4e6cf6 100644 --- a/mods/building-diagonal-residences/data/jakob/diagonal-engineers/assets.include.xml +++ b/mods/building-diagonal-residences/data/jakob/diagonal-engineers/assets.include.xml @@ -127,55 +127,6 @@ - - - - - 1500010427 - - - - @ Engineers (1010346) - - - - - - - - 1010346 - - - - - - - - - - - - - 1500010401 - - - 1500010402 - - - 1500010403 - - - - - - - - - - 0 - - - diff --git a/mods/building-diagonal-residences/data/jakob/diagonal-investors/assets.include.xml b/mods/building-diagonal-residences/data/jakob/diagonal-investors/assets.include.xml index 8d24718b..f1a10543 100644 --- a/mods/building-diagonal-residences/data/jakob/diagonal-investors/assets.include.xml +++ b/mods/building-diagonal-residences/data/jakob/diagonal-investors/assets.include.xml @@ -109,48 +109,6 @@ diff --git a/mods/building-diagonal-residences/data/jakob/narrow-residences/assets.include.xml b/mods/building-diagonal-residences/data/jakob/narrow-residences/assets.include.xml index 708e9313..1453256b 100644 --- a/mods/building-diagonal-residences/data/jakob/narrow-residences/assets.include.xml +++ b/mods/building-diagonal-residences/data/jakob/narrow-residences/assets.include.xml @@ -204,46 +204,6 @@ 1500010502 - Dark roofs + 검은 지붕 1500010503 - Engineer/Investor roofs + 기술자/투자가 지붕 1500010504 - Dark red roofs + 어두운 빨간 지붕 1500010512 - Small Hotels (Jakob) + 작은 호텔 (Jakob) 1500010529 @@ -26,23 +26,23 @@ 1500010507 - Red roofs #2 + 빨간 지붕 #2 1500010508 - Dark red roofs #1 + 어두운 빨간 지붕 #1 1500010509 - Dark red roofs #2 + 어두운 빨간 지붕 #2 1500010510 - Dark roofs + 검은 지붕 1500010531 - Reduced floors, red tile roofs #1 + 줄어든 층, 빨간 기와 지붕 #1 1500010532 @@ -50,15 +50,15 @@ 1500010533 - Reduced floors, red tile roofs #2 + 줄어든 층, 빨간 기와 지붕 #2 1500010534 - Reduced floors, dark red tile roofs + 줄어든 층, 어두운 빨간 기와 지붕 1500010535 - Reduced floors, metal roofs + 줄어든 층, 금속 지붕 1500010536 @@ -74,7 +74,7 @@ 1500010834 - Recolored residence. + 재채색된 거주지 \ No newline at end of file diff --git a/mods/building-hotels/modinfo.json b/mods/building-hotels/modinfo.json index 92f48e43..8f824310 100644 --- a/mods/building-hotels/modinfo.json +++ b/mods/building-hotels/modinfo.json @@ -1,11 +1,11 @@ { "out": "${annoMods}/[Addon] Jakob's City Variations/hotels", - "Version": "1.6", + "Version": "1.6.1", "ModID": "jakob_small_hotels", "DeprecateIds": [ ], "ModDependencies": [ - "https://github.com/anno-mods/shared-resources/releases/download/v8.1/shared-pools-and-definitions.zip" + "https://github.com/anno-mods/shared-resources/releases/download/v8.2/shared-pools-and-definitions.zip" ], "LoadAfterIds": [ "shared-pools-and-definitions" diff --git a/mods/building-modular-factories/data/config/gui/texts_korean.xml b/mods/building-modular-factories/data/config/gui/texts_korean.xml index 7721a57b..9a93cd6b 100644 --- a/mods/building-modular-factories/data/config/gui/texts_korean.xml +++ b/mods/building-modular-factories/data/config/gui/texts_korean.xml @@ -5,25 +5,17 @@ 1500010600 재봉틀 공장 - - 1500011270 - 비누 공장 - - - 1500011271 - 축산 가공장 - 1500010601 - 산업단지 + 모듈식 공장 1500010602 - 여러 공장이 하나의 단지로 병합 + 여러 공장들을 하나로 통합합니다. \ No newline at end of file diff --git a/mods/building-modular-factories/modinfo.json b/mods/building-modular-factories/modinfo.json index c478c2d1..b6252e4f 100644 --- a/mods/building-modular-factories/modinfo.json +++ b/mods/building-modular-factories/modinfo.json @@ -1,6 +1,6 @@ { "out": "${annoMods}/[Addon] Industrial Cities (Jakob)/jakob-modular-factories", - "Version": "1.3", + "Version": "1.3.1", "ModID": "jakob-modular-factories", "DeprecateIds": [ "jakob_modular_factories" diff --git a/mods/building-railway/data/config/gui/texts_korean.xml b/mods/building-railway/data/config/gui/texts_korean.xml index f6b3021d..7e503ba1 100644 --- a/mods/building-railway/data/config/gui/texts_korean.xml +++ b/mods/building-railway/data/config/gui/texts_korean.xml @@ -2,19 +2,19 @@ 1500011080 - Freight Platform + 화물 적하장 1500011081 - Passenger Platform + 여객 승강장 1500011082 - Dirt + 흙(Dirt) 1500011083 - Railway Stations (Jakob) + 철도역 (Jakob) diff --git a/mods/building-railway/modinfo.json b/mods/building-railway/modinfo.json index bf0faee3..66d1a552 100644 --- a/mods/building-railway/modinfo.json +++ b/mods/building-railway/modinfo.json @@ -1,6 +1,6 @@ { "out": "${annoMods}/[Addon] Industrial Cities (Jakob)/jakob-railway-stations", - "Version": "1.2.3", + "Version": "1.2.4", "ModID": "jakob-railway-stations", "DeprecateIds": [ "jakob_railway" diff --git a/mods/building-terraced-houses/data/config/export/main/asset/assets_.xml b/mods/building-terraced-houses/data/config/export/main/asset/assets_.xml index f2fd1327..fda01e35 100644 --- a/mods/building-terraced-houses/data/config/export/main/asset/assets_.xml +++ b/mods/building-terraced-houses/data/config/export/main/asset/assets_.xml @@ -2,11 +2,6 @@ Upgradable Low Tiers --> - - - data/ui/2kimages/main/icons/icon_increase_population_2.png - - @@ -64,8 +59,7 @@ - - + 1500010200 @@ -92,14 +86,13 @@ - - + 1500010225 1010017 - 1000 + 1500 1010196 @@ -310,7 +303,7 @@ 1010196 - 15 + 9 1010205 @@ -330,9 +323,29 @@ 1500010200 - - 0 - + 1500010225 + + + 1010017 + 1000 + + + 1010196 + 8 + + + 1010205 + 2 + + + 1010218 + 2 + + + 1010207 + 1 + + @@ -430,68 +443,6 @@ - 1 - - - - data/ui/2kimages/main/3dicons/icon_city_ornament_large.png - - - - - data/jakob/buildings/residence/worker_scraper/worker_scraper_empty.cfg - data/jakob/buildings/residence/worker_scraper/worker_scraper_roof.cfg - - - data/jakob/buildings/residence/worker_scraper/worker_scraper_empty.cfg - data/jakob/buildings/residence/worker_scraper/worker_scraper_roof.cfg - - - data/jakob/buildings/residence/worker_scraper/worker_scraper_empty.cfg - data/jakob/buildings/residence/worker_scraper/worker_scraper_roof.cfg - - - data/jakob/buildings/residence/worker_scraper/worker_scraper_empty.cfg - data/jakob/buildings/residence/worker_scraper/worker_scraper_roof.cfg - - - - data/jakob/buildings/residence/worker_scraper/worker_scraper_empty.cfg - data/jakob/buildings/residence/worker_scraper/worker_scraper_roof.cfg - - - data/jakob/buildings/residence/worker_scraper/worker_scraper_empty.cfg - data/jakob/buildings/residence/worker_scraper/worker_scraper_roof.cfg - - - - data/jakob/buildings/residence/worker_scraper/worker_scraper_empty.cfg - data/jakob/buildings/residence/worker_scraper/worker_scraper_roof.cfg - - - data/jakob/buildings/residence/worker_scraper/worker_scraper_empty.cfg - data/jakob/buildings/residence/worker_scraper/worker_scraper_roof.cfg - - - data/jakob/buildings/residence/worker_scraper/worker_scraper_empty.cfg - data/jakob/buildings/residence/worker_scraper/worker_scraper_roof.cfg - - - data/jakob/buildings/residence/worker_scraper/worker_scraper_empty.cfg - data/jakob/buildings/residence/worker_scraper/worker_scraper_roof.cfg - - - - data/jakob/buildings/residence/worker_scraper/worker_scraper_empty.cfg - data/jakob/buildings/residence/worker_scraper/worker_scraper_roof.cfg - - - data/jakob/buildings/residence/worker_scraper/worker_scraper_empty.cfg - data/jakob/buildings/residence/worker_scraper/worker_scraper_roof.cfg - - - - 1500010201 @@ -524,7 +475,7 @@ 14 - Skyscrapers + Residences