fix #1 (mayonez)

Warcraft-GoA-Development-Team · Oct 17, 2023 · 3a3df5b · 3a3df5b
1 parent fa520db
commit 3a3df5b
Show file tree

Hide file tree

Showing 4 changed files with 326 additions and 343 deletions.
diff --git a/common/decisions/wc_cen_kal_decisions.txt b/common/decisions/wc_cen_kal_decisions.txt
@@ -1,10 +1,6 @@
 change_depot_policy = {
 	ai_check_interval = 12
 	picture = "gfx/interface/illustrations/decisions/goblin_depot.dds"
-	desc = change_depot_policy_desc
-	title = change_depot_policy_name
-	selection_tooltip = change_depot_policy_tt
-	confirm_text = change_depot_policy_confirm
 	major = yes
 
 	cooldown = { years = 2 }
@@ -22,22 +18,26 @@
 		trigger_event = cen_kal.1006
 		custom_tooltip = change_depot_policy_tt_basic
 	}
+
+	ai_potential = {
+		always = yes
+	}
+
+	ai_will_do = {
+		base = 100
+	}
 }
 
 blood_shards_gather_operation = {
 	ai_check_interval = 12
 	picture = "gfx/interface/illustrations/decisions/quilboar_gatherers.dds"
-	desc = blood_shards_gather_operation_desc
-	title = blood_shards_gather_operation_name
-	selection_tooltip = blood_shards_gather_operation_tt
-	confirm_text = blood_shards_gather_operation_confirm
 
 	cooldown = { years = 2 }
 
 	is_shown = {
 		is_landed = yes
 		faith = faith:agamaggan_worship
-		NOT = { root.primary_title = { is_mercenary_company = yes } }
+		NOT = { government_has_flag = government_is_mercenary }
 	}
 
 	is_valid = {
@@ -50,23 +50,26 @@ blood_shards_gather_operation = {
 	cost = { gold = 75 piety = 50 }
 
 	effect = { trigger_event = cen_kal.1050 }
+
+	ai_potential = {
+		always = yes
+	}
+
+	ai_will_do = {
+		base = 100
+	}
 }
 
 change_agamaggan_blessing = {
 	ai_check_interval = 12
 	picture = "gfx/interface/illustrations/decisions/quilboar_ritual.dds"
-	desc = change_agamaggan_blessing_desc
-	title = change_agamaggan_blessing_name
-	selection_tooltip = change_agamaggan_blessing_tt
-	confirm_text = change_agamaggan_blessing_confirm
-	major = yes
 
 	cooldown = { years = 1 }
 
 	is_shown = {
 		is_landed = yes
 		faith = faith:agamaggan_worship
-		NOT = { root.primary_title = { is_mercenary_company = yes } }
+		NOT = { government_has_flag = government_is_mercenary }
 	}
 
 	is_valid = {
@@ -79,16 +82,19 @@ change_agamaggan_blessing = {
 	cost = { piety = 25 }
 
 	effect = { trigger_event = cen_kal.1052 }
+
+	ai_potential = {
+		always = yes
+	}
+
+	ai_will_do = {
+		base = 100
+	}
 }
 
 create_thorns_quilboar = {
 	ai_check_interval = 12
 	picture = "gfx/interface/illustrations/decisions/quilboar_vines.dds"
-	desc = create_thorns_quilboar_desc
-	title = create_thorns_quilboar_name
-	selection_tooltip = create_thorns_quilboar_tt
-	confirm_text = create_thorns_quilboar_confirm
-	major = yes
 
 	cooldown = { years = 2 }
 
@@ -97,9 +103,14 @@ create_thorns_quilboar = {
 		exists = capital_province
 		faith = faith:agamaggan_worship
 		NOR = { 
-			root.primary_title = { is_mercenary_company = yes }
+			government_has_flag = government_is_mercenary
 			government_has_flag = government_is_theocracy
 		}
+		any_sub_realm_county = {
+			title_province = {
+				NOT = { has_building_or_higher = quilboar_thorns_01 }
+			}
+		}
 	}
 
 	is_valid = {
@@ -111,62 +122,39 @@ create_thorns_quilboar = {
 	}
 
 	effect = {
-		custom_tooltip = create_thorns_quilboar_tt
-		any_sub_realm_county = {
+		custom_tooltip = create_thorns_quilboar_tooltip
+		random_sub_realm_county = {
 			limit = {
 				title_province = {
-					NOR = {
-						has_building = quilboar_thorns_01
-						has_building = quilboar_thorns_02
-						has_building = quilboar_thorns_03
-						has_building = quilboar_thorns_04
-						has_building = quilboar_thorns_05
-						has_building = quilboar_thorns_06
-						has_building = quilboar_thorns_07
-						has_building = quilboar_thorns_08
-					}
+					NOT = { has_building_or_higher = quilboar_thorns_01 }
 				}
 			}
 			title_province = { save_scope_as = thorn_location }
 		}
-		#Found one
-		if = { 
-			limit = { 
-				exists = scope:thorn_location
-			} 
-			trigger_event = cen_kal.1055
-		}
-		#No Avalible provinces
-		if = { 
-			limit = { 
-				NOT = { 
-					exists = scope:thorn_location 
-				} 
-			} 
-			trigger_event = cen_kal.1056 
-		}
+		trigger_event = cen_kal.1055
 	}
 	cost = { piety = 50 }
-	ai_will_do = { base = 100 }
+
+	ai_potential = {
+		always = yes
+	}
+
+	ai_will_do = {
+		base = 100
+	}
 }
 
 create_quilboar_empire = {
 	ai_check_interval = 12
 	picture = "gfx/interface/illustrations/decisions/quilboar_empire.dds"
-	desc = create_quilboar_empire_desc
-	title = create_quilboar_empire_name
-	selection_tooltip = create_quilboar_empire_tt
-	confirm_text = create_quilboar_empire_confirm
 	major = yes
 
-	ai_check_interval = 0
-
 	is_shown = {
 		is_landed = yes
 		highest_held_title_tier <= tier_kingdom
 		OR = {
 			faith = faith:agamaggan_worship
-			has_cultural_pillar = heritage_agamagganic
+			culture = { has_cultural_pillar = heritage_agamagganic }
 		}
 		NOT = {  #Can only do it once.
 			is_target_in_global_variable_list = {
@@ -245,18 +233,13 @@ create_quilboar_empire = {
 take_the_walk_quilboar = {
 	ai_check_interval = 12
 	picture = "gfx/interface/illustrations/decisions/quilboar_take_walk.dds"
-	desc = take_the_walk_quilboar_desc
-	title = take_the_walk_quilboar_name
-	selection_tooltip = take_the_walk_quilboar_tt
-	confirm_text = take_the_walk_quilboar_confirm
-	major = yes
 
 	cooldown = { years = 2 }
 
 	is_shown = {
 		OR = {
 			faith = faith:agamaggan_worship
-			has_cultural_pillar = heritage_agamagganic
+			culture = { has_cultural_pillar = heritage_agamagganic }
 		}
 		OR = {
 			has_trait = infirm
@@ -276,19 +259,21 @@ take_the_walk_quilboar = {
 	cost = { piety = 25 }
 
 	effect = { trigger_event = cen_kal.1062 }
+
+	ai_potential = {
+		always = yes
+	}
+
+	ai_will_do = {
+		base = 100
+	}
 }
 
 create_centaur_empire = {
 	ai_check_interval = 12
 	picture = "gfx/interface/illustrations/decisions/centaur_empire.dds"
-	desc = create_centaur_empire_desc
-	title = create_centaur_empire_name
-	selection_tooltip = create_centaur_empire_tt
-	confirm_text = create_centaur_empire_confirm
 	major = yes
 
-	ai_check_interval = 0
-
 	is_shown = {
 		is_landed = yes
 		highest_held_title_tier <= tier_kingdom

diff --git a/events/wc_events/wc_central_kalimdor_events.txt b/events/wc_events/wc_central_kalimdor_events.txt
@@ -3661,6 +3661,7 @@ cen_kal.1056 = {
 	desc = cen_kal.1056.desc
 	theme = faith
 	override_background = wilderness
+	orphan = yes
 
 	left_portrait = {
  		character = ROOT
@@ -3806,7 +3807,7 @@ cen_kal.1061 = {
 			limit = {
 				OR = {
 					faith = faith:agamaggan_worship
-					has_cultural_pillar = heritage_agamagganic
+					culture = { has_cultural_pillar = heritage_agamagganic }
 				}
 				NOT = { highest_held_title_tier = tier_empire }
 			}
@@ -3825,7 +3826,7 @@ cen_kal.1061 = {
 				highest_held_title_tier = tier_empire
 				NOR = {
 					faith = faith:agamaggan_worship
-					has_cultural_pillar = heritage_agamagganic
+					culture = { has_cultural_pillar = heritage_agamagganic }
 				}
 			}
 			text = cen_kal.1061.a
@@ -3834,7 +3835,7 @@ cen_kal.1061 = {
 			trigger = {
 				OR = {
 					faith = faith:agamaggan_worship
-					has_cultural_pillar = heritage_agamagganic
+					culture = { has_cultural_pillar = heritage_agamagganic }
 				}
 				NOT = { highest_held_title_tier = tier_empire }
 			}
@@ -3844,7 +3845,7 @@ cen_kal.1061 = {
 			trigger = {
 				NOR = {
 					faith = faith:agamaggan_worship
-					has_cultural_pillar = heritage_agamagganic
+					culture = { has_cultural_pillar = heritage_agamagganic }
 					highest_held_title_tier = tier_empire
 				}
 			}
@@ -3927,7 +3928,7 @@ cen_kal.1063 = {
 			limit = { 
 				OR = {
 					faith = faith:agamaggan_worship
-					has_cultural_pillar = heritage_agamagganic
+					culture = { has_cultural_pillar = heritage_agamagganic }
 				}
 			}
 			add_opinion = {
@@ -3970,7 +3971,7 @@ cen_kal.1064 = {
 			limit = { 
 				OR = {
 					faith = faith:agamaggan_worship
-					has_cultural_pillar = heritage_agamagganic
+					culture = { has_cultural_pillar = heritage_agamagganic }
 				}
 			}
 			add_opinion = {