Skip to content

graphicalgfx cleanup #153

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.

Sign up for GitHub

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

Merged
schwarherz merged 7 commits into from
Mar 8, 2023
Merged

graphicalgfx cleanup #153

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
254f98c
file naming consistency
schwarherz Mar 8, 2023
5cf59a3
fixed potential gfx naming conflicts
schwarherz Mar 8, 2023
9206bc3
filling in the blanks
schwarherz Mar 8, 2023
d132cbf
apply new culturalgfx
schwarherz Mar 8, 2023
3640bb6
clean up culturalgfx references
schwarherz Mar 8, 2023
ddf41bd
Fix Charlemagne's appearance
schwarherz Mar 8, 2023
1647d61
refined saxon, anglo-saxon, and english gfx entries
schwarherz Mar 8, 2023
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
26 changes: 13 additions & 13 deletions CleanSlate/common/cultures/00_altaic.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ altaic = {
}
}

graphical_cultures = { turkishgfx mongolgfx muslimgfx }
graphical_cultures = { altaicgfx turkishgfx easterngfx mongolgfx muslimgfx } # turkishgfx mongolgfx muslimgfx

avar = { # Oghur Turkish
alternate_start = {
Expand All @@ -23,7 +23,7 @@ altaic = {
}
}

graphical_cultures = { turkishgfx easterngfx }
graphical_cultures = { avargfx } # turkishgfx easterngfx
secondary_event_pictures = bedouin
color = { 0.7 0.7 0.3 }

Expand Down Expand Up @@ -79,7 +79,7 @@ altaic = {
}

bolghar = { # Oghur Turkish
graphical_cultures = { turkishgfx }
graphical_cultures = { bolghargfx } # turkishgfx
secondary_event_pictures = bedouin
color = { 0.7 0.65 0.15 }

Expand Down Expand Up @@ -132,7 +132,7 @@ altaic = {
}

cuman = { # Kipchak Turkish
graphical_cultures = { cumangfx turkishgfx }
graphical_cultures = { cumangfx } # cumangfx turkishgfx
secondary_event_pictures = bedouin
color = { 0.75 0.60 0.20 }

Expand Down Expand Up @@ -183,7 +183,7 @@ altaic = {
}
}

graphical_cultures = { chinesegfx mongolgfx muslimgfx }
graphical_cultures = { jurchengfx chinesegfx mongolgfx muslimgfx } # chinesegfx mongolgfx muslimgfx
secondary_event_pictures = bedouin
color = { 122 114 92 }

Expand Down Expand Up @@ -250,7 +250,7 @@ altaic = {
}

karluk = {
graphical_cultures = { cumangfx turkishgfx }
graphical_cultures = { karlukgfx cumangfx } # cumangfx turkishgfx
secondary_event_pictures = bedouin
color = { 0.65 0.50 0.15 }

Expand Down Expand Up @@ -297,7 +297,7 @@ altaic = {
}

khazar = { # Oghur Turkish
graphical_cultures = { turkishgfx }
graphical_cultures = { khazargfx } # turkishgfx
secondary_event_pictures = bedouin
color = { 0.7 0.45 0.1 }

Expand Down Expand Up @@ -346,7 +346,7 @@ altaic = {
}

khitan = {
graphical_cultures = { chinesegfx mongolgfx muslimgfx }
graphical_cultures = { khitangfx chinesegfx mongolgfx muslimgfx } # chinesegfx mongolgfx muslimgfx
secondary_event_pictures = bedouin
color = { 0.8 0.8 0.3 }

Expand Down Expand Up @@ -400,7 +400,7 @@ altaic = {
}

kirghiz = {
graphical_cultures = { cumangfx turkishgfx }
graphical_cultures = { kirghizgfx cumangfx } # cumangfx turkishgfx
secondary_event_pictures = bedouin
color = { 0.85 0.72 0.30 }

Expand Down Expand Up @@ -466,7 +466,7 @@ altaic = {
}
}

graphical_cultures = { mongolgfx muslimgfx }
graphical_cultures = { mongolgfx muslimgfx } # mongolgfx muslimgfx
secondary_event_pictures = bedouin
color = { 0.4 0.4 1.0 }

Expand Down Expand Up @@ -517,7 +517,7 @@ altaic = {
}

pecheneg = { # Oghuz Turkish
graphical_cultures = { turkishgfx }
graphical_cultures = { pecheneggfx } # turkishgfx
secondary_event_pictures = bedouin
color = { 0.85 0.79 0.25 }

Expand Down Expand Up @@ -559,7 +559,7 @@ altaic = {
}

turkish = { # Oghuz Turkish
graphical_cultures = { turkishgfx }
graphical_cultures = { turkishgfx } # turkishgfx
secondary_event_pictures = bedouin
color = { 0.85 0.55 0.15 }

Expand Down Expand Up @@ -622,7 +622,7 @@ altaic = {
}

uyghur = {
graphical_cultures = { cumangfx turkishgfx }
graphical_cultures = { uyghurgfx cumangfx } # cumangfx turkishgfx
secondary_event_pictures = bedouin
color = { 0.85 0.75 0.50 }

Expand Down
12 changes: 6 additions & 6 deletions CleanSlate/common/cultures/00_arabic.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ arabic = {
}
}

graphical_cultures = { muslimgfx }
graphical_cultures = { arabicgfx muslimgfx } # muslimgfx

andalusian = {
alternate_start = {
Expand All @@ -23,7 +23,7 @@ arabic = {
}
}

graphical_cultures = { berbergfx andalusiangfx } #westerngfx
graphical_cultures = { andalusiangfx berbergfx } # berbergfx andalusiangfx
color = { 0.4 0.6 0.1 }

male_names = {
Expand Down Expand Up @@ -86,7 +86,7 @@ arabic = {
}

bedouin = {
graphical_cultures = { arabicgfx muslimgfx }
graphical_cultures = { bedouingfx } # arabicgfx muslimgfx
color = { 0.1 0.75 0.1 }

male_names = {
Expand Down Expand Up @@ -134,7 +134,7 @@ arabic = {
}

berber = {
graphical_cultures = { berbergfx arabicgfx muslimgfx }
graphical_cultures = { berbergfx } # berbergfx arabicgfx muslimgfx
color = { 0.2 0.9 0.2 }

male_names = {
Expand Down Expand Up @@ -219,7 +219,7 @@ arabic = {
}

egyptian = {
graphical_cultures = { egyptiangfx levantinegfx arabicgfx muslimgfx }
graphical_cultures = { egyptiangfx levantinegfx } # egyptiangfx levantinegfx arabicgfx muslimgfx
color = { 0.1 0.6 0.1 }

male_names = {
Expand Down Expand Up @@ -274,7 +274,7 @@ arabic = {
}

levantine = {
graphical_cultures = { levantinegfx arabicgfx muslimgfx }
graphical_cultures = { levantinegfx } # levantinegfx arabicgfx muslimgfx
color = { 0.3 0.95 0.3 }

male_names = {
Expand Down
8 changes: 4 additions & 4 deletions CleanSlate/common/cultures/00_baltic.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ baltic = {
}
}

graphical_cultures = { easterngfx }
graphical_cultures = { balticgfx ugricgfx easterngfx } # easterngfx

latgalian = {
graphical_cultures = { ugricgfx }
graphical_cultures = { latgaliangfx } # ugricgfx
color = { 0.5 0.5 0.1 }

male_names = {
Expand Down Expand Up @@ -56,7 +56,7 @@ baltic = {
}

lithuanian = {
graphical_cultures = { ugricgfx }
graphical_cultures = { lithuaniangfx } # ugricgfx
color = { 0.56 0.55 0.2 }

male_names = {
Expand Down Expand Up @@ -98,7 +98,7 @@ baltic = {
}

prussian = {
graphical_cultures = { ugricgfx }
graphical_cultures = { prussiangfx } # ugricgfx
color = { 0.56 0.55 0.4 }

male_names = {
Expand Down
22 changes: 11 additions & 11 deletions CleanSlate/common/cultures/00_byzantine.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ byzantine = {
}

}
graphical_cultures = { easterngfx }
graphical_cultures = { byzantinegfx easterngfx } # easterngfx

alan = {
graphical_cultures = { easternslavicgfx }
graphical_cultures = { alangfx easternslavicgfx } # easternslavicgfx
color = { 0.7 0.5 0.7 }

male_names = {
Expand Down Expand Up @@ -62,7 +62,7 @@ byzantine = {
}

arberian = {
graphical_cultures = { byzantinegfx }
graphical_cultures = { arberiangfx } # byzantinegfx
color = { 0.7 0.2 0.9 }

male_names = {
Expand Down Expand Up @@ -106,7 +106,7 @@ byzantine = {
}

armenian = {
graphical_cultures = { byzantinegfx }
graphical_cultures = { armeniangfx } # byzantinegfx
color = { 0.5 0.2 0.5 }

male_names = {
Expand Down Expand Up @@ -156,7 +156,7 @@ byzantine = {
}

assyrian = {
graphical_cultures = { persiangfx }
graphical_cultures = { assyriangfx persiangfx } # persiangfx
secondary_event_pictures = bedouin
color = { 0.4 0.3 0.6 }

Expand Down Expand Up @@ -207,8 +207,8 @@ byzantine = {
prefix = yes
}

coptic = { #copto-egyptian
graphical_cultures = { byzantinegfx }
coptic = { # copto-egyptian
graphical_cultures = { copticgfx } # byzantinegfx
color = { 0.6 0.4 0.6 }

male_names = {
Expand Down Expand Up @@ -263,7 +263,7 @@ byzantine = {
}

georgian = {
graphical_cultures = { byzantinegfx }
graphical_cultures = { georgiangfx } # byzantinegfx
color = { 0.6 0.3 0.8 }

male_names = {
Expand Down Expand Up @@ -315,7 +315,7 @@ byzantine = {
}

greek = {
graphical_cultures = { byzantinegfx }
graphical_cultures = { greekgfx } # byzantinegfx
color = { 0.8 0.3 0.8 }

male_names = {
Expand Down Expand Up @@ -377,8 +377,8 @@ byzantine = {
disinherit_from_blinding = yes
}

crimean_gothic = {
graphical_cultures = { crimeangfx byzantinegfx }
crimean_gothic = { # Gothic
graphical_cultures = { crimeangfx } # crimeangfx byzantinegfx
color = { 0.8 0.4 0.8}

male_names = {
Expand Down
12 changes: 6 additions & 6 deletions CleanSlate/common/cultures/00_celtic.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ celtic = {
}

}
graphical_cultures = { cleanwesterngfx westerngfx }
graphical_cultures = { celticgfx cleanwesterngfx westerngfx } # westerngfx

breton = {
graphical_cultures = { celticgfx }
graphical_cultures = { bretongfx } # celticgfx
color = { 0.3 0.5 0.4 }

male_names = {
Expand Down Expand Up @@ -80,7 +80,7 @@ celtic = {
}

irish = {
graphical_cultures = { celticgfx }
graphical_cultures = { irishgfx } # celticgfx
color = { 0.3 0.8 0.8 }

male_names = {
Expand Down Expand Up @@ -150,7 +150,7 @@ celtic = {
}
}

graphical_cultures = { celticgfx }
graphical_cultures = { pictishgfx } # celticgfx
color = { 0.2 0.6 0.6 }

male_names = {
Expand Down Expand Up @@ -211,7 +211,7 @@ celtic = {
}
}

graphical_cultures = { celticgfx }
graphical_cultures = { scottishgfx } # celticgfx
color = { 0.3 0.7 0.7 }

male_names = {
Expand Down Expand Up @@ -278,7 +278,7 @@ celtic = {
}

welsh = {
graphical_cultures = { celticgfx }
graphical_cultures = { welshgfx } # celticgfx
color = { 0.3 0.8 0.6 }

male_names = {
Expand Down
8 changes: 4 additions & 4 deletions CleanSlate/common/cultures/00_central_african.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ central_african = {
}
}

graphical_cultures = { muslimgfx }
graphical_cultures = { centralafricangfx westafricangfx africangfx muslimgfx } # muslimgfx

hausa = {
graphical_cultures = { westafricangfx africangfx }
graphical_cultures = { hausagfx } # westafricangfx africangfx
secondary_event_pictures = bedouin
color = { 0.9 0.55 0.8 }

Expand Down Expand Up @@ -62,7 +62,7 @@ central_african = {
}

kanuri = {
graphical_cultures = { westafricangfx africangfx }
graphical_cultures = { kanurigfx } # westafricangfx africangfx
secondary_event_pictures = bedouin
color = { 0.8 0.45 0.75 }

Expand Down Expand Up @@ -107,7 +107,7 @@ central_african = {
}

zaghawa = {
graphical_cultures = { westafricangfx africangfx }
graphical_cultures = { zaghawagfx } # westafricangfx africangfx
secondary_event_pictures = bedouin
color = { 0.9 0.35 0.85 }

Expand Down
Loading