Vantha/0ad
1
1
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Updated Trade Demo map.

Browse Source 
Updated some Greek horse textures.

Tweaked Greek and Roman Traders.

This was SVN commit r11287.
This commit is contained in:
Michael D. Hafer 2012-03-09 02:12:50 +00:00
parent 497aadb653
commit 829a5444fe
15 changed files with 112 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
binaries/data/mods/public/art/actors/units/hellenes/cavalry_javelinist_e.xml
View File

@ -15,6 +15,7 @@
<mesh>skeletal/horse.pmd</mesh>
<props>
<prop actor="units/hellenes/cavalry_javelinist_e_r.xml" attachpoint="rider"/>
<prop actor="props/units/horse/horse_chest_colorband.xml" attachpoint="chest"/>
</props>
</variant>
</group>
@ -22,6 +23,12 @@
<variant frequency="1" name="hyppikon-horse-texture-plain">
<texture>skeletal/horse_hele_csw_e_1.dds</texture>
</variant>
<variant frequency="1" name="hyppikon-horse-texture-plain2">
<texture>skeletal/horse_hele_csw_e_2.png</texture>
</variant>
<variant frequency="1" name="hyppikon-horse-texture-blaze">
<texture>skeletal/horse_hele_csw_e_3.png</texture>
</variant>
</group>
<group>
<variant frequency="1" name="horse-color-bay">

10
binaries/data/mods/public/art/actors/units/hellenes/cavalry_swordsman_e.xml
View File

@ -23,9 +23,15 @@
<variant frequency="1" name="hyppikon-horse-texture-plain">
<texture>skeletal/horse_hele_csw_e_1.dds</texture>
</variant>
<variant frequency="1" name="hyppikon-horse-texture-plain2">
<texture>skeletal/horse_hele_csw_e_2.png</texture>
</variant>
<variant frequency="1" name="hyppikon-horse-texture-blaze">
<texture>skeletal/horse_hele_csw_e_3.png</texture>
</variant>
</group>
<group>
<variant frequency="1" name="horse-color-bay">
<variant frequency="5" name="horse-color-bay">
<colour>228 107 27</colour>
</variant>
<variant frequency="1" name="horse-color-red-chestnut">
@ -37,7 +43,7 @@
<variant frequency="1" name="horse-color-black">
<colour>42 42 42</colour>
</variant>
<variant frequency="5" name="horse-color-gray">
<variant frequency="3" name="horse-color-gray">
<colour>255 255 255</colour>
</variant>
<variant frequency="2" name="horse-color-beige">

10
binaries/data/mods/public/art/actors/units/hellenes/trader.xml
View File

@ -1,8 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Trader Cart">
<animations>
@ -12,15 +10,13 @@
</animations>
<mesh>skeletal/trader_cart.dae</mesh>
<props>
<prop actor="units/celts/boudicca_chariot_h1.xml" attachpoint="horse"/>
<prop actor="units/global/slave.xml" attachpoint="trader"/>
<prop actor="units/hellenes/trader_h.xml" attachpoint="horse"/>
<prop actor="units/hellenes/trader_r.xml" attachpoint="trader"/>
<prop actor="props/special/eyecandy/crate_a.xml" attachpoint="goodsa"/>
<prop actor="props/special/eyecandy/barrel_a.xml" attachpoint="goodsb"/>
</props>
<texture>structural/rome_ram.png</texture>
</variant>
</group>
<material>player_trans.xml</material>
</actor>

64
binaries/data/mods/public/art/actors/units/hellenes/trader_h.xml Normal file
View File

@ -0,0 +1,64 @@
<?xml version="1.0" encoding="utf-8"?>
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Base">
<animations>
<animation file="quadraped/horse_idle_a.psa" name="Idle" speed="50"/>
<animation file="quadraped/horse_idle_a.psa" name="Idle" speed="100"/>
<animation file="quadraped/horse_idle_a.psa" name="Idle" speed="200"/>
<animation file="quadraped/horse_walk.psa" name="Walk" speed="150"/>
<animation file="quadraped/horse_walk.psa" name="Run" speed="100"/>
<animation file="quadraped/horse_death.psa" name="death" speed="250"/>
</animations>
<mesh>skeletal/horse.pmd</mesh>
<props>
<prop actor="props/units/horse_back_blanket.xml" attachpoint="rider"/>
<prop actor="props/units/horse/horse_chest_colorband.xml" attachpoint="chest"/>
</props>
</variant>
</group>
<group>
<variant frequency="1" name="horse 1">
<texture>skeletal/horse_hele_csw_e_1.dds</texture>
</variant>
<variant frequency="1" name="horse 2">
<texture>skeletal/horse_hele_csw_e_2.png</texture>
</variant>
<variant frequency="1" name="horse 3">
<texture>skeletal/horse_hele_csw_e_3.png</texture>
</variant>
</group>
<group>
<variant frequency="15" name="white">
<colour>255 255 255</colour>
</variant>
<variant frequency="16" name="black">
<colour>44 39 37</colour>
</variant>
<variant frequency="17" name="brown">
<colour>115 89 55</colour>
</variant>
<variant frequency="16" name="chestnut">
<colour>204 138 94</colour>
</variant>
<variant frequency="17" name="dun">
<colour>210 185 138</colour>
</variant>
<variant frequency="17" name="gray">
<colour>138 138 138</colour>
</variant>
<variant frequency="17" name="tan">
<colour>171 157 107</colour>
</variant>
</group>
<group>
<variant frequency="100" name="Idle"/>
<variant name="death">
<props>
<prop actor="props/units/blood_01.xml" attachpoint="root"/>
</props>
</variant>
</group>
<material>objectcolor.xml</material>
</actor>

15
binaries/data/mods/public/art/actors/units/romans/trader.xml
View File

@ -2,13 +2,20 @@
<actor version="1">
<castshadow/>
<group>
<variant frequency="100" name="Base">
<mesh>skeletal/celt_trader.dae</mesh>
<variant frequency="100" name="Trader Cart">
<animations>
<animation file="mechanical/trader_cart_idle.dae" name="Idle" speed="100"/>
<animation file="mechanical/trader_cart_move.dae" name="Walk" speed="10"/>
<animation file="mechanical/trader_cart_move.dae" name="Run" speed="10"/>
</animations>
<mesh>skeletal/trader_cart.dae</mesh>
<props>
<prop actor="units/romans/trader_h.xml" attachpoint="horse"/>
<prop actor="units/hellenes/trader_r.xml" attachpoint="trader"/>
<prop actor="units/romans/trader_h.xml" attachpoint="donkey"/>
<prop actor="props/special/eyecandy/crate_a.xml" attachpoint="goodsa"/>
<prop actor="props/special/eyecandy/barrel_a.xml" attachpoint="goodsb"/>
</props>
<texture>null_white.dds</texture>
<texture>structural/rome_ram.png</texture>
</variant>
</group>
<material>player_trans.xml</material>

2
binaries/data/mods/public/art/actors/units/romans/trader_h.xml
View File

@ -13,8 +13,8 @@
</animations>
<mesh>skeletal/horse.pmd</mesh>
<props>
<prop actor="props/units/horse/donkey_pack_01.xml" attachpoint="rider"/>
<prop actor="props/units/horse_back_blanket.xml" attachpoint="rider"/>
<prop actor="props/units/horse/horse_chest_colorband.xml" attachpoint="chest"/>
</props>
</variant>
</group>

BIN
binaries/data/mods/public/art/textures/skins/skeletal/horse_hele_csw_e_1.dds (Stored with Git LFS)
View File

Binary file not shown.

BIN
binaries/data/mods/public/art/textures/skins/skeletal/horse_hele_csw_e_2.png (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
binaries/data/mods/public/art/textures/skins/skeletal/horse_hele_csw_e_3.png (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
binaries/data/mods/public/maps/scenarios/Demo_Trading.pmp (Stored with Git LFS)
View File

Binary file not shown.

BIN
binaries/data/mods/public/maps/scenarios/Demo_Trading.xml (Stored with Git LFS)
View File

Binary file not shown.

BIN
binaries/data/mods/public/maps/scenarios/Isthmus.xml (Stored with Git LFS)
View File

Binary file not shown.

2
binaries/data/mods/public/simulation/templates/template_structure_economic_market.xml
View File

@ -23,7 +23,7 @@
</Health>
<Identity>
<GenericName>Market</GenericName>
<Tooltip>Create trade units and barter resources.</Tooltip>
<Tooltip>Create trade units to trade between other markets. Barter resources.</Tooltip>
<Classes datatype="tokens">Town Market BarterMarket</Classes>
<Icon>structures/market.png</Icon>
</Identity>

4
binaries/data/mods/public/simulation/templates/template_unit_support_trader.xml
View File

@ -16,8 +16,8 @@
</Health>
<Identity>
<GenericName>Trader</GenericName>
<Rollover>Trade was a very important part of ancient civilisation - effective trading and control of trade routes equaled wealth. Trade took place by many forms from foot to caravans to merchant ships. One of the most notorious examples of the power of trade was the Silk Road.</Rollover>
<Tooltip>Trades resources between allied Markets.</Tooltip>
<History>Trade was a very important part of ancient civilisation - effective trading and control of trade routes equaled wealth. Trade took place by many forms from foot to caravans to merchant ships. One of the most notorious examples of the power of trade was the Silk Road.</History>
<Tooltip>Trades resources between allied Markets. *NEW FEATURE FOR ALPHA 9*</Tooltip>
</Identity>
<Sound>
<SoundGroups>

2
binaries/data/mods/public/simulation/templates/units/rome_support_trader.xml
View File

@ -6,6 +6,6 @@
<History>Plebians were the poor class in Roman society, underneath the patricians, often carrying out much local trading and business. While patricians financed large business ventures plebian merchants did the actual work. They traded far and wide, from Iberia to Syria, buying and selling everything from salt to wool to horses to metals to glass to slaves. Rome's extensive network of roads within Italy, many ports, and central location within the Mediterranean made it an ideal place to do business.</History>
</Identity>
<VisualActor>
<Actor>units/hellenes/trader.xml</Actor>
<Actor>units/romans/trader.xml</Actor>
</VisualActor>
</Entity>