Make fireWeaponAtLoc() use a different player in campaign.

So the lassat in Gamma can damage player droids. Also make campaign lassat more powerful.
Warzone2100 · Feb 11, 2018 · 00731ba · 00731ba
1 parent 21ad2f9
commit 00731ba
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/data/base/stats/weapons.json b/data/base/stats/weapons.json
@@ -1393,9 +1393,9 @@
         "muzzleGfx": "FXHBLas.PIE",
         "name": "LasSat",
         "numExplosions": 1,
-        "periodicalDamage": 360,
-        "periodicalDamageRadius": 384,
-        "periodicalDamageTime": 45,
+        "periodicalDamage": 380,
+        "periodicalDamageRadius": 425,
+        "periodicalDamageTime": 50,
         "radius": 256,
         "radiusDamage": 3000,
         "rotate": 180,

diff --git a/src/qtscriptfuncs.cpp b/src/qtscriptfuncs.cpp
@@ -4465,8 +4465,9 @@ static QScriptValue js_fireWeaponAtLoc(QScriptContext *context, QScriptEngine *)
 
 	WEAPON sWeapon;
 	sWeapon.nStat = weapon;
-	// send the projectile using the selectedPlayer so that it can always be seen
-	proj_SendProjectile(&sWeapon, nullptr, selectedPlayer, target, nullptr, true, 0);
+	// Send the projectile using the selectedPlayer so that it can always be seen.
+	// A player other than selectedPlayer is needed for the campaign lassat to damage player droids.
+	proj_SendProjectile(&sWeapon, nullptr, bMultiPlayer ? selectedPlayer : 8, target, nullptr, true, 0);
 	return QScriptValue();
 }