From ec416a9ada8fcf6bfb99992eb2f92accd011fa4e Mon Sep 17 00:00:00 2001 From: wowgetoffyourcellphone Date: Sat, 6 Jan 2024 22:08:46 +0000 Subject: [PATCH] [Art | Templates] Improve the look of the Persian civic center with Lamassu statues. Also add: A lamassu stone ruin object and a Persian Shrine capturable map object. Modeling by: @stan' This was SVN commit r28003. --- .../actors/structures/persians/lamassu.xml | 16 +++++++++++++ .../structures/persians/lamassu_black.xml | 16 +++++++++++++ .../structures/persians/lamassu_plinth.xml | 22 +++++++++++++++++ .../structures/persians/lamassu_ruin.xml | 16 +++++++++++++ .../structures/persians/lamassu_small.xml | 16 +++++++++++++ .../persians/lamassu_small_black.xml | 16 +++++++++++++ .../art/actors/structures/persians/shrine.xml | 23 ++++++++++++++++++ .../art/meshes/structural/pers_lamassu.dae | 3 +++ .../meshes/structural/pers_lamassu_small.dae | 3 +++ .../art/meshes/structural/pers_palace.dae | 4 ++-- .../art/meshes/structural/pers_plinth.dae | 3 +++ .../art/meshes/structural/pers_shrine.dae | 3 +++ .../skins/structural/ao/pers_lamassu.png | 3 +++ .../skins/structural/ao/pers_palace.png | 4 ++-- .../skins/structural/ao/pers_shrine.png | 3 +++ .../skins/structural/pers_lamassu.png | 3 +++ .../skins/structural/pers_lamassu_dark.png | 3 +++ .../skins/structural/pers_lamassu_norm.png | 3 +++ .../skins/structural/pers_lamassu_ruin.png | 3 +++ .../structural/pers_lamassu_ruin_norm.png | 3 +++ .../skins/structural/pers_lamassu_spec.png | 3 +++ .../textures/skins/structural/pers_struct.png | 4 ++-- .../gui/text/tips/persian_architecture.txt | 2 +- .../ruins/stone_statues_persian_lamassu.xml | 24 +++++++++++++++++++ .../simulation/templates/mixins/shrine.xml | 2 +- .../structures/pers/civil_centre.xml | 3 ++- .../templates/structures/shrine_greek_02.xml | 4 ++-- .../templates/structures/shrine_persian.xml | 17 +++++++++++++ 28 files changed, 214 insertions(+), 11 deletions(-) create mode 100644 binaries/data/mods/public/art/actors/structures/persians/lamassu.xml create mode 100644 binaries/data/mods/public/art/actors/structures/persians/lamassu_black.xml create mode 100644 binaries/data/mods/public/art/actors/structures/persians/lamassu_plinth.xml create mode 100644 binaries/data/mods/public/art/actors/structures/persians/lamassu_ruin.xml create mode 100644 binaries/data/mods/public/art/actors/structures/persians/lamassu_small.xml create mode 100644 binaries/data/mods/public/art/actors/structures/persians/lamassu_small_black.xml create mode 100644 binaries/data/mods/public/art/actors/structures/persians/shrine.xml create mode 100644 binaries/data/mods/public/art/meshes/structural/pers_lamassu.dae create mode 100644 binaries/data/mods/public/art/meshes/structural/pers_lamassu_small.dae create mode 100644 binaries/data/mods/public/art/meshes/structural/pers_plinth.dae create mode 100644 binaries/data/mods/public/art/meshes/structural/pers_shrine.dae create mode 100644 binaries/data/mods/public/art/textures/skins/structural/ao/pers_lamassu.png create mode 100644 binaries/data/mods/public/art/textures/skins/structural/ao/pers_shrine.png create mode 100644 binaries/data/mods/public/art/textures/skins/structural/pers_lamassu.png create mode 100644 binaries/data/mods/public/art/textures/skins/structural/pers_lamassu_dark.png create mode 100644 binaries/data/mods/public/art/textures/skins/structural/pers_lamassu_norm.png create mode 100644 binaries/data/mods/public/art/textures/skins/structural/pers_lamassu_ruin.png create mode 100644 binaries/data/mods/public/art/textures/skins/structural/pers_lamassu_ruin_norm.png create mode 100644 binaries/data/mods/public/art/textures/skins/structural/pers_lamassu_spec.png create mode 100644 binaries/data/mods/public/simulation/templates/gaia/ruins/stone_statues_persian_lamassu.xml create mode 100644 binaries/data/mods/public/simulation/templates/structures/shrine_persian.xml diff --git a/binaries/data/mods/public/art/actors/structures/persians/lamassu.xml b/binaries/data/mods/public/art/actors/structures/persians/lamassu.xml new file mode 100644 index 0000000000..cda9f4e3a2 --- /dev/null +++ b/binaries/data/mods/public/art/actors/structures/persians/lamassu.xml @@ -0,0 +1,16 @@ + + + + + + structural/pers_lamassu.dae + + + + + + + + + player_trans_ao_norm_spec.xml + diff --git a/binaries/data/mods/public/art/actors/structures/persians/lamassu_black.xml b/binaries/data/mods/public/art/actors/structures/persians/lamassu_black.xml new file mode 100644 index 0000000000..89ad0b8021 --- /dev/null +++ b/binaries/data/mods/public/art/actors/structures/persians/lamassu_black.xml @@ -0,0 +1,16 @@ + + + + + + structural/pers_lamassu.dae + + + + + + + + + player_trans_ao_norm_spec.xml + diff --git a/binaries/data/mods/public/art/actors/structures/persians/lamassu_plinth.xml b/binaries/data/mods/public/art/actors/structures/persians/lamassu_plinth.xml new file mode 100644 index 0000000000..d638e17236 --- /dev/null +++ b/binaries/data/mods/public/art/actors/structures/persians/lamassu_plinth.xml @@ -0,0 +1,22 @@ + + + + + + structural/pers_plinth.dae + + + + + + + + + + + + + + + player_trans_parallax_spec.xml + diff --git a/binaries/data/mods/public/art/actors/structures/persians/lamassu_ruin.xml b/binaries/data/mods/public/art/actors/structures/persians/lamassu_ruin.xml new file mode 100644 index 0000000000..68efd95fd6 --- /dev/null +++ b/binaries/data/mods/public/art/actors/structures/persians/lamassu_ruin.xml @@ -0,0 +1,16 @@ + + + + + + structural/pers_lamassu_small.dae + + + + + + + + + player_trans_ao_norm_spec.xml + diff --git a/binaries/data/mods/public/art/actors/structures/persians/lamassu_small.xml b/binaries/data/mods/public/art/actors/structures/persians/lamassu_small.xml new file mode 100644 index 0000000000..b6efb7ccf1 --- /dev/null +++ b/binaries/data/mods/public/art/actors/structures/persians/lamassu_small.xml @@ -0,0 +1,16 @@ + + + + + + structural/pers_lamassu_small.dae + + + + + + + + + player_trans_ao_norm_spec.xml + diff --git a/binaries/data/mods/public/art/actors/structures/persians/lamassu_small_black.xml b/binaries/data/mods/public/art/actors/structures/persians/lamassu_small_black.xml new file mode 100644 index 0000000000..a655bcb834 --- /dev/null +++ b/binaries/data/mods/public/art/actors/structures/persians/lamassu_small_black.xml @@ -0,0 +1,16 @@ + + + + + + structural/pers_lamassu_small.dae + + + + + + + + + player_trans_ao_norm_spec.xml + diff --git a/binaries/data/mods/public/art/actors/structures/persians/shrine.xml b/binaries/data/mods/public/art/actors/structures/persians/shrine.xml new file mode 100644 index 0000000000..f904090d6b --- /dev/null +++ b/binaries/data/mods/public/art/actors/structures/persians/shrine.xml @@ -0,0 +1,23 @@ + + + + + + structural/pers_shrine.dae + + + + + + + + + + + + + + + + player_trans_ao_parallax_spec.xml + diff --git a/binaries/data/mods/public/art/meshes/structural/pers_lamassu.dae b/binaries/data/mods/public/art/meshes/structural/pers_lamassu.dae new file mode 100644 index 0000000000..8050c72729 --- /dev/null +++ b/binaries/data/mods/public/art/meshes/structural/pers_lamassu.dae @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d6ff38f508604268697b1b3d6173c556436d886a3873b921377bc0c3fae324dd +size 3128183 diff --git a/binaries/data/mods/public/art/meshes/structural/pers_lamassu_small.dae b/binaries/data/mods/public/art/meshes/structural/pers_lamassu_small.dae new file mode 100644 index 0000000000..9299faa719 --- /dev/null +++ b/binaries/data/mods/public/art/meshes/structural/pers_lamassu_small.dae @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3f2f6a9b0deffdff28f2acaa90e2f0b70ad89c2f9a94c443fc1ad7371cbd2ed9 +size 3128227 diff --git a/binaries/data/mods/public/art/meshes/structural/pers_palace.dae b/binaries/data/mods/public/art/meshes/structural/pers_palace.dae index a1430fcfcc..5cf5497135 100644 --- a/binaries/data/mods/public/art/meshes/structural/pers_palace.dae +++ b/binaries/data/mods/public/art/meshes/structural/pers_palace.dae @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9cec3dc2d3a4e7ac2c7d77401618caa0030d70c6442597c6e2d20b9ca56f23d5 -size 1685721 +oid sha256:cb9349489fac6d4594ab7f9fbe2cf1c146ec35b4198e5d80226554558e5d8e01 +size 1773204 diff --git a/binaries/data/mods/public/art/meshes/structural/pers_plinth.dae b/binaries/data/mods/public/art/meshes/structural/pers_plinth.dae new file mode 100644 index 0000000000..9efb414f28 --- /dev/null +++ b/binaries/data/mods/public/art/meshes/structural/pers_plinth.dae @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d1e2da2dcbd9b70d6b84985617b639f98f7cbbaf2f307a881d8cbc3329328c59 +size 6446 diff --git a/binaries/data/mods/public/art/meshes/structural/pers_shrine.dae b/binaries/data/mods/public/art/meshes/structural/pers_shrine.dae new file mode 100644 index 0000000000..7a8f9a0022 --- /dev/null +++ b/binaries/data/mods/public/art/meshes/structural/pers_shrine.dae @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8c318244b531032fbdeee7fc76b25849fe36264aef227049c9c45d1954fad4b2 +size 294074 diff --git a/binaries/data/mods/public/art/textures/skins/structural/ao/pers_lamassu.png b/binaries/data/mods/public/art/textures/skins/structural/ao/pers_lamassu.png new file mode 100644 index 0000000000..09ef3f8f7a --- /dev/null +++ b/binaries/data/mods/public/art/textures/skins/structural/ao/pers_lamassu.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5c7a211eb3effd0bef80347343de08755306b52ca2765f3c7a83eb1be2e40357 +size 450274 diff --git a/binaries/data/mods/public/art/textures/skins/structural/ao/pers_palace.png b/binaries/data/mods/public/art/textures/skins/structural/ao/pers_palace.png index dda58a170a..7e64677c54 100644 --- a/binaries/data/mods/public/art/textures/skins/structural/ao/pers_palace.png +++ b/binaries/data/mods/public/art/textures/skins/structural/ao/pers_palace.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:98ebf3f224662f4feee52d8a27676140b5396a3c4f89f4233e91ebd336c1ca92 -size 344384 +oid sha256:86fc21a533513ecfd0aafd60d7361957bbc8342eddf83f1bf0c22d31624c0687 +size 420754 diff --git a/binaries/data/mods/public/art/textures/skins/structural/ao/pers_shrine.png b/binaries/data/mods/public/art/textures/skins/structural/ao/pers_shrine.png new file mode 100644 index 0000000000..ad34f22f0d --- /dev/null +++ b/binaries/data/mods/public/art/textures/skins/structural/ao/pers_shrine.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:925d2f9dc2eccdc50e3d127b95fd8f881104a2d9c9f6804c389365059f827f23 +size 142316 diff --git a/binaries/data/mods/public/art/textures/skins/structural/pers_lamassu.png b/binaries/data/mods/public/art/textures/skins/structural/pers_lamassu.png new file mode 100644 index 0000000000..c6ffe1d365 --- /dev/null +++ b/binaries/data/mods/public/art/textures/skins/structural/pers_lamassu.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d4c78ce019d9788874d600de93a47532948ad89f343da12eea14b0dd8127ca4c +size 1131047 diff --git a/binaries/data/mods/public/art/textures/skins/structural/pers_lamassu_dark.png b/binaries/data/mods/public/art/textures/skins/structural/pers_lamassu_dark.png new file mode 100644 index 0000000000..a1122270fd --- /dev/null +++ b/binaries/data/mods/public/art/textures/skins/structural/pers_lamassu_dark.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:77ae404df478b5b5d4ade31c0c77080fbdda7e3aaa897a27a1c6a08e026b108b +size 1092080 diff --git a/binaries/data/mods/public/art/textures/skins/structural/pers_lamassu_norm.png b/binaries/data/mods/public/art/textures/skins/structural/pers_lamassu_norm.png new file mode 100644 index 0000000000..962a248105 --- /dev/null +++ b/binaries/data/mods/public/art/textures/skins/structural/pers_lamassu_norm.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0fd476ed4f13a9e2a236922d760298decc2a10475237a0ecf0d07788218ec0df +size 1218444 diff --git a/binaries/data/mods/public/art/textures/skins/structural/pers_lamassu_ruin.png b/binaries/data/mods/public/art/textures/skins/structural/pers_lamassu_ruin.png new file mode 100644 index 0000000000..7d8b90367d --- /dev/null +++ b/binaries/data/mods/public/art/textures/skins/structural/pers_lamassu_ruin.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d3b3052ed0989f48421c57436ee2c7600b96970fc4f9f3ab5f79201d498bcaec +size 530488 diff --git a/binaries/data/mods/public/art/textures/skins/structural/pers_lamassu_ruin_norm.png b/binaries/data/mods/public/art/textures/skins/structural/pers_lamassu_ruin_norm.png new file mode 100644 index 0000000000..32571836c4 --- /dev/null +++ b/binaries/data/mods/public/art/textures/skins/structural/pers_lamassu_ruin_norm.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ea5d1f8be8833b0f57971516e339caa856392738dce8157f64a3f0f4741a70a4 +size 2072002 diff --git a/binaries/data/mods/public/art/textures/skins/structural/pers_lamassu_spec.png b/binaries/data/mods/public/art/textures/skins/structural/pers_lamassu_spec.png new file mode 100644 index 0000000000..f0b47aad25 --- /dev/null +++ b/binaries/data/mods/public/art/textures/skins/structural/pers_lamassu_spec.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:97d4ff0a9eb52716a56056f4425d5db4cdfd362cc4e40581abcd6dd512ba31ac +size 613338 diff --git a/binaries/data/mods/public/art/textures/skins/structural/pers_struct.png b/binaries/data/mods/public/art/textures/skins/structural/pers_struct.png index 18720cce2f..c886a1a764 100644 --- a/binaries/data/mods/public/art/textures/skins/structural/pers_struct.png +++ b/binaries/data/mods/public/art/textures/skins/structural/pers_struct.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ee338e2fb1d5d8e2827acaf556249ddbe4a43329db3d8ff73e6b8f760b6acfd9 -size 2855961 +oid sha256:be072a0033969327206edd92f0cea208ebfaf81ebaeff078f84694ca415e802d +size 2832788 diff --git a/binaries/data/mods/public/gui/text/tips/persian_architecture.txt b/binaries/data/mods/public/gui/text/tips/persian_architecture.txt index 176516f183..6e15fb125d 100644 --- a/binaries/data/mods/public/gui/text/tips/persian_architecture.txt +++ b/binaries/data/mods/public/gui/text/tips/persian_architecture.txt @@ -1,4 +1,4 @@ -PERSIAN ARCHITECTURE +ACHAEMENID ARCHITECTURE Special technology for the Persians. Structures +25% health. Build time lengthened by +20% as a consequence. diff --git a/binaries/data/mods/public/simulation/templates/gaia/ruins/stone_statues_persian_lamassu.xml b/binaries/data/mods/public/simulation/templates/gaia/ruins/stone_statues_persian_lamassu.xml new file mode 100644 index 0000000000..7b64b2e3ca --- /dev/null +++ b/binaries/data/mods/public/simulation/templates/gaia/ruins/stone_statues_persian_lamassu.xml @@ -0,0 +1,24 @@ + + + + + 10.0 + + + Lamassu Statue + + + + + + 500 + + + + + + + + structures/persians/lamassu_ruin.xml + + diff --git a/binaries/data/mods/public/simulation/templates/mixins/shrine.xml b/binaries/data/mods/public/simulation/templates/mixins/shrine.xml index 1f4e64f343..7dd7f0cfdd 100644 --- a/binaries/data/mods/public/simulation/templates/mixins/shrine.xml +++ b/binaries/data/mods/public/simulation/templates/mixins/shrine.xml @@ -13,7 +13,7 @@ Shrine Shrine - -town + -Town Train Elite Healers and heal garrisoned units. true diff --git a/binaries/data/mods/public/simulation/templates/structures/pers/civil_centre.xml b/binaries/data/mods/public/simulation/templates/structures/pers/civil_centre.xml index 7ea3ae710e..ce5bd5b0cc 100644 --- a/binaries/data/mods/public/simulation/templates/structures/pers/civil_centre.xml +++ b/binaries/data/mods/public/simulation/templates/structures/pers/civil_centre.xml @@ -2,7 +2,7 @@ - 8.0 + 18.0 decay|rubble/rubble_stone_6x6 @@ -34,5 +34,6 @@ structures/persians/civil_centre.xml + structures/fndn_9x7.xml diff --git a/binaries/data/mods/public/simulation/templates/structures/shrine_greek_02.xml b/binaries/data/mods/public/simulation/templates/structures/shrine_greek_02.xml index 8d3d58a236..1fe0c98f99 100644 --- a/binaries/data/mods/public/simulation/templates/structures/shrine_greek_02.xml +++ b/binaries/data/mods/public/simulation/templates/structures/shrine_greek_02.xml @@ -1,8 +1,8 @@ - - 18.0 + + 15.0 mace diff --git a/binaries/data/mods/public/simulation/templates/structures/shrine_persian.xml b/binaries/data/mods/public/simulation/templates/structures/shrine_persian.xml new file mode 100644 index 0000000000..2bef33a292 --- /dev/null +++ b/binaries/data/mods/public/simulation/templates/structures/shrine_persian.xml @@ -0,0 +1,17 @@ + + + + + 14 + + + pers + Fire Temple + + + + + + structures/persians/shrine.xml + +