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.

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

ethnicity calculations fix + satyr height adjustment #1466

Merged
merged 1 commit into from
Sep 20, 2024
Merged

ethnicity calculations fix + satyr height adjustment #1466

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
34 changes: 17 additions & 17 deletions common/ethnicities/wc_ethnicities_aquatic.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,27 +5,27 @@
gene_race = { 1 = { name = creature_sea_giant range = { 0 1 } } }

skin_color = {
1 = { 0.569 0.439 0.741 0.478 } # 1. Blue
1 = { 0.349 0.333 0.522 0.431 } # Yellow-Green to Green
1 = { 0.655 0.298 0.675 0.318 } # Greenish Gray
1 = { 0.447 0.455 0.475 0.5 } # Blue-green
25 = { 0.569 0.439 0.741 0.478 } # 1. Blue
25 = { 0.349 0.333 0.522 0.431 } # Yellow-Green to Green
25 = { 0.655 0.298 0.675 0.318 } # Greenish Gray
25 = { 0.447 0.455 0.475 0.5 } # Blue-green
}
eye_color = {
1 = { 0.714 0.098 0.714 0.631 } # Gray to Blue
1 = { 0.078 0.424 0.078 0.729 } # Brown/Yellow
1 = { 0.314 0.788 0.314 0.820 } # Hazel
40 = { 0.714 0.098 0.714 0.631 } # Gray to Blue
30 = { 0.078 0.424 0.078 0.729 } # Brown/Yellow
30 = { 0.314 0.788 0.314 0.820 } # Hazel
}
hair_color = {
1 = { 0.094 0.918 0.094 0.918 } # Brown
1 = { 0.063 0.773 0.063 0.839 } # Orange/Ginger
1 = { 0.004 0.443 0.067 0.541 } #Red/Orange
1 = { 0.784 0.824 0.992 0.824 } # Dark Blue, Purple, Pink-ish
2 = { 0.624 0.239 0.714 0.310 } # Blue/Green-ish
2 = { 0.447 0.455 0.475 0.5 } # Blue-green
1 = { 0.314 0.820 0.365 0.949 } # Dark Green
1 = { 0.004 0.910 0.231 0.937 } # Red & Brown
1 = { 0.584 0.455 0.584 0.5 } # Blue/Cyan
1 = { 0.910 0.455 0.941 0.5 } # Magenta/Pink/Purple
30 = { 0.094 0.918 0.094 0.918 } # Brown
10 = { 0.063 0.773 0.063 0.839 } # Orange/Ginger
5 = { 0.004 0.443 0.067 0.541 } #Red/Orange
5 = { 0.784 0.824 0.992 0.824 } # Dark Blue, Purple, Pink-ish
5 = { 0.624 0.239 0.714 0.310 } # Blue/Green-ish
15 = { 0.447 0.455 0.475 0.5 } # Blue-green
10 = { 0.314 0.820 0.365 0.949 } # Dark Green
5 = { 0.004 0.910 0.231 0.937 } # Red & Brown
10 = { 0.584 0.455 0.584 0.5 } # Blue/Cyan
5 = { 0.910 0.455 0.941 0.5 } # Magenta/Pink/Purple
}

#Height
Expand Down
74 changes: 37 additions & 37 deletions common/ethnicities/wc_ethnicities_demonic.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,31 +8,31 @@ nathrezim_ethnicity = {

# Colors
hair_color = {
1 = { 0.694 0.988 0.694 0.988 } # PH
100 = { 0.694 0.988 0.694 0.988 } # PH
}
skin_color = {
#Tint 1
1 = { 0.718 0.318 0.718 0.318 } # Gray/Blue
20 = { 0.718 0.318 0.718 0.318 } # Gray/Blue
#Tint 2
1 = { 0.337 0.082 0.337 0.082 } # Light
20 = { 0.337 0.082 0.337 0.082 } # Light
#Tint 3
1 = { 0.655 0.298 0.675 0.318 } # Greenish Gray
20 = { 0.655 0.298 0.675 0.318 } # Greenish Gray
#Tint 4
1 = { 0.710 0.314 0.788 0.314 } # Blue to Purple
20 = { 0.710 0.314 0.788 0.314 } # Blue to Purple
#Tint 5
1 = { 0.773 0.196 0.784 0.231 } # Light Pink
20 = { 0.773 0.196 0.784 0.231 } # Light Pink
}
eye_color = {
#Tint 1
1 = { 0.910 0.455 0.941 0.5 } # Magenta/Pink/Purple
20 = { 0.910 0.455 0.941 0.5 } # Magenta/Pink/Purple
#Tint 2
1 = { 0.447 0.455 0.475 0.5 } # Blue-green
20 = { 0.447 0.455 0.475 0.5 } # Blue-green
#Tint 3
1 = { 0.318 0.455 0.318 0.5 } # Fel Green
20 = { 0.318 0.455 0.318 0.5 } # Fel Green
#Tint 4
1 = { 0 0.6 0 0.7 } # Red
20 = { 0 0.6 0 0.7 } # Red
#Tint 5
1 = { 0.584 0.455 0.584 0.5 } # Blue/Cyan
20 = { 0.584 0.455 0.584 0.5 } # Blue/Cyan
}

gene_skin_value = {
Expand Down Expand Up @@ -422,15 +422,15 @@ nathrezim_tint1 = {

# Colors
hair_color = {
1 = { 0.694 0.988 0.694 0.988 } # PH
100 = { 0.694 0.988 0.694 0.988 } # PH
}
skin_color = {
#Tint 1
1 = { 0.718 0.318 0.718 0.318 } # Gray/Blue
100 = { 0.718 0.318 0.718 0.318 } # Gray/Blue
}
eye_color = {
#Tint 1
1 = { 0.910 0.455 0.941 0.5 } # Magenta/Pink/Purple
100 = { 0.910 0.455 0.941 0.5 } # Magenta/Pink/Purple
}
gene_skin_value = {
1 = { name = skin_value_neg range = { 0.35 0.45 } }
Expand All @@ -443,16 +443,16 @@ nathrezim_tint2 = {

# Colors
hair_color = {
1 = { 0.694 0.988 0.694 0.988 } # PH
100 = { 0.694 0.988 0.694 0.988 } # PH
}
skin_color = {
#Tint 2
#1 = { 0.643 0.141 0.643 0.141 } # Light
1 = { 0.337 0.082 0.337 0.082 } # Light
100 = { 0.337 0.082 0.337 0.082 } # Light
}
eye_color = {
#Tint 2
1 = { 0.447 0.455 0.475 0.5 } # Blue-green
100 = { 0.447 0.455 0.475 0.5 } # Blue-green
}
gene_skin_value = {
1 = { name = skin_value_neg range = { 0 0.25 } }
Expand All @@ -465,15 +465,15 @@ nathrezim_tint3 = {

# Colors
hair_color = {
1 = { 0.694 0.988 0.694 0.988 } # PH
100 = { 0.694 0.988 0.694 0.988 } # PH
}
skin_color = {
#Tint 3
1 = { 0.655 0.298 0.675 0.318 } # Greenish Gray
100 = { 0.655 0.298 0.675 0.318 } # Greenish Gray
}
eye_color = {
#Tint 3
1 = { 0.318 0.455 0.318 0.5 } # Fel Green
100 = { 0.318 0.455 0.318 0.5 } # Fel Green
}
}

Expand All @@ -483,15 +483,15 @@ nathrezim_tint4 = {

# Colors
hair_color = {
1 = { 0.694 0.988 0.694 0.988 } # PH
100 = { 0.694 0.988 0.694 0.988 } # PH
}
skin_color = {
#Tint 4
1 = { 0.710 0.314 0.788 0.314 } # Blue to Purple
100 = { 0.710 0.314 0.788 0.314 } # Blue to Purple
}
eye_color = {
#Tint 4
1 = { 0 0.6 0 0.7 } # Red
100 = { 0 0.6 0 0.7 } # Red
}
gene_skin_value = {
1 = { name = skin_value_neg range = { 0 0.25 } }
Expand All @@ -504,15 +504,15 @@ nathrezim_tint5 = {

# Colors
hair_color = {
1 = { 0.694 0.988 0.694 0.988 } # PH
100 = { 0.694 0.988 0.694 0.988 } # PH
}
skin_color = {
#Tint 5
1 = { 0.773 0.196 0.784 0.231 } # Light Pink
100 = { 0.773 0.196 0.784 0.231 } # Light Pink
}
eye_color = {
#Tint 5
1 = { 0.584 0.455 0.584 0.5 } # Blue/Cyan
100 = { 0.584 0.455 0.584 0.5 } # Blue/Cyan
}
}

Expand All @@ -524,15 +524,15 @@ succubus_ethnicity = {

# Colors
hair_color = {
1 = { 0.694 0.988 0.694 0.988 } # PH
100 = { 0.694 0.988 0.694 0.988 } # PH
}
skin_color = {
1 = { 0.588 0.239 0.588 0.239 } # PH (Blue)
1 = { 0.902 0.298 0.965 0.329 } # PH (Purple/Pink)
1 = { 0.002 0.298 0.059 0.3 } # PH (Red)
40 = { 0.588 0.239 0.588 0.239 } # PH (Blue)
30 = { 0.902 0.298 0.965 0.329 } # PH (Purple/Pink)
30 = { 0.002 0.298 0.059 0.3 } # PH (Red)
}
eye_color = {
1 = { 0.549 0.388 0.635 0.420 }
100 = { 0.549 0.388 0.635 0.420 }
}

#Height
Expand Down Expand Up @@ -919,10 +919,10 @@ succubus_red = {

# Colors
hair_color = {
1 = { 0 0.965 0.043 1 } # Black with a tint of green/blue/purple
100 = { 0 0.965 0.043 1 } # Black with a tint of green/blue/purple
}
skin_color = {
1 = { 0.002 0.298 0.059 0.4 } # PH (Red)
100 = { 0.002 0.298 0.059 0.4 } # PH (Red)
}
}

Expand All @@ -933,10 +933,10 @@ succubus_blue = {

# Colors
hair_color = {
1 = { 0.7 0.949 0.757 0.957 } # Black with a tint of green/blue/purple
100 = { 0.7 0.949 0.757 0.957 } # Black with a tint of green/blue/purple
}
skin_color = {
1 = { 0.624 0.239 0.714 0.310 } # Blue/Green-ish
100 = { 0.624 0.239 0.714 0.310 } # Blue/Green-ish
}
}

Expand All @@ -947,9 +947,9 @@ succubus_magenta = {

# Colors
hair_color = {
1 = { 0.847 0.922 0.910 0.957 } # Black with a tint of green/blue/purple
100 = { 0.847 0.922 0.910 0.957 } # Black with a tint of green/blue/purple
}
skin_color = {
1 = { 0.812 0.259 0.910 0.310 } # Blue/Green-ish
100 = { 0.812 0.259 0.910 0.310 } # Blue/Green-ish
}
}
26 changes: 13 additions & 13 deletions common/ethnicities/wc_ethnicities_draenei.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,24 +30,24 @@ draenei_ethnicity = {
#5 = { 0.914 0.814 0.961 0.859 } # Dark Red/Pink-ish
#1 = { 0.024 0.914 0.024 0.914 } # Dark Brown/Red
#1 = { 0.469 0.273 0.469 0.305 } # Pale Green
1 = { 0 0.95 0.137 0.97 } # Dark Brown
1 = { 0.114 0 0.114 0 } # Gray
20 = { 0 0.95 0.137 0.97 } # Dark Brown
20 = { 0.114 0 0.114 0 } # Gray
#1 = { 0.102 0.063 0.227 0.165 } # Blonde
1 = { 0.333 0.95 0.753 0.97 } # Dark Green/Blue
1 = { 0.540 0.773 0.749 0.875 } # Light Green/Blue
1 = { 0.902 0.85 0.953 0.97 } # Dark Violet
20 = { 0.333 0.95 0.753 0.97 } # Dark Green/Blue
20 = { 0.540 0.773 0.749 0.875 } # Light Green/Blue
20 = { 0.902 0.85 0.953 0.97 } # Dark Violet

}
skin_color = {
2 = { 0.609 0.25 0.623 0.4 } # Pale Green/Gray
4 = { 0.8 0.35 0.845 0.425 } # Purple
10 = { 0.7 0.4 0.75 0.45 } # Light Blue
20 = { 0.609 0.25 0.623 0.4 } # Pale Green/Gray
20 = { 0.8 0.35 0.845 0.425 } # Purple
60 = { 0.7 0.4 0.75 0.45 } # Light Blue
}
gene_skin_value = {
1 = { name = skin_value_neg range = { 0 0.25 } }
}
eye_color = {
1 = { 0.639 0.3 0.667 0.376 } # Blue
100 = { 0.639 0.3 0.667 0.376 } # Blue
}

#Height
Expand Down Expand Up @@ -362,17 +362,17 @@ manari_ethnicity = {
gene_being = { 1 = { name = being_demon range = { 0 1 } } }

hair_color = {
25 = { 0 0.94 0.100 0.97 } # Dark Brown
1 = { 0.114 0 0.114 0 } # Gray
40 = { 0 0.94 0.100 0.97 } # Dark Brown
15 = { 0.114 0 0.114 0 } # Gray
15 = { 0.659 0.95 0.753 0.97 } # Dark Blue
25 = { 0.902 0.95 0.953 1 } # Dark Violet/Black
1 = { 0 0.055 0 0.067 } # White
5 = { 0 0.055 0 0.067 } # White

}
skin_color = {
50 = { 0 0.44 0.02 0.47 } # Light Red
35 = { 0.047 0.44 0.067 0.5 } # Light Orange
15 = { 0.722 0.353 0.847 0.365 } # Uncorrupted Lavender
10 = { 0.722 0.353 0.847 0.365 } # Uncorrupted Lavender
5 = { 0.722 0.298 0.914 0.420 } # Uncorrupted Skin
}
gene_skin_value = {
Expand Down
Loading