diff --git a/N3OW/common/coat_of_arms/coat_of_arms/alps.txt b/N3OW/common/coat_of_arms/coat_of_arms/alps.txt index 2cd019f3..78dc4cd8 100644 --- a/N3OW/common/coat_of_arms/coat_of_arms/alps.txt +++ b/N3OW/common/coat_of_arms/coat_of_arms/alps.txt @@ -308,13 +308,13 @@ c_drome={ colored_emblem={ color1=white color2=white - texture="ce_waves_05.dds" + texture="NEOW_ce_waves_05.dds" instance={position={0.5 0.625} scale={1 1} depth=2} } colored_emblem={ color1=blue color2=blue - texture="ce_waves_05.dds" + texture="NEOW_ce_waves_05.dds" instance={position={0.5 0.5} scale={1 1} depth=3} instance={position={0.5 0.75} scale={1 1}} } @@ -333,13 +333,13 @@ c_isere={ colored_emblem={ color1=white color2=white - texture="ce_waves_05.dds" + texture="NEOW_ce_waves_05.dds" instance={position={0.5 0.375} scale={1 -1} depth=2} } colored_emblem={ color1=blue color2=blue - texture="ce_waves_05.dds" + texture="NEOW_ce_waves_05.dds" instance={position={0.5 0.5} scale={1 -1} depth=3} instance={position={0.5 0.25} scale={1 -1}} } @@ -432,7 +432,7 @@ c_vaucluse={ colored_emblem={ color1=green_light color2=yellow - texture="ce_orange_branch.dds" + texture="NEOW_ce_orange_branch.dds" instance={position={0.5 0.7}} } colored_emblem={ @@ -551,7 +551,7 @@ c_alpes_maritimes={ colored_emblem={ color1=blue color2=white - texture="ce_waves_05.dds" + texture="NEOW_ce_waves_05.dds" instance={position={0.5 0.75}} } } diff --git a/N3OW/common/dynasties/NEOW_dynasties.txt b/N3OW/common/dynasties/NEOW_dynasties.txt index 4edc2f5b..8c68a680 100644 --- a/N3OW/common/dynasties/NEOW_dynasties.txt +++ b/N3OW/common/dynasties/NEOW_dynasties.txt @@ -1089,4 +1089,9 @@ de_bourbon_naundorff_dynasty = { prefix = "dynnp_de" name = dynn_Bourbon_dsh_Naundorff culture = metropolitain +} + +chitteaux_dynasty = { + name = dynn_Chitteaux + culture = bourguignon } \ No newline at end of file diff --git a/N3OW/gfx/coat_of_arms/colored_emblems/NEOW_ce_orange_branch.dds b/N3OW/gfx/coat_of_arms/colored_emblems/NEOW_ce_orange_branch.dds new file mode 100644 index 00000000..5acd6456 --- /dev/null +++ b/N3OW/gfx/coat_of_arms/colored_emblems/NEOW_ce_orange_branch.dds @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:eff6fbf6e67520d5337271898b98725042518fb58b9cf4f14132a9ccfe9b5221 +size 87536 diff --git a/N3OW/gfx/coat_of_arms/colored_emblems/NEOW_ce_waves_05.dds b/N3OW/gfx/coat_of_arms/colored_emblems/NEOW_ce_waves_05.dds new file mode 100644 index 00000000..919e0db8 --- /dev/null +++ b/N3OW/gfx/coat_of_arms/colored_emblems/NEOW_ce_waves_05.dds @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:388e864539b6ea5056e75341d9224b71155ba1edd6b4acaae34d0dccc72c0b22 +size 87536 diff --git a/N3OW/gfx/coat_of_arms/colored_emblems/NEOW_coa_designer_emblems.txt b/N3OW/gfx/coat_of_arms/colored_emblems/NEOW_coa_designer_emblems.txt index afaf8531..0e909b1a 100644 --- a/N3OW/gfx/coat_of_arms/colored_emblems/NEOW_coa_designer_emblems.txt +++ b/N3OW/gfx/coat_of_arms/colored_emblems/NEOW_coa_designer_emblems.txt @@ -55,10 +55,7 @@ NEOW_ce_hamsick_china.dds = { colors = 1 category = manmade } NEOW_ce_paektu.dds = { colors = 1 category = nature } NEOW_ce_kimstar.dds = { colors = 1 category = nature } NEOW_ce_hamsick_soviet.dds = { colors = 1 category = manmade } -NEOW_ce_jugotorch.dds = { colors = 2 category = manmade } -NEOW_ce_vergina.dds = { colors = 1 category = nature } NEOW_ce_tryzub.dds = { colors = 1 category = tribal_seal } -NEOW_ce_wave_single.dds = { colors = 1 category = abstract } ###ANIMALS NEOW_ce_archaeopteryx.dds = { colors = 3 category = animals } @@ -99,8 +96,15 @@ NEOW_ce_bosphorus.dds = { colors = 1 category = manmade } NEOW_ce_gondor_crown.dds = { colors = 1 category = manmade } NEOW_ce_guinness_logo.dds = { colors = 1 category = manmade } NEOW_ce_helm_of_skanderbeg.dds = { colors = 1 category = manmade } +NEOW_ce_jugotorch.dds = { colors = 2 category = manmade } NEOW_ce_lantern.dds = { colors = 3 category = animals } ###NATURE NEOW_ce_cedar.dds = { colors = 2 category = nature } -NEOW_ce_lotus.dds = { colors = 1 category = nature } \ No newline at end of file +NEOW_ce_lotus.dds = { colors = 1 category = nature } +NEOW_ce_orange_branch.dds = { colors = 2 category = nature } +NEOW_ce_vergina.dds = { colors = 1 category = nature } + +###PATTERNS +NEOW_ce_wave_single.dds = { colors = 1 category = patterns } +NEOW_ce_waves_05.dds = { colors = 2 category = patterns } \ No newline at end of file diff --git a/N3OW/history/characters/NEOW_e_france.txt b/N3OW/history/characters/NEOW_e_france.txt index 5a96a309..fdc185ed 100644 --- a/N3OW/history/characters/NEOW_e_france.txt +++ b/N3OW/history/characters/NEOW_e_france.txt @@ -1092,4 +1092,12 @@ france_adelberth_de_bourbon_naundorff = { 2600.1.1 = { death = yes } +} +france_guy_loup_chitteaux={ + name ="Guy-Loup" + dynasty=chitteaux_dynasty + religion=girondin + culture=bourguignon + 2519.4.18={birth=yes} + 2600.1.1={death =yes} } \ No newline at end of file diff --git a/N3OW/history/titles/k_france.txt b/N3OW/history/titles/k_france.txt index 1a4810ad..0e02b3d3 100644 --- a/N3OW/history/titles/k_france.txt +++ b/N3OW/history/titles/k_france.txt @@ -138,6 +138,12 @@ c_autun = { liege = d_burgundy } } +c_beaune = { + 2547.2.7 = { + holder = france_guy_loup_chitteaux + liege = d_burgundy + } +} c_sens = { 2551.1.1 = { holder = france_marc_dumont #eric leroux diff --git a/N3OW/localization/english/dynasties/NEOW_dynasty_names_l_english.yml b/N3OW/localization/english/dynasties/NEOW_dynasty_names_l_english.yml index 95d92ac9..63ae3620 100644 --- a/N3OW/localization/english/dynasties/NEOW_dynasty_names_l_english.yml +++ b/N3OW/localization/english/dynasties/NEOW_dynasty_names_l_english.yml @@ -422,5 +422,6 @@ dynn_Attoumani:0 "Attoumani" dynn_Nguyen:0 "Nguyen" dynn_no:0 "Weiser" - dynn_bollani:0 "Bollani" dynn_Bourbon_dsh_Naundorff:0 "Bourbon-Naundorff" + dynn_bollani:0 "Bollani" + dynn_Chitteaux:0 "Chitteaux"