Merge branch 'master' into changelog-weekly-2025-01-06

CleverRaven · Jan 9, 2025 · 5724418 · 5724418
2 parents d10cac8 + b940e14
commit 5724418
Show file tree

Hide file tree

Showing 491 changed files with 64,191 additions and 61,951 deletions.
diff --git a/.github/workflows/clang-tidy.yml b/.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 }}

diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
@@ -28,7 +28,7 @@ jobs:
           operations-per-run: 110
           exempt-issue-labels: 'Accessibility,<Bug>,<Bugfix>,<Crash / Freeze>,Organization: Bounty,Good First Issue,Help Wanted,(P1 - Critical),(P2 - High),(P3 - Medium),(P4 - Low),(P5 - Long-term),(S2 - Confirmed),0.G String Freeze,0.G Feature Freeze,0.G Content Freeze'
           exempt-pr-labels: '<Bug>,<Bugfix>,<Crash / Freeze>,Organization: Bounty,Good First Issue,(P1 - Critical),(P2 - High),(P3 - Medium),(P4 - Low),(P5 - Long-term),(S2 - Confirmed),0.G String Freeze,0.G Feature Freeze,0.G Content Freeze'
-          any-of-labels: ${{ contains(fromJson('["01", "02", "03", "04", "05", "06"]'), env.time) && "" || "<Suggestion / Discussion>" }}
+          any-of-labels: ${{ contains(fromJson('["01", "02", "03", "04", "05", "06"]'), env.time) && '' || '<Suggestion / Discussion>' }}
           exempt-all-milestones: true
           exempt-all-assignees: true
       - name: Print outputs

diff --git a/build-scripts/clang-tidy-wrapper.sh b/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
diff --git a/build-scripts/clang-tidy.sh b/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
 

diff --git a/data/changelog.txt b/data/changelog.txt
@@ -421,6 +421,8 @@ Basic beach decorations
 Changed lore primer to accommodate eyebot removal.
 Add an new plasma gun for sale by the Exodii
 Added a small kindergarten
+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:
@@ -564,6 +566,7 @@ Make font-hinting user-configurable
 Set minimum sizes for missions menu UI
 Fix compact aim window
 Fix NPC rules window scaling for small terminal sizes
+Add history to Construction Search
 
 
 ## Mods:
@@ -943,6 +946,8 @@ Aftershock: Add Zenit security drones, a miniboss for industrial ruins.
 [innawood] Add Makeshift hand-crank charger and magnetite ore.
 [Magiclysm] Demon spider rework
 [MoM] Melded Teleporter Force
+[MoM] Sitting at high Nether Attunement costs additional calories/additional weariness when maintaining powers 
+[Magiclysm] Goblins and wargs are best friends
 
 
 ## Balance:
@@ -1460,6 +1465,10 @@ Fix vehicle not moving when being remotely controlled
 Fix crash when zone-harvesting crops with bad data
 kickboxing and boxing technique conditions
 Innawoods - Fixes trails spawning manmade stuff
+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:
@@ -1622,6 +1631,7 @@ Streamline Vertical Movement While Levitating and Flying
 Make enchantment mutations work again
 Added Imgui demo screen (and style editor) to the debug menu
 clang-tidy output is a bit more readable on windows
+migrate map-size related constants to new file, unmagic related constants
 
 ## Build:
 Support Mac arm64 build
@@ -1652,6 +1662,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:

diff --git a/data/core/external_options.json b/data/core/external_options.json
@@ -491,10 +491,10 @@
   },
   {
     "type": "EXTERNAL_OPTION",
-    "name": "EMP_DISABLE_ELECTRONICS",
-    "//": "Whether EMP effects will permanently disable items.",
+    "name": "GAME_EMP",
+    "//": "EMP will disable electonics for a short period of ~60 seconds, instead of permanently.  Theres a 5% chance of items shorting out permanently.",
     "stype": "bool",
-    "value": true
+    "value": false
   },
   {
     "type": "EXTERNAL_OPTION",

diff --git a/data/json/construction/furniture_tools.json b/data/json/construction/furniture_tools.json
@@ -300,6 +300,17 @@
     "pre_special": "check_empty",
     "post_terrain": "f_kiln_metal_empty"
   },
+  {
+    "type": "construction",
+    "id": "constr_kiln_portable_empty",
+    "group": "place_char_kiln",
+    "category": "FURN",
+    "required_skills": [ [ "fabrication", 0 ] ],
+    "time": "1 m",
+    "components": [ [ [ "char_kiln", 1 ] ] ],
+    "pre_special": "check_empty",
+    "post_terrain": "f_kiln_portable_empty"
+  },
   {
     "type": "construction",
     "id": "constr_place_screw_press",

diff --git a/data/json/construction_group.json b/data/json/construction_group.json
@@ -431,6 +431,11 @@
     "id": "build_metal_charcoal_kiln",
     "name": "Build Metal Charcoal Kiln"
   },
+  {
+    "type": "construction_group",
+    "id": "place_char_kiln",
+    "name": "Place Metal Charcoal Kiln"
+  },
   {
     "type": "construction_group",
     "id": "build_metal_door",

diff --git a/data/json/effects.json b/data/json/effects.json
@@ -985,6 +985,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 +4332,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 +4344,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",

diff --git a/data/json/effects_on_condition/nether_eocs/LIXA_EOCs_spells_traps.json b/data/json/effects_on_condition/nether_eocs/LIXA_EOCs_spells_traps.json
@@ -223,79 +223,79 @@
       { "math": [ "u_LIXA_hallway_direction = 2" ] },
       {
         "u_location_variable": { "global_val": "LIXA_unfold_A" },
-        "target_params": { "om_terrain": "LIXA_device_unfolded_A", "search_range": 400, "min_distance": 0, "z": 0 },
+        "target_params": { "om_terrain": "LIXA_device_unfolded_A", "min_distance": 0, "z": 0 },
         "z_adjust": -8,
         "z_override": true
       },
       {
         "u_location_variable": { "global_val": "LIXA_unfold_B" },
-        "target_params": { "om_terrain": "LIXA_device_unfolded_B", "search_range": 400, "min_distance": 0, "z": 0 },
+        "target_params": { "om_terrain": "LIXA_device_unfolded_B", "min_distance": 0, "z": 0 },
         "z_adjust": -8,
         "z_override": true
       },
       {
         "u_location_variable": { "global_val": "LIXA_chamber_1" },
-        "target_params": { "om_terrain": "LIXA_device_1", "search_range": 400, "min_distance": 0, "z": 0 },
+        "target_params": { "om_terrain": "LIXA_device_1", "min_distance": 0, "z": 0 },
         "z_adjust": -4,
         "z_override": true
       },
       {
         "u_location_variable": { "global_val": "LIXA_chamber_2" },
-        "target_params": { "om_terrain": "LIXA_device_2", "search_range": 400, "min_distance": 0, "z": 0 },
+        "target_params": { "om_terrain": "LIXA_device_2", "min_distance": 0, "z": 0 },
         "z_adjust": -4,
         "z_override": true
       },
       {
         "u_location_variable": { "global_val": "LIXA_chamber_3" },
-        "target_params": { "om_terrain": "LIXA_device_3", "search_range": 400, "min_distance": 0, "z": 0 },
+        "target_params": { "om_terrain": "LIXA_device_3", "min_distance": 0, "z": 0 },
         "z_adjust": -4,
         "z_override": true
       },
       {
         "u_location_variable": { "global_val": "LIXA_workfloor_NW" },
-        "target_params": { "om_terrain": "LIXA_workfloor_1a", "search_range": 400, "min_distance": 0, "z": 0 },
+        "target_params": { "om_terrain": "LIXA_workfloor_1a", "min_distance": 0, "z": 0 },
         "z_adjust": -4,
         "z_override": true
       },
       {
         "u_location_variable": { "global_val": "LIXA_workfloor_NE" },
-        "target_params": { "om_terrain": "LIXA_workfloor_2a", "search_range": 400, "min_distance": 0, "z": 0 },
+        "target_params": { "om_terrain": "LIXA_workfloor_2a", "min_distance": 0, "z": 0 },
         "z_adjust": -3,
         "z_override": true
       },
       {
         "u_location_variable": { "global_val": "LIXA_workfloor_SW" },
-        "target_params": { "om_terrain": "LIXA_workfloor_1b", "search_range": 400, "min_distance": 0, "z": 0 },
+        "target_params": { "om_terrain": "LIXA_workfloor_1b", "min_distance": 0, "z": 0 },
         "z_adjust": -3,
         "z_override": true
       },
       {
         "u_location_variable": { "global_val": "LIXA_workfloor_SE" },
-        "target_params": { "om_terrain": "LIXA_workfloor_2b", "search_range": 400, "min_distance": 0, "z": 0 },
+        "target_params": { "om_terrain": "LIXA_workfloor_2b", "min_distance": 0, "z": 0 },
         "z_adjust": -3,
         "z_override": true
       },
       {
         "u_location_variable": { "global_val": "LIXA_surface_NW" },
-        "target_params": { "om_terrain": "LIXA_surface_1a", "search_range": 400, "min_distance": 0, "z": 0 },
+        "target_params": { "om_terrain": "LIXA_surface_1a", "min_distance": 0, "z": 0 },
         "z_adjust": 0,
         "z_override": true
       },
       {
         "u_location_variable": { "global_val": "LIXA_surface_NE" },
-        "target_params": { "om_terrain": "LIXA_surface_1b", "search_range": 400, "min_distance": 0, "z": 0 },
+        "target_params": { "om_terrain": "LIXA_surface_1b", "min_distance": 0, "z": 0 },
         "z_adjust": 0,
         "z_override": true
       },
       {
         "u_location_variable": { "global_val": "LIXA_surface_SW" },
-        "target_params": { "om_terrain": "LIXA_surface_2a", "search_range": 400, "min_distance": 0, "z": 0 },
+        "target_params": { "om_terrain": "LIXA_surface_2a", "min_distance": 0, "z": 0 },
         "z_adjust": 0,
         "z_override": true
       },
       {
         "u_location_variable": { "global_val": "LIXA_surface_SE" },
-        "target_params": { "om_terrain": "LIXA_surface_2b", "search_range": 400, "min_distance": 0, "z": 0 },
+        "target_params": { "om_terrain": "LIXA_surface_2b", "min_distance": 0, "z": 0 },
         "z_adjust": 0,
         "z_override": true
       }

diff --git a/data/json/effects_on_condition/nether_eocs/nether_glass_effect_on_condition.json b/data/json/effects_on_condition/nether_eocs/nether_glass_effect_on_condition.json
@@ -22,7 +22,7 @@
           "effect": [
             {
               "u_location_variable": { "global_val": "glass_place" },
-              "target_params": { "om_terrain": "nether_glass_deep", "search_range": 20, "min_distance": 3, "z": -10 }
+              "target_params": { "om_terrain": "nether_glass_deep", "min_distance": 3, "z": -10 }
             },
             {
               "u_teleport": { "global_val": "glass_place" },

diff --git a/data/json/effects_on_condition/nether_eocs/portal_storm_effect_on_condition.json b/data/json/effects_on_condition/nether_eocs/portal_storm_effect_on_condition.json
@@ -922,7 +922,7 @@
     "effect": [
       {
         "u_location_variable": { "global_val": "portal_dungeon" },
-        "target_params": { "om_terrain": "field", "search_range": 200, "min_distance": 3, "z": 0 }
+        "target_params": { "om_terrain": "field", "min_distance": 3, "z": 0 }
       },
       {
         "u_message": "You can feel the presence of something nearby, cracked in a way you can't put into words (check mission log for details)."