Tools.json linted (#29025)

* Lint tools.json and remove from blacklist
CleverRaven · Mar 26, 2019 · e3964f4 · e3964f4
1 parent 462887d
commit e3964f4
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 42 deletions.
diff --git a/data/json/itemgroups/tools.json b/data/json/itemgroups/tools.json
@@ -1,15 +1,9 @@
 [
   {
-    "id" : "tools_blacksmith",
-    "type" : "item_group",
-    "//" : "Tools commonly used by blacksmiths",
-    "items": [
-      [ "anvil", 30 ],
-      [ "chisel", 90 ],
-      [ "crucible", 30 ],
-      [ "swage", 60 ],
-      [ "tongs", 90 ]
-    ]
+    "id": "tools_blacksmith",
+    "type": "item_group",
+    "//": "Tools commonly used by blacksmiths",
+    "items": [ [ "anvil", 30 ], [ "chisel", 90 ], [ "crucible", 30 ], [ "swage", 60 ], [ "tongs", 90 ] ]
   },
   {
     "id": "tools_carpentry",
@@ -37,9 +31,9 @@
     ]
   },
   {
-    "id" : "tools_common",
-    "type" : "item_group",
-    "//" : "Common household tools",
+    "id": "tools_common",
+    "type": "item_group",
+    "//": "Common household tools",
     "items": [
       [ "hacksaw", 50 ],
       [ "hammer", 80 ],
@@ -76,22 +70,13 @@
     "id": "tools_electronics",
     "type": "item_group",
     "//": "Portable tools used by electricians and for electronics repair",
-    "items": [
-      { "group": "tools_common", "prob": 100 },
-      [ "soldering_iron", 100 ],
-      [ "magnifying_glass", 100 ]
-    ]
+    "items": [ { "group": "tools_common", "prob": 100 }, [ "soldering_iron", 100 ], [ "magnifying_glass", 100 ] ]
   },
   {
     "id": "tools_entry",
     "type": "item_group",
     "//": "Tools used for forcing entry into a building",
-    "items": [
-      [ "boltcutters", 30 ],
-      [ "crowbar", 50 ],
-      [ "hammer_sledge", 20 ],
-      [ "halligan", 10 ]
-    ]
+    "items": [ [ "boltcutters", 30 ], [ "crowbar", 50 ], [ "hammer_sledge", 20 ], [ "halligan", 10 ] ]
   },
   {
     "id": "tools_home",
@@ -146,10 +131,10 @@
     ]
   },
   {
-    "id" : "tools_lighting",
-    "type" : "item_group",
+    "id": "tools_lighting",
+    "type": "item_group",
     "//": "Light sources balanced according to rarity",
-    "items" : [
+    "items": [
       [ "candle", 70 ],
       [ "electric_lantern", 20 ],
       [ "handflare", 50 ],
@@ -162,20 +147,16 @@
     ]
   },
   {
-    "id" : "tools_lighting_industrial",
-    "type" : "item_group",
+    "id": "tools_lighting_industrial",
+    "type": "item_group",
     "//": "Light sources used as industrial working equipment.",
-    "items" : [
-      [ "flashlight", 100 ],
-      [ "heavy_flashlight", 40 ],
-      [ "wearable_light", 60 ]
-    ]
+    "items": [ [ "flashlight", 100 ], [ "heavy_flashlight", 40 ], [ "wearable_light", 60 ] ]
   },
   {
-    "id" : "tools_survival",
-    "type" : "item_group",
+    "id": "tools_survival",
+    "type": "item_group",
     "//": "Practical, small and light-weight tools for survival excluding camping gear.",
-    "items" : [
+    "items": [
       [ "binoculars", 30 ],
       [ "canteen", 15 ],
       [ "e_tool", 10 ],
@@ -184,7 +165,7 @@
       [ "hatchet", 10 ],
       [ "knife_hunting", 10 ],
       [ "knife_rambo", 10 ],
-      [ "knife_swissarmy", 5],
+      [ "knife_swissarmy", 5 ],
       [ "knife_trench", 10 ],
       [ "mess_kit", 20 ],
       [ "multitool", 5 ],
@@ -198,9 +179,9 @@
     ]
   },
   {
-    "id" : "tools_tailor",
-    "type" : "item_group",
-    "items" : [
+    "id": "tools_tailor",
+    "type": "item_group",
+    "items": [
       [ "needle_curved", 30 ],
       [ "scissors", 1000 ],
       [ "sewing_kit", 100 ],

diff --git a/json_blacklist b/json_blacklist
@@ -1,4 +1,3 @@
-data/json/itemgroups/tools.json
 data/json/itemgroups/vending_machines.json
 data/json/items/chemicals_and_resources.json
 data/json/items/containers.json