From ef7fcd4674071abc85ec03aef19f9aafad92382c Mon Sep 17 00:00:00 2001 From: Enrique Date: Tue, 10 Jan 2017 19:22:54 +0000 Subject: [PATCH] Batch of patches from Stanislas69 Fixes #3813 Refs #2524 and #4440 -Fixes stoyas foundations -Fixes walls foundations -Fixes carth superdock foundation -Fixes cape_chariot variant -Fixes missing referenced files in #2524 This was SVN commit r19131. --- .../units/cape_animated_bow_chariot_rider.xml | 13 ++---- .../art/actors/structures/fndn_dock_super.xml | 15 ++++--- .../art/actors/structures/fndn_wall.xml | 27 ------------ .../art/actors/structures/fndn_wall_long.xml | 44 +++++++++++++++++++ .../actors/structures/fndn_wall_medium.xml | 39 ++++++++++++++++ .../art/actors/structures/fndn_wall_short.xml | 16 ++++--- .../actors/structures/gauls/storehouse.xml | 1 - .../art/actors/units/celts/vercingetorix.xml | 2 +- .../meshes/structural/found_wall_med_a.dae | 3 -- .../art/meshes/structural/kart_superdock.dae | 4 +- .../skeletal/imp_cavalry_javelinist_1.png | 3 ++ .../imp_infantry_swordsman_b_spec.png | 3 ++ .../skins/structural/ao/kart_superdock.png | 4 +- .../templates/other/hellenic_stoa.xml | 2 +- .../templates/rubble/rubble_wall.xml | 2 +- .../templates/structures/pers_ishtar_gate.xml | 2 +- .../structures/rome_siege_wall_gate.xml | 1 - .../structures/rome_siege_wall_long.xml | 1 - .../structures/rome_siege_wall_medium.xml | 1 - ...te_structure_civic_hellenic_royal_stoa.xml | 2 +- .../template_structure_defense_wall.xml | 3 -- .../template_structure_defense_wall_gate.xml | 3 ++ .../template_structure_defense_wall_long.xml | 3 ++ ...template_structure_defense_wall_medium.xml | 3 ++ .../template_structure_defense_wall_short.xml | 3 ++ 25 files changed, 132 insertions(+), 68 deletions(-) delete mode 100644 binaries/data/mods/public/art/actors/structures/fndn_wall.xml create mode 100644 binaries/data/mods/public/art/actors/structures/fndn_wall_long.xml create mode 100644 binaries/data/mods/public/art/actors/structures/fndn_wall_medium.xml delete mode 100644 binaries/data/mods/public/art/meshes/structural/found_wall_med_a.dae create mode 100644 binaries/data/mods/public/art/textures/skins/skeletal/imp_cavalry_javelinist_1.png create mode 100644 binaries/data/mods/public/art/textures/skins/skeletal/imp_infantry_swordsman_b_spec.png diff --git a/binaries/data/mods/public/art/actors/props/units/cape_animated_bow_chariot_rider.xml b/binaries/data/mods/public/art/actors/props/units/cape_animated_bow_chariot_rider.xml index b893454918..d4b613a764 100644 --- a/binaries/data/mods/public/art/actors/props/units/cape_animated_bow_chariot_rider.xml +++ b/binaries/data/mods/public/art/actors/props/units/cape_animated_bow_chariot_rider.xml @@ -3,20 +3,15 @@ - - - - - props/new/capes/cape_hd_long.dae - - - + + + - + diff --git a/binaries/data/mods/public/art/actors/structures/fndn_dock_super.xml b/binaries/data/mods/public/art/actors/structures/fndn_dock_super.xml index 16918c1901..66bb017f9c 100644 --- a/binaries/data/mods/public/art/actors/structures/fndn_dock_super.xml +++ b/binaries/data/mods/public/art/actors/structures/fndn_dock_super.xml @@ -3,8 +3,15 @@ - + structural/found_dock_super.dae + + + + + + + @@ -18,9 +25,5 @@ - - - - - + basic_trans.xml diff --git a/binaries/data/mods/public/art/actors/structures/fndn_wall.xml b/binaries/data/mods/public/art/actors/structures/fndn_wall.xml deleted file mode 100644 index 7f87c41df8..0000000000 --- a/binaries/data/mods/public/art/actors/structures/fndn_wall.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - structural/found_wall_long_a.dae - - - - - - - - - - - - - - - - - - - - - diff --git a/binaries/data/mods/public/art/actors/structures/fndn_wall_long.xml b/binaries/data/mods/public/art/actors/structures/fndn_wall_long.xml new file mode 100644 index 0000000000..2f847ace5c --- /dev/null +++ b/binaries/data/mods/public/art/actors/structures/fndn_wall_long.xml @@ -0,0 +1,44 @@ + + + + + + structural/found_wall_long_a.dae + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + basic_trans.xml + diff --git a/binaries/data/mods/public/art/actors/structures/fndn_wall_medium.xml b/binaries/data/mods/public/art/actors/structures/fndn_wall_medium.xml new file mode 100644 index 0000000000..d2af44a142 --- /dev/null +++ b/binaries/data/mods/public/art/actors/structures/fndn_wall_medium.xml @@ -0,0 +1,39 @@ + + + + + + structural/found_wall_short_a.dae + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + basic_trans.xml + diff --git a/binaries/data/mods/public/art/actors/structures/fndn_wall_short.xml b/binaries/data/mods/public/art/actors/structures/fndn_wall_short.xml index 54c6fa0190..b2bd3babe2 100644 --- a/binaries/data/mods/public/art/actors/structures/fndn_wall_short.xml +++ b/binaries/data/mods/public/art/actors/structures/fndn_wall_short.xml @@ -2,8 +2,14 @@ - - structural/found_wall_med_a.dae + + structural/found_wall_short_a.dae + + + + + + @@ -19,9 +25,5 @@ - - - - - + basic_trans.xml diff --git a/binaries/data/mods/public/art/actors/structures/gauls/storehouse.xml b/binaries/data/mods/public/art/actors/structures/gauls/storehouse.xml index 64606a93fc..45874c96ad 100644 --- a/binaries/data/mods/public/art/actors/structures/gauls/storehouse.xml +++ b/binaries/data/mods/public/art/actors/structures/gauls/storehouse.xml @@ -14,7 +14,6 @@ - diff --git a/binaries/data/mods/public/art/actors/units/celts/vercingetorix.xml b/binaries/data/mods/public/art/actors/units/celts/vercingetorix.xml index e8d3d78ac4..0a34226342 100644 --- a/binaries/data/mods/public/art/actors/units/celts/vercingetorix.xml +++ b/binaries/data/mods/public/art/actors/units/celts/vercingetorix.xml @@ -5,7 +5,7 @@ skeletal/new/m_armor_pants_tunic_long.dae - + diff --git a/binaries/data/mods/public/art/meshes/structural/found_wall_med_a.dae b/binaries/data/mods/public/art/meshes/structural/found_wall_med_a.dae deleted file mode 100644 index 68b59f0e74..0000000000 --- a/binaries/data/mods/public/art/meshes/structural/found_wall_med_a.dae +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:07858413a693385c5f8b77c895c7a00ebc4818200c5283ae8b7c67be5b7331e6 -size 137161 diff --git a/binaries/data/mods/public/art/meshes/structural/kart_superdock.dae b/binaries/data/mods/public/art/meshes/structural/kart_superdock.dae index 1da6e73a3f..7f12f146f9 100644 --- a/binaries/data/mods/public/art/meshes/structural/kart_superdock.dae +++ b/binaries/data/mods/public/art/meshes/structural/kart_superdock.dae @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dba8d1a9e502da289e957e451645a8022ae66d79ce66993a05e4afb8fc41cc2e -size 634527 +oid sha256:d7dc87ec8e3984913763d3220dd3964f9478f8e3028dc7fec70df96a1f3b6b97 +size 630436 diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/imp_cavalry_javelinist_1.png b/binaries/data/mods/public/art/textures/skins/skeletal/imp_cavalry_javelinist_1.png new file mode 100644 index 0000000000..6503c6e1b8 --- /dev/null +++ b/binaries/data/mods/public/art/textures/skins/skeletal/imp_cavalry_javelinist_1.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:872f55a0dbdd71206d661196365d8f5bcfb7327378556c75ffcc561188dc6085 +size 133175 diff --git a/binaries/data/mods/public/art/textures/skins/skeletal/imp_infantry_swordsman_b_spec.png b/binaries/data/mods/public/art/textures/skins/skeletal/imp_infantry_swordsman_b_spec.png new file mode 100644 index 0000000000..dcdaed4178 --- /dev/null +++ b/binaries/data/mods/public/art/textures/skins/skeletal/imp_infantry_swordsman_b_spec.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6d53d5db89659506abf6d0c01a9f9702ebd1b09a20184be505589d8e1ca278e5 +size 100339 diff --git a/binaries/data/mods/public/art/textures/skins/structural/ao/kart_superdock.png b/binaries/data/mods/public/art/textures/skins/structural/ao/kart_superdock.png index bbf3388387..b17fb605ec 100644 --- a/binaries/data/mods/public/art/textures/skins/structural/ao/kart_superdock.png +++ b/binaries/data/mods/public/art/textures/skins/structural/ao/kart_superdock.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:db25a1926601370560f6e4d2589777c337bfe6662b04fc00123e5096de899566 -size 539808 +oid sha256:25a945f880acac817ed4affadca5cf0bc569a839a980fb4aefc02e4e5f93840a +size 437979 diff --git a/binaries/data/mods/public/simulation/templates/other/hellenic_stoa.xml b/binaries/data/mods/public/simulation/templates/other/hellenic_stoa.xml index 612b70ac84..e4132add14 100644 --- a/binaries/data/mods/public/simulation/templates/other/hellenic_stoa.xml +++ b/binaries/data/mods/public/simulation/templates/other/hellenic_stoa.xml @@ -46,6 +46,6 @@ special/greek_stoa.xml - structures/fndn_wall.xml + structures/fndn_6x4.xml diff --git a/binaries/data/mods/public/simulation/templates/rubble/rubble_wall.xml b/binaries/data/mods/public/simulation/templates/rubble/rubble_wall.xml index 529c3539cf..c2d7a7f6c1 100644 --- a/binaries/data/mods/public/simulation/templates/rubble/rubble_wall.xml +++ b/binaries/data/mods/public/simulation/templates/rubble/rubble_wall.xml @@ -1,6 +1,6 @@ - structures/fndn_wall.xml + structures/fndn_wall_long.xml diff --git a/binaries/data/mods/public/simulation/templates/structures/pers_ishtar_gate.xml b/binaries/data/mods/public/simulation/templates/structures/pers_ishtar_gate.xml index c92af56742..2324121b64 100644 --- a/binaries/data/mods/public/simulation/templates/structures/pers_ishtar_gate.xml +++ b/binaries/data/mods/public/simulation/templates/structures/pers_ishtar_gate.xml @@ -49,6 +49,6 @@ special/pers_ishtar_gate.xml - structures/fndn_wall.xml + structures/fndn_wall_long.xml diff --git a/binaries/data/mods/public/simulation/templates/structures/rome_siege_wall_gate.xml b/binaries/data/mods/public/simulation/templates/structures/rome_siege_wall_gate.xml index 971c60b23e..3a9dea3d70 100644 --- a/binaries/data/mods/public/simulation/templates/structures/rome_siege_wall_gate.xml +++ b/binaries/data/mods/public/simulation/templates/structures/rome_siege_wall_gate.xml @@ -41,7 +41,6 @@ structures/romans/siege_wall_gate.xml - structures/fndn_wall.xml 36.0 diff --git a/binaries/data/mods/public/simulation/templates/structures/rome_siege_wall_long.xml b/binaries/data/mods/public/simulation/templates/structures/rome_siege_wall_long.xml index e7d94e9592..9be2815b92 100644 --- a/binaries/data/mods/public/simulation/templates/structures/rome_siege_wall_long.xml +++ b/binaries/data/mods/public/simulation/templates/structures/rome_siege_wall_long.xml @@ -73,7 +73,6 @@ structures/romans/siege_wall_long.xml - structures/fndn_wall.xml 36.0 diff --git a/binaries/data/mods/public/simulation/templates/structures/rome_siege_wall_medium.xml b/binaries/data/mods/public/simulation/templates/structures/rome_siege_wall_medium.xml index bd2ee61426..0abd94f8e9 100644 --- a/binaries/data/mods/public/simulation/templates/structures/rome_siege_wall_medium.xml +++ b/binaries/data/mods/public/simulation/templates/structures/rome_siege_wall_medium.xml @@ -58,7 +58,6 @@ structures/romans/siege_wall_medium.xml - structures/fndn_wall_short.xml 24.0 diff --git a/binaries/data/mods/public/simulation/templates/template_structure_civic_hellenic_royal_stoa.xml b/binaries/data/mods/public/simulation/templates/template_structure_civic_hellenic_royal_stoa.xml index f203008319..e3911c89d1 100644 --- a/binaries/data/mods/public/simulation/templates/template_structure_civic_hellenic_royal_stoa.xml +++ b/binaries/data/mods/public/simulation/templates/template_structure_civic_hellenic_royal_stoa.xml @@ -63,6 +63,6 @@ special/greek_stoa_great.xml - structures/fndn_wall.xml + structures/fndn_6x4.xml diff --git a/binaries/data/mods/public/simulation/templates/template_structure_defense_wall.xml b/binaries/data/mods/public/simulation/templates/template_structure_defense_wall.xml index 36146e170e..1af521f5e8 100644 --- a/binaries/data/mods/public/simulation/templates/template_structure_defense_wall.xml +++ b/binaries/data/mods/public/simulation/templates/template_structure_defense_wall.xml @@ -53,7 +53,4 @@ 20 - - structures/fndn_wall.xml - diff --git a/binaries/data/mods/public/simulation/templates/template_structure_defense_wall_gate.xml b/binaries/data/mods/public/simulation/templates/template_structure_defense_wall_gate.xml index 60de615b3a..3bae7890bd 100644 --- a/binaries/data/mods/public/simulation/templates/template_structure_defense_wall_gate.xml +++ b/binaries/data/mods/public/simulation/templates/template_structure_defense_wall_gate.xml @@ -32,4 +32,7 @@ + + structures/template_structure_defense_wall_long.xml + diff --git a/binaries/data/mods/public/simulation/templates/template_structure_defense_wall_long.xml b/binaries/data/mods/public/simulation/templates/template_structure_defense_wall_long.xml index 7ecb0440a7..80438f1e0b 100644 --- a/binaries/data/mods/public/simulation/templates/template_structure_defense_wall_long.xml +++ b/binaries/data/mods/public/simulation/templates/template_structure_defense_wall_long.xml @@ -49,4 +49,7 @@ + + structures/fndn_wall_long.xml + diff --git a/binaries/data/mods/public/simulation/templates/template_structure_defense_wall_medium.xml b/binaries/data/mods/public/simulation/templates/template_structure_defense_wall_medium.xml index 52c04ced93..fc374edf24 100644 --- a/binaries/data/mods/public/simulation/templates/template_structure_defense_wall_medium.xml +++ b/binaries/data/mods/public/simulation/templates/template_structure_defense_wall_medium.xml @@ -30,4 +30,7 @@ 2000 rubble/rubble_stone_wall_medium + + structures/fndn_wall_medium.xml + diff --git a/binaries/data/mods/public/simulation/templates/template_structure_defense_wall_short.xml b/binaries/data/mods/public/simulation/templates/template_structure_defense_wall_short.xml index a299191944..39e1dc92f9 100644 --- a/binaries/data/mods/public/simulation/templates/template_structure_defense_wall_short.xml +++ b/binaries/data/mods/public/simulation/templates/template_structure_defense_wall_short.xml @@ -10,4 +10,7 @@ 1000 rubble/rubble_stone_wall_short + + structures/fndn_wall_short.xml +