Merge branch 'master' into magic_type

.github/workflows/clang-tidy.yml

@@ -36,7 +36,11 @@ jobs:
       matrix:
         # To make the run finish in the run time limit, we split it up into two
         # parts: the src directory and everything else
-        subset: [ 'src', 'other' ]
+        subset: [
+            'directly-changed',
+            'indirectly-changed-src',
+            'indirectly-changed-other'
+        ]
 
     runs-on: ubuntu-22.04
     env:
@@ -90,7 +94,7 @@ jobs:
           for (const path of files) {
             console.log(path);
           }
-          fs.writeFileSync("files_changed", files.join('\n'));
+          fs.writeFileSync("files_changed", files.join('\n') + '\n');
     - uses: ammaraskar/gcc-problem-matcher@master
     - name: run clang-tidy
       if: ${{ needs.skip-duplicates.outputs.should_skip != 'true' && github.event_name != 'pull_request' || github.event.pull_request.draft == false }}

build-scripts/clang-tidy-wrapper.sh

@@ -7,7 +7,9 @@ plugin=build/tools/clang-tidy-plugin/libCataAnalyzerPlugin.so
 
 if [ -f "$plugin" ]
 then
+    set -x
     LD_PRELOAD=$plugin "$CATA_CLANG_TIDY" --enable-check-profile --store-check-profile=clang-tidy-trace "$@"
 else
+    set -x
     "$CATA_CLANG_TIDY" "$@"
 fi

build-scripts/clang-tidy.sh

@@ -42,6 +42,7 @@ cmake \
 
 if [ "$CATA_CLANG_TIDY" = "plugin" ]
 then
+    echo "Compiling clang-tidy plugin"
     make -j$num_jobs CataAnalyzerPlugin
     export PATH=$PWD/tools/clang-tidy-plugin/clang-tidy-plugin-support/bin:$PATH
     if ! which FileCheck
@@ -90,6 +91,7 @@ then
     tidyable_cpp_files=$all_cpp_files
 else
     make \
+        --silent \
         -j $num_jobs \
         ${COMPILER:+COMPILER=$COMPILER} \
         TILES=${TILES:-0} \
@@ -122,11 +124,14 @@ printf "Subset to analyze: '%s'\n" "$CATA_CLANG_TIDY_SUBSET"
 # formats are matched. Exit code 1 from grep (meaning no match) is ignored in
 # case one subset contains no file to analyze.
 case "$CATA_CLANG_TIDY_SUBSET" in
-    ( src )
-        tidyable_cpp_files=$(printf '%s\n' "$tidyable_cpp_files" | grep -E '(^|/)src/' || [[ $? == 1 ]])
+    ( directly-changed )
+        tidyable_cpp_files=$(printf '%s\n' "$tidyable_cpp_files" | grep -f ./files_changed || [[ $? == 1 ]])
         ;;
-    ( other )
-        tidyable_cpp_files=$(printf '%s\n' "$tidyable_cpp_files" | grep -Ev '(^|/)src/' || [[ $? == 1 ]])
+    ( indirectly-changed-src )
+        tidyable_cpp_files=$(printf '%s\n' "$tidyable_cpp_files" | grep -E '(^|/)src/' | grep -vf ./files_changed || [[ $? == 1 ]])
+        ;;
+    ( indirectly-changed-other )
+        tidyable_cpp_files=$(printf '%s\n' "$tidyable_cpp_files" | grep -Ev '(^|/)src/' | grep -vf ./files_changed || [[ $? == 1 ]])
         ;;
 esac
 

data/changelog.txt

@@ -417,6 +417,8 @@ Some houses are under construction
 Adds car crashes into existing buildings. Initial implementation includes three houses that can spawn with this variant.
 fungalize stages for rest of zombies
 Basic beach decorations
+Add Hazelnut Milk, Walnut Milk, and add them to various recipes a la crepes.
+Add the menorah and small candles to put in it
 
 
 ## Interface:
@@ -552,6 +554,7 @@ Add sorting by price to weight ratio
 Filter items by can_contain `L:`, `V:`, `M:` (longest_side, volume, mass); affects AIM, inventory…
 Migrate compare item menu to imgui
 Various misc improvements to camp crafting flow and feedback
+Add history to Construction Search
 
 
 ## Mods:
@@ -914,6 +917,8 @@ Aftershock: Shield bionics deploy Riemman shields
 [Xedra Evolved] Add time magic class / scenario
 [Magiclysm] Spells cost 1/5 of their normal cost on spell failure
 [Magiclysm] The Great Damage Randomization and Normalization
+[MoM] Sitting at high Nether Attunement costs additional calories/additional weariness when maintaining powers 
+[Magiclysm] Goblins and wargs are best friends
 
 
 ## Balance:
@@ -1418,6 +1423,10 @@ Fixes displaying of stats for ablative armor
 Fixes SegFault w/ flashlights & attached power
 Peeking out of elevated windows no longer causes you to fall
 Heat radiance now can spread through gas-permeable tiles like chain link fence
+Correct recipe for water purifying to use correct quantity of water
+Items in transparent pockets on the map illuminate surroundings
+Mark some specific furnitures/terrains examine as always allowed in faction territory
+NPC should not wield integrated armor
 
 
 ## Performance:
@@ -1577,6 +1586,7 @@ Improve test coverage of mod combinations with mod_interactions
 Tests now run in a guaranteed order (lexicographic) by default (can be overriden with cli argument)
 Streamline Vertical Movement While Levitating and Flying
 Make enchantment mutations work again
+migrate map-size related constants to new file, unmagic related constants
 
 ## Build:
 Support Mac arm64 build
@@ -1607,6 +1617,7 @@ Fix mac builds post freetype dependency addition
 Add imgui_stdlib to CMake
 Fixes potential artifact poisoning route in CI
 Update vcpkg commit to new mainline, remove portfile override
+Improve ccache performance with age based eviction instead of coarse size limits.
 
 
 ## I18N and A11Y:

data/json/ammo_effects.json

@@ -56,7 +56,7 @@
   {
     "id": "BOUNCE",
     "type": "ammo_effect",
-    "//": "Inflicts target with `bounced` effect and rebounds to a nearby target without this effect. Hardcoded"
+    "//": "Projectile with this effect will rebound to a nearby target after hitting the oringinal target. Will not choose targets already hit by this projectile. Hardcoded"
   },
   {
     "id": "BURST",

data/json/construction/appliances.json

@@ -23,19 +23,6 @@
     "post_special": "done_appliance",
     "activity_level": "MODERATE_EXERCISE"
   },
-  {
-    "type": "construction",
-    "id": "app_active_backup_generator",
-    "group": "place_active_backup_generator",
-    "category": "APPLIANCE",
-    "required_skills": [ [ "mechanics", 1 ] ],
-    "time": "5 m",
-    "qualities": [ [ { "id": "WRENCH", "level": 1 } ] ],
-    "components": [ [ [ "active_backup_generator", 1 ] ] ],
-    "pre_special": "check_empty",
-    "post_special": "done_appliance",
-    "activity_level": "LIGHT_EXERCISE"
-  },
   {
     "type": "construction",
     "id": "app_air_compressor",

data/json/construction_group.json

@@ -1845,11 +1845,6 @@
     "id": "place_asrg_containment",
     "name": "Place ASRG"
   },
-  {
-    "type": "construction_group",
-    "id": "place_active_backup_generator",
-    "name": "Place backup generator"
-  },
   {
     "type": "construction_group",
     "id": "build_rope_hoist",

data/json/effects.json

@@ -300,12 +300,6 @@
     "name": [ { "str": "Turret Is Targeted", "//~": "NO_I18N" } ],
     "desc": [ { "str": "AI tag used for turret targeting sounds.  This is a bug if you have it.", "//~": "NO_I18N" } ]
   },
-  {
-    "type": "effect_type",
-    "id": "bounced",
-    "name": [ { "str": "Bounced", "//~": "NO_I18N" } ],
-    "desc": [ { "str": "AI tag used for bouncing ammo targeting.  This is a bug if you have it.", "//~": "NO_I18N" } ]
-  },
   {
     "type": "effect_type",
     "id": "npc_value_interaction_timer_short",
@@ -985,6 +979,28 @@
       "hurt_min": [ 1 ],
       "hurt_chance": [ 450, 2700 ]
     },
+    "max_intensity": 10,
+    "limb_score_mods": [
+      { "limb_score": "manip", "modifier": 0.85, "resist_modifier": 0.92, "scaling": -0.05, "resist_scaling": -0.016 },
+      { "limb_score": "lift", "modifier": 0.85, "resist_modifier": 0.92, "scaling": -0.05, "resist_scaling": -0.016 },
+      { "limb_score": "grip", "modifier": 0.85, "resist_modifier": 0.92, "scaling": -0.05, "resist_scaling": -0.016 },
+      { "limb_score": "block", "modifier": 0.85, "resist_modifier": 0.92, "scaling": -0.05, "resist_scaling": -0.016 },
+      {
+        "limb_score": "reaction",
+        "modifier": 0.85,
+        "resist_modifier": 0.92,
+        "scaling": -0.05,
+        "resist_scaling": -0.016
+      },
+      {
+        "limb_score": "balance",
+        "modifier": 0.85,
+        "resist_modifier": 0.92,
+        "scaling": -0.05,
+        "resist_scaling": -0.016
+      }
+    ],
+    "flags": [ "EFFECT_LIMB_SCORE_MOD" ],
     "show_in_info": true,
     "blood_analysis_description": "Poison"
   },
@@ -4310,7 +4326,7 @@
   {
     "type": "effect_type",
     "id": "sad",
-    "name": [ "Unhappy", "Unhappy", "Unhappy", "Unhappy", "Unhappy", "Sad", "Sad", "Sad", "Sad", "Sad", "Depressed" ],
+    "name": [ "Unhappy", "Unhappy", "Unhappy", "Unhappy", "Unhappy", "Sad", "Sad", "Sad", "Sad", "Sad", "Depressed", "Depressed" ],
     "desc": [
       "You are not content with your life.",
       "You are not content with your life.",
@@ -4322,12 +4338,13 @@
       "This is not what you planned for your life.",
       "This is not what you planned for your life.",
       "This is not what you planned for your life.",
+      "You wonder what's the point of fighting?",
       "When will all your suffering end?"
     ],
     "max_intensity": 1000,
     "int_dur_factor": "10 s",
     "scaling_mods": { "speed_mod": [ -0.42 ], "str_mod": [ -0.06 ], "dex_mod": [ -0.05 ], "int_mod": [ -0.084 ], "per_mod": [ -0.1 ] },
-    "miss_messages": [ [ "What's the point of fighting?", 1 ] ]
+    "miss_messages": [ [ "You dejectedly consider the pointlessness of it all.", 1 ] ]
   },
   {
     "type": "effect_type",

data/json/enchantments.json

@@ -301,7 +301,7 @@
     "condition": {
       "and": [
         { "u_has_flag": "QUADRUPED_CROUCH" },
-        { "u_has_any_trait": [ "THRESH_RABBIT", "THRESH_BEAST", "THRESH_LUPINE", "THRESH_FELINE", "THRESH_CHIMERA" ] },
+        { "u_has_any_trait": [ "THRESH_RABBIT", "THRESH_BEAST", "THRESH_LUPINE", "THRESH_FELINE" ] },
         { "u_has_flag": "QUADRUPED_RUN" },
         { "or": [ { "u_has_move_mode": "crouch" }, { "u_has_move_mode": "run" } ] },
         { "not": "u_can_drop_weapon" }
@@ -317,7 +317,7 @@
     "condition": {
       "and": [
         { "u_has_flag": "QUADRUPED_CROUCH" },
-        { "u_has_any_trait": [ "THRESH_RABBIT", "THRESH_BEAST", "THRESH_LUPINE", "THRESH_FELINE", "THRESH_CHIMERA" ] },
+        { "u_has_any_trait": [ "THRESH_RABBIT", "THRESH_BEAST", "THRESH_LUPINE", "THRESH_FELINE" ] },
         { "not": { "u_has_flag": "QUADRUPED_RUN" } },
         { "u_has_move_mode": "crouch" },
         { "not": "u_can_drop_weapon" }