Fix army unit conversion (#559)

* Add ability to import a military formation. * Add ability to import all formations. * Minor fixes * Actually import military formations. * Put military formations in their owning countries, not in the overall world. * Extract battalion-finding code to its own function. * Update test save * Add method to convert military formations to batallions. * Add mappings for formations * Formatting. * Separate army and navy military formations. * Convert navies. * Fix army locations. * Set fleet names. * Fix broken test * Fix another test * Fix another test. * Disable converting new-style fleets for the moment. * Remove a stray comment. * Update cmake * Rename file * Formatting
ParadoxGameConverters · Jan 21, 2024 · 683fa5d · 683fa5d
1 parent a2eb763
commit 683fa5d
Show file tree

Hide file tree

Showing 26 changed files with 1,194 additions and 93 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -173,6 +173,8 @@ set(CONVERTER_SOURCES ${CONVERTER_SOURCES} "src/vic3_world/institutions/institut
 set(CONVERTER_SOURCES ${CONVERTER_SOURCES} "src/vic3_world/interest_groups/interest_group_importer.cpp")
 set(CONVERTER_SOURCES ${CONVERTER_SOURCES} "src/vic3_world/interest_groups/interest_groups_importer.cpp")
 set(CONVERTER_SOURCES ${CONVERTER_SOURCES} "src/vic3_world/laws/laws_importer.cpp")
+set(CONVERTER_SOURCES ${CONVERTER_SOURCES} "src/vic3_world/military/military_formations_importer.cpp")
+set(CONVERTER_SOURCES ${CONVERTER_SOURCES} "src/vic3_world/military/military_formation_importer.cpp")
 set(CONVERTER_SOURCES ${CONVERTER_SOURCES} "src/vic3_world/pacts/pact_importer.cpp")
 set(CONVERTER_SOURCES ${CONVERTER_SOURCES} "src/vic3_world/pacts/pacts_importer.cpp")
 set(CONVERTER_SOURCES ${CONVERTER_SOURCES} "src/vic3_world/provinces/vic3_province_definitions.cpp")
@@ -400,6 +402,8 @@ set(TEST_SOURCES ${TEST_SOURCES} "src/vic3_world/institutions/institutions_impor
 set(TEST_SOURCES ${TEST_SOURCES} "src/vic3_world/interest_groups/interest_groups_importer_tests.cpp")
 set(TEST_SOURCES ${TEST_SOURCES} "src/vic3_world/interest_groups/interest_group_importer_tests.cpp")
 set(TEST_SOURCES ${TEST_SOURCES} "src/vic3_world/laws/laws_importer_tests.cpp")
+set(TEST_SOURCES ${TEST_SOURCES} "src/vic3_world/military/military_formations_importer_tests.cpp")
+set(TEST_SOURCES ${TEST_SOURCES} "src/vic3_world/military/military_formation_importer_tests.cpp")
 set(TEST_SOURCES ${TEST_SOURCES} "src/vic3_world/pacts/pacts_importer_tests.cpp")
 set(TEST_SOURCES ${TEST_SOURCES} "src/vic3_world/pacts/pact_importer_tests.cpp")
 set(TEST_SOURCES ${TEST_SOURCES} "src/vic3_world/pacts/pact_test.cpp")

diff --git a/Vic3ToHoI4Tests.vcxproj b/Vic3ToHoI4Tests.vcxproj
@@ -114,6 +114,8 @@
     <ClCompile Include="src\mappers\character\character_trait_mapper_tests.cpp" />
     <ClCompile Include="src\vic3_world\ideologies\ideology_importer_tests.cpp" />
     <ClCompile Include="src\vic3_world\institutions\institutions_importer_tests.cpp" />
+    <ClCompile Include="src\vic3_world\military\military_formations_importer_tests.cpp" />
+    <ClCompile Include="src\vic3_world\military\military_formation_importer_tests.cpp" />
     <ClCompile Include="src\vic3_world\pacts\pacts_importer_tests.cpp" />
     <ClCompile Include="src\configuration\configuration_importer_tests.cpp" />
     <ClCompile Include="src\hoi4_world\characters\hoi4_characters_converter_tests.cpp" />

diff --git a/Vic3ToHoI4Tests.vcxproj.filters b/Vic3ToHoI4Tests.vcxproj.filters
@@ -180,6 +180,9 @@
     <Filter Include="src\out_hoi4\diplomacy">
       <UniqueIdentifier>{22bef3c9-5e92-4aa9-8e42-801243baefc1}</UniqueIdentifier>
     </Filter>
+    <Filter Include="src\vic3_world\military">
+      <UniqueIdentifier>{7b80163d-64f7-4031-959c-c160201e684e}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="src\out_hoi4\out_mod_test.cpp">
@@ -557,6 +560,12 @@
     <ClCompile Include="src\out_hoi4\diplomacy\out_war_tests.cpp">
       <Filter>src\out_hoi4\diplomacy</Filter>
     </ClCompile>
+    <ClCompile Include="src\vic3_world\military\military_formation_importer_tests.cpp">
+      <Filter>src\vic3_world\military</Filter>
+    </ClCompile>
+    <ClCompile Include="src\vic3_world\military\military_formations_importer_tests.cpp">
+      <Filter>src\vic3_world\military</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <CopyFileToFolders Include="external\rakaly\rakaly.dll">

diff --git a/Vic3ToHoI4lib.vcxproj b/Vic3ToHoI4lib.vcxproj
@@ -164,6 +164,9 @@
     <ClInclude Include="src\vic3_world\interest_groups\interest_groups_importer.h" />
     <ClInclude Include="src\vic3_world\interest_groups\interest_group_importer.h" />
     <ClInclude Include="src\vic3_world\laws\laws_importer.h" />
+    <ClInclude Include="src\vic3_world\military\military_formation.h" />
+    <ClInclude Include="src\vic3_world\military\military_formations_importer.h" />
+    <ClInclude Include="src\vic3_world\military\military_formation_importer.h" />
     <ClInclude Include="src\vic3_world\pacts\pact.h" />
     <ClInclude Include="src\vic3_world\pacts\pacts_importer.h" />
     <ClInclude Include="src\vic3_world\pacts\pact_importer.h" />
@@ -296,6 +299,8 @@
     <ClCompile Include="src\vic3_world\interest_groups\interest_groups_importer.cpp" />
     <ClCompile Include="src\vic3_world\interest_groups\interest_group_importer.cpp" />
     <ClCompile Include="src\vic3_world\laws\laws_importer.cpp" />
+    <ClCompile Include="src\vic3_world\military\military_formations_importer.cpp" />
+    <ClCompile Include="src\vic3_world\military\military_formation_importer.cpp" />
     <ClCompile Include="src\vic3_world\pacts\pacts_importer.cpp" />
     <ClCompile Include="src\vic3_world\pacts\pact_importer.cpp" />
     <ClCompile Include="src\vic3_world\provinces\vic3_province_definitions.cpp" />

diff --git a/Vic3ToHoI4lib.vcxproj.filters b/Vic3ToHoI4lib.vcxproj.filters
@@ -198,6 +198,9 @@
     <Filter Include="src\vic3_world\wars">
       <UniqueIdentifier>{f81bdcd3-9fdd-4a81-b245-ab3bae1d4db4}</UniqueIdentifier>
     </Filter>
+    <Filter Include="src\vic3_world\military">
+      <UniqueIdentifier>{5c7d0789-b5d6-46fe-906f-5e9065413240}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="src\vic3_to_hoi4_converter.h">
@@ -488,9 +491,6 @@
     <ClInclude Include="src\mappers\flags\flag_mapper.h">
       <Filter>src\mappers\unit</Filter>
     </ClInclude>
-    <ClInclude Include="src\mappers\flags\flag_mapper_importer.h">
-      <Filter>src\mappers\unit</Filter>
-    </ClInclude>
     <ClInclude Include="src\mappers\ideology\ideology_mapper.h">
       <Filter>src\mappers\ideology</Filter>
     </ClInclude>
@@ -736,6 +736,15 @@
     <ClInclude Include="src\vic3_world\wars\wars_importer.h">
       <Filter>src\vic3_world\wars</Filter>
     </ClInclude>
+    <ClInclude Include="src\vic3_world\military\military_formation.h">
+      <Filter>src\vic3_world\military</Filter>
+    </ClInclude>
+    <ClInclude Include="src\vic3_world\military\military_formation_importer.h">
+      <Filter>src\vic3_world\military</Filter>
+    </ClInclude>
+    <ClInclude Include="src\vic3_world\military\military_formations_importer.h">
+      <Filter>src\vic3_world\military</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="src\vic3_to_hoi4_converter.cpp">
@@ -1137,10 +1146,16 @@
     <ClCompile Include="src\vic3_world\wars\wars_importer.cpp">
       <Filter>src\vic3_world\wars</Filter>
     </ClCompile>
+    <ClCompile Include="src\vic3_world\military\military_formation_importer.cpp">
+      <Filter>src\vic3_world\military</Filter>
+    </ClCompile>
+    <ClCompile Include="src\vic3_world\military\military_formations_importer.cpp">
+      <Filter>src\vic3_world\military</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <Library Include="external\rakaly\rakaly.dll.lib">
       <Filter>external\rakaly</Filter>
     </Library>
   </ItemGroup>
-</Project>
+</Project>