Merge pull request CleverRaven#23 from CleverRaven/master

catchup to mainline

.appveyor.yml

@@ -12,4 +12,4 @@ build:
   parallel: true
   verbosity: minimal
 test_script:
-  - cmd: Cataclysm-test-vcpkg-static-Release-x64.exe --rng-seed time
+  - cmd: Cataclysm-test-vcpkg-static-Release-x64.exe --rng-seed time --min-duration 0.2

build-scripts/build.sh

@@ -8,8 +8,8 @@ num_jobs=3
 
 function run_tests
 {
-    # The grep suppresses 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:"
+    # --min-duration shows timing lines for tests with a duration of at least that many seconds.
+    $WINE "$@" --min-duration 0.2 --use-colour yes --rng-seed time $EXTRA_TEST_OPTS
 }
 
 # We might need binaries installed via pip, so ensure that our personal bin dir is on the PATH

data/json/artifact/premade_artifacts.json

@@ -0,0 +1,15 @@
+[
+  {
+    "id": "architect_cube",
+    "type": "TOOL",
+    "name": { "str": "The Architect's Cube" },
+    "description": "This is a solid cube that is much heavier than its size suggests.  When you look at it, it pulls your gaze inward until you fall through the sky, showing you a top-down view of your position with the surroundings revealed.",
+    "weight": "2 kg",
+    "volume": "100 ml",
+    "material": [ "iron" ],
+    "symbol": "]",
+    "relic_data": { "passive_effects": [ { "mutations": [ "DEBUG_CLAIRVOYANCE" ] } ] },
+    "color": "light_gray",
+    "flags": [ "TRADER_AVOID" ]
+  }
+]

data/json/body_parts.json

@@ -20,6 +20,7 @@
     "cold_morale_mod": 2,
     "squeamish_penalty": 6,
     "base_hp": 60,
+    "drench_capacity": 40,
     "bionic_slots": 80
   },
   {
@@ -43,6 +44,7 @@
     "cold_morale_mod": 2,
     "squeamish_penalty": 7,
     "base_hp": 60,
+    "drench_capacity": 7,
     "bionic_slots": 18
   },
   {
@@ -63,6 +65,7 @@
     "stylish_bonus": 2,
     "squeamish_penalty": 8,
     "base_hp": 60,
+    "drench_capacity": 1,
     "bionic_slots": 4
   },
   {
@@ -85,6 +88,7 @@
     "cold_morale_mod": 2,
     "squeamish_penalty": 9,
     "base_hp": 60,
+    "drench_capacity": 1,
     "bionic_slots": 4
   },
   {
@@ -111,6 +115,7 @@
     "squeamish_penalty": 5,
     "is_limb": true,
     "base_hp": 60,
+    "drench_capacity": 10,
     "bionic_slots": 20
   },
   {
@@ -136,6 +141,7 @@
     "squeamish_penalty": 5,
     "is_limb": true,
     "base_hp": 60,
+    "drench_capacity": 10,
     "bionic_slots": 20
   },
   {
@@ -160,6 +166,7 @@
     "cold_morale_mod": 0.5,
     "squeamish_penalty": 3,
     "base_hp": 60,
+    "drench_capacity": 3,
     "bionic_slots": 5
   },
   {
@@ -184,6 +191,7 @@
     "cold_morale_mod": 0.5,
     "squeamish_penalty": 3,
     "base_hp": 60,
+    "drench_capacity": 3,
     "bionic_slots": 5
   },
   {
@@ -210,6 +218,7 @@
     "squeamish_penalty": 5,
     "is_limb": true,
     "base_hp": 60,
+    "drench_capacity": 11,
     "bionic_slots": 30
   },
   {
@@ -236,6 +245,7 @@
     "squeamish_penalty": 5,
     "is_limb": true,
     "base_hp": 60,
+    "drench_capacity": 11,
     "bionic_slots": 30
   },
   {
@@ -260,6 +270,7 @@
     "cold_morale_mod": 0.5,
     "squeamish_penalty": 3,
     "base_hp": 60,
+    "drench_capacity": 3,
     "bionic_slots": 7
   },
   {
@@ -284,6 +295,7 @@
     "cold_morale_mod": 0.5,
     "squeamish_penalty": 3,
     "base_hp": 60,
+    "drench_capacity": 3,
     "bionic_slots": 7
   },
   {
@@ -301,6 +313,7 @@
     "hit_difficulty": 0,
     "side": "both",
     "base_hp": 60,
+    "drench_capacity": 1,
     "legacy_id": "NUM_BP"
   }
 ]

data/json/emit.json

@@ -247,15 +247,15 @@
     "id": "emit_hot_air_migo_seep",
     "type": "emit",
     "field": "fd_hot_air_sauna",
-    "intensity": 3,
-    "qty": 50
+    "intensity": 2,
+    "qty": 60
   },
   {
     "id": "emit_hot_air_migo_blast",
     "type": "emit",
     "field": "fd_hot_air_sauna",
     "intensity": 3,
-    "qty": 300
+    "qty": 150
   },
   {
     "id": "emit_migo_atmosphere",

data/json/field_type.json

@@ -1295,15 +1295,15 @@
     "id": "fd_hot_air_sauna",
     "type": "field_type",
     "intensity_levels": [
-      { "name": "hot air sauna", "sym": "&", "convection_temperature_mod": 65 },
-      { "color": "yellow", "convection_temperature_mod": 68 },
-      { "color": "red", "convection_temperature_mod": 71 }
+      { "name": "hot air sauna", "sym": "&", "convection_temperature_mod": 60 },
+      { "color": "yellow", "convection_temperature_mod": 70 },
+      { "color": "red", "convection_temperature_mod": 80 }
     ],
     "decay_amount_factor": 5,
-    "percent_spread": 100,
-    "outdoor_age_speedup": "100 minutes",
+    "percent_spread": 40,
+    "outdoor_age_speedup": "30 minutes",
     "priority": -1,
-    "half_life": "50 minutes",
+    "half_life": "5 minutes",
     "phase": "gas",
     "display_field": true
   },

data/json/furniture_and_terrain/furniture-alien.json

@@ -144,7 +144,7 @@
     "coverage": 40,
     "required_str": -1,
     "flags": [ "TRANSPARENT", "EASY_DECONSTRUCT" ],
-    "deconstruct": { "items": [ { "item": "alien_pod_resin", "charges": [ 2, 6 ] } ] },
+    "deconstruct": { "items": [ { "item": "alien_pod_resin", "count": [ 6, 8 ] } ] },
     "bash": { "str_min": 25, "str_max": 60, "sound": "splorch!", "sound_fail": "whump." }
   },
   {

data/json/furniture_and_terrain/furniture-decorative.json

@@ -58,6 +58,26 @@
     },
     "flags": [ "TRANSPARENT", "MOUNTABLE", "SHORT" ]
   },
+  {
+    "id": "f_cleat",
+    "type": "furniture",
+    "name": "cleat",
+    "description": "A small horn cleat with two “horns” extending parallel to the deck or the axis of the spar, and resembling a small anvil.  They are used to secure mooring lines, ropes, and similar.",
+    "symbol": "B",
+    "color": "light_gray",
+    "looks_like": "f_bitts",
+    "move_cost_mod": 2,
+    "coverage": 30,
+    "required_str": 0,
+    "bash": {
+      "str_min": 80,
+      "str_max": 200,
+      "sound": "metal screeching!",
+      "sound_fail": "clang!",
+      "items": [ { "item": "steel_chunk", "count": [ 1, 3 ] } ]
+    },
+    "flags": [ "TRANSPARENT", "SHORT" ]
+  },
   {
     "type": "furniture",
     "id": "f_shackle",

data/json/furniture_and_terrain/furniture-industrial.json

@@ -46,6 +46,7 @@
   {
     "type": "furniture",
     "id": "f_chemical_mixer",
+    "looks_like": "f_machinery_light",
     "description": "A large vat with a motorized mixing device for combining large quantities of chemicals.",
     "name": "chemical mixer",
     "symbol": "0",
@@ -82,10 +83,10 @@
     "type": "furniture",
     "id": "f_generator_broken",
     "name": "broken generator",
+    "looks_like": "f_machinery_old",
     "description": "This generator is broken and will not help you produce usable electricity.",
     "symbol": "&",
     "color": "light_gray",
-    "looks_like": "f_machinery_old",
     "move_cost_mod": -1,
     "coverage": 30,
     "required_str": 16,
@@ -119,10 +120,10 @@
     "type": "furniture",
     "id": "f_compact_ASRG_containment",
     "name": "Compact Advanced Sterling Radioisotope Generator",
+    "looks_like": "t_plut_generator",
     "description": "This hefty lump of steel and lead is the housing unit for a small nuclear reactor.  It is plastered with warning signs.  You could probably ignore those and salvage the steel and lead shielding, what could possibly go wrong?",
     "symbol": "0",
     "color": "green_white",
-    "looks_like": "f_machinery_electronic",
     "move_cost_mod": -1,
     "coverage": 80,
     "required_str": -1,
@@ -157,10 +158,10 @@
     "type": "furniture",
     "id": "f_compact_ASRG",
     "name": "Compact Advanced Sterling Radioisotope Generator",
+    "looks_like": "f_compact_ASRG_containment",
     "description": "Some insane fool has removed the outer containment on this small-scale nuclear reactor.  It is still fairly safe as it is: the reactor has considerable built-in containment as well.  Nevertheless, you probably don't want to stand too close for too long.",
     "symbol": "0",
     "color": "green",
-    "looks_like": "f_machinery_electronic",
     "move_cost_mod": -1,
     "coverage": 50,
     "required_str": -1,
@@ -185,6 +186,7 @@
     "type": "furniture",
     "id": "f_machinery_light",
     "name": "light machinery",
+    "looks_like": "t_machinery_light",
     "description": "Assorted light machinery.  You could scavenge it for parts.",
     "symbol": "$",
     "color": "dark_gray",
@@ -228,6 +230,7 @@
     "type": "furniture",
     "id": "f_machinery_heavy",
     "name": "heavy machinery",
+    "looks_like": "t_machinery_heavy",
     "description": "Assorted heavy machinery.  You could scavenge it for parts.",
     "symbol": "%",
     "color": "light_gray",
@@ -277,6 +280,7 @@
     "type": "furniture",
     "id": "f_machinery_old",
     "name": "old machinery",
+    "looks_like": "t_machinery_old",
     "description": "Assorted old, rusty machinery.  You could scavenge it for parts.",
     "symbol": "&",
     "color": "brown",
@@ -324,6 +328,7 @@
     "type": "furniture",
     "id": "f_machinery_electronic",
     "name": "electronic machinery",
+    "looks_like": "t_machinery_electronic",
     "description": "Assorted electronic machinery.  You could scavenge it for parts.",
     "symbol": "$",
     "color": "yellow",
@@ -378,6 +383,7 @@
     "type": "furniture",
     "id": "f_robotic_arm",
     "name": "robotic arm",
+    "looks_like": "f_machinery_electronic",
     "description": "An automated robotic arm used in assembly lines, which appears to be more general-purpose than specially designed assemblers.  Despite being functionless now, the parts could be useful.",
     "symbol": "&",
     "bgcolor": "yellow",
@@ -420,6 +426,7 @@
     "type": "furniture",
     "id": "f_ground_cable",
     "name": "ground cable",
+    "looks_like": "t_sewer_pipe",
     "description": "A bunch of loose cables snake along the floor.",
     "symbol": "}",
     "color": "white",
@@ -439,6 +446,7 @@
     "type": "furniture",
     "id": "f_capacitor",
     "name": "capacitor bank",
+    "looks_like": "f_machinery_electronic",
     "description": "A bank of heavy metal cylinders connected by large wires.",
     "symbol": "=",
     "color": "light_blue",
@@ -463,5 +471,56 @@
         { "item": "metal_tank_little", "count": [ 0, 6 ] }
       ]
     }
+  },
+  {
+    "type": "furniture",
+    "id": "f_control_station",
+    "name": "control station",
+    "description": "Assorted electronic interfaces and screens.  You could scavenge it for parts.",
+    "symbol": "$",
+    "color": "yellow",
+    "looks_like": "t_machinery_electronic",
+    "move_cost_mod": 8,
+    "coverage": 55,
+    "required_str": -1,
+    "flags": [ "TRANSPARENT", "BASHABLE", "FLAMMABLE", "PLACE_ITEM" ],
+    "deconstruct": {
+      "items": [
+        { "item": "wire", "count": [ 1, 3 ] },
+        { "item": "pipe", "count": [ 1, 2 ] },
+        { "item": "steel_chunk", "count": [ 1, 4 ] },
+        { "item": "processor", "count": 1 },
+        { "item": "RAM", "count": [ 1, 4 ] },
+        { "item": "cable", "charges": [ 1, 4 ] },
+        { "item": "small_lcd_screen", "count": 1 },
+        { "item": "e_scrap", "count": [ 5, 10 ] },
+        { "item": "circuit", "count": [ 3, 8 ] },
+        { "item": "power_supply", "count": [ 1, 3 ] },
+        { "item": "amplifier", "count": [ 1, 3 ] },
+        { "item": "plastic_chunk", "count": [ 2, 8 ] },
+        { "item": "scrap", "count": [ 1, 5 ] }
+      ]
+    },
+    "bash": {
+      "str_min": 10,
+      "str_max": 80,
+      "sound": "clang!",
+      "sound_fail": "ting.",
+      "items": [
+        { "item": "wire", "prob": 40 },
+        { "item": "pipe", "prob": 40 },
+        { "item": "steel_chunk", "prob": 40 },
+        { "item": "processor", "prob": 40 },
+        { "item": "RAM", "count": [ 1, 2 ] },
+        { "item": "cable", "charges": [ 1, 2 ] },
+        { "item": "small_lcd_screen", "prob": 40 },
+        { "item": "e_scrap", "count": [ 3, 8 ] },
+        { "item": "circuit", "count": [ 1, 3 ] },
+        { "item": "power_supply", "prob": 40 },
+        { "item": "amplifier", "prob": 40 },
+        { "item": "plastic_chunk", "count": [ 2, 8 ] },
+        { "item": "scrap", "count": [ 3, 8 ] }
+      ]
+    }
   }
 ]