Merge with upstream

.clang-tidy

@@ -16,6 +16,8 @@ cppcoreguidelines-slicing,\
 llvm-namespace-comment,\
 misc-*,\
 modernize-*,\
+-modernize-use-auto,\
+-modernize-use-trailing-return-type,\
 performance-*,\
 readability-*,\
 -bugprone-misplaced-widening-cast,\
@@ -31,11 +33,9 @@ readability-*,\
 -modernize-avoid-c-arrays,\
 -modernize-pass-by-value,\
 -modernize-return-braced-init-list,\
--modernize-use-auto,\
 -modernize-use-default-member-init,\
 -modernize-use-emplace,\
 -modernize-use-transparent-functors,\
--modernize-use-trailing-return-type,\
 -performance-for-range-copy,\
 -performance-inefficient-vector-operation,\
 -performance-noexcept-move-constructor,\

.github/ISSUE_TEMPLATE/feature_request.md

@@ -4,14 +4,14 @@ about: Suggest an idea for this project
 
 ---
 
-**Is your feature request related to a problem? Please describe.**  
+# Is your feature request related to a problem? Please describe.
 A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
 
-**Describe the solution you'd like**  
+# Describe the solution you'd like
 A clear and concise description of what you want to happen.
 
-**Describe alternatives you've considered**  
+# Describe alternatives you've considered
 A clear and concise description of any alternative solutions or features you've considered.
 
-**Additional context**  
+# Additional context
 Add any other context (such as mock-ups, proof of concepts or screenshots) about the feature request here.

.travis.yml

@@ -84,8 +84,8 @@ jobs:
           packages: ["g++-8",   "g++-8-multilib",   "libc6-dbg", "libc6-dbg:i386", "libsdl2-dev", "libsdl2-ttf-dev", "libsdl2-image-dev", "libsdl2-mixer-dev", "astyle"]
           sources: *apt_sources
 
-    - env: CLANG=clang++-8 SANITIZE=address EXTRA_TEST_OPTS="~[.] ~vehicle_efficiency ~vehicle_drag ~starting_items"
-      name: "Clang 8 Make build with address sanitization, but long-running tests disabled"
+    - env: CLANG=clang++-8 SANITIZE=address,undefined EXTRA_TEST_OPTS="~[.] ~vehicle_efficiency ~vehicle_drag ~starting_items"
+      name: "Clang 8 Make build with sanitizers enabled, but long-running tests disabled"
       compiler: clang
       addons: &clang8
         apt:

Makefile

@@ -185,7 +185,8 @@ ifeq ($(RUNTESTS), 1)
   TESTS = tests
 endif
 
-# tiles object directories are because gcc gets confused # Appears that the default value of $LD is unsuitable on most systems
+# tiles object directories are because gcc gets confused
+# Appears that the default value of $LD is unsuitable on most systems
 
 # when preprocessor defines change, but the source doesn't
 ODIR = $(BUILD_PREFIX)obj
@@ -256,8 +257,9 @@ CXXFLAGS += -ffast-math
 LDFLAGS += $(PROFILE)
 
 ifneq ($(SANITIZE),)
-  CXXFLAGS += -fsanitize=$(SANITIZE)
-  LDFLAGS += -fsanitize=$(SANITIZE)
+  SANITIZE_FLAGS := -fsanitize=$(SANITIZE) -fno-sanitize-recover=all
+  CXXFLAGS += $(SANITIZE_FLAGS)
+  LDFLAGS += $(SANITIZE_FLAGS)
 endif
 
 # enable optimizations. slow to build
@@ -283,6 +285,7 @@ ifdef RELEASE
       OPTLEVEL = -Os
     endif
   endif
+
   ifdef LTO
     ifdef CLANG
       # LLVM's LTO will complain if the optimization level isn't between O0 and
@@ -293,7 +296,14 @@ ifdef RELEASE
   CXXFLAGS += $(OPTLEVEL)
 
   ifdef LTO
-    LDFLAGS += -fuse-ld=gold
+    ifeq ($(NATIVE), osx)
+      ifdef CLANG
+        LTOFLAGS += -flto=full
+      endif
+    else
+      LDFLAGS += -fuse-ld=gold # This breaks in OS X because gold can only produce ELF binaries, not Mach
+    endif
+
     ifdef CLANG
       LTOFLAGS += -flto
     else
@@ -303,6 +313,8 @@ ifdef RELEASE
   CXXFLAGS += $(LTOFLAGS)
 
   # OTHERS += -mmmx -m3dnow -msse -msse2 -msse3 -mfpmath=sse -mtune=native
+  # OTHERS += -march=native # Uncomment this to build an optimized binary for your machine only
+
   # Strip symbols, generates smaller executable.
   OTHERS += $(RELEASE_FLAGS)
   DEBUG =

README.md

@@ -21,13 +21,13 @@ The source can either be downloaded as [an archive](https://github.com/CleverRav
 
 ### Arch Linux
 
-Ncurses and tiles version avaliable in [Community repo](https://www.archlinux.org/packages/?q=cataclysm-dda)
+Ncurses and tiles version available in [Community repo](https://www.archlinux.org/packages/?q=cataclysm-dda)
 
 `sudo pacman -S cataclysm-dda`
 
 ### Fedora
 
-Ncurses and tiles version avaliable in [official repos](https://src.fedoraproject.org/rpms/cataclysm-dda)
+Ncurses and tiles version available in [official repos](https://src.fedoraproject.org/rpms/cataclysm-dda)
 
 `sudo dnf install cataclysm-dda`
 

build-scripts/build.sh

@@ -113,7 +113,8 @@ then
         {
             if [ -n "$1" ]
             then
-                echo "$1" | shuf | xargs -P "$num_jobs" -n 1 ./build-scripts/clang-tidy-wrapper.sh
+                echo "$1" | shuf | \
+                    xargs -P "$num_jobs" -n 1 ./build-scripts/clang-tidy-wrapper.sh -quiet
             else
                 echo "No files to analyze"
             fi

data/json/bionics.json

@@ -862,6 +862,17 @@
     "occupied_bodyparts": [ [ "TORSO", 1 ], [ "ARM_L", 2 ], [ "ARM_R", 2 ], [ "LEG_L", 3 ], [ "LEG_R", 3 ] ],
     "flags": [ "BIONIC_FAULTY" ]
   },
+  {
+    "id": "bio_synaptic_regen",
+    "type": "bionic",
+    "name": "Synaptic Regeneration System",
+    "description": "An electromagnetic stimulator has been surgically implanted on the back of your head and along your spine, continually draining power.  As long as it's active, you won't become sleep deprived; and if you're sleep deprived already, it will boost the rate of recovery while you sleep.",
+    "flags": [ "BIONIC_TOGGLED" ],
+    "occupied_bodyparts": [ [ "HEAD", 1 ], [ "TORSO", 1 ] ],
+    "act_cost": 0,
+    "react_cost": "1 kJ",
+    "time": 100
+  },
   {
     "id": "bio_shock",
     "type": "bionic",

data/json/construction.json

@@ -854,7 +854,7 @@
     "//": "Fills a deep pit with dirt.",
     "category": "CONSTRUCT",
     "required_skills": [ [ "fabrication", 0 ] ],
-    "time": 40,
+    "time": "40 m",
     "qualities": [ [ { "id": "DIG", "level": 1 } ] ],
     "components": [ [ [ "material_soil", 200 ] ] ],
     "pre_special": "check_empty",
@@ -867,7 +867,7 @@
     "//": "Adds wood chippings to a shallow pit to prevent plants growing, or for looks.",
     "category": "CONSTRUCT",
     "required_skills": [ [ "fabrication", 0 ] ],
-    "time": 40,
+    "time": "40 m",
     "components": [ [ [ "splinter", 50 ] ] ],
     "pre_terrain": "t_pit_shallow",
     "post_terrain": "t_woodchips"
@@ -910,7 +910,7 @@
     "//": "Makes an outside wooden paving, similar to what would be used in patios.",
     "category": "CONSTRUCT",
     "required_skills": [ [ "fabrication", 1 ] ],
-    "time": 100,
+    "time": "100 m",
     "qualities": [ [ { "id": "HAMMER", "level": 2 } ] ],
     "components": [ [ [ "2x4", 14 ] ], [ [ "nail", 28 ] ] ],
     "pre_special": "check_empty",
@@ -1215,6 +1215,18 @@
     "pre_special": "check_support",
     "post_terrain": "t_floor_primitive"
   },
+  {
+    "type": "construction",
+    "description": "Build Roof Over Dirt Floor",
+    "category": "CONSTRUCT",
+    "required_skills": [ [ "fabrication", 3 ] ],
+    "time": "60 m",
+    "qualities": [ [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_W", "level": 2 } ] ],
+    "components": [ [ [ "wood_panel", 1 ] ], [ [ "2x4", 8 ] ], [ [ "nail", 20 ] ] ],
+    "pre_note": "Must be supported on at least two sides.",
+    "pre_special": "check_support",
+    "post_terrain": "t_dirtfloor"
+  },
   {
     "type": "construction",
     "description": "Build Rope & Pulley System",
@@ -1735,7 +1747,7 @@
     "description": "Build Bed Frame",
     "category": "FURN",
     "required_skills": [ [ "fabrication", 4 ] ],
-    "time": 55,
+    "time": "55 m",
     "qualities": [ [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_W", "level": 1 } ] ],
     "components": [ [ [ "2x4", 12 ] ], [ [ "nail", 10 ] ] ],
     "pre_special": "check_empty",
@@ -1746,7 +1758,7 @@
     "description": "Add Mattress to Bed Frame",
     "category": "FURN",
     "required_skills": [ [ "fabrication", 0 ] ],
-    "time": 5,
+    "time": "5 m",
     "components": [ [ [ "mattress", 1 ], [ "down_mattress", 1 ] ] ],
     "pre_terrain": "f_bed_frame",
     "post_terrain": "f_bed"
@@ -2322,6 +2334,7 @@
     "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",
+    "pre_special": "check_down_OK",
     "post_special": "done_dig_stair"
   },
   {
@@ -2983,7 +2996,7 @@
     "description": "Hang Hanging Meathook",
     "category": "CONSTRUCT",
     "required_skills": [ [ "fabrication", 1 ] ],
-    "time": 15,
+    "time": "15 m",
     "qualities": [ [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SCREW", "level": 1 } ] ],
     "components": [ [ [ "grip_hook", 1 ] ], [ [ "chain", 1 ] ] ],
     "pre_special": "check_support",
@@ -3050,7 +3063,7 @@
     "//": "Step 1: start wall",
     "category": "CONSTRUCT",
     "required_skills": [ [ "fabrication", 3 ] ],
-    "time": 120,
+    "time": "120 m",
     "qualities": [ [ { "id": "SMOOTH", "level": 1 } ] ],
     "components": [
       [ [ "adobe_brick", 10 ] ],
@@ -3067,7 +3080,7 @@
     "//": "Step 2: finish wall",
     "category": "CONSTRUCT",
     "required_skills": [ [ "fabrication", 3 ] ],
-    "time": 120,
+    "time": "120 m",
     "qualities": [ [ { "id": "SMOOTH", "level": 1 } ] ],
     "components": [
       [ [ "adobe_brick", 10 ] ],

data/json/effects.json

@@ -520,6 +520,26 @@
     "max_duration": "15 m",
     "base_mods": { "vomit_chance": [ 60 ] }
   },
+  {
+    "type": "effect_type",
+    "id": "sleep_deprived",
+    "name": [ "Sleep Deprived" ],
+    "desc": [ "Your sleep debt has been steadily increasing for a while.  You should get some rest." ],
+    "rating": "bad",
+    "max_intensity": 20160,
+    "int_dur_factor": 240,
+    "base_mods": { "speed_mod": [ -5 ] },
+    "scaling_mods": { "speed_mod": [ -1 ], "int_mod": [ -0.33 ], "per_mod": [ -0.33 ], "str_mod": [ -0.17 ], "dex_mod": [ -0.17 ] },
+    "apply_message": "You feel weary, your body tired from lack of quality sleep.",
+    "remove_message": "You have finally caught up with your lost sleep, and you feel refreshed and awake for a change."
+  },
+  {
+    "type": "effect_type",
+    "id": "melatonin",
+    "name": [ "Melatonin Supplements" ],
+    "desc": [ "You took some melatonin supplements.  These will help with sleep deprivation." ],
+    "rating": "good"
+  },
   {
     "type": "effect_type",
     "id": "beartrap",

data/json/furniture_and_terrain/furniture-storage.json

@@ -222,33 +222,6 @@
       "items": [ { "item": "paper", "charges": [ 50, 100 ] } ]
     }
   },
-  {
-    "type": "furniture",
-    "id": "f_cupboard",
-    "name": "cupboard",
-    "symbol": "#",
-    "description": "Store your cups.",
-    "color": "blue",
-    "move_cost_mod": 1,
-    "coverage": 55,
-    "required_str": -1,
-    "flags": [ "TRANSPARENT", "FLAMMABLE_ASH", "CONTAINER", "PLACE_ITEM", "ORGANIC", "MOUNTABLE" ],
-    "deconstruct": {
-      "items": [ { "item": "2x4", "count": 3 }, { "item": "wood_panel", "count": 1 }, { "item": "nail", "charges": [ 6, 8 ] } ]
-    },
-    "bash": {
-      "str_min": 8,
-      "str_max": 30,
-      "sound": "smash!",
-      "sound_fail": "whump.",
-      "items": [
-        { "item": "2x4", "count": [ 1, 3 ] },
-        { "item": "wood_panel", "count": [ 0, 1 ] },
-        { "item": "nail", "charges": [ 2, 6 ] },
-        { "item": "splinter", "count": 1 }
-      ]
-    }
-  },
   {
     "type": "furniture",
     "id": "f_dresser",
@@ -566,7 +539,7 @@
     "move_cost_mod": -1,
     "coverage": 40,
     "required_str": 5,
-    "max_volume": "20 L",
+    "max_volume": "200 L",
     "flags": [ "TRANSPARENT", "FLAMMABLE_ASH", "CONTAINER", "PLACE_ITEM", "MOUNTABLE", "SHORT" ],
     "bash": {
       "str_min": 8,

data/json/furniture_and_terrain/furniture-surfaces.json

@@ -23,6 +23,35 @@
     "examine_action": "workbench",
     "workbench": { "multiplier": 1.1, "mass": 200000, "volume": "75L" }
   },
+  {
+    "type": "furniture",
+    "id": "f_cupboard",
+    "name": "cupboard",
+    "symbol": "#",
+    "description": "Store your cups.",
+    "color": "blue",
+    "move_cost_mod": 1,
+    "coverage": 55,
+    "required_str": -1,
+    "flags": [ "TRANSPARENT", "FLAMMABLE_ASH", "CONTAINER", "PLACE_ITEM", "ORGANIC", "MOUNTABLE", "FLAT_SURF" ],
+    "deconstruct": {
+      "items": [ { "item": "2x4", "count": 3 }, { "item": "wood_panel", "count": 1 }, { "item": "nail", "charges": [ 6, 8 ] } ]
+    },
+    "bash": {
+      "str_min": 8,
+      "str_max": 30,
+      "sound": "smash!",
+      "sound_fail": "whump.",
+      "items": [
+        { "item": "2x4", "count": [ 1, 3 ] },
+        { "item": "wood_panel", "count": [ 0, 1 ] },
+        { "item": "nail", "charges": [ 2, 6 ] },
+        { "item": "splinter", "count": 1 }
+      ]
+    },
+    "examine_action": "workbench",
+    "workbench": { "multiplier": 1.1, "mass": 200000, "volume": "75L" }
+  },
   {
     "type": "furniture",
     "id": "f_counter_gate_c",

data/json/furniture_and_terrain/terrain-fences-gates.json

@@ -440,7 +440,7 @@
     "flags": [ "TRANSPARENT", "NOITEM", "PERMEABLE", "AUTO_WALL_SYMBOL", "BURROWABLE", "AUTO_WALL_SYMBOL" ],
     "examine_action": "chainfence",
     "deconstruct": {
-      "ter_set": "t_null",
+      "ter_set": "t_floor",
       "items": [ { "item": "screen_mesh", "count": 1 }, { "item": "nail", "charges": 10 }, { "item": "2x4", "charges": 4 } ]
     },
     "bash": {

data/json/furniture_and_terrain/terrain-floors-outdoors.json

@@ -337,7 +337,7 @@
     "color": "brown",
     "move_cost": 2,
     "looks_like": "t_dirtfloor",
-    "flags": [ "TRANSPARENT", "FLAT" ],
+    "flags": [ "TRANSPARENT", "FLAT", "DIGGABLE" ],
     "bash": { "sound": "SMASH!", "ter_set": "t_null", "str_min": 50, "str_max": 400, "str_min_supported": 100, "bash_below": true }
   }
 ]

data/json/furniture_and_terrain/terrain-floors_indoor.json

@@ -269,12 +269,12 @@
     "type": "terrain",
     "id": "t_dirtfloor",
     "name": "dirt floor",
-    "description": "Floor consisting of finely mixed earth that has been tamped down.",
+    "description": "Floor consisting of finely mixed earth that has been tamped down, with a wooden ceiling above it.",
     "symbol": ".",
     "color": "brown",
     "move_cost": 2,
     "roof": "t_shingle_flat_roof",
-    "flags": [ "TRANSPARENT", "SUPPORTS_ROOF", "COLLAPSES", "INDOORS", "FLAT" ],
+    "flags": [ "TRANSPARENT", "FLAMMABLE_HARD", "SUPPORTS_ROOF", "COLLAPSES", "INDOORS", "FLAT", "DIGGABLE" ],
     "bash": {
       "sound": "SMASH!",
       "ter_set": "t_null",
@@ -293,7 +293,7 @@
     "color": "brown",
     "move_cost": 2,
     "roof": "t_thatch_roof",
-    "flags": [ "TRANSPARENT", "SUPPORTS_ROOF", "COLLAPSES", "INDOORS", "FLAT" ],
+    "flags": [ "TRANSPARENT", "FLAMMABLE_ASH", "SUPPORTS_ROOF", "COLLAPSES", "INDOORS", "FLAT", "DIGGABLE" ],
     "bash": {
       "sound": "SMASH!",
       "ter_set": "t_null",