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

Move train time increase for advanced/elite to the upgrade tech.

Browse Source 
Techs which enabled training advanced/elite mercenaries directly also
increased the train time of those units.
It is more consistent and more maintainable to increase the train time
in the advanced/elite tech.
This does not affect promoting units since those are not trained.

Also rename and use a consistent order.

Patch by: Nescio
Reviewed By: borg-, wraitii
Differential Revision: https://code.wildfiregames.com/D2865
This was SVN commit r23818.
This commit is contained in:
wraitii
2020-07-12 09:14:44 +00:00
parent d43293f885
commit e007caf642
4 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
binaries/data/mods/public/simulation/data/technologies/advanced_unit_bonus.json → binaries/data/mods/public/simulation/data/technologies/unit_advanced.json
+10 -9
View File
@@ -1,29 +1,30 @@
{
"autoResearch": true,
"icon": "upgrade_advanced.png",
"tooltip": "Units promoted to the advanced class gain a lot of quality: 10% extra health, 1 extra armor level of every type, 20% extra loot, 20% extra attack for melee units, 4m extra range and better precision for ranged units, faster Infantry movement speeds and extra heal speed and range for healers.",
"tooltip": "Advanced and Elite units +20% training time, +1 armour level, +10% health, +0.4 capture attack strength, +20% loot, and −30% gather speed; Healers +5 healing strength and +3 healing range; Infantry +0.5 movement speed; Melee units +20% attack damage; Ranged units +4 attack range and −10% spread.",
"modifications": [
{ "value": "Health/Max", "multiply": 1.1 },
{ "value": "Armour/Hack", "add": 1 },
{ "value": "Armour/Pierce", "add": 1 },
{ "value": "Armour/Crush", "add": 1 },
{ "value": "Attack/Capture/Capture", "add": 0.4 },
{ "value": "ResourceGatherer/BaseSpeed", "multiply": 0.7 },
{ "value": "UnitMotion/WalkSpeed", "add": 0.5, "affects": "Infantry" },
{ "value": "Attack/Ranged/MaxRange", "add": 4, "affects": "Ranged" },
{ "value": "Vision/Range", "add": 4, "affects": "Ranged" },
{ "value": "Attack/Ranged/Spread", "multiply": 0.9, "affects": "Ranged" },
{ "value": "Attack/Melee/Damage/Hack", "multiply": 1.2, "affects": "Melee" },
{ "value": "Attack/Melee/Damage/Pierce", "multiply": 1.2, "affects": "Melee" },
{ "value": "Attack/Melee/Damage/Crush", "multiply": 1.2, "affects": "Melee" },
{ "value": "Vision/Range", "add": 3, "affects": "Healer" },
{ "value": "Attack/Ranged/MaxRange", "add": 4, "affects": "Ranged" },
{ "value": "Attack/Ranged/Spread", "multiply": 0.9, "affects": "Ranged" },
{ "value": "Cost/BuildTime", "multiply": 1.2 },
{ "value": "Health/Max", "multiply": 1.1 },
{ "value": "Heal/Range", "add": 3, "affects": "Healer" },
{ "value": "Heal/HP", "add": 5, "affects": "Healer" },
{ "value": "Loot/food", "multiply": 1.2 },
{ "value": "Loot/wood", "multiply": 1.2 },
{ "value": "Loot/stone", "multiply": 1.2 },
{ "value": "Loot/metal", "multiply": 1.2 },
{ "value": "Loot/xp", "multiply": 1.2 }
{ "value": "Loot/xp", "multiply": 1.2 },
{ "value": "ResourceGatherer/BaseSpeed", "multiply": 0.7 },
{ "value": "UnitMotion/WalkSpeed", "add": 0.5, "affects": "Infantry" },
{ "value": "Vision/Range", "add": 3, "affects": "Healer" },
{ "value": "Vision/Range", "add": 4, "affects": "Ranged" },
],
"affects": ["Advanced Unit", "Elite Unit"]
}
binaries/data/mods/public/simulation/data/technologies/elite_unit_bonus.json → binaries/data/mods/public/simulation/data/technologies/unit_elite.json
+10 -9
View File
@@ -1,29 +1,30 @@
{
"autoResearch": true,
"icon": "upgrade_elite.png",
"tooltip": "Units promoted to the elite class gain a lot of quality: 10% extra health, 1 extra armor level of every type, 20% extra loot, 20% extra attack for melee units, 4m extra range and better precision for ranged units, faster Infantry movement speeds and extra heal speed and range for healers.",
"tooltip": "Elite units +20% training time, +1 armour level, +10% health, +0.4 capture attack strength, +20% loot, and −30% gather speed; Healers +5 healing strength and +3 healing range; Infantry +0.5 movement speed; Melee units +20% attack damage; Ranged units +4 attack range and −10% spread.",
"modifications": [
{ "value": "Health/Max", "multiply": 1.1 },
{ "value": "Armour/Hack", "add": 1 },
{ "value": "Armour/Pierce", "add": 1 },
{ "value": "Armour/Crush", "add": 1 },
{ "value": "Attack/Capture/Capture", "add": 0.4 },
{ "value": "ResourceGatherer/BaseSpeed", "multiply": 0.7 },
{ "value": "UnitMotion/WalkSpeed", "add": 0.5, "affects": "Infantry" },
{ "value": "Attack/Ranged/MaxRange", "add": 4, "affects": "Ranged" },
{ "value": "Vision/Range", "add": 4, "affects": "Ranged" },
{ "value": "Attack/Ranged/Spread", "multiply": 0.9, "affects": "Ranged" },
{ "value": "Attack/Melee/Damage/Hack", "multiply": 1.2, "affects": "Melee" },
{ "value": "Attack/Melee/Damage/Pierce", "multiply": 1.2, "affects": "Melee" },
{ "value": "Attack/Melee/Damage/Crush", "multiply": 1.2, "affects": "Melee" },
{ "value": "Vision/Range", "add": 3, "affects": "Healer" },
{ "value": "Attack/Ranged/MaxRange", "add": 4, "affects": "Ranged" },
{ "value": "Attack/Ranged/Spread", "multiply": 0.9, "affects": "Ranged" },
{ "value": "Cost/BuildTime", "multiply": 1.2 },
{ "value": "Health/Max", "multiply": 1.1 },
{ "value": "Heal/Range", "add": 3, "affects": "Healer" },
{ "value": "Heal/HP", "add": 5, "affects": "Healer" },
{ "value": "Loot/food", "multiply": 1.2 },
{ "value": "Loot/wood", "multiply": 1.2 },
{ "value": "Loot/stone", "multiply": 1.2 },
{ "value": "Loot/metal", "multiply": 1.2 },
{ "value": "Loot/xp", "multiply": 1.2 }
{ "value": "Loot/xp", "multiply": 1.2 },
{ "value": "ResourceGatherer/BaseSpeed", "multiply": 0.7 },
{ "value": "UnitMotion/WalkSpeed", "add": 0.5, "affects": "Infantry" },
{ "value": "Vision/Range", "add": 3, "affects": "Healer" },
{ "value": "Vision/Range", "add": 4, "affects": "Ranged" },
],
"affects": ["Elite Unit"]
}
binaries/data/mods/public/simulation/data/technologies/upgrade_rank_advanced_mercenary.json
+2 -3
View File
@@ -18,10 +18,9 @@
"requirementsTooltip": "Unlocked in Town Phase.",
"icon": "upgrade_advanced.png",
"researchTime": 40,
"tooltip": "Mercenaries are promoted to advanced rank but require +20% training time.",
"tooltip": "Mercenaries are promoted to Advanced rank.",
"modifications": [
{ "value": "Promotion/RequiredXp", "replace": 0, "affects": "Basic" },
{ "value": "Cost/BuildTime", "multiply": 1.2, "affects": "Advanced" }
{ "value": "Promotion/RequiredXp", "replace": 0, "affects": "Basic" }
],
"soundComplete": "interface/alarm/alarm_upgradearmory.xml",
"affects": ["Mercenary"]
binaries/data/mods/public/simulation/templates/units/spart_champion_infantry_sword.xml
-1
View File
@@ -13,7 +13,6 @@
<food op="add">-10</food>
<metal op="add">20</metal>
</Resources>
<BuildTime op="add">5</BuildTime>
</Cost>
<Identity>
<Civ>spart</Civ>