Bugs are getting more gross

data/json/harvest.json

@@ -409,59 +409,83 @@
   {
     "id": "arachnid_tainted",
     "type": "harvest",
+    "message": "<arachnid_harvest>",
     "entries": [
       { "drop": "meat_tainted", "type": "flesh", "mass_ratio": 0.33 },
+      { "drop": "mutant_bug_lungs", "type": "flesh", "mass_ratio": 0.0035 },
+      { "drop": "mutant_bug_organs", "type": "offal", "mass_ratio": 0.015 },
+      { "drop": "endochitin", "type": "bone", "mass_ratio": 0.1 },
       { "drop": "chitin_piece", "type": "bone", "mass_ratio": 0.1 }
     ]
   },
   {
     "id": "acidant_queen",
     "type": "harvest",
-    "message": "You laboriously dissect the colossal insect.",
+    "message": "You laboriously dissect the colossal insect.  <acidant_harvest>",
     "entries": [
       { "drop": "mutant_meat", "base_num": [ 40, 55 ], "scale_num": [ 0.5, 0.7 ], "max": 80, "type": "flesh" },
       { "drop": "acidchitin_piece", "base_num": [ 2, 6 ], "scale_num": [ 0.3, 0.6 ], "max": 10, "type": "bone" },
-      { "drop": "sweetbread", "base_num": [ 3, 4 ], "scale_num": [ 0.4, 0.6 ], "max": 8, "type": "offal" },
+      { "drop": "endochitin", "type": "bone", "mass_ratio": 0.1 },
+      { "drop": "mutant_acidbug_lungs", "type": "flesh", "mass_ratio": 0.0035 },
+      { "drop": "mutant_acidbug_organs", "type": "offal", "mass_ratio": 0.015 },
       { "drop": "mutant_fat", "base_num": [ 5, 8 ], "scale_num": [ 0.6, 0.8 ], "max": 18, "type": "flesh" }
     ]
   },
   {
     "id": "arachnid",
     "type": "harvest",
+    "message": "<arachnid_harvest>",
     "entries": [
       { "drop": "mutant_meat", "type": "flesh", "mass_ratio": 0.33 },
       { "drop": "mutant_fat", "type": "flesh", "mass_ratio": 0.04 },
       { "drop": "sinew", "type": "bone", "mass_ratio": 0.01 },
+      { "drop": "endochitin", "type": "bone", "mass_ratio": 0.1 },
+      { "drop": "mutant_bug_lungs", "type": "flesh", "mass_ratio": 0.0035 },
+      { "drop": "mutant_bug_organs", "type": "offal", "mass_ratio": 0.015 },
       { "drop": "chitin_piece", "type": "bone", "mass_ratio": 0.1 }
     ]
   },
   {
     "id": "arachnid_acid",
     "type": "harvest",
+    "message": "<acidant_harvest>",
     "entries": [
       { "drop": "mutant_meat", "type": "flesh", "mass_ratio": 0.33 },
       { "drop": "mutant_fat", "type": "flesh", "mass_ratio": 0.04 },
       { "drop": "sinew", "type": "bone", "mass_ratio": 0.01 },
+      { "drop": "endochitin", "type": "bone", "mass_ratio": 0.1 },
+      { "drop": "mutant_acidbug_lungs", "type": "flesh", "mass_ratio": 0.0035 },
+      { "drop": "mutant_acidbug_organs", "type": "offal", "mass_ratio": 0.015 },
       { "drop": "acidchitin_piece", "type": "bone", "mass_ratio": 0.1 }
     ]
   },
   {
     "id": "arachnid_bee",
-    "//": "todo: add stinger here and remove drops from death",
     "type": "harvest",
+    "message": "What appeared to be insect hairs on the chitin of this creature look more like tiny feathers as you pare them back.  Inside is a bundle of bubble-like tissue sacs that appear to be floating, which doesn't fit with what you know about real bees.",
     "entries": [
-      { "drop": "mutant_meat", "type": "flesh", "mass_ratio": 0.33 },
+      { "drop": "mutant_meat", "type": "flesh", "mass_ratio": 0.23 },
       { "drop": "sinew", "type": "bone", "mass_ratio": 0.01 },
+      { "drop": "endochitin", "type": "bone", "mass_ratio": 0.1 },
+      { "drop": "mutant_bug_hydrogen_sacs", "type": "flesh", "mass_ratio": 0.1 },
+      { "drop": "mutant_bug_lungs", "type": "flesh", "mass_ratio": 0.0035 },
+      { "drop": "mutant_bug_organs", "type": "offal", "mass_ratio": 0.015 },
+      { "drop": "bee_sting", "base_num": [ 0, 1 ], "type": "bone" },
       { "drop": "chitin_piece", "type": "bone", "mass_ratio": 0.1 }
     ]
   },
   {
     "id": "arachnid_wasp",
-    "//": "todo: add stinger here and remove drops from death",
     "type": "harvest",
+    "message": "There's a faintly hairy, skin-like membrane, covered in blood vessels, beneath the chitin of this creature.  Inside it is a bundle of bubble-like tissue sacs that appear to be floating, which doesn't fit with what you know about real wasps.",
     "entries": [
       { "drop": "mutant_meat", "type": "flesh", "mass_ratio": 0.33 },
       { "drop": "sinew", "type": "bone", "mass_ratio": 0.01 },
+      { "drop": "endochitin", "type": "bone", "mass_ratio": 0.1 },
+      { "drop": "mutant_bug_hydrogen_sacs", "type": "flesh", "mass_ratio": 0.1 },
+      { "drop": "mutant_bug_lungs", "type": "flesh", "mass_ratio": 0.0035 },
+      { "drop": "mutant_bug_organs", "type": "offal", "mass_ratio": 0.015 },
+      { "drop": "wasp_sting", "base_num": [ 0, 1 ], "type": "bone" },
       { "drop": "chitin_piece", "type": "bone", "mass_ratio": 0.1 }
     ]
   },

data/json/itemgroups/item_groups.json

@@ -2382,21 +2382,11 @@
     "id": "biollante",
     "items": [ [ "biollante_bud", 1 ] ]
   },
-  {
-    "type": "item_group",
-    "id": "bees",
-    "items": [ [ "bee_sting", 5 ] ]
-  },
   {
     "type": "item_group",
     "id": "fungal_sting",
     "items": [ [ "fighter_sting", 5 ] ]
   },
-  {
-    "type": "item_group",
-    "id": "wasps",
-    "items": [ [ "wasp_sting", 5 ] ]
-  },
   {
     "type": "item_group",
     "id": "helicopter",

data/json/items/comestibles/carnivore.json

@@ -139,9 +139,9 @@
     "id": "mutant_meat",
     "type": "COMESTIBLE",
     "copy-from": "meat",
-    "name": "chunk of mutant meat",
-    "name_plural": "chunks of mutant meat",
-    "description": "Meat from a heavily mutated animal.  It has an unsettling loose and spongy texture, but smells… mostly normal.  There are strange tangles and formations in it that don't appear natural at all: bits of bone and hair crusted up inside the muscle, as if trying to form another organism.  Still, seems digestible at least, if you cook it and remove the worst parts.",
+    "name": { "str": "chunk of mutant meat", "str_pl": "chunks of mutant meat" },
+    "snippet_category": "mutant_meat_desc",
+    "description": "Meat from a heavily mutated animal.",
     "looks_like": "meat",
     "cooks_like": "mutant_meat_cooked",
     "proportional": { "price": 0.2, "calories": 0.5 },
@@ -152,9 +152,8 @@
     "id": "mutant_meat_scrap",
     "type": "COMESTIBLE",
     "copy-from": "meat_scrap",
-    "name": "scrap of mutant meat",
-    "name_plural": "scraps of mutant meat",
-    "description": "A tiny scrap of meat from a heavily mutated animal.  It smells a bit odd, and has bits of hair and bone mixed in that seem like they grew inside the muscle itself.  Still, seems digestible at least, if you cook it and remove the worst parts.",
+    "name": { "str": "scrap of mutant meat", "str_pl": "scraps of mutant meat" },
+    "description": "A tiny scrap of meat from a heavily mutated animal.  It smells unappealing, to say the least.",
     "looks_like": "meat_scrap",
     "cooks_like": "mutant_meat_scrap_cooked",
     "proportional": { "price": 0.2, "calories": 0.5 },
@@ -236,7 +235,8 @@
     "type": "COMESTIBLE",
     "copy-from": "mutant_meat",
     "name": "cooked mutant meat",
-    "description": "This is a cooked chunk of meat from a mutated animal.  It has an unsettling, spongy texture, but otherwise tastes… mostly normal.  Hopefully you got all the bits of hair and bone out…",
+    "snippet_category": "cooked_mutant_meat_desc",
+    "description": "This is a cooked chunk of meat from a mutated animal.",
     "looks_like": "meat_cooked",
     "proportional": { "price": 1.5 },
     "parasites": 0,
@@ -248,8 +248,8 @@
     "id": "mutant_meat_scrap_cooked",
     "type": "COMESTIBLE",
     "copy-from": "mutant_meat_scrap",
-    "name": "cooked scrap of mutant meat",
-    "name_plural": "cooked scraps of mutant meat",
+    "name": { "str": "cooked scrap of mutant meat", "str_pl": "cooked scraps of mutant meat" },
+    "description": "This is a tiny scrap of cooked mutant meat.  It is small enough that it's hard to tell how disgusting it is.",
     "looks_like": "meat_scrap_cooked",
     "parasites": 0,
     "calories": 25,
@@ -279,12 +279,22 @@
     "fun": -5,
     "flags": [ "EATEN_HOT" ]
   },
+  {
+    "id": "mutant_bug_organs",
+    "type": "COMESTIBLE",
+    "copy-from": "offal",
+    "name": { "str": "mutant organs", "str_pl": "mutant organs" },
+    "snippet_category": "bug_organs_desc",
+    "description": "These organs came from a giant mutant bug.",
+    "looks_like": "offal",
+    "proportional": { "price": 0.1, "calories": 0.65 },
+    "extend": { "flags": [ "BAD_TASTE" ], "vitamins": [ [ "mutant_toxin", 25 ] ] }
+  },
   {
     "id": "offal_pickled",
     "copy-from": "offal",
     "type": "COMESTIBLE",
-    "name": "pickled offal",
-    "name_plural": "pickled offal",
+    "name": { "str": "pickled offal", "str_pl": "pickled offal" },
     "description": "This is a mass of entrails and organ meat, preserved in brine.  Packed with essential vitamins, and although it looks like a lab specimen, it actually tastes pretty palatable.",
     "volume": "500 ml",
     "stack_size": 2,
@@ -438,6 +448,18 @@
     "parasites": 0,
     "delete": { "flags": [ "RAW" ] }
   },
+  {
+    "id": "mutant_bug_lungs",
+    "type": "COMESTIBLE",
+    "copy-from": "lung",
+    "name": { "str": "mutant lungs", "str_pl": "mutant lungs" },
+    "snippet_category": "mutant_lung_desc",
+    "description": "You're pretty sure this is lung tissue.",
+    "looks_like": "lung",
+    "cooks_like": "lung_cooked",
+    "proportional": { "price": 0.1, "calories": 0.65 },
+    "extend": { "flags": [ "BAD_TASTE" ], "vitamins": [ [ "mutant_toxin", 25 ] ] }
+  },
   {
     "id": "liver",
     "type": "COMESTIBLE",
@@ -630,7 +652,7 @@
     "copy-from": "fat",
     "name": "chunk of mutant fat",
     "name_plural": "chunks of mutant fat",
-    "description": "Freshly butchered fat from a heavily mutated animal.  You could eat it raw, but it is better used as an ingredient in other foods or projects.",
+    "description": "Freshly butchered fat from a heavily mutated animal.  It smells, if anything, even more disgusting than the rest of the mutant.  There are little puddles of undentified oils dripping from it.",
     "looks_like": "fat",
     "proportional": { "price": 0.2 },
     "vitamins": [ [ "mutant_toxin", 360 ] ]

data/json/items/generic.json

@@ -309,6 +309,7 @@
     "color": "light_gray",
     "name": "chunk of chitin",
     "name_plural": "chunks of chitin",
+    "snippet_category": "chitin_desc",
     "description": "A piece of an insect's exoskeleton.  It is light and very durable.",
     "price": 0,
     "material": "chitin",
@@ -318,6 +319,39 @@
     "bashing": 1,
     "to_hit": -2
   },
+  {
+    "type": "GENERIC",
+    "id": "endochitin",
+    "category": "spare_parts",
+    "symbol": ",",
+    "color": "light_gray",
+    "name": "strand of endochitin",
+    "name_plural": "strands of endochitin",
+    "snippet_category": "endochitin_desc",
+    "description": "A piece of an insect's endoskeleton.",
+    "price": 0,
+    "material": "chitin",
+    "flags": [ "NO_SALVAGE" ],
+    "weight": "89 g",
+    "volume": "300 ml",
+    "bashing": 1
+  },
+  {
+    "type": "GENERIC",
+    "id": "mutant_bug_hydrogen_sacs",
+    "category": "spare_parts",
+    "symbol": "o",
+    "color": "light_gray",
+    "name": "cluster of gas sacs",
+    "name_plural": "clusters of gas sacs",
+    "description": "This is a cluster of membranous bubbles, each about the size of a grape, retrieved from inside a mutant insect.  They float like tiny helium balloons, and are likely full of a lighter-than-air gas helping the bug to fly.",
+    "price": 0,
+    "material": "flesh",
+    "flags": [ "NO_SALVAGE" ],
+    "weight": "50 g",
+    "volume": "250 ml",
+    "to_hit": -4
+  },
   {
     "type": "GENERIC",
     "id": "ceramicdisks",

data/json/monsters/insect_spider.json

@@ -232,7 +232,6 @@
     "vision_night": 5,
     "harvest": "arachnid_bee",
     "anger_triggers": [ "HURT", "FRIEND_DIED", "PLAYER_CLOSE" ],
-    "death_drops": { "subtype": "collection", "groups": [ [ "bees", 50 ] ], "//": "50% chance of an item from group bees" },
     "death_function": [ "NORMAL" ],
     "flags": [ "SEES", "SMELLS", "VENOM", "FLIES", "STUMBLES", "SWARMS", "GROUP_MORALE", "CANPLAY", "PATH_AVOID_FIRE" ]
   },
@@ -671,7 +670,6 @@
     "vision_night": 5,
     "harvest": "arachnid_wasp",
     "anger_triggers": [ "HURT", "FRIEND_DIED", "PLAYER_CLOSE", "PLAYER_WEAK", "STALK" ],
-    "death_drops": { "subtype": "collection", "groups": [ [ "wasps", 40 ] ], "//": "40% chance of an item from group bees" },
     "death_function": [ "NORMAL" ],
     "flags": [ "SEES", "SMELLS", "VENOM", "FLIES", "SWARMS", "GROUP_MORALE", "CANPLAY", "PATH_AVOID_FIRE" ]
   },

data/json/obsolete.json

@@ -423,5 +423,15 @@
       }
     ],
     "flags": [ "SILENT" ]
+  },
+  {
+    "type": "item_group",
+    "id": "bees",
+    "items": [ [ "bee_sting", 5 ] ]
+  },
+  {
+    "type": "item_group",
+    "id": "wasps",
+    "items": [ [ "wasp_sting", 5 ] ]
   }
 ]