From 75f4e79b02eaf86510ed54d57da4bde8944ba6d9 Mon Sep 17 00:00:00 2001 From: Mythos_Ruler Date: Sun, 4 Jan 2009 02:50:51 +0000 Subject: [PATCH] #Lots of Persian buildings stuff. Re-exporting them to collada as well as re-mapping them. This was SVN commit r6596. --- .../props/structures/persians/barracks.xml | 8 ++++++++ .../structures/persians/civil_centre_b.xml | 2 ++ .../props/structures/persians/fortress_b.xml | 8 ++++---- .../props/structures/persians/market.xml | 20 +++++++++++++++++++ .../props/structures/persians/market_a.xml | 15 -------------- .../props/structures/persians/market_b.xml | 15 -------------- .../props/structures/persians/temple_b.xml | 15 -------------- .../actors/structures/persians/farmstead.xml | 7 ++----- .../actors/structures/persians/fortress.xml | 6 +++--- .../art/actors/structures/persians/market.xml | 7 +++---- .../meshes/props/pers_barracks_props_b.dae | 3 +++ .../art/meshes/props/pers_cc_props_a.dae | 4 ++-- .../art/meshes/props/pers_cc_props_b.dae | 4 ++-- .../art/meshes/props/pers_fortress_eagles.dae | 3 +++ .../art/meshes/props/pers_market_props_a.dae | 3 +++ .../art/meshes/structural/pers_civic.dae | 2 +- .../art/meshes/structural/pers_farmstead.dae | 3 +++ .../art/meshes/structural/pers_fortress.dae | 3 +++ .../art/meshes/structural/pers_market.dae | 3 +++ .../textures/skins/structural/pers_struct.dds | 2 +- 20 files changed, 66 insertions(+), 67 deletions(-) create mode 100644 binaries/data/mods/internal/art/actors/props/structures/persians/market.xml delete mode 100644 binaries/data/mods/internal/art/actors/props/structures/persians/market_a.xml delete mode 100644 binaries/data/mods/internal/art/actors/props/structures/persians/market_b.xml delete mode 100644 binaries/data/mods/internal/art/actors/props/structures/persians/temple_b.xml create mode 100644 binaries/data/mods/internal/art/meshes/props/pers_barracks_props_b.dae create mode 100644 binaries/data/mods/internal/art/meshes/props/pers_fortress_eagles.dae create mode 100644 binaries/data/mods/internal/art/meshes/props/pers_market_props_a.dae create mode 100644 binaries/data/mods/internal/art/meshes/structural/pers_farmstead.dae create mode 100644 binaries/data/mods/internal/art/meshes/structural/pers_fortress.dae create mode 100644 binaries/data/mods/internal/art/meshes/structural/pers_market.dae diff --git a/binaries/data/mods/internal/art/actors/props/structures/persians/barracks.xml b/binaries/data/mods/internal/art/actors/props/structures/persians/barracks.xml index 36b166c4e4..818a037aba 100644 --- a/binaries/data/mods/internal/art/actors/props/structures/persians/barracks.xml +++ b/binaries/data/mods/internal/art/actors/props/structures/persians/barracks.xml @@ -6,6 +6,14 @@ props/pers_barracks_props_a.dae + + + props/pers_barracks_props_b.dae + + + + + structural/pers_struct.dds diff --git a/binaries/data/mods/internal/art/actors/props/structures/persians/civil_centre_b.xml b/binaries/data/mods/internal/art/actors/props/structures/persians/civil_centre_b.xml index ca32a3f407..c53e68f98b 100644 --- a/binaries/data/mods/internal/art/actors/props/structures/persians/civil_centre_b.xml +++ b/binaries/data/mods/internal/art/actors/props/structures/persians/civil_centre_b.xml @@ -18,4 +18,6 @@ + basic_trans.xml + diff --git a/binaries/data/mods/internal/art/actors/props/structures/persians/fortress_b.xml b/binaries/data/mods/internal/art/actors/props/structures/persians/fortress_b.xml index 9b78efdcb3..97a444f033 100644 --- a/binaries/data/mods/internal/art/actors/props/structures/persians/fortress_b.xml +++ b/binaries/data/mods/internal/art/actors/props/structures/persians/fortress_b.xml @@ -4,12 +4,12 @@ - - props/pers_ff_fancy.pmd - structural/pers_struct_b.dds + + props/pers_fortress_eagles.dae + structural/pers_struct.dds - player_trans.xml + basic_trans.xml diff --git a/binaries/data/mods/internal/art/actors/props/structures/persians/market.xml b/binaries/data/mods/internal/art/actors/props/structures/persians/market.xml new file mode 100644 index 0000000000..3e8322efa9 --- /dev/null +++ b/binaries/data/mods/internal/art/actors/props/structures/persians/market.xml @@ -0,0 +1,20 @@ + + + + + + + + props/pers_market_props_a.dae + + + + + + structural/pers_struct.dds + + + + basic_trans.xml + + diff --git a/binaries/data/mods/internal/art/actors/props/structures/persians/market_a.xml b/binaries/data/mods/internal/art/actors/props/structures/persians/market_a.xml deleted file mode 100644 index 9216a2f8f3..0000000000 --- a/binaries/data/mods/internal/art/actors/props/structures/persians/market_a.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - props/pers_tc.pmd - - props/pers_prop_a.dds - - - - diff --git a/binaries/data/mods/internal/art/actors/props/structures/persians/market_b.xml b/binaries/data/mods/internal/art/actors/props/structures/persians/market_b.xml deleted file mode 100644 index fb302f269f..0000000000 --- a/binaries/data/mods/internal/art/actors/props/structures/persians/market_b.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - props/pers_tc_fancy.pmd - structural/pers_struct_b.dds - - - - player_trans.xml - - diff --git a/binaries/data/mods/internal/art/actors/props/structures/persians/temple_b.xml b/binaries/data/mods/internal/art/actors/props/structures/persians/temple_b.xml deleted file mode 100644 index 703f8b3da0..0000000000 --- a/binaries/data/mods/internal/art/actors/props/structures/persians/temple_b.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - props/pers_hc_fancy.pmd - structural/pers_struct_b.dds - - - - player_trans.xml - - diff --git a/binaries/data/mods/internal/art/actors/structures/persians/farmstead.xml b/binaries/data/mods/internal/art/actors/structures/persians/farmstead.xml index 5b34256036..6cf6438458 100644 --- a/binaries/data/mods/internal/art/actors/structures/persians/farmstead.xml +++ b/binaries/data/mods/internal/art/actors/structures/persians/farmstead.xml @@ -5,11 +5,8 @@ - structural/pers_fc.pmd - - - - structural/pers_struct_a.dds + structural/pers_farmstead.dae + structural/pers_struct.dds diff --git a/binaries/data/mods/internal/art/actors/structures/persians/fortress.xml b/binaries/data/mods/internal/art/actors/structures/persians/fortress.xml index 48db25cabf..addb69df34 100644 --- a/binaries/data/mods/internal/art/actors/structures/persians/fortress.xml +++ b/binaries/data/mods/internal/art/actors/structures/persians/fortress.xml @@ -5,11 +5,11 @@ - structural/pers_ff.pmd + structural/pers_fortress.dae - + - structural/pers_struct_a.dds + structural/pers_struct.dds diff --git a/binaries/data/mods/internal/art/actors/structures/persians/market.xml b/binaries/data/mods/internal/art/actors/structures/persians/market.xml index baa4dfe2f8..5581c179a9 100644 --- a/binaries/data/mods/internal/art/actors/structures/persians/market.xml +++ b/binaries/data/mods/internal/art/actors/structures/persians/market.xml @@ -5,12 +5,11 @@ - structural/pers_tc.pmd + structural/pers_market.dae - - + - structural/pers_struct_a.dds + structural/pers_struct.dds diff --git a/binaries/data/mods/internal/art/meshes/props/pers_barracks_props_b.dae b/binaries/data/mods/internal/art/meshes/props/pers_barracks_props_b.dae new file mode 100644 index 0000000000..d88ee9a9bf --- /dev/null +++ b/binaries/data/mods/internal/art/meshes/props/pers_barracks_props_b.dae @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:190e81d749767c9166d0cb772c4c5d22ad0dfdb2d921584c00dc514efe979028 +size 57834 diff --git a/binaries/data/mods/internal/art/meshes/props/pers_cc_props_a.dae b/binaries/data/mods/internal/art/meshes/props/pers_cc_props_a.dae index 2c1e6b9b0c..f3e496e479 100644 --- a/binaries/data/mods/internal/art/meshes/props/pers_cc_props_a.dae +++ b/binaries/data/mods/internal/art/meshes/props/pers_cc_props_a.dae @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d9a89849d2277e4960bebe3aedc9c767649abbfaf5dbe554963722a0eec78a61 -size 36622 +oid sha256:2b9546466d2a6dcbce0253b64d1aa5fdec41a870cb6583399c7d491fe9ec17d8 +size 37498 diff --git a/binaries/data/mods/internal/art/meshes/props/pers_cc_props_b.dae b/binaries/data/mods/internal/art/meshes/props/pers_cc_props_b.dae index 00ab59b1b3..5555f7cd71 100644 --- a/binaries/data/mods/internal/art/meshes/props/pers_cc_props_b.dae +++ b/binaries/data/mods/internal/art/meshes/props/pers_cc_props_b.dae @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5c5251d41e85181b0d3e68a3deacf069fb7b01ae7ffd8c95acd00d5f82e52d4a -size 36606 +oid sha256:be3980f48626844832369b4c56cda79910e3d6eb89cbea1054114a9f3cb051ec +size 37596 diff --git a/binaries/data/mods/internal/art/meshes/props/pers_fortress_eagles.dae b/binaries/data/mods/internal/art/meshes/props/pers_fortress_eagles.dae new file mode 100644 index 0000000000..0aba6bd179 --- /dev/null +++ b/binaries/data/mods/internal/art/meshes/props/pers_fortress_eagles.dae @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:33583d4c451fe686aec1da1445f20f80bddf200a26724087877d9627adb09ede +size 6571 diff --git a/binaries/data/mods/internal/art/meshes/props/pers_market_props_a.dae b/binaries/data/mods/internal/art/meshes/props/pers_market_props_a.dae new file mode 100644 index 0000000000..d131481cff --- /dev/null +++ b/binaries/data/mods/internal/art/meshes/props/pers_market_props_a.dae @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2d7302d0d31c2d78fb8de1cf078f9e56afd5d462542b797bc4d75b35a9686b07 +size 89757 diff --git a/binaries/data/mods/internal/art/meshes/structural/pers_civic.dae b/binaries/data/mods/internal/art/meshes/structural/pers_civic.dae index 0146fbd456..223e1d11dd 100644 --- a/binaries/data/mods/internal/art/meshes/structural/pers_civic.dae +++ b/binaries/data/mods/internal/art/meshes/structural/pers_civic.dae @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:196e2d2ecb68123ba3585d20756279252600e726ababb37c3f257d2f409f46ef +oid sha256:58194defbd264ddab860dbbf2703f236a603e18cffa17b0f871bde9c5096f373 size 263708 diff --git a/binaries/data/mods/internal/art/meshes/structural/pers_farmstead.dae b/binaries/data/mods/internal/art/meshes/structural/pers_farmstead.dae new file mode 100644 index 0000000000..885c0e347d --- /dev/null +++ b/binaries/data/mods/internal/art/meshes/structural/pers_farmstead.dae @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a3ac2f15263a300debdffb456c706269e447d530290bbc9b3d939675b8ca2ab5 +size 85515 diff --git a/binaries/data/mods/internal/art/meshes/structural/pers_fortress.dae b/binaries/data/mods/internal/art/meshes/structural/pers_fortress.dae new file mode 100644 index 0000000000..3e19d7f974 --- /dev/null +++ b/binaries/data/mods/internal/art/meshes/structural/pers_fortress.dae @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f545bcdb39a67e6e716c8f15ab28eb40514f44acff50aaab9365d8e74fd319aa +size 150690 diff --git a/binaries/data/mods/internal/art/meshes/structural/pers_market.dae b/binaries/data/mods/internal/art/meshes/structural/pers_market.dae new file mode 100644 index 0000000000..767ed683fd --- /dev/null +++ b/binaries/data/mods/internal/art/meshes/structural/pers_market.dae @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6dd477bd083e32e1b50674174f1ec688a07c56cc2b4fbb57c0162c0559a4b2a0 +size 174439 diff --git a/binaries/data/mods/internal/art/textures/skins/structural/pers_struct.dds b/binaries/data/mods/internal/art/textures/skins/structural/pers_struct.dds index 7e10faf19b..c5aa845b10 100644 --- a/binaries/data/mods/internal/art/textures/skins/structural/pers_struct.dds +++ b/binaries/data/mods/internal/art/textures/skins/structural/pers_struct.dds @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:abd336aa881ec224f7bf2ebc54f349cdedc032e64a4d5d6b8736e821973c9cf9 +oid sha256:7c57fc87d8d08fc504e628332212647ce4944b2e6efb0c46edc222e28670033b size 1398256