Skip to content

Commit

Permalink
Merge pull request #9 from anno-mods/nwr_update
Browse files Browse the repository at this point in the history
Update for NWR
  • Loading branch information
taubenangriff committed Dec 11, 2022
2 parents 56dda38 + 5e47098 commit 7248f4c
Show file tree
Hide file tree
Showing 3 changed files with 122 additions and 62 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,102 @@
<!--
Compatibility Changes for Hotel needs
You are free to include this snippet in your mod, as long as you don't change any values.
Copy the file as is and use `<Include File="./assets-hotel-needs.include.xml" />`.
Original from: https://github.com/anno-mods/shared-resources
You can request changes there as well.
Limit all Hotel needs to vanilla hotel only.
Mods have to add themselves to the `RequiredBuildings` list.
<ModOp Type="add" GUID="601379" Path="/Values/PopulationLevel7/PopulationInputs/Item/RequiredBuildings[Item/Region='Moderate']">
<Item>
<RequiredBuilding>my-guid</RequiredBuilding>
<Region>Moderate</Region>
</Item>
</ModOp>
-->
<ModOps>
<ModOp Type="addNextSibling" GUID="601379">
<Asset>
<Template>fallback</Template>
<Values>
<Standard>
<GUID>1500010999</GUID>
</Standard>
<PopulationLevel7>
<PopulationInputs>
<Item>
<RequiredBuildings />
</Item>
</PopulationInputs>
</PopulationLevel7>
</Values>
</Asset>
</ModOp>

<!-- # OW Needs -->
<ModOp Type="add" GUID="601379" Path="/Values/PopulationLevel7/PopulationInputs/Item[not(RequiredBuildings)] | //Values[Standard/GUID='1500010999']/PopulationLevel7/PopulationInputs/Item">
<RequiredBuildings>
<Item>
<RequiredBuilding>601445</RequiredBuilding>
<Region>Moderate</Region>
</Item>
</RequiredBuildings>
</ModOp>

<!-- # NW Tourism Needs -->
<ModOp Type="addNextSibling" GUID="601379" Path="/Values/PopulationLevel7/PopulationInputs[not(Item/Product='1440134405')]/Item[Product='133573'] | //Values[Standard/GUID='1500010999']/PopulationLevel7/PopulationInputs/Item[last()]">
<Item>
<Product>1440134405</Product> <!-- NW Tourism Boxing -->
<SupplyWeight>25</SupplyWeight>
<MoneyValue>45</MoneyValue>
<FullWeightPopulationCount>50</FullWeightPopulationCount>
<NoWeightPopulationCount>49</NoWeightPopulationCount>
<RequiredBuildings>
<Item>
<RequiredBuilding>0</RequiredBuilding>
<Region>Colony01</Region>
</Item>
</RequiredBuildings>
</Item>
</ModOp>
<ModOp Type="add" GUID="601379" Path="/Values/PopulationLevel7/PopulationInputs[not(Item/Product='1440134406')] | //Values[Standard/GUID='1500010999']/PopulationLevel7/PopulationInputs">
<Item>
<Product>1440134406</Product> <!-- NW Tourism Christo -->
<SupplyWeight>80</SupplyWeight>
<MoneyValue>135</MoneyValue>
<FullWeightPopulationCount>4000</FullWeightPopulationCount>
<NoWeightPopulationCount>2499</NoWeightPopulationCount>
<RequiredBuildings>
<Item>
<RequiredBuilding>0</RequiredBuilding>
<Region>Colony01</Region>
</Item>
</RequiredBuildings>
</Item>
</ModOp>
<ModOp Type="addPrevSibling" GUID="601379" Path="/Values/PopulationLevel7/PopulationInputs[not(Item/Product='1440134407')]/Item[Product='601485'] | //Values[Standard/GUID='1500010999']/PopulationLevel7/PopulationInputs/Item[last()]">
<Item>
<Product>1440134407</Product> <!-- NW Tourism Hacienda -->
<HappinessValue>3</HappinessValue>
<IsOptionalHappinessValue>1</IsOptionalHappinessValue>
<MoneyValue>75</MoneyValue>
<RequiredBuildings>
<Item>
<RequiredBuilding>0</RequiredBuilding>
<Region>Colony01</Region>
</Item>
</RequiredBuildings>
</Item>
</ModOp>
<!-- copy needs from vanilla hotel -->
<ModOp Type="add" GUID="601379" Path="/Values/PopulationLevel7/PopulationInputs/Item[not(RequiredBuildings/Item/RequiredBuilding='1440134300') and (Product<1010500) and not(Product='133573') and not(Product='132761') and not(Product='133536') and not(Product='137757')]/RequiredBuildings | //Values[Standard/GUID='1500010999']/PopulationLevel7/PopulationInputs/Item/RequiredBuildings">
<Item>
<RequiredBuilding>1440134300</RequiredBuilding>
<Region>Colony01</Region>
</Item>
</ModOp>
<ModOp Type="remove" GUID="1500010999" />
</ModOps>
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
<ModOps>
<Include File="./assets-hotel-needs.include.xml" />

<ModOp Type="addNextSibling" GUID='601445'>
<Asset>
<BaseAssetGUID>601445</BaseAssetGUID>
Expand Down Expand Up @@ -2869,7 +2871,7 @@
<Standard>
<GUID>1440134380</GUID>
<Name>TourismConstructionMenu</Name>
<IconFilename>data/ui/2kimages/main/3dicons/icon_hotel.png</IconFilename>
<IconFilename>data/ui/2kimages/main/icons/workforce/icon_workforce_2d_tourist.png</IconFilename>
</Standard>
<ConstructionCategory>
<BuildingList>
Expand Down Expand Up @@ -5378,14 +5380,6 @@
</Item>
</Uniques>
</BuildingUnique>
<Monument>
<UnfinishedIcon>1440134438</UnfinishedIcon>
<FinishedIcon>1440134439</FinishedIcon>
<ShutdownText>6783</ShutdownText>
<MonumentHeadline>1440134400</MonumentHeadline>
<ProgressbarHeight>108</ProgressbarHeight>
<AddOneToPhaseCount>0</AddOneToPhaseCount>
</Monument>
<Culture>
<Attractiveness>250</Attractiveness>
<CultureSpawnGroup>1</CultureSpawnGroup>
Expand Down Expand Up @@ -5968,8 +5962,6 @@
<WorkforceEntry>132723</WorkforceEntry>
</Item>
</ModOp>


<!-- ITEMEFFECT TARGET POOLS -->

<!-- Tourist Residence -->
Expand Down Expand Up @@ -6055,7 +6047,6 @@
<Item>
<GUID>1440134342</GUID>
</Item>

<Item>
<GUID>1440134400</GUID>
</Item>
Expand Down Expand Up @@ -6146,59 +6137,18 @@
</Asset>
</ModOp>

<!-- ensure to not restrict other mod's needs with not(RequiredBuildings)-->
<ModOp GUID = '601379' Type = "add" Path = "/Values/PopulationLevel7/PopulationInputs/Item[(Product = '133573' or Product = '132761') and (not(RequiredBuildings/Item/RequiredBuilding) or RequiredBuildings/Item/RequiredBuilding='601445')]">
<RequiredBuildings>
<Item>
<RequiredBuilding>601445</RequiredBuilding>
</Item>
</RequiredBuildings>
</ModOp>
<!-- use [last()] because there may be several entries for that need -->
<ModOp GUID = '601379' Type = "addNextSibling" Path = "/Values/PopulationLevel7/PopulationInputs/Item[Product = '133573'][last()]">
<Item>
<Product>1440134405</Product>
<SupplyWeight>25</SupplyWeight>
<MoneyValue>45</MoneyValue>
<FullWeightPopulationCount>50</FullWeightPopulationCount>
<NoWeightPopulationCount>49</NoWeightPopulationCount>
<RequiredBuildings>
<Item>
<RequiredBuilding>1440134300</RequiredBuilding>
</Item>
</RequiredBuildings>
</Item>
</ModOp>
<!-- use [last()] because there may be several entries for that need -->
<ModOp GUID = '601379' Type = "addNextSibling" Path = "/Values/PopulationLevel7/PopulationInputs/Item[Product = '132761'][last()]">
<!-- Add dependencies for new needs -->
<ModOp Type="add" GUID="601379" Path="/Values/PopulationLevel7/PopulationInputs/Item[Product='1440134405' or Product='1440134406' or Product='1440134407']/RequiredBuildings">
<Item>
<Product>1440134406</Product>
<SupplyWeight>80</SupplyWeight>
<MoneyValue>135</MoneyValue>
<FullWeightPopulationCount>4000</FullWeightPopulationCount>
<NoWeightPopulationCount>3999</NoWeightPopulationCount>
<RequiredBuildings>
<Item>
<RequiredBuilding>1440134300</RequiredBuilding>
</Item>
</RequiredBuildings>
</Item>
<Item>
<Product>1440134407</Product>
<HappinessValue>10</HappinessValue>
<IsOptionalHappinessValue>1</IsOptionalHappinessValue>
<MoneyValue>300</MoneyValue>
<RequiredBuildings>
<Item>
<RequiredBuilding>1440134300</RequiredBuilding>
</Item>
</RequiredBuildings>
<RequiredBuilding>1440134300</RequiredBuilding>
<Region>Colony01</Region>
</Item>
</ModOp>

<ModOp GUID = '601379' Type = "add" Path = "/Values/PopulationLevel7/HappinessDebuff/Hotspots/AffectedNeeds">
<ModOp Type="add" GUID="601379" Path="/Values/PopulationLevel7/PopulationInputs/Item[not(Product='132761') and not(Product='133573')]/RequiredBuildings">
<Item>
<Need>1440134405</Need>
<RequiredBuilding>1440134300</RequiredBuilding>
<Region>Colony01</Region>
</Item>
</ModOp>

Expand Down Expand Up @@ -6444,7 +6394,6 @@
</LogisticNode>
<Monument>
<UpgradeTarget>1440134432</UpgradeTarget>
<UseReplaceInsteadOfChangeGUID>1</UseReplaceInsteadOfChangeGUID>
<MicrophaseCount>30</MicrophaseCount>
<UnfinishedIcon>1440134434</UnfinishedIcon>
<FinishedIcon>1440134435</FinishedIcon>
Expand Down Expand Up @@ -6703,4 +6652,13 @@
</Values>
</Asset>
</ModOp>

<ModOp GUID = '502285' Path="/Values/MonumentScene/DataForNonMonumentTargets" Type="add">
<Item>
<TargetBuilding>1440134400</TargetBuilding>
<UnfinishedIcon>1440134438</UnfinishedIcon>
<FinishedIcon>1440134439</FinishedIcon>
<ProgressbarHeight>108</ProgressbarHeight>
</Item>
</ModOp>
</ModOps>
2 changes: 1 addition & 1 deletion [Gameplay] New World Tourism/modinfo.Json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"Version": "1.2.1",
"Version": "1.2.2",
"ModID": "FamTaubeLexy_NewWorldHotels",
"IncompatibleIds": [
"NewHorizons"
Expand Down

0 comments on commit 7248f4c

Please sign in to comment.