Merge pull request #36093 from Qrox/fix-redundant-unlubricated

Don't add unlubricated fault if dirt fault is already present
CleverRaven · Dec 14, 2019 · 72dbda8 · 72dbda8
2 parents 7ef0929 + ee15c5f
commit 72dbda8
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/src/item_group.cpp b/src/item_group.cpp
@@ -212,16 +212,15 @@ void Item_modifier::modify( item &new_item ) const
     if( new_item.is_gun() &&
         // no need for dirt if it's a bow
         !new_item.has_flag( "PRIMITIVE_RANGED_WEAPON" ) ) {
-        if( one_in( 10 ) &&
-            // chance to be unlubed, but only if it's not a laser or something
-            !new_item.has_flag( "NEEDS_NO_LUBE" ) ) {
-            new_item.faults.emplace( "fault_gun_unlubricated" );
-        }
         int random_dirt = rng( dirt.first, dirt.second );
         // if gun RNG is dirty, must add dirt fault to allow cleaning
         if( random_dirt > 0 ) {
             new_item.set_var( "dirt", random_dirt );
             new_item.faults.emplace( "fault_gun_dirt" );
+        } else if( one_in( 10 ) &&
+                   // chance to be unlubed, but only if it's not a laser or something
+                   !new_item.has_flag( "NEEDS_NO_LUBE" ) ) {
+            new_item.faults.emplace( "fault_gun_unlubricated" );
         }
     }