update

android/app/build.gradle

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

android/app/src/main/java/com/cleverraven/cataclysmdda/SplashScreen.java

@@ -28,8 +28,8 @@ public class SplashScreen extends Activity {
     private static final int INSTALL_DIALOG_ID = 0;
     private ProgressDialog installDialog;
 
-    public CharSequence[] mSettingsNames = { "Software rendering" };
-    public boolean[] mSettingsValues = { true };
+    public CharSequence[] mSettingsNames = { "Software rendering", "Force fullscreen" };
+    public boolean[] mSettingsValues = { false, false};
 
     private String getVersionName() {
         try {

android/app/src/main/java/org/libsdl/app/SDLActivity.java

@@ -21,6 +21,7 @@
 import android.widget.LinearLayout;
 import android.widget.TextView;
 import android.os.*;
+import android.preference.PreferenceManager;
 import android.util.DisplayMetrics;
 import android.util.Log;
 import android.util.SparseArray;
@@ -631,9 +632,11 @@ public void handleMessage(Message msg) {
                         } else {
                             int flags = View.SYSTEM_UI_FLAG_LAYOUT_STABLE | View.SYSTEM_UI_FLAG_VISIBLE;
                             window.getDecorView().setSystemUiVisibility(flags);
-                            window.addFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN);
-                            window.clearFlags(WindowManager.LayoutParams.FLAG_FORCE_NOT_FULLSCREEN);
-                            SDLActivity.mFullscreenModeActive = true;
+                            Context appContext = context.getApplicationContext();
+                            boolean forceFullScreen = PreferenceManager.getDefaultSharedPreferences(appContext).getBoolean("Force fullscreen", false);
+                            window.addFlags(forceFullScreen ? WindowManager.LayoutParams.FLAG_FULLSCREEN : WindowManager.LayoutParams.FLAG_FORCE_NOT_FULLSCREEN);
+                            window.clearFlags(forceFullScreen ? WindowManager.LayoutParams.FLAG_FORCE_NOT_FULLSCREEN : WindowManager.LayoutParams.FLAG_FULLSCREEN);
+                            SDLActivity.mFullscreenModeActive = forceFullScreen;
                         }
                     }
                 } else {

build-scripts/build.sh

@@ -2,13 +2,14 @@
 
 # Build script intended for use in Travis CI
 
-set -ex
+set -ex pipefail
 
 num_jobs=3
 
 function run_tests
 {
-    $WINE "$@" -d yes --rng-seed time $EXTRA_TEST_OPTS
+    # The grep supresses lines that begin with "0.0## s:", which are timing lines for tests with a very short duration.
+    $WINE "$@" -d yes --use-colour yes --rng-seed time $EXTRA_TEST_OPTS | grep -Ev "^0\.0[0-9]{2} s:"
 }
 
 date +%s > build-start-time

data/core/tips.json

@@ -122,7 +122,7 @@
   {
     "type": "snippet",
     "category": "tip",
-    "text": [ "Rotten food typically attracts bugs, and bugs got a lot bigger recently..." ]
+    "text": [ "Rotten food typically attracts bugs, and bugs got a lot bigger recently…" ]
   },
   {
     "type": "snippet",
@@ -222,7 +222,7 @@
   {
     "type": "snippet",
     "category": "tip",
-    "text": [ "Routine kills.  Stay alert! Don't let your guard down." ]
+    "text": [ "Routine kills.  Stay alert!  Don't let your guard down." ]
   },
   {
     "type": "snippet",
@@ -312,7 +312,7 @@
   {
     "type": "snippet",
     "category": "tip",
-    "text": [ "A survivor saved is a friend earned.  Most of the time..." ]
+    "text": [ "A survivor saved is a friend earned.  Most of the time…" ]
   },
   {
     "type": "snippet",

data/json/body_parts.json

@@ -13,7 +13,8 @@
     "hit_size_relative": [ 20, 33.33, 36.57 ],
     "hit_difficulty": 1,
     "side": "both",
-    "legacy_id": "TORSO"
+    "legacy_id": "TORSO",
+    "bionic_slots": 80
   },
   {
     "id": "head",
@@ -29,7 +30,8 @@
     "hit_size_relative": [ 0, 2.33, 5.71 ],
     "hit_difficulty": 1.35,
     "side": "both",
-    "legacy_id": "HEAD"
+    "legacy_id": "HEAD",
+    "bionic_slots": 18
   },
   {
     "id": "eyes",
@@ -44,7 +46,8 @@
     "hit_size_relative": [ 0, 0.33, 0.57 ],
     "hit_difficulty": 1.15,
     "side": "both",
-    "legacy_id": "EYES"
+    "legacy_id": "EYES",
+    "bionic_slots": 4
   },
   {
     "id": "mouth",
@@ -59,7 +62,8 @@
     "hit_size_relative": [ 0, 0, 0 ],
     "hit_difficulty": 1.15,
     "side": "both",
-    "legacy_id": "MOUTH"
+    "legacy_id": "MOUTH",
+    "bionic_slots": 4
   },
   {
     "id": "arm_l",
@@ -76,7 +80,8 @@
     "hit_size_relative": [ 15, 20, 22.86 ],
     "hit_difficulty": 0.95,
     "side": "left",
-    "legacy_id": "ARM_L"
+    "legacy_id": "ARM_L",
+    "bionic_slots": 20
   },
   {
     "id": "arm_r",
@@ -93,7 +98,8 @@
     "hit_size_relative": [ 15, 20, 22.86 ],
     "hit_difficulty": 0.95,
     "side": "right",
-    "legacy_id": "ARM_R"
+    "legacy_id": "ARM_R",
+    "bionic_slots": 20
   },
   {
     "id": "hand_l",
@@ -109,7 +115,8 @@
     "hit_size_relative": [ 0, 0, 0 ],
     "hit_difficulty": 1.1,
     "side": "left",
-    "legacy_id": "HAND_L"
+    "legacy_id": "HAND_L",
+    "bionic_slots": 5
   },
   {
     "id": "hand_r",
@@ -125,7 +132,8 @@
     "hit_size_relative": [ 0, 0, 0 ],
     "hit_difficulty": 1.1,
     "side": "right",
-    "legacy_id": "HAND_R"
+    "legacy_id": "HAND_R",
+    "bionic_slots": 5
   },
   {
     "id": "leg_l",
@@ -142,7 +150,8 @@
     "hit_size_relative": [ 25, 12, 5.71 ],
     "hit_difficulty": 0.975,
     "side": "left",
-    "legacy_id": "LEG_L"
+    "legacy_id": "LEG_L",
+    "bionic_slots": 30
   },
   {
     "id": "leg_r",
@@ -159,7 +168,8 @@
     "hit_size_relative": [ 25, 12, 5.71 ],
     "hit_difficulty": 0.975,
     "side": "right",
-    "legacy_id": "LEG_R"
+    "legacy_id": "LEG_R",
+    "bionic_slots": 30
   },
   {
     "id": "foot_l",
@@ -175,7 +185,8 @@
     "hit_size_relative": [ 0, 0, 0 ],
     "hit_difficulty": 0.8,
     "side": "left",
-    "legacy_id": "FOOT_L"
+    "legacy_id": "FOOT_L",
+    "bionic_slots": 7
   },
   {
     "id": "foot_r",
@@ -191,7 +202,8 @@
     "hit_size_relative": [ 0, 0, 0 ],
     "hit_difficulty": 0.8,
     "side": "right",
-    "legacy_id": "FOOT_R"
+    "legacy_id": "FOOT_R",
+    "bionic_slots": 7
   },
   {
     "id": "num_bp",

data/json/construction.json

@@ -2235,7 +2235,7 @@
       [ { "id": "HAMMER", "level": 2 } ],
       [ { "id": "DIG", "level": 2 } ]
     ],
-    "tools": [ [ [ "pickaxe", -1 ], [ "jackhammer", 30 ], [ "elec_jackhammer", 30 ] ] ],
+    "tools": [ [ [ "pickaxe", -1 ], [ "jackhammer", 140 ], [ "elec_jackhammer", 7000 ] ] ],
     "components": [ [ [ "2x4", 8 ], [ "log", 8 ] ], [ [ "rope_makeshift_30", 1 ], [ "rope_30", 1 ], [ "vine_30", 1 ] ] ],
     "pre_flags": "DIGGABLE",
     "post_special": "done_dig_stair"
@@ -2251,7 +2251,7 @@
       [ { "id": "HAMMER", "level": 2 } ],
       [ { "id": "DIG", "level": 2 } ]
     ],
-    "tools": [ [ [ "pickaxe", -1 ], [ "jackhammer", 30 ], [ "elec_jackhammer", 30 ] ] ],
+    "tools": [ [ [ "pickaxe", -1 ], [ "jackhammer", 160 ], [ "elec_jackhammer", 8000 ] ] ],
     "components": [ [ [ "2x4", 12 ], [ "log", 12 ] ], [ [ "rope_makeshift_30", 1 ], [ "rope_30", 1 ], [ "vine_30", 1 ] ] ],
     "pre_special": "check_down_OK",
     "pre_terrain": "t_rock_floor",
@@ -2307,7 +2307,7 @@
       [ { "id": "DIG", "level": 2 } ]
     ],
     "tools": [
-      [ [ "pickaxe", -1 ], [ "jackhammer", 30 ], [ "elec_jackhammer", 30 ] ],
+      [ [ "pickaxe", -1 ], [ "jackhammer", 160 ], [ "elec_jackhammer", 8000 ] ],
       [
         "miner_hat",
         "hat_hard",
@@ -3190,7 +3190,7 @@
     "components": [
       [ [ "processor", 2 ] ],
       [ [ "RAM", 2 ] ],
-      [ [ "small_lcd_screen", 1 ] ],
+      [ [ "large_lcd_screen", 1 ] ],
       [ [ "e_scrap", 8 ] ],
       [ [ "frame", 1 ] ],
       [ [ "circuit", 4 ] ],

data/json/effects.json

@@ -734,15 +734,15 @@
       "str_mod": [ -1 ],
       "dex_mod": [ -1 ],
       "vomit_chance": [ 1000, 1200 ],
-      "sleep_min": [ 60, 30 ],
-      "sleep_chance": [ -102 ]
+      "fatigue_min": [ 360, 180 ],
+      "fatigue_chance": [ -102 ]
     },
     "scaling_mods": {
       "pain_max_val": [ 30, 20 ],
       "str_mod": [ -1, -0.5 ],
       "dex_mod": [ -1, -0.5 ],
       "vomit_chance": [ -400 ],
-      "sleep_chance": [ 101 ]
+      "fatigue_chance": [ 101 ]
     }
   },
   {
@@ -760,10 +760,10 @@
       "str_mod": [ -1 ],
       "dex_mod": [ -1 ],
       "vomit_chance": [ 1000 ],
-      "sleep_min": [ 60 ],
-      "sleep_chance": [ -102 ]
+      "fatigue_min": [ 360 ],
+      "fatigue_chance": [ -102 ]
     },
-    "scaling_mods": { "pain_max_val": [ 30 ], "str_mod": [ -1 ], "dex_mod": [ -1 ], "vomit_chance": [ -400 ], "sleep_chance": [ 101 ] }
+    "scaling_mods": { "pain_max_val": [ 30 ], "str_mod": [ -1 ], "dex_mod": [ -1 ], "vomit_chance": [ -400 ], "fatigue_chance": [ 101 ] }
   },
   {
     "type": "effect_type",
@@ -1271,8 +1271,8 @@
     "base_mods": {
       "vomit_chance": [ -43 ],
       "sleep_chance": [ -1003 ],
-      "sleep_min": [ 2500 ],
-      "sleep_max": [ 3500 ],
+      "sleep_min": [ 15000 ],
+      "sleep_max": [ 21000 ],
       "pkill_amount": [ 3 ],
       "pkill_max_val": [ 3 ],
       "pkill_min": [ 1 ],

data/json/emit.json

@@ -293,5 +293,11 @@
     "field": "fd_fog",
     "intensity": 2,
     "qty": 200
+  },
+  {
+    "id": "emit_bees",
+    "type": "emit",
+    "field": "fd_bees",
+    "qty": 3
   }
 ]

data/json/field_type.json

@@ -221,7 +221,7 @@
     "dirty_transparency_cache": true,
     "percent_spread": 10,
     "outdoor_age_speedup": "0 turns",
-    "immunity_data": { "body_part_env_resistance": [ [ "MOUTH", 12 ] ] },
+    "immunity_data": { "body_part_env_resistance": [ [ "MOUTH", 7 ] ] },
     "priority": 8,
     "half_life": "2 minutes",
     "phase": "gas",

data/json/furniture_and_terrain/furniture-flora.json

@@ -286,5 +286,32 @@
       "sound_fail": "whump.",
       "items": [ { "item": "withered", "count": [ 45, 50 ] } ]
     }
+  },
+  {
+    "type": "furniture",
+    "id": "f_shrub_bee_hive",
+    "name": "shrub with bee hive",
+    "looks_like": "t_underbrush",
+    "description": "Shrub with a bee hive hidden somewhere deep inside.  A constant buzzing is heard near it.",
+    "symbol": "#",
+    "color": "light_green",
+    "move_cost_mod": 3,
+    "required_str": -1,
+    "flags": [ "TRANSPARENT", "DIGGABLE", "FLAMMABLE_ASH", "THIN_OBSTACLE", "SHRUB", "SHORT", "EMITTER" ],
+    "emissions": [ "emit_bees" ],
+    "examine_action": "harvest_furn",
+    "harvest_by_season": [
+      {
+        "seasons": [ "spring", "summer", "autumn" ],
+        "entries": [ { "drop": "honeycomb", "base_num": [ 0, 4 ] }, { "drop": "wax", "base_num": [ 0, 4 ] } ]
+      }
+    ],
+    "bash": {
+      "str_min": 1,
+      "str_max": 6,
+      "sound": "crunch.",
+      "sound_fail": "brush.",
+      "items": [ { "item": "honeycomb", "prob": 30, "count": [ 0, 4 ] }, { "item": "wax", "prob": 30, "count": [ 0, 4 ] } ]
+    }
   }
 ]

data/json/furniture_and_terrain/furniture-regional-pseudo.json

@@ -0,0 +1,13 @@
+[
+  {
+    "type": "furniture",
+    "id": "f_region_flower",
+    "name": "this should never actually show up, it's a pseudo furniture",
+    "description": "this should never actually show up, it's a pseudo furniture",
+    "symbol": " ",
+    "color": "black",
+    "move_cost_mod": 0,
+    "required_str": 0,
+    "flags": [ "TRANSPARENT", "NOITEM" ]
+  }
+]

data/json/furniture_and_terrain/terrain-manufactured.json

@@ -294,7 +294,7 @@
         { "item": "processor", "count": [ 1, 2 ] },
         { "item": "RAM", "count": [ 4, 8 ] },
         { "item": "cable", "charges": [ 4, 6 ] },
-        { "item": "small_lcd_screen", "count": [ 1, 2 ] },
+        { "item": "large_lcd_screen", "count": 1 },
         { "item": "e_scrap", "count": [ 10, 16 ] },
         { "item": "circuit", "count": [ 6, 10 ] },
         { "item": "power_supply", "count": [ 2, 4 ] },
@@ -313,7 +313,7 @@
         { "item": "processor", "prob": 25 },
         { "item": "RAM", "count": [ 0, 2 ], "prob": 50 },
         { "item": "cable", "charges": [ 1, 2 ], "prob": 50 },
-        { "item": "small_lcd_screen", "prob": 25 },
+        { "item": "large_lcd_screen", "prob": 25 },
         { "item": "e_scrap", "count": [ 1, 4 ], "prob": 50 },
         { "item": "circuit", "count": [ 0, 2 ], "prob": 50 },
         { "item": "power_supply", "prob": 25 },
@@ -640,6 +640,7 @@
         { "item": "RAM", "count": [ 4, 8 ] },
         { "item": "cable", "charges": [ 8, 16 ] },
         { "item": "small_lcd_screen", "count": [ 2, 4 ] },
+        { "item": "large_lcd_screen", "count": 1 },
         { "item": "e_scrap", "count": [ 12, 24 ] },
         { "item": "circuit", "count": [ 6, 10 ] },
         { "item": "power_supply", "count": [ 4, 8 ] },