Merge branch 'develop'

ACR_Changelog.md

@@ -1,5 +1,34 @@
+2020-01-27 v0.46.0 "Isis"
+===========================
+
+> Isis was originally a minor goddess of funerary rites and magical protection; a role mimicking her portrayal in the Osiris myth, where she resurrected her husband Osiris and protected their child Horus. Over the millenia she rose in prominence alongside her husband, eventually eclipsing him in popularity. By the time of the Roman Principate the worship of Isis could be found all over the Mediterranean, with local cults adapting her worship to their own customs.
+
+Celtic:
+
+- Fixed an issue that prevented the correct background and "small symbol" for the Petitioners of the Unseelie Court.
+- Fixed an issue where Celtic characters would not always receive a tattoo trait when they should.
+
+Hellenic:
+
+- Fixed an issue where the Skeptic and Epicurean orders were not joinable.
+- Fixed a bug that prevented god names from showing in certain monastic order events.
+
+Promethean/Titan:
+
+- Fixed an issue that prevented the correct background and "small symbol" for The Coven.
+
+Egyptian:
+
+- Fixed a bug that prevented the Nile Flooding events from firing.
+- Fixed an issue that prevented the correct background and "small symbol" for the Fangs of Apep.
+- Added the Isiac Order, a stewardship focused monastic order.
+  - Formable by Egyptian/Kemetic characters, with similar criteria found in the Neoplatonist society decisions.
+  - Otherwise identical to other monastic orders.
+  - Joinable by Hellenic/Reformed Hellenic characters as well.
+
 2019-11-15 v0.45.0 "Nimue"
 ===========================
+
 > Nimue, along with several other variant spellings, is given as the name of the Lady of the Lake in several Arthurian legends. Believed to be based on the multitude of goddessses and fairy queens associated with water in Celtic myth, she is the foster mother of Lancelot and his cousins and guides Merlin in his quest to make Arthur a great king of the Britons.
 
 General:

AncientReligions/common/scripted_effects/00_scripted_effects.txt

@@ -5521,6 +5521,18 @@ join_prev_monastic_order_society = {
 		limit = { PREV = { society_member_of = monastic_order_stoics } }
 		join_society = monastic_order_stoics
 	}
+	if = {
+		limit = { PREV = { society_member_of = monastic_order_skeptics } }
+		join_society = monastic_order_skeptics
+	}
+	if = {
+		limit = { PREV = { society_member_of = monastic_order_epicureans } }
+		join_society = monastic_order_epicureans
+	}
+	if = {
+		limit = { PREV = { society_member_of = monastic_order_isis } }
+		join_society = monastic_order_isis
+	}
 }
 
 clr_artifact_flagsmodifiers_effect = {
@@ -22988,6 +23000,7 @@ add_random_tattoo_effect = { #Tied to religion, used only for special events.
 			OR = { 
 				religion = norse_pagan
 				religion = norse_pagan_reformed
+				religion_openly_in_celtic_subgroup_trigger = yes
 			}
 			NOR = { 
 				trait = african_tattoo_1

AncientReligions/common/scripted_effects/ACR_scripted_effects.txt

@@ -1230,4 +1230,230 @@ subtract_foreign_influence_major_effect = {
 			}
 		}
 	}
+}
+
+spawn_good_scholar_effect = {
+
+	if = { 
+		limit = { has_religion_feature = religion_matriarchal }
+		create_random_priest = {
+			random_traits = yes
+			dynasty = actually_culture
+			female = yes
+			attributes = {
+				diplomacy = 2
+				learning = 8
+				stewardship = 2
+				intrigue = 2
+				martial = 2
+			}
+		}
+	}
+	if = { 
+		limit = { NOT = { has_religion_feature = religion_matriarchal } }
+		create_random_priest = {
+			random_traits = yes
+			dynasty = actually_culture
+			female = no
+			attributes = {
+				diplomacy = 2
+				learning = 8
+				stewardship = 2
+				intrigue = 2
+				martial = 2
+			}
+		}
+	}
+	new_character = {
+		remove_trait = weak
+		remove_trait = slow
+		remove_trait = imbecile
+		remove_trait = dull
+		remove_trait = dwarf
+		remove_trait = giant
+		remove_trait = hunchback
+		remove_trait = clubfooted
+		remove_trait = craven
+		remove_trait = paranoid
+
+		remove_trait = mystic
+		remove_trait = socializer
+		remove_trait = gamer
+		remove_trait = hedonist
+		remove_trait = duelist
+		remove_trait = hunter
+		remove_trait = strategist
+		remove_trait = administrator
+		remove_trait = architect
+		remove_trait = gardener
+		remove_trait = schemer
+		remove_trait = impaler
+		remove_trait = seducer
+		remove_trait = seductress
+		remove_trait = theologian
+		remove_trait = scholar
+
+		remove_trait = detached_priest
+		remove_trait = martial_cleric
+		remove_trait = mastermind_theologian
+
+		add_trait = scholarly_theologian
+
+		random_list = {
+			27 = {
+				add_trait = shrewd
+			}
+			3 = {
+				add_trait = quick
+			}
+			70 = {
+				change_diplomacy = 1
+			}
+		}
+
+		hidden_tooltip = {
+			if = {
+				limit = {
+					has_dharmic_religion_trigger = yes
+				}
+				add_trait = brahmin
+				character_event = { id = RoI.30121 }
+			}
+			if = {
+				limit = {
+					has_religion_feature = religion_no_leader
+					religion_group = pagan_group
+				}
+				random_list = {  
+					5 = {
+						add_trait = pagan_branch_1
+					}
+					25 = {
+						add_trait = pagan_branch_2
+					}
+					25 = {
+						add_trait = pagan_branch_3
+					}
+					25 = {
+						add_trait = pagan_branch_4
+					}
+				}
+			}
+		}
+		set_character_flag = invited_soldier
+		save_event_target_as = invited_character
+	}
+}
+
+spawn_good_steward_effect = {
+
+	if = { 
+		limit = { has_religion_feature = religion_matriarchal }
+		create_random_steward = {
+			random_traits = yes
+			dynasty = actually_culture
+			female = yes
+			attributes = {
+				diplomacy = 2
+				learning = 2
+				stewardship = 8
+				intrigue = 2
+				martial = 2
+			}
+		}
+	}
+	if = { 
+		limit = { NOT = { has_religion_feature = religion_matriarchal } }
+		create_random_steward = {
+			random_traits = yes
+			dynasty = actually_culture
+			female = no
+			attributes = {
+				diplomacy = 2
+				learning = 4
+				stewardship = 8
+				intrigue = 2
+				martial = 2
+			}
+		}
+	}
+	new_character = {
+		remove_trait = weak
+		remove_trait = slow
+		remove_trait = imbecile
+		remove_trait = dull
+		remove_trait = dwarf
+		remove_trait = giant
+		remove_trait = hunchback
+		remove_trait = clubfooted
+		remove_trait = craven
+		remove_trait = paranoid
+
+		remove_trait = mystic
+		remove_trait = socializer
+		remove_trait = gamer
+		remove_trait = hedonist
+		remove_trait = duelist
+		remove_trait = hunter
+		remove_trait = strategist
+		remove_trait = administrator
+		remove_trait = architect
+		remove_trait = gardener
+		remove_trait = schemer
+		remove_trait = impaler
+		remove_trait = seducer
+		remove_trait = seductress
+		remove_trait = theologian
+		remove_trait = scholar
+
+		remove_trait = indulgent_wastrel
+		remove_trait = thrifty_clerk
+		remove_trait = midas_touched
+
+		add_trait = scholarly_theologian
+
+		random_list = {
+			27 = {
+				add_trait = shrewd
+			}
+			3 = {
+				add_trait = quick
+			}
+			70 = {
+				change_diplomacy = 1
+			}
+		}
+
+		hidden_tooltip = {
+			if = {
+				limit = {
+					has_dharmic_religion_trigger = yes
+				}
+				add_trait = brahmin
+				character_event = { id = RoI.30121 }
+			}
+			if = {
+				limit = {
+					has_religion_feature = religion_no_leader
+					religion_group = pagan_group
+				}
+				random_list = {  
+					5 = {
+						add_trait = pagan_branch_1
+					}
+					25 = {
+						add_trait = pagan_branch_2
+					}
+					25 = {
+						add_trait = pagan_branch_3
+					}
+					25 = {
+						add_trait = pagan_branch_4
+					}
+				}
+			}
+		}
+		set_character_flag = invited_soldier
+		save_event_target_as = invited_character
+	}
 }

AncientReligions/common/scripted_triggers/00_scripted_triggers.txt

@@ -2998,6 +2998,7 @@ is_monastic_member_trigger = {
 		is_dharmic_monastic_member_trigger = yes
 		is_christian_monastic_member_trigger = yes
 		is_hellenic_monastic_order_member_trigger = yes
+		society_member_of = monastic_order_isis
 	}
 }
 

AncientReligions/common/scripted_triggers/ACR_scripted_triggers.txt

@@ -104,12 +104,14 @@ archdryad_submission_trigger = {
 is_on_nile_trigger = {
 	location = {
 		any_neighbor_province = {
-			province = 1995
-			province = 1996
-			province = 1997
-			province = 1998
-			province = 1999
-			province = 2000
+			OR = {
+				province = 1995
+				province = 1996
+				province = 1997
+				province = 1998
+				province = 1999
+				province = 2000
+			}
 		}
 	}
 }