Simply construction logic

data/json/construction.json

@@ -2791,18 +2791,6 @@
     "post_special": "done_vehicle",
     "vehicle_start": true
   },
-  {
-    "type": "construction",
-    "id": "constr_power_grid",
-    "group": "start_power_grid",
-    "//": "no components required, they are filled in at runtime based on the vehicle parts that can be used to start a power grid",
-    "category": "OTHER",
-    "required_skills": [ [ "electronics", 0 ] ],
-    "time": "10 m",
-    "//2": "no components required, they are filled in at runtime based on the vehicle parts that can be used to start a power grid",
-    "pre_special": "check_empty",
-    "post_special": "done_vehicle"
-  },
   {
     "type": "construction",
     "id": "constr_barricade_road",

data/json/construction_group.json

@@ -1144,11 +1144,6 @@
     "id": "start_vehicle_construction",
     "name": "Start Vehicle Construction"
   },
-  {
-    "type": "construction_group",
-    "id": "start_power_grid",
-    "name": "Start Power Grid"
-  },
   {
     "type": "construction_group",
     "id": "take_paint_off_pavement",

src/construction.cpp

@@ -1805,17 +1805,12 @@ std::vector<std::string> construction::get_folded_time_string( int width ) const
 void finalize_constructions()
 {
     std::vector<item_comp> frame_items;
-    std::vector<item_comp> power_grid_items;
     for( const auto &e : vpart_info::all() ) {
         const vpart_info &vp = e.second;
         if( !vp.has_flag( flag_INITIAL_PART ) ) {
             continue;
         }
-        if( vp.has_flag( VPFLAG_APPLIANCE ) ) {
-            power_grid_items.emplace_back( vp.base_item, 1 );
-        } else {
-            frame_items.emplace_back( vp.base_item, 1 );
-        }
+        frame_items.emplace_back( vp.base_item, 1 );
     }
 
     if( frame_items.empty() ) {
@@ -1830,10 +1825,6 @@ void finalize_constructions()
         if( con.vehicle_start ) {
             const_cast<requirement_data &>( con.requirements.obj() ).get_components().push_back( frame_items );
         }
-        if( con.str_id == construction_str_id( "constr_power_grid" ) ) {
-            const_cast<requirement_data &>( con.requirements.obj() ).get_components().push_back(
-                power_grid_items );
-        }
         bool is_valid_construction_category = false;
         for( const construction_category &cc : construction_categories::get_all() ) {
             if( con.category == cc.id ) {

src/veh_interact.cpp

@@ -753,13 +753,6 @@ bool veh_interact::can_self_jack()
     return false;
 }
 
-bool veh_interact::appliance_reqs_met( const vpart_info &info )
-{
-    bool is_appliance = veh->has_part( flag_APPLIANCE, false );
-    bool installing_appliance = info.has_flag( VPFLAG_APPLIANCE );
-    return ( is_appliance && installing_appliance ) || ( !is_appliance && !installing_appliance );
-}
-
 bool veh_interact::update_part_requirements()
 {
     if( sel_vpart_info == nullptr ) {
@@ -2264,7 +2257,7 @@ bool veh_interact::can_potentially_install( const vpart_info &vpart )
         engine_reqs_met = engines < 2;
     }
 
-    return hammerspace || ( can_make && engine_reqs_met && appliance_reqs_met( vpart ) );
+    return hammerspace || ( can_make && engine_reqs_met && !vpart.has_flag( VPFLAG_APPLIANCE ) );
 }
 
 /**
@@ -2855,7 +2848,7 @@ void veh_interact::display_list( size_t pos, const std::vector<const vpart_info
     size_t page = pos / lines_per_page;
     for( size_t i = page * lines_per_page; i < ( page + 1 ) * lines_per_page && i < list.size(); i++ ) {
         const vpart_info &info = *list[i];
-        if( !appliance_reqs_met( info ) ) {
+        if( !info.has_flag( VPFLAG_APPLIANCE ) ) {
             continue;
         }
 

src/veh_interact.h

@@ -290,8 +290,6 @@ class veh_interact
 
         /** Returns true if the vehicle has a jack powerful enough to lift itself installed */
         bool can_self_jack();
-
-        bool appliance_reqs_met( const vpart_info &info );
 };
 
 void act_vehicle_siphon( vehicle *veh );