Merge remote-tracking branch 'upstream/master'

.github/workflows/format_emscripten.yml

@@ -0,0 +1,63 @@
+name: JSON Formatter in HTML
+
+on:
+  workflow_dispatch:
+  push:
+    paths:
+    - 'tools/format/**'
+    - 'tools/format_emscripten/**'
+    - '.github/workflows/format_emscripten.yml'
+
+
+jobs:
+  build:
+    name: Build
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: checkout repository
+      uses: actions/checkout@v3
+
+    - name: install dependencies (ubuntu)
+      run: |
+          sudo apt-get update
+          sudo apt-get install emscripten
+
+    - name: Build with emcc (emscripten)
+      run: tools/format_emscripten/build.sh
+
+    - name: Display files
+      run: ls -Rah
+
+    - name: Upload zipped html as artifact
+      uses: actions/upload-artifact@v3
+      with:
+        name: formatter
+        path: formatter.html
+
+    - uses: actions/checkout@v3
+      with:
+        ref: gh-pages
+
+    - uses: actions/download-artifact@v3
+      with:
+        name: formatter
+
+    - name: Display files
+      run: ls -Rah
+
+    - name: Create Pull Request
+      uses: peter-evans/create-pull-request@v5
+      with:
+        token: ${{ secrets.TX_PR_CREATOR_JSON_LINTER }}
+        commit-message: JSON linter gh-pages file update
+        base: gh-pages
+        branch: gh-pages-json-linter-update
+        branch-suffix: short-commit-hash
+        delete-branch: true
+        add-paths: formatter.html
+        title: Update Github Pages JSON linter page
+        body: "#### Summary\nNone\n\n#### Additional context\nAutomatically generated PR from emscripten compile output"
+        labels: Organization,<Documentation>
+        # create as a draft to allow maintainers to cull the changes before merging
+        draft: true

.vscode/extensions.json

@@ -1,6 +1,7 @@
 {
-    "recommendations": [
-        "ms-vscode-remote.remote-containers",
-        "ms-azuretools.vscode-docker"
-    ]
+  "recommendations": [
+    "ms-vscode-remote.remote-containers",
+    "ms-azuretools.vscode-docker",
+    "cdda-toys.cdda-json-formatter"
+  ]
 }

CMakeLists.txt

@@ -21,7 +21,7 @@ option(LIBBACKTRACE "Print backtrace with libbacktrace." "OFF")
 option(USE_XDG_DIR "Use XDG directories for save and config files." "OFF")
 option(USE_HOME_DIR "Use user's home directory for save and config files." "ON")
 cmake_dependent_option(USE_PREFIX_DATA_DIR
-    "Use UNIX system directories for game data in release build." OFF
+    "Use UNIX system directories for game data in release build." ON
     "UNIX" OFF
 )
 option(LOCALIZE "Support for language localizations. Also enable UTF support." "ON")
@@ -172,6 +172,7 @@ else ()
     # Use CMAKE_INSTALL_PREFIX as storage of data,gfx, etc.. Useful only on *nix OS.
     if(USE_PREFIX_DATA_DIR)
         if ("${CMAKE_SYSTEM_NAME}" MATCHES "(Linux|FreeBSD|Darwin)")
+            set(CMAKE_INSTALL_DATAROOTDIR "${CMAKE_INSTALL_PREFIX}/share/cataclysm-dda")
             add_definitions(-DPREFIX=${CMAKE_INSTALL_PREFIX})
             configure_file(
                 "${CMAKE_SOURCE_DIR}/src/prefix.h.in"

data/changelog.txt

@@ -30,6 +30,8 @@ Allow mutation transformation using the normal mutation rules
 Implement setting direction for appliances and add a directed floodlight appliance
 Asynchronous animations including sprinting and smashing
 Added enable and disable mutation EOCs
+3D vision for isometric tilesets
+Unhardcode dragging, grab fixes
 
 
 ## Content:
@@ -55,6 +57,8 @@ Crashing ship start for Aftershock
 Add more monsters to the nether monster corpse
 Living lore document
 Gastropod Foot Limb: Mutant limbs can be added in json
+Added a small office building fortified by bandits
+New location: speedway
 
 
 ## Interface:
@@ -96,6 +100,7 @@ Adds the 'Mark as dangerous' keybinding to the overmap
 Alchemy Perks for Xedra Evolved
 Bombastic Perks adds Playstyle Perks
 [Magiclysm] Ways to boost your caster level
+Disable the Bionic Professions mod by default
 
 
 ## Balance:
@@ -115,6 +120,8 @@ Most materials now burn at least a little slower than gunpowder
 stationary monsters don't let you train throwing to high levels
 player can drag heavier vehicles
 difficulty to repair depends on what the thing is made of instead of its crafting difficulty
+Hound afterimages also copy their host nicknames
+The player is substantially less effective with guns at low skill values
 
 
 ## Bugfixes:
@@ -159,6 +166,9 @@ Improving NPC shooting frequency
 Enable death effects on limited lifespan monsters
 Make Hub01 globally unique
 Charge integrated magazines when plugged in
+Don't allow to scan books that are owned by other characters
+Fix NPC putting items in open air when fetching items during an activity when 3D FOV is on
+Trees and other FLAMMABLE_ASH terrain leaves behind ash when burned down
 
 
 ## Performance:

data/json/bionics.json

@@ -502,7 +502,7 @@
     "id": "bio_blindfold",
     "type": "bionic",
     "name": { "str": "Optical Dampers" },
-    "description": "The lenses surgically installed over your eyes can be tinted to block out incoming light.",
+    "description": "A pair of lenses surgically installed over your eyes that can be tinted to block out incoming light.",
     "included": true,
     "flags": [ "BIONIC_TOGGLED" ],
     "active_flags": [ "BLIND" ]

data/json/construction.json

@@ -5506,6 +5506,19 @@
     "post_special": "done_appliance",
     "activity_level": "LIGHT_EXERCISE"
   },
+  {
+    "type": "construction",
+    "id": "app_active_backup_generator",
+    "group": "place_active_backup_generator",
+    "category": "APPLIANCE",
+    "required_skills": [ [ "mechanics", 1 ] ],
+    "time": "5 m",
+    "qualities": [ [ { "id": "WRENCH", "level": 1 } ] ],
+    "components": [ [ [ "active_backup_generator", 1 ] ] ],
+    "pre_special": "check_empty",
+    "post_special": "done_appliance",
+    "activity_level": "LIGHT_EXERCISE"
+  },
   {
     "type": "construction",
     "id": "constr_pontoon_dp",

data/json/construction_group.json

@@ -1709,6 +1709,11 @@
     "id": "place_asrg_containment",
     "name": "Place ASRG"
   },
+  {
+    "type": "construction_group",
+    "id": "place_active_backup_generator",
+    "name": "Place backup generator"
+  },
   {
     "type": "construction_group",
     "id": "build_rope_hoist",

data/json/effects.json

@@ -50,6 +50,7 @@
     "type": "effect_type",
     "id": "dragging",
     "name": [ "Dragging" ],
+    "show_in_info": true,
     "desc": [ "AI tag for when a monster is dragging you behind it.  This is a bug if you have it." ]
   },
   {
@@ -3253,10 +3254,10 @@
     "limb_score_mods": [
       { "limb_score": "manip", "modifier": 0.0 },
       { "limb_score": "grip", "modifier": 0.0 },
-      { "limb_score": "lift", "modifier": 0.6, "scaling": -0.01 },
+      { "limb_score": "lift", "modifier": 0.6, "scaling": -0.015 },
       { "limb_score": "block", "modifier": 0.25, "scaling": -0.01 },
       { "limb_score": "breathing", "modifier": 0.75, "scaling": -0.005 },
-      { "limb_score": "balance", "modifier": 0.6, "scaling": -0.01 },
+      { "limb_score": "balance", "modifier": 0.6, "scaling": -0.016 },
       { "limb_score": "move_speed", "modifier": 0.6, "scaling": -0.01 },
       { "limb_score": "footing", "modifier": 0.6, "scaling": -0.01 },
       { "limb_score": "swim", "modifier": 0.0 }

data/json/flags.json

@@ -1185,6 +1185,10 @@
     "id": "ALLERGEN_WOOL",
     "type": "json_flag"
   },
+  {
+    "id": "ANIMAL_PRODUCT",
+    "type": "json_flag"
+  },
   {
     "id": "ALWAYS_TWOHAND",
     "info": "<bad>You must</bad> have two free hands to wield this item.",
@@ -2212,16 +2216,29 @@
   {
     "id": "GASFILTER_SM",
     "type": "json_flag",
-    "info": "A small-sized gasmask filter."
+    "info": "A small-sized gasmask filter.",
+    "name": "filter mask cartridge"
   },
   {
     "id": "GASFILTER_MED",
     "type": "json_flag",
-    "info": "A medium-sized gasmask filter."
+    "info": "A medium-sized gasmask filter.",
+    "name": "gas mask cartridge"
   },
   {
     "id": "REBREATHER_CART",
     "type": "json_flag",
-    "info": "A filter for a rebreather."
+    "info": "A filter for a rebreather.",
+    "name": "rebreather cartridge"
+  },
+  {
+    "id": "OLD_GUN",
+    "type": "json_flag",
+    "info": "An old gun, WWII or earlier."
+  },
+  {
+    "id": "USE_POWER_WHEN_HIT",
+    "type": "json_flag",
+    "info": "This armor <info>expends energy when hit</info>."
   }
 ]