gptbot/0ad
1
0
Fork 0
forked from mirrors/0ad
Code Pull Requests Activity

New horse and cattle fauna template corrections

Browse Source 
Patch by: @Nescio
Reviewed by: @Stan
Differential Revision: https://code.wildfiregames.com/D1874
This was SVN commit r22315.
This commit is contained in:
Stan
2019-05-28 20:46:56 +00:00
parent ca9109be75
commit 8cb7c4ec34
14 changed files with 21 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files
binaries/data/mods/public/simulation/templates/gaia/fauna_cattle_bull.xml
+2 -2
View File
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="template_unit_fauna_hunt_defensive_bull">
<Identity>
<Civ>gaia</Civ>
<SpecificName>Bos Taurus Taurus</SpecificName>
<GenericName>Bull</GenericName>
<SpecificName>Bos taurus taurus</SpecificName>
<Icon>gaia/fauna_bull.png</Icon>
</Identity>
<VisualActor>
binaries/data/mods/public/simulation/templates/gaia/fauna_cattle_cow.xml
+3 -3
View File
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="template_unit_fauna_hunt_passive_cattle">
<Entity parent="template_unit_fauna_herd_domestic_cattle">
<Identity>
<Civ>gaia</Civ>
<SpecificName>Bos Taurus Taurus</SpecificName>
<GenericName>Cow</GenericName>
<SpecificName>Bos taurus taurus</SpecificName>
<Icon>gaia/fauna_cow.png</Icon>
</Identity>
<VisualActor>
binaries/data/mods/public/simulation/templates/gaia/fauna_cattle_sanga.xml
+3 -3
View File
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="template_unit_fauna_hunt_passive_cattle">
<Entity parent="template_unit_fauna_herd_domestic_cattle">
<Identity>
<Civ>gaia</Civ>
<SpecificName>Bos Taurus Africanus</SpecificName>
<GenericName>Sanga Cattle</GenericName>
<SpecificName>Bos taurus africanus</SpecificName>
<Icon>gaia/fauna_sanga.png</Icon>
</Identity>
<VisualActor>
binaries/data/mods/public/simulation/templates/gaia/fauna_zebu.xml → binaries/data/mods/public/simulation/templates/gaia/fauna_cattle_zebu.xml
+3 -3
View File
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="template_unit_fauna_hunt_passive_cattle">
<Entity parent="template_unit_fauna_herd_domestic_cattle">
<Identity>
<Civ>gaia</Civ>
<SpecificName>Bos Taurus Indicus</SpecificName>
<GenericName>Zebu</GenericName>
<SpecificName>Bos taurus indicus</SpecificName>
<Icon>gaia/fauna_zebu.png</Icon>
</Identity>
<VisualActor>
binaries/data/mods/public/simulation/templates/gaia/fauna_zebu_trainable.xml → binaries/data/mods/public/simulation/templates/gaia/fauna_cattle_zebu_trainable.xml
+1 -1
View File
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="gaia/fauna_zebu">
<Entity parent="gaia/fauna_cattle_zebu">
<Cost>
<BuildTime>53</BuildTime>
<Resources>
binaries/data/mods/public/simulation/templates/gaia/fauna_horse_breed.xml
+1 -29
View File
@@ -1,33 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="template_unit_fauna_hunt_skittish">
<Footprint>
<Square width="2.1" depth="4.2"/>
<Height>3.0</Height>
</Footprint>
<Identity>
<GenericName>Horse</GenericName>
<SpecificName>Equus ferus caballus</SpecificName>
<Icon>gaia/fauna_horse.png</Icon>
</Identity>
<Position>
<Anchor>pitch</Anchor>
</Position>
<ResourceSupply>
<Amount>200</Amount>
</ResourceSupply>
<Sound>
<SoundGroups>
<select>actor/fauna/animal/horse_select.xml</select>
<order_attack>actor/fauna/animal/horse_attack_order.xml</order_attack>
<order_walk>actor/fauna/animal/horse_order.xml</order_walk>
<attack_melee>actor/fauna/animal/horse_attack.xml</attack_melee>
<death>actor/fauna/animal/horse_death.xml</death>
<trained>actor/fauna/animal/horse_trained.xml</trained>
</SoundGroups>
</Sound>
<UnitMotion>
<WalkSpeed op="mul">0.8</WalkSpeed>
</UnitMotion>
<Entity parent="gaia/fauna_horse">
<VisualActor>
<Actor>fauna/horse_breed.xml</Actor>
</VisualActor>
binaries/data/mods/public/simulation/templates/gaia/fauna_horse_lusitano.xml
+1 -29
View File
@@ -1,33 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="template_unit_fauna_hunt_skittish">
<Footprint>
<Square width="2.1" depth="4.2"/>
<Height>3.0</Height>
</Footprint>
<Identity>
<GenericName>Horse</GenericName>
<SpecificName>Equus ferus caballus</SpecificName>
<Icon>gaia/fauna_horse.png</Icon>
</Identity>
<Position>
<Anchor>pitch</Anchor>
</Position>
<ResourceSupply>
<Amount>200</Amount>
</ResourceSupply>
<Sound>
<SoundGroups>
<select>actor/fauna/animal/horse_select.xml</select>
<order_attack>actor/fauna/animal/horse_attack_order.xml</order_attack>
<order_walk>actor/fauna/animal/horse_order.xml</order_walk>
<attack_melee>actor/fauna/animal/horse_attack.xml</attack_melee>
<death>actor/fauna/animal/horse_death.xml</death>
<trained>actor/fauna/animal/horse_trained.xml</trained>
</SoundGroups>
</Sound>
<UnitMotion>
<WalkSpeed op="mul">0.8</WalkSpeed>
</UnitMotion>
<Entity parent="gaia/fauna_horse">
<VisualActor>
<Actor>fauna/horse_lusitano.xml</Actor>
</VisualActor>
binaries/data/mods/public/simulation/templates/gaia/fauna_horse_marwari.xml
+1 -29
View File
@@ -1,33 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="template_unit_fauna_hunt_skittish">
<Footprint>
<Square width="2.1" depth="4.2"/>
<Height>3.0</Height>
</Footprint>
<Identity>
<GenericName>Horse</GenericName>
<SpecificName>Equus ferus caballus</SpecificName>
<Icon>gaia/fauna_horse.png</Icon>
</Identity>
<Position>
<Anchor>pitch</Anchor>
</Position>
<ResourceSupply>
<Amount>200</Amount>
</ResourceSupply>
<Sound>
<SoundGroups>
<select>actor/fauna/animal/horse_select.xml</select>
<order_attack>actor/fauna/animal/horse_attack_order.xml</order_attack>
<order_walk>actor/fauna/animal/horse_order.xml</order_walk>
<attack_melee>actor/fauna/animal/horse_attack.xml</attack_melee>
<death>actor/fauna/animal/horse_death.xml</death>
<trained>actor/fauna/animal/horse_trained.xml</trained>
</SoundGroups>
</Sound>
<UnitMotion>
<WalkSpeed op="mul">0.8</WalkSpeed>
</UnitMotion>
<Entity parent="gaia/fauna_horse">
<VisualActor>
<Actor>fauna/horse_marwari.xml</Actor>
</VisualActor>
binaries/data/mods/public/simulation/templates/gaia/fauna_horse_persian.xml
+1 -29
View File
@@ -1,33 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="template_unit_fauna_hunt_skittish">
<Footprint>
<Square width="2.1" depth="4.2"/>
<Height>3.0</Height>
</Footprint>
<Identity>
<GenericName>Horse</GenericName>
<SpecificName>Equus ferus caballus</SpecificName>
<Icon>gaia/fauna_horse.png</Icon>
</Identity>
<Position>
<Anchor>pitch</Anchor>
</Position>
<ResourceSupply>
<Amount>200</Amount>
</ResourceSupply>
<Sound>
<SoundGroups>
<select>actor/fauna/animal/horse_select.xml</select>
<order_attack>actor/fauna/animal/horse_attack_order.xml</order_attack>
<order_walk>actor/fauna/animal/horse_order.xml</order_walk>
<attack_melee>actor/fauna/animal/horse_attack.xml</attack_melee>
<death>actor/fauna/animal/horse_death.xml</death>
<trained>actor/fauna/animal/horse_trained.xml</trained>
</SoundGroups>
</Sound>
<UnitMotion>
<WalkSpeed op="mul">0.8</WalkSpeed>
</UnitMotion>
<Entity parent="gaia/fauna_horse">
<VisualActor>
<Actor>fauna/horse_persian.xml</Actor>
</VisualActor>
binaries/data/mods/public/simulation/templates/structures/gaul_corral.xml
+1
View File
@@ -14,6 +14,7 @@
<Entities datatype="tokens">
-gaia/fauna_sheep_trainable
gaia/fauna_pig_trainable
gaia/fauna_cattle_cow_trainable
</Entities>
</ProductionQueue>
<VisualActor>
binaries/data/mods/public/simulation/templates/structures/kush_corral.xml
+2 -1
View File
@@ -13,8 +13,9 @@
</Obstruction>
<ProductionQueue>
<Entities datatype="tokens">
gaia/fauna_goat_trainable
-gaia/fauna_sheep_trainable
gaia/fauna_goat_trainable
gaia/fauna_cattle_sanga_trainable
</Entities>
</ProductionQueue>
<VisualActor>
binaries/data/mods/public/simulation/templates/structures/maur_corral.xml
+1 -1
View File
@@ -14,7 +14,7 @@
<Entities datatype="tokens">
-gaia/fauna_sheep_trainable
gaia/fauna_goat_trainable
gaia/fauna_zebu_trainable
gaia/fauna_cattle_zebu_trainable
</Entities>
</ProductionQueue>
<VisualActor>
binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_passive_cattle.xml → binaries/data/mods/public/simulation/templates/template_unit_fauna_herd_domestic_cattle.xml
+1 -4
View File
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="template_unit_fauna_hunt">
<Entity parent="template_unit_fauna_herd_domestic">
<Footprint>
<Square width="1.9" depth="3.8"/>
<Height>2.0</Height>
@@ -8,7 +8,4 @@
<WalkSpeed op="mul">0.4</WalkSpeed>
<RunMultiplier>1.4</RunMultiplier>
</UnitMotion>
<UnitAI>
<NaturalBehaviour>passive</NaturalBehaviour>
</UnitAI>
</Entity>
binaries/data/mods/public/simulation/templates/template_unit_fauna_hunt_defensive_bull.xml
-3
View File
@@ -15,9 +15,6 @@
<RestrictedClasses datatype="tokens">Structure Ship Siege</RestrictedClasses>
</Melee>
</Attack>
<Identity>
<VisibleClasses datatype="tokens">Cattle</VisibleClasses>
</Identity>
<Loot>
<xp>50</xp>
</Loot>