Merge pull request #82980 from RenechCDDA/audit_activity_var

(Mostly) fix butchering activity from zones

Author: GuardianDll

src/activity_item_handling.cpp

@@ -16,6 +16,7 @@
 
 #include "activity_actor_definitions.h"
 #include "avatar.h"
+#include "butchery.h"
 #include "calendar.h"
 #include "cata_utility.h"
 #include "character.h"
@@ -78,7 +79,6 @@
 #include "weather.h"
 
 static const activity_id ACT_BUILD( "ACT_BUILD" );
-static const activity_id ACT_BUTCHER_FULL( "ACT_BUTCHER_FULL" );
 static const activity_id ACT_FETCH_REQUIRED( "ACT_FETCH_REQUIRED" );
 static const activity_id ACT_FISH( "ACT_FISH" );
 static const activity_id ACT_MOVE_LOOT( "ACT_MOVE_LOOT" );
@@ -1209,7 +1209,8 @@ static activity_reason_info can_do_activity_there( const activity_id &act, Chara
         int small_count = 0;
         for( const item &i : here.i_at( src_loc ) ) {
             // make sure nobody else is working on that corpse right now
-            if( i.is_corpse() && !i.has_var( "activity_var" ) ) {
+            if( i.is_corpse() &&
+                ( !i.has_var( "activity_var" ) || i.get_var( "activity_var" ) == you.name ) ) {
                 const mtype corpse = *i.get_mtype();
                 if( corpse.size > creature_size::medium ) {
                     big_count += 1;
@@ -1219,6 +1220,9 @@ static activity_reason_info can_do_activity_there( const activity_id &act, Chara
                 corpses.push_back( i );
             }
         }
+        if( corpses.empty() ) {
+            return activity_reason_info::fail( do_activity_reason::NO_COMPONENTS );
+        }
         bool b_rack_present = false;
         for( const tripoint_bub_ms &pt : here.points_in_radius( src_loc, 2 ) ) {
             if( here.has_flag_furn( ter_furn_flag::TFLAG_BUTCHER_EQ, pt ) ) {
@@ -1970,21 +1974,23 @@ static bool butcher_corpse_activity( Character &you, const tripoint_bub_ms &src_
 {
     map &here = get_map();
     map_stack items = here.i_at( src_loc );
+    std::vector<butchery_data> bd;
     for( item &elem : items ) {
-        if( elem.is_corpse() && !elem.has_var( "activity_var" ) ) {
+        if( elem.is_corpse() &&
+            ( !elem.has_var( "activity_var" ) || elem.get_var( "activity_var" ) == you.name ) ) {
             const mtype corpse = *elem.get_mtype();
             if( corpse.size > creature_size::medium && reason != do_activity_reason::NEEDS_BIG_BUTCHERING ) {
                 continue;
             }
             elem.set_var( "activity_var", you.name );
-            you.assign_activity( ACT_BUTCHER_FULL, 0, true );
-            you.activity.targets.emplace_back( map_cursor( src_loc ), &elem );
-            you.activity.placement = here.get_abs( src_loc );
-            you.may_activity_occupancy_after_end_items_loc.emplace_back( map_cursor{here.get_abs( src_loc )},
-                    &elem );
-            return true;
+            item_location corpse_loc = item_location( map_cursor( src_loc ), &elem );
+            bd.emplace_back( corpse_loc, butcher_type::FULL );
         }
     }
+    if( !bd.empty() ) {
+        you.assign_activity( butchery_activity_actor( bd ) );
+        return true;
+    }
     return false;
 }
 
@@ -3486,6 +3492,11 @@ bool generic_multi_activity_handler( player_activity &act, Character &you, bool
         }
         // if we got here, we need to revert otherwise NPC will be stuck in AI Limbo and have a head explosion.
         if( you.backlog.empty() || src_set.empty() ) {
+            /**
+            * This should really be a debug message, but too many places rely on this broken behavior.
+            * debugmsg( "Reverting %s activity for %s, probable infinite loop", activity_to_restore.c_str(),
+            *           you.get_name() );
+            */
             check_npc_revert( you );
             if( player_activity( activity_to_restore ).is_multi_type() ) {
                 you.assign_activity( activity_id::NULL_ID() );

src/character.cpp

@@ -16,6 +16,7 @@
 #include <vector>
 
 #include "action.h"
+#include "activity_actor.h"
 #include "activity_actor_definitions.h"
 #include "activity_handlers.h"
 #include "addiction.h"
@@ -129,8 +130,6 @@
 #include "weather_type.h"
 #include "wound.h"
 
-class activity_actor;
-
 static const activity_id ACT_AUTODRIVE( "ACT_AUTODRIVE" );
 static const activity_id ACT_CONSUME_DRINK_MENU( "ACT_CONSUME_DRINK_MENU" );
 static const activity_id ACT_CONSUME_FOOD_MENU( "ACT_CONSUME_FOOD_MENU" );
@@ -9120,6 +9119,13 @@ void Character::set_knows_creature_type( const mtype_id &c )
 void Character::assign_activity( const activity_id &type, int moves, int index, int pos,
                                  const std::string &name )
 {
+    // This is not a perfect safety net, but I don't know of another way to get all activity actors and what activity_ids might be associated with them.
+    for( const auto &actor_ptr : activity_actors::deserialize_functions ) {
+        if( actor_ptr.first == type ) {
+            debugmsg( "Tried to assign generic activity %s to activity that has an actor!", type.c_str() );
+            return;
+        }
+    }
     assign_activity( player_activity( type, moves, index, pos, name ) );
 }
 

src/player_activity.cpp

@@ -12,6 +12,7 @@
 #include "character.h"
 #include "construction.h"
 #include "creature.h"
+#include "debug.h"
 #include "dialogue.h"
 #include "effect_on_condition.h"
 #include "event.h"
@@ -22,6 +23,7 @@
 #include "itype.h"
 #include "magic.h"
 #include "map.h"
+#include "messages.h"
 #include "rng.h"
 #include "skill.h"
 #include "sounds.h"
@@ -382,6 +384,8 @@ void player_activity::do_turn( Character &you )
             dialogue d( get_talker_for( you ), nullptr );
             type->completion_EOC->activate_activation_only( d, "player activities" );
         }
+        add_msg_debug( debugmode::DF_ACTIVITY, "Setting activity %s to null for %s, no moves left.",
+                       type.c_str(), you.name );
         get_event_bus().send<event_type::character_finished_activity>( you.getID(), type, false );
         g->wait_popup_reset();
         if( actor ) {