Fix blessed ice

Warcraft-GoA-Development-Team · Dec 8, 2024 · 6d0ed9a · 6d0ed9a
1 parent 71ab1c7
commit 6d0ed9a
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 16 deletions.
diff --git a/common/scripted_effects/00_activity_effects.txt b/common/scripted_effects/00_activity_effects.txt
@@ -3173,6 +3173,7 @@ disburse_feast_activity_rewards = {
 										target = root
 										modifier = impressed_opinion
 										opinion = 15
+										}
 								}
 								# End Warcraft
 							}
@@ -3526,7 +3527,7 @@ disburse_feast_activity_rewards = {
 				character = scope:root_scope
 				show_in_conclusion = yes
 				score = 50
-				
+
 				# Effects
 				root = {
 					# Host Rewards
@@ -3600,7 +3601,7 @@ disburse_feast_activity_rewards = {
 				character = scope:root_scope
 				show_in_conclusion = yes
 				score = 50
-				
+
 				# Effects
 				root = {
 					# Host Rewards
@@ -3624,7 +3625,7 @@ disburse_feast_activity_rewards = {
 							}
 							multiply = 1.5
 						}
-						
+
 						if = {
 							limit = {
 								culture = {
@@ -3635,7 +3636,7 @@ disburse_feast_activity_rewards = {
 						}
 						if = {
 							limit = {
-								activity_location.county = {
+								scope:activity.activity_location.county = {
 									has_county_modifier = wc_vernal_solstice_modifier
 								}
 							}
@@ -3675,7 +3676,7 @@ disburse_feast_activity_rewards = {
 				character = scope:root_scope
 				show_in_conclusion = yes
 				score = 50
-				
+
 				# Effects
 				root = {
 					# Host Rewards
@@ -3760,12 +3761,12 @@ disburse_feast_activity_rewards = {
 				character = scope:root_scope
 				show_in_conclusion = yes
 				score = 50
-				
+
 				# Effects
 				root = {
 					change_influence = {
 						value = 15
-						
+
 						scope:activity = {
 							every_attending_character = {
 								limit = {
@@ -3836,12 +3837,12 @@ disburse_feast_activity_rewards = {
 				character = scope:root_scope
 				show_in_conclusion = yes
 				score = 50
-				
+
 				# Effects
 				root = {
 					change_influence = {
 						value = 10
-						
+
 						scope:activity = {
 							every_attending_character = {
 								limit = {
@@ -3974,7 +3975,7 @@ disburse_feast_activity_rewards = {
 	}
 
 	# We give you the regular rewards
-	hosted_successful_feast_new_effect = yes	
+	hosted_successful_feast_new_effect = yes
 	# We give out the Reveler trait/xp
 	disburse_feast_reveler_rewards = yes
 	#Accolade glory gain
@@ -4459,7 +4460,7 @@ disburse_feast_reveler_rewards = {
 		}
 	}
 	# LEGITIMACY GAIN FOR STANDARD ACTIVITY PARTICIPATION - FEAST
-	standard_activity_participation_legitimacy_effect = yes
+	feast_activity_participation_legitimacy_effect = yes # Warcraft
 }
 
 
@@ -4605,7 +4606,7 @@ activity_special_type_progression_negative = {
 
 add_to_court_and_entourage_effect = {
 	root = {
-		add_courtier = prev 
+		add_courtier = prev
 	}
 	root.current_travel_plan = {
 		add_companion = prev
@@ -4618,7 +4619,7 @@ add_to_court_and_entourage_effect = {
 
 add_to_court_and_entourage_only_effect = {
 	root = {
-		add_courtier = prev 
+		add_courtier = prev
 	}
 	hidden_effect = {
 		root.current_travel_plan = {
@@ -4655,7 +4656,7 @@ add_to_entourage_court_and_activity_effect = {
 		else = {
 			if = {
 				limit = {
-					$CHAR_TO_ADD$ = { 
+					$CHAR_TO_ADD$ = {
 						NOT = { is_courtier_of = $NEW_COURT_OWNER$ }
 					}
 				}
@@ -4665,7 +4666,7 @@ add_to_entourage_court_and_activity_effect = {
 				if = {
 					limit = { $CHAR_TO_ADD$ = { NOT = { exists = current_travel_plan } } }
 					$NEW_COURT_OWNER$.current_travel_plan ?= { add_companion = $CHAR_TO_ADD$ }
-				} 
+				}
 			}
 			if = {
 				limit = {
@@ -4691,7 +4692,7 @@ recruit_to_entourage_court_and_activity_effect = {
 			hidden_effect = { # This must go above activity effect, or they will try and make their own travel plan!
 				if = {
 					limit = { $CHAR_TO_ADD$ = { NOT = { exists = current_travel_plan } } }
-					current_travel_plan ?= { add_companion = $CHAR_TO_ADD$ } 
+					current_travel_plan ?= { add_companion = $CHAR_TO_ADD$ }
 				}
 			}
 			if = {

diff --git a/common/scripted_effects/06_dlc_ce1_legitimacy_effects.txt b/common/scripted_effects/06_dlc_ce1_legitimacy_effects.txt
@@ -38,6 +38,35 @@ standard_activity_participation_legitimacy_effect = {
 	}
 }
 
+# Warcraft
+# Legitimacy from feasts, factors in Blessed Ice perk
+feast_activity_participation_legitimacy_effect = {
+	add_legitimacy = {
+		value = 0
+
+		if = {
+			limit = { is_valid_for_legitimacy_change = yes }
+			if = {
+				limit = {
+					this = scope:host
+				}
+				add = minor_legitimacy_gain
+			}
+			else = {
+				add = miniscule_legitimacy_gain
+			}
+
+			if = {
+				limit = {
+					has_perk = elemental_water_magic_tree_2_perk_3
+				}
+				multiply = 2
+			}
+		}
+	}
+}
+# End Warcraft
+
 # LEGITIMACY GAIN FOR LEGENDARY HUNT PARTICIPATION
 legendary_hunt_participation_legitimacy_effect = {
 	if = {