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 2f6cd135d..1685bd23f 100644 --- a/common/coat_of_arms/coat_of_arms/NEOW_dynasties.txt +++ b/common/coat_of_arms/coat_of_arms/NEOW_dynasties.txt @@ -10,166 +10,6 @@ } -dynasty_fredriksson={ - pattern="pattern_solid.dds" - color1=purple - color2=yellow - color3=red - colored_emblem={ - color1=white - texture="ce_suomenusko_sun_07.dds" - instance={ - position={ 0.500000 0.290000 } - scale={ 0.690000 0.690000 } - depth=1.010000 - } - - } - - colored_emblem={ - color1=white - texture="NEOW_ce_anvil.dds" - instance={ - position={ 0.500000 0.780000 } - scale={ 0.800000 0.800000 } - } - - } - -} - -morozov_dynasty={ - pattern="pattern_solid.dds" - color1=blue_light - color2=white - color3=red - colored_emblem={ - color1=white - color2=white - texture="ce_carbuncle.dds" - } - - colored_emblem={ - color1=white - texture="ce_aegishjalmr.dds" - instance={ - scale={ 0.840000 0.840000 } - depth=1.010000 - } - - } - -} - - -valkeapaa_dynasty={ - pattern="pattern_solid.dds" - color1=blue - color2=white - color3=black - colored_emblem={ - color1=white - texture="NEOW_ce_book_open.dds" - instance={ - position={ 0.500000 0.720000 } - scale={ 0.790000 0.790000 } - } - - } - - colored_emblem={ - color1=yellow - texture="NEOW_ce_halfsun.dds" - instance={ - position={ 0.500000 0.030000 } - depth=1.010000 - } - - } - -} - - -labba_dynasty={ - pattern="pattern_vertical_split_01.dds" - color1=red - color2=blue - color3=red - colored_emblem={ - color1=red - texture="ce_circle_mask.dds" - instance={ - position={ 0.600000 0.500000 } - scale={ 0.250000 0.420000 } - depth=2.010000 - } - - } - - colored_emblem={ - color1=white - color2=white - texture="ce_eastern_sun.dds" - instance={ - depth=3.010000 - } - - } - - colored_emblem={ - color1=blue - texture="ce_circle_mask.dds" - instance={ - position={ 0.400000 0.500000 } - scale={ 0.250000 0.430000 } - depth=1.010000 - } - - } - - colored_emblem={ - color1=white - texture="ce_pagan_wotan_cross.dds" - instance={ - scale={ 0.660000 0.660000 } - } - - } - -} - - -nordheim_dynasty={ - pattern="pattern_solid.dds" - color1=rgb { 94 116 144 } - color2=white - color3=green - colored_emblem={ - color1=white - color2=rgb { 94 116 144 } - texture="ce_norse_odins_raven.dds" - instance={ - position={ 0.510000 0.760000 } - scale={ 0.840000 0.840000 } - } - - } - - colored_emblem={ - color1=white - texture="ce_aegishjalmr.dds" - instance={ - position={ 0.500000 0.200000 } - scale={ 0.550000 0.550000 } - depth=1.010000 - } - - } - -} - - - khanov_dynasty={ pattern="pattern_solid.dds" color1=red @@ -221,90 +61,6 @@ khanov_dynasty={ } -trollkungen_dynasty={ - pattern="pattern_solid.dds" - color1=black - color2=yellow - color3=red - colored_emblem={ - color1=green_light - color2=blue_light - texture="ce_wildman.dds" - instance={ - position={ 0.500000 0.760000 } - depth=1.010000 - } - - } - - colored_emblem={ - color1=yellow - color2=black - texture="ce_crown_head.dds" - instance={ - position={ 0.500000 0.300000 } - scale={ 0.230000 0.230000 } - } - - } - -} - - -adlercreutz_dynasty={ - pattern="pattern_solid.dds" - color1=yellow - color2=yellow - color3=red - colored_emblem={ - color1=blue_light - texture="ce_block_01.dds" - instance={ - position={ 0.500000 0.090000 } - depth=4.010000 - } - - } - - colored_emblem={ - color1=black - color2=yellow - color3=yellow - texture="ce_eagle.dds" - instance={ - position={ 0.500000 0.690000 } - scale={ 0.770000 0.770000 } - } - - } - - colored_emblem={ - color1=white - texture="ce_cross_09.dds" - instance={ - position={ 0.800000 0.180000 } - scale={ 0.280000 0.280000 } - depth=1.010000 - } - - instance={ - position={ 0.200000 0.180000 } - scale={ 0.280000 0.280000 } - depth=2.010000 - } - - instance={ - position={ 0.500000 0.180000 } - scale={ 0.280000 0.280000 } - depth=3.010000 - } - - } - -} - - - sokolov_dynasty={ pattern="pattern_solid.dds" diff --git a/common/coat_of_arms/coat_of_arms/finland.txt b/common/coat_of_arms/coat_of_arms/finland.txt index 0daba6fe1..4bd5f3139 100644 --- a/common/coat_of_arms/coat_of_arms/finland.txt +++ b/common/coat_of_arms/coat_of_arms/finland.txt @@ -10,73 +10,38 @@ k_sapmi_kven={ color2=yellow color3=blue colored_emblem={ - color1=yellow - color2=blue - texture="ce_rosetta_06.dds" - instance={ - depth=3.010000 - rotation=30 - } - + color1=white + texture="ce_circle_mask.dds" + instance={scale={0.8 0.8}} + } + colored_emblem={ + color1=black + texture="ce_circle_mask.dds" + instance={scale={0.725 0.725}} } - colored_emblem={ color1=red texture="ce_circle_mask.dds" - instance={ - scale={ 0.675000 0.675000 } - depth=4.010000 - } - + instance={scale={0.675 0.675}} } - colored_emblem={ - color1=white - texture="ce_tamgha_regular_circle_frame.dds" - instance={ - scale={ 0.490000 0.490000 } - } - + color1=yellow + color2=blue + texture="ce_rosetta_06.dds" } - - colored_emblem={ - color1=black - texture="ce_circle_mask.dds" - instance={ - scale={ 0.725000 0.725000 } - depth=5.010000 - } - - } - - colored_emblem={ - color1=white - texture="ce_circle_mask.dds" - instance={ - scale={ 0.780000 0.780000 } - depth=6.010000 - } - - } - colored_emblem={ color1=white texture="ce_religion_bogomilist.dds" - instance={ - scale={ 0.160000 0.160000 } - depth=2.010000 - } - + instance={scale={0.16 0.16}} } - colored_emblem={ color1=black texture="ce_pagan_circle_frame.dds" - instance={ - scale={ 0.550000 0.550000 } - depth=1.010000 - } - + instance={scale={0.55 0.55}} + } + colored_emblem={ + color1=white + texture="ce_pagan_circle_frame.dds" + instance={scale={0.61 0.61}} } - } diff --git a/common/dynasties/NEOW_dynasties.txt b/common/dynasties/NEOW_dynasties.txt index e55b6e5d7..257364fa8 100644 --- a/common/dynasties/NEOW_dynasties.txt +++ b/common/dynasties/NEOW_dynasties.txt @@ -1696,11 +1696,6 @@ adlercreutz_dynasty = { culture = svealandsk } -nordheim_dynasty = { - name = dynn_nordheim - culture = trondheimer -} - roda_ulven_dynasty = { name = dynn_Ulven culture = svealandsk diff --git a/common/nicknames/NEOW_nicknames.txt b/common/nicknames/NEOW_nicknames.txt index 374103bf7..9b977b6dd 100644 --- a/common/nicknames/NEOW_nicknames.txt +++ b/common/nicknames/NEOW_nicknames.txt @@ -31,8 +31,6 @@ nick_NEOW_katyusha = {} nick_NEOW_trollslayer = {} nick_NEOW_cyprioarch = {} nick_NEOW_first_cyprioarch = {} -nick_NEOW_the_gnome = {} -nick_NEOW_the_frost_queen = {} # Decision Nicknames nick_the_lion_of_the_north = {} diff --git a/history/characters/NEOW_e_baltic.txt b/history/characters/NEOW_e_baltic.txt index 9a8ae3e31..f4253080e 100644 --- a/history/characters/NEOW_e_baltic.txt +++ b/history/characters/NEOW_e_baltic.txt @@ -228,9 +228,9 @@ baltic0013 = { baltic0014 = { name = "Grigoriy" - dynasty = kromanov_dynasty + #dynasty = koppel_dynasty religion = "hiisalka" - culture = NEOW_petrogradian + culture = kromanov_dynasty trait = deceitful trait = gluttonous trait = compassionate diff --git a/history/characters/NEOW_e_scandinavia.txt b/history/characters/NEOW_e_scandinavia.txt index 475eaa088..a2d52b1f5 100644 --- a/history/characters/NEOW_e_scandinavia.txt +++ b/history/characters/NEOW_e_scandinavia.txt @@ -367,12 +367,9 @@ scandinavia0019 = { culture = elfdalian trait = education_diplomacy_3 trait = hunchbacked - trait = dwarf trait = cynical - trait = craven - trait = diligent - trait = shrewd - give_nickname = nick_NEOW_the_gnome + trait = lustful + trait = gluttonous 2520.9.1 = { birth = yes } @@ -841,28 +838,7 @@ sweden_erik_trollslayer = { 2012.1.1 = { birth = yes } - 2083.3.15 = { + 2093.3.15 = { death = yes } -} - -norway_freya_frost_queen = { - name = "Freya" - dynasty = nordheim_dynasty - female = yes - religion = "viking" - culture = trondheimer - trait = education_intrigue_4 - trait = ambitious - trait = lustful - trait = wrathful - trait = adventurer - trait = witch - give_nickname = nick_NEOW_the_frost_queen - 1989.7.13 = { - birth = yes - } - 2078.1.1 = { - death = yes - } } \ No newline at end of file diff --git a/history/characters/NEOW_finland.txt b/history/characters/NEOW_finland.txt index 5073d9a52..82e96ed45 100644 --- a/history/characters/NEOW_finland.txt +++ b/history/characters/NEOW_finland.txt @@ -304,8 +304,8 @@ finland0017 = { } finland0018 = { - name = "Èoavvá" - dynasty = valkeapaa_dynasty + name = "Vetle" + dynasty = lillestol_dynasty culture = sami religion = sami_pagan trait = education_diplomacy_4 @@ -358,7 +358,7 @@ finland0020 = { finland0021 = { name = "Áilu" dynasty = pieski_dynasty - culture = tornedalian + culture = sami religion = laestadian trait = education_stewardship_3 trait = honest @@ -411,7 +411,7 @@ finland0023 = { finland0024 = { name = "Gert" dynasty = nilsson_dynasty - culture = norrlandsk + culture = tornedalian religion = laestadian trait = education_stewardship_1 trait = craven @@ -503,7 +503,6 @@ finland0029 = { trait = greedy trait = fickle trait = lifestyle_mystic - trait = witch give_nickname=nick_the_witch 2519.7.12 = { birth = yes diff --git a/history/provinces/e_finland.txt b/history/provinces/e_finland.txt index c97d1dbc0..471029d25 100644 --- a/history/provinces/e_finland.txt +++ b/history/provinces/e_finland.txt @@ -34,7 +34,7 @@ ##d_norrbottena ###c_julevadno 421 = { - culture = norrlandsk + culture = tornedalian religion = laestadian holding = tribal_holding } @@ -74,7 +74,7 @@ } ###c_jahkamakke 373 = { - culture = tornedalian + culture = sami religion = laestadian holding = tribal_holding } @@ -102,7 +102,7 @@ } ###c_karasjohka 397 = { - culture = sami + culture = kven religion = sami_pagan holding = tribal_holding } @@ -133,7 +133,7 @@ ##d_giemajohka ###c_giepma 425 = { - culture = finnish + culture = sami religion = laestadian holding = tribal_holding } diff --git a/history/titles/k_denmark.txt b/history/titles/k_denmark.txt index da0c47ad3..ada08a76d 100644 --- a/history/titles/k_denmark.txt +++ b/history/titles/k_denmark.txt @@ -7,7 +7,7 @@ k_denmark = { change_development_level = 3 } 2553.6.12 = { - holder = 0 + holder = scandinavia0030 } } d_sjaelland = { diff --git a/history/titles/k_norway.txt b/history/titles/k_norway.txt index ce205c198..23d96136f 100644 --- a/history/titles/k_norway.txt +++ b/history/titles/k_norway.txt @@ -1,10 +1,4 @@ k_norway = { - 2016.1.1 = { - holder = norway_freya_frost_queen - } - 2078.1.1 = { - holder = 0 - } 2553.1.1 = { holder = scandinavia0002 } diff --git a/history/titles/k_sweden.txt b/history/titles/k_sweden.txt index 66aca9e73..dafb47227 100644 --- a/history/titles/k_sweden.txt +++ b/history/titles/k_sweden.txt @@ -5,9 +5,6 @@ k_sweden = { 2062.1.1 = { holder = sweden_erik_trollslayer } - 2083.3.15 = { - holder = 0 - } 2545.1.1 = { holder = scandinavia0014 } diff --git a/localization/english/replace/NEOW_nicknames_l_english.yml b/localization/english/replace/NEOW_nicknames_l_english.yml index ccd201cd9..7cd92b6c8 100644 --- a/localization/english/replace/NEOW_nicknames_l_english.yml +++ b/localization/english/replace/NEOW_nicknames_l_english.yml @@ -46,8 +46,4 @@ nick_NEOW_cyprioarch:0 "the Ethnarch" nick_NEOW_cyprioarch_desc:0 "[CHARACTER.GetShortUINameNoTooltipNoFormat|U] [CharAreIs(CHARACTER)] recognized as the foremost representative of the Cypriot people, bearing the ancient title of Ethnarch and the expectations that come with it." nick_NEOW_first_cyprioarch:0 "the Protoethnarch" - nick_NEOW_first_cyprioarch_desc:0 "[CHARACTER.GetShortUINameNoTooltipNoFormat|U] was the first recognized Ethnarch in the modern age, laying claim to the ancient office as the father of a new Cypriot state." - nick_NEOW_the_gnome:0 "the Gnome" - nick_NEOW_the_gnome_desc:0 "[CHARACTER.GetShortUINameNoTooltipNoFormat|U] [CharAreIs(CHARACTER)] often compared to the gnome of myth, owing to [CharYourHerHis(CHARACTER)] diminutive size and stature." - nick_NEOW_the_frost_queen:0 "the Frost Queen" - nick_NEOW_the_frost_queen_desc:0 "[CHARACTER.GetShortUINameNoTooltipNoFormat|U] [CharHaveHas(CHARACTER)] gone down in legend as a powerful witch, one that cast a curse of eternal winter across all of Scandinavia. Her children would go on to found legendary lineages and rule much of the northern lands for years to come." \ No newline at end of file + nick_NEOW_first_cyprioarch_desc:0 "[CHARACTER.GetShortUINameNoTooltipNoFormat|U] was the first recognized Ethnarch in the modern age, laying claim to the ancient office as the father of a new Cypriot state." \ 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 4a7147028..dcc63c781 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 @@ -412,7 +412,6 @@ dynn_salman:0 "Salman" dynn_trollkungen:0 "Trollkungen" dynn_adlercreutz:0 "Adlercreutz" - dynn_nordheim:0 "Nordheim" # e_nistria dynn_bulat:0 "Bulat"