Allow EMP weapon subclasses to do actual damage

Also create a new stat "empRadius" to set the EMP blast radius instead of being reliant on "radius" which is for splash damage. The EMP radius will only determine the area where the EMP effect will take place.
Warzone2100 · Aug 27, 2023 · fa72ffe · fa72ffe
1 parent f410d02
commit fa72ffe
Show file tree

Hide file tree

Showing 14 changed files with 136 additions and 102 deletions.
diff --git a/data/mp/stats/weapons.json b/data/mp/stats/weapons.json
@@ -641,8 +641,10 @@
 	"Bomb6-VTOL-EMP": {
 		"buildPoints": 1000,
 		"buildPower": 225,
+		"damage": 200,
 		"designable": 1,
 		"effectSize": 100,
+		"empRadius": 512,
 		"facePlayer": 1,
 		"firePause": 10,
 		"flightGfx": "FXLBMBE2.PIE",
@@ -662,7 +664,8 @@
 		"name": "VTOL EMP Missile Launcher",
 		"numAttackRuns": 1,
 		"numExplosions": 1,
-		"radius": 512,
+		"radius": 256,
+		"radiusDamage": 200,
 		"radiusLife": 10,
 		"recoilValue": 10,
 		"rotate": 180,
@@ -1867,6 +1870,7 @@
 		"damage": 70,
 		"designable": 1,
 		"effectSize": 100,
+		"empRadius": 192,
 		"facePlayer": 1,
 		"firePause": 130,
 		"flightGfx": "FXBeam.PIE",
@@ -1887,7 +1891,8 @@
 		"muzzleGfx": "FXHBLas.PIE",
 		"name": "EMP Cannon",
 		"numExplosions": 1,
-		"radius": 192,
+		"radius": 128,
+		"radiusDamage": 20,
 		"recoilValue": 150,
 		"rotate": 180,
 		"shortHit": 70,
@@ -3463,9 +3468,10 @@
 	"MortarEMP": {
 		"buildPoints": 1000,
 		"buildPower": 200,
-		"damage": 60,
+		"damage": 40,
 		"designable": 1,
 		"effectSize": 100,
+		"empRadius": 160,
 		"facePlayer": 1,
 		"fireOnMove": 0,
 		"firePause": 90,
@@ -3488,7 +3494,7 @@
 		"name": "EMP Mortar",
 		"numExplosions": 1,
 		"radius": 160,
-		"radiusDamage": 60,
+		"radiusDamage": 30,
 		"radiusLife": 10,
 		"recoilValue": 150,
 		"shortHit": 40,

diff --git a/src/combat.cpp b/src/combat.cpp
@@ -400,7 +400,7 @@ int objArmour(const BASE_OBJECT *psObj, WEAPON_CLASS weaponClass)
  * \param weaponSubClass the subclass of the weapon that deals the damage
  * \return < 0 when the dealt damage destroys the object, > 0 when the object survives
  */
-int32_t objDamage(BASE_OBJECT *psObj, unsigned damage, unsigned originalhp, WEAPON_CLASS weaponClass, WEAPON_SUBCLASS weaponSubClass, bool isDamagePerSecond, int minDamage)
+int32_t objDamage(BASE_OBJECT *psObj, unsigned damage, unsigned originalhp, WEAPON_CLASS weaponClass, WEAPON_SUBCLASS weaponSubClass, bool isDamagePerSecond, int minDamage, bool empRadiusHit)
 {
 	int level = 1;
 	int armour = objArmour(psObj, weaponClass);
@@ -415,8 +415,8 @@ int32_t objDamage(BASE_OBJECT *psObj, unsigned damage, unsigned originalhp, WEAP
 		psObj->lastHitWeapon = weaponSubClass;
 	}
 
-	// EMP cannons do no damage, if we are one return now
-	if (weaponSubClass == WSC_EMP)
+	// EMP weapon radius should not do actual damage
+	if (weaponSubClass == WSC_EMP && empRadiusHit)
 	{
 		return 0;
 	}
@@ -508,12 +508,6 @@ unsigned int objGuessFutureDamage(WEAPON_STATS *psStats, unsigned int player, BA
 
 	damage = calcDamage(weaponDamage(psStats, player), psStats->weaponEffect, psTarget);
 
-	// EMP cannons do no damage, if we are one return now
-	if (psStats->weaponSubClass == WSC_EMP)
-	{
-		return 0;
-	}
-
 	// apply game difficulty setting
 	damage = modifyForDifficultyLevel(damage, psTarget->player != selectedPlayer);
 	armour = objArmour(psTarget, psStats->weaponClass);

diff --git a/src/combat.h b/src/combat.h
@@ -33,7 +33,7 @@ bool combFire(WEAPON *psWeap, BASE_OBJECT *psAttacker, BASE_OBJECT *psTarget, in
 if any support a counter battery sensor*/
 void counterBatteryFire(BASE_OBJECT *psAttacker, BASE_OBJECT *psTarget);
 
-int32_t objDamage(BASE_OBJECT *psObj, unsigned damage, unsigned originalhp, WEAPON_CLASS weaponClass, WEAPON_SUBCLASS weaponSubClass, bool isDamagePerSecond, int minDamage);
+int32_t objDamage(BASE_OBJECT *psObj, unsigned damage, unsigned originalhp, WEAPON_CLASS weaponClass, WEAPON_SUBCLASS weaponSubClass, bool isDamagePerSecond, int minDamage, bool empRadiusHit);
 
 unsigned int objGuessFutureDamage(WEAPON_STATS *psStats, unsigned int player, BASE_OBJECT *psTarget);
 

diff --git a/src/droid.cpp b/src/droid.cpp
@@ -274,7 +274,7 @@ void addDroidDeathAnimationEffect(DROID *psDroid)
  * \return > 0 when the dealt damage destroys the droid, < 0 when the droid survives
  *
  */
-int32_t droidDamage(DROID *psDroid, unsigned damage, WEAPON_CLASS weaponClass, WEAPON_SUBCLASS weaponSubClass, unsigned impactTime, bool isDamagePerSecond, int minDamage)
+int32_t droidDamage(DROID *psDroid, unsigned damage, WEAPON_CLASS weaponClass, WEAPON_SUBCLASS weaponSubClass, unsigned impactTime, bool isDamagePerSecond, int minDamage, bool empRadiusHit)
 {
 	int32_t relativeDamage;
 
@@ -286,7 +286,7 @@ int32_t droidDamage(DROID *psDroid, unsigned damage, WEAPON_CLASS weaponClass, W
 		damage *= 3;
 	}
 
-	relativeDamage = objDamage(psDroid, damage, psDroid->originalBody, weaponClass, weaponSubClass, isDamagePerSecond, minDamage);
+	relativeDamage = objDamage(psDroid, damage, psDroid->originalBody, weaponClass, weaponSubClass, isDamagePerSecond, minDamage, empRadiusHit);
 
 	if (relativeDamage > 0)
 	{
@@ -862,7 +862,7 @@ void droidUpdate(DROID *psDroid)
 		else
 		{
 			// do hardcoded burn damage (this damage automatically applied after periodical damage finished)
-			droidDamage(psDroid, BURN_DAMAGE, WC_HEAT, WSC_FLAME, gameTime - deltaGameTime / 2 + 1, true, BURN_MIN_DAMAGE);
+			droidDamage(psDroid, BURN_DAMAGE, WC_HEAT, WSC_FLAME, gameTime - deltaGameTime / 2 + 1, true, BURN_MIN_DAMAGE, false);
 		}
 	}
 

diff --git a/src/droid.h b/src/droid.h
@@ -115,7 +115,7 @@ UDWORD calcTemplatePower(const DROID_TEMPLATE *psTemplate);
 bool idfDroid(DROID *psDroid);
 
 /* Do damage to a droid */
-int32_t droidDamage(DROID *psDroid, unsigned damage, WEAPON_CLASS weaponClass, WEAPON_SUBCLASS weaponSubClass, unsigned impactTime, bool isDamagePerSecond, int minDamage);
+int32_t droidDamage(DROID *psDroid, unsigned damage, WEAPON_CLASS weaponClass, WEAPON_SUBCLASS weaponSubClass, unsigned impactTime, bool isDamagePerSecond, int minDamage, bool empRadiusHit);
 
 /* The main update routine for all droids */
 void droidUpdate(DROID *psDroid);

diff --git a/src/feature.cpp b/src/feature.cpp
@@ -155,7 +155,7 @@ void featureStatsShutDown()
  *  \param weaponClass,weaponSubClass the class and subclass of the weapon that deals the damage
  *  \return < 0 never, >= 0 always
  */
-int32_t featureDamage(FEATURE *psFeature, unsigned damage, WEAPON_CLASS weaponClass, WEAPON_SUBCLASS weaponSubClass, unsigned impactTime, bool isDamagePerSecond, int minDamage)
+int32_t featureDamage(FEATURE *psFeature, unsigned damage, WEAPON_CLASS weaponClass, WEAPON_SUBCLASS weaponSubClass, unsigned impactTime, bool isDamagePerSecond, int minDamage, bool empRadiusHit)
 {
 	int32_t relativeDamage;
 
@@ -164,7 +164,7 @@ int32_t featureDamage(FEATURE *psFeature, unsigned damage, WEAPON_CLASS weaponCl
 	debug(LOG_ATTACK, "feature (id %d): body %d armour %d damage: %d",
 	      psFeature->id, psFeature->body, psFeature->psStats->armourValue, damage);
 
-	relativeDamage = objDamage(psFeature, damage, psFeature->psStats->body, weaponClass, weaponSubClass, isDamagePerSecond, minDamage);
+	relativeDamage = objDamage(psFeature, damage, psFeature->psStats->body, weaponClass, weaponSubClass, isDamagePerSecond, minDamage, empRadiusHit);
 
 	// If the shell did sufficient damage to destroy the feature
 	if (relativeDamage < 0)

diff --git a/src/feature.h b/src/feature.h
@@ -56,7 +56,7 @@ bool destroyFeature(FEATURE *psDel, unsigned impactTime);
 /* get a feature stat id from its name */
 SDWORD getFeatureStatFromName(const WzString &name);
 
-int32_t featureDamage(FEATURE *psFeature, unsigned damage, WEAPON_CLASS weaponClass, WEAPON_SUBCLASS weaponSubClass, unsigned impactTime, bool isDamagePerSecond, int minDamage);
+int32_t featureDamage(FEATURE *psFeature, unsigned damage, WEAPON_CLASS weaponClass, WEAPON_SUBCLASS weaponSubClass, unsigned impactTime, bool isDamagePerSecond, int minDamage, bool empRadiusHit);
 
 void featureInitVars();