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

.github/labeler.yml

@@ -62,8 +62,8 @@
 "EOC: Effects On Condition":
   - "**/**effect_on_condition**"
   - "**/effect_on_condition**"
-  - "**/**eocs**"
-  - "**/eocs**"
+  - "**/**eoc**"
+  - "**/eoc**"
   - "**/condition**"
 
 "Fields / Furniture / Terrain / Traps":
@@ -135,13 +135,13 @@
   - "**/appliance**"
 
 "Monsters":
-  - "**/**monsters**"
-  - "**/monsters**"
+  - "**/**monster**"
+  - "**/monster**"
 
 "Mutations / Traits / Professions/ Hobbies":
   - "**/**profession**"
   - "**/profession**"
-  - "**/**mutations**"
+  - "**/**mutation**"
   - "**/mutation**"
   - "**/hobbies**"
 

.github/reviewers.yml

@@ -55,3 +55,5 @@ files:
     - Qrox
   'data/raw/keybindings{.json,/**}':
     - Qrox
+  'src/math_parser*':
+    - andrei8l

.github/workflows/linter.yml

@@ -2,12 +2,14 @@ name: Code Style Reviewer
 
 on:
   pull_request_target:
+    types: ['opened', 'reopened', 'synchronize', 'ready_for_review']
     paths:
       - '**.json'
       - '**.cpp'
       - '**.h'
       - '**.c'
   pull_request:
+    types: ['opened', 'reopened', 'synchronize', 'ready_for_review']
     paths:
       - '**.json'
       - '**.cpp'
@@ -20,7 +22,7 @@ concurrency:
 
 jobs:
   style-code:
-    if: ${{ github.event_name == 'pull_request_target' }}
+    if: ${{ github.event_name == 'pull_request_target' && github.event.pull_request.draft == false }}
 
     runs-on: ubuntu-latest
 

.github/workflows/msvc-full-features.yml

@@ -76,7 +76,7 @@ jobs:
       id: runvcpkg
       with:
         vcpkgDirectory: '${{ runner.workspace }}/b/vcpkg'
-        vcpkgGitCommitId: '5b1214315250939257ef5d62ecdcbca18cf4fb1c'
+        vcpkgGitCommitId: '66444e13a86da7087ee24c342f91801cc6eb9877'
 
     - name: Integrate vcpkg
       run: |

.github/workflows/release.yml

@@ -180,7 +180,7 @@ jobs:
         id: runvcpkg
         with:
           vcpkgDirectory: '${{ runner.workspace }}/b/vcpkg'
-          vcpkgGitCommitId: '5b1214315250939257ef5d62ecdcbca18cf4fb1c'
+          vcpkgGitCommitId: '66444e13a86da7087ee24c342f91801cc6eb9877'
       - name: Install dependencies (windows msvc) (3/3)
         if: runner.os == 'Windows'
         run: |

CMakeLists.txt

@@ -222,7 +222,10 @@ if (NOT MSVC)
              -Wpedantic \
              -Wsuggest-override \
              -Wunused-macros \
-             -Wzero-as-null-pointer-constant")
+             -Wzero-as-null-pointer-constant \
+             -Wno-unknown-warning-option \
+             -Wno-dangling-reference \
+             -Wno-c++20-compat")
     if("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
         set(CATA_WARNINGS "${CATA_WARNINGS} -Wno-unknown-warning-option")
     else()

data/changelog.txt

@@ -71,6 +71,9 @@ 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
+Add option to switch between outfit (when available) at chargen
+Animals have stomachs, digest food, and benefit from eating
+Enable NPCs to reload magazines in their inventory
 
 
 ## Content:
@@ -124,6 +127,11 @@ Updates the Portal Dependent mechanics and introduces rewards for exploring the
 Cyberhorse... CYBERHORSE!
 Make nuts and bolts craftable using thread cutting tool
 New map extra: civilians making a futile last stand against the horde
+Adds primitive cup(s)
+Add residential rolling trash cans.
+Adds Long awaited Exodii Sidearms
+Allow diving into water to remove Mycus spores.
+New Scenario: Last Stand
 
 
 ## Interface:
@@ -170,6 +178,7 @@ 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
+Melee weapons tell you your skill is too low to see melee values instead of just hiding them
 
 
 ## Mods:
@@ -230,6 +239,13 @@ 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
+[MoM] Add calorie cost for psionics
+[MoM] Prevent psionic creatures from using powers if nullified
+Make Aftershock and Aftershock: Exoplanet compatible with Defense Mode.
+Allow escape pods to carry loot planetside.
+[MoM] Add mi-go psions
+[Innawoods] Added meadow mutable
+[MoM] Drain overhaul  + Power Maintenance overhaul
 
 
 ## Balance:
@@ -359,6 +375,13 @@ 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
+Fix items applying effects multiple times when transformed
+The effect "corroding" should only be added when causing damage
+Climate control was 3.7x stronger than it should be.
+Allow sandwiches to be made using toast
+Reduce NPC faction camp task slowdown & fix save data bloat bug
+Fixed some items to cause multiple addictions
+Allow NPCs to teleport without the player
 
 
 ## Performance:
@@ -372,6 +395,7 @@ 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%
+Reduce time of selecting large amount of items in inventory menu
 
 
 ## Infrastructure:

data/json/ammo_effects.json

@@ -326,6 +326,11 @@
     "type": "ammo_effect",
     "explosion": { "power": 60 }
   },
+  {
+    "id": "EXPLOSIVE_EXODII_THERMOBARIC",
+    "type": "ammo_effect",
+    "explosion": { "power": 66 }
+  },
   {
     "id": "EXPLOSIVE_HESHOT",
     "type": "ammo_effect",

data/json/ascii_art/ammo/762.json

@@ -1,7 +1,7 @@
 [
   {
     "type": "ascii_art",
-    "id": "762_m43",
+    "id": "762_jhp",
     "picture": [
       "<color_red>;",
       "<color_green>‼"

data/json/effects.json

@@ -538,7 +538,7 @@
     "rating": "bad",
     "show_in_info": true,
     "limb_score_mods": [ { "limb_score": "balance", "modifier": 0.2 }, { "limb_score": "reaction", "modifier": 0.0 } ],
-    "flags": [ "DISABLE_FLIGHT", "EFFECT_LIMB_SCORE_MOD", "NO_SPELLCASTING" ]
+    "flags": [ "DISABLE_FLIGHT", "EFFECT_LIMB_SCORE_MOD", "NO_SPELLCASTING", "NO_PSIONICS" ]
   },
   {
     "type": "effect_type",
@@ -3195,7 +3195,8 @@
     "desc": [ "You aren't sure what's wrong with you but you don't feel well." ],
     "rating": "bad",
     "base_mods": { "pain_chance": [ 512 ], "pain_min": [ 2 ], "pain_max": [ 8 ], "h_mod_chance": [ 512 ], "h_mod_min": [ -10 ] },
-    "blood_analysis_description": "Intracranial Parasites"
+    "blood_analysis_description": "Intracranial Parasites",
+    "flags": [ "NO_PSIONICS" ]
   },
   {
     "type": "effect_type",
@@ -3416,7 +3417,7 @@
       { "limb_score": "balance", "modifier": 0.75, "scaling": -0.05 },
       { "limb_score": "swim", "modifier": 0.8, "scaling": -0.2 }
     ],
-    "flags": [ "EFFECT_LIMB_SCORE_MOD" ]
+    "flags": [ "EFFECT_LIMB_SCORE_MOD", "NO_PSIONICS" ]
   },
   {
     "type": "effect_type",
@@ -3893,7 +3894,8 @@
     "int_dur_factor": "50 m",
     "base_mods": { "int_mod": [ -1 ] },
     "scaling_mods": { "int_mod": [ -2 ] },
-    "miss_messages": [ [ "You suddenly think you shouldn't do that!", 1 ] ]
+    "miss_messages": [ [ "You suddenly think you shouldn't do that!", 1 ] ],
+    "flags": [ "NO_PSIONICS" ]
   },
   {
     "type": "effect_type",
@@ -4100,15 +4102,17 @@
     "name": [ "Extremely Weary" ],
     "desc": [
       "You've been extremely active for a while; it's time to stop.\nThe following move penalties are applied for the following activity levels:\nExtreme: 10x, Active: 8x, Brisk: 6x, Moderate: 4x, Light: 2x"
-    ]
+    ],
+    "flags": [ "NO_PSIONICS" ]
   },
   {
     "type": "effect_type",
     "id": "weary_8",
     "name": [ "Extremely Weary" ],
     "desc": [
       "You've been extremely active for a while, and can no longer keep pushing.\nThe following move penalties are applied for the following activity levels:\nExtreme: 10x, Active: 8x, Brisk: 6x, Moderate: 4x, Light: 2x"
-    ]
+    ],
+    "flags": [ "NO_PSIONICS" ]
   },
   {
     "type": "effect_type",

data/json/effects_on_condition/dream_eocs.json

@@ -0,0 +1,56 @@
+[
+  {
+    "type": "effect_on_condition",
+    "id": "EOC_RESET_DREAM_COUNTER",
+    "//": "used to prevent multiple dreams at the same sleep",
+    "effect": [ { "math": [ "dream_counter", "=", "0" ] } ]
+  },
+  {
+    "type": "effect_on_condition",
+    "id": "EOC_GIVE_NIGHTMARES",
+    "eoc_type": "EVENT",
+    "required_event": "character_wakes_up",
+    "condition": { "and": [ { "u_has_effect": "nightmares" }, { "math": [ "dream_counter", "==", "0" ] } ] },
+    "effect": [
+      { "u_message": "nightmares", "snippet": true, "type": "bad" },
+      { "u_add_morale": "morale_nightmare", "bonus": [ -15, -30 ], "max_bonus": -30 },
+      { "math": [ "dream_counter", "=", "1" ] },
+      { "queue_eocs": "EOC_RESET_DREAM_COUNTER", "time_in_future": 1 }
+    ]
+  },
+  {
+    "type": "effect_on_condition",
+    "id": "EOC_GIVE_HEALTH_MESSAGE",
+    "eoc_type": "EVENT",
+    "required_event": "character_wakes_up",
+    "condition": {
+      "and": [
+        {
+          "or": [
+            { "not": { "u_has_effect": "pre_common_cold" } },
+            { "not": { "u_has_effect": "common_cold" } },
+            { "not": { "u_has_effect": "pre_flu" } },
+            { "not": { "u_has_effect": "flu" } }
+          ]
+        },
+        { "math": [ "dream_counter", "==", "0" ] }
+      ]
+    },
+    "effect": [
+      {
+        "switch": { "u_val": "health" },
+        "cases": [
+          { "case": -100, "effect": { "u_message": "health_horrible", "snippet": true, "type": "bad" } },
+          { "case": -50, "effect": { "u_message": "health_very_bad", "snippet": true, "type": "bad" } },
+          { "case": -10, "effect": { "u_message": "health_bad", "snippet": true, "type": "bad" } },
+          { "case": 10, "effect": { "u_message": "" } },
+          { "case": 50, "effect": { "u_message": "health_good", "snippet": true, "type": "good" } },
+          { "case": 100, "effect": { "u_message": "health_very_good", "snippet": true, "type": "good" } },
+          { "case": 200, "effect": { "u_message": "health_great", "snippet": true, "type": "good" } }
+        ]
+      },
+      { "math": [ "dream_counter", "=", "1" ] },
+      { "queue_eocs": "EOC_RESET_DREAM_COUNTER", "time_in_future": 1 }
+    ]
+  }
+]