Cayleb-Ordo/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Improving corral tooltips/info.

Browse Source 
Reduces unnecessary text.
The corral defines the interval and the animal auras define the amount.

Patch by: @Grapjas
Differential revision: https://code.wildfiregames.com/D4896
Comments by: @Langbart, @Stan
Fixes #6687

This was SVN commit r27487.
This commit is contained in:
Freagarach 2023-01-25 08:56:55 +00:00
parent 1078277c59
commit 2969487cdd
15 changed files with 62 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
binaries/data/mods/public/simulation/data/auras/structures/corral_garrison.json
View File

@ -1,9 +0,0 @@
{
"type": "garrisonedUnits",
"affects": ["Domestic"],
"modifications": [
{ "value": "ResourceTrickle/Rates/food", "add": 1 }
],
"auraDescription" : "Garrison domesticated animals within the Corral to enable a slow trickle of food per animal. Pigs, Sheep, and Goats: 1 food/4 seconds. Cattle: 1 food/2 seconds.",
"auraName": "Ranching and Corralling"
}

10
binaries/data/mods/public/simulation/data/auras/structures/corral_garrison_large.json Normal file
View File

@ -0,0 +1,10 @@
{
"type": "garrison",
"affects": ["Corral"],
"modifications": [
{ "value": "ResourceTrickle/Rates/food", "add": 3 }
],
"auraDescription" : "Garrison within the Corral to gain a slow trickle of +3 food.",
"auraName": "Ranching and Corralling",
"stackable": true
}

10
binaries/data/mods/public/simulation/data/auras/structures/corral_garrison_medium.json Normal file
View File

@ -0,0 +1,10 @@
{
"type": "garrison",
"affects": ["Corral"],
"modifications": [
{ "value": "ResourceTrickle/Rates/food", "add": 2 }
],
"auraDescription" : "Garrison within the Corral to gain a slow trickle of +2 food.",
"auraName": "Ranching and Corralling",
"stackable": true
}

10
binaries/data/mods/public/simulation/data/auras/structures/corral_garrison_small.json Normal file
View File

@ -0,0 +1,10 @@
{
"type": "garrison",
"affects": ["Corral"],
"modifications": [
{ "value": "ResourceTrickle/Rates/food", "add": 1 }
],
"auraDescription" : "Garrison within the Corral to gain a slow trickle of +1 food.",
"auraName": "Ranching and Corralling",
"stackable": true
}

3
binaries/data/mods/public/simulation/templates/gaia/fauna_camel.xml
View File

@ -1,5 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="template_unit_fauna_hunt_skittish">
<Auras datatype="tokens">
structures/corral_garrison_medium
</Auras>
<Footprint>
<Square width="2.5" depth="5.0"/>
<Height>5.5</Height>

3
binaries/data/mods/public/simulation/templates/gaia/fauna_cattle_cow.xml
View File

@ -1,5 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="template_unit_fauna_herd_domestic_cattle">
<Auras datatype="tokens">
structures/corral_garrison_large
</Auras>
<Cost>
<BuildTime>60</BuildTime>
<Resources>

3
binaries/data/mods/public/simulation/templates/gaia/fauna_cattle_sanga.xml
View File

@ -1,5 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="template_unit_fauna_herd_domestic_cattle">
<Auras datatype="tokens">
structures/corral_garrison_large
</Auras>
<Cost>
<BuildTime>60</BuildTime>
<Resources>

3
binaries/data/mods/public/simulation/templates/gaia/fauna_cattle_zebu.xml
View File

@ -1,5 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="template_unit_fauna_herd_domestic_cattle">
<Auras datatype="tokens">
structures/corral_garrison_large
</Auras>
<Cost>
<BuildTime>60</BuildTime>
<Resources>

6
binaries/data/mods/public/simulation/templates/gaia/fauna_goat.xml
View File

@ -1,5 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="template_unit_fauna_herd_domestic">
<Auras datatype="tokens">
structures/corral_garrison_small
</Auras>
<Cost>
<BuildTime>30</BuildTime>
<Resources>
@ -25,9 +28,6 @@
<Max>70</Max>
<MaxGatherers>2</MaxGatherers>
</ResourceSupply>
<ResourceTrickle>
<Interval>5000</Interval>
</ResourceTrickle>
<Sound>
<SoundGroups>
<select>actor/fauna/animal/goat_select.xml</select>

3
binaries/data/mods/public/simulation/templates/gaia/fauna_horse.xml
View File

@ -1,5 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="template_unit_fauna_hunt_skittish">
<Auras datatype="tokens">
structures/corral_garrison_medium
</Auras>
<Footprint>
<Square width="3.0" depth="6.0"/>
<Height>4.0</Height>

6
binaries/data/mods/public/simulation/templates/gaia/fauna_pig.xml
View File

@ -1,5 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="template_unit_fauna_herd_domestic">
<Auras datatype="tokens">
structures/corral_garrison_medium
</Auras>
<Cost>
<BuildTime>50</BuildTime>
<Resources>
@ -25,9 +28,6 @@
<Max>150</Max>
<MaxGatherers>4</MaxGatherers>
</ResourceSupply>
<ResourceTrickle>
<Interval>3000</Interval>
</ResourceTrickle>
<Sound>
<SoundGroups>
<select>actor/fauna/animal/pig_select.xml</select>

3
binaries/data/mods/public/simulation/templates/gaia/fauna_sheep.xml
View File

@ -1,5 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="template_unit_fauna_herd_domestic">
<Auras datatype="tokens">
structures/corral_garrison_small
</Auras>
<Cost>
<BuildTime>40</BuildTime>
<Resources>

11
binaries/data/mods/public/simulation/templates/template_structure_resource_corral.xml
View File

@ -1,8 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="template_structure_resource">
<Auras datatype="tokens">
structures/corral_garrison
</Auras>
<Cost>
<BuildTime>50</BuildTime>
<Resources>
@ -28,13 +25,19 @@
<Identity>
<GenericName>Corral</GenericName>
<SelectionGroupName>template_structure_resource_corral</SelectionGroupName>
<Tooltip>Raise Domestic Animals for food.</Tooltip>
<Tooltip>Raise Domestic Animals for food. Garrison animals to gain a trickle of food.</Tooltip>
<VisibleClasses datatype="tokens">Economic Village Corral</VisibleClasses>
<Icon>structures/corral.png</Icon>
<Requirements>
<Techs>phase_village</Techs>
</Requirements>
</Identity>
<ResourceTrickle>
<Rates>
<food>0</food>
</Rates>
<Interval>5000</Interval>
</ResourceTrickle>
<Loot>
<wood>20</wood>
</Loot>

8
binaries/data/mods/public/simulation/templates/template_unit_fauna_herd_domestic.xml
View File

@ -2,14 +2,8 @@
<Entity parent="template_unit_fauna_herd">
<Identity>
<Classes datatype="tokens">Domestic</Classes>
<Tooltip>Kill to gather meat for quick food or garrison in a Corral for a slow food trickle.</Tooltip>
<Tooltip>Kill to gather meat for quick food.</Tooltip>
</Identity>
<ResourceTrickle>
<Rates>
<food>0</food>
</Rates>
<Interval>4000</Interval>
</ResourceTrickle>
<Vision>
<Range>6</Range>
</Vision>

3
binaries/data/mods/public/simulation/templates/template_unit_fauna_herd_domestic_cattle.xml
View File

@ -5,9 +5,6 @@
<Techs>phase_city</Techs>
</Requirements>
</Identity>
<ResourceTrickle>
<Interval>2000</Interval>
</ResourceTrickle>
<Sound>
<SoundGroups>
<select>actor/fauna/animal/cattle_select.xml</select>