From 89a48f4a3487c6be1a725a2ea134f29f100b5924 Mon Sep 17 00:00:00 2001 From: wowgetoffyourcellphone Date: Thu, 5 Jan 2023 00:06:20 +0000 Subject: [PATCH] Mapping | Atlas | Add a new "Farmstead" object for Skirmish maps, which simulates the much chewed-over Farmland concept. Capture one to gain the "Farmland" aura that boosts nearby farming. Add some to a few skirmish maps for testing. This was SVN commit r27342. --- .../textures/selection/outline_border_02.png | 3 + .../selection/outline_border_02_mask.png | 3 + .../maps/skirmishes/gallic_highlands_2p.xml | 4 +- .../maps/skirmishes/miletus_peninsula_2p.pmp | 4 +- .../maps/skirmishes/miletus_peninsula_2p.xml | 4 +- .../maps/skirmishes/saharan_oases_4p.pmp | 2 +- .../maps/skirmishes/saharan_oases_4p.xml | 4 +- .../data/auras/structures/farmstead_60.json | 17 ++++++ .../simulation/templates/mixins/shrine.xml | 9 +++ .../templates/mixins/trading_post.xml | 9 +++ .../templates/structures/farmstead_desert.xml | 13 ++++ .../structures/farmstead_field_wheat.xml | 18 ++++++ .../templates/structures/farmstead_greek.xml | 16 +++++ .../templates/structures/farmstead_indian.xml | 16 +++++ .../structures/farmstead_italian.xml | 16 +++++ .../structures/farmstead_middle_eastern.xml | 17 ++++++ .../structures/farmstead_temperate_europe.xml | 9 +++ .../template_structure_special_rotarymill.xml | 59 ++++++++++++++----- 18 files changed, 199 insertions(+), 24 deletions(-) create mode 100644 binaries/data/mods/public/art/textures/selection/outline_border_02.png create mode 100644 binaries/data/mods/public/art/textures/selection/outline_border_02_mask.png create mode 100644 binaries/data/mods/public/simulation/data/auras/structures/farmstead_60.json create mode 100644 binaries/data/mods/public/simulation/templates/structures/farmstead_desert.xml create mode 100644 binaries/data/mods/public/simulation/templates/structures/farmstead_field_wheat.xml create mode 100644 binaries/data/mods/public/simulation/templates/structures/farmstead_greek.xml create mode 100644 binaries/data/mods/public/simulation/templates/structures/farmstead_indian.xml create mode 100644 binaries/data/mods/public/simulation/templates/structures/farmstead_italian.xml create mode 100644 binaries/data/mods/public/simulation/templates/structures/farmstead_middle_eastern.xml create mode 100644 binaries/data/mods/public/simulation/templates/structures/farmstead_temperate_europe.xml diff --git a/binaries/data/mods/public/art/textures/selection/outline_border_02.png b/binaries/data/mods/public/art/textures/selection/outline_border_02.png new file mode 100644 index 0000000000..998828705f --- /dev/null +++ b/binaries/data/mods/public/art/textures/selection/outline_border_02.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e9cb8a35106e354687ad6294238978250c8150d19f6376d358927cd10fe28fe4 +size 861 diff --git a/binaries/data/mods/public/art/textures/selection/outline_border_02_mask.png b/binaries/data/mods/public/art/textures/selection/outline_border_02_mask.png new file mode 100644 index 0000000000..17d4c38079 --- /dev/null +++ b/binaries/data/mods/public/art/textures/selection/outline_border_02_mask.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:461444c40a541b653cc2e145b8b595d658cc91d3cb7c90f800df56b1c71f2fad +size 835 diff --git a/binaries/data/mods/public/maps/skirmishes/gallic_highlands_2p.xml b/binaries/data/mods/public/maps/skirmishes/gallic_highlands_2p.xml index 6a4791f8be..d287061058 100644 --- a/binaries/data/mods/public/maps/skirmishes/gallic_highlands_2p.xml +++ b/binaries/data/mods/public/maps/skirmishes/gallic_highlands_2p.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2c51f01f10168dcdb12283faa4ab5496fe04feb81a40b80cdc1ef9d970c66dca -size 1113130 +oid sha256:c057dfd9cf748021aac9457ee09f9b1cbb15a9c3ce6dbf56840e6a66ec6ba6c5 +size 1115755 diff --git a/binaries/data/mods/public/maps/skirmishes/miletus_peninsula_2p.pmp b/binaries/data/mods/public/maps/skirmishes/miletus_peninsula_2p.pmp index 17b3394985..6ea0741e56 100644 --- a/binaries/data/mods/public/maps/skirmishes/miletus_peninsula_2p.pmp +++ b/binaries/data/mods/public/maps/skirmishes/miletus_peninsula_2p.pmp @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:69f3c5ca62653e34f325cb2fe22e0eac0e0d24e8fb2e8b039542ba8b88e58cb9 -size 1025864 +oid sha256:2f4f44c7c9898722978ee8575e0d22f2d1ccdec63f8de802a5698df751d54b55 +size 1025888 diff --git a/binaries/data/mods/public/maps/skirmishes/miletus_peninsula_2p.xml b/binaries/data/mods/public/maps/skirmishes/miletus_peninsula_2p.xml index 4d022cb28f..1be4df14db 100644 --- a/binaries/data/mods/public/maps/skirmishes/miletus_peninsula_2p.xml +++ b/binaries/data/mods/public/maps/skirmishes/miletus_peninsula_2p.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b3a3999049f9828eea622ebaced29095dee25e2cca5ed7c9633426bb3fad0bb1 -size 1053956 +oid sha256:798b8ffdec8043da32fb03707ab450f41e6252683187b39c5263c96575a028d0 +size 999242 diff --git a/binaries/data/mods/public/maps/skirmishes/saharan_oases_4p.pmp b/binaries/data/mods/public/maps/skirmishes/saharan_oases_4p.pmp index 2cde803234..a502a8e3f7 100644 --- a/binaries/data/mods/public/maps/skirmishes/saharan_oases_4p.pmp +++ b/binaries/data/mods/public/maps/skirmishes/saharan_oases_4p.pmp @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1431961af7bbd6a4a7516e31784da0b3cc9164174519dab5e5b9bbfa8a451fba +oid sha256:4cb979c29912df2b307f9044bade93ff698853ff4d01a9e03411cd66c6c41808 size 2623935 diff --git a/binaries/data/mods/public/maps/skirmishes/saharan_oases_4p.xml b/binaries/data/mods/public/maps/skirmishes/saharan_oases_4p.xml index 624292bc4a..051d18997f 100644 --- a/binaries/data/mods/public/maps/skirmishes/saharan_oases_4p.xml +++ b/binaries/data/mods/public/maps/skirmishes/saharan_oases_4p.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fc7ba9f61880c556ff14a72864002050ab681d26e66c1b26184ca8647d251938 -size 808492 +oid sha256:5b39d58e2dd5f176e1bfab422b17f05785b1344aaeed1c239aa511a3954e87c4 +size 811200 diff --git a/binaries/data/mods/public/simulation/data/auras/structures/farmstead_60.json b/binaries/data/mods/public/simulation/data/auras/structures/farmstead_60.json new file mode 100644 index 0000000000..9cbe63cf25 --- /dev/null +++ b/binaries/data/mods/public/simulation/data/auras/structures/farmstead_60.json @@ -0,0 +1,17 @@ +{ + "type": "range", + "radius": 60, + "affects": ["Gatherer"], + "modifications": [ + { "value": "ResourceGatherer/Rates/food.grain", "multiply": 1.75 } + ], + "auraName": "Farmland", + "auraDescription": "Gatherers +75% farming rate around a captured Farmstead.", + "overlayIcon": "art/textures/ui/session/auras/farm_bonus.png", + "rangeOverlay" : { + "lineTexture": "outline_border.png", + "lineTextureMask": "outline_border_mask.png", + "lineThickness": 0.075 + }, + "stackable": false +} diff --git a/binaries/data/mods/public/simulation/templates/mixins/shrine.xml b/binaries/data/mods/public/simulation/templates/mixins/shrine.xml index 452b7101f7..849cba89bc 100644 --- a/binaries/data/mods/public/simulation/templates/mixins/shrine.xml +++ b/binaries/data/mods/public/simulation/templates/mixins/shrine.xml @@ -34,6 +34,15 @@ + + + + outline_border_02.png + outline_border_02_mask.png + 0.5 + + + 15.0 diff --git a/binaries/data/mods/public/simulation/templates/mixins/trading_post.xml b/binaries/data/mods/public/simulation/templates/mixins/trading_post.xml index 0877bf309e..3df00ed197 100644 --- a/binaries/data/mods/public/simulation/templates/mixins/trading_post.xml +++ b/binaries/data/mods/public/simulation/templates/mixins/trading_post.xml @@ -21,6 +21,15 @@ + + + + outline_border_02.png + outline_border_02_mask.png + 0.5 + + + diff --git a/binaries/data/mods/public/simulation/templates/structures/farmstead_desert.xml b/binaries/data/mods/public/simulation/templates/structures/farmstead_desert.xml new file mode 100644 index 0000000000..02e1758901 --- /dev/null +++ b/binaries/data/mods/public/simulation/templates/structures/farmstead_desert.xml @@ -0,0 +1,13 @@ + + + + + 10.0 + + + + + + structures/ptolemies/farmstead.xml + + diff --git a/binaries/data/mods/public/simulation/templates/structures/farmstead_field_wheat.xml b/binaries/data/mods/public/simulation/templates/structures/farmstead_field_wheat.xml new file mode 100644 index 0000000000..5683773408 --- /dev/null +++ b/binaries/data/mods/public/simulation/templates/structures/farmstead_field_wheat.xml @@ -0,0 +1,18 @@ + + + + + + gaia + Wheat Field + + + + 1 + + + + + structures/plot_field_temp.xml + + diff --git a/binaries/data/mods/public/simulation/templates/structures/farmstead_greek.xml b/binaries/data/mods/public/simulation/templates/structures/farmstead_greek.xml new file mode 100644 index 0000000000..6a06801665 --- /dev/null +++ b/binaries/data/mods/public/simulation/templates/structures/farmstead_greek.xml @@ -0,0 +1,16 @@ + + + + + 10.0 + + + Epoikion + + + + + + structures/spartans/farmstead.xml + + diff --git a/binaries/data/mods/public/simulation/templates/structures/farmstead_indian.xml b/binaries/data/mods/public/simulation/templates/structures/farmstead_indian.xml new file mode 100644 index 0000000000..354a7db4de --- /dev/null +++ b/binaries/data/mods/public/simulation/templates/structures/farmstead_indian.xml @@ -0,0 +1,16 @@ + + + + + 10.0 + + + Kantu + + + + + + structures/mauryas/farmstead.xml + + diff --git a/binaries/data/mods/public/simulation/templates/structures/farmstead_italian.xml b/binaries/data/mods/public/simulation/templates/structures/farmstead_italian.xml new file mode 100644 index 0000000000..158e6263e2 --- /dev/null +++ b/binaries/data/mods/public/simulation/templates/structures/farmstead_italian.xml @@ -0,0 +1,16 @@ + + + + + 10.0 + + + Villa + + + + + + structures/romans/farmstead.xml + + diff --git a/binaries/data/mods/public/simulation/templates/structures/farmstead_middle_eastern.xml b/binaries/data/mods/public/simulation/templates/structures/farmstead_middle_eastern.xml new file mode 100644 index 0000000000..0c75e7ce22 --- /dev/null +++ b/binaries/data/mods/public/simulation/templates/structures/farmstead_middle_eastern.xml @@ -0,0 +1,17 @@ + + + + + 10.0 + + + persian + Kaštašta + + + + + + structures/persians/farmstead.xml + + diff --git a/binaries/data/mods/public/simulation/templates/structures/farmstead_temperate_europe.xml b/binaries/data/mods/public/simulation/templates/structures/farmstead_temperate_europe.xml new file mode 100644 index 0000000000..4f8680b99e --- /dev/null +++ b/binaries/data/mods/public/simulation/templates/structures/farmstead_temperate_europe.xml @@ -0,0 +1,9 @@ + + + + Melonas + + + structures/celts/special.xml + + diff --git a/binaries/data/mods/public/simulation/templates/template_structure_special_rotarymill.xml b/binaries/data/mods/public/simulation/templates/template_structure_special_rotarymill.xml index f0faf2cd61..81f608bfc0 100644 --- a/binaries/data/mods/public/simulation/templates/template_structure_special_rotarymill.xml +++ b/binaries/data/mods/public/simulation/templates/template_structure_special_rotarymill.xml @@ -1,30 +1,51 @@ + + structures/farmstead_60 + + + own neutral + RotaryMill + + + 500 + 0 + 3 + 100 + 0 200 100 + 0 - + 6.0 - - 2000 - + - Rotary Mill - template_structure_special_rotarymill - RotaryMill + gaia + Farmstead + Rotary Mill + Farmstead + + RotaryMill + + Dropsite for harvested Food. Capture one of these to increase nearby food production. structures/rotarymill.png - 40 - 20 + 100 + 100 + + structure + other.png + @@ -33,24 +54,32 @@ food true + + + + outline_border_02.png + outline_border_02_mask.png + 0.5 + + + interface/complete/building/complete_ffactri.xml + attack/destruction/building_collapse_large.xml 8.0 - - false - 32 - 40000 - + + - 40 + 30 + structures/celts/special.xml structures/fndn_6x6.xml