1.36 MERCIA (#482)

* 1.36 MERCIA * units
ParadoxGameConverters · Nov 6, 2023 · f47612f · f47612f
1 parent e721bfe
commit f47612f
Show file tree

Hide file tree

Showing 14 changed files with 624 additions and 508 deletions.
diff --git a/.github/workflows/windows_build_test_and_push.yml b/.github/workflows/windows_build_test_and_push.yml
@@ -45,13 +45,13 @@ jobs:
     - name: "Prepare release"
       run: |
         cd "C:\Program Files\7-Zip\"
-        .\7z.exe a $Env:GITHUB_WORKSPACE\CK2ToEU4-1.0Leon-win-x64.zip $Env:GITHUB_WORKSPACE\Release\*
-        cp $Env:GITHUB_WORKSPACE\CK2ToEU4-1.0Leon-win-x64.zip $Env:GITHUB_WORKSPACE\CK2ToEU4-latest-win-x64.zip
+        .\7z.exe a $Env:GITHUB_WORKSPACE\CK2ToEU4-1.0Mercia-win-x64.zip $Env:GITHUB_WORKSPACE\Release\*
+        cp $Env:GITHUB_WORKSPACE\CK2ToEU4-1.0Mercia-win-x64.zip $Env:GITHUB_WORKSPACE\CK2ToEU4-latest-win-x64.zip
               
     - name: "Prepare installer"
       run: |
         c:\"Program Files (x86)\Inno Setup 6\iscc" CK2ToEU4-Installer.iss
-        cp $Env:GITHUB_WORKSPACE\Output\CK2ToEU4-latest-win-x64.exe $Env:GITHUB_WORKSPACE\Output\CK2ToEU4-1.0Leon-win-x64.exe
+        cp $Env:GITHUB_WORKSPACE\Output\CK2ToEU4-latest-win-x64.exe $Env:GITHUB_WORKSPACE\Output\CK2ToEU4-1.0Mercia-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: CK2ToEU4-1.0Leon-win-x64.zip, Output\CK2ToEU4-1.0Leon-win-x64.exe
+        artifacts: CK2ToEU4-1.0Mercia-win-x64.zip, Output\CK2ToEU4-1.0Mercia-win-x64.exe
         token: ${{ secrets.API_TOKEN_GITHUB }}
 
     - name: "Upload binaries to archive"
@@ -72,7 +72,7 @@ jobs:
         allowUpdates: true
         omitBodyDuringUpdate: true
         omitNameDuringUpdate: true
-        artifacts: CK2ToEU4-1.0Leon-win-x64.zip, CK2ToEU4-latest-win-x64.zip, Output\CK2ToEU4-1.0Leon-win-x64.exe, Output\CK2ToEU4-latest-win-x64.exe
+        artifacts: CK2ToEU4-1.0Mercia-win-x64.zip, CK2ToEU4-latest-win-x64.zip, Output\CK2ToEU4-1.0Mercia-win-x64.exe, Output\CK2ToEU4-latest-win-x64.exe
         token: ${{ secrets.API_TOKEN_GITHUB }}
 
     - name: "Cleanup"

diff --git a/CK2ToEU4-Installer.iss b/CK2ToEU4-Installer.iss
@@ -2,7 +2,7 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName "CK2 to EU4"
-#define MyAppVersion "1.0 de Leon"
+#define MyAppVersion "1.0 of Mercia"
 #define MyAppPublisher "Paradox Game Converters Group"
 #define MyAppURL "https://paradoxgameconverters.com/"
 #define MyAppExeName "ConverterFrontend.exe"

diff --git a/CK2ToEU4/Data_Files/blankMod/output/common/countries/Haruriyyah.txt b/CK2ToEU4/Data_Files/blankMod/output/common/countries/Haruriyyah.txt
@@ -12,7 +12,7 @@ historical_units = {
 	persian_footsoldier
 	persian_cavalry_charge
 	persian_shamshir
-	qizilbash_cavalry
+	qizilbash_cavalry_unit
 	tofongchis_musketeer
 	topchis_artillery
 	afsharid_reformed

diff --git a/CK2ToEU4/Data_Files/blankMod/output/common/countries/Immortals.txt b/CK2ToEU4/Data_Files/blankMod/output/common/countries/Immortals.txt
@@ -12,7 +12,7 @@ historical_units = {
 	persian_footsoldier
 	persian_cavalry_charge
 	persian_shamshir
-	qizilbash_cavalry
+	qizilbash_cavalry_unit
 	tofongchis_musketeer
 	topchis_artillery
 	afsharid_reformed

diff --git a/CK2ToEU4/Data_Files/blankMod/output/common/countries/KnightsZun.txt b/CK2ToEU4/Data_Files/blankMod/output/common/countries/KnightsZun.txt
@@ -12,7 +12,7 @@ historical_units = {
 	persian_footsoldier
 	persian_cavalry_charge
 	persian_shamshir
-	qizilbash_cavalry
+	qizilbash_cavalry_unit
 	tofongchis_musketeer
 	topchis_artillery
 	afsharid_reformed

diff --git a/CK2ToEU4/Data_Files/blankMod/output/common/ideas/!_order_of_saint_anthony_ideas.txt b/CK2ToEU4/Data_Files/blankMod/output/common/ideas/!_order_of_saint_anthony_ideas.txt
@@ -24,6 +24,7 @@ order_of_saint_anthony_ideas = {
 	}
 	ZZZ_mission_to_the_unknown = {
 		colonists = 1
+		effect = { remove_temporary_colonist = yes }
 	}
 	ZZZ_capacity_for_more = {
 		land_forcelimit_modifier = 0.25

diff --git a/CK2ToEU4/Data_Files/blankMod/output/common/ideas/!_sons_of_kaleva_ideas.txt b/CK2ToEU4/Data_Files/blankMod/output/common/ideas/!_sons_of_kaleva_ideas.txt
@@ -34,6 +34,7 @@ sons_of_kaleva_ideas = {
 	}
 	ZZZ_kalevan_expansion = {
 		colonists = 1
+		effect = { remove_temporary_colonist = yes }
 	}
 	ZZZ_take_down_the_walls = {
 		artillery_levels_available_vs_fort = 2