Merge pull request #8 from CleverRaven/master

Update baseline

.travis.yml

@@ -107,7 +107,7 @@ jobs:
       android:
         components:
           - build-tools-28.0.1
-          - android-26
+          - android-28
       cache:
         # The ccache feature in Travis doesn't work for language: android, so
         # do it ourselves.
@@ -125,7 +125,7 @@ jobs:
       compiler: clang
       addons: &clang8
         apt:
-          packages: ["clang-8", "libclang-8-dev", "llvm-8-dev", "llvm-8-tools", "libsdl2-dev", "libsdl2-ttf-dev", "libsdl2-image-dev", "libsdl2-mixer-dev"]
+          packages: ["clang-8", "libclang-8-dev", "llvm-8-dev", "llvm-8-tools", "libsdl2-dev", "libsdl2-ttf-dev", "libsdl2-image-dev", "libsdl2-mixer-dev", "libpulse-dev", "libpulse0=1:8.0-0ubuntu3.10", "libpulse-mainloop-glib0=1:8.0-0ubuntu3.10"]
           sources: [*apt_sources, llvm-toolchain-xenial-8]
 
     # Finally check the compiler variants

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)
+[![Lines of Code](https://tokei.rs/b1/github/CleverRaven/Cataclysm-DDA?category=code)](https://github.com/XAMPPRocky/tokei)
 
 # Cataclysm: Dark Days Ahead
 
@@ -9,10 +10,27 @@ Cataclysm: Dark Days Ahead is a roguelike set in a post-apocalyptic world. While
 
 ## Download
 
+<a href="https://repology.org/project/cataclysm-dda/versions">
+    <img src="https://repology.org/badge/vertical-allrepos/cataclysm-dda.svg" alt="Packaging status" align="right">
+</a>
+
 Visit [our website](http://cataclysmdda.org) for download links to all stable and experimental releases.
 
 The source can either be downloaded as [an archive](https://github.com/CleverRaven/Cataclysm-DDA/archive/master.zip), or you can clone it from [our GitHub repository](https://github.com/CleverRaven/Cataclysm-DDA/).
 
+## Packaging status
+
+### Arch Linux
+
+Ncurses and tiles version avaliable 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)
+
+`sudo dnf install cataclysm-dda`
 
 ## Compile
 

android/app/build.gradle

@@ -94,7 +94,7 @@ unzipDeps.dependsOn makeLocalization
 preBuild.dependsOn unzipDeps
 
 android {
-    compileSdkVersion 26
+    compileSdkVersion 28
 
     if (override_version.isEmpty()) {
         println("Generating version number to $version_header_path")
@@ -128,7 +128,7 @@ android {
 
     defaultConfig {
         minSdkVersion 14
-        targetSdkVersion 26
+        targetSdkVersion 28
         versionCode Integer.valueOf(System.env.UPSTREAM_BUILD_NUMBER ?: 1)
         versionName new File("$version_header_path").text.split('\"')[1]
         if (buildAsApplication) {

build-scripts/build.sh

@@ -161,6 +161,18 @@ else
         fi
         wait -n
     fi
+
+    if [ -n "$TEST_STAGE" ]
+    then
+        # Run the tests one more time, without actually running any tests, just to verify that all
+        # the mod data can be successfully loaded
+
+        # Use a blacklist of mods that currently fail to load cleanly.  Hopefully this list will
+        # shrink over time.
+        blacklist=build-scripts/mod_test_blacklist
+        mods="$(./build-scripts/get_all_mods.py $blacklist)"
+        run_tests ./tests/cata_test --user-dir=all_modded --mods="$mods" '~*'
+    fi
 fi
 ccache --show-stats
 

build-scripts/get_all_mods.py

@@ -0,0 +1,19 @@
+#!/usr/bin/env python3
+
+import sys
+import glob
+import json
+
+blacklist_filename, = sys.argv[1:]
+with open(blacklist_filename) as blacklist_file:
+    blacklist = {s.rstrip('\n') for s in blacklist_file.readlines()}
+
+mods = []
+
+for info in glob.glob('data/mods/*/modinfo.json'):
+    mod_info = json.load(open(info))
+    mods.extend(e["ident"] for e in mod_info if e["type"] == "MOD_INFO")
+
+mods_to_keep = [mod for mod in mods if mod not in blacklist]
+
+print(','.join(mods_to_keep))

build-scripts/mod_test_blacklist

@@ -0,0 +1,51 @@
+aftershock
+alt_map_key
+Animatronics
+Battery_Overhaul_Legacy_Mode
+blazemod
+cbm_slots
+classic_zombies
+crazy_cataclysm
+crt_expansion
+desertpack
+DinoMod
+ew_pack
+FIC_Weapons
+FujiStruct
+generic_guns
+Graphical_Overmap
+growable-pots
+Heavy miners
+hydroponics
+magiclysm
+manualbionicinstall
+mapgen_demo
+Medieval_Stuff
+MMA
+modular_turrets
+more_locations
+More_Survival_Tools
+mutant_npcs
+my_sweet_cataclysm
+national_guard_camp
+No_Anthills
+No_Bees
+no_faults
+no_filthy_clothing
+No_Fungi
+no_medieval_items
+no_npc_food
+No_Rail_Stations
+No_Triffids
+novitamins
+realguns
+safeautodoc
+Salvaged_Robots
+sees_player_hitbutton
+sees_player_retro
+sleepdeprivation
+speedydex
+stats_through_kills
+Tanks
+Tolerate_This
+Urban_Development

data/json/construction.json

@@ -1464,7 +1464,7 @@
     "required_skills": [ [ "fabrication", 4 ] ],
     "time": "60 m",
     "qualities": [ [ { "id": "HAMMER", "level": 2 } ], [ { "id": "WRENCH", "level": 1 } ] ],
-    "components": [ [ [ "sheet_metal", 2 ] ], [ [ "pipe", 8 ] ] ],
+    "components": [ [ [ "sheet_metal", 2 ] ], [ [ "pipe", 8 ] ], [ [ "lock", 1 ] ] ],
     "pre_special": "check_empty",
     "post_terrain": "f_locker"
   },

data/json/effects.json

@@ -1600,6 +1600,19 @@
     "max_intensity": 3,
     "scaling_mods": { "h_mod_min": [ -5 ] }
   },
+  {
+    "type": "effect_type",
+    "id": "bad_food_ennui",
+    "name": [ "Gross food", "Demoralizing food", "Depressing food" ],
+    "desc": [
+      "The food you eat is disgusting.",
+      "Eating nothing but disgusting rations is starting to get you down.",
+      "Sure, you survived, but what kind of survival is this, eating these disgusting rations day in and day out?"
+    ],
+    "max_intensity": 3,
+    "//": "No morale_mod is currently possible in effects, for some reason.  As soon as it's implemented, it goes here.",
+    "rating": "bad"
+  },
   {
     "type": "effect_type",
     "id": "cough_suppress"