Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Patch fpr 8.6 #41

Merged
merged 2 commits into from
Feb 27, 2024
Merged

Patch fpr 8.6 #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e5dd7fb
Patch for 8.6
Qurila Feb 27, 2024
ebd1e22
Merge branch 'pools' of https://github.com/Qurila/shared-resources in…
Qurila Feb 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
186 changes: 186 additions & 0 deletions [Shared] Pools and Definitions/data/config/export/main/asset/assets-pools.include.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1690,6 +1690,192 @@
</ModOp>
</Group>

<!-- # Hibiscus Farm -->
<Group>
<ModOp Type="addNextSibling" GUID="5814">
<Asset>
<Template>ItemEffectTargetPool</Template>
<Values>
<Standard>
<GUID>1500301955</GUID>
<Name>hibiscus farm</Name>
</Standard>
<ItemEffectTargetPool>
<EffectTargetGUIDs>
<Item>
<GUID>114447</GUID>
</Item>
</EffectTargetGUIDs>
</ItemEffectTargetPool>
<Text>
<TextOverride>114447</TextOverride>
</Text>
</Values>
</Asset>
</ModOp>
<!-- replace target GUIDs -->
<ModOp Type="replace" Path="//ItemEffect/EffectTargets/Item[GUID='114447']"><!-- Hibiscus Farm -->
<Item>
<GUID>1500301955</GUID>
</Item>
</ModOp>
</Group>

<!-- # Linseed Farm -->
<Group>
<ModOp Type="addNextSibling" GUID="5814">
<Asset>
<Template>ItemEffectTargetPool</Template>
<Values>
<Standard>
<GUID>1500301956</GUID>
<Name>linseed farm</Name>
</Standard>
<ItemEffectTargetPool>
<EffectTargetGUIDs>
<Item>
<GUID>114448</GUID>
</Item>
</EffectTargetGUIDs>
</ItemEffectTargetPool>
<Text>
<TextOverride>114448</TextOverride>
</Text>
</Values>
</Asset>
</ModOp>
<!-- replace target GUIDs -->
<ModOp Type="replace" Path="//ItemEffect/EffectTargets/Item[GUID='114448']"><!-- Linseed Farm -->
<Item>
<GUID>1500301956</GUID>
</Item>
</ModOp>
</Group>

<!-- # Teff Farm -->
<Group>
<ModOp Type="addNextSibling" GUID="5814">
<Asset>
<Template>ItemEffectTargetPool</Template>
<Values>
<Standard>
<GUID>1500301957</GUID>
<Name>teff farm</Name>
</Standard>
<ItemEffectTargetPool>
<EffectTargetGUIDs>
<Item>
<GUID>114450</GUID>
</Item>
</EffectTargetGUIDs>
</ItemEffectTargetPool>
<Text>
<TextOverride>114450</TextOverride>
</Text>
</Values>
</Asset>
</ModOp>
<!-- replace target GUIDs -->
<ModOp Type="replace" Path="//ItemEffect/EffectTargets/Item[GUID='114450']"><!-- Teff Farm -->
<Item>
<GUID>1500301957</GUID>
</Item>
</ModOp>
</Group>

<!-- # Indigo Farm -->
<Group>
<ModOp Type="addNextSibling" GUID="5814">
<Asset>
<Template>ItemEffectTargetPool</Template>
<Values>
<Standard>
<GUID>1500301958</GUID>
<Name>indigo farm</Name>
</Standard>
<ItemEffectTargetPool>
<EffectTargetGUIDs>
<Item>
<GUID>114451</GUID>
</Item>
</EffectTargetGUIDs>
</ItemEffectTargetPool>
<Text>
<TextOverride>114451</TextOverride>
</Text>
</Values>
</Asset>
</ModOp>
<!-- replace target GUIDs -->
<ModOp Type="replace" Path="//ItemEffect/EffectTargets/Item[GUID='114451']"><!-- Indigo Farm -->
<Item>
<GUID>1500301958</GUID>
</Item>
</ModOp>
</Group>

<!-- # Spice Farm -->
<Group>
<ModOp Type="addNextSibling" GUID="5814">
<Asset>
<Template>ItemEffectTargetPool</Template>
<Values>
<Standard>
<GUID>1500301959</GUID>
<Name>spice farm</Name>
</Standard>
<ItemEffectTargetPool>
<EffectTargetGUIDs>
<Item>
<GUID>114452</GUID>
</Item>
</EffectTargetGUIDs>
</ItemEffectTargetPool>
<Text>
<TextOverride>114452</TextOverride>
</Text>
</Values>
</Asset>
</ModOp>
<!-- replace target GUIDs -->
<ModOp Type="replace" Path="//ItemEffect/EffectTargets/Item[GUID='114452']"><!-- Spice Farm -->
<Item>
<GUID>1500301959</GUID>
</Item>
</ModOp>
</Group>

<!-- # Apiary -->
<Group>
<ModOp Type="addNextSibling" GUID="5814">
<Asset>
<Template>ItemEffectTargetPool</Template>
<Values>
<Standard>
<GUID>1500301020</GUID>
<Name>apiary</Name>
</Standard>
<ItemEffectTargetPool>
<EffectTargetGUIDs>
<Item>
<GUID>114453</GUID>
</Item>
</EffectTargetGUIDs>
</ItemEffectTargetPool>
<Text>
<TextOverride>114453</TextOverride>
</Text>
</Values>
</Asset>
</ModOp>
<!-- replace target GUIDs -->
<ModOp Type="replace" Path="//ItemEffect/EffectTargets/Item[GUID='114453']"><!-- Apiary -->
<Item>
<GUID>1500301020</GUID>
</Item>
</ModOp>
</Group>

<!-- # Pearl Farm -->
<Group>
<ModOp Type="addNextSibling" GUID="5814">
Expand Down
10 changes: 5 additions & 5 deletions [Shared] Pools and Definitions/data/config/gui/texts_chinese.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,23 +170,23 @@
</Text>
<Text>
<GUID>1500301948</GUID>
<Text>所有农民住宅</Text>
<Text>所有农民住所</Text>
</Text>
<Text>
<GUID>1500301949</GUID>
<Text>所有工人住宅</Text>
<Text>所有工人住所</Text>
</Text>
<Text>
<GUID>1500301950</GUID>
<Text>所有艺术公寓</Text>
<Text>所有工匠住所</Text>
</Text>
<Text>
<GUID>1500301951</GUID>
<Text>所有牧羊人公寓</Text>
<Text>所有牧羊人住所</Text>
</Text>
<Text>
<GUID>1500301952</GUID>
<Text>所有老人公寓</Text>
<Text>所有长老住所</Text>
</Text>
</ModOp>
</ModOps>
10 changes: 5 additions & 5 deletions [Shared] Pools and Definitions/data/config/gui/texts_polish.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,23 +170,23 @@
</Text>
<Text>
<GUID>1500301948</GUID>
<Text>Wszystkie rezydencje farmerów</Text>
<Text>Wszystkie Domy Farmerów</Text>
</Text>
<Text>
<GUID>1500301949</GUID>
<Text>Wszystkie rezydencje pracowników</Text>
<Text>Wszystkie Domy Robotników</Text>
</Text>
<Text>
<GUID>1500301950</GUID>
<Text>Wszystkie rezydencje Artista</Text>
<Text>Wszystkie Domy Artystów</Text>
</Text>
<Text>
<GUID>1500301951</GUID>
<Text>Wszystkie rezydencje Shepherd</Text>
<Text>Wszystkie Domy Pasterzy</Text>
</Text>
<Text>
<GUID>1500301952</GUID>
<Text>Wszystkie rezydencje dla osób starszych</Text>
<Text>Wszystkie Domy Starszych</Text>
</Text>
</ModOp>
</ModOps>
10 changes: 5 additions & 5 deletions [Shared] Pools and Definitions/data/config/gui/texts_taiwanese.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,23 +170,23 @@
</Text>
<Text>
<GUID>1500301948</GUID>
<Text>所有农民住宅</Text>
<Text>所有農民住所</Text>
</Text>
<Text>
<GUID>1500301949</GUID>
<Text>所有工人住宅</Text>
<Text>所有工人住所</Text>
</Text>
<Text>
<GUID>1500301950</GUID>
<Text>所有艺术公寓</Text>
<Text>所有艺术家住所</Text>
</Text>
<Text>
<GUID>1500301951</GUID>
<Text>所有牧羊人公寓</Text>
<Text>所有牧羊人住所</Text>
</Text>
<Text>
<GUID>1500301952</GUID>
<Text>所有老人公寓</Text>
<Text>所有長老住所</Text>
</Text>
</ModOp>
</ModOps>
2 changes: 1 addition & 1 deletion [Shared] Pools and Definitions/modinfo.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"Version": "8.5",
"Version": "8.6",
"ModID": "shared-pools-and-definitions",
"DepecrateIds": [ "jakob_shared_base" ],
"Category": {
Expand Down
Loading