Integratify Feathers

data/json/items/armor/integrated.json

@@ -113,7 +113,14 @@
       },
       {
         "material": [ { "type": "wood", "covered_by_mat": 100, "thickness": 3 }, { "type": "wood", "covered_by_mat": 40, "thickness": 4 } ],
-        "covers": [ "hand_l", "hand_r", "foot_l", "foot_r" ],
+        "covers": [ "hand_l", "hand_r" ],
+        "specifically_covers": [ "hand_back_l", "hand_back_r", "hand_palm_l", "hand_palm_r", "hand_wrist_l", "hand_wrist_r" ],
+        "coverage": 100,
+        "encumbrance": 6
+      },
+      {
+        "material": [ { "type": "wood", "covered_by_mat": 100, "thickness": 3 }, { "type": "wood", "covered_by_mat": 40, "thickness": 4 } ],
+        "covers": [ "foot_l", "foot_r" ],
         "coverage": 100,
         "encumbrance": 6
       }
@@ -156,6 +163,31 @@
       }
     ]
   },
+  {
+    "id": "integrated_feathers",
+    "type": "ARMOR",
+    "category": "armor",
+    "name": { "str_sp": "feathers" },
+    "description": "Iridescent feathers covering your entire body.  Provides some warmth and protection from the elements, but could be thicker.",
+    "weight": "300 g",
+    "volume": "300 ml",
+    "price": 0,
+    "price_postapoc": 0,
+    "material": [ "mut_feather" ],
+    "symbol": "x",
+    "color": "white",
+    "warmth": 15,
+    "environmental_protection": 1,
+    "flags": [ "INTEGRATED", "ALLOWS_NATURAL_ATTACKS", "UNBREAKABLE", "PERSONAL", "WATER_FRIENDLY", "TRANSPARENT" ],
+    "armor": [
+      {
+        "material": [ { "type": "mut_feather", "covered_by_mat": 100, "thickness": 4 } ],
+        "covers": [ "hand_l", "hand_r", "foot_l", "foot_r", "leg_l", "leg_r", "arm_l", "arm_r", "torso", "head" ],
+        "coverage": 100,
+        "encumbrance": 0
+      }
+    ]
+  },
   {
     "id": "integrated_lightfur",
     "type": "ARMOR",

data/json/materials.json

@@ -3010,6 +3010,29 @@
     "cut_dmg_verb": "damaged",
     "resist": { "bash": 2, "cut": 5, "acid": 10, "heat": 20, "bullet": 2 }
   },
+  {
+    "type": "material",
+    "id": "mut_feather",
+    "name": "Mutant Feather",
+    "density": 0.8,
+    "specific_heat_liquid": 0.5,
+    "specific_heat_solid": 0.5,
+    "latent_heat": 200,
+    "soft": true,
+    "chip_resist": 8,
+    "breathability": "POOR",
+    "dmg_adj": [ "ripped", "torn", "shredded", "tattered" ],
+    "bash_dmg_verb": "ripped",
+    "cut_dmg_verb": "cut",
+    "burn_data": [
+      { "fuel": 0.6, "smoke": 1, "burn": 0.02 },
+      { "fuel": 1, "smoke": 1, "burn": 0.04 },
+      { "fuel": 1, "smoke": 1, "burn": 0.06 }
+    ],
+    "burn_products": [ [ "corpse_ash", 0.035 ] ],
+    "wind_resist": 100,
+    "resist": { "bash": 0.5, "cut": 0.1, "bullet": 0.1, "acid": 0, "heat": 0 }
+  },
   {
     "type": "material",
     "id": "mut_fur",

data/json/mutations/mutations.json

@@ -2752,7 +2752,7 @@
     "leads_to": [ "DOWN" ],
     "prereqs": [ "SKIN_ROUGH" ],
     "category": [ "BIRD" ],
-    "armor": [ { "part_types": [ "torso", "head", "arm", "hand", "leg", "foot", "mouth", "tail" ], "bash": 1 } ]
+    "integrated_armor": [ "integrated_feathers" ]
   },
   {
     "type": "mutation",

doc/MUTATIONS.md

@@ -305,7 +305,7 @@ These fields are optional, but are very frequently used in mutations and their c
 | `threshreq`       | Nothing | This is a dedicated prerequisite slot for threshold mutations, and functions identically to `prereq` and `prereq2`.                                         |
 | `cancels`         | Nothing | Trait IDs defined in this array will be forcibly removed from the character when trait is mutated.                                                          |
 | `changes_to`      | Nothing | Used for defining mutation lines with defined steps. This trait can further mutate into any other trait defined in this list.                               |
-| `leads_to`        | Nothing | Mutations that add onto this one without removing it. Effectively a reverse of the `prereqs` tag.                                                           |
+| `leads_to`        | Nothing | Mutations that add onto this one without removing it. Effectively a reverse of the `prereqs` tag.  Also prevents type conflicts with this trait!                                                    |
 | `starting_trait`  | false   | If true, this trait can be selected during character creation.                                                                                              |
 | `valid`           | true    | Whether or not this trait can be obtained through mutation. Invalid traits are still obtainable while creating a character.                                 |
 | `purifiable`      | true    | Whether or not this trait can be removed. If false, the trait cannot be removed by any means.                                                               |