Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

When of the target is bigger than weapon damage the final damage is calculated as follows: damage / 3. It prevents situations when weapons with high ROF stop dealing any damage to their targets. 

This addresses bug #11191.

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4000 4a71c877-e1ca-e34f-864e-861f7616d084
master
Roman C 2008-03-10 17:38:11 +00:00
parent c4a62d5139
commit 5d2c9bb3ae
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/droid.c
View File

@ -147,10 +147,9 @@ BOOL droidInit(void)
*/
float droidDamage(DROID *psDroid, UDWORD damage, UDWORD weaponClass, UDWORD weaponSubClass, HIT_SIDE impactSide)
{
// Do at least one point of damage
unsigned int actualDamage = 1, armour;
float originalBody = psDroid->originalBody;
float body = psDroid->body;
UDWORD actualDamage, armour, level;
float originalBody = psDroid->originalBody;
float body = psDroid->body;
SECONDARY_STATE state;
CHECK_DROID(psDroid);
@ -202,21 +201,19 @@ float droidDamage(DROID *psDroid, UDWORD damage, UDWORD weaponClass, UDWORD weap
clustObjectAttacked((BASE_OBJECT *)psDroid);
// If the shell penetrated the armour work out how much damage it actually did
if (damage > armour)
{
unsigned int level;
actualDamage = damage - armour;
// Retrieve highest, applicable, experience level
level = getDroidEffectiveLevel(psDroid);
// Retrieve highest, applicable, experience level
level = getDroidEffectiveLevel(psDroid);
// Apply droid/commander experience to the droid damage
actualDamage = (damage * (100 - EXP_REDUCE_DAMAGE * level)) / 100;
// Reduce damage taken by EXP_REDUCE_DAMAGE % for each experience level
actualDamage = (actualDamage * (100 - EXP_REDUCE_DAMAGE * level)) / 100;
// Calculate final damage
actualDamage = (UDWORD)MAX((SDWORD)(actualDamage - armour), (SDWORD)(actualDamage / 3));
// Make sure we substract at least MIN_WEAPON_DAMAGE points from the target hp
actualDamage = MAX(actualDamage, MIN_WEAPON_DAMAGE);
debug( LOG_ATTACK, " penetrated: %d\n", actualDamage);
}
// If the shell did sufficient damage to destroy the droid, deal with it and return
if (actualDamage >= psDroid->body)

3
src/droid.h
View File

@ -542,4 +542,7 @@ do { \
assert(droid->psActionTarget[i]->direction >= 0.0f); \
} while (0)
// Minimum damage a weapon will deal to its target
#define MIN_WEAPON_DAMAGE 1
#endif