diff --git a/common/coat_of_arms/template_lists/colored_emblem_lists.txt b/common/coat_of_arms/template_lists/colored_emblem_lists.txt index acea9b769c..a527c78f1f 100644 --- a/common/coat_of_arms/template_lists/colored_emblem_lists.txt +++ b/common/coat_of_arms/template_lists/colored_emblem_lists.txt @@ -905,6 +905,20 @@ colored_emblem_texture_lists = { 6000 = "ce_magnataur9.dds" 6000 = "ce_magnataur10.dds" } + ### Xavian + special_selection = { + trigger = { scope:culture = { has_coa_gfx = satyr_coa_gfx } } + 1000 = "ce_satyr_1.dds" + 1000 = "ce_satyr_2.dds" + 1000 = "ce_satyr_3.dds" + 1000 = "ce_satyr_4.dds" + 1000 = "ce_satyr_5.dds" + 1000 = "ce_satyr_6.dds" + 1000 = "ce_satyr_7.dds" + 1000 = "ce_satyr_8.dds" + 1000 = "ce_satyr_9.dds" + 1000 = "ce_satyr_10.dds" + } ### Harpy special_selection = { trigger = { scope:culture = { has_coa_gfx = harpy_coa_gfx } } @@ -2576,6 +2590,20 @@ colored_emblem_texture_lists = { } ### Warcraft ### + ### Xavian + special_selection = { + trigger = { scope:culture = { has_coa_gfx = satyr_coa_gfx } } + 1000 = "ce_satyr_1.dds" + 1000 = "ce_satyr_2.dds" + 1000 = "ce_satyr_3.dds" + 1000 = "ce_satyr_4.dds" + 1000 = "ce_satyr_5.dds" + 1000 = "ce_satyr_6.dds" + 1000 = "ce_satyr_7.dds" + 1000 = "ce_satyr_8.dds" + 1000 = "ce_satyr_9.dds" + 1000 = "ce_satyr_10.dds" + } ### Harpy special_selection = { trigger = { scope:culture = { has_coa_gfx = harpy_coa_gfx } } diff --git a/common/culture/cultures/wc_xavic.txt b/common/culture/cultures/wc_xavic.txt index eb4beb57fe..d6dc2a326c 100644 --- a/common/culture/cultures/wc_xavic.txt +++ b/common/culture/cultures/wc_xavic.txt @@ -20,7 +20,7 @@ name_list = name_list_satyr - coa_gfx = { satyr_coa_gfx steppe_coa_gfx wc_pagan_coa_gfx } #satyr_coa_gfx for localization and remove error in error.log + coa_gfx = { satyr_coa_gfx } #satyr_coa_gfx for localization and remove error in error.log building_gfx = { indian_building_gfx } clothing_gfx = { creature_satyr_gfx demonic_clothing_gfx high_elven_hairstyles_gfx night_elven_beards_gfx no_headgear_gfx } unit_gfx = { eastern_unit_gfx } @@ -28,4 +28,4 @@ ethnicities = { 1 = satyr_ethnicity } -} \ No newline at end of file +} diff --git a/gfx/coat_of_arms/colored_emblems/69_coa_designer_emblems.txt b/gfx/coat_of_arms/colored_emblems/69_coa_designer_emblems.txt index 56cea8b30c..7fd32f3ac6 100644 --- a/gfx/coat_of_arms/colored_emblems/69_coa_designer_emblems.txt +++ b/gfx/coat_of_arms/colored_emblems/69_coa_designer_emblems.txt @@ -155,6 +155,16 @@ ce_shadowmoon.dds = { colors = 1 category = a_wc_category_2 } ce_shadowtooth.dds = { colors = 3 category = a_wc_category_2 } ce_shattered_hand.dds = { colors = 1 category = a_wc_category_2 } ce_shatterspear.dds = { colors = 3 category = a_wc_category_2 } +ce_satyr_1.dds = { colors = 2 category = a_wc_category_2 } +ce_satyr_2.dds = { colors = 2 category = a_wc_category_2 } +ce_satyr_3.dds = { colors = 2 category = a_wc_category_2 } +ce_satyr_4.dds = { colors = 2 category = a_wc_category_2 } +ce_satyr_5.dds = { colors = 2 category = a_wc_category_2 } +ce_satyr_6.dds = { colors = 2 category = a_wc_category_2 } +ce_satyr_7.dds = { colors = 2 category = a_wc_category_2 } +ce_satyr_8.dds = { colors = 2 category = a_wc_category_2 } +ce_satyr_9.dds = { colors = 2 category = a_wc_category_2 } +ce_satyr_10.dds = { colors = 2 category = a_wc_category_2 } ce_hozen1.dds = { colors = 1 category = a_wc_category_3 } ce_hozen2.dds = { colors = 2 category = a_wc_category_3 } diff --git a/gfx/coat_of_arms/colored_emblems/ce_satyr_1.dds b/gfx/coat_of_arms/colored_emblems/ce_satyr_1.dds new file mode 100644 index 0000000000..bd5bb4d5f9 Binary files /dev/null and b/gfx/coat_of_arms/colored_emblems/ce_satyr_1.dds differ diff --git a/gfx/coat_of_arms/colored_emblems/ce_satyr_10.dds b/gfx/coat_of_arms/colored_emblems/ce_satyr_10.dds new file mode 100644 index 0000000000..85aed97d6c Binary files /dev/null and b/gfx/coat_of_arms/colored_emblems/ce_satyr_10.dds differ diff --git a/gfx/coat_of_arms/colored_emblems/ce_satyr_2.dds b/gfx/coat_of_arms/colored_emblems/ce_satyr_2.dds new file mode 100644 index 0000000000..358eb159a5 Binary files /dev/null and b/gfx/coat_of_arms/colored_emblems/ce_satyr_2.dds differ diff --git a/gfx/coat_of_arms/colored_emblems/ce_satyr_3.dds b/gfx/coat_of_arms/colored_emblems/ce_satyr_3.dds new file mode 100644 index 0000000000..12d8f76c3d Binary files /dev/null and b/gfx/coat_of_arms/colored_emblems/ce_satyr_3.dds differ diff --git a/gfx/coat_of_arms/colored_emblems/ce_satyr_4.dds b/gfx/coat_of_arms/colored_emblems/ce_satyr_4.dds new file mode 100644 index 0000000000..6592992e37 Binary files /dev/null and b/gfx/coat_of_arms/colored_emblems/ce_satyr_4.dds differ diff --git a/gfx/coat_of_arms/colored_emblems/ce_satyr_5.dds b/gfx/coat_of_arms/colored_emblems/ce_satyr_5.dds new file mode 100644 index 0000000000..1c2d917f66 Binary files /dev/null and b/gfx/coat_of_arms/colored_emblems/ce_satyr_5.dds differ diff --git a/gfx/coat_of_arms/colored_emblems/ce_satyr_6.dds b/gfx/coat_of_arms/colored_emblems/ce_satyr_6.dds new file mode 100644 index 0000000000..096d599acf Binary files /dev/null and b/gfx/coat_of_arms/colored_emblems/ce_satyr_6.dds differ diff --git a/gfx/coat_of_arms/colored_emblems/ce_satyr_7.dds b/gfx/coat_of_arms/colored_emblems/ce_satyr_7.dds new file mode 100644 index 0000000000..edc4d73ece Binary files /dev/null and b/gfx/coat_of_arms/colored_emblems/ce_satyr_7.dds differ diff --git a/gfx/coat_of_arms/colored_emblems/ce_satyr_8.dds b/gfx/coat_of_arms/colored_emblems/ce_satyr_8.dds new file mode 100644 index 0000000000..a0ac6c92c8 Binary files /dev/null and b/gfx/coat_of_arms/colored_emblems/ce_satyr_8.dds differ diff --git a/gfx/coat_of_arms/colored_emblems/ce_satyr_9.dds b/gfx/coat_of_arms/colored_emblems/ce_satyr_9.dds new file mode 100644 index 0000000000..7cc0671422 Binary files /dev/null and b/gfx/coat_of_arms/colored_emblems/ce_satyr_9.dds differ