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

Remove morale penalty from dismemberment #79479

Merged
merged 8 commits into from
Feb 3, 2025
+5 −8
Merged

Remove morale penalty from dismemberment #79479

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
31a7c4f
Update activity_handlers.cpp
Et-Tu-Brute1234 Feb 1, 2025
214a530
Apply suggestions from code review
GuardianDll Feb 1, 2025
e1d6f2c
fix typo
Et-Tu-Brute1234 Feb 1, 2025
7de684a
removed useful drops
Et-Tu-Brute1234 Feb 1, 2025
ad9e3e6
okay NOW useful drops are removed
Et-Tu-Brute1234 Feb 1, 2025
ac782bf
Update src/activity_handlers.cpp
Et-Tu-Brute1234 Feb 1, 2025
9bd6945
Update activity_handlers.cpp
Et-Tu-Brute1234 Feb 1, 2025
e288d12
astyle
GuardianDll Feb 3, 2025
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
6 changes: 3 additions & 3 deletions src/activity_handlers.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -625,8 +625,8 @@ static void set_up_butchery( player_activity &act, Character &you, butcher_type
corpse.in_species( species_HUMAN ) ||
corpse.in_species( species_FERAL );

// applies to all butchery actions except for dissections
if( is_human && action != butcher_type::DISSECT && !you.okay_with_eating_humans() ) {
// applies to all butchery actions except for dissections or dismemberment
if( is_human && action != butcher_type::DISSECT && !you.okay_with_eating_humans() && action != butcher_type::DISMEMBER) {
//first determine if the butcherer has the dissect_humans proficiency.
if( you.has_proficiency( proficiency_prof_dissect_humans ) ) {
//if it's player doing the butchery, ask them first.
Expand Down Expand Up @@ -1395,7 +1395,7 @@ static bool butchery_drops_harvest( item *corpse_item, const mtype &mt, Characte
// therefore operations on this activity's targets and values may be invalidated.
// reveal hidden items / hidden content
if( action != butcher_type::FIELD_DRESS && action != butcher_type::SKIN &&
action != butcher_type::BLEED ) {
action != butcher_type::BLEED && action != butcher_tyoe:: DISMEMBER) {
for( item *content : corpse_item->all_items_top( pocket_type::CONTAINER ) ) {
if( ( roll_butchery_dissect( round( you.get_average_skill_level( skill_survival ) ), you.dex_cur,
tool_quality ) + 10 ) * 5 > rng( 0, 100 ) ) {
Expand Down
Loading