real_tabasco_sauce/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Actions Activity

Fix attack/armor techs not applying after 16b452cf91, and fix auras/techs affecting capture rate.

Browse Source 
Reported By: Nescio
Patch By: Freagarach
Differential Revision: https://code.wildfiregames.com/D2224
This was SVN commit r22786.
This commit is contained in:
wraitii 2019-08-25 18:03:32 +00:00
parent 719f2d7967
commit 85d01b839c
14 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
binaries/data/mods/public/simulation/components/Armour.js
View File

@ -53,7 +53,7 @@ Armour.prototype.GetArmourStrengths = function(effectType)
else
strength = +this.template[type];
return ApplyValueModificationsToEntity("Armour/" + effectType + "/" + type, strength, this.entity);
return ApplyValueModificationsToEntity("Armour/" + type, strength, this.entity);
};
let foundation = Engine.QueryInterface(this.entity, IID_Foundation) && this.template.Foundation;

6
binaries/data/mods/public/simulation/components/Attack.js
View File

@ -341,10 +341,10 @@ Attack.prototype.GetFullAttackRange = function()
Attack.prototype.GetAttackEffectsData = function(type, splash)
{
let tp = this.template[type];
let template = this.template[type];
if (splash)
tp = tp.Splash;
return Attacking.GetAttackEffectsData("Attack/" + type + splash ? "/Splash" : "", tp, this.entity);
template = template.Splash;
return Attacking.GetAttackEffectsData("Attack/" + type + (splash ? "/Splash" : ""), template, this.entity);
};
/**

2
binaries/data/mods/public/simulation/data/auras/units/catafalques/maur_catafalque_2.json
View File

@ -2,7 +2,7 @@
"type": "global",
"affects": ["Soldier"],
"modifications": [
{ "value": "Attack/Capture/Value", "multiply": 1.15 }
{ "value": "Attack/Capture/Capture", "multiply": 1.15 }
],
"auraName": "Vamba Moriyar",
"auraDescription": "Bindusara is said to have conquered lands to the south of the empire.\nSoldiers +15% capture attack strength."

2
binaries/data/mods/public/simulation/data/auras/units/heroes/brit_hero_boudicca.json
View File

@ -10,7 +10,7 @@
{ "value": "Attack/Ranged/Damage/Hack", "multiply": 1.2 },
{ "value": "Attack/Ranged/Damage/Pierce", "multiply": 1.2 },
{ "value": "Attack/Ranged/Damage/Crush", "multiply": 1.2 },
{ "value": "Attack/Capture/Value", "add": 2 }
{ "value": "Attack/Capture/Capture", "add": 2 }
],
"auraName": "Champion Army",
"auraDescription": "+20% attack, +2 capture and +10% speed for champion units.",

2
binaries/data/mods/public/simulation/data/auras/units/heroes/cart_hero_hannibal.json
View File

@ -10,7 +10,7 @@
{ "value": "Attack/Ranged/Damage/Hack", "multiply": 1.20 },
{ "value": "Attack/Ranged/Damage/Pierce", "multiply": 1.20 },
{ "value": "Attack/Ranged/Damage/Crush", "multiply": 1.20 },
{ "value": "Attack/Capture/Value", "add": 1 }
{ "value": "Attack/Capture/Capture", "add": 1 }
],
"auraName": "Tactician",
"auraDescription": "+20% attack and +1 capture for nearby allied soldiers and siege engines.",

2
binaries/data/mods/public/simulation/data/auras/units/heroes/gaul_hero_vercingetorix.json
View File

@ -9,7 +9,7 @@
{ "value": "Attack/Ranged/Damage/Hack", "multiply": 1.20 },
{ "value": "Attack/Ranged/Damage/Pierce", "multiply": 1.20 },
{ "value": "Attack/Ranged/Damage/Crush", "multiply": 1.20 },
{ "value": "Attack/Capture/Value", "add": 1 }
{ "value": "Attack/Capture/Capture", "add": 1 }
],
"auraName": "Celtic Warlord",
"auraDescription": "+20% attack and +1 capture for soldiers and siege engines.",

2
binaries/data/mods/public/simulation/data/auras/units/heroes/kush_hero_amanirenas.json
View File

@ -9,7 +9,7 @@
{ "value": "Attack/Ranged/Damage/Hack", "multiply": 1.2 },
{ "value": "Attack/Ranged/Damage/Pierce", "multiply": 1.2 },
{ "value": "Attack/Ranged/Damage/Crush", "multiply": 1.2 },
{ "value": "Attack/Capture/Value", "add": 2 }
{ "value": "Attack/Capture/Capture", "add": 2 }
],
"auraName": "Warrior Queen",
"auraDescription": "+20% attack and +2 capture for champion units.",

2
binaries/data/mods/public/simulation/data/auras/units/heroes/mace_hero_craterus.json
View File

@ -6,7 +6,7 @@
{ "value": "Attack/Melee/Damage/Hack", "multiply": 1.2 },
{ "value": "Attack/Melee/Damage/Pierce", "multiply": 1.2 },
{ "value": "Attack/Melee/Damage/Crush", "multiply": 1.2 },
{ "value": "Attack/Capture/Value", "multiply": 1.2 }
{ "value": "Attack/Capture/Capture", "multiply": 1.2 }
],
"auraName": "Taxiarchès",
"auraDescription": "+20% attack and +20% capture for pikemen.",

2
binaries/data/mods/public/simulation/data/auras/units/heroes/mace_hero_philip.json
View File

@ -9,7 +9,7 @@
{ "value": "Attack/Ranged/Damage/Hack", "multiply": 1.2 },
{ "value": "Attack/Ranged/Damage/Pierce", "multiply": 1.2 },
{ "value": "Attack/Ranged/Damage/Crush", "multiply": 1.2 },
{ "value": "Attack/Capture/Value", "add": 2 }
{ "value": "Attack/Capture/Capture", "add": 2 }
],
"auraName": "Rise of Macedon",
"auraDescription": "+20% attack and +2 capture for champion units.",

2
binaries/data/mods/public/simulation/data/auras/units/heroes/pers_hero_cyrus.json
View File

@ -9,7 +9,7 @@
{ "value": "Attack/Ranged/Damage/Hack", "multiply": 1.2 },
{ "value": "Attack/Ranged/Damage/Pierce", "multiply": 1.2 },
{ "value": "Attack/Ranged/Damage/Crush", "multiply": 1.2 },
{ "value": "Attack/Capture/Value", "add": 1 }
{ "value": "Attack/Capture/Capture", "add": 1 }
],
"auraName": "Forefront Leader",
"auraDescription": "+20% attack and +1 capture for cavalry.",

2
binaries/data/mods/public/simulation/data/auras/units/heroes/rome_hero_scipio.json
View File

@ -9,7 +9,7 @@
{ "value": "Attack/Ranged/Damage/Hack", "multiply": 1.2 },
{ "value": "Attack/Ranged/Damage/Pierce", "multiply": 1.2 },
{ "value": "Attack/Ranged/Damage/Crush", "multiply": 1.2 },
{ "value": "Attack/Capture/Value", "add": 2 }
{ "value": "Attack/Capture/Capture", "add": 2 }
],
"auraName": "Triumph",
"auraDescription": "+20% attack and +2 capture for soldiers and siege engines.",

2
binaries/data/mods/public/simulation/data/auras/units/heroes/spart_hero_leonidas.json
View File

@ -6,7 +6,7 @@
{ "value": "Attack/Melee/Damage/Hack", "multiply": 1.25 },
{ "value": "Attack/Melee/Damage/Pierce", "multiply": 1.25 },
{ "value": "Attack/Melee/Damage/Crush", "multiply": 1.25 },
{ "value": "Attack/Capture/Value", "add": 1 }
{ "value": "Attack/Capture/Capture", "add": 1 }
],
"auraName": "Last Stand",
"auraDescription": "+25% attack and +1 capture for spear soldiers.",

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

@ -7,7 +7,7 @@
{ "value": "Armour/Hack", "add": 1 },
{ "value": "Armour/Pierce", "add": 1 },
{ "value": "Armour/Crush", "add": 1 },
{ "value": "Attack/Capture/Value", "add": 0.4 },
{ "value": "Attack/Capture/Capture", "add": 0.4 },
{ "value": "ResourceGatherer/BaseSpeed", "multiply": 0.5 },
{ "value": "UnitMotion/WalkSpeed", "add": 0.5, "affects": "Infantry" },
{ "value": "UnitMotion/WalkSpeed", "add": 1, "affects": "Cavalry" },

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

@ -7,7 +7,7 @@
{ "value": "Armour/Hack", "add": 1 },
{ "value": "Armour/Pierce", "add": 1 },
{ "value": "Armour/Crush", "add": 1 },
{ "value": "Attack/Capture/Value", "add": 0.4 },
{ "value": "Attack/Capture/Capture", "add": 0.4 },
{ "value": "ResourceGatherer/BaseSpeed", "multiply": 0.5 },
{ "value": "UnitMotion/WalkSpeed", "add": 0.5, "affects": "Infantry" },
{ "value": "UnitMotion/WalkSpeed", "add": 1, "affects": "Cavalry" },