Skip to content

Commit

Permalink
1.15 support (#1711)
Browse files Browse the repository at this point in the history
* Update blank_mod

* Update version

* Update province mappings - vanilla & HPM

* Add new provinces to configurables/Map/regions.txt

* Clean common/special_projects

* Copy Vic3ToHoI4 common/raids

* Clean up error log

* Update buildings

* Import landmarks mappings

* Add landmarks mappings tests

* Add landmark buildings to states

* Check if landmark has a name and is located in the state before adding

* Import default landmark buildings

* Import enable_for_controllers as stringList & clean up

* Store buildings as a map of pointers

* Add LandmarksMapper.cpp

* Update landmark buildings

* Don't output unmapped landmark buildings

* Don't assign unbuilt landmarks to states

* Clang, includes & braces

* Import default adjacency rules

* Add adjacency rule tests

* Create and output adjacency rules

* Clang

* Add new files to Vic2ToHoI4lib

* Requested changes

* Add new test files to Vic2ToHoI4Tests build

* Merge adjacency rules default values tests

* Fix Codacy issue with adjacency rules map

* Requested changes

* Clang

* Update province names localisation for the Province Mapper

* Update version and name

* Store adjacency rules as pointers

* Fix tests

* Clang
  • Loading branch information
cetvrtak authored Jan 19, 2025
1 parent aa8fa6c commit f5c32df
Show file tree
Hide file tree
Showing 239 changed files with 27,582 additions and 2,599 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/windows_build_test_and_push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,12 +46,12 @@ jobs:
- name: "Prepare release"
run: |
cd "C:\Program Files\7-Zip\"
.\7z.exe a $Env:GITHUB_WORKSPACE\Vic2ToHoI4-1.2Tito-win-x64.zip $Env:GITHUB_WORKSPACE\build\Release\*
.\7z.exe a $Env:GITHUB_WORKSPACE\Vic2ToHoI4-1.3Umberto-II-win-x64.zip $Env:GITHUB_WORKSPACE\build\Release\*
- name: "Prepare installer"
run: |
c:\"Program Files (x86)\Inno Setup 6\iscc" Vic2ToHoI4-Installer.iss
cp $Env:GITHUB_WORKSPACE\Output\Vic2ToHoI4-latest-win-x64.exe $Env:GITHUB_WORKSPACE\Output\Vic2ToHoI4-1.2Tito-win-x64.exe
cp $Env:GITHUB_WORKSPACE\Output\Vic2ToHoI4-latest-win-x64.exe $Env:GITHUB_WORKSPACE\Output\Vic2ToHoI4-1.3Umberto-II-win-x64.exe
- name: "Upload binaries to release"
if: ${{ github.event_name == 'push' }}
Expand All @@ -61,7 +61,7 @@ jobs:
allowUpdates: true
omitBodyDuringUpdate: true
omitNameDuringUpdate: true
artifacts: Vic2ToHoI4-1.2Tito-win-x64.zip, Output\Vic2ToHoI4-1.2Tito-win-x64.exe
artifacts: Vic2ToHoI4-1.3Umberto-II-win-x64.zip, Output\Vic2ToHoI4-1.3Umberto-II-win-x64.exe
token: ${{ secrets.API_TOKEN_GITHUB }}

- name: "Prepare pull request artifact"
Expand Down
27 changes: 27 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,10 @@ file(GLOB HOI4WORLD_GAME_RULES_SOURCES "${PROJECT_SOURCE_DIR}/src/HOI4World/Game
file(GLOB HOI4WORLD_IDEAS_SOURCES "${PROJECT_SOURCE_DIR}/src/HOI4World/Ideas/*.cpp")
file(GLOB HOI4WORLD_IDEOLOGIES_SOURCES "${PROJECT_SOURCE_DIR}/src/HOI4World/Ideologies/*.cpp")
file(GLOB HOI4WORLD_INTELLIGENCE_AGENCIES_SOURCES "${PROJECT_SOURCE_DIR}/src/HOI4World/IntelligenceAgencies/*.cpp")
set(HOI4WORLD_LANDMARKS_SOURCES ${HOI4WORLD_LANDMARKS_SOURCES} "${PROJECT_SOURCE_DIR}/src/HOI4World/Landmarks/Landmark.cpp")
set(HOI4WORLD_LANDMARKS_SOURCES ${HOI4WORLD_LANDMARKS_SOURCES} "${PROJECT_SOURCE_DIR}/src/HOI4World/Landmarks/Landmarks.cpp")
set(HOI4WORLD_LANDMARKS_SOURCES ${HOI4WORLD_LANDMARKS_SOURCES} "${PROJECT_SOURCE_DIR}/src/HOI4World/Landmarks/LandmarkBuildings.cpp")
set(HOI4WORLD_LANDMARKS_SOURCES ${HOI4WORLD_LANDMARKS_SOURCES} "${PROJECT_SOURCE_DIR}/src/HOI4World/Landmarks/LandmarkModifiers.cpp")
set(HOI4WORLD_LEADERS_SOURCES ${HOI4WORLD_LEADERS_SOURCES} "${PROJECT_SOURCE_DIR}/src/HOI4World/Leaders/Advisor.cpp")
set(HOI4WORLD_LEADERS_SOURCES ${HOI4WORLD_LEADERS_SOURCES} "${PROJECT_SOURCE_DIR}/src/HOI4World/Leaders/IdeologicalAdvisors.cpp")
set(HOI4WORLD_LOCALISATIONS_SOURCES ${HOI4WORLD_LOCALISATIONS_SOURCES} "${PROJECT_SOURCE_DIR}/src/HOI4World/Localisations/AllReplacementRules.cpp")
Expand Down Expand Up @@ -173,6 +177,8 @@ set(MAPPERS_GRAPHICS_SOURCES ${MAPPERS_GRAPHICS_SOURCES} "${PROJECT_SOURCE_DIR}/
set(MAPPERS_IDEOLOGY_SOURCES ${MAPPERS_IDEOLOGY_SOURCES} "${PROJECT_SOURCE_DIR}/src/Mappers/Ideology/IdeologyMappingFactory.cpp")
set(MAPPERS_IDEOLOGY_SOURCES ${MAPPERS_IDEOLOGY_SOURCES} "${PROJECT_SOURCE_DIR}/src/Mappers/Ideology/IdeologyMapper.cpp")
set(MAPPERS_IDEOLOGY_SOURCES ${MAPPERS_IDEOLOGY_SOURCES} "${PROJECT_SOURCE_DIR}/src/Mappers/Ideology/IdeologyMapperFactory.cpp")
set(MAPPERS_LANDMARKS_SOURCES ${MAPPERS_LANDMARKS_SOURCES} "${PROJECT_SOURCE_DIR}/src/Mappers/Buildings/LandmarksMapper.cpp")
set(MAPPERS_LANDMARKS_SOURCES ${MAPPERS_LANDMARKS_SOURCES} "${PROJECT_SOURCE_DIR}/src/Mappers/Buildings/LandmarksMappingFactory.cpp")
set(MAPPERS_MERGE_RULES_SOURCES ${MAPPERS_MERGE_RULES_SOURCES} "${PROJECT_SOURCE_DIR}/src/Mappers/MergeRules/MergeRuleFactory.cpp")
set(MAPPERS_MERGE_RULES_SOURCES ${MAPPERS_MERGE_RULES_SOURCES} "${PROJECT_SOURCE_DIR}/src/Mappers/MergeRules/MergeRulesFactory.cpp")
set(MAPPERS_PROVINCES_SOURCES ${MAPPERS_PROVINCES_SOURCES} "${PROJECT_SOURCE_DIR}/src/Mappers/Provinces/ProvinceMapperFactory.cpp")
Expand Down Expand Up @@ -266,6 +272,8 @@ file(GLOB OUTHOI4_IDEAS_SOURCES "${PROJECT_SOURCE_DIR}/src/OutHoi4/Ideas/*.cpp")
file(GLOB OUTHOI4_IDEOLOGIES_SOURCES "${PROJECT_SOURCE_DIR}/src/OutHoi4/Ideologies/*.cpp")
file(GLOB OUTHOI4_INTELLIGENCE_AGENCIES_SOURCES "${PROJECT_SOURCE_DIR}/src/OutHoi4/IntelligenceAgencies/*.cpp")
set(OUTHOI4_INTERFACE_SOURCES ${OUTHOI4_INTERFACE_SOURCES} "${PROJECT_SOURCE_DIR}/src/OutHoi4/Interface/OutMonarchsInterface.cpp")
set(OUTHOI4_LANDMARKS_SOURCES ${OUTHOI4_LANDMARKS_SOURCES} "${PROJECT_SOURCE_DIR}/src/OutHoi4/Landmarks/OutLandmark.cpp")
set(OUTHOI4_LANDMARKS_SOURCES ${OUTHOI4_LANDMARKS_SOURCES} "${PROJECT_SOURCE_DIR}/src/OutHoi4/Landmarks/OutLandmarkBuildings.cpp")
set(OUTHOI4_LEADERS_SOURCES ${OUTHOI4_LEADERS_SOURCES} "${PROJECT_SOURCE_DIR}/src/OutHoi4/Leaders/OutAdvisor.cpp")
file(GLOB OUTHOI4_MAP_SOURCES "${PROJECT_SOURCE_DIR}/src/OutHoi4/Map/*.cpp")
file(GLOB OUTHOI4_MILITARY_SOURCES "${PROJECT_SOURCE_DIR}/src/OutHoi4/Military/*.cpp")
Expand Down Expand Up @@ -340,6 +348,7 @@ list(APPEND ALL_HOI4_FILES
${OUTHOI4_IDEOLOGIES_SOURCES}
${OUTHOI4_INTELLIGENCE_AGENCIES_SOURCES}
${OUTHOI4_INTERFACE_SOURCES}
${OUTHOI4_LANDMARKS_SOURCES}
${OUTHOI4_LEADERS_SOURCES}
${OUTHOI4_MAP_SOURCES}
${OUTHOI4_MILITARY_SOURCES}
Expand Down Expand Up @@ -388,6 +397,7 @@ list(APPEND ALL_HOI4_FILES
${MAPPERS_GOVERNMENT_SOURCES}
${MAPPERS_GRAPHICS_SOURCES}
${MAPPERS_IDEOLOGY_SOURCES}
${MAPPERS_LANDMARKS_SOURCES}
${MAPPERS_MERGE_RULES_SOURCES}
${MAPPERS_TECHNOLOGY_SOURCES}
${MAPPERS_PROVINCES_SOURCES}
Expand Down Expand Up @@ -415,6 +425,7 @@ list(APPEND ALL_HOI4_FILES
${HOI4WORLD_IDEAS_SOURCES}
${HOI4WORLD_IDEOLOGIES_SOURCES}
${HOI4WORLD_INTELLIGENCE_AGENCIES_SOURCES}
${HOI4WORLD_LANDMARKS_SOURCES}
${HOI4WORLD_LEADERS_SOURCES}
${HOI4WORLD_LOCALISATIONS_SOURCES}
${HOI4WORLD_LOCALISATIONS_ARTICLERULES_SOURCES}
Expand Down Expand Up @@ -481,6 +492,7 @@ configure_file("${DATA_FILE_DIR}/configurables/CodenamesOperatives/SWE_opertive_
configure_file("${DATA_FILE_DIR}/configurables/CodenamesOperatives/TUR_operative_codenames.txt" "${CONVERTER_OUTPUT_DIRECTORY}/Configurables/CodenamesOperatives/TUR_operative_codenames.txt" COPYONLY)
configure_file("${DATA_FILE_DIR}/configurables/Localisations/ArticleRules.txt" "${CONVERTER_OUTPUT_DIRECTORY}/Configurables/Localisations/ArticleRules.txt" COPYONLY)
configure_file("${DATA_FILE_DIR}/configurables/Localisations/StateCategories.txt" "${CONVERTER_OUTPUT_DIRECTORY}/Configurables/Localisations/StateCategories.txt" COPYONLY)
configure_file("${DATA_FILE_DIR}/configurables/Map/adjacency_rules.txt" "${CONVERTER_OUTPUT_DIRECTORY}/Configurables/Map/adjacency_rules.txt" COPYONLY)
configure_file("${DATA_FILE_DIR}/configurables/Map/regions.txt" "${CONVERTER_OUTPUT_DIRECTORY}/Configurables/Map/regions.txt" COPYONLY)
configure_file("${DATA_FILE_DIR}/configurables/casus_bellis_mappings.txt" "${CONVERTER_OUTPUT_DIRECTORY}/Configurables/casus_bellis_mappings.txt" COPYONLY)
configure_file("${DATA_FILE_DIR}/configurables/converterDynamicModifiers.txt" "${CONVERTER_OUTPUT_DIRECTORY}/Configurables/converterDynamicModifiers.txt" COPYONLY)
Expand Down Expand Up @@ -510,6 +522,7 @@ configure_file("${DATA_FILE_DIR}/configurables/ideologicalDecisions.txt" "${CONV
configure_file("${DATA_FILE_DIR}/configurables/IdeologyMappings.txt" "${CONVERTER_OUTPUT_DIRECTORY}/Configurables/IdeologyMappings.txt" COPYONLY)
configure_file("${DATA_FILE_DIR}/configurables/ImportCharacters.txt" "${CONVERTER_OUTPUT_DIRECTORY}/Configurables/ImportCharacters.txt" COPYONLY)
configure_file("${DATA_FILE_DIR}/configurables/IntelligenceAgencyLogos.txt" "${CONVERTER_OUTPUT_DIRECTORY}/Configurables/IntelligenceAgencyLogos.txt" COPYONLY)
configure_file("${DATA_FILE_DIR}/configurables/LandmarksMappings.txt" "${CONVERTER_OUTPUT_DIRECTORY}/Configurables/LandmarksMappings.txt" COPYONLY)
configure_file("${DATA_FILE_DIR}/configurables/languageReplacements.txt" "${CONVERTER_OUTPUT_DIRECTORY}/Configurables/languageReplacements.txt" COPYONLY)
configure_file("${DATA_FILE_DIR}/configurables/languageReplacementsBis.txt" "${CONVERTER_OUTPUT_DIRECTORY}/Configurables/languageReplacementsBis.txt" COPYONLY)
configure_file("${DATA_FILE_DIR}/configurables/merge_nations.txt" "${CONVERTER_OUTPUT_DIRECTORY}/Configurables/merge_nations.txt" COPYONLY)
Expand Down Expand Up @@ -616,6 +629,7 @@ file(GLOB HOI4WORLD_GAME_RULES_TESTS_SOURCES "${PROJECT_SOURCE_DIR}/src/HOI4Worl
file(GLOB HOI4WORLD_IDEAS_TESTS_SOURCES "${PROJECT_SOURCE_DIR}/src/HOI4World/Ideas/*.cpp")
file(GLOB HOI4WORLD_IDEOLOGIES_TESTS_SOURCES "${PROJECT_SOURCE_DIR}/src/HOI4World/Ideologies/*.cpp")
file(GLOB HOI4WORLD_INTELLIGENCE_AGENCIES_TESTS_SOURCES "${PROJECT_SOURCE_DIR}/src/HOI4World/IntelligenceAgencies/*.cpp")
set(HOI4WORLD_LANDMARKS_TESTS_SOURCES ${HOI4WORLD_LANDMARKS_TESTS_SOURCES} "${PROJECT_SOURCE_DIR}/src/HOI4World/Landmarks/LandmarkBuildingsTests.cpp")
set(HOI4WORLD_LEADER_TESTS_SOURCES ${HOI4WORLD_LEADER_TESTS_SOURCES} "${PROJECT_SOURCE_DIR}/src/HOI4World/Leaders/AdvisorTests.cpp")
set(HOI4WORLD_LOCALISATIONS_TESTS_SOURCES ${HOI4WORLD_LOCALISATIONS_TESTS_SOURCES} "${PROJECT_SOURCE_DIR}/src/HOI4World/Localisations/AllReplacementRulesTests.cpp")
set(HOI4WORLD_LOCALISATIONS_TESTS_SOURCES ${HOI4WORLD_LOCALISATIONS_TESTS_SOURCES} "${PROJECT_SOURCE_DIR}/src/HOI4World/Localisations/GrammarMappingsTests.cpp")
Expand Down Expand Up @@ -682,6 +696,8 @@ set(MAPPERS_GRAPHICS_TESTS_SOURCES ${MAPPERS_GRAPHICS_TESTS_SOURCES} "${PROJECT_
set(MAPPERS_GRAPHICS_TESTS_SOURCES ${MAPPERS_GRAPHICS_TESTS_SOURCES} "${PROJECT_SOURCE_DIR}/src/Mappers/Graphics/GraphicsMapperTests.cpp")
set(MAPPERS_IDEOLOGY_TESTS_SOURCES ${MAPPERS_IDEOLOGY_TESTS_SOURCES} "${PROJECT_SOURCE_DIR}/src/Mappers/Ideology/IdeologyMappingTests.cpp")
set(MAPPERS_IDEOLOGY_TESTS_SOURCES ${MAPPERS_IDEOLOGY_TESTS_SOURCES} "${PROJECT_SOURCE_DIR}/src/Mappers/Ideology/IdeologyMapperTests.cpp")
set(MAPPERS_LANDMARKS_TESTS_SOURCES ${MAPPERS_LANDMARKS_TESTS_SOURCES} "${PROJECT_SOURCE_DIR}/src/Mappers/Buildings/LandmarksMapperTests.cpp")
set(MAPPERS_LANDMARKS_TESTS_SOURCES ${MAPPERS_LANDMARKS_TESTS_SOURCES} "${PROJECT_SOURCE_DIR}/src/Mappers/Buildings/LandmarksMappingTests.cpp")
set(MAPPERS_MERGE_RULES_TESTS_SOURCES ${MAPPERS_MERGE_RULES_TESTS_SOURCES} "${PROJECT_SOURCE_DIR}/src/Mappers/MergeRules/MergeRulesTests.cpp")
set(MAPPERS_MERGE_RULES_TESTS_SOURCES ${MAPPERS_MERGE_RULES_TESTS_SOURCES} "${PROJECT_SOURCE_DIR}/src/Mappers/MergeRules/MergeRuleTests.cpp")
set(MAPPERS_PROVINCES_TESTS_SOURCES ${MAPPERS_PROVINCES_TESTS_SOURCES} "${PROJECT_SOURCE_DIR}/src/Mappers/Provinces/ProvinceMapperTests.cpp")
Expand Down Expand Up @@ -766,6 +782,7 @@ list(APPEND ALL_HOI4_TESTS_FILES
${HOI4WORLD_IDEAS_TESTS_SOURCES}
${HOI4WORLD_IDEOLOGIES_TESTS_SOURCES}
${HOI4WORLD_INTELLIGENCE_AGENCIES_TESTS_SOURCES}
${HOI4WORLD_LANDMARKS_TESTS_SOURCES}
${HOI4WORLD_LEADER_TESTS_SOURCES}
${HOI4WORLD_LOCALISATIONS_TESTS_SOURCES}
${HOI4WORLD_LOCALISATIONS_ARTICLERULES_TESTS_SOURCES}
Expand Down Expand Up @@ -798,12 +815,14 @@ list(APPEND ALL_HOI4_TESTS_FILES
${MAPPERS_GOVERNMENT_TESTS_SOURCES}
${MAPPERS_GRAPHICS_TESTS_SOURCES}
${MAPPERS_IDEOLOGY_TESTS_SOURCES}
${MAPPERS_LANDMARKS_TESTS_SOURCES}
${MAPPERS_MERGE_RULES_TESTS_SOURCES}
${MAPPERS_PROVINCES_TESTS_SOURCES}
${MAPPERS_TECHNOLOGY_TESTS_SOURCES}
${MAPPERS_FACTIONNAME_TESTS_SOURCES}
${MAPS_TESTS_SOURCES}
${OUTHOI4_CHARACTERS_TESTS_SOURCES}
${OUTHOI4_LANDMARKS_SOURCES}
${OUTHOI4_MAP_TESTS_SOURCES}
${VIC2WORLD_AI_TESTS_SOURCES}
${VIC2WORLD_COUNTRIES_TESTS_SOURCES}
Expand Down Expand Up @@ -842,6 +861,8 @@ target_precompile_headers(Vic2ToHoi4ConverterTests REUSE_FROM Vic2ToHoi4lib)

configure_file("data/test_files/blank_operative_codenames.txt" "${TEST_OUTPUT_DIRECTORY}/common/units/codenames_operatives/blank_operative_codenames.txt" COPYONLY)
configure_file("data/test_files/definition.csv" "${TEST_OUTPUT_DIRECTORY}/HoI4Linux/map/definition.csv" COPYONLY)
configure_file("data/test_files/Buildings/01_landmark_buildings.txt" "${TEST_OUTPUT_DIRECTORY}/HoI4Windows/common/buildings/01_landmark_buildings.txt" COPYONLY)
configure_file("data/test_files/Buildings/LandmarksMappings.txt" "${TEST_OUTPUT_DIRECTORY}/Configurables/LandmarksMappings.txt" COPYONLY)
configure_file("data/test_files/Configurables/ideological_ai_peace.txt" "${TEST_OUTPUT_DIRECTORY}/Configurables/ideological_ai_peace.txt" COPYONLY)
configure_file("data/test_files/Configurables/ideological_cost_modifiers.txt" "${TEST_OUTPUT_DIRECTORY}/Configurables/ideological_cost_modifiers.txt" COPYONLY)
configure_file("data/test_files/Configurables/ideological_unit_medals.txt" "${TEST_OUTPUT_DIRECTORY}/Configurables/ideological_unit_medals.txt" COPYONLY)
Expand Down Expand Up @@ -893,6 +914,7 @@ configure_file("data/test_files/Mappers/Technology/research_bonus_mappings.txt"
configure_file("data/test_files/Mappers/Technology/tech_mappings.txt" "${TEST_OUTPUT_DIRECTORY}/Configurables/tech_mappings.txt" COPYONLY)
configure_file("data/test_files/Mappers/FactionName/factions_mappings.txt" "${TEST_OUTPUT_DIRECTORY}/Configurables/factions_mappings.txt" COPYONLY)
configure_file("data/test_files/Maps/adjacencies.csv" "${TEST_OUTPUT_DIRECTORY}/maptests/map/adjacencies.csv" COPYONLY)
configure_file("data/test_files/Maps/adjacency_rules.txt" "${TEST_OUTPUT_DIRECTORY}/Configurables/Map/adjacency_rules.txt" COPYONLY)
configure_file("data/test_files/Maps/nocsv.bmp" "${TEST_OUTPUT_DIRECTORY}/maptests/nocsv/map/nocsv.bmp" COPYONLY)
configure_file("data/test_files/Maps/provinces.bmp" "${TEST_OUTPUT_DIRECTORY}/maptests/map/provinces.bmp" COPYONLY)
configure_file("data/test_files/Mods/Dependencies.mod" "${TEST_OUTPUT_DIRECTORY}/Vic2/mod/Dependencies.mod" COPYONLY)
Expand Down Expand Up @@ -1035,6 +1057,7 @@ add_library(run_clang_tidy
${HOI4WORLD_IDEAS_SOURCES}
${HOI4WORLD_IDEOLOGIES_SOURCES}
${HOI4WORLD_INTELLIGENCE_AGENCIES_SOURCES}
${HOI4WORLD_LANDMARKS_SOURCES}
${HOI4WORLD_LEADERS_SOURCES}
${HOI4WORLD_LOCALISATIONS_SOURCES}
${HOI4WORLD_LOCALISATIONS_ARTICLERULES_SOURCES}
Expand Down Expand Up @@ -1065,6 +1088,7 @@ add_library(run_clang_tidy
${MAPPERS_GOVERNMENT_SOURCES}
${MAPPERS_GRAPHICS_SOURCES}
${MAPPERS_IDEOLOGY_SOURCES}
${MAPPERS_LANDMARKS_SOURCES}
${MAPPERS_MERGE_RULES_SOURCES}
${MAPPERS_TECHNOLOGY_SOURCES}
${MAPPERS_PROVINCES_SOURCES}
Expand Down Expand Up @@ -1101,6 +1125,7 @@ add_library(run_clang_tidy
${OUTHOI4_IDEOLOGIES_SOURCES}
${OUTHOI4_INTELLIGENCE_AGENCIES_SOURCES}
${OUTHOI4_INTERFACE_SOURCES}
${OUTHOI4_LANDMARKS_SOURCES}
${OUTHOI4_LEADERS_SOURCES}
${OUTHOI4_MAP_SOURCES}
${OUTHOI4_MILITARY_SOURCES}
Expand Down Expand Up @@ -1135,6 +1160,7 @@ add_library(run_clang_tidy
${HOI4WORLD_IDEAS_TESTS_SOURCES}
${HOI4WORLD_IDEOLOGIES_TESTS_SOURCES}
${HOI4WORLD_INTELLIGENCE_AGENCIES_TESTS_SOURCES}
${HOI4WORLD_LANDMARKS_TESTS_SOURCES}
${HOI4WORLD_LEADER_TESTS_SOURCES}
${HOI4WORLD_LOCALISATIONS_TESTS_SOURCES}
${HOI4WORLD_LOCALISATIONS_ARTICLERULES_TESTS_SOURCES}
Expand Down Expand Up @@ -1166,6 +1192,7 @@ add_library(run_clang_tidy
${MAPPERS_GOVERNMENT_TESTS_SOURCES}
${MAPPERS_GRAPHICS_TESTS_SOURCES}
${MAPPERS_IDEOLOGY_TESTS_SOURCES}
${MAPPERS_LANDMARKS_TESTS_SOURCES}
${MAPPERS_MERGE_RULES_TESTS_SOURCES}
${MAPPERS_PROVINCES_TESTS_SOURCES}
${MAPPERS_TECHNOLOGY_TESTS_SOURCES}
Expand Down
2 changes: 1 addition & 1 deletion Vic2ToHoI4-Installer.iss
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!

#define MyAppName "Vic2 to HoI4"
#define MyAppVersion "1.2 Tito"
#define MyAppVersion "1.3 Umberto II"
#define MyAppPublisher "Paradox Game Converters Group"
#define MyAppURL "https://paradoxgameconverters.com/"
#define MyAppExeName "ConverterFrontend.exe"
Expand Down
1 change: 1 addition & 0 deletions Vic2ToHoI4.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,7 @@
<Text Include="data\configurables\IdeologyMappings.txt" />
<Text Include="data\configurables\ImportCharacters.txt" />
<Text Include="data\configurables\IntelligenceAgencyLogos.txt" />
<Text Include="data\configurables\LandmarksMappings.txt" />
<Text Include="data\configurables\languageReplacements.txt" />
<Text Include="data\configurables\languageReplacementsBis.txt" />
<Text Include="data\configurables\Localisations\ArticleRules.txt" />
Expand Down
3 changes: 3 additions & 0 deletions Vic2ToHoI4.vcxproj.filters
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,9 @@
<Text Include="data\configurables\IntelligenceAgencyLogos.txt">
<Filter>data\configurables</Filter>
</Text>
<Text Include="data\configurables\LandmarksMappings.txt">
<Filter>data\configurables</Filter>
</Text>
<Text Include="data\configurables\languageReplacements.txt">
<Filter>data\configurables</Filter>
</Text>
Expand Down
Loading

0 comments on commit f5c32df

Please sign in to comment.