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

[Fix] Code inconsistency in Attack.js for range accuracy

Browse Source 
The proper schema is:

Attack/Ranged/Projectile/Spread

Fixes this oversight in Attack.js and adjusts the relevant technologies and trigger.
This commit is contained in:
Justus Avramenko 2024-08-31 20:03:35 -04:00 committed by wowgetoffyourcellphone
parent ea4b580527
commit b626bb7eae
6 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
binaries/data/mods/public/maps/scenarios/unit_dancing_test_triggers.js
View File

@ -356,7 +356,7 @@ Trigger.prototype.RemoveSpread = function()
{
let cmpModifiersManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_ModifiersManager);
cmpModifiersManager.AddModifiers("no_promotion", {
"Attack/Ranged/Spread": [{ "affects": ["Unit"], "replace": 0 }],
"Attack/Ranged/Projectile/Spread": [{ "affects": ["Unit"], "replace": 0 }],
}, 4); // player 2 is ent 4
};

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

@ -674,7 +674,7 @@ Attack.prototype.PerformAttack = function(type, target)
let predictedHeight = cmpTargetPosition.GetHeightAt(predictedPosition.x, predictedPosition.z);
// Add inaccuracy based on spread.
let distanceModifiedSpread = ApplyValueModificationsToEntity("Attack/" + type + "/Spread", +this.template[type].Projectile.Spread, this.entity) *
const distanceModifiedSpread = ApplyValueModificationsToEntity("Attack/" + type + "/Projectile/Spread", +this.template[type].Projectile.Spread, this.entity) *
predictedPosition.horizDistanceTo(selfPosition) / 100;
let randNorm = randomNormal2D();

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

@ -20,7 +20,7 @@
"researchTime": 40,
"tooltip": "Archers −20% ranged attack spread.",
"modifications": [
{ "value": "Attack/Ranged/Spread", "multiply": 0.8 }
{ "value": "Attack/Ranged/Projectile/Spread", "multiply": 0.8 }
],
"affects": ["Archer"],
"soundComplete": "interface/alarm/alarm_upgradearmory.xml"

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

@ -22,7 +22,7 @@
"researchTime": 40,
"tooltip": "Bolt Shooters −20% ranged attack spread.",
"modifications": [
{ "value": "Attack/Ranged/Spread", "multiply": 0.8 }
{ "value": "Attack/Ranged/Projectile/Spread", "multiply": 0.8 }
],
"affects": ["BoltShooter"],
"soundComplete": "interface/alarm/alarm_upgradearmory.xml"

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

@ -7,7 +7,7 @@
{ "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": "Attack/Ranged/Spread", "multiply": 0.8, "affects": "Ranged" },
{ "value": "Attack/Ranged/Projectile/Spread", "multiply": 0.8, "affects": "Ranged" },
{ "value": "Cost/BuildTime", "multiply": 1.2 },
{ "value": "Health/Max", "multiply": 1.25 },
{ "value": "Heal/Range", "add": 3, "affects": "Healer" },

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

@ -7,7 +7,7 @@
{ "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": "Attack/Ranged/Spread", "multiply": 0.8, "affects": "Ranged" },
{ "value": "Attack/Ranged/Projectile/Spread", "multiply": 0.8, "affects": "Ranged" },
{ "value": "Cost/BuildTime", "multiply": 1.2 },
{ "value": "Health/Max", "multiply": 1.25 },
{ "value": "Heal/Range", "add": 3, "affects": "Healer" },