Make a few shield tweaks

Warzone2100 · Oct 28, 2024 · 3b54ccc · 3b54ccc
1 parent e1d4439
commit 3b54ccc
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/data/base/audio/audio.json b/data/base/audio/audio.json
@@ -451,7 +451,7 @@
             { "fileName": "scream2.ogg", "loop": false, "range": 1800, "volume": 100 },
             { "fileName": "scream3.ogg", "loop": false, "range": 1800, "volume": 100 },
             { "fileName": "silence.ogg", "loop": false, "range": 1800, "volume": 100 },
-            { "fileName": "shield-hit.ogg", "loop": false, "range": 1800, "volume": 100 }
+            { "fileName": "shield-hit.ogg", "loop": false, "range": 1800, "volume": 70 }
         ]
     },
     "Extra": {

diff --git a/src/combat.cpp b/src/combat.cpp
@@ -518,11 +518,17 @@ int32_t objDamage(BASE_OBJECT *psObj, unsigned damage, unsigned originalhp, WEAP
 			{
 				actualDamage -= psDroid->shieldPoints;
 				psDroid->shieldPoints = 0;
+			}
+
+			if (psDroid->shieldPoints == 0) {
 				// shields are interrupted, wait for a while until regeneration starts again
 				psDroid->shieldInterruptRegenTime = psDroid->time;
 			}
 
-			if (PERCENT(psDroid->shieldPoints, droidGetMaxShieldPoints(psDroid)) > 25) {
+			if (weaponSubClass != WSC_FLAME &&
+				weaponSubClass != WSC_COMMAND &&
+				PERCENT(psDroid->shieldPoints, droidGetMaxShieldPoints(psDroid)) > 25) 
+			{
 				Vector3i dv;
 				dv.y = psDroid->pos.z;
 				dv.y += (psDroid->sDisplay.imd->max.y * 2);