Adding TTL to CWeapon

rts/Lua/LuaSyncedCtrl.cpp

@@ -2243,6 +2243,10 @@ static bool SetSingleUnitWeaponState(lua_State* L, CWeapon* weapon, int index)
 			weapon->collisionFlags = lua_toint(L, index + 1);
 		} break;
 
+		case hashString("ttl"): {
+			weapon->ttl = (int) (lua_toint(L, index + 1) * GAME_SPEED);
+		} break;
+
 		default: {
 			return false;
 		} break;

rts/Sim/Projectiles/WeaponProjectiles/StarburstProjectile.cpp

@@ -74,13 +74,13 @@ CStarburstProjectile::CStarburstProjectile(const ProjectileParams& params): CWea
 
 	if (weaponDef != nullptr) {
 		maxSpeed = weaponDef->projectilespeed;
-		ttl = weaponDef->flighttime;
+		ttl = params.ttl;
 
-		// Default uptime is -1. Positive values override the weapondef.
+		// Default uptime is -1. Positive values override the projectile params.
 		if (uptime < 0)
 			uptime = weaponDef->uptime * GAME_SPEED;
 
-		if (weaponDef->flighttime == 0)
+		if (ttl == 0)
 			ttl = std::min(3000.0f, uptime + myrange / maxSpeed + 100);
 	}
 

rts/Sim/Weapons/BombDropper.cpp

@@ -132,7 +132,7 @@ void CBombDropper::FireImpl(const bool scriptCall)
 		params.pos = weaponMuzzlePos;
 		params.end = currentTargetPos;
 		params.speed = launchSpeed;
-		params.ttl = (weaponDef->flighttime == 0)? ((range / projectileSpeed) + 15 + predict): weaponDef->flighttime;
+		params.ttl = (ttl == 0)? ((range / projectileSpeed) + 15 + predict): ttl;
 		params.tracking = tracking;
 
 		assert(weaponDef->projectileType == WEAPON_TORPEDO_PROJECTILE);

rts/Sim/Weapons/Cannon.cpp

@@ -110,27 +110,27 @@ void CCannon::FireImpl(const bool scriptCall)
 	launchDir += (gsRNG.NextVector() * SprayAngleExperience() + SalvoErrorExperience());
 	launchDir.SafeNormalize();
 
-	int ttl = 0;
+	int thisTtl = 0;
 	const float sqSpeed2D = launchDir.SqLength2D() * projectileSpeed * projectileSpeed;
 	const int predict = math::ceil((sqSpeed2D == 0.0f) ?
 		(-2.0f * projectileSpeed * launchDir.y / gravity):
 		math::sqrt(targetVec.SqLength2D() / sqSpeed2D));
 
-	if (weaponDef->flighttime > 0) {
-		ttl = weaponDef->flighttime;
+	if (ttl > 0) {
+		thisTtl = ttl;
 	} else if (weaponDef->selfExplode) {
-		ttl = (predict + gsRNG.NextFloat() * 2.5f - 0.5f);
+		thisTtl = (predict + gsRNG.NextFloat() * 2.5f - 0.5f);
 	} else if ((weaponDef->groundBounce || weaponDef->waterBounce) && weaponDef->numBounce > 0) {
-		ttl = (predict * (1 + weaponDef->numBounce * weaponDef->bounceRebound));
+		thisTtl = (predict * (1 + weaponDef->numBounce * weaponDef->bounceRebound));
 	} else {
-		ttl = predict * 2;
+		thisTtl = predict * 2;
 	}
 
 	ProjectileParams params = GetProjectileParams();
 	params.pos = weaponMuzzlePos;
 	params.end = currentTargetPos;
 	params.speed = launchDir * projectileSpeed;
-	params.ttl = ttl;
+	params.ttl = thisTtl;
 	params.gravity = gravity;
 
 	WeaponProjectileFactory::LoadProjectile(params);

rts/Sim/Weapons/EmgCannon.cpp

@@ -33,7 +33,7 @@ void CEmgCannon::FireImpl(const bool scriptCall)
 	ProjectileParams params = GetProjectileParams();
 	params.pos = weaponMuzzlePos;
 	params.speed = dir * projectileSpeed;
-	params.ttl = weaponDef->flighttime > 0 ? weaponDef->flighttime : math::ceil(std::max(dist, range) / projectileSpeed);
+	params.ttl = ttl > 0 ? ttl : math::ceil(std::max(dist, range) / projectileSpeed);
 
 	WeaponProjectileFactory::LoadProjectile(params);
 }

rts/Sim/Weapons/MissileLauncher.cpp

@@ -62,7 +62,7 @@ void CMissileLauncher::FireImpl(const bool scriptCall)
 	params.pos = weaponMuzzlePos;
 	params.end = currentTargetPos;
 	params.speed = startSpeed;
-	params.ttl = weaponDef->flighttime == 0? math::ceil(std::max(targetDist, range) / projectileSpeed + 25 * weaponDef->selfExplode): weaponDef->flighttime;
+	params.ttl = ttl == 0? math::ceil(std::max(targetDist, range) / projectileSpeed + 25 * weaponDef->selfExplode): ttl;
 	params.gravity = -weaponDef->myGravity;
 
 	WeaponProjectileFactory::LoadProjectile(params);

rts/Sim/Weapons/StarburstLauncher.cpp

@@ -39,9 +39,11 @@ void CStarburstLauncher::FireImpl(const bool scriptCall)
 	params.end = currentTargetPos;
 	params.speed = speed;
 	params.error = aimError;
-	params.ttl = 200; //???
+	// Projectile TTL (params.ttl) is ignored by the Starburst Projectile and it only uses the weapondef.
+	// I tried overriding the projectile TTL to 1 and it caused the starburst rocket to fly off into space
+	params.ttl = (ttl > 0) ? ttl: weaponDef->flighttime;
 	params.tracking = tracking;
-	params.maxRange = (weaponDef->flighttime > 0 || weaponDef->fixedLauncher)? MAX_PROJECTILE_RANGE: range;
+	params.maxRange = (ttl > 0 || weaponDef->fixedLauncher)? MAX_PROJECTILE_RANGE: range;
 
 	WeaponProjectileFactory::LoadProjectile(params);
 }

rts/Sim/Weapons/TorpedoLauncher.cpp

@@ -71,7 +71,7 @@ void CTorpedoLauncher::FireImpl(const bool scriptCall)
 	params.speed = vel;
 	params.pos = weaponMuzzlePos;
 	params.end = currentTargetPos;
-	params.ttl = (weaponDef->flighttime == 0)? math::ceil(std::max(dist, range) / projectileSpeed + 25): weaponDef->flighttime;
+	params.ttl = (ttl == 0)? math::ceil(std::max(dist, range) / projectileSpeed + 25): ttl;
 	params.tracking = tracking;
 
 	WeaponProjectileFactory::LoadProjectile(params);

rts/Sim/Weapons/Weapon.cpp

@@ -53,6 +53,7 @@ CR_REG_METADATA(CWeapon, (
 	CR_MEMBER(nextSalvo),
 	CR_MEMBER(salvoLeft),
 	CR_MEMBER(salvoWindup),
+	CR_MEMBER(ttl),
 
 	CR_MEMBER(range),
 	CR_MEMBER(projectileSpeed),
@@ -139,6 +140,7 @@ CWeapon::CWeapon(CUnit* owner, const WeaponDef* def):
 	nextSalvo(0),
 	salvoLeft(0),
 	salvoWindup(0),
+	ttl(1),
 
 	range(1.0f),
 	projectileSpeed(1.0f),

rts/Sim/Weapons/Weapon.h

@@ -151,6 +151,7 @@ class CWeapon : public CObject
 	int nextSalvo;                          // when the next shot in the current salvo will fire
 	int salvoLeft;                          // number of shots left in current salvo
 	int salvoWindup;                        // delay before first shot (in frames)
+	int ttl;                                // flight time for most projectile type weapons except for Starburst
 
 	float range;
 	float projectileSpeed;

rts/Sim/Weapons/WeaponLoader.cpp

@@ -190,5 +190,7 @@ void CWeaponLoader::InitWeapon(CUnit* owner, CWeapon* weapon, const UnitDefWeapo
 	weapon->fastAutoRetargeting = defWeapon->fastAutoRetargeting;
 	weapon->fastQueryPointUpdate = defWeapon->fastQueryPointUpdate;
 	weapon->burstControlWhenOutOfArc = defWeapon->burstControlWhenOutOfArc;
+
+	weapon->ttl = weaponDef->flighttime;
 }