diff --git a/EU4ToVic2/Data_Files/blankMod/output/common/countries.txt b/EU4ToVic2/Data_Files/blankMod/output/common/countries.txt index bfa30a003a..2177ae010c 100644 --- a/EU4ToVic2/Data_Files/blankMod/output/common/countries.txt +++ b/EU4ToVic2/Data_Files/blankMod/output/common/countries.txt @@ -369,6 +369,7 @@ HND ="countries/India.txt" # East Asia QIN ="countries/Qing.txt" AIN = "countries/Ainu.txt" +KHA = "countries/MongolKhanate.txt" # Americas AZT = "countries/Aztec.txt" diff --git a/EU4ToVic2/Data_Files/blankMod/output/gfx/interface/icon_religion.dds b/EU4ToVic2/Data_Files/blankMod/output/gfx/interface/icon_religion.dds index 4d7b9ad24d..b3d98c4c5f 100644 Binary files a/EU4ToVic2/Data_Files/blankMod/output/gfx/interface/icon_religion.dds and b/EU4ToVic2/Data_Files/blankMod/output/gfx/interface/icon_religion.dds differ diff --git a/EU4ToVic2/Data_Files/blankMod/output/gfx/pictures/news/punic_communist_newspaper_title.dds b/EU4ToVic2/Data_Files/blankMod/output/gfx/pictures/news/punic_communist_newspaper_title.dds new file mode 100644 index 0000000000..174c14be07 Binary files /dev/null and b/EU4ToVic2/Data_Files/blankMod/output/gfx/pictures/news/punic_communist_newspaper_title.dds differ diff --git a/EU4ToVic2/Data_Files/blankMod/output/gfx/pictures/news/punic_default_newspaper_title.dds b/EU4ToVic2/Data_Files/blankMod/output/gfx/pictures/news/punic_default_newspaper_title.dds new file mode 100644 index 0000000000..0c5bbc6927 Binary files /dev/null and b/EU4ToVic2/Data_Files/blankMod/output/gfx/pictures/news/punic_default_newspaper_title.dds differ diff --git a/EU4ToVic2/Data_Files/blankMod/output/gfx/pictures/news/punic_facist_newspaper_title.dds b/EU4ToVic2/Data_Files/blankMod/output/gfx/pictures/news/punic_facist_newspaper_title.dds new file mode 100644 index 0000000000..be43cbdf70 Binary files /dev/null and b/EU4ToVic2/Data_Files/blankMod/output/gfx/pictures/news/punic_facist_newspaper_title.dds differ diff --git a/EU4ToVic2/Data_Files/blankMod/output/gfx/pictures/news/punic_reactionary_newspaper_title.dds b/EU4ToVic2/Data_Files/blankMod/output/gfx/pictures/news/punic_reactionary_newspaper_title.dds new file mode 100644 index 0000000000..e00b364e77 Binary files /dev/null and b/EU4ToVic2/Data_Files/blankMod/output/gfx/pictures/news/punic_reactionary_newspaper_title.dds differ diff --git a/EU4ToVic2/Data_Files/blankMod/output/interface/general_gfx.gfx b/EU4ToVic2/Data_Files/blankMod/output/interface/general_gfx.gfx index e2d1a50004..1a7be613cb 100644 --- a/EU4ToVic2/Data_Files/blankMod/output/interface/general_gfx.gfx +++ b/EU4ToVic2/Data_Files/blankMod/output/interface/general_gfx.gfx @@ -8,7 +8,7 @@ spriteTypes = { spriteType = { name = "GFX_icon_religion" texturefile = "gfx\\interface\\icon_religion.tga" - noOfFrames = 82 + noOfFrames = 83 norefcount = yes } spriteType = { diff --git a/EU4ToVic2/Data_Files/blankMod/output/localisation/0_Cultures.csv b/EU4ToVic2/Data_Files/blankMod/output/localisation/0_Cultures.csv index cd67808227..dc2eebc80e 100644 --- a/EU4ToVic2/Data_Files/blankMod/output/localisation/0_Cultures.csv +++ b/EU4ToVic2/Data_Files/blankMod/output/localisation/0_Cultures.csv @@ -87,7 +87,7 @@ delian;D dhen;�en;�en;�en;�en;�en;Dhen;Dhen;Dhen;Dhen;Dhen;�en;���;Dhen;x dinajidad;Dinajidad;Dinadjidad;Dinadschidad;Dinad�idad;Dinayidad;Dinagid�;Dinajidad;Dinajidad;Dinajidad;Dinajidad;Dinajidad;����������;Dinajidad;x dog_culture;Dog;Chien;H�ndisch;Psia;Perra;Cane;Pes;Kutya;Hond;Cadela;Cadela;�����;Koira;x -dom;Dom;Dom;Dom;Dom;Dom;Dom;Dom;Dom;Dom;Dom;Dom;���;Dom;x +dom_culture;Dom;Dom;Dom;Dom;Dom;Dom;Dom;Dom;Dom;Dom;Dom;���;Dom;x dongren;Dongren;Dongren;Dongren;Dongren;Dongren;Dongren;Dongren;Dongren;Dongren;Dongren;Dongren;�������;Dongren;x dragon_culture;Dragon;Dragon;Drachen;Drago�ska;Drag�n;Drago;Drak;S�rk�ny;Draak;Dragoa;Dragoa;��������;Lohik��rme;x dramor;Dramor;Dramor;Dramor;Dramor;Dramor;Dramor;Dramor;Dramor;Dramor;Dramor;Dramor;Dramor;Dramor;x @@ -235,6 +235,7 @@ nayeduniya;Nayeduniya;Na negru;Lau;Leoue;Lau;Lau;Lau;Negru;Negru;Negru;Negru;Negru;L�u;���;Negru;x nehwaustronijaz;Nehwaustronijaz;Neouaustr�nienne;Neuaustronisch;Nevaustronijazka;Neguaustroniyaza;Nehwaustronijaz;Nehwaustronijaz;Nehwaustronijaz;Nehwaustronijaz;Nehwaustronijaz;Neguaustr�nha�a;������������������;Nehwaustronijaz;x nemedian;Nemedian;Nemedian;Nemedian;Nemedian;Nemedian;Nemedian;Nemedian;Nemedian;Nemedian;Nemedian;Nemedian;������������;Nemedian;x +neo_hyksos;Neo-Hyksos;N�o-Hyksos;Neuhyksos;Neo-Hyksosi;Neo-hicsos;Neo-Hicsos;�j-Hikszosz;Neo-Hyks�s;�j-Hikszosz;Neo-Hyksos;Neo-Mitanni;����������;Uusi Hyksos;x neo_mitanni;Neo-Mitanni;Neo-Mitanni;Neo-Mitanni;Neo-Mitanni;Neo-Mitanni;Neo-Mitanni;Neo-Mitanni;Neo-Mitanni;Neo-Mitanni;Neo-Mitanni;Neo-Mitanni;����������;Neo-Mitanni;x neokosmi;Neokosmi;N�ocosmie;Neokosmi;Neokosmijska;Neokosmi;Neokosmi;Neokosmi;Neokosmi;Neokosmi;Neokosmi;Neokosmi;��������;Neokosmi;x neotyrrhenian;Neo-Tyrrhenian;N�o-Tyrrh�nienne;Neutyrrhenisch;Neotyrre�ska;Neotirrena;Neo-Tirrena;�j-tirr�n;Neo-Tyrrhenian;�j-tirr�n;Neo-Tyrreense;Neo-Tirrena;��������������;Uus Tyrrhenian;x diff --git a/EU4ToVic2/Data_Files/blankMod/output/localisation/0_Religions.csv b/EU4ToVic2/Data_Files/blankMod/output/localisation/0_Religions.csv index 31e7b154ce..97f64a9f56 100644 --- a/EU4ToVic2/Data_Files/blankMod/output/localisation/0_Religions.csv +++ b/EU4ToVic2/Data_Files/blankMod/output/localisation/0_Religions.csv @@ -32,6 +32,7 @@ fraticelli;Fraticelli;Fraticelles;Fraticelli;Fraticelli;Fraticelli;;;;;;Fraticel generic_pagan;Pagan;Pa�ens;Heidnisch;Poga�stwo;Pagana;;;;;;Pag�o;���������;;x german_pagan;Irminism;Irministes;Iriminisch;Irmi�stwo;Irminesa;;;;;;Irminismo;���������;;x gnostic;Gnosticism;Gnostiques;Gnostisch;Gnostycyzm;Gn�stica;;;;;;Gnosticismo;������������;;x +hattian;Hattian;Hattien;Hattianisch;Hattyjski;Hatti;;;;;;Hattiano;��������;;x hellenic_pagan;Hellenic;Hell�niques;Hellenisch;Helle�stwo;Hel�nica;;;;;;Hel�nico;���������������;;x hetanism;Theodism;Theodistes;Theodisch;Teodistwo;Teodista;;;;;;Teodista;���������;;x hurrian;Hurrian;Hourrite;Hurrisch;Hurra;Hurrita;;;;;;Hurita;������;;x @@ -121,6 +122,7 @@ zzz_religion_gelugpa; zzz_religion_generic_pagan;�HReligion�!: Pagan;�HReligion�!: Pa�ens;�HReligion�!: Heidnisch;�HReligia�!: Poga�stwo;�HReligi�n�!: Pagana;;;;;;�HReligi�o�!: Pag�o;�H��������!: ���������;;x zzz_religion_german_pagan;�HReligion�!: Irminism;�HReligion�!: Irministes;�HReligion�!: Iriminisch;�HReligia�!: Irmi�stwo;�HReligi�n�!: Irminesa;;;;;;�HReligi�o�!: Irminismo;�H��������!: ���������;;x zzz_religion_gnostic;�HReligion�!: Gnosticism;�HReligion�!: Gnostiques;�HReligion�!: Gnostisch;�HReligia�!: Gnostycyzm;�HReligi�n�!: Gn�stica;;;;;;�HReligi�o�!: Gnosticismo;�H��������!: ������������;;x +zzz_religion_hattian;�HReligion�!: Hattian;�HReligion�!: Hattien;�HReligion�!: Hattianisch;�HReligia�!: Hattyjski;�HReligi�n�!: Hatti;;;;;;�HReligi�o�!: Hattiano;�H��������!: ��������;;x zzz_religion_hellenic_pagan;�HReligion�!: Hellenic;�HReligion�!: Hell�niques;�HReligion�!: Hellenisch;�HReligia�!: Helle�stwo;�HReligi�n�!: Hel�nica;;;;;;�HReligi�o�!: Hel�nico;�H��������!: ���������������;;x zzz_religion_hetanism;�HReligion�!: Theodism;�HReligion�!: Theodistes;�HReligion�!: Theodisch;�HReligia�!: Teodistwo;�HReligi�n�!: Teodista;;;;;;�HReligi�o�!: Teodista;�H��������!: ���������;;x zzz_religion_hindu;�HReligion�!: Hindu;�HReligion�!: Hindous;�HReligion�!: Hindu;�HReligia�!: Hinduizm;�HReligi�n�!: Hind�;;;;;;�HReligi�o�!: Hindu;�H��������!: ��������;;x diff --git a/EU4ToVic2/Data_Files/blankMod/output/news/news_layout.txt b/EU4ToVic2/Data_Files/blankMod/output/news/news_layout.txt index 61605e721b..e0c6af700b 100644 --- a/EU4ToVic2/Data_Files/blankMod/output/news/news_layout.txt +++ b/EU4ToVic2/Data_Files/blankMod/output/news/news_layout.txt @@ -565,6 +565,124 @@ style = } } picture = "news/RME_default_newspaper_title.dds" + } + + # Punic ################### + case = { + trigger = { + or = { + and = { + is_culture_group = punic + ruling_party_ideology = communist + } + and = { + civilized = no + part_of_sphere = yes + + sphere_owner = { + is_culture_group = punic + ruling_party_ideology = communist + } + } + and = { + civilized = no + is_vassal = yes + + overlord = { + is_culture_group = punic + ruling_party_ideology = communist + } + } + } + } + picture = "news/punic_communist_newspaper_title.dds" + } + + case = { + trigger = { + or = { + and = { + is_culture_group = punic + ruling_party_ideology = fascist + } + and = { + civilized = no + part_of_sphere = yes + + sphere_owner = { + is_culture_group = punic + ruling_party_ideology = fascist + } + } + and = { + civilized = no + is_vassal = yes + + overlord = { + is_culture_group = punic + ruling_party_ideology = fascist + } + } + } + } + picture = "news/punic_facist_newspaper_title.dds" + } + + case = { + trigger = { + or = { + and = { + is_culture_group = punic + ruling_party_ideology = reactionary + } + and = { + civilized = no + part_of_sphere = yes + + sphere_owner = { + is_culture_group = punic + ruling_party_ideology = reactionary + } + } + and = { + civilized = no + is_vassal = yes + + overlord = { + is_culture_group = punic + ruling_party_ideology = reactionary + } + } + } + } + picture = "news/punic_reactionary_newspaper_title.dds" + } + + case = { + trigger = { + or = { + and = { + is_culture_group = punic + } + and = { + civilized = no + part_of_sphere = yes + + sphere_owner = { + is_culture_group = punic + } + } + and = { + civilized = no + is_vassal = yes + + overlord = { + is_culture_group = punic + } + } + } + } + picture = "news/punic_default_newspaper_title.dds" } diff --git a/EU4ToVic2/Data_Files/configurables/culture_definitions.txt b/EU4ToVic2/Data_Files/configurables/culture_definitions.txt index 71c67e7821..6ef41d5356 100644 --- a/EU4ToVic2/Data_Files/configurables/culture_definitions.txt +++ b/EU4ToVic2/Data_Files/configurables/culture_definitions.txt @@ -4794,7 +4794,7 @@ south_asian = { Ruddha Sinda Nandelid Satadhanva Katyuri Kangra } } - dom = { + dom_culture = { color = { 114 1 1 } first_names = { Chetan Fakirbhai Jivraj Madhavsingh Khemchand Manubhai Bharatsingh Balwantry Chabildas Maniraj } @@ -7758,6 +7758,22 @@ punic = { Gisgoid Gerbalid Hammid Eugarid Mashhid Ummashid } } + neo_hyksos = { + color = { 148 173 143 } + first_names = { + Abbar Abdmelqart Adonibaal Agbal Ahirom Azimilik Baal Baalhanno Bodashtart Bodo Bodmelqart Bomilcar Bostar Boulomenus Carthalo Chelbes + Eshbaal Eugoras Germelqart Hamilcar Hannibal Hanno Hasdrubal Himilco Hiram Mago Maharbal Mattan Metallo Milkherem Milkiram + Paltibaal Philosir Boodes Bomical Gisgo Malchus Abdhamon Abibaal Abirami Ahumm Eshmounhilles Eshmouniaton Itthobaal + Ummashtart Melqartshama Batnoam Urumilki Yehomilk Yadamilk Baaliaton Barekbaal Gerbaal Gerimilki Khiletzbaal Tabnit Yutpan Zimrida + Danel Kanmi Maharbaal Milkpilles Melqartpilles Milkyaton Massinissa Hiempsal Juba + } + last_names = { + Abbarid Adonibaalid Ahiromid Baalhannid Baalid Barcid + Bodonid Bostarid Chelbesid Eshbaalid Eugorid Hannid + Hiramid Magid Mattanid Metallid Milkiramid Philosirid + Gisgoid Gerbalid Hammid Eugarid Mashhid Ummashid + } + } } varangian_g = { leader = european @@ -9754,4 +9770,5 @@ zzz_religions = { zzz_religion_waaqi = { color = { 0 0 0 } first_names = { FNU } last_names = { LNU } } zzz_religion_mithraic = { color = { 0 0 0 } first_names = { FNU } last_names = { LNU } } zzz_religion_hurrian = { color = { 0 0 0 } first_names = { FNU } last_names = { LNU } } + zzz_religion_hattian = { color = { 0 0 0 } first_names = { FNU } last_names = { LNU } } } \ No newline at end of file diff --git a/EU4ToVic2/Data_Files/configurables/culture_map.txt b/EU4ToVic2/Data_Files/configurables/culture_map.txt index 2be073287d..1ac559e012 100644 --- a/EU4ToVic2/Data_Files/configurables/culture_map.txt +++ b/EU4ToVic2/Data_Files/configurables/culture_map.txt @@ -203,6 +203,7 @@ link = { vic2 = ychibarku eu4 = ychibarku } link = { vic2 = liphocaneth eu4 = liphocaneth } link = { vic2 = mysehi eu4 = mysehi } link = { vic2 = phoenician eu4 = phoenician } +link = { vic2 = neo_hyksos eu4 = neo_hyksos } # Varangian link = { vic2 = varangian_american eu4 = miklagardrian eu4 = varangian eu4 = mena_german region = central_america_superregion region = north_america_superregion region = south_america_superregion region = andes_superregion } @@ -647,7 +648,7 @@ link = { vic2 = marathi eu4 = marathi eu4 = bhil eu4 = deccan_colonial eu4 = tul link = { vic2 = sindi eu4 = sindhi eu4 = multani } link = { vic2 = rajput eu4 = rajput eu4 = malvi eu4 = dhundari eu4 = harauti eu4 = jati eu4 = khandeshi eu4 = marwari eu4 = meo eu4 = mewari eu4 = naga eu4 = rajput_colonial eu4 = tomara eu4 = nimadi } link = { vic2 = neo_mitanni eu4 = neo_mitanni } -link = { vic2 = dom eu4 = dom eu4 = lom eu4 = ghagar } +link = { vic2 = dom_culture eu4 = dom eu4 = lom eu4 = ghagar } # Dravidian - kannada, malayalam, tamil, telegu link = { vic2 = kannada eu4 = kannada } diff --git a/EU4ToVic2/Data_Files/configurables/religion_definitions.txt b/EU4ToVic2/Data_Files/configurables/religion_definitions.txt index ae4c7552e5..eacf456663 100644 --- a/EU4ToVic2/Data_Files/configurables/religion_definitions.txt +++ b/EU4ToVic2/Data_Files/configurables/religion_definitions.txt @@ -334,6 +334,11 @@ mena_pagan = { color = { 0.45 0.46 0.92 } pagan = yes } + hattian = { + icon = 83 + color = { 0.78 0.78 0.78 } + pagan = yes + } } euro_pagan = { norse_pagan_reformed= { diff --git a/EU4ToVic2/Data_Files/configurables/religion_map.txt b/EU4ToVic2/Data_Files/configurables/religion_map.txt index e1dd1126e0..a49b79414e 100644 --- a/EU4ToVic2/Data_Files/configurables/religion_map.txt +++ b/EU4ToVic2/Data_Files/configurables/religion_map.txt @@ -96,6 +96,7 @@ link = { v2 = nuragic eu4 = nuragic_pagan_reformed } link = { v2 = bamar eu4 = bamar_pagan_reformed } link = { v2 = waaqi eu4 = waaqi_pagan_reformed } link = { v2 = hurrian eu4 = hurrian_pagan_reformed } +link = { v2 = hattian eu4 = hattian_pagan_reformed } link = { v2 = inca_reformed eu4 = inca_reformed } link = { v2 = zun_pagan_reformed eu4 = zun_pagan_reformed eu4 = zunism eu4 = atenism } @@ -132,6 +133,7 @@ link = { v2 = animist eu4 = nuragic_pagan } link = { v2 = animist eu4 = bamar_pagan } link = { v2 = animist eu4 = waaqi_pagan } link = { v2 = animist eu4 = hurrian_pagan } +link = { v2 = animist eu4 = hattian_pagan } #Zoroastrian link = { v2 = zoroastrian eu4 = zoroastrian } diff --git a/Fronter b/Fronter index f9a1fb2dcd..82a109ca48 160000 --- a/Fronter +++ b/Fronter @@ -1 +1 @@ -Subproject commit f9a1fb2dcdae4d50f6bbc9840051e4f45a972426 +Subproject commit 82a109ca485a2e6a2db9d4bbebfd96af48a8bc13 diff --git a/commonItems b/commonItems index 3b2423dce7..d1aca586a5 160000 --- a/commonItems +++ b/commonItems @@ -1 +1 @@ -Subproject commit 3b2423dce792914cc49b5fcdd4fcd2daa3349cde +Subproject commit d1aca586a5b456b52f29d56e958d47a9cc6159fb