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

Maleclypse · Dec 17, 2021 · 41863d0 · 41863d0
2 parents ef62c89 + eff6ef1
commit 41863d0
Show file tree

Hide file tree

Showing 207 changed files with 2,969 additions and 1,276 deletions.
diff --git a/data/json/ammo_effects.json b/data/json/ammo_effects.json
@@ -89,7 +89,7 @@
   {
     "id": "LIGHTNING",
     "type": "ammo_effect",
-    "aoe": { "field_type": "fd_electricity", "intensity_min": 3, "intensity_max": 3 }
+    "aoe": { "field_type": "fd_electricity", "intensity_min": 6, "intensity_max": 10, "chance": 25 }
   },
   {
     "id": "PLASMA",

diff --git a/data/json/construction.json b/data/json/construction.json
@@ -148,7 +148,7 @@
     "category": "CONSTRUCT",
     "required_skills": [ [ "fabrication", 2 ] ],
     "time": "30 m",
-    "qualities": [ [ { "id": "CUT", "level": 1 } ] ],
+    "qualities": [ [ { "id": "CUT", "level": 2 } ] ],
     "components": [ [ [ "2x4", 6 ], [ "stick", 6 ], [ "wood_panel", 1 ] ], [ [ "rope_makeshift_6", 2 ], [ "rope_6", 2 ] ] ],
     "pre_note": "Can be deconstructed without tools.",
     "pre_terrain": "t_door_frame",
@@ -664,7 +664,7 @@
     "category": "CONSTRUCT",
     "required_skills": [ [ "fabrication", 0 ], [ "survival", 1 ] ],
     "time": "20 m",
-    "qualities": [ [ { "id": "CUT", "level": 1 } ], [ { "id": "HAMMER", "level": 1 } ], [ { "id": "DIG", "level": 1 } ] ],
+    "qualities": [ [ { "id": "CUT", "level": 2 } ], [ { "id": "HAMMER", "level": 1 } ], [ { "id": "DIG", "level": 1 } ] ],
     "components": [ [ [ "stick", 4 ], [ "pointy_stick", 4 ] ] ],
     "pre_flags": "DIGGABLE",
     "pre_special": "check_empty",
@@ -677,7 +677,7 @@
     "category": "CONSTRUCT",
     "required_skills": [ [ "fabrication", 2 ], [ "survival", 2 ] ],
     "time": "50 m",
-    "qualities": [ [ { "id": "CUT", "level": 1 } ], [ { "id": "HAMMER", "level": 1 } ] ],
+    "qualities": [ [ { "id": "CUT", "level": 2 } ], [ { "id": "HAMMER", "level": 1 } ] ],
     "components": [ [ [ "stick", 10 ] ] ],
     "pre_terrain": "t_wattle_fence_posts",
     "post_terrain": "t_wattle_fence"
@@ -690,7 +690,7 @@
     "category": "CONSTRUCT",
     "required_skills": [ [ "fabrication", 3 ], [ "survival", 3 ] ],
     "time": "50 m",
-    "qualities": [ { "id": "CUT", "level": 1 }, { "id": "HAMMER", "level": 1 } ],
+    "qualities": [ { "id": "CUT", "level": 2 }, { "id": "HAMMER", "level": 1 } ],
     "components": [
       [ [ "2x4", 5 ], [ "stick", 10 ] ],
       [ [ "material_quicklime", 4 ], [ "material_limestone", 4 ], [ "clay_lump", 4 ] ],
@@ -709,7 +709,7 @@
     "category": "CONSTRUCT",
     "required_skills": [ [ "fabrication", 3 ], [ "survival", 3 ] ],
     "time": "50 m",
-    "qualities": [ { "id": "CUT", "level": 1 }, { "id": "HAMMER", "level": 1 } ],
+    "qualities": [ { "id": "CUT", "level": 2 }, { "id": "HAMMER", "level": 1 } ],
     "components": [
       [ [ "2x4", 5 ], [ "stick", 10 ] ],
       [ [ "material_quicklime", 4 ], [ "material_limestone", 4 ], [ "clay_lump", 4 ] ],
@@ -728,7 +728,7 @@
     "category": "CONSTRUCT",
     "required_skills": [ [ "fabrication", 3 ], [ "survival", 3 ] ],
     "time": "60 m",
-    "qualities": [ [ { "id": "CUT", "level": 1 } ], [ { "id": "HAMMER", "level": 1 } ] ],
+    "qualities": [ [ { "id": "CUT", "level": 2 } ], [ { "id": "HAMMER", "level": 1 } ] ],
     "components": [
       [ [ "2x4", 5 ], [ "stick", 10 ] ],
       [ [ "material_quicklime", 8 ], [ "material_limestone", 8 ], [ "clay_lump", 8 ] ],
@@ -746,7 +746,7 @@
     "category": "REPAIR",
     "required_skills": [ [ "fabrication", 2 ], [ "survival", 2 ] ],
     "time": "30 m",
-    "qualities": [ { "id": "CUT", "level": 1 }, { "id": "HAMMER", "level": 1 } ],
+    "qualities": [ { "id": "CUT", "level": 2 }, { "id": "HAMMER", "level": 1 } ],
     "components": [
       [ [ "2x4", 2 ], [ "stick", 4 ] ],
       [ [ "material_quicklime", 2 ], [ "material_limestone", 2 ], [ "clay_lump", 2 ] ],
@@ -1055,6 +1055,18 @@
     "pre_special": "check_empty",
     "post_terrain": "t_railroad_rubble"
   },
+  {
+    "type": "construction",
+    "id": "constr_rubber_mulch",
+    "group": "make_rubber_mulch",
+    "//": "Covers the floor with rubber mulch. Used for constructing exercise spaces.",
+    "category": "CONSTRUCT",
+    "required_skills": [ [ "fabrication", 1 ] ],
+    "time": "40 m",
+    "components": [ [ [ "shredded_rubber", 200 ] ] ],
+    "pre_special": "check_empty",
+    "post_terrain": "t_rubber_mulch"
+  },
   {
     "type": "construction",
     "id": "constr_railroad_track_small",
@@ -1133,6 +1145,18 @@
     "pre_terrain": "t_pit",
     "post_terrain": "t_reb_cage"
   },
+  {
+    "type": "construction",
+    "id": "constr_parkour_bars",
+    "group": "build_parkour_bars",
+    "category": "CONSTRUCT",
+    "required_skills": [ [ "fabrication", 6 ] ],
+    "time": "420 m",
+    "using": [ [ "welding_standard", 2 ] ],
+    "components": [ [ [ "pipe", 36 ] ] ],
+    "pre_terrain": "t_pit",
+    "post_terrain": "f_parkour_bars"
+  },
   {
     "type": "construction",
     "id": "constr_strconc_wall_halfway",
@@ -1161,6 +1185,20 @@
     "pre_terrain": "t_strconc_wall_halfway",
     "post_terrain": "t_strconc_wall"
   },
+  {
+    "type": "construction",
+    "id": "constr_strconc_wall_rope",
+    "group": "build_reinforced_concrete_wall_ropes",
+    "//": "Step 3: finish wall",
+    "category": "CONSTRUCT",
+    "required_skills": [ [ "fabrication", 6 ] ],
+    "time": "120 m",
+    "tools": [ [ [ "con_mix", 50 ] ] ],
+    "qualities": [ [ { "id": "SMOOTH", "level": 2 } ] ],
+    "components": [ [ [ "concrete", 6 ] ], [ [ "2x4", 12 ] ], [ [ "rope_6", 8 ] ], [ [ "water", 4 ], [ "water_clean", 4 ] ] ],
+    "pre_terrain": "t_strconc_wall_halfway",
+    "post_terrain": "t_concrete_wall_rope"
+  },
   {
     "type": "construction",
     "id": "constr_reb_cage_column",
@@ -1391,7 +1429,7 @@
     "category": "CONSTRUCT",
     "required_skills": [ [ "fabrication", 3 ], [ "survival", 7 ] ],
     "time": "360 m",
-    "qualities": [ { "id": "CUT", "level": 1 } ],
+    "qualities": [ { "id": "CUT", "level": 2 } ],
     "components": [ [ [ "2x4", 5 ], [ "stick", 10 ] ], [ [ "straw_pile", 60 ], [ "withered", 60 ] ], [ [ "cordage", 8, "LIST" ] ] ],
     "pre_special": "check_support",
     "post_terrain": "t_dirtfloor_thatchroof"
@@ -2332,7 +2370,7 @@
     "category": "FURN",
     "required_skills": [ [ "fabrication", 4 ] ],
     "time": "90 m",
-    "qualities": [ [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_W", "level": 1 } ], [ { "id": "CUT", "level": 1 } ] ],
+    "qualities": [ [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_W", "level": 1 } ], [ { "id": "CUT", "level": 2 } ] ],
     "components": [ [ [ "2x4", 8 ] ], [ [ "wood_sheet", 1 ], [ "wood_panel", 2 ] ], [ [ "nail", 24 ] ] ],
     "pre_special": "check_empty",
     "post_terrain": "f_desk"
@@ -3269,7 +3307,7 @@
     "qualities": [
       [ { "id": "DIG", "level": 1 } ],
       [ { "id": "HAMMER", "level": 2 } ],
-      [ { "id": "CUT", "level": 1 } ],
+      [ { "id": "CUT", "level": 2 } ],
       [ { "id": "SAW_W", "level": 1 } ]
     ],
     "components": [ [ [ "stick", 16 ], [ "2x4", 16 ] ], [ [ "rock", 8 ] ] ],
@@ -3392,7 +3430,7 @@
     "category": "FURN",
     "required_skills": [ [ "fabrication", 1 ], [ "survival", 3 ] ],
     "time": "45 m",
-    "qualities": [ [ { "id": "CUT", "level": 1 } ], [ { "id": "SAW_W", "level": 1 } ] ],
+    "qualities": [ [ { "id": "CUT", "level": 2 } ], [ { "id": "SAW_W", "level": 1 } ] ],
     "components": [
       [ [ "stick_long", 6 ] ],
       [ [ "rope_natural_short", 1, "LIST" ], [ "cordage", 2, "LIST" ], [ "wire", 8 ] ],
@@ -3882,7 +3920,7 @@
     "category": "CONSTRUCT",
     "difficulty": 2,
     "time": "90m",
-    "qualities": [ { "id": "CUT", "level": 1 }, { "id": "HAMMER", "level": 1 } ],
+    "qualities": [ { "id": "CUT", "level": 2 }, { "id": "HAMMER", "level": 1 } ],
     "components": [ [ [ "stick", 6 ], [ "2x4", 3 ] ] ],
     "pre_terrain": "t_tree_pine",
     "post_terrain": "t_leanto"
@@ -4050,7 +4088,7 @@
     "category": "FURN",
     "required_skills": [ [ "survival", 1 ] ],
     "time": "10 m",
-    "qualities": [ [ { "id": "CUT", "level": 1 } ] ],
+    "qualities": [ [ { "id": "CUT", "level": 2 } ] ],
     "components": [ [ [ "log", 1 ] ] ],
     "pre_special": "check_empty",
     "post_terrain": "f_logstool"
@@ -4537,6 +4575,18 @@
     "pre_terrain": "t_railroad_rubble",
     "post_terrain": "t_dirt"
   },
+  {
+    "type": "construction",
+    "id": "constr_remove_rubber_mulch",
+    "group": "remove_rubber_mulch",
+    "category": "OTHER",
+    "required_skills": [ [ "survival", 0 ] ],
+    "time": "60 m",
+    "qualities": [ [ { "id": "DIG", "level": 1 } ] ],
+    "byproducts": [ { "item": "shredded_rubber", "count": [ 150, 200 ] } ],
+    "pre_terrain": "t_rubber_mulch",
+    "post_terrain": "t_dirt"
+  },
   {
     "type": "construction",
     "id": "constr_mechanical_winch",

diff --git a/data/json/construction_group.json b/data/json/construction_group.json
@@ -274,6 +274,11 @@
     "id": "build_exercise_machine",
     "name": "Build Exercise Machine"
   },
+  {
+    "type": "construction_group",
+    "id": "build_parkour_bars",
+    "name": "Build Parkour Bars"
+  },
   {
     "type": "construction_group",
     "id": "build_fence",
@@ -509,6 +514,11 @@
     "id": "build_reinforced_concrete_wall",
     "name": "Build Reinforced Concrete Wall"
   },
+  {
+    "type": "construction_group",
+    "id": "build_reinforced_concrete_wall_ropes",
+    "name": "Build Reinforced Concrete Wall with Ropes"
+  },
   {
     "type": "construction_group",
     "id": "build_brick_wall_embrasure",
@@ -1004,6 +1014,11 @@
     "id": "make_gravel_floor",
     "name": "Make Gravel Floor"
   },
+  {
+    "type": "construction_group",
+    "id": "make_rubber_mulch",
+    "name": "Make Rubber Mulch Floor"
+  },
   {
     "type": "construction_group",
     "id": "make_woodchip_floor",
@@ -1214,6 +1229,11 @@
     "id": "remove_gravel",
     "name": "Remove Gravel"
   },
+  {
+    "type": "construction_group",
+    "id": "remove_rubber_mulch",
+    "name": "Remove Rubber Mulch"
+  },
   {
     "type": "construction_group",
     "id": "remove_empty_window",

diff --git a/data/json/dreams.json b/data/json/dreams.json
@@ -181,7 +181,8 @@
     "type": "dream",
     "messages": [
       "You have a disturbing dream of undergoing strange medical procedures.",
-      "While dreaming, you see yourself dressed in a hospital gown, receiving treatment."
+      "While dreaming, you see yourself dressed in a hospital gown, receiving treatment.",
+      "You dream of a hospital where doctors try out experimental treatments."
     ],
     "category": "MEDICAL",
     "strength": 2
@@ -190,7 +191,8 @@
     "type": "dream",
     "messages": [
       "You have a disturbing dream about running from dogs.",
-      "While dreaming, you see a distinctively rabbit-like reflection of yourself."
+      "While dreaming, you see a distinctively rabbit-like reflection of yourself.",
+      "You dream of digging a hole under a hill to make your home."
     ],
     "category": "RABBIT",
     "strength": 2
@@ -232,14 +234,19 @@
     "type": "dream",
     "messages": [
       "You have a vivid dream of hunting in the woods.",
-      "Whilst dreaming, you see a disturbingly bestial version of yourself."
+      "Whilst dreaming, you see a disturbingly bestial version of yourself.",
+      "You dream of blood and guts.  For some reason, it makes you feel weirdly excited."
     ],
     "category": "BEAST",
     "strength": 2
   },
   {
     "type": "dream",
-    "messages": [ "You dream of foraging in the woods… mouth-first?", "Your dream-reflection is rather bearish." ],
+    "messages": [
+      "You dream of foraging in the woods… mouth-first?",
+      "Your dream-reflection is rather bearish.",
+      "You dream of brushing the fur on your back against a tree."
+    ],
     "category": "URSINE",
     "strength": 2
   },
@@ -254,7 +261,11 @@
   },
   {
     "type": "dream",
-    "messages": [ "You have a disturbing dream of someone invading your territory.", "Your dream-self's muzzle looks… wait, muzzle?" ],
+    "messages": [
+      "You have a disturbing dream of someone invading your territory.",
+      "Your dream-self's muzzle looks… wait, muzzle?",
+      "You dream of the moon and feel a sudden urge to howl."
+    ],
     "category": "LUPINE",
     "strength": 2
   },
@@ -271,7 +282,8 @@
     "type": "dream",
     "messages": [
       "You have a dream of working in a hive.",
-      "While dreaming you look into a mirror and see a frighteningly insectoid reflection."
+      "While dreaming you look into a mirror and see a frighteningly insectoid reflection.",
+      "You dream of a feast and excitedly chitter with your pincers… wait, what?"
     ],
     "category": "INSECT",
     "strength": 2
@@ -280,7 +292,8 @@
     "type": "dream",
     "messages": [
       "You have a confusing dream of growing in a garden.",
-      "You are confused by a plantlike image of yourself in a dream."
+      "You are confused by a plantlike image of yourself in a dream.",
+      "You dream of standing still in the rain, drinking in the falling drops… with your feet?"
     ],
     "category": "PLANT",
     "strength": 2
@@ -312,7 +325,11 @@
   },
   {
     "type": "dream",
-    "messages": [ "You have a strange dream of spinning webs", "In your dream you see a very spiderlike version of yourself." ],
+    "messages": [
+      "You have a strange dream of spinning webs",
+      "In your dream you see a very spiderlike version of yourself.",
+      "You dream of the buzzing of a fly that you cannot see.  It makes you hungry."
+    ],
     "category": "SPIDER",
     "strength": 2
   },
@@ -329,7 +346,8 @@
     "type": "dream",
     "messages": [
       "You dream of having that success you knew you deserved, back before all this.",
-      "Your dream-self looks competent and in control."
+      "Your dream-self looks competent and in control.",
+      "You dream of a fortress, sheltering humanity from the zombies.  You're in charge, of course."
     ],
     "category": "ALPHA",
     "strength": 2
@@ -390,7 +408,8 @@
     "type": "dream",
     "messages": [
       "You have a dream of doctors and nurses doing unnatural things to your body, which brings you perverse pleasure.",
-      "You have a vivid dream of being a medical anomaly, as your heartbeat syncs with the steady drip of an IV line."
+      "You have a vivid dream of being a medical anomaly, as your heartbeat syncs with the steady drip of an IV line.",
+      "You dream of cutting yourself with a knife and watch in fascination as it heals in seconds."
     ],
     "category": "MEDICAL",
     "strength": 3