fixes

Warcraft-GoA-Development-Team · Nov 19, 2023 · 6e78124 · 6e78124
1 parent 6cdcfb6
commit 6e78124
Show file tree

Hide file tree

Showing 17 changed files with 371 additions and 730 deletions.
diff --git a/common/casus_belli_types/00_religious_war.txt b/common/casus_belli_types/00_religious_war.txt
@@ -3048,17 +3048,7 @@ undirected_great_holy_war = {
 			save_scope_as = the_ghw
 		}
 
-		scope:attacker = {	#Achievement setup.
-			every_character_war = {
-				limit = {
-					is_attacker = scope:attacker
-					is_defender = scope:defender
-				}
-				every_war_attacker = {
-					add_achievement_flag_effect = { FLAG = achievement_for_the_faith_flag }
-				}
-			}
-		}
+		#Warcraft
 
 		scope:defender.faith = {		#needed for hold_court.6150
 			set_variable = {
@@ -3496,17 +3486,7 @@ undirected_great_holy_war = {
 			}
 		}
 
-		scope:defender = {	#Achievement setup.
-			every_character_war = {
-				limit = {
-					is_attacker = scope:attacker
-					is_defender = scope:defender
-				}
-				every_war_defender = {
-					add_achievement_flag_effect = { FLAG = achievement_for_the_faith_flag }
-				}
-			}
-		}
+		#Warcraft
 
 		every_player = { #Fluff for players
 			limit = {
@@ -3795,17 +3775,7 @@ directed_great_holy_war = {
 			save_scope_as = the_ghw
 		}
 
-		scope:attacker = {	#Achievement setup.
-			every_character_war = {
-				limit = {
-					is_attacker = scope:attacker
-					is_defender = scope:defender
-				}
-				every_war_attacker = {
-					add_achievement_flag_effect = { FLAG = achievement_for_the_faith_flag }
-				}
-			}
-		}
+		#Warcraft
 
 		if = {
 			limit = { exists = scope:attacker.faith.great_holy_war.ghw_title_recipient }
@@ -3983,17 +3953,7 @@ directed_great_holy_war = {
 			save_scope_as = the_ghw
 		}
 
-		scope:defender = {	#Achievement setup.
-			every_character_war = {
-				limit = {
-					is_attacker = scope:attacker
-					is_defender = scope:defender
-				}
-				every_war_defender = {
-					add_achievement_flag_effect = { FLAG = achievement_for_the_faith_flag }
-				}
-			}
-		}
+		#Warcraft
 
 		every_player = { #Fluff for players
 			limit = {

diff --git a/common/casus_belli_types/00_subjugation.txt b/common/casus_belli_types/00_subjugation.txt
@@ -30,12 +30,12 @@
 		scope:attacker = {
 			trigger_if = {
 				limit = {
-					faith.religion = religion:islam_religion
+					faith.religion = like_islam_religion_trigger = yes
 					house ?= {
 						house_head = scope:attacker
 						has_variable = subjugations_expanded
 					}
-					scope:defender.faith.religion = religion:islam_religion
+					scope:defender.faith.religion = like_islam_religion_trigger = yes
 				}
 			}
 			trigger_else = {
@@ -161,12 +161,12 @@
 					}
 				}
 				AND = {
-					faith.religion = religion:islam_religion
+					faith.religion = like_islam_religion_trigger = yes
 					house ?= {
 						house_head = scope:attacker
 						has_variable = subjugations_expanded
 					}
-					scope:defender.faith.religion = religion:islam_religion
+					scope:defender.faith.religion = like_islam_religion_trigger = yes
 				}
 			}
 		}

diff --git a/common/culture/traditions/01_fp1_traditions.txt b/common/culture/traditions/01_fp1_traditions.txt
@@ -151,7 +151,7 @@ tradition_fp1_performative_honour = {
 	is_shown = {
 		# DLC check.
 		has_fp1_dlc_trigger = yes
-		has_cultural_pillar = heritage_north_germanic
+		like_north_germanic_group_trigger = yes
 	}
 
 	can_pick = {
@@ -160,7 +160,7 @@ tradition_fp1_performative_honour = {
 		# Warcraft
 		#custom_tooltip = {
 		#	text = northern_germanic_heritage_trigger
-		#	has_cultural_pillar = heritage_north_germanic
+		#	like_north_germanic_group_trigger= yes
 		#}
 		# End of Warcraft
 

diff --git a/common/decisions/00_holy_order_decisions.txt b/common/decisions/00_holy_order_decisions.txt
@@ -60,6 +60,9 @@
 		}
 		trigger_if = {
 			limit = {
+				# Warcraft
+				NOT = { has_character_flag = holy_order_debug }
+
 				exists = faith.religious_head
 				NOT = { root = root.faith.religious_head }
 			}

diff --git a/common/decisions/test_decision.txt b/common/decisions/test_decision.txt
@@ -9,9 +9,7 @@
 		is_available_adult_or_is_commanding = yes
 	}
 	effect = {
-		custom_tooltip = wild_goose_chase_decision_effect_tooltip
-		remove_short_term_gold = 13
-		add_stress = 20
+		create_artifact_frostmourne_effect = { OWNER = root }
 	}
 
 	ai_check_interval = 0

diff --git a/common/religion/doctrines/00_core_tenets.txt b/common/religion/doctrines/00_core_tenets.txt
@@ -3532,7 +3532,7 @@
 		piety_cost = {
 			if = {
 				limit = {
-					AND = {
+					#AND = {
 						#OR = {
 						#	has_doctrine = muhammad_succession_shia_doctrine
 						#	has_doctrine = muhammad_succession_muhakkima_doctrine
@@ -3541,8 +3541,9 @@
 							has_doctrine = tenet_warmonger
 							has_doctrine = tenet_unrelenting_faith
 							has_doctrine = tenet_consolamentum
+							has_doctrine = special_doctrine_end_justifies_means
 						}
-					}
+					#}
 
 				}
 				value = faith_tenet_cost_low

diff --git a/common/religion/doctrines/02_doctrines_special.txt b/common/religion/doctrines/02_doctrines_special.txt
@@ -145,9 +145,10 @@ unreformed_faith = {
 		parameters = {
 			# unreformed = yes also serves as the basis for the unreformed_syncretic tenet.
 			unreformed = yes
-			hostility_override_tenet_unreformed_syncretism = 2
-			unreformed_syncretic_recipient_opinion_active = yes
-			opinion_of_unreformed_syncretic_actor_opinion_active = 30
+			# Warcraft
+			# hostility_override_tenet_unreformed_syncretism = 2
+			# unreformed_syncretic_recipient_opinion_active = yes
+			# opinion_of_unreformed_syncretic_actor_opinion_active = 30
 			conquest_cb_enabled = yes
 			faith_can_raid = yes
 		}
@@ -268,29 +269,29 @@ not_allowed_to_hof = {
 	}
 
 	special_doctrine_not_allowed_to_hof = {
-		#name = {
+		name = {
 			#first_valid = {
 				#triggered_desc = {
 					#trigger = {
 						#religion_tag = judaism_religion
 					#}
 					#desc = prophecy_of_malachi_name
 				#}
-				#desc = special_doctrine_not_allowed_to_hof_name
+				desc = special_doctrine_not_allowed_to_hof_name
 			#}
-		#}
+		}
 
-		#desc = {
+		desc = {
 			#first_valid = {
 				#triggered_desc = {
 					#trigger = {
 						#religion_tag = judaism_religion
 					#}
 					#desc = prophecy_of_malachi_desc
 				#}
-				#desc = special_doctrine_not_allowed_to_hof_desc
+				desc = special_doctrine_not_allowed_to_hof_desc
 			#}
-		#}
+		}
 		parameters = {
 			block_from_create_hof_parameter = yes
 		}
@@ -315,7 +316,7 @@ has_jizya_doctrine = { #To be adapted for Warcraft
 	is_available_on_create = {
 		OR = {
 			has_doctrine = special_doctrine_jizya
-			has_doctrine = special_doctrine_is_islamic_faith
+			like_islam_religion_trigger = yes
 		}
 	}
 

diff --git a/common/script_values/00_struggle_values.txt b/common/script_values/00_struggle_values.txt
@@ -38,71 +38,7 @@ catalyst_fp3_yearly_time_out_ending_drift = {
 	}
 }
 
-# Mess around with the AI's priorities for war targets.
-## We mostly apply this in nakedly aggressive wars; AI with claims or de jure rights elsewhere shouldn't want to forgo them completely.
-struggle_wars_prioritise_struggle_targets_value = {
-	value = 1
-
-	# If scope:attacker is involved in a struggle, we tank how much they want to attack non-struggle characters.
-	if = {
-		limit = {
-			scope:attacker = {
-				any_character_struggle = {
-					involvement = involved
-					is_secondary_character_involvement_neither_trigger = { CHAR = scope:defender }
-				}
-			}
-		}
-		multiply = 0.25
-	}
-	# And scope:defender is an interloper in the same struggle, we double-dip.
-	if = {
-		limit = {
-			scope:attacker = {
-				any_character_struggle = {
-					involvement = involved
-					is_secondary_character_involvement_interloper_trigger = { CHAR = scope:defender }
-				}
-			}
-		}
-		multiply = 1.5
-	}
-
-	# Agenda impact
-	if = {
-		limit = {
-			scope:attacker = {
-				any_character_struggle = {
-					involvement = involved
-				}
-			}
-		}
-		multiply = {
-			value = 0
-			if = {
-				limit = {
-					scope:attacker = {
-						any_character_struggle = {
-							phase_has_catalyst = catalyst_winning_large_conquest_war
-						}
-						has_character_flag = agenda_towards_escalation
-					}
-				}
-				add = 2
-			}
-			else_if = {
-				limit = {
-					scope:attacker = {
-						any_character_struggle = {
-							phase_has_catalyst = catalyst_winning_large_conquest_war
-						}
-					}
-				}
-				add = 0.25
-			}
-		}
-	}
-}
+# Warcraft
 
 ##################################################
 # Catalyst Values
@@ -127,12 +63,7 @@ boost_county_conversion_phase_malus_value = {
 
 # Used for random weighting.
 add_X_per_sub_realm_struggle_county_value = {
-	every_sub_realm_county = {
-		limit = {
-			any_county_struggle = { this = root }
-		}
-		add = 2
-	}
+	value = 0
 }
 
 fp2_struggle_0011_gift_cost_value = { value = major_gold_value }
@@ -169,6 +100,6 @@ sub_realm_size_value = {
 	value = sub_realm_size
 }
 
-caliph_realm_size_value = {
-	value = title:d_sunni.holder.realm_size
-}
+#caliph_realm_size_value = {
+	#value = title:d_sunni.holder.realm_size
+#}
diff --git a/common/script_values/99_court_chaplain_values.txt b/common/script_values/99_court_chaplain_values.txt
@@ -706,52 +706,7 @@ court_chaplain_conversion_contextual_bonuses = {
 			desc = COURT_CHAPLAIN_CONVERSION_HARDER_TO_CONVERT_FAITH_AWAY_IN_MOUNTAINS_MALUS_MODIFIER
 		}
 	}
-	### Syncretics
-	#### Syncretic tenets aim to allow a faith and a separate religion/family to coexist without one eating the other. Accordingly, we make it harder for you to syncretise with a faith *then* wipe it out.
-	if = {
-		limit = {
-			exists = scope:county
-			scope:councillor.faith = { has_doctrine_parameter = unreformed_syncretic_actor_opinion_active }
-			scope:county.faith = { has_doctrine_parameter = unreformed}
-		}
-		add = {
-			value = scope:councillor.conversion_syncretic_with_religion_malus
-			desc = COURT_CHAPLAIN_CONVERSION_SYNCRETIC_WITH_RELIGION_MODIFIER
-		}
-	}
-	if = {
-		limit = {
-			exists = scope:county
-			scope:councillor.faith = { has_doctrine_parameter = christian_syncretic_actor_opinion_active }
-			scope:county.faith = { religion_tag = christianity_religion }
-		}
-		add = {
-			value = scope:councillor.conversion_syncretic_with_religion_malus
-			desc = COURT_CHAPLAIN_CONVERSION_SYNCRETIC_WITH_RELIGION_MODIFIER
-		}
-	}
-	if = {
-		limit = {
-			exists = scope:county
-			scope:councillor.faith = { has_doctrine_parameter = islamic_syncretic_actor_opinion_active }
-			scope:county.faith = { religion_tag = islam_religion }
-		}
-		add = {
-			value = scope:councillor.conversion_syncretic_with_religion_malus
-			desc = COURT_CHAPLAIN_CONVERSION_SYNCRETIC_WITH_RELIGION_MODIFIER
-		}
-	}
-	if = {
-		limit = {
-			exists = scope:county
-			scope:councillor.faith = { has_doctrine_parameter = jewish_syncretic_actor_opinion_active }
-			scope:county.faith = { religion_tag = judaism_religion }
-		}
-		add = {
-			value = scope:councillor.conversion_syncretic_with_religion_malus
-			desc = COURT_CHAPLAIN_CONVERSION_SYNCRETIC_WITH_RELIGION_MODIFIER
-		}
-	}
+	# Warcraft - Removed unused syncretic vanilla faith maluses
 
 	#Various Modifier Penalties
 	if = {