Skip to content

Commit

Permalink
Merge pull request #25833 from nexusmrsep/butcher_man
Browse files Browse the repository at this point in the history
Fix for multiplied stomach in butchery yields
  • Loading branch information
ZhilkinSerg committed Sep 25, 2018
2 parents 7d04731 + c2e7a9e commit f371cf8
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions src/activity_handlers.cpp
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

0 comments on commit f371cf8

Please sign in to comment.