feat(content): reimplement bone armor using heavy bones, additional p…

…ost-apoc monster hunter profession, update chitin armor recipes for consistency (#5646) * feat(content): reimplement bone armor using heavy bones, related adjustments * Update external_tileset.md * style(autofix.ci): automated formatting * And a thing --------- Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
cataclysmbnteam · Nov 2, 2024 · bea1a3b · bea1a3b
1 parent 51a76fa
commit bea1a3b
Show file tree

Hide file tree

Showing 20 changed files with 201 additions and 70 deletions.
diff --git a/data/json/external_tileset/External_Tileset_DP_Normal.json b/data/json/external_tileset/External_Tileset_DP_Normal.json
@@ -152,7 +152,10 @@
               { "weight": 10, "sprite": 135 }
             ],
             "animated": true
-          }
+          },
+          { "id": "overlay_worn_cuirass_bone", "fg": 136 },
+          { "id": [ "greaves_bone", "overlay_wielded_greaves_bone" ], "fg": 137 },
+          { "id": "overlay_worn_greaves_bone", "fg": 138 }
         ],
         "sprite_width": 32,
         "sprite_height": 32

diff --git a/data/json/external_tileset/External_Tileset_DP_Normal.png b/data/json/external_tileset/External_Tileset_DP_Normal.png
diff --git a/data/json/items/armor/arms_armor.json b/data/json/items/armor/arms_armor.json
@@ -297,6 +297,21 @@
     "valid_mods": [ "steel_padded", "alloy_padded", "resized_large" ],
     "flags": [ "STURDY", "BELTED", "WATER_FRIENDLY" ]
   },
+  {
+    "id": "armguard_bone",
+    "copy-from": "vambrace_larmor",
+    "type": "ARMOR",
+    "name": { "str": "pair of bone vambraces", "str_pl": "pairs of bone vambraces" },
+    "description": "Arm protection made from strips of carved bone, laced together as splint armor.  Tough but stiff, and a bit brittle.",
+    "material": [ "bone_heavy" ],
+    "color": "white",
+    "encumbrance": 12,
+    "warmth": 12,
+    "material_thickness": 4,
+    "valid_mods": [  ],
+    "proportional": { "weight": 1.2 },
+    "delete": { "flags": [ "WATER_FRIENDLY" ] }
+  },
   {
     "id": "carbon_armguard",
     "type": "ARMOR",

diff --git a/data/json/items/armor/helmets.json b/data/json/items/armor/helmets.json
@@ -763,6 +763,20 @@
     "techniques": [ "WBLOCK_1" ],
     "flags": [ "OVERSIZE" ]
   },
+  {
+    "id": "helmet_bone",
+    "copy-from": "helmet_larmor",
+    "type": "ARMOR",
+    "name": { "str": "bone helmet" },
+    "description": "A helmet made from carved bone, laced together into a pattern resembling a Mycenaean boar's tusk helmet.  Tough but stiff, and a bit brittle.",
+    "material": [ "bone_heavy" ],
+    "color": "white",
+    "encumbrance": 12,
+    "warmth": 12,
+    "environmental_protection": 1,
+    "proportional": { "weight": 1.2 },
+    "delete": { "flags": [ "VARSIZE", "WATER_FRIENDLY" ] }
+  },
   {
     "id": "carbon_helmet",
     "type": "ARMOR",

diff --git a/data/json/items/armor/legs_armor.json b/data/json/items/armor/legs_armor.json
@@ -387,6 +387,20 @@
     "price_postapoc": "175 cent",
     "encumbrance": 6
   },
+  {
+    "id": "greaves_bone",
+    "copy-from": "legguard_bronze",
+    "type": "ARMOR",
+    "name": { "str": "pair of bone greaves", "str_pl": "pairs of bone greaves" },
+    "description": "Leg guards made from strips of carved bone, laced together as splint armor.  Tough but stiff, and a bit brittle.",
+    "material": [ "bone_heavy" ],
+    "color": "white",
+    "encumbrance": 12,
+    "warmth": 12,
+    "environmental_protection": 1,
+    "//": "Lower here since the closet counterpart is heavier",
+    "proportional": { "weight": 0.8 }
+  },
   {
     "id": "carbon_legguard",
     "type": "ARMOR",

diff --git a/data/json/items/armor/torso_armor.json b/data/json/items/armor/torso_armor.json
@@ -431,6 +431,23 @@
     "environmental_protection": 1,
     "flags": [ "VARSIZE", "POCKETS", "OUTER" ]
   },
+  {
+    "id": "cuirass_bone",
+    "copy-from": "armor_lamellar",
+    "looks_like": "armor_bone",
+    "type": "ARMOR",
+    "name": { "str": "bone cuirass", "str_pl": "bone cuirasses" },
+    "description": "A cuirass made from large pieces of carved bone, laced together like lamellar armor.  Tough but stiff, and a bit brittle.",
+    "material": [ "bone_heavy" ],
+    "color": "white",
+    "encumbrance": 12,
+    "warmth": 12,
+    "environmental_protection": 1,
+    "valid_mods": [  ],
+    "proportional": { "weight": 1.2 },
+    "extend": { "flags": [ "OUTER" ] },
+    "delete": { "flags": [ "VARSIZE" ] }
+  },
   {
     "id": "carbon_chestguard",
     "type": "ARMOR",

diff --git a/data/json/materials.json b/data/json/materials.json
@@ -1910,8 +1910,8 @@
     "edible": true,
     "rotting": true,
     "reinforces": true,
-    "bash_resist": 4,
-    "cut_resist": 6,
+    "bash_resist": 3,
+    "cut_resist": 5,
     "bullet_resist": 4,
     "acid_resist": 7,
     "fire_resist": 1,

diff --git a/data/json/obsoletion/items.json b/data/json/obsoletion/items.json
@@ -435,29 +435,9 @@
     "ammo_effects": [ "LASER", "INCENDIARY" ],
     "flags": [ "NO_UNLOAD" ]
   },
-  {
-    "id": "armguard_bone",
-    "type": "ARMOR",
-    "category": "armor",
-    "name": { "str": "pair of bone arm guards", "str_pl": "pairs of bone arm guards" },
-    "description": "A pair of arm guards made from leather, reinforced with bone.  Light and strong.",
-    "weight": "645 g",
-    "volume": "3 L",
-    "price": "200 USD",
-    "to_hit": 1,
-    "material": [ "bone", "leather" ],
-    "symbol": "[",
-    "color": "white",
-    "covers": [ "arms" ],
-    "coverage": 95,
-    "encumbrance": 22,
-    "warmth": 20,
-    "material_thickness": 4,
-    "environmental_protection": 1,
-    "flags": [ "STURDY", "BELTED", "BLOCK_WHILE_WORN", "WATER_FRIENDLY" ]
-  },
   {
     "id": "armor_bone",
+    "//": "Bone armguards and helm have been fully de-obsoleted, the remaining stuff here has been replaced with cuirass and greaves.",
     "type": "ARMOR",
     "category": "armor",
     "name": { "str": "bone body armor" },
@@ -499,28 +479,6 @@
     "environmental_protection": 4,
     "flags": [ "STURDY" ]
   },
-  {
-    "id": "helmet_bone",
-    "type": "ARMOR",
-    "category": "armor",
-    "name": { "str": "bone armor helmet" },
-    "description": "A grotesque, horned helmet carved from bone.  Covers the entire head; very light and strong.",
-    "weight": "1621 g",
-    "volume": "4250 ml",
-    "price": "420 USD",
-    "to_hit": -2,
-    "bashing": 2,
-    "material": [ "bone" ],
-    "symbol": "[",
-    "color": "white",
-    "covers": [ "head", "eyes", "mouth" ],
-    "coverage": 100,
-    "encumbrance": 25,
-    "warmth": 10,
-    "material_thickness": 5,
-    "environmental_protection": 3,
-    "flags": [ "VARSIZE", "WATERPROOF", "STURDY" ]
-  },
   {
     "id": "matchbomb",
     "type": "TOOL",

diff --git a/data/json/obsoletion/recipes.json b/data/json/obsoletion/recipes.json
@@ -1143,11 +1143,6 @@
     "result": "heavy_snare_kit",
     "obsolete": true
   },
-  {
-    "type": "recipe",
-    "result": "helmet_bone",
-    "obsolete": true
-  },
   {
     "type": "recipe",
     "result": "helmet_netting",

diff --git a/data/json/professions.json b/data/json/professions.json
@@ -3967,6 +3967,44 @@
     },
     "flags": [ "SCEN_ONLY" ]
   },
+  {
+    "type": "profession",
+    "id": "monster_slayer",
+    "name": "Monster Slayer",
+    "description": "With the fall of civilization, you took to living off the land and honed your skills fending off undead and worse.  You wear the fruits of your labor proudly, bearing weapons and armor made from the bones of great beasts.",
+    "points": 6,
+    "skills": [
+      { "level": 5, "name": "tailor" },
+      { "level": 5, "name": "fabrication" },
+      { "level": 3, "name": "survival" },
+      { "level": 3, "name": "melee" },
+      { "level": 2, "name": "bashing" },
+      { "level": 1, "name": "cutting" },
+      { "level": 2, "name": "dodge" },
+      { "level": 3, "name": "cooking" }
+    ],
+    "items": {
+      "both": {
+        "items": [
+          "greaves_bone",
+          "armguard_bone",
+          "cuirass_bone",
+          "backpack_leather",
+          "footrags_fur",
+          "gloves_wraps_fur",
+          "helmet_bone",
+          "clay_pot",
+          "waterskin",
+          "needle_bone",
+          "fire_drill"
+        ],
+        "entries": [ { "item": "sword_bone", "container-item": "scabbard" }, { "item": "mace_bone", "custom-flags": [ "auto_wield" ] } ]
+      },
+      "male": [ "chestwrap_fur", "loincloth_fur" ],
+      "female": [ "bikini_top_fur", "hot_pants_fur" ]
+    },
+    "flags": [ "SCEN_ONLY" ]
+  },
   {
     "type": "profession",
     "id": "mall_cop",

diff --git a/data/json/recipes/armor/arms.json b/data/json/recipes/armor/arms.json
@@ -34,7 +34,8 @@
     "time": "30 m",
     "autolearn": true,
     "book_learn": [ [ "textbook_tailor", 3 ], [ "tailor_portfolio", 3 ] ],
-    "components": [ [ [ "string_36", 1 ], [ "string_6", 4 ] ], [ [ "chitin_piece", 4 ] ], [ [ "fabric_hides_proper", 4, "LIST" ] ] ]
+    "using": [ [ "sewing_standard", 16 ] ],
+    "components": [ [ [ "chitin_piece", 8 ] ], [ [ "fabric_hides_proper", 8, "LIST" ] ] ]
   },
   {
     "result": "armguard_acidchitin",
@@ -45,9 +46,9 @@
     "difficulty": 5,
     "time": "30 m",
     "autolearn": true,
-    "book_learn": [ [ "textbook_tailor", 3 ], [ "tailor_portfolio", 3 ] ],
+    "book_learn": [ [ "textbook_tailor", 4 ], [ "tailor_portfolio", 4 ] ],
     "using": [ [ "sewing_standard", 16 ] ],
-    "components": [ [ [ "acidchitin_piece", 4 ] ], [ [ "fabric_hides_proper", 4, "LIST" ] ] ]
+    "components": [ [ [ "acidchitin_piece", 8 ] ], [ [ "fabric_hides_proper", 8, "LIST" ] ] ]
   },
   {
     "result": "armguard_hard",
@@ -255,5 +256,22 @@
     "book_learn": [ [ "textbook_tailor", 3 ], [ "tailor_portfolio", 3 ] ],
     "using": [ [ "sewing_standard", 16 ] ],
     "components": [ [ [ "scute_piece", 6 ] ], [ [ "fabric_hides_proper", 6, "LIST" ] ] ]
+  },
+  {
+    "result": "armguard_bone",
+    "type": "recipe",
+    "category": "CC_ARMOR",
+    "subcategory": "CSC_ARMOR_ARMS",
+    "skill_used": "tailor",
+    "difficulty": 4,
+    "time": "1 h",
+    "autolearn": true,
+    "book_learn": [ [ "textbook_tailor", 3 ], [ "tailor_portfolio", 3 ] ],
+    "using": [ [ "sewing_standard", 6 ] ],
+    "components": [
+      [ [ "bone_heavy", 6 ] ],
+      [ [ "cordage", 2, "LIST" ] ],
+      [ [ "fabric_standard", 3, "LIST" ], [ "fabric_hides_any", 3, "LIST" ] ]
+    ]
   }
 ]
diff --git a/data/json/recipes/armor/feet.json b/data/json/recipes/armor/feet.json
@@ -34,7 +34,7 @@
     "time": "40 m",
     "autolearn": true,
     "book_learn": [ [ "textbook_tailor", 3 ], [ "tailor_portfolio", 3 ] ],
-    "using": [ [ "cordage", 1 ] ],
+    "using": [ [ "sewing_standard", 64 ] ],
     "components": [ [ [ "chitin_piece", 16 ] ], [ [ "fabric_hides_proper", 16, "LIST" ] ] ]
   },
   {
@@ -46,7 +46,7 @@
     "difficulty": 5,
     "time": "1 h 20 m",
     "autolearn": true,
-    "book_learn": [ [ "textbook_tailor", 3 ], [ "tailor_portfolio", 3 ] ],
+    "book_learn": [ [ "textbook_tailor", 4 ], [ "tailor_portfolio", 4 ] ],
     "using": [ [ "sewing_standard", 64 ] ],
     "components": [ [ [ "acidchitin_piece", 16 ] ], [ [ "fabric_hides_proper", 16, "LIST" ] ] ]
   },

diff --git a/data/json/recipes/armor/hands.json b/data/json/recipes/armor/hands.json
@@ -9,7 +9,8 @@
     "time": "30 m",
     "autolearn": true,
     "book_learn": [ [ "textbook_tailor", 3 ], [ "tailor_portfolio", 3 ] ],
-    "components": [ [ [ "cordage_superior", 1, "LIST" ] ], [ [ "chitin_piece", 3 ] ], [ [ "fabric_hides_proper", 3, "LIST" ] ] ]
+    "using": [ [ "sewing_standard", 12 ] ],
+    "components": [ [ [ "chitin_piece", 3 ] ], [ [ "fabric_hides_proper", 3, "LIST" ] ] ]
   },
   {
     "result": "gauntlets_acidchitin",
@@ -20,7 +21,7 @@
     "difficulty": 5,
     "time": "1 h",
     "autolearn": true,
-    "book_learn": [ [ "textbook_tailor", 3 ], [ "tailor_portfolio", 3 ] ],
+    "book_learn": [ [ "textbook_tailor", 4 ], [ "tailor_portfolio", 4 ] ],
     "using": [ [ "sewing_standard", 12 ] ],
     "components": [ [ [ "acidchitin_piece", 3 ] ], [ [ "fabric_hides_proper", 3, "LIST" ] ] ]
   },

diff --git a/data/json/recipes/armor/head.json b/data/json/recipes/armor/head.json
@@ -464,7 +464,8 @@
     "time": "1 h",
     "autolearn": true,
     "book_learn": [ [ "textbook_tailor", 3 ], [ "tailor_portfolio", 3 ] ],
-    "components": [ [ [ "cordage_superior", 1, "LIST" ] ], [ [ "chitin_piece", 6 ] ], [ [ "fabric_hides_proper", 6, "LIST" ] ] ]
+    "using": [ [ "sewing_standard", 24 ] ],
+    "components": [ [ [ "chitin_piece", 6 ] ], [ [ "fabric_hides_proper", 6, "LIST" ] ] ]
   },
   {
     "result": "helmet_acidchitin",
@@ -475,7 +476,7 @@
     "difficulty": 5,
     "time": "2 h",
     "autolearn": true,
-    "book_learn": [ [ "textbook_tailor", 3 ], [ "tailor_portfolio", 3 ] ],
+    "book_learn": [ [ "textbook_tailor", 4 ], [ "tailor_portfolio", 4 ] ],
     "using": [ [ "sewing_standard", 24 ] ],
     "components": [ [ [ "acidchitin_piece", 6 ] ], [ [ "fabric_hides_proper", 6, "LIST" ] ] ]
   },
@@ -1606,5 +1607,22 @@
     "book_learn": [ [ "textbook_tailor", 3 ], [ "tailor_portfolio", 3 ] ],
     "using": [ [ "sewing_standard", 18 ] ],
     "components": [ [ [ "scute_piece", 8 ] ], [ [ "fabric_hides_proper", 8, "LIST" ] ] ]
+  },
+  {
+    "result": "helmet_bone",
+    "type": "recipe",
+    "category": "CC_ARMOR",
+    "subcategory": "CSC_ARMOR_HEAD",
+    "skill_used": "tailor",
+    "difficulty": 4,
+    "time": "1 h",
+    "autolearn": true,
+    "book_learn": [ [ "textbook_tailor", 3 ], [ "tailor_portfolio", 3 ] ],
+    "using": [ [ "sewing_standard", 4 ] ],
+    "components": [
+      [ [ "bone_heavy", 4 ] ],
+      [ [ "cordage", 1, "LIST" ] ],
+      [ [ "fabric_standard", 2, "LIST" ], [ "fabric_hides_any", 2, "LIST" ] ]
+    ]
   }
 ]
diff --git a/data/json/recipes/armor/legs.json b/data/json/recipes/armor/legs.json
@@ -719,5 +719,22 @@
     "book_learn": [ [ "textbook_computer", 3 ], [ "advanced_electronics", 3 ], [ "reference_fabrication1", 3 ] ],
     "using": [ [ "3d_printing_standard", 49 ] ],
     "components": [ [ [ "carbon_fiber_filament", 490 ] ] ]
+  },
+  {
+    "result": "greaves_bone",
+    "type": "recipe",
+    "category": "CC_ARMOR",
+    "subcategory": "CSC_ARMOR_LEGS",
+    "skill_used": "tailor",
+    "difficulty": 5,
+    "time": "1 h 30 m",
+    "autolearn": true,
+    "book_learn": [ [ "textbook_tailor", 4 ], [ "tailor_portfolio", 4 ] ],
+    "using": [ [ "sewing_standard", 10 ] ],
+    "components": [
+      [ [ "bone_heavy", 10 ] ],
+      [ [ "cordage", 2, "LIST" ] ],
+      [ [ "fabric_standard", 5, "LIST" ], [ "fabric_hides_any", 5, "LIST" ] ]
+    ]
   }
 ]