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

Jump to bottom

Fix for multiplied stomach in butchery yields #25833

Merged
merged 1 commit into from Sep 25, 2018
Merged

Fix for multiplied stomach in butchery yields #25833

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 4 additions & 3 deletions src/activity_handlers.cpp
View file
Open in desktop
Expand Up @@ -539,7 +539,6 @@ void butchery_drops_hardcoded( item *corpse_item, const mtype *corpse, player *p
stomach = roll_butchery() >= 0;

// (QUICK) BUTCHERY
// in quick butchery you aim for meat and don't care about the rest
if( action == BUTCHER && ( !corpse_item->has_flag( "FIELD_DRESS" ) ||
!corpse_item->has_flag( "FIELD_DRESS_FAILED" ) ) ) {
pieces /= 4;
Expand All @@ -551,6 +550,8 @@ void butchery_drops_hardcoded( item *corpse_item, const mtype *corpse, player *p
sinews /= 4;
// feathers unchanged
wool /= 4;
stomach = false;
} else if( action == BUTCHER ) {
stomach = roll_butchery() >= 0;
}

Expand All @@ -568,7 +569,7 @@ void butchery_drops_hardcoded( item *corpse_item, const mtype *corpse, player *p

// field dressing removed innards and bones from meatless limbs
if( action == BUTCHER_FULL && corpse_item->has_flag( "FIELD_DRESS" ) ) {
stomach = 0;
stomach = false;
bones = ( bones / 2 ) + rng( bones / 2, bones );
}
// unskillfull field dressing damaged the skin, meat, and other parts
Expand All @@ -579,7 +580,7 @@ void butchery_drops_hardcoded( item *corpse_item, const mtype *corpse, player *p
fats = rng( 0, fats );
feathers = rng( 0, feathers );
wool = rng( 0, wool );
stomach = 0;
stomach = false;
}
if( corpse_item->has_flag( "QUARTERED" ) ) {
pieces /= 4;
Expand Down