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

Author: Maleclypse

.github/comment-commands.yml

@@ -59,6 +59,7 @@ users:
     - SariusSkelrets
     - SittingDucken
     - ShnitzelX2
+    - BalthazarArgall
 
 keywords:
   - name: confirm-bug

.github/workflows/release.yml

@@ -45,7 +45,7 @@ jobs:
       - name: Generate Release Notes
         id: generate-release-notes
         run: |
-          npm install @actions/github
+          npm install @actions/github@8
           node build-scripts/generate-release-notes.js '${{ secrets.GITHUB_TOKEN }}' '${{ steps.generate_env_vars.outputs.tag_name }}' "$(git log -1 --format='%H')" > notes.txt
       - run: |
           gh release create ${{ steps.generate_env_vars.outputs.tag_name }} --notes-file notes.txt --prerelease --title "${{ steps.generate_env_vars.outputs.release_name }}" --target "$(git log -1 --format='%H')"

CDDA.natvis

@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<AutoVisualizer xmlns="http://schemas.microsoft.com/vstudio/debugger/natvis/2010">
+    <Type Name="Character">
+        <DisplayString>{name}</DisplayString>
+    </Type>
+    <Type Name="units::quantity&lt;*, units::volume_in_milliliter_tag&gt;">
+        <DisplayString>{value_} ml</DisplayString>
+    </Type>
+    <Type Name="units::quantity&lt;*, units::length_in_millimeter_tag&gt;">
+        <DisplayString>{value_ / 10} cm</DisplayString>
+    </Type>
+    <Type Name="units::quantity&lt;*, units::mass_in_milligram_tag&gt;">
+        <DisplayString>{value_ / 1000} g</DisplayString>
+    </Type>
+    <Type Name="item">
+        <DisplayString Condition="is_favorite">* {type->name}</DisplayString>
+        <DisplayString Condition="!is_favorite">{type->name}</DisplayString>
+    </Type>
+    <Type Name="item_pocket">
+        <DisplayString Condition="data->pocket_name.raw._Mypair._Myval2._Mysize != 0">{data->pocket_name} in {data->name}</DisplayString>
+        <DisplayString>{data->name}</DisplayString>
+    </Type>
+    <Type Name="item_location">
+        <DisplayString Condition="ptr._Ptr->what.impl._Rep->_Uses">{*ptr._Ptr}</DisplayString>
+        <DisplayString Condition="!ptr._Ptr->what.impl._Rep->_Uses">invalid item location</DisplayString>
+    </Type>
+    <Type Name="item_location::impl::item_in_container">
+        <DisplayString Condition="what.impl._Rep->_Uses">{*what.impl._Ptr} in {container}</DisplayString>
+        <DisplayString Condition="!what.impl._Rep->_Uses">invalid item location</DisplayString>
+    </Type>
+    <Type Name="item_location::impl::item_on_map">
+        <DisplayString Condition="what.impl._Rep->_Uses">{*what.impl._Ptr} at {cur}</DisplayString>
+        <DisplayString Condition="!what.impl._Rep->_Uses">invalid item location</DisplayString>
+    </Type>
+    <Type Name="item_location::impl::item_on_person">
+        <DisplayString Condition="what.impl._Rep->_Uses">{*what.impl._Ptr} on {*who}</DisplayString>
+        <DisplayString Condition="!what.impl._Rep->_Uses">invalid item location</DisplayString>
+    </Type>
+    <Type Name="item_location::impl::item_on_vehicle">
+        <DisplayString Condition="what.impl._Rep->_Uses">{*what.impl._Ptr} in vehicle {cur.veh.name}</DisplayString>
+        <DisplayString Condition="!what.impl._Rep->_Uses">invalid item location</DisplayString>
+    </Type>
+    <Type Name="translation">
+        <DisplayString>{raw}</DisplayString>
+    </Type>
+</AutoVisualizer>

Makefile

@@ -1206,7 +1206,7 @@ clean: clean-tests clean-lang
 	rm -f $(CHKJSON_BIN)
 	rm -f $(TEST_MO)
 	rm -rf zzip.dSYM
-	rm -f zzip zzip.*
+	rm -f zzip zzip.* zstd.a
 
 distclean:
 	rm -rf *$(BINDIST_DIR)

build-scripts/files_changed

@@ -17,7 +17,7 @@ then
     if [ -n $TRAVIS_COMMIT_RANGE ]
     then
         # If this string is populated, it should work.
-        # But it mught fail, due to e.g. the shallow clone depth missing the
+        # But it might fail, due to e.g. the shallow clone depth missing the
         # relevant commit, in which case we fail
         files_list $TRAVIS_COMMIT_RANGE || exit 1
     else

data/changelog.txt

@@ -178,6 +178,14 @@ More proper sorting
 Freeze water into ice in winter basic func
 Spells can now be actively channeled, causing continued effects over time so long as you wait after casting.
 Better furniture loading onto vehicles
+Freeze water into ice in winter with phase change system.（2/?）
+Use `EXTRADIMENSIONAL` flag as a catch-all for other-dimensional specials
+Set of clothes takes off ALL items, always
+Frezze water in winter monster and plant part. (3/?)
+Promote "SWIM_UNDER" flag to docks and bridges.
+Water frozen in winter veh and thick ice part. (4/5)
+Limbify tails
+Allow furniture/vehicles to be vertically dragged
 
 
 
@@ -404,6 +412,10 @@ Inland container depot
 25 more shipping containers
 Your new pal, Pat (check the Hub)
 Add feldspar chunks to forest/field itemgroups, add feldspar veins to Innawood
+Dimension of sundered spacetime
+Turn various traits into limb-adding mutations
+Add tarot reading
+Devourer Evolution
 
 
 ## Interface:
@@ -544,6 +556,14 @@ Better contrast for blue-on-black color
 Print 'taming' foods for monsters
 Sidebar headers to differentiate terrain vs furniture
 Remove 'Toggle skill training' hotkey description
+Add a new display mode to the construction menu: ready.
+Disable invalid file operations for empty e-devices
+Show time required to hotwire a car
+Add sidebar widgets for oxygen levels
+Show time required to pick a lock
+Show time to hacksaw before committing to doing it
+Show objective directions on overmap
+Allow resuming hacksaw cutting metal with different tools
 
 
 ## Mods:
@@ -1003,6 +1023,17 @@ Add an enchantment that modifies the 'free dodges' stat introduced for Martial A
 [Xedra Evolved] Add Sefer Raziel HaMalakh as a hedge magic book
 [MoM] Add biokinesis/vitakinesis research facility
 [Aftershock] Add esper enkindling tinctures
+[MoM] Add spoiler doc to explain how power learning works
+[XE] Add three vampire hunter professions
+[Mods] Use external options in the manipulation of mods skills and proficiencies
+[Xedra Evolved] Fix elemental fae joining the Butlerian Jihad
+[Sky Island] Spawn the Island in a void
+[Sky Island] Mod compatibility
+[Sky Island] Dummy EOCs so the innawood integration does not cause an error
+[No Hope] Actually use defined region settings
+[XE] The holy-burnt suffer from wearing holy symbols.
+[Bombastic Perks] Change the way you get playstyle perks
+[Bombastic Perks] Add more prerequisites for perks
 
 
 
@@ -1126,6 +1157,18 @@ Techniqueify `HOOVES`
 Increase hulk combat ability
 internal vehicle electronics don't threaten the integrity of the tires when destroyed
 Apis npc is more insectoid, more brave, less talkative, and more dangerous
+Natural healing degrades health but medical healing does not
+Devourers gain abilities and resilience from devouring
+Scale devourer flesh raptor generation with size
+Remove grenade hacks from direct spawn, make lab bots spawn flashbang hacks instead
+Reduce the rate of siphoning and drawing a liquid from vehicle from 0.66L to 0.25L per second
+Technique-ify Several traits
+Hub 01 pays less for HEW reports
+Exodii do not pay for clothes or common kitchen goods
+Remove free attack from rabbit feet
+Give krecks a bite attack
+Make riding an animal exerting; add walking gait
+Flying Polyps are out of phase
 
 
 ## Bugfixes:
@@ -1549,6 +1592,20 @@ Fix format mismatch in cataimgui::draw_colored_text
 Fixing error and tips msg for water purification tablets
 Fix ethereal item info
 Fixed debug msg in mapgen that caused debug errors.
+You can't fold veh with furn in it.
+Fix bandages or disinfectant could apply bonus healing to other body parts
+Updated logic for sunlight availability for planting
+More reasonable approach to item rot
+Fix vehicles not being seriously impacted by flat tires
+fix focus always be a penalty when install GUNMOD with `INSTALL_DIFFICULT`
+Fix supermarket items spawning with unrealistic quantities and missing containers
+Fix update_mapgen in missions to use mission target as origin instead of player if possible
+Fix add_mod printf specifier
+Fix basic typos in code and comments
+[MoM] Remove riot damage from labs
+Fix typos in code and comments
+Fix another edge case with zone sorting
+Fix monster infighting slowing game down
 
 
 ## Performance:
@@ -1583,6 +1640,7 @@ Speed up mapgen especially noticeable in Sky Islands
 don’t call std::pow for squaring numbers
 don’t compute the size of far away hordes when drawing the world map
 can_contain: calculate pocket volume once (huge speed up in special cases)
+Shrink binary by using constexpr arrays for units constants
 
 
 ## Infrastructure:
@@ -1753,6 +1811,20 @@ obsolete ACT_ARMOR_LAYERS, move to uistate::open_menu
 move ACT_TREE_COMMUNION handler to activity_actor
 move ACT_ATM handler to activity_actor
 Add support for fstring style placeholders in translated strings.
+Move ACT_TRAIN handler to activity_actor, obsolete ACT_TRAIN_TEACHER
+Add captions to AppStream screenshots to satisfy Flathub linter
+move ACT_TOOLMOD_ADD to activity_actor
+remove ACT_DISMEMBER handler (dead code)
+move ACT_PULL_CREATURE handler to activity_actor
+Move ACT_MEND_ITEM to activity_actor
+clean up heat_activity_actor
+Add tileset support for pets wearing armor
+activity_actor framework for multi-activities, move ACT_MULTIPLE_MINE to activity_actor
+Rewrite and migrate V menu to ImGui
+move ACT_MULTIPLE_MOP, ACT_MULTIPLE_CHOP_PLANKS, ACT_MULTIPLE_CHOP_TREES to activity actor
+move ACT_VEHICLE_REPAIR, ACT_VEHICLE_DECONSTRUCTION to activity_actor
+Move ACT_MULTIPLE_FISH/FARM/READ/STUDY to activity_actors
+move ACT_MULTIPLE_CRAFT, ACT_MULTIPLE_DIS(assembly) to activity_actors
 
 
 ## Build:

data/core/external_options.json

@@ -487,7 +487,7 @@
   {
     "type": "EXTERNAL_OPTION",
     "name": "ETERNAL_SEASON",
-    "//": "If true, keep the initial season for ever.",
+    "//": "If true, keep the initial season forever.",
     "stub": true,
     "stype": "bool",
     "value": false
@@ -503,14 +503,14 @@
   {
     "type": "EXTERNAL_OPTION",
     "name": "HIGHWAY_GRID_ROW_SEPARATION",
-    "//": "The distance between east-west highways in overmaps, with the whole overmap gap being `grid_row_seperation` - 1.",
+    "//": "The distance between east-west highways in overmaps, with the whole overmap gap being `grid_row_separation` - 1.",
     "stype": "int",
     "value": 8
   },
   {
     "type": "EXTERNAL_OPTION",
     "name": "HIGHWAY_GRID_COLUMN_SEPARATION",
-    "//": "The distance between north-south highways in overmaps, with the whole overmap gap being `grid_column_seperation` - 1.",
+    "//": "The distance between north-south highways in overmaps, with the whole overmap gap being `grid_column_separation` - 1.",
     "stype": "int",
     "value": 10
   },

data/core/sentinels.json

@@ -29,7 +29,7 @@
     "id": "sub_bp_null",
     "type": "sub_body_part",
     "parent": "bp_null",
-    "side": 0,
+    "side": "both",
     "opposite": "sub_bp_null",
     "name": { "str": "Null sub_body_part, if you see this please report it", "//~": "NO_I18N" }
   },

data/json/ammo_effects.json

@@ -115,11 +115,6 @@
     "type": "ammo_effect",
     "//": "Generate a small cloud of smoke at the source. Hardcoded"
   },
-  {
-    "id": "NEVER_MISFIRES",
-    "type": "ammo_effect",
-    "//": "Firing ammo without this flag may trigger a misfiring, this is independent of the weapon flags. Hardcoded"
-  },
   {
     "id": "NO_DAMAGE_SCALING",
     "type": "ammo_effect",