diff --git a/src/faction_camp.cpp b/src/faction_camp.cpp index 28930f66f968a..00bafa7b13f7f 100644 --- a/src/faction_camp.cpp +++ b/src/faction_camp.cpp @@ -449,9 +449,6 @@ static std::string mission_ui_activity_of( const mission_id &miss_id ) case Camp_Harvest: return dir_abbr + _( " Harvest Fields" ); - case Camp_Chop_Shop: // Obsolete removed during 0.E - return _( " Chop Shop. Obsolete. Can only be recalled" ); - // Actions that won't be used here case Scavenging_Patrol_Job: case Scavenging_Raid_Job: @@ -1214,17 +1211,6 @@ void basecamp::get_available_missions_by_dir( mission_data &mission_key, const p } } - if( has_provides( "dismantling", - dir ) ) { // Obsolete (during 0.E), but we still have to be able to process existing missions. - const mission_id miss_id = { Camp_Chop_Shop, "", {}, dir }; - comp_list npc_list = get_mission_workers( miss_id ); - if( !npc_list.empty() ) { - entry = action_of( miss_id.id ); - bool avail = update_time_left( entry, npc_list ); - mission_key.add_return( miss_id, - dir_abbr + _( " (Finish) Chop Shop" ), entry, avail ); - } - } std::map craft_recipes = recipe_deck( dir ); { mission_id miss_id = { Camp_Crafting, "", {}, dir }; @@ -1949,10 +1935,6 @@ bool basecamp::handle_mission( const ui_mission_id &miss_id ) } break; - case Camp_Chop_Shop: // Removed during 0.E - debugmsg( "Obsolete Function. Use Vehicle Deconstruct zone instead. Recover your companion with Emergency Recall." ); - break; - case Camp_Plow: case Camp_Plant: case Camp_Harvest: @@ -5923,7 +5905,6 @@ std::string basecamp::name_display_of( const mission_id &miss_id ) case Camp_Recruiting: case Camp_Scouting: case Camp_Combat_Patrol: - case Camp_Chop_Shop: case Camp_Plow: case Camp_Plant: case Camp_Harvest: diff --git a/src/mission_companion.cpp b/src/mission_companion.cpp index 1a02890bbc8fe..312ec2c532142 100644 --- a/src/mission_companion.cpp +++ b/src/mission_companion.cpp @@ -212,7 +212,6 @@ std::string enum_to_string( mission_kind data ) case mission_kind::Camp_Recruiting: return "Camp_Recruiting"; case mission_kind::Camp_Scouting: return "Camp_Scouting"; case mission_kind::Camp_Combat_Patrol: return "Camp_Combat_Patrol"; - case mission_kind::Camp_Chop_Shop: return "Camp_Chop_Shop"; case mission_kind::Camp_Plow: return "Camp_Plow"; case mission_kind::Camp_Plant: return "Camp_Plant"; case mission_kind::Camp_Harvest: return "Camp_Harvest"; @@ -368,11 +367,6 @@ static const std::array < miss_data, Camp_Harvest + 1 > miss_info = { { "Camp_Combat Patrol", to_translation( "Patrolling the region.\n" ) }, - { - // Obsolete entry - "Camp_Chop_Shop", - to_translation( "Working at the chop shop…\n" ) - }, { "Camp_Plow", to_translation( "Working to plow your fields!\n" ) @@ -538,8 +532,6 @@ void mission_id::deserialize( const JsonValue &val ) camp_upgrade_expansion_npc_string ) { // blueprint + id + dir id = Camp_Upgrade; parameters = st.substr( 0, id_size - camp_upgrade_expansion_npc_string.length() ); - } else if( st == "_faction_exp_chop_shop_" ) { // id + dir - id = Camp_Chop_Shop; } else if( st == "_faction_exp_kitchen_cooking_" || // id + dir st == "_faction_exp_blacksmith_crafting_" || st == "_faction_exp_farm_crafting_" ) { @@ -1277,7 +1269,6 @@ bool talk_function::handle_outpost_mission( const mission_entry &cur_key, npc &p case Camp_Recruiting: case Camp_Scouting: case Camp_Combat_Patrol: - case Camp_Chop_Shop: case Camp_Plow: case Camp_Plant: case Camp_Harvest: diff --git a/src/mission_companion.h b/src/mission_companion.h index 8b23d1c7ae8ff..54e8ad3e21594 100644 --- a/src/mission_companion.h +++ b/src/mission_companion.h @@ -74,7 +74,6 @@ enum mission_kind : int { Camp_Recruiting, Camp_Scouting, Camp_Combat_Patrol, - Camp_Chop_Shop, // Obsolete removed during 0.E Camp_Plow, Camp_Plant, Camp_Harvest,