From 78b546eeb407e513d09fe2224413465562661ee9 Mon Sep 17 00:00:00 2001
From: LyleSY <lyle.sollayates@Gmail.com>
Date: Fri, 8 May 2020 15:26:04 -0400
Subject: [PATCH 01/26] Create uncrafting recipe for roller blades

---
 data/json/uncraft/armor/boots | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 data/json/uncraft/armor/boots

diff --git a/data/json/uncraft/armor/boots b/data/json/uncraft/armor/boots
new file mode 100644
index 0000000000000..0d6c94887dd27
--- /dev/null
+++ b/data/json/uncraft/armor/boots
@@ -0,0 +1,11 @@
+[
+  {
+    "result": "roller_blades",
+    "type": "uncraft",
+    "skill_used": "mechanics",
+    "difficulty": 3,
+    "time": "600 s",
+    "qualities": [ { "id": "PRYING", "level": 1 }, { "id": "TURNING", "level": 1 } ],
+    "components": [ [ [ "boots", 1 ] ], [ [ "plastic_chunk", 1 ] ], [ [ "bearings", 1 ] ] ]
+  }
+]

From 2d6788d9c784c7a5b49b14801c457f362743e9a9 Mon Sep 17 00:00:00 2001
From: LyleSY <lyle.sollayates@Gmail.com>
Date: Fri, 8 May 2020 20:43:28 -0400
Subject: [PATCH 02/26] Add roller_blades and roller_skates recipes

---
 data/json/recipes/armor/feet.json | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/data/json/recipes/armor/feet.json b/data/json/recipes/armor/feet.json
index dc008d5acaa43..62c4a19662b33 100644
--- a/data/json/recipes/armor/feet.json
+++ b/data/json/recipes/armor/feet.json
@@ -555,5 +555,33 @@
     "book_learn": [ [ "textbook_armwest", 6 ], [ "textbook_fabrication", 6 ], [ "recipe_melee", 6 ] ],
     "using": [ [ "chainmail_standard", 2 ] ],
     "components": [ [ [ "link_sheet", 2 ] ], [ [ "chain_link", 50 ] ], [ [ "wire", 1 ] ], [ [ "rag", 4 ] ] ]
+  },
+  {
+    "result": "roller_blades",
+    "type": "recipe",
+    "category": "CC_ARMOR",
+    "subcategory": "CSC_ARMOR_FEET",
+    "skill_used": "fabrication",
+    "skills_required": [ "tailor", 2 ],
+    "difficulty": 4,
+    "time": "60 m",
+    "book_learn": [ [ "textbook_tailor", 5 ], [ "tailor_portfolio", 5 ] ],
+    "using": [ [ "sewing_standard", 20 ] ],
+    "tools": [ [ [ "mold_plastic", -1 ] ], [ [ "surface_heat", 15, "LIST" ] ] ],
+    "components": [ [ [ "plastic_chunk", 9 ] ], [ [ "boots", 1 ] ], [ [ "bearings", 1 ] ], [ [ "scrap", 3 ] ] ]
+  },
+  {
+    "result": "rollerskates",
+    "type": "recipe",
+    "category": "CC_ARMOR",
+    "subcategory": "CSC_ARMOR_FEET",
+    "skill_used": "fabrication",
+    "skills_required": [ "tailor", 2 ],
+    "difficulty": 4,
+    "time": "60 m",
+    "book_learn": [ [ "textbook_tailor", 5 ], [ "tailor_portfolio", 5 ] ],
+    "using": [ [ "sewing_standard", 20 ] ],
+    "tools": [ [ [ "mold_plastic", -1 ] ], [ [ "surface_heat", 15, "LIST" ] ] ],
+    "components": [ [ [ "plastic_chunk", 10 ] ], [ [ "boots", 1 ] ], [ [ "bearings", 1 ] ], [ [ "scrap", 2 ] ] ]
   }
 ]

From 066f9073b63447a99b1c117a11fdd1dfbd9cad84 Mon Sep 17 00:00:00 2001
From: LyleSY <lyle.sollayates@Gmail.com>
Date: Fri, 8 May 2020 20:44:51 -0400
Subject: [PATCH 03/26] Revert uncraft

---
 data/json/uncraft/armor/boots | 11 -----------
 1 file changed, 11 deletions(-)
 delete mode 100644 data/json/uncraft/armor/boots

diff --git a/data/json/uncraft/armor/boots b/data/json/uncraft/armor/boots
deleted file mode 100644
index 0d6c94887dd27..0000000000000
--- a/data/json/uncraft/armor/boots
+++ /dev/null
@@ -1,11 +0,0 @@
-[
-  {
-    "result": "roller_blades",
-    "type": "uncraft",
-    "skill_used": "mechanics",
-    "difficulty": 3,
-    "time": "600 s",
-    "qualities": [ { "id": "PRYING", "level": 1 }, { "id": "TURNING", "level": 1 } ],
-    "components": [ [ [ "boots", 1 ] ], [ [ "plastic_chunk", 1 ] ], [ [ "bearings", 1 ] ] ]
-  }
-]

From 7937f352c1322c07c5c9a0eb2f3d6947a54bc187 Mon Sep 17 00:00:00 2001
From: LyleSY <lyle.sollayates@Gmail.com>
Date: Fri, 8 May 2020 21:40:17 -0400
Subject: [PATCH 04/26] Troubleshoot and customize

Made bearings "ammo" instead of components since they were throwing errors. Customized rollerskates to be more about metal and leather, and a little easier, and roller blades to be about cloth and plastic and a little harder.
---
 data/json/recipes/armor/feet.json | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/data/json/recipes/armor/feet.json b/data/json/recipes/armor/feet.json
index 62c4a19662b33..0468eb93d1ce4 100644
--- a/data/json/recipes/armor/feet.json
+++ b/data/json/recipes/armor/feet.json
@@ -563,12 +563,12 @@
     "subcategory": "CSC_ARMOR_FEET",
     "skill_used": "fabrication",
     "skills_required": [ "tailor", 2 ],
-    "difficulty": 4,
-    "time": "60 m",
+    "difficulty": 5,
+    "time": "90 m",
     "book_learn": [ [ "textbook_tailor", 5 ], [ "tailor_portfolio", 5 ] ],
-    "using": [ [ "sewing_standard", 20 ] ],
+    "using": [ [ [ "bearings", 6 ] ], [ [ "sewing_standard", 20 ] ] ],
     "tools": [ [ [ "mold_plastic", -1 ] ], [ [ "surface_heat", 15, "LIST" ] ] ],
-    "components": [ [ [ "plastic_chunk", 9 ] ], [ [ "boots", 1 ] ], [ [ "bearings", 1 ] ], [ [ "scrap", 3 ] ] ]
+    "components": [ [ [ "plastic_chunk", 15 ] ], [ [ "rag", 8 ] ], [ [ "scrap", 6 ] ] ]
   },
   {
     "result": "rollerskates",
@@ -576,12 +576,12 @@
     "category": "CC_ARMOR",
     "subcategory": "CSC_ARMOR_FEET",
     "skill_used": "fabrication",
-    "skills_required": [ "tailor", 2 ],
+    "skills_required": [ "tailor", 1 ],
     "difficulty": 4,
     "time": "60 m",
     "book_learn": [ [ "textbook_tailor", 5 ], [ "tailor_portfolio", 5 ] ],
-    "using": [ [ "sewing_standard", 20 ] ],
-    "tools": [ [ [ "mold_plastic", -1 ] ], [ [ "surface_heat", 15, "LIST" ] ] ],
-    "components": [ [ [ "plastic_chunk", 10 ] ], [ [ "boots", 1 ] ], [ [ "bearings", 1 ] ], [ [ "scrap", 2 ] ] ]
+    "using": [ [ "bearings", 8 ] ],
+    "tools": [ [ [ "mold_plastic", -1 ] ], [ [ "surface_heat", 15, "LIST" ] ], [ [ "hammering" ] ], [ [ "drilling" ] ] ],
+    "components": [ [ [ "plastic_chunk", 8 ] ], [ [ "boots", 1 ] ], [ [ "scrap", 16 ] ] ]
   }
 ]

From 100b0f29b615f6101c8d2fc3bdaa7d414ca1b537 Mon Sep 17 00:00:00 2001
From: LyleSY <lyle.sollayates@Gmail.com>
Date: Fri, 8 May 2020 21:49:32 -0400
Subject: [PATCH 05/26] "Using" troubleshooting

Apparently "Using" two different types of ammo crashes the game hard. No thread required for blades now.
---
 data/json/recipes/armor/feet.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/data/json/recipes/armor/feet.json b/data/json/recipes/armor/feet.json
index 0468eb93d1ce4..b1cffebe9222d 100644
--- a/data/json/recipes/armor/feet.json
+++ b/data/json/recipes/armor/feet.json
@@ -566,8 +566,8 @@
     "difficulty": 5,
     "time": "90 m",
     "book_learn": [ [ "textbook_tailor", 5 ], [ "tailor_portfolio", 5 ] ],
-    "using": [ [ [ "bearings", 6 ] ], [ [ "sewing_standard", 20 ] ] ],
-    "tools": [ [ [ "mold_plastic", -1 ] ], [ [ "surface_heat", 15, "LIST" ] ] ],
+    "using": [ [ "bearings", 6 ] ],
+    "tools": [ [ [ "mold_plastic", -1 ] ], [ [ "surface_heat", 15, "LIST" ] ], [ [ "cutting" ] ], [ [ "sewing" ] ] ],
     "components": [ [ [ "plastic_chunk", 15 ] ], [ [ "rag", 8 ] ], [ [ "scrap", 6 ] ] ]
   },
   {

From 49924f399aaaf4d42ef331bfe03755f77dbf43dd Mon Sep 17 00:00:00 2001
From: LyleSY <lyle.sollayates@Gmail.com>
Date: Fri, 8 May 2020 21:55:04 -0400
Subject: [PATCH 06/26] Add "qualities" to troubleshoot

Tools: cutting or tools: sewing does not work and kills game start.
---
 data/json/recipes/armor/feet.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/data/json/recipes/armor/feet.json b/data/json/recipes/armor/feet.json
index b1cffebe9222d..8e22fdddc19c5 100644
--- a/data/json/recipes/armor/feet.json
+++ b/data/json/recipes/armor/feet.json
@@ -567,7 +567,8 @@
     "time": "90 m",
     "book_learn": [ [ "textbook_tailor", 5 ], [ "tailor_portfolio", 5 ] ],
     "using": [ [ "bearings", 6 ] ],
-    "tools": [ [ [ "mold_plastic", -1 ] ], [ [ "surface_heat", 15, "LIST" ] ], [ [ "cutting" ] ], [ [ "sewing" ] ] ],
+    "qualities": [ { "id": "CUT", "level": 1 }, { "id": "SEW", "level": 1 } ],
+    "tools": [ [ [ "mold_plastic", -1 ] ], [ [ "surface_heat", 15, "LIST" ] ] ],
     "components": [ [ [ "plastic_chunk", 15 ] ], [ [ "rag", 8 ] ], [ [ "scrap", 6 ] ] ]
   },
   {

From 9e39eaa67b462f8bf73ef153874a456a0f9d12f9 Mon Sep 17 00:00:00 2001
From: LyleSY <lyle.sollayates@Gmail.com>
Date: Fri, 8 May 2020 22:00:22 -0400
Subject: [PATCH 07/26] More "qualities" troubleshooting

Complicated recipes are complicated.
---
 data/json/recipes/armor/feet.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/data/json/recipes/armor/feet.json b/data/json/recipes/armor/feet.json
index 8e22fdddc19c5..3dfd0d1173813 100644
--- a/data/json/recipes/armor/feet.json
+++ b/data/json/recipes/armor/feet.json
@@ -582,7 +582,8 @@
     "time": "60 m",
     "book_learn": [ [ "textbook_tailor", 5 ], [ "tailor_portfolio", 5 ] ],
     "using": [ [ "bearings", 8 ] ],
-    "tools": [ [ [ "mold_plastic", -1 ] ], [ [ "surface_heat", 15, "LIST" ] ], [ [ "hammering" ] ], [ [ "drilling" ] ] ],
+    "tools": [ [ [ "mold_plastic", -1 ] ], [ [ "surface_heat", 15, "LIST" ] ] ],
+    "qualities": [ { "id": "HAMMER", "level": 1 }, { "id": "DRILL", "level": 1 } ],
     "components": [ [ [ "plastic_chunk", 8 ] ], [ [ "boots", 1 ] ], [ [ "scrap", 16 ] ] ]
   }
 ]

From 05b2d8d15941a2e3dafa598267433c7f49cd3dd9 Mon Sep 17 00:00:00 2001
From: LyleSY <lyle.sollayates@Gmail.com>
Date: Fri, 8 May 2020 22:13:21 -0400
Subject: [PATCH 08/26] bearing spellcheck

plurals hate us
---
 data/json/recipes/armor/feet.json | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/data/json/recipes/armor/feet.json b/data/json/recipes/armor/feet.json
index 3dfd0d1173813..17e5a436b31cd 100644
--- a/data/json/recipes/armor/feet.json
+++ b/data/json/recipes/armor/feet.json
@@ -566,10 +566,10 @@
     "difficulty": 5,
     "time": "90 m",
     "book_learn": [ [ "textbook_tailor", 5 ], [ "tailor_portfolio", 5 ] ],
-    "using": [ [ "bearings", 6 ] ],
+    "using": [ [ "sewing_standard", 20 ] ],
     "qualities": [ { "id": "CUT", "level": 1 }, { "id": "SEW", "level": 1 } ],
     "tools": [ [ [ "mold_plastic", -1 ] ], [ [ "surface_heat", 15, "LIST" ] ] ],
-    "components": [ [ [ "plastic_chunk", 15 ] ], [ [ "rag", 8 ] ], [ [ "scrap", 6 ] ] ]
+    "components": [ [ [ "plastic_chunk", 15 ] ], [ [ "rag", 8 ] ], [ [ "scrap", 6 ] ], [ [ "bearing", 6 ] ] ]
   },
   {
     "result": "rollerskates",
@@ -581,9 +581,8 @@
     "difficulty": 4,
     "time": "60 m",
     "book_learn": [ [ "textbook_tailor", 5 ], [ "tailor_portfolio", 5 ] ],
-    "using": [ [ "bearings", 8 ] ],
     "tools": [ [ [ "mold_plastic", -1 ] ], [ [ "surface_heat", 15, "LIST" ] ] ],
     "qualities": [ { "id": "HAMMER", "level": 1 }, { "id": "DRILL", "level": 1 } ],
-    "components": [ [ [ "plastic_chunk", 8 ] ], [ [ "boots", 1 ] ], [ [ "scrap", 16 ] ] ]
+    "components": [ [ [ "plastic_chunk", 8 ] ], [ [ "boots", 1 ] ], [ [ "scrap", 16 ] ], [ [ "bearing", 8 ] ] ]
   }
 ]

From 13719f6fb3ec543fba6ed027333964ca02bde848 Mon Sep 17 00:00:00 2001
From: LyleSY <lyle.sollayates@Gmail.com>
Date: Fri, 8 May 2020 22:19:27 -0400
Subject: [PATCH 09/26] Remove duplicate cut and sew for blades

---
 data/json/recipes/armor/feet.json | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/data/json/recipes/armor/feet.json b/data/json/recipes/armor/feet.json
index 17e5a436b31cd..cc6cde599d613 100644
--- a/data/json/recipes/armor/feet.json
+++ b/data/json/recipes/armor/feet.json
@@ -1,3 +1,8 @@
+Cataclysm: Dark Days Ahead JSON Web Linting Tool
+This is a tool to help modders and editors of the open source game Cataclysm: Dark Days Ahead write JSON in the game's expected format.
+
+Paste some JSON into the field below and click "Lint" to run an autoformatter against it.
+
 [
   {
     "result": "bastsandals",
@@ -567,7 +572,6 @@
     "time": "90 m",
     "book_learn": [ [ "textbook_tailor", 5 ], [ "tailor_portfolio", 5 ] ],
     "using": [ [ "sewing_standard", 20 ] ],
-    "qualities": [ { "id": "CUT", "level": 1 }, { "id": "SEW", "level": 1 } ],
     "tools": [ [ [ "mold_plastic", -1 ] ], [ [ "surface_heat", 15, "LIST" ] ] ],
     "components": [ [ [ "plastic_chunk", 15 ] ], [ [ "rag", 8 ] ], [ [ "scrap", 6 ] ], [ [ "bearing", 6 ] ] ]
   },

From 82b58ecf27266b856ae4c3e082e822d04bc566c4 Mon Sep 17 00:00:00 2001
From: LyleSY <lyle.sollayates@Gmail.com>
Date: Fri, 8 May 2020 22:19:52 -0400
Subject: [PATCH 10/26] Remote linting spam

---
 data/json/recipes/armor/feet.json | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/data/json/recipes/armor/feet.json b/data/json/recipes/armor/feet.json
index cc6cde599d613..980d607c9b296 100644
--- a/data/json/recipes/armor/feet.json
+++ b/data/json/recipes/armor/feet.json
@@ -1,8 +1,3 @@
-Cataclysm: Dark Days Ahead JSON Web Linting Tool
-This is a tool to help modders and editors of the open source game Cataclysm: Dark Days Ahead write JSON in the game's expected format.
-
-Paste some JSON into the field below and click "Lint" to run an autoformatter against it.
-
 [
   {
     "result": "bastsandals",

From 809e38e90c980cf856d27a28ad7a4ff8cac19f85 Mon Sep 17 00:00:00 2001
From: LyleSY <lyle.sollayates@Gmail.com>
Date: Sat, 9 May 2020 09:50:19 -0400
Subject: [PATCH 11/26] Add wheel_skate

Based on real weight and stats of similar wheels
---
 data/json/items/vehicle/wheel.json | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/data/json/items/vehicle/wheel.json b/data/json/items/vehicle/wheel.json
index c6f2b617eb2f5..d746fba4581c1 100644
--- a/data/json/items/vehicle/wheel.json
+++ b/data/json/items/vehicle/wheel.json
@@ -289,6 +289,24 @@
     "diameter": 10,
     "width": 3
   },
+  {
+    "id": "wheel_skate",
+    "type": "WHEEL",
+    "category": "veh_parts",
+    "name": { "str": "skate wheel" },
+    "description": "A very small plastic wheel with a punk attitude. This wheel was made for skating.",
+    "weight": "200 g",
+    "volume": "200 ml",
+    "price": 1400,
+    "price_postapoc": 10,
+    "bashing": 1,
+    "to_hit": -2,
+    "material": [ "steel", "plastic" ],
+    "symbol": "]",
+    "color": "dark_gray",
+    "diameter": 1,
+    "width": 1
+  },
   {
     "id": "wheel_tricycle",
     "category": "veh_parts",

From 4e08e8f1f58b73fc2ddbe8a528a6839c69824a18 Mon Sep 17 00:00:00 2001
From: LyleSY <lyle.sollayates@Gmail.com>
Date: Sat, 9 May 2020 10:04:23 -0400
Subject: [PATCH 12/26] Skate recipes use welding and skate wheels

---
 data/json/recipes/armor/feet.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/data/json/recipes/armor/feet.json b/data/json/recipes/armor/feet.json
index 980d607c9b296..4b6fe1b572e06 100644
--- a/data/json/recipes/armor/feet.json
+++ b/data/json/recipes/armor/feet.json
@@ -566,9 +566,10 @@
     "difficulty": 5,
     "time": "90 m",
     "book_learn": [ [ "textbook_tailor", 5 ], [ "tailor_portfolio", 5 ] ],
-    "using": [ [ "sewing_standard", 20 ] ],
+    "using": [ [ "welding_standard", 6 ] ],
     "tools": [ [ [ "mold_plastic", -1 ] ], [ [ "surface_heat", 15, "LIST" ] ] ],
-    "components": [ [ [ "plastic_chunk", 15 ] ], [ [ "rag", 8 ] ], [ [ "scrap", 6 ] ], [ [ "bearing", 6 ] ] ]
+    "qualities": [ { "id": "HAMMER", "level": 1 }, { "id": "DRILL", "level": 1 } ],
+    "components": [ [ [ "wheel_skate, 6 ] ], [ [ "plastic_chunk", 8 ] ], [ [ "rag", 8 ] ], [ [ "scrap", 14 ] ], [ [ "bearing", 6 ] ] ]
   },
   {
     "result": "rollerskates",
@@ -576,12 +577,11 @@
     "category": "CC_ARMOR",
     "subcategory": "CSC_ARMOR_FEET",
     "skill_used": "fabrication",
-    "skills_required": [ "tailor", 1 ],
-    "difficulty": 4,
+    "difficulty": 5,
     "time": "60 m",
     "book_learn": [ [ "textbook_tailor", 5 ], [ "tailor_portfolio", 5 ] ],
-    "tools": [ [ [ "mold_plastic", -1 ] ], [ [ "surface_heat", 15, "LIST" ] ] ],
+    "using": [ [ "welding_standard", 6 ] ],
     "qualities": [ { "id": "HAMMER", "level": 1 }, { "id": "DRILL", "level": 1 } ],
-    "components": [ [ [ "plastic_chunk", 8 ] ], [ [ "boots", 1 ] ], [ [ "scrap", 16 ] ], [ [ "bearing", 8 ] ] ]
+    "components": [ [ [ "wheel_skate, 8 ] ], [ [ "boots", 1 ] ], [ [ "scrap", 16 ] ], [ [ "bearing", 8 ] ] ]
   }
 ]

From 3f8f0cd537b24ac455bf227bfd0f05d48ac94ba1 Mon Sep 17 00:00:00 2001
From: LyleSY <lyle.sollayates@Gmail.com>
Date: Sat, 9 May 2020 10:57:01 -0400
Subject: [PATCH 13/26] Skate recipe from fab books, frames

---
 data/json/recipes/armor/feet.json | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/data/json/recipes/armor/feet.json b/data/json/recipes/armor/feet.json
index 4b6fe1b572e06..0260cff9b37dd 100644
--- a/data/json/recipes/armor/feet.json
+++ b/data/json/recipes/armor/feet.json
@@ -565,11 +565,18 @@
     "skills_required": [ "tailor", 2 ],
     "difficulty": 5,
     "time": "90 m",
-    "book_learn": [ [ "textbook_tailor", 5 ], [ "tailor_portfolio", 5 ] ],
+    "book_learn": [ [ "textbook_tailor", 5 ], [ "textbook_fabrication", 5 ] ],
     "using": [ [ "welding_standard", 6 ] ],
     "tools": [ [ [ "mold_plastic", -1 ] ], [ [ "surface_heat", 15, "LIST" ] ] ],
-    "qualities": [ { "id": "HAMMER", "level": 1 }, { "id": "DRILL", "level": 1 } ],
-    "components": [ [ [ "wheel_skate, 6 ] ], [ [ "plastic_chunk", 8 ] ], [ [ "rag", 8 ] ], [ [ "scrap", 14 ] ], [ [ "bearing", 6 ] ] ]
+    "qualities": [ { "id": "HAMMER", "level": 1 }, { "id": "DRILL", "level": 1 }, { "id": "SAW_M", "level": 1 } ],
+    "components": [
+      [ [ "xlframe", 1 ] ],
+      [ [ "wheel_skate", 6 ] ],
+      [ [ "plastic_chunk", 8 ] ],
+      [ [ "rag", 8 ] ],
+      [ [ "scrap", 10 ] ],
+      [ [ "bearing", 6 ] ]
+    ]
   },
   {
     "result": "rollerskates",
@@ -579,9 +586,9 @@
     "skill_used": "fabrication",
     "difficulty": 5,
     "time": "60 m",
-    "book_learn": [ [ "textbook_tailor", 5 ], [ "tailor_portfolio", 5 ] ],
+    "book_learn": [ [ "textbook_tailor", 5 ], [ "textbook_fabrication", 5 ] ],
     "using": [ [ "welding_standard", 6 ] ],
-    "qualities": [ { "id": "HAMMER", "level": 1 }, { "id": "DRILL", "level": 1 } ],
-    "components": [ [ [ "wheel_skate, 8 ] ], [ [ "boots", 1 ] ], [ [ "scrap", 16 ] ], [ [ "bearing", 8 ] ] ]
+    "qualities": [ { "id": "HAMMER", "level": 1 }, { "id": "DRILL", "level": 1 }, { "id": "SAW_M", "level": 1 } ],
+    "components": [ [ [ "wheel_skate", 8 ] ], [ [ "boots", 1 ] ], [ [ "pipe", 1 ] ], [ [ "scrap", 12 ] ], [ [ "bearing", 8 ] ] ]
   }
 ]

From 97513cb5cffc28071325dda7cf52161b5ec79765 Mon Sep 17 00:00:00 2001
From: LyleSY <lyle.sollayates@Gmail.com>
Date: Sat, 9 May 2020 11:04:22 -0400
Subject: [PATCH 14/26] Add wheel_skate to sports item group

---
 data/json/itemgroups/activities_hobbies.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/data/json/itemgroups/activities_hobbies.json b/data/json/itemgroups/activities_hobbies.json
index 7a015630e9f62..85ef1f8350ce4 100644
--- a/data/json/itemgroups/activities_hobbies.json
+++ b/data/json/itemgroups/activities_hobbies.json
@@ -85,6 +85,7 @@
       [ "knee_pads", 40 ],
       [ "roller_blades", 20 ],
       [ "rollerskates", 10 ],
+      [ "wheel_skate", 50 ],
       [ "manual_throw", 12 ],
       {
         "item": "protein_powder",

From d1e0bb19f5a34bab130f34cd65abe266ca99dc3a Mon Sep 17 00:00:00 2001
From: LyleSY <lyle.sollayates@Gmail.com>
Date: Sat, 9 May 2020 11:43:14 -0400
Subject: [PATCH 15/26] Create uncraft boots for skates

---
 data/json/uncraft/armor/boots | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 data/json/uncraft/armor/boots

diff --git a/data/json/uncraft/armor/boots b/data/json/uncraft/armor/boots
new file mode 100644
index 0000000000000..233c30252f555
--- /dev/null
+++ b/data/json/uncraft/armor/boots
@@ -0,0 +1,27 @@
+[
+  {
+    "result": "roller_blades",
+    "type": "uncraft",
+    "skill_used": "fabrication",
+    "difficulty": 2,
+    "time": "600 s",
+    "qualities": [ { "id": "PRYING", "level": 1 } ],
+    "components": [
+      [ [ "material_aluminium_ingot", 10 ] ],
+      [ [ "wheel_skate", 6 ] ],
+      [ [ "rag", 6 ] ],
+      [ [ "plastic_chunk", 6 ] ],
+      [ [ "scrap", 8 ] ],
+      [ [ "bearing", 6 ] ]
+    ]
+  },
+  {
+    "result": "roller_skates",
+    "type": "uncraft",
+    "skill_used": "fabrication",
+    "difficulty": 2,
+    "time": "600 s",
+    "qualities": [ { "id": "PRYING", "level": 1 } ],
+    "components": [ [ [ "wheel_skate", 8 ] ], [ [ "leather", 6 ] ], [ [ "scrap", 20 ] ], [ [ "bearing", 8 ] ] ]
+  }
+]

From 71be1278ca452f59faa8d0f9f36bc20da4ce91da Mon Sep 17 00:00:00 2001
From: LyleSY <lyle.sollayates@Gmail.com>
Date: Sat, 9 May 2020 11:49:31 -0400
Subject: [PATCH 16/26] file type check json

---
 data/json/uncraft/armor/{boots => boots.json} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename data/json/uncraft/armor/{boots => boots.json} (100%)

diff --git a/data/json/uncraft/armor/boots b/data/json/uncraft/armor/boots.json
similarity index 100%
rename from data/json/uncraft/armor/boots
rename to data/json/uncraft/armor/boots.json

From 77fa1adf64a177879b2f68a1e1b625dc2d35615b Mon Sep 17 00:00:00 2001
From: LyleSY <lyle.sollayates@Gmail.com>
Date: Sat, 9 May 2020 15:33:55 -0400
Subject: [PATCH 17/26] Add space in wheel_skate desc

---
 data/json/items/vehicle/wheel.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/json/items/vehicle/wheel.json b/data/json/items/vehicle/wheel.json
index d746fba4581c1..789dd8441052e 100644
--- a/data/json/items/vehicle/wheel.json
+++ b/data/json/items/vehicle/wheel.json
@@ -294,7 +294,7 @@
     "type": "WHEEL",
     "category": "veh_parts",
     "name": { "str": "skate wheel" },
-    "description": "A very small plastic wheel with a punk attitude. This wheel was made for skating.",
+    "description": "A very small plastic wheel with a punk attitude.  This wheel was made for skating.",
     "weight": "200 g",
     "volume": "200 ml",
     "price": 1400,

From e12695021df7ab00fcaf90b7877aa38e3c83d511 Mon Sep 17 00:00:00 2001
From: LyleSY <lyle.sollayates@Gmail.com>
Date: Sat, 9 May 2020 16:57:37 -0400
Subject: [PATCH 18/26] Diameter fix

---
 data/json/items/vehicle/wheel.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/json/items/vehicle/wheel.json b/data/json/items/vehicle/wheel.json
index 789dd8441052e..2abfedeef2956 100644
--- a/data/json/items/vehicle/wheel.json
+++ b/data/json/items/vehicle/wheel.json
@@ -304,7 +304,7 @@
     "material": [ "steel", "plastic" ],
     "symbol": "]",
     "color": "dark_gray",
-    "diameter": 1,
+    "diameter": 3,
     "width": 1
   },
   {

From a70aedea661234c381940024c96d87ffe964a606 Mon Sep 17 00:00:00 2001
From: LyleSY <lyle.sollayates@Gmail.com>
Date: Sat, 9 May 2020 18:02:06 -0400
Subject: [PATCH 19/26] pry spellcheck

---
 data/json/uncraft/armor/boots.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/data/json/uncraft/armor/boots.json b/data/json/uncraft/armor/boots.json
index 233c30252f555..70a3a8289b4c4 100644
--- a/data/json/uncraft/armor/boots.json
+++ b/data/json/uncraft/armor/boots.json
@@ -5,7 +5,7 @@
     "skill_used": "fabrication",
     "difficulty": 2,
     "time": "600 s",
-    "qualities": [ { "id": "PRYING", "level": 1 } ],
+    "qualities": [ { "id": "PRY", "level": 1 } ],
     "components": [
       [ [ "material_aluminium_ingot", 10 ] ],
       [ [ "wheel_skate", 6 ] ],
@@ -21,7 +21,7 @@
     "skill_used": "fabrication",
     "difficulty": 2,
     "time": "600 s",
-    "qualities": [ { "id": "PRYING", "level": 1 } ],
+    "qualities": [ { "id": "PRY", "level": 1 } ],
     "components": [ [ [ "wheel_skate", 8 ] ], [ [ "leather", 6 ] ], [ [ "scrap", 20 ] ], [ [ "bearing", 8 ] ] ]
   }
 ]

From 79be93c2be6744e4621a2d4c5740dd76b916c032 Mon Sep 17 00:00:00 2001
From: LyleSY <lyle.sollayates@Gmail.com>
Date: Sat, 9 May 2020 22:14:30 -0400
Subject: [PATCH 20/26] scrap_leather spellcheck

---
 data/json/uncraft/armor/boots.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/json/uncraft/armor/boots.json b/data/json/uncraft/armor/boots.json
index 70a3a8289b4c4..070b4429d3445 100644
--- a/data/json/uncraft/armor/boots.json
+++ b/data/json/uncraft/armor/boots.json
@@ -22,6 +22,6 @@
     "difficulty": 2,
     "time": "600 s",
     "qualities": [ { "id": "PRY", "level": 1 } ],
-    "components": [ [ [ "wheel_skate", 8 ] ], [ [ "leather", 6 ] ], [ [ "scrap", 20 ] ], [ [ "bearing", 8 ] ] ]
+    "components": [ [ [ "wheel_skate", 8 ] ], [ [ "scrap_leather", 6 ] ], [ [ "scrap", 20 ] ], [ [ "bearing", 8 ] ] ]
   }
 ]

From 2dbdbc0c5d5b50dd7707b7db22d3bb0783c61458 Mon Sep 17 00:00:00 2001
From: LyleSY <lyle.sollayates@Gmail.com>
Date: Sun, 10 May 2020 00:12:38 -0400
Subject: [PATCH 21/26] roller_skates spellcheck

---
 data/json/recipes/armor/feet.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/json/recipes/armor/feet.json b/data/json/recipes/armor/feet.json
index 0260cff9b37dd..0b8a13a9cd66f 100644
--- a/data/json/recipes/armor/feet.json
+++ b/data/json/recipes/armor/feet.json
@@ -579,7 +579,7 @@
     ]
   },
   {
-    "result": "rollerskates",
+    "result": "roller_skates",
     "type": "recipe",
     "category": "CC_ARMOR",
     "subcategory": "CSC_ARMOR_FEET",

From e217c904de642da75b42bf473e2d843c15f8b584 Mon Sep 17 00:00:00 2001
From: LyleSY <lyle.sollayates@Gmail.com>
Date: Sun, 10 May 2020 09:11:09 -0400
Subject: [PATCH 22/26] rollerskates revert

---
 data/json/recipes/armor/feet.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/json/recipes/armor/feet.json b/data/json/recipes/armor/feet.json
index 0b8a13a9cd66f..0260cff9b37dd 100644
--- a/data/json/recipes/armor/feet.json
+++ b/data/json/recipes/armor/feet.json
@@ -579,7 +579,7 @@
     ]
   },
   {
-    "result": "roller_skates",
+    "result": "rollerskates",
     "type": "recipe",
     "category": "CC_ARMOR",
     "subcategory": "CSC_ARMOR_FEET",

From e2907055940eac9603c6730647bc480c4318079e Mon Sep 17 00:00:00 2001
From: LyleSY <lyle.sollayates@Gmail.com>
Date: Sun, 10 May 2020 09:11:30 -0400
Subject: [PATCH 23/26] rollerskates spellcheck

---
 data/json/uncraft/armor/boots.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/json/uncraft/armor/boots.json b/data/json/uncraft/armor/boots.json
index 070b4429d3445..286bec787941c 100644
--- a/data/json/uncraft/armor/boots.json
+++ b/data/json/uncraft/armor/boots.json
@@ -16,7 +16,7 @@
     ]
   },
   {
-    "result": "roller_skates",
+    "result": "rollerskates",
     "type": "uncraft",
     "skill_used": "fabrication",
     "difficulty": 2,

From 976ef25722ed589743aa954266cb4d2c162ae138 Mon Sep 17 00:00:00 2001
From: LyleSY <lyle.sollayates@Gmail.com>
Date: Mon, 11 May 2020 12:03:59 -0400
Subject: [PATCH 24/26] Smith/swage convert, no aluminum

Standardized skate recipes to use smithing and swaging instead of welding, take longer, and only use pipe and scrap instead of aluminum.
---
 data/json/recipes/armor/feet.json | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/data/json/recipes/armor/feet.json b/data/json/recipes/armor/feet.json
index 0260cff9b37dd..f715c2c8ea8ae 100644
--- a/data/json/recipes/armor/feet.json
+++ b/data/json/recipes/armor/feet.json
@@ -564,13 +564,12 @@
     "skill_used": "fabrication",
     "skills_required": [ "tailor", 2 ],
     "difficulty": 5,
-    "time": "90 m",
+    "time": "3 h",
     "book_learn": [ [ "textbook_tailor", 5 ], [ "textbook_fabrication", 5 ] ],
-    "using": [ [ "welding_standard", 6 ] ],
-    "tools": [ [ [ "mold_plastic", -1 ] ], [ [ "surface_heat", 15, "LIST" ] ] ],
-    "qualities": [ { "id": "HAMMER", "level": 1 }, { "id": "DRILL", "level": 1 }, { "id": "SAW_M", "level": 1 } ],
+    "using": [ [ "blacksmithing_standard", 6 ] ],
+    "tools": [ [ [ "mold_plastic", -1 ] ], [ [ "surface_heat", 15, "LIST" ] ], [ [ "swage", -1 ] ] ],
     "components": [
-      [ [ "xlframe", 1 ] ],
+      [ [ "pipe", 1 ] ],
       [ [ "wheel_skate", 6 ] ],
       [ [ "plastic_chunk", 8 ] ],
       [ [ "rag", 8 ] ],
@@ -585,10 +584,10 @@
     "subcategory": "CSC_ARMOR_FEET",
     "skill_used": "fabrication",
     "difficulty": 5,
-    "time": "60 m",
+    "time": "3 h",
     "book_learn": [ [ "textbook_tailor", 5 ], [ "textbook_fabrication", 5 ] ],
-    "using": [ [ "welding_standard", 6 ] ],
-    "qualities": [ { "id": "HAMMER", "level": 1 }, { "id": "DRILL", "level": 1 }, { "id": "SAW_M", "level": 1 } ],
+    "using": [ [ "blacksmithing_standard", 6 ] ],
+    "tools": [ [ [ "swage", -1 ] ] ],
     "components": [ [ [ "wheel_skate", 8 ] ], [ [ "boots", 1 ] ], [ [ "pipe", 1 ] ], [ [ "scrap", 12 ] ], [ [ "bearing", 8 ] ] ]
   }
 ]

From a12cd4ef28b62a7e378931441597de25ac5adcb6 Mon Sep 17 00:00:00 2001
From: LyleSY <lyle.sollayates@Gmail.com>
Date: Mon, 11 May 2020 12:06:01 -0400
Subject: [PATCH 25/26] Remove aluminium

---
 data/json/uncraft/armor/boots.json | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/data/json/uncraft/armor/boots.json b/data/json/uncraft/armor/boots.json
index 286bec787941c..114fa2e521477 100644
--- a/data/json/uncraft/armor/boots.json
+++ b/data/json/uncraft/armor/boots.json
@@ -7,11 +7,10 @@
     "time": "600 s",
     "qualities": [ { "id": "PRY", "level": 1 } ],
     "components": [
-      [ [ "material_aluminium_ingot", 10 ] ],
       [ [ "wheel_skate", 6 ] ],
       [ [ "rag", 6 ] ],
       [ [ "plastic_chunk", 6 ] ],
-      [ [ "scrap", 8 ] ],
+      [ [ "scrap", 18 ] ],
       [ [ "bearing", 6 ] ]
     ]
   },

From e68ec2c0be712a6e8936a9affda763f739a053c3 Mon Sep 17 00:00:00 2001
From: LyleSY <lyle.sollayates@Gmail.com>
Date: Mon, 11 May 2020 12:21:25 -0400
Subject: [PATCH 26/26] lint boots uncraft

---
 data/json/uncraft/armor/boots.json | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/data/json/uncraft/armor/boots.json b/data/json/uncraft/armor/boots.json
index 114fa2e521477..55a8efa39e7aa 100644
--- a/data/json/uncraft/armor/boots.json
+++ b/data/json/uncraft/armor/boots.json
@@ -6,13 +6,7 @@
     "difficulty": 2,
     "time": "600 s",
     "qualities": [ { "id": "PRY", "level": 1 } ],
-    "components": [
-      [ [ "wheel_skate", 6 ] ],
-      [ [ "rag", 6 ] ],
-      [ [ "plastic_chunk", 6 ] ],
-      [ [ "scrap", 18 ] ],
-      [ [ "bearing", 6 ] ]
-    ]
+    "components": [ [ [ "wheel_skate", 6 ] ], [ [ "rag", 6 ] ], [ [ "plastic_chunk", 6 ] ], [ [ "scrap", 18 ] ], [ [ "bearing", 6 ] ] ]
   },
   {
     "result": "rollerskates",