Merge branch 'dev' into tauren-ethnicity

Warcraft-GoA-Development-Team · Dec 17, 2024 · 1c7c378 · 1c7c378
2 parents 837bd0b + cfe25ff
commit 1c7c378
Show file tree

Hide file tree

Showing 423 changed files with 33,460 additions and 6,071 deletions.
diff --git a/Warcraft-Guardians-of-Azeroth-2.mod b/Warcraft-Guardians-of-Azeroth-2.mod
@@ -1,5 +1,5 @@
 name="Warcraft: Guardians of Azeroth Reforged (Release Alpha)"
-version="0.5.3"
+version="0.5.4"
 picture="thumbnail.png"
 tags={
 	"Total Conversion"
@@ -27,5 +27,5 @@ replace_path="common/religion/religion_families"
 replace_path="common/religion/holy_sites"
 replace_path="common/bookmark_portraits"
 replace_path="common/bookmarks"
-supported_version="1.14.0.2"
+supported_version="1.14.2.2"
 path="mod/Warcraft-Guardians-of-Azeroth-2"
diff --git a/common/achievements/standard_achievements.txt b/common/achievements/standard_achievements.txt
@@ -1,4 +1,4 @@
-until_death_do_us_part_achievement = {
+until_death_do_us_part_achievement = {
 	possible = {
 
 	}

diff --git a/common/activities/activity_types/adult_education.txt b/common/activities/activity_types/adult_education.txt
@@ -170,12 +170,18 @@
 		custom_tooltip = {
 			text = activity_pilgrimage.war_dangerous
 			NOR = {
-				county.holder = { any_war_enemy = { is_crisis_trigger = yes } }
-				county.holder = { any_liege_or_above = { any_war_enemy = { is_crisis_trigger = yes } } }
-				county.holder = { is_crisis_trigger = yes }
-				county.holder = { any_liege_or_above = { is_crisis_trigger = yes } }
+				county.holder ?= { any_war_enemy = { is_crisis_trigger = yes } }
+				county.holder ?= { any_liege_or_above = { any_war_enemy = { is_crisis_trigger = yes } } }
+				county.holder ?= { is_crisis_trigger = yes }
+				county.holder ?= { any_liege_or_above = { is_crisis_trigger = yes } }
 			}
 		}
+		trigger_if = {
+			limit = {
+				exists = county.holder
+			}
+			NOT = { county.holder = { is_isolated_from_trigger = { target = scope:host } } }
+		}
 	}
 
 	province_description = {

diff --git a/common/activities/activity_types/feast.txt b/common/activities/activity_types/feast.txt
@@ -1093,6 +1093,15 @@ activity_feast = {
 						desc = court_event_discount_desc
 					}
 				}
+				if = {
+					limit = {
+						has_character_modifier = wc_suramar_supporting_arcwinists_modifier
+					}
+					multiply = {
+						value = 0.75
+						desc = MODIFIER_DESC_wc_suramar_supporting_arcwinists_modifier
+					}
+				}
 				if = {
 					limit = {
 						has_character_flag = food_improves_feasts
@@ -4208,6 +4217,10 @@ activity_feast = {
 				}
 				remove_character_flag = feast_ai_override
 			}
+			add_character_flag = { # Warcraft - For ref in events
+				flag = wc_feast_cooldown
+				years = standard_feast_cooldown_time
+			}
 		}
 		set_variable = {
 			name = host_var