Solar panels are not repairable (#34546)

* can't repair any solar panel item * can't repair solar panel vehicle part * NO_REPAIR flag is valid even for vehicle with TOOL_WRENCH flag
CleverRaven · Oct 8, 2019 · 9f71965 · 9f71965
1 parent 44daa0d
commit 9f71965
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/data/json/items/vehicle/solar.json b/data/json/items/vehicle/solar.json
@@ -11,6 +11,7 @@
     "material": [ "glass" ],
     "volume": "3 L",
     "bashing": 1,
+    "flags": [ "NO_REPAIR" ],
     "category": "veh_parts",
     "price": 90000
   },

diff --git a/data/json/vehicleparts/vehicle_parts.json b/data/json/vehicleparts/vehicle_parts.json
@@ -1737,7 +1737,7 @@
     "item": "solar_panel",
     "difficulty": 4,
     "location": "on_roof",
-    "flags": [ "SOLAR_PANEL", "TOOL_WRENCH" ],
+    "flags": [ "SOLAR_PANEL", "TOOL_WRENCH", "NO_REPAIR" ],
     "breaks_into": [
       { "item": "steel_lump", "count": [ 2, 4 ] },
       { "item": "steel_chunk", "count": [ 2, 4 ] },

diff --git a/src/veh_type.cpp b/src/veh_type.cpp
@@ -520,18 +520,21 @@ void vpart_info::check()
             if( part.has_flag( "TOOL_WRENCH" ) || part.has_flag( "WHEEL" ) ) {
                 part.install_reqs = { { requirement_id( "vehicle_bolt" ), 1 } };
                 part.removal_reqs = { { requirement_id( "vehicle_bolt" ), 1 } };
-                part.repair_reqs  = { { requirement_id( "welding_standard" ), 5 } };
-
+                if( !part.has_flag( "NO_REPAIR" ) ) {
+                    part.repair_reqs  = { { requirement_id( "welding_standard" ), 5 } };
+                }
             } else if( part.has_flag( "TOOL_SCREWDRIVER" ) ) {
                 part.install_reqs = { { requirement_id( "vehicle_screw" ), 1 } };
                 part.removal_reqs = { { requirement_id( "vehicle_screw" ), 1 } };
-                part.repair_reqs  = { { requirement_id( "adhesive" ), 1 } };
-
+                if( !part.has_flag( "NO_REPAIR" ) ) {
+                    part.repair_reqs  = { { requirement_id( "adhesive" ), 1 } };
+                }
             } else if( part.has_flag( "NAILABLE" ) ) {
                 part.install_reqs = { { requirement_id( "vehicle_nail_install" ), 1 } };
                 part.removal_reqs = { { requirement_id( "vehicle_nail_removal" ), 1 } };
-                part.repair_reqs  = { { requirement_id( "adhesive" ), 2 } };
-
+                if( !part.has_flag( "NO_REPAIR" ) ) {
+                    part.repair_reqs  = { { requirement_id( "adhesive" ), 2 } };
+                }
             } else if( part.has_flag( "TOOL_NONE" ) ) {
                 // no-op