Skip to content

Commit

Permalink
Merge pull request #116 from jakobharder/devel/7.1
Browse files Browse the repository at this point in the history
add various improvements, current t4 residence state
  • Loading branch information
jakobharder authored Aug 3, 2024
2 parents ae3a327 + a2805cb commit e0a551b
Show file tree
Hide file tree
Showing 297 changed files with 57,419 additions and 1,289 deletions.
4 changes: 4 additions & 0 deletions doc/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,11 @@ You can simply overwrite older version. The modloader automatically takes the ri

## [Unreleased]

- Brick Post Office skin
- Compact Menu
- Improved Russian translations thanks to DATM
- Re-organized construction menu
- Instant Residences

## 7.0 - More Factories, Integrated Pescatarians

Expand Down
2 changes: 1 addition & 1 deletion mods/addon-city-variations/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ The roofs are colored in realtime for reduced memory usage and better performanc

## Changes

- 1.0.10: Improved Russian translations thanks to DATM
- 1.1: Brick Post Office skin

## Credits

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,57 +9,4 @@
</Item>
</ModOp>
</Group>

<!-- # Commercial Street -->
<!-- Old World Menu Engineers, insert after oil power plant -->
<Group>
<ModOp Type="addNextSibling" GUID="135100">
<Asset>
<Template>ConstructionCategory</Template>
<Values>
<Standard>
<GUID>1500010868</GUID>
<Name>minimalls_menu</Name>
<IconFilename>data/ui/jakob/icon_commercial.png</IconFilename>
</Standard>
<ConstructionCategory>
<BuildingList>
<Item>
<Building>1500010517</Building>
</Item>
<Item>
<Building>1500010888</Building>
</Item>
<Item>
<Building>1500010850</Building>
</Item>
<Item>
<Building>1500010856</Building>
</Item>
<Item>
<Building>1500010862</Building>
</Item>
<Item>
<Building>1500010909</Building>
</Item>
</BuildingList>
<CategoryDescription>1500010512</CategoryDescription>
</ConstructionCategory>
<Locked />
</Values>
</Asset>
</ModOp>
<ModOp Type="addPrevSibling" GUID='500094' Path="/Values/ConstructionCategory/BuildingList/Item[Building='2015']">
<Item>
<Building>1500010868</Building>
</Item>
</ModOp>
<ModOp Type="addNextSibling" GUID="25000192,500447"
Path="/Values/ConstructionCategory/BuildingList/Item[Building='134629']">
<Item>
<Building>1500010868</Building>
<Investor>5000</Investor>
</Item>
</ModOp>
</Group>
</ModOps>
12 changes: 7 additions & 5 deletions mods/addon-city-variations/modinfo.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"Version": "1.0.10",
"Version": "1.1.1",
"ModID": "jakob-city-variations",
"ModioResourceId": 3229836,
"ModDependencies": [
"https://github.com/anno-mods/shared-resources/releases/download/v10.2.1/shared-pools-and-definitions.zip"
"https://github.com/anno-mods/shared-resources/releases/download/v10.5/shared-pools-and-definitions.zip"
],
"DeprecateIds": [
"skin-everything-skin-pack-jakob"
Expand All @@ -12,10 +12,12 @@
"shared-pools-and-definitions"
],
"bundle": [
"https://github.com/jakobharder/anno1800-shared-mods/releases/download/v4.5.1/decals-industry-jakob.zip",
"https://github.com/jakobharder/anno1800-shared-mods/releases/download/v4.5.1/decals-city-jakob.zip",
"https://github.com/jakobharder/anno1800-shared-mods/releases/download/v4.5.2/decals-industry-jakob.zip",
"https://github.com/jakobharder/anno1800-shared-mods/releases/download/v4.5.2/decals-city-jakob.zip",
"../../sub/jakob-diagonal-ornaments",
"../../sub/jakob-small-post"
"../../sub/jakob-small-post",
"../../sub/ow-commercial-jakob",
"../../sub/skin-post-jakob"
],
"Category": {
"Chinese": "插件",
Expand Down
7 changes: 7 additions & 0 deletions mods/addon-industrial-cities/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,13 @@ Smaller **power plants** and additional energy options.

## Changes

### 4.1

- 4.1.1: Removed storage info for services in needs InfoTip
- Re-organized construction menu
- Removed residence construction menu entries.
Use mod `Instant Residences` if you still want them.

### 4.0

- 4.0.8: Updated Russian translations thanks to DATM
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,6 @@
</Item>
</ModOp> -->

<ModOp Type="addNextSibling" GUID="25000189"
Path="/Values/ConstructionCategory/BuildingList/Item[Farmer or Worker&lt;=1][last()]">
<Item>
<Building>1500010100</Building>
<Worker>1</Worker>
</Item>
<Item>
<Building>1500010830</Building>
<Worker>1</Worker>
</Item>
</ModOp>

<ModOp Type="addNextSibling" GUID="25000190"
Path="/Values/ConstructionCategory/BuildingList/Item[Worker&lt;=500][last()]">
<Item>
Expand Down
56 changes: 29 additions & 27 deletions mods/addon-industrial-cities/modinfo.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"out": "${annoMods}/[Addon] Industrial Cities (Jakob)",
"Version": "4.0.8",
"Version": "4.1.1",
"ModID": "jakob_industrial_cities",
"ModioResourceId": 3227009,
"ModDependencies": [
"https://github.com/anno-mods/shared-resources/releases/download/v10.2.1/shared-pools-and-definitions.zip",
"https://github.com/anno-mods/shared-resources/releases/download/v10.5/shared-pools-and-definitions.zip",
"ow-vegetables-jakob",
"../../sub/ow-tea-jakob",
"../../sub/ow-sardines-jakob",
Expand All @@ -30,39 +30,41 @@
"DeprecateIds": [
"jakob_extra_goods",
"production-cans-and-suits-jakob",
"production-vegetables-and-cheese-jakob"
"production-vegetables-and-cheese-jakob",
"jakob-cheese-tools"
],
"bundle": [
"https://github.com/jakobharder/anno1800-shared-mods/releases/download/v4.5.1/decals-city-jakob.zip",
"https://github.com/jakobharder/anno1800-shared-mods/releases/download/v4.5.1/decals-industry-jakob.zip",
"https://github.com/jakobharder/anno1800-shared-mods/releases/download/v4.5.4/decals-city-jakob.zip",
"https://github.com/jakobharder/anno1800-shared-mods/releases/download/v4.5.4/decals-industry-jakob.zip",
"../../sub/jakob-power-plants",
"../../sub/jakob-skyscraper-button",
"../../sub/jakob-small-post",
"../../sub/alt-menu-jakob",
"../../sub/ow-seafood-jakob",
"../../sub/ow-music-school-jakob",
"https://github.com/jakobharder/anno1800-shared-mods/releases/download/v4.5.1/cheese-jakob.zip",
"https://github.com/jakobharder/anno1800-shared-mods/releases/download/v4.5.1/hemp-jakob.zip",
"https://github.com/jakobharder/anno1800-shared-mods/releases/download/v4.5.1/olive-oil-jakob.zip",
"https://github.com/jakobharder/anno1800-shared-mods/releases/download/v4.5.1/olives-jakob.zip",
"https://github.com/jakobharder/anno1800-shared-mods/releases/download/v4.5.1/ropes-jakob.zip",
"https://github.com/jakobharder/anno1800-shared-mods/releases/download/v4.5.1/sardines-jakob.zip",
"https://github.com/jakobharder/anno1800-shared-mods/releases/download/v4.5.1/suits-jakob.zip",
"https://github.com/jakobharder/anno1800-shared-mods/releases/download/v4.5.1/tea-jakob.zip",
"https://github.com/jakobharder/anno1800-shared-mods/releases/download/v4.5.1/tools-jakob.zip",
"https://github.com/jakobharder/anno1800-shared-mods/releases/download/v4.5.1/vegetables-jakob.zip",
"https://github.com/jakobharder/anno1800-shared-mods/releases/download/v4.5.1/ow-calamari-jakob.zip",
"https://github.com/jakobharder/anno1800-shared-mods/releases/download/v4.5.1/ow-cheese-jakob.zip",
"https://github.com/jakobharder/anno1800-shared-mods/releases/download/v4.5.1/ow-flax-jakob.zip",
"https://github.com/jakobharder/anno1800-shared-mods/releases/download/v4.5.1/ow-hemp-jakob.zip",
"https://github.com/jakobharder/anno1800-shared-mods/releases/download/v4.5.1/ow-herbs-jakob.zip",
"https://github.com/jakobharder/anno1800-shared-mods/releases/download/v4.5.1/ow-linen-jakob.zip",
"https://github.com/jakobharder/anno1800-shared-mods/releases/download/v4.5.1/ow-olive-oil-jakob.zip",
"https://github.com/jakobharder/anno1800-shared-mods/releases/download/v4.5.1/ow-ropes-jakob.zip",
"https://github.com/jakobharder/anno1800-shared-mods/releases/download/v4.5.1/ow-tools-jakob.zip",
"https://github.com/jakobharder/anno1800-shared-mods/releases/download/v4.5.1/ow-vegetables-jakob.zip",
"https://github.com/jakobharder/anno1800-shared-mods/releases/download/v4.5.1/models-railway-jakob.zip",
"https://github.com/jakobharder/anno1800-shared-mods/releases/download/v4.5.1/infotip-jakob.zip"
"../ui-compact-menu",
"https://github.com/jakobharder/anno1800-shared-mods/releases/download/v4.5.4/cheese-jakob.zip",
"https://github.com/jakobharder/anno1800-shared-mods/releases/download/v4.5.4/hemp-jakob.zip",
"https://github.com/jakobharder/anno1800-shared-mods/releases/download/v4.5.4/olive-oil-jakob.zip",
"https://github.com/jakobharder/anno1800-shared-mods/releases/download/v4.5.4/olives-jakob.zip",
"https://github.com/jakobharder/anno1800-shared-mods/releases/download/v4.5.4/ropes-jakob.zip",
"https://github.com/jakobharder/anno1800-shared-mods/releases/download/v4.5.4/sardines-jakob.zip",
"https://github.com/jakobharder/anno1800-shared-mods/releases/download/v4.5.4/suits-jakob.zip",
"https://github.com/jakobharder/anno1800-shared-mods/releases/download/v4.5.4/tea-jakob.zip",
"https://github.com/jakobharder/anno1800-shared-mods/releases/download/v4.5.4/tools-jakob.zip",
"https://github.com/jakobharder/anno1800-shared-mods/releases/download/v4.5.4/vegetables-jakob.zip",
"https://github.com/jakobharder/anno1800-shared-mods/releases/download/v4.5.4/ow-calamari-jakob.zip",
"https://github.com/jakobharder/anno1800-shared-mods/releases/download/v4.5.4/ow-cheese-jakob.zip",
"https://github.com/jakobharder/anno1800-shared-mods/releases/download/v4.5.4/ow-flax-jakob.zip",
"https://github.com/jakobharder/anno1800-shared-mods/releases/download/v4.5.4/ow-hemp-jakob.zip",
"https://github.com/jakobharder/anno1800-shared-mods/releases/download/v4.5.4/ow-herbs-jakob.zip",
"https://github.com/jakobharder/anno1800-shared-mods/releases/download/v4.5.4/ow-linen-jakob.zip",
"https://github.com/jakobharder/anno1800-shared-mods/releases/download/v4.5.4/ow-olive-oil-jakob.zip",
"https://github.com/jakobharder/anno1800-shared-mods/releases/download/v4.5.4/ow-ropes-jakob.zip",
"https://github.com/jakobharder/anno1800-shared-mods/releases/download/v4.5.4/ow-tools-jakob.zip",
"https://github.com/jakobharder/anno1800-shared-mods/releases/download/v4.5.4/ow-vegetables-jakob.zip",
"https://github.com/jakobharder/anno1800-shared-mods/releases/download/v4.5.4/models-railway-jakob.zip",
"https://github.com/jakobharder/anno1800-shared-mods/releases/download/v4.5.4/infotip-jakob.zip"
],
"Category": {
"Chinese": "插件",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,30 @@
<ModOps>
<!-- # Includes -->
<Group>
<ModOp Type="addNextSibling" GUID="1010372">
<Asset>
<Template>Text</Template>
<Values>
<Standard>
<GUID>1500011564</GUID>
<Name>Cheats Marker</Name>
</Standard>
</Values>
</Asset>
</ModOp>

<ModOp Type="merge" GUID="1500011564"
Condition="#cheat-instant-residences-jakob"
Path="/Values">
<InstantResidences />
</ModOp>
<ModOp Type="merge" GUID="1500011564"
Condition="#Insta_Residences"
Path="/Values">
<InstantResidences />
</ModOp>
</Group>

<!-- Add electrity support to the New World -->
<Include File="/data/jakob/nw-electricity/assets.include.xml" />

Expand All @@ -25,6 +51,8 @@
<Include File="./banners.include.xml" />
<Include File="./unlocks.include.xml" />

<Include File="./menu.include.xml" />

<!-- # Neighbors -->
<!-- <ModOp Type="add" GUID="1500011043,1500011044,1500011250"
Path="/Values/Building/InfluencedByNeighbors">
Expand Down Expand Up @@ -70,6 +98,15 @@
</Item>
</ModOp>

<!-- # Cheats -->
<Group Condition="@1500011564/InstantResidences">
<ModOp Type="replace" GUID="1500011044,1500011090,1500011382,1500011383,1500011250,1500011380,1500011043,1500011381"
Path="/Values/Building/PickingAsset"
Content="~/Values/Standard/GUID/text()">
<PickingAsset><ModOpContent /></PickingAsset>
</ModOp>
</Group>

<!-- # Harborlife Fix -->
<!-- just in case people didn't update and blame upgradable worker for it -->
<!-- <ModOp Type="replace" GUID="1440137000" Condition="~" Path="/Values/Upgradable">
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
<ModOps>
<Group Condition="@1500011564/InstantResidences">
<!-- New World, Obrero -->
<ModOp Type="addPrevSibling" GUID="25000194" Path="/Values/ConstructionCategory/BuildingList/Item[1]">
<Item>
<Building>1500011043</Building>
<CompactResidence />
</Item>
</ModOp>
<!-- By Progress Jornalero -->
<ModOp Type="addNextSibling" GUID="25000193"
Path="/Values/ConstructionCategory/BuildingList/Item[Building='101254']">
<Item>
<Building>1500011250</Building>
<CompactResidence />
</Item>
</ModOp>
<!-- New World, Artista -->
<ModOp Type="addPrevSibling" GUID="5466" Path="/Values/ConstructionCategory/BuildingList/Item[1]">
<Item>
<Building>1500011044</Building>
<CompactResidence />
</Item>
</ModOp>
<!-- New World, City -->
<ModOp Type="addNextSibling" GUID='500137'
Condition="!#cheat-instant-residences-jakob"
Path="/Values/ConstructionCategory/BuildingList/Item[Building='101254']">
<Item>
<Building>1500011087</Building>
</Item>
</ModOp>
<Group Condition="#cheat-instant-residences-jakob">
<ModOp Type="addNextSibling" GUID="1500011567"
Path="/Values/ConstructionCategory/BuildingList/Item[Jornalero or Obrero&lt;=500][last()]">
<Item>
<Building>1500011250</Building>
<Obrero>500</Obrero>
</Item>
<Item>
<Building>1500011043</Building>
<Obrero>500</Obrero>
</Item>
</ModOp>
<ModOp Type="addNextSibling" GUID="1500011567"
Path="/Values/ConstructionCategory/BuildingList/Item[Jornalero or Obrero or Artista&lt;=300][last()]">
<Item>
<Building>1500011044</Building>
<Artista>300</Artista>
</Item>
</ModOp>
</Group>
</Group>

<ModOp Type="addNextSibling" GUID="1010372">
<Asset>
<Template>ConstructionCategory</Template>
<Values>
<Standard>
<GUID>1500011087</GUID>
<Name>New World Cities</Name>
<IconFilename>data\ui\jakob\nwc\icon_menu.png</IconFilename>
</Standard>
<ConstructionCategory>
<BuildingList>
<Item>
<Building>1500011250</Building>
</Item>
<Item>
<Building>1500011043</Building>
</Item>
<Item>
<Building>1500011044</Building>
</Item>
<!-- <Item>
<Building>1500011090</Building>
</Item> -->
</BuildingList>
<CategoryDescription>1500011055</CategoryDescription>
</ConstructionCategory>
<Locked>
<DefaultLockedState>0</DefaultLockedState>
</Locked>
</Values>
</Asset>
</ModOp>
</ModOps>
Loading

0 comments on commit e0a551b

Please sign in to comment.