Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix pulp acid-filled corpses #76262

Merged
merged 1 commit into from
Sep 8, 2024
Merged

Fix pulp acid-filled corpses #76262

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/activity_actor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8023,7 +8023,7 @@ void pulp_activity_actor::do_turn( player_activity &act, Character &you )
const mtype *corpse_mtype = corpse.get_mtype();
const bool acid_immune = you.is_immune_damage( damage_acid ) ||
you.is_immune_field( fd_acid );
if( corpse_mtype->bloodType().obj().has_acid && ( !acid_immune || !pulp_acid ) ) {
if( !pulp_acid && corpse_mtype->bloodType().obj().has_acid && !acid_immune ) {
//don't smash acid zombies when auto pulping unprotected
continue;
}
Expand Down
4 changes: 2 additions & 2 deletions src/game.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10931,11 +10931,11 @@ point game::place_player( const tripoint &dest_loc, bool quick )
}
}
if( !places.empty() ) {
u.assign_activity( pulp_activity_actor( places, true ) );
u.assign_activity( pulp_activity_actor( places ) );
}
} else {
if( corpse_available( u.pos_bub() ) ) {
u.assign_activity( pulp_activity_actor( m.getglobal( u.pos_bub() ), true ) );
u.assign_activity( pulp_activity_actor( m.getglobal( u.pos_bub() ) ) );
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/handle_action.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -974,7 +974,7 @@ static void smash()
}

if( should_pulp ) {
player_character.assign_activity( pulp_activity_actor( here.getglobal( smashp ) ) );
player_character.assign_activity( pulp_activity_actor( here.getglobal( smashp ), true ) );
return; // don't smash terrain if we've smashed a corpse
}

Expand Down
Loading