Differential D3113 Diff 15516 binaries/data/mods/public/simulation/components/DelayedDamage.js

Changeset View

Standalone View

binaries/data/mods/public/simulation/components/DelayedDamage.js

* @param {string} data.splash.shape - The shape of the splash range. * @param {string} data.splash.shape - The shape of the splash range.

* @param {Object} data.splash.attackData - same as attackData, for splash. * @param {Object} data.splash.attackData - same as attackData, for splash.

*/ */

DelayedDamage.prototype.MissileHit = function(data, lateness) DelayedDamage.prototype.MissileHit = function(data, lateness)

{ {

if (!data.position) if (!data.position)

return; return;

let cmpSoundManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_SoundManager);

if (cmpSoundManager && data.attackImpactSound)

cmpSoundManager.PlaySoundGroupAtPosition(data.attackImpactSound, data.position);

// Do this first in case the direct hit kills the target. // Do this first in case the direct hit kills the target.

if (data.splash) if (data.splash)

Attacking.CauseDamageOverArea({ Attacking.CauseDamageOverArea({

"type": data.type, "type": data.type,

"attackData": data.splash.attackData, "attackData": data.splash.attackData,

"attacker": data.attacker, "attacker": data.attacker,

"attackerOwner": data.attackerOwner, "attackerOwner": data.attackerOwner,

"origin": Vector2D.from3D(data.position), "origin": Vector2D.from3D(data.position),

"radius": data.splash.radius, "radius": data.splash.radius,

"shape": data.splash.shape, "shape": data.splash.shape,

"direction": data.direction, "direction": data.direction,

"friendlyFire": data.splash.friendlyFire "friendlyFire": data.splash.friendlyFire

}); });

let cmpProjectileManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_ProjectileManager); let cmpProjectileManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_ProjectileManager);

let target = data.target; let target = data.target;

// Since we can't damage mirages, replace a miraged target by the real target. // Since we can't damage mirages, replace a miraged target by the real target.

let cmpMirage = Engine.QueryInterface(data.target, IID_Mirage); let cmpMirage = Engine.QueryInterface(data.target, IID_Mirage);

if (cmpMirage) if (cmpMirage)

target = cmpMirage.GetParent(); target = cmpMirage.GetParent();

let hitTarget = PositionHelper.TestCollision(target, data.position, lateness) &&

SilierUnsubmitted

Done

let

Silier: let

FreagarachUnsubmitted

Done

You don't need the variable anymore :)

Freagarach: You don't need the variable anymore :)

Attacking.HandleAttackEffects(target, data.type, data.attackData, data.attacker, data.attackerOwner);

// Deal direct damage if we hit the main target // Deal direct damage if we hit the main target

// and we could handle the attack. // and we could handle the attack.

if (PositionHelper.TestCollision(target, data.position, lateness) && if (hitTarget)

FreagarachUnsubmitted

Not Done

If an entity is invulnerable, they will return false here, but not after playing the blocked sound.

Freagarach: If an entity is invulnerable, they will return false here, but not after playing the blocked…

Attacking.HandleAttackEffects(target, data.type, data.attackData, data.attacker, data.attackerOwner))

{ {

cmpProjectileManager.RemoveProjectile(data.projectileId); cmpProjectileManager.RemoveProjectile(data.projectileId);

SilierUnsubmitted

Done

space

Silier: space

this.PlayImpactSound(data.attacker, data.type, data.position, true);

return; return;

FreagarachUnsubmitted

Done

So, if we didn't hit the main target, but _did_ hit a secondary one, we'd still play a miss sound?

Freagarach: So, if we didn't hit the main target, but _did_ hit a secondary one, we'd still play a miss…

} }

// If we didn't hit the main target look for nearby units. // If we didn't hit the main target look for nearby units.

let ents = PositionHelper.EntitiesNearPoint(Vector2D.from3D(data.position), this.MISSILE_HIT_RADIUS, let ents = PositionHelper.EntitiesNearPoint(Vector2D.from3D(data.position), this.MISSILE_HIT_RADIUS,

Attacking.GetPlayersToDamage(data.attackerOwner, data.friendlyFire)); Attacking.GetPlayersToDamage(data.attackerOwner, data.friendlyFire));

let hitSideTarget = false;

for (let ent of ents) for (let ent of ents)

{ {

if (!PositionHelper.TestCollision(ent, data.position, lateness) || if (!PositionHelper.TestCollision(ent, data.position, lateness) ||

!Attacking.HandleAttackEffects(ent, data.type, data.attackData, data.attacker, data.attackerOwner)) !Attacking.HandleAttackEffects(ent, data.type, data.attackData, data.attacker, data.attackerOwner))

FreagarachUnsubmitted

Not Done

Then a second entity is tried to be hit here. (If it is invulnerable (or doesn't have cmpResistance, e.g. trees), it will play the blocked sound again.)

If it receives any effect, the impact sound is played.

Freagarach: Then a second entity is tried to be hit here. (If it is invulnerable (or doesn't have…

continue; continue;

cmpProjectileManager.RemoveProjectile(data.projectileId); cmpProjectileManager.RemoveProjectile(data.projectileId);

hitSideTarget = true;

FreagarachUnsubmitted

Done

cmpProjectileManager.RemoveProjectile(data.projectileId);

- hitSideTarget = true;

+ this.PlayImpactSound(data.attacker, data.type, data.position, true);

break;

Freagarach:

break; break;

} }

this.PlayImpactSound(data.attacker, data.type, data.position, hitSideTarget);

FreagarachUnsubmitted

Done

Check whether we hit something here and play the "missed" variant else.

Freagarach: Check whether we hit something here and play the "missed" variant else.

FreagarachUnsubmitted

Done

break;

}

- this.PlayImpactSound(data.attacker, data.type, data.position, hitSideTarget);

+ this.PlayImpactSound(data.attacker, data.type, data.position, false);

};

DelayedDamage.prototype.PlayImpactSound = function(attacker, type, position, hitTarget)

Freagarach:

}; };

DelayedDamage.prototype.PlayImpactSound = function(attacker, type, position, hitTarget)

FreagarachUnsubmitted

Done

According to the code below, this should be missed?

Freagarach: According to the code below, this should be `missed`?

StanAuthorUnsubmitted

Done

Well then I need to invert the boolean somewhere.

Stan: Well then I need to invert the boolean somewhere.

{

let cmpSound = Engine.QueryInterface(attacker, IID_Sound)

if (!cmpSound)

return;

let soundGroup = cmpSound.GetSoundGroup("attack_impact_" + type + (hitTarget ? "_missed" : ""));

FreagarachUnsubmitted

Done

if (hitTarget): attack_impact_" + type + "_missed"?
So I suggest using missed and having it default to false (and omit the booleans above).

(I would even find it nicer to have a seperate function for the two, but that is probably not desireable from a performance POV.)

Freagarach: `if (hitTarget): attack_impact_" + type + "_missed"`? So I suggest using `missed` and having it…

if (!soundGroup)

return;

let cmpSoundManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_SoundManager);

if (cmpSoundManager)

cmpSoundManager.PlaySoundGroupAtPosition(soundGroup, position);

}

Engine.RegisterSystemComponentType(IID_DelayedDamage, "DelayedDamage", DelayedDamage); Engine.RegisterSystemComponentType(IID_DelayedDamage, "DelayedDamage", DelayedDamage);