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

[Alpha 26] Remove the food.rice distinction and subsequent animation variants. Fixes some odd behavior.

Browse Source 
Fixes #6559
Fixes #6565

Refs #6566

This was SVN commit r26937.
This commit is contained in:
wowgetoffyourcellphone 2022-06-11 20:16:14 +00:00
parent 76323e791b
commit 20a11614d7
27 changed files with 2 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
binaries/data/mods/public/art/actors/units/han/female_citizen.xml
View File

@ -23,7 +23,6 @@
<variant file="biped/female_carry_metal.xml"/>
<variant file="biped/approach_tree.xml"/>
<variant file="biped/approach_grain.xml"/>
<variant file="biped/approach_rice.xml"/>
<variant file="biped/approach_fruit.xml"/>
<variant file="biped/approach_meat.xml"/>
<variant file="biped/approach_rock.xml"/>
@ -46,11 +45,6 @@
<prop actor="props/units/helmets/han_ricehat.xml" attachpoint="helmet"/>
</props>
</variant>
<variant file="biped/female_gather_rice.xml">
<props>
<prop actor="props/units/helmets/han_ricehat.xml" attachpoint="helmet"/>
</props>
</variant>
<variant file="biped/female_gather_fruit.xml">
<props>
<prop actor="props/units/helmets/han_ricehat.xml" attachpoint="helmet"/>

1
binaries/data/mods/public/art/actors/units/han/infantry_archer_a.xml
View File

@ -61,7 +61,6 @@
<variant file="biped/attack_slaughter.xml"/>
<variant file="biped/gather_tree.xml"/>
<variant file="biped/gather_grain.xml"/>
<variant file="biped/gather_rice.xml"/>
<variant file="biped/gather_fruit.xml"/>
<variant file="biped/gather_meat.xml"/>
<variant file="biped/gather_rock.xml"/>

1
binaries/data/mods/public/art/actors/units/han/infantry_archer_b.xml
View File

@ -59,7 +59,6 @@
<variant file="biped/attack_slaughter.xml"/>
<variant file="biped/gather_tree.xml"/>
<variant file="biped/gather_grain.xml"/>
<variant file="biped/gather_rice.xml"/>
<variant file="biped/gather_fruit.xml"/>
<variant file="biped/gather_meat.xml"/>
<variant file="biped/gather_rock.xml"/>

1
binaries/data/mods/public/art/actors/units/han/infantry_archer_e.xml
View File

@ -61,7 +61,6 @@
<variant file="biped/attack_slaughter.xml"/>
<variant file="biped/gather_tree.xml"/>
<variant file="biped/gather_grain.xml"/>
<variant file="biped/gather_rice.xml"/>
<variant file="biped/gather_fruit.xml"/>
<variant file="biped/gather_meat.xml"/>
<variant file="biped/gather_rock.xml"/>

1
binaries/data/mods/public/art/actors/units/han/infantry_crossbowman_a.xml
View File

@ -60,7 +60,6 @@
<variant file="biped/attack_slaughter.xml"/>
<variant file="biped/gather_tree.xml"/>
<variant file="biped/gather_grain.xml"/>
<variant file="biped/gather_rice.xml"/>
<variant file="biped/gather_fruit.xml"/>
<variant file="biped/gather_meat.xml"/>
<variant file="biped/gather_rock.xml"/>

1
binaries/data/mods/public/art/actors/units/han/infantry_crossbowman_b.xml
View File

@ -58,7 +58,6 @@
<variant file="biped/attack_slaughter.xml"/>
<variant file="biped/gather_tree.xml"/>
<variant file="biped/gather_grain.xml"/>
<variant file="biped/gather_rice.xml"/>
<variant file="biped/gather_fruit.xml"/>
<variant file="biped/gather_meat.xml"/>
<variant file="biped/gather_rock.xml"/>

1
binaries/data/mods/public/art/actors/units/han/infantry_crossbowman_e.xml
View File

@ -61,7 +61,6 @@
<variant file="biped/attack_slaughter.xml"/>
<variant file="biped/gather_tree.xml"/>
<variant file="biped/gather_grain.xml"/>
<variant file="biped/gather_rice.xml"/>
<variant file="biped/gather_fruit.xml"/>
<variant file="biped/gather_meat.xml"/>
<variant file="biped/gather_rock.xml"/>

1
binaries/data/mods/public/art/actors/units/han/infantry_halberdman_a.xml
View File

@ -45,7 +45,6 @@
<variant file="biped/attack_slaughter.xml"/>
<variant file="biped/gather_tree.xml"/>
<variant file="biped/gather_grain.xml"/>
<variant file="biped/gather_rice.xml"/>
<variant file="biped/gather_fruit.xml"/>
<variant file="biped/gather_meat.xml"/>
<variant file="biped/gather_rock.xml"/>

1
binaries/data/mods/public/art/actors/units/han/infantry_halberdman_b.xml
View File

@ -42,7 +42,6 @@
<variant file="biped/attack_slaughter.xml"/>
<variant file="biped/gather_tree.xml"/>
<variant file="biped/gather_grain.xml"/>
<variant file="biped/gather_rice.xml"/>
<variant file="biped/gather_fruit.xml"/>
<variant file="biped/gather_meat.xml"/>
<variant file="biped/gather_rock.xml"/>

1
binaries/data/mods/public/art/actors/units/han/infantry_halberdman_e.xml
View File

@ -45,7 +45,6 @@
<variant file="biped/attack_slaughter.xml"/>
<variant file="biped/gather_tree.xml"/>
<variant file="biped/gather_grain.xml"/>
<variant file="biped/gather_rice.xml"/>
<variant file="biped/gather_fruit.xml"/>
<variant file="biped/gather_meat.xml"/>
<variant file="biped/gather_rock.xml"/>

1
binaries/data/mods/public/art/actors/units/han/infantry_spearman_a.xml
View File

@ -47,7 +47,6 @@
<variant file="biped/attack_slaughter.xml"/>
<variant file="biped/gather_tree.xml"/>
<variant file="biped/gather_grain.xml"/>
<variant file="biped/gather_rice.xml"/>
<variant file="biped/gather_fruit.xml"/>
<variant file="biped/gather_meat.xml"/>
<variant file="biped/gather_rock.xml"/>

1
binaries/data/mods/public/art/actors/units/han/infantry_spearman_b.xml
View File

@ -44,7 +44,6 @@
<variant file="biped/attack_slaughter.xml"/>
<variant file="biped/gather_tree.xml"/>
<variant file="biped/gather_grain.xml"/>
<variant file="biped/gather_rice.xml"/>
<variant file="biped/gather_fruit.xml"/>
<variant file="biped/gather_meat.xml"/>
<variant file="biped/gather_rock.xml"/>

1
binaries/data/mods/public/art/actors/units/han/infantry_spearman_e.xml
View File

@ -46,7 +46,6 @@
<variant file="biped/attack_slaughter.xml"/>
<variant file="biped/gather_tree.xml"/>
<variant file="biped/gather_grain.xml"/>
<variant file="biped/gather_rice.xml"/>
<variant file="biped/gather_fruit.xml"/>
<variant file="biped/gather_meat.xml"/>
<variant file="biped/gather_rock.xml"/>

1
binaries/data/mods/public/art/actors/units/han/infantry_swordsman_a.xml
View File

@ -61,7 +61,6 @@
<variant file="biped/attack_slaughter.xml"/>
<variant file="biped/gather_tree.xml"/>
<variant file="biped/gather_grain.xml"/>
<variant file="biped/gather_rice.xml"/>
<variant file="biped/gather_fruit.xml"/>
<variant file="biped/gather_meat.xml"/>
<variant file="biped/gather_rock.xml"/>

1
binaries/data/mods/public/art/actors/units/han/infantry_swordsman_b.xml
View File

@ -58,7 +58,6 @@
<variant file="biped/attack_slaughter.xml"/>
<variant file="biped/gather_tree.xml"/>
<variant file="biped/gather_grain.xml"/>
<variant file="biped/gather_rice.xml"/>
<variant file="biped/gather_fruit.xml"/>
<variant file="biped/gather_meat.xml"/>
<variant file="biped/gather_rock.xml"/>

1
binaries/data/mods/public/art/actors/units/han/infantry_swordsman_e.xml
View File

@ -60,7 +60,6 @@
<variant file="biped/attack_slaughter.xml"/>
<variant file="biped/gather_tree.xml"/>
<variant file="biped/gather_grain.xml"/>
<variant file="biped/gather_rice.xml"/>
<variant file="biped/gather_fruit.xml"/>
<variant file="biped/gather_meat.xml"/>
<variant file="biped/gather_rock.xml"/>

9
binaries/data/mods/public/art/variants/biped/female_gather_rice.xml
View File

@ -1,9 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<variant name="gather_rice">
<animations>
<animation file="biped/gatherer/farming.dae" name="gather_rice" speed="100"/>
</animations>
<props>
<prop actor="props/units/tools/hoe.xml" attachpoint="weapon_R"/>
</props>
</variant>

15
binaries/data/mods/public/art/variants/biped/gather_rice.xml
View File

@ -1,15 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<variant name="gather_rice">
<animations>
<animation file="biped/gatherer/farming.dae" name="gather_rice" speed="100"/>
</animations>
<props>
<prop actor="props/units/tools/hoe.xml" attachpoint="weapon_R"/>
<prop actor="props/units/helmets/han_ricehat.xml" attachpoint="helmet"/>
<prop attachpoint="weapon_L"/>
<prop attachpoint="shield"/>
<prop attachpoint="shield_arm"/>
<prop attachpoint="ammo"/>
<prop attachpoint="weapon_bow"/>
</props>
</variant>

3
binaries/data/mods/public/simulation/data/resources/food.json
View File

@ -7,8 +7,7 @@
"fish": "Fish",
"fruit": "Fruit",
"grain": "Grain",
"meat": "Meat",
"rice": "Rice"
"meat": "Meat"
},
"properties": ["barterable", "tradable", "tributable"],
"truePrice": 100,

2
binaries/data/mods/public/simulation/data/technologies/gather_farming_water_weeding.json
View File

@ -17,7 +17,7 @@
"researchTime": 60,
"tooltip": "Workers +25% rice gather rate.",
"modifications": [
{ "value": "ResourceGatherer/Rates/food.rice", "multiply": 1.25 }
{ "value": "ResourceGatherer/Rates/food.grain", "multiply": 1.25 }
],
"affects": ["Worker"],
"soundComplete": "interface/alarm/alarm_upgradearmory.xml"

4
binaries/data/mods/public/simulation/templates/structures/han/field.xml
View File

@ -19,11 +19,7 @@
<Static depth="20.0" width="20.0"/>
</Obstruction>
<ResourceSupply>
<KillBeforeGather>false</KillBeforeGather>
<Max>Infinity</Max>
<Type>food.rice</Type>
<MaxGatherers>3</MaxGatherers>
<DiminishingReturns>0.90</DiminishingReturns>
</ResourceSupply>
<VisualActor>
<Actor>structures/rice_paddy.xml</Actor>

5
binaries/data/mods/public/simulation/templates/units/han/infantry_archer_b.xml
View File

@ -17,9 +17,4 @@
<VisualActor>
<Actor>units/han/infantry_archer_b.xml</Actor>
</VisualActor>
<ResourceGatherer>
<Rates>
<food.rice>0.35</food.rice>
</Rates>
</ResourceGatherer>
</Entity>

5
binaries/data/mods/public/simulation/templates/units/han/infantry_crossbowman_b.xml
View File

@ -18,9 +18,4 @@
<VisualActor>
<Actor>units/han/infantry_crossbowman_b.xml</Actor>
</VisualActor>
<ResourceGatherer>
<Rates>
<food.rice>0.35</food.rice>
</Rates>
</ResourceGatherer>
</Entity>

5
binaries/data/mods/public/simulation/templates/units/han/infantry_pikeman_b.xml
View File

@ -35,11 +35,6 @@
</Damage>
</Entity>
</Resistance>
<ResourceGatherer>
<Rates>
<food.rice>0.35</food.rice>
</Rates>
</ResourceGatherer>
<UnitAI>
<Formations datatype="tokens">
special/formations/anti_cavalry

5
binaries/data/mods/public/simulation/templates/units/han/infantry_spearman_b.xml
View File

@ -17,11 +17,6 @@
<VisualActor>
<Actor>units/han/infantry_spearman_b.xml</Actor>
</VisualActor>
<ResourceGatherer>
<Rates>
<food.rice>0.35</food.rice>
</Rates>
</ResourceGatherer>
<UnitAI>
<Formations datatype="tokens">
special/formations/anti_cavalry

5
binaries/data/mods/public/simulation/templates/units/han/infantry_swordsman_b.xml
View File

@ -18,9 +18,4 @@
<VisualActor>
<Actor>units/han/infantry_swordsman_b.xml</Actor>
</VisualActor>
<ResourceGatherer>
<Rates>
<food.rice>0.35</food.rice>
</Rates>
</ResourceGatherer>
</Entity>

5
binaries/data/mods/public/simulation/templates/units/han/support_female_citizen.xml
View File

@ -13,9 +13,4 @@
<VisualActor>
<Actor>units/han/female_citizen.xml</Actor>
</VisualActor>
<ResourceGatherer>
<Rates>
<food.rice>0.6</food.rice>
</Rates>
</ResourceGatherer>
</Entity>