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

simplify mercenary cost

Browse Source 
Move repetitive cost change for mercenary from templates to technology
json.

Differential revision: https://code.wildfiregames.com/D2685
Patch by: Nescio
This was SVN commit r24330.
This commit is contained in:
Angen 2020-12-06 08:34:31 +00:00
parent 1bd3d7ee5b
commit 46413134bb
25 changed files with 29 additions and 161 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
binaries/data/mods/public/simulation/data/technologies/unit_mercenary.json Normal file
View File

@ -0,0 +1,11 @@
{
"autoResearch": true,
"tooltip": "Non-Champion Mercenaries cost −25 food, +25 metal.",
"modifications": [
{ "value": "Cost/Resources/food", "add": -25 },
{ "value": "Cost/Resources/metal", "add": 25 },
{ "value": "Loot/food", "add": -2 },
{ "value": "Loot/metal", "add": 2 }
],
"affects": ["Mercenary !Champion"]
}

8
binaries/data/mods/public/simulation/templates/units/athen/infantry_javelineer_b.xml
View File

@ -8,19 +8,13 @@
structures/athen/royal_stoa
</Entities>
</Builder>
<Cost>
<Resources>
<food op="add">-25</food>
<metal op="add">25</metal>
</Resources>
</Cost>
<Identity>
<Civ>athen</Civ>
<VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
<Lang>greek</Lang>
<SelectionGroupName>units/athen/infantry_javelineer_b</SelectionGroupName>
<GenericName>Thracian Peltast</GenericName>
<SpecificName>Peltastḗs Thrâx</SpecificName>
<VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
<Icon>units/athen_infantry_javelinist.png</Icon>
<RequiredTechnology>phase_town</RequiredTechnology>
</Identity>

8
binaries/data/mods/public/simulation/templates/units/athen/infantry_marine_archer_b.xml
View File

@ -8,19 +8,13 @@
structures/athen/royal_stoa
</Entities>
</Builder>
<Cost>
<Resources>
<food op="add">-25</food>
<metal op="add">25</metal>
</Resources>
</Cost>
<Identity>
<Civ>athen</Civ>
<VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
<Lang>greek</Lang>
<SelectionGroupName>units/athen/infantry_marine_archer_b</SelectionGroupName>
<GenericName>Cretan Mercenary Archer</GenericName>
<SpecificName>Toxótēs Krētikós</SpecificName>
<VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
<Icon>units/mace_infantry_archer.png</Icon>
<RequiredTechnology>hellenes/special_iphicratean_reforms</RequiredTechnology>
</Identity>

6
binaries/data/mods/public/simulation/templates/units/cart/cavalry_spearman_ital_b.xml
View File

@ -1,11 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="template_unit_cavalry_melee_spearman">
<Cost>
<Resources>
<food op="add">-25</food>
<metal op="add">25</metal>
</Resources>
</Cost>
<Identity>
<Civ>cart</Civ>
<GenericName>Italic Cavalry</GenericName>

6
binaries/data/mods/public/simulation/templates/units/cart/cavalry_swordsman_gaul_b.xml
View File

@ -1,11 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="template_unit_cavalry_melee_swordsman">
<Cost>
<Resources>
<food op="add">-25</food>
<metal op="add">25</metal>
</Resources>
</Cost>
<Identity>
<Civ>cart</Civ>
<GenericName>Gallic Mercenary Cavalry</GenericName>

6
binaries/data/mods/public/simulation/templates/units/cart/cavalry_swordsman_iber_b.xml
View File

@ -5,12 +5,6 @@
<AttackName context="Name of an attack using a single-edged sword.">Sword</AttackName>
</Melee>
</Attack>
<Cost>
<Resources>
<food op="add">-25</food>
<metal op="add">25</metal>
</Resources>
</Cost>
<Identity>
<Civ>cart</Civ>
<GenericName>Iberian Heavy Cavalry</GenericName>

6
binaries/data/mods/public/simulation/templates/units/cart/infantry_javelineer_iber_b.xml
View File

@ -8,12 +8,6 @@
structures/{civ}/embassy_italic
</Entities>
</Builder>
<Cost>
<Resources>
<food op="add">-25</food>
<metal op="add">25</metal>
</Resources>
</Cost>
<Identity>
<Civ>cart</Civ>
<GenericName>Iberian Mercenary Skirmisher</GenericName>

6
binaries/data/mods/public/simulation/templates/units/cart/infantry_slinger_iber_b.xml
View File

@ -8,12 +8,6 @@
structures/{civ}/embassy_italic
</Entities>
</Builder>
<Cost>
<Resources>
<food op="add">-25</food>
<metal op="add">25</metal>
</Resources>
</Cost>
<Identity>
<Civ>cart</Civ>
<GenericName>Balearic Slinger</GenericName>

6
binaries/data/mods/public/simulation/templates/units/cart/infantry_swordsman_gaul_b.xml
View File

@ -8,12 +8,6 @@
structures/{civ}/embassy_italic
</Entities>
</Builder>
<Cost>
<Resources>
<food op="add">-25</food>
<metal op="add">25</metal>
</Resources>
</Cost>
<Identity>
<Civ>cart</Civ>
<GenericName>Gallic Mercenary Swordsman</GenericName>

6
binaries/data/mods/public/simulation/templates/units/cart/infantry_swordsman_ital_b.xml
View File

@ -8,12 +8,6 @@
structures/{civ}/embassy_italic
</Entities>
</Builder>
<Cost>
<Resources>
<food op="add">-25</food>
<metal op="add">25</metal>
</Resources>
</Cost>
<Identity>
<Civ>cart</Civ>
<GenericName>Samnite Swordsman</GenericName>

8
binaries/data/mods/public/simulation/templates/units/kush/cavalry_javelineer_merc_b.xml
View File

@ -1,21 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="template_unit_cavalry_ranged_javelineer">
<Cost>
<Resources>
<food op="add">-25</food>
<metal op="add">25</metal>
</Resources>
</Cost>
<Footprint>
<Height>7.5</Height>
</Footprint>
<Identity>
<Civ>kush</Civ>
<Lang>napatan</Lang>
<VisibleClasses datatype="tokens">Camel Mercenary</VisibleClasses>
<SelectionGroupName>units/kush/cavalry_javelineer_merc_b</SelectionGroupName>
<GenericName>Blemmye Desert Raider</GenericName>
<SpecificName>nhw Bulahau gml</SpecificName>
<VisibleClasses datatype="tokens">Camel Mercenary</VisibleClasses>
<Icon>units/kush_camel_javelinist.png</Icon>
<RequiredTechnology>phase_town</RequiredTechnology>
</Identity>

8
binaries/data/mods/public/simulation/templates/units/kush/infantry_javelineer_merc_b.xml
View File

@ -9,19 +9,13 @@
structures/kush/camp_noba
</Entities>
</Builder>
<Cost>
<Resources>
<food op="add">-25</food>
<metal op="add">25</metal>
</Resources>
</Cost>
<Identity>
<Civ>kush</Civ>
<Lang>napatan</Lang>
<VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
<SelectionGroupName>units/kush/infantry_javelineer_merc_b</SelectionGroupName>
<GenericName>Noba Skirmisher</GenericName>
<SpecificName>nhw ʿhȝw Noba</SpecificName>
<VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
<Icon>units/kush_infantry_javelinist.png</Icon>
<RequiredTechnology>phase_town</RequiredTechnology>
</Identity>

8
binaries/data/mods/public/simulation/templates/units/kush/infantry_maceman_merc_b.xml
View File

@ -18,19 +18,13 @@
structures/kush/camp_noba
</Entities>
</Builder>
<Cost>
<Resources>
<food op="add">-25</food>
<metal op="add">25</metal>
</Resources>
</Cost>
<Identity>
<Civ>kush</Civ>
<Lang>napatan</Lang>
<VisibleClasses datatype="tokens">-Swordsman Macemen Mercenary</VisibleClasses>
<SelectionGroupName>units/kush/infantry_maceman_b</SelectionGroupName>
<GenericName>Noba Maceman</GenericName>
<SpecificName>nhw Noba</SpecificName>
<VisibleClasses datatype="tokens">-Swordsman Maceman Mercenary</VisibleClasses>
<Icon>units/kush_infantry_clubman.png</Icon>
<RequiredTechnology>phase_town</RequiredTechnology>
</Identity>

8
binaries/data/mods/public/simulation/templates/units/mace/cavalry_javelineer_b.xml
View File

@ -1,18 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="template_unit_cavalry_ranged_javelineer">
<Cost>
<Resources>
<food op="add">-25</food>
<metal op="add">25</metal>
</Resources>
</Cost>
<Identity>
<Civ>mace</Civ>
<VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
<Lang>greek</Lang>
<SelectionGroupName>units/mace/cavalry_javelineer_b</SelectionGroupName>
<GenericName>Odrysian Skirmish Cavalry</GenericName>
<SpecificName>Hippakontistḕs Odrysós</SpecificName>
<VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
<Icon>units/mace_cavalry_javelinist.png</Icon>
<RequiredTechnology>phase_town</RequiredTechnology>
</Identity>

8
binaries/data/mods/public/simulation/templates/units/mace/infantry_archer_b.xml
View File

@ -6,19 +6,13 @@
structures/mace/library
</Entities>
</Builder>
<Cost>
<Resources>
<food op="add">-25</food>
<metal op="add">25</metal>
</Resources>
</Cost>
<Identity>
<Civ>mace</Civ>
<VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
<Lang>greek</Lang>
<SelectionGroupName>units/mace/infantry_archer_b</SelectionGroupName>
<GenericName>Cretan Mercenary Archer</GenericName>
<SpecificName>Toxótēs Krētikós</SpecificName>
<VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
<Icon>units/mace_infantry_archer.png</Icon>
<RequiredTechnology>phase_town</RequiredTechnology>
</Identity>

8
binaries/data/mods/public/simulation/templates/units/mace/infantry_slinger_b.xml
View File

@ -6,19 +6,13 @@
structures/mace/library
</Entities>
</Builder>
<Cost>
<Resources>
<food op="add">-25</food>
<metal op="add">25</metal>
</Resources>
</Cost>
<Identity>
<Civ>mace</Civ>
<VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
<Lang>greek</Lang>
<SelectionGroupName>units/mace/infantry_slinger_b</SelectionGroupName>
<GenericName>Rhodian Slinger</GenericName>
<SpecificName>Sphendonḗtēs Rhódios</SpecificName>
<VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
<Icon>units/mace_infantry_slinger.png</Icon>
<RequiredTechnology>phase_town</RequiredTechnology>
</Identity>

8
binaries/data/mods/public/simulation/templates/units/ptol/cavalry_javelineer_merc_b.xml
View File

@ -1,17 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="template_unit_cavalry_ranged_javelineer">
<Cost>
<Resources>
<food op="add">-25</food>
<metal op="add">25</metal>
</Resources>
</Cost>
<Identity>
<Civ>ptol</Civ>
<VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
<SelectionGroupName>units/ptol/cavalry_javelineer_merc_b</SelectionGroupName>
<GenericName>Tarantine Settler Cavalry</GenericName>
<SpecificName>Hippeús Tarantînos</SpecificName>
<VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
<Icon>units/mace_cavalry_javelinist.png</Icon>
<RequiredTechnology>phase_town</RequiredTechnology>
</Identity>

8
binaries/data/mods/public/simulation/templates/units/ptol/cavalry_spearman_merc_b.xml
View File

@ -1,17 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="template_unit_cavalry_melee_spearman">
<Cost>
<Resources>
<food op="add">-25</food>
<metal op="add">25</metal>
</Resources>
</Cost>
<Identity>
<Civ>ptol</Civ>
<VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
<SelectionGroupName>units/ptol/cavalry_spearman_merc_b</SelectionGroupName>
<GenericName>Macedonian Settler Cavalry</GenericName>
<SpecificName>Hippeús Makedonikós</SpecificName>
<VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
<Icon>units/ptol_cavalry_spearman.png</Icon>
<RequiredTechnology>phase_town</RequiredTechnology>
</Identity>

8
binaries/data/mods/public/simulation/templates/units/ptol/infantry_archer_b.xml
View File

@ -6,18 +6,12 @@
structures/ptol/library
</Entities>
</Builder>
<Cost>
<Resources>
<food op="add">-25</food>
<metal op="add">25</metal>
</Resources>
</Cost>
<Identity>
<Civ>ptol</Civ>
<VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
<SelectionGroupName>units/ptol/infantry_archer_b</SelectionGroupName>
<GenericName>Cretan Mercenary Archer</GenericName>
<SpecificName>Toxótēs Krētikós</SpecificName>
<VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
<Icon>units/mace_infantry_archer.png</Icon>
<RequiredTechnology>phase_town</RequiredTechnology>
</Identity>

8
binaries/data/mods/public/simulation/templates/units/ptol/infantry_javelineer_b.xml
View File

@ -6,18 +6,12 @@
structures/ptol/library
</Entities>
</Builder>
<Cost>
<Resources>
<food op="add">-25</food>
<metal op="add">25</metal>
</Resources>
</Cost>
<Identity>
<Civ>ptol</Civ>
<VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
<SelectionGroupName>units/ptol/infantry_javelineer_b</SelectionGroupName>
<GenericName>Mercenary Thureos Skirmisher</GenericName>
<SpecificName>Thureophóros Akrobolistḗs</SpecificName>
<VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
<Icon>units/ptol_infantry_javelinist_merc.png</Icon>
<RequiredTechnology>phase_village</RequiredTechnology>
</Identity>

9
binaries/data/mods/public/simulation/templates/units/ptol/infantry_spearman_merc_b.xml
View File

@ -6,19 +6,14 @@
structures/ptol/library
</Entities>
</Builder>
<Cost>
<Resources>
<food op="add">-25</food>
<metal op="add">25</metal>
</Resources>
</Cost>
<Identity>
<Civ>ptol</Civ>
<VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
<SelectionGroupName>units/ptol/infantry_spearman_merc_b</SelectionGroupName>
<GenericName>Mercenary Thureos Spearman</GenericName>
<SpecificName>Thureophóros Misthophóros</SpecificName>
<VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
<Icon>units/ptol_infantry_spearman_2.png</Icon>
<RequiredTechnology>phase_town</RequiredTechnology>
</Identity>
<Promotion>
<Entity>units/ptol/infantry_spearman_merc_a</Entity>

6
binaries/data/mods/public/simulation/templates/units/ptol/infantry_swordsman_merc_b.xml
View File

@ -6,12 +6,6 @@
structures/ptol/library
</Entities>
</Builder>
<Cost>
<Resources>
<food op="add">-25</food>
<metal op="add">25</metal>
</Resources>
</Cost>
<Identity>
<Civ>ptol</Civ>
<GenericName>Gallic Mercenary Swordsman</GenericName>

10
binaries/data/mods/public/simulation/templates/units/sele/cavalry_spearman_merc_b.xml
View File

@ -1,20 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<Entity parent="template_unit_cavalry_melee_spearman">
<Cost>
<Resources>
<food op="add">-25</food>
<metal op="add">25</metal>
</Resources>
</Cost>
<Identity>
<Civ>sele</Civ>
<VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
<Lang>greek</Lang>
<SelectionGroupName>units/sele/cavalry_spearman_merc_b</SelectionGroupName>
<GenericName>Companion Cavalry</GenericName>
<SpecificName>Hippos Hetairike</SpecificName>
<RequiredTechnology>phase_town</RequiredTechnology>
<VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
<Icon>units/mace_cavalry_spearman.png</Icon>
<RequiredTechnology>phase_town</RequiredTechnology>
</Identity>
<Promotion>
<Entity>units/sele/cavalry_spearman_merc_a</Entity>

8
binaries/data/mods/public/simulation/templates/units/sele/infantry_archer_merc_b.xml
View File

@ -5,19 +5,13 @@
structures/sele/library
</Entities>
</Builder>
<Cost>
<Resources>
<food op="add">-25</food>
<metal op="add">25</metal>
</Resources>
</Cost>
<Identity>
<Civ>sele</Civ>
<VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
<Lang>greek</Lang>
<SelectionGroupName>units/sele/infantry_archer_merc_b</SelectionGroupName>
<GenericName>Syrian Archer</GenericName>
<SpecificName>Toxótēs Syrías</SpecificName>
<VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
<Icon>units/sele_infantry_archer.png</Icon>
<RequiredTechnology>phase_town</RequiredTechnology>
</Identity>

8
binaries/data/mods/public/simulation/templates/units/sele/infantry_swordsman_merc_b.xml
View File

@ -10,19 +10,13 @@
structures/sele/library
</Entities>
</Builder>
<Cost>
<Resources>
<food op="add">-25</food>
<metal op="add">25</metal>
</Resources>
</Cost>
<Identity>
<Civ>sele</Civ>
<VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
<Lang>greek</Lang>
<SelectionGroupName>units/sele/infantry_swordsman_merc_b</SelectionGroupName>
<GenericName>Thracian Mercenary Swordsman</GenericName>
<SpecificName>Rhomphaiaphoros Thrakikós</SpecificName>
<VisibleClasses datatype="tokens">Mercenary</VisibleClasses>
<Icon>units/sele_infantry_swordsman.png</Icon>
<RequiredTechnology>phase_town</RequiredTechnology>
</Identity>