dallasgroot/0ad
1
0
Fork 0
mirror of https://gitea.wildfiregames.com/0ad/0ad synced 2026-07-04 05:55:47 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

[Fix] Remove the remnants of the Han rice resource

Browse source 
It is unused at this point and causes their farming upgrades to be
non-functional

Accepted by: @Silier @wowgetoffyourcellphone
Differential revision: https://code.wildfiregames.com/D4791
This was SVN commit r27144.
This commit is contained in:
marder 2022-10-11 15:26:53 +00:00
parent 856e876148
commit 2ca0fd6ffb
21 changed files with 6 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -46,7 +46,6 @@
<variant file="biped/carry_metal.xml"/>
<variant file="biped/approach_tree.xml"/>
<variant file="biped/approach_grain_han.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"/>

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

@ -40,7 +40,6 @@
<variant file="biped/carry_metal.xml"/>
<variant file="biped/approach_tree.xml"/>
<variant file="biped/approach_grain_han.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"/>

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

@ -42,7 +42,6 @@
<variant file="biped/carry_metal.xml"/>
<variant file="biped/approach_tree.xml"/>
<variant file="biped/approach_grain_han.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"/>

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

@ -41,7 +41,6 @@
<variant file="biped/carry_metal.xml"/>
<variant file="biped/approach_tree.xml"/>
<variant file="biped/approach_grain_han.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"/>

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

@ -39,7 +39,6 @@
<variant file="biped/carry_metal.xml"/>
<variant file="biped/approach_tree.xml"/>
<variant file="biped/approach_grain_han.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"/>

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

@ -42,7 +42,6 @@
<variant file="biped/carry_metal.xml"/>
<variant file="biped/approach_tree.xml"/>
<variant file="biped/approach_grain_han.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"/>

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

@ -49,7 +49,6 @@
<variant file="biped/carry_metal.xml"/>
<variant file="biped/approach_tree.xml"/>
<variant file="biped/approach_grain_han.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"/>

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

@ -46,7 +46,6 @@
<variant file="biped/carry_metal.xml"/>
<variant file="biped/approach_tree.xml"/>
<variant file="biped/approach_grain_han.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"/>

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

@ -49,7 +49,6 @@
<variant file="biped/carry_metal.xml"/>
<variant file="biped/approach_tree.xml"/>
<variant file="biped/approach_grain_han.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"/>

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

@ -43,7 +43,6 @@
<variant file="biped/carry_metal.xml"/>
<variant file="biped/approach_tree.xml"/>
<variant file="biped/approach_grain_han.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"/>

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

@ -43,7 +43,6 @@
<variant file="biped/base_spearman_shield_relax.xml"/>
<variant file="biped/approach_tree.xml"/>
<variant file="biped/approach_grain_han.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"/>

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

@ -42,7 +42,6 @@
<variant file="biped/carry_metal.xml"/>
<variant file="biped/approach_tree.xml"/>
<variant file="biped/approach_grain_han.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"/>

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

@ -43,7 +43,6 @@
<variant file="biped/carry_metal.xml"/>
<variant file="biped/approach_tree.xml"/>
<variant file="biped/approach_grain_han.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"/>

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

@ -40,7 +40,6 @@
<variant file="biped/carry_metal.xml"/>
<variant file="biped/approach_tree.xml"/>
<variant file="biped/approach_grain_han.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"/>

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

@ -42,7 +42,6 @@
<variant file="biped/carry_metal.xml"/>
<variant file="biped/approach_tree.xml"/>
<variant file="biped/approach_grain_han.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"/>

17
binaries/data/mods/public/art/variants/biped/approach_rice.xml
View file

@ -1,17 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<variant name="approach_rice">
<animations>
<animation file="biped/gatherer/idle_hoe_01.dae" name="Idle" speed="20"/>
<animation file="biped/gatherer/walk_hoe.dae" name="Walk" speed="20"/>
<animation file="biped/gatherer/walk_hoe.dae" name="Run" speed="20"/>
</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>

8
binaries/data/mods/public/art/variants/capes/approach_rice.xml
View file

@ -1,8 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<variant name="approach_rice">
<animations>
<animation file="biped/gatherer/idle_hoe_01.dae" name="Idle" speed="20"/>
<animation file="biped/gatherer/walk_hoe.dae" name="Walk" speed="20"/>
<animation file="biped/gatherer/walk_hoe.dae" name="Run" speed="20"/>
</animations>
</variant>

2
binaries/data/mods/public/simulation/ai/petra/researchManager.js
View file

@ -105,7 +105,7 @@ PETRA.ResearchManager.prototype.researchWantedTechs = function(gameState, techs)
return { "name": tech[0], "increasePriority": this.CostSum(template.cost) < 400 };
else if (template.modifications[i].value === "ResourceGatherer/Rates/food.fruit")
return { "name": tech[0], "increasePriority": this.CostSum(template.cost) < 400 };
else if (template.modifications[i].value === "ResourceGatherer/Rates/food.grain" || template.modifications[i].value === "ResourceGatherer/Rates/food.rice")
else if (template.modifications[i].value === "ResourceGatherer/Rates/food.grain")
return { "name": tech[0], "increasePriority": false };
else if (template.modifications[i].value === "ResourceGatherer/Rates/wood.tree")
return { "name": tech[0], "increasePriority": this.CostSum(template.cost) < 400 };

4
binaries/data/mods/public/simulation/data/technologies/gather_farming_chain_pump.json
View file

@ -15,9 +15,9 @@
"requirementsTooltip": "Unlocked in City Phase.",
"icon": "flood_control.png",
"researchTime": 70,
"tooltip": "Workers +20% rice gather rate.",
"tooltip": "Workers +20% grain gather rate.",
"modifications": [
{ "value": "ResourceGatherer/Rates/food.rice", "multiply": 1.2 }
{ "value": "ResourceGatherer/Rates/food.grain", "multiply": 1.2 }
],
"affects": ["Worker"],
"soundComplete": "interface/alarm/alarm_upgradearmory.xml"

4
binaries/data/mods/public/simulation/data/technologies/gather_farming_seed_drill.json
View file

@ -14,9 +14,9 @@
"requirementsTooltip": "Unlocked in Village Phase.",
"icon": "torsion_springs.png",
"researchTime": 50,
"tooltip": "Workers +20% rice gather rate.",
"tooltip": "Workers +20% grain gather rate.",
"modifications": [
{ "value": "ResourceGatherer/Rates/food.rice", "multiply": 1.2 }
{ "value": "ResourceGatherer/Rates/food.grain", "multiply": 1.2 }
],
"affects": ["Worker"],
"soundComplete": "interface/alarm/alarm_upgradearmory.xml"

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

@ -15,7 +15,7 @@
"requirementsTooltip": "Unlocked in Town Phase.",
"icon": "irrigation.png",
"researchTime": 60,
"tooltip": "Workers +20% rice gather rate.",
"tooltip": "Workers +20% grain gather rate.",
"modifications": [
{ "value": "ResourceGatherer/Rates/food.grain", "multiply": 1.2 }
],