Merge remote-tracking branch 'upstream/master' into walls-3

.github/workflows/release.yml

@@ -56,45 +56,29 @@ jobs:
       matrix:
         include:
           - name: Windows Tiles x64 MSVC
-            artifact: windows-tiles-x64-msvc
+            artifact: windows-with-graphics-x64
             arch: x64
             os: windows-2019
             mxe: none
             ext: zip
             content: application/zip
             sound: 0
           - name: Windows Tiles Sounds x64 MSVC
-            artifact: windows-tiles-sounds-x64-msvc
+            artifact: windows-with-graphics-and-sounds-x64
             arch: x64
             os: windows-2019
             mxe: none
             ext: zip
             content: application/zip
             sound: 1
-          - name: Windows Tiles x64
-            mxe: x86_64
-            libbacktrace: 1
-            artifact: windows-tiles-x64
-            os: ubuntu-latest
-            ext: zip
-            content: application/zip
-            sound: 0
-          - name: Windows Tiles Sounds x64
-            mxe: x86_64
-            libbacktrace: 1
-            artifact: windows-tiles-sounds-x64
-            os: ubuntu-latest
-            ext: zip
-            content: application/zip
-            sound: 1
           - name: Linux Tiles x64
             os: ubuntu-20.04
             mxe: none
             android: none
             libbacktrace: 1
             tiles: 1
             sound: 0
-            artifact: linux-tiles-x64
+            artifact: linux-with-graphics-x64
             ext: tar.gz
             content: application/gzip
           - name: Linux Tiles Sounds x64
@@ -104,7 +88,7 @@ jobs:
             libbacktrace: 1
             tiles: 1
             sound: 1
-            artifact: linux-tiles-sounds-x64
+            artifact: linux-with-graphics-and-sounds-x64
             ext: tar.gz
             content: application/gzip
           - name: Linux Curses x64
@@ -114,23 +98,23 @@ jobs:
             libbacktrace: 1
             tiles: 0
             sound: 0
-            artifact: linux-curses-x64
+            artifact: linux-terminal-only-x64
             ext: tar.gz
             content: application/gzip
           - name: macOS Curses Universal Binary (x64 and arm64)
             os: macos-12
             mxe: none
             tiles: 0
             sound: 0
-            artifact: osx-curses-universal
+            artifact: osx-terminal-only-universal
             ext: dmg
             content: application/x-apple-diskimage
           - name: macOS Tiles Universal Binary (x64 and arm64)
             os: macos-12
             mxe: none
             tiles: 1
             sound: 0
-            artifact: osx-tiles-universal
+            artifact: osx-with-graphics-universal
             ext: dmg
             content: application/x-apple-diskimage
           - name: Android x64

data/changelog.txt

@@ -152,11 +152,32 @@ Grazing animals actually eat grass, and it regrows every season
 New characters get random natural hair color during character generation
 Binoculars now also increase 'detailed' vision range, not only max vision range
 Morphic Sizing flag for summoned/magickal items
+Pet feeding tweaks
+Adds a baseball bat recipe
+Flagify animal empathy/discord traits
+Dialogue debug: toggle display of conditionals/effects
+Character randomization sometimes produces 'crossdressing' characters
+Dialogue: JSON fields for displaying hidden responses
+Added check for stealing prior to inserting items into container
+Make garlic smokable
+Grazing animals actually eat grass, and it regrows every season
 Added check for stealing prior to wearing
 Plastic tub audit
 Adds throwing practice tools
 Debug spawn NPC by class id
 EOCs modifying calories track spent calories
+Mutations can have a custom activation message
+modify random NPC starting equipment based on time passed
+Throwing items while piloting mechs (with the mech's assist)
+Faction relationships can be modified through dialogue
+Adds whispering fungi to fungi zombie mongroup.
+Added check for stealing prior to obtaining book to read
+Added check for stealing prior to reloading items
+Added check for stealing prior to activating items
+Deconstruct simple furniture in the dark
+Mission deadlines supports dialogue variables
+Add a new appliance, the glassblower's crucible
+Add a new widget to display weight as "##.#/##.#[unit]"
 NPC factions get mad if you mess with their property by smashing or deconstructing it etc
 obsolete generic NPC common classes; use the avatar character generator instead
 Allow PCs/NPCs to move diagonally during overmap pathfinding
@@ -341,8 +362,25 @@ Professions & hobbies know gross anatomy & new butchering profs
 Slightly Expands Hub-01 and Yrax factions
 Adds a new stationary fungal variant.
 adds a new fungus infested mapgen
+Adds new end screen for thresh types, and a unique one.
+Overhaul gun spawning
+Fungal brute and hulk
+Massive expansion of dialogues and messages for various categories
+Make more zombies wear wedding rings
 Add a random NPC class that knows how to fly. Yes you CAN recruit them, switch to them, and then fly a helicopter with their skills.
 fungalize stages for zombies
+Adds in new .357, .44, and .22 LR lever-action rifles
+Carpets won't always be the same color
+Beds are draggable
+Large clay pots can now be crafted without a lid and used in the slow sand water filter
+Fence posts and bollards are more similar
+Melee weapon item groups for random NPCs
+Remove secret science and military stuff from bank/industry/mall vaults
+No free wiring in log walls
+Military locations can spawn EOD suits
+Added a welding store
+Titanium Density Fix
+Add Vitamin C Supplements
 
 
 ## Interface:
@@ -441,6 +479,13 @@ Map UI: hint custom keybind for `CHOOSE_DESTINATION`
 Toggle between the map and look around
 Only list non-zero damage types on melee weapons
 Misc. improvements to NPC goto-location options
+Repeat survey missions without leaving the interface
+Unify name suffix and profession
+Add daily health widget
+Add labels to structured sidebar tiny bodygraphs
+use Freetype to render fonts for ImGui, and use multiple fonts in the ImGui interface
+Debug reveal map moved to overmap editor, can reveal any overmap
+Wrap the text in the menu for choosing your new faction camp type
 Missions track when they were completed/failed
 Add activity to continually bash something until it's destroyed
 Option to set all of a companion's job priorities at once
@@ -698,6 +743,14 @@ Create the Martial Mastery mod, which allows you to develop your own martial art
 [DinoMod] Astrodon 
 [MoM] Add Alien Meadow mutable map special
 [Magiclysm] Fantasy species zombies
+[DinoMod] longer tail attacks
+[DinoMod] sauropods out of the water
+[Magiclysm] Condense Attunement UI and simplify json code
+[MoM] Add the unstoppable force (final rank feral telekinetic)
+[MoM] Give the human whirlwind (and feral security captain, Ψ Division) the Hurricane Blows power
+[Magiclysm] Add feral stormshapers
+[MoM] Allow Intuitive Artisan to craft in complete darkness (because you close your eyes and let the visions take over)
+[DinoMod] DinoZoo update
 [Magiclysm] Add `UNRESTRICTED` flag to several Magiclysm summoned items
 [Magiclysm] Rapid Regeneration's effect only triggers if you need healing
 [Xedra Evolved] Werewolves only regenerate when they need to
@@ -717,6 +770,32 @@ Prevent Paraclesians from being born with a drivers license
 [MoM/CrazyCata Interaction] Rename Metaphysics to "woo woo"
 [Bombastic Perks/MoM] Add MoM-specific perks
 [Xedra Evolved] Dreamsmithing procgen expansion (enchants)
+[MoM/Magiclysm interaction] Synchronize anti-Stare powers, Thought Shield spell protects from telepathy
+[Xedra Evolve] Add Ruach counter to sidebars
+[Sky Island/MoM/XE interactions] Allow starting with XE/MoM scenario-limited professions in Sky Island
+Apply copy-from to mod scenarios
+[MoM] Move Mirror-mask bonus to effect, obsolete mutations
+[Xedra Evolved] Require Traverse the Wilds to target a tree as the endpoint
+[Xedra Evolved] More Lilin powers
+[DinoMod] mountable and harnessable audit
+Magus spell Slow description change
+[DinoMod] Eggs process directly into hatchlings
+[MoM] Update mutated animals to match vanilla changes
+[XE] Add cryptid hunting and a few cryptids
+[Magiclysm] Zombie versions of lizardfolk and ravenfolk drop tainted flesh like all other zombies
+[MoM] Update everglow matrix lighting recipes
+[Magiclysm] Feral dabblers: add a small chance for ferals to know a single spell
+[MoM] Remove monster inherent speed boosts, replace with actual powers that have to be used
+[XE] Fix two bugs about learning new blood gifts
+[Magiclysm] Add a trait that prevents magical spellcasting
+Martial Mastery: Fix duration of several technique effects
+Create an external option for disabling zombify_into. Apply it to both Aftershock:Exoplanet and DDtD
+[Xedra Evolved] Moon's tears weapons
+[Xedra Evolved] Add playable Lilin with appropriate scenario
+[MoM] Torrential Channeling power maintenance also raises Nether Attunement
+Aftershock: Remove swims flag from terrestrial creatures.
+[MoM] Feral psion updates with copy-from
+Aftershock: Add suit batteries for the winter suits.
 [DinoMod] eolambia
 [Xedra Evolved/Innawood] Remove modern items from XE spawns Innawood, allow starting with XE-specific scenarios
 [Xedra Evolved] Only humans can learn dream magick
@@ -819,7 +898,19 @@ Wielded items behave the same as ranged weapons when driving
 Small changes to Quenching and tempering proficiency
 Battery tools sanification
 Obsolete and migrate legacy wire in favor of mild steel wire
+Remove itch from conjunctivitis and make it even shorter when irrigated
+Electronic devices spawn rate rework
+Crashed planes have no ferals
+Replace land mines with bear traps in the bandit cabin
+Human lard less dense
+Ballista is no longer pure magic
 Make lab access shafts normally visible once spotted
+Factions don't mind the player smashing zombie corpses
+Remove calcium from Rare Drugs itemgroup
+Ranged weapon selection for random NPCs
+Some factions claim only one OMT
+Added some reaction to furniture when falling down
+Auditing portable charcoal kiln cleanup
 NPCs can funk out to music, too.
 
 
@@ -1069,6 +1160,24 @@ NPC flee from being run over by vehicles
 fix the crash in select_language by building the font atlas first
 Monsters won't be sending immobile targets into flight anymore.
 [XE/Magiclysm] No wizard cats
+Fixed hair growth and balding issue in appearance_eocs.json
+HUB01 templates' spawn is more predictable
+[MoM] Fix Missing mind shield (0.H Backport)
+Fixes AIM layout #76606
+[Isolation Protocol] Fix trailing spaces
+Cameras can now be charged and they all consume one battery charge per usage
+Change X95 to 556
+Avoid JSON errors on Windows with no sound devices
+Move Zombio Bio Operators to No Hope
+Adjust spawns of .22
+Allow tiny continuous power draw in electronic devices.
+Don't take integrated and no-takeoff items when mugging
+Remove Military Professions mod
+GUI Loading screen shows progress again
+Prevent sidebar crash when trying to divide by zero
+[Xedra Evolved] No werealfs
+Fixed crash on trying to unwield heavy items when trying to drive
+Fixes species of feral wizards and feral butchering
 Cabin in Safe Place scenario is now actually safe
 [MoM] NPCs can awaken in portal storms
 Start of cataclysm day and start of game day now respect season length
@@ -1078,6 +1187,51 @@ Faulty guns don't lock your view
 Don't apply additional move cost for moving barefoot in deep water
 Fixed a crash when using the 'set of clothes' item
 Fix non-battery charge consumption of active items
+Heating elements no longer drop from smashing the fume hood
+Cotton patch can be used to stop bleeding
+No salvage for ballistic plates
+Forbid drinking liquids underwater for characters with `Aqueous Repose` and `Embrace of the Waters` mutations, as it stated in mutations' descriptions
+New appliances have correct owner
+Minor gun fixes
+Fix flatlander not using special attack
+Battery charger appliances now work when outside the reality bubble
+Dropped lit cigarette won't start fires if there's no flammable terrain, furniture, or items on that tile
+Use correct symbols for vehicle front corners
+Invalid recharge type and instant book reading
+Fix scenario spawns
+Stop 20x melatonin spawns
+Debug log no longer one entry behind
+'Burst-fire wielded weapon' now actually sets wielded weapon to burst or auto firing modes
+[Xedra Evolved] Fix homullus trait regressions
+Fix shelter and burning building starts
+Camp food can be distributed from vehicle cargo zones
+Bleeding can be stopped with bandages without waiting an extra turn
+Don't apply parkour bonus when moving prone
+[MoM] Purifiable updates
+Calculate correct height when a uilist has desired_bounds not including a height
+Fix: weariness makes hauling faster instead of slower
+Make floors under furniture correct
+Unload zone properly clears auto whitelists
+Stop spawning too many monsters in a cave
+Removes a few handguns, rifles, and a shotgun that didn't meet inclusion criteria
+Fix raw butter calories, add salt to raw butter recipes, Add raw butter as option to recipes that use butter
+Flamethrowers count as firestarters for lighting up bombs
+Forbid starting fires (using firestarters) on water tiles
+[Xedra Evolved] Fix Eater's sixth sense trait
+Fragile and Sturdy flags cannot be inherited
+[Xedra Evolved] Lo Ra'ab
+Faction camp storage zone effective after editing
+Fix: weariness makes hauling faster instead of slower
+Construction blueprints don't require deconstruction tools or decoration materials
+Removes the pockets flag from the cropped hoodies
+[MoM] Fix """""missing""""" EoC id
+Deployed furniture won't be floating anymore if deployed on open air
+Fix minor typos in keybinding descriptions
+NPCs stealing player default name
+Fix zoo scenario spawn
+Fix regression of calculation of the height of a uilist that has a desired_bounds not including a height
+Lowers electronic skill requirement of clay car batteries from 3 to 2
+Cotton patch can be used to stop bleeding
 
 
 ## Performance:
@@ -1111,6 +1265,7 @@ Optimize typed coordinate conversion functions for widespread savings
 NPCs take less time to check for enemies.
 Improve point hash functions to eliminate map overhead in nps los checks and elsewhere
 Fix lag examining large stacks of crafted items
+Backport Don't unnecessarily copy items in a tight loop in get_uncraft_components
 Reduce unnecessary/duplicate checks for dangerous tiles
 Cache the absolute map square position of the first submap
 Cache mutation trait flags
@@ -1190,7 +1345,13 @@ Migrate ACT_PULP to the new activity actor system.
 Migrate ACT_WAIT_STAMINA to an activity_actor
 Migrate extended description (`x`->`e`) to imgui
 [DEBUG] Modify hordes through overmap editor
+Added palettes to use parameters more generally
+debug dialogue + talk_topic menus
 Mod Compatibility: Only load files within "mod_interactions" if requisite mod is loaded
+Refactoring armor order from Cody
+Allow construction pre_terrain to be a list of alternatives
+Refactoring Hub01 dialogues
+Remove furniture/terrain legacy alias code and JSON
 Adds bash_scaling fields to use with spells
 Replace some player responses with snippets
 Make mutation able to use mana as resourse without EoC
@@ -1225,6 +1386,9 @@ stl_emulation span::count_ is not const anymore
 No longer build object creator in CI nor include it in releases
 Add PDCurses to Windows
 Fixed Linux experimental build automation issues caused by SDL dependencies
+Fix CMake build after adding freetype
+Fixes broken Windows build due to missing ImGui Freetype-related files and map::get_field function deletion
+Fixed broken Android build due to missing FreeType library
 Allow the game to build on OSX
 
 
@@ -1234,6 +1398,8 @@ Make furniture->lockpick_message translatable
 Add check to ensure translator comments are correctly located and extracted
 Add more English names and their translations to Simplified Chinese and Japanese
 Expand the Russian name list with translated English names
+Do not extract pseudoitems/some UI labels/debug strings for translations
+Audit/NO_I18N effects.json
 Allow new KEYBDINGS window title to be translated
 Omit unnecessary lines from translations
 Dont extract monster guns and spells for translation

data/json/flags.json

@@ -662,7 +662,7 @@
   {
     "id": "PRESERVE_SPAWN_OMT",
     "type": "json_flag",
-    "//": "This item will store the OMT it spawned in in the 'spawn_location_omt' var"
+    "//": "This item will store the OMT it spawned in the 'spawn_location_omt' var"
   },
   {
     "id": "PROVIDES_TECHNIQUES",

data/json/itemgroups/Weapons_Mods_Ammo/ammo.json

@@ -566,7 +566,7 @@
   {
     "type": "item_group",
     "id": "ammo_launcher_grenade_adapter",
-    "//": "Adapters for for firing multiples of civilian legal ammo from a greneade launcher",
+    "//": "Adapters for firing multiples of civilian legal ammo from a greneade launcher",
     "subtype": "distribution",
     "entries": [ { "item": "40x46mm_hornets_nest_22lr", "prob": 50 }, { "item": "40x46mm_hornets_nest_410", "prob": 50 } ]
   },

data/json/items/armor/boots.json

@@ -423,6 +423,7 @@
     "weight": "907 g",
     "volume": "1 L",
     "price": "25 USD",
+    "price_postapoc": "6 USD 50 cent",
     "to_hit": { "grip": "none", "length": "hand", "surface": "any", "balance": "clumsy" },
     "material": [ "plastic", "steel" ],
     "symbol": "[",