eukara
/
fallout2-ce
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix several combat bugs 

- fixed crit misses becoming 0-damage crit hits;
- fixed wrong messages after " and ";
- fixed the silent death perk benefitting everyone but the player;
This commit is contained in:
Alexander Arkhipov 2022-12-05 20:29:10 +03:00
parent 3a541d4b67
commit fc18a4e7e2
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/combat.cc
View File

@ -3860,7 +3860,7 @@ static int attackCompute(Attack* attack)
if (perkHasRank(gDude, PERK_SILENT_DEATH)
&& !_is_hit_from_front(gDude, attack->defender)
&& dudeHasState(DUDE_STATE_SNEAKING)
&& gDude != attack->defender->data.critter.combat.whoHitMe) {
&& gDude == attack->defender->data.critter.combat.whoHitMe) {
damageMultiplier = 4;
}
@ -3905,7 +3905,7 @@ static int attackCompute(Attack* attack)
if (perkHasRank(gDude, PERK_SILENT_DEATH)
&& !_is_hit_from_front(gDude, attack->defender)
&& dudeHasState(DUDE_STATE_SNEAKING)
&& gDude != attack->defender->data.critter.combat.whoHitMe) {
&& gDude == attack->defender->data.critter.combat.whoHitMe) {
damageMultiplier *= 2;
}
}
@ -4167,7 +4167,7 @@ static int _attackFindInvalidFlags(Object* critter, Object* item)
// 0x4240DC
static int attackComputeCriticalFailure(Attack* attack)
{
attack->attackerFlags |= DAM_HIT;
attack->attackerFlags &= ~DAM_HIT;
if (attack->attacker != NULL && _critter_flag_check(attack->attacker->pid, CRITTER_INVULNERABLE)) {
return 0;
@ -4668,7 +4668,7 @@ void _apply_damage(Attack* attack, bool animated)
bool attackerIsCritter = attacker != NULL && FID_TYPE(attacker->fid) == OBJ_TYPE_CRITTER;
bool v5 = attack->defender != attack->oops;
if (attackerIsCritter && (attacker->data.critter.combat.results & DAM_DEAD) != 0) {
if (attackerIsCritter && (attacker->data.critter.combat.results & DAM_DEAD) == 0) {
_set_new_results(attacker, attack->attackerFlags);
// TODO: Not sure about "attack->defender == attack->oops".
_damage_object(attacker, attack->attackerDamage, animated, attack->defender == attack->oops, attacker);
@ -5297,7 +5297,7 @@ static void combatAddDamageFlagsDescription(char* dest, int flags, Object* critt
strcat(dest, messageListItem.text);
}
messageListItem.num = flagsList[flagsListLength - 1];
messageListItem.num = num + flagsList[flagsListLength - 1];
if (messageListGetItem(&gCombatMessageList, &messageListItem)) {
strcat(dest, messageListItem.text);
}