Merge remote-tracking branch 'upstream/pr/28084' into 0.D-branch

* upstream/pr/28084: (88 commits) Fix wet morale cycling clear player morale effects in clear_player (#28045) Adds some money types. (#27963) You lived your life, like a candle in the wind... (#27935) [CR] Joint torsion ratchet CBM increases stamina drain (toggleable) (#27882) Allowed Snowstorms to happen - added snow wet and glare effects ( and fixed test_weather ) (#27870) I didn't make this mod! (#28033) Replaced popup with a message in a sidebar Added a popup after the start describing scenario Added Color manager mention to COLOR.md (#27991) Fix some more mission completion dialog bugs Fix NPC dialog around lying and succeeding mission Update MSX++DeadPeopleEdition 2019-01-31 Update RetroDays - Mouse mutants, mailboxes Update lab_1.json Clear traps in test clear_map helper Fixed cyan color in COLOR.md (#27969) Update gfx/RetroASCIITileset/tile_config.json RetroAscii tileset - cleanup, update, lint Add lab terrain ...
CleverRaven · Feb 6, 2019 · bfdc11d · bfdc11d
2 parents 6567661 + fa19c8a
commit bfdc11d
Show file tree

Hide file tree

Showing 93 changed files with 22,615 additions and 5,975 deletions.
diff --git a/.travis.yml b/.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

diff --git a/data/json/bionics.json b/data/json/bionics.json
@@ -1017,9 +1017,9 @@
     "id": "bio_torsionratchet",
     "type": "bionic",
     "name": "Joint Torsion Ratchet",
-    "description": "Your joints have been surgically equipped with torsion ratchets that generate power slowly when you move.",
+    "description": "Your joints have been surgically equipped with torsion ratchets that generate power slowly when you move.  Whilst this is toggled, moving will require more effort, though more power will be generated.",
     "occupied_bodyparts": [ [ "ARM_L", 8 ], [ "ARM_R", 8 ], [ "LEG_L", 12 ], [ "LEG_R", 12 ] ],
-    "flags": [ "BIONIC_POWER_SOURCE", "BIONIC_NPC_USABLE" ]
+    "flags": [ "BIONIC_POWER_SOURCE", "BIONIC_NPC_USABLE", "BIONIC_TOGGLED" ]
   },
   {
     "id": "bio_trip",

diff --git a/data/json/effects.json b/data/json/effects.json
@@ -253,7 +253,7 @@
     "id": "blind",
     "name": [ "Blind" ],
     "desc": [ "Range of Sight: 0.  You cannot see anything." ],
-    "removes_effects": [ "glare", "darkness" ],
+    "removes_effects": [ "glare", "snow_glare", "darkness" ],
     "apply_message": "You're blinded!",
     "remove_message": "Your sight returns!",
     "rating": "bad",
@@ -422,6 +422,15 @@
     "rating": "bad",
     "base_mods": { "per_mod": [ -1 ] }
   },
+  {
+    "type": "effect_type",
+    "id": "snow_glare",
+    "name": [ "Snow glare" ],
+    "desc": [ "The sunlight is reflecting off the snow." ],
+    "apply_message": "The sunlight reflecting off the snow makes it hard to see.",
+    "rating": "bad",
+    "base_mods": { "per_mod": [ -1 ] }
+  },
   {
     "type": "effect_type",
     "id": "laserlocked",

diff --git a/data/json/furniture.json b/data/json/furniture.json
@@ -211,7 +211,7 @@
     "move_cost_mod": -1,
     "description": "A few stacked sandbags.",
     "required_str": -1,
-    "flags": [ "NOITEM", "BLOCKSDOOR", "EASY_DECONSTRUCT", "MINEABLE" ],
+    "flags": [ "NOITEM", "BLOCKSDOOR", "EASY_DECONSTRUCT", "MINEABLE", "BLOCK_WIND" ],
     "deconstruct": {
       "items": [ { "item": "bag_canvas", "count": 4 }, { "item": "material_sand", "charges": 40 } ],
       "furn_set": "f_sandbag_half"
@@ -1492,7 +1492,7 @@
     "color": "blue",
     "move_cost_mod": -1,
     "required_str": -1,
-    "flags": [ "FLAMMABLE_HARD", "NOITEM" ],
+    "flags": [ "FLAMMABLE_HARD", "NOITEM", "BLOCK_WIND" ],
     "bash": {
       "str_min": 1,
       "str_max": 8,
@@ -1510,7 +1510,7 @@
     "color": "blue",
     "move_cost_mod": -1,
     "required_str": -1,
-    "flags": [ "FLAMMABLE_HARD", "NOITEM" ],
+    "flags": [ "FLAMMABLE_HARD", "NOITEM", "BLOCK_WIND" ],
     "bash": {
       "str_min": 1,
       "str_max": 8,
@@ -1529,7 +1529,7 @@
     "color": "blue",
     "move_cost_mod": -1,
     "required_str": -1,
-    "flags": [ "FLAMMABLE_HARD", "NOITEM", "DOOR" ],
+    "flags": [ "FLAMMABLE_HARD", "NOITEM", "DOOR", "BLOCK_WIND" ],
     "open": "f_canvas_door_o",
     "bash": {
       "str_min": 1,
@@ -1567,7 +1567,7 @@
     "color": "blue",
     "move_cost_mod": -1,
     "required_str": -1,
-    "flags": [ "FLAMMABLE_HARD", "NOITEM", "DOOR" ],
+    "flags": [ "FLAMMABLE_HARD", "NOITEM", "DOOR", "BLOCK_WIND" ],
     "open": "f_large_canvas_door_o",
     "bash": {
       "str_min": 1,
@@ -1688,7 +1688,7 @@
     "color": "brown",
     "move_cost_mod": -1,
     "required_str": -1,
-    "flags": [ "FLAMMABLE_HARD", "NOITEM" ],
+    "flags": [ "FLAMMABLE_HARD", "NOITEM", "BLOCK_WIND" ],
     "bash": {
       "str_min": 1,
       "str_max": 8,
@@ -1706,7 +1706,7 @@
     "color": "white",
     "move_cost_mod": -1,
     "required_str": -1,
-    "flags": [ "FLAMMABLE_HARD", "NOITEM" ],
+    "flags": [ "FLAMMABLE_HARD", "NOITEM", "BLOCK_WIND" ],
     "open": "f_skin_door_o",
     "bash": {
       "str_min": 1,
@@ -3009,7 +3009,7 @@
     "color": "dark_gray",
     "move_cost_mod": -1,
     "required_str": 32,
-    "flags": [ "NOITEM", "MINEABLE", "BASHABLE" ],
+    "flags": [ "NOITEM", "MINEABLE", "BASHABLE", "BLOCK_WIND" ],
     "bash": {
       "str_min": 64,
       "str_max": 160,

diff --git a/data/json/gates.json b/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",

diff --git a/data/json/itemgroups/ammo.json b/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",