diff --git a/src/mission_start.cpp b/src/mission_start.cpp index f4af59a6e74cc..07ee699a95e18 100644 --- a/src/mission_start.cpp +++ b/src/mission_start.cpp @@ -601,41 +601,6 @@ void mission_start::place_deposit_box( mission *miss ) compmap.save(); } -void mission_start::reveal_lab_black_box( mission *miss ) -{ - npc *dev = g->find_npc( miss->npc_id ); - if( dev != nullptr ) { - g->u.i_add( item( "black_box", 0 ) ); - add_msg( _( "%s gave you back the black box." ), dev->name ); - } - target_om_ter( "lab", 3, miss, false ); -} - -void mission_start::open_sarcophagus( mission *miss ) -{ - npc *p = g->find_npc( miss->npc_id ); - if( p != nullptr ) { - p->set_attitude( NPCATT_FOLLOW ); - g->u.i_add( item( "sarcophagus_access_code", 0 ) ); - add_msg( m_good, _( "%s gave you sarcophagus access code." ), p->name ); - } else { - DebugLog( D_ERROR, DC_ALL ) << "mission_start: open_sarcophagus() <= Can't find NPC"; - } - target_om_ter( "haz_sar", 3, miss, false ); -} - -void mission_start::reveal_hospital( mission *miss ) -{ - npc *dev = g->find_npc( miss->npc_id ); - if( dev != nullptr ) { - g->u.i_add( item( "vacutainer", 0 ) ); - add_msg( _( "%s gave you a blood draw kit." ), dev->name ); - g->u.i_add( item( "usb_drive", 0 ) ); - add_msg( _( "%s gave you a USB drive." ), dev->name ); - } - target_om_ter( "hospital_2", 3, miss, false ); -} - void mission_start::find_safety( mission *miss ) { const tripoint place = g->u.global_omt_location(); @@ -686,16 +651,6 @@ void mission_start::find_safety( mission *miss ) } } -void mission_start::point_prison( mission *miss ) -{ - target_om_ter( "prison_1_5", 3, miss, false ); -} - -void mission_start::point_cabin_strange( mission *miss ) -{ - target_om_ter( "cabin_strange", 3, miss, false ); -} - void mission_start::recruit_tracker( mission *miss ) { npc *p = g->find_npc( miss->npc_id ); @@ -718,12 +673,6 @@ void mission_start::recruit_tracker( mission *miss ) temp->getID() ) ); } -void mission_start::radio_repeater( mission *miss ) -{ - target_om_ter( "necropolis_c_23", 3, miss, false, -2 ); - g->u.i_add( item( "repeater_mod_guide", calendar::turn ) ); -} - void mission_start::start_commune( mission *miss ) { // Check entire overmap for now. @@ -1782,26 +1731,6 @@ void reveal_any_target( mission *miss, const std::vector &omter_ids reveal_target( miss, random_entry( omter_ids ) ); } -void mission_start::reveal_weather_station( mission *miss ) -{ - reveal_target( miss, "station_radio" ); -} - -void mission_start::reveal_office_tower( mission *miss ) -{ - reveal_target( miss, "office_tower_1" ); -} - -void mission_start::reveal_doctors_office( mission *miss ) -{ - reveal_any_target( miss, { "office_doctor", "hospital_2" } ); -} - -void mission_start::reveal_cathedral( mission *miss ) -{ - reveal_any_target( miss, { "cathedral_1", "museum" } ); -} - void mission_start::reveal_refugee_center( mission *miss ) { const tripoint your_pos = g->u.global_omt_location(); diff --git a/src/missiondef.cpp b/src/missiondef.cpp index 99fbe1cb6ad71..af9009e2af691 100644 --- a/src/missiondef.cpp +++ b/src/missiondef.cpp @@ -110,14 +110,8 @@ static const std::map> mission_fun { "place_npc_software", mission_start::place_npc_software }, { "place_priest_diary", mission_start::place_priest_diary }, { "place_deposit_box", mission_start::place_deposit_box }, - { "reveal_lab_black_box", mission_start::reveal_lab_black_box }, - { "open_sarcophagus", mission_start::open_sarcophagus }, - { "reveal_hospital", mission_start::reveal_hospital }, { "find_safety", mission_start::find_safety }, - { "point_prison", mission_start::point_prison }, - { "point_cabin_strange", mission_start::point_cabin_strange }, { "recruit_tracker", mission_start::recruit_tracker }, - { "radio_repeater", mission_start::radio_repeater }, { "start_commune", mission_start::start_commune }, { "ranch_construct_1", mission_start::ranch_construct_1 }, { "ranch_construct_2", mission_start::ranch_construct_2 }, @@ -152,10 +146,6 @@ static const std::map> mission_fun { "ranch_bartender_3", mission_start::ranch_bartender_3 }, { "ranch_bartender_4", mission_start::ranch_bartender_4 }, { "place_book", mission_start::place_book }, - { "reveal_weather_station", mission_start::reveal_weather_station }, - { "reveal_office_tower", mission_start::reveal_office_tower }, - { "reveal_doctors_office", mission_start::reveal_doctors_office }, - { "reveal_cathedral", mission_start::reveal_cathedral }, { "reveal_refugee_center", mission_start::reveal_refugee_center }, { "create_lab_console", mission_start::create_lab_console }, { "create_hidden_lab_console", mission_start::create_hidden_lab_console },