Chestdialogfix

.clang-tidy

@@ -14,12 +14,15 @@ Checks: >-
   -cppcoreguidelines-pro-type-reinterpret-cast,
   -cppcoreguidelines-pro-type-union-access,
   misc-*,
+  -misc-include-cleaner,
   -misc-non-private-member-variables-in-classes,
   modernize-*,
   -modernize-use-auto,
   -modernize-use-nodiscard,
   -modernize-use-trailing-return-type,
   performance-*,
+  -performance-avoid-endl,
+  -performance-enum-size,
   readability-*,
   -readability-avoid-const-params-in-decls,
   -readability-braces-around-statements,

.github/workflows/clang_analyzer.yml

@@ -8,7 +8,7 @@ permissions: {}
 jobs:
   clang:
     name: Clang Analyzer
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     timeout-minutes: 30
     defaults:
       run:
@@ -18,10 +18,10 @@ jobs:
     - name: Install dependencies and clang-tools
       run: |
         sudo apt-get -y update
-        sudo apt-get -y install libsdl2-dev libsdl2-mixer-dev libsdl2-image-dev gettext clang-tools-15
+        sudo apt-get -y install libsdl2-dev libsdl2-mixer-dev libsdl2-image-dev gettext clang-tools-18
     - name: Setup clang-tools
       run: |
-        sudo update-alternatives --install /usr/bin/scan-build scan-build /usr/bin/scan-build-15 100
+        sudo update-alternatives --install /usr/bin/scan-build scan-build /usr/bin/scan-build-18 100
     - name: Analyze
       run: |
         scan-build --status-bugs -v -o scan-build-result make -j 2

.github/workflows/clang_tidy.yml

@@ -14,7 +14,7 @@ permissions: {}
 jobs:
   tidy:
     name: Clang-Tidy
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     timeout-minutes: 60
     defaults:
       run:
@@ -31,11 +31,11 @@ jobs:
     - name: Install dependencies and clang-tidy
       run: |
         sudo apt-get -y update
-        sudo apt-get -y install libsdl2-dev libsdl2-mixer-dev libsdl2-image-dev gettext clang-tidy-15
+        sudo apt-get -y install libsdl2-dev libsdl2-mixer-dev libsdl2-image-dev gettext clang-tidy-18
     - name: Setup clang-tidy
       run: |
-        sudo update-alternatives --install /usr/bin/clang-tidy clang-tidy /usr/bin/clang-tidy-15 100
-        sudo update-alternatives --install /usr/bin/clang-tidy-diff clang-tidy-diff /usr/bin/clang-tidy-diff-15.py 100
+        sudo update-alternatives --install /usr/bin/clang-tidy clang-tidy /usr/bin/clang-tidy-18 100
+        sudo update-alternatives --install /usr/bin/clang-tidy-diff clang-tidy-diff /usr/bin/clang-tidy-diff-18.py 100
     - name: Prepare compile_commands.json
       run: |
         cmake -B build -DCMAKE_BUILD_TYPE=Debug -DENABLE_STRICT_COMPILATION=ON -DENABLE_IMAGE=ON -DENABLE_TOOLS=ON -DCMAKE_EXPORT_COMPILE_COMMANDS=ON

.github/workflows/code_style_check.yml

@@ -8,7 +8,7 @@ permissions: {}
 jobs:
   style:
     name: Code style check
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     timeout-minutes: 10
     defaults:
       run:
@@ -19,8 +19,8 @@ jobs:
         fetch-depth: 50
     - name: Setup clang-format
       run: |
-        sudo update-alternatives --install /usr/bin/clang-format clang-format /usr/bin/clang-format-14 100
-        sudo update-alternatives --install /usr/bin/clang-format-diff clang-format-diff /usr/bin/clang-format-diff-14 100
+        sudo update-alternatives --install /usr/bin/clang-format clang-format /usr/bin/clang-format-17 100
+        sudo update-alternatives --install /usr/bin/clang-format-diff clang-format-diff /usr/bin/clang-format-diff-17 100
     - name: Check code format
       run: |
         bash script/tools/check_code_format.sh

.github/workflows/iwyu.yml

@@ -8,7 +8,7 @@ permissions: {}
 jobs:
   iwyu:
     name: IWYU
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     timeout-minutes: 30
     defaults:
       run:
@@ -24,8 +24,8 @@ jobs:
         cmake -B build -DCMAKE_BUILD_TYPE=Debug -DENABLE_STRICT_COMPILATION=ON -DENABLE_IMAGE=ON -DENABLE_TOOLS=ON -DCMAKE_EXPORT_COMPILE_COMMANDS=ON
     - name: Analyze
       run: |
-        iwyu_tool -p build -j 2 -- -Xiwyu --cxx17ns -Xiwyu --mapping_file="$GITHUB_WORKSPACE/iwyu.map" | (grep -E -v "^$|has correct #includes/fwd-decls" || true) \
-                                                                                                       | tee iwyu-result.txt
+        iwyu_tool -p build -j 2 -- -Xiwyu --cxx17ns -Xiwyu --error -Xiwyu --mapping_file="$GITHUB_WORKSPACE/iwyu.map" | (grep -E -v "^$|has correct #includes/fwd-decls" || true) \
+                                                                                                                      | tee iwyu-result.txt
     - uses: actions/upload-artifact@v4
       if: ${{ failure() }}
       with:

.github/workflows/pr_author_auto_assign.yml

@@ -16,6 +16,6 @@ jobs:
       run:
         shell: bash
     steps:
-    - uses: toshimaru/[email protected].0
+    - uses: toshimaru/[email protected].1
       with:
         repo-token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/sonarcloud.yml

@@ -37,7 +37,7 @@ jobs:
         bash script/android/install_packages.sh
         sudo apt-get -y update
         sudo apt-get -y install libsdl2-dev libsdl2-mixer-dev libsdl2-image-dev
-    - uses: SonarSource/sonarcloud-github-c-cpp@v2
+    - uses: SonarSource/sonarcloud-github-c-cpp@v3
     - name: Prepare SonarCloud cfamily cache
       uses: actions/cache@v4
       with:

VisualStudio/fheroes2/sources.props

@@ -3,6 +3,7 @@
   <ItemGroup>
     <ClCompile Include="src\engine\agg_file.cpp" />
     <ClCompile Include="src\engine\audio.cpp" />
+    <ClCompile Include="src\engine\audio_xmi2mid.cpp" />
     <ClCompile Include="src\engine\core.cpp" />
     <ClCompile Include="src\engine\dir.cpp" />
     <ClCompile Include="src\engine\h2d_file.cpp" />
@@ -23,7 +24,6 @@
     <ClCompile Include="src\engine\tinyconfig.cpp" />
     <ClCompile Include="src\engine\tools.cpp" />
     <ClCompile Include="src\engine\translations.cpp" />
-    <ClCompile Include="src\engine\xmi2mid.cpp" />
     <ClCompile Include="src\engine\zzlib.cpp" />
     <ClCompile Include="src\fheroes2\agg\agg.cpp" />
     <ClCompile Include="src\fheroes2\agg\agg_image.cpp" />
@@ -32,16 +32,15 @@
     <ClCompile Include="src\fheroes2\agg\m82.cpp" />
     <ClCompile Include="src\fheroes2\agg\mus.cpp" />
     <ClCompile Include="src\fheroes2\agg\xmi.cpp" />
-    <ClCompile Include="src\fheroes2\ai\ai_base.cpp" />
+    <ClCompile Include="src\fheroes2\ai\ai_battle.cpp" />
+    <ClCompile Include="src\fheroes2\ai\ai_battle_spell.cpp" />
     <ClCompile Include="src\fheroes2\ai\ai_common.cpp" />
     <ClCompile Include="src\fheroes2\ai\ai_hero_action.cpp" />
     <ClCompile Include="src\fheroes2\ai\ai_personality.cpp" />
-    <ClCompile Include="src\fheroes2\ai\normal\ai_normal.cpp" />
-    <ClCompile Include="src\fheroes2\ai\normal\ai_normal_battle.cpp" />
-    <ClCompile Include="src\fheroes2\ai\normal\ai_normal_castle.cpp" />
-    <ClCompile Include="src\fheroes2\ai\normal\ai_normal_hero.cpp" />
-    <ClCompile Include="src\fheroes2\ai\normal\ai_normal_kingdom.cpp" />
-    <ClCompile Include="src\fheroes2\ai\normal\ai_normal_spell.cpp" />
+    <ClCompile Include="src\fheroes2\ai\ai_planner.cpp" />
+    <ClCompile Include="src\fheroes2\ai\ai_planner_castle.cpp" />
+    <ClCompile Include="src\fheroes2\ai\ai_planner_hero.cpp" />
+    <ClCompile Include="src\fheroes2\ai\ai_planner_kingdom.cpp" />
     <ClCompile Include="src\fheroes2\army\army.cpp" />
     <ClCompile Include="src\fheroes2\army\army_bar.cpp" />
     <ClCompile Include="src\fheroes2\army\army_troop.cpp" />
@@ -112,8 +111,11 @@
     <ClCompile Include="src\fheroes2\editor\editor_map_specs_window.cpp" />
     <ClCompile Include="src\fheroes2\editor\editor_object_popup_window.cpp" />
     <ClCompile Include="src\fheroes2\editor\editor_castle_details_window.cpp" />
+    <ClCompile Include="src\fheroes2\editor\editor_daily_event_spec_window.cpp" />
+    <ClCompile Include="src\fheroes2\editor\editor_daily_events_window.cpp" />
     <ClCompile Include="src\fheroes2\editor\editor_event_details_window.cpp" />
     <ClCompile Include="src\fheroes2\editor\editor_options.cpp" />
+    <ClCompile Include="src\fheroes2\editor\editor_rumor_window.cpp" />
     <ClCompile Include="src\fheroes2\editor\editor_save_map_window.cpp" />
     <ClCompile Include="src\fheroes2\editor\editor_sphinx_window.cpp" />
     <ClCompile Include="src\fheroes2\editor\editor_ui_helper.cpp" />
@@ -214,19 +216,6 @@
     <ClCompile Include="src\fheroes2\monster\monster.cpp" />
     <ClCompile Include="src\fheroes2\monster\monster_anim.cpp" />
     <ClCompile Include="src\fheroes2\monster\monster_info.cpp" />
-    <ClCompile Include="src\fheroes2\objects\mounts.cpp" />
-    <ClCompile Include="src\fheroes2\objects\objcrck.cpp" />
-    <ClCompile Include="src\fheroes2\objects\objdirt.cpp" />
-    <ClCompile Include="src\fheroes2\objects\objdsrt.cpp" />
-    <ClCompile Include="src\fheroes2\objects\objgras.cpp" />
-    <ClCompile Include="src\fheroes2\objects\objlava.cpp" />
-    <ClCompile Include="src\fheroes2\objects\objmult.cpp" />
-    <ClCompile Include="src\fheroes2\objects\objsnow.cpp" />
-    <ClCompile Include="src\fheroes2\objects\objswmp.cpp" />
-    <ClCompile Include="src\fheroes2\objects\objtown.cpp" />
-    <ClCompile Include="src\fheroes2\objects\objwatr.cpp" />
-    <ClCompile Include="src\fheroes2\objects\objxloc.cpp" />
-    <ClCompile Include="src\fheroes2\objects\trees.cpp" />
     <ClCompile Include="src\fheroes2\resource\artifact.cpp" />
     <ClCompile Include="src\fheroes2\resource\artifact_info.cpp" />
     <ClCompile Include="src\fheroes2\resource\artifact_ultimate.cpp" />
@@ -280,9 +269,12 @@
     <ClInclude Include="src\fheroes2\agg\mus.h" />
     <ClInclude Include="src\fheroes2\agg\til.h" />
     <ClInclude Include="src\fheroes2\agg\xmi.h" />
-    <ClInclude Include="src\fheroes2\ai\ai.h" />
+    <ClInclude Include="src\fheroes2\ai\ai_battle.h" />
+    <ClInclude Include="src\fheroes2\ai\ai_common.h" />
+    <ClInclude Include="src\fheroes2\ai\ai_hero_action.h" />
     <ClInclude Include="src\fheroes2\ai\ai_personality.h" />
-    <ClInclude Include="src\fheroes2\ai\normal\ai_normal.h" />
+    <ClInclude Include="src\fheroes2\ai\ai_planner.h" />
+    <ClInclude Include="src\fheroes2\ai\ai_planner_internals.h" />
     <ClInclude Include="src\fheroes2\army\army.h" />
     <ClInclude Include="src\fheroes2\army\army_bar.h" />
     <ClInclude Include="src\fheroes2\army\army_troop.h" />
@@ -327,9 +319,12 @@
     <ClInclude Include="src\fheroes2\editor\editor_mainmenu.h" />
     <ClInclude Include="src\fheroes2\editor\editor_map_specs_window.h" />
     <ClInclude Include="src\fheroes2\editor\editor_object_popup_window.h" />
+    <ClInclude Include="src\fheroes2\editor\editor_daily_event_spec_window.h" />
+    <ClInclude Include="src\fheroes2\editor\editor_daily_events_window.h" />
     <ClInclude Include="src\fheroes2\editor\editor_castle_details_window.h" />
     <ClInclude Include="src\fheroes2\editor\editor_event_details_window.h" />
     <ClInclude Include="src\fheroes2\editor\editor_options.h" />
+    <ClInclude Include="src\fheroes2\editor\editor_rumor_window.h" />
     <ClInclude Include="src\fheroes2\editor\editor_save_map_window.h" />
     <ClInclude Include="src\fheroes2\editor\editor_sphinx_window.h" />
     <ClInclude Include="src\fheroes2\editor\editor_ui_helper.h" />
@@ -423,19 +418,6 @@
     <ClInclude Include="src\fheroes2\monster\monster.h" />
     <ClInclude Include="src\fheroes2\monster\monster_anim.h" />
     <ClInclude Include="src\fheroes2\monster\monster_info.h" />
-    <ClInclude Include="src\fheroes2\objects\mounts.h" />
-    <ClInclude Include="src\fheroes2\objects\objcrck.h" />
-    <ClInclude Include="src\fheroes2\objects\objdirt.h" />
-    <ClInclude Include="src\fheroes2\objects\objdsrt.h" />
-    <ClInclude Include="src\fheroes2\objects\objgras.h" />
-    <ClInclude Include="src\fheroes2\objects\objlava.h" />
-    <ClInclude Include="src\fheroes2\objects\objmult.h" />
-    <ClInclude Include="src\fheroes2\objects\objsnow.h" />
-    <ClInclude Include="src\fheroes2\objects\objswmp.h" />
-    <ClInclude Include="src\fheroes2\objects\objtown.h" />
-    <ClInclude Include="src\fheroes2\objects\objwatr.h" />
-    <ClInclude Include="src\fheroes2\objects\objxloc.h" />
-    <ClInclude Include="src\fheroes2\objects\trees.h" />
     <ClInclude Include="src\fheroes2\resource\artifact.h" />
     <ClInclude Include="src\fheroes2\resource\artifact_info.h" />
     <ClInclude Include="src\fheroes2\resource\artifact_ultimate.h" />

VisualStudio/tools/xmi2midi/sources.props

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
+    <ClCompile Include="..\engine\audio_xmi2mid.cpp" />
     <ClCompile Include="..\engine\logging.cpp" />
     <ClCompile Include="..\engine\serialize.cpp" />
     <ClCompile Include="..\engine\system.cpp" />
-    <ClCompile Include="..\engine\xmi2mid.cpp" />
     <ClCompile Include="xmi2midi.cpp" />
   </ItemGroup>
   <ItemGroup>

android/app/src/main/res/values-ru/strings.xml

@@ -9,6 +9,7 @@
     <string name="activity_toolset_extract_homm2_assets_btn_text">Извлечь ресурсы HoMM2</string>
     <string name="activity_toolset_download_homm2_demo_btn_text">Скачать демо-версию HoMM2</string>
     <string name="activity_toolset_save_file_manager_btn_text">Менеджер файлов сохранений</string>
+    <string name="activity_toolset_map_file_manager_btn_text">Менеджер файлов карт FH2M</string>
     <string name="activity_toolset_last_task_status_lbl_text_completed_successfully">Операция успешно завершена.</string>
     <string name="activity_toolset_last_task_status_lbl_text_no_assets_found">Операция успешно завершена, но никаких ресурсов HoMM2 найдено не было.</string>
     <string name="activity_toolset_last_task_status_lbl_text_failed">Во время операции произошла ошибка: %s</string>
@@ -43,4 +44,29 @@
     </plurals>
     <string name="activity_save_file_manager_delete_confirmation_positive_btn_text">Да</string>
     <string name="activity_save_file_manager_delete_confirmation_negative_btn_text">Нет</string>
+    <string name="activity_map_file_manager_label">fh2 менеджер файлов карт</string>
+    <string name="activity_map_file_manager_map_file_list_empty_lbl_text">Нет доступных файлов карт</string>
+    <string name="activity_map_file_manager_select_all_btn_content_description">Выбрать все файлы карт</string>
+    <string name="activity_map_file_manager_unselect_all_btn_content_description">Отменить выбор файлов карт</string>
+    <string name="activity_map_file_manager_import_btn_content_description">Импортировать файлы карт</string>
+    <string name="activity_map_file_manager_export_btn_content_description">Экспортировать выбранные файлы карт</string>
+    <string name="activity_map_file_manager_delete_btn_content_description">Удалить выбранные файлы карт</string>
+    <string name="activity_map_file_manager_last_task_status_lbl_text_no_map_files_found">Операция успешно завершена, но никаких файлов карт найдено не было.</string>
+    <string name="activity_map_file_manager_last_task_status_lbl_text_failed">Во время операции произошла ошибка: %s</string>
+    <string name="activity_map_file_manager_no_files_selected_for_export_title">Файлы для экспорта не выбраны</string>
+    <string name="activity_map_file_manager_no_files_selected_for_export_message">Пожалуйста, выберите файлы карт для экспорта.</string>
+    <string name="activity_map_file_manager_no_files_selected_for_export_positive_btn_text">OK</string>
+    <string name="activity_map_file_manager_no_files_selected_for_deletion_title">Файлы для удаления не выбраны</string>
+    <string name="activity_map_file_manager_no_files_selected_for_deletion_message">Пожалуйста, выберите файлы карт для удаления.</string>
+    <string name="activity_map_file_manager_no_files_selected_for_deletion_positive_btn_text">OK</string>
+    <plurals name="activity_map_file_manager_delete_confirmation_title" tools:ignore="MissingQuantity">
+        <item quantity="other">Удалить файлы карт</item>
+    </plurals>
+    <plurals name="activity_map_file_manager_delete_confirmation_message">
+        <item quantity="one">Вы действительно хотите удалить %d выбранный файл?</item>
+        <item quantity="few">Вы действительно хотите удалить %d выбранных файла?</item>
+        <item quantity="many">Вы действительно хотите удалить %d выбранных файлов?</item>
+    </plurals>
+    <string name="activity_map_file_manager_delete_confirmation_positive_btn_text">Да</string>
+    <string name="activity_map_file_manager_delete_confirmation_negative_btn_text">Нет</string>
 </resources>

android/build.gradle

@@ -7,7 +7,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.4.1'
+        classpath 'com.android.tools.build:gradle:8.5.1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

android/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Thu Nov 11 18:20:34 PST 2021
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME