Merge branch 'master' into add-stone-pouch

Inglonias · Nov 19, 2019 · 7539cb3 · 7539cb3
2 parents 7e06daf + d0db81d
commit 7539cb3
Show file tree

Hide file tree

Showing 294 changed files with 92,344 additions and 44,934 deletions.
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
@@ -149,6 +149,8 @@ If you are also looking for suggestions then mark it with [CR] — "comments req
 
 This can help speed up our review process by allowing us to only review the things that are ready for it, and will prevent anything that isn't completely ready from being merged in.
 
+It is not required to solve or reference an open issue to file a PR, however, if you do so, you need to explain the problem your PR is solving in full detail.
+
 ### All PRs should have a "Summary" line
 Summary is a one-line description of your change that will be extracted and added to the project changelog at https://github.com/CleverRaven/Cataclysm-DDA/blob/master/data/changelog.txt
 

diff --git a/build-scripts/build.sh b/build-scripts/build.sh
@@ -2,13 +2,14 @@
 
 # Build script intended for use in Travis CI
 
-set -ex
+set -ex pipefail
 
 num_jobs=3
 
 function run_tests
 {
-    $WINE "$@" -d yes --rng-seed time $EXTRA_TEST_OPTS
+    # The grep supresses lines that begin with "0.0## s:", which are timing lines for tests with a very short duration.
+    $WINE "$@" -d yes --use-colour yes --rng-seed time $EXTRA_TEST_OPTS | grep -Ev "^0\.0[0-9]{2} s:"
 }
 
 date +%s > build-start-time

diff --git a/data/core/tips.json b/data/core/tips.json
@@ -122,7 +122,7 @@
   {
     "type": "snippet",
     "category": "tip",
-    "text": [ "Rotten food typically attracts bugs, and bugs got a lot bigger recently..." ]
+    "text": [ "Rotten food typically attracts bugs, and bugs got a lot bigger recently…" ]
   },
   {
     "type": "snippet",
@@ -222,7 +222,7 @@
   {
     "type": "snippet",
     "category": "tip",
-    "text": [ "Routine kills.  Stay alert! Don't let your guard down." ]
+    "text": [ "Routine kills.  Stay alert!  Don't let your guard down." ]
   },
   {
     "type": "snippet",
@@ -312,7 +312,7 @@
   {
     "type": "snippet",
     "category": "tip",
-    "text": [ "A survivor saved is a friend earned.  Most of the time..." ]
+    "text": [ "A survivor saved is a friend earned.  Most of the time…" ]
   },
   {
     "type": "snippet",

diff --git a/data/json/body_parts.json b/data/json/body_parts.json
@@ -13,7 +13,8 @@
     "hit_size_relative": [ 20, 33.33, 36.57 ],
     "hit_difficulty": 1,
     "side": "both",
-    "legacy_id": "TORSO"
+    "legacy_id": "TORSO",
+    "bionic_slots": 80
   },
   {
     "id": "head",
@@ -29,7 +30,8 @@
     "hit_size_relative": [ 0, 2.33, 5.71 ],
     "hit_difficulty": 1.35,
     "side": "both",
-    "legacy_id": "HEAD"
+    "legacy_id": "HEAD",
+    "bionic_slots": 18
   },
   {
     "id": "eyes",
@@ -44,7 +46,8 @@
     "hit_size_relative": [ 0, 0.33, 0.57 ],
     "hit_difficulty": 1.15,
     "side": "both",
-    "legacy_id": "EYES"
+    "legacy_id": "EYES",
+    "bionic_slots": 4
   },
   {
     "id": "mouth",
@@ -59,7 +62,8 @@
     "hit_size_relative": [ 0, 0, 0 ],
     "hit_difficulty": 1.15,
     "side": "both",
-    "legacy_id": "MOUTH"
+    "legacy_id": "MOUTH",
+    "bionic_slots": 4
   },
   {
     "id": "arm_l",
@@ -76,7 +80,8 @@
     "hit_size_relative": [ 15, 20, 22.86 ],
     "hit_difficulty": 0.95,
     "side": "left",
-    "legacy_id": "ARM_L"
+    "legacy_id": "ARM_L",
+    "bionic_slots": 20
   },
   {
     "id": "arm_r",
@@ -93,7 +98,8 @@
     "hit_size_relative": [ 15, 20, 22.86 ],
     "hit_difficulty": 0.95,
     "side": "right",
-    "legacy_id": "ARM_R"
+    "legacy_id": "ARM_R",
+    "bionic_slots": 20
   },
   {
     "id": "hand_l",
@@ -109,7 +115,8 @@
     "hit_size_relative": [ 0, 0, 0 ],
     "hit_difficulty": 1.1,
     "side": "left",
-    "legacy_id": "HAND_L"
+    "legacy_id": "HAND_L",
+    "bionic_slots": 5
   },
   {
     "id": "hand_r",
@@ -125,7 +132,8 @@
     "hit_size_relative": [ 0, 0, 0 ],
     "hit_difficulty": 1.1,
     "side": "right",
-    "legacy_id": "HAND_R"
+    "legacy_id": "HAND_R",
+    "bionic_slots": 5
   },
   {
     "id": "leg_l",
@@ -142,7 +150,8 @@
     "hit_size_relative": [ 25, 12, 5.71 ],
     "hit_difficulty": 0.975,
     "side": "left",
-    "legacy_id": "LEG_L"
+    "legacy_id": "LEG_L",
+    "bionic_slots": 30
   },
   {
     "id": "leg_r",
@@ -159,7 +168,8 @@
     "hit_size_relative": [ 25, 12, 5.71 ],
     "hit_difficulty": 0.975,
     "side": "right",
-    "legacy_id": "LEG_R"
+    "legacy_id": "LEG_R",
+    "bionic_slots": 30
   },
   {
     "id": "foot_l",
@@ -175,7 +185,8 @@
     "hit_size_relative": [ 0, 0, 0 ],
     "hit_difficulty": 0.8,
     "side": "left",
-    "legacy_id": "FOOT_L"
+    "legacy_id": "FOOT_L",
+    "bionic_slots": 7
   },
   {
     "id": "foot_r",
@@ -191,7 +202,8 @@
     "hit_size_relative": [ 0, 0, 0 ],
     "hit_difficulty": 0.8,
     "side": "right",
-    "legacy_id": "FOOT_R"
+    "legacy_id": "FOOT_R",
+    "bionic_slots": 7
   },
   {
     "id": "num_bp",

diff --git a/data/json/construction.json b/data/json/construction.json
@@ -2235,7 +2235,7 @@
       [ { "id": "HAMMER", "level": 2 } ],
       [ { "id": "DIG", "level": 2 } ]
     ],
-    "tools": [ [ [ "pickaxe", -1 ], [ "jackhammer", 30 ], [ "elec_jackhammer", 30 ] ] ],
+    "tools": [ [ [ "pickaxe", -1 ], [ "jackhammer", 140 ], [ "elec_jackhammer", 7000 ] ] ],
     "components": [ [ [ "2x4", 8 ], [ "log", 8 ] ], [ [ "rope_makeshift_30", 1 ], [ "rope_30", 1 ], [ "vine_30", 1 ] ] ],
     "pre_flags": "DIGGABLE",
     "post_special": "done_dig_stair"
@@ -2251,7 +2251,7 @@
       [ { "id": "HAMMER", "level": 2 } ],
       [ { "id": "DIG", "level": 2 } ]
     ],
-    "tools": [ [ [ "pickaxe", -1 ], [ "jackhammer", 30 ], [ "elec_jackhammer", 30 ] ] ],
+    "tools": [ [ [ "pickaxe", -1 ], [ "jackhammer", 160 ], [ "elec_jackhammer", 8000 ] ] ],
     "components": [ [ [ "2x4", 12 ], [ "log", 12 ] ], [ [ "rope_makeshift_30", 1 ], [ "rope_30", 1 ], [ "vine_30", 1 ] ] ],
     "pre_special": "check_down_OK",
     "pre_terrain": "t_rock_floor",
@@ -2307,7 +2307,7 @@
       [ { "id": "DIG", "level": 2 } ]
     ],
     "tools": [
-      [ [ "pickaxe", -1 ], [ "jackhammer", 30 ], [ "elec_jackhammer", 30 ] ],
+      [ [ "pickaxe", -1 ], [ "jackhammer", 160 ], [ "elec_jackhammer", 8000 ] ],
       [
         "miner_hat",
         "hat_hard",
@@ -3190,7 +3190,7 @@
     "components": [
       [ [ "processor", 2 ] ],
       [ [ "RAM", 2 ] ],
-      [ [ "small_lcd_screen", 1 ] ],
+      [ [ "large_lcd_screen", 1 ] ],
       [ [ "e_scrap", 8 ] ],
       [ [ "frame", 1 ] ],
       [ [ "circuit", 4 ] ],

diff --git a/data/json/effects.json b/data/json/effects.json
@@ -734,15 +734,15 @@
       "str_mod": [ -1 ],
       "dex_mod": [ -1 ],
       "vomit_chance": [ 1000, 1200 ],
-      "sleep_min": [ 60, 30 ],
-      "sleep_chance": [ -102 ]
+      "fatigue_min": [ 360, 180 ],
+      "fatigue_chance": [ -102 ]
     },
     "scaling_mods": {
       "pain_max_val": [ 30, 20 ],
       "str_mod": [ -1, -0.5 ],
       "dex_mod": [ -1, -0.5 ],
       "vomit_chance": [ -400 ],
-      "sleep_chance": [ 101 ]
+      "fatigue_chance": [ 101 ]
     }
   },
   {
@@ -760,10 +760,10 @@
       "str_mod": [ -1 ],
       "dex_mod": [ -1 ],
       "vomit_chance": [ 1000 ],
-      "sleep_min": [ 60 ],
-      "sleep_chance": [ -102 ]
+      "fatigue_min": [ 360 ],
+      "fatigue_chance": [ -102 ]
     },
-    "scaling_mods": { "pain_max_val": [ 30 ], "str_mod": [ -1 ], "dex_mod": [ -1 ], "vomit_chance": [ -400 ], "sleep_chance": [ 101 ] }
+    "scaling_mods": { "pain_max_val": [ 30 ], "str_mod": [ -1 ], "dex_mod": [ -1 ], "vomit_chance": [ -400 ], "fatigue_chance": [ 101 ] }
   },
   {
     "type": "effect_type",
@@ -1271,8 +1271,8 @@
     "base_mods": {
       "vomit_chance": [ -43 ],
       "sleep_chance": [ -1003 ],
-      "sleep_min": [ 2500 ],
-      "sleep_max": [ 3500 ],
+      "sleep_min": [ 15000 ],
+      "sleep_max": [ 21000 ],
       "pkill_amount": [ 3 ],
       "pkill_max_val": [ 3 ],
       "pkill_min": [ 1 ],

diff --git a/data/json/furniture_and_terrain/terrain-manufactured.json b/data/json/furniture_and_terrain/terrain-manufactured.json
@@ -294,7 +294,7 @@
         { "item": "processor", "count": [ 1, 2 ] },
         { "item": "RAM", "count": [ 4, 8 ] },
         { "item": "cable", "charges": [ 4, 6 ] },
-        { "item": "small_lcd_screen", "count": [ 1, 2 ] },
+        { "item": "large_lcd_screen", "count": 1 },
         { "item": "e_scrap", "count": [ 10, 16 ] },
         { "item": "circuit", "count": [ 6, 10 ] },
         { "item": "power_supply", "count": [ 2, 4 ] },
@@ -313,7 +313,7 @@
         { "item": "processor", "prob": 25 },
         { "item": "RAM", "count": [ 0, 2 ], "prob": 50 },
         { "item": "cable", "charges": [ 1, 2 ], "prob": 50 },
-        { "item": "small_lcd_screen", "prob": 25 },
+        { "item": "large_lcd_screen", "prob": 25 },
         { "item": "e_scrap", "count": [ 1, 4 ], "prob": 50 },
         { "item": "circuit", "count": [ 0, 2 ], "prob": 50 },
         { "item": "power_supply", "prob": 25 },
@@ -640,6 +640,7 @@
         { "item": "RAM", "count": [ 4, 8 ] },
         { "item": "cable", "charges": [ 8, 16 ] },
         { "item": "small_lcd_screen", "count": [ 2, 4 ] },
+        { "item": "large_lcd_screen", "count": 1 },
         { "item": "e_scrap", "count": [ 12, 24 ] },
         { "item": "circuit", "count": [ 6, 10 ] },
         { "item": "power_supply", "count": [ 4, 8 ] },

diff --git a/data/json/furniture_and_terrain/terrain-mechanisms.json b/data/json/furniture_and_terrain/terrain-mechanisms.json
@@ -16,7 +16,7 @@
         { "item": "processor", "count": [ 1, 2 ] },
         { "item": "RAM", "count": [ 4, 8 ] },
         { "item": "cable", "charges": [ 4, 6 ] },
-        { "item": "small_lcd_screen", "count": [ 1, 2 ] },
+        { "item": "large_lcd_screen", "count": 1 },
         { "item": "e_scrap", "count": [ 10, 16 ] },
         { "item": "circuit", "count": [ 6, 10 ] },
         { "item": "power_supply", "count": [ 2, 4 ] },
@@ -35,7 +35,7 @@
         { "item": "processor", "prob": 25 },
         { "item": "RAM", "count": [ 0, 2 ], "prob": 50 },
         { "item": "cable", "charges": [ 1, 2 ], "prob": 50 },
-        { "item": "small_lcd_screen", "prob": 25 },
+        { "item": "large_lcd_screen", "prob": 25 },
         { "item": "e_scrap", "count": [ 1, 4 ], "prob": 50 },
         { "item": "circuit", "count": [ 0, 2 ], "prob": 50 },
         { "item": "power_supply", "prob": 25 },
@@ -63,7 +63,7 @@
         { "item": "processor", "count": [ 1, 2 ] },
         { "item": "RAM", "count": [ 4, 8 ] },
         { "item": "cable", "charges": [ 4, 6 ] },
-        { "item": "small_lcd_screen", "count": [ 1, 2 ] },
+        { "item": "large_lcd_screen", "count": 1 },
         { "item": "e_scrap", "count": [ 10, 16 ] },
         { "item": "circuit", "count": [ 6, 10 ] },
         { "item": "power_supply", "count": [ 2, 4 ] },
@@ -82,7 +82,7 @@
         { "item": "processor", "prob": 25 },
         { "item": "RAM", "count": [ 0, 2 ], "prob": 50 },
         { "item": "cable", "charges": [ 1, 2 ], "prob": 50 },
-        { "item": "small_lcd_screen", "prob": 25 },
+        { "item": "large_lcd_screen", "prob": 25 },
         { "item": "e_scrap", "count": [ 1, 4 ], "prob": 50 },
         { "item": "circuit", "count": [ 0, 2 ], "prob": 50 },
         { "item": "power_supply", "prob": 25 },

diff --git a/data/json/furniture_and_terrain/terrain-railroads.json b/data/json/furniture_and_terrain/terrain-railroads.json
@@ -8,15 +8,15 @@
     "color": [ "brown" ],
     "move_cost": 2,
     "bash": {
-      "str_min": 4,
+      "str_min": 30,
       "str_max": 40,
-      "ter_set": "t_rock_floor",
+      "ter_set": "t_null",
       "sound": "crunch!",
       "sound_fail": "whump!",
       "items": [ { "item": "pebble", "count": [ 1, 3 ] }, { "item": "sharp_rock", "count": [ 0, 1 ] } ]
     },
     "deconstruct": {
-      "ter_set": "t_rock_floor",
+      "ter_set": "t_null",
       "items": [ { "item": "pebble", "count": [ 2, 6 ] }, { "item": "sharp_rock", "count": [ 1, 3 ] } ]
     },
     "flags": [ "BASHABLE", "TRANSPARENT" ]

diff --git a/data/json/furniture_and_terrain/terrain-traps.json b/data/json/furniture_and_terrain/terrain-traps.json
@@ -8,7 +8,7 @@
     "color": "black",
     "move_cost": 2,
     "trap": "tr_ledge",
-    "flags": [ "TRANSPARENT", "NOITEM" ]
+    "flags": [ "TRANSPARENT", "NOITEM", "NO_FLOOR" ]
   },
   {
     "type": "terrain",

diff --git a/data/json/furniture_and_terrain/terrain-walls.json b/data/json/furniture_and_terrain/terrain-walls.json
@@ -6,8 +6,12 @@
     "entries": [
       { "item": "rock", "count": [ 0, 2 ] },
       { "item": "wood_panel", "count": [ 0, 1 ] },
-      { "item": "nail", "charges": [ 2, 8 ] },
-      { "item": "splinter", "count": [ 1, 5 ] }
+      { "item": "nail", "charges": [ 4, 16 ] },
+      { "item": "splinter", "count": [ 1, 5 ] },
+      { "item": "2x4", "count": [ 1, 2 ], "prob": 25 },
+      { "item": "pipe", "count": [ 0, 2 ], "prob": 10 },
+      { "item": "cu_pipe", "count": [ 0, 2 ], "prob": 10 },
+      { "item": "cable", "charges": [ 0, 200 ], "prob": 10 }
     ]
   },
   {

diff --git a/data/json/item_category.json b/data/json/item_category.json
@@ -131,6 +131,13 @@
     "zone": "LOOT_SPARE_PARTS",
     "sort_rank": 8
   },
+  {
+    "id": "container",
+    "type": "ITEM_CATEGORY",
+    "name": "CONTAINERS",
+    "zone": "LOOT_CONTAINERS",
+    "sort_rank": 9
+  },
   {
     "id": "artifacts",
     "type": "ITEM_CATEGORY",