mirror/fallout1-ce
1
0
Fork 0
mirror of https://github.com/alexbatalov/fallout1-ce.git synced 2024-10-04 13:49:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Review pick_death

Browse Source 
Closes #44
This commit is contained in:
Alexander Batalov 2023-02-27 19:56:35 +03:00
parent 3a80ebadca
commit 6cb5ad2fdb
1 changed files with 25 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/game/actions.cc
View File

@ -189,28 +189,33 @@ static int pick_death(Object* attacker, Object* defender, int damage, int damage
} }
} }
if ((anim == ANIM_THROW_PUNCH if (anim == ANIM_THROW_PUNCH
|| anim == ANIM_KICK_LEG || anim == ANIM_KICK_LEG
|| anim == ANIM_THRUST_ANIM || anim == ANIM_THRUST_ANIM
|| anim == ANIM_SWING_ANIM || anim == ANIM_SWING_ANIM
|| anim == ANIM_THROW_ANIM) || anim == ANIM_THROW_ANIM) {
&& violence_level == VIOLENCE_LEVEL_MAXIMUM_BLOOD if (violence_level == VIOLENCE_LEVEL_MAXIMUM_BLOOD && has_bloody_mess) {
&& has_bloody_mess) { death_anim = ANIM_BIG_HOLE;
death_anim = ANIM_BIG_HOLE; } else {
} else if (anim == ANIM_FIRE_SINGLE death_anim = ANIM_FALL_BACK;
&& damage_type == DAMAGE_TYPE_NORMAL }
&& violence_level == VIOLENCE_LEVEL_MAXIMUM_BLOOD } else if (anim == ANIM_FIRE_SINGLE && damage_type == DAMAGE_TYPE_NORMAL) {
&& (has_bloody_mess || damage >= 45)) { if (violence_level == VIOLENCE_LEVEL_MAXIMUM_BLOOD && (has_bloody_mess || damage >= 45)) {
death_anim = ANIM_BIG_HOLE; death_anim = ANIM_BIG_HOLE;
} else if (violence_level > VIOLENCE_LEVEL_NORMAL && (has_bloody_mess || damage >= 45)) { } else {
death_anim = death_3[damage_type]; death_anim = ANIM_FALL_BACK;
if (check_death(defender, death_anim, VIOLENCE_LEVEL_MAXIMUM_BLOOD, hit_from_front) != death_anim) {
death_anim = death_2[damage_type];
} }
} else if (violence_level > VIOLENCE_LEVEL_MINIMAL && (has_bloody_mess || damage >= 15)) {
death_anim = death_2[damage_type];
} else { } else {
death_anim = ANIM_FALL_BACK; if (violence_level > VIOLENCE_LEVEL_NORMAL && (has_bloody_mess || damage >= 45)) {
death_anim = death_3[damage_type];
if (check_death(defender, death_anim, VIOLENCE_LEVEL_MAXIMUM_BLOOD, hit_from_front) != death_anim) {
death_anim = death_2[damage_type];
}
} else if (violence_level > VIOLENCE_LEVEL_MINIMAL && (has_bloody_mess || damage >= 15)) {
death_anim = death_2[damage_type];
} else {
death_anim = ANIM_FALL_BACK;
}
} }
if (!hit_from_front && death_anim == ANIM_FALL_BACK) { if (!hit_from_front && death_anim == ANIM_FALL_BACK) {