Merge pull request #212 from xirsoi/develop

Pryderi
xirsoi · Aug 4, 2019 · 5ad7de1 · 5ad7de1
2 parents b5971d0 + 398f9a7
commit 5ad7de1
Show file tree

Hide file tree

Showing 13 changed files with 99 additions and 115 deletions.
diff --git a/AncientReligions/common/landed_titles/ACR_special_titles.txt b/AncientReligions/common/landed_titles/ACR_special_titles.txt
@@ -8,6 +8,7 @@ e_greater_egypt = {
 
 	culture = egyptian_coptic
 	religion = egyptian_pagan
+	dynasty_title_names = no 	# Will not be named "Seljuk", etc.
 
 	allow = {
 		always = no # Only created through special event
@@ -100,11 +101,11 @@ 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 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 Baufre Chephren Cheops Tutimaios  Djedefhor Djedefptah Djedefre Djedkare Djedkhonsuefankh Djedptahiufankh Djehuty Djer Djet Duaenhor Duaenre Hakor Akoris Hannu Hapuseneb Harkhuf Harsiese Harsiese Harsiotef Harwa Hemaka Hepu Heqanakht Herihor Hersy-Ra Hewernef Hor Horbaef Horemheb Haremhab Hori Hornakht Hotepibre Hotepsekhemwy Hsekiu Seka Hugronaphor Hunefer Huni Huy Huya Ibi Wahibre Ibiau Imhotep  Imyremeshaw Inaros Isesi-ankh Sabef Sabu Sahure Sakir-Har Salitis Siamun Siaspiqa Siatum Siese Simut Smendes Smenkhkare Snefru Sobekemhat Sobekhotep Tutankhamun Tutu Unas Useramen Userhet Userkaf Userkare Usermontu Wadjmose Djoser
 	}
 
 	female_names = {
-		Baketwernel Behenu Beket_Beket Beketamun_Beket Beketaten Benerib Betrest Bintanath_Bintanath Bentanath_Bintanath Bunefer Cleopatra Dakhamunzu Djefatnebti Djefatsen Djehuti_Djehuti Thuty_Djehuti "Djehuty Sekhemresementawy"_Djehuti Djeseretnebti Duatentopet_Duatentopet Tentopet_Duatentopet Duathathor-Henuttawy Gautseshen Gilukhipa Hatshepsut Hatshepsut-Merytre Hedjetnebu Hekenuhedjet Hemetre Hemiunu Henutmehyt Henutmire Henutsen Henuttaneb Henuttawy Henutwati Herneith Hetepheres Hetephernebti Hui Iaret Inenek-Inti Ineni_Ineni Ini_Ineni Inetkawes Ipu Iput Iry-Hor Isesu Iset "Iset Ta-Hemdjert" Isetemkheb Isetnofret Itet Kapes Karomama_Karomama "Karomama Meritmut"_Karomama Keminub Khamerernebty Khedebneithirbinet Khenemetneferhedjet_Khenemetneferhedjet "Khenemetneferhedjet Weret"_Khenemetneferhedjet Khensa Khentetka Khenthap Khentimeresh Khentkaus Khenut Khuit Kiya Maathorneferure Maatkare_Maatkare "Maatkare Mutemhat"_Maatkare Maia_Maia Matia_Maia Maya_Maia Mehytenweskhet Meketaten Menhet Mentuhotep Menwi Mereret Mereruka Meresamun Meresankh Meretseger Meritamen Meritaten_Meritaten "Meritaten Tasherit"_Meritaten Meritites Merneith Merti Meryteti_Meryteti Mutbenret Mutemwiya Mutnedjmet Mutnofret Nakhtneith Nakhtubasterau Naparaye Nauny Nebet Nebetah Nebetia Nebetiunet Nebetnehat Nebettawy Nebtu Nebtyemneferes Nebty-tepites Nedjeftet Nedjemib Neferetnebty Neferhetepes Neferneferuaten_Neferneferuaten  "Neferneferuaten Ankhkheperure" Neferneferuaten "Neferneferuaten Tasherit" Neferneferure Nefertari Neferthenut Nefertiabet Nefertiti Nefertkau Nefertnesu Neferu Neferuptah Neferure Nefrubity Neith Neithhotep Nesitanebetashru Nesitaudjatakhet Neskhons Nimaethap Nitocris Nofret Nubhetepti-khered Nubkhaes Nubkhesbed Nubwenet Pageti Patareshnes Pebatjma Peksater Penebui Persenet Peseshet Pyhia Qalhata Rekhetre Reptynub Reputnebty Satiah Scota Sekhmakh Semat Senseneb Serethor Seshemetka Sesheshet Setepenre Shepenupet Sitamun Sitdjehuti Sithathoriunet Sitre_Sitre "Sitre In"_Sitre Sobekneferu Tabekenamun Tabiry Tadukhipa Takahatenamun Takhat Takhuit Tashedkhonsu Tawerettenru Tentamun Tentkheta Tetisheri Tey Tia_Tia Tiaa_Tia Tiye_Tia Tiy-Merenese Tjuyu Tuya Twosret Tyti Udjebten
+		Baketwernel Behenu Beketamun Beketaten Benerib Betrest Bunefer Cleopatra Dakhamunzu Djefatnebti Djefatsen Djehuti Duatentopet Henuttawy Hatshepsut Henutmire Henuttaneb Henuttawy Henutwati Hetepheres Hetephernebti Inenek-Inti Inetkawes Iry-Hor Ta-Hemdjert Isetemkheb Isetnofret Itet Kapes Neferthenut Nefertiabet Nefertiti Nefertkau Nefertnesu Neferu Neferuptah Neferure Nefrubity Neith Neithhotep Nesitanebetashru Nesitaudjatakhet Neskhons Nimaethap Nitocris Nofret Nubhetepti-khered Nubkhaes Nubkhesbed Nubwenet Pageti Patareshnes Pebatjma Peksater Penebui Persenet Peseshet Pyhia Qalhata Rekhetre Reptynub Reputnebty Satiah Scota Sekhmakh Semat Senseneb Serethor Seshemetka Sesheshet Setepenre Shepenupet Sitamun Sitdjehuti Sithathoriunet Sobekneferu Tabekenamun Tabiry Tadukhipa Takahatenamun Takhat Takhuit Tashedkhonsu Tawerettenru Tentamun Tentkheta Tetisheri Tey Tiy-Merenese Tjuyu Tuya Twosret Tyti Udjebten
 	}
 }
 

diff --git a/AncientReligions/decisions/ACR_egyptian_decisions.txt b/AncientReligions/decisions/ACR_egyptian_decisions.txt
@@ -463,8 +463,6 @@ decisions = {
 			completely_controls = d_paraetonium
 			completely_controls = d_nobatia
 			completely_controls = d_nubia
-			completely_controls = d_sennar
-			completely_controls = d_hayya
 			completely_controls = d_cyrenaica
 			completely_controls = d_oultrejourdain
 			completely_controls = d_jerusalem

diff --git a/AncientReligions/events/ACR_druidic_caste_events.txt b/AncientReligions/events/ACR_druidic_caste_events.txt
@@ -837,7 +837,7 @@ character_event = {
 	}
 }
 
-# Child wants to become a druid (Father)
+# Child wants to become a druid
 character_event = {
 	id = celtic.187
 	desc = celtic.187.desc
@@ -913,15 +913,12 @@ character_event = {
 		name = celtic.189.a
 		FROM = {
 			add_trait = scarred
-			custom_tooltip = { 
-				text = return_from_druidic_training
-				remove_trait = learning_druidic_arts
-				random_list = {
-					10 = { add_trait = scholar }
-					10 = { add_trait = mystic }
-					40 = { add_trait = poet }
-					40 = { add_trait = druid }
-				}
+			remove_trait = learning_druidic_arts
+			random_list = {
+				10 = { add_trait = scholar }
+				10 = { add_trait = mystic }
+				40 = { add_trait = poet }
+				40 = { add_trait = druid }
 			}
 		}
 	}
@@ -965,17 +962,14 @@ character_event = {
 	option = {
 		name = celtic.191.a
 		FROM = {
-			custom_tooltip = { 
-				text = return_from_druidic_training
-				remove_trait = learning_druidic_arts
-				random_list = {
-					10 = { add_trait = scholar }
-					10 = { add_trait = mystic }
-					40 = { add_trait = poet }
-					40 = { add_trait = druid }
-				}
+			remove_trait = learning_druidic_arts
+			random_list = {
+				10 = { add_trait = scholar }
+				10 = { add_trait = mystic }
+				40 = { add_trait = poet }
+				40 = { add_trait = druid }
 			}
-			tooltip = { add_trait = maimed }
+			add_trait = maimed
 		}
 	}
 }
@@ -1069,15 +1063,12 @@ character_event = {
 			}
 		}
 		FROM = {
-			custom_tooltip = { 
-				text = return_from_druidic_training
-				remove_trait = learning_druidic_arts
-				random_list = {
-					10 = { add_trait = scholar }
-					10 = { add_trait = mystic }
-					40 = { add_trait = poet }
-					40 = { add_trait = druid }
-				}
+			remove_trait = learning_druidic_arts
+			random_list = {
+				10 = { add_trait = scholar }
+				10 = { add_trait = mystic }
+				40 = { add_trait = poet }
+				40 = { add_trait = druid }
 			}
 		}
 	}
@@ -1132,15 +1123,12 @@ character_event = {
 		name = celtic.195.a
 		FROM = {
 			add_trait = lunatic
-			custom_tooltip = { 
-				text = return_from_druidic_training
-				remove_trait = learning_druidic_arts
-				random_list = {
-					10 = { add_trait = scholar }
-					10 = { add_trait = mystic }
-					40 = { add_trait = poet }
-					40 = { add_trait = druid }
-				}
+			remove_trait = learning_druidic_arts
+			random_list = {
+				10 = { add_trait = scholar }
+				10 = { add_trait = mystic }
+				40 = { add_trait = poet }
+				40 = { add_trait = druid }
 			}
 		}
 	}
@@ -1214,15 +1202,12 @@ character_event = {
 			set_character_flag = changeling_child
 		}
 		FROM = { 
-			custom_tooltip = { 
-				text = return_from_druidic_training
-				remove_trait = learning_druidic_arts
-				random_list = {
-					10 = { add_trait = scholar }
-					10 = { add_trait = mystic }
-					40 = { add_trait = poet }
-					40 = { add_trait = druid }
-				}
+			remove_trait = learning_druidic_arts
+			random_list = {
+				10 = { add_trait = scholar }
+				10 = { add_trait = mystic }
+				40 = { add_trait = poet }
+				40 = { add_trait = druid }
 			}
 		}
 	}
@@ -1269,15 +1254,12 @@ character_event = {
 		name = celtic.199.a
 		FROM = {
 			add_trait = zealous
-			custom_tooltip = { 
-				text = return_from_druidic_training
-				remove_trait = learning_druidic_arts
-				random_list = {
-					10 = { add_trait = scholar }
-					10 = { add_trait = mystic }
-					40 = { add_trait = poet }
-					40 = { add_trait = druid }
-				}
+			remove_trait = learning_druidic_arts
+			random_list = {
+				10 = { add_trait = scholar }
+				10 = { add_trait = mystic }
+				40 = { add_trait = poet }
+				40 = { add_trait = druid }
 			}
 		}
 	}
@@ -1344,15 +1326,12 @@ character_event = {
 		name = celtic.201.a
 		FROM = {
 			add_trait = patient
-			custom_tooltip = { 
-				text = return_from_druidic_training
-				remove_trait = learning_druidic_arts
-				random_list = {
-					10 = { add_trait = scholar }
-					10 = { add_trait = mystic }
-					40 = { add_trait = poet }
-					40 = { add_trait = druid }
-				}
+			remove_trait = learning_druidic_arts
+			random_list = {
+				10 = { add_trait = scholar }
+				10 = { add_trait = mystic }
+				40 = { add_trait = poet }
+				40 = { add_trait = druid }
 			}
 		}
 	}
@@ -1493,15 +1472,12 @@ character_event = {
 	option = {
 		name = celtic.205.a
 		FROM = {
-			custom_tooltip = { 
-				text = return_from_druidic_training
-				remove_trait = learning_druidic_arts
-				random_list = {
-					10 = { add_trait = scholar }
-					10 = { add_trait = mystic }
-					40 = { add_trait = poet }
-					40 = { add_trait = druid }
-				}
+			remove_trait = learning_druidic_arts
+			random_list = {
+				10 = { add_trait = scholar }
+				10 = { add_trait = mystic }
+				40 = { add_trait = poet }
+				40 = { add_trait = druid }
 			}
 		}
 		wealth = 300
@@ -1537,15 +1513,12 @@ character_event = {
 
 	option = {
 		name = celtic.206.a
-		custom_tooltip = {
-			text = return_from_druidic_training_player
-			remove_trait = learning_druidic_arts
-			random_list = {
-				30 = { add_trait = scholar }
-				25 = { add_trait = mystic }
-				30 = { add_trait = poet }
-				10 = { add_trait = druid }
-			}
+		remove_trait = learning_druidic_arts
+		random_list = {
+			30 = { add_trait = scholar }
+			25 = { add_trait = mystic }
+			30 = { add_trait = poet }
+			10 = { add_trait = druid }
 		}
 		prestige = 100
 		piety = 100

diff --git a/AncientReligions/gfx/interface/ACR/religion_feature_celtic.dds b/AncientReligions/gfx/interface/ACR/religion_feature_celtic.dds
diff --git a/...interface/ACR/bg_champions_of_the_sun.dds → ...e/ACR/society_bg_champions_of_the_sun.dds b/...interface/ACR/bg_champions_of_the_sun.dds → ...e/ACR/society_bg_champions_of_the_sun.dds
diff --git a/AncientReligions/interface/ACR_domestic_religion.gfx b/AncientReligions/interface/ACR_domestic_religion.gfx
@@ -4,7 +4,6 @@ spriteTypes = {
 		name = "GFX_religion_druid_circle_bg"
 		texturefile = "gfx\\interface\ACR\religion_druid_circle_bg.dds"
 	}
-
 	spriteType = {
 		name = "GFX_druidic_election_values"
 		texturefile = "gfx\\interface\ACR\icon_druidic_suitability.dds"
@@ -15,7 +14,6 @@ spriteTypes = {
 		name = "GFX_religion_dryad_circle_bg"
 		texturefile = "gfx\\interface\ACR\religion_druid_circle_bg.dds"
 	}
-
 	spriteType = {
 		name = "GFX_britannic_election_values"
 		texturefile = "gfx\\interface\ACR\icon_dryadic_suitability.dds"
@@ -26,9 +24,18 @@ spriteTypes = {
 		name = "GFX_religion_collegium_pontificum_bg"
 		texturefile = "gfx\\interface\ACR\religion_druid_circle_bg.dds"
 	}
-
 	spriteType = {
 		name = "GFX_hellenic_election_values"
 		texturefile = "gfx\\interface\icon_papal_suitability.dds"
 	}
+
+	### Xroj Council
+	spriteType = {
+		name = "GFX_religion_xroj_council_bg"
+		texturefile = "gfx\\interface\ACR\religion_druid_circle_bg.dds"
+	}
+	spriteType = {
+		name = "GFX_egyptian_election_values"
+		texturefile = "gfx\\interface\icon_papal_suitability.dds"
+	}
 }
diff --git a/AncientReligions/interface/ACR_druidic.gfx b/AncientReligions/interface/ACR_druidic.gfx
@@ -297,6 +297,6 @@ spriteTypes = {
 
 	spriteType = {
 		name = "GFX_religion_feature_celtic"
-		texturefile = "gfx\\interface\ACR\religion_feature_celtic.dds"
+		texturefile = "gfx\\interface\\ACR\\religion_feature_celtic.dds"
 	}
 }
diff --git a/AncientReligions/interface/ACR_druidic_domestic_religion.gui b/AncientReligions/interface/ACR_druidic_domestic_religion.gui
@@ -1,5 +1,4 @@
 guiTypes = {
-	# druidic circle of druids
 	windowType = {
 		name = "domestic_religion_title_druid_circle_member"
 		backGround =""
@@ -60,7 +59,7 @@ guiTypes = {
 				textureFile = ""
 				font = "vic_22_black"
 				borderSize = {x = 0 y = 0}
-				text = "ARCH_DRUID_FOA"
+				text = "ARCHDRUID_FOA"
 				maxWidth = 250
 				maxHeight = 24
 				fixedsize = yes

diff --git a/...erface/ACR_egyptian_domestic_religion.gfx → ...erface/ACR_egyptian_domestic_religion.gui b/...erface/ACR_egyptian_domestic_religion.gfx → ...erface/ACR_egyptian_domestic_religion.gui
@@ -265,7 +265,7 @@ guiTypes = {
 
 			iconType =
 			{
-				name = "paragon_election_values"
+				name = "papal_election_values"
 				spriteType = "GFX_egyptian_election_values"
 				position = { x= 23 y = 85 }
 				Orientation = "UPPER_LEFT"
@@ -338,7 +338,7 @@ guiTypes = {
 
 			iconType =
 			{
-				name = "paragon_election_values"
+				name = "papal_election_values"
 				spriteType = "GFX_egyptian_election_values"
 				position = { x= 23 y = 85 }
 				Orientation = "UPPER_LEFT"
@@ -410,7 +410,7 @@ guiTypes = {
 
 			iconType =
 			{
-				name = "paragon_election_values"
+				name = "papal_election_values"
 				spriteType = "GFX_egyptian_election_values"
 				position = { x= 23 y = 85 }
 				Orientation = "UPPER_LEFT"
@@ -482,7 +482,7 @@ guiTypes = {
 
 			iconType =
 			{
-				name = "paragon_election_values"
+				name = "papal_election_values"
 				spriteType = "GFX_egyptian_election_values"
 				position = { x= 23 y = 85 }
 				Orientation = "UPPER_LEFT"
@@ -554,7 +554,7 @@ guiTypes = {
 
 			iconType =
 			{
-				name = "paragon_election_values"
+				name = "papal_election_values"
 				spriteType = "GFX_egyptian_election_values"
 				position = { x= 23 y = 85 }
 				Orientation = "UPPER_LEFT"
@@ -626,7 +626,7 @@ guiTypes = {
 
 			iconType =
 			{
-				name = "paragon_election_values"
+				name = "papal_election_values"
 				spriteType = "GFX_egyptian_election_values"
 				position = { x= 23 y = 85 }
 				Orientation = "UPPER_LEFT"
@@ -698,7 +698,7 @@ guiTypes = {
 
 			iconType =
 			{
-				name = "paragon_election_values"
+				name = "papal_election_values"
 				spriteType = "GFX_egyptian_election_values"
 				position = { x= 23 y = 85 }
 				Orientation = "UPPER_LEFT"
@@ -770,7 +770,7 @@ guiTypes = {
 
 			iconType =
 			{
-				name = "paragon_election_values"
+				name = "papal_election_values"
 				spriteType = "GFX_egyptian_election_values"
 				position = { x= 23 y = 85 }
 				Orientation = "UPPER_LEFT"
@@ -842,7 +842,7 @@ guiTypes = {
 
 			iconType =
 			{
-				name = "paragon_election_values"
+				name = "papal_election_values"
 				spriteType = "GFX_egyptian_election_values"
 				position = { x= 23 y = 85 }
 				Orientation = "UPPER_LEFT"