dallasgroot/0ad
1
0
Fork 0
mirror of https://gitea.wildfiregames.com/0ad/0ad synced 2026-08-15 14:43:32 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Add support for throwing multiple projectils

Browse source 
Fixes #8918
This commit is contained in:
Atrik 2026-05-18 15:39:24 +02:00 committed by wowgetoffyourcellphone
parent 63b4b35bd3
commit ec00288b36
1 changed files with 51 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

74
binaries/data/mods/public/simulation/components/Attack.js
View file

@ -179,6 +179,11 @@ Attack.prototype.Schema =
"<ref name='nonNegativeDecimal'/>" + "<ref name='nonNegativeDecimal'/>" +
"</element>" + "</element>" +
"<element name='FriendlyFire' a:help='Whether stray missiles can hurt non enemy units.'><data type='boolean'/></element>" + "<element name='FriendlyFire' a:help='Whether stray missiles can hurt non enemy units.'><data type='boolean'/></element>" +
"<optional>" +
"<element name='Count' a:help='Number of projectiles to fire at once.'>" +
"<data type='positiveInteger'/>" +
"</element>" +
"</optional>" +
"<optional>" + "<optional>" +
"<element name='LaunchPoint' a:help='Delta from the unit position where to launch the projectile.'>" + "<element name='LaunchPoint' a:help='Delta from the unit position where to launch the projectile.'>" +
"<attribute name='y'>" + "<attribute name='y'>" +
@ -660,7 +665,7 @@ Attack.prototype.PerformAttack = function(type, target)
"target": target, "target": target,
}; };
let delay = +(this.template[type].EffectDelay || 0); const delay = +(this.template[type].EffectDelay || 0);
if (this.template[type].Projectile) if (this.template[type].Projectile)
{ {
@ -679,7 +684,7 @@ Attack.prototype.PerformAttack = function(type, target)
// of the last turn. We compute the time till an arrow will intersect the target. // of the last turn. We compute the time till an arrow will intersect the target.
const targetVelocity = Vector3D.sub(targetPosition, cmpTargetPosition.GetPreviousPosition()).div(turnLength); const targetVelocity = Vector3D.sub(targetPosition, cmpTargetPosition.GetPreviousPosition()).div(turnLength);
let timeToTarget = PositionHelper.PredictTimeToTarget(selfPosition, horizSpeed, targetPosition, targetVelocity); const timeToTarget = PositionHelper.PredictTimeToTarget(selfPosition, horizSpeed, targetPosition, targetVelocity);
// 'Cheat' and use UnitMotion to predict the position in the near-future. // 'Cheat' and use UnitMotion to predict the position in the near-future.
// This avoids 'dancing' issues with units zigzagging over very short distances. // This avoids 'dancing' issues with units zigzagging over very short distances.
@ -714,18 +719,6 @@ Attack.prototype.PerformAttack = function(type, target)
const distanceModifiedSpread = ApplyValueModificationsToEntity("Attack/" + type + "/Projectile/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; predictedPosition.horizDistanceTo(selfPosition) / 100;
const randNorm = randomNormal2D();
const offsetX = randNorm[0] * distanceModifiedSpread;
const offsetZ = randNorm[1] * distanceModifiedSpread;
data.position = new Vector3D(predictedPosition.x + offsetX, predictedHeight, predictedPosition.z + offsetZ);
const realHorizDistance = data.position.horizDistanceTo(selfPosition);
timeToTarget = realHorizDistance / horizSpeed;
delay += timeToTarget * 1000;
data.direction = Vector3D.sub(data.position, selfPosition).div(realHorizDistance);
let actorName = this.template[type].Projectile.ActorName || ""; let actorName = this.template[type].Projectile.ActorName || "";
const impactActorName = this.template[type].Projectile.ImpactActorName || ""; const impactActorName = this.template[type].Projectile.ImpactActorName || "";
const impactAnimationLifetime = this.template[type].Projectile.ImpactAnimationLifetime || 0; const impactAnimationLifetime = this.template[type].Projectile.ImpactAnimationLifetime || 0;
@ -748,18 +741,53 @@ Attack.prototype.PerformAttack = function(type, target)
} }
const cmpProjectileManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_ProjectileManager); const cmpProjectileManager = Engine.QueryInterface(SYSTEM_ENTITY, IID_ProjectileManager);
data.projectileId = cmpProjectileManager.LaunchProjectileAtPoint(launchPoint, data.position, horizSpeed, gravity, actorName, impactActorName, impactAnimationLifetime);
const cmpSound = Engine.QueryInterface(this.entity, IID_Sound); const cmpSound = Engine.QueryInterface(this.entity, IID_Sound);
data.attackImpactSound = cmpSound ? cmpSound.GetSoundGroup("attack_impact_" + type.toLowerCase()) : ""; const attackImpactSound = cmpSound ? cmpSound.GetSoundGroup("attack_impact_" + type.toLowerCase()) : "";
const friendlyFire = this.template[type].Projectile.FriendlyFire == "true";
const count = Math.max(1, Math.floor(
ApplyValueModificationsToEntity(
"Attack/" + type + "/Projectile/Count",
this.template[type].Projectile.Count ? +this.template[type].Projectile.Count : 1,
this.entity
)
));
data.friendlyFire = this.template[type].Projectile.FriendlyFire == "true"; for (let i = 0; i < count; ++i)
} {
else const randNorm = randomNormal2D();
{ const offsetX = randNorm[0] * distanceModifiedSpread;
data.position = targetPosition; const offsetZ = randNorm[1] * distanceModifiedSpread;
data.direction = Vector3D.sub(targetPosition, selfPosition);
const projectileData = {
"type": type,
"attackData": this.GetAttackEffectsData(type),
"splash": this.GetSplashData(type),
"attacker": this.entity,
"attackerOwner": attackerOwner,
"target": target,
"position": new Vector3D(predictedPosition.x + offsetX, predictedHeight, predictedPosition.z + offsetZ),
"friendlyFire": friendlyFire,
"attackImpactSound": attackImpactSound
};
const realHorizDistance = projectileData.position.horizDistanceTo(selfPosition);
const projectileTimeToTarget = realHorizDistance / horizSpeed;
const projectileDelay = delay + projectileTimeToTarget * 1000;
projectileData.direction = Vector3D.sub(projectileData.position, selfPosition).div(realHorizDistance);
projectileData.projectileId = cmpProjectileManager.LaunchProjectileAtPoint(launchPoint, projectileData.position, horizSpeed, gravity, actorName, impactActorName, impactAnimationLifetime);
if (projectileDelay)
cmpTimer.SetTimeout(SYSTEM_ENTITY, IID_DelayedDamage, "Hit", projectileDelay, projectileData);
else
Engine.QueryInterface(SYSTEM_ENTITY, IID_DelayedDamage).Hit(projectileData, 0);
}
return;
} }
data.position = targetPosition;
data.direction = Vector3D.sub(targetPosition, selfPosition);
if (delay) if (delay)
{ {
const cmpTimer = Engine.QueryInterface(SYSTEM_ENTITY, IID_Timer); const cmpTimer = Engine.QueryInterface(SYSTEM_ENTITY, IID_Timer);