Test

.github/CODEOWNERS

@@ -0,0 +1,28 @@
+#Note that despite github calling these "owners", a better term would be "alerts"
+#Everything in the cataclysm repository remains under a creative commons license, nobody owns the mods.
+#In fact, the code "owners" designation is meant to encourage third party
+#individuals to contribute to the mod, with the maintainers notified for reviews.
+
+/data/mods/Aftershock/ @Malecypse @John-Candlebury
+/data/mods/DinoMod/ @damien @ethankaminski @LyleSY
+/data/mods/Graphical_Overmap/ @Kilvoctu @Larwck
+/data/mods/MMA/ @Hymore246
+/data/mods/No_Fungi/ @I-am-Erk
+/data/mods/blazemod/ @SouP
+/data/mods/classic_zombies/ @I-am-Erk
+/data/mods/crt_expansion/ @Soupster89
+/data/mods/desertpack/ @davidpwbrown 
+/data/mods/generic_guns/ @tenmillimaster
+/data/mods/magiclysm/ @KorGgenT
+/data/mods/my_sweet_cataclysm/ @Fris0uman
+/data/mods/ruralbiome/ @I-am-Erk
+/data/mods/speedydex/ @KorGgenT
+/data/mods/stats_through_kills/ @KorGgenT
+
+magic*.cpp @KorGgenT
+magic*.h @KorGgenT
+/data/json/itemgroups/SUS/ @I-am-Erk
+/data/json/npcs/refugee_center/ @I-am-Erk
+/data/json/npcs/Backgrounds/ @I-am-Erk
+/data/json/snippets/ @I-am-Erk
+/gfx/ @I-am-Erk

.github/ISSUE_TEMPLATE/bug_report.md

@@ -7,28 +7,28 @@ about: Create a report to help us improve
 
 # Describe the bug
 
-A clear and concise description of what the bug is.
+<!-- A clear and concise description of what the bug is. -->
 
 
 # Steps To Reproduce
 
-Steps to reproduce the behavior:
+<!-- 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.
+3. There's no way to increase aim level. -->
 
 
 # Expected behavior
 
-A clear and concise description of what you expected to happen.
-Ideally also describe *why* you expect it to happen.
+<!-- 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.
+<!-- **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" -->
+Do not take a screenshot of the crashing window. Please provide the crash logs in the "Additional context" -->
 
 # Versions and configuration
 
@@ -44,9 +44,9 @@ Ideally also describe *why* you expect it to happen.
 
 # Additional context
 
-Add any other context about the problem here.
+<!-- 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:
+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.

.github/workflows/ccpp.yml

@@ -14,7 +14,8 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v1
+    - name: checkout repository
+      uses: actions/checkout@v1
       with:
         fetch-depth: 10
     - name: install dependencies
@@ -23,3 +24,9 @@ jobs:
       run: make
     - name: run tests
       run: make check
+    - name: upload artifacts if failed
+      uses: actions/upload-artifact@v1
+      if: failure()
+      with:
+        name: cata_test
+        path: tests/cata_test

.gitignore

@@ -14,11 +14,11 @@
 /cmake-build-debug/
 /config/
 /data/*.template
-/data/font/
 /data/mods/user-default-mods.json
 /dep/
 /doxygen_doc/html/*
 /doxygen_doc/latex/*
+/font/
 /graveyard/
 /memorial/
 /mods/

.travis.yml

@@ -84,7 +84,7 @@ 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,undefined EXTRA_TEST_OPTS="~[.] ~vehicle_efficiency ~vehicle_drag ~starting_items"
+    - env: CLANG=clang++-8 SANITIZE=address,undefined EXTRA_TEST_OPTS="~[.] ~vehicle_efficiency ~vehicle_drag ~starting_items ~starve_test"
       name: "Clang 8 Make build with sanitizers enabled, but long-running tests disabled"
       compiler: clang
       addons: &clang8

CMakeLists.txt

@@ -222,11 +222,12 @@ ELSE()
     SET(CATA_WARNINGS
       "-Werror -Wall -Wextra \
        -Wmissing-declarations \
+       -Wmissing-noreturn \
        -Wold-style-cast \
        -Woverloaded-virtual \
        -Wsuggest-override \
-       -Wno-unknown-warning-option \
-       -Wpedantic")
+       -Wpedantic \
+       -Wno-unknown-warning-option")
     # Compact the whitespace in the warning string
     string(REGEX REPLACE "[\t ]+" " " CATA_WARNINGS "${CATA_WARNINGS}")
     SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CATA_WARNINGS}")

Makefile

@@ -90,11 +90,12 @@ RELEASE_FLAGS =
 WARNINGS = \
   -Werror -Wall -Wextra \
   -Wmissing-declarations \
+  -Wmissing-noreturn \
   -Wold-style-cast \
   -Woverloaded-virtual \
+  -Wpedantic \
   -Wsuggest-override \
-  -Wno-unknown-warning-option \
-  -Wpedantic
+  -Wno-unknown-warning-option
 # Uncomment below to disable warnings
 #WARNINGS = -w
 DEBUGSYMS = -g
@@ -1039,12 +1040,13 @@ endif
 
 export ODIR _OBJS LDFLAGS CXX W32FLAGS DEFINES CXXFLAGS TARGETSYSTEM
 
-ctags: $(SOURCES) $(HEADERS) $(TESTSRC) $(TESTHDR)
-	ctags $(SOURCES) $(HEADERS) $(TESTSRC) $(TESTHDR)
+ctags: $(ASTYLE_SOURCES)
+	ctags $^
+	./tools/json_tools/cddatags.py
 
-etags: $(SOURCES) $(HEADERS) $(TESTSRC) $(TESTHDR)
-	etags $(SOURCES) $(HEADERS) $(TESTSRC) $(TESTHDR)
-	find data -name "*.json" -print0 | xargs -0 -L 50 etags --append
+etags: $(ASTYLE_SOURCES)
+	etags $^
+	./tools/json_tools/cddatags.py
 
 astyle: $(ASTYLE_SOURCES)
 	$(ASTYLE_BINARY) --options=.astylerc -n $(ASTYLE_SOURCES)

README.md

@@ -1,6 +1,7 @@
 [![Build Status](https://travis-ci.org/CleverRaven/Cataclysm-DDA.svg?branch=master)](https://travis-ci.org/CleverRaven/Cataclysm-DDA)
 [![Coverage Status](https://coveralls.io/repos/github/CleverRaven/Cataclysm-DDA/badge.svg?branch=master)](https://coveralls.io/github/CleverRaven/Cataclysm-DDA?branch=master)
 [![Open Source Helpers](https://www.codetriage.com/cleverraven/cataclysm-dda/badges/users.svg)](https://www.codetriage.com/cleverraven/cataclysm-dda)
+![Commit Activity](https://img.shields.io/github/commit-activity/m/CleverRaven/Cataclysm-DDA)
 [![Lines of Code](https://tokei.rs/b1/github/CleverRaven/Cataclysm-DDA?category=code)](https://github.com/XAMPPRocky/tokei)
 
 # Cataclysm: Dark Days Ahead
@@ -31,6 +32,12 @@ Ncurses and tiles version available in [official repos](https://src.fedoraprojec
 
 `sudo dnf install cataclysm-dda`
 
+### Debian / Ubuntu
+
+Ncurses and tiles version available in [official repos](https://tracker.debian.org/pkg/cataclysm-dda)
+
+`sudo apt install cataclysm-dda-curses cataclysm-dda-sdl`
+
 ## Compile
 
 Please read [COMPILING.md](doc/COMPILING/COMPILING.md) - it covers general information and more specific recipes for Linux, OS X, Windows and BSD. See [COMPILER_SUPPORT.md](doc/COMPILING/COMPILER_SUPPORT.md) for details on which compilers we support. And you can always dig for more information in [doc/](https://github.com/CleverRaven/Cataclysm-DDA/tree/master/doc).