From 240a518e90e3b9ac37520202510d4de7deb3a7b0 Mon Sep 17 00:00:00 2001 From: x-qq Date: Fri, 30 Aug 2024 03:00:41 +0300 Subject: [PATCH] fix npc butchering --- src/activity_item_handling.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/activity_item_handling.cpp b/src/activity_item_handling.cpp index 2f6710a6baace..0a04185b97010 100644 --- a/src/activity_item_handling.cpp +++ b/src/activity_item_handling.cpp @@ -1187,7 +1187,7 @@ static activity_reason_info can_do_activity_there( const activity_id &act, Chara // make sure nobody else is working on that corpse right now if( i.is_corpse() && !i.has_var( "activity_var" ) ) { const mtype corpse = *i.get_mtype(); - if( corpse.size >= creature_size::medium ) { + if( corpse.size > creature_size::medium ) { big_count += 1; } else { small_count += 1; @@ -1203,7 +1203,7 @@ static activity_reason_info can_do_activity_there( const activity_id &act, Chara } if( !corpses.empty() ) { if( big_count > 0 && small_count == 0 ) { - if( !b_rack_present || !here.has_nearby_table( src_loc, 2 ) ) { + if( !b_rack_present ) { return activity_reason_info::fail( do_activity_reason::NO_ZONE ); } if( you.has_quality( quality_id( qual_BUTCHER ), 1 ) && ( you.has_quality( qual_SAW_W ) || @@ -1960,7 +1960,7 @@ static bool butcher_corpse_activity( Character &you, const tripoint_bub_ms &src_ for( item &elem : items ) { if( elem.is_corpse() && !elem.has_var( "activity_var" ) ) { const mtype corpse = *elem.get_mtype(); - if( corpse.size >= creature_size::medium && reason != do_activity_reason::NEEDS_BIG_BUTCHERING ) { + if( corpse.size > creature_size::medium && reason != do_activity_reason::NEEDS_BIG_BUTCHERING ) { continue; } elem.set_var( "activity_var", you.name );