Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA

data/json/bionics.json

@@ -706,6 +706,7 @@
     "description": "Much of the material in your inner eye has been surgically removed and replaced with an array of high-powered, auto-focusing lenses.  They function as integrated binoculars, letting you see much farther than before, and any vision problems you might have had are now gone.",
     "occupied_bodyparts": [ [ "eyes", 2 ] ],
     "flags": [ "ENHANCED_VISION" ],
+    "cant_remove_reason": "The Telescopic Lenses are part of %1$s eyes now.  Removing them would leave %2$s blind.",
     "canceled_mutations": [
       "HYPEROPIC",
       "MYOPIC",

data/json/item_spell_effects.json

@@ -63,5 +63,22 @@
     "min_duration": 18000,
     "max_duration": 18000,
     "damage_type": "cold"
+  },
+  {
+    "id": "spice_pain",
+    "type": "SPELL",
+    "name": { "str": "spice pain" },
+    "description": "Causes pain from eating spicy food.",
+    "valid_targets": [ "self" ],
+    "flags": [ "SILENT" ],
+    "min_damage": -2,
+    "max_damage": -200,
+    "damage_increment": -2.0,
+    "max_level": 100,
+    "//": "Spicier dishes might be added in the future so the spell is ready for them.",
+    "message": "Spicy!",
+    "shape": "blast",
+    "effect": "recover_energy",
+    "effect_str": "PAIN"
   }
 ]

data/json/itemgroups/SUS/domestic.json

@@ -581,7 +581,13 @@
         "prob": 65
       },
       {
-        "distribution": [ { "item": "pot", "prob": 20 }, { "item": "pot_copper", "prob": 5 }, { "item": "iron_pot", "prob": 5 } ],
+        "distribution": [
+          { "item": "pot", "prob": 20 },
+          { "item": "tuna_noodle_casserole", "charges": 8, "container-item": "casserole", "prob": 10 },
+          { "item": "hot_corn_casserole", "charges": 8, "container-item": "casserole", "prob": 10 },
+          { "item": "pot_copper", "prob": 5 },
+          { "item": "iron_pot", "prob": 5 }
+        ],
         "prob": 25
       },
       {

data/json/itemgroups/SUS/library.json

@@ -303,6 +303,9 @@
       { "item": "book_fict_soft_pulp_flashcc", "prob": 2 },
       { "item": "book_fict_soft_pulp_gcapes", "prob": 2 },
       { "item": "book_fict_soft_pulp_yesmurd", "prob": 2 },
+      { "item": "book_anthology_sst", "prob": 2 },
+      { "item": "book_anthology_bk", "prob": 2 },
+      { "item": "book_anthology_cw", "prob": 2 },
       { "item": "novel_pulp", "prob": 1 }
     ]
   },
@@ -338,6 +341,10 @@
       { "item": "book_fict_soft_scifi_dune", "prob": 1 },
       { "item": "book_fict_soft_scifi_zamwe", "prob": 1 },
       { "item": "book_fict_soft_satire_cats", "prob": 1 },
+      { "item": "book_anthology_htloop", "prob": 1 },
+      { "item": "book_anthology_an", "prob": 1 },
+      { "item": "book_anthology_sunvault", "prob": 1 },
+      { "item": "book_anthology_moataatgb", "prob": 1 },
       { "item": "book_fict_soft_pulp_ddive", "prob": 1 }
     ]
   },

data/json/items/book/abstract.json

@@ -332,6 +332,19 @@
     "time": "8 m",
     "fun": 1
   },
+  {
+    "abstract": "book_antho_tpl",
+    "type": "BOOK",
+    "name": { "str": "Generic Anthology Book" },
+    "description": "template for a collection of stories",
+    "intelligence": 5,
+    "symbol": "?",
+    "looks_like": "story_book",
+    "color": "yellow",
+    "time": "15 m",
+    "chapters": 16,
+    "fun": 2
+  },
   {
     "abstract": "book_martial",
     "type": "BOOK",

data/json/items/book/anthology.json

@@ -0,0 +1,78 @@
+[
+  {
+    "id": "book_anthology_moataatgb",
+    "type": "BOOK",
+    "name": {
+      "str": "The Museum of All Things Awesome and That Go Boom",
+      "str_pl": "copies of The Museum of All Things Awesome and That Go Boom"
+    },
+    "description": "The Museum of All Things Awesome and That Go Boom is an anthology of science fiction featuring blunt force trauma, explosions, adventure, derring-do, tigers, Martians, zombies, fanged monsters, dinosaurs (alien and domestic), ray guns, rocket ships, and anthropomorphized marshmallows.  Published by Upper Rubber Boot Books.",
+    "weight": "225 g",
+    "volume": "408 ml",
+    "longest_side": "20 cm",
+    "copy-from": "book_antho_tpl"
+  },
+  {
+    "id": "book_anthology_sunvault",
+    "type": "BOOK",
+    "name": { "str": "Sunvault: Stories of Solarpunk & Eco-Speculation", "str_pl": "copies of Sunvault" },
+    "description": "Sunvault is the first English-language anthology to broadly collect solarpunk short fiction, artwork, and poetry.  A new genre for the 21st Century, solarpunk is a revolution against despair.  Focusing on solutions to environmental disasters, solarpunk envisions a future of green, sustainable energy used by societies that value inclusiveness, cooperation, and personal freedom.  Published by Upper Rubber Boot Books.",
+    "weight": "225 g",
+    "volume": "408 ml",
+    "longest_side": "20 cm",
+    "copy-from": "book_antho_tpl"
+  },
+  {
+    "id": "book_anthology_sst",
+    "type": "BOOK",
+    "name": { "str": "Sharp & Sugar Tooth", "str_pl": "copies of Sharp & Sugar Tooth" },
+    "description": "Sharp & Sugar Tooth: Women Up To No Good is a horror anthology of dark fiction and darker appetites, edited by Octavia Cade.  Containing 22 stories of “bad” women, and “good” women who just haven’t been caught yet, it features 22 fearless writers who identify as female, non-binary, or a marginalized sex or gender identity.  Published by Upper Rubber Boot Books.",
+    "weight": "225 g",
+    "volume": "408 ml",
+    "longest_side": "20 cm",
+    "copy-from": "book_antho_tpl"
+  },
+  {
+    "id": "book_anthology_bk",
+    "type": "BOOK",
+    "name": { "str": "Broad Knowledge", "str_pl": "copies of Broad Knowledge" },
+    "description": "Broad Knowledge: 35 Women Up To No Good is a feminist anthology of dark fiction and darker knowledge, edited by Joanne Merriam.  Containing 35 stories of “bad” women, and “good” women who just haven’t been caught yet.  Published by Upper Rubber Boot Books.",
+    "weight": "225 g",
+    "volume": "408 ml",
+    "longest_side": "20 cm",
+    "copy-from": "book_antho_tpl"
+  },
+  {
+    "id": "book_anthology_cw",
+    "type": "BOOK",
+    "name": { "str": "Choose Wisely", "str_pl": "copies of Choose Wisely" },
+    "description": "Choose Wisely: 35 Women Up To No Good is a feminist anthology of dark fiction, co-edited by H. L. Nelson and Joanne Merriam.  Containing 35 stories of “bad” women, and “good” women who just haven’t been caught yet, it features Joyce Carol Oates, Aimee Bender, Diane Cook, and 33 other fearless women writers.  Published by Upper Rubber Boot Books.",
+    "weight": "225 g",
+    "volume": "408 ml",
+    "longest_side": "20 cm",
+    "copy-from": "book_antho_tpl"
+  },
+  {
+    "id": "book_anthology_an",
+    "type": "BOOK",
+    "name": { "str": "Apocalypse Now", "str_pl": "copies of Apocalypse Now" },
+    "description": "Every society and every generation has its version of the apocalypse: swine flu, genetic mutation, global warming, nuclear fallout, the second coming, peak oil, mass extinction, giant irradiated ants, zombies… Apocalypse Now: Poems and Prose from the End of Days is the first anthology of its kind to bring together the poetry and prose of some of America’s finest (though not always most well-known) literary voices with an eye for the literary and the popular, for story and lyric, for the past and the future, for the psychological and the physical, for the real and the fantastic.  Published by Upper Rubber Boot Books.",
+    "weight": "225 g",
+    "volume": "408 ml",
+    "longest_side": "20 cm",
+    "copy-from": "book_antho_tpl"
+  },
+  {
+    "id": "book_anthology_htloop",
+    "type": "BOOK",
+    "name": {
+      "str": "How to Live on Other Planets: A Handbook for Aspiring Aliens",
+      "str_pl": "copies of How to Live on Other Planets"
+    },
+    "description": "How to Live on Other Planets: A Handbook for Aspiring Aliens explores the immigrant experience in a science fiction setting, with exciting fiction and poetry from some of the genre’s best writers.  Published by Upper Rubber Boot Books.",
+    "weight": "225 g",
+    "volume": "408 ml",
+    "longest_side": "20 cm",
+    "copy-from": "book_antho_tpl"
+  }
+]

data/json/items/book/misc.json

@@ -66,6 +66,9 @@
     "symbol": "?",
     "looks_like": "record_patient",
     "color": "light_green",
+    "skill": "mechanics",
+    "required_level": 1,
+    "max_level": 1,
     "intelligence": 8,
     "time": "45 m",
     "fun": -2

data/json/items/comestibles/casseroles.json

@@ -0,0 +1,38 @@
+[
+  {
+    "type": "COMESTIBLE",
+    "id": "hot_corn_casserole",
+    "name": { "str_sp": "hot corn casserole" },
+    "comestible_type": "FOOD",
+    "weight": "178 g",
+    "color": "yellow",
+    "symbol": "%",
+    "spoils_in": "2 days",
+    "container": "casserole",
+    "calories": 301,
+    "fun": 6,
+    "volume": "250 ml",
+    "description": "It’s cheesy and indulgent, although the mix of tender kernels of corn, veggies, fresh herbs, and a pop of heat keep it in check so it’s not too heavy for the apocalypse.",
+    "price": 50,
+    "price_postapoc": 100,
+    "flags": [ "EATEN_HOT" ]
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "tuna_noodle_casserole",
+    "name": { "str_sp": "fish noodle casserole" },
+    "comestible_type": "FOOD",
+    "weight": "178 g",
+    "color": "yellow",
+    "symbol": "%",
+    "spoils_in": "2 days",
+    "container": "casserole",
+    "calories": 601,
+    "fun": 6,
+    "volume": "250 ml",
+    "description": "Fish noodle casserole is a casserole primarily made with pasta and canned tuna, with canned peas and corn sometimes added.",
+    "price": 50,
+    "price_postapoc": 100,
+    "flags": [ "EATEN_HOT" ]
+  }
+]

data/json/items/comestibles/meat_dishes.json

@@ -154,12 +154,10 @@
   },
   {
     "id": "sausage_wasteland",
-    "copy-from": "sausage_raw",
+    "copy-from": "sausage",
     "type": "COMESTIBLE",
     "name": { "str": "wasteland sausage" },
     "description": "Lean sausage made from heavily salt-cured offal, with natural gut casing.  Waste not, want not.",
-    "parasites": 0,
-    "healthy": 0,
     "spoils_in": 1176,
     "quench": -7,
     "fun": -3,

data/json/items/comestibles/nuts.json

@@ -525,6 +525,7 @@
     "price_postapoc": 300,
     "material": [ "nut" ],
     "vitamins": [ [ "calcium", 1 ], [ "iron", 2 ] ],
-    "volume": "250 ml"
+    "volume": "250 ml",
+    "milling": { "into": "flour", "conversion_rate": 7.5 }
   }
 ]

data/json/items/comestibles/spice.json

@@ -9,15 +9,20 @@
   },
   {
     "id": "hot_sauce",
-    "copy-from": "spice",
     "container": "bottle_plastic_small",
     "type": "COMESTIBLE",
+    "comestible_type": "DRINK",
     "name": { "str_sp": "hot sauce" },
     "description": "Flamin' hot sauce.  Bad idea to eat on its own.  You should probably wash your hands after handling.",
     "weight": "6 g",
     "charges": 50,
     "volume": "250 ml",
+    "//": "hot sauces are very salty, hence the negative quench",
+    "quench": -2,
+    "calories": 5,
+    "symbol": "~",
     "color": "red",
+    "use_action": { "type": "cast_spell", "spell_id": "sauce_pain", "no_fail": true, "level": 1 },
     "primary_material": "water",
     "freezing_point": -30,
     "phase": "liquid"

data/json/items/comestibles/veggy_dishes.json

@@ -19,6 +19,7 @@
     "copy-from": "cattail_rhizome",
     "weight": "160 g",
     "volume": "220 ml",
+    "milling": { "into": "flour", "conversion_rate": 7.5 },
     "color": "black",
     "calories": 280,
     "spoils_in": "5 days",
@@ -205,6 +206,44 @@
     "price_postapoc": 150,
     "flags": [ "EATEN_HOT" ]
   },
+  {
+    "type": "COMESTIBLE",
+    "id": "corn_on_cob",
+    "name": { "str_sp": "corn on the cob" },
+    "comestible_type": "FOOD",
+    "weight": "178 g",
+    "color": "yellow",
+    "symbol": "%",
+    "material": [ "veggy" ],
+    "vitamins": [ [ "vitA", 6 ], [ "vitC", 3 ], [ "iron", 3 ] ],
+    "spoils_in": "2 days",
+    "quench": -2,
+    "calories": 370,
+    "volume": "250 ml",
+    "description": "An ear of corn cooked in foil.",
+    "price": 50,
+    "price_postapoc": 100,
+    "flags": [ "EATEN_HOT" ]
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "pan_roasted_corn",
+    "name": { "str_sp": "pan roasted corn" },
+    "comestible_type": "FOOD",
+    "weight": "178 g",
+    "color": "yellow",
+    "symbol": "%",
+    "material": [ "veggy" ],
+    "vitamins": [ [ "vitA", 6 ], [ "vitC", 3 ], [ "iron", 3 ] ],
+    "spoils_in": "2 days",
+    "calories": 172,
+    "fun": 3,
+    "volume": "250 ml",
+    "description": "Corn roasted in a frying pan with herbs and spices.",
+    "price": 50,
+    "price_postapoc": 100,
+    "flags": [ "EATEN_HOT" ]
+  },
   {
     "type": "COMESTIBLE",
     "id": "hominy",
@@ -285,6 +324,7 @@
     "material": [ "veggy" ],
     "primary_material": "dried_vegetable",
     "volume": "250 ml",
+    "milling": { "into": "flour", "conversion_rate": 3 },
     "cooks_like": "rice_cooked",
     "flags": [ "EDIBLE_FROZEN" ],
     "charges": 3,

data/json/monsterdrops/zombie_medical.json

@@ -0,0 +1,29 @@
+[
+  {
+    "id": "mon_zombie_medical_death_drops",
+    "type": "item_group",
+    "subtype": "collection",
+    "entries": [
+      { "group": "lab_torso", "damage": [ 1, 4 ] },
+      { "group": "lab_pants", "damage": [ 1, 4 ] },
+      { "group": "lab_shoes", "damage": [ 1, 4 ] },
+      { "group": "underwear", "damage": [ 1, 4 ] },
+      { "group": "hazmat_gloves", "damage": [ 1, 4 ] },
+      { "group": "hazmat_masks", "damage": [ 1, 4 ] },
+      { "group": "gear_medical" }
+    ]
+  },
+  {
+    "id": "zombie_medical_clothes",
+    "type": "item_group",
+    "subtype": "collection",
+    "entries": [
+      { "group": "lab_torso", "damage": [ 1, 4 ] },
+      { "group": "lab_pants", "damage": [ 1, 4 ] },
+      { "group": "lab_shoes", "damage": [ 1, 4 ] },
+      { "group": "underwear", "damage": [ 1, 4 ] },
+      { "group": "hazmat_gloves", "damage": [ 1, 4 ] },
+      { "group": "hazmat_masks", "damage": [ 1, 4 ] }
+    ]
+  }
+]

data/json/monstergroups/zombie_upgrades.json

@@ -66,6 +66,21 @@
       { "monster": "mon_skeleton", "freq": 50, "cost_multiplier": 1 }
     ]
   },
+  {
+    "type": "monstergroup",
+    "name": "GROUP_MEDICAL_UPGRADE",
+    "default": "mon_zombie_medical_brute",
+    "//": "Masters pick from here when upgrading.  Note that 'freq' units are tenth of a percent, with default filling in the gap.",
+    "monsters": [
+      { "monster": "mon_zombie_medical_brute", "freq": 300, "cost_multiplier": 2 },
+      { "monster": "mon_boomer", "freq": 200, "cost_multiplier": 1 },
+      { "monster": "mon_zombie_hollow", "freq": 100, "cost_multiplier": 1 },
+      { "monster": "mon_skeleton_medical", "freq": 200, "cost_multiplier": 1 },
+      { "monster": "mon_zombie_medical_acidic", "freq": 100, "cost_multiplier": 2 },
+      { "monster": "mon_zombie_medical_pupa", "freq": 50, "cost_multiplier": 2 },
+      { "monster": "mon_zombie_pupa_medical_decoy", "freq": 50, "cost_multiplier": 2 }
+    ]
+  },
   {
     "type": "monstergroup",
     "name": "GROUP_ZOMBIE_BRUTE",