Merge pull request #15 from CleverRaven/master

Update #15

.appveyor.yml

@@ -1,5 +1,5 @@
 version: '{branch}.{build}'
-image: Previous Visual Studio 2019
+image: Visual Studio 2019
 configuration: Release
 platform: x64
 shallow_clone: true

.clang-tidy

@@ -35,8 +35,6 @@ readability-*,\
 -modernize-return-braced-init-list,\
 -modernize-use-default-member-init,\
 -modernize-use-emplace,\
--modernize-use-transparent-functors,\
--performance-for-range-copy,\
 -performance-inefficient-vector-operation,\
 -performance-noexcept-move-constructor,\
 -performance-implicit-conversion-in-loop,\

.gitignore

@@ -69,6 +69,9 @@ Cataclysm.exe.lastcodeanalysissucceeded
 #Visual Studio 2017
 /msvc-full-features/PredictedInputCache_Debug_x64.dat
 
+#vcpkg
+/msvc-full-features/vcpkg_installed
+
 # PVS Studio
 /msvc-full-features/*PVS-Studio*
 

build-scripts/build.sh

@@ -124,7 +124,6 @@ then
         else
             remaining_cpp_files="$all_cpp_files"
         fi
-        set -x
 
         function analyze_files_in_random_order
         {
@@ -142,6 +141,7 @@ then
 
         echo "Analyzing remaining files"
         analyze_files_in_random_order "$remaining_cpp_files"
+        set -x
     else
         # Regular build
         make -j$num_jobs

build-scripts/clang-tidy-wrapper.sh

@@ -5,7 +5,6 @@ set -o pipefail
 
 plugin=build/tools/clang-tidy-plugin/libCataAnalyzerPlugin.so
 
-set -x
 if [ -f "$plugin" ]
 then
     LD_PRELOAD=$plugin "$CATA_CLANG_TIDY" "$@"

data/json/body_parts.json

@@ -109,6 +109,7 @@
     "hot_morale_mod": 0.5,
     "cold_morale_mod": 0.5,
     "squeamish_penalty": 5,
+    "is_limb": true,
     "base_hp": 60,
     "bionic_slots": 20
   },
@@ -133,6 +134,7 @@
     "hot_morale_mod": 0.5,
     "cold_morale_mod": 0.5,
     "squeamish_penalty": 5,
+    "is_limb": true,
     "base_hp": 60,
     "bionic_slots": 20
   },
@@ -206,6 +208,7 @@
     "hot_morale_mod": 0.5,
     "cold_morale_mod": 0.5,
     "squeamish_penalty": 5,
+    "is_limb": true,
     "base_hp": 60,
     "bionic_slots": 30
   },
@@ -231,6 +234,7 @@
     "hot_morale_mod": 0.5,
     "cold_morale_mod": 0.5,
     "squeamish_penalty": 5,
+    "is_limb": true,
     "base_hp": 60,
     "bionic_slots": 30
   },

data/json/construction.json

@@ -2615,6 +2615,40 @@
     "pre_terrain": "t_rock",
     "post_special": "done_mine_upstair"
   },
+  {
+    "type": "construction",
+    "id": "constr_concrete_ramp_low",
+    "description": "Build Low End of a Concrete Ramp",
+    "//": "Builds a low end of a concrete ramp going up on this level and down on the level above.",
+    "pre_note": "Build a concrete ramp leading to the next z-level above, and the corresponding ramp down leading from the z-level above to this level.  The high end of a ramp must be built adjacent to allow moving between z-levels in both directions.",
+    "category": "DIG",
+    "required_skills": [ [ "fabrication", 3 ] ],
+    "time": "150 m",
+    "tools": [ [ [ "con_mix", 125 ] ] ],
+    "qualities": [ [ { "id": "SMOOTH", "level": 1 } ] ],
+    "components": [ [ [ "concrete", 5 ] ], [ [ "water", 5 ] ] ],
+    "pre_terrain": "t_pit_shallow",
+    "pre_special": "check_ramp_low",
+    "post_terrain": "t_ramp_up_low",
+    "post_special": "done_ramp_low"
+  },
+  {
+    "type": "construction",
+    "id": "constr_concrete_ramp_high",
+    "description": "Build High End of a Concrete Ramp",
+    "//": "Builds a high end of a concrete ramp going up on this level and down on the level above.",
+    "pre_note": "Build a concrete ramp leading to the next z-level above, and the corresponding ramp down leading from the z-level above to this level.  It must be built next to a low end of a ramp to allow moving between z-levels in both directions.",
+    "category": "DIG",
+    "required_skills": [ [ "fabrication", 3 ] ],
+    "time": "150 m",
+    "tools": [ [ [ "con_mix", 125 ] ] ],
+    "qualities": [ [ { "id": "SMOOTH", "level": 1 } ] ],
+    "components": [ [ [ "concrete", 5 ] ], [ [ "water", 5 ] ] ],
+    "pre_terrain": "t_pit_shallow",
+    "pre_special": "check_ramp_high",
+    "post_terrain": "t_ramp_up_high",
+    "post_special": "done_ramp_high"
+  },
   {
     "type": "construction",
     "id": "constr_veh",

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

@@ -947,6 +947,25 @@
       ]
     }
   },
+  {
+    "type": "terrain",
+    "id": "t_guardrail_hw_air",
+    "name": "guard rail",
+    "description": "A section of metal railing, put in place to prevent people from falling or taking the easy way out.",
+    "symbol": "#",
+    "color": "light_gray",
+    "looks_like": "t_guardrail_bg_dp",
+    "move_cost": 3,
+    "flags": [ "TRANSPARENT", "NOITEM", "REDUCE_SCENT", "MOUNTABLE", "SHORT", "THIN_OBSTACLE", "ROAD", "BURROWABLE" ],
+    "bash": {
+      "str_min": 8,
+      "str_max": 150,
+      "sound": "crunch!",
+      "sound_fail": "clang!",
+      "ter_set": "t_pavement_hw_air",
+      "items": [ { "item": "pipe", "count": [ 1, 2 ] }, { "item": "scrap", "count": [ 3, 6 ] } ]
+    }
+  },
   {
     "type": "terrain",
     "id": "t_guardrail_bg_dp",

data/json/furniture_and_terrain/terrain-flesh.json

@@ -0,0 +1,41 @@
+[
+  {
+    "type": "terrain",
+    "id": "t_thconc_floor_flesh",
+    "name": "overgrown floor",
+    "description": "A bare concrete floor, almost completely covered by twitching filaments of grey flesh.",
+    "symbol": ".",
+    "color": "red_yellow",
+    "move_cost": 5,
+    "roof": "t_flat_roof",
+    "flags": [ "TRANSPARENT", "SUPPORTS_ROOF", "COLLAPSES", "INDOORS", "FLAT" ],
+    "bash": {
+      "sound": "SMASH!",
+      "ter_set": "t_concrete",
+      "str_min": 10,
+      "str_max": 20,
+      "str_min_supported": 10,
+      "items": [ { "item": "meat_tainted", "count": [ 5, 10 ] } ]
+    }
+  },
+  {
+    "type": "terrain",
+    "id": "t_concrete_wall_flesh",
+    "name": "overgrown wall",
+    "description": "A concrete wall overgrown by a  grotesque grid of veins and knotted flesh.",
+    "symbol": "LINE_OXOX",
+    "color": "magenta_yellow",
+    "move_cost": 0,
+    "coverage": 100,
+    "roof": "t_flat_roof",
+    "flags": [ "NOITEM", "SUPPORTS_ROOF", "WALL", "NO_SCENT", "AUTO_WALL_SYMBOL", "MINEABLE", "BLOCK_WIND" ],
+    "bash": {
+      "str_min": 10,
+      "str_max": 20,
+      "sound": "crash!",
+      "sound_fail": "whump!",
+      "ter_set": "t_strconc_wall",
+      "items": [ { "item": "meat_tainted", "count": [ 5, 10 ] } ]
+    }
+  }
+]

data/json/furniture_and_terrain/terrain-highways.json

@@ -0,0 +1,59 @@
+[
+  {
+    "type": "terrain",
+    "id": "t_pavement_hw_air",
+    "name": "bridge pavement",
+    "description": "A bridge section made out of metal and concrete.",
+    "looks_like": "t_pavement",
+    "symbol": ".",
+    "color": "dark_gray",
+    "move_cost": 2,
+    "flags": [ "TRANSPARENT", "FLAT", "ROAD", "MINEABLE" ],
+    "bash": {
+      "str_min": 70,
+      "str_max": 300,
+      "sound": "concrete cracking and metal screeching!",
+      "sound_fail": "whump!",
+      "ter_set": "t_open_air",
+      "items": [ { "item": "rock", "count": [ 4, 20 ] }, { "item": "rebar", "count": [ 10, 20 ] } ]
+    }
+  },
+  {
+    "type": "terrain",
+    "id": "t_pavement_y_hw_air",
+    "name": "bridge yellow pavement",
+    "description": "A bridge section made out of metal and concrete.  It's painted yellow.",
+    "looks_like": "t_pavement_y",
+    "symbol": ".",
+    "color": "yellow",
+    "move_cost": 2,
+    "flags": [ "TRANSPARENT", "FLAT", "ROAD", "MINEABLE" ],
+    "bash": {
+      "str_min": 70,
+      "str_max": 300,
+      "sound": "concrete cracking and metal screeching!",
+      "sound_fail": "whump!",
+      "ter_set": "t_open_air",
+      "items": [ { "item": "rock", "count": [ 4, 20 ] }, { "item": "rebar", "count": [ 10, 20 ] } ]
+    }
+  },
+  {
+    "type": "terrain",
+    "id": "t_sidewalk_hw_air",
+    "name": "bridge sidewalk",
+    "description": "The sidewalk section of a concrete bridge.",
+    "looks_like": "t_sidewalk",
+    "symbol": ".",
+    "color": "light_gray",
+    "move_cost": 2,
+    "flags": [ "TRANSPARENT", "FLAT", "ROAD", "MINEABLE" ],
+    "bash": {
+      "str_min": 70,
+      "str_max": 300,
+      "sound": "concrete cracking and metal screeching!",
+      "sound_fail": "whump!",
+      "ter_set": "t_open_air",
+      "items": [ { "item": "rock", "count": [ 4, 20 ] }, { "item": "rebar", "count": [ 10, 20 ] } ]
+    }
+  }
+]

data/json/furniture_and_terrain/terrain-zlevel-transitions.json

@@ -165,6 +165,86 @@
     "move_cost": 2,
     "flags": [ "TRANSPARENT", "GOES_DOWN", "PLACE_ITEM", "DIFFICULT_Z" ]
   },
+  {
+    "type": "terrain",
+    "id": "t_ramp_down_high",
+    "name": "road ramp down (high end)",
+    "description": "The upper end of an asphalt ramp leading down.",
+    "symbol": ">",
+    "color": "dark_gray",
+    "move_cost": 2,
+    "flags": [ "TRANSPARENT", "ROAD", "Z_TRANSPARENT" ]
+  },
+  {
+    "type": "terrain",
+    "id": "t_ramp_down_low",
+    "name": "road ramp down (low end)",
+    "description": "The lower end of an asphalt ramp leading down.",
+    "symbol": ">",
+    "color": "dark_gray",
+    "move_cost": 2,
+    "flags": [ "TRANSPARENT", "ROAD", "RAMP_DOWN", "Z_TRANSPARENT" ]
+  },
+  {
+    "type": "terrain",
+    "id": "t_ramp_up_high",
+    "name": "road ramp up (high end)",
+    "description": "The upper end of an asphalt ramp leading up.",
+    "symbol": "<",
+    "color": "dark_gray",
+    "move_cost": 2,
+    "flags": [ "ROAD", "RAMP_UP" ]
+  },
+  {
+    "type": "terrain",
+    "id": "t_ramp_up_low",
+    "name": "road ramp up (low end)",
+    "description": "The lower end of an asphalt ramp leading up.",
+    "symbol": "<",
+    "color": "dark_gray",
+    "move_cost": 2,
+    "flags": [ "TRANSPARENT", "ROAD" ]
+  },
+  {
+    "type": "terrain",
+    "id": "t_sidewalk_ramp_down_high",
+    "name": "sidewalk ramp down (high end)",
+    "description": "The upper end of a sidewalk ramp leading down.",
+    "symbol": ">",
+    "color": "light_gray",
+    "move_cost": 2,
+    "flags": [ "TRANSPARENT", "ROAD", "Z_TRANSPARENT" ]
+  },
+  {
+    "type": "terrain",
+    "id": "t_sidewalk_ramp_down_low",
+    "name": "sidewalk ramp down (low end)",
+    "description": "The lower end of a sidewalk ramp leading down.",
+    "symbol": ">",
+    "color": "light_gray",
+    "move_cost": 2,
+    "flags": [ "TRANSPARENT", "ROAD", "RAMP_DOWN", "Z_TRANSPARENT" ]
+  },
+  {
+    "type": "terrain",
+    "id": "t_sidewalk_ramp_up_high",
+    "name": "sidewalk ramp up (high end)",
+    "description": "The upper end of a sidewalk ramp leading up.",
+    "symbol": "<",
+    "color": "light_gray",
+    "move_cost": 2,
+    "flags": [ "ROAD", "RAMP_UP" ]
+  },
+  {
+    "type": "terrain",
+    "id": "t_sidewalk_ramp_up_low",
+    "name": "sidewalk ramp up (low end)",
+    "description": "The lower end of a sidewalk ramp leading up.",
+    "symbol": "<",
+    "color": "light_gray",
+    "move_cost": 2,
+    "flags": [ "TRANSPARENT", "ROAD" ]
+  },
   {
     "type": "terrain",
     "id": "t_slope_down",

data/json/items/ammo.json

@@ -29,6 +29,7 @@
     "weight": "1 mg",
     "color": "white",
     "flags": [ "TRADER_AVOID" ],
+    "phase": "liquid",
     "ammo_type": "butane"
   },
   {

data/json/items/ammo/10mm.json

@@ -5,7 +5,7 @@
     "name": { "str": "10mm Auto FMJ" },
     "description": "A jacketed 10mm Auto round.  The 10mm Auto cartridge is a rather powerful handgun round and the progenitor to the more popular .40 S&W.",
     "weight": "9 g",
-    "volume": "250 ml",
+    "volume": "117 ml",
     "price": 400,
     "price_postapoc": 800,
     "flags": [ "IRREPLACEABLE_CONSUMABLE" ],

data/json/items/ammo/20x66mm.json

@@ -117,7 +117,7 @@
     "//": "2.5x the Generic Rate of $1/shot",
     "description": "20x66mm caseless shotgun rounds, buckshot type.  Proprietary ammunition for Rivtech shotguns.  Being caseless rounds, these cannot be disassembled or reloaded.",
     "weight": "56 g",
-    "volume": "250 ml",
+    "volume": "415 ml",
     "price": 1500,
     "price_postapoc": 4000,
     "flags": [ "IRREPLACEABLE_CONSUMABLE" ],

data/json/items/ammo/22.json

@@ -28,7 +28,7 @@
     "name": { "str": ".22 LR" },
     "description": ".22 Long Rifle ammunition with 40gr unjacketed bullets.  The .22LR round is extremely weak with very low stopping power, short range, and negligible recoil.  It is most useful for rifle training, and hunting small animals.",
     "weight": "3 g",
-    "volume": "250 ml",
+    "volume": "65 ml",
     "price": 150,
     "price_postapoc": 800,
     "flags": [ "IRREPLACEABLE_CONSUMABLE" ],

data/json/items/ammo/223.json

@@ -5,7 +5,7 @@
     "name": { "str": ".223 Remington" },
     "description": ".223 Remington ammunition with 36gr JHP bullets.  The .223 round has been very popular with civilian shooters for almost a century, finding use in a wide variety of weapons.  It generates lower pressure than 5.56 NATO leading to slightly decreased accuracy and recoil.",
     "weight": "12 g",
-    "volume": "250 ml",
+    "volume": "194 ml",
     "price": 280,
     "price_postapoc": 900,
     "flags": [ "IRREPLACEABLE_CONSUMABLE" ],

data/json/items/ammo/270win.json

@@ -5,7 +5,7 @@
     "name": { "str": ".270 Winchester JSP" },
     "description": ".270 Winchester ammunition with 130gr soft point bullets.  The .270 round was not initially successful, but over a few decades it became one of the most popular rifle cartridges for hunting and silhouette shooting.  It is a powerful round capable of taking down large targets with ease.",
     "weight": "20 g",
-    "volume": "250 ml",
+    "volume": "189 ml",
     "price": 170,
     "price_postapoc": 600,
     "flags": [ "IRREPLACEABLE_CONSUMABLE" ],

data/json/items/ammo/300.json

@@ -5,7 +5,7 @@
     "name": { "str": ".300 Winchester Magnum" },
     "description": ".300 Winchester Magnum rounds with 220gr JHP bullets.  The 300WM round is an extremely powerful and accurate rifle round introduced in 1963.  It has proven popular with hunters and snipers, although it is not as common as .308 or .30-06.",
     "weight": "28 g",
-    "volume": "250 ml",
+    "volume": "169 ml",
     "price": 220,
     "price_postapoc": 400,
     "flags": [ "IRREPLACEABLE_CONSUMABLE" ],