Merge branch 'master' into squashed_variant_jp_r7

.appveyor.yml

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

.clang-tidy

@@ -51,7 +51,6 @@ readability-*,\
 -readability-isolate-declaration,\
 -readability-magic-numbers,\
 -readability-named-parameter,\
--readability-redundant-control-flow,\
 "
 WarningsAsErrors: '*'
 HeaderFilterRegex: '(src|test|tools).*'

.github/workflows/CBA.yml

@@ -0,0 +1,39 @@
+name: Clang Build Analyzer
+
+on:
+  push:
+    branches:
+    - master
+  pull_request:
+    branches:
+    - master
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: checkout repository
+      uses: actions/checkout@v1
+      with:
+        fetch-depth: 10
+    - name: install dependencies
+      run: sudo apt-get install libncursesw5-dev
+    - name: Prepare Build Analyzer
+      run: |
+        cd
+        git clone --recursive https://github.com/aras-p/ClangBuildAnalyzer.git buildAnalyzer
+        cd buildAnalyzer
+        mkdir build
+        cd build
+        cmake -DCMAKE_BUILD_TYPE=RELEASE ..
+        cmake --build . -- -j3
+        echo "::add-path::$PWD"
+    - name: make
+      run: |
+        ClangBuildAnalyzer --start .
+        CLANG=clang++-9 CXXFLAGS=-ftime-trace make 
+        ClangBuildAnalyzer --stop . buildAnalysis
+    - name: Analyze
+      run: ClangBuildAnalyzer --analyze buildAnalysis

CMakeLists.txt

@@ -33,7 +33,7 @@ include(CTest)
 include(GetGitRevisionDescription)
 git_describe(GIT_VERSION)
 
-MESSAGE("\n * Cataclysm: Dark Days Ahead is a roguelike set in a post-apocalyptic world.")
+MESSAGE("\n * Cataclysm: Dark Days Ahead is a turn-based survival game set in a post-apocalyptic world.")
 MESSAGE("   _________            __                   .__                                ")
 MESSAGE("   \\_   ___ \\ _____   _/  |_ _____     ____  |  |   ___.__   ______  _____      ")
 MESSAGE("   /    \\  \\/ \\__  \\  \\   __\\\\__  \\  _/ ___\\ |  |  <   |  | /  ___/ /     \\     ")

Makefile

@@ -1102,22 +1102,18 @@ else
 	@echo Cannot run an astyle check, your system either does not have astyle, or it is too old.
 endif
 
-JSON_FILES = $(shell find data -name "*.json" | sed "s|^\./||")
-JSON_WHITELIST = $(filter-out $(shell cat json_blacklist), $(JSON_FILES))
-
-style-json: $(JSON_WHITELIST)
-
-$(JSON_WHITELIST): json_blacklist json_formatter
+style-json: json_blacklist $(JSON_FORMATTER_BIN)
 ifndef CROSS
-	@$(JSON_FORMATTER_BIN) $@
+	find data -name "*.json" -print0 | grep -v -z -F -f json_blacklist | \
+	  xargs -0 -L 1 $(JSON_FORMATTER_BIN)
 else
 	@echo Cannot run json formatter in cross compiles.
 endif
 
-style-all-json: json_formatter
+style-all-json: $(JSON_FORMATTER_BIN)
 	find data -name "*.json" -print0 | xargs -0 -L 1 $(JSON_FORMATTER_BIN)
 
-json_formatter: $(JSON_FORMATTER_SOURCES)
+$(JSON_FORMATTER_BIN): $(JSON_FORMATTER_SOURCES)
 	$(CXX) $(CXXFLAGS) $(TOOL_CXXFLAGS) -Itools/format -Isrc \
 	  $(JSON_FORMATTER_SOURCES) -o $(JSON_FORMATTER_BIN)
 

data/help/texts.json

@@ -4,10 +4,10 @@
     "order": 0,
     "name": "<a|A>: Introduction",
     "messages": [
-      "Cataclysm is a survival roguelike with a monster apocalypse setting.  You have survived the original onslaught, but the future looks pretty grim.",
+      "Cataclysm: Dark Days Ahead is a turn-based survival game set in a post-apocalyptic world.  You have survived the original onslaught, but the future looks pretty grim.",
       "You must prepare to face the many hardships to come including dwindling supplies, hostile creatures, and harmful weather.  Even among fellow survivors you must stay alert, since someone may be plotting behind your back to take your hard-earned loot.",
-      "Cataclysm differs from the traditional roguelikes in several ways.  Rather than exploring an underground dungeon, with a limited area on each level, you are exploring a truly infinite world, stretching in all four cardinal directions.  In this survival roguelike, you will have to find food; you also need to keep yourself hydrated and sleep periodically.  It's based on principle of realism, so expect all hardships you'd expect in life in a survival situation, and at least a dozen more from the eldritch and sci-fi nature of the Cataclysm itself.",
-      "While Cataclysm has more tasks to keep track of than many other roguelikes, the near-future setting of the game makes some tasks easier. Firearms, medications, and a wide variety of tools are all available to help you survive."
+      "Though one can think Cataclysm: Dark Days Ahead is a roguelike, it vastly differs from the traditional roguelikes in several ways.  Rather than exploring an underground dungeon, with a limited area on each level, you are exploring a truly infinite world, stretching in all four cardinal directions.  In this survival game, you will have to find food; you also need to keep yourself hydrated and sleep periodically.  It's based on the principle of realism, so expect all hardships you'd expect in life in a survival situation, and at least a dozen more from the eldritch and sci-fi nature of the Cataclysm itself.",
+      "While Cataclysm: Dark Days Ahead has more tasks to keep track of than many other games, the modern setting of the game makes some tasks easier. Firearms, medications, and a wide variety of tools are all available to help you survive."
     ]
   },
   {

data/json/achievements.json

@@ -110,5 +110,76 @@
     "type": "achievement",
     "name": "Ain't no valley low enough",
     "requirements": [ { "event_statistic": "min_move_z", "is": "<=", "target": -10 } ]
+  },
+  {
+    "id": "achievement_wield_crowbar",
+    "type": "achievement",
+    "name": "Freeman's favorite",
+    "requirements": [
+      {
+        "event_statistic": "num_avatar_wields_crowbar",
+        "is": ">=",
+        "target": 1,
+        "visible": "when_achievement_completed",
+        "description": "Wield a crowbar"
+      }
+    ]
+  },
+  {
+    "id": "achievement_wear_power_armor",
+    "type": "achievement",
+    "name": "Impenetrable",
+    "requirements": [
+      {
+        "event_statistic": "num_avatar_wears_power_armor_heavy",
+        "is": ">=",
+        "target": 1,
+        "visible": "when_achievement_completed",
+        "description": "Wear a tank suit"
+      }
+    ]
+  },
+  {
+    "id": "achievement_reach_lab_finale",
+    "type": "achievement",
+    "name": "What are they hiding?",
+    "requirements": [
+      {
+        "event_statistic": "last_oter_type_avatar_entered",
+        "is": "==",
+        "target": [ "oter_type_str_id", "lab_finale" ],
+        "visible": "when_achievement_completed",
+        "description": "Enter a lab finale room"
+      }
+    ]
+  },
+  {
+    "id": "achievement_reach_refugee_center",
+    "type": "achievement",
+    "name": "The Last Homely House",
+    "requirements": [
+      {
+        "event_statistic": "last_oter_type_avatar_entered",
+        "is": "==",
+        "target": [ "oter_type_str_id", "evac_center_18" ],
+        "visible": "when_achievement_completed",
+        "description": "Reach a refugee center"
+      }
+    ]
+  },
+  {
+    "id": "achievement_return_to_first_omt",
+    "type": "achievement",
+    "name": "Return to your roots",
+    "hidden_by": [ "achievement_survive_91_days" ],
+    "time_constraint": { "since": "game_start", "is": ">=", "target": "91 days" },
+    "requirements": [
+      {
+        "event_statistic": "num_avatar_enter_first_omt",
+        "is": ">=",
+        "target": 1,
+        "description": "Return to the location you started the game"
+      }
+    ]
   }
 ]

data/json/bionics.json

@@ -116,7 +116,7 @@
     "name": { "str": "Shotgun Arm" },
     "description": "Concealed in your left arm is a single shot 12 gauge shotgun.  Activate the bionic to fire and reload the shotgun.",
     "occupied_bodyparts": [ [ "arm_l", 15 ] ],
-    "encumbrance": [ [ "ARM_L", 5 ] ],
+    "encumbrance": [ [ "arm_l", 5 ] ],
     "act_cost": "50 J",
     "fake_item": "bio_shotgun_gun",
     "flags": [ "BIONIC_TOGGLED", "BIONIC_WEAPON", "NO_UNWIELD" ]
@@ -740,7 +740,7 @@
     "name": { "str": "Bionic Nostril" },
     "description": "You're really not sure how the CBM ended up in your nose, but no matter how it got there this badly misplaced bionic makes it difficult to breathe.  Increases mouth encumbrance by ten.",
     "occupied_bodyparts": [ [ "head", 2 ], [ "mouth", 1 ] ],
-    "encumbrance": [ [ "MOUTH", 10 ] ],
+    "encumbrance": [ [ "mouth", 10 ] ],
     "flags": [ "BIONIC_FAULTY" ]
   },
   {
@@ -768,7 +768,7 @@
     "name": { "str": "Bionic Visual Impairment" },
     "description": "Due to a badly misplaced dielectric stylette, you are now suffering from mild optic neuropathy.  Increases eye encumbrance by ten.",
     "occupied_bodyparts": [ [ "eyes", 1 ] ],
-    "encumbrance": [ [ "EYES", 10 ] ],
+    "encumbrance": [ [ "eyes", 10 ] ],
     "flags": [ "BIONIC_FAULTY" ]
   },
   {
@@ -977,13 +977,13 @@
     "description": "Improperly installed wires cause a physical stiffness in most of your body, causing increased encumbrance.",
     "occupied_bodyparts": [ [ "torso", 2 ], [ "arm_l", 1 ], [ "arm_r", 1 ], [ "leg_l", 1 ], [ "leg_r", 1 ], [ "foot_l", 1 ], [ "foot_r", 1 ] ],
     "encumbrance": [
-      [ "TORSO", 10 ],
-      [ "ARM_L", 10 ],
-      [ "ARM_R", 10 ],
-      [ "LEG_L", 10 ],
-      [ "LEG_R", 10 ],
-      [ "FOOT_L", 10 ],
-      [ "FOOT_R", 10 ]
+      [ "torso", 10 ],
+      [ "arm_l", 10 ],
+      [ "arm_r", 10 ],
+      [ "leg_l", 10 ],
+      [ "leg_r", 10 ],
+      [ "foot_l", 10 ],
+      [ "foot_r", 10 ]
     ],
     "flags": [ "BIONIC_FAULTY" ]
   },
@@ -1037,7 +1037,7 @@
     "name": { "str": "Self-Locking Thumbs" },
     "description": "Self-locking thumbs hold tight (even when you really don't want them to) and don't let go (even when you'd rather they did).  Increases hand encumbrance by ten, while failing to improve your ability to hold objects whatsoever.",
     "occupied_bodyparts": [ [ "hand_l", 1 ], [ "hand_r", 1 ] ],
-    "encumbrance": [ [ "HAND_L", 10 ], [ "HAND_R", 10 ] ],
+    "encumbrance": [ [ "hand_l", 10 ], [ "hand_r", 10 ] ],
     "flags": [ "BIONIC_FAULTY" ]
   },
   {
@@ -1153,7 +1153,7 @@
     "name": { "str": "Gasoline Fuel Cell CBM" },
     "description": "A small gasoline fuel cell fixed to your scapula.  Despite its limited energy output compared to other fuel cells, this device still produces a significant amount of heat dissipated through a heat exhaust protruding from your back.  A diffuse network of bio-plastic bladders has been meshed with your circulatory system and serves as a fuel tank.",
     "occupied_bodyparts": [ [ "torso", 8 ] ],
-    "encumbrance": [ [ "TORSO", 5 ] ],
+    "encumbrance": [ [ "torso", 5 ] ],
     "fuel_options": [ "gasoline" ],
     "fuel_capacity": 500,
     "fuel_efficiency": 0.25,

data/json/conducts.json

@@ -3,18 +3,21 @@
     "id": "conduct_zero_kills",
     "type": "conduct",
     "name": "Pacifist",
-    "description": "Kill nothing",
     "requirements": [
-      { "event_statistic": "num_avatar_monster_kills", "is": "<=", "target": 0, "visible": "never" },
-      { "event_statistic": "num_avatar_character_kills", "is": "<=", "target": 0, "visible": "never" }
+      { "event_statistic": "num_avatar_monster_kills", "is": "<=", "target": 0, "description": "Kill no monsters" },
+      {
+        "event_statistic": "num_avatar_character_kills",
+        "is": "<=",
+        "target": 0,
+        "description": "Kill no characters"
+      }
     ]
   },
   {
     "id": "conduct_zero_character_kills",
     "type": "conduct",
     "name": "Merciful",
-    "description": "Kill no characters",
     "hidden_by": [ "conduct_zero_kills" ],
-    "requirements": [ { "event_statistic": "num_avatar_character_kills", "is": "<=", "target": 0, "visible": "never" } ]
+    "requirements": [ { "event_statistic": "num_avatar_character_kills", "is": "<=", "target": 0, "description": "Kill no characters" } ]
   }
 ]

data/json/construction.json

@@ -3206,6 +3206,18 @@
     ],
     "post_terrain": "f_cardboard_fort"
   },
+  {
+    "type": "construction",
+    "id": "constr_sand_castle",
+    "description": "Build Sand Castle",
+    "category": "CONSTRUCT",
+    "required_skills": [ [ "fabrication", 0 ] ],
+    "time": "20 m",
+    "pre_special": "check_empty",
+    "tools": [ [ [ "sandbox_kit", -1 ] ] ],
+    "components": [ [ [ "material_sand", 8 ] ], [ [ "water", 2 ], [ "water_clean", 2 ], [ "salt_water", 2 ] ] ],
+    "post_terrain": "f_sand_castle"
+  },
   {
     "type": "construction",
     "id": "constr_firering",

data/json/flags.json

@@ -377,6 +377,12 @@
     "context": [ "GENERIC", "TOOL_ARMOR", "TOOL" ],
     "info": "This item can be used to communicate with radio waves."
   },
+  {
+    "id": "PERFECT_LOCKPICK",
+    "type": "json_flag",
+    "context": [  ],
+    "info": "This item can be used to <info>pick locks</info> with <good>zero effort</good>."
+  },
   {
     "id": "RAINPROOF",
     "type": "json_flag",

data/json/furniture_and_terrain/furniture-decorative.json

@@ -198,6 +198,23 @@
     "required_str": 10,
     "flags": [ "PLACE_ITEM" ]
   },
+  {
+    "type": "furniture",
+    "id": "f_sand_castle",
+    "name": "sand castle",
+    "description": "A glorious castle made of sand.  This mighty fortress will stand tall for the ages to come, a true testimony of the skills of its builder.",
+    "symbol": "m",
+    "color": "yellow",
+    "move_cost_mod": 2,
+    "required_str": -1,
+    "bash": {
+      "str_min": 1,
+      "str_max": 1,
+      "sound": "crunch.",
+      "sound_fail": "thump.",
+      "items": [ { "item": "material_sand", "count": 8 } ]
+    }
+  },
   {
     "type": "furniture",
     "id": "f_decorative_tree",