Merge branch 'feat/code/roads-to-power-update' of https://github.com/…

…Warcraft-GoA-Development-Team/Warcraft-Guardians-of-Azeroth-2 into feat/code/roads-to-power-update
Warcraft-GoA-Development-Team · Sep 25, 2024 · b62dc43 · b62dc43
2 parents 7ec81f9 + 32bd281
commit b62dc43
Show file tree

Hide file tree

Showing 33 changed files with 2,708 additions and 372 deletions.
diff --git a/common/courtier_guest_management/guest_management.txt b/common/courtier_guest_management/guest_management.txt
@@ -35,8 +35,8 @@
 				}
 				else_if = {
 					limit = { guest_vassal_candidate_trigger = yes }
+					multiply = 2
 				}
-				multiply = 2
 			}
 		}
 		modifier = {
@@ -587,7 +587,7 @@
 			add = {		
 				if = {
 					limit = {
-						scope:host = { has_royal_court = yes }
+						scope:host = { has_royal_court = yes has_dlc_feature = royal_court }
 					}
 					if = {
 						limit = {
@@ -642,6 +642,7 @@
 					if = {
 						limit = {
 							has_royal_court = yes
+							has_dlc_feature = royal_court
 						}
 						if = {
 							limit = {
@@ -692,6 +693,7 @@
 						if = {
 							limit = {
 								has_royal_court = yes
+								has_dlc_feature = royal_court
 							}
 							if = {
 								limit = {

diff --git a/common/customizable_localization/00_activity_loc.txt b/common/customizable_localization/00_activity_loc.txt
@@ -40,6 +40,12 @@
 		}
 		localization_key = activity_adult_education_success
 	}
+
+	##Camp Party
+	text = {
+		trigger = { has_activity_type = activity_camp_party }
+		localization_key = activity_camp_party_success
+	}
 }
 
 GetActivitySpecialTypeDesc = { # Only used for Pilgrimages
@@ -70,6 +76,12 @@ GetActivitySpecialTypeDesc = { # Only used for Pilgrimages
 		localization_key = pilgrimage_worldliness_desc
 	}
 
+	##Camp Party
+	text = {
+		trigger = { has_activity_type = activity_camp_party }
+		localization_key = activity_camp_party_success_desc
+	}
+
 }
 
 GetAnimalSightingDescriptionType = {

diff --git a/common/customizable_localization/00_animal_custom_loc.txt b/common/customizable_localization/00_animal_custom_loc.txt
@@ -47,19 +47,56 @@ SmallAnimal = {
 		trigger = {
 			location = {
 				OR = {
-					#geographical_region = world_europe_south
-					geographical_region = world_europe_north
-					#geographical_region = world_europe_south_east
-					geographical_region = world_europe_west
-					#geographical_region = world_europe_east
-					geographical_region = world_asia_minor
+					#Warcraft
+					geographical_region = world_eastern_kingdoms
+					geographical_region = world_kalimdor
+					geographical_region = world_northrend
+					geographical_region = world_broken_isles
 				}
 			}
 		}
 		localization_key = small_animal_hedgehog
 	}
 }
 
+SmallAnimalPlural = {
+	type = character
+
+	random_valid = yes
+
+	#Bunny
+	text = {
+		localization_key = small_animal_plural_rabbit
+	}
+	#Squirrel
+	text = {
+		localization_key = small_animal_plural_squirrel
+	}
+	#Bird
+	text = {
+		localization_key = small_animal_plural_bird
+	}
+	#Mouse
+	text = {
+		localization_key = small_animal_plural_mouse
+	}
+	#Hedgehog
+	text = {
+		trigger = {
+			location = {
+				OR = {
+					#Warcraft
+					geographical_region = world_eastern_kingdoms
+					geographical_region = world_kalimdor
+					geographical_region = world_northrend
+					geographical_region = world_broken_isles
+				}
+			}
+		}
+		localization_key = small_animal_plural_hedgehog
+	}
+}
+
 HateCatsDogs = {
 	type = character