Merge from master to resolve conflicts

.appveyor.yml

@@ -11,7 +11,7 @@ install:
     - cmd: cd c:\tools\vcpkg\
     - cmd: git pull
     - cmd: bootstrap-vcpkg.bat -disableMetrics
-    - cmd: vcpkg --triplet %PLATFORM%-windows-static install sdl2 sdl2-image sdl2-mixer[dynamic-load,libflac,mpg123,libmodplug,libvorbis] sdl2-ttf gettext --recurse
+    - cmd: vcpkg --triplet %PLATFORM%-windows-static install sdl2 sdl2-image sdl2-mixer[libflac,mpg123,libmodplug,libvorbis] sdl2-ttf gettext --recurse
 build:
   project: /msvc-full-features/Cataclysm-vcpkg-static.sln
   parallel: true

.github/workflows/pull-translations.yml

@@ -40,6 +40,7 @@ jobs:
           commit-message: Routine i18n updates on ${{ steps.current-date.outputs.formattedTime }}
           committer: Brett Dong (BOT) <brett.browning.dong@gmail.com>
           author: Brett Dong (BOT) <brett.browning.dong@gmail.com>
+          token: TX_PR_CREATOR
           branch: i18n
           delete-branch: true
           base: master

.github/workflows/push-translation-template.yml

@@ -0,0 +1,55 @@
+name: "Push translation template"
+
+concurrency: push_transifex
+
+on:
+  push:
+    branches:
+      - master
+    paths:
+      - '**.json'
+      - 'src/**.cpp'
+      - 'src/**.h'
+      - 'lang/extract_json_strings.py'
+      - 'lang/strip_line_numbers.py'
+      - 'lang/update_pot.sh'
+      - 'lang/unicode_check.py'
+
+
+jobs:
+  push-template:
+    if: github.repository == 'CleverRaven/Cataclysm-DDA'
+    runs-on: ubuntu-20.04
+    steps:
+      - name: "Install dependencies"
+        run: |
+          sudo apt-get update
+          sudo apt-get install gettext python3-pip
+          sudo pip3 install transifex-client
+      - name: "Checkout"
+        uses: actions/checkout@v2
+      - name: "Generate translation template"
+        run: |
+          lang/update_pot.sh
+      - name: "Set up Transifex token"
+        env: 
+          TX_TOKEN: ${{ secrets.TX_TOKEN }}
+        run: |
+          cat << EOF > ~/.transifexrc
+          [https://www.transifex.com]
+          api_hostname = https://api.transifex.com
+          hostname = https://www.transifex.com
+          password = $TX_TOKEN
+          username = api
+          EOF
+      - name: "Push translation template to Transifex server"
+        uses: nick-invision/retry@v2
+        with:
+          timeout_minutes: 10
+          max_attempts: 5
+          retry_on: error
+          command: |
+            tx push --source --no-interactive --resource cataclysm-dda.master-cataclysm-dda
+      - name: Sleep for 5 minutes
+        run: sleep 5m
+        shell: bash

CMakeLists.txt

@@ -96,7 +96,8 @@ else ()
 endif ()
 
 # System specific actions
-if (${CMAKE_SYSTEM_NAME} MATCHES Linux OR ${CMAKE_SYSTEM_NAME} MATCHES FreeBSD)
+if (${CMAKE_SYSTEM_NAME} MATCHES Linux OR ${CMAKE_SYSTEM_NAME} MATCHES FreeBSD
+    OR ${CMAKE_SYSTEM_NAME} MATCHES Darwin)
     if (NOT DATA_PREFIX)
         set(DATA_PREFIX ${CMAKE_INSTALL_PREFIX}/share/cataclysm-dda)
     endif ()
@@ -159,6 +160,7 @@ endif ()
 
 # Set build types and display info
 if (CMAKE_BUILD_TYPE STREQUAL Debug)
+    set(RELEASE 0)
     message(STATUS "Build ${PROJECT} in development mode --")
     message(STATUS "Binaries will be located in: " ${CMAKE_SOURCE_DIR})
     set(CMAKE_VERBOSE_MAKEFILE ON)
@@ -169,6 +171,7 @@ if (CMAKE_BUILD_TYPE STREQUAL Debug)
             "Single Directory for all Executables.")
     set(BIN_PREFIX ${CMAKE_SOURCE_DIR})
 else ()
+    set(RELEASE 1)
     message(STATUS "CMAKE_INSTALL_PREFIX          : ${CMAKE_INSTALL_PREFIX}")
     message(STATUS "BIN_PREFIX                    : ${BIN_PREFIX}")
     message(STATUS "DATA_PREFIX                   : ${DATA_PREFIX}")

Makefile

@@ -598,6 +598,7 @@ endif
 
 # Global settings for Windows targets
 ifeq ($(TARGETSYSTEM),WINDOWS)
+  DEFINES += -DWIN32_LEAN_AND_MEAN
   CHKJSON_BIN = chkjson.exe
   TARGET = $(W32TARGET)
   BINDIST = $(W32BINDIST)

data/json/bionics.json

@@ -400,8 +400,8 @@
     "occupied_bodyparts": [ [ "arm_r", 7 ], [ "hand_r", 1 ] ],
     "encumbrance": [ [ "arm_r", 2 ] ],
     "act_cost": "50 J",
-    "fake_item": "bio_blade_weapon",
-    "flags": [ "BIONIC_TOGGLED", "BIONIC_WEAPON", "BIONIC_NPC_USABLE" ]
+    "fake_weapon": "bio_blade_weapon",
+    "flags": [ "BIONIC_TOGGLED", "BIONIC_WEAPON", "BIONIC_NPC_USABLE", "USES_BIONIC_POWER" ]
   },
   {
     "id": "bio_shotgun",
@@ -411,7 +411,7 @@
     "occupied_bodyparts": [ [ "arm_l", 12 ] ],
     "encumbrance": [ [ "arm_l", 5 ] ],
     "act_cost": "50 J",
-    "fake_item": "bio_shotgun_gun",
+    "fake_weapon": "bio_shotgun_gun",
     "flags": [ "BIONIC_TOGGLED", "BIONIC_WEAPON", "NO_UNWIELD" ]
   },
   {
@@ -512,7 +512,7 @@
     "description": "Your body is equipped with a chain lightning generator, allowing you to emit a blast of lightning at a target, leaving a trail of lightning in its wake, jumping to additional targets within 4 tiles of the previous target.",
     "occupied_bodyparts": [ [ "torso", 16 ], [ "arm_l", 4 ] ],
     "act_cost": "100 kJ",
-    "fake_item": "bio_lightning",
+    "fake_weapon": "bio_lightning",
     "flags": [ "BIONIC_GUN", "BIONIC_NPC_USABLE" ]
   },
   {
@@ -523,7 +523,7 @@
     "occupied_bodyparts": [ [ "hand_l", 4 ], [ "hand_r", 4 ] ],
     "encumbrance": [ [ "hand_l", 3 ], [ "hand_r", 3 ] ],
     "act_cost": "25 J",
-    "fake_item": "bio_claws_weapon",
+    "fake_weapon": "bio_claws_weapon",
     "flags": [ "BIONIC_TOGGLED", "BIONIC_WEAPON", "BIONIC_NPC_USABLE" ]
   },
   {
@@ -642,7 +642,8 @@
     "description": "When this bionic is active, you can block hearing completely.",
     "included": true,
     "flags": [ "BIONIC_TOGGLED" ],
-    "active_flags": [ "DEAF" ]
+    "active_flags": [ "DEAF" ],
+    "auto_deactivates": [ "bio_ears" ]
   },
   {
     "id": "bio_ears",
@@ -652,6 +653,7 @@
     "occupied_bodyparts": [ [ "head", 2 ] ],
     "flags": [ "BIONIC_TOGGLED", "IMMUNE_HEARING_DAMAGE" ],
     "active_flags": [ "SUPER_HEARING" ],
+    "auto_deactivates": [ "bio_earplugs" ],
     "included_bionics": [ "bio_earplugs" ]
   },
   {
@@ -669,7 +671,7 @@
     "description": "A ranged EMP generator system is implanted in your right arm and the palm of your right hand.  The system fires precise, single-target pulses that require time to aim.  Extremely effective against electronic targets but mostly useless otherwise.",
     "occupied_bodyparts": [ [ "arm_r", 8 ], [ "hand_r", 2 ] ],
     "act_cost": "50 kJ",
-    "fake_item": "bio_emp_gun",
+    "fake_weapon": "bio_emp_gun",
     "flags": [ "BIONIC_GUN" ]
   },
   {
@@ -772,8 +774,8 @@
     "name": { "str": "Fingerhack" },
     "description": "One of your fingers has an electrohack surgically embedded in it; an all-purpose hacking unit used to override control panels and the like (but not computers).  Skill in computers is important, and a failed use may damage your circuits.",
     "occupied_bodyparts": [ [ "hand_l", 1 ] ],
-    "fake_item": "electrohack",
-    "flags": [ "BIONIC_TOGGLED" ]
+    "toggled_pseudo_items": [ "electrohack" ],
+    "flags": [ "BIONIC_TOGGLED", "USES_BIONIC_POWER" ]
   },
   {
     "id": "bio_flashbang",
@@ -932,7 +934,7 @@
     "description": "One of your fingers has a small high-powered laser surgically embedded in it.  This long range weapon is not incredibly damaging, but is very accurate, and has the potential to start fires.",
     "occupied_bodyparts": [ [ "hand_r", 1 ] ],
     "act_cost": "30 kJ",
-    "fake_item": "bio_laser_gun",
+    "fake_weapon": "bio_laser_gun",
     "flags": [ "BIONIC_GUN", "BIONIC_NPC_USABLE" ]
   },
   {
@@ -970,7 +972,8 @@
     "name": { "str": "Finger Lighter" },
     "description": "The index finger of your left hand has a fire starter that can extend from the tip.",
     "occupied_bodyparts": [ [ "hand_l", 1 ] ],
-    "fake_item": "fake_firestarter",
+    "flags": [ "USES_BIONIC_POWER" ],
+    "passive_pseudo_items": [ "crude_firestarter" ],
     "act_cost": "1500 J"
   },
   {
@@ -1222,7 +1225,7 @@
     "name": { "str": "Fingertip Razors" },
     "description": "You possess razor-sharp claws underneath your fingernails that do a small amount of unarmed slashing damage whenever your fingertips are uncovered.",
     "occupied_bodyparts": [ [ "hand_l", 1 ], [ "hand_r", 1 ] ],
-    "fake_item": "fake_razor",
+    "passive_pseudo_items": [ "fake_razor" ],
     "flags": [ "BIONIC_NPC_USABLE" ]
   },
   {
@@ -1378,7 +1381,7 @@
     "name": { "str": "Autonomous Surgical Scalpels" },
     "description": "A system of surgical grade scalpels is implanted in your forearms, extending from just above your wrists.  They allow you to make automated precise cuts and can also be used as a high-quality butchering tool.",
     "occupied_bodyparts": [ [ "arm_r", 2 ], [ "arm_l", 2 ] ],
-    "fake_item": "bio_scalpel",
+    "fake_weapon": "bio_scalpel",
     "flags": [ "BIONIC_TOGGLED", "BIONIC_WEAPON" ]
   },
   {
@@ -1389,7 +1392,7 @@
     "occupied_bodyparts": [ [ "eyes", 1 ] ],
     "included_bionics": [ "bio_blindfold" ],
     "flags": [ "BIONIC_NPC_USABLE", "GLARE_RESIST" ],
-    "fake_item": "fake_goggles"
+    "passive_pseudo_items": [ "fake_goggles" ]
   },
   {
     "id": "bio_targeting",
@@ -1442,18 +1445,18 @@
     "name": { "str": "Integrated Toolset" },
     "description": "Surgically implanted in your hands and forearms is a set of tools - screwdriver, hammer, wrench, hacksaw, drill, heating elements, and others.  You can use this in place of many tools when crafting.",
     "occupied_bodyparts": [ [ "hand_l", 1 ], [ "hand_r", 1 ], [ "arm_l", 3 ], [ "arm_r", 3 ] ],
-    "fake_item": "toolset",
+    "toggled_pseudo_items": [ "toolset" ],
     "included_bionics": [ "bio_tools_extend" ],
-    "flags": [ "BIONIC_TOGGLED", "BIONIC_NPC_USABLE" ]
+    "flags": [ "BIONIC_TOGGLED", "BIONIC_NPC_USABLE", "USES_BIONIC_POWER" ]
   },
   {
     "id": "bio_tools_extend",
     "type": "bionic",
     "name": { "str": "Extended Toolset" },
     "description": "Extend or withdraw your integrated toolset to cut metal, pry things, or other stuff.  This takes up your hands.",
-    "fake_item": "toolset_extended",
+    "fake_weapon": "toolset_extended",
     "included": true,
-    "flags": [ "BIONIC_TOGGLED", "BIONIC_WEAPON" ]
+    "flags": [ "BIONIC_TOGGLED", "BIONIC_WEAPON", "USES_BIONIC_POWER" ]
   },
   {
     "id": "bio_torsionratchet",
@@ -1554,7 +1557,7 @@
     "name": { "str": "Intravenous Needletip" },
     "description": "The flesh of the inside of your middle finger has been replaced with a tube leading into your arteries, with a retractable needle extending out of the tip of the finger when clenched.  This lets you pump intravenous drugs like morphine directly into your bloodstream without needing to carry a syringe.",
     "occupied_bodyparts": [ [ "hand_l", 1 ] ],
-    "fake_item": "syringe"
+    "passive_pseudo_items": [ "syringe" ]
   },
   {
     "id": "bio_weight",