From bc6a173c934e6b8dd4e1af60d0a71ccdcc73715c Mon Sep 17 00:00:00 2001 From: Mythos_Ruler Date: Mon, 12 Jan 2009 01:19:22 +0000 Subject: [PATCH] This was SVN commit r6613. --- .../props/structures/iberians/barracks.xml | 8 +-- .../structures/iberians/civil_centre.xml | 12 ++-- .../props/structures/iberians/house_a.xml | 16 +++-- .../props/structures/iberians/house_b.xml | 16 +++-- .../actors/props/structures/iberians/mill.xml | 16 +++-- .../props/structures/iberians/scout_tower.xml | 23 ++++++++ .../actors/structures/iberians/barracks.xml | 32 +++++----- .../structures/iberians/civil_centre.xml | 34 ++++++----- .../art/actors/structures/iberians/house.xml | 59 ++++++++++--------- .../art/actors/structures/iberians/mill.xml | 32 +++++----- .../structures/iberians/scout_tower.xml | 7 ++- .../art/meshes/props/iber_barracks_a.dae | 3 + .../art/meshes/props/iber_civic_centre.dae | 3 + .../art/meshes/props/iber_house_a_1.dae | 3 + .../art/meshes/props/iber_house_a_2.dae | 3 + .../art/meshes/props/iber_house_b_1.dae | 3 + .../art/meshes/props/iber_house_b_2.dae | 3 + .../internal/art/meshes/props/iber_mill_a.dae | 3 + .../internal/art/meshes/props/iber_mill_b.dae | 3 + .../art/meshes/props/iber_scout_tower.dae | 3 + .../art/meshes/props/iber_scout_tower_b.dae | 3 + .../art/meshes/structural/iber_barracks.dae | 3 + .../meshes/structural/iber_civic_centre.dae | 3 + .../art/meshes/structural/iber_house_a.dae | 3 + .../art/meshes/structural/iber_house_b.dae | 3 + .../art/meshes/structural/iber_mill.dae | 3 + .../meshes/structural/iber_scout_tower.dae | 3 + .../skins/props/iber_prop_shields.dds | 3 + .../skins/props/shield/iber_round_e.dds | 2 +- .../textures/skins/structural/iber_struct.dds | 2 +- .../entities/structures/rome_civil_centre.xml | 15 +---- .../maps/scenarios/iberian_buildings.pmp | 3 + .../maps/scenarios/iberian_buildings.xml | 3 + 33 files changed, 212 insertions(+), 119 deletions(-) create mode 100644 binaries/data/mods/internal/art/actors/props/structures/iberians/scout_tower.xml create mode 100644 binaries/data/mods/internal/art/meshes/props/iber_barracks_a.dae create mode 100644 binaries/data/mods/internal/art/meshes/props/iber_civic_centre.dae create mode 100644 binaries/data/mods/internal/art/meshes/props/iber_house_a_1.dae create mode 100644 binaries/data/mods/internal/art/meshes/props/iber_house_a_2.dae create mode 100644 binaries/data/mods/internal/art/meshes/props/iber_house_b_1.dae create mode 100644 binaries/data/mods/internal/art/meshes/props/iber_house_b_2.dae create mode 100644 binaries/data/mods/internal/art/meshes/props/iber_mill_a.dae create mode 100644 binaries/data/mods/internal/art/meshes/props/iber_mill_b.dae create mode 100644 binaries/data/mods/internal/art/meshes/props/iber_scout_tower.dae create mode 100644 binaries/data/mods/internal/art/meshes/props/iber_scout_tower_b.dae create mode 100644 binaries/data/mods/internal/art/meshes/structural/iber_barracks.dae create mode 100644 binaries/data/mods/internal/art/meshes/structural/iber_civic_centre.dae create mode 100644 binaries/data/mods/internal/art/meshes/structural/iber_house_a.dae create mode 100644 binaries/data/mods/internal/art/meshes/structural/iber_house_b.dae create mode 100644 binaries/data/mods/internal/art/meshes/structural/iber_mill.dae create mode 100644 binaries/data/mods/internal/art/meshes/structural/iber_scout_tower.dae create mode 100644 binaries/data/mods/internal/art/textures/skins/props/iber_prop_shields.dds create mode 100644 binaries/data/mods/internal/maps/scenarios/iberian_buildings.pmp create mode 100644 binaries/data/mods/internal/maps/scenarios/iberian_buildings.xml diff --git a/binaries/data/mods/internal/art/actors/props/structures/iberians/barracks.xml b/binaries/data/mods/internal/art/actors/props/structures/iberians/barracks.xml index 39ea6c1320..4474aaeed8 100644 --- a/binaries/data/mods/internal/art/actors/props/structures/iberians/barracks.xml +++ b/binaries/data/mods/internal/art/actors/props/structures/iberians/barracks.xml @@ -5,11 +5,11 @@ - - props/iber_mc.pmd - - props/iber_prop_a.dds + props/iber_barracks_a.dae + props/iber_prop_shields.dds + player_trans.xml + diff --git a/binaries/data/mods/internal/art/actors/props/structures/iberians/civil_centre.xml b/binaries/data/mods/internal/art/actors/props/structures/iberians/civil_centre.xml index 3fe9bc4316..e1c12d017e 100644 --- a/binaries/data/mods/internal/art/actors/props/structures/iberians/civil_centre.xml +++ b/binaries/data/mods/internal/art/actors/props/structures/iberians/civil_centre.xml @@ -1,15 +1,13 @@ - - - - - props/iber_cc.pmd - - props/iber_prop_a.dds + + props/iber_civic_centre.dae + props/iber_prop_shields.dds + player_trans.xml + diff --git a/binaries/data/mods/internal/art/actors/props/structures/iberians/house_a.xml b/binaries/data/mods/internal/art/actors/props/structures/iberians/house_a.xml index 5079b5e5dd..06f0a37b51 100644 --- a/binaries/data/mods/internal/art/actors/props/structures/iberians/house_a.xml +++ b/binaries/data/mods/internal/art/actors/props/structures/iberians/house_a.xml @@ -4,11 +4,17 @@ - - - props/iber_ho_a.pmd - - props/iber_prop_a.dds + + props/iber_house_a_1.dae + + + props/iber_house_a_2.dae + + + + + + structural/iber_struct.dds diff --git a/binaries/data/mods/internal/art/actors/props/structures/iberians/house_b.xml b/binaries/data/mods/internal/art/actors/props/structures/iberians/house_b.xml index bbf538d383..0806a74519 100644 --- a/binaries/data/mods/internal/art/actors/props/structures/iberians/house_b.xml +++ b/binaries/data/mods/internal/art/actors/props/structures/iberians/house_b.xml @@ -4,11 +4,17 @@ - - - props/iber_ho_b.pmd - - props/iber_prop_a.dds + + props/iber_house_b_1.dae + + + props/iber_house_b_2.dae + + + + + + structural/iber_struct.dds diff --git a/binaries/data/mods/internal/art/actors/props/structures/iberians/mill.xml b/binaries/data/mods/internal/art/actors/props/structures/iberians/mill.xml index e5d4323c4c..02e25718fa 100644 --- a/binaries/data/mods/internal/art/actors/props/structures/iberians/mill.xml +++ b/binaries/data/mods/internal/art/actors/props/structures/iberians/mill.xml @@ -4,11 +4,17 @@ - - - props/iber_rc.pmd - - props/iber_prop_a.dds + + props/iber_mill_a.dae + + + props/iber_mill_b.dae + + + + + + structural/iber_struct.dds diff --git a/binaries/data/mods/internal/art/actors/props/structures/iberians/scout_tower.xml b/binaries/data/mods/internal/art/actors/props/structures/iberians/scout_tower.xml new file mode 100644 index 0000000000..2f5cc2fa96 --- /dev/null +++ b/binaries/data/mods/internal/art/actors/props/structures/iberians/scout_tower.xml @@ -0,0 +1,23 @@ + + + + + + + + props/iber_scout_tower.dae + + + props/iber_scout_tower_b.dae + + + + + + props/iber_prop_shields.dds + + + + player_trans.xml + + diff --git a/binaries/data/mods/internal/art/actors/structures/iberians/barracks.xml b/binaries/data/mods/internal/art/actors/structures/iberians/barracks.xml index ab2d69be69..a877e84e46 100644 --- a/binaries/data/mods/internal/art/actors/structures/iberians/barracks.xml +++ b/binaries/data/mods/internal/art/actors/structures/iberians/barracks.xml @@ -1,16 +1,16 @@ - - - - - - - - structural/iber_mc.pmd - - - - structural/iber_struct_a.dds - - - - + + + + + + + + structural/iber_barracks.dae + + + + structural/iber_struct.dds + + + + diff --git a/binaries/data/mods/internal/art/actors/structures/iberians/civil_centre.xml b/binaries/data/mods/internal/art/actors/structures/iberians/civil_centre.xml index c5888a236e..1c03222ba5 100644 --- a/binaries/data/mods/internal/art/actors/structures/iberians/civil_centre.xml +++ b/binaries/data/mods/internal/art/actors/structures/iberians/civil_centre.xml @@ -1,16 +1,18 @@ - - - - - - - - structural/iber_cc.pmd - - - - structural/iber_struct_a.dds - - - - + + + + + + + + structural/iber_civic_centre.dae + + + + structural/iber_struct.dds + + + + player_trans.xml + + diff --git a/binaries/data/mods/internal/art/actors/structures/iberians/house.xml b/binaries/data/mods/internal/art/actors/structures/iberians/house.xml index 365c956862..e1a27133c4 100644 --- a/binaries/data/mods/internal/art/actors/structures/iberians/house.xml +++ b/binaries/data/mods/internal/art/actors/structures/iberians/house.xml @@ -1,28 +1,31 @@ - - - - - - structural/iber_ho_a.pmd - - - - structural/iber_struct_a.dds - - - structural/iber_ho_b.pmd - - - - structural/iber_struct_a.dds - - - structural/iber_ho_c.pmd - - - - structural/iber_struct_a.dds - - - - + + + + + + structural/iber_house_a.dae + + + + + + structural/iber_house_b.dae + + + + + + structural/iber_ho_c.pmd + + + + + + + + + structural/iber_struct.dds + + + + diff --git a/binaries/data/mods/internal/art/actors/structures/iberians/mill.xml b/binaries/data/mods/internal/art/actors/structures/iberians/mill.xml index 71458e2370..d26c17724e 100644 --- a/binaries/data/mods/internal/art/actors/structures/iberians/mill.xml +++ b/binaries/data/mods/internal/art/actors/structures/iberians/mill.xml @@ -1,16 +1,16 @@ - - - - - - - - structural/iber_rc.pmd - - - - structural/iber_struct_a.dds - - - - + + + + + + + + structural/iber_mill.dae + + + + structural/iber_struct.dds + + + + diff --git a/binaries/data/mods/internal/art/actors/structures/iberians/scout_tower.xml b/binaries/data/mods/internal/art/actors/structures/iberians/scout_tower.xml index d631da727d..6252eeab78 100644 --- a/binaries/data/mods/internal/art/actors/structures/iberians/scout_tower.xml +++ b/binaries/data/mods/internal/art/actors/structures/iberians/scout_tower.xml @@ -5,8 +5,11 @@ - structural/iber_st.pmd - structural/iber_struct_a.dds + structural/iber_scout_tower.dae + + + + structural/iber_struct.dds diff --git a/binaries/data/mods/internal/art/meshes/props/iber_barracks_a.dae b/binaries/data/mods/internal/art/meshes/props/iber_barracks_a.dae new file mode 100644 index 0000000000..56555d41d2 --- /dev/null +++ b/binaries/data/mods/internal/art/meshes/props/iber_barracks_a.dae @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7d202e8184e74c5d432d131ed2fff4a472d9804fbca51723ce2a92a109c8d567 +size 26549 diff --git a/binaries/data/mods/internal/art/meshes/props/iber_civic_centre.dae b/binaries/data/mods/internal/art/meshes/props/iber_civic_centre.dae new file mode 100644 index 0000000000..ae177c7cce --- /dev/null +++ b/binaries/data/mods/internal/art/meshes/props/iber_civic_centre.dae @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d6cb5eff8f28fbd865a97c2bf5d1c17aec23b9acec62f32559ca492ce92aa049 +size 19920 diff --git a/binaries/data/mods/internal/art/meshes/props/iber_house_a_1.dae b/binaries/data/mods/internal/art/meshes/props/iber_house_a_1.dae new file mode 100644 index 0000000000..859d40298c --- /dev/null +++ b/binaries/data/mods/internal/art/meshes/props/iber_house_a_1.dae @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3ea9d04847b948f7acf54ea7818d7fc8ccee69dcecade74dc6ea253a203b1286 +size 20690 diff --git a/binaries/data/mods/internal/art/meshes/props/iber_house_a_2.dae b/binaries/data/mods/internal/art/meshes/props/iber_house_a_2.dae new file mode 100644 index 0000000000..3851f48f90 --- /dev/null +++ b/binaries/data/mods/internal/art/meshes/props/iber_house_a_2.dae @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:86b7d292edae829e535fa3b6b1af3f21f51c0062297ab58c9a25dcb25066b29e +size 28140 diff --git a/binaries/data/mods/internal/art/meshes/props/iber_house_b_1.dae b/binaries/data/mods/internal/art/meshes/props/iber_house_b_1.dae new file mode 100644 index 0000000000..4a4a07f425 --- /dev/null +++ b/binaries/data/mods/internal/art/meshes/props/iber_house_b_1.dae @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:25ac1d0da7c02e8ca598a5573b96c964f2bc008011ab36f1e34f63a616058bce +size 17104 diff --git a/binaries/data/mods/internal/art/meshes/props/iber_house_b_2.dae b/binaries/data/mods/internal/art/meshes/props/iber_house_b_2.dae new file mode 100644 index 0000000000..c17eca908a --- /dev/null +++ b/binaries/data/mods/internal/art/meshes/props/iber_house_b_2.dae @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3b6bfcb174d5d68f1b1310879abdcaacd5758509eca10e7efde723a1f3fd1e23 +size 24712 diff --git a/binaries/data/mods/internal/art/meshes/props/iber_mill_a.dae b/binaries/data/mods/internal/art/meshes/props/iber_mill_a.dae new file mode 100644 index 0000000000..0366229a40 --- /dev/null +++ b/binaries/data/mods/internal/art/meshes/props/iber_mill_a.dae @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:182469e52fb118301c168257857a1f9ce5358afe9d71eeada004df0408560a55 +size 33373 diff --git a/binaries/data/mods/internal/art/meshes/props/iber_mill_b.dae b/binaries/data/mods/internal/art/meshes/props/iber_mill_b.dae new file mode 100644 index 0000000000..a263d3d54d --- /dev/null +++ b/binaries/data/mods/internal/art/meshes/props/iber_mill_b.dae @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7b48c5d4e55a9edcef77e30199a50d5ac70a5a7b3abffdd40cf832ac17321f62 +size 37656 diff --git a/binaries/data/mods/internal/art/meshes/props/iber_scout_tower.dae b/binaries/data/mods/internal/art/meshes/props/iber_scout_tower.dae new file mode 100644 index 0000000000..abaa8be311 --- /dev/null +++ b/binaries/data/mods/internal/art/meshes/props/iber_scout_tower.dae @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7c7c6eca6cf1cb15b4afa0f9a3f3e2f0d2b456b81d46b230ba03e9e1915e2772 +size 12496 diff --git a/binaries/data/mods/internal/art/meshes/props/iber_scout_tower_b.dae b/binaries/data/mods/internal/art/meshes/props/iber_scout_tower_b.dae new file mode 100644 index 0000000000..d92b74ea14 --- /dev/null +++ b/binaries/data/mods/internal/art/meshes/props/iber_scout_tower_b.dae @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bd23e43d845b854e723ff740bf48ef08e76a3fe8c0a3f0999f5f0ebeb30feb45 +size 12564 diff --git a/binaries/data/mods/internal/art/meshes/structural/iber_barracks.dae b/binaries/data/mods/internal/art/meshes/structural/iber_barracks.dae new file mode 100644 index 0000000000..522ce632bb --- /dev/null +++ b/binaries/data/mods/internal/art/meshes/structural/iber_barracks.dae @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5e491f9393886732387c391d167c6022130555deaa56096856f55409f46a60f5 +size 125831 diff --git a/binaries/data/mods/internal/art/meshes/structural/iber_civic_centre.dae b/binaries/data/mods/internal/art/meshes/structural/iber_civic_centre.dae new file mode 100644 index 0000000000..7902db8321 --- /dev/null +++ b/binaries/data/mods/internal/art/meshes/structural/iber_civic_centre.dae @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c3af51cfbb5597ebe7fa94e6bd9a0c406c1ee467a4228236335b483d7a2a0bc8 +size 165280 diff --git a/binaries/data/mods/internal/art/meshes/structural/iber_house_a.dae b/binaries/data/mods/internal/art/meshes/structural/iber_house_a.dae new file mode 100644 index 0000000000..f9b7dac356 --- /dev/null +++ b/binaries/data/mods/internal/art/meshes/structural/iber_house_a.dae @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5174d1770f9940901da7dd273d00b41df8e0e39399d867cef0c17e0e88d17fe5 +size 52361 diff --git a/binaries/data/mods/internal/art/meshes/structural/iber_house_b.dae b/binaries/data/mods/internal/art/meshes/structural/iber_house_b.dae new file mode 100644 index 0000000000..53c34fb5e8 --- /dev/null +++ b/binaries/data/mods/internal/art/meshes/structural/iber_house_b.dae @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:84aa6e819e29a5ff7e640578f9c71b23a5cd5dac0e796c46dec6ce559ea89105 +size 46574 diff --git a/binaries/data/mods/internal/art/meshes/structural/iber_mill.dae b/binaries/data/mods/internal/art/meshes/structural/iber_mill.dae new file mode 100644 index 0000000000..5f2e58ae36 --- /dev/null +++ b/binaries/data/mods/internal/art/meshes/structural/iber_mill.dae @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0fe014296d07ce5f3659952079043d4a6e8b6852df89def80c4a631072533f3c +size 37420 diff --git a/binaries/data/mods/internal/art/meshes/structural/iber_scout_tower.dae b/binaries/data/mods/internal/art/meshes/structural/iber_scout_tower.dae new file mode 100644 index 0000000000..d13840039a --- /dev/null +++ b/binaries/data/mods/internal/art/meshes/structural/iber_scout_tower.dae @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bb1d006f0c4ff55ae26c42a531935a96db4ab38aba2ea364927c41451082a0e4 +size 28425 diff --git a/binaries/data/mods/internal/art/textures/skins/props/iber_prop_shields.dds b/binaries/data/mods/internal/art/textures/skins/props/iber_prop_shields.dds new file mode 100644 index 0000000000..f4e4a785c2 --- /dev/null +++ b/binaries/data/mods/internal/art/textures/skins/props/iber_prop_shields.dds @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d3f26d10a501a4c97bac077fb81f7d54ab30d533d4e159d102f91463b40c9b5c +size 43856 diff --git a/binaries/data/mods/internal/art/textures/skins/props/shield/iber_round_e.dds b/binaries/data/mods/internal/art/textures/skins/props/shield/iber_round_e.dds index 72b498fb71..c167a5ebe9 100644 --- a/binaries/data/mods/internal/art/textures/skins/props/shield/iber_round_e.dds +++ b/binaries/data/mods/internal/art/textures/skins/props/shield/iber_round_e.dds @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:872853fcbb9df9a5449c673688ac04dc8207ecbfbdd9255c78c0501292c8d2f9 +oid sha256:c0fb425ee02000e63fb7f43cbf67668ada6d4bacefdb9fffa0c085f3ca1a2e06 size 5616 diff --git a/binaries/data/mods/internal/art/textures/skins/structural/iber_struct.dds b/binaries/data/mods/internal/art/textures/skins/structural/iber_struct.dds index 080c09b23c..95e90833c4 100644 --- a/binaries/data/mods/internal/art/textures/skins/structural/iber_struct.dds +++ b/binaries/data/mods/internal/art/textures/skins/structural/iber_struct.dds @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f023507665247dac03f714f2b4b660ca4f1e25be4630ebe78eb255f38dfa6a82 +oid sha256:ef4929953dee08d981357d11a59ebdb394b685e9e43beedcf6b4089e4207b6a2 size 699216 diff --git a/binaries/data/mods/internal/entities/structures/rome_civil_centre.xml b/binaries/data/mods/internal/entities/structures/rome_civil_centre.xml index cc74fe34c7..99b813057c 100644 --- a/binaries/data/mods/internal/entities/structures/rome_civil_centre.xml +++ b/binaries/data/mods/internal/entities/structures/rome_civil_centre.xml @@ -1,24 +1,14 @@ - + + structures/romans/civic_centre.xml - - Municipium - Romans - (Roman History goes here) - - - - structures/romans/civil_centre.xml - @@ -30,5 +20,4 @@ - \ No newline at end of file diff --git a/binaries/data/mods/internal/maps/scenarios/iberian_buildings.pmp b/binaries/data/mods/internal/maps/scenarios/iberian_buildings.pmp new file mode 100644 index 0000000000..a9b91c41e3 --- /dev/null +++ b/binaries/data/mods/internal/maps/scenarios/iberian_buildings.pmp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b56fc7d77b69bc7165b575a8fdf1b795d8cdc14f7975734d2ec83e44396fd16a +size 207996 diff --git a/binaries/data/mods/internal/maps/scenarios/iberian_buildings.xml b/binaries/data/mods/internal/maps/scenarios/iberian_buildings.xml new file mode 100644 index 0000000000..8fbceb0027 --- /dev/null +++ b/binaries/data/mods/internal/maps/scenarios/iberian_buildings.xml @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2a1a1368f606a80a6fb1be44a69b24b93bb8cc5ca5822b598ccd97ef4c75fc15 +size 3916