Skip to content

Commit f5c32df

Browse files
cetvrtakcetvrtak
authored
1.15 support (#1711)
* 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
1 parent aa8fa6c commit f5c32df

File tree

239 files changed

+27582
-2599
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

239 files changed

+27582
-2599
lines changed

‎.github/workflows/windows_build_test_and_push.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,12 @@ jobs:
4646
- name: "Prepare release"
4747
run: |
4848
cd "C:\Program Files\7-Zip\"
49-
.\7z.exe a $Env:GITHUB_WORKSPACE\Vic2ToHoI4-1.2Tito-win-x64.zip $Env:GITHUB_WORKSPACE\build\Release\*
49+
.\7z.exe a $Env:GITHUB_WORKSPACE\Vic2ToHoI4-1.3Umberto-II-win-x64.zip $Env:GITHUB_WORKSPACE\build\Release\*
5050
5151
- name: "Prepare installer"
5252
run: |
5353
c:\"Program Files (x86)\Inno Setup 6\iscc" Vic2ToHoI4-Installer.iss
54-
cp $Env:GITHUB_WORKSPACE\Output\Vic2ToHoI4-latest-win-x64.exe $Env:GITHUB_WORKSPACE\Output\Vic2ToHoI4-1.2Tito-win-x64.exe
54+
cp $Env:GITHUB_WORKSPACE\Output\Vic2ToHoI4-latest-win-x64.exe $Env:GITHUB_WORKSPACE\Output\Vic2ToHoI4-1.3Umberto-II-win-x64.exe
5555
5656
- name: "Upload binaries to release"
5757
if: ${{ github.event_name == 'push' }}
@@ -61,7 +61,7 @@ jobs:
6161
allowUpdates: true
6262
omitBodyDuringUpdate: true
6363
omitNameDuringUpdate: true
64-
artifacts: Vic2ToHoI4-1.2Tito-win-x64.zip, Output\Vic2ToHoI4-1.2Tito-win-x64.exe
64+
artifacts: Vic2ToHoI4-1.3Umberto-II-win-x64.zip, Output\Vic2ToHoI4-1.3Umberto-II-win-x64.exe
6565
token: ${{ secrets.API_TOKEN_GITHUB }}
6666

6767
- name: "Prepare pull request artifact"

‎CMakeLists.txt

+27
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,10 @@ file(GLOB HOI4WORLD_GAME_RULES_SOURCES "${PROJECT_SOURCE_DIR}/src/HOI4World/Game
9292
file(GLOB HOI4WORLD_IDEAS_SOURCES "${PROJECT_SOURCE_DIR}/src/HOI4World/Ideas/*.cpp")
9393
file(GLOB HOI4WORLD_IDEOLOGIES_SOURCES "${PROJECT_SOURCE_DIR}/src/HOI4World/Ideologies/*.cpp")
9494
file(GLOB HOI4WORLD_INTELLIGENCE_AGENCIES_SOURCES "${PROJECT_SOURCE_DIR}/src/HOI4World/IntelligenceAgencies/*.cpp")
95+
set(HOI4WORLD_LANDMARKS_SOURCES ${HOI4WORLD_LANDMARKS_SOURCES} "${PROJECT_SOURCE_DIR}/src/HOI4World/Landmarks/Landmark.cpp")
96+
set(HOI4WORLD_LANDMARKS_SOURCES ${HOI4WORLD_LANDMARKS_SOURCES} "${PROJECT_SOURCE_DIR}/src/HOI4World/Landmarks/Landmarks.cpp")
97+
set(HOI4WORLD_LANDMARKS_SOURCES ${HOI4WORLD_LANDMARKS_SOURCES} "${PROJECT_SOURCE_DIR}/src/HOI4World/Landmarks/LandmarkBuildings.cpp")
98+
set(HOI4WORLD_LANDMARKS_SOURCES ${HOI4WORLD_LANDMARKS_SOURCES} "${PROJECT_SOURCE_DIR}/src/HOI4World/Landmarks/LandmarkModifiers.cpp")
9599
set(HOI4WORLD_LEADERS_SOURCES ${HOI4WORLD_LEADERS_SOURCES} "${PROJECT_SOURCE_DIR}/src/HOI4World/Leaders/Advisor.cpp")
96100
set(HOI4WORLD_LEADERS_SOURCES ${HOI4WORLD_LEADERS_SOURCES} "${PROJECT_SOURCE_DIR}/src/HOI4World/Leaders/IdeologicalAdvisors.cpp")
97101
set(HOI4WORLD_LOCALISATIONS_SOURCES ${HOI4WORLD_LOCALISATIONS_SOURCES} "${PROJECT_SOURCE_DIR}/src/HOI4World/Localisations/AllReplacementRules.cpp")
@@ -173,6 +177,8 @@ set(MAPPERS_GRAPHICS_SOURCES ${MAPPERS_GRAPHICS_SOURCES} "${PROJECT_SOURCE_DIR}/
173177
set(MAPPERS_IDEOLOGY_SOURCES ${MAPPERS_IDEOLOGY_SOURCES} "${PROJECT_SOURCE_DIR}/src/Mappers/Ideology/IdeologyMappingFactory.cpp")
174178
set(MAPPERS_IDEOLOGY_SOURCES ${MAPPERS_IDEOLOGY_SOURCES} "${PROJECT_SOURCE_DIR}/src/Mappers/Ideology/IdeologyMapper.cpp")
175179
set(MAPPERS_IDEOLOGY_SOURCES ${MAPPERS_IDEOLOGY_SOURCES} "${PROJECT_SOURCE_DIR}/src/Mappers/Ideology/IdeologyMapperFactory.cpp")
180+
set(MAPPERS_LANDMARKS_SOURCES ${MAPPERS_LANDMARKS_SOURCES} "${PROJECT_SOURCE_DIR}/src/Mappers/Buildings/LandmarksMapper.cpp")
181+
set(MAPPERS_LANDMARKS_SOURCES ${MAPPERS_LANDMARKS_SOURCES} "${PROJECT_SOURCE_DIR}/src/Mappers/Buildings/LandmarksMappingFactory.cpp")
176182
set(MAPPERS_MERGE_RULES_SOURCES ${MAPPERS_MERGE_RULES_SOURCES} "${PROJECT_SOURCE_DIR}/src/Mappers/MergeRules/MergeRuleFactory.cpp")
177183
set(MAPPERS_MERGE_RULES_SOURCES ${MAPPERS_MERGE_RULES_SOURCES} "${PROJECT_SOURCE_DIR}/src/Mappers/MergeRules/MergeRulesFactory.cpp")
178184
set(MAPPERS_PROVINCES_SOURCES ${MAPPERS_PROVINCES_SOURCES} "${PROJECT_SOURCE_DIR}/src/Mappers/Provinces/ProvinceMapperFactory.cpp")
@@ -266,6 +272,8 @@ file(GLOB OUTHOI4_IDEAS_SOURCES "${PROJECT_SOURCE_DIR}/src/OutHoi4/Ideas/*.cpp")
266272
file(GLOB OUTHOI4_IDEOLOGIES_SOURCES "${PROJECT_SOURCE_DIR}/src/OutHoi4/Ideologies/*.cpp")
267273
file(GLOB OUTHOI4_INTELLIGENCE_AGENCIES_SOURCES "${PROJECT_SOURCE_DIR}/src/OutHoi4/IntelligenceAgencies/*.cpp")
268274
set(OUTHOI4_INTERFACE_SOURCES ${OUTHOI4_INTERFACE_SOURCES} "${PROJECT_SOURCE_DIR}/src/OutHoi4/Interface/OutMonarchsInterface.cpp")
275+
set(OUTHOI4_LANDMARKS_SOURCES ${OUTHOI4_LANDMARKS_SOURCES} "${PROJECT_SOURCE_DIR}/src/OutHoi4/Landmarks/OutLandmark.cpp")
276+
set(OUTHOI4_LANDMARKS_SOURCES ${OUTHOI4_LANDMARKS_SOURCES} "${PROJECT_SOURCE_DIR}/src/OutHoi4/Landmarks/OutLandmarkBuildings.cpp")
269277
set(OUTHOI4_LEADERS_SOURCES ${OUTHOI4_LEADERS_SOURCES} "${PROJECT_SOURCE_DIR}/src/OutHoi4/Leaders/OutAdvisor.cpp")
270278
file(GLOB OUTHOI4_MAP_SOURCES "${PROJECT_SOURCE_DIR}/src/OutHoi4/Map/*.cpp")
271279
file(GLOB OUTHOI4_MILITARY_SOURCES "${PROJECT_SOURCE_DIR}/src/OutHoi4/Military/*.cpp")
@@ -340,6 +348,7 @@ list(APPEND ALL_HOI4_FILES
340348
${OUTHOI4_IDEOLOGIES_SOURCES}
341349
${OUTHOI4_INTELLIGENCE_AGENCIES_SOURCES}
342350
${OUTHOI4_INTERFACE_SOURCES}
351+
${OUTHOI4_LANDMARKS_SOURCES}
343352
${OUTHOI4_LEADERS_SOURCES}
344353
${OUTHOI4_MAP_SOURCES}
345354
${OUTHOI4_MILITARY_SOURCES}
@@ -388,6 +397,7 @@ list(APPEND ALL_HOI4_FILES
388397
${MAPPERS_GOVERNMENT_SOURCES}
389398
${MAPPERS_GRAPHICS_SOURCES}
390399
${MAPPERS_IDEOLOGY_SOURCES}
400+
${MAPPERS_LANDMARKS_SOURCES}
391401
${MAPPERS_MERGE_RULES_SOURCES}
392402
${MAPPERS_TECHNOLOGY_SOURCES}
393403
${MAPPERS_PROVINCES_SOURCES}
@@ -415,6 +425,7 @@ list(APPEND ALL_HOI4_FILES
415425
${HOI4WORLD_IDEAS_SOURCES}
416426
${HOI4WORLD_IDEOLOGIES_SOURCES}
417427
${HOI4WORLD_INTELLIGENCE_AGENCIES_SOURCES}
428+
${HOI4WORLD_LANDMARKS_SOURCES}
418429
${HOI4WORLD_LEADERS_SOURCES}
419430
${HOI4WORLD_LOCALISATIONS_SOURCES}
420431
${HOI4WORLD_LOCALISATIONS_ARTICLERULES_SOURCES}
@@ -481,6 +492,7 @@ configure_file("${DATA_FILE_DIR}/configurables/CodenamesOperatives/SWE_opertive_
481492
configure_file("${DATA_FILE_DIR}/configurables/CodenamesOperatives/TUR_operative_codenames.txt" "${CONVERTER_OUTPUT_DIRECTORY}/Configurables/CodenamesOperatives/TUR_operative_codenames.txt" COPYONLY)
482493
configure_file("${DATA_FILE_DIR}/configurables/Localisations/ArticleRules.txt" "${CONVERTER_OUTPUT_DIRECTORY}/Configurables/Localisations/ArticleRules.txt" COPYONLY)
483494
configure_file("${DATA_FILE_DIR}/configurables/Localisations/StateCategories.txt" "${CONVERTER_OUTPUT_DIRECTORY}/Configurables/Localisations/StateCategories.txt" COPYONLY)
495+
configure_file("${DATA_FILE_DIR}/configurables/Map/adjacency_rules.txt" "${CONVERTER_OUTPUT_DIRECTORY}/Configurables/Map/adjacency_rules.txt" COPYONLY)
484496
configure_file("${DATA_FILE_DIR}/configurables/Map/regions.txt" "${CONVERTER_OUTPUT_DIRECTORY}/Configurables/Map/regions.txt" COPYONLY)
485497
configure_file("${DATA_FILE_DIR}/configurables/casus_bellis_mappings.txt" "${CONVERTER_OUTPUT_DIRECTORY}/Configurables/casus_bellis_mappings.txt" COPYONLY)
486498
configure_file("${DATA_FILE_DIR}/configurables/converterDynamicModifiers.txt" "${CONVERTER_OUTPUT_DIRECTORY}/Configurables/converterDynamicModifiers.txt" COPYONLY)
@@ -510,6 +522,7 @@ configure_file("${DATA_FILE_DIR}/configurables/ideologicalDecisions.txt" "${CONV
510522
configure_file("${DATA_FILE_DIR}/configurables/IdeologyMappings.txt" "${CONVERTER_OUTPUT_DIRECTORY}/Configurables/IdeologyMappings.txt" COPYONLY)
511523
configure_file("${DATA_FILE_DIR}/configurables/ImportCharacters.txt" "${CONVERTER_OUTPUT_DIRECTORY}/Configurables/ImportCharacters.txt" COPYONLY)
512524
configure_file("${DATA_FILE_DIR}/configurables/IntelligenceAgencyLogos.txt" "${CONVERTER_OUTPUT_DIRECTORY}/Configurables/IntelligenceAgencyLogos.txt" COPYONLY)
525+
configure_file("${DATA_FILE_DIR}/configurables/LandmarksMappings.txt" "${CONVERTER_OUTPUT_DIRECTORY}/Configurables/LandmarksMappings.txt" COPYONLY)
513526
configure_file("${DATA_FILE_DIR}/configurables/languageReplacements.txt" "${CONVERTER_OUTPUT_DIRECTORY}/Configurables/languageReplacements.txt" COPYONLY)
514527
configure_file("${DATA_FILE_DIR}/configurables/languageReplacementsBis.txt" "${CONVERTER_OUTPUT_DIRECTORY}/Configurables/languageReplacementsBis.txt" COPYONLY)
515528
configure_file("${DATA_FILE_DIR}/configurables/merge_nations.txt" "${CONVERTER_OUTPUT_DIRECTORY}/Configurables/merge_nations.txt" COPYONLY)
@@ -616,6 +629,7 @@ file(GLOB HOI4WORLD_GAME_RULES_TESTS_SOURCES "${PROJECT_SOURCE_DIR}/src/HOI4Worl
616629
file(GLOB HOI4WORLD_IDEAS_TESTS_SOURCES "${PROJECT_SOURCE_DIR}/src/HOI4World/Ideas/*.cpp")
617630
file(GLOB HOI4WORLD_IDEOLOGIES_TESTS_SOURCES "${PROJECT_SOURCE_DIR}/src/HOI4World/Ideologies/*.cpp")
618631
file(GLOB HOI4WORLD_INTELLIGENCE_AGENCIES_TESTS_SOURCES "${PROJECT_SOURCE_DIR}/src/HOI4World/IntelligenceAgencies/*.cpp")
632+
set(HOI4WORLD_LANDMARKS_TESTS_SOURCES ${HOI4WORLD_LANDMARKS_TESTS_SOURCES} "${PROJECT_SOURCE_DIR}/src/HOI4World/Landmarks/LandmarkBuildingsTests.cpp")
619633
set(HOI4WORLD_LEADER_TESTS_SOURCES ${HOI4WORLD_LEADER_TESTS_SOURCES} "${PROJECT_SOURCE_DIR}/src/HOI4World/Leaders/AdvisorTests.cpp")
620634
set(HOI4WORLD_LOCALISATIONS_TESTS_SOURCES ${HOI4WORLD_LOCALISATIONS_TESTS_SOURCES} "${PROJECT_SOURCE_DIR}/src/HOI4World/Localisations/AllReplacementRulesTests.cpp")
621635
set(HOI4WORLD_LOCALISATIONS_TESTS_SOURCES ${HOI4WORLD_LOCALISATIONS_TESTS_SOURCES} "${PROJECT_SOURCE_DIR}/src/HOI4World/Localisations/GrammarMappingsTests.cpp")
@@ -682,6 +696,8 @@ set(MAPPERS_GRAPHICS_TESTS_SOURCES ${MAPPERS_GRAPHICS_TESTS_SOURCES} "${PROJECT_
682696
set(MAPPERS_GRAPHICS_TESTS_SOURCES ${MAPPERS_GRAPHICS_TESTS_SOURCES} "${PROJECT_SOURCE_DIR}/src/Mappers/Graphics/GraphicsMapperTests.cpp")
683697
set(MAPPERS_IDEOLOGY_TESTS_SOURCES ${MAPPERS_IDEOLOGY_TESTS_SOURCES} "${PROJECT_SOURCE_DIR}/src/Mappers/Ideology/IdeologyMappingTests.cpp")
684698
set(MAPPERS_IDEOLOGY_TESTS_SOURCES ${MAPPERS_IDEOLOGY_TESTS_SOURCES} "${PROJECT_SOURCE_DIR}/src/Mappers/Ideology/IdeologyMapperTests.cpp")
699+
set(MAPPERS_LANDMARKS_TESTS_SOURCES ${MAPPERS_LANDMARKS_TESTS_SOURCES} "${PROJECT_SOURCE_DIR}/src/Mappers/Buildings/LandmarksMapperTests.cpp")
700+
set(MAPPERS_LANDMARKS_TESTS_SOURCES ${MAPPERS_LANDMARKS_TESTS_SOURCES} "${PROJECT_SOURCE_DIR}/src/Mappers/Buildings/LandmarksMappingTests.cpp")
685701
set(MAPPERS_MERGE_RULES_TESTS_SOURCES ${MAPPERS_MERGE_RULES_TESTS_SOURCES} "${PROJECT_SOURCE_DIR}/src/Mappers/MergeRules/MergeRulesTests.cpp")
686702
set(MAPPERS_MERGE_RULES_TESTS_SOURCES ${MAPPERS_MERGE_RULES_TESTS_SOURCES} "${PROJECT_SOURCE_DIR}/src/Mappers/MergeRules/MergeRuleTests.cpp")
687703
set(MAPPERS_PROVINCES_TESTS_SOURCES ${MAPPERS_PROVINCES_TESTS_SOURCES} "${PROJECT_SOURCE_DIR}/src/Mappers/Provinces/ProvinceMapperTests.cpp")
@@ -766,6 +782,7 @@ list(APPEND ALL_HOI4_TESTS_FILES
766782
${HOI4WORLD_IDEAS_TESTS_SOURCES}
767783
${HOI4WORLD_IDEOLOGIES_TESTS_SOURCES}
768784
${HOI4WORLD_INTELLIGENCE_AGENCIES_TESTS_SOURCES}
785+
${HOI4WORLD_LANDMARKS_TESTS_SOURCES}
769786
${HOI4WORLD_LEADER_TESTS_SOURCES}
770787
${HOI4WORLD_LOCALISATIONS_TESTS_SOURCES}
771788
${HOI4WORLD_LOCALISATIONS_ARTICLERULES_TESTS_SOURCES}
@@ -798,12 +815,14 @@ list(APPEND ALL_HOI4_TESTS_FILES
798815
${MAPPERS_GOVERNMENT_TESTS_SOURCES}
799816
${MAPPERS_GRAPHICS_TESTS_SOURCES}
800817
${MAPPERS_IDEOLOGY_TESTS_SOURCES}
818+
${MAPPERS_LANDMARKS_TESTS_SOURCES}
801819
${MAPPERS_MERGE_RULES_TESTS_SOURCES}
802820
${MAPPERS_PROVINCES_TESTS_SOURCES}
803821
${MAPPERS_TECHNOLOGY_TESTS_SOURCES}
804822
${MAPPERS_FACTIONNAME_TESTS_SOURCES}
805823
${MAPS_TESTS_SOURCES}
806824
${OUTHOI4_CHARACTERS_TESTS_SOURCES}
825+
${OUTHOI4_LANDMARKS_SOURCES}
807826
${OUTHOI4_MAP_TESTS_SOURCES}
808827
${VIC2WORLD_AI_TESTS_SOURCES}
809828
${VIC2WORLD_COUNTRIES_TESTS_SOURCES}
@@ -842,6 +861,8 @@ target_precompile_headers(Vic2ToHoi4ConverterTests REUSE_FROM Vic2ToHoi4lib)
842861

843862
configure_file("data/test_files/blank_operative_codenames.txt" "${TEST_OUTPUT_DIRECTORY}/common/units/codenames_operatives/blank_operative_codenames.txt" COPYONLY)
844863
configure_file("data/test_files/definition.csv" "${TEST_OUTPUT_DIRECTORY}/HoI4Linux/map/definition.csv" COPYONLY)
864+
configure_file("data/test_files/Buildings/01_landmark_buildings.txt" "${TEST_OUTPUT_DIRECTORY}/HoI4Windows/common/buildings/01_landmark_buildings.txt" COPYONLY)
865+
configure_file("data/test_files/Buildings/LandmarksMappings.txt" "${TEST_OUTPUT_DIRECTORY}/Configurables/LandmarksMappings.txt" COPYONLY)
845866
configure_file("data/test_files/Configurables/ideological_ai_peace.txt" "${TEST_OUTPUT_DIRECTORY}/Configurables/ideological_ai_peace.txt" COPYONLY)
846867
configure_file("data/test_files/Configurables/ideological_cost_modifiers.txt" "${TEST_OUTPUT_DIRECTORY}/Configurables/ideological_cost_modifiers.txt" COPYONLY)
847868
configure_file("data/test_files/Configurables/ideological_unit_medals.txt" "${TEST_OUTPUT_DIRECTORY}/Configurables/ideological_unit_medals.txt" COPYONLY)
@@ -893,6 +914,7 @@ configure_file("data/test_files/Mappers/Technology/research_bonus_mappings.txt"
893914
configure_file("data/test_files/Mappers/Technology/tech_mappings.txt" "${TEST_OUTPUT_DIRECTORY}/Configurables/tech_mappings.txt" COPYONLY)
894915
configure_file("data/test_files/Mappers/FactionName/factions_mappings.txt" "${TEST_OUTPUT_DIRECTORY}/Configurables/factions_mappings.txt" COPYONLY)
895916
configure_file("data/test_files/Maps/adjacencies.csv" "${TEST_OUTPUT_DIRECTORY}/maptests/map/adjacencies.csv" COPYONLY)
917+
configure_file("data/test_files/Maps/adjacency_rules.txt" "${TEST_OUTPUT_DIRECTORY}/Configurables/Map/adjacency_rules.txt" COPYONLY)
896918
configure_file("data/test_files/Maps/nocsv.bmp" "${TEST_OUTPUT_DIRECTORY}/maptests/nocsv/map/nocsv.bmp" COPYONLY)
897919
configure_file("data/test_files/Maps/provinces.bmp" "${TEST_OUTPUT_DIRECTORY}/maptests/map/provinces.bmp" COPYONLY)
898920
configure_file("data/test_files/Mods/Dependencies.mod" "${TEST_OUTPUT_DIRECTORY}/Vic2/mod/Dependencies.mod" COPYONLY)
@@ -1035,6 +1057,7 @@ add_library(run_clang_tidy
10351057
${HOI4WORLD_IDEAS_SOURCES}
10361058
${HOI4WORLD_IDEOLOGIES_SOURCES}
10371059
${HOI4WORLD_INTELLIGENCE_AGENCIES_SOURCES}
1060+
${HOI4WORLD_LANDMARKS_SOURCES}
10381061
${HOI4WORLD_LEADERS_SOURCES}
10391062
${HOI4WORLD_LOCALISATIONS_SOURCES}
10401063
${HOI4WORLD_LOCALISATIONS_ARTICLERULES_SOURCES}
@@ -1065,6 +1088,7 @@ add_library(run_clang_tidy
10651088
${MAPPERS_GOVERNMENT_SOURCES}
10661089
${MAPPERS_GRAPHICS_SOURCES}
10671090
${MAPPERS_IDEOLOGY_SOURCES}
1091+
${MAPPERS_LANDMARKS_SOURCES}
10681092
${MAPPERS_MERGE_RULES_SOURCES}
10691093
${MAPPERS_TECHNOLOGY_SOURCES}
10701094
${MAPPERS_PROVINCES_SOURCES}
@@ -1101,6 +1125,7 @@ add_library(run_clang_tidy
11011125
${OUTHOI4_IDEOLOGIES_SOURCES}
11021126
${OUTHOI4_INTELLIGENCE_AGENCIES_SOURCES}
11031127
${OUTHOI4_INTERFACE_SOURCES}
1128+
${OUTHOI4_LANDMARKS_SOURCES}
11041129
${OUTHOI4_LEADERS_SOURCES}
11051130
${OUTHOI4_MAP_SOURCES}
11061131
${OUTHOI4_MILITARY_SOURCES}
@@ -1135,6 +1160,7 @@ add_library(run_clang_tidy
11351160
${HOI4WORLD_IDEAS_TESTS_SOURCES}
11361161
${HOI4WORLD_IDEOLOGIES_TESTS_SOURCES}
11371162
${HOI4WORLD_INTELLIGENCE_AGENCIES_TESTS_SOURCES}
1163+
${HOI4WORLD_LANDMARKS_TESTS_SOURCES}
11381164
${HOI4WORLD_LEADER_TESTS_SOURCES}
11391165
${HOI4WORLD_LOCALISATIONS_TESTS_SOURCES}
11401166
${HOI4WORLD_LOCALISATIONS_ARTICLERULES_TESTS_SOURCES}
@@ -1166,6 +1192,7 @@ add_library(run_clang_tidy
11661192
${MAPPERS_GOVERNMENT_TESTS_SOURCES}
11671193
${MAPPERS_GRAPHICS_TESTS_SOURCES}
11681194
${MAPPERS_IDEOLOGY_TESTS_SOURCES}
1195+
${MAPPERS_LANDMARKS_TESTS_SOURCES}
11691196
${MAPPERS_MERGE_RULES_TESTS_SOURCES}
11701197
${MAPPERS_PROVINCES_TESTS_SOURCES}
11711198
${MAPPERS_TECHNOLOGY_TESTS_SOURCES}

‎Vic2ToHoI4-Installer.iss

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
33

44
#define MyAppName "Vic2 to HoI4"
5-
#define MyAppVersion "1.2 Tito"
5+
#define MyAppVersion "1.3 Umberto II"
66
#define MyAppPublisher "Paradox Game Converters Group"
77
#define MyAppURL "https://paradoxgameconverters.com/"
88
#define MyAppExeName "ConverterFrontend.exe"

‎Vic2ToHoI4.vcxproj

+1
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,7 @@
162162
<Text Include="data\configurables\IdeologyMappings.txt" />
163163
<Text Include="data\configurables\ImportCharacters.txt" />
164164
<Text Include="data\configurables\IntelligenceAgencyLogos.txt" />
165+
<Text Include="data\configurables\LandmarksMappings.txt" />
165166
<Text Include="data\configurables\languageReplacements.txt" />
166167
<Text Include="data\configurables\languageReplacementsBis.txt" />
167168
<Text Include="data\configurables\Localisations\ArticleRules.txt" />

‎Vic2ToHoI4.vcxproj.filters

+3
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,9 @@
208208
<Text Include="data\configurables\IntelligenceAgencyLogos.txt">
209209
<Filter>data\configurables</Filter>
210210
</Text>
211+
<Text Include="data\configurables\LandmarksMappings.txt">
212+
<Filter>data\configurables</Filter>
213+
</Text>
211214
<Text Include="data\configurables\languageReplacements.txt">
212215
<Filter>data\configurables</Filter>
213216
</Text>

0 commit comments

Comments
 (0)