get head

.travis.yml

@@ -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

@@ -10,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

@@ -42,6 +42,15 @@ def abi64 = getProperty("abi64").toBoolean()
 def deps = getProperty("deps")
 def override_version = getProperty("override_version")
 def version_header_path = getProperty("version_header_path")
+def override_compileSdkVersion = getProperty("override_compileSdkVersion").toInteger()
+def override_minSdkVersion = getProperty("override_minSdkVersion").toInteger()
+def override_targetSdkVersion = getProperty("override_targetSdkVersion").toInteger()
+def override_ndkBuildAppPlatform = getProperty("override_ndkBuildAppPlatform")
+
+println("Using compileSdkVersion: $override_compileSdkVersion")
+println("Using minSdkVersion: $override_minSdkVersion")
+println("Using targetSdkVersion: $override_targetSdkVersion")
+println("Using ndkBuildAppPlatform: $override_ndkBuildAppPlatform")
 
 if (!abi32 && !abi64) {
     throw new GradleException("Both `abi32` and `abi64` properties are set to false")
@@ -94,7 +103,7 @@ unzipDeps.dependsOn makeLocalization
 preBuild.dependsOn unzipDeps
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion override_compileSdkVersion
 
     if (override_version.isEmpty()) {
         println("Generating version number to $version_header_path")
@@ -127,14 +136,15 @@ android {
     }
 
     defaultConfig {
-        minSdkVersion 14
-        targetSdkVersion 28
+        minSdkVersion override_minSdkVersion
+        targetSdkVersion override_targetSdkVersion
         versionCode Integer.valueOf(System.env.UPSTREAM_BUILD_NUMBER ?: 1)
         versionName new File("$version_header_path").text.split('\"')[1]
         if (buildAsApplication) {
             applicationId "com.cleverraven.cataclysmdda"
             setProperty("archivesBaseName", "cataclysmdda-" + versionName)
         }
+        resValue "string", "app_name", "Cataclysm DDA"
 
         splits {
             // Configures multiple APKs based on ABI.
@@ -157,7 +167,7 @@ android {
 
         externalNativeBuild {
             ndkBuild {
-                arguments "APP_PLATFORM=android-16", "-j$njobs"
+                arguments "APP_PLATFORM=$override_ndkBuildAppPlatform", "-j$njobs"
             }
         }
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -169,6 +179,7 @@ android {
         experimental {
             dimension "version"
             applicationIdSuffix ".experimental"
+            resValue "string", "app_name", "Cataclysm DDA (experimental)"
         }
     }
 

android/app/src/main/res/values/strings.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">Cataclysm DDA</string>
     <string name="installing">Installing game data...</string>
     <string name="upgrading">Upgrading game data...</string>
 </resources>

android/gradle.properties

@@ -43,3 +43,19 @@ override_version=
 # This property controls path where overriden version number header should be generated
 # You can override this from the command line by passing "-Pversion_header_path=#"
 version_header_path=app/jni/src/version.h
+
+# This property controls which compileSdkVersion should be used
+# You can override this from the command line by passing "-Poverride_compileSdkVersion=#"
+override_compileSdkVersion=28
+
+# This property controls which minSdkVersion should be used
+# You can override this from the command line by passing "-Poverride_minSdkVersion=#"
+override_minSdkVersion=14
+
+# This property controls which targetSdkVersion should be used
+# You can override this from the command line by passing "-Poverride_targetSdkVersion=#"
+override_targetSdkVersion=28
+
+# This property controls which ndkBuildAppPlatform should be used
+# You can override this from the command line by passing "-Poverride_ndkBuildAppPlatform=#"
+override_ndkBuildAppPlatform=android-16

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,43 @@
+aftershock
+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
+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
+realguns
+Salvaged_Robots
+sees_player_hitbutton
+sees_player_retro
+Tanks
+Tolerate_This
+Urban_Development

data/json/construction.json

@@ -1101,7 +1101,7 @@
     "required_skills": [ [ "fabrication", 6 ], [ "survival", 2 ] ],
     "time": "180 m",
     "qualities": [ [ { "id": "HAMMER", "level": 2 }, { "id": "DIG", "level": 2 } ] ],
-    "components": [ [ [ "rock", 12 ] ] ],
+    "components": [ [ [ "rock", 12 ] ], [ [ "pebble", 50 ] ], [ [ "mortar_build", 1 ] ] ],
     "pre_special": "check_empty",
     "post_terrain": "t_rock_wall_half"
   },
@@ -1113,7 +1113,7 @@
     "required_skills": [ [ "fabrication", 6 ], [ "survival", 2 ] ],
     "time": "180 m",
     "qualities": [ [ { "id": "HAMMER", "level": 2 }, { "id": "DIG", "level": 2 } ] ],
-    "components": [ [ [ "rock", 12 ] ] ],
+    "components": [ [ [ "rock", 12 ] ], [ [ "mortar_build", 1 ] ] ],
     "pre_terrain": "t_rock_wall_half",
     "post_terrain": "t_rock_wall"
   },

data/json/flags.json

@@ -502,6 +502,13 @@
     "//": "Prevents the item from making the body part count as unfriendly to water and thus causing negative morale from being wet.",
     "info": "This clothing <good>performs well</good> even when <info>soaking wet</info>. This can feel good."
   },
+  {
+    "id": "POWERARMOR_COMPATIBLE",
+    "type": "json_flag",
+    "context": [ "ARMOR", "TOOL_ARMOR" ],
+    "//": "Allows power armor to be worn with compatible armors like ear plugs and mouthpieces.",
+    "info": "This item can be worn simultaneously with power armor."
+  },
   {
     "id": "furred",
     "type": "json_flag",

data/json/furniture_and_terrain/furniture-graves.json

@@ -65,7 +65,7 @@
     "description": "A worn-out gravestone.",
     "symbol": "^",
     "color": "dark_gray",
-    "move_cost_mod": 1.5,
+    "move_cost_mod": 2,
     "coverage": 50,
     "required_str": -1,
     "flags": [ "MINEABLE", "NOITEM", "TRANSPARENT", "MOUNTABLE", "ROUGH", "PLACE_ITEM", "UNSTABLE" ],

data/json/furniture_and_terrain/furniture-storage.json

@@ -398,10 +398,9 @@
       "sound": "metal screeching!",
       "sound_fail": "clang!",
       "items": [
-        { "item": "scrap", "count": [ 2, 8 ] },
-        { "item": "steel_chunk", "count": [ 2, 4 ] },
+        { "item": "scrap", "count": [ 4, 10 ] },
         { "item": "sheet_metal_small", "count": [ 6, 10 ] },
-        { "item": "pipe", "count": 1 }
+        { "item": "pipe", "count": [ 0, 1 ] }
       ]
     }
   },

data/json/furniture_and_terrain/terrain-fences-gates.json

@@ -725,8 +725,8 @@
   {
     "type": "terrain",
     "id": "t_gate_metal_o",
-    "name": "closed metal gate",
-    "description": "A closed metal gate.",
+    "name": "open metal gate",
+    "description": "An open metal gate.",
     "symbol": ",",
     "color": "light_gray",
     "looks_like": "t_fencegate_o",

data/json/item_actions.json

@@ -84,11 +84,6 @@
     "id": "HOTPLATE",
     "name": "Heat up food (with it)"
   },
-  {
-    "type": "item_action",
-    "id": "MISC_REPAIR",
-    "name": "Repair wood/paper/bone/chitin"
-  },
   {
     "type": "item_action",
     "id": "TOOLMOD_ATTACH",

data/json/itemgroups/SUS/clothes_store.json

@@ -54,20 +54,6 @@
     "subtype": "collection",
     "entries": [ { "group": "formal_set_mens" } ]
   },
-  {
-    "id": "SUS_tailoring_bookcase",
-    "type": "item_group",
-    "//": "SUS item groups are collections that contain a reasonable realistic distribution of items that might spawn in a given storage furniture.",
-    "//2": "This group is for a set of tailoring manuals and references.",
-    "subtype": "collection",
-    "entries": [
-      { "item": "mag_tailor", "count": [ 1, 10 ], "prob": 80 },
-      { "item": "manual_tailor", "count": [ 1, 4 ], "prob": 80 },
-      { "item": "tailor_portfolio", "prob": 20 },
-      { "item": "tailor_japanese", "prob": 10 },
-      { "item": "textbook_tailor", "count": [ 1, 4 ], "prob": 80 }
-    ]
-  },
   {
     "id": "SUS_tailoring_tool_drawer",
     "type": "item_group",