Move some of the effect ids out.

src/activity_handlers.cpp

@@ -200,6 +200,9 @@ static const activity_id ACT_WAIT_WEATHER( "ACT_WAIT_WEATHER" );
 static const activity_id ACT_WASH( "ACT_WASH" );
 static const activity_id ACT_WEAR( "ACT_WEAR" );
 
+static const efftype_id effect_blind( "blind" );
+static const efftype_id effect_controlled( "controlled" );
+
 static const zone_type_id zone_type_FARM_PLOT( "FARM_PLOT" );
 
 static const skill_id skill_computer( "computer" );

src/avatar.cpp

@@ -72,6 +72,9 @@ static const bionic_id bio_eye_optic( "bio_eye_optic" );
 static const bionic_id bio_memory( "bio_memory" );
 static const bionic_id bio_watch( "bio_watch" );
 
+static const efftype_id effect_contacts( "contacts" );
+static const efftype_id effect_depressants( "depressants" );
+
 class JsonIn;
 class JsonOut;
 

src/avatar_action.cpp

@@ -52,6 +52,8 @@
 
 static const activity_id ACT_AIM( "ACT_AIM" );
 
+static const efftype_id effect_amigara( "amigara" );
+
 static const skill_id skill_swimming( "swimming" );
 
 static const bionic_id bio_ups( "bio_ups" );

src/ballistics.cpp

@@ -35,6 +35,8 @@
 #include "point.h"
 #include "cata_string_consts.h"
 
+static const efftype_id effect_bounced( "bounced" );
+
 static void drop_or_embed_projectile( const dealt_projectile_attack &attack )
 {
     const auto &proj = attack.proj;

src/bionics.cpp

@@ -70,6 +70,18 @@
 
 static const activity_id ACT_OPERATION( "ACT_OPERATION" );
 
+static const efftype_id effect_adrenaline( "adrenaline" );
+static const efftype_id effect_adrenaline_mycus( "adrenaline_mycus" );
+static const efftype_id effect_assisted( "assisted" );
+static const efftype_id effect_asthma( "asthma" );
+static const efftype_id effect_bleed( "bleed" );
+static const efftype_id effect_bloodworms( "bloodworms" );
+static const efftype_id effect_brainworms( "brainworms" );
+static const efftype_id effect_cig( "cig" );
+static const efftype_id effect_datura( "datura" );
+static const efftype_id effect_dermatik( "dermatik" );
+static const efftype_id effect_drunk( "drunk" );
+
 static const itype_id fuel_type_battery( "battery" );
 static const itype_id fuel_type_sun_light( "sunlight" );
 static const itype_id fuel_type_wind( "wind" );

src/cata_string_consts.h

@@ -4,58 +4,6 @@
 
 #include "type_id.h"
 
-static const efftype_id effect_adrenaline( "adrenaline" );
-static const efftype_id effect_adrenaline_mycus( "adrenaline_mycus" );
-static const efftype_id effect_alarm_clock( "alarm_clock" );
-static const efftype_id effect_allow_sleep( "allow_sleep" );
-static const efftype_id effect_amigara( "amigara" );
-static const efftype_id effect_antibiotic( "antibiotic" );
-static const efftype_id effect_antibiotic_visible( "antibiotic_visible" );
-static const efftype_id effect_asked_for_item( "asked_for_item" );
-static const efftype_id effect_asked_personal_info( "asked_personal_info" );
-static const efftype_id effect_asked_to_follow( "asked_to_follow" );
-static const efftype_id effect_asked_to_lead( "asked_to_lead" );
-static const efftype_id effect_asked_to_train( "asked_to_train" );
-static const efftype_id effect_assisted( "assisted" );
-static const efftype_id effect_asthma( "asthma" );
-static const efftype_id effect_attention( "attention" );
-static const efftype_id effect_badpoison( "badpoison" );
-static const efftype_id effect_bandaged( "bandaged" );
-static const efftype_id effect_beartrap( "beartrap" );
-static const efftype_id effect_bite( "bite" );
-static const efftype_id effect_bleed( "bleed" );
-static const efftype_id effect_blind( "blind" );
-static const efftype_id effect_blisters( "blisters" );
-static const efftype_id effect_bloodworms( "bloodworms" );
-static const efftype_id effect_boomered( "boomered" );
-static const efftype_id effect_bouldering( "bouldering" );
-static const efftype_id effect_bounced( "bounced" );
-static const efftype_id effect_brainworms( "brainworms" );
-static const efftype_id effect_catch_up( "catch_up" );
-static const efftype_id effect_cig( "cig" );
-static const efftype_id effect_cold( "cold" );
-static const efftype_id effect_common_cold( "common_cold" );
-static const efftype_id effect_contacts( "contacts" );
-static const efftype_id effect_controlled( "controlled" );
-static const efftype_id effect_corroding( "corroding" );
-static const efftype_id effect_cough_suppress( "cough_suppress" );
-static const efftype_id effect_countdown( "countdown" );
-static const efftype_id effect_crushed( "crushed" );
-static const efftype_id effect_cureall( "cureall" );
-static const efftype_id effect_currently_busy( "currently_busy" );
-static const efftype_id effect_darkness( "darkness" );
-static const efftype_id effect_datura( "datura" );
-static const efftype_id effect_dazed( "dazed" );
-static const efftype_id effect_deaf( "deaf" );
-static const efftype_id effect_depressants( "depressants" );
-static const efftype_id effect_dermatik( "dermatik" );
-static const efftype_id effect_disabled( "disabled" );
-static const efftype_id effect_disinfected( "disinfected" );
-static const efftype_id effect_docile( "docile" );
-static const efftype_id effect_downed( "downed" );
-static const efftype_id effect_dragging( "dragging" );
-static const efftype_id effect_drunk( "drunk" );
-static const efftype_id effect_earphones( "earphones" );
 static const efftype_id effect_emp( "emp" );
 static const efftype_id effect_evil( "evil" );
 static const efftype_id effect_fearparalyze( "fearparalyze" );

src/character.cpp

@@ -75,6 +75,28 @@ static const activity_id ACT_TREE_COMMUNION( "ACT_TREE_COMMUNION" );
 static const activity_id ACT_TRY_SLEEP( "ACT_TRY_SLEEP" );
 static const activity_id ACT_WAIT_STAMINA( "ACT_WAIT_STAMINA" );
 
+static const efftype_id effect_adrenaline( "adrenaline" );
+static const efftype_id effect_alarm_clock( "alarm_clock" );
+static const efftype_id effect_bandaged( "bandaged" );
+static const efftype_id effect_beartrap( "beartrap" );
+static const efftype_id effect_bite( "bite" );
+static const efftype_id effect_bleed( "bleed" );
+static const efftype_id effect_blind( "blind" );
+static const efftype_id effect_blisters( "blisters" );
+static const efftype_id effect_boomered( "boomered" );
+static const efftype_id effect_cold( "cold" );
+static const efftype_id effect_common_cold( "common_cold" );
+static const efftype_id effect_contacts( "contacts" );
+static const efftype_id effect_controlled( "controlled" );
+static const efftype_id effect_corroding( "corroding" );
+static const efftype_id effect_cough_suppress( "cough_suppress" );
+static const efftype_id effect_crushed( "crushed" );
+static const efftype_id effect_darkness( "darkness" );
+static const efftype_id effect_deaf( "deaf" );
+static const efftype_id effect_disinfected( "disinfected" );
+static const efftype_id effect_downed( "downed" );
+static const efftype_id effect_drunk( "drunk" );
+
 static const trait_id trait_DEBUG_NODMG( "DEBUG_NODMG" );
 
 static const skill_id skill_dodge( "dodge" );

src/computer_session.cpp

@@ -52,6 +52,8 @@
 #include "type_id.h"
 #include "cata_string_consts.h"
 
+static const efftype_id effect_amigara( "amigara" );
+
 static const skill_id skill_computer( "computer" );
 
 static const species_id HUMAN( "HUMAN" );

src/condition.cpp

@@ -30,6 +30,8 @@
 #include "vpart_position.h"
 #include "cata_string_consts.h"
 
+static const efftype_id effect_currently_busy( "currently_busy" );
+
 // throws an error on failure, so no need to return
 std::string get_talk_varname( const JsonObject &jo, const std::string &member, bool check_value )
 {

src/consumption.cpp

@@ -52,6 +52,10 @@ static const bionic_id bio_furnace( "bio_furnace" );
 static const bionic_id bio_reactor( "bio_reactor" );
 static const bionic_id bio_taste_blocker( "bio_taste_blocker" );
 
+static const efftype_id effect_bloodworms( "bloodworms" );
+static const efftype_id effect_brainworms( "brainworms" );
+static const efftype_id effect_common_cold( "common_cold" );
+
 const std::vector<std::string> carnivore_blacklist {{
         flag_ALLERGEN_VEGGY, flag_ALLERGEN_FRUIT, flag_ALLERGEN_WHEAT, flag_ALLERGEN_NUT,
     }

src/crafting.cpp

@@ -73,6 +73,8 @@
 static const activity_id ACT_CRAFT( "ACT_CRAFT" );
 static const activity_id ACT_DISASSEMBLE( "ACT_DISASSEMBLE" );
 
+static const efftype_id effect_contacts( "contacts" );
+
 static const skill_id skill_electronics( "electronics" );
 static const skill_id skill_tailor( "tailor" );
 

src/creature.cpp

@@ -42,6 +42,10 @@
 #include "point.h"
 #include "cata_string_consts.h"
 
+static const efftype_id effect_blind( "blind" );
+static const efftype_id effect_bounced( "bounced" );
+static const efftype_id effect_downed( "downed" );
+
 const std::map<std::string, m_size> Creature::size_map = {
     {"TINY", MS_TINY}, {"SMALL", MS_SMALL}, {"MEDIUM", MS_MEDIUM},
     {"LARGE", MS_LARGE}, {"HUGE", MS_HUGE}

src/debug_menu.cpp

@@ -88,6 +88,8 @@
 #include "cata_string_consts.h"
 #include "mapgendata.h"
 
+static const efftype_id effect_asthma( "asthma" );
+
 static const mtype_id mon_generator( "mon_generator" );
 
 class vehicle;

src/effect.cpp

@@ -17,6 +17,10 @@
 #include "units.h"
 #include "cata_string_consts.h"
 
+static const efftype_id effect_beartrap( "beartrap" );
+static const efftype_id effect_crushed( "crushed" );
+static const efftype_id effect_downed( "downed" );
+
 namespace
 {
 std::map<efftype_id, effect_type> effect_types;

src/explosion.cpp

@@ -61,6 +61,9 @@
 #include "type_id.h"
 #include "cata_string_consts.h"
 
+static const efftype_id effect_blind( "blind" );
+static const efftype_id effect_deaf( "deaf" );
+
 static const itype_id fuel_type_none( "null" );
 
 static const species_id ROBOT( "ROBOT" );

src/game_inventory.cpp

@@ -53,6 +53,8 @@ static const activity_id ACT_CONSUME_FOOD_MENU( "ACT_CONSUME_FOOD_MENU" );
 static const activity_id ACT_CONSUME_DRINK_MENU( "ACT_CONSUME_DRINK_MENU" );
 static const activity_id ACT_CONSUME_MEDS_MENU( "ACT_CONSUME_MEDS_MENU" );
 
+static const efftype_id effect_assisted( "assisted" );
+
 static const fault_id fault_bionic_salvaged( "fault_bionic_salvaged" );
 
 static const skill_id skill_computer( "computer" );

src/handle_action.cpp

@@ -83,6 +83,8 @@ static const activity_id ACT_WAIT( "ACT_WAIT" );
 static const activity_id ACT_WAIT_STAMINA( "ACT_WAIT_STAMINA" );
 static const activity_id ACT_WAIT_WEATHER( "ACT_WAIT_WEATHER" );
 
+static const efftype_id effect_alarm_clock( "alarm_clock" );
+
 static const skill_id skill_melee( "melee" );
 
 static const quality_id qual_CUT( "CUT" );

src/iexamine.cpp

@@ -97,6 +97,8 @@ static const activity_id ACT_HACKING( "ACT_HACKING" );
 static const activity_id ACT_PICKUP( "ACT_PICKUP" );
 static const activity_id ACT_PLANT_SEED( "ACT_PLANT_SEED" );
 
+static const efftype_id effect_earphones( "earphones" );
+
 static const trap_str_id tr_unfinished_construction( "tr_unfinished_construction" );
 
 static const skill_id skill_computer( "computer" );

src/item.cpp

@@ -93,6 +93,8 @@ static const std::string CLOTHING_MOD_VAR_PREFIX( "clothing_mod_" );
 static const ammotype ammo_battery( "battery" );
 static const ammotype ammo_plutonium( "plutonium" );
 
+static const efftype_id effect_cig( "cig" );
+
 static const fault_id fault_gun_blackpowder( "fault_gun_blackpowder" );
 
 static const skill_id skill_cooking( "cooking" );

src/iuse.cpp

@@ -130,6 +130,32 @@ static const activity_id ACT_SHAVE( "ACT_SHAVE" );
 static const activity_id ACT_VIBE( "ACT_VIBE" );
 static const activity_id ACT_WASH( "ACT_WASH" );
 
+static const efftype_id effect_adrenaline( "adrenaline" );
+static const efftype_id effect_antibiotic( "antibiotic" );
+static const efftype_id effect_antibiotic_visible( "antibiotic_visible" );
+static const efftype_id effect_asthma( "asthma" );
+static const efftype_id effect_attention( "attention" );
+static const efftype_id effect_beartrap( "beartrap" );
+static const efftype_id effect_bite( "bite" );
+static const efftype_id effect_bleed( "bleed" );
+static const efftype_id effect_blind( "blind" );
+static const efftype_id effect_bloodworms( "bloodworms" );
+static const efftype_id effect_boomered( "boomered" );
+static const efftype_id effect_bouldering( "bouldering" );
+static const efftype_id effect_brainworms( "brainworms" );
+static const efftype_id effect_cig( "cig" );
+static const efftype_id effect_contacts( "contacts" );
+static const efftype_id effect_corroding( "corroding" );
+static const efftype_id effect_crushed( "crushed" );
+static const efftype_id effect_cureall( "cureall" );
+static const efftype_id effect_datura( "datura" );
+static const efftype_id effect_dazed( "dazed" );
+static const efftype_id effect_dermatik( "dermatik" );
+static const efftype_id effect_docile( "docile" );
+static const efftype_id effect_downed( "downed" );
+static const efftype_id effect_drunk( "drunk" );
+static const efftype_id effect_earphones( "earphones" );
+
 static const skill_id skill_computer( "computer" );
 static const skill_id skill_cooking( "cooking" );
 static const skill_id skill_electronics( "electronics" );

src/iuse_actor.cpp

@@ -85,6 +85,13 @@ static const activity_id ACT_SPELLCASTING( "ACT_SPELLCASTING" );
 static const activity_id ACT_STUDY_SPELL( "ACT_STUDY_SPELL" );
 static const activity_id ACT_START_FIRE( "ACT_START_FIRE" );
 
+static const efftype_id effect_asthma( "asthma" );
+static const efftype_id effect_bandaged( "bandaged" );
+static const efftype_id effect_bite( "bite" );
+static const efftype_id effect_bleed( "bleed" );
+static const efftype_id effect_disinfected( "disinfected" );
+static const efftype_id effect_downed( "downed" );
+
 static const fault_id fault_bionic_salvaged( "fault_bionic_salvaged" );
 
 static const bionic_id bio_syringe( "bio_syringe" );

src/map_field.cpp

@@ -67,6 +67,10 @@ static const species_id SPIDER( "SPIDER" );
 
 static const bionic_id bio_heatsink( "bio_heatsink" );
 
+static const efftype_id effect_badpoison( "badpoison" );
+static const efftype_id effect_blind( "blind" );
+static const efftype_id effect_corroding( "corroding" );
+
 void map::create_burnproducts( const tripoint &p, const item &fuel, const units::mass &burned_mass )
 {
     std::vector<material_id> all_mats = fuel.made_of();

src/mattack_actors.cpp

@@ -26,6 +26,9 @@
 #include "point.h"
 #include "cata_string_consts.h"
 
+static const efftype_id effect_badpoison( "badpoison" );
+static const efftype_id effect_bite( "bite" );
+
 // Simplified version of the function in monattack.cpp
 static bool is_adjacent( const monster &z, const Creature &target )
 {

src/memorial_logger.cpp

@@ -21,6 +21,10 @@
 #include "stats_tracker.h"
 #include "cata_string_consts.h"
 
+static const efftype_id effect_adrenaline( "adrenaline" );
+static const efftype_id effect_datura( "datura" );
+static const efftype_id effect_drunk( "drunk" );
+
 static const trap_str_id tr_bubblewrap( "tr_bubblewrap" );
 static const trap_str_id tr_glass( "tr_glass" );
 static const trap_str_id tr_beartrap( "tr_beartrap" );

src/monattack.cpp

@@ -76,6 +76,21 @@
 
 static const activity_id ACT_RELOAD( "ACT_RELOAD" );
 
+static const efftype_id effect_assisted( "assisted" );
+static const efftype_id effect_bite( "bite" );
+static const efftype_id effect_bleed( "bleed" );
+static const efftype_id effect_blind( "blind" );
+static const efftype_id effect_boomered( "boomered" );
+static const efftype_id effect_controlled( "controlled" );
+static const efftype_id effect_corroding( "corroding" );
+static const efftype_id effect_countdown( "countdown" );
+static const efftype_id effect_darkness( "darkness" );
+static const efftype_id effect_dazed( "dazed" );
+static const efftype_id effect_deaf( "deaf" );
+static const efftype_id effect_dermatik( "dermatik" );
+static const efftype_id effect_downed( "downed" );
+static const efftype_id effect_dragging( "dragging" );
+
 static const skill_id skill_gun( "gun" );
 static const skill_id skill_launcher( "launcher" );
 static const skill_id skill_melee( "melee" );

src/mondeath.cpp

@@ -49,6 +49,11 @@
 #include "mattack_actors.h"
 #include "cata_string_consts.h"
 
+static const efftype_id effect_amigara( "amigara" );
+static const efftype_id effect_boomered( "boomered" );
+static const efftype_id effect_controlled( "controlled" );
+static const efftype_id effect_darkness( "darkness" );
+
 static const species_id species_BLOB( "BLOB" );
 static const species_id ZOMBIE( "ZOMBIE" );
 

src/monexamine.cpp

@@ -41,6 +41,8 @@
 static const activity_id ACT_MILK( "ACT_MILK" );
 static const activity_id ACT_PLAY_WITH_PET( "ACT_PLAY_WITH_PET" );
 
+static const efftype_id effect_controlled( "controlled" );
+
 static const skill_id skill_survival( "survival" );
 
 static const species_id ZOMBIE( "ZOMBIE" );

src/monmove.cpp

@@ -43,6 +43,12 @@
 #include "string_formatter.h"
 #include "cata_string_consts.h"
 
+static const efftype_id effect_bouldering( "bouldering" );
+static const efftype_id effect_countdown( "countdown" );
+static const efftype_id effect_docile( "docile" );
+static const efftype_id effect_downed( "downed" );
+static const efftype_id effect_dragging( "dragging" );
+
 static const species_id FUNGUS( "FUNGUS" );
 static const species_id INSECT( "INSECT" );
 static const species_id SPIDER( "SPIDER" );