diff --git a/common/coat_of_arms/coat_of_arms/NEOW_dynasties.txt b/common/coat_of_arms/coat_of_arms/NEOW_dynasties.txt index 1685bd23f..539ca7341 100644 --- a/common/coat_of_arms/coat_of_arms/NEOW_dynasties.txt +++ b/common/coat_of_arms/coat_of_arms/NEOW_dynasties.txt @@ -21730,72 +21730,3 @@ pelushi_dynasty={ } } -house_olimpiyat = { - pattern="pattern_horizontal_split_01.dds" - color1=red - color2=red - color3=blue - colored_emblem={ - color1=white - texture="NEOW_ce_sovwreath.dds" - instance={ - position={ 0.500000 0.390000 } - scale={ 1.000000 -1.000000 } - depth=4.010000 - } - - instance={ - position={ 0.500000 0.590000 } - depth=5.010000 - } - - } - - colored_emblem={ - color1=white - color3=white - texture="ce_circle_mask.dds" - instance={ - position={ 0.670000 0.410000 } - scale={ 0.210000 0.210000 } - depth=2.010000 - } - - } - - colored_emblem={ - color1=white - color2=red - color3=red - texture="ce_lion_head.dds" - instance={ - position={ 0.650000 0.440000 } - scale={ 0.240000 0.240000 } - } - - } - - colored_emblem={ - color1=white - color3=white - texture="ce_star_16.dds" - instance={ - position={ 0.650000 0.410000 } - scale={ 0.450000 0.450000 } - depth=1.010000 - } - - } - - colored_emblem={ - color1=white - color3=white - texture="ce_singha.dds" - instance={ - scale={ 0.670000 0.670000 } - depth=3.010000 - } - - } - -} diff --git a/common/dynasty_houses/NEOW_dynasty_houses.txt b/common/dynasty_houses/NEOW_dynasty_houses.txt index 9ae3f341a..291a25f65 100644 --- a/common/dynasty_houses/NEOW_dynasty_houses.txt +++ b/common/dynasty_houses/NEOW_dynasty_houses.txt @@ -100,9 +100,3 @@ house_christiansen = { culture = dansk dynasty = glucksburg_dynasty } -#turkish -house_olimpiyat = { - name = dynn_olimpiyat - culture = thracian - dynasty = olympios_dynasty -} diff --git a/history/characters/NEOW_e_greece.txt b/history/characters/NEOW_e_greece.txt index c1acdede3..63165c02c 100644 --- a/history/characters/NEOW_e_greece.txt +++ b/history/characters/NEOW_e_greece.txt @@ -112,7 +112,6 @@ greece0002 = { #makedon emperor # not anymore trait = compassionate trait = arrogant sexuality = heterosexual - father = greece0072 2500.1.1 = { birth = yes } @@ -123,7 +122,7 @@ greece0002 = { #makedon emperor # not anymore greece0003 = { #makis name = "Mákis" - dynasty_house = house_olimpiyat + dynasty = olympios_dynasty religion = "megalocratic" culture = thracian trait = education_learning_3 @@ -131,7 +130,6 @@ greece0003 = { #makis trait = gregarious trait = zealous sexuality = heterosexual - father = greece0073 2527.1.1 = { birth = yes } @@ -545,7 +543,6 @@ greece0036 = { # trait = ambitious trait = arrogant trait = stubborn - father = greece0072 2502.1.1 = { birth = yes } @@ -633,8 +630,6 @@ greece0040 = { # trait = intellect_good_1 trait = beauty_bad_3 sexuality = heterosexual - father = greece0059 - mother = greece0060 2513.1.1 = { birth = yes } @@ -660,11 +655,9 @@ greece0041 = { # trait = irritable trait = intellect_good_2 trait = lifestyle_poet - trait = legitimized_bastard sexuality = heterosexual give_nickname = nick_the_cyclops trait = beauty_bad_3 - father = greece0072 2496.1.1 = { birth = yes } @@ -725,8 +718,6 @@ greece0044 = { # trait = generous sexuality = heterosexual female = yes - father = greece0059 - mother = greece0060 2514.1.1 = { birth = yes } @@ -853,7 +844,7 @@ greece0049 = { greece0050 = { name = "Kyriakí" - dynasty = mavromichalis_dynasty + dynasty = argo_dynasty religion = "megalocratic" culture = NEOW_peloponnesian trait = education_learning_4 @@ -873,7 +864,7 @@ greece0050 = { greece0051 = { name = "Deftéra" - dynasty = mavromichalis_dynasty + dynasty = argo_dynasty religion = "megalocratic" culture = thracian trait = education_diplomacy_4 @@ -893,7 +884,7 @@ greece0051 = { greece0052 = { name = "Tríti" - dynasty = mavromichalis_dynasty + dynasty = argo_dynasty religion = "megalocratic" culture = NEOW_tsakonian trait = education_diplomacy_4 @@ -914,7 +905,7 @@ greece0052 = { greece0053 = { name = "Tetárti" - dynasty = mavromichalis_dynasty + dynasty = argo_dynasty religion = "megalocratic" culture = NEOW_aegeaner trait = education_martial_3 @@ -935,7 +926,7 @@ greece0053 = { greece0054 = { name = "Pémpti" - dynasty = mavromichalis_dynasty + dynasty = argo_dynasty religion = "megalocratic" culture = NEOW_tsakonian trait = education_intrigue_4 @@ -957,7 +948,7 @@ greece0054 = { greece0055 = { name = "Paraskeví" - dynasty = mavromichalis_dynasty + dynasty = argo_dynasty religion = "megalocratic" culture = neapolitan trait = education_stewardship_3 @@ -978,7 +969,7 @@ greece0055 = { greece0056 = { name = "Sávvato" - dynasty = mavromichalis_dynasty + dynasty = argo_dynasty religion = "megalocratic" culture = NEOW_aegeaner trait = education_intrigue_4 @@ -999,7 +990,7 @@ greece0056 = { greece0057 = { name = "Pános" - dynasty = mavromichalis_dynasty + dynasty = argo_dynasty religion = "megalocratic" culture = NEOW_tsakonian trait = education_learning_4 @@ -1036,51 +1027,6 @@ greece0058 = { death = yes } } -greece0059 = { - name = "Giánnis" - dynasty = labrys_dynasty - religion = "megalocratic" - culture = NEOW_aegeaner - trait = education_diplomacy_2 - trait = generous - trait = compassionate - trait = ambitious - trait = lifestyle_poet - sexuality = heterosexual - female = no - 2460.4.8 = { - birth = yes - } - 2480.1.1 = { - add_spouse = greece0060 - } - 2556.1.1 = { - death = yes - } -} -greece0060 = { - name = "María" - dynasty = labrys_dynasty - religion = "megalocratic" - culture = NEOW_aegeaner - trait = education_diplomacy_2 - trait = generous - trait = compassionate - trait = ambitious - trait = lifestyle_poet - sexuality = heterosexual - female = yes - 2460.4.8 = { - birth = yes - } - 2480.1.1 = { - add_spouse = greece0059 - } - 2556.1.1 = { - death = yes - } -} - ####Albanians#### @@ -1818,263 +1764,4 @@ mikel_ndoci = { 2600.1.1 = { death = yes } -} - -# greek history stuff -greece0061 = { # Leonidas I - name = "Leonídas" - dynasty = olympios_dynasty - religion = "megalocratic" - culture = NEOW_peloponnesian - trait = education_martial_4 - trait = brave - trait = ambitious - trait = stubborn - sexuality = bisexual - 2230.1.1 = { - birth = yes - } - 2318.1.1 = { - death = yes - } -} - -greece0062 = { # Alexander I - name = "Aléxandros" - dynasty = olympios_dynasty - religion = "megalocratic" - culture = NEOW_peloponnesian - trait = education_martial_3 - trait = brave - trait = wrathful - trait = ambitious - father = greece0061 - 2302.1.1 = { - birth = yes - } - 2378.1.1 = { - death = yes - } -} - -greece0063 = { # Mithras I - name = "Míthras" - dynasty = olympios_dynasty - religion = "megalocratic" - culture = NEOW_peloponnesian - trait = education_martial_4 - trait = ambitious - trait = brave - trait = wrathful - father = greece0062 - 2340.1.1 = { - birth = yes - } - 2397.1.1 = { - death = yes - } -} - -greece0064 = { # Mithras the Younger - name = "Míthras" - dynasty = olympios_dynasty - religion = "megalocratic" - culture = NEOW_peloponnesian - trait = education_martial_3 - trait = brave - trait = arrogant - trait = ambitious - father = greece0063 - 2360.1.1 = { - birth = yes - } - 2410.1.1 = { - death = yes - } -} - -greece0065 = { # Despoina I - name = "Déspoina" - dynasty = olympios_dynasty - religion = "megalocratic" - culture = NEOW_peloponnesian - trait = education_diplomacy_4 - trait = ambitious - trait = diligent - trait = stubborn - trait = intellect_good_1 - sexuality = heterosexual - father = greece0064 - female = yes - 2390.1.1 = { - birth = yes - } - 2468.1.1 = { - death = yes - } -} - -greece0066 = { # Leonidas II - name = "Leonídas" - dynasty = olympios_dynasty - religion = "megalocratic" - culture = NEOW_peloponnesian - trait = education_martial_1 - trait = craven - trait = lazy - trait = impatient - sexuality = heterosexual - mother = greece0065 - 2412.1.1 = { - birth = yes - } - 2440.1.1 = { - death = { - death_reason = death_murder - killer = greece0067 - } - } -} - -greece0067 = { # Mithras III the Old - name = "Míthras" - dynasty = olympios_dynasty - religion = "megalocratic" - culture = NEOW_peloponnesian - trait = education_martial_4 - trait = ambitious - trait = brave - trait = stubborn - mother = greece0065 - 2414.1.1 = { - birth = yes - } - 2473.1.1 = { - death = { - death_reason = death_murder - killer = greece0068 - } - } -} - -greece0068 = { # Mithras IV - name = "Míthras" - dynasty = olympios_dynasty - religion = "megalocratic" - culture = NEOW_peloponnesian - trait = education_martial_3 - trait = ambitious - trait = brave - trait = stubborn - mother = greece0065 - 2420.1.1 = { - birth = yes - } - 2474.1.1 = { - death = { - death_reason = death_murder - killer = greece0069 - } - } -} - -greece0069 = { # Dimitris I - name = "Dimitrís" - dynasty = olympios_dynasty - religion = "megalocratic" - culture = NEOW_peloponnesian - trait = education_martial_3 - trait = ambitious - trait = wrathful - trait = stubborn - mother = greece0065 - 2422.1.1 = { - birth = yes - } - 2477.1.1 = { - death = { - death_reason = death_murder - killer = greece0070 - } - } -} - -greece0070 = { # Antonis I - name = "Antónis" - dynasty = olympios_dynasty - religion = "megalocratic" - culture = NEOW_peloponnesian - trait = education_martial_2 - trait = ambitious - trait = stubborn - trait = wrathful - mother = greece0065 - 2425.1.1 = { - birth = yes - } - 2479.1.1 = { - death = { - death_reason = death_murder - killer = greece0065 - } - } -} - -greece0071 = { # Leonidas III - name = "Leonídas" - dynasty = olympios_dynasty - religion = "megalocratic" - culture = NEOW_peloponnesian - trait = education_diplomacy_2 - trait = craven - trait = trusting - trait = shy - father = greece0070 - sexuality = heterosexual - 2455.1.1 = { - birth = yes - } - 2493.1.1 = { - death = yes - } -} - -greece0072 = { # Leonidas IV - name = "Leonídas" - dynasty = olympios_dynasty - religion = "megalocratic" - culture = NEOW_peloponnesian - trait = education_martial_3 - trait = ambitious - trait = diligent - trait = brave - sexuality = heterosexual - father = greece0071 - 2460.1.1 = { - birth = yes - } - 2512.2.12 = { - death = { - death_reason = death_murder - killer = yugoslav0013 - } - } -} -greece0073 = { # turk - name = "Mákis" - dynasty_house = house_olimpiyat - religion = "megalocratic" - culture = thracian - trait = education_learning_4 - trait = greedy - trait = gregarious - trait = zealous - sexuality = heterosexual - father = greece0067 - 2460.1.1 = { - birth = yes - } - 2534.1.1 = { - death = yes - } } \ No newline at end of file diff --git a/history/titles/e_greece.txt b/history/titles/e_greece.txt deleted file mode 100644 index f874f45e1..000000000 --- a/history/titles/e_greece.txt +++ /dev/null @@ -1,52 +0,0 @@ -e_greece = { - 2318.1.1 = { - holder = greece0061 - } - - 2350.1.1 = { - holder = greece0062 - } - - 2378.1.1 = { - holder = greece0063 - } - - 2397.1.1 = { - holder = greece0064 - } - - 2410.1.1 = { - holder = greece0065 - } - - 2436.1.1 = { - holder = greece0066 - } - - 2440.1.1 = { - holder = greece0067 - } - - 2473.1.1 = { - holder = greece0068 - } - - 2474.1.1 = { - holder = greece0069 - } - - 2477.1.1 = { - holder = greece0070 - } - - 2479.1.1 = { - holder = greece0071 - } - - 2493.1.1 = { - holder = greece0072 - } - 2512.2.12 = { - holder = 0 - } -} \ No newline at end of file diff --git a/localization/english/replace/dynasties/zz_NEOW_dynasty_names_l_english.yml b/localization/english/replace/dynasties/zz_NEOW_dynasty_names_l_english.yml index dcc63c781..440ed3325 100644 --- a/localization/english/replace/dynasties/zz_NEOW_dynasty_names_l_english.yml +++ b/localization/english/replace/dynasties/zz_NEOW_dynasty_names_l_english.yml @@ -496,7 +496,6 @@ dynn_vretanou:0 "Vretanoú" dynn_mavromichalis:0 "Mavromichális" dynn_pelushi:0 "Pelushi" - dynn_olimpiyat:0 "Olimpiyat" # e_finland dynn_lahtinen:0 "Lahtinen"