Merge branch 'master' into russian-adaptation

Warcraft-GoA-Development-Team · Sep 14, 2023 · 524983c · 524983c
2 parents 994fd6f + b38afd2
commit 524983c
Show file tree

Hide file tree

Showing 77 changed files with 1,147 additions and 2,865 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.3"
+version="0.3.2"
 picture="thumbnail.png"
 tags={
 	"Total Conversion"
@@ -26,5 +26,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.10.1"
+supported_version="1.10.2"
 path="mod/Warcraft-Guardians-of-Azeroth-2"
diff --git a/common/activities/activity_types/adult_education.txt b/common/activities/activity_types/adult_education.txt
@@ -760,12 +760,6 @@
 				subtract = root.adult_education_activity_cost
 				desc = activity_cost_scale_by_era_desc
 			}
-			add = {
-				value = root.adult_education_activity_cost
-				multiply = university_visit_activity_cost_scale_by_tier
-				subtract = root.adult_education_activity_cost
-				desc = activity_cost_scale_by_tier_desc
-			}
 		}
 		piety = {
 			add = {
@@ -803,19 +797,24 @@
 			add = { # Base Cost, scaled by era
 				value = adult_education_activity_cost
 				multiply = activity_cost_scale_by_era
-				multiply = university_visit_activity_cost_scale_by_tier
 			}
 
 			# Options 
 			add = { # Books Option 
 				value = 0
-				add = 10
-				add = 50
-				add = 200
+				subtract = minor_gold_value_static_max
+				add = {
+					value = medium_gold_value_static_max
+					min = 150
+				}
+				add = {
+					value = major_gold_value_static_max
+					min = 300
+				}
 				# Scale option costs by era
 				multiply = activity_cost_scale_by_era
 				# Divide by the number of option levels to get an average option cost
-				divide = 3
+				divide = 4
 			}
 
 			# Make it a multiple of 5 (rounded up)
@@ -845,21 +844,21 @@
 					gold = {
 						value = 0 
 						desc = adult_education_books_bad
-						add = {
-							value = 10
+						subtract = {
+							value = minor_gold_value_static_max
 							desc = adult_education_books_bad
 						}
-						add = {
-							value = 10
+						subtract = {
+							value = minor_gold_value_static_max
 							multiply = activity_cost_scale_by_era
-							subtract = 10
+							subtract = minor_gold_value_static_max
 							desc = activity_cost_scale_by_era_desc 
 						}
 					}
 				}
 
 				ai_will_do = {
-					value = 0
+					value = 100
 					if = {
 						limit = { has_trait = lazy }
 						add = 50
@@ -895,13 +894,14 @@
 						value = 0 
 						desc = adult_education_books_normal
 						add = {
-							value = 50
+							value = medium_gold_value_static_max
 							desc = adult_education_books_normal
+							min = 150
 						}
 						add = {
-							value = 50
+							value = medium_gold_value_static_max
 							multiply = activity_cost_scale_by_era
-							subtract = 50
+							subtract = medium_gold_value_static_max
 							desc = activity_cost_scale_by_era_desc 
 						}
 					}
@@ -925,13 +925,14 @@
 						value = 0 
 						desc = adult_education_books_good
 						add = {
-							value = 200
+							value = major_gold_value_static_max
 							desc = adult_education_books_good
+							min = 300
 						}
 						add = {
-							value = 200
+							value = major_gold_value_static_max
 							multiply = activity_cost_scale_by_era
-							subtract = 200
+							subtract = major_gold_value_static_max
 							desc = activity_cost_scale_by_era_desc 
 						}
 					}

diff --git a/common/activities/activity_types/wc_activity_arthas_expedition.txt b/common/activities/activity_types/wc_activity_arthas_expedition.txt
@@ -4,6 +4,7 @@
 		exists = global_var:arthas_character
 		root = global_var:arthas_character
 		is_landed = yes
+		exists = title:e_scourge.holder
 		# DLC locked
 		has_dlc_feature = tours_and_tournaments
 		has_dlc_feature = advanced_activities

diff --git a/common/activities/activity_types/wc_activity_arthas_expedition_non_dlc.txt b/common/activities/activity_types/wc_activity_arthas_expedition_non_dlc.txt
@@ -4,6 +4,7 @@
 		exists = global_var:arthas_character
 		root = global_var:arthas_character
 		is_landed = yes
+		exists = title:e_scourge.holder
 		# DLC locked
 		NAND = {
 			has_dlc_feature = tours_and_tournaments

diff --git a/common/activities/activity_types/wedding.txt b/common/activities/activity_types/wedding.txt
@@ -39,6 +39,9 @@
 		}
 	}
 
+	# Require a betrothal for player to start planning a wedding
+	can_always_plan = no
+
 	is_valid = {
 		# A spouse dying will invalidate
 		scope:activity.special_guest:spouse_1 = {