Fix text (#82583)

Author: Maleclypse

data/json/monster_special_attacks/monster_attacks.json

@@ -704,12 +704,12 @@
     "effects": [ { "id": "dermatik", "duration": 86400, "affect_hit_bp": true } ],
     "cooldown": 25,
     "move_cost": 300,
-    "hit_dmg_u": "The %1$s sinks its ovipositor into your %2$s!",
-    "hit_dmg_npc": "The %1$s sinks its ovipositor into <npcname>'s %2$s!",
-    "miss_msg_u": "The %s tries to land on you, but you dodge!",
-    "miss_msg_npc": "The %1$s tries to land on <npcname>, but they dodge!",
-    "no_dmg_msg_u": "The %1$s lands on your %2$s, but can't penetrate your armor!",
-    "no_dmg_msg_npc": "The %1$s lands on <npcname>'s %2$s, but can't penetrate their armor!"
+    "hit_dmg_u": "%1$s sinks its ovipositor into your %2$s!",
+    "hit_dmg_npc": "%1$s sinks its ovipositor into <npcname>'s %2$s!",
+    "miss_msg_u": "%s tries to land on you, but you dodge!",
+    "miss_msg_npc": "%s tries to land on <npcname>, but they dodge!",
+    "no_dmg_msg_u": "%1$s lands on your %2$s, but can't penetrate your armor!",
+    "no_dmg_msg_npc": "%1$s lands on <npcname>'s %2$s, but can't penetrate their armor!"
   },
   {
     "type": "monster_attack",
@@ -732,12 +732,12 @@
       ]
     },
     "effects": [ { "id": "venom_pain", "duration": 54000, "affect_hit_bp": true } ],
-    "hit_dmg_u": "Using its filaments, the %s pulls you close.",
-    "hit_dmg_npc": "Using its filaments, the %s pulls <npcname> close.",
-    "miss_msg_u": "The %s spews filaments at you but misses.",
-    "miss_msg_npc": "The %s spews filaments at <npcname> but misses.",
-    "no_dmg_msg_u": "Using its filaments, the %s pulls you close but can't penetrate your armor.",
-    "no_dmg_msg_npc": "Using its filaments, the %s pulls <npcname> close but can't penetrate their armor."
+    "hit_dmg_u": "%s pulls you close using its filaments.",
+    "hit_dmg_npc": "%s pulls <npcname> close using its filaments.",
+    "miss_msg_u": "%s spews filaments at you but misses.",
+    "miss_msg_npc": "%s spews filaments at <npcname> but misses.",
+    "no_dmg_msg_u": "%s pulls you close using its filaments, but can't penetrate your armor.",
+    "no_dmg_msg_npc": "%s pulls <npcname> close using its filaments, but can't penetrate their armor."
   },
   {
     "type": "monster_attack",
@@ -752,12 +752,12 @@
     "max_mul": 1.5,
     "condition": { "not": { "u_has_effect": "sectioned_filaments" } },
     "effects": [ { "id": "venom_pain", "duration": 54000, "affect_hit_bp": true } ],
-    "hit_dmg_u": "The %s lashes at your %2$s.",
-    "hit_dmg_npc": "The %s lashes at <npcname> %2$s.",
-    "miss_msg_u": "The %s lashes at your %2$s but misses.",
-    "miss_msg_npc": "The %s lashes at <npcname> %2$s but misses.",
-    "no_dmg_msg_u": "The %s lashes at your %2$s but can't penetrate your armor.",
-    "no_dmg_msg_npc": "The %s lashes at <npcname> %2$s but can't penetrate their armor."
+    "hit_dmg_u": "%1$s lashes at your %2$s.",
+    "hit_dmg_npc": "%1$s lashes at <npcname>'s %2$s.",
+    "miss_msg_u": "%1$s lashes at your %2$s but misses.",
+    "miss_msg_npc": "%1$s lashes at <npcname>'s %2$s but misses.",
+    "no_dmg_msg_u": "%1$s lashes at your %2$s, but can't penetrate your armor.",
+    "no_dmg_msg_npc": "%1$s lashes at <npcname>'s %2$s, but can't penetrate their armor."
   },
   {
     "type": "monster_attack",
@@ -779,12 +779,12 @@
       ]
     },
     "effects": [ { "id": "venom_pain", "duration": 54000, "affect_hit_bp": true } ],
-    "hit_dmg_u": "The %s wraps its filaments around your %2$s.",
-    "hit_dmg_npc": "The %s wraps its filaments around <npcname>'s %2$s.",
-    "miss_msg_u": "The %s tries to wrap its filaments around your %2$s but misses.",
-    "miss_msg_npc": "The %s tries to wrap its filaments around <npcname> %2$s but misses.",
-    "no_dmg_msg_u": "The %s wraps its filaments around your %2$s but can't penetrate your armor.",
-    "no_dmg_msg_npc": "The %s wraps its filaments around <npcname>'s %2$s but can't penetrate their armor."
+    "hit_dmg_u": "%1$s wraps its filaments around your %2$s.",
+    "hit_dmg_npc": "%1$s wraps its filaments around <npcname>'s %2$s.",
+    "miss_msg_u": "%1$s tries to wrap its filaments around your %2$s but misses.",
+    "miss_msg_npc": "%1$s tries to wrap its filaments around <npcname>'s %2$s but misses.",
+    "no_dmg_msg_u": "%1$s wraps its filaments around your %2$s, but can't penetrate your armor.",
+    "no_dmg_msg_npc": "%1$s wraps its filaments around <npcname>'s %2$s, but can't penetrate their armor."
   },
   {
     "type": "monster_attack",
@@ -801,11 +801,11 @@
     "condition": {
       "and": [ { "u_has_flag": "GRAB_FILTER" }, { "npc_has_flag": "GRAB" }, { "not": { "u_has_effect": "sectioned_filaments" } } ]
     },
-    "hit_dmg_u": "The %s pulls your %2$s in its orifice and starts crushing it.",
-    "hit_dmg_npc": "The %s pulls <npcname>'s %2$s in its orifice and starts crushing it.",
-    "miss_msg_u": "The %s tries to pulls your %2$s in its orifice but misses.",
-    "miss_msg_npc": "The %s tries to pulls <npcname>'s %2$s in its orifice but misses.",
-    "no_dmg_msg_u": "The %s pulls your %2$s in its orifice and starts crushing it but can't penetrate your armor.",
-    "no_dmg_msg_npc": "The %s pulls <npcname>'s %2$s in its orifice and starts crushing it but can't penetrate their armor."
+    "hit_dmg_u": "%1$s pulls your %2$s in its orifice and starts crushing it.",
+    "hit_dmg_npc": "%1$s pulls <npcname>'s %2$s in its orifice and starts crushing it.",
+    "miss_msg_u": "%1$s tries to pulls your %2$s in its orifice but misses.",
+    "miss_msg_npc": "%1$s tries to pulls <npcname>'s %2$s in its orifice but misses.",
+    "no_dmg_msg_u": "%1$s pulls your %2$s in its orifice and starts crushing it, but can't penetrate your armor.",
+    "no_dmg_msg_npc": "%1$s pulls <npcname>'s %2$s in its orifice and starts crushing it, but can't penetrate their armor."
   }
 ]

data/mods/MindOverMatter/monsters/animal_psychics.json

@@ -325,7 +325,7 @@
         "spell_data": { "id": "telepathic_fear_blast_monster", "min_level": 2 },
         "cooldown": { "math": [ "9 + rand(18)" ] },
         "condition": { "not": { "u_has_flag": "NO_PSIONICS" } },
-        "monster_message": "%1$'s third eye opens and it coos!"
+        "monster_message": "%s's third eye opens and it coos!"
       },
       { "id": "pigeon_aura", "type": "spell", "spell_data": { "id": "pigeon_aura", "min_level": 4 }, "cooldown": 200 }
     ],

src/activity_item_handling.cpp

@@ -260,7 +260,8 @@ static std::vector<item_location> try_to_put_into_vehicle( Character &c, item_dr
                 result.emplace_back( c.get_wielded_item() );
             } else {
                 const std::string ter_name = here.name( where );
-                add_msg( _( "The %s falls to the %s." ), it.tname(), ter_name );
+                //~ %1$s - item name, %2$s - terrain name
+                add_msg( _( "The %1$s falls to the %2$s." ), it.tname(), ter_name );
                 result.push_back( here.add_item_or_charges_ret_loc( where, it ) );
             }
         }
@@ -295,24 +296,24 @@ static std::vector<item_location> try_to_put_into_vehicle( Character &c, item_dr
             case item_drop_reason::too_large:
                 c.add_msg_if_player(
                     n_gettext(
-                        "There's no room in your inventory for the %s, so you drop it into the %s's %s.",
-                        "There's no room in your inventory for the %s, so you drop them into the %s's %s.",
+                        "There's no room in your inventory for the %1$s, so you drop it into the %2$s's %3$s.",
+                        "There's no room in your inventory for the %1$s, so you drop them into the %2$s's %3$s.",
                         dropcount ),
                     it_name, veh.name, part_name
                 );
                 break;
             case item_drop_reason::too_heavy:
                 c.add_msg_if_player(
-                    n_gettext( "The %s is too heavy to carry, so you drop it into the %s's %s.",
-                               "The %s are too heavy to carry, so you drop them into the %s's %s.", dropcount ),
+                    n_gettext( "The %1$s is too heavy to carry, so you drop it into the %2$s's %3$s.",
+                               "The %1$s are too heavy to carry, so you drop them into the %2$s's %3$s.", dropcount ),
                     it_name, veh.name, part_name
                 );
                 break;
             case item_drop_reason::tumbling:
                 c.add_msg_if_player(
                     m_bad,
-                    n_gettext( "Your %s tumbles into the %s's %s.",
-                               "Your %s tumble into the %s's %s.", dropcount ),
+                    n_gettext( "Your %1$s tumbles into the %2$s's %3$s.",
+                               "Your %1$s tumble into the %2$s's %3$s.", dropcount ),
                     it_name, veh.name, part_name
                 );
                 break;
@@ -3503,7 +3504,7 @@ bool generic_multi_activity_handler( player_activity &act, Character &you, bool
     if( !check_only && you.is_npc() ) {
         if( src_sorted.empty() ) {
             add_msg( m_neutral,
-                     _( "%1s failed to perform the %2$s activity because no suitable locations were found." ),
+                     _( "%1$s failed to perform the %2$s activity because no suitable locations were found." ),
                      you.disp_name(), activity_to_restore.c_str() );
         } else if( reason.no_path ) {
             add_msg( m_neutral,

src/character.cpp

@@ -7985,7 +7985,7 @@ ret_val<void> Character::can_wield( const item &it ) const
     }
 
     if( is_armed() && !can_unwield( weapon ).success() ) {
-        return ret_val<void>::make_failure( _( "The %s prevents you from wielding the %s." ),
+        return ret_val<void>::make_failure( _( "The %1$s prevents you from wielding the %2$s." ),
                                             weapname(), it.tname() );
     }
     monster *mount = mounted_creature.get();
@@ -12410,7 +12410,7 @@ const Character *Character::get_book_reader( const item &book,
         // Low morale still permits skimming
         reasons.emplace_back( is_avatar() ?
                               _( "What's the point of studying?  (Your morale is too low!)" )  :
-                              string_format( _( "What's the point of studying?  (%s)'s morale is too low!)" ), disp_name() ) );
+                              string_format( _( "What's the point of studying?  (%s's morale is too low!)" ), disp_name() ) );
         return nullptr;
     }
     if( condition & read_condition_result::CANT_UNDERSTAND ) {

src/explosion.cpp

@@ -410,7 +410,7 @@ static void do_blast( map *m, const Creature *source, const tripoint_bub_ms &p,
             add_msg_debug( debugmode::DF_EXPLOSION, "%s for %d raw, %d actual", hit_part_name, part_dam,
                            res_dmg );
             if( res_dmg > 0 ) {
-                pl->add_msg_if_player( m_bad, _( "Your %s is hit for %d damage!" ), hit_part_name, res_dmg );
+                pl->add_msg_if_player( m_bad, _( "Your %1$s is hit for %2$d damage!" ), hit_part_name, res_dmg );
             }
         }
     }

src/handle_action.cpp

@@ -777,9 +777,10 @@ static void grab()
         if( vp->has_loaded_furniture() ) {
             furn_str_id furn( vp->part_with_feature( "FURNITURE_TIEDOWN",
                               true )->part().get_base().get_var( "tied_down_furniture" ) );
-            if( query_yn( _( "Grab %s on %s?" ), furn->name(), veh_name ) ) {
+            //~ %1$s - furniture name, %2$s - vehicle name
+            if( query_yn( _( "Grab %1$s on %2$s?" ), furn->name(), veh_name ) ) {
                 you.grab( object_type::FURNITURE_ON_VEHICLE, grabp - you.pos_bub() );
-                add_msg( m_info, _( "You grab the %s loaded on the %s." ), furn->name(), veh_name );
+                add_msg( m_info, _( "You grab the %1$s loaded on the %2$s." ), furn->name(), veh_name );
                 return;
             }
         }
@@ -1075,7 +1076,8 @@ avatar::smash_result avatar::smash( tripoint_bub_ms &smashp )
             if( !best_part_to_smash.first->smash_message.empty() ) {
                 add_msg( best_part_to_smash.first->smash_message, name_to_bash );
             } else {
-                add_msg( _( "You use your %s to smash the %s." ),
+                //~ %1$s - bodypart name in accusative, %2$s - furniture/terrain name
+                add_msg( _( "You use your %1$s to smash the %2$s." ),
                          body_part_name_accusative( best_part_to_smash.first ), name_to_bash );
             }
         }

src/item_pocket.cpp

@@ -821,7 +821,7 @@ void item_pocket::handle_liquid_or_spill( Character &guy, const item *avoid )
             item i_copy( *iter );
             guy.i_add_or_drop( i_copy, 1, avoid, &*iter );
             iter = contents.erase( iter );
-            guy.add_msg_if_player( m_warning, _( "The %s falls out of the %s." ), i_copy.display_name(),
+            guy.add_msg_if_player( m_warning, _( "The %1$s falls out of the %2$s." ), i_copy.display_name(),
                                    get_name() );
         }
     }

src/iuse_actor.cpp

@@ -4236,7 +4236,8 @@ bool place_trap_actor::is_allowed( Character &p, const tripoint_bub_ms &pos,
         }
     }
     if( needs_neighbor_terrain && !has_neighbor( pos, needs_neighbor_terrain ) ) {
-        p.add_msg_if_player( m_info, _( "The %s needs a %s adjacent to it." ), name,
+        //~ %1$s - trap name, %2$s - terrain name
+        p.add_msg_if_player( m_info, _( "The %1$s needs a %2$s adjacent to it." ), name,
                              needs_neighbor_terrain.obj().name() );
         return false;
     }
@@ -4249,6 +4250,7 @@ bool place_trap_actor::is_allowed( Character &p, const tripoint_bub_ms &pos,
                                  : _( "You can't place a %s there.  It contains a trap already." ),
                                  name );
         } else {
+            //~ %s - trap name
             p.add_msg_if_player( m_bad, _( "You trigger a %s!" ), existing_trap.name() );
             existing_trap.trigger( pos, p );
         }

src/magic_spell_effect.cpp

@@ -982,15 +982,15 @@ static void handle_remove_fd_fatigue_field( const std::pair<field, tripoint_bub_
                 caster.add_effect( effect_teleglow, 5_hours );
                 break;
             case 3:
-                std::string message_prefix = "A nearby";
-
-                if( caster.sees( here, field_position ) ) {
-                    message_prefix = "The";
+                if( sees_field ) {
+                    caster.add_msg_if_player( m_bad, _( "The %s pulls you in as it closes and ejects you violently!" ),
+                                              intensity_name );
+                } else {
+                    caster.add_msg_if_player( m_bad,
+                                              _( "A nearby %s pulls you in as it closes and ejects you violently!" ),
+                                              intensity_name );
                 }
 
-                caster.add_msg_if_player( m_bad,
-                                          _( "%s %s pulls you in as it closes and ejects you violently!" ),
-                                          message_prefix, intensity_name );
                 caster.as_character()->hurtall( 10, nullptr );
                 caster.add_effect( effect_teleglow, 630_minutes );
                 teleport::teleport_creature( caster );

src/monattack.cpp

@@ -2047,7 +2047,8 @@ static void poly_keep_speed( monster &mon, const mtype_id &id )
 
 static bool blobify( monster &blob, monster &target )
 {
-    add_msg_if_player_sees( target, m_warning, _( "%s is engulfed by %s!" ),
+    //~ %1$s and %2$s - monster names
+    add_msg_if_player_sees( target, m_warning, _( "%1$s is engulfed by %2$s!" ),
                             target.disp_name(), blob.disp_name() );
     switch( target.get_size() ) {
         case creature_size::tiny: