Merge pull request #3 from CleverRaven/master

Sync repository

.clang-tidy

@@ -1,4 +1,4 @@
-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'
+Checks: 'clang-diagnostic-*,-clang-analyzer-security.FloatLoopCounter,-clang-analyzer-core.UndefinedBinaryOperatorResult,-clang-analyzer-core.uninitialized.Assign,-clang-analyzer-cplusplus.NewDeleteLeaks,-clang-analyzer-core.CallAndMessage,-clang-analyzer-core.NonNullParamChecker,-clang-analyzer-optin.cplusplus.VirtualCall,-clang-analyzer-core.NullDereference'
 WarningsAsErrors: '*'
 HeaderFilterRegex: '.*'
 FormatStyle:     none

.github/ISSUE_TEMPLATE/bug_report.md

@@ -3,29 +3,56 @@ name: Bug report
 about: Create a report to help us improve
 
 ---
+<!-- Please follow the template below -->
+
+# Describe the bug
 
-**Describe the bug**  
 A clear and concise description of what the bug is.
 
-**To Reproduce**  
+
+# Steps To Reproduce
+
 Steps to reproduce the behavior:
 1. Make a player with a gun, magazine, and some ammo.
 2. Try to aim at a wall.
 3. There's no way to increase aim level.
 
-**Expected behavior**  
-A clear and concise description of what you expected to happen.  
+
+# Expected behavior
+
+A clear and concise description of what you expected to happen.
 Ideally also describe *why* you expect it to happen.
 
-**Screenshots**  
-If applicable, add screenshots to help explain your problem.
 
-**Versions and configuration(please complete the following information):**
+# Screenshots
+
+**If applicable**, add screenshots to help explain your problem.
+
+<!-- Do not take a screenshot of the crashing window. Please provide the crash logs in the "Additional context" -->
+
+# Versions and configuration
+
+<!-- Please complete the following information; you can now go to:
+    - "Main menu (ESC) > Debug Menu > Info > Generate game report" to generate this report.
+    - Please update your OS version with a more precise version. -->
+
  - OS: [e.g. iOS 8 or Windows 10 or Ubuntu 18.04]
  - Game Version: [from the main menu, e.g. 0.C-29938-g90f5268437]
  - Graphics version: [Tiles or Terminal]
  - Mods loaded: [e.g.dda, boats, hacktheplanet, StatsThroughSkills]
 
-**Additional context**  
-Add any other context about the problem here.  
-E.g. A link to a savegame that allows the issue to be reproduced.
+
+# Additional context
+
+Add any other context about the problem here.
+
+<!-- Crash: if your problem refers to a crash, please add the following files to the "Additional Context" paragraph:
+    - From the /config folder (you can zip them both together):
+        - crash.log file.
+        - debug.log file.
+    - Your save file (zipped)
+
+- note #1: you can drag and drop files in this issue post!
+- note #2: it is very important for us that you provide a save file in case of a crash. It really helps the developers
+    to reproduce the bug and fix it. If possible, try to provide a save file that occurs in the right conditions, just
+    before the crash happens. -->

.gitignore

@@ -47,6 +47,7 @@ logg.txt
 *.ilk
 *.opensdf
 *.pdb
+*.lib
 *.sdf
 *.suo
 *.user

.travis.yml

@@ -36,7 +36,7 @@ jobs:
   include:
     # Initial test stage, if this fails everything else is cancelled.
     - stage: test
-      # GCC 5 is the pre-installed compiler on Xenial
+      # GCC 5.4 is the pre-installed compiler on Xenial
       env: COMPILER=g++ MODS=--mods=RL_Classes TEST_STAGE=1
 
     # Then build different configurations and targets in parallel.
@@ -91,21 +91,12 @@ jobs:
           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
+    - env: COMPILER=g++
       compiler: gcc
-      addons: &gcc48
+      addons: &gcc53
         apt:
-          packages: ["g++-4.8", "g++-4.8-multilib", "libc6-dbg", "libc6-dbg:i386"]
-          sources: *apt_sources
-
-    # GCC 4.9
-    - env: COMPILER=g++-4.9
-      if: type != pull_request
-      compiler: gcc
-      addons: &gcc49
-        apt:
-          packages: ["g++-4.9", "g++-4.9-multilib", "libc6-dbg", "libc6-dbg:i386"]
-          sources: *apt_sources
+          packages: ["g++-5=5.3.1-14ubuntu2", "libstdc++-5-dev=5.3.1-14ubuntu2", "gcc-5=5.3.1-14ubuntu2", "gcc-5-base=5.3.1-14ubuntu2", "cpp-5=5.3.1-14ubuntu2", "libgcc-5-dev=5.3.1-14ubuntu2", "libasan2=5.3.1-14ubuntu2", "libmpx0=5.3.1-14ubuntu2"]
+          sources: [*apt_sources]
 
     # GCC 6
     - env: COMPILER=g++-6

CMakeLists.txt

@@ -212,7 +212,7 @@ IF(MSVC)
 		add_definitions(-D_X86_)
 	endif()
 ELSE()
-	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wextra -Wall -std=c++11")
+	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wextra -Wall -std=c++14")
 	SET(CMAKE_CXX_FLAGS_DEBUG "-Og -g -D_GLIBCXX_DEBUG")
 ENDIF()
 

Makefile

@@ -307,9 +307,9 @@ ifndef RELEASE
 endif
 
 ifeq ($(shell sh -c 'uname -o 2>/dev/null || echo not'),Cygwin)
-  OTHERS += -std=gnu++11
+  OTHERS += -std=gnu++14
 else
-  OTHERS += -std=c++11
+  OTHERS += -std=c++14
 endif
 
 CXXFLAGS += $(WARNINGS) $(DEBUG) $(DEBUGSYMS) $(PROFILE) $(OTHERS) -MMD -MP

SIGNOFF

@@ -61,3 +61,4 @@ Patrik Stridvall <patrik@stridvall.se>
 Ryan Schneider (RadHazard) <rslego@gmail.com>
 Paul Bransford (draeath) <draeath@gmail.com>
 Mark Langsdorf (mlangsdorf) <mark.langsdorf@gmail.com> / <mlangsdo@redhat.com>
+Davis Bray (Kaltag1925) <pdavisbray@gmail.com>

build-scripts/build.sh

@@ -96,10 +96,19 @@ then
     fi
 else
     make -j "$num_jobs" RELEASE=1 CCACHE=1 BACKTRACE=1 CROSS="$CROSS_COMPILATION" LINTJSON=0
+
     run_tests ./tests/cata_test
-    if [ -n "$MODS" ]
+    if [ "$TRAVIS_OS_NAME" == "osx" ]
     then
-        run_tests ./tests/cata_test $MODS
+        run_tests ./tests/cata_test
+    else
+        run_tests ./tests/cata_test &
+        if [ -n "$MODS" ]
+        then
+            run_tests ./tests/cata_test $MODS &
+            wait -n
+        fi
+        wait -n
     fi
 fi
 ccache --show-stats

data/json/construction.json

@@ -1219,17 +1219,6 @@
     "pre_special": "check_empty",
     "post_terrain": "f_crate_o"
   },
-  {
-    "type": "construction",
-    "description": "Seal Coffin",
-    "category": "FURN",
-    "required_skills": [ [ "mechanics", 0 ] ],
-    "time": 10,
-    "components": [ [ [ "nail", 6 ] ] ],
-    "qualities": [ [ { "id": "HAMMER", "level": 1 } ] ],
-    "pre_terrain": "f_coffin_o",
-    "post_terrain": "f_coffin_c"
-  },
   {
     "type": "construction",
     "description": "Build Coffin",
@@ -1245,6 +1234,30 @@
     "pre_special": "check_empty",
     "post_terrain": "f_coffin_o"
   },
+  {
+    "type": "construction",
+    "description": "Seal Coffin",
+    "category": "FURN",
+    "required_skills": [ [ "mechanics", 0 ] ],
+    "time": 10,
+    "components": [ [ [ "nail", 6 ] ] ],
+    "qualities": [ [ { "id": "HAMMER", "level": 1 } ] ],
+    "pre_terrain": "f_coffin_o",
+    "post_terrain": "f_coffin_c"
+  },
+  {
+    "type": "construction",
+    "description": "Dig Grave and Bury Sealed Coffin",
+    "category": "DIG",
+    "required_skills": [ [ "fabrication", 0 ] ],
+    "time": 60,
+    "qualities": [ [ { "id": "HAMMER", "level": 1 } ], [ { "id": "DIG", "level": 2 } ] ],
+    "components": [ [ [ "rock", 20 ], [ "2x4", 2 ] ] ],
+    "pre_flags": "DIGGABLE",
+    "pre_terrain": "f_coffin_c",
+    "post_terrain": "t_grave_new",
+    "post_special": "done_grave"
+  },
   {
     "type": "construction",
     "description": "Build Bulletin Board",

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/furniture.json

@@ -1510,7 +1510,7 @@
       "MOUNTABLE",
       "SHORT"
     ],
-    "examine_action": "crate",
+    "examine_action": "locked_object",
     "deconstruct": { "items": [ { "item": "2x4", "count": 4 }, { "item": "nail", "charges": [ 6, 10 ] } ] },
     "max_volume": 4000,
     "bash": {
@@ -3207,6 +3207,50 @@
       "items": [ { "item": "rock", "count": 8 }, { "item": "stick", "count": [ 8, 12 ] } ]
     }
   },
+  {
+    "type": "furniture",
+    "id": "f_metal_smoking_rack",
+    "name": "metal smoking rack",
+    "description": "A special rack designed to smoke food for better preservation and taste.",
+    "symbol": "=",
+    "bgcolor": "light_gray",
+    "move_cost_mod": 2,
+    "required_str": -1,
+    "deployed_item": "metal_smoking_rack",
+    "flags": [ "TRANSPARENT", "SEALED", "ALLOW_FIELD_EFFECT", "CONTAINER", "NOITEM", "EASY_DECONSTRUCT", "MINEABLE" ],
+    "crafting_pseudo_item": "char_smoker",
+    "examine_action": "smoker_options",
+    "deconstruct": { "items": [ { "item": "metal_smoking_rack", "count": 1 } ] },
+    "bash": {
+      "str_min": 18,
+      "str_max": 50,
+      "sound": "metal screeching!",
+      "sound_fail": "clang!",
+      "items": [ { "item": "scrap", "count": 4 }, { "item": "pipe", "count": [ 3, 5 ] } ]
+    }
+  },
+  {
+    "type": "furniture",
+    "id": "f_metal_smoking_rack_active",
+    "name": "active metal smoking rack",
+    "description": "A special rack designed to smoke food for better preservation and taste.",
+    "symbol": "=",
+    "bgcolor": "light_gray",
+    "move_cost_mod": 2,
+    "required_str": -1,
+    "deployed_item": "metal_smoking_rack",
+    "flags": [ "TRANSPARENT", "SEALED", "ALLOW_FIELD_EFFECT", "CONTAINER", "NOITEM", "EASY_DECONSTRUCT", "MINEABLE" ],
+    "crafting_pseudo_item": "char_smoker",
+    "examine_action": "smoker_options",
+    "deconstruct": { "items": [ { "item": "metal_smoking_rack", "count": 1 } ] },
+    "bash": {
+      "str_min": 18,
+      "str_max": 50,
+      "sound": "metal screeching!",
+      "sound_fail": "clang!",
+      "items": [ { "item": "scrap", "count": 4 }, { "item": "pipe", "count": [ 3, 5 ] } ]
+    }
+  },
   {
     "type": "furniture",
     "id": "f_forge_rock",

data/json/item_actions.json

@@ -54,6 +54,11 @@
     "id": "PICKAXE",
     "name": "Dig through rock"
   },
+  {
+    "type": "item_action",
+    "id": "BURROW",
+    "name": "Burrow through rock"
+  },
   {
     "type": "item_action",
     "id": "GEIGER",
@@ -879,6 +884,11 @@
     "id": "BLOOD_DRAW",
     "name": "Draw some blood"
   },
+  {
+    "type": "item_action",
+    "id": "HAND_CRANK",
+    "name": "Recharge a battery"
+  },
   {
     "type": "item_action",
     "id": "VIBE",

data/json/item_groups.json

@@ -389,7 +389,7 @@
       [ "kippah", 1 ],
       [ "robe", 3 ],
       [ "thawb", 1 ],
-      [ "kimono", 1 ],
+      [ "yukata", 1 ],
       [ "eclipse_glasses", 1 ],
       [ "reading_light", 9 ]
     ]
@@ -1139,7 +1139,11 @@
       [ "robe", 10 ],
       [ "eboshi", 1 ],
       [ "kariginu", 1 ],
-      [ "kimono", 5 ],
+      [ "geta", 1 ],
+      [ "kimono", 2 ],
+      [ "yukata", 6 ],
+      [ "haori", 2 ],
+      [ "hakama", 4 ],
       [ "eclipse_glasses", 1 ],
       [ "thermos", 20 ]
     ]
@@ -3044,7 +3048,11 @@
       [ "robe", 5 ],
       [ "eboshi", 1 ],
       [ "kariginu", 1 ],
-      [ "kimono", 3 ]
+      [ "geta", 1 ],
+      [ "kimono", 2 ],
+      [ "yukata", 4 ],
+      [ "haori", 1 ],
+      [ "hakama", 2 ]
     ]
   },
   {
@@ -4419,7 +4427,11 @@
       [ "cassock", 1 ],
       [ "eboshi", 1 ],
       [ "kariginu", 2 ],
-      [ "kimono", 3 ],
+      [ "kimono", 2 ],
+      [ "yukata", 4 ],
+      [ "haori", 1 ],
+      [ "hakama", 2 ],
+      [ "geta", 1 ],
       [ "l-stick", 1 ],
       [ "solarpack", 5 ],
       [ "tourist_table", 10 ],
@@ -8208,6 +8220,8 @@
       [ "cavalry_sabre", 2 ],
       [ "glaive", 2 ],
       [ "naginata", 2 ],
+      [ "naginata_fake", 2 ],
+      [ "naginata_inferior", 3 ],
       [ "estoc", 2 ],
       [ "estoc_fake", 6 ],
       [ "qiang", 3 ],
@@ -8269,7 +8283,7 @@
       [ "seed_zucchini", 60 ],
       [ "seed_cotton_boll", 10 ],
       [ "seed_tobacco", 10 ],
-      [ "raw_beans", 60 ],
+      [ "seed_beans", 60 ],
       [ "seed_chili_pepper", 60 ],
       [ "seed_tomato", 60 ]
     ]
@@ -8669,6 +8683,7 @@
     "items": [
       [ "rope_30", 10 ],
       [ "hatchet", 50 ],
+      [ "iceaxe", 20 ],
       [ "mess_kit", 100 ],
       [ "teapot", 50 ],
       [ "binoculars", 30 ],