Merge branch 'main' into more-cbm-recipes

data/json/harvest.json

@@ -443,75 +443,125 @@
   {
     "id": "arachnid_tainted",
     "type": "harvest",
-    "message": "You carefully crack open its exoskeleton to get at the flesh beneath",
+    "message": "<arachnid_harvest>",
     "entries": [
+      { "drop": "endochitin", "type": "bone", "mass_ratio": 0.1 },
       { "drop": "meat_tainted", "type": "flesh", "mass_ratio": 0.33 },
-      { "drop": "chitin_piece", "type": "skin", "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_flying",
+    "type": "harvest",
+    "message": "<arachnid_flying_harvest>",
+    "entries": [
+      { "drop": "mutant_meat", "type": "flesh", "mass_ratio": 0.1 },
+      { "drop": "sinew", "type": "bone", "mass_ratio": 0.01 },
+      { "drop": "endochitin", "type": "bone", "mass_ratio": 0.01 },
+      { "drop": "mutant_bug_hydrogen_sacs", "type": "flesh", "mass_ratio": 0.2 },
+      { "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.01 }
     ]
   },
   {
     "id": "acidant_queen",
     "type": "harvest",
-    "message": "You laboriously dissect the colossal insect.",
+    "message": "<acidant_harvest>",
     "entries": [
+      { "drop": "endochitin", "type": "bone", "mass_ratio": 0.1 },
       { "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": "skin" },
-      { "drop": "sweetbread", "base_num": [ 3, 4 ], "scale_num": [ 0.4, 0.6 ], "max": 8, "type": "offal" },
       { "drop": "mutant_fat", "base_num": [ 5, 8 ], "scale_num": [ 0.6, 0.8 ], "max": 18, "type": "flesh" }
     ]
   },
   {
     "id": "arachnid",
     "type": "harvest",
-    "message": "You carefully crack open its exoskeleton to get at the flesh beneath",
+    "message": "<arachnid_harvest>",
     "entries": [
+      { "drop": "endochitin", "type": "bone", "mass_ratio": 0.1 },
       { "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": "chitin_piece", "type": "skin", "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": "You carefully crack open its exoskeleton to get at the flesh beneath",
+    "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": "acidchitin_piece", "type": "skin", "mass_ratio": 0.1 }
+      { "drop": "endochitin", "type": "bone", "mass_ratio": 0.1 },
+      { "drop": "acidchitin_piece", "type": "bone", "mass_ratio": 0.1 }
     ]
   },
   {
     "id": "arachnid_bee",
-    "//": "todo: add stinger here and remove drops from death",
     "type": "harvest",
-    "message": "You carefully crack open its exoskeleton to get at the flesh beneath",
+    "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": "chitin_piece", "type": "skin", "mass_ratio": 0.1 }
+      { "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": "You carefully crack open its exoskeleton to get at the flesh beneath",
+    "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": "chitin_piece", "type": "skin", "mass_ratio": 0.1 }
+      { "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 }
+    ]
+  },
+  {
+    "id": "arachnid_dragonfly_mega",
+    "type": "harvest",
+    "message": "<arachnid_flying_harvest>",
+    "entries": [
+      { "drop": "mutant_meat", "type": "flesh", "mass_ratio": 0.15 },
+      { "drop": "mutant_fat", "type": "flesh", "mass_ratio": 0.04 },
+      { "drop": "sinew", "type": "bone", "mass_ratio": 0.005 },
+      { "drop": "endochitin", "type": "bone", "mass_ratio": 0.05 },
+      { "drop": "mutant_bug_lungs", "type": "flesh", "mass_ratio": 0.0045 },
+      { "drop": "mutant_bug_organs", "type": "offal", "mass_ratio": 0.025 },
+      { "drop": "chitin_piece", "type": "bone", "mass_ratio": 0.01 },
+      { "drop": "egg_dragonfly", "type": "offal", "base_num": [ 5, 35 ], "scale_num": [ 0.3, 0.5 ] }
     ]
   },
   {
     "id": "arachnid_firefly",
     "type": "harvest",
-    "message": "You carefully crack open its exoskeleton to get at the flesh beneath",
+    "message": "<firefly_harvest>",
+    "//": "copied from arachnid_flying+egg",
     "entries": [
-      { "drop": "mutant_meat", "type": "flesh", "mass_ratio": 0.33 },
+      { "drop": "mutant_meat", "type": "flesh", "mass_ratio": 0.1 },
       { "drop": "sinew", "type": "bone", "mass_ratio": 0.01 },
-      { "drop": "chitin_piece", "type": "skin", "mass_ratio": 0.1 }
+      { "drop": "endochitin", "type": "bone", "mass_ratio": 0.01 },
+      { "drop": "mutant_bug_hydrogen_sacs", "type": "flesh", "mass_ratio": 0.2 },
+      { "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.01 },
+      { "drop": "egg_firefly", "type": "offal", "base_num": [ 0, 3 ] }
     ]
   },
   {

data/json/itemgroups/Monsters_Animals_Lairs/monster_drops_lairs.json

@@ -152,24 +152,12 @@
     "subtype": "distribution",
     "entries": [ { "item": "biollante_bud", "prob": 1 } ]
   },
-  {
-    "type": "item_group",
-    "id": "bees",
-    "subtype": "distribution",
-    "entries": [ { "item": "bee_sting", "prob": 5 } ]
-  },
   {
     "type": "item_group",
     "id": "fungal_sting",
     "subtype": "distribution",
     "entries": [ { "item": "fighter_sting", "prob": 5 } ]
   },
-  {
-    "type": "item_group",
-    "id": "wasps",
-    "subtype": "distribution",
-    "entries": [ { "item": "wasp_sting", "prob": 5 } ]
-  },
   {
     "type": "item_group",
     "id": "vault_wanderer",

data/json/items/ammo.json

@@ -129,6 +129,7 @@
     "looks_like": "thread",
     "description": "Wool yarn, could be used to knit wool clothing.",
     "material": "wool",
+    "flags": [ "NO_SALVAGE" ],
     "volume": "250 ml",
     "weight": "1 g",
     "ammo_type": "thread",

data/json/items/comestibles/carnivore.json

@@ -138,7 +138,8 @@
     "type": "COMESTIBLE",
     "copy-from": "meat",
     "name": { "str": "chunk of mutant meat", "str_pl": "chunks of mutant meat" },
-    "description": "Meat from a heavily mutated animal.  Tough, discolored, with a somewhat chemical smell.  Still, seems digestible at least, if you cook it and remove the worst parts.",
+    "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 },
@@ -201,6 +202,7 @@
     "copy-from": "meat_scrap",
     "type": "COMESTIBLE",
     "name": { "str": "cooked scrap of meat", "str_pl": "cooked scraps of 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.",
     "spoils_in": "2 days",
     "parasites": 0,
     "fun": 0,
@@ -298,6 +300,17 @@
       [ "mutant_toxin", 50 ]
     ]
   },
+  {
+    "id": "mutant_bug_organs",
+    "type": "COMESTIBLE",
+    "copy-from": "offal",
+    "name": { "str_sp": "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": "stomach",
     "copy-from": "flesh",
@@ -413,6 +426,18 @@
     "calories": 50,
     "vitamins": [ [ "vitA", 0 ], [ "vitC", 9 ], [ "calcium", 0 ], [ "iron", 14 ], [ "vitB", 22 ] ]
   },
+  {
+    "id": "mutant_bug_lungs",
+    "type": "COMESTIBLE",
+    "copy-from": "lung",
+    "name": { "str_sp": "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",
@@ -763,7 +788,8 @@
     "price": "330 cent",
     "price_postapoc": "20 cent",
     "material": "flesh",
-    "flags": [ "RAW", "TRADER_AVOID", "UNSAFE_CONSUME" ],
+    "flags": [ "RAW", "TRADER_AVOID", "UNSAFE_CONSUME", "SMOKABLE" ],
+    "smoking_result": "cured_hide",
     "stack_size": 1,
     "fun": -12
   },
@@ -804,7 +830,8 @@
     "price": "330 cent",
     "price_postapoc": "1 USD",
     "material": [ "fur", "flesh" ],
-    "flags": [ "NO_SALVAGE", "TRADER_AVOID" ],
+    "flags": [ "NO_SALVAGE", "TRADER_AVOID", "SMOKABLE" ],
+    "smoking_result": "cured_pelt",
     "stack_size": 1,
     "fun": -24
   },
@@ -818,7 +845,7 @@
     "description": "A carefully folded raw skin harvested from a fur-bearing unnatural creature.  It still has the fur attached and is poisonous.  You can cure it for storage and tanning.",
     "price": "0 cent",
     "price_postapoc": "50 cent",
-    "flags": [ "NO_SALVAGE", "UNSAFE_CONSUME" ]
+    "flags": [ "NO_SALVAGE", "UNSAFE_CONSUME", "SMOKABLE" ]
   },
   {
     "type": "COMESTIBLE",

data/json/items/comestibles/egg.json

@@ -208,6 +208,17 @@
     "material": [ "egg" ],
     "rot_spawn": "GROUP_EGG_FIREFLY"
   },
+  {
+    "type": "COMESTIBLE",
+    "id": "egg_dragonfly",
+    "name": "dragonfly egg",
+    "description": "The still wet egg of a mutated dragonfly.  Serves as a disgusting substitute for the real thing, just don't let it hatch in the water.",
+    "copy-from": "spider_egg",
+    "color": "light_green",
+    "symbol": "o",
+    "spoils_in": "2 days",
+    "rot_spawn": "GROUP_EGG_DRAGONFLY"
+  },
   {
     "type": "COMESTIBLE",
     "id": "razorclaw_roe",

data/json/items/generic.json

@@ -337,6 +337,37 @@
     "bashing": 1,
     "to_hit": -2
   },
+  {
+    "type": "GENERIC",
+    "id": "endochitin",
+    "category": "spare_parts",
+    "symbol": ",",
+    "color": "light_gray",
+    "name": { "str": "strand of endochitin", "str_pl": "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": { "str": "cluster of gas sacs", "str_pl": "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/monster_factions.json

@@ -144,7 +144,10 @@
   {
     "type": "MONSTER_FACTION",
     "name": "dragonfly",
-    "base_faction": "insect"
+    "base_faction": "insect",
+    "by_mood": [ "centipede", "spider" ],
+    "hate": [ "insect", "small_animal", "bird" ],
+    "neutral": [ "dragonfly" ]
   },
   {
     "type": "MONSTER_FACTION",
@@ -192,6 +195,12 @@
     "name": "spider_cellar",
     "base_faction": "spider"
   },
+  {
+    "type": "MONSTER_FACTION",
+    "name": "aquatic_predator",
+    "neutral": "bot",
+    "hate": "fish"
+  },
   {
     "type": "MONSTER_FACTION",
     "name": "plant",

data/json/monstergroups/eggs.json

@@ -120,5 +120,14 @@
     "type": "monstergroup",
     "default": "mon_ant_larva",
     "monsters": [ { "monster": "mon_ant_acid_larva", "freq": 10, "cost_multiplier": 1 } ]
+  },
+  {
+    "name": "GROUP_EGG_DRAGONFLY",
+    "type": "monstergroup",
+    "default": "mon_null",
+    "monsters": [
+      { "monster": "mon_dragonfly_naiad", "freq": 500, "cost_multiplier": 1, "conditions": [ "SPRING", "SUMMER", "AUTUMN" ] },
+      { "monster": "mon_dragonfly_naiad", "freq": 500, "cost_multiplier": 1, "conditions": [ "SUMMER" ] }
+    ]
   }
 ]

data/json/monstergroups/fish.json

@@ -309,7 +309,14 @@
         "conditions": [ "DAWN", "DUSK" ],
         "pack_size": [ 1, 3 ]
       },
-      { "monster": "mon_fish_blinky", "freq": 5, "cost_multiplier": 3, "pack_size": [ 1, 3 ] }
+      { "monster": "mon_fish_blinky", "freq": 5, "cost_multiplier": 3, "pack_size": [ 1, 3 ] },
+      {
+        "monster": "mon_dragonfly_naiad",
+        "freq": 50,
+        "cost_multiplier": 3,
+        "conditions": [ "SPRING", "SUMMER" ],
+        "pack_size": [ 1, 3 ]
+      }
     ]
   },
   {

data/json/monstergroups/wilderness.json

@@ -2196,7 +2196,8 @@
         "conditions": [ "DAWN", "DUSK" ],
         "pack_size": [ 1, 3 ]
       },
-      { "monster": "mon_fish_blinky", "freq": 5, "cost_multiplier": 3, "pack_size": [ 1, 3 ] }
+      { "monster": "mon_fish_blinky", "freq": 5, "cost_multiplier": 3, "pack_size": [ 1, 3 ] },
+      { "monster": "mon_dragonfly_naiad", "freq": 50, "cost_multiplier": 2, "pack_size": [ 1, 3 ] }
     ]
   },
   {