-fixed stun grenade dmg

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@271 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
MaddMugsy
2006-06-19 23:11:10 +00:00
parent 3d3c6afd32
commit d9f049de49
2 changed files with 7 additions and 3 deletions
+2 -2
View File
@@ -23,12 +23,12 @@ INT16 zVersionLabel[256] = { L"Beta v. 0.98" };
#else
//RELEASE BUILD VERSION
INT16 zVersionLabel[256] = { L"Release v1.13.261" };
INT16 zVersionLabel[256] = { L"Release v1.13.262" };
#endif
INT8 czVersionNumber[16] = { "Build 06.06.17" };
INT8 czVersionNumber[16] = { "Build 06.06.19" };
INT16 zTrackingNumber[16] = { L"Z" };
+5 -1
View File
@@ -1574,14 +1574,18 @@ BOOLEAN ExpAffect( INT16 sBombGridNo, INT16 sGridNo, UINT32 uiDist, UINT16 usIte
// Calculate wound amount
sWoundAmt = pExplosive->ubDamage + (INT16) ( (pExplosive->ubDamage * uiRoll) / 100 );
DebugMsg(TOPIC_JA2,DBG_LEVEL_3,String("ExpAffect: explosive dmg = %d, woundamt = %d",pExplosive->ubDamage,sWoundAmt));
sWoundAmt = min(255, (UINT16)( (sWoundAmt) + ( (double)sWoundAmt / 100) * gGameExternalOptions.ubExplosivesDamageMultiplier ) ); //lal
DebugMsg(TOPIC_JA2,DBG_LEVEL_3,String("ExpAffect: explosive dmg multiplier = %d, woundamt = %d",gGameExternalOptions.ubExplosivesDamageMultiplier,sWoundAmt));
// Calculate breath amount ( if stun damage applicable )
sBreathAmt = ( pExplosive->ubStunDamage * 100 ) + (INT16) ( ( ( pExplosive->ubStunDamage / 2 ) * 100 * uiRoll ) / 100 ) ;
DebugMsg(TOPIC_JA2,DBG_LEVEL_3,String("ExpAffect: breath dmg = %d, breathamt = %d",pExplosive->ubStunDamage,sBreathAmt));
sBreathAmt = min(255, (UINT16)( (sBreathAmt) + ( (double)sBreathAmt / 100) * gGameExternalOptions.ubExplosivesDamageMultiplier ) ); //lal
sBreathAmt = (UINT16)( (sBreathAmt) + ( (double)sBreathAmt / 100) * gGameExternalOptions.ubExplosivesDamageMultiplier ) ; //lal //Madd: remove 255 max, since it was making breath damage next to nothing
DebugMsg(TOPIC_JA2,DBG_LEVEL_3,String("ExpAffect: breath dmg multiplier = %d, breathamt = %d",gGameExternalOptions.ubExplosivesDamageMultiplier,sBreathAmt));
// ATE: Make sure guys get pissed at us!
HandleBuldingDestruction( sGridNo ,ubOwner );