diff --git a/src/inventory_ui.cpp b/src/inventory_ui.cpp index bf6bb344729c8..00a5e398ee0f0 100644 --- a/src/inventory_ui.cpp +++ b/src/inventory_ui.cpp @@ -396,6 +396,7 @@ void uistatedata::serialize( JsonOut &json ) const json.member( "distraction_temperature", distraction_temperature ); json.member( "distraction_mutation", distraction_mutation ); json.member( "distraction_oxygen", distraction_oxygen ); + json.member( "distraction_withdrawal", distraction_withdrawal ); json.member( "numpad_navigation", numpad_navigation ); json.member( "input_history" ); @@ -468,6 +469,7 @@ void uistatedata::deserialize( const JsonObject &jo ) jo.read( "distraction_temperature", distraction_temperature ); jo.read( "distraction_mutation", distraction_mutation ); jo.read( "distraction_oxygen", distraction_oxygen ); + jo.read( "distraction_withdrawal", distraction_withdrawal ); jo.read( "numpad_navigation", numpad_navigation ); if( !jo.read( "vmenu_show_items", vmenu_show_items ) ) { diff --git a/src/iuse.cpp b/src/iuse.cpp index 8e928130cdd36..e06467208e8cf 100644 --- a/src/iuse.cpp +++ b/src/iuse.cpp @@ -5873,37 +5873,33 @@ static std::string effects_description_for_creature( Creature *const creature, s status( status ), intensity_lower_limit( 0 ) {} }; static const std::unordered_map vec_effect_status = { - { effect_onfire, ef_con( to_translation( " is on fire. " ) ) }, - { effect_bleed, ef_con( to_translation( " is bleeding. " ), 1 ) }, - { effect_happy, ef_con( to_translation( " looks happy. " ), 13 ) }, + { effect_onfire, ef_con( to_translation( " is on fire." ) ) }, + { effect_bleed, ef_con( to_translation( " is bleeding." ), 1 ) }, + { effect_happy, ef_con( to_translation( " looks happy." ), 13 ) }, { effect_downed, ef_con( translation(), to_translation( "downed" ) ) }, { effect_in_pit, ef_con( translation(), to_translation( "stuck" ) ) }, - { effect_stunned, ef_con( to_translation( " is stunned. " ) ) }, - { effect_dazed, ef_con( to_translation( " is dazed. " ) ) }, - // NOLINTNEXTLINE(cata-text-style): spaces required for concatenation - { effect_beartrap, ef_con( to_translation( " is stuck in beartrap. " ) ) }, - // NOLINTNEXTLINE(cata-text-style): spaces required for concatenation - { effect_laserlocked, ef_con( to_translation( " have tiny red dot on body. " ) ) }, - { effect_boomered, ef_con( to_translation( " has bile covering their eyes. " ) ) }, - { effect_glowing, ef_con( to_translation( " is covered in glowing goo. " ) ) }, - { effect_slimed, ef_con( to_translation( " is covered in thick goo. " ) ) }, - { effect_bile_irritant, ef_con( to_translation( " is covered in bile. " ) ) }, - { effect_corroding, ef_con( to_translation( " is covered in acid. " ) ) }, - { effect_sap, ef_con( to_translation( " is coated in sap. " ) ) }, - { effect_webbed, ef_con( to_translation( " is covered in webs. " ) ) }, - { effect_spores, ef_con( to_translation( " is covered in spores. " ), 1 ) }, - { effect_crushed, ef_con( to_translation( " lies under collapsed debris. " ), to_translation( "lies" ) ) }, - { effect_lack_sleep, ef_con( to_translation( " looks very tired. " ) ) }, - { effect_lying_down, ef_con( to_translation( " is sleeping. " ), to_translation( "lies" ) ) }, - { effect_sleep, ef_con( to_translation( " is sleeping. " ), to_translation( "lies" ) ) }, - { effect_haslight, ef_con( to_translation( " is lit. " ) ) }, - { effect_monster_saddled, ef_con( to_translation( " is saddled. " ) ) }, - // NOLINTNEXTLINE(cata-text-style): spaces required for concatenation - { effect_harnessed, ef_con( to_translation( " is being harnessed by a vehicle. " ) ) }, - { effect_monster_armor, ef_con( to_translation( " is wearing armor. " ) ) }, - // NOLINTNEXTLINE(cata-text-style): spaces required for concatenation - { effect_has_bag, ef_con( to_translation( " have bag attached. " ) ) }, - { effect_tied, ef_con( to_translation( " is tied. " ) ) }, + { effect_stunned, ef_con( to_translation( " is stunned." ) ) }, + { effect_dazed, ef_con( to_translation( " is dazed." ) ) }, + { effect_beartrap, ef_con( to_translation( " is stuck in beartrap." ) ) }, + { effect_laserlocked, ef_con( to_translation( " have tiny red dot on body." ) ) }, + { effect_boomered, ef_con( to_translation( " has bile covering their eyes." ) ) }, + { effect_glowing, ef_con( to_translation( " is covered in glowing goo." ) ) }, + { effect_slimed, ef_con( to_translation( " is covered in thick goo." ) ) }, + { effect_bile_irritant, ef_con( to_translation( " is covered in bile." ) ) }, + { effect_corroding, ef_con( to_translation( " is covered in acid." ) ) }, + { effect_sap, ef_con( to_translation( " is coated in sap." ) ) }, + { effect_webbed, ef_con( to_translation( " is covered in webs." ) ) }, + { effect_spores, ef_con( to_translation( " is covered in spores." ), 1 ) }, + { effect_crushed, ef_con( to_translation( " lies under collapsed debris." ), to_translation( "lies" ) ) }, + { effect_lack_sleep, ef_con( to_translation( " looks very tired." ) ) }, + { effect_lying_down, ef_con( to_translation( " is sleeping." ), to_translation( "lies" ) ) }, + { effect_sleep, ef_con( to_translation( " is sleeping." ), to_translation( "lies" ) ) }, + { effect_haslight, ef_con( to_translation( " is lit." ) ) }, + { effect_monster_saddled, ef_con( to_translation( " is saddled." ) ) }, + { effect_harnessed, ef_con( to_translation( " is being harnessed by a vehicle." ) ) }, + { effect_monster_armor, ef_con( to_translation( " is wearing armor." ) ) }, + { effect_has_bag, ef_con( to_translation( " have bag attached." ) ) }, + { effect_tied, ef_con( to_translation( " is tied." ) ) }, { effect_bouldering, ef_con( translation(), to_translation( "balancing" ) ) } }; @@ -5912,7 +5908,8 @@ static std::string effects_description_for_creature( Creature *const creature, s for( const auto &pair : vec_effect_status ) { if( creature->get_effect_int( pair.first ) > pair.second.intensity_lower_limit ) { if( !pair.second.status.empty() ) { - figure_effects += pronoun_gender + pair.second.status; + figure_effects += string_format( pgettext( "effects_description_for_creature", "%s%s " ), + pronoun_gender, pair.second.status ); } if( !pair.second.pose.empty() ) { pose = pair.second.pose.translated();