Merge pull request #82260 from sparr/dedupe_eoc_activation_only

Maleclypse · web-flow · commit 4c6c25e2538f · 2025-08-10T11:54:24.000-05:00
diff --git a/src/bionics.cpp b/src/bionics.cpp
@@ -784,11 +784,7 @@ bool Character::activate_bionic( bionic &bio, bool eff_only, bool *close_bionics
         dialogue d( get_talker_for( *this ), nullptr );
         write_var_value( var_type::context, "act_cost", &d,
                          units::to_millijoule( bio.info().power_activate ) );
-        if( eoc->type == eoc_type::ACTIVATION ) {
-            eoc->activate( d );
-        } else {
-            debugmsg( "Must use an activation eoc for a bionic activation.  If you don't want the effect_on_condition to happen on its own (without the bionic being activated), remove the recurrence min and max.  Otherwise, create a non-recurring effect_on_condition for this bionic with its condition and effects, then have a recurring one queue it." );
-        }
+        eoc->activate_activation_only( d, "a bionic activation", "bionic being activated", "bionic" );
     }
 
     item tmp_item;
@@ -1239,11 +1235,7 @@ bool Character::deactivate_bionic( bionic &bio, bool eff_only )
 
     for( const effect_on_condition_id &eoc : bio.id->deactivated_eocs ) {
         dialogue d( get_talker_for( *this ), nullptr );
-        if( eoc->type == eoc_type::ACTIVATION ) {
-            eoc->activate( d );
-        } else {
-            debugmsg( "Must use an activation eoc for a bionic deactivation.  If you don't want the effect_on_condition to happen on its own (without the bionic being activated), remove the recurrence min and max.  Otherwise, create a non-recurring effect_on_condition for this bionic with its condition and effects, then have a recurring one queue it." );
-        }
+        eoc->activate_activation_only( d, "a bionic deactivation", "bionic being activated", "bionic" );
     }
 
     if( bio.info().has_flag( json_flag_BIONIC_WEAPON ) ) {
@@ -1623,11 +1615,7 @@ void Character::process_bionic( bionic &bio )
 
     for( const effect_on_condition_id &eoc : bio.id->processed_eocs ) {
         dialogue d( get_talker_for( *this ), nullptr );
-        if( eoc->type == eoc_type::ACTIVATION ) {
-            eoc->activate( d );
-        } else {
-            debugmsg( "Must use an activation eoc for a bionic process.  If you don't want the effect_on_condition to happen on its own (without the bionic being activated), remove the recurrence min and max.  Otherwise, create a non-recurring effect_on_condition for this bionic with its condition and effects, then have a recurring one queue it." );
-        }
+        eoc->activate_activation_only( d, "a bionic process", "bionic being activated", "bionic" );
     }
 
     // Bionic effects on every turn they are active go here.
diff --git a/src/crafting.cpp b/src/crafting.cpp
@@ -1587,12 +1587,8 @@ void Character::complete_craft( item &craft, const std::optional<tripoint_bub_ms
     inv->restack( *this );
     for( const effect_on_condition_id &eoc : making.result_eocs ) {
         dialogue d( get_talker_for( *this ), nullptr );
-        if( eoc->type == eoc_type::ACTIVATION ) {
-            for( int i = 0; i < batch_size; i++ ) {
-                eoc->activate( d );
-            }
-        } else {
-            debugmsg( "Must use an activation eoc for a recipe.  If you don't want the effect_on_condition to happen on its own, remove the recurrence min and max.  Otherwise, create a non-recurring effect_on_condition for this recipe with its condition and effects, then have a recurring one queue it." );
+        for( int i = 0; i < batch_size; i++ ) {
+            eoc->activate_activation_only( d, "a recipe", "crafting", "recipe" );
         }
     }
 }
diff --git a/src/damage.cpp b/src/damage.cpp
@@ -394,11 +394,8 @@ void damage_type::onhit_effects( Creature *source, Creature *target ) const
         dialogue d( source == nullptr ? nullptr : get_talker_for( source ),
                     target == nullptr ? nullptr : get_talker_for( target ) );
 
-        if( eoc->type == eoc_type::ACTIVATION ) {
-            eoc->activate( d );
-        } else {
-            debugmsg( "Must use an activation eoc for a damage type effect.  If you don't want the effect_on_condition to happen on its own (without the damage type effect being activated), remove the recurrence min and max.  Otherwise, create a non-recurring effect_on_condition for this damage type with its condition and effects, then have a recurring one queue it." );
-        }
+        eoc->activate_activation_only( d, "a damage type effect", "damage type effect being activated",
+                                       "damage type" );
     }
 }
 
@@ -439,11 +436,8 @@ void damage_type::ondamage_effects( Creature *source, Creature *target, bodypart
         d.set_value( "total_damage", total_damage );
         d.set_value( "bp", bp.str() );
 
-        if( eoc->type == eoc_type::ACTIVATION ) {
-            eoc->activate( d );
-        } else {
-            debugmsg( "Must use an activation eoc for a damage type effect.  If you don't want the effect_on_condition to happen on its own (without the damage type effect being activated), remove the recurrence min and max.  Otherwise, create a non-recurring effect_on_condition for this damage type with its condition and effects, then have a recurring one queue it." );
-        }
+        eoc->activate_activation_only( d, "a damage type effect", "damage type effect being activated",
+                                       "damage type" );
     }
 }
 
diff --git a/src/effect_on_condition.cpp b/src/effect_on_condition.cpp
@@ -360,6 +360,24 @@ bool effect_on_condition::activate( dialogue &d, bool require_callstack_check )
     return retval;
 }
 
+bool effect_on_condition::activate_activation_only( dialogue &d, const std::string &text1,
+        const std::string &text2, const std::string &text3, bool require_callstack_check ) const
+{
+    if( type == eoc_type::ACTIVATION ) {
+        return activate( d, require_callstack_check );
+    }
+    debugmsg(
+        "Must use an activation eoc for %s%s%s%s.  Otherwise, create a non-recurring effect_on_condition for this %s%swith its condition and effects, then have a recurring one queue it.",
+        text1,
+        text2.empty() ? "" :
+        ".  If you don't want the effect_on_condition to happen on its own (without the ",
+        text2,
+        text2.empty() ? "" : "), remove the recurrence min and max.",
+        text3,
+        text3.empty() ? "" : " " );
+    return false;
+}
+
 bool effect_on_condition::check_deactivate( const_dialogue const &d ) const
 {
     if( !has_deactivate_condition || has_false_effect ) {
diff --git a/src/effect_on_condition.h b/src/effect_on_condition.h
@@ -67,6 +67,8 @@ struct effect_on_condition {
         event_type required_event;
         duration_or_var recurrence;
         bool activate( dialogue &d, bool require_callstack_check = true ) const;
+        bool activate_activation_only( dialogue &d, const std::string &text1, const std::string &text2 = "",
+                                       const std::string &text3 = "", bool require_callstack_check = true ) const;
         bool check_deactivate( const_dialogue const &d ) const;
         bool test_condition( const_dialogue const &d ) const;
         void apply_true_effects( dialogue &d ) const;
diff --git a/src/game.cpp b/src/game.cpp
@@ -14442,21 +14442,13 @@ void avatar_moves( const tripoint_abs_ms &old_abs_pos, const avatar &u, const ma
         if( !past_ter->get_exit_EOC().is_null() ) {
             dialogue d( get_talker_for( get_avatar() ), nullptr );
             effect_on_condition_id eoc = cur_ter->get_exit_EOC();
-            if( eoc->type == eoc_type::ACTIVATION ) {
-                eoc->activate( d );
-            } else {
-                debugmsg( "Must use an activation eoc for OMT movement.  Otherwise, create a non-recurring effect_on_condition for this with its condition and effects, then have a recurring one queue it." );
-            }
+            eoc->activate_activation_only( d, "OMT movement" );
         }
 
         if( !cur_ter->get_entry_EOC().is_null() ) {
             dialogue d( get_talker_for( get_avatar() ), nullptr );
             effect_on_condition_id eoc = cur_ter->get_entry_EOC();
-            if( eoc->type == eoc_type::ACTIVATION ) {
-                eoc->activate( d );
-            } else {
-                debugmsg( "Must use an activation eoc for OMT movement.  Otherwise, create a non-recurring effect_on_condition for this with its condition and effects, then have a recurring one queue it." );
-            }
+            eoc->activate_activation_only( d, "OMT movement" );
         }
 
     }
diff --git a/src/iuse_actor.cpp b/src/iuse_actor.cpp
@@ -6155,11 +6155,7 @@ std::optional<int> effect_on_conditions_actor::use( Character *p, item &it,
     dialogue d( ( char_ptr == nullptr ? nullptr : get_talker_for( char_ptr ) ), get_talker_for( loc ) );
     write_var_value( var_type::context, "id", &d, it.typeId().str() );
     for( const effect_on_condition_id &eoc : eocs ) {
-        if( eoc->type == eoc_type::ACTIVATION ) {
-            eoc->activate( d );
-        } else {
-            debugmsg( "Must use an activation eoc for activation.  If you don't want the effect_on_condition to happen on its own (without the item's involvement), remove the recurrence min and max.  Otherwise, create a non-recurring effect_on_condition for this item with its condition and effects, then have a recurring one queue it." );
-        }
+        eoc->activate_activation_only( d, "activation", "item's involvement", "item" );
     }
     // Prevents crash from trying to spend charge with item removed
     // NOTE: Because this section and/or calling stack does not check if the item exists in the surrounding tiles
diff --git a/src/magic_spell_effect.cpp b/src/magic_spell_effect.cpp
@@ -1934,11 +1934,7 @@ void spell_effect::effect_on_condition( const spell &sp, Creature &caster,
         write_var_value( var_type::context, "spell_location", &d, target_abs );
         d.amend_callstack( string_format( "Spell: %s Caster: %s", sp.id().c_str(), caster.disp_name() ) );
         effect_on_condition_id eoc = effect_on_condition_id( sp.effect_data() );
-        if( eoc->type == eoc_type::ACTIVATION ) {
-            eoc->activate( d );
-        } else {
-            debugmsg( "Must use an activation eoc for a spell.  If you don't want the effect_on_condition to happen on its own (without the spell being cast), remove the recurrence min and max.  Otherwise, create a non-recurring effect_on_condition for this spell with its condition and effects, then have a recurring one queue it." );
-        }
+        eoc->activate_activation_only( d, "a spell", "spell being cast", "spell" );
     }
 }
 
diff --git a/src/martialarts.cpp b/src/martialarts.cpp
@@ -1304,11 +1304,8 @@ void martialart::activate_eocs( Character &u,
 {
     for( const effect_on_condition_id &eoc : eocs ) {
         dialogue d( get_talker_for( u ), nullptr );
-        if( eoc->type == eoc_type::ACTIVATION ) {
-            eoc->activate( d );
-        } else {
-            debugmsg( "Must use an activation eoc for a martial art activation.  If you don't want the effect_on_condition to happen on its own (without the martial art being activated), remove the recurrence min and max.  Otherwise, create a non-recurring effect_on_condition for this martial art with its condition and effects, then have a recurring one queue it." );
-        }
+        eoc->activate_activation_only( d, "a martial art activation", "martial art being activated",
+                                       "martial art" );
     }
 }
 
diff --git a/src/melee.cpp b/src/melee.cpp
@@ -1798,11 +1798,8 @@ void Character::perform_technique( const ma_technique &technique, Creature &t,
 
         for( const effect_on_condition_id &eoc : technique.eocs ) {
             dialogue d( get_talker_for( *this ), get_talker_for( t ) );
-            if( eoc->type == eoc_type::ACTIVATION ) {
-                eoc->activate( d );
-            } else {
-                debugmsg( "Must use an activation eoc for a technique activation.  If you don't want the effect_on_condition to happen on its own (without the technique being activated), remove the recurrence min and max.  Otherwise, create a non-recurring effect_on_condition for this technique with its condition and effects, then have a recurring one queue it." );
-            }
+            eoc->activate_activation_only( d, "a technique activation", "technique being activated",
+                                           "technique" );
         }
     }
 
diff --git a/src/mutation.cpp b/src/mutation.cpp
@@ -878,11 +878,7 @@ void Character::activate_cached_mutation( const trait_id &mut )
         for( const effect_on_condition_id &eoc : mut->activated_eocs ) {
             dialogue d( get_talker_for( *this ), nullptr );
             d.set_value( "this", mut.str() );
-            if( eoc->type == eoc_type::ACTIVATION ) {
-                eoc->activate( d );
-            } else {
-                debugmsg( "Must use an activation eoc for a mutation activation.  If you don't want the effect_on_condition to happen on its own (without the mutation being activated), remove the recurrence min and max.  Otherwise, create a non-recurring effect_on_condition for this mutation with its condition and effects, then have a recurring one queue it." );
-            }
+            eoc->activate_activation_only( d, "a mutation activation", "mutation being activated", "mutation" );
         }
         // if the activation EOCs are not just setup for processing then turn the mutation off
         tdata.powered = mut->activated_is_setup;
@@ -1032,11 +1028,8 @@ void Character::deactivate_mutation( const trait_id &mut )
     for( const effect_on_condition_id &eoc : mut->deactivated_eocs ) {
         dialogue d( get_talker_for( *this ), nullptr );
         d.set_value( "this", mut.str() );
-        if( eoc->type == eoc_type::ACTIVATION ) {
-            eoc->activate( d );
-        } else {
-            debugmsg( "Must use an activation eoc for a mutation deactivation.  If you don't want the effect_on_condition to happen on its own (without the mutation being activated), remove the recurrence min and max.  Otherwise, create a non-recurring effect_on_condition for this mutation with its condition and effects, then have a recurring one queue it." );
-        }
+        eoc->activate_activation_only( d, "a mutation deactivation", "mutation being activated",
+                                       "mutation" );
     }
 
     if( mdata.transform && !mdata.transform->msg_transform.empty() ) {
diff --git a/src/player_activity.cpp b/src/player_activity.cpp
@@ -12,7 +12,6 @@
 #include "character.h"
 #include "construction.h"
 #include "creature.h"
-#include "debug.h"
 #include "dialogue.h"
 #include "effect_on_condition.h"
 #include "event.h"
@@ -307,11 +306,7 @@ void player_activity::do_turn( Character &you )
     if( !type->do_turn_EOC.is_null() ) {
         // if we have an EOC defined in json do that
         dialogue d( get_talker_for( you ), nullptr );
-        if( type->do_turn_EOC->type == eoc_type::ACTIVATION ) {
-            type->do_turn_EOC->activate( d );
-        } else {
-            debugmsg( "Must use an activation eoc for player activities.  Otherwise, create a non-recurring effect_on_condition for this with its condition and effects, then have a recurring one queue it." );
-        }
+        type->do_turn_EOC->activate_activation_only( d, "player activities" );
         // We may have canceled this via a message interrupt.
         if( type.is_null() ) {
             activity_handlers::clean_may_activity_occupancy_items_var_if_is_avatar_and_no_activity_now( you );
@@ -385,11 +380,7 @@ void player_activity::do_turn( Character &you )
         if( !type->completion_EOC.is_null() ) {
             // if we have an EOC defined in json do that
             dialogue d( get_talker_for( you ), nullptr );
-            if( type->completion_EOC->type == eoc_type::ACTIVATION ) {
-                type->completion_EOC->activate( d );
-            } else {
-                debugmsg( "Must use an activation eoc for player activities.  Otherwise, create a non-recurring effect_on_condition for this with its condition and effects, then have a recurring one queue it." );
-            }
+            type->completion_EOC->activate_activation_only( d, "player activities" );
         }
         get_event_bus().send<event_type::character_finished_activity>( you.getID(), type, false );
         g->wait_popup_reset();
diff --git a/src/suffer.cpp b/src/suffer.cpp
@@ -299,11 +299,7 @@ void suffer::mutation_power( Character &you, const trait_id &mut_id )
         for( const effect_on_condition_id &eoc : mut_id->processed_eocs ) {
             dialogue d( get_talker_for( you ), nullptr );
             d.set_value( "this", mut_id.str() );
-            if( eoc->type == eoc_type::ACTIVATION ) {
-                eoc->activate( d );
-            } else {
-                debugmsg( "Must use an activation eoc for a mutation process.  If you don't want the effect_on_condition to happen on its own (without the mutation being activated), remove the recurrence min and max.  Otherwise, create a non-recurring effect_on_condition for this mutation with its condition and effects, then have a recurring one queue it." );
-            }
+            eoc->activate_activation_only( d, "a mutation process", "mutation being activated", "mutation" );
         }
     }
 }
diff --git a/src/trapfunc.cpp b/src/trapfunc.cpp
@@ -391,11 +391,7 @@ bool trapfunc::eocs( const tripoint_bub_ms &p, Creature *critter, item * )
     for( const effect_on_condition_id &eoc : tr.eocs ) {
         dialogue d( get_talker_for( critter ), nullptr );
         write_var_value( var_type::context, "trap_location", &d, trap_location );
-        if( eoc->type == eoc_type::ACTIVATION ) {
-            eoc->activate( d );
-        } else {
-            debugmsg( "Must use an activation eoc for activation.  If you don't want the effect_on_condition to happen on its own (without the item's involvement), remove the recurrence min and max.  Otherwise, create a non-recurring effect_on_condition for this item with its condition and effects, then have a recurring one queue it." );
-        }
+        eoc->activate_activation_only( d, "activation", "item's involvement", "item" );
     }
     here.remove_trap( p );
     return true;

Original file line number	Diff line number	Diff line change
`@@ -1587,12 +1587,8 @@ void Character::complete_craft( item &craft, const std::optional<tripoint_bub_ms`
`1587`	`1587`	`inv->restack( *this );`
`1588`	`1588`	`for( const effect_on_condition_id &eoc : making.result_eocs ) {`
`1589`	`1589`	`dialogue d( get_talker_for( *this ), nullptr );`
`1590`		`- if( eoc->type == eoc_type::ACTIVATION ) {`
`1591`		`- for( int i = 0; i < batch_size; i++ ) {`
`1592`		`- eoc->activate( d );`
`1593`		`- }`
`1594`		`- } else {`
`1595`		`- debugmsg( "Must use an activation eoc for a recipe. If you don't want the effect_on_condition to happen on its own, remove the recurrence min and max. Otherwise, create a non-recurring effect_on_condition for this recipe with its condition and effects, then have a recurring one queue it." );`
	`1590`	`+ for( int i = 0; i < batch_size; i++ ) {`
	`1591`	`+ eoc->activate_activation_only( d, "a recipe", "crafting", "recipe" );`
`1596`	`1592`	`}`
`1597`	`1593`	`}`
`1598`	`1594`	`}`
Original file line number	Diff line number	Diff line change
`@@ -394,11 +394,8 @@ void damage_type::onhit_effects( Creature source, Creature target ) const`
`394`	`394`	`dialogue d( source == nullptr ? nullptr : get_talker_for( source ),`
`395`	`395`	`target == nullptr ? nullptr : get_talker_for( target ) );`
`396`	`396`
`397`		`- if( eoc->type == eoc_type::ACTIVATION ) {`
`398`		`- eoc->activate( d );`
`399`		`- } else {`
`400`		`- debugmsg( "Must use an activation eoc for a damage type effect. If you don't want the effect_on_condition to happen on its own (without the damage type effect being activated), remove the recurrence min and max. Otherwise, create a non-recurring effect_on_condition for this damage type with its condition and effects, then have a recurring one queue it." );`
`401`		`- }`
	`397`	`+ eoc->activate_activation_only( d, "a damage type effect", "damage type effect being activated",`
	`398`	`+ "damage type" );`
`402`	`399`	`}`
`403`	`400`	`}`
`404`	`401`
`@@ -439,11 +436,8 @@ void damage_type::ondamage_effects( Creature source, Creature target, bodypart`
`439`	`436`	`d.set_value( "total_damage", total_damage );`
`440`	`437`	`d.set_value( "bp", bp.str() );`
`441`	`438`
`442`		`- if( eoc->type == eoc_type::ACTIVATION ) {`
`443`		`- eoc->activate( d );`
`444`		`- } else {`
`445`		`- debugmsg( "Must use an activation eoc for a damage type effect. If you don't want the effect_on_condition to happen on its own (without the damage type effect being activated), remove the recurrence min and max. Otherwise, create a non-recurring effect_on_condition for this damage type with its condition and effects, then have a recurring one queue it." );`
`446`		`- }`
	`439`	`+ eoc->activate_activation_only( d, "a damage type effect", "damage type effect being activated",`
	`440`	`+ "damage type" );`
`447`	`441`	`}`
`448`	`442`	`}`
`449`	`443`
Original file line number	Diff line number	Diff line change
`@@ -1934,11 +1934,7 @@ void spell_effect::effect_on_condition( const spell &sp, Creature &caster,`
`1934`	`1934`	`write_var_value( var_type::context, "spell_location", &d, target_abs );`
`1935`	`1935`	`d.amend_callstack( string_format( "Spell: %s Caster: %s", sp.id().c_str(), caster.disp_name() ) );`
`1936`	`1936`	`effect_on_condition_id eoc = effect_on_condition_id( sp.effect_data() );`
`1937`		`- if( eoc->type == eoc_type::ACTIVATION ) {`
`1938`		`- eoc->activate( d );`
`1939`		`- } else {`
`1940`		`- debugmsg( "Must use an activation eoc for a spell. If you don't want the effect_on_condition to happen on its own (without the spell being cast), remove the recurrence min and max. Otherwise, create a non-recurring effect_on_condition for this spell with its condition and effects, then have a recurring one queue it." );`
`1941`		`- }`
	`1937`	`+ eoc->activate_activation_only( d, "a spell", "spell being cast", "spell" );`
`1942`	`1938`	`}`
`1943`	`1939`	`}`
`1944`	`1940`
Original file line number	Diff line number	Diff line change
`@@ -1304,11 +1304,8 @@ void martialart::activate_eocs( Character &u,`
`1304`	`1304`	`{`
`1305`	`1305`	`for( const effect_on_condition_id &eoc : eocs ) {`
`1306`	`1306`	`dialogue d( get_talker_for( u ), nullptr );`
`1307`		`- if( eoc->type == eoc_type::ACTIVATION ) {`
`1308`		`- eoc->activate( d );`
`1309`		`- } else {`
`1310`		`- debugmsg( "Must use an activation eoc for a martial art activation. If you don't want the effect_on_condition to happen on its own (without the martial art being activated), remove the recurrence min and max. Otherwise, create a non-recurring effect_on_condition for this martial art with its condition and effects, then have a recurring one queue it." );`
`1311`		`- }`
	`1307`	`+ eoc->activate_activation_only( d, "a martial art activation", "martial art being activated",`
	`1308`	`+ "martial art" );`
`1312`	`1309`	`}`
`1313`	`1310`	`}`
`1314`	`1311`
Original file line number	Diff line number	Diff line change
`@@ -1798,11 +1798,8 @@ void Character::perform_technique( const ma_technique &technique, Creature &t,`
`1798`	`1798`
`1799`	`1799`	`for( const effect_on_condition_id &eoc : technique.eocs ) {`
`1800`	`1800`	`dialogue d( get_talker_for( *this ), get_talker_for( t ) );`
`1801`		`- if( eoc->type == eoc_type::ACTIVATION ) {`
`1802`		`- eoc->activate( d );`
`1803`		`- } else {`
`1804`		`- debugmsg( "Must use an activation eoc for a technique activation. If you don't want the effect_on_condition to happen on its own (without the technique being activated), remove the recurrence min and max. Otherwise, create a non-recurring effect_on_condition for this technique with its condition and effects, then have a recurring one queue it." );`
`1805`		`- }`
	`1801`	`+ eoc->activate_activation_only( d, "a technique activation", "technique being activated",`
	`1802`	`+ "technique" );`
`1806`	`1803`	`}`
`1807`	`1804`	`}`
`1808`	`1805`