1.13 support

.github/workflows/windows_build_test_and_push.yml

@@ -46,12 +46,12 @@ jobs:
     - name: "Prepare release"
       run: |
        cd "C:\Program Files\7-Zip\"
-       .\7z.exe a $Env:GITHUB_WORKSPACE\Vic2ToHoI4-1.0Rommel-win-x64.zip $Env:GITHUB_WORKSPACE\build\Release\*
+       .\7z.exe a $Env:GITHUB_WORKSPACE\Vic2ToHoI4-1.1Spruance-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.0Rommel-win-x64.exe
+        cp $Env:GITHUB_WORKSPACE\Output\Vic2ToHoI4-latest-win-x64.exe $Env:GITHUB_WORKSPACE\Output\Vic2ToHoI4-1.1Spruance-win-x64.exe
 
     - name: "Upload binaries to release"
       if: ${{ github.event_name == 'push' }}
@@ -61,7 +61,7 @@ jobs:
         allowUpdates: true
         omitBodyDuringUpdate: true
         omitNameDuringUpdate: true
-        artifacts: Vic2ToHoI4-1.0Rommel-win-x64.zip, Output\Vic2ToHoI4-1.0Rommel-win-x64.exe
+        artifacts: Vic2ToHoI4-1.1Spruance-win-x64.zip, Output\Vic2ToHoI4-1.1Spruance-win-x64.exe
         token: ${{ secrets.API_TOKEN_GITHUB }}
 
     - name: "Prepare pull request artifact"

CMakeLists.txt

@@ -123,6 +123,10 @@ set(HOI4WORLD_PLANE_DESIGNS_SOURCES ${HOI4WORLD_PLANE_DESIGNS_SOURCES} "${PROJEC
 set(HOI4WORLD_REGIONS_SOURCES ${HOI4WORLD_REGIONS_SOURCES} "${PROJECT_SOURCE_DIR}/src/HOI4World/Regions/RegionFactory.cpp")
 set(HOI4WORLD_REGIONS_SOURCES ${HOI4WORLD_REGIONS_SOURCES} "${PROJECT_SOURCE_DIR}/src/HOI4World/Regions/Regions.cpp")
 set(HOI4WORLD_REGIONS_SOURCES ${HOI4WORLD_REGIONS_SOURCES} "${PROJECT_SOURCE_DIR}/src/HOI4World/Regions/RegionsFactory.cpp")
+set(HOI4WORLD_SCORERS_SOURCES ${HOI4WORLD_SCORERS_SOURCES} "${PROJECT_SOURCE_DIR}/src/HOI4World/Scorers/Scorer.cpp")
+set(HOI4WORLD_SCORERS_SOURCES ${HOI4WORLD_SCORERS_SOURCES} "${PROJECT_SOURCE_DIR}/src/HOI4World/Scorers/ScorerFactory.cpp")
+set(HOI4WORLD_SCORERS_SOURCES ${HOI4WORLD_SCORERS_SOURCES} "${PROJECT_SOURCE_DIR}/src/HOI4World/Scorers/Scorers.cpp")
+set(HOI4WORLD_SCORERS_SOURCES ${HOI4WORLD_SCORERS_SOURCES} "${PROJECT_SOURCE_DIR}/src/HOI4World/Scorers/ScorersFactory.cpp")
 set(HOI4WORLD_SCRIPTED_EFFECTS_SOURCES ${HOI4WORLD_SCRIPTED_EFFECTS_SOURCES} "${PROJECT_SOURCE_DIR}/src/HOI4World/ScriptedEffects/ScriptedEffectFactory.cpp")
 set(HOI4WORLD_SCRIPTED_EFFECTS_SOURCES ${HOI4WORLD_SCRIPTED_EFFECTS_SOURCES} "${PROJECT_SOURCE_DIR}/src/HOI4World/ScriptedEffects/ScriptedEffectFile.cpp")
 set(HOI4WORLD_SCRIPTED_EFFECTS_SOURCES ${HOI4WORLD_SCRIPTED_EFFECTS_SOURCES} "${PROJECT_SOURCE_DIR}/src/HOI4World/ScriptedEffects/ScriptedEffects.cpp")
@@ -277,6 +281,8 @@ set(OUTHOI4_PEACECONFERENCE_SOURCES ${OUTHOI4_PEACECONFERENCE_SOURCES} "${PROJEC
 set(OUTHOI4_PLANE_DESIGNS_SOURCES ${OUTHOI4_PLANE_DESIGNS_SOURCES} "${PROJECT_SOURCE_DIR}/src/OutHoi4/PlaneDesigns/OutPlaneDesign.cpp")
 set(OUTHOI4_PLANE_DESIGNS_SOURCES ${OUTHOI4_PLANE_DESIGNS_SOURCES} "${PROJECT_SOURCE_DIR}/src/OutHoi4/PlaneDesigns/OutPlaneDesigns.cpp")
 set(OUTHOI4_PLANE_DESIGNS_SOURCES ${OUTHOI4_PLANE_DESIGNS_SOURCES} "${PROJECT_SOURCE_DIR}/src/OutHoi4/PlaneDesigns/OutPlaneModules.cpp")
+set(OUTHOI4_SCORERS_SOURCES ${OUTHOI4_SCORERS_SOURCES} "${PROJECT_SOURCE_DIR}/src/OutHoi4/Scorers/OutScorers.cpp")
+set(OUTHOI4_SCORERS_SOURCES ${OUTHOI4_SCORERS_SOURCES} "${PROJECT_SOURCE_DIR}/src/OutHoi4/Scorers/OutScorer.cpp")
 set(OUTHOI4_SCRIPTED_EFFECTS_SOURCES ${OUTHOI4_SCRIPTED_EFFECTS_SOURCES} "${PROJECT_SOURCE_DIR}/src/OutHoi4/ScriptedEffects/OutScriptedEffects.cpp")
 set(OUTHOI4_SCRIPTED_EFFECTS_SOURCES ${OUTHOI4_SCRIPTED_EFFECTS_SOURCES} "${PROJECT_SOURCE_DIR}/src/OutHoi4/ScriptedEffects/OutScriptedEffect.cpp")
 file(GLOB OUTHOI4_SCRIPTED_LOCALISATIONS_SOURCES "${PROJECT_SOURCE_DIR}/src/OutHoi4/ScriptedLocalisations/*.cpp")
@@ -345,6 +351,7 @@ list(APPEND ALL_HOI4_FILES
 	${OUTHOI4_PEACECONFERENCE_SOURCES}
 	${OUTHOI4_PLANE_DESIGNS_SOURCES}
 	${OUTHOI4_NAVIES_SOURCES}
+	${OUTHOI4_SCORERS_SOURCES}
 	${OUTHOI4_SCRIPTED_EFFECTS_SOURCES}
 	${OUTHOI4_SCRIPTED_LOCALISATIONS_SOURCES}
 	${OUTHOI4_SCRIPTED_TRIGGERS_SOURCES}
@@ -423,6 +430,7 @@ list(APPEND ALL_HOI4_FILES
 	${HOI4WORLD_PEACECONFERENCES_SOURCES}
 	${HOI4WORLD_PLANE_DESIGNS_SOURCES}
 	${HOI4WORLD_REGIONS_SOURCES}
+	${HOI4WORLD_SCORERS_SOURCES}
 	${HOI4WORLD_SCRIPTED_EFFECTS_SOURCES}
 	${HOI4WORLD_SCRIPTED_LOCALISATIONS_SOURCES}
 	${HOI4WORLD_SCRIPTED_TRIGGERS_SOURCES}
@@ -498,7 +506,6 @@ configure_file("${DATA_FILE_DIR}/configurables/ideological_ai_peace.txt" "${CONV
 configure_file("${DATA_FILE_DIR}/configurables/ideological_cost_modifiers.txt" "${CONVERTER_OUTPUT_DIRECTORY}/Configurables/ideological_cost_modifiers.txt" COPYONLY)
 configure_file("${DATA_FILE_DIR}/configurables/ideological_unit_medals.txt" "${CONVERTER_OUTPUT_DIRECTORY}/Configurables/ideological_unit_medals.txt" COPYONLY)
 configure_file("${DATA_FILE_DIR}/configurables/ideologicalDecisions.txt" "${CONVERTER_OUTPUT_DIRECTORY}/Configurables/ideologicalDecisions.txt" COPYONLY)
-configure_file("${DATA_FILE_DIR}/configurables/ideologicalIdeas.txt" "${CONVERTER_OUTPUT_DIRECTORY}/Configurables/ideologicalIdeas.txt" COPYONLY)
 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)
@@ -522,6 +529,7 @@ configure_file("${DATA_FILE_DIR}/configurables/Vic2Localisations/dominions.csv"
 configure_file("${DATA_FILE_DIR}/configurables/Vic2Localisations/unrecognized_nations.csv" "${CONVERTER_OUTPUT_DIRECTORY}/Configurables/Vic2Localisations/unrecognized_nations.csv" COPYONLY)
 file(COPY "${DATA_FILE_DIR}/blank_mod/" DESTINATION "${CONVERTER_OUTPUT_DIRECTORY}/blankmod/")
 file(COPY "${DATA_FILE_DIR}/configurables/CustomizedFocusBranches/" DESTINATION "${CONVERTER_OUTPUT_DIRECTORY}/Configurables/CustomizedFocusBranches/")
+file(COPY "${DATA_FILE_DIR}/configurables/IdeologicalIdeas/" DESTINATION "${CONVERTER_OUTPUT_DIRECTORY}/Configurables/ideologicalIdeas/")
 file(COPY "${DATA_FILE_DIR}/flags" DESTINATION "${CONVERTER_OUTPUT_DIRECTORY}")
 add_custom_command(TARGET Vic2ToHoi4Converter POST_BUILD WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} COMMAND git rev-parse HEAD > build/Release-Linux/commit_id.txt)
 
@@ -634,6 +642,10 @@ set(HOI4WORLD_PLANE_DESIGNS_TESTS_SOURCES ${HOI4WORLD_PLANE_DESIGNS_TESTS_SOURCE
 set(HOI4WORLD_PLANE_DESIGNS_TESTS_SOURCES ${HOI4WORLD_PLANE_DESIGNS_TESTS_SOURCES} "${PROJECT_SOURCE_DIR}/src/HOI4World/PlaneDesigns/PossiblePlaneDesignsTests.cpp")
 set(HOI4WORLD_REGIONS_TESTS_SOURCES ${HOI4WORLD_REGIONS_TESTS_SOURCES} "${PROJECT_SOURCE_DIR}/src/HOI4World/Regions/RegionTests.cpp")
 set(HOI4WORLD_REGIONS_TESTS_SOURCES ${HOI4WORLD_REGIONS_TESTS_SOURCES} "${PROJECT_SOURCE_DIR}/src/HOI4World/Regions/RegionsTests.cpp")
+set(HOI4WORLD_SCORERS_TESTS_SOURCES ${HOI4WORLD_SCORERS_TESTS_SOURCES} "${PROJECT_SOURCE_DIR}/src/HOI4World/Scorers/ScorerFactoryTests.cpp")
+set(HOI4WORLD_SCORERS_TESTS_SOURCES ${HOI4WORLD_SCORERS_TESTS_SOURCES} "${PROJECT_SOURCE_DIR}/src/HOI4World/Scorers/ScorerTests.cpp")
+set(HOI4WORLD_SCORERS_TESTS_SOURCES ${HOI4WORLD_SCORERS_TESTS_SOURCES} "${PROJECT_SOURCE_DIR}/src/HOI4World/Scorers/ScorersFactoryTests.cpp")
+set(HOI4WORLD_SCORERS_TESTS_SOURCES ${HOI4WORLD_SCORERS_TESTS_SOURCES} "${PROJECT_SOURCE_DIR}/src/HOI4World/Scorers/ScorersTests.cpp")
 set(HOI4WORLD_SCRIPTED_EFFECTS_TESTS_SOURCES ${HOI4WORLD_SCRIPTED_EFFECTS_TESTS_SOURCES} "${PROJECT_SOURCE_DIR}/src/HOI4World/ScriptedEffects/ScriptedEffectTests.cpp")
 set(HOI4WORLD_SCRIPTED_EFFECTS_TESTS_SOURCES ${HOI4WORLD_SCRIPTED_EFFECTS_TESTS_SOURCES} "${PROJECT_SOURCE_DIR}/src/HOI4World/ScriptedEffects/ScriptedEffectFileTests.cpp")
 set(HOI4WORLD_SCRIPTED_LOCALISATIONS_TESTS_SOURCES ${HOI4WORLD_SCRIPTED_LOCALISATIONS_TESTS_SOURCES} "${PROJECT_SOURCE_DIR}/src/HOI4World/ScriptedLocalisations/ScriptedLocalisationTests.cpp")
@@ -768,6 +780,7 @@ list(APPEND ALL_HOI4_TESTS_FILES
 	${HOI4WORLD_PEACECONFERENCES_TESTS_SOURCES}
 	${HOI4WORLD_PLANE_DESIGNS_TESTS_SOURCES}
 	${HOI4WORLD_REGIONS_TESTS_SOURCES}
+	${HOI4WORLD_SCORERS_TESTS_SOURCES}
 	${HOI4WORLD_SCRIPTED_EFFECTS_TESTS_SOURCES}
 	${HOI4WORLD_SCRIPTED_LOCALISATIONS_TESTS_SOURCES}
 	${HOI4WORLD_SCRIPTED_TRIGGERS_TESTS_SOURCES}
@@ -896,6 +909,7 @@ configure_file("data/test_files/operations.txt" "${TEST_OUTPUT_DIRECTORY}/blankm
 configure_file("data/test_files/regions.txt" "${TEST_OUTPUT_DIRECTORY}/Configurables/Map/regions.txt" COPYONLY)
 configure_file("data/test_files/ReadMe.txt" "${TEST_OUTPUT_DIRECTORY}/Vic2Windows/ReadMe.txt" COPYONLY)
 configure_file("data/test_files/ReadMe.txt" "${TEST_OUTPUT_DIRECTORY}/Vic2Linux/ReadMe.txt" COPYONLY)
+configure_file("data/test_files/Scorers.txt" "${TEST_OUTPUT_DIRECTORY}/Configurables/Scorers/generic_platonic_scorers.txt" COPYONLY)
 configure_file("data/test_files/ScriptedEffects/effects_file.txt" "${TEST_OUTPUT_DIRECTORY}/ScriptedEffects/effects_file.txt" COPYONLY)
 configure_file("data/test_files/ScriptedEffects/empty_effects_file.txt" "${TEST_OUTPUT_DIRECTORY}/ScriptedEffects/empty_effects_file.txt" COPYONLY)
 configure_file("data/test_files/Sounds/CultureToVoiceMappings.txt" "${TEST_OUTPUT_DIRECTORY}/Configurables/Sounds/CultureToVoiceMappings.txt" COPYONLY)
@@ -1034,6 +1048,7 @@ add_library(run_clang_tidy
 	${HOI4WORLD_OPERATIVE_NAMES_SOURCES}
 	${HOI4WORLD_PEACECONFERENCES_SOURCES}
 	${HOI4WORLD_REGIONS_SOURCES}
+	${HOI4WORLD_SCORERS_SOURCES}
 	${HOI4WORLD_SCRIPTED_EFFECTS_SOURCES}
 	${HOI4WORLD_SCRIPTED_LOCALISATIONS_SOURCES}
 	${HOI4WORLD_SCRIPTED_TRIGGERS_SOURCES}
@@ -1095,6 +1110,7 @@ add_library(run_clang_tidy
 	${OUTHOI4_OPERATIVE_SOURCES}
 	${OUTHOI4_NAVIES_SOURCES}
 	${OUTHOI4_PEACECONFERENCE_SOURCES}
+	${OUTHOI4_SCORERS_SOURCES}
 	${OUTHOI4_SCRIPTED_EFFECTS_SOURCES}
 	${OUTHOI4_SCRIPTED_LOCALISATIONS_SOURCES}
 	${OUTHOI4_SCRIPTED_TRIGGERS_SOURCES}
@@ -1133,6 +1149,7 @@ add_library(run_clang_tidy
 	${HOI4WORLD_PEACECONFERENCES_TESTS_SOURCES}
 	${HOI4WORLD_PLANE_DESIGNS_TESTS_SOURCES}
 	${HOI4WORLD_REGIONS_TESTS_SOURCES}
+	${HOI4WORLD_SCORERS_TESTS_SOURCES}
 	${HOI4WORLD_SCRIPTED_EFFECTS_TESTS_SOURCES}
 	${HOI4WORLD_SCRIPTED_LOCALISATIONS_TESTS_SOURCES}
 	${HOI4WORLD_SCRIPTED_TRIGGERS_TESTS_SOURCES}

Vic2ToHoI4-Installer.iss

@@ -2,7 +2,7 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName "Vic2 to HoI4"
-#define MyAppVersion "1.0 Rommel"
+#define MyAppVersion "1.1 Spruance"
 #define MyAppPublisher "Paradox Game Converters Group"
 #define MyAppURL "https://paradoxgameconverters.com/"
 #define MyAppExeName "ConverterFrontend.exe"

Vic2ToHoI4Tests.vcxproj

@@ -128,6 +128,10 @@
     <ClCompile Include="src\HOI4World\PlaneDesigns\PossiblePlaneDesignsTests.cpp" />
     <ClCompile Include="src\HOI4World\Regions\RegionsTests.cpp" />
     <ClCompile Include="src\HOI4World\Regions\RegionTests.cpp" />
+    <ClCompile Include="src\HOI4World\Scorers\ScorerFactoryTests.cpp" />
+    <ClCompile Include="src\HOI4World\Scorers\ScorerTests.cpp" />
+    <ClCompile Include="src\HOI4World\Scorers\ScorersFactoryTests.cpp" />
+    <ClCompile Include="src\HOI4World\Scorers\ScorersTests.cpp" />
     <ClCompile Include="src\HOI4World\ScriptedEffects\ScriptedEffectFileTests.cpp" />
     <ClCompile Include="src\HOI4World\ScriptedEffects\ScriptedEffectTests.cpp" />
     <ClCompile Include="src\HOI4World\ScriptedLocalisations\ScriptedLocalisationsTests.cpp" />
@@ -452,6 +456,12 @@
       <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)/configurables/Localisations</DestinationFolders>
     </CopyFileToFolders>
   </ItemGroup>
+  <ItemGroup>
+    <CopyFileToFolders Include="data\test_files\Scorers.txt">
+      <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)/configurables/Scorers/</DestinationFolders>
+      <DestinationFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">generic_platonic_scorers%(Extension)</DestinationFileName>
+    </CopyFileToFolders>
+  </ItemGroup>
   <ItemGroup>
     <CopyFileToFolders Include="data\test_files\ScriptedEffects\empty_effects_file.txt">
       <DestinationFolders Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)/ScriptedEffects</DestinationFolders>

Vic2ToHoI4Tests.vcxproj.filters

@@ -634,6 +634,18 @@
     <ClCompile Include="src\V2World\Pops\PopFactoryTests.cpp">
       <Filter>src\V2World\Pops</Filter>
     </ClCompile>
+    <ClCompile Include="src\HOI4World\Scorers\ScorerFactoryTests.cpp">
+      <Filter>src\HOI4World\Scorers</Filter>
+    </ClCompile>
+    <ClCompile Include="src\HOI4World\Scorers\ScorerTests.cpp">
+      <Filter>src\HOI4World\Scorers</Filter>
+    </ClCompile>
+    <ClCompile Include="src\HOI4World\Scorers\ScorersFactoryTests.cpp">
+      <Filter>src\HOI4World\Scorers</Filter>
+    </ClCompile>
+    <ClCompile Include="src\HOI4World\Scorers\ScorersTests.cpp">
+      <Filter>src\HOI4World\Scorers</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <Filter Include="src">
@@ -1059,6 +1071,9 @@
     <Filter Include="src\HOI4World\FocusTrees">
       <UniqueIdentifier>{0f64a54e-5b9c-47ae-89cd-58afdec9b5cc}</UniqueIdentifier>
     </Filter>
+    <Filter Include="src\HOI4World\Scorers">
+      <UniqueIdentifier>{c7079fbb-9df6-467f-a26e-cbfcf59b89a3}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <None Include="TestFiles\World\merge_nations.txt">
@@ -1393,6 +1408,9 @@
     <CopyFileToFolders Include="data\test_files\regions.txt">
       <Filter>data\test_files</Filter>
     </CopyFileToFolders>
+    <CopyFileToFolders Include="data\test_files\Scorers.txt">
+      <Filter>data\test_files</Filter>
+    </CopyFileToFolders>
     <CopyFileToFolders Include="data\test_files\v2game">
       <Filter>data\test_files</Filter>
     </CopyFileToFolders>

Vic2ToHoI4lib.vcxproj

@@ -144,6 +144,10 @@
     <ClCompile Include="src\HOI4World\Regions\RegionFactory.cpp" />
     <ClCompile Include="src\HOI4World\Regions\Regions.cpp" />
     <ClCompile Include="src\HOI4World\Regions\RegionsFactory.cpp" />
+    <ClCompile Include="src\HOI4World\Scorers\Scorer.cpp" />
+    <ClCompile Include="src\HOI4World\Scorers\ScorerFactory.cpp" />
+    <ClCompile Include="src\HOI4World\Scorers\Scorers.cpp" />
+    <ClCompile Include="src\HOI4World\Scorers\ScorersFactory.cpp" />
     <ClCompile Include="src\HOI4World\ScriptedEffects\ScriptedEffectFactory.cpp" />
     <ClCompile Include="src\HOI4World\ScriptedEffects\ScriptedEffectFile.cpp" />
     <ClCompile Include="src\HOI4World\ScriptedEffects\ScriptedEffects.cpp" />
@@ -300,6 +304,8 @@
     <ClCompile Include="src\OutHoi4\PlaneDesigns\OutPlaneDesign.cpp" />
     <ClCompile Include="src\OutHoi4\PlaneDesigns\OutPlaneDesigns.cpp" />
     <ClCompile Include="src\OutHoi4\PlaneDesigns\OutPlaneModules.cpp" />
+    <ClCompile Include="src\OutHoi4\Scorers\OutScorer.cpp" />
+    <ClCompile Include="src\OutHoi4\Scorers\OutScorers.cpp" />
     <ClCompile Include="src\OutHoi4\ScriptedEffects\OutScriptedEffect.cpp" />
     <ClCompile Include="src\OutHoi4\ScriptedEffects\OutScriptedEffects.cpp" />
     <ClCompile Include="src\OutHoi4\ScriptedLocalisations\OutScriptedLocalisation.cpp" />
@@ -548,6 +554,10 @@
     <ClInclude Include="src\HOI4World\Regions\RegionFactory.h" />
     <ClInclude Include="src\HOI4World\Regions\Regions.h" />
     <ClInclude Include="src\HOI4World\Regions\RegionsFactory.h" />
+    <ClInclude Include="src\HOI4World\Scorers\Scorer.h" />
+    <ClInclude Include="src\HOI4World\Scorers\ScorerFactory.h" />
+    <ClInclude Include="src\HOI4World\Scorers\Scorers.h" />
+    <ClInclude Include="src\HOI4World\Scorers\ScorersFactory.h" />
     <ClInclude Include="src\HOI4World\ScriptedEffects\ScriptedEffect.h" />
     <ClInclude Include="src\HOI4World\ScriptedEffects\ScriptedEffectFactory.h" />
     <ClInclude Include="src\HOI4World\ScriptedEffects\ScriptedEffectFile.h" />
@@ -735,6 +745,8 @@
     <ClInclude Include="src\OutHoi4\PlaneDesigns\OutPlaneDesign.h" />
     <ClInclude Include="src\OutHoi4\PlaneDesigns\OutPlaneDesigns.h" />
     <ClInclude Include="src\OutHoi4\PlaneDesigns\OutPlaneModules.h" />
+    <ClInclude Include="src\OutHoi4\Scorers\OutScorer.h" />
+    <ClInclude Include="src\OutHoi4\Scorers\OutScorers.h" />
     <ClInclude Include="src\OutHoi4\ScriptedEffects\OutScriptedEffect.h" />
     <ClInclude Include="src\OutHoi4\ScriptedEffects\OutScriptedEffects.h" />
     <ClInclude Include="src\OutHoi4\ScriptedLocalisations\OutScriptedLocalisation.h" />

Vic2ToHoI4lib.vcxproj.filters

@@ -313,6 +313,12 @@
     <Filter Include="external\bitmap">
       <UniqueIdentifier>{3b5bae8f-1a84-4852-b2b3-1024028d64d8}</UniqueIdentifier>
     </Filter>
+    <Filter Include="src\HoI4World\Scorers">
+      <UniqueIdentifier>{c7817af0-36c6-489a-b034-64638a55d80f}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="src\OutHoi4\Scorers">
+      <UniqueIdentifier>{e4d5ceee-934a-4813-8a4f-2c6e321263b5}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="src\Configuration.cpp">
@@ -1416,6 +1422,24 @@
     <ClCompile Include="src\V2World\World\WorldFactory.cpp">
       <Filter>src\V2World\World</Filter>
     </ClCompile>
+    <ClCompile Include="src\HOI4World\Scorers\ScorerFactory.cpp">
+      <Filter>src\HoI4World\Scorers</Filter>
+    </ClCompile>
+    <ClCompile Include="src\HOI4World\Scorers\Scorers.cpp">
+      <Filter>src\HoI4World\Scorers</Filter>
+    </ClCompile>
+    <ClCompile Include="src\HOI4World\Scorers\ScorersFactory.cpp">
+      <Filter>src\HoI4World\Scorers</Filter>
+    </ClCompile>
+    <ClCompile Include="src\HOI4World\Scorers\Scorer.cpp">
+      <Filter>src\HoI4World\Scorers</Filter>
+    </ClCompile>
+    <ClCompile Include="src\OutHoi4\Scorers\OutScorer.cpp">
+      <Filter>src\OutHoi4\Scorers</Filter>
+    </ClCompile>
+    <ClCompile Include="src\OutHoi4\Scorers\OutScorers.cpp">
+      <Filter>src\OutHoi4\Scorers</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="src\Configuration.h">
@@ -2780,5 +2804,23 @@
     <ClInclude Include="external\bitmap\bitmap_image.hpp">
       <Filter>external\bitmap</Filter>
     </ClInclude>
+    <ClInclude Include="src\HOI4World\Scorers\Scorer.h">
+      <Filter>src\HoI4World\Scorers</Filter>
+    </ClInclude>
+    <ClInclude Include="src\HOI4World\Scorers\ScorerFactory.h">
+      <Filter>src\HoI4World\Scorers</Filter>
+    </ClInclude>
+    <ClInclude Include="src\HOI4World\Scorers\Scorers.h">
+      <Filter>src\HoI4World\Scorers</Filter>
+    </ClInclude>
+    <ClInclude Include="src\HOI4World\Scorers\ScorersFactory.h">
+      <Filter>src\HoI4World\Scorers</Filter>
+    </ClInclude>
+    <ClInclude Include="src\OutHoi4\Scorers\OutScorer.h">
+      <Filter>src\OutHoi4\Scorers</Filter>
+    </ClInclude>
+    <ClInclude Include="src\OutHoi4\Scorers\OutScorers.h">
+      <Filter>src\OutHoi4\Scorers</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>

data/!provincenames_l_english.yml

@@ -12490,4 +12490,24 @@
  PROV13232:0 "Fuentesaúco"
  PROV13233:0 "Amurrio"
  PROV13234:0 "Gjirokastër"
- PROV13235:0 "Korçë"
+ PROV13235:0 "Korçë"
+ PROV13236:0 "Semera"
+ PROV13237:0 "Aksum"
+ PROV13238:0 "Adwa"
+ PROV13239:0 "Debre Birhan"
+ PROV13240:0 "Asayita"
+ PROV13241:0 "Debre Tabor"
+ PROV13242:0 "Debre Markos"
+ PROV13243:0 "Dembidolo"
+ PROV13244:0 "Gambela"
+ PROV13245:0 "Mizan"
+ PROV13246:0 "Awasa"
+ PROV13247:0 "Moyale"
+ PROV13248:0 "Robe"
+ PROV13249:0 "Harar"
+ PROV13250:0 "Asmara"
+ PROV13251:0 "Teseney"
+ PROV13252:0 "Crikvenica"
+ PROV13253:0 "Gode"
+ PROV13255:0 "Durrës"
+ PROV13256:0 "Siracusa"

data/blank_mod/common/abilities/generic_leader_abilities.txt

@@ -183,7 +183,7 @@ ability = {
 		}
 
 		unit_modifiers = {
-			paratrooper_count_per_plane = 1.0
+			paratrooper_weight_factor = -0.10
 			paradrop_organization_factor = 2.0
 			paratrooper_aa_defense = 0.5
 		}