From 4e62e0b59ccaa4130c25c63f58a8f64bfa7d7784 Mon Sep 17 00:00:00 2001 From: Mythos_Ruler Date: Sat, 26 Nov 2011 05:08:32 +0000 Subject: [PATCH] Updating the foundation actors and meshes, and dirt decals. Added an "embassy" template. This was SVN commit r10604. --- .../props/structures/decals/dirt_2x4.xml | 10 +++++ .../props/structures/decals/dirt_4x2.xml | 10 +++++ .../props/structures/decals/dirt_4x4.xml | 2 +- .../props/structures/decals/dirt_4x6.xml | 10 +++++ .../props/structures/decals/dirt_6x6.xml | 2 +- .../public/art/actors/structures/fndn_2x4.xml | 2 +- .../public/art/actors/structures/fndn_4x2.xml | 25 +++++++++++ .../public/art/actors/structures/fndn_4x4.xml | 11 +++-- .../public/art/actors/structures/fndn_4x6.xml | 22 ++++++++++ .../art/meshes/structural/found_3x3_a.dae | 4 +- .../art/meshes/structural/found_3x3_b.dae | 4 +- .../art/meshes/structural/found_3x3_c.dae | 4 +- .../art/meshes/structural/found_3x6_a.dae | 4 +- .../art/meshes/structural/found_4x2_a.dae | 3 ++ .../art/meshes/structural/found_4x2_b.dae | 3 ++ .../art/meshes/structural/found_4x4_a.dae | 4 +- .../art/meshes/structural/found_4x4_b.dae | 3 ++ .../art/meshes/structural/found_4x6_a.dae | 3 ++ .../art/meshes/structural/found_5x5_a.dae | 4 +- .../art/meshes/structural/found_5x5_b.dae | 4 +- .../art/meshes/structural/found_6x6_a.dae | 4 +- .../structures/cart_embassy_celtic.xml | 11 +---- .../structures/cart_embassy_iberian.xml | 18 +------- .../structures/cart_embassy_italiote.xml | 15 +------ .../templates/structures/pers_apadana.xml | 4 ++ .../templates/structures/pers_corral.xml | 2 +- .../template_structure_civic_civil_centre.xml | 2 +- .../template_structure_civic_temple.xml | 2 +- .../template_structure_military_barracks.xml | 4 +- .../template_structure_military_embassy.xml | 41 +++++++++++++++++++ .../template_structure_military_fortress.xml | 2 +- 31 files changed, 169 insertions(+), 70 deletions(-) create mode 100644 binaries/data/mods/public/art/actors/props/structures/decals/dirt_2x4.xml create mode 100644 binaries/data/mods/public/art/actors/props/structures/decals/dirt_4x2.xml create mode 100644 binaries/data/mods/public/art/actors/props/structures/decals/dirt_4x6.xml create mode 100644 binaries/data/mods/public/art/actors/structures/fndn_4x2.xml create mode 100644 binaries/data/mods/public/art/actors/structures/fndn_4x6.xml create mode 100644 binaries/data/mods/public/art/meshes/structural/found_4x2_a.dae create mode 100644 binaries/data/mods/public/art/meshes/structural/found_4x2_b.dae create mode 100644 binaries/data/mods/public/art/meshes/structural/found_4x4_b.dae create mode 100644 binaries/data/mods/public/art/meshes/structural/found_4x6_a.dae create mode 100644 binaries/data/mods/public/simulation/templates/template_structure_military_embassy.xml diff --git a/binaries/data/mods/public/art/actors/props/structures/decals/dirt_2x4.xml b/binaries/data/mods/public/art/actors/props/structures/decals/dirt_2x4.xml new file mode 100644 index 0000000000..a487a9a05d --- /dev/null +++ b/binaries/data/mods/public/art/actors/props/structures/decals/dirt_2x4.xml @@ -0,0 +1,10 @@ + + + + + + props/decal_struct_sand_long.dds + + + basic_trans.xml + diff --git a/binaries/data/mods/public/art/actors/props/structures/decals/dirt_4x2.xml b/binaries/data/mods/public/art/actors/props/structures/decals/dirt_4x2.xml new file mode 100644 index 0000000000..6c761980b4 --- /dev/null +++ b/binaries/data/mods/public/art/actors/props/structures/decals/dirt_4x2.xml @@ -0,0 +1,10 @@ + + + + + + props/decal_struct_sand_long.dds + + + basic_trans.xml + diff --git a/binaries/data/mods/public/art/actors/props/structures/decals/dirt_4x4.xml b/binaries/data/mods/public/art/actors/props/structures/decals/dirt_4x4.xml index c1e285a7f1..e4f0195760 100644 --- a/binaries/data/mods/public/art/actors/props/structures/decals/dirt_4x4.xml +++ b/binaries/data/mods/public/art/actors/props/structures/decals/dirt_4x4.xml @@ -2,7 +2,7 @@ - + props/decal_struct_sand_small.dds diff --git a/binaries/data/mods/public/art/actors/props/structures/decals/dirt_4x6.xml b/binaries/data/mods/public/art/actors/props/structures/decals/dirt_4x6.xml new file mode 100644 index 0000000000..e4416dd483 --- /dev/null +++ b/binaries/data/mods/public/art/actors/props/structures/decals/dirt_4x6.xml @@ -0,0 +1,10 @@ + + + + + + props/decal_struct_sand_long.dds + + + basic_trans.xml + diff --git a/binaries/data/mods/public/art/actors/props/structures/decals/dirt_6x6.xml b/binaries/data/mods/public/art/actors/props/structures/decals/dirt_6x6.xml index 8457cf8290..129663a45d 100644 --- a/binaries/data/mods/public/art/actors/props/structures/decals/dirt_6x6.xml +++ b/binaries/data/mods/public/art/actors/props/structures/decals/dirt_6x6.xml @@ -2,7 +2,7 @@ - + props/decal_struct_sand_large.dds diff --git a/binaries/data/mods/public/art/actors/structures/fndn_2x4.xml b/binaries/data/mods/public/art/actors/structures/fndn_2x4.xml index edffecf857..d028801d45 100644 --- a/binaries/data/mods/public/art/actors/structures/fndn_2x4.xml +++ b/binaries/data/mods/public/art/actors/structures/fndn_2x4.xml @@ -9,7 +9,7 @@ - + diff --git a/binaries/data/mods/public/art/actors/structures/fndn_4x2.xml b/binaries/data/mods/public/art/actors/structures/fndn_4x2.xml new file mode 100644 index 0000000000..30d442b7e2 --- /dev/null +++ b/binaries/data/mods/public/art/actors/structures/fndn_4x2.xml @@ -0,0 +1,25 @@ + + + + + + structural/found_4x2_a.dae + + + structural/found_4x2_b.dae + + + + + + + + + + + + + structural/foundation.dds + + + diff --git a/binaries/data/mods/public/art/actors/structures/fndn_4x4.xml b/binaries/data/mods/public/art/actors/structures/fndn_4x4.xml index dd59dfb329..921979aaa1 100644 --- a/binaries/data/mods/public/art/actors/structures/fndn_4x4.xml +++ b/binaries/data/mods/public/art/actors/structures/fndn_4x4.xml @@ -4,10 +4,13 @@ structural/found_4x4_a.dae + + + + - - - + + structural/found_4x4_b.dae @@ -15,7 +18,7 @@ - + structural/foundation.dds diff --git a/binaries/data/mods/public/art/actors/structures/fndn_4x6.xml b/binaries/data/mods/public/art/actors/structures/fndn_4x6.xml new file mode 100644 index 0000000000..8c32bd2396 --- /dev/null +++ b/binaries/data/mods/public/art/actors/structures/fndn_4x6.xml @@ -0,0 +1,22 @@ + + + + + + structural/found_4x6_a.dae + + + + + + + + + + + + + structural/foundation.dds + + + diff --git a/binaries/data/mods/public/art/meshes/structural/found_3x3_a.dae b/binaries/data/mods/public/art/meshes/structural/found_3x3_a.dae index f0b2113a8a..80f5036bf2 100644 --- a/binaries/data/mods/public/art/meshes/structural/found_3x3_a.dae +++ b/binaries/data/mods/public/art/meshes/structural/found_3x3_a.dae @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9032b836dc43e50f7c464230bdb9c025834d1364efaf11278017bdac0e8a599a -size 143526 +oid sha256:cdacc314b1103f2f9cc95135b6fb35947f3aa562b8e119eaf95f077e35b5e822 +size 140868 diff --git a/binaries/data/mods/public/art/meshes/structural/found_3x3_b.dae b/binaries/data/mods/public/art/meshes/structural/found_3x3_b.dae index 3d2026fc4f..c26b99d3ab 100644 --- a/binaries/data/mods/public/art/meshes/structural/found_3x3_b.dae +++ b/binaries/data/mods/public/art/meshes/structural/found_3x3_b.dae @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:725dd094c526ba408ac121e2e136c0279bbdb1b533109e0a3e40a65e2fd7e55f -size 143965 +oid sha256:3d8d1b7119cebd47f62b49ca9a489350daf6d3f8886f014096c5c28b05572958 +size 141085 diff --git a/binaries/data/mods/public/art/meshes/structural/found_3x3_c.dae b/binaries/data/mods/public/art/meshes/structural/found_3x3_c.dae index 97a2352bd4..54cde7eb02 100644 --- a/binaries/data/mods/public/art/meshes/structural/found_3x3_c.dae +++ b/binaries/data/mods/public/art/meshes/structural/found_3x3_c.dae @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:eb106d2d639952d1cd7ad163871298be26c29f41ba48fa6f06ceba7b2bb0746a -size 144924 +oid sha256:68c01a6da07af8635b0b38cd1f7b3c91f0500de900abc96c76acba1e1411deb1 +size 142927 diff --git a/binaries/data/mods/public/art/meshes/structural/found_3x6_a.dae b/binaries/data/mods/public/art/meshes/structural/found_3x6_a.dae index 927d35299c..73cef0c632 100644 --- a/binaries/data/mods/public/art/meshes/structural/found_3x6_a.dae +++ b/binaries/data/mods/public/art/meshes/structural/found_3x6_a.dae @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fc8e5500e5066e683a5687925c5e679c2decebef75beaa33efb22ef9ae21b8e0 -size 335381 +oid sha256:a57e9c3034364fb533d4c3a7a37f4562d551c443855c991f80a651fd6d3859e9 +size 232627 diff --git a/binaries/data/mods/public/art/meshes/structural/found_4x2_a.dae b/binaries/data/mods/public/art/meshes/structural/found_4x2_a.dae new file mode 100644 index 0000000000..ed4a497dd5 --- /dev/null +++ b/binaries/data/mods/public/art/meshes/structural/found_4x2_a.dae @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:619a9ed35e1f9eb18f9497a414c9e510437537f63f2590e5eb85e2d981cbabb2 +size 78556 diff --git a/binaries/data/mods/public/art/meshes/structural/found_4x2_b.dae b/binaries/data/mods/public/art/meshes/structural/found_4x2_b.dae new file mode 100644 index 0000000000..3cf1f6b6db --- /dev/null +++ b/binaries/data/mods/public/art/meshes/structural/found_4x2_b.dae @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3519345aee43db13b9ce78351bed6aaf63b8f3c3b635fbe7e7a6d20018818da8 +size 78555 diff --git a/binaries/data/mods/public/art/meshes/structural/found_4x4_a.dae b/binaries/data/mods/public/art/meshes/structural/found_4x4_a.dae index 5be3c5f943..49ed8edbe5 100644 --- a/binaries/data/mods/public/art/meshes/structural/found_4x4_a.dae +++ b/binaries/data/mods/public/art/meshes/structural/found_4x4_a.dae @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b867c71cf31d8138d6ca3033a096f24139318331c07ce76dd68c28a25bfbee8d -size 163928 +oid sha256:790db8d5ed9595161168b23f233bdbff13a7a6dd3e1e6596ce96fbdc8bd39996 +size 161722 diff --git a/binaries/data/mods/public/art/meshes/structural/found_4x4_b.dae b/binaries/data/mods/public/art/meshes/structural/found_4x4_b.dae new file mode 100644 index 0000000000..f84b03058a --- /dev/null +++ b/binaries/data/mods/public/art/meshes/structural/found_4x4_b.dae @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d88999362df6d652461550e19a6322af3ca959e37f878cce5f1043e563212d3a +size 269577 diff --git a/binaries/data/mods/public/art/meshes/structural/found_4x6_a.dae b/binaries/data/mods/public/art/meshes/structural/found_4x6_a.dae new file mode 100644 index 0000000000..db9dd5d9c6 --- /dev/null +++ b/binaries/data/mods/public/art/meshes/structural/found_4x6_a.dae @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:055da9f621e5b22f0f377a4611b49fdf9018c957bddf3045114b370e7fe26b73 +size 248185 diff --git a/binaries/data/mods/public/art/meshes/structural/found_5x5_a.dae b/binaries/data/mods/public/art/meshes/structural/found_5x5_a.dae index 6dd58cfbfb..40eff0dbe3 100644 --- a/binaries/data/mods/public/art/meshes/structural/found_5x5_a.dae +++ b/binaries/data/mods/public/art/meshes/structural/found_5x5_a.dae @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5da861e2ec44083e8cd326e1ab9e5aff137aa4aa47f69c39de111025580f0c89 -size 283030 +oid sha256:cec6ab2667dce88f8d47abe2402617c1b50da362d3c72b17f26425cf044536ef +size 304585 diff --git a/binaries/data/mods/public/art/meshes/structural/found_5x5_b.dae b/binaries/data/mods/public/art/meshes/structural/found_5x5_b.dae index 21877dab30..257fc1265c 100644 --- a/binaries/data/mods/public/art/meshes/structural/found_5x5_b.dae +++ b/binaries/data/mods/public/art/meshes/structural/found_5x5_b.dae @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2d916ad7c5542dedaac241db41397fbb7692d4d057bc73114f01fc159cf355e4 -size 275761 +oid sha256:5a9bac71dbf4ea8258f1ece85a251b3738ed7c708b6c70edf6f328efdf5af8bd +size 294653 diff --git a/binaries/data/mods/public/art/meshes/structural/found_6x6_a.dae b/binaries/data/mods/public/art/meshes/structural/found_6x6_a.dae index 3499b714b1..90b0452fc8 100644 --- a/binaries/data/mods/public/art/meshes/structural/found_6x6_a.dae +++ b/binaries/data/mods/public/art/meshes/structural/found_6x6_a.dae @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5bc6c3936fce80adf5cec4cbc035319e6a89c14e7b247124741620f3479a729f -size 335509 +oid sha256:d100befec2002c4579b2567fbee725ccd4a4104cef3f8a58cb7ab5f60c392b67 +size 309022 diff --git a/binaries/data/mods/public/simulation/templates/structures/cart_embassy_celtic.xml b/binaries/data/mods/public/simulation/templates/structures/cart_embassy_celtic.xml index 61277efc87..d54fad68d6 100644 --- a/binaries/data/mods/public/simulation/templates/structures/cart_embassy_celtic.xml +++ b/binaries/data/mods/public/simulation/templates/structures/cart_embassy_celtic.xml @@ -1,7 +1,6 @@ - + - 0 120 200 @@ -17,7 +16,6 @@ cart - Embassy Celtic Embassy The Carthaginian army was a cosmopolitan affair, made up of mercenaries from dozens of lands. Hire Celtic mercenaries. @@ -26,20 +24,13 @@ - - 32 - units/cart_infantry_swordsman_b units/cart_cavalry_swordsman_2_b - - 24 - structures/carthaginians/embassy_celtic.xml - structures/fndn_4x4.xml diff --git a/binaries/data/mods/public/simulation/templates/structures/cart_embassy_iberian.xml b/binaries/data/mods/public/simulation/templates/structures/cart_embassy_iberian.xml index 4258392ac1..21e2258bc5 100644 --- a/binaries/data/mods/public/simulation/templates/structures/cart_embassy_iberian.xml +++ b/binaries/data/mods/public/simulation/templates/structures/cart_embassy_iberian.xml @@ -1,23 +1,14 @@ - + - 0 200 0 200 - - - 12.0 - - - 2000 - cart - Embassy Iberian Embassy The Carthaginian army was a cosmopolitan affair, made up of mercenaries from dozens of lands. Hire Iberian mercenaries. @@ -26,9 +17,6 @@ - - 32 - units/cart_infantry_javelinist_b @@ -36,11 +24,7 @@ units/cart_cavalry_swordsman_b - - 24 - structures/carthaginians/embassy_iberian.xml - structures/fndn_4x4.xml \ No newline at end of file diff --git a/binaries/data/mods/public/simulation/templates/structures/cart_embassy_italiote.xml b/binaries/data/mods/public/simulation/templates/structures/cart_embassy_italiote.xml index 4c05527a05..0cfce316db 100644 --- a/binaries/data/mods/public/simulation/templates/structures/cart_embassy_italiote.xml +++ b/binaries/data/mods/public/simulation/templates/structures/cart_embassy_italiote.xml @@ -1,12 +1,7 @@ - + - 0 150 - - 100 - 100 - @@ -17,7 +12,6 @@ cart - Embassy Italiote Embassy The Carthaginian army was a cosmopolitan affair, made up of mercenaries from dozens of lands. Hire Italian mercenaries. @@ -26,20 +20,13 @@ - - 32 - units/cart_infantry_swordsman_2_b units/cart_cavalry_spearman_b - - 24 - structures/carthaginians/embassy_italiote.xml - structures/fndn_4x4.xml \ No newline at end of file diff --git a/binaries/data/mods/public/simulation/templates/structures/pers_apadana.xml b/binaries/data/mods/public/simulation/templates/structures/pers_apadana.xml index b08608b1e3..3f4f854392 100644 --- a/binaries/data/mods/public/simulation/templates/structures/pers_apadana.xml +++ b/binaries/data/mods/public/simulation/templates/structures/pers_apadana.xml @@ -27,6 +27,10 @@ + + true + 38 + units/pers_champion_infantry diff --git a/binaries/data/mods/public/simulation/templates/structures/pers_corral.xml b/binaries/data/mods/public/simulation/templates/structures/pers_corral.xml index b0f5babfd1..1a10843482 100644 --- a/binaries/data/mods/public/simulation/templates/structures/pers_corral.xml +++ b/binaries/data/mods/public/simulation/templates/structures/pers_corral.xml @@ -19,6 +19,6 @@ structures/persians/corral.xml - structures/fndn_2x4.xml + structures/fndn_4x2.xml diff --git a/binaries/data/mods/public/simulation/templates/template_structure_civic_civil_centre.xml b/binaries/data/mods/public/simulation/templates/template_structure_civic_civil_centre.xml index 0770258aa0..77ed511303 100644 --- a/binaries/data/mods/public/simulation/templates/template_structure_civic_civil_centre.xml +++ b/binaries/data/mods/public/simulation/templates/template_structure_civic_civil_centre.xml @@ -54,7 +54,7 @@ Civic Centre - Build to acquire large tracts of territory. Train citizens. + Build to acquire large tracts of territory. Train citizens. Garrison: 20. Village Defensive diff --git a/binaries/data/mods/public/simulation/templates/template_structure_civic_temple.xml b/binaries/data/mods/public/simulation/templates/template_structure_civic_temple.xml index 621db29397..4e4ff799f7 100644 --- a/binaries/data/mods/public/simulation/templates/template_structure_civic_temple.xml +++ b/binaries/data/mods/public/simulation/templates/template_structure_civic_temple.xml @@ -64,6 +64,6 @@ 40 - structures/fndn_3x6.xml + structures/fndn_4x6.xml diff --git a/binaries/data/mods/public/simulation/templates/template_structure_military_barracks.xml b/binaries/data/mods/public/simulation/templates/template_structure_military_barracks.xml index 73c37a8f6e..733bd9adc4 100644 --- a/binaries/data/mods/public/simulation/templates/template_structure_military_barracks.xml +++ b/binaries/data/mods/public/simulation/templates/template_structure_military_barracks.xml @@ -30,7 +30,7 @@ Barracks - Train Citizen-Soldiers. + Train Citizen-Soldiers. Garrison: 10. Town structures/barracks.png @@ -46,7 +46,7 @@ false - 32 + 38 65536 diff --git a/binaries/data/mods/public/simulation/templates/template_structure_military_embassy.xml b/binaries/data/mods/public/simulation/templates/template_structure_military_embassy.xml new file mode 100644 index 0000000000..569b8f6694 --- /dev/null +++ b/binaries/data/mods/public/simulation/templates/template_structure_military_embassy.xml @@ -0,0 +1,41 @@ + + + + 0 + + 100 + 100 + + + + + 12.0 + + + + 2000 + + + cart + Embassy + + + + + + 25 + + + + units/cart_infantry_javelinist_b + units/cart_infantry_slinger_b + units/cart_cavalry_swordsman_b + + + + 24 + + + structures/fndn_3x3.xml + + \ No newline at end of file diff --git a/binaries/data/mods/public/simulation/templates/template_structure_military_fortress.xml b/binaries/data/mods/public/simulation/templates/template_structure_military_fortress.xml index 6023bd2c80..03496cf400 100644 --- a/binaries/data/mods/public/simulation/templates/template_structure_military_fortress.xml +++ b/binaries/data/mods/public/simulation/templates/template_structure_military_fortress.xml @@ -47,7 +47,7 @@ Fortress - Train Heroes, Champions, and Siege Units. + Train Heroes, Champions, and Siege Units. Garrison: 20. City Defensive structures/fortress.png