Merge pull request #13 from CleverRaven/master

Pre 0.E catchup

.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,46 +7,47 @@ 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
 
 <!-- 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. -->
+    - 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]
+ - Ingame language: [Arabic or Bulgarian or Chinese (Simplified) or Chinese (Traditional) or Dutch or Esperanto or French or German or Italian (Italy) or Japanese or Korean or Polish or Portuguese (Brazil) or Russian or Serbian or Spanish (Argentina) or Spanish (Spain) or Turkish]
  - Mods loaded: [e.g.dda, boats, hacktheplanet, StatsThroughSkills]
-
+ -->
 
 # 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/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.

.github/stale.yml

@@ -23,6 +23,7 @@ exemptLabels:
   - "(P5 - Long-term)"
   - "(S2 - Confirmed)"
   - "0.E Feature Freeze"
+  - "0.E Content Freeze"
 
 # Set to true to ignore issues in a project (defaults to false)
 exemptProjects: true

.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

@@ -57,7 +57,7 @@ jobs:
     # Initial test stage, if this fails everything else is cancelled.
     - stage: Test
       # Clang is consistently the fastest to build, so use it for the initial test.
-      env: CLANG=clang++-3.8 MODS=--mods=RL_Classes TEST_STAGE=1 CXXFLAGS='-Wno-error=unused-command-line-argument -D__extern_always_inline="extern __always_inline"'
+      env: CLANG=clang++-3.8 MODS=--mods=RL_Classes TEST_STAGE=1 CXXFLAGS="-Wno-error=unused-command-line-argument -D__extern_always_inline='extern __always_inline'"
       name: "Clang 3.8 Make build with curses, style check and RL_Classes test"
       compiler: clang
       addons: &clang38
@@ -75,7 +75,7 @@ jobs:
           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]
 
-    - env: COMPILER=g++-8 CXXFLAGS='-Wno-implicit-fallthrough' TILES=1 SOUND=1 SANITIZE=address
+    - env: COMPILER=g++-8 CXXFLAGS="-Wno-implicit-fallthrough" TILES=1 SOUND=1 SANITIZE=address EXTRA_TEST_OPTS="~[.] ~vehicle_efficiency"
       name: "GCC 8 Make build with Tiles, Sound, astyle and address sanitization"
       dist: bionic
       compiler: gcc
@@ -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] ~grenade_lethality"
       name: "Clang 8 Make build with sanitizers enabled, but long-running tests disabled"
       compiler: clang
       addons: &clang8
@@ -94,7 +94,7 @@ jobs:
 
     - stage: "Platforms and Tidy"
     # MXE variant using alternate repository http://mirror.mxe.cc/repos/apt
-      env: COMPILER='g++' LDFLAGS='-static-libgcc -static-libstdc++' MXE_TARGET='i686-w64-mingw32.static' WINE='wine' TILES=1 SOUND=1
+      env: COMPILER=g++ LDFLAGS="-static-libgcc -static-libstdc++" MXE_TARGET="i686-w64-mingw32.static" WINE="wine" TILES=1 SOUND=1
       name: "Mingw-w64 Make cross-compile to Windows with Tiles and Sound"
       compiler: gcc
       addons: &gcc

CMakeLists.txt

@@ -193,7 +193,7 @@ ELSE (CMAKE_BUILD_TYPE STREQUAL Debug)
     MESSAGE(STATUS "PIXMAPS_UNITY_ENTRY_PATH      : ${PIXMAPS_UNITY_ENTRY_PATH}")
     MESSAGE(STATUS "MANPAGE_ENTRY_PATH            : ${MANPAGE_ENTRY_PATH}\n")
     ADD_DEFINITIONS(-DRELEASE)
-    # Use PREFIX as storage of data,gfx, etc.. Usefull only on *nix OS.
+    # Use PREFIX as storage of data,gfx, etc.. Useful only on *nix OS.
     IF (PREFIX AND NOT WIN32)
       ADD_DEFINITIONS(-DDATA_DIR_PREFIX)
     ENDIF (PREFIX AND NOT WIN32)
@@ -221,12 +221,21 @@ IF(MSVC)
 ELSE()
     SET(CATA_WARNINGS
       "-Werror -Wall -Wextra \
+       -Wformat-signedness \
+       -Wlogical-op \
        -Wmissing-declarations \
+       -Wmissing-noreturn \
+       -Wnon-virtual-dtor \
        -Wold-style-cast \
        -Woverloaded-virtual \
+       -Wpedantic \
        -Wsuggest-override \
-       -Wno-unknown-warning-option \
-       -Wpedantic")
+       -Wunused-macros \
+       -Wzero-as-null-pointer-constant \
+       -Wno-unknown-warning-option")
+    IF (NOT ${CMAKE_SYSTEM_NAME} MATCHES Windows)
+        SET(CATA_WARNINGS "${CATA_WARNINGS} -Wredundant-decls")
+    ENDIF()
     # Compact the whitespace in the warning string
     string(REGEX REPLACE "[\t ]+" " " CATA_WARNINGS "${CATA_WARNINGS}")
     SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CATA_WARNINGS}")

LICENSE-OFL-Terminus-Font.txt

@@ -0,0 +1,94 @@
+Copyright (c) 2019 Dimitar Toshkov Zhekov,
+with Reserved Font Name "Terminus Font".
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded, 
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.

LICENSE.txt

@@ -4,6 +4,8 @@ The Square font (data/font/square.ttf) is copyright Wouter van Oortmerssen, lice
 
 GNU Unifont (data/font/unitfont.ttf) is licensed under GNU General Public License v2+ with the GNU font embedding exception. Visit http://unifoundry.com/LICENSE.txt for details.
 
+Terminus Font (data/font/terminus.ttf) is licensed under the SIL Open Font License (see LICENSE-OFL-Terminus-Font.txt).
+
 CATCH unit-test framework (tests/catch/catch.hpp) is licensed under the Boost Software License. Visit https://github.com/philsquared/Catch/blob/master/LICENSE.txt to read the license.
 
 PLF List and PLF Colony (src/list.h, src/colony.h) are licensed under the zLib license (https://www.zlib.net/zlib_license.html).