Merge pull request #56189 from dseguin/fix_app_remove_prompt

Fix missing appliance removal prompt
CleverRaven · Mar 20, 2022 · 9da10a0 · 9da10a0
2 parents d2dd947 + ca694c5
commit 9da10a0
Showing 1 changed file with 2 additions and 8 deletions.
diff --git a/src/veh_appliance.cpp b/src/veh_appliance.cpp
@@ -365,17 +365,11 @@ void veh_app_interact::remove()
     bool can_remove = reqs.can_make_with_inventory( inv, is_crafting_component );
     if( !can_remove ) {
         msg += _( "Insufficient components/tools!\n" );
-    }
-    for( const auto &sk : vpinfo.removal_skills ) {
-        if( you.get_knowledge_level( sk.first ) < sk.second ) {
-            can_remove = false;
-            //~ 1$ = skill name (ex: mechanics), 2$ = skill level
-            msg += string_format( _( "Removal requires %1$s %2$d!\n" ), sk.first->name(), sk.second );
-        }
+        msg += reqs.list_missing();
     }
 
     int time = vpinfo.removal_time( you );
-    if( trait_DEBUG_HS ) {
+    if( you.has_trait( trait_DEBUG_HS ) ) {
         can_remove = true;
         time = 1;
     }