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 9753df33..6dd27af7 100644 --- a/common/coat_of_arms/coat_of_arms/NEOW_dynasties.txt +++ b/common/coat_of_arms/coat_of_arms/NEOW_dynasties.txt @@ -21,129 +21,29 @@ dynn_britannia_solomonid = { } house_britannia_rholls_rhoycy = { - pattern="pattern_vertical_split_01.dds" - color1=yellow_light - color2=red - color3=black + custom=yes + pattern="pattern_solid.dds" + color1=white + color2=white + color3=red colored_emblem={ - color1=white - texture="ce_block_02.dds" + color1=black + texture="ce_letter_r.dds" instance={ - position={ 0.710000 0.450000 } - scale={ 0.290000 0.480000 } + position={ 0.570000 0.530000 } + scale={ 0.720000 0.670000 } + } + + instance={ + position={ 0.400000 0.390000 } + scale={ 0.700000 0.700000 } depth=1.010000 } } - colored_emblem={ - color1=red - texture="ce_block_01.dds" - instance={ - position={ 0.760000 0.510000 } - depth=2.010000 - rotation=90 - } - - } - - colored_emblem={ - color1=yellow_light - color2=yellow_light - color3=yellow_light - texture="ce_lion_rampant_per_pale.dds" - instance={ - position={ 0.200000 0.250000 } - scale={ 0.140000 0.140000 } - depth=3.010000 - } - - instance={ - position={ 0.300000 0.750000 } - scale={ 0.140000 0.140000 } - depth=4.010000 - } - - instance={ - position={ 0.400000 0.250000 } - scale={ 0.140000 0.140000 } - depth=5.010000 - } - - } - - colored_emblem={ - color1=black - texture="ce_billet.dds" - instance={ - position={ 0.200000 0.250000 } - scale={ 0.320000 0.230000 } - depth=6.010000 - } - - instance={ - position={ 0.300000 0.750000 } - scale={ 0.320000 0.230000 } - depth=7.010000 - } - - instance={ - position={ 0.400000 0.250000 } - scale={ 0.320000 0.230000 } - depth=8.010000 - } - - } - - colored_emblem={ - color1=black - texture="ce_fess_dancetty.dds" - instance={ - position={ 0.470000 0.470000 } - scale={ 1.000000 0.510000 } - depth=12.010000 - } - - } - - colored_emblem={ - color1=black - color2=yellow_light - color3=yellow_light - texture="ce_griffin_rampant.dds" - instance={ - position={ 0.700000 0.460000 } - scale={ 0.400000 0.400000 } - } - - } - - colored_emblem={ - color1=yellow_light - texture="ce_circle.dds" - instance={ - position={ 0.470000 0.440000 } - scale={ 0.100000 0.100000 } - depth=9.010000 - } - - instance={ - position={ 0.280000 0.440000 } - scale={ 0.100000 0.100000 } - depth=10.010000 - } - - instance={ - position={ 0.090000 0.440000 } - scale={ 0.100000 0.100000 } - depth=11.010000 - } - - } - } - dynn_britannia_guinness ={ pattern="pattern_checkers_diagonal_01.dds" color1=blue @@ -288,6 +188,38 @@ habsburg_dynasty = { } } +murat_dynasty = { + custom=yes + pattern="pattern_horizontal_split_01.dds" + color1=rgb { 29 21 87 } + color2=rgb { 191 168 47 } + color3=red + colored_emblem={ + color1=rgb { 255 180 68 } + texture="NEOW_ce_nap_eagle.dds" + instance={ + position={ 0.500000 0.280000 } + scale={ -0.560000 0.560000 } + depth=1.010000 + } + + } + + colored_emblem={ + color1=black + color2=black + color3=white + texture="ce_horse_statant.dds" + instance={ + position={ 0.500000 0.730000 } + scale={ -0.470000 0.470000 } + rotation=334 + } + + } + +} + lichtenstein_dynasty = { pattern="pattern_horizontal_split_01.dds" color1=yellow_light @@ -621,21 +553,117 @@ dynn_britannia_flamank = { } -dynn_britannia_wall ={ +menhir_dynasty={ custom=yes - pattern="pattern_solid.dds" - color1=white + pattern="pattern__solid_designer.dds" + color1=blue_light color2=white - color3=blue + color3=black colored_emblem={ - color1=red - texture="ce_lion_rampant_small.dds" + color1=rgb { 183 0 13 } + color2=red + texture="NEOW_ce_gaul_boar.dds" instance={ - scale={ 0.870000 0.870000 } + scale={ -0.910000 0.910000 } } } + colored_emblem={ + color1=rgb { 255 255 255 } + color2=rgb { 141 190 232 } + texture="ce_ordinary_pales_4.dds" + instance={ + position={ 0.510000 0.520000 } + depth=1.010000 + } + + } + +} + +dynn_britannia_wall ={ + pattern="pattern_solid.dds" + color1=white + color2=yellow + colored_emblem={ + color1=blue_light + texture="ce_block_02.dds" + instance={ + position={ 0.750000 0.540000 } + scale={ 0.150000 0.150000 } + depth=2.010000 + } + + } + + colored_emblem={ + color1=rgb { 154 38 22 } + texture="ce_shield_01.dds" + instance={ + position={ 0.500000 0.520000 } + scale={ 0.780000 0.810000 } + depth=1.010000 + } + + } + + colored_emblem={ + color1=white + color2=blue_light + texture="ce_checkers_06.dds" + instance={ + position={ 0.020000 0.170000 } + scale={ 0.350000 1.000000 } + depth=4.010000 + } + + instance={ + position={ 0.350000 0.000000 } + scale={ 1.000000 0.400000 } + depth=5.010000 + } + + instance={ + position={ 0.680000 0.880000 } + scale={ 0.530000 0.810000 } + depth=7.010000 + rotation=319 + } + + } + + colored_emblem={ + color1=white + color2=white + color3=white + texture="ce_lion_rampant_wide_stance.dds" + instance={ + position={ 0.500000 0.470000 } + scale={ 0.540000 0.690000 } + } + + } + + colored_emblem={ + color1=blue_light + color2=white + texture="ce_checkers_06.dds" + instance={ + position={ 1.000000 0.330000 } + scale={ 0.380000 1.000000 } + depth=3.010000 + } + + instance={ + position={ 0.160000 1.000000 } + scale={ 0.530000 0.720000 } + depth=6.010000 + rotation=38 + } + + } + } dynn_britannia_leigh ={ @@ -656,76 +684,17 @@ dynn_britannia_leigh ={ } spatstony_dynasty = { + custom=yes pattern="pattern__solid_designer.dds" - color1=yellow - color2=blue - color3=green - colored_emblem={ - color1=yellow_light - texture="ce_star_06.dds" - instance={ - position={ 0.290000 0.710000 } - scale={ 0.480000 0.480000 } - depth=4.010000 - } - - } - - colored_emblem={ - color1=white - color2=yellow_light - color3=red - texture="ce_martlet.dds" - instance={ - position={ 0.290000 0.280000 } - scale={ 0.510000 0.510000 } - depth=3.010000 - } - - } - - colored_emblem={ - color1=blue - color2=blue - texture="ce_diagonal_stripes_02_dual.dds" - instance={ - position={ 0.700000 0.460000 } - scale={ 0.990000 0.980000 } - depth=6.010000 - rotation=44 - } - - } - - colored_emblem={ - color1=blue - color2=yellow_light - texture="ce_quarterly.dds" - instance={ - position={ 0.000000 0.500000 } - depth=5.010000 - } - - } - + color1=black + color2=yellow + color3=blue colored_emblem={ color1=yellow - texture="ce_escallop_vannet.dds" + texture="NEOW_ce_spatstone.dds" instance={ - position={ 0.700000 0.300000 } - scale={ 0.240000 -0.240000 } - } - - instance={ - position={ 0.700000 0.700000 } - scale={ 0.240000 -0.240000 } - depth=1.010000 - } - - instance={ - position={ 0.700000 0.500000 } - scale={ 0.220000 -0.220000 } - depth=2.010000 + position={ 0.500000 0.530000 } + scale={ 0.890000 0.890000 } } } @@ -893,128 +862,33 @@ dynn_britannia_starr = { dynn_britannia_said = { - pattern="pattern__solid_designer.dds" - color1=red - color2=white - color3=blue + custom=yes + pattern="pattern_solid.dds" + color1=rgb { 220 52 47 } + color2=yellow + color3=black colored_emblem={ - color1=yellow_light - color2=yellow_light - texture="ce_mena_ceremonial_sword.dds" + color1=rgb { 241 238 62 } + texture="NEOW_ce_zanzibar.dds" instance={ - position={ 0.500000 0.450000 } - scale={ 0.300000 -0.300000 } - depth=8.010000 - rotation=130 - } - - instance={ - position={ 0.500000 0.450000 } - scale={ 0.300000 0.300000 } - depth=9.010000 - rotation=48 + position={ 0.500000 0.520000 } + scale={ 0.500000 0.500000 } } } colored_emblem={ - color1=yellow_light - color2=yellow_light - texture="ce_mena_horn.dds" + color1=rgb { 29 154 61 } + texture="ce_circle_mask.dds" instance={ - position={ 0.470000 0.410000 } - scale={ -0.190000 0.190000 } - depth=6.010000 - } - - instance={ - position={ 0.450000 0.430000 } - scale={ -0.190000 0.190000 } - depth=7.010000 - rotation=55 - } - - } - - colored_emblem={ - color1=yellow_light - color2=yellow_light - color3=yellow_light - texture="ce_globus_cruciger.dds" - instance={ - position={ 0.500000 0.370000 } - scale={ 0.160000 -0.260000 } - } - - } - - colored_emblem={ - color1=yellow_light - texture="ce_block_02.dds" - instance={ - position={ 0.600000 0.420000 } - scale={ 0.050000 0.030000 } + scale={ 0.590000 0.590000 } depth=1.010000 } - instance={ - position={ 0.400000 0.420000 } - scale={ 0.050000 0.030000 } - depth=2.010000 - } - - instance={ - position={ 0.500000 0.420000 } - scale={ 0.050000 0.030000 } - depth=3.010000 - } - - } - - colored_emblem={ - color1=red - texture="ce_block_02.dds" - instance={ - position={ 0.500000 0.430000 } - scale={ 0.410000 0.410000 } - depth=10.010000 - } - - } - - colored_emblem={ - color1=green - texture="ce_block_02.dds" - instance={ - position={ 0.500000 0.430000 } - scale={ 0.520000 0.520000 } - depth=11.010000 - } - - } - - colored_emblem={ - color1=yellow_light - texture="ce_chain.dds" - instance={ - position={ 0.550000 0.420000 } - scale={ 0.070000 0.070000 } - depth=4.010000 - rotation=89 - } - - instance={ - position={ 0.450000 0.420000 } - scale={ 0.070000 0.070000 } - depth=5.010000 - rotation=89 - } - } } - dynn_britannia_primrose = { pattern="pattern_solid.dds" color1=green_light @@ -1055,32 +929,26 @@ dynn_britannia_primrose = { } dynn_britannia_giray = { - pattern="pattern__solid_designer.dds" - color1=red - color2=white + custom=yes + pattern="pattern_solid.dds" + color1=blue_light + color2=yellow color3=red colored_emblem={ - color1=grey - color2=white - color3=white - texture="ce_flower.dds" + color1=yellow_light + texture="ce_tamgha_regular_circle_frame.dds" instance={ - position={ 0.500000 0.190000 } - scale={ 0.290000 0.290000 } + scale={ 0.790000 0.790000 } + depth=1.010000 } } colored_emblem={ - color1=grey - texture="ce_bend_thin.dds" + color1=yellow_light + texture="NEOW_ce_giray.dds" instance={ - scale={ -1.000000 1.000000 } - depth=1.010000 - } - - instance={ - depth=2.010000 + scale={ 0.550000 0.550000 } } } @@ -1118,56 +986,20 @@ house_britannia_juny = { dynn_britannia_newton={ pattern="pattern__solid_designer.dds" - color1=green - color2=yellow + color1=green_light + color2=black color3=black colored_emblem={ - color1=yellow - texture="ce_block_01.dds" + color1=black + color2=white + texture="NEOW_ce_newton.dds" instance={ - position={ 0.500000 0.000000 } + position={ 0.500000 0.500000 } depth=3.010000 } } - colored_emblem={ - color1=yellow - color2=yellow_light - color3=white - texture="ce_lion_rampant_wide_stance.dds" - instance={ - position={ 0.500000 0.550000 } - scale={ 0.570000 0.570000 } - depth=4.010000 - } - - } - - colored_emblem={ - color1=red - color2=green_light - color3=white - texture="ce_flower.dds" - instance={ - position={ 0.250000 0.140000 } - scale={ 0.240000 0.240000 } - } - - instance={ - position={ 0.750000 0.140000 } - scale={ 0.240000 0.240000 } - depth=1.010000 - } - - instance={ - position={ 0.500000 0.140000 } - scale={ 0.240000 0.240000 } - depth=2.010000 - } - - } - } dynn_britannia_nelson = { @@ -2604,17 +2436,18 @@ dynn_britannia_dev={ } dynn_britannia_cartney={ - pattern="pattern_solid.dds" - color1=yellow + pattern="pattern__solid_designer.dds" + color1=rgb { 52 49 45 } color2=white - color3=blue + color3=red colored_emblem={ - color1=red + color1=black color2=red - color3=white - texture="ce_stag.dds" + color3=grey + texture="NEOW_ce_blackadder.dds" instance={ - scale={ 0.700000 0.700000 } + position={ 0.500000 0.520000 } + scale={ 0.940000 0.940000 } } } diff --git a/common/dynasties/NEOW_dynasties.txt b/common/dynasties/NEOW_dynasties.txt index 7916ea3a..fe381db4 100644 --- a/common/dynasties/NEOW_dynasties.txt +++ b/common/dynasties/NEOW_dynasties.txt @@ -331,9 +331,8 @@ dynn_britannia_gibb = { culture = gaelic #change to manx later } -dynn_britannia_cartney = { +dynn_britannia_cartney = { #blaicaiddyr name = dynn_cartney - prefix = "dynnp_mac" culture = gaelic } diff --git a/gfx/coat_of_arms/colored_emblems/NEOW_ce_blackadder.dds b/gfx/coat_of_arms/colored_emblems/NEOW_ce_blackadder.dds new file mode 100644 index 00000000..ba94d7f8 --- /dev/null +++ b/gfx/coat_of_arms/colored_emblems/NEOW_ce_blackadder.dds @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d8220fc4c70cde524ea919ffb112535d5892cbb828bb83bf03a7682abf098e33 +size 22000 diff --git a/gfx/coat_of_arms/colored_emblems/NEOW_ce_gaul_boar.dds b/gfx/coat_of_arms/colored_emblems/NEOW_ce_gaul_boar.dds new file mode 100644 index 00000000..f632804c --- /dev/null +++ b/gfx/coat_of_arms/colored_emblems/NEOW_ce_gaul_boar.dds @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c40c1224f7eabf8c05733341a64a082aa94ed127b6e477145a198e2d0729e09a +size 22000 diff --git a/gfx/coat_of_arms/colored_emblems/NEOW_ce_giray.dds b/gfx/coat_of_arms/colored_emblems/NEOW_ce_giray.dds new file mode 100644 index 00000000..69faa713 --- /dev/null +++ b/gfx/coat_of_arms/colored_emblems/NEOW_ce_giray.dds @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:af5d138a349e15d85eeb1876307d7e055d9a71c940d96a1688db3560e9510489 +size 22000 diff --git a/gfx/coat_of_arms/colored_emblems/NEOW_ce_newton.dds b/gfx/coat_of_arms/colored_emblems/NEOW_ce_newton.dds new file mode 100644 index 00000000..3ef9df10 --- /dev/null +++ b/gfx/coat_of_arms/colored_emblems/NEOW_ce_newton.dds @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d32b484df2b863948906941baab0196ac421acd49d4a21068b36964296461bc6 +size 22000 diff --git a/gfx/coat_of_arms/colored_emblems/NEOW_ce_spatstone.dds b/gfx/coat_of_arms/colored_emblems/NEOW_ce_spatstone.dds new file mode 100644 index 00000000..53f6a05c --- /dev/null +++ b/gfx/coat_of_arms/colored_emblems/NEOW_ce_spatstone.dds @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dbebbec9b4d63a27b6ed6741f362de367cb0bd05961aec4bad1c1e320063d5b8 +size 22000 diff --git a/gfx/coat_of_arms/colored_emblems/NEOW_ce_zanzibar.dds b/gfx/coat_of_arms/colored_emblems/NEOW_ce_zanzibar.dds new file mode 100644 index 00000000..16662ef6 --- /dev/null +++ b/gfx/coat_of_arms/colored_emblems/NEOW_ce_zanzibar.dds @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5275513c03a376b01c66717ea9d8a134b062d9b38069b0fa2ec67c088a47059c +size 22000 diff --git a/gfx/coat_of_arms/colored_emblems/NEOW_coa_designer_emblems.txt b/gfx/coat_of_arms/colored_emblems/NEOW_coa_designer_emblems.txt index e88bb62e..d648677b 100644 --- a/gfx/coat_of_arms/colored_emblems/NEOW_coa_designer_emblems.txt +++ b/gfx/coat_of_arms/colored_emblems/NEOW_coa_designer_emblems.txt @@ -51,3 +51,9 @@ NEOW_ce_crown_koln.dds = { colors = 2 category = manmade } NEOW_ce_drop.dds = { colors = 2 category = nature } NEOW_ce_crown_koln_imperial.dds = { colors = 3 category = manmade } NEOW_ce_bend_alsace.dds = { colors = 1 category = patterns } +NEOW_ce_giray.dds = { colors = 1 category = tribal_seal } +NEOW_ce_newton.dds = { colors = 2 category = patterns } +NEOW_ce_spatstone.dds = { colors = 1 category = faiths } +NEOW_ce_zanzibar.dds = { colors = 1 category = nature } +NEOW_ce_blackadder.dds = { colors = 3 category = animals } +NEOW_ce_gaul_boar.dds = { colors = 2 category = animals } diff --git a/history/characters/NEOW_e_britannia.txt b/history/characters/NEOW_e_britannia.txt index 767379fc..6d21ac89 100644 --- a/history/characters/NEOW_e_britannia.txt +++ b/history/characters/NEOW_e_britannia.txt @@ -1633,17 +1633,17 @@ britannia_lennon_shaun = { } britannia_cartney_hamish = { - name = "Hamish" + name = "Eddmundd" dynasty = dynn_britannia_cartney religion = "victorian" culture = strafclideg - trait = education_stewardship_3 - trait = callous - trait = greedy + trait = education_intrigue_3 trait = diligent - trait = giant - trait = spindly - trait = physique_good_2 + trait = ambitious + trait = deceitful + trait = intellect_good_1 + trait = shrewd + trait = bastard_founder 2520.1.1 = { birth = yes } diff --git a/localization/english/replace/dynasties/NEOW_dynasty_names_l_english.yml b/localization/english/replace/dynasties/NEOW_dynasty_names_l_english.yml index f1dd8386..292f48f8 100644 --- a/localization/english/replace/dynasties/NEOW_dynasty_names_l_english.yml +++ b/localization/english/replace/dynasties/NEOW_dynasty_names_l_english.yml @@ -222,7 +222,7 @@ dynn_starr:0 "Starr" dynn_tudorh:0 "Tudorh" dynn_elgarh:0 "Elgarh" - dynn_wall:0 "Wall" + dynn_wall:0 "Waillaicy" dynn_rholls_rhoycy:0 "Rolls-Rhoycy" dynn_nelson:0 "Nelson" dynn_solomonid:0 "Solomonid" @@ -262,7 +262,7 @@ dynn_gibb:0 "Gibb" dynn_lennon:0 "Lennon" dynn_harriswn:0 "Harriswn" - dynn_cartney:0 "Cartney" + dynn_cartney:0 "Blaicaiddyr" dynn_wood:0 "Wood" dynn_richards:0 "Richards" dynn_watts:0 "Watts"