From 936d1adaef30cf82001def84432c1bc514b2c2be Mon Sep 17 00:00:00 2001 From: Stan Date: Sun, 8 Mar 2020 10:19:45 +0000 Subject: [PATCH] Rename wall_med to wall_medium for consistency. Fix some of the variant names. Fix useless AO suffix as already contained in folders see: wiki:ArtFileNamingConventions Add some mime types and some EOL properties. Based on a patch by: @Nescio Differential Revision: https://code.wildfiregames.com/D2554 This was SVN commit r23524. --- .../construction/scaf_cart_wall_medium.xml | 4 ++-- .../actors/structures/britons/wall_medium.xml | 15 +++---------- ...fndn_wall_med.xml => fndn_wall_medium.xml} | 2 +- .../structures/carthaginians/wall_med.xml | 21 ------------------- .../{wall_med.xml => wall_medium.xml} | 4 ++-- .../actors/structures/seleucids/wall_gate.xml | 4 ++-- .../actors/structures/seleucids/wall_long.xml | 4 ++-- .../{wall_med.xml => wall_medium.xml} | 6 +++--- .../structures/seleucids/wall_short.xml | 4 ++-- .../structures/seleucids/wall_tower.xml | 4 ++-- .../meshes/props/decal_struct_wall_med.dae | 3 --- .../art/meshes/structural/brit_wall_med.dae | 3 --- .../meshes/structural/brit_wall_medium.dae | 3 +++ .../art/meshes/structural/kush_wall_med.dae | 3 --- .../meshes/structural/kush_wall_medium.dae | 3 +++ .../art/meshes/structural/sele_wall_med.dae | 3 --- .../meshes/structural/sele_wall_medium.dae | 3 +++ ...t_wall_med_AO.png => brit_wall_medium.png} | 0 ...png => kart_wall_medium_b_scaffolding.png} | 0 ...le_wall_gate_AO.png => sele_wall_gate.png} | 0 ...le_wall_long_AO.png => sele_wall_long.png} | 0 ...all_medium_AO.png => sele_wall_medium.png} | 0 ..._wall_short_AO.png => sele_wall_short.png} | 0 ..._wall_tower_AO.png => sele_wall_tower.png} | 0 .../templates/structures/cart_wall_medium.xml | 2 +- .../templates/structures/kush_wall_medium.xml | 2 +- .../templates/structures/sele_wall_medium.xml | 2 +- 27 files changed, 31 insertions(+), 64 deletions(-) rename binaries/data/mods/public/art/actors/structures/carthaginians/{fndn_wall_med.xml => fndn_wall_medium.xml} (97%) delete mode 100644 binaries/data/mods/public/art/actors/structures/carthaginians/wall_med.xml rename binaries/data/mods/public/art/actors/structures/kushites/{wall_med.xml => wall_medium.xml} (90%) rename binaries/data/mods/public/art/actors/structures/seleucids/{wall_med.xml => wall_medium.xml} (84%) delete mode 100644 binaries/data/mods/public/art/meshes/props/decal_struct_wall_med.dae delete mode 100644 binaries/data/mods/public/art/meshes/structural/brit_wall_med.dae create mode 100644 binaries/data/mods/public/art/meshes/structural/brit_wall_medium.dae delete mode 100644 binaries/data/mods/public/art/meshes/structural/kush_wall_med.dae create mode 100644 binaries/data/mods/public/art/meshes/structural/kush_wall_medium.dae delete mode 100644 binaries/data/mods/public/art/meshes/structural/sele_wall_med.dae create mode 100644 binaries/data/mods/public/art/meshes/structural/sele_wall_medium.dae rename binaries/data/mods/public/art/textures/skins/structural/ao/{brit_wall_med_AO.png => brit_wall_medium.png} (100%) rename binaries/data/mods/public/art/textures/skins/structural/ao/{kart_wall_medium_b_scaffolding_AO.png => kart_wall_medium_b_scaffolding.png} (100%) rename binaries/data/mods/public/art/textures/skins/structural/ao/{sele_wall_gate_AO.png => sele_wall_gate.png} (100%) rename binaries/data/mods/public/art/textures/skins/structural/ao/{sele_wall_long_AO.png => sele_wall_long.png} (100%) rename binaries/data/mods/public/art/textures/skins/structural/ao/{sele_wall_medium_AO.png => sele_wall_medium.png} (100%) rename binaries/data/mods/public/art/textures/skins/structural/ao/{sele_wall_short_AO.png => sele_wall_short.png} (100%) rename binaries/data/mods/public/art/textures/skins/structural/ao/{sele_wall_tower_AO.png => sele_wall_tower.png} (100%) diff --git a/binaries/data/mods/public/art/actors/props/structures/construction/scaf_cart_wall_medium.xml b/binaries/data/mods/public/art/actors/props/structures/construction/scaf_cart_wall_medium.xml index 9be436b758..ca01a2bb75 100644 --- a/binaries/data/mods/public/art/actors/props/structures/construction/scaf_cart_wall_medium.xml +++ b/binaries/data/mods/public/art/actors/props/structures/construction/scaf_cart_wall_medium.xml @@ -2,7 +2,7 @@ - + structural/kart_wall_medium_b_scaffolding.dae @@ -11,7 +11,7 @@ - + diff --git a/binaries/data/mods/public/art/actors/structures/britons/wall_medium.xml b/binaries/data/mods/public/art/actors/structures/britons/wall_medium.xml index 61fc53318e..8a61ad49fd 100644 --- a/binaries/data/mods/public/art/actors/structures/britons/wall_medium.xml +++ b/binaries/data/mods/public/art/actors/structures/britons/wall_medium.xml @@ -2,22 +2,13 @@ - - structural/brit_wall_med.dae - - - - - - - - - structural/brit_wall_med.dae + + structural/brit_wall_medium.dae - + diff --git a/binaries/data/mods/public/art/actors/structures/carthaginians/fndn_wall_med.xml b/binaries/data/mods/public/art/actors/structures/carthaginians/fndn_wall_medium.xml similarity index 97% rename from binaries/data/mods/public/art/actors/structures/carthaginians/fndn_wall_med.xml rename to binaries/data/mods/public/art/actors/structures/carthaginians/fndn_wall_medium.xml index 39663e0a6b..df11bebdf1 100644 --- a/binaries/data/mods/public/art/actors/structures/carthaginians/fndn_wall_med.xml +++ b/binaries/data/mods/public/art/actors/structures/carthaginians/fndn_wall_medium.xml @@ -27,7 +27,7 @@ - + diff --git a/binaries/data/mods/public/art/actors/structures/carthaginians/wall_med.xml b/binaries/data/mods/public/art/actors/structures/carthaginians/wall_med.xml deleted file mode 100644 index 18a10ac177..0000000000 --- a/binaries/data/mods/public/art/actors/structures/carthaginians/wall_med.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - structural/kart_wall_medium.dae - - - - - - - - - - - - - - player_trans.xml - diff --git a/binaries/data/mods/public/art/actors/structures/kushites/wall_med.xml b/binaries/data/mods/public/art/actors/structures/kushites/wall_medium.xml similarity index 90% rename from binaries/data/mods/public/art/actors/structures/kushites/wall_med.xml rename to binaries/data/mods/public/art/actors/structures/kushites/wall_medium.xml index a61153596a..e3ed6293ea 100644 --- a/binaries/data/mods/public/art/actors/structures/kushites/wall_med.xml +++ b/binaries/data/mods/public/art/actors/structures/kushites/wall_medium.xml @@ -2,8 +2,8 @@ - - structural/kush_wall_med.dae + + structural/kush_wall_medium.dae diff --git a/binaries/data/mods/public/art/actors/structures/seleucids/wall_gate.xml b/binaries/data/mods/public/art/actors/structures/seleucids/wall_gate.xml index 9bb3499ee3..176bb8f1d1 100644 --- a/binaries/data/mods/public/art/actors/structures/seleucids/wall_gate.xml +++ b/binaries/data/mods/public/art/actors/structures/seleucids/wall_gate.xml @@ -2,7 +2,7 @@ - + structural/sele_wall_gate.dae @@ -11,7 +11,7 @@ - + diff --git a/binaries/data/mods/public/art/actors/structures/seleucids/wall_long.xml b/binaries/data/mods/public/art/actors/structures/seleucids/wall_long.xml index 96738fadea..402c4fef93 100644 --- a/binaries/data/mods/public/art/actors/structures/seleucids/wall_long.xml +++ b/binaries/data/mods/public/art/actors/structures/seleucids/wall_long.xml @@ -2,7 +2,7 @@ - + @@ -11,7 +11,7 @@ - + diff --git a/binaries/data/mods/public/art/actors/structures/seleucids/wall_med.xml b/binaries/data/mods/public/art/actors/structures/seleucids/wall_medium.xml similarity index 84% rename from binaries/data/mods/public/art/actors/structures/seleucids/wall_med.xml rename to binaries/data/mods/public/art/actors/structures/seleucids/wall_medium.xml index a6863c7b97..f6b8acfec9 100644 --- a/binaries/data/mods/public/art/actors/structures/seleucids/wall_med.xml +++ b/binaries/data/mods/public/art/actors/structures/seleucids/wall_medium.xml @@ -2,16 +2,16 @@ - + - structural/sele_wall_med.dae + structural/sele_wall_medium.dae - + diff --git a/binaries/data/mods/public/art/actors/structures/seleucids/wall_short.xml b/binaries/data/mods/public/art/actors/structures/seleucids/wall_short.xml index 7fd411076c..68452e6894 100644 --- a/binaries/data/mods/public/art/actors/structures/seleucids/wall_short.xml +++ b/binaries/data/mods/public/art/actors/structures/seleucids/wall_short.xml @@ -2,7 +2,7 @@ - + @@ -11,7 +11,7 @@ - + diff --git a/binaries/data/mods/public/art/actors/structures/seleucids/wall_tower.xml b/binaries/data/mods/public/art/actors/structures/seleucids/wall_tower.xml index becce151db..4ac77403e4 100644 --- a/binaries/data/mods/public/art/actors/structures/seleucids/wall_tower.xml +++ b/binaries/data/mods/public/art/actors/structures/seleucids/wall_tower.xml @@ -2,7 +2,7 @@ - + @@ -16,7 +16,7 @@ - + diff --git a/binaries/data/mods/public/art/meshes/props/decal_struct_wall_med.dae b/binaries/data/mods/public/art/meshes/props/decal_struct_wall_med.dae deleted file mode 100644 index 7219b102eb..0000000000 --- a/binaries/data/mods/public/art/meshes/props/decal_struct_wall_med.dae +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:65127b901547ca77827bced0b1742220c0db30c1becb9a2bcfd370752fbeecfe -size 5861 diff --git a/binaries/data/mods/public/art/meshes/structural/brit_wall_med.dae b/binaries/data/mods/public/art/meshes/structural/brit_wall_med.dae deleted file mode 100644 index 5b32c6c755..0000000000 --- a/binaries/data/mods/public/art/meshes/structural/brit_wall_med.dae +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e9e6b593d642aec2e9ba2cc34133ece3a50f18960d79fe4aaee3349627fc97fd -size 260846 diff --git a/binaries/data/mods/public/art/meshes/structural/brit_wall_medium.dae b/binaries/data/mods/public/art/meshes/structural/brit_wall_medium.dae new file mode 100644 index 0000000000..1c18eb35cd --- /dev/null +++ b/binaries/data/mods/public/art/meshes/structural/brit_wall_medium.dae @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d528c3da19147cbf06284e13249d29a0f3eb7f77b31b82ef0cab9dafb77f4925 +size 260847 diff --git a/binaries/data/mods/public/art/meshes/structural/kush_wall_med.dae b/binaries/data/mods/public/art/meshes/structural/kush_wall_med.dae deleted file mode 100644 index 121ce21cf8..0000000000 --- a/binaries/data/mods/public/art/meshes/structural/kush_wall_med.dae +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7d5481b708d9240e55a948e7291e2755da6039806c419c0fcff19cb053e7b641 -size 241679 diff --git a/binaries/data/mods/public/art/meshes/structural/kush_wall_medium.dae b/binaries/data/mods/public/art/meshes/structural/kush_wall_medium.dae new file mode 100644 index 0000000000..69cbda7e77 --- /dev/null +++ b/binaries/data/mods/public/art/meshes/structural/kush_wall_medium.dae @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1ac4dce70b247062d9849c572023ff24d1803907ce97a6e6250ce32c0013c148 +size 241680 diff --git a/binaries/data/mods/public/art/meshes/structural/sele_wall_med.dae b/binaries/data/mods/public/art/meshes/structural/sele_wall_med.dae deleted file mode 100644 index 438d5f2b9b..0000000000 --- a/binaries/data/mods/public/art/meshes/structural/sele_wall_med.dae +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5947574b0184e2f3b0b33d5c831a75c0758a7f26c2db6ab68bf65ea82d7a4172 -size 124087 diff --git a/binaries/data/mods/public/art/meshes/structural/sele_wall_medium.dae b/binaries/data/mods/public/art/meshes/structural/sele_wall_medium.dae new file mode 100644 index 0000000000..bae7d8d040 --- /dev/null +++ b/binaries/data/mods/public/art/meshes/structural/sele_wall_medium.dae @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:daa90b698ba756698625795577638cfe8dd619bef360aed1fd6d12326c4fa17a +size 124088 diff --git a/binaries/data/mods/public/art/textures/skins/structural/ao/brit_wall_med_AO.png b/binaries/data/mods/public/art/textures/skins/structural/ao/brit_wall_medium.png similarity index 100% rename from binaries/data/mods/public/art/textures/skins/structural/ao/brit_wall_med_AO.png rename to binaries/data/mods/public/art/textures/skins/structural/ao/brit_wall_medium.png diff --git a/binaries/data/mods/public/art/textures/skins/structural/ao/kart_wall_medium_b_scaffolding_AO.png b/binaries/data/mods/public/art/textures/skins/structural/ao/kart_wall_medium_b_scaffolding.png similarity index 100% rename from binaries/data/mods/public/art/textures/skins/structural/ao/kart_wall_medium_b_scaffolding_AO.png rename to binaries/data/mods/public/art/textures/skins/structural/ao/kart_wall_medium_b_scaffolding.png diff --git a/binaries/data/mods/public/art/textures/skins/structural/ao/sele_wall_gate_AO.png b/binaries/data/mods/public/art/textures/skins/structural/ao/sele_wall_gate.png similarity index 100% rename from binaries/data/mods/public/art/textures/skins/structural/ao/sele_wall_gate_AO.png rename to binaries/data/mods/public/art/textures/skins/structural/ao/sele_wall_gate.png diff --git a/binaries/data/mods/public/art/textures/skins/structural/ao/sele_wall_long_AO.png b/binaries/data/mods/public/art/textures/skins/structural/ao/sele_wall_long.png similarity index 100% rename from binaries/data/mods/public/art/textures/skins/structural/ao/sele_wall_long_AO.png rename to binaries/data/mods/public/art/textures/skins/structural/ao/sele_wall_long.png diff --git a/binaries/data/mods/public/art/textures/skins/structural/ao/sele_wall_medium_AO.png b/binaries/data/mods/public/art/textures/skins/structural/ao/sele_wall_medium.png similarity index 100% rename from binaries/data/mods/public/art/textures/skins/structural/ao/sele_wall_medium_AO.png rename to binaries/data/mods/public/art/textures/skins/structural/ao/sele_wall_medium.png diff --git a/binaries/data/mods/public/art/textures/skins/structural/ao/sele_wall_short_AO.png b/binaries/data/mods/public/art/textures/skins/structural/ao/sele_wall_short.png similarity index 100% rename from binaries/data/mods/public/art/textures/skins/structural/ao/sele_wall_short_AO.png rename to binaries/data/mods/public/art/textures/skins/structural/ao/sele_wall_short.png diff --git a/binaries/data/mods/public/art/textures/skins/structural/ao/sele_wall_tower_AO.png b/binaries/data/mods/public/art/textures/skins/structural/ao/sele_wall_tower.png similarity index 100% rename from binaries/data/mods/public/art/textures/skins/structural/ao/sele_wall_tower_AO.png rename to binaries/data/mods/public/art/textures/skins/structural/ao/sele_wall_tower.png diff --git a/binaries/data/mods/public/simulation/templates/structures/cart_wall_medium.xml b/binaries/data/mods/public/simulation/templates/structures/cart_wall_medium.xml index 25e235d287..5167c0a6ca 100644 --- a/binaries/data/mods/public/simulation/templates/structures/cart_wall_medium.xml +++ b/binaries/data/mods/public/simulation/templates/structures/cart_wall_medium.xml @@ -27,7 +27,7 @@ structures/carthaginians/wall_medium.xml - structures/carthaginians/fndn_wall_med.xml + structures/carthaginians/fndn_wall_medium.xml 24.0 diff --git a/binaries/data/mods/public/simulation/templates/structures/kush_wall_medium.xml b/binaries/data/mods/public/simulation/templates/structures/kush_wall_medium.xml index 94bcaa675c..fa93d6cdeb 100644 --- a/binaries/data/mods/public/simulation/templates/structures/kush_wall_medium.xml +++ b/binaries/data/mods/public/simulation/templates/structures/kush_wall_medium.xml @@ -32,7 +32,7 @@ - structures/kushites/wall_med.xml + structures/kushites/wall_medium.xml 22.9 diff --git a/binaries/data/mods/public/simulation/templates/structures/sele_wall_medium.xml b/binaries/data/mods/public/simulation/templates/structures/sele_wall_medium.xml index 01174977ed..9baa14743b 100644 --- a/binaries/data/mods/public/simulation/templates/structures/sele_wall_medium.xml +++ b/binaries/data/mods/public/simulation/templates/structures/sele_wall_medium.xml @@ -13,7 +13,7 @@ - structures/seleucids/wall_med.xml + structures/seleucids/wall_medium.xml 21.1