Merge pull request #204 from xirsoi/develop

vesontio release
xirsoi · May 11, 2019 · 5de06f4 · 5de06f4
2 parents 2666a57 + 4728276
commit 5de06f4
Show file tree

Hide file tree

Showing 21 changed files with 4,745 additions and 67 deletions.
diff --git a/ACR_Changelog.md b/ACR_Changelog.md
@@ -1,3 +1,25 @@
+2019-05-11 v0.43.3 "Vesontio"
+===========================
+
+> Vesontio was the site of a battle between Gaius Julius Caesar's 6 Roman legions and the armies of Ariovistus in 58 BC. The Roman's nearly lost, if not for a snap judgement by Crassus to send the infantry reserve to support the right flank, the German's may have been able to encircle Caesar's forces. Ariovistus is believed to have escaped, but his exact fate is unknown except that he was dead before 54 BC drew to a close.
+
+General:
+
+- Fixed many many bugs reported by The Validator.
+- Fixed issue where Reformed Pagans couldn't use the Great Library or Grand University Great Works.
+
+Celtic:
+
+- Fixed issue that made the Archdruid never qualify for Papal Succession.
+
+Hellenic:
+
+- Hellenic Monastic Orders (Stoics, Skeptics, Epicureans) have access to the correct decisions now.
+
+Egyptian:
+
+- Egyptians always have access to Pyramids, including the Great Pyramids.
+
 2019-04-08 v0.43.2 "Ariovistus"
 ===========================
 

diff --git a/AncientReligions/common/cb_types/00_cb_types.txt b/AncientReligions/common/cb_types/00_cb_types.txt
@@ -9598,7 +9598,6 @@ imperial_reconquest = {
 			de_jure_liege_or_above = k_mauretania
 			de_jure_liege_or_above = k_papal_state
 			de_jure_liege_or_above = k_papacy
-			de_jure_liege_or_above = k_venice
 			de_jure_liege_or_above = k_asturias
 			de_jure_liege_or_above = k_sardinia
 			de_jure_liege_or_above = k_antioch
@@ -10380,6 +10379,7 @@ pagan_subjugation = {
 
 	can_use = {
 		ROOT = {
+			religion_group = pagan_group
 			is_organized_religion_trigger = no
 			NOT = { religion = hellenic_pagan }
 			NOT = { same_realm = FROM }
@@ -10431,7 +10431,12 @@ pagan_subjugation = {
 			religion_group = pagan_group
 			is_nomadic = no
 			NOT = { is_offmap_governor = yes }
-			is_organized_religion_trigger = yes
+			OR = {
+				is_reformed_religion = no
+				ROOT = {
+					is_organized_religion_trigger = yes
+				}
+			}
 			NOT = {
 				any_war = {
 					defender = { character = PREVPREV }

diff --git a/AncientReligions/common/landed_titles/ACR_religion_titles.txt b/AncientReligions/common/landed_titles/ACR_religion_titles.txt
@@ -84,7 +84,7 @@ d_egyptian_pagan_reformed = {
 	dynasty_title_names = no 	# Will not be named "Seljuk", etc.
 
 	male_names = {
-		Babaef Bakenkhonsu Bakenranef Baskakeren Baufra_Baufra Baufre_Baufra Bauefre_Baufra "Bay Irsu" Bebi Bebiankh_Bebiankh "Seuserenre Bebiankh" Bek_Bek Bak_Bek Buneb Chephren Cheops Dagi Dedi Dedumose_Dedumose Tutimaios_Dedumose Den Didia Djaty Djau Djedefhor Djedefptah Djedefre Djedhor Djedi Djediufankh "Djedkare Isesi" "Djedkare Shemai" Djedkhonsuefankh Djedptahiufankh Djehuty Djer Djet Djoser_Djoser Duaenhor Duaenre Hakor_Hakor Akoris_Hakor Hannu Hapuseneb Harkhuf "Harsiese Hedjkheperre Setepenamun" Harsiese Harsiotef Harwa Hemaka Hepu Heqanakht Herihor Hersy-Ra Hewernef Hor_Hor Hor-Aha_Hor Horbaef Horemheb_Horemheb Horemhab_Horemheb Haremhab_Horemheb Hori Hornakht Hotepibre Hotepsekhemwy Hsekiu_Hsekiu Seka_Hsekiu Hugronaphor Hunefer Huni Huy Huya Ibi Ibiau_Ibiau Ibiaw_Ibiau "Wahibre Ibiau"_Ibiau Imhotep  Imyremeshaw Inaros_Inaros Ienheru_Inaros Inarus_Inaros "Ini Menkheperre" Inkaef Intef Intefiqer Isesi-ankh Isu Itisen Iufaa Iufni Iunmin_Iunmin Yunmin_Iunmin Iuenmin_Iunmin Minuen_Iunmin Iunre_Iunre Yunre_Iunre Iuput Iynefer Ka_Ka "Sekhem Ka"_Ka Ka-Sekhen_Ka Kaemsekhem Kagemni Kakhent Kamose Kanefer Kashta Khaba Khabash Khabekhnet Khaemtir Khaemweset Khafra Khamudi Khasekhemwy Khawy Khay Khayu "Khendjer Userkare" Kheti Khnumhotep Khufu Khufukhaf Khyan Mahu Maiherpri Malewiebamani Masaharta Meketre Menes Menkare "Menkauhor Kaiu"_Menkauhor Menkaure_Menkauhor Menkheperraseneb Menkheperre Menna Mentuherkhepeshef Mentuhotep Merefnebef Merenhor "Merenre Nemtyemsaf" "Merhotepre Ini" Merikare Merit-Ptah "Merneferre Ay" Merneptah Meru Meryatum Merymose Meryptah Meryre Merysekhmet Meryteti_Meryteti Merytre-Hatshepsut_Meryteti Mindjedef Minkhaf Minmontu Minmose Minnefer Montuherkhopshef Nakht_Nakht Nakhthoreb Nakhtmin Nakhtnebef Nakhtpaaten_Nakht Narmer Nasakhma Nastasen Nebamun Nebemakhet Nebiriau_Nebiriau "Nebiriau Sewadjenre"_Nebiriau Nebmaatre "Nebneteru Tenry" Nebnuni Nebre Nebwenenef Neby Necho Nectanebo Nedjem Neferefre Neferhotep_Neferhotep "Neferhotep Sekhemre Sankhtawy"_Neferhotep Neferirkare_Neferirkare "Neferirkare Kakai"_Neferirkare Neferkahor Neferkamin_Neferkamin "Neferkamin Anu" Neferkara "Neferkare Iymeru" Neferkare "Neferkare Khendu" "Neferkare Neby" "Neferkare Pepiseneb" "Neferkare Tereru" Neferkau Neferkauhor Neferkaure Nefermaat Neferronpet Nefersheshemre Nehesy Nehi "Neitiqerty Siptah" Nekauba Nemtyemsaf Nepherites Neserkauhor "Neterkheperre Meryptah" Netjeraperef Netjerkare Nikare Nikaure Nimlot Nykara Nynetjer "Nyuserre Ini" Osorkon Paanchi Pabasa Pahemnetjer "Pami Usermaatre Setepenre" Panehesy Paraemheb Pareherwenemef Parennefer Paser Pashedu Paweraa Pawura Pebekkamen Pediamenopet Pediese Petiese Pedubast Pennesuttawy Pensekhmet Pentawer Penthu Pentu Pepi_Pepi "Pepi Meryre" Pepi "Pepi Neferkare" Perneb Petubastis Piankh Pihuri Pimay Pinedjem Pinehesy Pipi Piye Prehotep Psammuthes Psamtik_Psamtik "Psamtik Wahibre"_Psamtik Psusennes_Psusennes "Psusennes Titkheperure"_Psusennes Ptahhotep Ptahmose Ptahshepses Puimre Qa'a "Qakare Ibi" Qar Qen Qenna Raemka Raherka Rahotep Ramesses_Ramesses "Ramesses Menpehtyre" "Ramesses Usimare" "Ramesses Usermaatre Meryamun Setepenre" "Ramesses Usermare Akhenamun" "Ramesses-Meryamun-Nebweben" Ramesses Ramessesnakht Ramose Raneb Ranefer Rashepses Rawer Rehuerdjersen Rekhmire Renseneb Roma-Roi "Rudamun Usermaatre Setepenamun Meryamun" Sabef Sabu Sahure Sakir-Har Salitis Sanakht "Sankhenre Sewadjtu" "Sedjefakare Amenemhat" Sehetepre Sekhemib-Perenmaat Sekhemkare Sekhemkhet "Sekhemre Khutawy Sobekhotep" Semenkare Semenre Semerkhet "Senakhtenre Tao" Tao Seneb Senebhenaf Senebi Senedj Senedjemib_Senedjemib "Senedjemib Inti" "Senedjemib Mehi" Senedjemib Senenmut Senewosret-Ankh Senkamanisken Sennedjem Sennefer Senneferi Senusret "Seqenenre Tao" Serfka Setau Seth-Peribsen Seti_Seti "Seti Menmaatre" "Seti Userkheperure Setepenre" Seti-Merenptah_Seti "Setnakhte Userkhaure-Setepenre" Bebiankh Sewadjkare "Sewadjkare Hori" "Shabaka Neferkare" Shebitku Shedsu-nefertum Shepseska "Shepseskare Isi" Shepsesneb Shery "Sheshi Maaibre" Sheshonk_Sheshonk "Sheshonk Heqakheperre" "Sheshonk Usermaatre Setepenre" "Sheshonk Hedjkheperre Setepenre" Sheshonk Shoshenq_Sheshonk "Siamun Netjerkheperre-Setepenamun" Siamun Siaspiqa Siatum Siese Simut "Siptah Akhenre Setepenre" Smendes_Smendes "Smendes Hedjkheperre Setepenre"_Smendes Smenkhkare Sneferu_Sneferu Snefru_Sneferu Snofru_Sneferu Soris_Sneferu Sobekemhat Sobekemsaf_Sobekemsaf  "Sobekemsaf Sekhemrewadjkhaw"_Sobekemsaf Sobekhotep_Sobekhotep "Sobekhotep Khaankhre" "Sobekhotep Sekhemresewdjtawy" "Sobekhotep Khaneferre" Sobekhotep "Sobekhotep Sekhemre Susertawi" Sobeknakht Taharqa Takelot_Takelot "Takelot Hedjkheperre Setepenre" "Takelot Si-Ese Hedjkheperre Setepenre" "Takelot Si-Ese Usimare Setepenamun" Takelot Talakhamani Tantamani Tao_Tao "Tao Seqenenre" Tefnakht_Tefnakht "Tefnakht Shepsesre"_Tefnakht Teos Teta Teti Thamphthis Thutmose Tjanefer Tutankhamun "Tutkheperre Shoshenq" Tutu Unas Useramen Userhet Userkaf Userkare Usermontu Wadjmose "Wakhare Khety" Webensenu "Wegaf Khutawyre" Wehemka Weneg Weni Wentawat Wetka Yanhamu Yaqub-Har Yuny Yuya Zamonth Zannanza Zoser_Djoser
+		Babaef Bakenkhonsu Bakenranef Baskakeren Baufra_Baufra Baufre_Baufra Bauefre_Baufra "Bay Irsu" Bebi Bebiankh_Bebiankh "Seuserenre Bebiankh" Bek_Bek Bak_Bek Buneb Chephren Cheops Dagi Dedi Dedumose Tutimaios_Dedumose Den Didia Djaty Djau Djedefhor Djedefptah Djedefre Djedhor Djedi Djediufankh "Djedkare Isesi" "Djedkare Shemai" Djedkhonsuefankh Djedptahiufankh Djehuty Djer Djet Djoser_Djoser Duaenhor Duaenre Hakor_Hakor Akoris_Hakor Hannu Hapuseneb Harkhuf "Harsiese Hedjkheperre Setepenamun" Harsiese Harsiotef Harwa Hemaka Hepu Heqanakht Herihor Hersy-Ra Hewernef Hor_Hor Hor-Aha_Hor Horbaef Horemheb_Horemheb Horemhab_Horemheb Haremhab_Horemheb Hori Hornakht Hotepibre Hotepsekhemwy Hsekiu_Hsekiu Seka_Hsekiu Hugronaphor Hunefer Huni Huy Huya Ibi Ibiau_Ibiau Ibiaw_Ibiau "Wahibre Ibiau"_Ibiau Imhotep  Imyremeshaw Inaros_Inaros Ienheru_Inaros Inarus_Inaros "Ini Menkheperre" Inkaef Intef Intefiqer Isesi-ankh Isu Itisen Iufaa Iufni Iunmin_Iunmin Yunmin_Iunmin Iuenmin_Iunmin Minuen_Iunmin Iunre_Iunre Yunre_Iunre Iuput Iynefer Ka_Ka "Sekhem Ka"_Ka Ka-Sekhen_Ka Kaemsekhem Kagemni Kakhent Kamose Kanefer Kashta Khaba Khabash Khabekhnet Khaemtir Khaemweset Khafra Khamudi Khasekhemwy Khawy Khay Khayu "Khendjer Userkare" Kheti Khnumhotep Khufu Khufukhaf Khyan Mahu Maiherpri Malewiebamani Masaharta Meketre Menes Menkare "Menkauhor Kaiu"_Menkauhor Menkaure_Menkauhor Menkheperraseneb Menkheperre Menna Mentuherkhepeshef Mentuhotep Merefnebef Merenhor "Merenre Nemtyemsaf" "Merhotepre Ini" Merikare Merit-Ptah "Merneferre Ay" Merneptah Meru Meryatum Merymose Meryptah Meryre Merysekhmet Meryteti_Meryteti Merytre-Hatshepsut_Meryteti Mindjedef Minkhaf Minmontu Minmose Minnefer Montuherkhopshef Nakht_Nakht Nakhthoreb Nakhtmin Nakhtnebef Nakhtpaaten_Nakht Narmer Nasakhma Nastasen Nebamun Nebemakhet Nebiriau_Nebiriau "Nebiriau Sewadjenre"_Nebiriau Nebmaatre "Nebneteru Tenry" Nebnuni Nebre Nebwenenef Neby Necho Nectanebo Nedjem Neferefre Neferhotep_Neferhotep "Neferhotep Sekhemre Sankhtawy"_Neferhotep Neferirkare_Neferirkare "Neferirkare Kakai"_Neferirkare Neferkahor Neferkamin_Neferkamin "Neferkamin Anu" Neferkara "Neferkare Iymeru" Neferkare "Neferkare Khendu" "Neferkare Neby" "Neferkare Pepiseneb" "Neferkare Tereru" Neferkau Neferkauhor Neferkaure Nefermaat Neferronpet Nefersheshemre Nehesy Nehi "Neitiqerty Siptah" Nekauba Nemtyemsaf Nepherites Neserkauhor "Neterkheperre Meryptah" Netjeraperef Netjerkare Nikare Nikaure Nimlot Nykara Nynetjer "Nyuserre Ini" Osorkon Paanchi Pabasa Pahemnetjer "Pami Usermaatre Setepenre" Panehesy Paraemheb Pareherwenemef Parennefer Paser Pashedu Paweraa Pawura Pebekkamen Pediamenopet Pediese Petiese Pedubast Pennesuttawy Pensekhmet Pentawer Penthu Pentu Pepi_Pepi "Pepi Meryre" Pepi "Pepi Neferkare" Perneb Petubastis Piankh Pihuri Pimay Pinedjem Pinehesy Pipi Piye Prehotep Psammuthes Psamtik_Psamtik "Psamtik Wahibre"_Psamtik Psusennes_Psusennes "Psusennes Titkheperure"_Psusennes Ptahhotep Ptahmose Ptahshepses Puimre Qa'a "Qakare Ibi" Qar Qen Qenna Raemka Raherka Rahotep Ramesses_Ramesses "Ramesses Menpehtyre" "Ramesses Usimare" "Ramesses Usermaatre Meryamun Setepenre" "Ramesses Usermare Akhenamun" "Ramesses-Meryamun-Nebweben" Ramesses Ramessesnakht Ramose Raneb Ranefer Rashepses Rawer Rehuerdjersen Rekhmire Renseneb Roma-Roi "Rudamun Usermaatre Setepenamun Meryamun" Sabef Sabu Sahure Sakir-Har Salitis Sanakht "Sankhenre Sewadjtu" "Sedjefakare Amenemhat" Sehetepre Sekhemib-Perenmaat Sekhemkare Sekhemkhet "Sekhemre Khutawy Sobekhotep" Semenkare Semenre Semerkhet "Senakhtenre Tao" Tao Seneb Senebhenaf Senebi Senedj Senedjemib_Senedjemib "Senedjemib Inti" "Senedjemib Mehi" Senedjemib Senenmut Senewosret-Ankh Senkamanisken Sennedjem Sennefer Senneferi Senusret "Seqenenre Tao" Serfka Setau Seth-Peribsen Seti_Seti "Seti Menmaatre" "Seti Userkheperure Setepenre" Seti-Merenptah_Seti "Setnakhte Userkhaure-Setepenre" Bebiankh Sewadjkare "Sewadjkare Hori" "Shabaka Neferkare" Shebitku Shedsu-nefertum Shepseska "Shepseskare Isi" Shepsesneb Shery "Sheshi Maaibre" Sheshonk_Sheshonk "Sheshonk Heqakheperre" "Sheshonk Usermaatre Setepenre" "Sheshonk Hedjkheperre Setepenre" Sheshonk Shoshenq_Sheshonk "Siamun Netjerkheperre-Setepenamun" Siamun Siaspiqa Siatum Siese Simut "Siptah Akhenre Setepenre" Smendes_Smendes "Smendes Hedjkheperre Setepenre"_Smendes Smenkhkare Sneferu_Sneferu Snefru_Sneferu Snofru_Sneferu Soris_Sneferu Sobekemhat Sobekemsaf_Sobekemsaf  "Sobekemsaf Sekhemrewadjkhaw"_Sobekemsaf Sobekhotep_Sobekhotep "Sobekhotep Khaankhre" "Sobekhotep Sekhemresewdjtawy" "Sobekhotep Khaneferre" Sobekhotep "Sobekhotep Sekhemre Susertawi" Sobeknakht Taharqa Takelot_Takelot "Takelot Hedjkheperre Setepenre" "Takelot Si-Ese Hedjkheperre Setepenre" "Takelot Si-Ese Usimare Setepenamun" Takelot Talakhamani Tantamani Tao_Tao "Tao Seqenenre" Tefnakht_Tefnakht "Tefnakht Shepsesre"_Tefnakht Teos Teta Teti Thamphthis Thutmose Tjanefer Tutankhamun "Tutkheperre Shoshenq" Tutu Unas Useramen Userhet Userkaf Userkare Usermontu Wadjmose "Wakhare Khety" Webensenu "Wegaf Khutawyre" Wehemka Weneg Weni Wentawat Wetka Yanhamu Yaqub-Har Yuny Yuya Zamonth Zannanza Zoser_Djoser
 	}
 
 	female_names = {

diff --git a/AncientReligions/common/laws/succession_laws.txt b/AncientReligions/common/laws/succession_laws.txt
@@ -316,7 +316,6 @@ succession_laws = {
 						religion = west_african_pagan
 					}
 					has_religion_feature = religion_beatification
-					has_religion_feature = religion_feature_egyptian
 					has_religion_feature = religion_feature_baltic
 					has_religion_feature = religion_feature_west_african
 				}
@@ -380,7 +379,6 @@ succession_laws = {
 							religion = west_african_pagan
 						}
 						has_religion_feature = religion_beatification
-						has_religion_feature = religion_feature_egyptian
 						has_religion_feature = religion_feature_baltic
 						has_religion_feature = religion_feature_west_african
 					}
@@ -1361,7 +1359,7 @@ succession_laws = {
 				title = k_britannic_pagan
 				AND = {
 					title = d_celtic_pagan_reformed
-					has_religion_feature = religion_theocratic_head
+					holder_scope = { has_religion_feature = religion_theocratic_head }
 				}
 			}
 		}

diff --git a/AncientReligions/common/societies/00_societies.txt b/AncientReligions/common/societies/00_societies.txt
@@ -2655,7 +2655,7 @@ monastic_order_stoics = {
 	startup_populate = {
 	    trigger = {
 			ai = yes
-	  	  	controls_religion = no
+	  	controls_religion = no
 			NOR = { #Not for savages.
 				is_tribal = yes
 				is_nomadic = yes

diff --git a/AncientReligions/common/wonders/00_wonders.txt b/AncientReligions/common/wonders/00_wonders.txt
@@ -2750,6 +2750,7 @@ wonder_pyramid_giza = {
 				culture = egyptian_arabic
 				trait = lunatic
 				has_religion_feature = religion_feature_pyramids
+				religion_openly_in_egyptian_subgroup_trigger = yes
 			}
 		}
 	}

diff --git a/AncientReligions/decisions/ACR_druidic_decisions.txt b/AncientReligions/decisions/ACR_druidic_decisions.txt
@@ -172,6 +172,9 @@ decisions = {
 			any_courtier = {
 				has_minor_title = title_court_wizard
 			}
+			NOT = {
+				has_alternate_start_parameter = { key = religion_names value = random }
+			}
 		}
 		allow = {
 			war = no
@@ -228,12 +231,23 @@ decisions = {
 			prisoner = no
 			age = 16
 			NOT = { has_global_flag = gwydion_founded }
+			NOT = {
+				has_alternate_start_parameter = { key = religion_names value = random }
+			}
 		}
 		allow = {
-			#OR = { # detect alternate starts and only require an empire in that case
+			trigger_if = {
+				limit = {
+					is_random_world = yes
+				}
+				tier = emperor
+			}
+			trigger_if = {
+				limit = {
+					is_random_world = no
+				}
 				has_landed_title = e_britannia
-
-			#}
+			}
 			prestige = 300
 			wealth = 300
 			d_celtic_pagan_reformed = {
@@ -376,6 +390,9 @@ decisions = {
 			prisoner = no
 			age = 16
 			NOT = { has_global_flag = fianna_founded }
+			NOT = {
+				has_alternate_start_parameter = { key = religion_names value = random }
+			}
 		}
 		allow = {
 			OR = {
@@ -453,7 +470,9 @@ decisions = {
 			}
 
 			d_fianna = {
-				independent = yes
+				holder_scope = {
+					independent = yes
+				}
 			}
 		}
 

diff --git a/AncientReligions/decisions/HF_baptism_decisions.txt b/AncientReligions/decisions/HF_baptism_decisions.txt
@@ -89,9 +89,6 @@ targetted_decisions = {
 			}
 			letter_event = { id = HF.20000 tooltip = EVTTOOLTIPHF20000 }
 		}
-		revoke_allowed = {
-			always = no
-		}
 		ai_will_do = {
 			factor = 0
 		}
@@ -479,9 +476,6 @@ targetted_decisions = {
 				}
 			}
 		}
-		revoke_allowed = {
-			always = no
-		}
 		ai_will_do = {
 			factor = 1
 			modifier = {

diff --git a/AncientReligions/decisions/HF_religious_decisions.txt b/AncientReligions/decisions/HF_religious_decisions.txt
@@ -1478,7 +1478,8 @@ decisions = {
 				is_tribal = yes
 				is_nomadic = yes
 			}
-			OR = { 
+			OR = {
+				religion = promethean_pagan
 				religion = hellenic_pagan 
 				religion = hellenic_pagan_reformed
 				AND = { 
@@ -1819,7 +1820,7 @@ title_decisions = {
 		from_potential = {
 			has_dlc = "Mystics"
 			is_ruler = yes
-			society_member_of = monastic_order_stoics
+			is_hellenic_monastic_order_member_trigger = yes
 			society_rank == 4
 		}
 

diff --git a/AncientReligions/decisions/hf_warrior_lodge_decisions.txt b/AncientReligions/decisions/hf_warrior_lodge_decisions.txt
@@ -2792,11 +2792,6 @@ settlement_decisions = {
 				}
 			}
 		}
-
-		revoke_allowed = {
-			always = no
-		}
-
 		ai_will_do = {
 			factor = 1
 		}

diff --git a/AncientReligions/decisions/minor_decisions.txt b/AncientReligions/decisions/minor_decisions.txt
@@ -913,12 +913,15 @@ decisions = {
 		}
 		ai_will_do = {
 			factor = 1
-			trigger = {
-				had_global_flag = { flag = viking_age_started years = 2 }
-				OR = {
-					independent = yes
-					any_liege = {
-						ai = no
+			modifier = {
+				factor = 0
+				NOT = {
+					had_global_flag = { flag = viking_age_started years = 2 }
+					OR = {
+						independent = yes
+						any_liege = {
+							ai = no
+						}
 					}
 				}
 			}