Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Translate "something" in monster attack messages #56200

Merged
merged 2 commits into from
Mar 20, 2022
Merged

Translate "something" in monster attack messages #56200

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6b0d8fd
Translate something
haveric Mar 18, 2022
07b69f5
Don't drop bracket
haveric Mar 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions src/monster.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1640,16 +1640,16 @@ bool monster::melee_attack( Creature &target, float accuracy )
if( u_see_my_spot && !target.in_sleep_state() ) {
if( target.is_avatar() ) {
if( target_dodging ) {
add_msg( _( "You dodge %s." ), u_see_me ? disp_name() : "something" );
add_msg( _( "You dodge %s." ), u_see_me ? disp_name() : _( "something" ) );
} else {
add_msg( _( "%s misses you." ), u_see_me ? disp_name( false, true ) : "Something" );
add_msg( _( "%s misses you." ), u_see_me ? disp_name( false, true ) : _( "Something" ) );
}
} else if( target.is_npc() && target_dodging ) {
add_msg( _( "%1$s dodges %2$s attack." ),
target.disp_name(), u_see_me ? name() : "something" );
target.disp_name(), u_see_me ? name() : _( "something" ) );
} else {
add_msg( _( "%1$s misses %2$s!" ),
u_see_me ? disp_name( false, true ) : "Something", target.disp_name() );
u_see_me ? disp_name( false, true ) : _( "Something" ), target.disp_name() );
}
} else if( target.is_avatar() ) {
add_msg( _( "You dodge an attack from an unseen source." ) );
Expand All @@ -1662,7 +1662,7 @@ bool monster::melee_attack( Creature &target, float accuracy )
sfx::get_heard_volume( target.pos() ) );
sfx::do_player_death_hurt( dynamic_cast<Character &>( target ), false );
//~ 1$s is attacker name, 2$s is bodypart name in accusative.
add_msg( m_bad, _( "%1$s hits your %2$s." ), u_see_me ? disp_name( false, true ) : "Something",
add_msg( m_bad, _( "%1$s hits your %2$s." ), u_see_me ? disp_name( false, true ) : _( "Something" ),
body_part_name_accusative( dealt_dam.bp_hit ) );
} else if( target.is_npc() ) {
if( has_effect( effect_ridden ) && has_flag( MF_RIDEABLE_MECH ) &&
Expand All @@ -1672,7 +1672,7 @@ bool monster::melee_attack( Creature &target, float accuracy )
total_dealt );
} else {
//~ %1$s: attacker name, %2$s: target NPC name, %3$s: bodypart name in accusative
add_msg( _( "%1$s hits %2$s %3$s." ), u_see_me ? disp_name( false, true ) : "Something",
add_msg( _( "%1$s hits %2$s %3$s." ), u_see_me ? disp_name( false, true ) : _( "Something" ),
target.disp_name( true ),
body_part_name_accusative( dealt_dam.bp_hit ) );
}
Expand Down Expand Up @@ -1703,14 +1703,14 @@ bool monster::melee_attack( Creature &target, float accuracy )
if( target.is_avatar() ) {
//~ 1$s is attacker name, 2$s is bodypart name in accusative, 3$s is armor name
add_msg( _( "%1$s hits your %2$s, but your %3$s protects you." ), u_see_me ? disp_name( false,
true ) : "Something",
true ) : _( "Something" ),
body_part_name_accusative( dealt_dam.bp_hit ), target.skin_name() );
} else if( target.is_npc() ) {
//~ $1s is monster name, %2$s is that monster target name,
//~ $3s is target bodypart name in accusative, $4s is the monster target name,
//~ 5$s is target armor name.
add_msg( _( "%1$s hits %2$s %3$s but is stopped by %4$s %5$s." ), u_see_me ? disp_name( false,
true ) : "Something",
true ) : _( "Something" ),
target.disp_name( true ),
body_part_name_accusative( dealt_dam.bp_hit ),
target.disp_name( true ),
Expand All @@ -1719,7 +1719,7 @@ bool monster::melee_attack( Creature &target, float accuracy )
//~ $1s is monster name, %2$s is that monster target name,
//~ $3s is target armor name.
add_msg( _( "%1$s hits %2$s but is stopped by its %3$s." ),
u_see_me ? disp_name( false, true ) : "Something",
u_see_me ? disp_name( false, true ) : _( "Something" ),
target.disp_name(),
target.skin_name() );
}
Expand Down