From 3e03a8ae10ad39ca869c218bbe2421ee27d206b6 Mon Sep 17 00:00:00 2001 From: Mythos_Ruler Date: Fri, 1 Oct 2010 07:34:29 +0000 Subject: [PATCH] #Re-exported Celtic Mill and Farmstead to Collada with some tweaks and additions. Can now delete their *.PMD meshes. Added a Celtic "hut" eye candy building. This was SVN commit r8232. --- .../props/structures/celts/farmstead.xml | 7 ++--- .../props/structures/celts/farmstead_hoe.xml | 10 ++++++ .../structures/celts/farmstead_shield.xml | 11 +++++++ .../props/structures/celts/hut_props.xml | 10 ++++++ .../props/structures/celts/hut_shield.xml | 11 +++++++ .../actors/props/structures/celts/mill_1.xml | 7 ++--- .../actors/props/structures/celts/mill_2.xml | 7 ++--- .../props/structures/celts/mill_shield.xml | 11 +++++++ .../props/structures/decals/farmstead_mud.xml | 10 ++++++ .../art/actors/structures/celts/farmstead.xml | 14 ++++----- .../art/actors/structures/celts/hut.xml | 14 +++++++++ .../art/actors/structures/celts/mill.xml | 13 ++++---- .../art/meshes/props/celt_farmstead_hoe.dae | 3 ++ .../art/meshes/props/celt_farmstead_props.dae | 3 ++ .../meshes/props/celt_farmstead_shield.dae | 3 ++ .../art/meshes/props/celt_hut_props.dae | 3 ++ .../art/meshes/props/celt_hut_shield.dae | 3 ++ .../art/meshes/props/celt_mill_props.dae | 3 ++ .../art/meshes/props/celt_mill_shield.dae | 3 ++ .../art/meshes/props/celt_mill_silo.dae | 3 ++ .../art/meshes/props/decal_celt_farmstead.dae | 3 ++ .../art/meshes/structural/celt_farmstead.dae | 3 ++ .../public/art/meshes/structural/celt_hut.dae | 3 ++ .../art/meshes/structural/celt_mill.dae | 3 ++ .../art/textures/skins/props/celt_prop_1.dds | 2 +- .../simulation/templates/other/celt_hut.xml | 31 +++++++++++++++++++ .../template_structure_economic_mill.xml | 2 +- 27 files changed, 168 insertions(+), 28 deletions(-) create mode 100644 binaries/data/mods/public/art/actors/props/structures/celts/farmstead_hoe.xml create mode 100644 binaries/data/mods/public/art/actors/props/structures/celts/farmstead_shield.xml create mode 100644 binaries/data/mods/public/art/actors/props/structures/celts/hut_props.xml create mode 100644 binaries/data/mods/public/art/actors/props/structures/celts/hut_shield.xml create mode 100644 binaries/data/mods/public/art/actors/props/structures/celts/mill_shield.xml create mode 100644 binaries/data/mods/public/art/actors/props/structures/decals/farmstead_mud.xml create mode 100644 binaries/data/mods/public/art/actors/structures/celts/hut.xml create mode 100644 binaries/data/mods/public/art/meshes/props/celt_farmstead_hoe.dae create mode 100644 binaries/data/mods/public/art/meshes/props/celt_farmstead_props.dae create mode 100644 binaries/data/mods/public/art/meshes/props/celt_farmstead_shield.dae create mode 100644 binaries/data/mods/public/art/meshes/props/celt_hut_props.dae create mode 100644 binaries/data/mods/public/art/meshes/props/celt_hut_shield.dae create mode 100644 binaries/data/mods/public/art/meshes/props/celt_mill_props.dae create mode 100644 binaries/data/mods/public/art/meshes/props/celt_mill_shield.dae create mode 100644 binaries/data/mods/public/art/meshes/props/celt_mill_silo.dae create mode 100644 binaries/data/mods/public/art/meshes/props/decal_celt_farmstead.dae create mode 100644 binaries/data/mods/public/art/meshes/structural/celt_farmstead.dae create mode 100644 binaries/data/mods/public/art/meshes/structural/celt_hut.dae create mode 100644 binaries/data/mods/public/art/meshes/structural/celt_mill.dae create mode 100644 binaries/data/mods/public/simulation/templates/other/celt_hut.xml diff --git a/binaries/data/mods/public/art/actors/props/structures/celts/farmstead.xml b/binaries/data/mods/public/art/actors/props/structures/celts/farmstead.xml index 415a367afa..40d57f6a49 100644 --- a/binaries/data/mods/public/art/actors/props/structures/celts/farmstead.xml +++ b/binaries/data/mods/public/art/actors/props/structures/celts/farmstead.xml @@ -1,11 +1,10 @@ - + - + - props/celt_fc.pmd + props/celt_farmstead_props.dae props/celt_prop_1.dds - diff --git a/binaries/data/mods/public/art/actors/props/structures/celts/farmstead_hoe.xml b/binaries/data/mods/public/art/actors/props/structures/celts/farmstead_hoe.xml new file mode 100644 index 0000000000..f838c320ef --- /dev/null +++ b/binaries/data/mods/public/art/actors/props/structures/celts/farmstead_hoe.xml @@ -0,0 +1,10 @@ + + + + + + props/celt_farmstead_hoe.dae + props/prop_weap.dds + + + diff --git a/binaries/data/mods/public/art/actors/props/structures/celts/farmstead_shield.xml b/binaries/data/mods/public/art/actors/props/structures/celts/farmstead_shield.xml new file mode 100644 index 0000000000..15836d7e64 --- /dev/null +++ b/binaries/data/mods/public/art/actors/props/structures/celts/farmstead_shield.xml @@ -0,0 +1,11 @@ + + + + + + props/celt_farmstead_shield.dae + props/celt_props_new.dds + + + player_trans.xml + diff --git a/binaries/data/mods/public/art/actors/props/structures/celts/hut_props.xml b/binaries/data/mods/public/art/actors/props/structures/celts/hut_props.xml new file mode 100644 index 0000000000..11f8fe0424 --- /dev/null +++ b/binaries/data/mods/public/art/actors/props/structures/celts/hut_props.xml @@ -0,0 +1,10 @@ + + + + + + props/celt_hut_props.dae + props/celt_prop_1.dds + + + diff --git a/binaries/data/mods/public/art/actors/props/structures/celts/hut_shield.xml b/binaries/data/mods/public/art/actors/props/structures/celts/hut_shield.xml new file mode 100644 index 0000000000..5c6292e727 --- /dev/null +++ b/binaries/data/mods/public/art/actors/props/structures/celts/hut_shield.xml @@ -0,0 +1,11 @@ + + + + + + props/celt_hut_shield.dae + props/celt_props_new.dds + + + player_trans.xml + diff --git a/binaries/data/mods/public/art/actors/props/structures/celts/mill_1.xml b/binaries/data/mods/public/art/actors/props/structures/celts/mill_1.xml index 9963947632..7de3be46fa 100644 --- a/binaries/data/mods/public/art/actors/props/structures/celts/mill_1.xml +++ b/binaries/data/mods/public/art/actors/props/structures/celts/mill_1.xml @@ -1,11 +1,10 @@ - + - + - props/celt_rc1.pmd + props/celt_mill_props.dae props/celt_prop_1.dds - diff --git a/binaries/data/mods/public/art/actors/props/structures/celts/mill_2.xml b/binaries/data/mods/public/art/actors/props/structures/celts/mill_2.xml index 70ece7c06e..02be855432 100644 --- a/binaries/data/mods/public/art/actors/props/structures/celts/mill_2.xml +++ b/binaries/data/mods/public/art/actors/props/structures/celts/mill_2.xml @@ -1,11 +1,10 @@ - + - + - props/celt_rc2.pmd + props/celt_mill_silo.dae structural/celt_broch.dds - diff --git a/binaries/data/mods/public/art/actors/props/structures/celts/mill_shield.xml b/binaries/data/mods/public/art/actors/props/structures/celts/mill_shield.xml new file mode 100644 index 0000000000..70e617c77e --- /dev/null +++ b/binaries/data/mods/public/art/actors/props/structures/celts/mill_shield.xml @@ -0,0 +1,11 @@ + + + + + + props/celt_mill_shield.dae + props/celt_props_new.dds + + + player_trans.xml + diff --git a/binaries/data/mods/public/art/actors/props/structures/decals/farmstead_mud.xml b/binaries/data/mods/public/art/actors/props/structures/decals/farmstead_mud.xml new file mode 100644 index 0000000000..2ce238b881 --- /dev/null +++ b/binaries/data/mods/public/art/actors/props/structures/decals/farmstead_mud.xml @@ -0,0 +1,10 @@ + + + + + props/decal_celt_farmstead.dae + props/decal_struct_mud_long.dds + + + basic_trans.xml + diff --git a/binaries/data/mods/public/art/actors/structures/celts/farmstead.xml b/binaries/data/mods/public/art/actors/structures/celts/farmstead.xml index 6e7e2ab7a9..a1efb769bb 100644 --- a/binaries/data/mods/public/art/actors/structures/celts/farmstead.xml +++ b/binaries/data/mods/public/art/actors/structures/celts/farmstead.xml @@ -1,16 +1,16 @@ - + - - - - structural/celt_fc.pmd + + structural/celt_farmstead.dae - + + + + structural/celt_struct_1.dds - diff --git a/binaries/data/mods/public/art/actors/structures/celts/hut.xml b/binaries/data/mods/public/art/actors/structures/celts/hut.xml new file mode 100644 index 0000000000..d85145c09f --- /dev/null +++ b/binaries/data/mods/public/art/actors/structures/celts/hut.xml @@ -0,0 +1,14 @@ + + + + + + structural/celt_hut.dae + + + + + structural/celt_struct_1.dds + + + diff --git a/binaries/data/mods/public/art/actors/structures/celts/mill.xml b/binaries/data/mods/public/art/actors/structures/celts/mill.xml index c433cea229..c085b777ee 100644 --- a/binaries/data/mods/public/art/actors/structures/celts/mill.xml +++ b/binaries/data/mods/public/art/actors/structures/celts/mill.xml @@ -1,17 +1,16 @@ - + - - - structural/celt_rc.pmd + structural/celt_mill.dae - - + + + + structural/celt_struct_1.dds - diff --git a/binaries/data/mods/public/art/meshes/props/celt_farmstead_hoe.dae b/binaries/data/mods/public/art/meshes/props/celt_farmstead_hoe.dae new file mode 100644 index 0000000000..6f2abbb7eb --- /dev/null +++ b/binaries/data/mods/public/art/meshes/props/celt_farmstead_hoe.dae @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4bd019def910601bdb7a2b3dac9a4b06eb9056721bfcc4606cf44527e82fb688 +size 11032 diff --git a/binaries/data/mods/public/art/meshes/props/celt_farmstead_props.dae b/binaries/data/mods/public/art/meshes/props/celt_farmstead_props.dae new file mode 100644 index 0000000000..1e5a30a116 --- /dev/null +++ b/binaries/data/mods/public/art/meshes/props/celt_farmstead_props.dae @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c79706ea8521092e9f72acc98265bb2589fef3905f12039062ee158108442dbd +size 67964 diff --git a/binaries/data/mods/public/art/meshes/props/celt_farmstead_shield.dae b/binaries/data/mods/public/art/meshes/props/celt_farmstead_shield.dae new file mode 100644 index 0000000000..3520884880 --- /dev/null +++ b/binaries/data/mods/public/art/meshes/props/celt_farmstead_shield.dae @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5c70504aaa3fd28e378e68878ca48ececf806806b6c867823cbf0955a734612c +size 8221 diff --git a/binaries/data/mods/public/art/meshes/props/celt_hut_props.dae b/binaries/data/mods/public/art/meshes/props/celt_hut_props.dae new file mode 100644 index 0000000000..9cf66ed59d --- /dev/null +++ b/binaries/data/mods/public/art/meshes/props/celt_hut_props.dae @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0ff7e2817b2863a33f623c6e071f81672b32ec60500c32dfef727e1173d931a1 +size 19526 diff --git a/binaries/data/mods/public/art/meshes/props/celt_hut_shield.dae b/binaries/data/mods/public/art/meshes/props/celt_hut_shield.dae new file mode 100644 index 0000000000..7ea089768b --- /dev/null +++ b/binaries/data/mods/public/art/meshes/props/celt_hut_shield.dae @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:438a89f53709b61d84915b4401724f4452e7f73ec5942d51670141e4dd7ba87c +size 7412 diff --git a/binaries/data/mods/public/art/meshes/props/celt_mill_props.dae b/binaries/data/mods/public/art/meshes/props/celt_mill_props.dae new file mode 100644 index 0000000000..e4cfb258ad --- /dev/null +++ b/binaries/data/mods/public/art/meshes/props/celt_mill_props.dae @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:beac80de110bc877929f159295753a3c95bed46c7001192d244894c5f0f87e60 +size 28928 diff --git a/binaries/data/mods/public/art/meshes/props/celt_mill_shield.dae b/binaries/data/mods/public/art/meshes/props/celt_mill_shield.dae new file mode 100644 index 0000000000..0adb87e5b5 --- /dev/null +++ b/binaries/data/mods/public/art/meshes/props/celt_mill_shield.dae @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3080c5fc3439e8accf0b68ac1eb4e281159d9100884f53098a5daea41a9aff7f +size 8221 diff --git a/binaries/data/mods/public/art/meshes/props/celt_mill_silo.dae b/binaries/data/mods/public/art/meshes/props/celt_mill_silo.dae new file mode 100644 index 0000000000..964c9c4126 --- /dev/null +++ b/binaries/data/mods/public/art/meshes/props/celt_mill_silo.dae @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:20ea4ee83d1e47bb590e7b612dd7baa8498ae7278322cf47ed026b025bd667a4 +size 8750 diff --git a/binaries/data/mods/public/art/meshes/props/decal_celt_farmstead.dae b/binaries/data/mods/public/art/meshes/props/decal_celt_farmstead.dae new file mode 100644 index 0000000000..b3ddb76e8d --- /dev/null +++ b/binaries/data/mods/public/art/meshes/props/decal_celt_farmstead.dae @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:943ea42ddfe186fabd7b76c55edab5134ee0b674f010193e94cfc716fb4e35ce +size 5824 diff --git a/binaries/data/mods/public/art/meshes/structural/celt_farmstead.dae b/binaries/data/mods/public/art/meshes/structural/celt_farmstead.dae new file mode 100644 index 0000000000..9706563bc3 --- /dev/null +++ b/binaries/data/mods/public/art/meshes/structural/celt_farmstead.dae @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d09bf7bfcd905a4091b8372552379f3964df66518ae55043039f31af1ea5df46 +size 92518 diff --git a/binaries/data/mods/public/art/meshes/structural/celt_hut.dae b/binaries/data/mods/public/art/meshes/structural/celt_hut.dae new file mode 100644 index 0000000000..853c7d8eb7 --- /dev/null +++ b/binaries/data/mods/public/art/meshes/structural/celt_hut.dae @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:51f6a4264bc47a5a802514b9b5696758709b6f4141c9241ff26b7af6a9eb3b30 +size 49267 diff --git a/binaries/data/mods/public/art/meshes/structural/celt_mill.dae b/binaries/data/mods/public/art/meshes/structural/celt_mill.dae new file mode 100644 index 0000000000..8d866a8ec4 --- /dev/null +++ b/binaries/data/mods/public/art/meshes/structural/celt_mill.dae @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c184770f742116e2090395e6e0d1c4a29d0a0eb1a422f003977c702feba797a5 +size 64079 diff --git a/binaries/data/mods/public/art/textures/skins/props/celt_prop_1.dds b/binaries/data/mods/public/art/textures/skins/props/celt_prop_1.dds index 6dde1daeaf..6ca8977ad3 100644 --- a/binaries/data/mods/public/art/textures/skins/props/celt_prop_1.dds +++ b/binaries/data/mods/public/art/textures/skins/props/celt_prop_1.dds @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3e400d1ea5d0da58fa2c50b2c66ce32ecf1f44a5e6df1b2dc4dc4c7e467d5506 +oid sha256:6702498704072168f03e1a2080fe0247fa196e55157879557475fc9b53e8e2d8 size 349680 diff --git a/binaries/data/mods/public/simulation/templates/other/celt_hut.xml b/binaries/data/mods/public/simulation/templates/other/celt_hut.xml new file mode 100644 index 0000000000..5387a37eb4 --- /dev/null +++ b/binaries/data/mods/public/simulation/templates/other/celt_hut.xml @@ -0,0 +1,31 @@ + + + + celt + Hut + This is a small round Celtic hut. + Add +5 to Population Cap. + + + 5 + + 0 + 50 + 0 + 0 + + + + 500 + + + + 5.0 + + + + + + structures/celts/hut.xml + + diff --git a/binaries/data/mods/public/simulation/templates/template_structure_economic_mill.xml b/binaries/data/mods/public/simulation/templates/template_structure_economic_mill.xml index 542ab889d8..90c5359609 100644 --- a/binaries/data/mods/public/simulation/templates/template_structure_economic_mill.xml +++ b/binaries/data/mods/public/simulation/templates/template_structure_economic_mill.xml @@ -27,7 +27,7 @@ structures/fndn_3x3.xml - + 8.0