Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Satyr CoA Update #1259

Merged
merged 4 commits into from
Nov 28, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 28 additions & 0 deletions common/coat_of_arms/template_lists/colored_emblem_lists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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 } }
Expand Down Expand Up @@ -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 } }
Expand Down
4 changes: 2 additions & 2 deletions common/culture/cultures/wc_xavic.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@

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 }

ethnicities = {
1 = satyr_ethnicity
}
}
}
10 changes: 10 additions & 0 deletions gfx/coat_of_arms/colored_emblems/69_coa_designer_emblems.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Expand Down
Binary file added gfx/coat_of_arms/colored_emblems/ce_satyr_1.dds
Binary file not shown.
Binary file added gfx/coat_of_arms/colored_emblems/ce_satyr_10.dds
Binary file not shown.
Binary file added gfx/coat_of_arms/colored_emblems/ce_satyr_2.dds
Binary file not shown.
Binary file added gfx/coat_of_arms/colored_emblems/ce_satyr_3.dds
Binary file not shown.
Binary file added gfx/coat_of_arms/colored_emblems/ce_satyr_4.dds
Binary file not shown.
Binary file added gfx/coat_of_arms/colored_emblems/ce_satyr_5.dds
Binary file not shown.
Binary file added gfx/coat_of_arms/colored_emblems/ce_satyr_6.dds
Binary file not shown.
Binary file added gfx/coat_of_arms/colored_emblems/ce_satyr_7.dds
Binary file not shown.
Binary file added gfx/coat_of_arms/colored_emblems/ce_satyr_8.dds
Binary file not shown.
Binary file added gfx/coat_of_arms/colored_emblems/ce_satyr_9.dds
Binary file not shown.
Loading