merge upstream

.travis.yml

@@ -159,7 +159,7 @@ jobs:
           sources: [*apt_sources, llvm-toolchain-trusty-5.0]
 
     # Clang 6.0
-    - env: CLANG=clang++-6.0 CXXFLAGS=-Wno-error=unused-command-line-argument SANITIZE=address EXTRA_TEST_OPTS="~[.] ~vehicle_efficiency ~vehicle_drag"
+    - env: CLANG=clang++-6.0 CXXFLAGS=-Wno-error=unused-command-line-argument SANITIZE=address EXTRA_TEST_OPTS="~[.] ~vehicle_efficiency ~vehicle_drag ~starting_items"
       dist: trusty
       compiler: clang
       addons: &clang60

build-scripts/requirements.sh

@@ -32,6 +32,6 @@ fi
 
 if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
   brew update
-  brew install sdl2 sdl2_image sdl2_ttf sdl2_mixer gettext ncurses lua coreutils
+  brew install sdl2 sdl2_image sdl2_ttf sdl2_mixer gettext ncurses lua
   brew link --force gettext ncurses
 fi

data/json/bionics.json

@@ -1008,7 +1008,7 @@
     "id": "bio_tools",
     "type": "bionic",
     "name": "Integrated Toolset",
-    "description": "Surgically implanted in your hands and fingers is a complete tool set - screwdriver, hammer, wrench, and heating elements.  You can use this in place of many tools when crafting.",
+    "description": "Surgically implanted in your hands and fingers is a complete tool set - screwdriver, hammer, wrench, hacksaw, wood saw, boltcutters, drill and heating elements.  You can use this in place of many tools when crafting.",
     "occupied_bodyparts": [ [ "HAND_L", 3 ], [ "HAND_R", 3 ] ],
     "flags": [ "BIONIC_TOGGLED" ],
     "fake_item": "toolset"

data/json/effects.json

@@ -462,7 +462,8 @@
     "rating": "bad",
     "miss_messages": [ [ "Your eyes burn from the tear gas.", 2 ] ],
     "harmful_cough": true,
-    "base_mods": { "str_mod": [ -2 ], "dex_mod": [ -2 ], "per_mod": [ -5 ], "cough_chance": [ 3 ] },
+    "max_duration": 1800,
+    "base_mods": { "str_mod": [ -2 ], "dex_mod": [ -2 ], "per_mod": [ -5 ], "speed_mod": [ -10 ], "cough_chance": [ 5 ] },
     "show_in_info": true
   },
   {

data/json/flags.json

@@ -240,6 +240,12 @@
     "description": "Prevents repairing of this item even if otherwise suitable tools exist.",
     "inherit": false
   },
+  {
+    "id": "NUTRIENT_OVERRIDE",
+    "type": "json_flag",
+    "context": [ "COMESTIBLE" ],
+    "description": "forces calories and vitamins to be the ones defined in the json, instead of inheriting from ingredients"
+  },
   {
     "id": "MELTS",
     "type": "json_flag",

data/json/game_balance.json

@@ -138,5 +138,12 @@
     "info": "Enables sleep deprivation mechanics. If true, stimulants will only help you so far, and you might have to enforce proper sleep hygiene for a while.",
     "stype": "bool",
     "value": false
+  },
+  {
+    "type": "EXTERNAL_OPTION",
+    "name": "CBM_SLOTS_ENABLED",
+    "info": "Enables CBM slots mechanics. If true CBM slots are enabled.",
+    "stype": "bool",
+    "value": false
   }
 ]

data/json/gates.json

@@ -15,6 +15,22 @@
     "moves": 1800,
     "bashing_damage": 40
   },
+  {
+    "type": "gate",
+    "handle": "t_gates_mech_control_lab",
+    "other_handles": [ "t_gates_control_concrete_lab", "t_gates_control_brick_lab" ],
+    "door": "t_door_metal_locked",
+    "floor": "t_thconc_floor",
+    "walls": [ "t_wall", "t_wall_r", "t_wall_w", "t_wall_b", "t_wall_g", "t_wall_y", "t_wall_p", "t_concrete_wall", "t_brick_wall" ],
+    "messages": {
+      "pull": "You turn the handle...",
+      "open": "The gate is opened!",
+      "close": "The gate is closed!",
+      "fail": "The gate can't be closed!"
+    },
+    "moves": 1800,
+    "bashing_damage": 40
+  },
   {
     "type": "gate",
     "handle": "t_barndoor",

data/json/item_groups.json

@@ -3504,7 +3504,7 @@
       [ "novel_swash", 30 ],
       [ "manual_fencing", 9 ],
       [ "manual_niten", 9 ],
-      [ "manual_sojutsu", 9 ],	  
+      [ "manual_sojutsu", 9 ],
       [ "novel_samurai", 30 ],
       [ "plays_book", 30 ],
       [ "poetry_book", 30 ],

data/json/itemgroups/ammo.json

@@ -22,28 +22,23 @@
     "id": "ammo_pistol_rare",
     "//": "Less common pistol ammo including that only used by police/paramilitary forces.",
     "items": [
-       [ "10mm", 15 ],
-       [ "38_super", 20 ],
-       [ "44fmj", 15 ],
-       [ "44magnum", 35 ],
-       [ "45_super", 30 ],
-       [ "460_rowland", 15 ],
-       [ "460_fmj", 10 ],
-       [ "57mm", 50 ],
-       [ "9mmP", 30 ],
-       [ "9mmP2", 20 ]
+      [ "10mm", 15 ],
+      [ "38_super", 20 ],
+      [ "44fmj", 15 ],
+      [ "44magnum", 35 ],
+      [ "45_super", 30 ],
+      [ "460_rowland", 15 ],
+      [ "460_fmj", 10 ],
+      [ "57mm", 50 ],
+      [ "9mmP", 30 ],
+      [ "9mmP2", 20 ]
     ]
   },
   {
     "type": "item_group",
     "id": "ammo_pistol_milspec",
     "//": "Military specification pistol ammo found at military sites.",
-    "items": [
-       [ "46mm", 70 ],
-       [ "5x50dart", 30 ],
-       [ "5x50heavy", 20 ],
-       [ "9mmfmj", 100 ]
-    ]
+    "items": [ [ "46mm", 70 ], [ "5x50dart", 30 ], [ "5x50heavy", 20 ], [ "9mmfmj", 100 ] ]
   },
   {
     "type": "item_group",
@@ -65,75 +60,65 @@
     "id": "ammo_pistol_reloaded",
     "//": "Reloaded pistol ammo balanced according to rarity.",
     "items": [
-       [ "reloaded_10mm", 10 ],
-       [ "reloaded_32_acp", 50 ],
-       [ "reloaded_38_fmj", 30 ],
-       [ "reloaded_38_special", 80 ],
-       [ "reloaded_38_super", 40 ],
-       [ "reloaded_357sig_fmj", 70 ],
-       [ "reloaded_357sig_jhp", 70 ],
-       [ "reloaded_40fmj", 20 ],
-       [ "reloaded_40sw", 50 ],
-       [ "reloaded_44magnum", 60],
-       [ "reloaded_44fmj", 30 ],
-       [ "reloaded_45_acp", 80 ],
-       [ "reloaded_45_jhp", 100 ],
-       [ "reloaded_45_super", 40 ],
-       [ "reloaded_46mm", 20 ],
-       [ "reloaded_454_Casull", 5 ],
-       [ "reloaded_460_fmj", 5 ],
-       [ "reloaded_460_rowland", 5 ],
-       [ "reloaded_500_Magnum", 5 ],
-       [ "reloaded_57mm", 50 ],
-       [ "reloaded_9mm", 160 ],
-       [ "reloaded_9mmfmj", 80 ],
-       [ "reloaded_9mmP", 80 ],
-       [ "reloaded_9mmP2", 40 ],
-       [ "reloaded_9x18mm", 20 ],
-       [ "reloaded_9x18mmfmj", 10 ],
-       [ "reloaded_9x18mmP2", 5 ],
-       [ "reloaded_762_25", 10 ]
+      [ "reloaded_10mm", 10 ],
+      [ "reloaded_32_acp", 50 ],
+      [ "reloaded_38_fmj", 30 ],
+      [ "reloaded_38_special", 80 ],
+      [ "reloaded_38_super", 40 ],
+      [ "reloaded_357sig_fmj", 70 ],
+      [ "reloaded_357sig_jhp", 70 ],
+      [ "reloaded_40fmj", 20 ],
+      [ "reloaded_40sw", 50 ],
+      [ "reloaded_44magnum", 60 ],
+      [ "reloaded_44fmj", 30 ],
+      [ "reloaded_45_acp", 80 ],
+      [ "reloaded_45_jhp", 100 ],
+      [ "reloaded_45_super", 40 ],
+      [ "reloaded_46mm", 20 ],
+      [ "reloaded_454_Casull", 5 ],
+      [ "reloaded_460_fmj", 5 ],
+      [ "reloaded_460_rowland", 5 ],
+      [ "reloaded_500_Magnum", 5 ],
+      [ "reloaded_57mm", 50 ],
+      [ "reloaded_9mm", 160 ],
+      [ "reloaded_9mmfmj", 80 ],
+      [ "reloaded_9mmP", 80 ],
+      [ "reloaded_9mmP2", 40 ],
+      [ "reloaded_9x18mm", 20 ],
+      [ "reloaded_9x18mmfmj", 10 ],
+      [ "reloaded_9x18mmP2", 5 ],
+      [ "reloaded_762_25", 10 ]
     ]
   },
   {
     "type": "item_group",
     "id": "ammo_smg_common",
     "//": "SMG ammo commonly owned by citizens and found in many locations.",
-    "items": [
-      { "group": "ammo_pistol_common", "prob": 100 }
-    ]
+    "items": [ { "group": "ammo_pistol_common", "prob": 100 } ]
   },
   {
     "type": "item_group",
     "id": "ammo_smg_rare",
     "//": "Less common SMGs including that only used by police/paramilitary forces.",
-    "items": [
-      { "group": "ammo_pistol_rare", "prob": 100 }
-    ]
+    "items": [ { "group": "ammo_pistol_rare", "prob": 100 } ]
   },
   {
     "type": "item_group",
     "id": "ammo_smg_milspec",
     "//": "Military specification SMG ammo found at military sites.",
-    "items": [
-      { "group": "ammo_pistol_milspec", "prob": 100 }
-    ]
+    "items": [ { "group": "ammo_pistol_milspec", "prob": 100 } ]
   },
   {
     "type": "item_group",
     "id": "ammo_smg_obscure",
     "//": "Imported or otherwise very obscure SMG ammo.",
-    "items": [
-      { "group": "ammo_pistol_obscure", "prob": 100 }
-    ]
+    "items": [ { "group": "ammo_pistol_obscure", "prob": 100 } ]
   },
   {
     "type": "item_group",
     "id": "ammo_smg_reloaded",
     "//": "Reloaded SMG ammo balanced according to rarity.",
-    "items": [
-      { "group": "ammo_pistol_reloaded", "prob": 100 }
-    ]
+    "items": [ { "group": "ammo_pistol_reloaded", "prob": 100 } ]
   },
   {
     "type": "item_group",
@@ -156,14 +141,7 @@
     "type": "item_group",
     "id": "ammo_rifle_rare",
     "//": "Less common rifle ammo including that only used by police/paramilitary forces.",
-    "items": [
-      [ "300_winmag", 40 ],
-      [ "3006fmj", 50 ],
-      [ "556", 100 ],
-      [ "762_51", 50 ],
-      [ "762_m87", 25 ],
-      [ "8mm_civilian", 15 ]
-    ]
+    "items": [ [ "300_winmag", 40 ], [ "3006fmj", 50 ], [ "556", 100 ], [ "762_51", 50 ], [ "762_m87", 25 ], [ "8mm_civilian", 15 ] ]
   },
   {
     "type": "item_group",
@@ -191,11 +169,7 @@
     "type": "item_group",
     "id": "ammo_rifle_obscure",
     "//": "Imported or otherwise very obscure rifle ammo.",
-    "items": [
-      [ "545", 150 ],
-      [ "545_ap", 100 ],
-      [ "700nx", 70 ]
-    ]
+    "items": [ [ "545", 150 ], [ "545_ap", 100 ], [ "700nx", 70 ] ]
   },
   {
     "type": "item_group",
@@ -223,10 +197,7 @@
     "type": "item_group",
     "id": "ammo_shotgun_common",
     "//": "Shotgun ammo commonly owned by citizens and found in many locations.",
-    "items": [
-      [ "shot_00", 100 ],
-      [ "shot_bird", 70 ]
-    ]
+    "items": [ [ "shot_00", 100 ], [ "shot_bird", 70 ] ]
   },
   {
     "type": "item_group",
@@ -245,20 +216,13 @@
     "type": "item_group",
     "id": "ammo_shotgun_milspec",
     "//": "Military specification shotgun ammo found at military sites.",
-    "items": [
-      [ "20x66_exp", 10 ],
-      [ "20x66_flechette", 60 ],
-      [ "20x66_inc", 20 ],
-      [ "shot_flechette", 100 ],
-      [ "shot_he", 10 ]
-    ]
+    "items": [ [ "20x66_exp", 10 ], [ "20x66_flechette", 60 ], [ "20x66_inc", 20 ], [ "shot_flechette", 100 ], [ "shot_he", 10 ] ]
   },
   {
     "type": "item_group",
     "id": "ammo_shotgun_obscure",
     "//": "Imported or otherwise very obscure shotgun ammo.",
-    "items": [
-    ]
+    "items": [  ]
   },
   {
     "type": "item_group",