Skip to content

Commit

Permalink
fix whatever gods of github messed up in my PR
Browse files Browse the repository at this point in the history
  • Loading branch information
GuardianDll committed Sep 3, 2024
1 parent d54768f commit 36fe368
Showing 1 changed file with 7 additions and 10 deletions.
17 changes: 7 additions & 10 deletions src/activity_handlers.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1075,17 +1075,15 @@ static bool butchery_drops_harvest( item *corpse_item, const mtype &mt, Characte
if( corpse_item->has_flag( flag_SKINNED ) && entry.type == harvest_drop_skin ) {
roll = 0;
}
if( corpse_item->has_flag( flag_SKINNED ) ) {
monster_weight = std::round( 0.85 * monster_weight );

if( entry.type == harvest_drop_flesh ) {
roll /= 1.13 - ( 0.13 * you.get_proficiency_practice( proficiency_prof_butchering_adv ) );
roll /= 1.6 - ( 0.6 * you.get_proficiency_practice( proficiency_prof_butchering_basic ) );
}
const int entry_count = ( action == butcher_type::DISSECT &&
!mt.dissect.is_empty() ) ? mt.dissect->get_all().size() : mt.harvest->get_all().size();
int monster_weight_remaining = monster_weight;
int practice = 0;

if( mt.harvest.is_null() ) {
debugmsg( "ERROR: %s has no harvest entry.", mt.id.c_str() );
return false;
if( entry.type == harvest_drop_skin ) {
roll /= 1.13 - ( 0.13 * you.get_proficiency_practice( proficiency_prof_skinning_adv ) );
roll /= 1.6 - ( 0.6 * you.get_proficiency_practice( proficiency_prof_skinning_basic ) );
}

// QUICK BUTCHERY
Expand Down Expand Up @@ -1322,7 +1320,6 @@ static bool butchery_drops_harvest( item *corpse_item, const mtype &mt, Characte
}
}


// after this point, if there was a liquid handling from the harvest,
// and the liquid handling was interrupted, then the activity was canceled,
// therefore operations on this activity's targets and values may be invalidated.
Expand Down

0 comments on commit 36fe368

Please sign in to comment.