Merge pull request #600 from Zemnmez/update-ck3

update ck3

project/ck3/base_game/BUILD

@@ -8,4 +8,4 @@ filegroup(
     ),
 )
 
-exports_files(glob(["**/*"]))
+exports_files(glob(["**/*"]))

project/ck3/base_game/common/achievement_groups.txt

@@ -38,6 +38,10 @@ group = {
 		"ep1_03_achievement"
 		"ep1_06_achievement"
 		"ep1_18_achievement"
+		# FP2
+		"fp2_historys_best_friends"
+		"fp2_basque_in_my_glory"
+		"fp2_friendship_is_magic"
 	}
 }
 
@@ -73,6 +77,12 @@ group = {
 		"ep1_14_achievement"
 		"ep1_17_achievement"
 		"ep1_20_achievement"
+		# FP2
+		"fp2_high_stakes_chess"
+		"fp2_iberia_or_iberia"
+		"fp2_iberian_hostilities"
+		"fp2_iberian_conciliation"
+		"fp2_iberian_compromise"
 	}
 }
 
@@ -106,6 +116,9 @@ group = {
 		"ep1_12_achievement"
 		"ep1_13_achievement"
 		"ep1_16_achievement"
+		# FP2
+		"fp2_andalusian_inquisition"
+		"fp2_holiday_in_iberia"
 	}
 }
 
@@ -123,5 +136,7 @@ group= {
 		# EP1
 		"ep1_15_achievement"
 		"ep1_19_achievement"
+		# FP2
+		"fp2_el_cid_achievement"
 	}
 }

project/ck3/base_game/common/achievements/fp2_achievements.txt

@@ -0,0 +1,166 @@
+fp2_historys_best_friends = { # History's Best Friend
+	possible = {
+		has_fp2_dlc_trigger = yes
+	}
+	happened = {
+		custom_description = {
+			text = fp2_historys_best_friends_trigger
+			exists = global_var:fp2_historys_best_friends_achievement_unlocked
+		}
+	}
+}
+
+fp2_basque_in_my_glory = {
+	possible = {
+		has_fp2_dlc_trigger = yes
+	}
+	happened = {
+		custom_description = {
+			text = fp2_basque_in_my_glory_trigger
+			exists = global_var:fp2_basque_in_my_glory_achievement_unlocked
+		}
+	}
+}
+
+fp2_friendship_is_magic = {
+	possible = {
+		has_fp2_dlc_trigger = yes
+		fp2_character_involved_in_struggle_trigger = yes
+	}
+	happened = {
+		custom_description = {
+			text = fp2_friendship_is_magic_trigger
+			exists = global_var:fp2_friendship_is_magic_achievement_unlocked
+		}
+	}
+}
+
+fp2_high_stakes_chess = {
+	possible = {
+		has_fp2_dlc_trigger = yes
+	}
+	happened = {
+		custom_description = {
+			text = fp2_high_stakes_chess_trigger
+			exists = global_var:fp2_high_stakes_chess_achievement_unlocked
+		}
+	}
+}
+
+fp2_iberia_or_iberia = {
+	possible = {
+		has_fp2_dlc_trigger = yes
+		NOT = {
+			is_target_in_global_variable_list = {
+				name = unavailable_achievements
+				target = flag:rd_character_blocked_iberia_or_iberia_achievement
+			}
+		}
+	}
+	happened = {
+		custom_description = {
+			text = fp2_iberia_or_iberia_trigger
+			is_ai = no
+			culture = { has_cultural_pillar = heritage_iberian }
+			completely_controls_region = dlc_fp2_caucasian_iberia # custom_ireland can be used instead of dlc_fp2_caucasian_iberia for testing, otherwise use debug.411
+		}
+	}
+}
+
+fp2_andalusian_inquisition = {
+	possible = {
+		has_fp2_dlc_trigger = yes
+	}
+	happened = {
+		custom_description = {
+			text = fp2_andalusian_inquisition_trigger
+			is_ai = no
+			any_county_in_region = {
+				region = world_europe_west_iberia
+				count = all
+				faith = faith:mozarabic_church
+			}
+		}
+	}
+}
+
+fp2_iberian_hostilities = {
+	possible = {
+		has_fp2_dlc_trigger = yes
+	}
+	happened = {
+		custom_description = {
+			text = fp2_iberian_hostilities_trigger
+			exists = global_var:fp2_iberian_hostilities_achievement_unlocked
+		}
+	}
+}
+
+fp2_iberian_conciliation = {
+	possible = {
+		has_fp2_dlc_trigger = yes
+	}
+	happened = {
+		custom_description = {
+			text = fp2_iberian_conciliation_trigger
+			exists = global_var:fp2_iberian_conciliation_achievement_unlocked
+		}
+	}
+}
+
+fp2_iberian_compromise = {
+	possible = {
+		has_fp2_dlc_trigger = yes
+	}
+	happened = {
+		custom_description = {
+			text = fp2_iberian_compromise_trigger
+			exists = global_var:fp2_iberian_compromise_achievement_unlocked
+		}
+	}
+}
+
+fp2_holiday_in_iberia = {
+	possible = {
+		has_fp2_dlc_trigger = yes
+		exists = global_var:fp2_holiday_in_iberia_achievement_unlocked
+	}
+	happened = {
+		custom_description = {
+			text = fp2_holiday_in_iberia_trigger
+			global_var:fp2_holiday_in_iberia_achievement_unlocked = yes
+		}
+	}
+}
+
+fp2_el_cid_achievement = {
+	possible = {
+		has_fp2_dlc_trigger = yes
+		game_start_date > 1045
+		NOT = {
+			is_target_in_global_variable_list = {
+				name = unavailable_achievements
+				target = flag:rd_character_blocked_el_cid_achievement
+			}
+		}
+	}
+	happened = {
+		custom_description = {
+			text = fp2_el_cid_achievement_trigger
+			exists = global_var:fp2_el_cid_achievement_unlocked
+		}
+	}
+}
+
+
+# fp2_00_achievement = {
+# 	possible = {
+# 		has_fp2_dlc_trigger = yes
+# 	}
+# 	happened = {
+# 		custom_description = {
+# 			text = fp2_00_achievement_trigger
+# 			#
+# 		}
+# 	}
+# }

project/ck3/base_game/common/achievements/msgrdk_achievements.json

@@ -343,6 +343,50 @@
 		{
 			"pdx_id": "ep1_20_achievement",
 			"xbla_id": "86"
+		},
+		{
+		    "pdx_id": "fp2_historys_best_friends",
+		    "xbla_id": "87"
+		},
+		{
+		    "pdx_id": "fp2_basque_in_my_glory",
+		    "xbla_id": "88"
+		},
+		{
+		    "pdx_id": "fp2_friendship_is_magic",
+		    "xbla_id": "89"
+		},
+		{
+		    "pdx_id": "fp2_high_stakes_chess",
+		    "xbla_id": "90"
+		},
+		{
+		    "pdx_id": "fp2_iberia_or_iberia",
+		    "xbla_id": "91"
+		},
+		{
+		    "pdx_id": "fp2_andalusian_inquisition",
+		    "xbla_id": "92"
+		},
+		{
+		    "pdx_id": "fp2_iberian_hostilities",
+		    "xbla_id": "93"
+		},
+		{
+		    "pdx_id": "fp2_iberian_conciliation",
+		    "xbla_id": "94"
+		},
+		{
+		    "pdx_id": "fp2_iberian_compromise",
+		    "xbla_id": "95"
+		},
+		{
+		    "pdx_id": "fp2_holiday_in_iberia",
+		    "xbla_id": "96"
+		},
+		{
+		    "pdx_id": "fp2_el_cid_achievement",
+		    "xbla_id": "97"
 		}
     ]
 }

project/ck3/base_game/common/achievements/standard_achievements.txt

@@ -88,6 +88,8 @@ a_legacy_to_last_the_ages_achievement = {
 				has_dynasty_perk = fp1_adventure_legacy_5
 				has_dynasty_perk = fp1_pillage_legacy_5
 				has_dynasty_perk = ep1_culture_legacy_5
+				has_dynasty_perk = fp2_urbanism_legacy_5
+				has_dynasty_perk = fp2_coterie_legacy_5
 			}
 		}
 	}
@@ -116,6 +118,14 @@ a_legacy_to_last_the_ages_achievement = {
 						has_dlc_feature = hybridize_culture
 						has_dynasty_perk = ep1_culture_legacy_5
 					}
+					#FP2
+					AND = {
+						has_fp2_dlc_trigger = yes
+						OR = {
+							has_dynasty_perk = fp2_urbanism_legacy_5
+							has_dynasty_perk = fp2_coterie_legacy_5
+						}
+					}
 				}
 			}
 		}

project/ck3/base_game/common/activities/00_activity_feast.txt

@@ -14,6 +14,9 @@
 		accept_invitation_for_character = activity_owner
 
 		activity_owner = {
+			# Check for special guest and make sure they join the party; the acceptance was done in the interaction
+			invite_special_guest_to_activity_effect = yes
+
 			#Start by setting the "host spouse"
 			if = {
 				limit = {
@@ -58,7 +61,7 @@
 			every_child = {
 				limit = {
 					is_available_for_activity_trigger = yes
-					liege = root
+					liege = scope:activity.activity_owner
 					OR = {
 						is_adult = yes
 						is_landed = yes
@@ -69,14 +72,14 @@
 			every_parent = {
 				limit = {
 					is_available_for_activity_trigger = yes
-					liege = root
+					liege = scope:activity.activity_owner
 				}
 				add_to_temporary_list = potential_guests
 			}
 			every_sibling = {
 				limit = {
 					is_available_for_activity_trigger = yes
-					liege = root
+					liege = scope:activity.activity_owner
 					OR = {
 						is_adult = yes
 						is_landed = yes
@@ -100,7 +103,7 @@
 					}
 					exists = scheme_target
 					scheme_target = {
-						liege = root
+						liege = scope:activity.activity_owner
 					}
 				}
 				scheme_target = {
@@ -143,7 +146,6 @@
 					trigger_event = feast.1503
 				}
 			}
-
 		}
 	}
 	on_activate = {
@@ -162,7 +164,7 @@
 			}
 		}
 		else = {
-		# If there are guests present
+			# If there are guests present
 			activity_owner = { # The host gets their events
 				# The key event is chosen for the host, and fires other events from there to every participant:
 				trigger_event = feast.0001
@@ -189,6 +191,33 @@
 				#Remove blocker for invitations to feasts (the feast is now active and will work as a blocker)
 				remove_variable = booked_for_a_party
 			}
+
+			# Struggle Catalysts
+			if = {
+				limit = {
+					# At least one participant is involved and  of a different faith or culture
+					any_participant = {
+						any_character_struggle = {
+							involvement = involved
+							phase_has_catalyst = catalyst_invite_diff_faith_culture_to_feast
+						}
+						is_diff_faith_or_culture_trigger = {
+							CHAR = scope:activity.activity_owner
+							STATUS = involved
+							STRUGGLE_TYPE = iberian_struggle
+						}
+					}
+				}
+				activity_owner = {
+					every_character_struggle = {
+						involvement = involved
+						activate_struggle_catalyst = {
+							catalyst = catalyst_invite_diff_faith_culture_to_feast
+							character = scope:activity.activity_owner
+						}
+					}
+				}
+			}
 		}
 	}
 	on_complete = {

project/ck3/base_game/common/activities/00_activity_hunt.txt

@@ -265,6 +265,9 @@ activity_hunt = {
 					}
 				}
 			}
+
+			# Check for special guest and make sure they join the party; the acceptance was done in the interaction
+			invite_special_guest_to_activity_effect = yes
 		}
 		scope:activity = {
 			activity_province = {