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

Display fruit tree as fruit and not as wood on the minimap. Rework a bit inheritence of fruit tree and of wood bushes. The noticeable change is that fruit tree block movement as other trees.

Browse Source 
Patch by: Temple
Differential Revision: https://code.wildfiregames.com/D845
This was SVN commit r20345.
This commit is contained in:
fatherbushido
2017-10-25 08:05:53 +00:00
parent c5ccdccfc4
commit 266ddfa8da
13 changed files with 54 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files
binaries/data/mods/public/simulation/templates/gaia/flora_bush_badlands.xml
+1 -6
View File
@@ -1,15 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="template_gaia_flora_tree">
<Footprint>
<Circle radius="3.0"/>
<Height>3.0</Height>
</Footprint>
<Entity parent="template_gaia_flora_bush">
<Identity>
<SpecificName>Hardy Bush</SpecificName>
</Identity>
<ResourceSupply>
<Amount>75</Amount>
<Type>wood.tree</Type>
</ResourceSupply>
<VisualActor>
<Actor>props/flora/bush_tempe_a.xml</Actor>
binaries/data/mods/public/simulation/templates/gaia/flora_bush_berry.xml
+5 -3
View File
@@ -1,8 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="template_gaia_flora_bush_berry">
<Obstruction>
<Static width="4.0" depth="4.0"/>
</Obstruction>
<Identity>
<SpecificName>Berries</SpecificName>
<Tooltip>Gather the fruit from these bushes to accumulate Food.</Tooltip>
<Icon>gaia/flora_bush_berry.png</Icon>
</Identity>
<VisualActor>
<Actor>props/flora/berry_bush.xml</Actor>
</VisualActor>
binaries/data/mods/public/simulation/templates/gaia/flora_bush_grapes.xml
-1
View File
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="template_gaia_flora_bush_berry">
<Identity>
<GenericName>Forage</GenericName>
<SpecificName>Grapes</SpecificName>
<Tooltip>Gather grapes from these vines for Food.</Tooltip>
<Icon>gaia/flora_bush_grapes.png</Icon>
binaries/data/mods/public/simulation/templates/gaia/flora_bush_temperate.xml
+1 -6
View File
@@ -1,15 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="template_gaia_flora_tree">
<Footprint>
<Circle radius="3.0"/>
<Height>3.0</Height>
</Footprint>
<Entity parent="template_gaia_flora_bush">
<Identity>
<SpecificName>Deciduous Bush</SpecificName>
</Identity>
<ResourceSupply>
<Amount>50</Amount>
<Type>wood.tree</Type>
</ResourceSupply>
<VisualActor>
<Actor>props/flora/bush_tempe_a.xml</Actor>
binaries/data/mods/public/simulation/templates/gaia/flora_tree_apple.xml
+1 -13
View File
@@ -1,20 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="template_gaia_flora_bush_berry">
<Footprint>
<Circle radius="2.5"/>
<Height>10.0</Height>
</Footprint>
<Entity parent="template_gaia_flora_tree_fruit">
<Identity>
<SpecificName>Apple Tree</SpecificName>
<Icon>gaia/flora_bush_berry.png</Icon>
</Identity>
<Obstruction>
<Static width="1.8" depth="1.8"/>
</Obstruction>
<ResourceSupply>
<Amount>400</Amount>
<Type>food.fruit</Type>
</ResourceSupply>
<VisualActor>
<Actor>flora/trees/apple_bloom.xml</Actor>
</VisualActor>
binaries/data/mods/public/simulation/templates/gaia/flora_tree_cretan_date_palm_short.xml
-1
View File
@@ -5,7 +5,6 @@
</Identity>
<ResourceSupply>
<Amount>100</Amount>
<Type>wood.tree</Type>
</ResourceSupply>
<VisualActor>
<Actor>flora/trees/palm_cretan_date_short.xml</Actor>
binaries/data/mods/public/simulation/templates/gaia/flora_tree_fig.xml
+2 -10
View File
@@ -1,20 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="template_gaia_flora_tree">
<Entity parent="template_gaia_flora_tree_fruit">
<Footprint>
<Circle radius="4.0"/>
<Height>10.0</Height>
</Footprint>
<Identity>
<SpecificName>Fig</SpecificName>
<Tooltip>Gather figs for Food.</Tooltip>
<Icon>gaia/flora_bush_berry.png</Icon>
</Identity>
<Obstruction>
<Static width="4.0" depth="4.0"/>
<Static width="5.0" depth="5.0"/>
</Obstruction>
<ResourceSupply>
<Amount>500</Amount>
<Type>food.fruit</Type>
</ResourceSupply>
<Selectable>
<Overlay>
@@ -24,11 +21,6 @@
</Texture>
</Overlay>
</Selectable>
<Sound>
<SoundGroups>
<select>interface/select/resource/sel_fruit.xml</select>
</SoundGroups>
</Sound>
<VisualActor>
<Actor>flora/trees/fig.xml</Actor>
</VisualActor>
binaries/data/mods/public/simulation/templates/gaia/flora_tree_oak_large.xml
-4
View File
@@ -3,12 +3,8 @@
<Identity>
<SpecificName>Large Oak Tree</SpecificName>
</Identity>
<Obstruction>
<Static width="2.0" depth="2.0"/>
</Obstruction>
<ResourceSupply>
<Amount>300</Amount>
<Type>wood.tree</Type>
</ResourceSupply>
<VisualActor>
<Actor>flora/trees/oak_large.xml</Actor>
binaries/data/mods/public/simulation/templates/gaia/flora_tree_olive.xml
+1 -13
View File
@@ -1,20 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="template_gaia_flora_bush_berry">
<Footprint>
<Circle radius="2.5"/>
<Height>10.0</Height>
</Footprint>
<Entity parent="template_gaia_flora_tree_fruit">
<Identity>
<SpecificName>Olive Tree</SpecificName>
<Icon>gaia/flora_bush_berry.png</Icon>
</Identity>
<Obstruction>
<Static width="1.8" depth="1.8"/>
</Obstruction>
<ResourceSupply>
<Amount>400</Amount>
<Type>food.fruit</Type>
</ResourceSupply>
<VisualActor>
<Actor>flora/trees/olive.xml</Actor>
</VisualActor>
binaries/data/mods/public/simulation/templates/template_gaia_flora.xml
+32 -6
View File
@@ -1,13 +1,39 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="template_gaia">
<Footprint>
<Circle radius="2.5"/>
<Height>15.0</Height>
</Footprint>
<Identity>
<GenericName>Generic Flora</GenericName>
<Classes datatype="tokens">ForestPlant</Classes>
<Icon>gaia/flora_tree_generic.png</Icon>
</Identity>
<Minimap>
<Type>wood</Type>
<Color r="69" g="107" b="68"/>
</Minimap>
<Obstruction>
<Static width="3.0" depth="3.0"/>
<Static width="1.6" depth="1.6"/>
</Obstruction>
<ResourceSupply>
<KillBeforeGather>false</KillBeforeGather>
<Amount>200</Amount>
<Type>wood.tree</Type>
<MaxGatherers>8</MaxGatherers>
</ResourceSupply>
<Selectable>
<EditorOnly disable=""/>
<Overlay>
<Texture>
<MainTexture>circle/128x128.png</MainTexture>
<MainTextureMask>circle/128x128_mask.png</MainTextureMask>
</Texture>
</Overlay>
</Selectable>
<Sound>
<SoundGroups>
<select>interface/select/resource/sel_tree.xml</select>
</SoundGroups>
</Sound>
<VisualActor>
<SelectionShape>
<Footprint/>
</SelectionShape>
</VisualActor>
</Entity>
binaries/data/mods/public/simulation/templates/template_gaia_flora_bush.xml
+2 -8
View File
@@ -1,16 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="template_gaia_flora">
<Footprint>
<Circle radius="1.0"/>
<Height>1.0</Height>
<Circle radius="3.0"/>
<Height>3.0</Height>
</Footprint>
<Identity>
<GenericName>Bush</GenericName>
<Classes datatype="tokens">ForestPlant</Classes>
</Identity>
<Obstruction>
<Static width="2.0" depth="2.0"/>
<BlockMovement>false</BlockMovement>
<BlockPathfinding>false</BlockPathfinding>
</Obstruction>
</Entity>
binaries/data/mods/public/simulation/templates/template_gaia_flora_bush_berry.xml
+5 -21
View File
@@ -1,34 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="template_gaia_flora_bush">
<Footprint>
<Circle radius="3.0"/>
<Height>1.0</Height>
</Footprint>
<Identity>
<GenericName>Bush</GenericName>
<SpecificName>Berries</SpecificName>
<Tooltip>Gather the fruit from these bushes to accumulate Food.</Tooltip>
<Icon>gaia/flora_bush_berry.png</Icon>
</Identity>
<Minimap>
<Type>food</Type>
<Color r="155" g="204" b="102"/>
</Minimap>
<Obstruction>
<Static width="4.0" depth="4.0"/>
<BlockMovement>false</BlockMovement>
<BlockPathfinding>false</BlockPathfinding>
</Obstruction>
<ResourceSupply>
<KillBeforeGather>false</KillBeforeGather>
<Amount>200</Amount>
<Type>food.fruit</Type>
<MaxGatherers>8</MaxGatherers>
</ResourceSupply>
<Selectable>
<EditorOnly disable=""/>
<Overlay>
<Texture>
<MainTexture>circle/128x128.png</MainTexture>
<MainTextureMask>circle/128x128_mask.png</MainTextureMask>
</Texture>
</Overlay>
</Selectable>
<Sound>
<SoundGroups>
<select>interface/select/resource/sel_fruit.xml</select>
binaries/data/mods/public/simulation/templates/template_gaia_flora_tree.xml
+4 -34
View File
@@ -1,46 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="template_gaia_flora">
<Footprint>
<Circle radius="2.5"/>
<Height>15.0</Height>
</Footprint>
<Identity>
<Classes datatype="tokens">ForestPlant</Classes>
<GenericName>Tree</GenericName>
<Icon>gaia/flora_tree_generic.png</Icon>
<Tooltip>Chop down to accumulate Wood.</Tooltip>
</Identity>
<Minimap>
<Type>wood</Type>
<Color r="69" g="107" b="68"/>
</Minimap>
<Obstruction>
<Static width="1.6" depth="1.6"/>
</Obstruction>
<ResourceSupply>
<KillBeforeGather>false</KillBeforeGather>
<Amount>200</Amount>
<Type>wood.tree</Type>
<MaxGatherers>8</MaxGatherers>
</ResourceSupply>
<Selectable>
<EditorOnly disable=""/>
<Overlay>
<Texture>
<MainTexture>circle/128x128.png</MainTexture>
<MainTextureMask>circle/128x128_mask.png</MainTextureMask>
</Texture>
</Overlay>
</Selectable>
<Sound>
<SoundGroups>
<select>interface/select/resource/sel_tree.xml</select>
</SoundGroups>
</Sound>
<StatusBars>
<BarWidth>3.0</BarWidth>
<BarHeight>0.5</BarHeight>
<HeightOffset>10.0</HeightOffset>
</StatusBars>
<VisualActor>
<SelectionShape>
<Footprint/>
</SelectionShape>
</VisualActor>
</Entity>