Merge gun cleaning fault_fixes

CleverRaven · May 9, 2023 · 0ad1fed · 0ad1fed
1 parent 592bbde
commit 0ad1fed
Showing 1 changed file with 6 additions and 29 deletions.
diff --git a/data/json/faults/fixes_gun.json b/data/json/faults/fixes_gun.json
@@ -1,23 +1,23 @@
 [
   {
     "type": "fault_fix",
-    "id": "mend_fault_gun_blackpowder_clean",
-    "name": "Clean blackpowder fouling",
+    "id": "mend_gun_fouling_clean",
+    "name": "Clean fouling",
     "success_msg": "You clean your %s.",
     "time": "50 m",
-    "faults_removed": [ "fault_gun_blackpowder" ],
+    "faults_removed": [ "fault_gun_dirt", "fault_gun_blackpowder" ],
     "faults_added": [ "fault_gun_unlubricated" ],
     "skills": { "mechanics": 1 },
     "set_variables": { "dirt": "0" },
     "requirements": [ [ "gun_cleaning", 1 ] ]
   },
   {
     "type": "fault_fix",
-    "id": "mend_fault_gun_blackpowder_clean_and_lube",
-    "name": "Clean blackpowder fouling and lubricate",
+    "id": "mend_gun_fouling_clean_and_lube",
+    "name": "Clean fouling and lubricate",
     "success_msg": "You clean and lubricate your %s.",
     "time": "55 m",
-    "faults_removed": [ "fault_gun_blackpowder", "fault_gun_unlubricated" ],
+    "faults_removed": [ "fault_gun_dirt", "fault_gun_blackpowder", "fault_gun_unlubricated" ],
     "skills": { "mechanics": 1 },
     "set_variables": { "dirt": "0" },
     "requirements": [ [ "gun_cleaning", 1 ], [ "gun_lubrication", 1 ] ]
@@ -39,28 +39,5 @@
     "skills": { "mechanics": 1 },
     "success_msg": "You lubricate the %s.",
     "requirements": [ [ "gun_lubrication", 1 ] ]
-  },
-  {
-    "type": "fault_fix",
-    "id": "mend_fault_gun_dirt_clean",
-    "name": "Clean gun",
-    "success_msg": "You clean your %s.",
-    "time": "50 m",
-    "skills": { "mechanics": 1 },
-    "faults_removed": [ "fault_gun_dirt" ],
-    "faults_added": [ "fault_gun_unlubricated" ],
-    "set_variables": { "dirt": "0" },
-    "requirements": [ [ "gun_cleaning", 1 ] ]
-  },
-  {
-    "type": "fault_fix",
-    "id": "mend_fault_gun_dirt_clean_and_lube",
-    "name": "Clean gun and lubricate",
-    "success_msg": "You clean and lubricate your %s.",
-    "time": "55 m",
-    "faults_removed": [ "fault_gun_dirt", "fault_gun_unlubricated" ],
-    "skills": { "mechanics": 1 },
-    "set_variables": { "dirt": "0" },
-    "requirements": [ [ "gun_cleaning", 1 ], [ "gun_lubrication", 1 ] ]
   }
 ]