Merge remote-tracking branch 'origin/0.D-branch'

* origin/0.D-branch: Rebmove bone helmet Remove bone suit Remove bone gloves Remove bone boots Removing bone armor recipes.
CleverRaven · Feb 16, 2019 · 958e17f · 958e17f
2 parents a123eea + 2365f4b
commit 958e17f
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 76 deletions.
diff --git a/data/json/recipes/armor/arms.json b/data/json/recipes/armor/arms.json
@@ -28,21 +28,6 @@
     "using": [ [ "sewing_standard", 10 ] ],
     "components": [ [ [ "rag", 4 ] ] ]
   },
-  {
-    "result": "armguard_bone",
-    "type": "recipe",
-    "category": "CC_ARMOR",
-    "subcategory": "CSC_ARMOR_ARMS",
-    "skill_used": "tailor",
-    "difficulty": 4,
-    "time": 30000,
-    "autolearn": true,
-    "using": [ [ "sewing_standard", 11 ] ],
-    "components": [
-      [ [ "bone", 10 ], [ "bone_human", 10 ], [ "bone_tainted", 20 ] ],
-      [ [ "leather", 6 ], [ "tanned_hide", 1 ], [ "fur", 6 ], [ "tanned_pelt", 1 ] ]
-    ]
-  },
   {
     "result": "armguard_chitin",
     "type": "recipe",

diff --git a/data/json/recipes/armor/feet.json b/data/json/recipes/armor/feet.json
@@ -23,22 +23,6 @@
     "using": [ [ "sewing_standard", 10 ] ],
     "components": [ [ [ "leather", 10 ], [ "tanned_hide", 2 ] ] ]
   },
-  {
-    "result": "boots_bone",
-    "type": "recipe",
-    "category": "CC_ARMOR",
-    "subcategory": "CSC_ARMOR_FEET",
-    "skill_used": "tailor",
-    "difficulty": 3,
-    "time": 40000,
-    "autolearn": true,
-    "book_learn": [ [ "manual_tailor", 2 ], [ "textbook_tailor", 2 ] ],
-    "using": [ [ "sewing_standard", 18 ] ],
-    "components": [
-      [ [ "bone", 18 ], [ "bone_human", 18 ], [ "bone_tainted", 36 ] ],
-      [ [ "leather", 6 ], [ "fur", 6 ] ]
-    ]
-  },
   {
     "result": "boots_chitin",
     "type": "recipe",

diff --git a/data/json/recipes/armor/hands.json b/data/json/recipes/armor/hands.json
@@ -1,20 +1,4 @@
 [
-  {
-    "result": "gauntlets_bone",
-    "type": "recipe",
-    "category": "CC_ARMOR",
-    "subcategory": "CSC_ARMOR_HANDS",
-    "skill_used": "tailor",
-    "difficulty": 3,
-    "time": 30000,
-    "autolearn": true,
-    "book_learn": [ [ "manual_tailor", 2 ], [ "textbook_tailor", 2 ] ],
-    "using": [ [ "sewing_standard", 12 ], [ "cordage", 1 ] ],
-    "components": [
-      [ [ "bone", 12 ], [ "bone_human", 12 ], [ "bone_tainted", 24 ] ],
-      [ [ "leather", 2 ] ]
-    ]
-  },
   {
     "result": "gauntlets_chitin",
     "type": "recipe",

diff --git a/data/json/recipes/armor/head.json b/data/json/recipes/armor/head.json
@@ -364,19 +364,6 @@
     ],
     "components": [ [ [ "fur", 4 ], [ "leather", 4 ] ] ]
   },
-  {
-    "result": "helmet_bone",
-    "type": "recipe",
-    "category": "CC_ARMOR",
-    "subcategory": "CSC_ARMOR_HEAD",
-    "skill_used": "tailor",
-    "difficulty": 5,
-    "time": 60000,
-    "autolearn": true,
-    "book_learn": [ [ "textbook_tailor", 5 ], [ "tailor_portfolio", 5 ] ],
-    "qualities": [ { "id": "CUT", "level": 1 } ],
-    "components": [ [ [ "bone", 24 ], [ "bone_human", 24 ], [ "bone_tainted", 48 ] ] ]
-  },
   {
     "result": "helmet_chitin",
     "type": "recipe",

diff --git a/data/json/recipes/armor/suit.json b/data/json/recipes/armor/suit.json
@@ -58,22 +58,6 @@
       [ [ "armguard_larmor", 1 ] ]
     ]
   },
-  {
-    "result": "armor_bone",
-    "type": "recipe",
-    "category": "CC_ARMOR",
-    "subcategory": "CSC_ARMOR_SUIT",
-    "skill_used": "tailor",
-    "difficulty": 6,
-    "time": 30000,
-    "autolearn": true,
-    "book_learn": [ [ "textbook_tailor", 4 ], [ "tailor_portfolio", 5 ] ],
-    "using": [ [ "sewing_standard", 43 ] ],
-    "components": [
-      [ [ "bone", 40 ], [ "bone_human", 40 ], [ "bone_tainted", 80 ] ],
-      [ [ "leather", 12 ], [ "tanned_hide", 2 ], [ "fur", 12 ], [ "tanned_pelt", 2 ] ]
-    ]
-  },
   {
     "result": "armor_chitin",
     "type": "recipe",