merge

.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/core/basic.json

@@ -12,8 +12,8 @@
     "category": "food",
     "name": { "str_sp": "water" },
     "description": "Water, the stuff of life, the best thirst-quencher available.  It would be safer to drink once purified.",
-    "weight": 250,
-    "volume": 1,
+    "weight": "250 g",
+    "volume": "250 ml",
     "price": 50,
     "symbol": "~",
     "color": "light_blue",

data/json/artifact/relic_procgen_data.json

@@ -0,0 +1,125 @@
+[
+  {
+    "type": "relic_procgen_data",
+    "id": "cult",
+    "passive_add_procgen_values": [
+      { "weight": 100, "min_value": -1, "max_value": 1, "type": "STRENGTH", "increment": 1, "power_per_increment": 250 },
+      {
+        "weight": 100,
+        "min_value": -1,
+        "max_value": 1,
+        "type": "DEXTERITY",
+        "increment": 1,
+        "power_per_increment": 250
+      },
+      {
+        "weight": 100,
+        "min_value": -1,
+        "max_value": 1,
+        "type": "PERCEPTION",
+        "increment": 1,
+        "power_per_increment": 250
+      },
+      {
+        "weight": 100,
+        "min_value": -1,
+        "max_value": 1,
+        "type": "INTELLIGENCE",
+        "increment": 1,
+        "power_per_increment": 250
+      },
+      {
+        "weight": 100,
+        "min_value": -100,
+        "max_value": 25,
+        "type": "SPEED",
+        "increment": 5,
+        "power_per_increment": 200
+      }
+    ],
+    "type_weights": [ { "weight": 100, "value": "passive_enchantment_add" } ],
+    "items": [ { "weight": 100, "item": "spoon" } ]
+  },
+  {
+    "type": "relic_procgen_data",
+    "id": "netherum_tunnels",
+    "passive_add_procgen_values": [
+      { "weight": 100, "min_value": -1, "max_value": 1, "type": "STRENGTH", "increment": 1, "power_per_increment": 250 },
+      {
+        "weight": 100,
+        "min_value": -1,
+        "max_value": 1,
+        "type": "DEXTERITY",
+        "increment": 1,
+        "power_per_increment": 250
+      },
+      {
+        "weight": 100,
+        "min_value": -1,
+        "max_value": 1,
+        "type": "PERCEPTION",
+        "increment": 1,
+        "power_per_increment": 250
+      },
+      {
+        "weight": 100,
+        "min_value": -1,
+        "max_value": 1,
+        "type": "INTELLIGENCE",
+        "increment": 1,
+        "power_per_increment": 250
+      },
+      {
+        "weight": 100,
+        "min_value": -100,
+        "max_value": 25,
+        "type": "SPEED",
+        "increment": 5,
+        "power_per_increment": 200
+      }
+    ],
+    "type_weights": [ { "weight": 100, "value": "passive_enchantment_add" } ],
+    "items": [ { "weight": 100, "item": "spoon" } ]
+  },
+  {
+    "type": "relic_procgen_data",
+    "id": "alien_reality",
+    "passive_add_procgen_values": [
+      { "weight": 100, "min_value": -1, "max_value": 1, "type": "STRENGTH", "increment": 1, "power_per_increment": 250 },
+      {
+        "weight": 100,
+        "min_value": -1,
+        "max_value": 1,
+        "type": "DEXTERITY",
+        "increment": 1,
+        "power_per_increment": 250
+      },
+      {
+        "weight": 100,
+        "min_value": -1,
+        "max_value": 1,
+        "type": "PERCEPTION",
+        "increment": 1,
+        "power_per_increment": 250
+      },
+      {
+        "weight": 100,
+        "min_value": -1,
+        "max_value": 1,
+        "type": "INTELLIGENCE",
+        "increment": 1,
+        "power_per_increment": 250
+      },
+      {
+        "weight": 100,
+        "min_value": -100,
+        "max_value": 25,
+        "type": "SPEED",
+        "increment": 5,
+        "power_per_increment": 200
+      }
+    ],
+    "type_weights": [ { "weight": 100, "value": "passive_enchantment_add" } ],
+    "items": [ { "weight": 100, "item": "spoon" } ]
+  }
+]