1.36 NESTORIAN (#514)

* 1.36 compatch * fixes
ParadoxGameConverters · Nov 6, 2023 · 77e73a7 · 77e73a7
1 parent 5736223
commit 77e73a7
Show file tree

Hide file tree

Showing 18 changed files with 2,167 additions and 8,234 deletions.
diff --git a/.github/workflows/windows_build_test_and_push.yml b/.github/workflows/windows_build_test_and_push.yml
@@ -46,13 +46,13 @@ jobs:
     - name: "Prepare release"
       run: |
         cd "C:\Program Files\7-Zip\"
-        .\7z.exe a $Env:GITHUB_WORKSPACE\CK3ToEU4-0.13Melian-win-x64.zip $Env:GITHUB_WORKSPACE\Release\*
-        cp $Env:GITHUB_WORKSPACE\CK3ToEU4-0.13Melian-win-x64.zip $Env:GITHUB_WORKSPACE\CK3ToEU4-latest-win-x64.zip
+        .\7z.exe a $Env:GITHUB_WORKSPACE\CK3ToEU4-0.14Nestorian-win-x64.zip $Env:GITHUB_WORKSPACE\Release\*
+        cp $Env:GITHUB_WORKSPACE\CK3ToEU4-0.14Nestorian-win-x64.zip $Env:GITHUB_WORKSPACE\CK3ToEU4-latest-win-x64.zip
        
     - name: "Prepare installer"
       run: |
         c:\"Program Files (x86)\Inno Setup 6\iscc" CK3ToEU4-Installer.iss
-        cp $Env:GITHUB_WORKSPACE\Output\CK3ToEU4-latest-win-x64.exe $Env:GITHUB_WORKSPACE\Output\CK3ToEU4-0.13Melian-win-x64.exe
+        cp $Env:GITHUB_WORKSPACE\Output\CK3ToEU4-latest-win-x64.exe $Env:GITHUB_WORKSPACE\Output\CK3ToEU4-0.14Nestorian-win-x64.exe
        
     - name: "Upload binaries to release"
       if: ${{ github.event_name == 'push' }}
@@ -62,7 +62,7 @@ jobs:
         allowUpdates: true
         omitBodyDuringUpdate: true
         omitNameDuringUpdate: true
-        artifacts: CK3ToEU4-0.13Melian-win-x64.zip, Output\CK3ToEU4-0.13Melian-win-x64.exe
+        artifacts: CK3ToEU4-0.14Nestorian-win-x64.zip, Output\CK3ToEU4-0.14Nestorian-win-x64.exe
         token: ${{ secrets.API_TOKEN_GITHUB }}
 
     - name: "Upload binaries to archive"
@@ -73,7 +73,7 @@ jobs:
         allowUpdates: true
         omitBodyDuringUpdate: true
         omitNameDuringUpdate: true
-        artifacts: CK3ToEU4-0.13Melian-win-x64.zip, CK3ToEU4-latest-win-x64.zip, Output\CK3ToEU4-0.13Melian-win-x64.exe, Output\CK3ToEU4-latest-win-x64.exe
+        artifacts: CK3ToEU4-0.14Nestorian-win-x64.zip, CK3ToEU4-latest-win-x64.zip, Output\CK3ToEU4-0.14Nestorian-win-x64.exe, Output\CK3ToEU4-latest-win-x64.exe
         token: ${{ secrets.API_TOKEN_GITHUB }}
 
     - name: "Cleanup"

diff --git a/CK3ToEU4-Installer.iss b/CK3ToEU4-Installer.iss
@@ -2,7 +2,7 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName "CK3 to EU4"
-#define MyAppVersion "0.13 Melian"
+#define MyAppVersion "0.14 Nestorian"
 #define MyAppPublisher "Paradox Game Converters Group"
 #define MyAppURL "https://paradoxgameconverters.com/"
 #define MyAppExeName "ConverterFrontend.exe"

diff --git a/CK3ToEU4/Data_Files/blankMod/output/common/countries/Haruriyyah.txt b/CK3ToEU4/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/CK3ToEU4/Data_Files/blankMod/output/common/countries/Immortals.txt b/CK3ToEU4/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/CK3ToEU4/Data_Files/blankMod/output/common/countries/KnightsZun.txt b/CK3ToEU4/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/CK3ToEU4/Data_Files/blankMod/output/common/ideas/!_order_of_saint_anthony_ideas.txt b/CK3ToEU4/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/CK3ToEU4/Data_Files/blankMod/output/common/ideas/!_sons_of_kaleva_ideas.txt b/CK3ToEU4/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

diff --git a/CK3ToEU4/Data_Files/blankMod/output/common/ideas/01_extra_ideas_b.txt b/CK3ToEU4/Data_Files/blankMod/output/common/ideas/01_extra_ideas_b.txt
@@ -33,6 +33,7 @@ norse_cultural_ideas = {
 	norse_vinlandsaga = {
 		colonists = 1
 		range = 0.33
+		effect = { remove_temporary_colonist = yes }
 	}
 	norse_settle_homeland = {
 		development_cost = -0.1
@@ -81,6 +82,7 @@ iberian_muslim_cultural_ideas = {
 	}
 	iberian_further_into_america = {
 		colonists = 1					#Iberian nation, duh!
+		effect = { remove_temporary_colonist = yes }
 	}
 	iberian_global_caliphate = {
 		land_forcelimit_modifier = 0.33
@@ -515,7 +517,10 @@ african_christian_ideas = {
 		land_attrition = -0.10
 	}
 
-	bonus = { colonists = 1 }					#Iberian influence
+	bonus = { 
+		colonists = 1 
+		effect = { remove_temporary_colonist = yes }
+	}					#Iberian influence
 
 	trigger = {	
 		religion_group = christian										#in case crusaders are successful

diff --git a/CK3ToEU4/Data_Files/blankMod/output/common/on_actions/ZZZ_added_on_actions.txt b/CK3ToEU4/Data_Files/blankMod/output/common/on_actions/ZZZ_added_on_actions.txt
@@ -1,13 +1,25 @@
 #Scripted effect for Extra Fetishist cult mechanics.
 
 on_battle_lost_country = {
-	on_battle_ended_effect = yes
 	##VANILLA
-	#battle_cult_spreading_effect = yes #Scripted effect for fetishist cult mechanics.
+	on_battle_ended_effect = yes
+	battle_cult_spreading_effect = yes #Scripted effect for fetishist cult mechanics.
 	random_events = {
 		90 = 0
 		10 = friendship_events.1 #Historical Friendship Broken
 	}
+	if = {
+		limit = { 
+			OR = {
+				is_or_was_tag = { tag = QAR }
+				is_or_was_tag = { tag = AKK }
+			}
+			FROM = {
+				tag = TUR
+			}
+		}
+		set_country_flag = turkoman_hasnt_lost_battle_to_ottomans
+	}
 	##MODDED
 	ZZZ_enhanced_converter_battle_cult_spreading_effect = yes
 }
@@ -18,7 +30,6 @@ on_province_owner_change = {
 		japan.1			#Fall of the current Shogun
 		flavor_tur.207	#Victory over the Knights
 	}
-
 	on_province_owner_change_government_effect = yes
 
 	if = {
@@ -39,14 +50,14 @@ on_province_owner_change = {
 	}
 	on_province_owner_change_estate_privileges_effect = yes
 	imperial_modifiers_on_province_change_culture_or_change_owner_effect = yes
-
+	
 	if = {
 		limit = {
 			region = indo_china_region
 			has_building = farm_estate
 			trade_goods = grain
 			owner = {
-				has_mission = mnd_khm_irrigation
+				has_mission = mnd_khm_irrigation 
 				NOT = {
 					OR = {
 						has_estate = estate_vaisyas
@@ -74,6 +85,16 @@ on_province_owner_change = {
 			duration = -1
 		}
 	}
+
+	if = {
+		limit = {
+			province_id = 379
+			owner = {
+				NOT = { religion = jewish }
+			}
+		}
+		remove_country_modifier = third_temple_country_modifier
+	}
 	if = {
 		limit = {
 			owner = {
@@ -88,16 +109,6 @@ on_province_owner_change = {
 			desc = son_fetishism_as_secondary_religion_province_desc
 		}
 	}
-
-	if = {
-		limit = {
-			province_id = 379
-			owner = {
-				NOT = { religion = jewish }
-			}
-		}
-		remove_country_modifier = third_temple_country_modifier
-	}
 	else_if = {
 		limit = {
 			OR = {
@@ -110,7 +121,38 @@ on_province_owner_change = {
 		}
 		remove_province_modifier = son_fetishism_as_secondary_religion_province
 	}
-
+	if = { 
+		limit = { 
+			owner = { NOT = { has_reform = jap_gokaido_reform } }
+		}
+		remove_province_modifier = jap_gokaido_modifier
+	}
+	if = {
+		limit = { 
+			owner = { 
+				has_government_attribute = more_15_manpower_in_heathen_provinces
+			}
+			NOT ={ religion_group = owner }
+			NOT = { has_province_modifier = ottoman_siyasah_tax_reform_manpower }
+		}
+		add_province_modifier = {
+			name = ottoman_siyasah_tax_reform_manpower
+			duration = -1
+		}
+	}
+	if = {
+		limit = { 
+			owner = { 
+				has_government_attribute = more_15_manpower_in_heathen_provinces
+			}
+			NOT ={ religion_group = owner }
+			NOT = { has_province_modifier = ottoman_siyasah_tax_reform_manpower }
+		}
+		add_province_modifier = {
+			name = ottoman_siyasah_tax_reform_manpower
+			duration = -1
+		}
+	}
 	##MODDED
 	if = {
 		limit = {