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

SuddenEyePuncture · Jun 7, 2021 · 58cd96e · 58cd96e
2 parents 0fac78c + 31837e9
commit 58cd96e
Show file tree

Hide file tree

Showing 22 changed files with 89 additions and 29 deletions.
diff --git a/data/json/itemgroups/Drugs_Tobacco_Alcohol/drugs.json b/data/json/itemgroups/Drugs_Tobacco_Alcohol/drugs.json
@@ -152,6 +152,7 @@
       { "item": "aspirin", "prob": 85, "charges": [ 1, 20 ] },
       { "item": "caffeine", "prob": 25, "charges": [ 1, 10 ] },
       { "item": "pills_sleep", "prob": 15, "charges": [ 1, 10 ] },
+      { "item": "melatonin_tablet", "prob": 10, "charges": [ 1, 30 ] },
       { "item": "iodine", "prob": 5, "charges": [ 1, 10 ] },
       { "item": "prussian_blue", "prob": 5, "charges": [ 1, 10 ] },
       { "item": "dayquil", "prob": 70, "charges": [ 1, 5 ] },

diff --git a/data/json/itemgroups/Locations_MapExtras/locations_commercial.json b/data/json/itemgroups/Locations_MapExtras/locations_commercial.json
@@ -8,6 +8,7 @@
     "entries": [
       { "item": "aspirin", "prob": 85, "charges": [ 1, 10 ] },
       { "item": "caffeine", "prob": 25, "charges": [ 1, 10 ] },
+      { "item": "melatonin_tablet", "prob": 5, "charges": [ 1, 30 ] },
       { "group": "tobacco_products", "prob": 161 },
       { "item": "sponge", "prob": 10 },
       { "group": "ammo_pocket_batteries_full", "prob": 50 },

diff --git a/data/json/itemgroups/Locations_MapExtras/mall_item_groups.json b/data/json/itemgroups/Locations_MapExtras/mall_item_groups.json
@@ -85,6 +85,7 @@
       [ "aspirin", 45 ],
       [ "caffeine", 50 ],
       [ "pills_sleep", 45 ],
+      [ "melatonin_tablet", 30 ],
       [ "disinfectant", 15 ],
       [ "vaccine_shot", 10 ],
       [ "protein_powder", 40 ],

diff --git a/data/json/itemgroups/SUS/domestic.json b/data/json/itemgroups/SUS/domestic.json
@@ -649,7 +649,13 @@
       { "item": "eyedrops", "prob": 15 },
       { "item": "pepto", "prob": 70, "charges-min": 1, "container-item": "bottle_plastic_small" },
       { "item": "inhaler", "prob": 25, "charges-min": 10, "charges-max": 100 },
-      { "item": "pills_sleep", "prob": 10, "charges": [ 1, 10 ] },
+      {
+        "distribution": [
+          { "item": "pills_sleep", "prob": 60, "charges": [ 1, 10 ] },
+          { "item": "melatonin_tablet", "prob": 40, "charges": [ 1, 30 ] }
+        ],
+        "prob": 10
+      },
       {
         "distribution": [ { "item": "nyquil", "prob": 60, "charges-min": 1 }, { "item": "dayquil", "prob": 20, "charges-min": 1 } ],
         "prob": 50

diff --git a/data/json/itemgroups/collections_domestic.json b/data/json/itemgroups/collections_domestic.json
@@ -262,6 +262,7 @@
       [ "eyedrops", 10 ],
       [ "holy_symbol", 5 ],
       [ "pills_sleep", 5 ],
+      { "item": "melatonin_tablet", "prob": 3, "charges": [ 1, 30 ] },
       { "item": "nyquil", "prob": 5, "charges": [ 1, 5 ] },
       { "group": "mansion_guns", "prob": 3 },
       { "group": "harddrugs", "prob": 1 },

diff --git a/data/json/itemgroups/stashes.json b/data/json/itemgroups/stashes.json
@@ -44,6 +44,7 @@
     "id": "stash_drugs",
     "items": [
       { "item": "pills_sleep", "prob": 15, "charges": [ 1, 10 ] },
+      { "item": "melatonin_tablet", "prob": 5, "charges": [ 1, 30 ] },
       { "item": "oxycodone", "prob": 4, "charges": [ 1, 10 ] },
       { "item": "morphine", "prob": 4, "charges": [ 1, 4 ] },
       { "item": "xanax", "prob": 10, "charges": [ 1, 10 ] },

diff --git a/data/json/items/generic.json b/data/json/items/generic.json
@@ -1838,6 +1838,7 @@
   {
     "type": "GENERIC",
     "id": "mobile_memory_card_used",
+    "looks_like": "mobile_memory_card",
     "symbol": ",",
     "color": "white",
     "name": { "str": "SD-Memory card (clean)", "str_pl": "SD-Memory cards (clean)" },
@@ -1853,6 +1854,7 @@
   {
     "type": "GENERIC",
     "id": "mobile_memory_card_encrypted",
+    "looks_like": "mobile_memory_card",
     "symbol": ",",
     "color": "white",
     "name": { "str": "SD-Memory card (encrypted)", "str_pl": "SD-Memory cards (encrypted)" },
@@ -1867,6 +1869,7 @@
   {
     "type": "GENERIC",
     "id": "mobile_memory_card_science",
+    "looks_like": "mobile_memory_card",
     "symbol": ",",
     "color": "white",
     "name": { "str": "Science SD-Memory card" },

diff --git a/data/json/items/vehicle/engine.json b/data/json/items/vehicle/engine.json
@@ -315,7 +315,8 @@
     "type": "ENGINE",
     "name": { "str": "1900 hp gas turbine engine" },
     "description": "A large gas turbine engine, usually used for military helicopters.  Known for its high rate of fuel consumption.",
-    "weight": "1582000 g",
+    "weight": "400000 g",
+    "//": "Much lighter weight than the 1,350 HP small gas turbine.  Doubled the published weight to account for a transmission.",
     "volume": "63 L",
     "price": 192000,
     "price_postapoc": 5000,
@@ -327,7 +328,7 @@
     "type": "ENGINE",
     "name": { "str": "6000 hp gas turbine engine" },
     "description": "A massive gas turbine engine, used to power the V-22 Osprey.  Known for its high rate of fuel consumption.",
-    "weight": "3164000 g",
+    "weight": "900000 g",
     "volume": "95 L",
     "price": 960000,
     "price_postapoc": 7500,

diff --git a/data/json/mapgen/farm_stills.json b/data/json/mapgen/farm_stills.json
@@ -297,7 +297,7 @@
         "W": "f_wood_keg"
       },
       "place_vehicles": [ { "vehicle": "bikeshop", "x": 22, "y": 19, "chance": 100, "rotation": 90 } ],
-      "liquids": { "X": { "liquid": "hb_beer", "amount": [ 100, 1000 ] }, "W": { "liquid": "dandelion_wine", "amount": [ 100, 1000 ] } },
+      "liquids": { "X": { "liquid": "hb_beer", "amount": [ 100, 500 ] }, "W": { "liquid": "dandelion_wine", "amount": [ 100, 500 ] } },
       "items": {
         "%": { "item": "wines_worthy", "chance": 70, "repeat": [ 1, 2 ] },
         "0": { "item": "keg_wine_intact", "chance": 70 },

diff --git a/data/json/mapgen/isherwood_farms/farm_isherwood.json b/data/json/mapgen/isherwood_farms/farm_isherwood.json
@@ -300,7 +300,7 @@
         "X": "f_wood_keg",
         "W": "f_wood_keg"
       },
-      "liquids": { "X": { "liquid": "hb_beer", "amount": [ 100, 1000 ] }, "W": { "liquid": "dandelion_wine", "amount": [ 100, 1000 ] } },
+      "liquids": { "X": { "liquid": "hb_beer", "amount": [ 100, 500 ] }, "W": { "liquid": "dandelion_wine", "amount": [ 100, 500 ] } },
       "items": {
         "a": { "item": "dry_goods", "chance": 50, "repeat": [ 2, 8 ] },
         "r": { "item": "preserved_food", "chance": 50, "repeat": [ 2, 8 ] },

diff --git a/data/json/mapgen/mansion.json b/data/json/mapgen/mansion.json
@@ -2737,7 +2737,7 @@
         "=": "f_machinery_old",
         "}": "f_generator_broken"
       },
-      "liquids": { "!": { "liquid": "wine_chardonnay", "amount": [ 100, 1000 ] } },
+      "liquids": { "!": { "liquid": "wine_chardonnay", "amount": [ 100, 500 ] } },
       "place_loot": [ { "item": "deck_of_cards", "x": 16, "y": 11, "chance": 100 } ],
       "items": {
         "%": { "item": "wines_worthy", "chance": 70, "repeat": [ 1, 2 ] },

diff --git a/data/json/mapgen/nested/basement_nested.json b/data/json/mapgen/nested/basement_nested.json
@@ -1304,7 +1304,7 @@
       "palettes": [ "standard_domestic_palette" ],
       "terrain": { "|": "t_wall_wood" },
       "furniture": { "%": "f_rack_wood", "$": "f_fvat_empty", "0": "f_wood_keg", "!": "f_wood_keg" },
-      "liquids": { "X": { "liquid": "hb_beer", "amount": [ 100, 1000 ] }, "W": { "liquid": "dandelion_wine", "amount": [ 100, 1000 ] } },
+      "liquids": { "X": { "liquid": "hb_beer", "amount": [ 100, 500 ] }, "W": { "liquid": "dandelion_wine", "amount": [ 100, 500 ] } },
       "items": {
         "%": [
           { "item": "liqstore_brew", "chance": 50, "repeat": [ 2, 8 ] },
@@ -1332,7 +1332,7 @@
       "palettes": [ "standard_domestic_palette" ],
       "terrain": { "|": "t_wall_wood" },
       "furniture": { "%": "f_rack_wood", "$": "f_fvat_empty", "0": "f_wood_keg", "!": "f_wood_keg" },
-      "liquids": { "0": { "liquid": "hb_beer", "amount": [ 10, 1000 ] }, "!": { "liquid": "dandelion_wine", "amount": [ 10, 1000 ] } },
+      "liquids": { "0": { "liquid": "hb_beer", "amount": [ 10, 500 ] }, "!": { "liquid": "dandelion_wine", "amount": [ 10, 500 ] } },
       "items": {
         "%": [
           { "item": "liqstore_brew", "chance": 50, "repeat": [ 2, 8 ] },
@@ -1360,7 +1360,7 @@
       "palettes": [ "standard_domestic_palette" ],
       "terrain": { "|": "t_wall_wood" },
       "furniture": { "%": "f_rack_wood", "$": "f_fvat_empty", "0": "f_wood_keg", ",": "f_still", "~": "f_ash", "!": "f_wood_keg" },
-      "liquids": { "0": { "liquid": "moonshine", "amount": [ 100, 1000 ] }, "!": { "liquid": "mead", "amount": [ 100, 1000 ] } },
+      "liquids": { "0": { "liquid": "moonshine", "amount": [ 100, 500 ] }, "!": { "liquid": "mead", "amount": [ 100, 500 ] } },
       "items": {
         "%": [
           { "item": "liqstore_brew", "chance": 50, "repeat": [ 2, 8 ] },
@@ -1388,7 +1388,7 @@
       "palettes": [ "standard_domestic_palette" ],
       "terrain": { "|": "t_wall_wood" },
       "furniture": { "%": "f_rack_wood", "$": "f_fvat_empty", "0": "f_wood_keg", ",": "f_still", "~": "f_ash", "!": "f_wood_keg" },
-      "liquids": { "0": { "liquid": "moonshine", "amount": [ 100, 1000 ] }, "!": { "liquid": "mead", "amount": [ 100, 1000 ] } },
+      "liquids": { "0": { "liquid": "moonshine", "amount": [ 100, 500 ] }, "!": { "liquid": "mead", "amount": [ 100, 500 ] } },
       "items": {
         "%": [
           { "item": "liqstore_brew", "chance": 50, "repeat": [ 2, 8 ] },
@@ -1819,8 +1819,8 @@
       },
       "furniture": { "%": "f_rack_wood", "0": "f_wood_keg", "!": "f_wood_keg", "t": "f_table", "E": "f_armchair", "m": "f_glass_fridge" },
       "liquids": {
-        "0": { "liquid": "wine_cabernet", "amount": [ 100, 1000 ] },
-        "!": { "liquid": "wine_chardonnay", "amount": [ 100, 1000 ] }
+        "0": { "liquid": "wine_cabernet", "amount": [ 100, 500 ] },
+        "!": { "liquid": "wine_chardonnay", "amount": [ 100, 500 ] }
       },
       "place_loot": [ { "item": "deck_of_cards", "x": 3, "y": 3, "chance": 100 } ],
       "items": {
@@ -1860,8 +1860,8 @@
       },
       "furniture": { "%": "f_rack_wood", "0": "f_wood_keg", "!": "f_wood_keg", "t": "f_table", "E": "f_armchair", "m": "f_glass_fridge" },
       "liquids": {
-        "0": { "liquid": "wine_cabernet", "amount": [ 100, 1000 ] },
-        "!": { "liquid": "wine_chardonnay", "amount": [ 100, 1000 ] }
+        "0": { "liquid": "wine_cabernet", "amount": [ 100, 500 ] },
+        "!": { "liquid": "wine_chardonnay", "amount": [ 100, 500 ] }
       },
       "place_loot": [ { "item": "deck_of_cards", "x": 3, "y": 3, "chance": 100 } ],
       "items": {
@@ -1901,8 +1901,8 @@
       },
       "furniture": { "%": "f_rack_wood", "0": "f_wood_keg", "!": "f_wood_keg", "t": "f_table", "E": "f_armchair", "m": "f_glass_fridge" },
       "liquids": {
-        "0": { "liquid": "wine_cabernet", "amount": [ 100, 1000 ] },
-        "!": { "liquid": "wine_chardonnay", "amount": [ 100, 1000 ] }
+        "0": { "liquid": "wine_cabernet", "amount": [ 100, 500 ] },
+        "!": { "liquid": "wine_chardonnay", "amount": [ 100, 500 ] }
       },
       "place_loot": [ { "item": "deck_of_cards", "x": 3, "y": 3, "chance": 100 } ],
       "items": {
@@ -1942,8 +1942,8 @@
       },
       "furniture": { "%": "f_rack_wood", "0": "f_wood_keg", "!": "f_wood_keg", "t": "f_table", "E": "f_armchair", "m": "f_glass_fridge" },
       "liquids": {
-        "0": { "liquid": "wine_cabernet", "amount": [ 100, 1000 ] },
-        "!": { "liquid": "wine_chardonnay", "amount": [ 100, 1000 ] }
+        "0": { "liquid": "wine_cabernet", "amount": [ 100, 500 ] },
+        "!": { "liquid": "wine_chardonnay", "amount": [ 100, 500 ] }
       },
       "place_loot": [ { "item": "deck_of_cards", "x": 3, "y": 3, "chance": 100 } ],
       "items": {

diff --git a/data/json/mapgen/riverside/potters_cottage.json b/data/json/mapgen/riverside/potters_cottage.json
@@ -279,7 +279,7 @@
         "W": "f_wood_keg"
       },
       "place_vehicles": [ { "vehicle": "bikeshop", "x": 22, "y": 19, "chance": 100, "rotation": 90 } ],
-      "liquids": { "X": { "liquid": "hb_beer", "amount": [ 100, 1000 ] }, "W": { "liquid": "dandelion_wine", "amount": [ 100, 1000 ] } },
+      "liquids": { "X": { "liquid": "hb_beer", "amount": [ 100, 500 ] }, "W": { "liquid": "dandelion_wine", "amount": [ 100, 500 ] } },
       "items": {
         "a": { "item": "dry_goods", "chance": 50, "repeat": [ 2, 8 ] },
         "r": { "item": "preserved_food", "chance": 50, "repeat": [ 2, 8 ] },

diff --git a/data/json/mutations/mutations.json b/data/json/mutations/mutations.json
@@ -4168,6 +4168,7 @@
   {
     "type": "mutation",
     "id": "LARGE",
+    "flags": [ "LARGE" ],
     "name": { "str": "Inconveniently Large" },
     "points": 0,
     "visibility": 1,
@@ -4186,6 +4187,7 @@
   {
     "type": "mutation",
     "id": "LARGE_OK",
+    "flags": [ "LARGE" ],
     "name": { "str": "Large" },
     "points": 2,
     "visibility": 1,
@@ -4204,6 +4206,7 @@
   {
     "type": "mutation",
     "id": "HUGE",
+    "flags": [ "HUGE" ],
     "name": { "str": "Freakishly Huge" },
     "points": -2,
     "visibility": 4,
@@ -4226,6 +4229,7 @@
   {
     "type": "mutation",
     "id": "HUGE_OK",
+    "flags": [ "HUGE" ],
     "name": { "str": "Huge" },
     "points": 2,
     "visibility": 4,
@@ -4532,6 +4536,7 @@
   {
     "type": "mutation",
     "id": "SMALL",
+    "flags": [ "SMALL" ],
     "name": { "str": "Little" },
     "points": -2,
     "visibility": 5,
@@ -4548,6 +4553,7 @@
   {
     "type": "mutation",
     "id": "SMALL2",
+    "flags": [ "TINY" ],
     "name": { "str": "Tiny" },
     "points": -4,
     "visibility": 8,
@@ -4566,6 +4572,7 @@
   {
     "type": "mutation",
     "id": "SMALL_OK",
+    "flags": [ "TINY" ],
     "name": { "str": "Unassuming" },
     "points": 3,
     "mixed_effect": true,

diff --git a/data/json/professions.json b/data/json/professions.json
@@ -1547,12 +1547,7 @@
           { "item": "legpouch_large", "contents-group": "army_mags_usp9" },
           { "item": "usp_9mm", "ammo-item": "9mmfmj", "charges": 15, "container-item": "holster" },
           { "item": "baton-extended", "container-item": "police_belt" },
-          {
-            "item": "ksg",
-            "ammo-item": "shot_00",
-            "charges": 7,
-            "contents-item": [ "shoulder_strap", "ksg_aux_shotgun" ]
-          }
+          { "item": "ksg", "ammo-item": "shot_00", "charges": 7, "contents-item": [ "shoulder_strap" ] }
         ]
       },
       "male": [ "boxer_shorts" ],
@@ -3777,6 +3772,10 @@
           "scalpel",
           "syringe",
           "morphine",
+          "aspirin",
+          "antibiotics",
+          "disinfectant",
+          "pepto",
           "molle_pack"
         ],
         "entries": [

diff --git a/data/json/recipes/recipe_companion.json b/data/json/recipes/recipe_companion.json
@@ -3,6 +3,7 @@
     "type": "recipe",
     "activity_level": "fake",
     "result": "charcoal",
+    "byproducts": [ [ "charcoal", 12 ] ],
     "id_suffix": "npc",
     "category": "CC_OTHER",
     "subcategory": "CSC_OTHER_MATERIALS",