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

…into CleverRaven-master
a-chancey · Mar 28, 2022 · 935054c · 935054c
2 parents 744e461 + e0dc297
commit 935054c
Show file tree

Hide file tree

Showing 182 changed files with 1,220 additions and 729 deletions.
diff --git a/data/json/construction.json b/data/json/construction.json
@@ -2234,6 +2234,30 @@
     "pre_special": "check_empty",
     "post_terrain": "f_leaves_pile"
   },
+  {
+    "type": "construction",
+    "id": "constr_hammock",
+    "group": "place_hammock",
+    "category": "FURN",
+    "required_skills": [ [ "fabrication", 0 ] ],
+    "time": "5 m",
+    "components": [ [ [ "hammock", 1 ] ] ],
+    "pre_note": "Can be deconstructed without tools.  Must be supported on at least two sides.",
+    "pre_special": "check_support",
+    "post_terrain": "f_hammock"
+  },
+  {
+    "type": "construction",
+    "id": "constr_hammock_net",
+    "group": "place_net_hammock",
+    "category": "FURN",
+    "required_skills": [ [ "fabrication", 0 ] ],
+    "time": "5 m",
+    "components": [ [ [ "hammock_net", 1 ] ] ],
+    "pre_note": "Can be deconstructed without tools.  Must be supported on at least two sides.",
+    "pre_special": "check_support",
+    "post_terrain": "f_hammock_net"
+  },
   {
     "type": "construction",
     "id": "constr_bed",

diff --git a/data/json/construction_group.json b/data/json/construction_group.json
@@ -459,6 +459,16 @@
     "id": "build_pile_of_leaves",
     "name": "Build Pile of Leaves"
   },
+  {
+    "type": "construction_group",
+    "id": "place_hammock",
+    "name": "Place Hammock"
+  },
+  {
+    "type": "construction_group",
+    "id": "place_net_hammock",
+    "name": "Place Net Hammock"
+  },
   {
     "type": "construction_group",
     "id": "build_pillow_fort",

diff --git a/data/json/effects.json b/data/json/effects.json
@@ -3207,7 +3207,7 @@
   {
     "type": "effect_type",
     "id": "pd_str_bad",
-    "name": [ "Muscle Vanishment", "Muscle Dissapearance" ],
+    "name": [ "Muscle Vanishment", "Muscle Disappearance" ],
     "desc": [ "You feel as if your muscles are not quite there.", "You feel as if your muscles are not in your body." ],
     "max_intensity": 2,
     "rating": "bad",

diff --git a/data/json/flags.json b/data/json/flags.json
@@ -100,6 +100,11 @@
     "type": "json_flag",
     "info": "This item enables you to keep track of calorie intake."
   },
+  {
+    "id": "CASELESS_ROUNDS",
+    "type": "json_flag",
+    "info": "Being caseless rounds, these <bad>cannot be disassembled or reloaded</bad>."
+  },
   {
     "id": "CBM",
     "type": "json_flag",
@@ -198,6 +203,11 @@
     "type": "json_flag",
     "info": "This armor can't be worn directly."
   },
+  {
+    "id": "DECAY_EXPOSED_ATMOSPHERE",
+    "type": "json_flag",
+    "info": "If exposed to the atmosphere, it will <bad>start to go bad</bad>."
+  },
   {
     "id": "DIRTY",
     "type": "json_flag"
@@ -631,6 +641,16 @@
     "info": "This clothing <good>partially protects</good> you from <info>radiation</info>.",
     "conflicts": [ "RAD_PROOF" ]
   },
+  {
+    "id": "RAD_STERILIZED",
+    "type": "json_flag",
+    "info": "Sterilized using radiation, so it's <good>safe to eat</good>."
+  },
+  {
+    "id": "RAD_STERILIZED_EDIBLE_FOREVER",
+    "type": "json_flag",
+    "info": "Sterilized using radiation, so it's <good>safe to eat</good> and <good>will remain edible nearly forever</good>."
+  },
   {
     "id": "REQUIRES_BALANCE",
     "type": "json_flag",
@@ -1377,6 +1397,16 @@
     "info": "This item is designed to have special effects",
     "type": "json_flag"
   },
+  {
+    "id": "MUTAGEN_CATALYST",
+    "type": "json_flag",
+    "info": "Injecting it will <neutral>jumpstart mutation</neutral>."
+  },
+  {
+    "id": "MUTAGEN_PRIMER",
+    "type": "json_flag",
+    "info": "Injecting it will <neutral>prime your body for mutation</neutral>."
+  },
   {
     "id": "MYCUS_OK",
     "type": "json_flag"

diff --git a/data/json/furniture_and_terrain/furniture-sleep.json b/data/json/furniture_and_terrain/furniture-sleep.json
@@ -130,6 +130,54 @@
       "items": [ { "item": "rag", "count": [ 40, 55 ] }, { "item": "down_feather", "count": [ 900, 1100 ] } ]
     }
   },
+  {
+    "type": "furniture",
+    "id": "f_hammock",
+    "name": "hammock",
+    "looks_like": "t_leanto",
+    "symbol": "#",
+    "description": "A large sheet of cloth with ropes on two sides tied to nearby objects.  It's quite comfortable to sleep in, but provides no warmth.",
+    "color": "white",
+    "move_cost_mod": 3,
+    "comfort": 4,
+    "floor_bedding_warmth": -1400,
+    "required_str": -1,
+    "deconstruct": { "items": [ { "item": "hammock", "count": 1 } ] },
+    "flags": [ "TRANSPARENT", "FLAMMABLE", "PLACE_ITEM", "ORGANIC", "CAN_SIT", "EASY_DECONSTRUCT" ],
+    "bash": {
+      "str_min": 4,
+      "str_max": 14,
+      "sound": "rrrrip!",
+      "sound_fail": "slap!",
+      "sound_vol": 6,
+      "sound_fail_vol": 3,
+      "items": [ { "item": "rag", "count": [ 20, 30 ] }, { "item": "rope_makeshift_6", "count": [ 2, 3 ] } ]
+    }
+  },
+  {
+    "type": "furniture",
+    "id": "f_hammock_net",
+    "name": "net hammock",
+    "looks_like": "f_hammock",
+    "symbol": "#",
+    "description": "A large net with ropes on two sides tied to nearby objects.  It's quite comfortable to sleep in, but provides no warmth.",
+    "color": "white",
+    "move_cost_mod": 3,
+    "comfort": 4,
+    "floor_bedding_warmth": -1500,
+    "required_str": -1,
+    "deconstruct": { "items": [ { "item": "hammock_net", "count": 1 } ] },
+    "flags": [ "TRANSPARENT", "FLAMMABLE", "PLACE_ITEM", "ORGANIC", "CAN_SIT", "EASY_DECONSTRUCT" ],
+    "bash": {
+      "str_min": 2,
+      "str_max": 10,
+      "sound": "rrrrip!",
+      "sound_fail": "slap!",
+      "sound_vol": 6,
+      "sound_fail_vol": 3,
+      "items": [ { "item": "string_36", "count": [ 12, 16 ] }, { "item": "rope_makeshift_6", "count": [ 2, 3 ] } ]
+    }
+  },
   {
     "type": "furniture",
     "id": "f_makeshift_bed",

diff --git a/data/json/itemgroups/Clothing_Gear/gear_civilian.json b/data/json/itemgroups/Clothing_Gear/gear_civilian.json
@@ -44,6 +44,7 @@
       { "item": "gum", "prob": 50, "charges": [ 0, 10 ] },
       { "group": "ammo_pocket_batteries", "prob": 50 },
       [ "wrapper", 50 ],
+      [ "wrapper_foil", 5 ],
       [ "string_6", 50 ],
       [ "pocket_firstaid", 5 ],
       [ "pocket_survival", 5 ],

diff --git a/data/json/itemgroups/Locations_MapExtras/locations.json b/data/json/itemgroups/Locations_MapExtras/locations.json
@@ -720,6 +720,8 @@
       [ "stethoscope", 2 ],
       { "item": "spray_can", "prob": 45, "charges-min": 1, "charges-max": 3 },
       { "item": "aluminum_foil", "prob": 40, "charges-min": 1, "charges-max": 10 },
+      [ "wrapper_foil", 20 ],
+      [ "cup_foil", 1 ],
       [ "golf_club", 3 ],
       [ "antenna", 30 ],
       [ "bat_metal", 2 ],
@@ -848,6 +850,7 @@
     "id": "subway",
     "items": [
       [ "wrapper", 50 ],
+      [ "wrapper_foil", 5 ],
       [ "string_6", 2 ],
       [ "rubber_band", 2 ],
       [ "chain", 20 ],
@@ -2364,6 +2367,8 @@
       [ "rollmat", 40 ],
       [ "tent_kit", 17 ],
       [ "large_tent_kit", 17 ],
+      [ "hammock", 2 ],
+      [ "hammock_net", 1 ],
       [ "tent_pole", 17 ],
       { "distribution": [ { "group": "full_survival_kit" }, { "group": "used_survival_kit" } ], "prob": 10 },
       [ "canteen", 15 ],

diff --git a/data/json/itemgroups/Locations_MapExtras/locations_commercial.json b/data/json/itemgroups/Locations_MapExtras/locations_commercial.json
@@ -423,6 +423,8 @@
       [ "cot", 40 ],
       [ "rollmat", 40 ],
       [ "tent_kit", 17 ],
+      [ "hammock", 2 ],
+      [ "hammock_net", 1 ],
       [ "large_tent_kit", 17 ],
       [ "bat_metal", 60 ],
       [ "lawnmower", 25 ],
@@ -794,6 +796,7 @@
       [ "cig", 39 ],
       [ "rolling_paper", 15 ],
       [ "wrapper", 25 ],
+      [ "wrapper_foil", 2 ],
       [ "mag_news", 40 ],
       [ "news_regional", 35 ],
       [ "coffee", 55 ],
@@ -808,6 +811,7 @@
     "entries": [
       { "item": "paper", "prob": 150, "count": [ 10, 30 ] },
       { "item": "wrapper", "prob": 25 },
+      { "item": "wrapper_foil", "prob": 1 },
       { "item": "bubblewrap", "prob": 25 },
       { "item": "scissors", "prob": 25 },
       { "item": "roadmap", "prob": 10 },
@@ -1006,6 +1010,7 @@
       { "item": "bottle_plastic", "prob": 70 },
       { "item": "can_drink", "prob": 65 },
       { "item": "wrapper", "prob": 50 },
+      { "item": "wrapper_foil", "prob": 5 },
       { "item": "ceramic_plate", "prob": 40 },
       { "item": "news_regional", "prob": 20 },
       { "item": "mag_news", "prob": 20 },
@@ -1036,6 +1041,7 @@
     "subtype": "distribution",
     "entries": [
       { "item": "wrapper", "prob": 50 },
+      { "item": "wrapper_foil", "prob": 5 },
       { "item": "bottle_glass", "prob": 50 },
       { "item": "bottle_plastic", "prob": 70 },
       { "item": "can_drink", "prob": 60 },

diff --git a/data/json/itemgroups/Locations_MapExtras/locations_mapextras.json b/data/json/itemgroups/Locations_MapExtras/locations_mapextras.json
@@ -158,6 +158,8 @@
       { "item": "radio", "prob": 20, "charges": [ 0, 100 ] },
       [ "rollmat", 60 ],
       [ "tent_kit", 10 ],
+      [ "hammock", 5 ],
+      [ "hammock_net", 2 ],
       [ "large_tent_kit", 5 ],
       { "distribution": [ { "group": "full_survival_kit" }, { "group": "used_survival_kit" } ], "prob": 5 },
       [ "canteen", 100 ],

diff --git a/data/json/itemgroups/Locations_MapExtras/mall_item_groups.json b/data/json/itemgroups/Locations_MapExtras/mall_item_groups.json
@@ -15,6 +15,7 @@
       [ "jug_plastic", 10 ],
       [ "jar_glass_sealed", 5 ],
       [ "wrapper", 10 ],
+      [ "wrapper_foil", 1 ],
       [ "string_6", 5 ],
       [ "cig_butt", 10 ],
       [ "string_36", 5 ],

diff --git a/data/json/itemgroups/Locations_MapExtras/mansion.json b/data/json/itemgroups/Locations_MapExtras/mansion.json
@@ -723,6 +723,7 @@
       [ "spike", 30 ],
       { "item": "blood", "prob": 10, "container-item": "jar_3l_glass_sealed", "sealed": false },
       [ "bone_human", 10 ],
+      [ "bowl_skull", 5 ],
       [ "bondage_mask", 10 ],
       [ "zentai", 5 ],
       [ "bondage_suit", 5 ]
@@ -829,6 +830,7 @@
       [ "glass", 20 ],
       [ "glass_plate", 20 ],
       [ "glass_bowl", 20 ],
+      [ "bowl_wood", 5 ],
       [ "ceramic_plate", 10 ],
       [ "ceramic_bowl", 10 ],
       [ "ceramic_cup", 10 ],
@@ -883,6 +885,7 @@
       [ "cig_butt", 50 ],
       [ "string_6", 50 ],
       [ "wrapper", 50 ],
+      [ "wrapper_foil", 5 ],
       [ "shot_hull", 40 ],
       [ "splinter", 40 ],
       [ "sinew", 40 ],
@@ -914,6 +917,7 @@
     "items": [
       [ "string_6", 50 ],
       [ "wrapper", 50 ],
+      [ "wrapper_foil", 5 ],
       { "item": "paper", "prob": 50, "count": [ 20, 50 ] },
       [ "ceramic_shard", 40 ],
       [ "shot_hull", 40 ],
@@ -990,6 +994,7 @@
       [ "bathroom_scale", 10 ],
       [ "string_6", 50 ],
       [ "wrapper", 50 ],
+      [ "wrapper_foil", 5 ],
       { "item": "paper", "prob": 50, "count": [ 20, 50 ] },
       [ "ceramic_shard", 40 ],
       [ "shot_hull", 40 ],
@@ -1032,6 +1037,7 @@
       [ "38_casing", 20 ],
       [ "45_casing", 20 ],
       [ "wrapper", 20 ],
+      [ "wrapper_foil", 2 ],
       [ "bottle_glass", 10 ],
       [ "flyer", 10 ],
       [ "bone_tainted", 5 ],
@@ -1072,6 +1078,7 @@
       [ "sinew", 40 ],
       { "item": "glass_shard", "prob": 30, "count": [ 1, 8 ] },
       [ "wrapper", 30 ],
+      [ "wrapper_foil", 3 ],
       [ "dance_shoes", 20 ],
       [ "dress_shoes", 20 ],
       { "item": "rag", "prob": 20, "custom-flags": [ "FILTHY" ] },

diff --git a/data/json/itemgroups/Locations_MapExtras/private_resort_item_groups.json b/data/json/itemgroups/Locations_MapExtras/private_resort_item_groups.json
@@ -156,6 +156,7 @@
       { "item": "matches", "prob": 50, "charges": [ 1, 20 ] },
       { "item": "rolling_paper", "prob": 50, "charges": [ 1, 30 ] },
       { "item": "wrapper", "prob": 50 },
+      { "item": "wrapper_foil", "prob": 5 },
       { "item": "news_regional", "prob": 50 },
       { "item": "mag_news", "prob": 50 },
       { "group": "stash_drugs", "prob": 10 },

diff --git a/data/json/itemgroups/Monsters_Animals_Lairs/monster_drops_lairs.json b/data/json/itemgroups/Monsters_Animals_Lairs/monster_drops_lairs.json
@@ -165,6 +165,7 @@
       { "item": "coke", "prob": 8 },
       { "item": "adrenaline_injector", "prob": 4 },
       { "item": "wrapper", "prob": 50 },
+      { "item": "wrapper_foil", "prob": 5 },
       { "group": "wallets_science", "prob": 2 },
       { "item": "laptop", "prob": 5, "charges": [ 0, 500 ] },
       { "item": "atomic_light", "prob": 10 },

diff --git a/data/json/itemgroups/SUS/evac_shelter.json b/data/json/itemgroups/SUS/evac_shelter.json
@@ -40,6 +40,7 @@
       { "item": "mask_gas", "prob": 1 },
       { "item": "flashlight", "prob": 10 },
       { "item": "wrapper", "prob": 50 },
+      { "item": "wrapper_foil", "prob": 2 },
       { "item": "survnote", "prob": 5 },
       { "item": "plastic_shopping_bag", "prob": 5 },
       { "item": "box_small", "prob": 5 },

diff --git a/data/json/itemgroups/activities_hobbies.json b/data/json/itemgroups/activities_hobbies.json
@@ -269,6 +269,8 @@
       [ "wire", 50 ],
       [ "rollmat", 40 ],
       [ "tent_kit", 17 ],
+      [ "hammock", 5 ],
+      [ "hammock_net", 2 ],
       [ "large_tent_kit", 17 ],
       [ "tent_pole", 17 ],
       [ "canteen", 15 ],

diff --git a/data/json/itemgroups/art_antiques_crafts.json b/data/json/itemgroups/art_antiques_crafts.json
@@ -169,6 +169,7 @@
       { "item": "baseball", "prob": 12 },
       { "item": "glass_plate", "prob": 15 },
       { "item": "glass_bowl", "prob": 15 },
+      { "item": "bowl_wood", "prob": 15 },
       { "item": "glass", "prob": 15 },
       { "item": "ceramic_cup", "prob": 15 },
       { "item": "ceramic_bowl", "prob": 15 },

diff --git a/data/json/itemgroups/collections_domestic.json b/data/json/itemgroups/collections_domestic.json
@@ -49,6 +49,7 @@
       [ "bowl_pewter", 25 ],
       [ "glass_plate", 20 ],
       [ "glass_bowl", 20 ],
+      [ "bowl_wood", 5 ],
       [ "plastic_spoon", 20 ],
       [ "plastic_knife", 20 ],
       [ "plastic_fork", 20 ],
@@ -1030,6 +1031,7 @@
     "subtype": "distribution",
     "entries": [
       { "item": "wrapper", "prob": 50 },
+      { "item": "wrapper_foil", "prob": 5 },
       { "item": "knife_butter", "prob": 90 },
       { "item": "knife_steak", "prob": 85 },
       { "item": "fork", "prob": 90 },