Merge remote-tracking branch 'origin/master' into play_2022

* origin/master:
  Prepper NPC quest follow-up (CleverRaven#59515)
  Adds a new widget for th structured sidebar with all midsize bodygraphs (i.e. the ones structured uses for "Health + Status" et al) side by side with nothing else, for use with Health + Overmap because I like the way the midsize bodygraphs look and don't want to have to choose just one of them to display (CleverRaven#60244)
  [DinoMod] slower zombie dino upgrades (CleverRaven#60311)
  [Xedra Evolved] Adds itemgroups for spell items (CleverRaven#60296)
  Update mutations.json (CleverRaven#60295)
  Fix typos (CleverRaven#60269)
  Wooden pulley fixes (CleverRaven#60285)
  Update landscaping.json (CleverRaven#60299)
  Update martialarts.json (CleverRaven#60305)
  fix: 'person' monster silently vanishes after touching character (CleverRaven#60270)
  fix: prevent use of non valid creature pointer (CleverRaven#60272)
  Nested Recipes - Ropes, Bundles, Shelled Nuts (CleverRaven#60297)
  Nested Recipes - Chain Armor (CleverRaven#60268)
  Nerf isherwood dandelion quest rewards (CleverRaven#60273)
  Animal ports from TropiCata to Mainline + egg density fixes for insects and birds (CleverRaven#60234)
  Modular Defense Anchor is SOFT (CleverRaven#60279)

data/json/furniture_and_terrain/furniture-sleep.json

@@ -121,7 +121,7 @@
     "type": "furniture",
     "id": "f_floor_mattress",
     "name": "mattress",
-    "description": "An ordinary mattress left on the floor.  While it's not as comfortable as an entire bed without the mattress, it's pretty close.  If it's someplace actually safe to sleep, it's practically a luxury in of itself.",
+    "description": "An ordinary mattress left on the floor.  While it's not as comfortable as an entire bed without the mattress, it's pretty close.  If it's someplace actually safe to sleep, it's practically a luxury in and of itself.",
     "symbol": "0",
     "color": "magenta",
     "move_cost_mod": 3,
@@ -145,7 +145,7 @@
     "type": "furniture",
     "id": "f_down_mattress",
     "name": "down mattress",
-    "description": "A squishy feather-stuffed mattress left on the floor.  While it's not as comfortable as an entire bed without the mattress, it's pretty close.  If it's someplace actually safe to sleep, it's practically a luxury in of itself.",
+    "description": "A squishy feather-stuffed mattress left on the floor.  While it's not as comfortable as an entire bed without the mattress, it's pretty close.  If it's someplace actually safe to sleep, it's practically a luxury in and of itself.",
     "symbol": "0",
     "color": "magenta",
     "move_cost_mod": 3,

data/json/furniture_and_terrain/terrain-mechanisms.json

@@ -218,6 +218,7 @@
   {
     "type": "terrain",
     "id": "t_palisade_pulley_wood",
+    "looks_like": "t_palisade_pulley",
     "name": "gate pulley",
     "description": "A system of ropes and wooden pulleys that allows to pull up heavy doors or gates.",
     "symbol": "|",

data/json/gates.json

@@ -83,6 +83,21 @@
     "moves": 1800,
     "bashing_damage": 30
   },
+  {
+    "type": "gate",
+    "id": "t_palisade_pulley_wood",
+    "door": "t_palisade_gate",
+    "floor": "t_palisade_gate_o",
+    "walls": "t_palisade",
+    "messages": {
+      "pull": "You pull the rope…",
+      "open": "The palisade gate swings open!",
+      "close": "The palisade gate swings closed with a crash!",
+      "fail": "The palisade gate can't be closed!"
+    },
+    "moves": 1800,
+    "bashing_damage": 30
+  },
   {
     "type": "gate",
     "id": "t_gates_control_metal",

data/json/items/ammo.json

@@ -1390,7 +1390,7 @@
     "symbol": "=",
     "color": "light_gray",
     "looks_like": "marble",
-    "description": "A metal die used to play various role-playing games",
+    "description": "A metal die used to play various role-playing games.",
     "material": [ "zinc" ],
     "volume": "250 ml",
     "weight": "1 g",

data/json/items/armor/robofac_armor.json

@@ -16,7 +16,7 @@
     "material": [ "nylon", "kevlar" ],
     "color": "light_gray",
     "warmth": 5,
-    "flags": [ "STURDY", "OUTER", "WATERPROOF", "VARSIZE", "RAINPROOF", "HOOD" ],
+    "flags": [ "STURDY", "OUTER", "WATERPROOF", "VARSIZE", "RAINPROOF", "HOOD", "SOFT" ],
     "material_thickness": 3,
     "pocket_data": [
       {
@@ -241,7 +241,7 @@
       "msg": "The Hub logo on your front stops glowing.",
       "target": "robofac_armor_anchor"
     },
-    "flags": [ "DIMENSIONAL_ANCHOR", "PORTAL_PROOF", "STURDY", "OUTER", "WATERPROOF", "VARSIZE", "RAINPROOF", "HOOD" ]
+    "flags": [ "DIMENSIONAL_ANCHOR", "PORTAL_PROOF", "STURDY", "OUTER", "WATERPROOF", "VARSIZE", "RAINPROOF", "HOOD", "SOFT" ]
   },
   {
     "abstract": "robofac_mantle",

data/json/items/biosignatures.json

@@ -71,5 +71,23 @@
       "charges_to_use": 1,
       "effects": [ { "id": "fetid_goop", "duration": 3600 } ]
     }
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "insect_dust",
+    "name": { "str_sp": "chitin dust" },
+    "category": "spare_parts",
+    "weight": "40 g",
+    "color": "white",
+    "comestible_type": "FOOD",
+    "symbol": "%",
+    "description": "The dust left over by winged insects such as butterflies or moths.  It's mostly chitin but may also contain dirt and other gross materials.",
+    "price": 0,
+    "price_postapoc": 0,
+    "material": [ "chitin" ],
+    "flags": [ "NO_SALVAGE" ],
+    "volume": "250 ml",
+    "charges": 4,
+    "stack_size": 4
   }
 ]

data/json/items/comestibles/egg.json

@@ -3,7 +3,7 @@
     "type": "COMESTIBLE",
     "id": "egg_bird",
     "name": { "str": "bird egg" },
-    "weight": "57 g",
+    "weight": "55 g",
     "color": "brown",
     "spoils_in": "7 days",
     "comestible_type": "FOOD",
@@ -113,8 +113,8 @@
     "name": { "str": "goose egg" },
     "copy-from": "egg_chicken",
     "calories": 266,
-    "volume": "125 ml",
-    "weight": "144 g",
+    "volume": "130 ml",
+    "weight": "143 g",
     "vitamins": [ [ "calcium", 9 ], [ "iron", 29 ] ],
     "rot_spawn": "GROUP_EGG_GOOSE_CANADIAN"
   },
@@ -176,7 +176,7 @@
     "material": [ "egg" ],
     "stack_size": 1,
     "volume": "250 ml",
-    "weight": "300 g",
+    "weight": "275 g",
     "calories": 240,
     "quench": 10,
     "fun": -20,
@@ -637,5 +637,104 @@
     "volume": "650 ml",
     "description": "A large clump of the eggs of a frog.  The eggs themselves are gelatinous and transparent.",
     "rot_spawn": "GROUP_EGG_FROG"
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "egg_goose",
+    "name": "goose egg",
+    "copy-from": "egg_goose_canadian",
+    "rot_spawn": "GROUP_EGG_GOOSE"
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "egg_goose_golden",
+    "name": "golden goose egg",
+    "copy-from": "egg_goose_canadian",
+    "proportional": { "weight": 2, "calories": 2, "volume": 2 },
+    "rot_spawn": "GROUP_EGG_GOOSE"
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "egg_hummingbird",
+    "name": "hummingbird egg",
+    "copy-from": "egg_crow",
+    "volume": "1 ml",
+    "weight": "1 g",
+    "rot_spawn": "GROUP_EGG_HUMMINGBIRD"
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "egg_woodpecker",
+    "name": "woodpecker egg",
+    "copy-from": "egg_crow",
+    "rot_spawn": "GROUP_EGG_WOODPECKER"
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "egg_coot",
+    "name": "coot egg",
+    "copy-from": "egg_chicken",
+    "rot_spawn": "GROUP_EGG_COOT"
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "egg_cormorant",
+    "name": "cormorant egg",
+    "copy-from": "egg_chicken",
+    "rot_spawn": "GROUP_EGG_CORMORANT"
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "egg_moorhen",
+    "name": "moorhen egg",
+    "copy-from": "egg_chicken",
+    "rot_spawn": "GROUP_EGG_MOORHEN"
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "egg_grebe",
+    "name": "grebe egg",
+    "copy-from": "egg_chicken",
+    "rot_spawn": "GROUP_EGG_GREBE"
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "egg_toad",
+    "name": { "str": "cluster of toad's eggs", "str_pl": "clusters of toad's eggs" },
+    "copy-from": "egg_frog",
+    "description": "A large clump of the eggs of a toad.  The eggs themselves are gelatinous and transparent.",
+    "rot_spawn": "GROUP_EGG_TOAD"
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "egg_water_beetle",
+    "name": "water beetle egg",
+    "copy-from": "egg_strider",
+    "description": "The egg of a water beetle, usually found near aquatic grass.",
+    "rot_spawn": "GROUP_EGG_WATER_BEETLE"
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "egg_water_bug",
+    "name": "water scorpion egg",
+    "copy-from": "egg_strider",
+    "description": "The egg of a water scorpion, usually found near aquatic grass.",
+    "rot_spawn": "GROUP_EGG_WATER_BUG"
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "egg_butterfly",
+    "name": "butterfly egg",
+    "copy-from": "egg_insect",
+    "description": "The egg of a butterfly.  They are usually found clustered on leaves.",
+    "rot_spawn": "GROUP_EGG_BUTTERFLY"
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "egg_cicada",
+    "name": "cicada egg",
+    "copy-from": "egg_insect",
+    "description": "The egg of a cicada.  They are usually found near trees.",
+    "rot_spawn": "GROUP_EGG_CICADA"
   }
 ]

data/json/items/containers.json

@@ -245,7 +245,7 @@
     "copy-from": "bag_zipper",
     "type": "GENERIC",
     "name": { "str": "gallon-sized zipper bag" },
-    "description": "An inexpensive flexible rectangular storage bag, noticeably larger than it's more common counterpart.  Transparent and made of plastic, it can be sealed and opened by a slider which works in a similar way to a zip fastener.",
+    "description": "An inexpensive flexible rectangular storage bag, noticeably larger than its more common counterpart.  Transparent and made of plastic, it can be sealed and opened by a slider which works in a similar way to a zip fastener.",
     "weight": "20 g",
     "volume": "75 ml",
     "price_postapoc": 13,

data/json/items/gun/shot.json

@@ -264,7 +264,7 @@
     "copy-from": "shotgun_base",
     "type": "GUN",
     "name": { "str": "gas-operated semi-automatic shotgun" },
-    "description": "A semi-automatic smooth-bore shotgun, this weapon features respectable ergonomics and room for 8 shotshells within its tubular magazine.  Suitable both for competition shooting and offensive combat rolls, this firearm is faster to shoot than a traditional pump-action model, with the caveat that its harder to maintain than its manually operated siblings as it relies on an internal gas system to cycle rounds rather than the user’s own physical input.",
+    "description": "A semi-automatic smooth-bore shotgun, this weapon features respectable ergonomics and room for 8 shotshells within its tubular magazine.  Suitable both for competition shooting and offensive combat roles, this firearm is faster to shoot than a traditional pump-action model, with the caveat that its harder to maintain than its manually operated siblings as it relies on an internal gas system to cycle rounds rather than the user’s own physical input.",
     "variant_type": "gun",
     "variants": [
       {
@@ -375,7 +375,7 @@
     "//": "Tileset whitelist for shotguns.",
     "type": "GUN",
     "name": { "str": "12 gauge hunting shotgun" },
-    "description": "A classic shotgun in nearly every respect; big, bulky, and intimidating, guns such as this one have been made for over a century in one form or another, coming in both pump-action and semi-automatic models.  Serving both competition-shooting, law-enforcement, and hunting rolls, this firearm is sporting a standard-capacity 5-round magazine tube.  Despite the firearm’s low magazine space, what it lacks in capacity it makes up for in sheer close-range effectiveness and stopping power.",
+    "description": "A classic shotgun in nearly every respect; big, bulky, and intimidating, guns such as this one have been made for over a century in one form or another, coming in both pump-action and semi-automatic models.  Serving both competition-shooting, law-enforcement, and hunting roles, this firearm is sporting a standard-capacity 5-round magazine tube.  Despite the firearm’s low magazine space, what it lacks in capacity it makes up for in sheer close-range effectiveness and stopping power.",
     "variant_type": "gun",
     "variants": [
       {

data/json/items/tool/landscaping.json

@@ -328,7 +328,7 @@
     "material": [ "wood", "steel" ],
     "symbol": "/",
     "color": "brown",
-    "looks_like": "light_gray",
+    "looks_like": "glaive",
     "qualities": [ [ "AXE", 1 ], [ "GRASS_CUT", 1 ], [ "CUT", 1 ], [ "BUTCHER", -70 ] ],
     "techniques": [ "WBLOCK_1", "BRUTAL", "WIDE", "SWEEP" ],
     "flags": [ "DURABLE_MELEE", "REACH_ATTACK", "NONCONDUCTIVE", "POLEARM", "SHEATH_SPEAR", "ALWAYS_TWOHAND" ],

data/json/mapgen/lmoe.json

@@ -191,6 +191,84 @@
       ]
     }
   },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "om_terrain": [ "lmoe_prepperquest" ],
+    "//": "Above ground",
+    "//2": "The front door to this LMOE is locked and can be unlocked by doing the prepper_1 quest line.",
+    "weight": 100,
+    "object": {
+      "fill_ter": "t_metal_floor",
+      "rows": [
+        "       S     S         S",
+        "   S       S     S      ",
+        " S     S            S   ",
+        "          S             ",
+        "   S    S SSSSS      S  ",
+        "      SSSSSSSSSSSS      ",
+        "     SS$$$$$$$$$$SS     ",
+        "     S$$TTTTTTTT$$S   S ",
+        "    SS$$T))))))T$$S     ",
+        " S  SS$$T)####)T$$SS    ",
+        "    SS$$T)#>>#)T$$SS    ",
+        "    SS$$T)#..#)T$$SS    ",
+        "    SS$$T)#X##)T$$SS   S",
+        "  S  S$$T))_)))T$$SS    ",
+        "     S$$$$$_$$$$$$S     ",
+        "     SS$$$$_$$$$$SS  S  ",
+        "      SSSSS_ SSSSS      ",
+        "S      S S   SS S       ",
+        "                 S    S ",
+        "   S   S                ",
+        "            S  S        ",
+        "                       S",
+        "    S      S            ",
+        "                  S     "
+      ],
+      "place_signs": [ { "signage": "Private property!  Keep out!", "x": 12, "y": 16 } ],
+      "terrain": { "X": "t_door_metal_locked" },
+      "palettes": [ "bunker_ext" ]
+    }
+  },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "om_terrain": [ "lmoe_under_empty_prepperquest" ],
+    "//": "This particular 2-bed shelter is a more professionally done, all metal bomb shelter with kitchen, secret safe room / gun locker, and workshop.",
+    "//2": "This terrain is the destination for the prepper_1 quest.  The front door is locked and can be unlocked by completing the quest.",
+    "weight": 100,
+    "object": {
+      "fill_ter": "t_metal_floor",
+      "rows": [
+        "########################",
+        "########################",
+        "##||||||||||||||||||||##",
+        "##|{{{{{|UUUUUU|w__BB|##",
+        "##|u____|U____U|d__BB|##",
+        "##|u___h|U_UU_U|A,,,_|##",
+        "##|u___D|=*==*=|_,,,}|##",
+        "##|A____:______+_,,,}|##",
+        "##|||||||_1,,1_|S__hD|##",
+        "##|VVVVV=_e,,P_|||||||##",
+        "##|_____*__,,____|s_K|##",
+        "##|vvvvv=_E,,f___+__t|##",
+        "##|||||||||++|||||||||##",
+        "##|c_bbbbA|,,|CSCCKCC|##",
+        "##|c______|,,|u_____C|##",
+        "##|c_TT___|,,|u_hLh_F|##",
+        "##|c_TTh__+__+_______|##",
+        "##|c_TT___|__|rrrr__~|##",
+        "##|c______|__|||||+|||##",
+        "##|c______|__*__a|__A|##",
+        "##|ccccccc|<<=G_a|HlW|##",
+        "##||||||||||||||||||||##",
+        "########################",
+        "########################"
+      ],
+      "palettes": [ "bunker", "empty_prepperquest_bunker_items" ]
+    }
+  },
   {
     "type": "mapgen",
     "method": "json",

data/json/mapgen_palettes/lmoe.json

@@ -85,6 +85,39 @@
       "}": { "item": "novels", "chance": 90, "repeat": [ 3, 8 ] }
     }
   },
+  {
+    "type": "palette",
+    "id": "empty_prepperquest_bunker_items",
+    "//": "Used for the prepper_1 NPC's bunker. Nearly identical to empty_bunker_items but with some added item groups and other spawns buffed ~15-25%, especially food and ammo.",
+    "items": {
+      "b": [ { "item": "manuals", "chance": 70 }, { "item": "textbooks", "chance": 50 } ],
+      "B": { "item": "bed", "chance": 70, "repeat": [ 1, 2 ] },
+      "c": { "item": "hardware", "chance": 70 },
+      "C": [
+        { "item": "dining", "chance": 35, "repeat": [ 1, 3 ] },
+        { "item": "oven", "chance": 20 },
+        { "item": "cleaning", "chance": 40, "repeat": [ 1, 2 ] }
+      ],
+      "d": { "item": "allclothes", "chance": 85, "repeat": [ 2, 4 ] },
+      "D": { "item": "office", "chance": 75 },
+      "F": { "item": "SUS_fridge_survivor", "chance": 100 },
+      "l": { "item": "hardware", "chance": 65, "repeat": [ 1, 3 ] },
+      "L": { "item": "dining", "chance": 30 },
+      "r": { "item": "stash_wood", "chance": 80, "repeat": [ 1, 4 ] },
+      "R": { "item": "hardware", "chance": 80 },
+      "S": { "item": "oven", "chance": 80 },
+      "T": { "item": "tools_common", "chance": 70, "repeat": [ 1, 2 ] },
+      "U": { "item": "gear_survival", "chance": 30, "repeat": [ 3, 5 ] },
+      "u": [ { "item": "cannedfood", "chance": 50, "repeat": [ 1, 5 ] }, { "item": "pasta", "chance": 20, "repeat": [ 1, 3 ] } ],
+      "v": { "item": "softdrugs", "chance": 75, "repeat": [ 1, 3 ] },
+      "V": [ { "item": "bags", "chance": 30 }, { "item": "large_bags", "chance": 8 } ],
+      "w": { "item": "allclothes", "chance": 80, "repeat": [ 2, 4 ] },
+      "Y": [ { "item": "jackets", "chance": 20 }, { "item": "hatstore_hats", "chance": 20 }, { "item": "winter", "chance": 15 } ],
+      "^": { "item": "shelter", "chance": 30 },
+      "{": [ { "item": "lmoe_guns", "chance": 90 }, { "item": "ammo", "chance": 30, "repeat": [ 2, 8 ] } ],
+      "}": [ { "item": "novels", "chance": 90, "repeat": [ 3, 8 ] }, { "item": "religious_books", "chance": 25 } ]
+    }
+  },
   {
     "type": "palette",
     "id": "bunker_ext",