Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA

.github/reviewers.yml

@@ -39,9 +39,8 @@ files:
     - KorGgenT
   '**/magic*.h':
     - KorGgenT
-  'tools/**':
+  'tools/{spell_checker/!(dictionary.txt){,/**},!(spell_checker){,/**}}':
     - jbytheway
-    - int-ua
   'src/widget.cpp':
     - wapcaplet
     - dseguin

.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

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

@@ -25,6 +25,13 @@ Creatures can stumble into invisible players to discover them
 Add molting for exoskeleton mutations
 3D vision of lower levels with distance fog
 Rework MA tech requirements
+Allow NPCs to read E-books - new activity added
+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:
@@ -47,6 +54,11 @@ Addition of non-NPC civilians for lore reasons
 Nether spiders as a new bossfight for the game.
 New conversion kits, guns, and calibres
 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:
@@ -60,6 +72,7 @@ Mouse thumb button support
 Show NPC location when selecting NPC to chat with, guard, or follow
 Display why vehicle parts cannot be installed
 Open multiple containers in Advanced Inventory Manager
+Adds the 'Mark as dangerous' keybinding to the overmap
 
 
 ## Mods:
@@ -86,6 +99,8 @@ Open multiple containers in Advanced Inventory Manager
 [Xedra Evolved] Revamped the inventor class
 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:
@@ -104,6 +119,9 @@ Add a more accessible holy symbol mission, replacing the small relic one
 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:
@@ -145,11 +163,18 @@ Fix unicode path encoding error in Windows MinGW build
 Difficulty 0 recipes are no longer arbitrarily difficult
 Make EOC u_sell_item() actually transfers the items' ownership
 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:
 Make `Character::best_item_with_quality` examine items non-recursively
 Refactor effect types to use map indirection and enums instead of strings
+Removes the ludicrous amount of OMs the refugee and research centres define
 
 
 ## Infrastructure:
@@ -162,10 +187,12 @@ Migrate some JSON APIs to string_view
 Add units::temperature_delta
 Upgrade clang-tidy used in CI to LLVM 16
 Allow C++ standard includes in clang-tidy tests
+Refactor timer items to be a bit more time based
 
 
 ## Build:
 Support Mac arm64 build
+Adds VS Code Dev Containers & Workspace Config
 
 
 ## I18N and A11Y:

data/json/character_modifiers.json

@@ -16,9 +16,9 @@
   {
     "type": "character_mod",
     "id": "aim_speed_mod",
-    "description": "Gun aim speed modifier <color_dark_gray>(Manipulation)</color>",
+    "description": "Gun aim speed modifier <color_dark_gray>(Manipulation, Grip, Lift)</color> ",
     "mod_type": "x",
-    "value": { "limb_score": "manip", "limb_type": "hand" }
+    "value": { "limb_score": [ [ "grip", 0.2 ], [ "manip", 0.2 ], [ "lift", 0.6 ] ], "limb_score_op": "+", "min": 0.1, "max": 1.0 }
   },
   {
     "type": "character_mod",

data/json/construction.json

@@ -5130,6 +5130,20 @@
     "post_special": "done_appliance",
     "activity_level": "BRISK_EXERCISE"
   },
+  {
+    "type": "construction",
+    "id": "app_catalytic_cracking_reactor",
+    "group": "place_catalytic_cracking_reactor",
+    "category": "APPLIANCE",
+    "//1": "maybe some applied science? this seems to be some semi-advanced hardware",
+    "required_skills": [ [ "fabrication", 0 ] ],
+    "//2": "I set lower activity and longer time for putting a lot of light and/or small items together. When possible, I'd like it to take more time to disassemble as well.",
+    "time": "40 m",
+    "components": [ [ [ "catalytic_cracking_reactor", 1 ] ] ],
+    "pre_special": "check_empty",
+    "post_special": "done_appliance",
+    "activity_level": "LIGHT_EXERCISE"
+  },
   {
     "type": "construction",
     "id": "app_hydraulic_press",
@@ -5378,6 +5392,18 @@
     "post_special": "done_appliance",
     "activity_level": "MODERATE_EXERCISE"
   },
+  {
+    "type": "construction",
+    "id": "app_wall_light",
+    "group": "place_wall_light",
+    "category": "APPLIANCE",
+    "required_skills": [ [ "fabrication", 0 ] ],
+    "time": "5 s",
+    "components": [ [ [ "wall_light", 1 ] ] ],
+    "pre_flags": "WALL",
+    "post_special": "done_appliance",
+    "activity_level": "NO_EXERCISE"
+  },
   {
     "type": "construction",
     "id": "app_standing_lamp",

data/json/construction_group.json

@@ -1259,6 +1259,11 @@
     "id": "place_jointer",
     "name": "Place Jointer"
   },
+  {
+    "type": "construction_group",
+    "id": "place_catalytic_cracking_reactor",
+    "name": "Place Catalytic Cracking Reactor"
+  },
   {
     "type": "construction_group",
     "id": "place_hydraulic_press",
@@ -1279,6 +1284,11 @@
     "id": "place_heater_small",
     "name": "Place Small Heater"
   },
+  {
+    "type": "construction_group",
+    "id": "place_wall_light",
+    "name": "Place Wall Light"
+  },
   {
     "type": "construction_group",
     "id": "place_standing_lamp",

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/example_eocs.json

@@ -8,7 +8,7 @@
         "names": [ "name_1", "name_2", "name_3", "should_fail" ],
         "keys": [ "a", "b", "c", "d" ],
         "descriptions": [ "option 1", "option 2", "option 3", "should not be available" ],
-        "variables": { "val": "8" }
+        "variables": [ { "val": "8" } ]
       }
     ]
   },
@@ -42,7 +42,7 @@
         "names": [ "name_1", "name_2", "name_3", "should_fail" ],
         "keys": [ "a", "b", "c", "d" ],
         "descriptions": [ "option 1", "option 2", "option 3", "should not be available" ],
-        "variables": { "val": "8" },
+        "variables": [ { "val": "8" } ],
         "hide_failing": true
       }
     ]

data/json/faults/fixes_gun.json

@@ -5,22 +5,51 @@
     "name": "Clean fouling",
     "success_msg": "You clean your %s.",
     "time": "50 m",
-    "faults_removed": [ "fault_gun_dirt", "fault_gun_blackpowder" ],
+    "faults_removed": [ "fault_gun_dirt" ],
     "faults_added": [ "fault_gun_unlubricated" ],
     "skills": { "mechanics": 1 },
     "set_variables": { "dirt": "0" },
-    "requirements": [ [ "gun_cleaning", 1 ] ]
+    "requirements": [ [ "gun_cleaning", 1 ] ],
+    "time_save_profs": { "prof_gun_cleaning": 0.5 }
+  },
+  {
+    "type": "fault_fix",
+    "id": "mend_gun_fouling_bp",
+    "name": "Clean blackpowder fouling",
+    "success_msg": "You clean your %s.",
+    "time": "50 m",
+    "faults_removed": [ "fault_gun_blackpowder" ],
+    "faults_added": [ "fault_gun_unlubricated" ],
+    "skills": { "mechanics": 1 },
+    "set_variables": { "dirt": "0" },
+    "requirements": [ [ "gun_cleaning_bp", 1 ] ],
+    "time_save_profs": { "prof_gun_cleaning": 0.5 },
+    "time_save_flags": { "EASY_CLEAN": 0.5 }
   },
   {
     "type": "fault_fix",
     "id": "mend_gun_fouling_clean_and_lube",
     "name": "Clean fouling and lubricate",
     "success_msg": "You clean and lubricate your %s.",
-    "time": "55 m",
-    "faults_removed": [ "fault_gun_dirt", "fault_gun_blackpowder", "fault_gun_unlubricated" ],
+    "time": "60 m",
+    "faults_removed": [ "fault_gun_dirt", "fault_gun_unlubricated" ],
     "skills": { "mechanics": 1 },
     "set_variables": { "dirt": "0" },
-    "requirements": [ [ "gun_cleaning", 1 ], [ "gun_lubrication", 1 ] ]
+    "requirements": [ [ "gun_cleaning", 1 ], [ "gun_lubrication", 1 ] ],
+    "time_save_profs": { "prof_gun_cleaning": 0.5 }
+  },
+  {
+    "type": "fault_fix",
+    "id": "mend_gun_fouling_clean_and_lube_bp",
+    "name": "Clean fouling and lubricate",
+    "success_msg": "You clean and lubricate your %s.",
+    "time": "60 m",
+    "faults_removed": [ "fault_gun_blackpowder", "fault_gun_unlubricated" ],
+    "skills": { "mechanics": 1 },
+    "set_variables": { "dirt": "0" },
+    "requirements": [ [ "gun_cleaning_bp", 1 ], [ "gun_lubrication", 1 ] ],
+    "time_save_profs": { "prof_gun_cleaning": 0.5 },
+    "time_save_flags": { "EASY_CLEAN": 0.5 }
   },
   {
     "type": "fault_fix",
@@ -34,10 +63,11 @@
     "type": "fault_fix",
     "id": "mend_fault_gun_unlubricated",
     "name": "Lubricate",
-    "time": "50 m",
+    "time": "10 m",
     "faults_removed": [ "fault_gun_unlubricated" ],
     "skills": { "mechanics": 1 },
     "success_msg": "You lubricate the %s.",
-    "requirements": [ [ "gun_lubrication", 1 ] ]
+    "requirements": [ [ "gun_lubrication", 1 ] ],
+    "time_save_profs": { "prof_gun_cleaning": 0.5 }
   }
 ]

data/json/flags.json

@@ -202,6 +202,11 @@
     "info": "As a weapon, this item is <good>well-made</good> and will <info>withstand the punishment of combat</info>.",
     "conflicts": [ "FRAGILE_MELEE" ]
   },
+  {
+    "id": "EASY_CLEAN",
+    "type": "json_flag",
+    "info": "This gun is made of <info>relatively simple parts</info> which makes powder fouling <good>easier to clean</good>."
+  },
   {
     "id": "FIELD_DRESS",
     "type": "json_flag"
@@ -2218,5 +2223,10 @@
     "id": "REBREATHER_CART",
     "type": "json_flag",
     "info": "A filter for a rebreather."
+  },
+  {
+    "id": "USE_POWER_WHEN_HIT",
+    "type": "json_flag",
+    "info": "This armor <info>expends energy when hit</info>."
   }
 ]