Merge branch 'terrain-brokenisles-1.10' of https://github.com/Warcraf…

…t-GoA-Development-Team/Warcraft-Guardians-of-Azeroth-2 into terrain-brokenisles-1.10
Warcraft-GoA-Development-Team · Nov 26, 2023 · e3508ea · e3508ea
2 parents 6aa34b6 + e05d64d
commit e3508ea
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 25 deletions.
diff --git a/common/buildings/wc_special_buildings.txt b/common/buildings/wc_special_buildings.txt
@@ -728,6 +728,7 @@ narthalas_academy_01 = {
 	}
 
 	next_building = narthalas_academy_02
+	flag = travel_point_of_interest_learning
 
 
 	type = special
@@ -772,6 +773,7 @@ falanaar_tunnels_01 = {
 	}
 
 	type = special
+	flag = travel_point_of_interest_wonder
 
 	can_construct_potential = {
 		always = no

diff --git a/common/scripted_triggers/00_building_requirement_triggers.txt b/common/scripted_triggers/00_building_requirement_triggers.txt
@@ -590,33 +590,32 @@ religious_special_building_exclusion_trigger = { # checks if any special buildin
 				has_building = holy_site_pagan_grand_temple_01
 				has_building = holy_site_indian_grand_temple_01
 				has_building = holy_site_other_grand_temple_01
-
 				# Warcraft
 				# islamic_special_building_trigger = yes
 				# christian_special_building_trigger = yes
 			}
 		}
-		AND = { # Islamic
-			NOT = { barony.holder = { like_islam_religion_trigger = yes } }
-			# Warcraft
-			# islamic_special_building_trigger = yes
-		}
-		AND = { # Christian
-			NOT = { barony.holder = { like_christianity_religion_trigger = yes } }
-			# Warcraft
-			# christian_special_building_trigger = yes
-		}
-		AND = { # Eastern family
-			NOR = {
-				ROOT = { like_hinduism_religion_trigger = yes }
-				ROOT = { like_buddhism_religion_trigger = yes }
-				ROOT = { like_jainism_religion_trigger = yes }
-				# Warcraft
-				# ROOT.religion = religion:taoism_religion
-				# ROOT.religion = religion:zoroastrianism_religion
-			}
-			# Warcraft
-			# eastern_special_building_trigger = yes
-		}
+		#AND = { # Islamic
+		#	NOT = { barony.holder = { like_islam_religion_trigger = yes } }
+		#	# Warcraft
+		#	# islamic_special_building_trigger = yes
+		#}
+		#AND = { # Christian
+		#	NOT = { barony.holder = { like_christianity_religion_trigger = yes } }
+		#	# Warcraft
+		#	# christian_special_building_trigger = yes
+		#}
+		#AND = { # Eastern family
+		#	NOR = {
+		#		ROOT = { like_hinduism_religion_trigger = yes }
+		#		ROOT = { like_buddhism_religion_trigger = yes }
+		#		ROOT = { like_jainism_religion_trigger = yes }
+		#		# Warcraft
+		#		# ROOT.religion = religion:taoism_religion
+		#		# ROOT.religion = religion:zoroastrianism_religion
+		#	}
+		#	# Warcraft
+		#	# eastern_special_building_trigger = yes
+		#}
 	}
 }
diff --git a/common/scripted_triggers/00_education_triggers.txt b/common/scripted_triggers/00_education_triggers.txt
@@ -364,8 +364,12 @@ had_learning_education_disaffinity_childhood_trait_trigger = {
 }
 
 has_university_building_trigger = {
-	# Warcraft
-	has_building_or_higher = generic_university
+	OR = {
+		has_building_or_higher = generic_university
+		has_building_or_higher = narthalas_academy_02
+		has_building_or_higher = karazhan_01
+		has_building_or_higher = violet_citadel_01
+	}
 }
 
 characters_have_same_education_group_trigger = {

diff --git a/common/scripted_triggers/05_bp2_triggers.txt b/common/scripted_triggers/05_bp2_triggers.txt
@@ -13,6 +13,8 @@ is_religious_studies_location = {
 		has_building_or_higher = holy_site_pagan_grand_temple_01
 		has_building_or_higher = holy_site_indian_grand_temple_01
 		has_building_or_higher = holy_site_other_grand_temple_01
+		has_building_or_higher = sunwell_01
+		has_building_or_higher = nightwell_01
 		#has_building_or_higher = holy_site_mahabodhi_temple_01
 		#has_building_or_higher = brihadeeswarar_temple_01
 		#has_building_or_higher = holy_site_cologne_cathedral_01