update

.clang-tidy

@@ -0,0 +1,6 @@
+Checks: 'clang-diagnostic-*,-clang-analyzer-deadcode.DeadStores,-clang-analyzer-security.FloatLoopCounter,-clang-analyzer-core.UndefinedBinaryOperatorResult,-clang-analyzer-core.uninitialized.Assign,-clang-analyzer-cplusplus.NewDelete,-clang-analyzer-cplusplus.NewDeleteLeaks,-clang-analyzer-core.CallAndMessage,-clang-analyzer-core.NonNullParamChecker,-clang-analyzer-core.DivideZero,-clang-diagnostic-defaulted-function-deleted,-clang-analyzer-optin.cplusplus.VirtualCall,-clang-analyzer-core.uninitialized.UndefReturn'
+WarningsAsErrors: '*'
+HeaderFilterRegex: '.*'
+FormatStyle:     none
+
+# vim:tw=0

.gitignore

@@ -10,6 +10,7 @@
 /WinDepend/
 /bindist/
 /build/
+/build-start-time
 /cmake-build-debug/
 /config/
 /data/*.template

.travis.yml

@@ -80,7 +80,18 @@ jobs:
 
     # Finally check the compiler variants
     - stage: compilers
-      env: COMPILER=g++-4.8
+
+    # CMake Clang 8.0 Tiles with CMAKE and clang-tidy
+    # (analysis only; no build or tests)
+      env: CLANG=clang++-8 TILES=1 SOUND=1 CXXFLAGS=-Wno-unused-command-line-argument CMAKE=1 CATA_CLANG_TIDY=1
+      dist: trusty
+      compiler: clang
+      addons: &clang80
+        apt:
+          packages: ["clang-8", "libc6-dbg", "libc6-dbg:i386", "g++-6", "libsdl2-dev", "libsdl2-ttf-dev", "libsdl2-image-dev", "libsdl2-mixer-dev"]
+          sources: [*apt_sources, llvm-toolchain-trusty-8]
+
+    - env: COMPILER=g++-4.8
       compiler: gcc
       addons: &gcc48
         apt:

README.md

@@ -4,7 +4,7 @@
 
 # Cataclysm: Dark Days Ahead
 
-Cataclysm: Dark Days Ahead is a roguelike set in a post-apocalyptic world. While some have described it as a "zombie game", there is far more to Cataclysm than that. Struggle to survive in a harsh, persistent, procedurally generated world. Scavenge the remnants of a dead civilization for food, equipment, or, if you are lucky, a vehicle with a full tank of gas to get you the hell out of Dodge. Fight to defeat or escape from a wide variety of powerful monstrosities, from zombies to giant insects to killer robots and things far stranger and deadlier, and against the others like yourself, that want what you have...
+Cataclysm: Dark Days Ahead is a roguelike set in a post-apocalyptic world. While some have described it as a "zombie game", there is far more to Cataclysm than that. Struggle to survive in a harsh, persistent, procedurally generated world. Scavenge the remnants of a dead civilization for food, equipment, or, if you are lucky, a vehicle with a full tank of gas to get you the hell out of Dodge. Fight to defeat or escape from a wide variety of powerful monstrosities, from zombies to giant insects to killer robots and things far stranger and deadlier, and against the others like yourself, who want what you have...
 
 
 ## Download

build-scripts/build.sh

@@ -4,40 +4,23 @@
 
 set -ex
 
+num_jobs=3
+
 function run_tests
 {
-    $WINE "$@" -d yes -r cata --rng-seed time $EXTRA_TEST_OPTS
+    $WINE "$@" -d yes --rng-seed time $EXTRA_TEST_OPTS
 }
 
-function just_json
-{
-    if [ -n $TRAVIS_COMMIT_RANGE ]
-    then
-        # If this string is populated, it will work.
-        files_changed="$(git diff --name-only $TRAVIS_COMMIT_RANGE)"
-    else
-        # The only time it isn't populated is on a new PR branch, where THIS will work.
-        files_changed="$(git diff --name-only $TRAVIS_BRANCH)"
-    fi
-    for filename in $files_changed
-    do
-        if [[ ! "$filename" =~ .json$ ]]
-        then
-            echo "$filename is not json, triggering full build."
-            return 1
-        fi
-    done
-    echo "Only json files present, skipping full build."
-    return 0
-}
+date +%s > build-start-time
 
 export CCACHE_MAXSIZE=1G
 if [ -n "$TEST_STAGE" ]
 then
     build-scripts/lint-json.sh
-    make -j 5 style-json
-elif just_json
+    make -j "$num_jobs" style-json
+elif [ -n "$JUST_JSON" ]
 then
+    echo "Early exit on just-json change"
     exit 0
 fi
 
@@ -62,12 +45,57 @@ then
         -DTILES=${TILES:-0} \
         -DSOUND=${SOUND:-0} \
         ..
-    make -j3
-    cd ..
-    [ -f "${bin_path}cata_test" ] && run_tests "${bin_path}cata_test"
-    [ -f "${bin_path}cata_test-tiles" ] && run_tests "${bin_path}cata_test-tiles"
+    if [ -n "$CATA_CLANG_TIDY" ]
+    then
+        # Run clang-tidy analysis instead of regular build & test
+        # We could use CMake to create compile_commands.json, but that's super
+        # slow, so use compiledb <https://github.com/nickdiego/compiledb>
+        # instead.
+        compiledb -n make
+
+        cd ..
+        ln -s build/compile_commands.json
+
+        # We want to first analyze all files that changed in this PR, then as
+        # many others as possible, in a random order.
+        all_cpp_files="$( \
+            grep '"file": "' build/compile_commands.json | \
+            sed "s+.*$PWD/++;s+\"$++")"
+        changed_cpp_files="$( \
+            ./build-scripts/files_changed | grep -F "$all_cpp_files" || true )"
+        if [ -n "$changed_cpp_files" ]
+        then
+            remaining_cpp_files="$( \
+                echo "$all_cpp_files" | grep -v -F "$changed_cpp_files" || true )"
+        else
+            remaining_cpp_files="$all_cpp_files"
+        fi
+
+        function analyze_files_in_random_order
+        {
+            if [ -n "$1" ]
+            then
+                echo "$1" | shuf | xargs -P "$num_jobs" -n 1 ./build-scripts/clang-tidy-wrapper.sh
+            else
+                echo "No files to analyze"
+            fi
+        }
+
+        echo "Analyzing changed files"
+        analyze_files_in_random_order "$changed_cpp_files"
+
+        echo "Analyzing remaining files"
+        analyze_files_in_random_order "$remaining_cpp_files"
+    else
+        # Regular build
+        make -j3
+        cd ..
+        # Run regular tests
+        [ -f "${bin_path}cata_test" ] && run_tests "${bin_path}cata_test"
+        [ -f "${bin_path}cata_test-tiles" ] && run_tests "${bin_path}cata_test-tiles"
+    fi
 else
-    make -j3 RELEASE=1 CCACHE=1 BACKTRACE=1 CROSS="$CROSS_COMPILATION" LINTJSON=0
+    make -j "$num_jobs" RELEASE=1 CCACHE=1 BACKTRACE=1 CROSS="$CROSS_COMPILATION" LINTJSON=0
     run_tests ./tests/cata_test
     if [ -n "$MODS" ]
     then

build-scripts/clang-tidy-wrapper.sh

@@ -0,0 +1,19 @@
+#!/bin/bash
+
+# Wrapper script for clang tidy which is a no-op after some time limit to avoid
+# hitting the Travis build timeout.
+
+set -eu
+set -o pipefail
+
+seconds_since_build_start=$(($(date +%s) - $(cat build-start-time)))
+time_limit=$((15*60)) # Stop 15 minutes after build started
+printf "%s/%s seconds elapsed\n" "$seconds_since_build_start" "$time_limit"
+if [ "$seconds_since_build_start" -gt "$time_limit" ]
+then
+    printf "Skipping clang-tidy %s due to time limit\n" "$*"
+    exit 0
+fi
+
+set -x
+clang-tidy "$@"

build-scripts/files_changed

@@ -0,0 +1,17 @@
+#!/bin/bash
+
+# Helper script to get the list of changed files for this build.
+# If a PR it lists the changes from the target branch.
+# If a 'regular' branch build the changes since the last build.
+# https://docs.travis-ci.com/user/environment-variables/
+
+if [ -n $TRAVIS_COMMIT_RANGE ]
+then
+    # If this string is populated, it should work.
+    # But it mught fail, due to e.g. the shallow clone depth missing the
+    # relevant commit, in which case we fail
+    git diff --name-only $TRAVIS_COMMIT_RANGE || exit 1
+else
+    # The only time it isn't populated is on a new PR branch, where THIS will work.
+    git diff --name-only $TRAVIS_BRANCH
+fi

build-scripts/requirements.sh

@@ -2,12 +2,35 @@
 
 set -e
 
+function just_json
+{
+    for filename in $(./build-scripts/files_changed || echo UNKNOWN)
+    do
+        if [[ ! "$filename" =~ \.(json|md)$ ]]
+        then
+            echo "$filename is not json or markdown, triggering full build."
+            return 1
+        fi
+    done
+    echo "Only json / markdown files changed, skipping full build."
+    return 0
+}
+
+if just_json; then
+    export JUST_JSON=true
+    export CODE_COVERAGE=""
+fi
+
 if [ -n "${CODE_COVERAGE}" ]; then
   travis_retry pip install --user pyyaml cpp-coveralls;
   export CXXFLAGS=--coverage;
   export LDFLAGS=--coverage;
 fi
 
+if [ -n "$CATA_CLANG_TIDY" ]; then
+    travis_retry pip install --user compiledb
+fi
+
 # Influenced by https://github.com/zer0main/battleship/blob/master/build/windows/requirements.sh
 if [ -n "${MXE_TARGET}" ]; then
     sudo add-apt-repository 'deb [arch=amd64] https://mirror.mxe.cc/repos/apt xenial main'

data/json/bionics.json

@@ -438,14 +438,6 @@
     "description": "You don't think that capacitor is *meant* to glow, but it does, and usually at bad times.  A malfunctioning bionic randomly turns on and off, causing you to glow and making you visible in the dark without improving how much you can see in the slighest.",
     "flags": [ "BIONIC_FAULTY" ]
   },
-  {
-    "id": "bio_furnace",
-    "type": "bionic",
-    "name": "Internal Furnace",
-    "description": "When this bionic is active, you can burn nearly any organic material as fuel (use 'E'), recharging your power level.  Some materials will burn better than others.",
-    "occupied_bodyparts": [ [ "TORSO", 40 ] ],
-    "flags": [ "BIONIC_POWER_SOURCE", "BIONIC_TOGGLED" ]
-  },
   {
     "id": "bio_geiger",
     "type": "bionic",

data/json/construction.json

@@ -1873,6 +1873,30 @@
     "pre_terrain": "t_water_moving_sh",
     "post_terrain": "t_dock"
   },
+  {
+    "type": "construction",
+    "description": "Place Water Mill",
+    "//": "Set up Water Mill",
+    "category": "CONSTRUCT",
+    "required_skills": [ [ "fabrication", 2 ] ],
+    "time": 40,
+    "qualities": [ [ { "id": "HAMMER", "level": 2 } ] ],
+    "components": [ [ [ "water_mill", 1 ] ] ],
+    "pre_terrain": "t_water_moving_sh",
+    "post_terrain": "f_water_mill"
+  },
+  {
+    "type": "construction",
+    "description": "Place Wind Mill",
+    "//": "Set up Wind Mill",
+    "category": "CONSTRUCT",
+    "required_skills": [ [ "fabrication", 2 ] ],
+    "time": 40,
+    "qualities": [ [ { "id": "DIG", "level": 1 } ] ],
+    "components": [ [ [ "wind_mill", 1 ] ] ],
+    "pre_terrain": "t_pit_shallow",
+    "post_terrain": "f_wind_mill"
+  },
   {
     "type": "construction",
     "description": "Build Shallow Temporary Bridge",

data/json/corpses.json

@@ -13,7 +13,7 @@
       { "item": "adderall", "prob": 40 },
       { "item": "id_military", "prob": 5 },
       { "item": "militarymap", "prob": 5 },
-      { "item": "cash_card", "charges-min": 0, "charges-max": 50000 },
+      { "item": "cash_card", "prob": 10, "charges-min": 0, "charges-max": 50000 },
       { "group": "mil_food", "prob": 15 },
       { "item": "bone_human", "count": [ 5, 8 ], "prob": 100 },
       { "item": "human_flesh", "count": [ 5, 8 ], "prob": 100 },
@@ -62,7 +62,7 @@
           { "item": "two_way_radio", "prob": 50 },
           { "item": "grenade", "prob": 5 },
           { "item": "id_military", "prob": 5 },
-          { "item": "cash_card", "charges-min": 0, "charges-max": 50000 },
+          { "item": "cash_card", "prob": 10, "charges-min": 0, "charges-max": 50000 },
           { "group": "misc_smoking", "prob": 30 }
         ]
       },

data/json/dreams.json

@@ -76,7 +76,7 @@
   },
   {
     "type": "dream",
-    "messages": [ "You have a strange dream about living in a cave.", "Your dreams give a strange reclusive feeling." ],
+    "messages": [ "You have a strange dream about living in a cave.", "Your dreams give you a strange reclusive feeling." ],
     "category": "TROGLOBITE",
     "strength": 1
   },