Merge branch 'CleverRaven:master' into master

.github/comment-commands.yml

@@ -6,8 +6,11 @@ trigger: specific
 # TODO implement more commands, add more users
 users:
   active:
+    # maintainer
     - casswedson
+    # curator
     - Maleclypse
+    # voluntiers
     - Termineitor244
     - Faalagorn
     - Ilysen
@@ -54,7 +57,10 @@ keywords:
     value: '\/(I|i)nvalid.*'
 
   - name: good-first-issue
+    # example: /good-first-issue
     value: '\/(G|g)ood[\s-]*(F|f)irst[\s-]*(I|i)ssue.*'
 
   - name: help-wanted
+    # - only works in PRs
+    # example: /help-wanted
     value: '\/(H|h)elp[\s-]*(W|w)anted.*'

.github/pull_request_template.md

@@ -20,7 +20,10 @@ https://github.com/CleverRaven/Cataclysm-DDA/blob/master/data/changelog.txt -->
 
 #### Purpose of change
 
-<!-- With a few sentences, describe your reasons for making this change.  If it relates to an existing issue, you can link it with a # followed by the GitHub issue number, like #1234.  If your pull request *fully* resolves an issue, include the word "Fix" or "Fixes" before the issue number, like: Fixes #xxxx
+<!-- With a few sentences, describe your reasons for making this change.
+If it relates to an existing issue, you can link it with a # followed by the GitHub issue number, like #1234.
+When you submit a pull request that completely resolves an issue, use [Github's closing keywords](https://docs.github.com/en/get-started/writing-on-github/working-with-advanced-formatting/using-keywords-in-issues-and-pull-requests#linking-a-pull-request-to-an-issue)
+to automatically close the issue once your pull request is merged.
 If there is no related issue, explain here what issue, feature, or other concern you are addressing.  If this is a bugfix, include steps to reproduce the original bug, so your fix can be verified. -->
 
 #### Describe the solution

.github/summary-labels.yml

@@ -3,40 +3,40 @@ version: v1
 labels:
   - label: "<Enhancement / Feature>"
     matcher:
-      body: "(\\s|^)#### Summary\\s*Features +\".+\"\\s*(\n|$)"
+      body: ".*Features +\".+\".*"
 
   - label: "Info / User Interface"
     matcher:
-      body: "(\\s|^)#### Summary\\s*Interface +\".+\"\\s*(\n|$)"
+      body: ".*Interface +\".+\".*"
 
   - label: "Mods"
     matcher:
-      body: "(\\s|^)#### Summary\\s*Mods +\".+\"\\s*(\n|$)"
+      body: ".*Mods +\".+\".*"
 
   - label: "Game: Balance"
     matcher:
-      body: "(\\s|^)#### Summary\\s*Balance +\".+\"\\s*(\n|$)"
+      body: ".*Balance +\".+\".*"
 
   - label: "<Bugfix>"
     matcher:
-      body: "(\\s|^)#### Summary\\s*Bugfixes +\".+\"\\s*(\n|$)"
+      body: ".*Bugfixes +\".+\".*"
 
   - label: "<Bugfix>"
     matcher:
-      body: ".*((C|c)lose(s|d)?|(F|f)ix(es|ed)?|(R|r)esolve(s|d)?):? #([1-9][0-9]{3,6})(\\s*|$)"
+      body: ".*((C|c)lose(s|d)?|(F|f)ix(es|ed)?|(R|r)esolve(s|d)?):?.*#([1-9][0-9]{3,8}).*"
 
   - label: "Code: Performance"
     matcher:
-      body: "(\\s|^)#### Summary\\s*Performance +\".+\"\\s*(\n|$)"
+      body: ".*Performance +\".+\".*"
 
   - label: "Code: Infrastructure / Style / Static Analysis"
     matcher:
-      body: "(\\s|^)#### Summary\\s*Infrastructure +\".+\"\\s*(\n|$)"
+      body: ".*Infrastructure +\".+\".*"
 
   - label: "Code: Build"
     matcher:
-      body: "(\\s|^)#### Summary\\s*Build +\".+\"\\s*(\n|$)"
+      body: ".*Build +\".+\".*"
 
   - label: "Translation"
     matcher:
-      body: "(\\s|^)#### Summary\\s*I18N +\".+\"\\s*(\n|$)"
+      body: ".*I18N +\".+\".*"

.github/workflows/pull-translations.yml

@@ -39,6 +39,8 @@ jobs:
         env:
           TX_TOKEN: ${{ secrets.TX_TOKEN }}
         run: tx pull --force
+      - name: "Discard invalid translations"
+        run: ./lang/discard_invalid_po.sh
       - name: "Update stats"
         run: ./lang/update_stats.sh
       - name: Create Pull Request

build-data/osx/dmgsettings.py

@@ -37,7 +37,7 @@ def icon_from_app(app_path):
 format = defines.get('format', 'UDBZ')
 
 # Volume size (must be large enough for your files)
-size = defines.get('size', '300M')
+size = defines.get('size', '400M')
 
 # Files to include
 files = [application]

data/changelog.txt

@@ -58,10 +58,19 @@ Allow NPC doctors to install and remove CBMs from player allies
 Look up and down with 3d vision off
 Add ignored_monster_species spell parameter
 Monsters affiliated with factions will watch for theft of faction items
+Allow gunmods to make changes related to gun overheat.
+Items that can heat up food (microwaves, coffeemakers, chemistry sets, etc) can be used or reloaded from an adjacent space without picking them up.
+[EoC] Condition for asking the player to select a tile
+Allow martial arts techniques to trigger on reach attacks.
 Adds a confirmation prompt if you are the target, or in the AoE of, your own damaging spell.
 Ledges provide sight coverage
 Add foreach function to EoC
 Add Map related EoC functions
+Allow messages to parse nested tags
+Allow using snippets in item descriptions
+Infectious diseases (cold/flu) have an invisible incubation period, and start with milder symptoms
+Weapon Proficiency
+Fixes NPCs being too afraid, makes swarm danger assessment more robust
 
 
 ## Content:
@@ -108,8 +117,13 @@ Add some backstory to Eddie McKenzie.
 Add some prosthetics.
 Added Bulk Storage Mounds and Piles for More Resources
 Add undomesticated wild rabbits
+Adds some MA techniques, improves disarming and transform certain techniques from stuns to downing techs
+adds dried garlic/chili
+Adds more ways to learn bronze crafting
 Updates the Portal Dependent mechanics and introduces rewards for exploring the portal dungeons.
 Cyberhorse... CYBERHORSE!
+Make nuts and bolts craftable using thread cutting tool
+New map extra: civilians making a futile last stand against the horde
 
 
 ## Interface:
@@ -144,12 +158,18 @@ Enable history for AIM and inventory filters
 Make zone manager display more of zone name
 Show estimated time when washing items
 Selecting container mode for unloaded items
+Open proficiency UI with relevant first selection
+Adjust hungry and overweight coloring in sidebar
+Categorize more containers by their contents
 Explain why wielding an item from pick-up menu fails
 Switch crafter in crafting menu to and from an ally
 Add favorite category to spell casting menu
 Allow scanning several books into ereader at once
 Add milling info to milleable items
 Add spell class selecter to spell casting menu
+'Learning is disabled' message on disabled skills
+Update gun mod removal UI to use inventory menu instead of a prompt; prevent removal of gun mods with other mods installed on it
+Show the mass of vitamins in food items
 
 
 ## Mods:
@@ -198,12 +218,18 @@ JSON-ize faction camp hunting returns
 [Magiclysm] Add dispel magic spells
 Create the Isolation Protocol Mod: A traditional roguelike experience
 [Magiclysm] Add triffid and migo mages
+Clairsentients can have premonitions about Defense Mode events.
+Aftershock: New Sci-fi military Gear
+Make some non-combat MoM utility powers toggleable
+Aftershock: Add a shotgun mod that turns shotguns into coilguns 
+Aftershock: Add a new outpost location that can spawn modded tools
 Add Sense Minds Telepathic power
 Add scaling to Metaphysics XP gain from powers, add penalty for power failure
 Add the HAS_MIND flag to appropriate monsters in in-repo mods
 XE: Add gossamer material and clothing
 XE:  transformation potions to top level alchemy perk
 MoM: Add PSI_NULL species to interact with "ignored_monster_species" JSON parameter
+[MoM] Add a new power class Photokinesis
 
 
 ## Balance:
@@ -240,11 +266,16 @@ Add NO_SPELLCASTING flag to Stunned effect
 Improve pets' ability to use stairs
 Make ferals actually feel like human enemies instead of weaker zombies with range attacks
 Allow metal wreckage to be used for cutting
+Slimy mutation helps you escape grabs
+Caffeinated gum is now only slightly stronger than a cup of tea.
 Improved path for intelligent monsters
 Make safe place starts safer
 Touch up pawn shops with better loot
 Prevent staunching bleeding while driving
 Threatening to kill NPCs(recruitment) is more likely to make them hostile
+Backup generator is much more powerful
+Bulk unloading and dropping items saves time cost
+Fragile Clothing will degrade if its dealt damage larger than 15% its armor value.
 
 
 ## Bugfixes:
@@ -323,7 +354,11 @@ Fix Free Merchants Broker price calculation of non charge based item
 Skip auto sorting items that don't belong to you
 Use correct actor in bulk trade messages
 Your nemesis will still hunt you even if you spawn on a roof at the start
+Picky eaters won't drink unsavory drinks
+Corrects duplicates /the/ in martial arts techs messages
 Gas masks only use charges on fields with gas_absorption_factor set
+More background stories: actually access them
+All weapon proficiencies can be learned by hitting
 
 
 ## Performance:
@@ -336,6 +371,7 @@ Optimize pocket overflow function
 Speed up new character screen, particularly when many recipes are known
 Stop clearing weight carried cache unnecessarily
 Precalculate visitable zones to optimize inter-monster aggression checks
+Reduced wait times in high traffic areas by ~15-20%
 
 
 ## Infrastructure:
@@ -362,6 +398,10 @@ EVENT EOCs provide beta talker
 [EOC]Inventory selector
 Replaced the use of the arbitrary body temperature scale in game logic with units::temperature/units::temperature_delta
 [EoC] Simple if-else statement
+Allow specifying vitamins by weight (mass) in items
+Add more comment-commands which apply labels to issues and PRs
+Migrate arithmetics function with arguments to math
+Provide more options to name monsters placed via mapgen
 
 
 ## Build:

data/json/construction.json

@@ -5031,6 +5031,18 @@
     "post_special": "done_appliance",
     "activity_level": "BRISK_EXERCISE"
   },
+  {
+    "type": "construction",
+    "id": "app_glass_fridge",
+    "group": "place_glass_fridge",
+    "category": "APPLIANCE",
+    "required_skills": [ [ "fabrication", 0 ] ],
+    "time": "5 m",
+    "components": [ [ [ "glass_fridge", 1 ] ] ],
+    "pre_special": "check_empty",
+    "post_special": "done_appliance",
+    "activity_level": "BRISK_EXERCISE"
+  },
   {
     "type": "construction",
     "id": "app_stereo",

data/json/construction_group.json

@@ -1204,6 +1204,11 @@
     "id": "place_fridge",
     "name": "Place Fridge"
   },
+  {
+    "type": "construction_group",
+    "id": "place_glass_fridge",
+    "name": "Place Glass Door Fridge"
+  },
   {
     "type": "construction_group",
     "id": "place_stereo",

data/json/effects.json

@@ -3928,7 +3928,7 @@
     "miss_messages": [
       [ "Did the world just oppose you?", 1 ],
       [ "For a moment you felt a great hostility all around you.", 1 ],
-      [ "Did your enemy just vanish for a moment?.", 2 ],
+      [ "Did your enemy just vanish for a moment?", 2 ],
       [ "You felt weird for a moment.", 3 ],
       [ "Was that a spark?", 5 ],
       [ "Your grip suddenly failed you.", 6 ],