Index: ps/trunk/binaries/data/mods/public/simulation/components/Damage.js =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/components/Damage.js +++ ps/trunk/binaries/data/mods/public/simulation/components/Damage.js @@ -113,7 +113,7 @@ // Do this first in case the direct hit kills the target if (data.isSplash) { - this.CauseSplashDamage({ + this.CauseDamageOverArea({ "attacker": data.attacker, "origin": Vector2D.from3D(data.position), "radius": data.radius, @@ -184,7 +184,7 @@ * @param {Object} data.splashBonus - The attack bonus template from the attacker. * @param {number[]} data.playersToDamage - The array of player id's to damage. */ -Damage.prototype.CauseSplashDamage = function(data) +Damage.prototype.CauseDamageOverArea = function(data) { // Get nearby entities and define variables let nearEnts = this.EntitiesNearPoint(data.origin, data.radius, data.playersToDamage); Index: ps/trunk/binaries/data/mods/public/simulation/components/DeathDamage.js =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/components/DeathDamage.js +++ ps/trunk/binaries/data/mods/public/simulation/components/DeathDamage.js @@ -79,7 +79,7 @@ let radius = ApplyValueModificationsToEntity("DeathDamage/Range", +this.template.Range, this.entity); - cmpDamage.CauseSplashDamage({ + cmpDamage.CauseDamageOverArea({ "attacker": this.entity, "origin": pos, "radius": radius, Index: ps/trunk/binaries/data/mods/public/simulation/components/tests/test_Damage.js =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/components/tests/test_Damage.js +++ ps/trunk/binaries/data/mods/public/simulation/components/tests/test_Damage.js @@ -212,7 +212,7 @@ } }); - cmpDamage.CauseSplashDamage(data); + cmpDamage.CauseDamageOverArea(data); TS_ASSERT(hitEnts.has(60)); TS_ASSERT(hitEnts.has(61)); TS_ASSERT(hitEnts.has(62)); @@ -228,7 +228,7 @@ } }); - cmpDamage.CauseSplashDamage(data); + cmpDamage.CauseDamageOverArea(data); TS_ASSERT(hitEnts.has(60)); TS_ASSERT(hitEnts.has(61)); TS_ASSERT(hitEnts.has(62)); @@ -310,7 +310,7 @@ } }); - cmpDamage.CauseSplashDamage({ + cmpDamage.CauseDamageOverArea({ "attacker": 50, "origin": new Vector2D(3, 4), "radius": radius, Index: ps/trunk/binaries/data/mods/public/simulation/components/tests/test_DeathDamage.js =================================================================== --- ps/trunk/binaries/data/mods/public/simulation/components/tests/test_DeathDamage.js +++ ps/trunk/binaries/data/mods/public/simulation/components/tests/test_DeathDamage.js @@ -52,7 +52,7 @@ }; AddMock(SYSTEM_ENTITY, IID_Damage, { - "CauseSplashDamage": data => TS_ASSERT_UNEVAL_EQUALS(data, result), + "CauseDamageOverArea": data => TS_ASSERT_UNEVAL_EQUALS(data, result), "GetPlayersToDamage": (owner, friendlyFire) => playersToDamage });