From 4cdab5a1e39f02d607e09d13cf043e40eb0c9c1f Mon Sep 17 00:00:00 2001 From: Qrox Date: Tue, 15 Oct 2019 22:14:36 +0800 Subject: [PATCH] Replace three ascii dots with the unicode ellipsis --- src/action.cpp | 6 +- src/activity_handlers.cpp | 12 +-- src/addiction.cpp | 12 +-- src/advanced_inv.cpp | 4 +- src/animation.cpp | 2 +- src/avatar.cpp | 12 +-- src/avatar_action.cpp | 8 +- src/bionics.cpp | 2 +- src/computer.cpp | 120 ++++++++++++++-------------- src/construction.cpp | 4 +- src/consumption.cpp | 22 +++--- src/crafting.cpp | 10 +-- src/debug_menu.cpp | 20 ++--- src/defense.cpp | 2 +- src/effect.cpp | 22 +++--- src/faction_camp.cpp | 132 +++++++++++++++---------------- src/game.cpp | 32 ++++---- src/game_inventory.cpp | 2 +- src/handle_action.cpp | 16 ++-- src/iexamine.cpp | 70 ++++++++-------- src/iuse.cpp | 94 +++++++++++----------- src/iuse_actor.cpp | 6 +- src/iuse_software_kitten.cpp | 10 +-- src/main.cpp | 4 +- src/mattack_actors.cpp | 2 +- src/mission_companion.cpp | 88 ++++++++++----------- src/mission_start.cpp | 6 +- src/mission_util.cpp | 2 +- src/monattack.cpp | 42 +++++----- src/mondeath.cpp | 2 +- src/monster.cpp | 2 +- src/mutation.cpp | 8 +- src/npcmove.cpp | 6 +- src/npctalk.cpp | 20 ++--- src/npctalk_funcs.cpp | 18 ++--- src/output.cpp | 2 +- src/overmap.cpp | 2 +- src/player.cpp | 36 ++++----- src/player_hardcoded_effects.cpp | 8 +- src/regional_settings.cpp | 26 +++--- src/teleport.cpp | 2 +- src/trapfunc.cpp | 6 +- src/veh_interact.cpp | 20 ++--- src/vehicle_display.cpp | 6 +- src/vehicle_use.cpp | 2 +- src/weather.cpp | 4 +- src/wish.cpp | 2 +- src/worldfactory.cpp | 2 +- tests/test_main.cpp | 4 +- 49 files changed, 471 insertions(+), 471 deletions(-) diff --git a/src/action.cpp b/src/action.cpp index 7d7620bba5926..4cad62d802e96 100644 --- a/src/action.cpp +++ b/src/action.cpp @@ -771,7 +771,7 @@ action_id handle_action_menu() } REGISTER_ACTION( ACTION_HELP ); if( ( entry = &entries.back() ) ) { - entry->txt += "..."; // help _is_a menu. + entry->txt += "…"; // help _is_a menu. } if( hotkey_for_action( ACTION_DEBUG ) > -1 ) { REGISTER_CATEGORY( _( "Debug" ) ); // register with global key @@ -809,7 +809,7 @@ action_id handle_action_menu() } else if( category == _( "Debug" ) ) { REGISTER_ACTION( ACTION_DEBUG ); if( ( entry = &entries.back() ) ) { - entry->txt += "..."; // debug _is_a menu. + entry->txt += "…"; // debug _is_a menu. } #if !defined(TILES) REGISTER_ACTION( ACTION_TOGGLE_FULLSCREEN ); @@ -892,7 +892,7 @@ action_id handle_action_menu() if( category != "back" ) { std::string msg = _( "Back" ); - msg += "..."; + msg += "…"; entries.emplace_back( 2 * NUM_ACTIONS, true, hotkey_for_action( ACTION_ACTIONMENU ), msg ); } diff --git a/src/activity_handlers.cpp b/src/activity_handlers.cpp index 3cf5040bf5bc0..c7017f29e708a 100644 --- a/src/activity_handlers.cpp +++ b/src/activity_handlers.cpp @@ -2919,7 +2919,7 @@ void activity_handlers::find_mount_do_turn( player_activity *act, player *p ) void activity_handlers::wait_npc_finish( player_activity *act, player *p ) { - p->add_msg_if_player( _( "%s finishes with you..." ), act->str_values[0] ); + p->add_msg_if_player( _( "%s finishes with you…" ), act->str_values[0] ); act->set_to_null(); } @@ -2969,7 +2969,7 @@ void activity_handlers::try_sleep_do_turn( player_activity *act, player *p ) p->fall_asleep(); p->remove_value( "sleep_query" ); } else if( one_in( 1000 ) ) { - p->add_msg_if_player( _( "You toss and turn..." ) ); + p->add_msg_if_player( _( "You toss and turn…" ) ); } if( calendar::once_every( 30_minutes ) ) { try_sleep_query( act, p ); @@ -3172,7 +3172,7 @@ void activity_handlers::operation_do_turn( player_activity *act, player *p ) void activity_handlers::try_sleep_finish( player_activity *act, player *p ) { if( !p->has_effect( effect_sleep ) ) { - p->add_msg_if_player( _( "You try to sleep, but can't..." ) ); + p->add_msg_if_player( _( "You try to sleep, but can't…" ) ); } act->set_to_null(); } @@ -4143,7 +4143,7 @@ void activity_handlers::robot_control_finish( player_activity *act, player *p ) return; // Do not do the other effects if the robot died } if( one_in( 3 ) ) { - p->add_msg_if_player( _( "...and turns friendly!" ) ); + p->add_msg_if_player( _( "…and turns friendly!" ) ); if( one_in( 3 ) ) { //did the robot became friendly permanently? z->friendly = -1; //it did } else { @@ -4151,7 +4151,7 @@ void activity_handlers::robot_control_finish( player_activity *act, player *p ) } } } else { - p->add_msg_if_player( _( "...but the robot refuses to acknowledge you as an ally!" ) ); + p->add_msg_if_player( _( "…but the robot refuses to acknowledge you as an ally!" ) ); } p->practice( skill_id( "computer" ), 10 ); } @@ -4440,7 +4440,7 @@ void activity_handlers::mind_splicer_finish( player_activity *act, player *p ) return; } item &data_card = *act->targets[0]; - p->add_msg_if_player( m_info, _( "...you finally find the memory banks." ) ); + p->add_msg_if_player( m_info, _( "…you finally find the memory banks." ) ); p->add_msg_if_player( m_info, _( "The kit makes a copy of the data inside the bionic." ) ); data_card.contents.clear(); data_card.put_in( item( "mind_scan_robofac" ) ); diff --git a/src/addiction.cpp b/src/addiction.cpp index 17243d1bd7aad..9541362c6408c 100644 --- a/src/addiction.cpp +++ b/src/addiction.cpp @@ -82,7 +82,7 @@ void addict_effect( player &u, addiction &add ) u.stim--; } if( rng( 8, 400 ) < in ) { - u.add_msg_if_player( m_bad, _( "Your hands start shaking... you need it bad!" ) ); + u.add_msg_if_player( m_bad, _( "Your hands start shaking… you need it bad!" ) ); u.add_effect( effect_shakes, 2_minutes ); } break; @@ -104,8 +104,8 @@ void addict_effect( player &u, addiction &add ) u.add_morale( morale_type, -35, -10 * in ); } else if( rng( 8, 300 ) < in ) { const std::string msg_2 = add.type == ADD_ALCOHOL ? - _( "Your hands start shaking... you need a drink bad!" ) : - _( "You're shaking... you need some diazepam!" ); + _( "Your hands start shaking… you need a drink bad!" ) : + _( "You're shaking… you need some diazepam!" ); u.add_msg_if_player( m_bad, msg_2 ); u.add_morale( morale_type, -35, -10 * in ); u.add_effect( effect_shakes, 5_minutes ); @@ -143,7 +143,7 @@ void addict_effect( player &u, addiction &add ) u.mod_healthy_mod( -1, -in * 30 ); } if( one_in( 20 ) && dice( 2, 20 ) < in ) { - u.add_msg_if_player( m_bad, _( "Your hands start shaking... you need some painkillers." ) ); + u.add_msg_if_player( m_bad, _( "Your hands start shaking… you need some painkillers." ) ); u.add_morale( MORALE_CRAVING_OPIATE, -40, -10 * in ); u.add_effect( effect_shakes, 2_minutes + in * 30_seconds ); } else if( one_in( 20 ) && dice( 2, 30 ) < in ) { @@ -167,7 +167,7 @@ void addict_effect( player &u, addiction &add ) u.add_msg_if_player( m_warning, _( "You feel depressed. Speed would help." ) ); u.add_morale( MORALE_CRAVING_SPEED, -25, -20 * in ); } else if( one_in( 10 ) && dice( 2, 80 ) < in ) { - u.add_msg_if_player( m_bad, _( "Your hands start shaking... you need a pick-me-up." ) ); + u.add_msg_if_player( m_bad, _( "Your hands start shaking… you need a pick-me-up." ) ); u.add_morale( MORALE_CRAVING_SPEED, -25, -20 * in ); u.add_effect( effect_shakes, in * 2_minutes ); } else if( one_in( 50 ) && dice( 2, 100 ) < in ) { @@ -216,7 +216,7 @@ void addict_effect( player &u, addiction &add ) } } else if( in > 5 || one_in( 500 - 15 * in ) ) { u.add_msg_if_player( m_warning, rng( 0, 6 ) < in ? _( "You haven't had any mutagen lately." ) : - _( "You could use some new parts..." ) ); + _( "You could use some new parts…" ) ); u.add_morale( MORALE_CRAVING_MUTAGEN, -5, -50 ); } break; diff --git a/src/advanced_inv.cpp b/src/advanced_inv.cpp index b6e45a7a26ad1..dedcc796fd69d 100644 --- a/src/advanced_inv.cpp +++ b/src/advanced_inv.cpp @@ -1199,7 +1199,7 @@ bool advanced_inventory::move_all_items( bool nested_call ) if( spane.get_area() == AIM_ALL ) { // move all to `AIM_WORN' doesn't make sense (see `MAX_WORN_PER_TYPE') if( dpane.get_area() == AIM_WORN ) { - popup( _( "You look at the items, then your clothes, and scratch your head..." ) ); + popup( _( "You look at the items, then your clothes, and scratch your head…" ) ); return false; } // if the source pane (AIM_ALL) is empty, then show a message and leave @@ -1419,7 +1419,7 @@ bool advanced_inventory::move_all_items( bool nested_call ) bool advanced_inventory::show_sort_menu( advanced_inventory_pane &pane ) { uilist sm; - sm.text = _( "Sort by..." ); + sm.text = _( "Sort by…" ); sm.addentry( SORTBY_NONE, true, 'u', _( "Unsorted (recently added first)" ) ); sm.addentry( SORTBY_NAME, true, 'n', get_sortname( SORTBY_NAME ) ); sm.addentry( SORTBY_WEIGHT, true, 'w', get_sortname( SORTBY_WEIGHT ) ); diff --git a/src/animation.cpp b/src/animation.cpp index c547918ebf1f1..ec58a3024863e 100644 --- a/src/animation.cpp +++ b/src/animation.cpp @@ -48,7 +48,7 @@ class basic_animation g->draw_panels(); query_popup() - .wait_message( "%s", _( "Hang on a bit..." ) ) + .wait_message( "%s", _( "Hang on a bit…" ) ) .on_top( true ) .show(); diff --git a/src/avatar.cpp b/src/avatar.cpp index 78840c2e03117..f4d64eaa3156a 100644 --- a/src/avatar.cpp +++ b/src/avatar.cpp @@ -392,7 +392,7 @@ bool avatar::read( int inventory_position, const bool continuous ) if( !has_identified( it.typeId() ) ) { if( reader != this ) { add_msg( m_info, fail_messages[0] ); - add_msg( m_info, _( "%s reads aloud..." ), reader->disp_name() ); + add_msg( m_info, _( "%s reads aloud…" ), reader->disp_name() ); } assign_activity( act ); return true; @@ -553,9 +553,9 @@ bool avatar::read( int inventory_position, const bool continuous ) if( !continuous || activity.position != act.position ) { if( reader != this ) { add_msg( m_info, fail_messages[0] ); - add_msg( m_info, _( "%s reads aloud..." ), reader->disp_name() ); + add_msg( m_info, _( "%s reads aloud…" ), reader->disp_name() ); } else if( !learners.empty() || !fun_learners.empty() ) { - add_msg( m_info, _( "You read aloud..." ) ); + add_msg( m_info, _( "You read aloud…" ) ); } } @@ -839,7 +839,7 @@ void avatar::do_read( item &book ) add_msg( m_info, _( "Rereading the %s isn't as much fun for %s." ), book.type_name(), names ); if( out_of_chapters.front() == disp_name() && one_in( 6 ) ) { - add_msg( m_info, _( "Maybe you should find something new to read..." ) ); + add_msg( m_info, _( "Maybe you should find something new to read…" ) ); } } @@ -916,9 +916,9 @@ void avatar::wake_up() } if( has_effect( effect_slept_through_alarm ) ) { if( has_bionic( bio_watch ) ) { - add_msg( m_warning, _( "It looks like you've slept through your internal alarm..." ) ); + add_msg( m_warning, _( "It looks like you've slept through your internal alarm…" ) ); } else { - add_msg( m_warning, _( "It looks like you've slept through the alarm..." ) ); + add_msg( m_warning, _( "It looks like you've slept through the alarm…" ) ); } } } diff --git a/src/avatar_action.cpp b/src/avatar_action.cpp index 12d350ead9328..2a7ab9755aeee 100644 --- a/src/avatar_action.cpp +++ b/src/avatar_action.cpp @@ -207,7 +207,7 @@ bool avatar_action::move( avatar &you, map &m, int dx, int dy, int dz ) } } if( newdist > curdist ) { - add_msg( m_info, _( "You cannot pull yourself away from the faultline..." ) ); + add_msg( m_info, _( "You cannot pull yourself away from the faultline…" ) ); return false; } } @@ -251,7 +251,7 @@ bool avatar_action::move( avatar &you, map &m, int dx, int dy, int dz ) add_msg( m_good, _( "Your willpower asserts itself, and so do you!" ) ); } else { you.moves -= rng( 2, 8 ) * 10; - add_msg( m_bad, _( "You're too pacified to strike anything..." ) ); + add_msg( m_bad, _( "You're too pacified to strike anything…" ) ); return false; } } @@ -596,7 +596,7 @@ bool avatar_action::fire_check( avatar &you, const map &m, const targeting_data add_msg( m_good, _( "Your eyes steel, and you raise your weapon!" ) ); } else { you.moves -= rng( 2, 5 ) * 10; - add_msg( m_bad, _( "You can't fire your weapon, it's too heavy..." ) ); + add_msg( m_bad, _( "You can't fire your weapon, it's too heavy…" ) ); // break a possible loop when aiming if( you.activity ) { you.cancel_activity(); @@ -877,7 +877,7 @@ void avatar_action::plthrow( avatar &you, int pos, add_msg( m_good, _( "You concentrate mightily, and your body obeys!" ) ); } else { you.moves -= rng( 2, 5 ) * 10; - add_msg( m_bad, _( "You can't muster up the effort to throw anything..." ) ); + add_msg( m_bad, _( "You can't muster up the effort to throw anything…" ) ); return; } } diff --git a/src/bionics.cpp b/src/bionics.cpp index 0edb8ac6f8557..1176a416fa2ba 100644 --- a/src/bionics.cpp +++ b/src/bionics.cpp @@ -1275,7 +1275,7 @@ int player::bionics_pl_skill( const skill_id &most_important_skill, const skill_ // People trained in bionics gain an additional advantage towards using it if( has_trait( trait_PROF_AUTODOC ) ) { pl_skill += 7; - add_msg( m_neutral, _( "A lifetime of augmentation has taught %s a thing or two..." ), + add_msg( m_neutral, _( "A lifetime of augmentation has taught %s a thing or two…" ), disp_name() ); } return pl_skill; diff --git a/src/computer.cpp b/src/computer.cpp index dad43e1aa20d1..36038b1d6aba5 100644 --- a/src/computer.cpp +++ b/src/computer.cpp @@ -161,7 +161,7 @@ void computer::use() wrefresh( w_border ); // Login - print_line( _( "Logging into %s..." ), _( name ) ); + print_line( _( "Logging into %s…" ), _( name ) ); if( security > 0 ) { if( calendar::turn < next_attempt ) { print_error( _( "Access is temporary blocked for security purposes." ) ); @@ -178,7 +178,7 @@ void computer::use() case 'n': case 'N': - query_any( _( "Shutting down... press any key." ) ); + query_any( _( "Shutting down… press any key." ) ); shutdown_terminal(); return; @@ -186,7 +186,7 @@ void computer::use() case 'Y': if( !hack_attempt( g->u ) ) { if( failures.empty() ) { - query_any( _( "Maximum login attempts exceeded. Press any key..." ) ); + query_any( _( "Maximum login attempts exceeded. Press any key…" ) ); shutdown_terminal(); return; } @@ -195,12 +195,12 @@ void computer::use() return; } else { // Successful hack attempt security = 0; - query_any( _( "Login successful. Press any key..." ) ); + query_any( _( "Login successful. Press any key…" ) ); reset_terminal(); } } } else { // No security - query_any( _( "Login successful. Press any key..." ) ); + query_any( _( "Login successful. Press any key…" ) ); reset_terminal(); } @@ -401,7 +401,7 @@ void computer::activate_function( computer_action action ) /* fallthrough */ case COMPACT_OPEN: g->m.translate_radius( t_door_metal_locked, t_floor, 25.0, g->u.pos(), true ); - query_any( _( "Doors opened. Press any key..." ) ); + query_any( _( "Doors opened. Press any key…" ) ); break; //LOCK AND UNLOCK are used to build more complex buildings @@ -411,7 +411,7 @@ void computer::activate_function( computer_action action ) // player position to determine which terrain tiles to edit. case COMPACT_LOCK: g->m.translate_radius( t_door_metal_c, t_door_metal_locked, 8.0, g->u.pos(), true ); - query_any( _( "Lock enabled. Press any key..." ) ); + query_any( _( "Lock enabled. Press any key…" ) ); break; // UNLOCK_DISARM falls through to just UNLOCK @@ -420,14 +420,14 @@ void computer::activate_function( computer_action action ) /* fallthrough */ case COMPACT_UNLOCK: g->m.translate_radius( t_door_metal_locked, t_door_metal_c, 8.0, g->u.pos(), true ); - query_any( _( "Lock disabled. Press any key..." ) ); + query_any( _( "Lock disabled. Press any key…" ) ); break; //Toll is required for the church computer/mechanism to function case COMPACT_TOLL: sounds::sound( g->u.pos(), 120, sounds::sound_t::music, //~ the sound of a church bell ringing - _( "Bohm... Bohm... Bohm..." ), true, "environment", "church_bells" ); + _( "Bohm… Bohm… Bohm…" ), true, "environment", "church_bells" ); break; case COMPACT_SAMPLE: @@ -469,7 +469,7 @@ void computer::activate_function( computer_action action ) sounds::sound( g->u.pos(), 40, sounds::sound_t::alarm, _( "an alarm sound!" ), false, "environment", "alarm" ); g->m.translate_radius( t_reinforced_glass, t_thconc_floor, 25.0, g->u.pos(), true ); - query_any( _( "Containment shields opened. Press any key..." ) ); + query_any( _( "Containment shields opened. Press any key…" ) ); break; // COMPACT_RELEASE_DISARM falls through to just COMPACT_RELEASE_BIONICS @@ -480,7 +480,7 @@ void computer::activate_function( computer_action action ) sounds::sound( g->u.pos(), 40, sounds::sound_t::alarm, _( "an alarm sound!" ), false, "environment", "alarm" ); g->m.translate_radius( t_reinforced_glass, t_thconc_floor, 3.0, g->u.pos(), true ); - query_any( _( "Containment shields opened. Press any key..." ) ); + query_any( _( "Containment shields opened. Press any key…" ) ); break; case COMPACT_TERMINATE: @@ -497,7 +497,7 @@ void computer::activate_function( computer_action action ) mon->die( &g->u ); } } - query_any( _( "Subjects terminated. Press any key..." ) ); + query_any( _( "Subjects terminated. Press any key…" ) ); break; case COMPACT_PORTAL: { @@ -549,12 +549,12 @@ void computer::activate_function( computer_action action ) print_text( "%s", log ); // One's an anomaly if( alerts == 0 ) { - query_any( _( "Local data-access error logged, alerting helpdesk. Press any key..." ) ); + query_any( _( "Local data-access error logged, alerting helpdesk. Press any key…" ) ); alerts ++; } else { // Two's a trend. query_any( - _( "Warning: anomalous archive-access activity detected at this node. Press any key..." ) ); + _( "Warning: anomalous archive-access activity detected at this node. Press any key…" ) ); alerts ++; } } @@ -568,10 +568,10 @@ void computer::activate_function( computer_action action ) print_text( "Accessing archive. Playing audio recording nr %d.\n%s", rng( 1, 9999 ), SNIPPET.random_from_category( "radio_archive" ) ); if( one_in( 3 ) ) { - query_any( _( "Warning: resticted data access. Attempt logged. Press any key..." ) ); + query_any( _( "Warning: resticted data access. Attempt logged. Press any key…" ) ); alerts ++; } else { - query_any( _( "Press any key..." ) ); + query_any( _( "Press any key…" ) ); } sfx::fade_audio_channel( sfx::channel::radio, 100 ); } @@ -582,7 +582,7 @@ void computer::activate_function( computer_action action ) const tripoint center = g->u.global_omt_location(); overmap_buffer.reveal( center.xy(), 40, 0 ); query_any( - _( "Surface map data downloaded. Local anomalous-access error logged. Press any key..." ) ); + _( "Surface map data downloaded. Local anomalous-access error logged. Press any key…" ) ); remove_option( COMPACT_MAPS ); alerts ++; } @@ -601,7 +601,7 @@ void computer::activate_function( computer_action action ) } } } - query_any( _( "Sewage map data downloaded. Press any key..." ) ); + query_any( _( "Sewage map data downloaded. Press any key…" ) ); remove_option( COMPACT_MAP_SEWER ); } break; @@ -619,7 +619,7 @@ void computer::activate_function( computer_action action ) } } } - query_any( _( "Subway map data downloaded. Press any key..." ) ); + query_any( _( "Subway map data downloaded. Press any key…" ) ); remove_option( COMPACT_MAP_SUBWAY ); } break; @@ -726,11 +726,11 @@ void computer::activate_function( computer_action action ) print_line( "%s", name ); } if( more > 0 ) { - print_line( ngettext( "%d OTHER FOUND...", "%d OTHERS FOUND...", more ), more ); + print_line( ngettext( "%d OTHER FOUND…", "%d OTHERS FOUND…", more ), more ); } print_newline(); - query_any( _( "Press any key..." ) ); + query_any( _( "Press any key…" ) ); } break; @@ -740,7 +740,7 @@ void computer::activate_function( computer_action action ) g->m.ter_set( p, t_elevator_control ); } } - query_any( _( "Elevator activated. Press any key..." ) ); + query_any( _( "Elevator activated. Press any key…" ) ); break; case COMPACT_AMIGARA_LOG: { @@ -790,7 +790,7 @@ void computer::activate_function( computer_action action ) print_gibberish_line(); print_gibberish_line(); print_newline(); - print_error( _( "FILE CORRUPTED, PRESS ANY KEY..." ) ); + print_error( _( "FILE CORRUPTED, PRESS ANY KEY…" ) ); inp_mngr.wait_for_any_key(); reset_terminal(); break; @@ -829,7 +829,7 @@ void computer::activate_function( computer_action action ) commo_4 = mission_type_id( "MISSION_OLD_GUARD_NEC_COMMO_4" ); if( miss->mission_id() == commo_3 || miss->mission_id() == commo_4 ) { miss->step_complete( 1 ); - print_error( _( "Repeater mod installed..." ) ); + print_error( _( "Repeater mod installed…" ) ); print_error( _( "Mission Complete!" ) ); g->u.use_amount( "radio_repeater_mod", 1 ); inp_mngr.wait_for_any_key(); @@ -839,7 +839,7 @@ void computer::activate_function( computer_action action ) } } } else { - print_error( _( "You do not have a repeater mod to install..." ) ); + print_error( _( "You do not have a repeater mod to install…" ) ); inp_mngr.wait_for_any_key(); break; } @@ -905,7 +905,7 @@ void computer::activate_function( computer_action action ) } } } - query_any( _( "Press any key..." ) ); + query_any( _( "Press any key…" ) ); break; case COMPACT_DATA_ANAL: @@ -934,7 +934,7 @@ void computer::activate_function( computer_action action ) } } } - query_any( _( "Press any key..." ) ); + query_any( _( "Press any key…" ) ); break; case COMPACT_DISCONNECT: @@ -944,7 +944,7 @@ void computer::activate_function( computer_action action ) "UNABLE TO REACH NETWORK ROUTER OR PROXY. PLEASE CONTACT YOUR\n" "SYSTEM ADMINISTRATOR TO RESOLVE THIS ISSUE.\n" " \n" ) ); - query_any( _( "Press any key to continue..." ) ); + query_any( _( "Press any key to continue…" ) ); break; case COMPACT_EMERG_MESS: @@ -959,7 +959,7 @@ void computer::activate_function( computer_action action ) "5. AWAIT FURTHER INSTRUCTIONS.\n" "\n" " \n" ) ); - query_any( _( "Press any key to continue..." ) ); + query_any( _( "Press any key to continue…" ) ); break; case COMPACT_EMERG_REF_CENTER: @@ -976,58 +976,58 @@ void computer::activate_function( computer_action action ) " UNITS TO RECEIVE PRIORITY WHEN GENERATORS ARE BEING DEPLOYED.\n" " \n" " \n" ) ); - query_any( _( "Press any key to continue..." ) ); + query_any( _( "Press any key to continue…" ) ); break; case COMPACT_SR1_MESS: reset_terminal(); print_text( "%s", SNIPPET.get( SNIPPET.assign( "sr1_mess" ) ) ); - query_any( _( "Press any key to continue..." ) ); + query_any( _( "Press any key to continue…" ) ); break; case COMPACT_SR2_MESS: reset_terminal(); print_text( "%s", SNIPPET.get( SNIPPET.assign( "sr2_mess" ) ) ); - query_any( _( "Press any key to continue..." ) ); + query_any( _( "Press any key to continue…" ) ); break; case COMPACT_SR3_MESS: reset_terminal(); print_text( "%s", SNIPPET.get( SNIPPET.assign( "sr3_mess" ) ) ); - query_any( _( "Press any key to continue..." ) ); + query_any( _( "Press any key to continue…" ) ); break; case COMPACT_SR4_MESS: reset_terminal(); print_text( "%s", SNIPPET.get( SNIPPET.assign( "sr4_mess" ) ) ); - query_any( _( "Press any key to continue..." ) ); + query_any( _( "Press any key to continue…" ) ); break; case COMPACT_SRCF_1_MESS: reset_terminal(); print_text( "%s", SNIPPET.get( SNIPPET.assign( "scrf_1_mess" ) ) ); - query_any( _( "Press any key to continue..." ) ); + query_any( _( "Press any key to continue…" ) ); break; case COMPACT_SRCF_2_MESS: reset_terminal(); print_text( "%s", SNIPPET.get( SNIPPET.assign( "scrf_2_1_mess" ) ) ); - query_any( _( "Press any key to continue..." ) ); + query_any( _( "Press any key to continue…" ) ); reset_terminal(); print_text( "%s", SNIPPET.get( SNIPPET.assign( "scrf_2_2_mess" ) ) ); - query_any( _( "Press any key to continue..." ) ); + query_any( _( "Press any key to continue…" ) ); break; case COMPACT_SRCF_3_MESS: reset_terminal(); print_text( "%s", SNIPPET.get( SNIPPET.assign( "scrf_3_mess" ) ) ); - query_any( _( "Press any key to continue..." ) ); + query_any( _( "Press any key to continue…" ) ); break; case COMPACT_SRCF_SEAL_ORDER: reset_terminal(); print_text( "%s", SNIPPET.get( SNIPPET.assign( "scrf_seal_order" ) ) ); - query_any( _( "Press any key to continue..." ) ); + query_any( _( "Press any key to continue…" ) ); break; case COMPACT_SRCF_SEAL: @@ -1070,7 +1070,7 @@ void computer::activate_function( computer_action action ) } } } - query_any( _( "Press any key..." ) ); + query_any( _( "Press any key…" ) ); break; //irradiates food at t_rad_platform, adds radiation @@ -1095,7 +1095,7 @@ void computer::activate_function( computer_action action ) explosion_handler::explosion( dest, 40 ); reset_terminal(); print_error( _( "WARNING [409]: Primary sensors offline!" ) ); - print_error( _( " >> Initialize secondary sensors: Geiger profiling..." ) ); + print_error( _( " >> Initialize secondary sensors: Geiger profiling…" ) ); print_error( _( " >> Radiation spike detected!\n" ) ); print_error( _( "WARNING [912]: Catastrophic malfunction! Contamination detected!" ) ); print_error( _( "EMERGENCY PROCEDURE [1]: Evacuate. Evacuate. Evacuate.\n" ) ); @@ -1115,7 +1115,7 @@ void computer::activate_function( computer_action action ) } else { g->u.irradiate( rng_float( 20, 100 ) / rl_dist( g->u.pos(), dest ) ); } - query_any( _( "EMERGENCY SHUTDOWN! Press any key..." ) ); + query_any( _( "EMERGENCY SHUTDOWN! Press any key…" ) ); error = true; options.clear(); // Disable the terminal. activate_failure( COMPFAIL_SHUTDOWN ); @@ -1132,7 +1132,7 @@ void computer::activate_function( computer_action action ) } } if( !error && platform_exists ) { - print_error( _( "PROCESSING... CYCLE COMPLETE." ) ); + print_error( _( "PROCESSING… CYCLE COMPLETE." ) ); print_error( _( "GEIGER COUNTER @ PLATFORM: %s mSv/h." ), g->m.get_radiation( dest ) ); } } @@ -1140,10 +1140,10 @@ void computer::activate_function( computer_action action ) } if( !platform_exists ) { print_error( - _( "CRITICAL ERROR... RADIATION PLATFORM UNRESPONSIVE. COMPLY TO PROCEDURE RP_M_01_rev.03." ) ); + _( "CRITICAL ERROR… RADIATION PLATFORM UNRESPONSIVE. COMPLY TO PROCEDURE RP_M_01_rev.03." ) ); } if( !error ) { - query_any( _( "Press any key..." ) ); + query_any( _( "Press any key…" ) ); } break; } @@ -1176,14 +1176,14 @@ void computer::activate_function( computer_action action ) peak_rad = g->m.get_radiation( platform ); } } - print_error( _( "GEIGER COUNTER @ ZONE:... AVG %s mSv/h." ), sum_rads / tiles_counted ); - print_error( _( "GEIGER COUNTER @ ZONE:... MAX %s mSv/h." ), peak_rad ); + print_error( _( "GEIGER COUNTER @ ZONE:… AVG %s mSv/h." ), sum_rads / tiles_counted ); + print_error( _( "GEIGER COUNTER @ ZONE:… MAX %s mSv/h." ), peak_rad ); print_newline(); } - print_error( _( "GEIGER COUNTER @ CONSOLE: .... %s mSv/h." ), g->m.get_radiation( g->u.pos() ) ); - print_error( _( "PERSONAL DOSIMETRY: .... %s mSv." ), g->u.radiation ); + print_error( _( "GEIGER COUNTER @ CONSOLE:… %s mSv/h." ), g->m.get_radiation( g->u.pos() ) ); + print_error( _( "PERSONAL DOSIMETRY:… %s mSv." ), g->u.radiation ); print_newline(); - query_any( _( "Press any key..." ) ); + query_any( _( "Press any key…" ) ); break; } @@ -1211,7 +1211,7 @@ void computer::activate_function( computer_action action ) } if( !l_exists || !p_exists || !u_exists ) { print_error( _( "Conveyor belt malfunction. Consult maintenance team." ) ); - query_any( _( "Press any key..." ) ); + query_any( _( "Press any key…" ) ); break; } auto items = g->m.i_at( platform ); @@ -1236,7 +1236,7 @@ void computer::activate_function( computer_action action ) } } g->m.i_clear( loading ); - query_any( _( "Conveyor belt cycle complete. Press any key..." ) ); + query_any( _( "Conveyor belt cycle complete. Press any key…" ) ); break; } // toggles reinforced glass shutters open->closed and closed->open depending on their current state @@ -1244,7 +1244,7 @@ void computer::activate_function( computer_action action ) g->u.moves -= 300; g->m.translate_radius( t_reinforced_glass_shutter_open, t_reinforced_glass_shutter, 8.0, g->u.pos(), true, true ); - query_any( _( "Toggling shutters. Press any key..." ) ); + query_any( _( "Toggling shutters. Press any key…" ) ); break; // extract radiation source material from irradiator case COMPACT_EXTRACT_RAD_SOURCE: @@ -1263,9 +1263,9 @@ void computer::activate_function( computer_action action ) g->m.translate_radius( t_rad_platform, t_concrete, 8.0, g->u.pos(), true ); remove_option( COMPACT_IRRADIATOR ); remove_option( COMPACT_EXTRACT_RAD_SOURCE ); - query_any( _( "Extraction sequence complete... Press any key." ) ); + query_any( _( "Extraction sequence complete… Press any key." ) ); } else { - query_any( _( "ERROR! Radiation platform unresponsive... Press any key." ) ); + query_any( _( "ERROR! Radiation platform unresponsive… Press any key." ) ); } } break; @@ -1283,7 +1283,7 @@ void computer::activate_function( computer_action action ) } g->m.remove_field( dest, fd_shock_vent ); } - print_line( _( "Initiating POWER-DIAG ver.2.34 ..." ) ); + print_line( _( "Initiating POWER-DIAG ver.2.34…" ) ); if( has_vent ) { print_error( _( "Short circuit detected!" ) ); print_error( _( "Short circuit rerouted." ) ); @@ -1299,7 +1299,7 @@ void computer::activate_function( computer_action action ) } else { print_error( _( "Backup power status: OFFLINE. Reason: UNKNOWN" ) ); } - query_any( _( "Press any key..." ) ); + query_any( _( "Press any key…" ) ); break; } // switch (action) @@ -1495,7 +1495,7 @@ void computer::remove_option( computer_action const action ) void computer::mark_refugee_center() { - print_line( _( "SEARCHING FOR NEAREST REFUGEE CENTER, PLEASE WAIT..." ) ); + print_line( _( "SEARCHING FOR NEAREST REFUGEE CENTER, PLEASE WAIT…" ) ); const mission_type_id &mission_type = mission_type_id( "MISSION_REACH_REFUGEE_CENTER" ); tripoint mission_target; @@ -1528,10 +1528,10 @@ void computer::mark_refugee_center() "4PM AT 555-0164.\n" "\n" "IF YOU WOULD LIKE TO SPEAK WITH SOMEONE IN PERSON OR WOULD LIKE\n" - "TO WRITE US A LETTER PLEASE SEND IT TO...\n" ), rl_dist( g->u.pos(), mission_target ), + "TO WRITE US A LETTER PLEASE SEND IT TO…\n" ), rl_dist( g->u.pos(), mission_target ), direction_name_short( direction_from( g->u.pos(), mission_target ) ) ); - query_any( _( "Press any key to continue..." ) ); + query_any( _( "Press any key to continue…" ) ); } template diff --git a/src/construction.cpp b/src/construction.cpp index 36aaaaa006886..97eec9d3e4fb4 100644 --- a/src/construction.cpp +++ b/src/construction.cpp @@ -872,10 +872,10 @@ void complete_construction( player *p ) if( p->is_player() ) { for( auto &elem : g->u.get_crafting_helpers() ) { if( elem->meets_skill_requirements( built ) ) { - add_msg( m_info, _( "%s assists you with the work..." ), elem->name ); + add_msg( m_info, _( "%s assists you with the work…" ), elem->name ); } else { //NPC near you isn't skilled enough to help - add_msg( m_info, _( "%s watches you work..." ), elem->name ); + add_msg( m_info, _( "%s watches you work…" ), elem->name ); } award_xp( *elem ); diff --git a/src/consumption.cpp b/src/consumption.cpp index 02ed438124870..7136cd340f970 100644 --- a/src/consumption.cpp +++ b/src/consumption.cpp @@ -672,7 +672,7 @@ bool player::eat( item &food, bool force ) ( get_hunger() > -60 && get_thirst() > -60 ) && ( get_hunger() - nutr < -60 || get_thirst() - quench < -60 ) ) { add_msg_if_player( - _( "You've begun stockpiling calories and liquid for hibernation. You get the feeling that you should prepare for bed, just in case, but... you're hungry again, and you could eat a whole week's worth of food RIGHT NOW." ) ); + _( "You've begun stockpiling calories and liquid for hibernation. You get the feeling that you should prepare for bed, just in case, but… you're hungry again, and you could eat a whole week's worth of food RIGHT NOW." ) ); } const bool will_vomit = stomach.stomach_remaining() < food.volume() && @@ -681,13 +681,13 @@ bool player::eat( item &food, bool force ) stomach.capacity() ); const bool saprophage = has_trait( trait_id( "SAPROPHAGE" ) ); if( spoiled && !saprophage ) { - add_msg_if_player( m_bad, _( "Ick, this %s doesn't taste so good..." ), food.tname() ); + add_msg_if_player( m_bad, _( "Ick, this %s doesn't taste so good…" ), food.tname() ); if( !has_trait( trait_id( "SAPROVORE" ) ) && !has_trait( trait_id( "EATDEAD" ) ) && ( !has_bionic( bio_digestion ) || one_in( 3 ) ) ) { add_effect( effect_foodpoison, rng( 6_minutes, ( nutr + 1 ) * 6_minutes ) ); } } else if( spoiled && saprophage ) { - add_msg_if_player( m_good, _( "Mmm, this %s tastes delicious..." ), food.tname() ); + add_msg_if_player( m_good, _( "Mmm, this %s tastes delicious…" ), food.tname() ); } if( !consume_effects( food ) ) { //Already consumed by using `food.type->invoke`? @@ -759,7 +759,7 @@ bool player::eat( item &food, bool force ) if( ( has_trait( trait_id( "SCHIZOPHRENIC" ) ) || has_artifact_with( AEP_SCHIZO ) ) && one_in( 50 ) && !spoiled && food.goes_bad() && is_player() ) { - add_msg( m_bad, _( "Ick, this %s (rotten) doesn't taste so good..." ), food.tname() ); + add_msg( m_bad, _( "Ick, this %s (rotten) doesn't taste so good…" ), food.tname() ); add_msg( _( "You drink your %s (rotten)." ), food.tname() ); } else { add_msg_player_or_npc( _( "You drink your %s." ), _( " drinks a %s." ), @@ -769,7 +769,7 @@ bool player::eat( item &food, bool force ) if( ( has_trait( trait_id( "SCHIZOPHRENIC" ) ) || has_artifact_with( AEP_SCHIZO ) ) && one_in( 50 ) && !spoiled && food.goes_bad() && is_player() ) { - add_msg( m_bad, _( "Ick, this %s (rotten) doesn't taste so good..." ), food.tname() ); + add_msg( m_bad, _( "Ick, this %s (rotten) doesn't taste so good…" ), food.tname() ); add_msg( _( "You eat your %s (rotten)." ), food.tname() ); } else { add_msg_player_or_npc( _( "You eat your %s." ), _( " eats a %s." ), @@ -895,7 +895,7 @@ bool player::eat( item &food, bool force ) if( !one_in( 100 ) ) { add_msg_if_player( m_good, _( "When life's got you down, there's always sugar." ) ); } else { - add_msg_if_player( m_good, _( "They may do what they must... you've already won." ) ); + add_msg_if_player( m_good, _( "They may do what they must… you've already won." ) ); } add_morale( MORALE_SWEETTOOTH, 10, 50, 1_hours, 50_minutes ); } @@ -984,14 +984,14 @@ void player::modify_stimulation( const islot_comestible &comest ) _( "A powerful sense of dread comes over you." ), _( "Your skin starts crawling." ), _( "They're coming to get you." ), - _( "This might've been a bad idea..." ), + _( "This might've been a bad idea…" ), _( "You've really done it this time, haven't you?" ), - _( "You have to stay vigilant. They're always watching..." ), + _( "You have to stay vigilant. They're always watching…" ), _( "mistake mistake mistake mistake mistake" ), _( "Just gotta stay calm, and you'll make it through this." ), _( "You're starting to feel very jumpy." ), _( "Something is twitching at the edge of your vision." ), - _( "They know what you've done..." ), + _( "They know what you've done…" ), _( "You're feeling even more paranoid than usual." ) }; add_msg_if_player( m_bad, random_entry_ref( stimboost_msg ) ); } @@ -1085,14 +1085,14 @@ bool player::consume_effects( item &food ) if( ( nutr > 0 && get_hunger() < -400 ) || ( comest.quench > 0 && get_thirst() < -400 ) ) { add_msg_if_player( - _( "Mmm. You can still fit some more in... but maybe you should get comfortable and sleep." ) ); + _( "Mmm. You can still fit some more in… but maybe you should get comfortable and sleep." ) ); if( !one_in( 3 ) ) { //Third check, this one at 66% mod_fatigue( nutr ); } } if( ( nutr > 0 && get_hunger() < -600 ) || ( comest.quench > 0 && get_thirst() < -600 ) ) { - add_msg_if_player( _( "That filled a hole! Time for bed..." ) ); + add_msg_if_player( _( "That filled a hole! Time for bed…" ) ); // At this point, you're done. Schlaf gut. mod_fatigue( nutr ); } diff --git a/src/crafting.cpp b/src/crafting.cpp index 03891c146bc67..7d4725523323b 100644 --- a/src/crafting.cpp +++ b/src/crafting.cpp @@ -79,7 +79,7 @@ static const trait_id trait_BURROW( "BURROW" ); static bool crafting_allowed( const player &p, const recipe &rec ) { if( p.morale_crafting_speed_multiplier( rec ) <= 0.0f ) { - add_msg( m_info, _( "Your morale is too low to craft such a difficult thing..." ) ); + add_msg( m_info, _( "Your morale is too low to craft such a difficult thing…" ) ); return false; } @@ -875,17 +875,17 @@ void player::craft_skill_gain( const item &craft, const int &multiplier ) helper->practice( making.skill_used, roll_remainder( base_practice / 2.0 ), skill_cap ); if( batch_size > 1 && one_in( 3 ) ) { - add_msg( m_info, _( "%s assists with crafting..." ), helper->name ); + add_msg( m_info, _( "%s assists with crafting…" ), helper->name ); } if( batch_size == 1 && one_in( 3 ) ) { - add_msg( m_info, _( "%s could assist you with a batch..." ), helper->name ); + add_msg( m_info, _( "%s could assist you with a batch…" ), helper->name ); } // NPCs around you understand the skill used better } else { helper->practice( making.skill_used, roll_remainder( base_practice / 10.0 ), skill_cap ); if( one_in( 3 ) ) { - add_msg( m_info, _( "%s watches you craft..." ), helper->name ); + add_msg( m_info, _( "%s watches you craft…" ), helper->name ); } } } @@ -914,7 +914,7 @@ double player::crafting_success_roll( const recipe &making ) const get_skill_level( making.skill_used ) ) { // NPC assistance is worth half a skill level skill_dice += 2; - add_msg_if_player( m_info, _( "%s helps with crafting..." ), np->name ); + add_msg_if_player( m_info, _( "%s helps with crafting…" ), np->name ); break; } } diff --git a/src/debug_menu.cpp b/src/debug_menu.cpp index 335b7fdf1c37d..c16e70abab68f 100644 --- a/src/debug_menu.cpp +++ b/src/debug_menu.cpp @@ -179,7 +179,7 @@ static int player_uilist() _( "Level a spell" ) ) ); } - return uilist( _( "Player..." ), uilist_initializer ); + return uilist( _( "Player…" ), uilist_initializer ); } static int info_uilist( bool display_all_entries = true ) @@ -216,7 +216,7 @@ static int info_uilist( bool display_all_entries = true ) debug_only_options.end() ); } - return uilist( _( "Info..." ), uilist_initializer ); + return uilist( _( "Info…" ), uilist_initializer ); } static int teleport_uilist() @@ -227,7 +227,7 @@ static int teleport_uilist() { uilist_entry( DEBUG_OM_TELEPORT, true, 'o', _( "Teleport - adjacent overmap" ) ) }, }; - return uilist( _( "Teleport..." ), uilist_initializer ); + return uilist( _( "Teleport…" ), uilist_initializer ); } static int spawning_uilist() @@ -241,7 +241,7 @@ static int spawning_uilist() { uilist_entry( DEBUG_SPAWN_CLAIRVOYANCE, true, 'c', _( "Spawn clairvoyance artifact" ) ) }, }; - return uilist( _( "Spawning..." ), uilist_initializer ); + return uilist( _( "Spawning…" ), uilist_initializer ); } static int map_uilist() @@ -259,7 +259,7 @@ static int map_uilist() { uilist_entry( DEBUG_MAP_EXTRA, true, 'm', _( "Spawn map extra" ) ) }, }; - return uilist( _( "Map..." ), uilist_initializer ); + return uilist( _( "Map…" ), uilist_initializer ); } /** @@ -271,16 +271,16 @@ static int map_uilist() static int debug_menu_uilist( bool display_all_entries = true ) { std::vector menu = { - { uilist_entry( 1, true, 'i', _( "Info..." ) ) }, + { uilist_entry( 1, true, 'i', _( "Info…" ) ) }, }; if( display_all_entries ) { const std::vector debug_menu = { { uilist_entry( DEBUG_QUIT_NOSAVE, true, 'Q', _( "Quit to main menu" ) ) }, - { uilist_entry( 2, true, 's', _( "Spawning..." ) ) }, - { uilist_entry( 3, true, 'p', _( "Player..." ) ) }, - { uilist_entry( 4, true, 't', _( "Teleport..." ) ) }, - { uilist_entry( 5, true, 'm', _( "Map..." ) ) }, + { uilist_entry( 2, true, 's', _( "Spawning…" ) ) }, + { uilist_entry( 3, true, 'p', _( "Player…" ) ) }, + { uilist_entry( 4, true, 't', _( "Teleport…" ) ) }, + { uilist_entry( 5, true, 'm', _( "Map…" ) ) }, }; // insert debug-only menu right after "Info". diff --git a/src/defense.cpp b/src/defense.cpp index 5a2ff784168bb..af651d76c0115 100644 --- a/src/defense.cpp +++ b/src/defense.cpp @@ -134,7 +134,7 @@ void defense_game::per_turn() if( calendar::once_every( time_between_waves ) ) { current_wave++; if( current_wave > 1 && current_wave % waves_between_caravans == 0 ) { - popup( _( "A caravan approaches! Press spacebar..." ) ); + popup( _( "A caravan approaches! Press spacebar…" ) ); caravan(); } spawn_wave(); diff --git a/src/effect.cpp b/src/effect.cpp index b3001a685ba1a..82847a6899415 100644 --- a/src/effect.cpp +++ b/src/effect.cpp @@ -54,7 +54,7 @@ void weed_msg( player &p ) switch( msg ) { case 0: // Freakazoid p.add_msg_if_player( - _( "The scariest thing in the world would be... if all the air in the world turned to WOOD!" ) ); + _( "The scariest thing in the world would be… if all the air in the world turned to WOOD!" ) ); return; case 1: // Simpsons p.add_msg_if_player( @@ -67,7 +67,7 @@ void weed_msg( player &p ) } else if( smarts < 3 ) { // It's Always Sunny in Philadelphia p.add_msg_if_player( _( "Science is a liar sometimes." ) ); } else { // Durr - p.add_msg_if_player( _( "Science is... wait, what was I talking about again?" ) ); + p.add_msg_if_player( _( "Science is… wait, what was I talking about again?" ) ); } return; case 3: // Dazed and Confused @@ -83,7 +83,7 @@ void weed_msg( player &p ) return; case 4: if( p.has_amount( "money_bundle", 1 ) ) { // Half Baked - p.add_msg_if_player( _( "You ever see the back of a twenty dollar bill... on weed?" ) ); + p.add_msg_if_player( _( "You ever see the back of a twenty dollar bill… on weed?" ) ); if( one_in( 2 ) ) { p.add_msg_if_player( _( "Oh, there's some crazy shit, man. There's a dude in the bushes. Has he got a gun? I dunno!" ) ); @@ -92,13 +92,13 @@ void weed_msg( player &p ) } } } else if( p.has_amount( "holybook_bible", 1 ) ) { - p.add_msg_if_player( _( "You have a sudden urge to flip your bible open to Genesis 1:29..." ) ); + p.add_msg_if_player( _( "You have a sudden urge to flip your bible open to Genesis 1:29…" ) ); } else { // Big Lebowski - p.add_msg_if_player( _( "That rug really tied the room together..." ) ); + p.add_msg_if_player( _( "That rug really tied the room together…" ) ); } return; case 5: - p.add_msg_if_player( _( "I used to do drugs... I still do, but I used to, too." ) ); + p.add_msg_if_player( _( "I used to do drugs… I still do, but I used to, too." ) ); default: return; } @@ -110,12 +110,12 @@ void weed_msg( player &p ) return; case 1: // Freakazoid p.add_msg_if_player( - _( "Okay, like, the scariest thing in the world would be... if like you went to grab something and it wasn't there!" ) ); + _( "Okay, like, the scariest thing in the world would be… if like you went to grab something and it wasn't there!" ) ); return; case 2: // Simpsons p.add_msg_if_player( _( "They call them fingers, but I never see them fing." ) ); if( smarts > 2 && one_in( 2 ) ) { - p.add_msg_if_player( _( "...oh, there they go." ) ); + p.add_msg_if_player( _( "…oh, there they go." ) ); } return; case 3: // Bill Hicks @@ -139,7 +139,7 @@ void weed_msg( player &p ) p.add_msg_if_player( _( "Oh, sometimes the early-mid-late-early-morning." ) ); } if( smarts > 2 ) { - p.add_msg_if_player( _( "...But never at dusk." ) ); + p.add_msg_if_player( _( "…But never at dusk." ) ); } return; case 5: @@ -156,9 +156,9 @@ void weed_msg( player &p ) p.add_msg_if_player( _( "Man, a cheeseburger sounds SO awesome right now." ) ); p.mod_hunger( 4 ); if( p.has_trait( trait_id( "VEGETARIAN" ) ) ) { - p.add_msg_if_player( _( "Eh... maybe not." ) ); + p.add_msg_if_player( _( "Eh… maybe not." ) ); } else if( p.has_trait( trait_id( "LACTOSE" ) ) ) { - p.add_msg_if_player( _( "I guess, maybe, without the cheese... yeah." ) ); + p.add_msg_if_player( _( "I guess, maybe, without the cheese… yeah." ) ); } return; case 2: // Dazed and Confused diff --git a/src/faction_camp.cpp b/src/faction_camp.cpp index 6457f66f2d560..0b457a3f25317 100644 --- a/src/faction_camp.cpp +++ b/src/faction_camp.cpp @@ -164,42 +164,42 @@ std::map miss_info = {{ { "_faction_camp_menial", { "Menial Labor", to_translation( "Menial Labor" ), - to_translation( "Performing menial labor...\n" ), + to_translation( "Performing menial labor…\n" ), "Recover Menial Laborer", to_translation( "Recover Menial Laborer" ) } }, { "_faction_camp_expansion", { "Expand Base", to_translation( "Expand Base" ), - to_translation( "Surveying for expansion...\n" ), + to_translation( "Surveying for expansion…\n" ), "Recover Surveyor", to_translation( "Recover Surveyor" ) } }, { "_faction_camp_cut_log", { "Cut Logs", to_translation( "Cut Logs" ), - to_translation( "Cutting logs in the woods...\n" ), + to_translation( "Cutting logs in the woods…\n" ), "Recover Log Cutter", to_translation( "Recover Log Cutter" ) } }, { "_faction_camp_clearcut", { "Clearcut", to_translation( "Clear a forest" ), - to_translation( "Clearing a forest...\n" ), + to_translation( "Clearing a forest…\n" ), "Recover Clearcutter", to_translation( "Recover Clearcutter" ) } }, { "_faction_camp_hide_site", { "Setup Hide Site", to_translation( "Setup Hide Site" ), - to_translation( "Setting up a hide site...\n" ), + to_translation( "Setting up a hide site…\n" ), "Recover Hide Setup", to_translation( "Recover Hide Setup" ) } }, { "_faction_camp_hide_trans", { "Relay Hide Site", to_translation( "Relay Hide Site" ), - to_translation( "Transferring gear to a hide site...\n" ), + to_translation( "Transferring gear to a hide site…\n" ), "Recover Hide Relay", to_translation( "Recover Hide Relay" ) } }, @@ -227,7 +227,7 @@ std::map miss_info = {{ { "_faction_camp_om_fortifications", { "Construct Map Fort", to_translation( "Construct Map Fortifications" ), - to_translation( "Constructing fortifications...\n" ), + to_translation( "Constructing fortifications…\n" ), "Finish Map Fort", to_translation( "Finish Map Fortifications" ) } }, @@ -262,7 +262,7 @@ std::map miss_info = {{ { "_faction_exp_chop_shop_", { " Chop Shop", to_translation( " Chop Shop" ), - to_translation( "Working at the chop shop...\n" ), + to_translation( "Working at the chop shop…\n" ), " (Finish) Chop Shop", to_translation( " (Finish) Chop Shop" ) } }, @@ -494,7 +494,7 @@ recipe_id base_camps::select_camp_option( const std::map const int choice = uilist( _( option ), pos_names ); if( choice < 0 || static_cast( choice ) >= pos_name_ids.size() ) { - popup( _( "You choose to wait..." ) ); + popup( _( "You choose to wait…" ) ); return recipe_id::NULL_ID(); } return pos_name_ids[choice]; @@ -1326,14 +1326,14 @@ bool basecamp::handle_mission( const std::string &miss_id, const cata::optional< if( miss_id == "Gather Materials" ) { start_mission( "_faction_camp_gathering", 3_hours, true, - _( "departs to search for materials..." ), false, {}, "survival", 0 ); + _( "departs to search for materials…" ), false, {}, "survival", 0 ); } else if( miss_id == "Recover Ally from Gathering" ) { gathering_return( "_faction_camp_gathering", 3_hours, by_radio ); } if( miss_id == "Collect Firewood" ) { start_mission( "_faction_camp_firewood", 3_hours, true, - _( "departs to search for firewood..." ), false, {}, "survival", 0 ); + _( "departs to search for firewood…" ), false, {}, "survival", 0 ); } else if( miss_id == "Recover Firewood Gatherers" ) { gathering_return( "_faction_camp_firewood", 3_hours, by_radio ); } @@ -1351,47 +1351,47 @@ bool basecamp::handle_mission( const std::string &miss_id, const cata::optional< if( miss_id == "Cut Logs" ) { start_cut_logs(); } else if( miss_id == "Recover Log Cutter" ) { - const std::string msg = _( "returns from working in the woods..." ); + const std::string msg = _( "returns from working in the woods…" ); mission_return( "_faction_camp_cut_log", 6_hours, true, msg, "construction", 2 ); } if( miss_id == "Clearcut" ) { start_clearcut(); } else if( miss_id == "Recover Clearcutter" ) { - const std::string msg = _( "returns from working in the woods..." ); + const std::string msg = _( "returns from working in the woods…" ); mission_return( "_faction_camp_clearcut", 6_hours, true, msg, "construction", 1 ); } if( miss_id == "Setup Hide Site" ) { start_setup_hide_site(); } else if( miss_id == "Recover Hide Setup" ) { - const std::string msg = _( "returns from working on the hide site..." ); + const std::string msg = _( "returns from working on the hide site…" ); mission_return( "_faction_camp_hide_site", 3_hours, true, msg, "survival", 3 ); } if( miss_id == "Relay Hide Site" ) { start_relay_hide_site(); } else if( miss_id == "Recover Hide Transport" ) { - const std::string msg = _( "returns from shuttling gear between the hide site..." ); + const std::string msg = _( "returns from shuttling gear between the hide site…" ); mission_return( "_faction_camp_hide_trans", 3_hours, true, msg, "survival", 3 ); } if( miss_id == "Camp Forage" ) { start_mission( "_faction_camp_foraging", 4_hours, true, - _( "departs to search for edible plants..." ), false, {}, "survival", 0 ); + _( "departs to search for edible plants…" ), false, {}, "survival", 0 ); } else if( miss_id == "Recover Foragers" ) { gathering_return( "_faction_camp_foraging", 4_hours, by_radio ); } if( miss_id == "Trap Small Game" ) { start_mission( "_faction_camp_trapping", 6_hours, true, - _( "departs to set traps for small animals..." ), false, {}, "traps", 0 ); + _( "departs to set traps for small animals…" ), false, {}, "traps", 0 ); } else if( miss_id == "Recover Trappers" ) { gathering_return( "_faction_camp_trapping", 6_hours, by_radio ); } if( miss_id == "Hunt Large Animals" ) { start_mission( "_faction_camp_hunting", 6_hours, true, - _( "departs to hunt for meat..." ), false, {}, "gun", 0 ); + _( "departs to hunt for meat…" ), false, {}, "gun", 0 ); } else if( miss_id == "Recover Hunter" ) { gathering_return( "_faction_camp_hunting", 6_hours, by_radio ); } @@ -1408,7 +1408,7 @@ bool basecamp::handle_mission( const std::string &miss_id, const cata::optional< if( miss_id == "Recruit Companions" ) { start_mission( "_faction_camp_recruit_0", 4_days, true, - _( "departs to search for recruits..." ), false, {}, "gun", 0 ); + _( "departs to search for recruits…" ), false, {}, "gun", 0 ); } else if( miss_id == "Recover Recruiter" ) { recruit_return( "_faction_camp_recruit_0", recruit_evaluation() ); } @@ -1425,7 +1425,7 @@ bool basecamp::handle_mission( const std::string &miss_id, const cata::optional< if( miss_id == "Expand Base" ) { start_mission( "_faction_camp_expansion", 3_hours, true, - _( "departs to survey land..." ), false, {}, "gun", 0 ); + _( "departs to survey land…" ), false, {}, "gun", 0 ); } else if( miss_id == "Recover Surveyor" ) { survey_return(); } @@ -1438,7 +1438,7 @@ bool basecamp::handle_mission( const std::string &miss_id, const cata::optional< start_crafting( miss_id, *miss_dir, "BASE", "_faction_camp_crafting_", by_radio ); } if( miss_id == base_dir_id + " (Finish) Crafting" ) { - const std::string msg = _( "returns to you with something..." ); + const std::string msg = _( "returns to you with something…" ); mission_return( "_faction_camp_crafting_" + miss_dir_id, 1_minutes, true, msg, "construction", 2 ); } @@ -1465,7 +1465,7 @@ bool basecamp::handle_mission( const std::string &miss_id, const cata::optional< start_crafting( miss_id, *miss_dir, "FARM", "_faction_exp_farm_crafting_", by_radio ); if( miss_id == miss_dir_id + " (Finish) Crafting" && *miss_dir != base_dir ) { - const std::string msg = _( "returns from your farm with something..." ); + const std::string msg = _( "returns from your farm with something…" ); mission_return( "_faction_exp_farm_crafting_" + miss_dir_id, 1_minutes, true, msg, "construction", 2 ); } @@ -1473,7 +1473,7 @@ bool basecamp::handle_mission( const std::string &miss_id, const cata::optional< start_crafting( miss_id, *miss_dir, "COOK", "_faction_exp_kitchen_cooking_", by_radio ); if( miss_id == miss_dir_id + " (Finish) Cooking" ) { - const std::string msg = _( "returns from your kitchen with something..." ); + const std::string msg = _( "returns from your kitchen with something…" ); mission_return( "_faction_exp_kitchen_cooking_" + miss_dir_id, 1_minutes, true, msg, "cooking", 2 ); } @@ -1482,7 +1482,7 @@ bool basecamp::handle_mission( const std::string &miss_id, const cata::optional< by_radio ); if( miss_id == miss_dir_id + " (Finish) Smithing" ) { const std::string msg = _( "returns from your blacksmith shop with " - "something..." ); + "something…" ); mission_return( "_faction_exp_blacksmith_crafting_" + miss_dir_id, 1_minutes, true, msg, "fabrication", 2 ); } @@ -1508,7 +1508,7 @@ bool basecamp::handle_mission( const std::string &miss_id, const cata::optional< if( miss_id == miss_dir_id + " Chop Shop" ) { start_garage_chop( *miss_dir, omt_trg ); } else if( miss_id == miss_dir_id + " (Finish) Chop Shop" ) { - const std::string msg = _( "returns from your garage..." ); + const std::string msg = _( "returns from your garage…" ); mission_return( "_faction_exp_chop_shop_" + miss_dir_id, 5_days, true, msg, "mechanics", 2 ); } @@ -1559,7 +1559,7 @@ void basecamp::start_upgrade( const std::string &bldg, const point &dir, time_duration work_days = base_camps::to_workdays( making.batch_duration() ); npc_ptr comp = start_mission( key, work_days, must_feed, - _( "begins to upgrade the camp..." ), false, {}, + _( "begins to upgrade the camp…" ), false, {}, making.skill_used.str(), making.difficulty ); if( comp == nullptr ) { return; @@ -1711,7 +1711,7 @@ void basecamp::start_cut_logs() g->draw_ter(); npc_ptr comp = start_mission( "_faction_camp_cut_log", work_time, true, - _( "departs to cut logs..." ), false, {}, "fabrication", 2 ); + _( "departs to cut logs…" ), false, {}, "fabrication", 2 ); if( comp != nullptr ) { om_cutdown_trees_logs( forest, 50 ); om_harvest_ter( *comp, forest, ter_id( "t_tree_young" ), 50 ); @@ -1756,7 +1756,7 @@ void basecamp::start_clearcut() g->draw_ter(); npc_ptr comp = start_mission( "_faction_camp_clearcut", work_time, - true, _( "departs to clear a forest..." ), false, {}, + true, _( "departs to clear a forest…" ), false, {}, "fabrication", 1 ); if( comp != nullptr ) { om_cutdown_trees_trunks( forest, 95 ); @@ -1798,7 +1798,7 @@ void basecamp::start_setup_hide_site() return; } npc_ptr comp = start_mission( "_faction_camp_hide_site", work_time, true, - _( "departs to build a hide site..." ), false, {}, + _( "departs to build a hide site…" ), false, {}, "survival", 3 ); if( comp != nullptr ) { trips = om_carry_weight_to_trips( losing_equipment, comp ); @@ -1809,7 +1809,7 @@ void basecamp::start_setup_hide_site() om_set_hide_site( *comp, forest, losing_equipment ); } } else { - popup( _( "You need equipment to setup a hide site..." ) ); + popup( _( "You need equipment to setup a hide site…" ) ); } } } @@ -1859,7 +1859,7 @@ void basecamp::start_relay_hide_site() } npc_ptr comp = start_mission( "_faction_camp_hide_trans", work_time, true, - _( "departs for the hide site..." ), false, {}, + _( "departs for the hide site…" ), false, {}, "survival", 3 ); if( comp != nullptr ) { // recalculate trips based on actual load @@ -1873,7 +1873,7 @@ void basecamp::start_relay_hide_site() om_set_hide_site( *comp, forest, losing_equipment, gaining_equipment ); } } else { - popup( _( "You need equipment to transport between the hide site..." ) ); + popup( _( "You need equipment to transport between the hide site…" ) ); } } } @@ -1957,7 +1957,7 @@ void basecamp::start_fortifications( std::string &bldg_exp, bool by_radio ) } npc_ptr comp = start_mission( "_faction_camp_om_fortifications", total_time, true, - _( "begins constructing fortifications..." ), false, {}, + _( "begins constructing fortifications…" ), false, {}, making.skill_used.str(), making.difficulty ); if( comp != nullptr ) { consume_components( making, fortify_om.size() * 2 - 2, by_radio ); @@ -1985,7 +1985,7 @@ void basecamp::start_combat_mission( const std::string &miss ) travel_time, dist, trips, time_to_food( travel_time ) ) ) ) { return; } - npc_ptr comp = start_mission( miss, travel_time, true, _( "departs on patrol..." ), + npc_ptr comp = start_mission( miss, travel_time, true, _( "departs on patrol…" ), false, {}, "survival", 3 ); if( comp != nullptr ) { comp->companion_mission_points = scout_points; @@ -2033,7 +2033,7 @@ void basecamp::start_crafting( const std::string &cur_id, const point &cur_dir, } time_duration work_days = base_camps::to_workdays( making.batch_duration( batch_size ) ); npc_ptr comp = start_mission( miss_id + cur_dir_id, work_days, true, - _( "begins to work..." ), false, {}, + _( "begins to work…" ), false, {}, making.skill_used.str(), making.difficulty ); if( comp != nullptr ) { consume_components( making, batch_size, by_radio ); @@ -2182,12 +2182,12 @@ void basecamp::start_farm_op( const point &dir, const tripoint &omt_tgt, farm_op case farm_ops::harvest: work += 3_minutes * plots_cnt; start_mission( "_faction_exp_harvest_" + dir_id, work, true, - _( "begins to harvest the field..." ), false, {}, "survival", 0 ); + _( "begins to harvest the field…" ), false, {}, "survival", 0 ); break; case farm_ops::plant: { std::vector seed_inv = _inv.items_with( farm_valid_seed ); if( seed_inv.empty() ) { - popup( _( "You have no additional seeds to give your companions..." ) ); + popup( _( "You have no additional seeds to give your companions…" ) ); return; } std::vector plant_these = give_equipment( seed_inv, @@ -2202,13 +2202,13 @@ void basecamp::start_farm_op( const point &dir, const tripoint &omt_tgt, farm_op } work += 1_minutes * plots_seeded; start_mission( "_faction_exp_plant_" + dir_id, work, true, - _( "begins planting the field..." ), false, plant_these, "", 0 ); + _( "begins planting the field…" ), false, plant_these, "", 0 ); break; } case farm_ops::plow: work += 5_minutes * plots_cnt; start_mission( "_faction_exp_plow_" + dir_id, work, true, - _( "begins plowing the field..." ), false, {}, "", 0 ); + _( "begins plowing the field…" ), false, {}, "", 0 ); break; default: debugmsg( "Farm operations called with no operation" ); @@ -2229,7 +2229,7 @@ bool basecamp::start_garage_chop( const point &dir, const tripoint &omt_tgt ) const std::string dir_id = base_camps::all_directions.at( dir ).id; npc_ptr comp = start_mission( "_faction_exp_chop_shop_" + dir_id, 5_days, true, - _( "begins working in the garage..." ), false, {}, + _( "begins working in the garage…" ), false, {}, "mechanics", 2 ); if( comp == nullptr ) { return false; @@ -2311,7 +2311,7 @@ void basecamp::finish_return( npc &comp, const bool fixed_time, const std::strin // that food. so add it back in. int need_food = time_to_food( mission_time - reserve_time ); if( camp_food_supply() < need_food ) { - popup( _( "Your companion seems disappointed that your pantry is empty..." ) ); + popup( _( "Your companion seems disappointed that your pantry is empty…" ) ); } int avail_food = std::min( need_food, camp_food_supply() ) + time_to_food( reserve_time ); // movng all the logic from talk_function::companion return here instead of polluting @@ -2361,7 +2361,7 @@ npc_ptr basecamp::emergency_recall() npc_ptr comp = talk_function::companion_choose_return( omt_pos, base_camps::id, "", calendar::turn - 24_hours, false ); if( comp != nullptr ) { - const std::string return_msg = _( "responds to the emergency recall..." ); + const std::string return_msg = _( "responds to the emergency recall…" ); finish_return( *comp, false, return_msg, "menial", 0, true ); } return comp; @@ -2402,7 +2402,7 @@ bool basecamp::upgrade_return( const point &dir, const std::string &miss, update_resources( bldg ); const std::string msg = _( "returns from upgrading the camp having earned a bit of " - "experience..." ); + "experience…" ); finish_return( *comp, false, msg, "construction", making.difficulty ); return true; @@ -2410,7 +2410,7 @@ bool basecamp::upgrade_return( const point &dir, const std::string &miss, bool basecamp::menial_return() { - const std::string msg = _( "returns from doing the dirty work to keep the camp running..." ); + const std::string msg = _( "returns from doing the dirty work to keep the camp running…" ); npc_ptr comp = mission_return( "_faction_camp_menial", 3_hours, true, msg, "menial", 2 ); if( comp == nullptr ) { return false; @@ -2459,7 +2459,7 @@ bool basecamp::gathering_return( const std::string &task, time_duration min_time return false; } const std::string msg = string_format( _( "returns from %s carrying supplies and has a bit " - "more experience..." ), task_description ); + "more experience…" ), task_description ); finish_return( *comp, false, msg, skill_group, 1 ); std::string itemlist = "forest"; @@ -2534,7 +2534,7 @@ void basecamp::fortifications_return() fortifications.push_back( fort_point ); } } - const std::string msg = _( "returns from constructing fortifications..." ); + const std::string msg = _( "returns from constructing fortifications…" ); finish_return( *comp, true, msg, "construction", 2 ); } } @@ -2542,7 +2542,7 @@ void basecamp::fortifications_return() void basecamp::recruit_return( const std::string &task, int score ) { const std::string msg = _( "returns from searching for recruits with " - "a bit more experience..." ); + "a bit more experience…" ); npc_ptr comp = mission_return( task, 4_days, true, msg, "recruiting", 2 ); if( comp == nullptr ) { return; @@ -2555,18 +2555,18 @@ void basecamp::recruit_return( const std::string &task, int score ) recruit = std::make_shared(); recruit->normalize(); recruit->randomize(); - popup( _( "%s encountered %s..." ), comp->name, recruit->name ); + popup( _( "%s encountered %s…" ), comp->name, recruit->name ); } else { - popup( _( "%s didn't find anyone to recruit..." ), comp->name ); + popup( _( "%s didn't find anyone to recruit…" ), comp->name ); return; } //Chance of convincing them to come back skill = ( 100 * comp->get_skill_level( skill_speech ) + score ) / 100; if( rng( 1, 20 ) + skill > 19 ) { - popup( _( "%s convinced %s to hear a recruitment offer from you..." ), comp->name, + popup( _( "%s convinced %s to hear a recruitment offer from you…" ), comp->name, recruit->name ); } else { - popup( _( "%s wasn't interested in anything %s had to offer..." ), recruit->name, + popup( _( "%s wasn't interested in anything %s had to offer…" ), recruit->name, comp->name ); return; } @@ -2613,7 +2613,7 @@ void basecamp::recruit_return( const std::string &task, int score ) rec_m = uilist( description, rec_options ); if( rec_m < 0 || rec_m == 3 || static_cast( rec_m ) >= rec_options.size() ) { - popup( _( "You decide you aren't interested..." ) ); + popup( _( "You decide you aren't interested…" ) ); return; } @@ -2635,7 +2635,7 @@ void basecamp::recruit_return( const std::string &task, int score ) if( rng( 1, 20 ) + appeal >= 10 ) { popup( _( "%s has been convinced to join!" ), recruit->name ); } else { - popup( _( "%s wasn't interested..." ), recruit->name ); + popup( _( "%s wasn't interested…" ), recruit->name ); // nullptr; return; } @@ -2667,10 +2667,10 @@ void basecamp::combat_mission_return( const std::string &miss ) int swim = comp->get_skill_level( skill_swimming ); if( is_river( omt_ref ) && swim < 2 ) { if( swim == 0 ) { - popup( _( "Your companion hit a river and didn't know how to swim..." ) ); + popup( _( "Your companion hit a river and didn't know how to swim…" ) ); } else { popup( _( "Your companion hit a river and didn't know how to swim well " - "enough to cross..." ) ); + "enough to cross…" ) ); } break; } @@ -2680,14 +2680,14 @@ void basecamp::combat_mission_return( const std::string &miss ) if( outcome ) { overmap_buffer.reveal( pt, 2 ); } else if( comp->is_dead() ) { - popup( _( "%s didn't return from patrol..." ), comp->name ); + popup( _( "%s didn't return from patrol…" ), comp->name ); comp->place_corpse( pt ); overmap_buffer.add_note( pt, "DEAD NPC" ); overmap_buffer.remove_npc( comp->getID() ); return; } } - const std::string msg = _( "returns from patrol..." ); + const std::string msg = _( "returns from patrol…" ); finish_return( *comp, true, msg, "combat", 4 ); } } @@ -2745,7 +2745,7 @@ bool basecamp::survey_return() bool basecamp::farm_return( const std::string &task, const tripoint &omt_tgt, farm_ops op ) { - const std::string msg = _( "returns from working your fields..." ); + const std::string msg = _( "returns from working your fields…" ); npc_ptr comp = companion_choose_return( task, 15_minutes ); if( comp == nullptr ) { return false; @@ -3655,7 +3655,7 @@ int time_to_food( time_duration work ) bool basecamp::distribute_food() { if( !validate_sort_points() ) { - popup( _( "You do not have a camp food zone. Aborting..." ) ); + popup( _( "You do not have a camp food zone. Aborting…" ) ); return false; } @@ -3677,7 +3677,7 @@ bool basecamp::distribute_food() } } if( !has_food ) { - popup( _( "No items are located at the drop point..." ) ); + popup( _( "No items are located at the drop point…" ) ); return false; } double quick_rot = 0.6 + ( has_provides( "pantry" ) ? 0.1 : 0 ); @@ -3791,7 +3791,7 @@ void apply_camp_ownership( const tripoint &camp_pos, int radius ) // this entire system is stupid bool survive_random_encounter( npc &comp, std::string &situation, int favor, int threat ) { - popup( _( "While %s, a silent specter approaches %s..." ), situation, comp.name ); + popup( _( "While %s, a silent specter approaches %s…" ), situation, comp.name ); int skill_1 = comp.get_skill_level( skill_survival ); int skill_2 = comp.get_skill_level( skill_speech ); if( skill_1 + favor > rng( 0, 10 ) ) { @@ -3815,15 +3815,15 @@ bool survive_random_encounter( npc &comp, std::string &situation, int favor, int int monsters = rng( 0, threat ); if( skill * rng( 8, 12 ) > ( monsters * rng( 8, 12 ) ) ) { if( one_in( 2 ) ) { - popup( _( "The bull moose charged %s from the tree line..." ), comp.name ); + popup( _( "The bull moose charged %s from the tree line…" ), comp.name ); popup( _( "Despite being caught off guard %s was able to run away until the " "moose gave up pursuit." ), comp.name ); } else { popup( _( "The jabberwock grabbed %s by the arm from behind and " "began to scream." ), comp.name ); popup( _( "Terrified, %s spun around and delivered a massive kick " - "to the creature's torso..." ), comp.name ); - popup( _( "Collapsing into a pile of gore, %s walked away unscathed..." ), + "to the creature's torso…" ), comp.name ); + popup( _( "Collapsing into a pile of gore, %s walked away unscathed…" ), comp.name ); popup( _( "(Sounds like bullshit, you wonder what really happened.)" ) ); } @@ -3831,11 +3831,11 @@ bool survive_random_encounter( npc &comp, std::string &situation, int favor, int } else { if( one_in( 2 ) ) { popup( _( "%s turned to find the hideous black eyes of a giant wasp " - "staring back from only a few feet away..." ), comp.name ); + "staring back from only a few feet away…" ), comp.name ); popup( _( "The screams were terrifying, there was nothing anyone could do." ) ); } else { popup( _( "Pieces of %s were found strewn across a few bushes." ), comp.name ); - popup( _( "(You wonder if your companions are fit to work on their own...)" ) ); + popup( _( "(You wonder if your companions are fit to work on their own…)" ) ); } overmap_buffer.remove_npc( comp.getID() ); return false; diff --git a/src/game.cpp b/src/game.cpp index f40960edc4de4..e2bd931d8b23a 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -628,7 +628,7 @@ void game::reenter_fullscreen() */ void game::setup() { - popup_status( _( "Please wait while the world data loads..." ), _( "Loading core data" ) ); + popup_status( _( "Please wait while the world data loads…" ), _( "Loading core data" ) ); loading_ui ui( true ); load_core_data( ui ); @@ -1560,7 +1560,7 @@ bool game::do_turn() if( calendar::once_every( 1_minutes ) ) { query_popup() - .wait_message( "%s", _( "Wait till you wake up..." ) ) + .wait_message( "%s", _( "Wait till you wake up…" ) ) .on_top( true ) .show(); @@ -2537,7 +2537,7 @@ bool game::is_game_over() if( get_option( "DEATHCAM" ) == "always" ) { uquit = QUIT_WATCH; } else if( get_option( "DEATHCAM" ) == "ask" ) { - uquit = query_yn( _( "Watch the last moments of your life...?" ) ) ? + uquit = query_yn( _( "Watch the last moments of your life…?" ) ) ? QUIT_WATCH : QUIT_DIED; } else if( get_option( "DEATHCAM" ) == "never" ) { uquit = QUIT_DIED; @@ -3029,21 +3029,21 @@ void game::disp_faction_ends() for( const auto &elem : faction_manager_ptr->all() ) { if( elem.second.known_by_u ) { if( elem.second.name == "Your Followers" ) { - data.emplace_back( _( " You are forgotten among the billions lost in the cataclysm..." ) ); + data.emplace_back( _( " You are forgotten among the billions lost in the cataclysm…" ) ); display_table( w, "", 1, data ); } else if( elem.second.name == "The Old Guard" && elem.second.power != 100 ) { if( elem.second.power < 150 ) { data.emplace_back( _( " Locked in an endless battle, the Old Guard was forced to consolidate their " "resources in a handful of fortified bases along the coast. Without the men " - "or material to rebuild, the soldiers that remained lost all hope..." ) ); + "or material to rebuild, the soldiers that remained lost all hope…" ) ); } else { data.emplace_back( _( " The steadfastness of individual survivors after the cataclysm impressed " "the tattered remains of the once glorious union. Spurred on by small " "successes, a number of operations to re-secure facilities met with limited " "success. Forced to eventually consolidate to large bases, the Old Guard left " "these facilities in the hands of the few survivors that remained. As the " - "years past, little materialized from the hopes of rebuilding civilization..." ) ); + "years past, little materialized from the hopes of rebuilding civilization…" ) ); } display_table( w, _( "The Old Guard" ), 1, data ); } else if( elem.second.name == "The Free Merchants" && elem.second.power != 100 ) { @@ -3051,13 +3051,13 @@ void game::disp_faction_ends() data.emplace_back( _( " Life in the refugee shelter deteriorated as food shortages and disease " "destroyed any hope of maintaining a civilized enclave. The merchants and " "craftsmen dispersed to found new colonies but most became victims of " - "marauding bandits. Those who survived never found a place to call home..." ) ); + "marauding bandits. Those who survived never found a place to call home…" ) ); } else { data.emplace_back( _( " The Free Merchants struggled for years to keep themselves fed but their " "once profitable trade routes were plundered by bandits and thugs. In squalor " "and filth the first generations born after the cataclysm are told stories of " "the old days when food was abundant and the children were allowed to play in " - "the sun..." ) ); + "the sun…" ) ); } display_table( w, _( "The Free Merchants" ), 1, data ); } else if( elem.second.name == "The Tacoma Commune" && elem.second.power != 100 ) { @@ -3081,7 +3081,7 @@ void game::disp_faction_ends() _( " The lone bands of survivors who wandered the now alien world dwindled in " "number through the years. Unable to compete with the growing number of " "monstrosities that had adapted to live in their world, those who did survive " - "lived in dejected poverty and hopelessness..." ) ); + "lived in dejected poverty and hopelessness…" ) ); } else { data.emplace_back( _( " The scavengers who flourished in the opening days of the cataclysm found " @@ -3089,7 +3089,7 @@ void game::disp_faction_ends() "old world. Enormous hordes made cities impossible to enter while new " "eldritch horrors appeared mysteriously near old research labs. But on the " "fringes of where civilization once ended, bands of hunter-gatherers began to " - "adopt agrarian lifestyles in fortified enclaves..." ) ); + "adopt agrarian lifestyles in fortified enclaves…" ) ); } display_table( w, _( "The Wasteland Scavengers" ), 1, data ); } else if( elem.second.name == "Hell's Raiders" && elem.second.power != 100 ) { @@ -3106,7 +3106,7 @@ void game::disp_faction_ends() "brought the warlords abundant territory and slaves but little in the way of " "stability. Within weeks, infighting led to civil war as tribes vied for " "leadership of the faction. When only one warlord finally secured control, " - "there was nothing left to fight for... just endless cities full of the dead." ) ); + "there was nothing left to fight for… just endless cities full of the dead." ) ); } display_table( w, _( "Hell's Raiders" ), 1, data ); } @@ -5992,7 +5992,7 @@ void game::print_items_info( const tripoint &lp, const catacurses::window &w_loo const int max_width = getmaxx( w_look ) - column - 1; for( const auto &it : item_names ) { if( line >= last_line - 2 ) { - mvwprintz( w_look, point( column, ++line ), c_yellow, _( "More items here..." ) ); + mvwprintz( w_look, point( column, ++line ), c_yellow, _( "More items here…" ) ); break; } @@ -8324,7 +8324,7 @@ void game::butcher() } const auto helpers = u.get_crafting_helpers(); for( const npc *np : helpers ) { - add_msg( m_info, _( "%s helps with this task..." ), np->name ); + add_msg( m_info, _( "%s helps with this task…" ), np->name ); break; } switch( butcher_select ) { @@ -10568,7 +10568,7 @@ cata::optional game::find_or_make_stairs( map &mp, const int z_after, } else if( u.has_trait( trait_VINES2 ) || u.has_trait( trait_VINES3 ) ) { if( query_yn( _( "There is a sheer drop halfway down. Use your vines to descend?" ) ) ) { if( u.has_trait( trait_VINES2 ) ) { - if( query_yn( _( "Detach a vine? It'll hurt, but you'll be able to climb back up..." ) ) ) { + if( query_yn( _( "Detach a vine? It'll hurt, but you'll be able to climb back up…" ) ) ) { rope_ladder = true; add_msg( m_bad, _( "You descend on your vines, though leaving a part of you behind stings." ) ); u.mod_pain( 5 ); @@ -11794,7 +11794,7 @@ void game::add_artifact_messages( const std::vector &effects break; case AEP_EVIL: - add_msg( m_warning, _( "You feel an evil presence..." ) ); + add_msg( m_warning, _( "You feel an evil presence…" ) ); break; case AEP_SCHIZO: @@ -11810,7 +11810,7 @@ void game::add_artifact_messages( const std::vector &effects break; case AEP_ATTENTION: - add_msg( m_warning, _( "You feel an otherworldly attention upon you..." ) ); + add_msg( m_warning, _( "You feel an otherworldly attention upon you…" ) ); break; case AEP_FORCE_TELEPORT: diff --git a/src/game_inventory.cpp b/src/game_inventory.cpp index fe045742ecfa9..3ad61271f8487 100644 --- a/src/game_inventory.cpp +++ b/src/game_inventory.cpp @@ -815,7 +815,7 @@ class activatable_inventory_preset : public pickup_inventory_preset if( uses.size() == 1 ) { return uses.begin()->second.get_name(); } else if( uses.size() > 1 ) { - return _( "..." ); + return _( "…" ); } return std::string(); diff --git a/src/handle_action.cpp b/src/handle_action.cpp index 7c40e33ace3ee..d895af2eda886 100644 --- a/src/handle_action.cpp +++ b/src/handle_action.cpp @@ -306,7 +306,7 @@ input_context game::get_player_input( std::string &action ) if( uquit == QUIT_WATCH ) { query_popup() - .wait_message( c_red, _( "Press %s to accept your fate..." ), ctxt.get_desc( "QUIT" ) ) + .wait_message( c_red, _( "Press %s to accept your fate…" ), ctxt.get_desc( "QUIT" ) ) .on_top( true ) .show(); @@ -370,7 +370,7 @@ static void rcdrive( int dx, int dy ) } else if( !m.add_item_or_charges( dest, *rc_car ).is_null() ) { tripoint src( cx, cy, cz ); //~ Sound of moving a remote controlled car - sounds::sound( src, 6, sounds::sound_t::movement, _( "zzz..." ), true, "misc", "rc_car_drives" ); + sounds::sound( src, 6, sounds::sound_t::movement, _( "zzz…" ), true, "misc", "rc_car_drives" ); u.moves -= 50; m.i_rem( src, rc_car ); car_location_string.clear(); @@ -1066,19 +1066,19 @@ static void loot() if( flags & TillPlots ) { menu.addentry_desc( TillPlots, has_hoe, 't', - has_hoe ? _( "Till farm plots" ) : _( "Till farm plots... you need a tool to dig with" ), + has_hoe ? _( "Till farm plots" ) : _( "Till farm plots… you need a tool to dig with" ), _( "Tills nearby Farm: Plot zones." ) ); } if( flags & PlantPlots ) { menu.addentry_desc( PlantPlots, warm_enough_to_plant( g->u.pos() ) && has_seeds, 'p', - !warm_enough_to_plant( g->u.pos() ) ? _( "Plant seeds... it is too cold for planting" ) : - !has_seeds ? _( "Plant seeds... you don't have any" ) : _( "Plant seeds" ), + !warm_enough_to_plant( g->u.pos() ) ? _( "Plant seeds… it is too cold for planting" ) : + !has_seeds ? _( "Plant seeds… you don't have any" ) : _( "Plant seeds" ), _( "Plant seeds into nearby Farm: Plot zones. Farm plot has to be set to specific plant seed and you must have seeds in your inventory." ) ); } if( flags & FertilizePlots ) { menu.addentry_desc( FertilizePlots, has_fertilizer, 'f', - !has_fertilizer ? _( "Fertilize plots... you don't have any fertilizer" ) : _( "Fertilize plots" ), + !has_fertilizer ? _( "Fertilize plots… you don't have any fertilizer" ) : _( "Fertilize plots" ), _( "Fertilize any nearby Farm: Plot zones." ) ); } @@ -1344,7 +1344,7 @@ static void fire() reach_attack( range, u ); } else { u.moves -= rng( 2, 8 ) * 10; - add_msg( m_bad, _( "You're too pacified to strike anything..." ) ); + add_msg( m_bad, _( "You're too pacified to strike anything…" ) ); } } else { reach_attack( range, u ); @@ -1357,7 +1357,7 @@ static void fire() reach_attack( range, u ); } else { u.moves -= rng( 2, 8 ) * 10; - add_msg( m_bad, _( "You're too pacified to strike anything..." ) ); + add_msg( m_bad, _( "You're too pacified to strike anything…" ) ); } } else { reach_attack( range, u ); diff --git a/src/iexamine.cpp b/src/iexamine.cpp index 29fa4052ff57d..ee621343abc16 100644 --- a/src/iexamine.cpp +++ b/src/iexamine.cpp @@ -876,7 +876,7 @@ void iexamine::rubble( player &p, const tripoint &examp ) } else if( p.has_quality( quality_id( "DIG" ), 2 ) ) { moves = to_moves( 2_minutes ); } else { - add_msg( m_info, _( "If only you had a shovel..." ) ); + add_msg( m_info, _( "If only you had a shovel…" ) ); return; } if( ( g->m.veh_at( examp ) || !g->m.tr_at( examp ).is_null() || @@ -1109,12 +1109,12 @@ void iexamine::slot_machine( player &p, const tripoint & ) } else if( query_yn( _( "Insert $10?" ) ) ) { do { if( one_in( 5 ) ) { - popup( _( "Three cherries... you get your money back!" ) ); + popup( _( "Three cherries… you get your money back!" ) ); } else if( one_in( 20 ) ) { - popup( _( "Three bells... you win $50!" ) ); + popup( _( "Three bells… you win $50!" ) ); p.cash += 4000; // Minus the $10 we wagered } else if( one_in( 50 ) ) { - popup( _( "Three stars... you win $200!" ) ); + popup( _( "Three stars… you win $200!" ) ); p.cash += 19000; } else if( one_in( 1000 ) ) { popup( _( "JACKPOT! You win $3000!" ) ); @@ -1145,7 +1145,7 @@ void iexamine::safe( player &p, const tripoint &examp ) p.moves -= to_turns( 10_seconds ); // one_in(30^3) chance of guessing if( one_in( 27000 ) ) { - p.add_msg_if_player( m_good, _( "You mess with the dial for a little bit... and it opens!" ) ); + p.add_msg_if_player( m_good, _( "You mess with the dial for a little bit… and it opens!" ) ); g->m.furn_set( examp, f_safe_o ); return; } else { @@ -1240,7 +1240,7 @@ void iexamine::locked_object( player &p, const tripoint &examp ) } ); if( prying_items.empty() ) { - add_msg( m_info, _( "If only you had something to pry with..." ) ); + add_msg( m_info, _( "If only you had something to pry with…" ) ); return; } @@ -1250,7 +1250,7 @@ void iexamine::locked_object( player &p, const tripoint &examp ) } ); //~ %1$s: terrain/furniture name, %2$s: prying tool name - p.add_msg_if_player( _( "You attempt to pry open the %1$s using your %2$s..." ), + p.add_msg_if_player( _( "You attempt to pry open the %1$s using your %2$s…" ), g->m.has_furn( examp ) ? g->m.furnname( examp ) : g->m.tername( examp ), prying_items[0]->tname() ); // if crowbar() ever eats charges or otherwise alters the passed item, rewrite this to reflect @@ -1309,8 +1309,8 @@ void iexamine::pedestal_wyrm( player &p, const tripoint &examp ) g->m.ter_set( mon->pos(), t_rock_floor ); } } - add_msg( _( "The pedestal sinks into the ground..." ) ); - sounds::sound( examp, 80, sounds::sound_t::combat, _( "an ominous grinding noise..." ), true, + add_msg( _( "The pedestal sinks into the ground…" ) ); + sounds::sound( examp, 80, sounds::sound_t::combat, _( "an ominous grinding noise…" ), true, "misc", "stones_grinding" ); g->m.ter_set( examp, t_rock_floor ); g->timed_events.add( TIMED_EVENT_SPAWN_WYRMS, calendar::turn + rng( 30_seconds, 60_seconds ) ); @@ -1323,14 +1323,14 @@ void iexamine::pedestal_temple( player &p, const tripoint &examp ) { map_stack items = g->m.i_at( examp ); if( !items.empty() && items.only_item().typeId() == "petrified_eye" ) { - add_msg( _( "The pedestal sinks into the ground..." ) ); + add_msg( _( "The pedestal sinks into the ground…" ) ); g->m.ter_set( examp, t_dirt ); g->m.i_clear( examp ); g->timed_events.add( TIMED_EVENT_TEMPLE_OPEN, calendar::turn + 10_seconds ); } else if( p.has_amount( "petrified_eye", 1 ) && query_yn( _( "Place your petrified eye on the pedestal?" ) ) ) { p.use_amount( "petrified_eye", 1 ); - add_msg( _( "The pedestal sinks into the ground..." ) ); + add_msg( _( "The pedestal sinks into the ground…" ) ); g->m.ter_set( examp, t_dirt ); g->timed_events.add( TIMED_EVENT_TEMPLE_OPEN, calendar::turn + 10_seconds ); } else { @@ -1545,7 +1545,7 @@ void iexamine::flower_poppy( player &p, const tripoint &examp ) if( ( ( recentWeather.rain_amount > 1 ) ? one_in( 6 ) : one_in( 3 ) ) && resist < 5 ) { // Should user player::infect, but can't! // player::infect needs to be restructured to return a bool indicating success. - add_msg( m_bad, _( "You fall asleep..." ) ); + add_msg( m_bad, _( "You fall asleep…" ) ); p.fall_asleep( 2_hours ); add_msg( m_bad, _( "Your legs are covered in the poppy's roots!" ) ); p.apply_damage( nullptr, bp_leg_l, 4 ); @@ -1728,7 +1728,7 @@ void iexamine::harvested_plant( player &p, const tripoint &examp ) void iexamine::flower_marloss( player &p, const tripoint &examp ) { if( season_of_year( calendar::turn ) == WINTER ) { - add_msg( m_info, _( "This flower is still alive, despite the harsh conditions..." ) ); + add_msg( m_info, _( "This flower is still alive, despite the harsh conditions…" ) ); } if( can_drink_nectar( p ) ) { if( !query_yn( _( "You feel out of place as you explore the %s. Drink?" ), @@ -1736,7 +1736,7 @@ void iexamine::flower_marloss( player &p, const tripoint &examp ) return; } p.moves -= to_moves( 30_seconds ); // Takes 30 seconds - add_msg( m_bad, _( "This flower tastes very wrong..." ) ); + add_msg( m_bad, _( "This flower tastes very wrong…" ) ); // If you can drink flowers, you're post-thresh and the Mycus does not want you. p.add_effect( effect_teleglow, 10_minutes ); } @@ -1919,7 +1919,7 @@ void iexamine::dirtmound( player &p, const tripoint &examp ) return; } if( !g->m.i_at( examp ).empty() ) { - add_msg( _( "Something's lying there..." ) ); + add_msg( _( "Something's lying there…" ) ); return; } @@ -2023,7 +2023,7 @@ void iexamine::harvest_plant( player &p, const tripoint &examp, bool from_activi add_msg( m_info, _( "The seed blooms forth! We have brought true beauty to this world." ) ); } else if( ( p.has_trait( trait_THRESH_MYCUS ) ) || one_in( 4 ) ) { g->m.furn_set( examp, f_flower_marloss ); - add_msg( m_info, _( "The seed blossoms rather rapidly..." ) ); + add_msg( m_info, _( "The seed blossoms rather rapidly…" ) ); } else { g->m.furn_set( examp, f_flower_fungal ); add_msg( m_info, _( "The seed blossoms into a flower-looking fungus." ) ); @@ -2270,7 +2270,7 @@ void iexamine::kiln_full( player &, const tripoint &examp ) map_stack items = g->m.i_at( examp ); if( items.empty() ) { - add_msg( _( "This kiln is empty..." ) ); + add_msg( _( "This kiln is empty…" ) ); g->m.furn_set( examp, next_kiln_type ); return; } @@ -2397,7 +2397,7 @@ void iexamine::arcfurnace_full( player &, const tripoint &examp ) map_stack items = g->m.i_at( examp ); if( items.empty() ) { - add_msg( _( "This furnace is empty..." ) ); + add_msg( _( "This furnace is empty…" ) ); g->m.furn_set( examp, next_arcfurnace_type ); return; } @@ -2463,7 +2463,7 @@ void iexamine::autoclave_empty( player &p, const tripoint &examp ) } ); if( items.empty() ) { - add_msg( _( "This autoclave is empty..." ) ); + add_msg( _( "This autoclave is empty…" ) ); return; } if( !cbms ) { @@ -2522,7 +2522,7 @@ void iexamine::autoclave_full( player &, const tripoint &examp ) } ); if( items.empty() ) { - add_msg( _( "This autoclave is empty..." ) ); + add_msg( _( "This autoclave is empty…" ) ); g->m.furn_set( examp, next_autoclave_type ); return; } @@ -2588,7 +2588,7 @@ void iexamine::fireplace( player &p, const tripoint &examp ) selection_menu.addentry( 0, true, 'g', _( "Get items" ) ); if( !already_on_fire ) { selection_menu.addentry( 1, has_firestarter, 'f', - has_firestarter ? _( "Start a fire" ) : _( "Start a fire... you'll need a fire source." ) ); + has_firestarter ? _( "Start a fire" ) : _( "Start a fire… you'll need a fire source." ) ); if( has_bionic_firestarter ) { selection_menu.addentry( 2, true, 'b', _( "Use a CBM to start a fire" ) ); } @@ -2612,7 +2612,7 @@ void iexamine::fireplace( player &p, const tripoint &examp ) item *it = firestarter.second; const auto usef = it->type->get_use( "firestarter" ); const auto actor = dynamic_cast( usef->get_actor_ptr() ); - p.add_msg_if_player( _( "You attempt to start a fire with your %s..." ), it->tname() ); + p.add_msg_if_player( _( "You attempt to start a fire with your %s…" ), it->tname() ); const ret_val can_use = actor->can_use( p, *it, false, examp ); if( can_use.success() ) { const int charges = actor->use( p, *it, false, examp ); @@ -3127,7 +3127,7 @@ void iexamine::tree_hickory( player &p, const tripoint &examp ) g->m.ter_set( examp, g->m.get_ter_transforms_into( examp ) ); } if( !p.has_quality( quality_id( "DIG" ) ) ) { - p.add_msg_if_player( m_info, _( "You have no tool to dig with..." ) ); + p.add_msg_if_player( m_info, _( "You have no tool to dig with…" ) ); return; } if( p.is_player() && @@ -5103,13 +5103,13 @@ void iexamine::quern_examine( player &p, const tripoint &examp ) if( !active ) { smenu.addentry_desc( 1, !empty, 'r', - empty ? _( "Remove brake and start milling... insert some products for milling first" ) : + empty ? _( "Remove brake and start milling… insert some products for milling first" ) : _( "Remove brake and start milling" ), _( "Remove brake and start milling, milling will take about 6 hours." ) ); smenu.addentry_desc( 2, !full, 'p', - full ? _( "Insert products for milling... mill is full" ) : - string_format( _( "Insert products for milling... remaining capacity is %s %s" ), + full ? _( "Insert products for milling… mill is full" ) : + string_format( _( "Insert products for milling… remaining capacity is %s %s" ), format_volume( remaining_capacity ), volume_units_abbr() ), _( "Fill the mill with starchy products such as wheat, barley or oats." ) ); @@ -5146,7 +5146,7 @@ void iexamine::quern_examine( player &p, const tripoint &examp ) } pop << "" << _( "You inspect its contents and find: " ) << "" << "\n\n "; if( items_here.empty() ) { - pop << _( "...that it is empty." ); + pop << _( "…that it is empty." ); } else { for( const item &it : items_here ) { if( it.typeId() == "fake_milling_item" ) { @@ -5277,16 +5277,16 @@ void iexamine::smoker_options( player &p, const tripoint &examp ) if( !active ) { smenu.addentry_desc( 1, !empty && has_enough_coal, 'l', - empty ? _( "Light up and smoke food... insert some food for smoking first" ) : + empty ? _( "Light up and smoke food… insert some food for smoking first" ) : !has_enough_coal ? string_format( - _( "Light up and smoke food... need extra %d charges of charcoal" ), + _( "Light up and smoke food… need extra %d charges of charcoal" ), need_charges - coal_charges ) : _( "Light up and smoke food" ), _( "Light up the smoking rack and start smoking. Smoking will take about 6 hours." ) ); if( portable ) { smenu.addentry_desc( 2, !full_portable, 'f', - full_portable ? _( "Insert food for smoking... smoking rack is full" ) : - string_format( _( "Insert food for smoking... remaining capacity is %s %s" ), + full_portable ? _( "Insert food for smoking… smoking rack is full" ) : + string_format( _( "Insert food for smoking… remaining capacity is %s %s" ), format_volume( remaining_capacity_portable ), volume_units_abbr() ), _( "Fill the smoking rack with raw meat, fish or sausages for smoking or fruit or vegetable or smoked meat for drying." ) ); @@ -5296,8 +5296,8 @@ void iexamine::smoker_options( player &p, const tripoint &examp ) } else { smenu.addentry_desc( 2, !full, 'f', - full ? _( "Insert food for smoking... smoking rack is full" ) : - string_format( _( "Insert food for smoking... remaining capacity is %s %s" ), + full ? _( "Insert food for smoking… smoking rack is full" ) : + string_format( _( "Insert food for smoking… remaining capacity is %s %s" ), format_volume( remaining_capacity ), volume_units_abbr() ), _( "Fill the smoking rack with raw meat, fish or sausages for smoking or fruit or vegetable or smoked meat for drying." ) ); } @@ -5307,7 +5307,7 @@ void iexamine::smoker_options( player &p, const tripoint &examp ) } smenu.addentry_desc( 3, has_coal_in_inventory, 'r', - !has_coal_in_inventory ? _( "Reload with charcoal... you don't have any" ) : + !has_coal_in_inventory ? _( "Reload with charcoal… you don't have any" ) : _( "Reload with charcoal" ), string_format( _( "You need %d charges of charcoal for %s %s of food. Minimal amount of charcoal is %d charges." ), @@ -5351,7 +5351,7 @@ void iexamine::smoker_options( player &p, const tripoint &examp ) } pop << "" << _( "You inspect its contents and find: " ) << "" << "\n\n "; if( items_here.empty() ) { - pop << _( "...that it is empty." ); + pop << _( "…that it is empty." ); } else { for( const item &it : items_here ) { if( it.typeId() == "fake_smoke_plume" ) { diff --git a/src/iuse.cpp b/src/iuse.cpp index 37f22376bc784..d0a289275c7fc 100644 --- a/src/iuse.cpp +++ b/src/iuse.cpp @@ -347,7 +347,7 @@ static bool check_litcig( player &u ) */ int iuse::sewage( player *p, item *it, bool, const tripoint & ) { - if( !p->query_yn( _( "Are you sure you want to drink... this?" ) ) ) { + if( !p->query_yn( _( "Are you sure you want to drink… this?" ) ) ) { return 0; } @@ -505,7 +505,7 @@ int iuse::smoking( player *p, item *it, bool, const tripoint & ) } } if( p->get_effect_dur( effect_cig ) > 10_minutes * ( p->addiction_level( ADD_CIG ) + 1 ) ) { - p->add_msg_if_player( m_bad, _( "Ugh, too much smoke... you feel nasty." ) ); + p->add_msg_if_player( m_bad, _( "Ugh, too much smoke… you feel nasty." ) ); } return it->type->charges_to_use(); @@ -532,7 +532,7 @@ int iuse::ecig( player *p, item *it, bool, const tripoint & ) p->mod_hunger( -1 ); p->add_effect( effect_cig, 10_minutes ); if( p->get_effect_dur( effect_cig ) > 10_minutes * ( p->addiction_level( ADD_CIG ) + 1 ) ) { - p->add_msg_if_player( m_bad, _( "Ugh, too much nicotine... you feel nasty." ) ); + p->add_msg_if_player( m_bad, _( "Ugh, too much nicotine… you feel nasty." ) ); } return it->type->charges_to_use(); } @@ -722,7 +722,7 @@ int iuse::anticonvulsant( player *p, item *it, bool, const tripoint & ) int iuse::weed_cake( player *p, item *it, bool, const tripoint & ) { p->add_msg_if_player( - _( "You start scarfing down the delicious cake. It tastes a little funny though..." ) ); + _( "You start scarfing down the delicious cake. It tastes a little funny though…" ) ); time_duration duration = 12_minutes; if( p->has_trait( trait_TOLERANCE ) ) { duration = 9_minutes; @@ -828,7 +828,7 @@ int iuse::poison( player *p, item *it, bool, const tripoint & ) // Players can abuse the crafting menu instead... if( !it->has_flag( "HIDDEN_POISON" ) && ( p->is_npc() || - !p->query_yn( _( "Are you sure you want to eat this? It looks poisonous..." ) ) ) ) { + !p->query_yn( _( "Are you sure you want to eat this? It looks poisonous…" ) ) ) ) { return 0; } /** @EFFECT_STR increases EATPOISON trait effectiveness (50-90%) */ @@ -902,7 +902,7 @@ int iuse::prozac( player *p, item *it, bool, const tripoint & ) int iuse::sleep( player *p, item *it, bool, const tripoint & ) { p->mod_fatigue( 40 ); - p->add_msg_if_player( m_warning, _( "You feel very sleepy..." ) ); + p->add_msg_if_player( m_warning, _( "You feel very sleepy…" ) ); return it->type->charges_to_use(); } @@ -932,7 +932,7 @@ int iuse::flusleep( player *p, item *it, bool, const tripoint & ) p->add_effect( effect_took_flumed, 12_hours ); p->mod_fatigue( 30 ); p->add_msg_if_player( _( "You take some %s" ), it->tname() ); - p->add_msg_if_player( m_warning, _( "You feel very sleepy..." ) ); + p->add_msg_if_player( m_warning, _( "You feel very sleepy…" ) ); return it->type->charges_to_use(); } @@ -1199,7 +1199,7 @@ static void marloss_common( player &p, item &it, const trait_id ¤t_color ) if( p.has_trait( current_color ) || p.has_trait( trait_THRESH_MARLOSS ) ) { p.add_msg_if_player( m_good, - _( "As you eat the %s, you have a near-religious experience, feeling at one with your surroundings..." ), + _( "As you eat the %s, you have a near-religious experience, feeling at one with your surroundings…" ), it.tname() ); p.add_morale( MORALE_MARLOSS, 100, 1000 ); for( const std::pair &pr : mycus_colors ) { @@ -1265,7 +1265,7 @@ static void marloss_common( player &p, item &it, const trait_id ¤t_color ) } else if( p.crossed_threshold() ) { // Mycus Rejection. Goo already present fights off the fungus. p.add_msg_if_player( m_bad, - _( "You feel a familiar warmth, but suddenly it surges into an excruciating burn as you convulse, vomiting, and black out..." ) ); + _( "You feel a familiar warmth, but suddenly it surges into an excruciating burn as you convulse, vomiting, and black out…" ) ); if( p.is_avatar() ) { g->memorial().add( pgettext( "memorial_male", "Suffered Marloss Rejection." ), @@ -1285,7 +1285,7 @@ static void marloss_common( player &p, item &it, const trait_id ¤t_color ) trait_MARLOSS_AVOID ); // And if you survive it's etched in your RNA, so you're unlikely to repeat the experiment. } else if( marloss_count >= 2 ) { p.add_msg_if_player( m_bad, - _( "You feel a familiar warmth, but suddenly it surges into painful burning as you convulse and collapse to the ground..." ) ); + _( "You feel a familiar warmth, but suddenly it surges into painful burning as you convulse and collapse to the ground…" ) ); /** @EFFECT_INT reduces sleep duration when eating wrong color marloss */ p.fall_asleep( 40_minutes - 1_minutes * p.int_cur / 2 ); for( const std::pair &pr : mycus_colors ) { @@ -1300,9 +1300,9 @@ static void marloss_common( player &p, item &it, const trait_id ¤t_color ) _( "You wake up in a marloss bush. Almost *cradled* in it, actually, as though it grew there for you." ) ); p.add_msg_if_player( m_good, //~ Beginning to hear the Mycus while conscious: that's it speaking - _( "unity. together we have reached the door. we provide the final key. now to pass through..." ) ); + _( "unity. together we have reached the door. we provide the final key. now to pass through…" ) ); } else { - p.add_msg_if_player( _( "You feel a strange warmth spreading throughout your body..." ) ); + p.add_msg_if_player( _( "You feel a strange warmth spreading throughout your body…" ) ); p.set_mutation( current_color ); // Give us addictions to the other two colors, but cure one for current color for( const std::pair &pr : mycus_colors ) { @@ -1392,10 +1392,10 @@ int iuse::mycus( player *p, item *it, bool t, const tripoint &pos ) p->radiation = 0; p->healall( 4 ); // Can't make you a whole new person, but not for lack of trying p->add_msg_if_player( m_good, - _( "As it settles in, you feel ecstasy radiating through every part of your body..." ) ); + _( "As it settles in, you feel ecstasy radiating through every part of your body…" ) ); p->add_morale( MORALE_MARLOSS, 1000, 1000 ); // Last time you'll ever have it this good. So enjoy. p->add_msg_if_player( m_good, - _( "Your eyes roll back in your head. Everything dissolves into a blissful haze..." ) ); + _( "Your eyes roll back in your head. Everything dissolves into a blissful haze…" ) ); /** @EFFECT_INT slightly reduces sleep duration when eating mycus */ p->fall_asleep( 5_hours - p->int_cur * 1_minutes ); p->unset_mutation( trait_THRESH_MARLOSS ); @@ -1456,7 +1456,7 @@ int iuse::mycus( player *p, item *it, bool t, const tripoint &pos ) } else { // In case someone gets one without having been adapted first. // Marloss is the Mycus' method of co-opting humans. Mycus fruit is for symbiotes' maintenance and development. p->add_msg_if_player( - _( "This tastes really weird! You're not sure it's good for you..." ) ); + _( "This tastes really weird! You're not sure it's good for you…" ) ); p->mutate(); p->mod_pain( 2 * rng( 1, 5 ) ); p->mod_stored_nutr( 10 ); @@ -1712,7 +1712,7 @@ int iuse::fishing_rod( player *p, item *it, bool, const tripoint & ) p->add_msg_if_player( m_info, _( "You can't fish there!" ) ); return 0; } - p->add_msg_if_player( _( "You cast your line and wait to hook something..." ) ); + p->add_msg_if_player( _( "You cast your line and wait to hook something…" ) ); p->assign_activity( activity_id( "ACT_FISH" ), to_moves( 5_hours ), 0, p->get_item_position( it ), it->tname() ); p->activity.coord_set = g->get_fishable_locations( 60, *found ); @@ -2765,7 +2765,7 @@ int iuse::dig( player *p, item *it, bool t, const tripoint & ) const std::vector helpers = g->u.get_crafting_helpers(); for( const npc *np : helpers ) { - add_msg( m_info, _( "%s helps with this task..." ), np->name ); + add_msg( m_info, _( "%s helps with this task…" ), np->name ); break; } @@ -2830,7 +2830,7 @@ int iuse::dig_channel( player *p, item *it, bool t, const tripoint & ) const std::vector helpers = g->u.get_crafting_helpers(); for( const npc *np : helpers ) { - add_msg( m_info, _( "%s helps with this task..." ), np->name ); + add_msg( m_info, _( "%s helps with this task…" ), np->name ); break; } @@ -2906,7 +2906,7 @@ int iuse::fill_pit( player *p, item *it, bool t, const tripoint & ) const int helpersize = g->u.get_num_crafting_helpers( 3 ); moves = moves * ( 1 - ( helpersize / 10 ) ); for( const npc *np : helpers ) { - add_msg( m_info, _( "%s helps with this task..." ), np->name ); + add_msg( m_info, _( "%s helps with this task…" ), np->name ); break; } p->assign_activity( activity_id( "ACT_FILL_PIT" ), moves, -1, p->get_item_position( it ) ); @@ -2946,7 +2946,7 @@ int iuse::clear_rubble( player *p, item *it, bool, const tripoint & ) int bonus = std::max( it->get_quality( quality_id( "DIG" ) ) - 1, 1 ); const std::vector helpers = g->u.get_crafting_helpers(); for( const npc *np : helpers ) { - add_msg( m_info, _( "%s helps with this task..." ), np->name ); + add_msg( m_info, _( "%s helps with this task…" ), np->name ); break; } const int helpersize = g->u.get_num_crafting_helpers( 3 ); @@ -3252,7 +3252,7 @@ int iuse::jackhammer( player *p, item *it, bool, const tripoint &pos ) const int helpersize = g->u.get_num_crafting_helpers( 3 ); moves *= ( 1 - ( helpersize / 10 ) ); for( const npc *np : helpers ) { - add_msg( m_info, _( "%s helps with this task..." ), np->name ); + add_msg( m_info, _( "%s helps with this task…" ), np->name ); break; } @@ -3308,7 +3308,7 @@ int iuse::pickaxe( player *p, item *it, bool, const tripoint &pos ) const int helpersize = g->u.get_num_crafting_helpers( 3 ); moves *= ( 1 - ( helpersize / 10 ) ); for( const npc *np : helpers ) { - add_msg( m_info, _( "%s helps with this task..." ), np->name ); + add_msg( m_info, _( "%s helps with this task…" ), np->name ); break; } @@ -3793,7 +3793,7 @@ int iuse::firecracker_pack_act( player *, item *it, bool, const tripoint &pos ) { time_duration timer = it->age(); if( timer < 2_turns ) { - sounds::sound( pos, 0, sounds::sound_t::alarm, _( "ssss..." ), true, "misc", "lit_fuse" ); + sounds::sound( pos, 0, sounds::sound_t::alarm, _( "ssss…" ), true, "misc", "lit_fuse" ); it->inc_damage(); } else if( it->charges > 0 ) { int ex = rng( 4, 6 ); @@ -3835,7 +3835,7 @@ int iuse::firecracker_act( player *p, item *it, bool t, const tripoint &pos ) return 0; } if( t ) { // Simple timer effects - sounds::sound( pos, 0, sounds::sound_t::alarm, _( "ssss..." ), true, "misc", "lit_fuse" ); + sounds::sound( pos, 0, sounds::sound_t::alarm, _( "ssss…" ), true, "misc", "lit_fuse" ); } else if( it->charges > 0 ) { p->add_msg_if_player( m_info, _( "You've already lit the %s, try throwing it instead." ), it->tname() ); @@ -3877,8 +3877,8 @@ int iuse::pheromone( player *p, item *it, bool, const tripoint &pos ) return 0; } - p->add_msg_player_or_npc( _( "You squeeze the pheromone ball..." ), - _( " squeezes the pheromone ball..." ) ); + p->add_msg_player_or_npc( _( "You squeeze the pheromone ball…" ), + _( " squeezes the pheromone ball…" ) ); p->moves -= 15; @@ -3898,11 +3898,11 @@ int iuse::pheromone( player *p, item *it, bool, const tripoint &pos ) if( g->u.sees( *p ) ) { if( converts == 0 ) { - add_msg( _( "...but nothing happens." ) ); + add_msg( _( "…but nothing happens." ) ); } else if( converts == 1 ) { - add_msg( m_good, _( "...and a nearby zombie becomes passive!" ) ); + add_msg( m_good, _( "…and a nearby zombie becomes passive!" ) ); } else { - add_msg( m_good, _( "...and several nearby zombies become passive!" ) ); + add_msg( m_good, _( "…and several nearby zombies become passive!" ) ); } } return it->type->charges_to_use(); @@ -4433,7 +4433,7 @@ int iuse::vibe( player *p, item *it, bool, const tripoint & ) return 0; } if( p->is_mounted() ) { - p->add_msg_if_player( m_info, _( "You cannot do... that while mounted." ) ); + p->add_msg_if_player( m_info, _( "You cannot do… that while mounted." ) ); return 0; } if( ( p->is_underwater() ) && ( !( ( p->has_trait( trait_GILLS ) ) || @@ -4480,7 +4480,7 @@ int iuse::vortex( player *p, item *it, bool, const tripoint & ) if( !mon ) { continue; } - p->add_msg_if_player( m_warning, _( "Air swirls all over..." ) ); + p->add_msg_if_player( m_warning, _( "Air swirls all over…" ) ); p->moves -= to_moves( 1_seconds ); it->convert( "spiral_stone" ); mon->friendly = -1; @@ -4550,7 +4550,7 @@ int iuse::blood_draw( player *p, item *it, bool, const tripoint & ) if( map_it.is_corpse() && query_yn( _( "Draw blood from %s?" ), colorize( map_it.tname(), map_it.color_in_inventory() ) ) ) { - p->add_msg_if_player( m_info, _( "You drew blood from the %s..." ), map_it.tname() ); + p->add_msg_if_player( m_info, _( "You drew blood from the %s…" ), map_it.tname() ); drew_blood = true; auto bloodtype( map_it.get_mtype()->bloodType() ); if( bloodtype.obj().has_acid ) { @@ -4562,7 +4562,7 @@ int iuse::blood_draw( player *p, item *it, bool, const tripoint & ) } if( !drew_blood && query_yn( _( "Draw your own blood?" ) ) ) { - p->add_msg_if_player( m_info, _( "You drew your own blood..." ) ); + p->add_msg_if_player( m_info, _( "You drew your own blood…" ) ); drew_blood = true; if( p->has_trait( trait_ACIDBLOOD ) ) { acid_blood = true; @@ -4577,12 +4577,12 @@ int iuse::blood_draw( player *p, item *it, bool, const tripoint & ) it->put_in( acid ); if( one_in( 3 ) ) { if( it->inc_damage( DT_ACID ) ) { - p->add_msg_if_player( m_info, _( "...but acidic blood melts the %s, destroying it!" ), + p->add_msg_if_player( m_info, _( "…but acidic blood melts the %s, destroying it!" ), it->tname() ); p->i_rem( it ); return 0; } - p->add_msg_if_player( m_info, _( "...but acidic blood damages the %s!" ), it->tname() ); + p->add_msg_if_player( m_info, _( "…but acidic blood damages the %s!" ), it->tname() ); } return it->type->charges_to_use(); } @@ -4719,7 +4719,7 @@ int iuse::chop_tree( player *p, item *it, bool t, const tripoint & ) int moves = chop_moves( p, it ); const std::vector helpers = g->u.get_crafting_helpers(); for( const npc *np : helpers ) { - add_msg( m_info, _( "%s helps with this task..." ), np->name ); + add_msg( m_info, _( "%s helps with this task…" ), np->name ); break; } p->assign_activity( activity_id( "ACT_CHOP_TREE" ), moves, -1, p->get_item_position( it ) ); @@ -4762,7 +4762,7 @@ int iuse::chop_logs( player *p, item *it, bool t, const tripoint & ) int moves = chop_moves( p, it ); const std::vector helpers = g->u.get_crafting_helpers(); for( const npc *np : helpers ) { - add_msg( m_info, _( "%s helps with this task..." ), np->name ); + add_msg( m_info, _( "%s helps with this task…" ), np->name ); break; } p->assign_activity( activity_id( "ACT_CHOP_LOGS" ), moves, -1, p->get_item_position( it ) ); @@ -5169,7 +5169,7 @@ int iuse::artifact( player *p, item *it, bool, const tripoint & ) const bool new_map = overmap_buffer.reveal( center.xy(), 20, center.z ); if( new_map ) { - p->add_msg_if_player( m_warning, _( "You have a vision of the surrounding area..." ) ); + p->add_msg_if_player( m_warning, _( "You have a vision of the surrounding area…" ) ); p->moves -= to_moves( 1_seconds ); } } @@ -6556,7 +6556,7 @@ int iuse::einktabletpc( player *p, item *it, bool t, const tripoint &pos ) const int random_photo = rng( 1, 20 ); switch( random_photo ) { case 1: - p->add_msg_if_player( m_good, _( "You used to have a dog like this..." ) ); + p->add_msg_if_player( m_good, _( "You used to have a dog like this…" ) ); break; case 2: p->add_msg_if_player( m_good, _( "Ha-ha! An amusing cat photo." ) ); @@ -6565,7 +6565,7 @@ int iuse::einktabletpc( player *p, item *it, bool t, const tripoint &pos ) p->add_msg_if_player( m_good, _( "Excellent pictures of nature." ) ); break; case 4: - p->add_msg_if_player( m_good, _( "Food photos... your stomach rumbles!" ) ); + p->add_msg_if_player( m_good, _( "Food photos… your stomach rumbles!" ) ); break; case 5: p->add_msg_if_player( m_good, _( "Some very interesting travel photos." ) ); @@ -7682,11 +7682,11 @@ int iuse::camera( player *p, item *it, bool, const tripoint & ) // get an special message if the target is a hallucination if( trajectory_point == aim_point && ( z.is_hallucination() || z.type->in_species( HALLUCINATION ) ) ) { - p->add_msg_if_player( _( "Strange... there's nothing in the center of picture?" ) ); + p->add_msg_if_player( _( "Strange… there's nothing in the center of picture?" ) ); } } else if( guy ) { if( trajectory_point == aim_point && guy->is_hallucination() ) { - p->add_msg_if_player( _( "Strange... %s's not visible on the picture?" ), guy->name ); + p->add_msg_if_player( _( "Strange… %s's not visible on the picture?" ), guy->name ); } else if( !aim_bounds.is_point_inside( trajectory_point ) ) { // take a photo of the monster that's in the way p->add_msg_if_player( m_warning, _( "%s got in the way of your photo." ), guy->name ); @@ -8054,7 +8054,7 @@ int iuse::radiocaron( player *p, item *it, bool t, const tripoint &pos ) { if( t ) { //~Sound of a radio controlled car moving around - sounds::sound( pos, 6, sounds::sound_t::movement, _( "buzzz..." ), true, "misc", "rc_car_drives" ); + sounds::sound( pos, 6, sounds::sound_t::movement, _( "buzzz…" ), true, "misc", "rc_car_drives" ); return it->type->charges_to_use(); } else if( !it->ammo_sufficient() ) { @@ -8525,7 +8525,7 @@ int iuse::multicooker( player *p, item *it, bool t, const tripoint &pos ) /** @EFFECT_SURVIVAL increases chance of checking multi-cooker on time */ if( p->int_cur + p->get_skill_level( skill_cooking ) + p->get_skill_level( skill_survival ) > 16 ) { - add_msg( m_info, _( "The multi-cooker should be finishing shortly..." ) ); + add_msg( m_info, _( "The multi-cooker should be finishing shortly…" ) ); } } @@ -8745,7 +8745,7 @@ int iuse::multicooker( player *p, item *it, bool t, const tripoint &pos ) if( mc_upgrade == choice ) { if( !p->has_morale_to_craft() ) { - p->add_msg_if_player( m_info, _( "Your morale is too low to craft..." ) ); + p->add_msg_if_player( m_info, _( "Your morale is too low to craft…" ) ); return 0; } @@ -9076,7 +9076,7 @@ int iuse::weather_tool( player *p, item *it, bool, const tripoint & ) const auto player_local_temp = g->weather.get_temperature( g->u.pos() ); if( it->typeId() == "weather_reader" ) { - p->add_msg_if_player( m_neutral, _( "The %s's monitor slowly outputs the data..." ), + p->add_msg_if_player( m_neutral, _( "The %s's monitor slowly outputs the data…" ), it->tname() ); } if( it->has_flag( "THERMOMETER" ) ) { @@ -9496,7 +9496,7 @@ int iuse::wash_items( player *p, bool soft_items, bool hard_items ) const int helpersize = g->u.get_num_crafting_helpers( 3 ); required.time = required.time * ( 1 - ( helpersize / 10 ) ); for( const npc *np : helpers ) { - add_msg( m_info, _( "%s helps with this task..." ), np->name ); + add_msg( m_info, _( "%s helps with this task…" ), np->name ); break; } // Assign the activity values. diff --git a/src/iuse_actor.cpp b/src/iuse_actor.cpp index a187db9ebad8a..950580c037a95 100644 --- a/src/iuse_actor.cpp +++ b/src/iuse_actor.cpp @@ -993,7 +993,7 @@ int pick_lock_actor::use( player &p, item &it, bool, const tripoint & ) const } else if( type == t_door_bar_locked ) { new_type = t_door_bar_o; //Bar doors auto-open (and lock if closed again) so show a different message) - open_message = _( "The door swings open..." ); + open_message = _( "The door swings open…" ); } else { return 0; } @@ -1907,7 +1907,7 @@ int enzlave_actor::use( player &p, item &it, bool t, const tripoint & ) const if( tolerance_level == 0 ) { // You just don't care, no message. } else if( tolerance_level <= 5 ) { - add_msg( m_neutral, _( "Well, it's more constructive than just chopping 'em into gooey meat..." ) ); + add_msg( m_neutral, _( "Well, it's more constructive than just chopping 'em into gooey meat…" ) ); } else { add_msg( m_bad, _( "You feel horrible for mutilating and enslaving someone's corpse." ) ); @@ -4215,7 +4215,7 @@ int mutagen_actor::use( player &p, item &it, bool, const tripoint & ) const mutation_category ); if( p.has_trait( trait_MUT_JUNKIE ) ) { - p.add_msg_if_player( m_good, _( "You quiver with anticipation..." ) ); + p.add_msg_if_player( m_good, _( "You quiver with anticipation…" ) ); p.add_morale( MORALE_MUTAGEN, 5, 50 ); } diff --git a/src/iuse_software_kitten.cpp b/src/iuse_software_kitten.cpp index a9eebb759a7a4..b9031c062bf23 100644 --- a/src/iuse_software_kitten.cpp +++ b/src/iuse_software_kitten.cpp @@ -26,7 +26,7 @@ std::string robot_finds_kitten::getmessage( int idx ) _( "That's just a charred human corpse." ), _( "I don't know what that is, but it's not kitten." ), _( "An empty shopping bag. Paper or plastic?" ), - _( "Could it be... a big ugly bowling trophy?" ), + _( "Could it be… a big ugly bowling trophy?" ), _( "A coat hanger hovers in thin air. Odd." ), _( "Not kitten, just a packet of Kool-Aid(tm)." ), _( "A freshly-baked pumpkin pie." ), @@ -51,7 +51,7 @@ std::string robot_finds_kitten::getmessage( int idx ) _( "It's a dark, amorphous blob of matter." ), _( "Just a pincushion." ), _( "It's a mighty zombie talking about some love and prosperity." ), - _( "\"Dear robot, you may have already won our 10 MILLION DOLLAR prize...\"" ), + _( "\"Dear robot, you may have already won our 10 MILLION DOLLAR prize…\"" ), _( "It's just an object." ), _( "A mere collection of pixels." ), _( "A badly dented high-hat cymbal lies on its side here." ), @@ -118,7 +118,7 @@ std::string robot_finds_kitten::getmessage( int idx ) _( "A vase full of artificial flowers is stuck to the floor here." ), _( "A large snake bars your way." ), _( "A pair of saloon-style doors swing slowly back and forth here." ), - _( "It's an ordinary bust of Beethoven... but why is it painted green?" ), + _( "It's an ordinary bust of Beethoven… but why is it painted green?" ), _( "It's TV's lovable wisecracking Crow! \"Bite me!\", he says." ), _( "Hey, look, it's war. What is it good for? Absolutely nothing. Say it again." ), _( "It's the amazing self-referential thing that's not kitten." ), @@ -213,10 +213,10 @@ std::string robot_finds_kitten::getmessage( int idx ) _( "Empty jewelboxes litter the landscape." ), _( "It's the astounding meta-object." ), _( "Ed McMahon stands here, lost in thought. Seeing you, he bellows, \"YES SIR!\"" ), - _( "...thingy???" ), + _( "…thingy???" ), _( "It's 1000 secrets the government doesn't want you to know!" ), _( "The letters O and R." ), - _( "A magical... magic thing." ), + _( "A magical… magic thing." ), _( "That is a moose, a thing of pure evil. You should \"RUN!\"" ), }; if( idx < 0 || idx >= nummessages ) { diff --git a/src/main.cpp b/src/main.cpp index 8c05a2ae009fa..62b67fde5fb76 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -207,7 +207,7 @@ int main( int argc, char *argv[] ) } }, { - "--check-mods", "[mods...]", + "--check-mods", "[mods…]", "Checks the json files belonging to CDDA mods", section_default, [&check_mods, &opts]( int n, const char *params[] ) -> int { @@ -221,7 +221,7 @@ int main( int argc, char *argv[] ) } }, { - "--dump-stats", " [mode = TSV] [opts...]", + "--dump-stats", " [mode = TSV] [opts…]", "Dumps item stats", section_default, [&dump, &dmode, &opts]( int n, const char *params[] ) -> int { diff --git a/src/mattack_actors.cpp b/src/mattack_actors.cpp index a1583fa963a23..e1a7e9da9ff53 100644 --- a/src/mattack_actors.cpp +++ b/src/mattack_actors.cpp @@ -522,7 +522,7 @@ void gun_actor::shoot( monster &z, Creature &target, const gun_mode_id &mode ) c target.add_effect( effect_laserlocked, 5_turns ); target.add_effect( effect_was_laserlocked, 5_turns ); target.add_msg_if_player( m_warning, - _( "You're not sure why you've got a laser dot on you..." ) ); + _( "You're not sure why you've got a laser dot on you…" ) ); } z.moves -= targeting_cost; diff --git a/src/mission_companion.cpp b/src/mission_companion.cpp index 5fb164f128572..d7326e71530bf 100644 --- a/src/mission_companion.cpp +++ b/src/mission_companion.cpp @@ -241,7 +241,7 @@ void talk_function::commune_farmfield( mission_data &mission_key, npc &p ) " ...O|....\n\n" "We're willing to let you purchase a field at a substantial " "discount to use for your own agricultural enterprises. We'll " - "plow it for you so you know exactly what is yours... after you " + "plow it for you so you know exactly what is yours… after you " "have a field you can hire workers to plant or harvest crops for " "you. If the crop is something we have a demand for, we'll be " "willing to liquidate it." ); @@ -369,7 +369,7 @@ bool talk_function::display_and_choose_opts( mission_data &mission_key, const tr const std::string &role_id, const std::string &title ) { if( mission_key.entries.empty() ) { - popup( _( "There are no missions at this colony. Press Spacebar..." ) ); + popup( _( "There are no missions at this colony. Press Spacebar…" ) ); return false; } @@ -437,7 +437,7 @@ bool talk_function::display_and_choose_opts( mission_data &mission_key, const tr reset_cur_key_list(); if( cur_key_list.empty() ) { - popup( _( "There are no missions at this colony. Press Spacebar..." ) ); + popup( _( "There are no missions at this colony. Press Spacebar…" ) ); return false; } @@ -619,7 +619,7 @@ bool talk_function::display_and_choose_opts( mission_data &mission_key, const tr bool talk_function::handle_outpost_mission( const mission_entry &cur_key, npc &p ) { if( cur_key.id == "Caravan Commune-Refugee Center" ) { - individual_mission( p, _( "joins the caravan team..." ), "_commune_refugee_caravan", true ); + individual_mission( p, _( "joins the caravan team…" ), "_commune_refugee_caravan", true ); } if( cur_key.id == "Begin Commune-Refugee Center Run" ) { caravan_depart( p, "evac_center_18", "_commune_refugee_caravan" ); @@ -640,32 +640,32 @@ bool talk_function::handle_outpost_mission( const mission_entry &cur_key, npc &p field_harvest( p, "ranch_camp_63" ); } if( cur_key.id == "Assign Scavenging Patrol" ) { - individual_mission( p, _( "departs on the scavenging patrol..." ), "_scavenging_patrol" ); + individual_mission( p, _( "departs on the scavenging patrol…" ), "_scavenging_patrol" ); } if( cur_key.id == "Retrieve Scavenging Patrol" ) { scavenging_patrol_return( p ); } if( cur_key.id == "Assign Scavenging Raid" ) { - individual_mission( p, _( "departs on the scavenging raid..." ), "_scavenging_raid" ); + individual_mission( p, _( "departs on the scavenging raid…" ), "_scavenging_raid" ); } if( cur_key.id == "Retrieve Scavenging Raid" ) { scavenging_raid_return( p ); } if( cur_key.id == "Assign Ally to Menial Labor" ) { - individual_mission( p, _( "departs to work as a laborer..." ), "_labor" ); + individual_mission( p, _( "departs to work as a laborer…" ), "_labor" ); } if( cur_key.id == "Recover Ally from Menial Labor" ) { labor_return( p ); } if( cur_key.id == "Assign Ally to Carpentry Work" ) { - individual_mission( p, _( "departs to work as a carpenter..." ), "_carpenter" ); + individual_mission( p, _( "departs to work as a carpenter…" ), "_carpenter" ); } if( cur_key.id == "Recover Ally from Carpentry Work" ) { carpenter_return( p ); } if( cur_key.id == "Assign Ally to Forage for Food" ) { - individual_mission( p, _( "departs to forage for food..." ), "_forage" ); + individual_mission( p, _( "departs to forage for food…" ), "_forage" ); } if( cur_key.id == "Recover Ally from Foraging" ) { forage_return( p ); @@ -730,7 +730,7 @@ void talk_function::caravan_depart( npc &p, const std::string &dest, const std:: std::vector npc_list = companion_list( p, id ); int distance = caravan_dist( dest ); time_duration time = 20_minutes + distance * 10_minutes; - popup( _( "The caravan departs with an estimated total travel time of %d hours..." ), + popup( _( "The caravan departs with an estimated total travel time of %d hours…" ), to_hours( time ) ); for( auto &elem : npc_list ) { @@ -818,7 +818,7 @@ void talk_function::caravan_return( npc &p, const std::string &dest, const std:: g->u.cash += ( 100 * money ); popup( _( "The caravan party has returned. Your share of the profits are $%d!" ), money ); } else { - popup( _( "The caravan was a disaster and your companions never made it home..." ) ); + popup( _( "The caravan was a disaster and your companions never made it home…" ) ); } } @@ -959,7 +959,7 @@ void talk_function::field_build_2( npc &p ) bay.draw_square_ter( t_fencegate_c, point( 4, 9 ), point( 4, 9 ) ); bay.save(); popup( _( "After counting your money %s directs a nearby laborer to begin constructing a " - "fence around your plot..." ), p.name ); + "fence around your plot…" ), p.name ); } void talk_function::field_plant( npc &p, const std::string &place ) @@ -1014,7 +1014,7 @@ void talk_function::field_plant( npc &p, const std::string &place ) } if( empty_plots == 0 ) { - popup( _( "You have no room to plant seeds..." ) ); + popup( _( "You have no room to plant seeds…" ) ); return; } @@ -1025,7 +1025,7 @@ void talk_function::field_plant( npc &p, const std::string &place ) signed int a = limiting_number * 300; if( a > g->u.cash ) { - popup( _( "I'm sorry, you don't have enough money to plant those seeds..." ) ); + popup( _( "I'm sorry, you don't have enough money to plant those seeds…" ) ); return; } if( !query_yn( _( "Do you wish to have %d %s planted here for $%d?" ), limiting_number, @@ -1091,7 +1091,7 @@ void talk_function::field_harvest( npc &p, const std::string &place ) } } if( plant_names.empty() ) { - popup( _( "There aren't any plants that are ready to harvest..." ) ); + popup( _( "There aren't any plants that are ready to harvest…" ) ); return; } // Choose the crop to harvest @@ -1099,7 +1099,7 @@ void talk_function::field_harvest( npc &p, const std::string &place ) plant_names ); // Did we cancel? if( plant_index < 0 || static_cast( plant_index ) >= plant_types.size() ) { - popup( _( "You decided to hold off for now..." ) ); + popup( _( "You decided to hold off for now…" ) ); return; } @@ -1148,7 +1148,7 @@ void talk_function::field_harvest( npc &p, const std::string &place ) if( a > g->u.cash ) { liquidate = true; popup( _( "You don't have enough to pay the workers to harvest the crop so you are forced " - "to sell..." ) ); + "to sell…" ) ); } else { liquidate = query_yn( _( "Do you wish to sell the crop of %d %s for a profit of $%d?" ), number_plants, plant_names[plant_index], money ); @@ -1156,7 +1156,7 @@ void talk_function::field_harvest( npc &p, const std::string &place ) //Add fruit if( liquidate ) { - add_msg( _( "The %s are sold for $%d..." ), plant_names[plant_index], money ); + add_msg( _( "The %s are sold for $%d…" ), plant_names[plant_index], money ); g->u.cash += ( number_plants * tmp.price( true ) - number_plots * 2 ) / 100; } else { if( tmp.count_by_charges() ) { @@ -1166,7 +1166,7 @@ void talk_function::field_harvest( npc &p, const std::string &place ) //Should be dropped at your feet once greedy companions can be controlled g->u.i_add( tmp ); } - add_msg( _( "You receive %d %s..." ), number_plants, plant_names[plant_index] ); + add_msg( _( "You receive %d %s…" ), number_plants, plant_names[plant_index] ); } tmp = item( seed_types[plant_index], calendar::turn ); const islot_seed &seed_data = *tmp.type->seed; @@ -1177,7 +1177,7 @@ void talk_function::field_harvest( npc &p, const std::string &place ) for( int i = 0; i < number_seeds; ++i ) { g->u.i_add( tmp ); } - add_msg( _( "You receive %d %s..." ), number_seeds, tmp.type_name( 3 ) ); + add_msg( _( "You receive %d %s…" ), number_seeds, tmp.type_name( 3 ) ); } } @@ -1209,19 +1209,19 @@ bool talk_function::scavenging_patrol_return( npc &p ) int experience = rng( 5, 20 ); if( one_in( 4 ) ) { popup( _( "While scavenging, %s's party suddenly found itself set upon by a large mob of " - "undead..." ), comp->name ); + "undead…" ), comp->name ); int skill = scavenging_combat_skill( *comp, 4, true ); if( one_in( 6 ) ) { popup( _( "Through quick thinking the group was able to evade combat!" ) ); } else { - popup( _( "Combat took place in close quarters, focusing on melee skills..." ) ); + popup( _( "Combat took place in close quarters, focusing on melee skills…" ) ); int monsters = rng( 8, 30 ); if( skill * rng_float( .60, 1.4 ) > .35 * monsters * rng_float( .6, 1.4 ) ) { popup( _( "Through brute force the party smashed through the group of %d" " undead!" ), monsters ); experience += rng( 2, 10 ); } else { - popup( _( "Unfortunately they were overpowered by the undead... I'm sorry." ) ); + popup( _( "Unfortunately they were overpowered by the undead… I'm sorry." ) ); overmap_buffer.remove_npc( comp->getID() ); return false; } @@ -1232,7 +1232,7 @@ bool talk_function::scavenging_patrol_return( npc &p ) g->u.cash += money * 100; companion_skill_trainer( *comp, "combat", experience * 10_minutes, 10 ); - popup( _( "%s returns from patrol having earned $%d and a fair bit of experience..." ), + popup( _( "%s returns from patrol having earned $%d and a fair bit of experience…" ), comp->name, money ); if( one_in( 10 ) ) { popup( _( "%s was impressed with %s's performance and gave you a small bonus ( $100 )" ), @@ -1258,19 +1258,19 @@ bool talk_function::scavenging_raid_return( npc &p ) int experience = rng( 10, 20 ); if( one_in( 2 ) ) { popup( _( "While scavenging, %s's party suddenly found itself set upon by a large mob of " - "undead..." ), comp->name ); + "undead…" ), comp->name ); int skill = scavenging_combat_skill( *comp, 4, true ); if( one_in( 6 ) ) { popup( _( "Through quick thinking the group was able to evade combat!" ) ); } else { - popup( _( "Combat took place in close quarters, focusing on melee skills..." ) ); + popup( _( "Combat took place in close quarters, focusing on melee skills…" ) ); int monsters = rng( 8, 30 ); if( skill * rng_float( .60, 1.4 ) > ( .35 * monsters * rng_float( .6, 1.4 ) ) ) { popup( _( "Through brute force the party smashed through the group of %d " "undead!" ), monsters ); experience += rng( 2, 10 ); } else { - popup( _( "Unfortunately they were overpowered by the undead... I'm sorry." ) ); + popup( _( "Unfortunately they were overpowered by the undead… I'm sorry." ) ); overmap_buffer.remove_npc( comp->getID() ); return false; } @@ -1288,7 +1288,7 @@ bool talk_function::scavenging_raid_return( npc &p ) g->u.cash += money * 100; companion_skill_trainer( *comp, "combat", experience * 10_minutes, 10 ); - popup( _( "%s returns from the raid having earned $%d and a fair bit of experience..." ), + popup( _( "%s returns from the raid having earned $%d and a fair bit of experience…" ), comp->name, money ); if( one_in( 20 ) ) { popup( _( "%s was impressed with %s's performance and gave you a small bonus ( $100 )" ), @@ -1323,7 +1323,7 @@ bool talk_function::labor_return( npc &p ) companion_skill_trainer( *comp, "menial", calendar::turn - comp->companion_mission_time, 1 ); - popup( _( "%s returns from working as a laborer having earned $%d and a bit of experience..." ), + popup( _( "%s returns from working as a laborer having earned $%d and a bit of experience…" ), comp->name, money ); companion_return( *comp ); if( hours >= 8 && one_in( 8 ) && !p.has_trait( trait_NPC_MISSION_LEV_1 ) ) { @@ -1354,7 +1354,7 @@ bool talk_function::carpenter_return( npc &p ) int skill_1 = comp->get_skill_level( skill_fabrication ); int skill_2 = comp->get_skill_level( skill_dodge ); int skill_3 = comp->get_skill_level( skill_survival ); - popup( _( "While %s was framing a building one of the walls began to collapse..." ), + popup( _( "While %s was framing a building one of the walls began to collapse…" ), comp->name ); if( skill_1 > rng( 1, 8 ) ) { popup( _( "In the blink of an eye, %s threw a brace up and averted a disaster." ), @@ -1362,12 +1362,12 @@ bool talk_function::carpenter_return( npc &p ) } else if( skill_2 > rng( 1, 8 ) ) { popup( _( "Darting out a window, %s escaped the collapse." ), comp->name ); } else if( skill_3 > rng( 1, 8 ) ) { - popup( _( "%s didn't make it out in time..." ), comp->name ); + popup( _( "%s didn't make it out in time…" ), comp->name ); popup( _( "but %s was rescued from the debris with only minor injuries!" ), comp->name ); } else { - popup( _( "%s didn't make it out in time..." ), comp->name ); - popup( _( "Everyone who was trapped under the collapsing roof died..." ) ); + popup( _( "%s didn't make it out in time…" ), comp->name ); + popup( _( "Everyone who was trapped under the collapsing roof died…" ) ); popup( _( "I'm sorry, there is nothing we could do." ) ); overmap_buffer.remove_npc( comp->getID() ); return false; @@ -1382,7 +1382,7 @@ bool talk_function::carpenter_return( npc &p ) comp->companion_mission_time, 2 ); popup( _( "%s returns from working as a carpenter having earned $%d and a bit of " - "experience..." ), comp->name, money ); + "experience…" ), comp->name, money ); companion_return( *comp ); return true; } @@ -1395,7 +1395,7 @@ bool talk_function::forage_return( npc &p ) } if( one_in( 10 ) ) { - popup( _( "While foraging, a beast began to stalk %s..." ), comp->name ); + popup( _( "While foraging, a beast began to stalk %s…" ), comp->name ); // the following doxygen aliases do not yet exist. this is marked for future reference ///\EFFECT_SURVIVAL_NPC affects forage mission results @@ -1423,11 +1423,11 @@ bool talk_function::forage_return( npc &p ) } else { if( one_in( 2 ) ) { popup( _( "%s was able to hold off the first wolf but the others that were " - "skulking in the tree line caught up..." ), comp->name ); - popup( _( "I'm sorry, there wasn't anything we could do..." ) ); + "skulking in the tree line caught up…" ), comp->name ); + popup( _( "I'm sorry, there wasn't anything we could do…" ) ); } else { - popup( _( "We... we don't know what exactly happened but we found %s's gear " - "ripped and bloody..." ), comp->name ); + popup( _( "We… we don't know what exactly happened but we found %s's gear " + "ripped and bloody…" ), comp->name ); popup( _( "I fear your companion won't be returning." ) ); } overmap_buffer.remove_npc( comp->getID() ); @@ -1444,7 +1444,7 @@ bool talk_function::forage_return( npc &p ) comp->companion_mission_time, 2 ); popup( _( "%s returns from working as a forager having earned $%d and a bit of " - "experience..." ), comp->name, money ); + "experience…" ), comp->name, money ); // the following doxygen aliases do not yet exist. this is marked for future reference ///\EFFECT_SURVIVAL_NPC affects forage mission results @@ -1944,7 +1944,7 @@ npc_ptr talk_function::companion_choose( const std::string &skill_tested, int sk } } if( available.empty() ) { - popup( _( "You don't have any companions to send out..." ) ); + popup( _( "You don't have any companions to send out…" ) ); return nullptr; } std::vector npcs; @@ -1976,7 +1976,7 @@ npc_ptr talk_function::companion_choose( const std::string &skill_tested, int sk const size_t npc_choice = uilist( _( "Who do you want to send? " "[ COMBAT : SURVIVAL : INDUSTRY ]" ), npcs ); if( npc_choice >= available.size() ) { - popup( _( "You choose to send no one..." ) ); + popup( _( "You choose to send no one…" ) ); return nullptr; } @@ -2020,7 +2020,7 @@ npc_ptr talk_function::companion_choose_return( const tripoint &omt_pos, } if( available.empty() ) { - popup( _( "You don't have any companions ready to return..." ) ); + popup( _( "You don't have any companions ready to return…" ) ); return nullptr; } @@ -2036,7 +2036,7 @@ npc_ptr talk_function::companion_choose_return( const tripoint &omt_pos, if( npc_choice < available.size() ) { return available[npc_choice]; } - popup( _( "No one returns to your party..." ) ); + popup( _( "No one returns to your party…" ) ); return nullptr; } diff --git a/src/mission_start.cpp b/src/mission_start.cpp index d808a277fcd41..39bfd25d41d84 100644 --- a/src/mission_start.cpp +++ b/src/mission_start.cpp @@ -606,7 +606,7 @@ void mission_start::reveal_refugee_center( mission *miss ) const cata::optional target_pos = mission_util::assign_mission_target( t ); if( !target_pos ) { - add_msg( _( "You don't know where the address could be..." ) ); + add_msg( _( "You don't know where the address could be…" ) ); return; } @@ -615,9 +615,9 @@ void mission_start::reveal_refugee_center( mission *miss ) const tripoint dest_road = overmap_buffer.find_closest( *target_pos, "road", 3, false ); if( overmap_buffer.reveal_route( source_road, dest_road, 1, true ) ) { - add_msg( _( "You mark the refugee center and the road that leads to it..." ) ); + add_msg( _( "You mark the refugee center and the road that leads to it…" ) ); } else { - add_msg( _( "You mark the refugee center, but you have no idea how to get there by road..." ) ); + add_msg( _( "You mark the refugee center, but you have no idea how to get there by road…" ) ); } } diff --git a/src/mission_util.cpp b/src/mission_util.cpp index 51666d8fc090c..16f7b16058d21 100644 --- a/src/mission_util.cpp +++ b/src/mission_util.cpp @@ -54,7 +54,7 @@ static void reveal_route( mission *miss, const tripoint &destination ) const tripoint dest_road = overmap_buffer.find_closest( destination, "road", 3, false ); if( overmap_buffer.reveal_route( source_road, dest_road ) ) { - add_msg( _( "%s also marks the road that leads to it..." ), p->name ); + add_msg( _( "%s also marks the road that leads to it…" ), p->name ); } } diff --git a/src/monattack.cpp b/src/monattack.cpp index 962824ea8ea1b..df63297f225c7 100644 --- a/src/monattack.cpp +++ b/src/monattack.cpp @@ -1717,7 +1717,7 @@ bool mattack::fungus_inject( monster *z ) } if( ( g->u.has_trait( trait_MARLOSS ) ) && ( g->u.has_trait( trait_MARLOSS_BLUE ) ) && !g->u.crossed_threshold() ) { - add_msg( m_info, _( "The %s seems to wave you toward the tower..." ), z->name() ); + add_msg( m_info, _( "The %s seems to wave you toward the tower…" ), z->name() ); z->anger = 0; return true; } @@ -1752,7 +1752,7 @@ bool mattack::fungus_inject( monster *z ) if( one_in( 10 - dam ) ) { g->u.add_effect( effect_fungus, 10_minutes, num_bp, true ); - add_msg( m_warning, _( "You feel thousands of live spores pumping into you..." ) ); + add_msg( m_warning, _( "You feel thousands of live spores pumping into you…" ) ); } } else { //~ 1$s is monster name, 2$s bodypart in accusative @@ -1809,7 +1809,7 @@ bool mattack::fungus_bristle( monster *z ) if( one_in( 15 - dam ) ) { target->add_effect( effect_fungus, 20_minutes, num_bp, true ); target->add_msg_if_player( m_warning, - _( "You feel thousands of live spores pumping into you..." ) ); + _( "You feel thousands of live spores pumping into you…" ) ); } } else { //~ 1$s is monster name, 2$s bodypart in accusative @@ -1871,12 +1871,12 @@ bool mattack::fungus_fortify( monster *z ) if( ( g->u.has_trait( trait_MARLOSS ) ) && ( g->u.has_trait( trait_MARLOSS_BLUE ) ) && !g->u.crossed_threshold() && !mycus ) { // You have the other two. Is it really necessary for us to fight? - add_msg( m_info, _( "The %s spreads its tendrils. It seems as though it's expecting you..." ), + add_msg( m_info, _( "The %s spreads its tendrils. It seems as though it's expecting you…" ), z->name() ); if( rl_dist( z->pos(), g->u.pos() ) < 3 ) { if( query_yn( _( "The tower extends and aims several tendrils from its depths. Hold still?" ) ) ) { add_msg( m_warning, - _( "The %s works several tendrils into your arms, legs, torso, and even neck..." ), + _( "The %s works several tendrils into your arms, legs, torso, and even neck…" ), z->name() ); g->u.hurtall( 1, z ); add_msg( m_warning, @@ -1893,7 +1893,7 @@ bool mattack::fungus_fortify( monster *z ) _( "You wake up in a marloss bush. Almost *cradled* in it, actually, as though it grew there for you." ) ); g->u.add_msg_if_player( m_good, //~ Beginning to hear the Mycus while conscious: this is it speaking - _( "assistance, on an arduous quest. unity. together we have reached the door. now to pass through..." ) ); + _( "assistance, on an arduous quest. unity. together we have reached the door. now to pass through…" ) ); return true; } else { peaceful = false; // You declined the offer. Fight! @@ -1973,7 +1973,7 @@ bool mattack::fungus_fortify( monster *z ) add_msg( m_bad, _( "The %1$s sinks its point into your %2$s!" ), z->name(), body_part_name_accusative( hit ) ); g->u.add_effect( effect_fungus, 40_minutes, num_bp, true ); - add_msg( m_warning, _( "You feel millions of live spores pumping into you..." ) ); + add_msg( m_warning, _( "You feel millions of live spores pumping into you…" ) ); } else { //~ 1$s is monster name, 2$s bodypart in accusative add_msg( _( "The %1$s strikes your %2$s, but your armor protects you." ), z->name(), @@ -2613,7 +2613,7 @@ bool mattack::grab( monster *z ) z->name() ); } else if( pl->is_throw_immune() && ( !pl->is_armed() || pl->style_selected.obj().has_weapon( pl->weapon.typeId() ) ) ) { - target->add_msg_if_player( m_info, _( "The %s tries to grab you..." ), z->name() ); + target->add_msg_if_player( m_info, _( "The %s tries to grab you…" ), z->name() ); thrown_by_judo( z ); } else if( pl->has_grab_break_tec() ) { ma_technique tech = pl->get_grab_break_tec(); @@ -3037,7 +3037,7 @@ bool mattack::photograph( monster *z ) add_msg( m_info, _( "The %s acknowledges you as an officer responding, but hangs around to watch." ), z->name() ); - add_msg( m_info, _( "Probably some now-obsolete Internal Affairs subroutine..." ) ); + add_msg( m_info, _( "Probably some now-obsolete Internal Affairs subroutine…" ) ); return true; } } @@ -3057,7 +3057,7 @@ bool mattack::photograph( monster *z ) add_msg( m_info, _( "The %s acknowledges you as an officer responding, but hangs around to watch." ), z->name() ); - add_msg( m_info, _( "Ops used to do that in case you needed backup..." ) ); + add_msg( m_info, _( "Ops used to do that in case you needed backup…" ) ); return true; } } @@ -3074,7 +3074,7 @@ bool mattack::photograph( monster *z ) } else { add_msg( m_info, _( "The %s acknowledges you as SWAT onsite, but hangs around to watch." ), z->name() ); - add_msg( m_info, _( "Probably some now-obsolete Internal Affairs subroutine..." ) ); + add_msg( m_info, _( "Probably some now-obsolete Internal Affairs subroutine…" ) ); return true; } } @@ -3117,7 +3117,7 @@ bool mattack::photograph( monster *z ) z->moves -= 150; add_msg( m_warning, _( "The %s takes your picture!" ), z->name() ); // TODO: Make the player known to the faction - std::string cname = _( "...database connection lost!" ) ; + std::string cname = _( "…database connection lost!" ) ; if( one_in( 6 ) ) { cname = Name::generate( g->u.male ); } else if( one_in( 3 ) ) { @@ -3239,7 +3239,7 @@ void mattack::frag( monster *z, Creature *target ) // This is for the bots, not add_msg( m_warning, _( "Thee eye o dat divil be upon me!" ) ); } else { //~ Potential grenading detected. - add_msg( m_warning, _( "Those laser dots don't seem very friendly..." ) ); + add_msg( m_warning, _( "Those laser dots don't seem very friendly…" ) ); } g->u.add_effect( effect_laserlocked, 3_turns ); // Effect removed in game.cpp, duration doesn't much matter @@ -3297,7 +3297,7 @@ void mattack::tankgun( monster *z, Creature *target ) if( !z->has_effect( effect_targeted ) ) { //~ There will be a 120mm HEAT shell sent at high speed to your location next turn. - target->add_msg_if_player( m_warning, _( "You're not sure why you've got a laser dot on you..." ) ); + target->add_msg_if_player( m_warning, _( "You're not sure why you've got a laser dot on you…" ) ); //~ Sound of a tank turret swiveling into place sounds::sound( z->pos(), 10, sounds::sound_t::combat, _( "whirrrrrclick." ), false, "misc", "servomotor" ); @@ -3818,19 +3818,19 @@ bool mattack::ratking( monster *z ) switch( rng( 1, 5 ) ) { // What do we say? case 1: - add_msg( m_warning, _( "\"YOU... ARE FILTH...\"" ) ); + add_msg( m_warning, _( "\"YOU… ARE FILTH…\"" ) ); break; case 2: - add_msg( m_warning, _( "\"VERMIN... YOU ARE VERMIN...\"" ) ); + add_msg( m_warning, _( "\"VERMIN… YOU ARE VERMIN…\"" ) ); break; case 3: - add_msg( m_warning, _( "\"LEAVE NOW...\"" ) ); + add_msg( m_warning, _( "\"LEAVE NOW…\"" ) ); break; case 4: - add_msg( m_warning, _( "\"WE... WILL FEAST... UPON YOU...\"" ) ); + add_msg( m_warning, _( "\"WE… WILL FEAST… UPON YOU…\"" ) ); break; case 5: - add_msg( m_warning, _( "\"FOUL INTERLOPER...\"" ) ); + add_msg( m_warning, _( "\"FOUL INTERLOPER…\"" ) ); break; } if( rl_dist( z->pos(), g->u.pos() ) <= 10 ) { @@ -4483,7 +4483,7 @@ bool mattack::thrown_by_judo( monster *z ) // most of the time, when not isolated if( !one_in( 4 ) && !target->is_elec_immune() && z->type->sp_defense == &mdefense::zapback ) { // If it all pans out, we're zap the player's arm as he flips the monster. - target->add_msg_if_player( _( "The flip does shock you..." ) ); + target->add_msg_if_player( _( "The flip does shock you…" ) ); // Discounted electric damage for quick flip damage_instance shock; shock.add_damage( DT_ELECTRIC, rng( 1, 3 ) ); @@ -4860,7 +4860,7 @@ bool mattack::bio_op_takedown( monster *z ) // TODO: Literally "The zombie kicks" vvvvv | Fix message or comment why Literally. //~ 1$s is bodypart name in accusative, 2$d is damage value. - target->add_msg_if_player( m_bad, _( "The zombie kicks your %1$s for %2$d damage..." ), + target->add_msg_if_player( m_bad, _( "The zombie kicks your %1$s for %2$d damage…" ), body_part_name_accusative( hit ), dam ); foe->deal_damage( z, hit, damage_instance( DT_BASH, dam ) ); // At this point, Judo or Tentacle Bracing can make this much less painful diff --git a/src/mondeath.cpp b/src/mondeath.cpp index 0dc14decc9c20..905042ec7e63d 100644 --- a/src/mondeath.cpp +++ b/src/mondeath.cpp @@ -543,7 +543,7 @@ void mdeath::amigara( monster &z ) // We were the last! if( g->u.has_effect( effect_amigara ) ) { g->u.remove_effect( effect_amigara ); - add_msg( _( "Your obsession with the fault fades away..." ) ); + add_msg( _( "Your obsession with the fault fades away…" ) ); } g->m.spawn_artifact( z.pos() ); diff --git a/src/monster.cpp b/src/monster.cpp index dc83c3b1cf27a..be5ee152aca33 100644 --- a/src/monster.cpp +++ b/src/monster.cpp @@ -1399,7 +1399,7 @@ void monster::melee_attack( Creature &target, float accuracy ) if( stab_cut > 0 && has_flag( MF_BADVENOM ) ) { target.add_msg_if_player( m_bad, - _( "You feel venom flood your body, wracking you with pain..." ) ); + _( "You feel venom flood your body, wracking you with pain…" ) ); target.add_effect( effect_badpoison, 4_minutes ); } diff --git a/src/mutation.cpp b/src/mutation.cpp index a0bd2835ddb88..db450232c907c 100644 --- a/src/mutation.cpp +++ b/src/mutation.cpp @@ -917,7 +917,7 @@ bool Character::mutate_towards( const trait_id &mut ) // It shouldn't pick a Threshold anyway--they're supposed to be non-Valid // and aren't categorized. This can happen if someone makes a threshold mutation into a prerequisite. if( threshold ) { - add_msg_if_player( _( "You feel something straining deep inside you, yearning to be free..." ) ); + add_msg_if_player( _( "You feel something straining deep inside you, yearning to be free…" ) ); return false; } if( profession ) { @@ -933,7 +933,7 @@ bool Character::mutate_towards( const trait_id &mut ) // No crossing The Threshold by simply not having it if( !has_threshreq && !threshreq.empty() ) { - add_msg_if_player( _( "You feel something straining deep inside you, yearning to be free..." ) ); + add_msg_if_player( _( "You feel something straining deep inside you, yearning to be free…" ) ); return false; } @@ -1375,7 +1375,7 @@ void test_crossing_threshold( player &p, const mutation_category_trait &m_catego int breacher = breach_power + booster; if( x_in_y( breacher, total ) ) { p.add_msg_if_player( m_good, - _( "Something strains mightily for a moment... and then... you're... FREE!" ) ); + _( "Something strains mightily for a moment… and then… you're… FREE!" ) ); p.set_mutation( mutation_thresh ); g->events().send( p.getID(), m_category.id ); // Manually removing Carnivore, since it tends to creep in @@ -1396,7 +1396,7 @@ void test_crossing_threshold( player &p, const mutation_category_trait &m_catego p.add_effect( effect_stunned, rng( 3_turns, 5_turns ) ); } else if( breach_power > 80 ) { p.add_msg_if_player( m_bad, - _( "Your head throbs with memories of your life, before all this..." ) ); + _( "Your head throbs with memories of your life, before all this…" ) ); p.mod_pain_noresist( 6 ); p.add_effect( effect_stunned, rng( 2_turns, 4_turns ) ); } else if( breach_power > 60 ) { diff --git a/src/npcmove.cpp b/src/npcmove.cpp index 986df7898078e..08a7b365ec682 100644 --- a/src/npcmove.cpp +++ b/src/npcmove.cpp @@ -1905,7 +1905,7 @@ npc_action npc::address_player() if( attitude == NPCATT_MUG && sees( g->u ) ) { if( one_in( 3 ) ) { - say( _( "Don't move a muscle..." ) ); + say( _( "Don't move a muscle…" ) ); } return npc_mug_player; } @@ -4249,7 +4249,7 @@ bool npc::complain() body_part bp = bp_affected( *this, effect_infected ); const auto &eff = get_effect( effect_infected, bp ); int intensity = eff.get_intensity(); - const std::string speech = string_format( _( "My %s wound is infected..." ), + const std::string speech = string_format( _( "My %s wound is infected…" ), body_part_name( bp ) ); if( complain_about( infected_string, time_duration::from_hours( 4 - intensity ), speech, intensity >= 3 ) ) { @@ -4278,7 +4278,7 @@ bool npc::complain() // Radiation every 10 minutes if( radiation > 90 ) { activate_bionic_by_id( bio_radscrubber ); - std::string speech = _( "I'm suffering from radiation sickness..." ); + std::string speech = _( "I'm suffering from radiation sickness…" ); if( complain_about( radiation_string, 10_minutes, speech, radiation > 150 ) ) { return true; } diff --git a/src/npctalk.cpp b/src/npctalk.cpp index 496a3ce292024..57599934671d6 100644 --- a/src/npctalk.cpp +++ b/src/npctalk.cpp @@ -385,7 +385,7 @@ void game::chat() if( !available.empty() ) { nmenu.addentry( NPC_CHAT_TALK, true, 't', available_count == 1 ? string_format( _( "Talk to %s" ), available.front()->name ) : - _( "Talk to..." ) + _( "Talk to…" ) ); } nmenu.addentry( NPC_CHAT_YELL, true, 'a', _( "Yell" ) ); @@ -401,13 +401,13 @@ void game::chat() if( !guards.empty() ) { nmenu.addentry( NPC_CHAT_FOLLOW, true, 'f', guard_count == 1 ? string_format( _( "Tell %s to follow" ), guards.front()->name ) : - _( "Tell someone to follow..." ) + _( "Tell someone to follow…" ) ); } if( !followers.empty() ) { nmenu.addentry( NPC_CHAT_GUARD, true, 'g', follower_count == 1 ? string_format( _( "Tell %s to guard" ), followers.front()->name ) : - _( "Tell someone to guard..." ) + _( "Tell someone to guard…" ) ); nmenu.addentry( NPC_CHAT_AWAKE, true, 'w', _( "Tell everyone on your team to wake up" ) ); nmenu.addentry( NPC_CHAT_MOUNT, true, 'M', _( "Tell everyone on your team to mount up" ) ); @@ -416,7 +416,7 @@ void game::chat() _( "Tell everyone on your team to prepare for danger" ) ); nmenu.addentry( NPC_CHAT_CLEAR_OVERRIDES, true, 'r', _( "Tell everyone on your team to relax (Clear Overrides)" ) ); - nmenu.addentry( NPC_CHAT_ORDERS, true, 'o', _( "Tell everyone on your team to temporarily..." ) ); + nmenu.addentry( NPC_CHAT_ORDERS, true, 'o', _( "Tell everyone on your team to temporarily…" ) ); } std::string message; std::string yell_msg; @@ -900,7 +900,7 @@ std::string dialogue::dynamic_line( const talk_topic &the_topic ) const if( trainable.empty() && styles.empty() ) { return _( "Sorry, but it doesn't seem I have anything to teach you." ); } else { - return _( "Here's what I can teach you..." ); + return _( "Here's what I can teach you…" ); } } else if( topic == "TALK_HOW_MUCH_FURTHER" ) { // TODO: this ignores the z-component @@ -1485,7 +1485,7 @@ void parse_tags( std::string &phrase, const player &u, const player &me, const i phrase.replace( fa, l, pgettext( "punctuation", "." ) ); break; case 1: - phrase.replace( fa, l, pgettext( "punctuation", "..." ) ); + phrase.replace( fa, l, pgettext( "punctuation", "…" ) ); break; case 2: phrase.replace( fa, l, pgettext( "punctuation", "!" ) ); @@ -3099,7 +3099,7 @@ static consumption_result try_consume( npc &p, item &it, std::string &reason ) } if( !p.will_accept_from_player( it ) ) { - reason = _( "I don't trust you enough to eat THIS..." ); + reason = _( "I don't trust you enough to eat THIS…" ); return REFUSED; } @@ -3107,7 +3107,7 @@ static consumption_result try_consume( npc &p, item &it, std::string &reason ) int amount_used = 1; if( to_eat.is_food() ) { if( !p.eat( to_eat ) ) { - reason = _( "It doesn't look like a good idea to consume this..." ); + reason = _( "It doesn't look like a good idea to consume this…" ); return REFUSED; } } else if( to_eat.is_medication() || to_eat.get_contained().is_medication() ) { @@ -3184,7 +3184,7 @@ std::string give_item_to( npc &p, bool allow_use, bool allow_carry ) if( given.is_container() ) { given.on_contents_changed(); } - return _( "Here we go..." ); + return _( "Here we go…" ); } } @@ -3244,7 +3244,7 @@ std::string give_item_to( npc &p, bool allow_use, bool allow_carry ) reason += string_format( _( "I can only store %s %s more." ), format_volume( free_space ), volume_units_long() ); } else { - reason += _( "...or to store anything else for that matter." ); + reason += _( "…or to store anything else for that matter." ); } } if( !p.can_pickWeight( given ) ) { diff --git a/src/npctalk_funcs.cpp b/src/npctalk_funcs.cpp index c539d20727ed6..42ca01f8ac939 100644 --- a/src/npctalk_funcs.cpp +++ b/src/npctalk_funcs.cpp @@ -464,7 +464,7 @@ void talk_function::bionic_remove( npc &p ) { bionic_collection all_bio = *g->u.my_bionics; if( all_bio.empty() ) { - popup( _( "You don't have any bionics installed..." ) ); + popup( _( "You don't have any bionics installed…" ) ); return; } @@ -489,7 +489,7 @@ void talk_function::bionic_remove( npc &p ) bionic_names ); // Did we cancel? if( bionic_index < 0 ) { - popup( _( "You decide to hold off..." ) ); + popup( _( "You decide to hold off…" ) ); return; } @@ -500,7 +500,7 @@ void talk_function::bionic_remove( npc &p ) price = 50000; } if( price > g->u.cash ) { - popup( _( "You can't afford the procedure..." ) ); + popup( _( "You can't afford the procedure…" ) ); return; } @@ -596,7 +596,7 @@ static void generic_barber( const std::string &mut_type ) } hair_menu.text = menu_text; int index = 0; - hair_menu.addentry( index, true, 'q', _( "Actually... I've changed my mind." ) ); + hair_menu.addentry( index, true, 'q', _( "Actually… I've changed my mind." ) ); std::vector hair_muts = get_mutations_in_type( mut_type ); trait_id cur_hair; for( auto elem : hair_muts ) { @@ -635,7 +635,7 @@ void talk_function::buy_haircut( npc &p ) const int moves = to_moves( 20_minutes ); g->u.assign_activity( activity_id( "ACT_WAIT_NPC" ), moves ); g->u.activity.str_values.push_back( p.name ); - add_msg( m_good, _( "%s gives you a decent haircut..." ), p.name ); + add_msg( m_good, _( "%s gives you a decent haircut…" ), p.name ); } void talk_function::buy_shave( npc &p ) @@ -644,13 +644,13 @@ void talk_function::buy_shave( npc &p ) const int moves = to_moves( 5_minutes ); g->u.assign_activity( activity_id( "ACT_WAIT_NPC" ), moves ); g->u.activity.str_values.push_back( p.name ); - add_msg( m_good, _( "%s gives you a decent shave..." ), p.name ); + add_msg( m_good, _( "%s gives you a decent shave…" ), p.name ); } void talk_function::morale_chat( npc &p ) { g->u.add_morale( MORALE_CHAT, rng( 3, 10 ), 10, 200_minutes, 5_minutes / 2 ); - add_msg( m_good, _( "That was a pleasant conversation with %s..." ), p.disp_name() ); + add_msg( m_good, _( "That was a pleasant conversation with %s…" ), p.disp_name() ); } void talk_function::morale_chat_activity( npc &p ) @@ -685,7 +685,7 @@ void talk_function::buy_10_logs( npc &p ) bay.save(); p.add_effect( effect_currently_busy, 1_days ); - add_msg( m_good, _( "%s drops the logs off in the garage..." ), p.name ); + add_msg( m_good, _( "%s drops the logs off in the garage…" ), p.name ); } void talk_function::buy_100_logs( npc &p ) @@ -711,7 +711,7 @@ void talk_function::buy_100_logs( npc &p ) bay.save(); p.add_effect( effect_currently_busy, 7_days ); - add_msg( m_good, _( "%s drops the logs off in the garage..." ), p.name ); + add_msg( m_good, _( "%s drops the logs off in the garage…" ), p.name ); } void talk_function::follow( npc &p ) diff --git a/src/output.cpp b/src/output.cpp index 15fec9bc89a80..e391b30a2d570 100644 --- a/src/output.cpp +++ b/src/output.cpp @@ -355,7 +355,7 @@ void multipage( const catacurses::window &w, const std::vector &tex ( text.size() ) ? 1 : 0 ) ) { // Next page i--; - center_print( w, height - 1, c_light_gray, _( "Press any key for more..." ) ); + center_print( w, height - 1, c_light_gray, _( "Press any key for more…" ) ); wrefresh( w ); catacurses::refresh(); inp_mngr.wait_for_any_key(); diff --git a/src/overmap.cpp b/src/overmap.cpp index a247fcc74d195..a513ed3e4f294 100644 --- a/src/overmap.cpp +++ b/src/overmap.cpp @@ -1459,7 +1459,7 @@ void overmap::generate( const overmap *north, const overmap *east, const overmap *south, const overmap *west, overmap_special_batch &enabled_specials ) { - dbg( D_INFO ) << "overmap::generate start..."; + dbg( D_INFO ) << "overmap::generate start…"; populate_connections_out_from_neighbors( north, east, south, west ); diff --git a/src/player.cpp b/src/player.cpp index 7b954431b2424..91257b8748b65 100644 --- a/src/player.cpp +++ b/src/player.cpp @@ -3313,7 +3313,7 @@ int player::impact( const int force, const tripoint &p ) } else if( is_player() && shock_absorbers ) { add_msg( m_bad, _( "You are slammed against %s!" ), target_name, total_dealt ); - add_msg( m_good, _( "...but your shock absorbers negate the damage!" ) ); + add_msg( m_good, _( "…but your shock absorbers negate the damage!" ) ); } else if( slam ) { // Only print this line if it is a slam and not a landing // Non-players should only get this one: player doesn't know how much damage was dealt @@ -3665,17 +3665,17 @@ void player::check_needs_extremes() std::string message; if( stomach.contains() <= stomach.capacity() / 4 ) { if( get_kcal_percent() < 0.1f ) { - message = _( "Food..." ); + message = _( "Food…" ); } else if( get_kcal_percent() < 0.25f ) { message = _( "Due to insufficient nutrition, your body is suffering from starvation." ); } else if( get_kcal_percent() < 0.5f ) { - message = _( "Despite having something in your stomach, you still feel like you haven't eaten in days..." ); + message = _( "Despite having something in your stomach, you still feel like you haven't eaten in days…" ); } else if( get_kcal_percent() < 0.8f ) { - message = _( "Your stomach feels so empty..." ); + message = _( "Your stomach feels so empty…" ); } } else { if( get_kcal_percent() < 0.1f ) { - message = _( "Food..." ); + message = _( "Food…" ); } else if( get_kcal_percent() < 0.25f ) { message = _( "You are EMACIATED!" ); } else if( get_kcal_percent() < 0.5f ) { @@ -3697,11 +3697,11 @@ void player::check_needs_extremes() g->events().send( getID() ); hp_cur[hp_torso] = 0; } else if( get_thirst() >= 1000 && calendar::once_every( 30_minutes ) ) { - add_msg_if_player( m_warning, _( "Even your eyes feel dry..." ) ); + add_msg_if_player( m_warning, _( "Even your eyes feel dry…" ) ); } else if( get_thirst() >= 800 && calendar::once_every( 30_minutes ) ) { add_msg_if_player( m_warning, _( "You are THIRSTY!" ) ); } else if( calendar::once_every( 30_minutes ) ) { - add_msg_if_player( m_warning, _( "Your mouth feels so dry..." ) ); + add_msg_if_player( m_warning, _( "Your mouth feels so dry…" ) ); } } @@ -3713,7 +3713,7 @@ void player::check_needs_extremes() mod_fatigue( -10 ); fall_asleep(); } else if( get_fatigue() >= 800 && calendar::once_every( 30_minutes ) ) { - add_msg_if_player( m_warning, _( "Anywhere would be a good place to sleep..." ) ); + add_msg_if_player( m_warning, _( "Anywhere would be a good place to sleep…" ) ); } else if( calendar::once_every( 30_minutes ) ) { add_msg_if_player( m_warning, _( "You feel like you haven't slept in days." ) ); } @@ -4968,7 +4968,7 @@ void player::suffer() } // Numbness if( !done_effect && one_turn_in( 4_hours ) ) { - add_msg( m_bad, _( "You suddenly feel so numb..." ) ); + add_msg( m_bad, _( "You suddenly feel so numb…" ) ); mod_painkiller( 25 ); done_effect = true; } @@ -5372,7 +5372,7 @@ void player::suffer() // Yes, you can be blind and hallucinate at the same time. // Your post-human biology is truly remarkable. if( one_turn_in( 30_minutes ) && !( has_effect( effect_visuals ) ) ) { - add_msg_if_player( m_bad, _( "Your visual centers must be acting up..." ) ); + add_msg_if_player( m_bad, _( "Your visual centers must be acting up…" ) ); add_effect( effect_visuals, rng( 36_minutes, 72_minutes ) ); } } @@ -5704,7 +5704,7 @@ void player::suffer() } if( stim > 75 ) { if( !one_turn_in( 2_minutes ) && !has_effect( effect_nausea ) ) { - add_msg( _( "You feel nauseous..." ) ); + add_msg( _( "You feel nauseous…" ) ); add_effect( effect_nausea, 5_minutes ); } } @@ -5737,7 +5737,7 @@ void player::suffer() } if( stim < -60 || pkill > 130 ) { if( calendar::once_every( 10_minutes ) ) { - add_msg( m_warning, _( "You feel tired..." ) ); + add_msg( m_warning, _( "You feel tired…" ) ); mod_fatigue( rng( 1, 2 ) ); } } @@ -8081,11 +8081,11 @@ player::wear_item( const item &to_wear, bool interactive ) } if( supertinymouse && !to_wear.has_flag( "UNDERSIZE" ) ) { add_msg_if_player( m_warning, - _( "This %s is too big to wear comfortably! Maybe it could be refitted..." ), + _( "This %s is too big to wear comfortably! Maybe it could be refitted…" ), to_wear.tname() ); } else if( to_wear.has_flag( "UNDERSIZE" ) ) { add_msg_if_player( m_warning, - _( "This %s is too small to wear comfortably! Maybe it could be refitted..." ), + _( "This %s is too small to wear comfortably! Maybe it could be refitted…" ), to_wear.tname() ); } } else { @@ -9189,7 +9189,7 @@ void player::try_to_sleep( const time_duration &dur ) // At this point, it's kinda weird, but surprisingly comfy... if( web >= 3 ) { add_msg_if_player( m_good, - _( "These thick webs support your weight, and are strangely comfortable..." ) ); + _( "These thick webs support your weight, and are strangely comfortable…" ) ); websleeping = true; } else if( web > 0 ) { add_msg_if_player( m_info, @@ -9215,10 +9215,10 @@ void player::try_to_sleep( const time_duration &dur ) if( has_trait( trait_WATERSLEEP ) ) { if( underwater ) { add_msg_if_player( m_good, - _( "You lay beneath the waves' embrace, gazing up through the water's surface..." ) ); + _( "You lay beneath the waves' embrace, gazing up through the water's surface…" ) ); watersleep = true; } else if( g->m.has_flag_ter( "SWIMMABLE", pos() ) ) { - add_msg_if_player( m_good, _( "You settle into the water and begin to drowse..." ) ); + add_msg_if_player( m_good, _( "You settle into the water and begin to drowse…" ) ); watersleep = true; } } @@ -10340,7 +10340,7 @@ bool player::uncanny_dodge() if( is_u ) { add_msg( _( "Time seems to slow down and you instinctively dodge!" ) ); } else if( seen ) { - add_msg( _( "%s dodges... so fast!" ), this->disp_name() ); + add_msg( _( "%s dodges… so fast!" ), this->disp_name() ); } return true; diff --git a/src/player_hardcoded_effects.cpp b/src/player_hardcoded_effects.cpp index 2b683be234a03..9232329904603 100644 --- a/src/player_hardcoded_effects.cpp +++ b/src/player_hardcoded_effects.cpp @@ -689,7 +689,7 @@ void player::hardcoded_effects( effect &it ) add_effect( effect_shakes, rng( 4_minutes, 8_minutes ) ); } if( one_in( 12000 - to_turns( dur ) ) ) { - add_msg_if_player( m_bad, _( "Your vision is filled with bright lights..." ) ); + add_msg_if_player( m_bad, _( "Your vision is filled with bright lights…" ) ); add_effect( effect_blind, rng( 1_minutes, 2_minutes ) ); if( one_in( 8 ) ) { // Set ourselves up for removal @@ -998,7 +998,7 @@ void player::hardcoded_effects( effect &it ) it.set_duration( 0_turns ); } if( dur == 1_turns && !sleeping ) { - add_msg_if_player( _( "You try to sleep, but can't..." ) ); + add_msg_if_player( _( "You try to sleep, but can't…" ) ); } } else if( id == effect_sleep ) { set_moves( 0 ); @@ -1217,9 +1217,9 @@ void player::hardcoded_effects( effect &it ) remove_effect( effect_alarm_clock ); } else if( has_effect( effect_slept_through_alarm ) ) { // slept though the alarm. if( has_bionic( bionic_id( "bio_watch" ) ) ) { - add_msg_if_player( m_warning, _( "It looks like you've slept through your internal alarm..." ) ); + add_msg_if_player( m_warning, _( "It looks like you've slept through your internal alarm…" ) ); } else { - add_msg_if_player( m_warning, _( "It looks like you've slept through the alarm..." ) ); + add_msg_if_player( m_warning, _( "It looks like you've slept through the alarm…" ) ); } get_effect( effect_slept_through_alarm ).set_duration( 0_turns ); remove_effect( effect_alarm_clock ); diff --git a/src/regional_settings.cpp b/src/regional_settings.cpp index 3eeb1373ef879..7b71fa72c9380 100644 --- a/src/regional_settings.cpp +++ b/src/regional_settings.cpp @@ -166,7 +166,7 @@ static void load_forest_mapgen_settings( JsonObject &jo, { if( !jo.has_object( "forest_mapgen_settings" ) ) { if( strict ) { - jo.throw_error( "\"forest_mapgen_settings\": { ... } required for default" ); + jo.throw_error( "\"forest_mapgen_settings\": { … } required for default" ); } } else { JsonObject forest_biomes_list_jo = jo.get_object( "forest_mapgen_settings" ); @@ -187,7 +187,7 @@ static void load_forest_trail_settings( JsonObject &jo, { if( !jo.has_object( "forest_trail_settings" ) ) { if( strict ) { - jo.throw_error( "\"forest_trail_settings\": { ... } required for default" ); + jo.throw_error( "\"forest_trail_settings\": { … } required for default" ); } } else { JsonObject forest_trail_settings_jo = jo.get_object( "forest_trail_settings" ); @@ -245,7 +245,7 @@ static void load_overmap_feature_flag_settings( JsonObject &jo, { if( !jo.has_object( "overmap_feature_flag_settings" ) ) { if( strict ) { - jo.throw_error( "\"overmap_feature_flag_settings\": { ... } required for default" ); + jo.throw_error( "\"overmap_feature_flag_settings\": { … } required for default" ); } } else { JsonObject overmap_feature_flag_settings_jo = jo.get_object( "overmap_feature_flag_settings" ); @@ -292,7 +292,7 @@ static void load_overmap_forest_settings( { if( !jo.has_object( "overmap_forest_settings" ) ) { if( strict ) { - jo.throw_error( "\"overmap_forest_settings\": { ... } required for default" ); + jo.throw_error( "\"overmap_forest_settings\": { … } required for default" ); } } else { JsonObject overmap_forest_settings_jo = jo.get_object( "overmap_forest_settings" ); @@ -317,7 +317,7 @@ static void load_overmap_lake_settings( JsonObject &jo, { if( !jo.has_object( "overmap_lake_settings" ) ) { if( strict ) { - jo.throw_error( "\"overmap_lake_settings\": { ... } required for default" ); + jo.throw_error( "\"overmap_lake_settings\": { … } required for default" ); } } else { JsonObject overmap_lake_settings_jo = jo.get_object( "overmap_lake_settings" ); @@ -388,7 +388,7 @@ void load_region_settings( JsonObject &jo ) if( ! jo.has_object( "field_coverage" ) ) { if( strict ) { - jo.throw_error( "\"field_coverage\": { ... } required for default" ); + jo.throw_error( "\"field_coverage\": { … } required for default" ); } } else { JsonObject pjo = jo.get_object( "field_coverage" ); @@ -435,7 +435,7 @@ void load_region_settings( JsonObject &jo ) } } } else { - pjo.throw_error( "boost_chance > 0 requires boosted_other { ... }" ); + pjo.throw_error( "boost_chance > 0 requires boosted_other { … }" ); } } } @@ -446,7 +446,7 @@ void load_region_settings( JsonObject &jo ) if( ! jo.has_object( "map_extras" ) ) { if( strict ) { - jo.throw_error( "\"map_extras\": { ... } required for default" ); + jo.throw_error( "\"map_extras\": { … } required for default" ); } } else { JsonObject pjo = jo.get_object( "map_extras" ); @@ -463,7 +463,7 @@ void load_region_settings( JsonObject &jo ) if( ! zjo.has_object( "extras" ) ) { if( strict ) { - zjo.throw_error( "\"extras\": { ... } required for default" ); + zjo.throw_error( "\"extras\": { … } required for default" ); } } else { JsonObject exjo = zjo.get_object( "extras" ); @@ -483,7 +483,7 @@ void load_region_settings( JsonObject &jo ) if( ! jo.has_object( "city" ) ) { if( strict ) { - jo.throw_error( "\"city\": { ... } required for default" ); + jo.throw_error( "\"city\": { … } required for default" ); } } else { JsonObject cjo = jo.get_object( "city" ); @@ -505,7 +505,7 @@ void load_region_settings( JsonObject &jo ) const auto load_building_types = [&jo, &cjo, strict]( const std::string & type, building_bin & dest ) { if( !cjo.has_object( type ) && strict ) { - jo.throw_error( "city: \"" + type + "\": { ... } required for default" ); + jo.throw_error( "city: \"" + type + "\": { … } required for default" ); } else { JsonObject wjo = cjo.get_object( type ); std::set keys = wjo.get_member_names(); @@ -526,7 +526,7 @@ void load_region_settings( JsonObject &jo ) if( ! jo.has_object( "weather" ) ) { if( strict ) { - jo.throw_error( "\"weather\": { ... } required for default" ); + jo.throw_error( "\"weather\": { … } required for default" ); } } else { JsonObject wjo = jo.get_object( "weather" ); @@ -646,7 +646,7 @@ void apply_region_overlay( JsonObject &jo, regional_settings ®ion ) if( region.field_coverage.boost_chance > 0.0f && region.field_coverage.boosted_percent_str.empty() ) { - fieldjo.throw_error( "boost_chance > 0 requires boosted_other { ... }" ); + fieldjo.throw_error( "boost_chance > 0 requires boosted_other { … }" ); } load_forest_mapgen_settings( jo, region.forest_composition, false, true ); diff --git a/src/teleport.cpp b/src/teleport.cpp index 68f6f9918e037..00c0b6deed413 100644 --- a/src/teleport.cpp +++ b/src/teleport.cpp @@ -67,7 +67,7 @@ bool teleport::teleport( Creature &critter, int min_distance, int max_distance, } else { const bool poor_soul_is_u = ( poor_soul == &g->u ); if( poor_soul_is_u ) { - add_msg( m_bad, _( "..." ) ); + add_msg( m_bad, _( "…" ) ); add_msg( m_bad, _( "You explode into thousands of fragments." ) ); } if( p ) { diff --git a/src/trapfunc.cpp b/src/trapfunc.cpp index d712b20ceb560..3fedce1003649 100644 --- a/src/trapfunc.cpp +++ b/src/trapfunc.cpp @@ -640,10 +640,10 @@ bool trapfunc::telepad( const tripoint &p, Creature *c, item * ) return false; } if( c == &g->u ) { - c->add_msg_if_player( m_warning, _( "The air shimmers around you..." ) ); + c->add_msg_if_player( m_warning, _( "The air shimmers around you…" ) ); } else { if( g->u.sees( p ) ) { - add_msg( _( "The air shimmers around %s..." ), c->disp_name() ); + add_msg( _( "The air shimmers around %s…" ), c->disp_name() ); } } teleport::teleport( *c ); @@ -1035,7 +1035,7 @@ static bool sinkhole_safety_roll( player *p, const std::string &itemname, const const int throwing_skill_level = p->get_skill_level( skill_throw ); const int roll = rng( throwing_skill_level, throwing_skill_level + p->str_cur + p->dex_cur ); if( roll < diff ) { - p->add_msg_if_player( m_bad, _( "You fail to attach it..." ) ); + p->add_msg_if_player( m_bad, _( "You fail to attach it…" ) ); p->use_amount( itemname, 1 ); g->m.spawn_item( random_neighbor( p->pos() ), itemname ); return false; diff --git a/src/veh_interact.cpp b/src/veh_interact.cpp index b8aa92e6a0925..a4ff50d17256f 100644 --- a/src/veh_interact.cpp +++ b/src/veh_interact.cpp @@ -963,10 +963,10 @@ bool veh_interact::do_install( std::string &msg ) if( can_install ) { switch( reason ) { case LOW_MORALE: - msg = _( "Your morale is too low to construct..." ); + msg = _( "Your morale is too low to construct…" ); return false; case LOW_LIGHT: - msg = _( "It's too dark to see what you are doing..." ); + msg = _( "It's too dark to see what you are doing…" ); return false; case MOVING_VEHICLE: msg = _( "You can't install parts while driving." ); @@ -1075,10 +1075,10 @@ bool veh_interact::do_repair( std::string &msg ) auto can_repair = [&msg, &reason]() { switch( reason ) { case LOW_MORALE: - msg = _( "Your morale is too low to repair..." ); + msg = _( "Your morale is too low to repair…" ); return false; case LOW_LIGHT: - msg = _( "It's too dark to see what you are doing..." ); + msg = _( "It's too dark to see what you are doing…" ); return false; case MOVING_VEHICLE: msg = _( "You can't repair stuff while driving." ); @@ -1141,7 +1141,7 @@ bool veh_interact::do_repair( std::string &msg ) sel_vpart_info = &vp; const std::vector helpers = g->u.get_crafting_helpers(); for( const npc *np : helpers ) { - add_msg( m_info, _( "%s helps with this task..." ), np->name ); + add_msg( m_info, _( "%s helps with this task…" ), np->name ); } sel_cmd = 'r'; break; @@ -1166,10 +1166,10 @@ bool veh_interact::do_mend( std::string &msg ) { switch( cant_do( 'm' ) ) { case LOW_MORALE: - msg = _( "Your morale is too low to mend..." ); + msg = _( "Your morale is too low to mend…" ); return false; case LOW_LIGHT: - msg = _( "It's too dark to see what you are doing..." ); + msg = _( "It's too dark to see what you are doing…" ); return false; case INVALID_TARGET: msg = _( "No faulty parts require mending." ); @@ -1734,10 +1734,10 @@ bool veh_interact::do_remove( std::string &msg ) if( can_remove && ( action == "REMOVE" || action == "CONFIRM" ) ) { switch( reason ) { case LOW_MORALE: - msg = _( "Your morale is too low to construct..." ); + msg = _( "Your morale is too low to construct…" ); return false; case LOW_LIGHT: - msg = _( "It's too dark to see what you are doing..." ); + msg = _( "It's too dark to see what you are doing…" ); return false; case NOT_FREE: msg = _( "You cannot remove that part while something is attached to it." ); @@ -1750,7 +1750,7 @@ bool veh_interact::do_remove( std::string &msg ) } const std::vector helpers = g->u.get_crafting_helpers(); for( const npc *np : helpers ) { - add_msg( m_info, _( "%s helps with this task..." ), np->name ); + add_msg( m_info, _( "%s helps with this task…" ), np->name ); } sel_cmd = 'o'; break; diff --git a/src/vehicle_display.cpp b/src/vehicle_display.cpp index 913e4c12e43a3..df9dab0e439c9 100644 --- a/src/vehicle_display.cpp +++ b/src/vehicle_display.cpp @@ -144,7 +144,7 @@ int vehicle::print_part_list( const catacurses::window &win, int y1, const int m int y = y1; for( size_t i = 0; i < pl.size(); i++ ) { if( y >= max_y ) { - mvwprintz( win, point( 1, y ), c_yellow, _( "More parts here..." ) ); + mvwprintz( win, point( 1, y ), c_yellow, _( "More parts here…" ) ); ++y; break; } @@ -256,7 +256,7 @@ void vehicle::print_vparts_descs( const catacurses::window &win, int max_y, int */ start_at = std::max( 0, std::min( start_at, start_limit ) ); if( start_at ) { - msg << "" << "< " << _( "More parts here..." ) << "\n"; + msg << "" << "< " << _( "More parts here…" ) << "\n"; lines += 1; } for( size_t i = start_at; i < pl.size(); i++ ) { @@ -284,7 +284,7 @@ void vehicle::print_vparts_descs( const catacurses::window &win, int max_y, int lines += new_lines; start_limit = start_at; } else { - msg << "" << _( "More parts here..." ) << " >" << "\n"; + msg << "" << _( "More parts here…" ) << " >" << "\n"; start_limit = i; break; } diff --git a/src/vehicle_use.cpp b/src/vehicle_use.cpp index b3bcd06ec0365..bea093b28fd39 100644 --- a/src/vehicle_use.cpp +++ b/src/vehicle_use.cpp @@ -473,7 +473,7 @@ void vehicle::smash_security_system() if( parts[ c ].removed || parts[ c ].is_broken() ) { g->u.controlling_vehicle = false; is_alarm_on = false; - add_msg( _( "You destroy the controls..." ) ); + add_msg( _( "You destroy the controls…" ) ); } else { add_msg( _( "You damage the controls." ) ); } diff --git a/src/weather.cpp b/src/weather.cpp index daf435f520599..16fe208a6d1f6 100644 --- a/src/weather.cpp +++ b/src/weather.cpp @@ -497,7 +497,7 @@ void weather_effect::light_acid() if( g->u.is_wearing_power_armor( &has_helmet ) && ( has_helmet || !one_in( 4 ) ) ) { add_msg( _( "Your power armor protects you from the acidic drizzle." ) ); } else { - add_msg( m_warning, _( "The acid rain stings, but is mostly harmless for now..." ) ); + add_msg( m_warning, _( "The acid rain stings, but is mostly harmless for now…" ) ); if( one_in( 10 ) && ( g->u.get_pain() < 10 ) ) { g->u.mod_pain( 1 ); } @@ -646,7 +646,7 @@ std::string weather_forecast( const point &abs_sm_pos ) day = to_string( day_of_week( c ) ); } weather_report << string_format( - _( "%s... %s. Highs of %s. Lows of %s. " ), + _( "%s… %s. Highs of %s. Lows of %s. " ), day, weather::name( forecast ), print_temperature( high ), print_temperature( low ) ); diff --git a/src/wish.cpp b/src/wish.cpp index 6bd73fb1ecb2d..d5b10fba649de 100644 --- a/src/wish.cpp +++ b/src/wish.cpp @@ -579,7 +579,7 @@ void debug_menu::wishskill( player *p ) uilist skmenu; skmenu.text = _( "Select a skill to modify" ); skmenu.allow_anykey = true; - skmenu.addentry( 0, true, '1', _( "Modify all skills..." ) ); + skmenu.addentry( 0, true, '1', _( "Modify all skills…" ) ); std::vector origskills; origskills.reserve( Skill::skills.size() ); diff --git a/src/worldfactory.cpp b/src/worldfactory.cpp index 0401ccb75b200..5ac9cc8c519c3 100644 --- a/src/worldfactory.cpp +++ b/src/worldfactory.cpp @@ -925,7 +925,7 @@ int worldfactory::show_worldgen_tab_modselection( const catacurses::window &win, if( num_lines > window_height ) { // The description didn't fit in the window, so provide a // hint for how to see the whole thing - std::string message = string_format( _( "...%s = View full description " ), + std::string message = string_format( _( "…%s = View full description " ), ctxt.get_desc( "VIEW_MOD_DESCRIPTION" ) ); nc_color color = c_green; print_colored_text( w_description, point( window_width - utf8_width( message ), window_height - 1 ), diff --git a/tests/test_main.cpp b/tests/test_main.cpp index 60d088daefc40..9e1c046dd3a30 100644 --- a/tests/test_main.cpp +++ b/tests/test_main.cpp @@ -275,10 +275,10 @@ int main( int argc, const char *argv[] ) int result = session.applyCommandLine( arg_vec.size(), &arg_vec[0] ); if( result != 0 || session.configData().showHelp ) { printf( "CataclysmDDA specific options:\n" ); - printf( " --mods= Loads the list of mods before executing tests.\n" ); + printf( " --mods= Loads the list of mods before executing tests.\n" ); printf( " --user-dir= Set user dir (where test world will be created).\n" ); printf( " -D, --drop-world Don't save the world on test failure.\n" ); - printf( " --option_overrides=n:v[,...] Name-value pairs of game options for tests.\n" ); + printf( " --option_overrides=n:v[,…] Name-value pairs of game options for tests.\n" ); printf( " (overrides config/options.json values)\n" ); return result; }