mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-10 18:22:39 +00:00
[MIRROR] Add DNA for the recent wing/ear/tail alpha addition (#10436)
Co-authored-by: eghughguhhhhhh <Hawoogabooga@gmail.com> Co-authored-by: vorestation-ci[bot] <199609141+vorestation-ci[bot]@users.noreply.github.com> Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
committed by
GitHub
GitHub
parent
9a93bc0c9d
commit
e11b9aba4f
@@ -122,41 +122,45 @@ var/SMALLSIZEBLOCK = 0
|
||||
#define DNA_UI_TAIL3_R 27
|
||||
#define DNA_UI_TAIL3_G 28
|
||||
#define DNA_UI_TAIL3_B 29
|
||||
#define DNA_UI_TAIL_ALPHA 30
|
||||
|
||||
#define DNA_UI_EARS_R 30
|
||||
#define DNA_UI_EARS_G 31
|
||||
#define DNA_UI_EARS_B 32
|
||||
#define DNA_UI_EARS2_R 33
|
||||
#define DNA_UI_EARS2_G 34
|
||||
#define DNA_UI_EARS2_B 35
|
||||
#define DNA_UI_EARS3_R 36
|
||||
#define DNA_UI_EARS3_G 37
|
||||
#define DNA_UI_EARS3_B 38
|
||||
#define DNA_UI_EARS_R 31
|
||||
#define DNA_UI_EARS_G 32
|
||||
#define DNA_UI_EARS_B 33
|
||||
#define DNA_UI_EARS2_R 34
|
||||
#define DNA_UI_EARS2_G 35
|
||||
#define DNA_UI_EARS2_B 36
|
||||
#define DNA_UI_EARS3_R 37
|
||||
#define DNA_UI_EARS3_G 38
|
||||
#define DNA_UI_EARS3_B 39
|
||||
#define DNA_UI_EARS_ALPHA 40
|
||||
|
||||
#define DNA_UI_EARS_SECONDARY_START 39
|
||||
#define DNA_UI_EARS_SECONDARY_START 41
|
||||
#define DNA_UI_EARS_SECONDARY_COLOR_CHANNEL_COUNT 3
|
||||
|
||||
#define DNA_UI_EARS_SECONDARY_R 39
|
||||
#define DNA_UI_EARS_SECONDARY_G 40
|
||||
#define DNA_UI_EARS_SECONDARY_B 41
|
||||
#define DNA_UI_EARS_SECONDARY2_R 42
|
||||
#define DNA_UI_EARS_SECONDARY2_G 43
|
||||
#define DNA_UI_EARS_SECONDARY2_B 44
|
||||
#define DNA_UI_EARS_SECONDARY3_R 45
|
||||
#define DNA_UI_EARS_SECONDARY3_G 46
|
||||
#define DNA_UI_EARS_SECONDARY3_B 47
|
||||
#define DNA_UI_EARS_SECONDARY_R 41
|
||||
#define DNA_UI_EARS_SECONDARY_G 42
|
||||
#define DNA_UI_EARS_SECONDARY_B 43
|
||||
#define DNA_UI_EARS_SECONDARY2_R 44
|
||||
#define DNA_UI_EARS_SECONDARY2_G 45
|
||||
#define DNA_UI_EARS_SECONDARY2_B 46
|
||||
#define DNA_UI_EARS_SECONDARY3_R 47
|
||||
#define DNA_UI_EARS_SECONDARY3_G 48
|
||||
#define DNA_UI_EARS_SECONDARY3_B 49
|
||||
#define DNA_UI_EARS_SECONDARY_ALPHA 50
|
||||
|
||||
#define DNA_UI_WING_STYLE 48
|
||||
#define DNA_UI_WING_R 49
|
||||
#define DNA_UI_WING_G 50
|
||||
#define DNA_UI_WING_B 51
|
||||
#define DNA_UI_WING2_R 52
|
||||
#define DNA_UI_WING2_G 53
|
||||
#define DNA_UI_WING2_B 54
|
||||
#define DNA_UI_WING3_R 55
|
||||
#define DNA_UI_WING3_G 56
|
||||
#define DNA_UI_WING3_B 57 // VOREStation snippet end.
|
||||
#define DNA_UI_LENGTH 57 // VOREStation Edit - Needs to match the highest number above.
|
||||
#define DNA_UI_WING_STYLE 51
|
||||
#define DNA_UI_WING_R 52
|
||||
#define DNA_UI_WING_G 53
|
||||
#define DNA_UI_WING_B 54
|
||||
#define DNA_UI_WING2_R 55
|
||||
#define DNA_UI_WING2_G 56
|
||||
#define DNA_UI_WING2_B 57
|
||||
#define DNA_UI_WING3_R 58
|
||||
#define DNA_UI_WING3_G 59
|
||||
#define DNA_UI_WING3_B 60 // VOREStation snippet end.
|
||||
#define DNA_UI_WING_ALPHA 61
|
||||
#define DNA_UI_LENGTH 61 // VOREStation Edit - Needs to match the highest number above.
|
||||
|
||||
#define DNA_SE_LENGTH 90 // Traitgenes (Expanded from 49 to 84, there have been a considerable expansion of genes.
|
||||
// This leaves room for future expansion. This can be arbitrarily raised without worry if genes start to get crowded.
|
||||
|
||||
@@ -228,6 +228,7 @@ GLOBAL_LIST_EMPTY_TYPED(dna_genes_bad, /datum/gene/trait)
|
||||
SetUIValueRange(DNA_UI_TAIL3_R, character.r_tail3, 255, 1)
|
||||
SetUIValueRange(DNA_UI_TAIL3_G, character.g_tail3, 255, 1)
|
||||
SetUIValueRange(DNA_UI_TAIL3_B, character.b_tail3, 255, 1)
|
||||
SetUIValueRange(DNA_UI_TAIL_ALPHA,character.a_tail, 255, 1)
|
||||
|
||||
SetUIValueRange(DNA_UI_WING_R, character.r_wing, 255, 1)
|
||||
SetUIValueRange(DNA_UI_WING_G, character.g_wing, 255, 1)
|
||||
@@ -240,6 +241,7 @@ GLOBAL_LIST_EMPTY_TYPED(dna_genes_bad, /datum/gene/trait)
|
||||
SetUIValueRange(DNA_UI_WING3_R, character.r_wing3, 255, 1)
|
||||
SetUIValueRange(DNA_UI_WING3_G, character.g_wing3, 255, 1)
|
||||
SetUIValueRange(DNA_UI_WING3_B, character.b_wing3, 255, 1)
|
||||
SetUIValueRange(DNA_UI_WING_ALPHA, character.a_wing, 255, 1)
|
||||
|
||||
SetUIValueRange(DNA_UI_EARS_R, character.r_ears, 255, 1)
|
||||
SetUIValueRange(DNA_UI_EARS_G, character.g_ears, 255, 1)
|
||||
@@ -252,6 +254,7 @@ GLOBAL_LIST_EMPTY_TYPED(dna_genes_bad, /datum/gene/trait)
|
||||
SetUIValueRange(DNA_UI_EARS3_R, character.r_ears3, 255, 1)
|
||||
SetUIValueRange(DNA_UI_EARS3_G, character.g_ears3, 255, 1)
|
||||
SetUIValueRange(DNA_UI_EARS3_B, character.b_ears3, 255, 1)
|
||||
SetUIValueRange(DNA_UI_EARS_ALPHA,character.a_ears, 255, 1)
|
||||
|
||||
for(var/channel in 1 to DNA_UI_EARS_SECONDARY_COLOR_CHANNEL_COUNT)
|
||||
var/offset = DNA_UI_EARS_SECONDARY_START + (channel - 1) * 3
|
||||
@@ -262,6 +265,7 @@ GLOBAL_LIST_EMPTY_TYPED(dna_genes_bad, /datum/gene/trait)
|
||||
SetUIValueRange(offset, red, 255, 1)
|
||||
SetUIValueRange(offset + 1, green, 255, 1)
|
||||
SetUIValueRange(offset + 2, blue, 255, 1)
|
||||
SetUIValueRange(DNA_UI_EARS_SECONDARY_ALPHA, character.a_ears2, 255, 1)
|
||||
|
||||
SetUIValueRange(DNA_UI_HAIR_R, character.r_hair, 255, 1)
|
||||
SetUIValueRange(DNA_UI_HAIR_G, character.g_hair, 255, 1)
|
||||
|
||||
@@ -205,6 +205,8 @@
|
||||
H.r_ears3 = dna.GetUIValueRange(DNA_UI_EARS3_R, 255)
|
||||
H.g_ears3 = dna.GetUIValueRange(DNA_UI_EARS3_G, 255)
|
||||
H.b_ears3 = dna.GetUIValueRange(DNA_UI_EARS3_B, 255)
|
||||
H.a_ears = dna.GetUIValueRange(DNA_UI_EARS_ALPHA, 255)
|
||||
H.a_ears2 = dna.GetUIValueRange(DNA_UI_EARS_SECONDARY_ALPHA, 255)
|
||||
|
||||
LAZYINITLIST(H.ear_secondary_colors)
|
||||
H.ear_secondary_colors.len = max(length(H.ear_secondary_colors), DNA_UI_EARS_SECONDARY_COLOR_CHANNEL_COUNT)
|
||||
@@ -231,15 +233,16 @@
|
||||
H.wing_style = wing_styles_list[wing_styles_list[wing]]
|
||||
|
||||
//Wing Color
|
||||
H.r_wing = dna.GetUIValueRange(DNA_UI_WING_R, 255)
|
||||
H.g_wing = dna.GetUIValueRange(DNA_UI_WING_G, 255)
|
||||
H.b_wing = dna.GetUIValueRange(DNA_UI_WING_B, 255)
|
||||
H.r_wing = dna.GetUIValueRange(DNA_UI_WING_R, 255)
|
||||
H.g_wing = dna.GetUIValueRange(DNA_UI_WING_G, 255)
|
||||
H.b_wing = dna.GetUIValueRange(DNA_UI_WING_B, 255)
|
||||
H.r_wing2 = dna.GetUIValueRange(DNA_UI_WING2_R, 255)
|
||||
H.g_wing2 = dna.GetUIValueRange(DNA_UI_WING2_G, 255)
|
||||
H.b_wing2 = dna.GetUIValueRange(DNA_UI_WING2_B, 255)
|
||||
H.r_wing3 = dna.GetUIValueRange(DNA_UI_WING3_R, 255)
|
||||
H.g_wing3 = dna.GetUIValueRange(DNA_UI_WING3_G, 255)
|
||||
H.b_wing3 = dna.GetUIValueRange(DNA_UI_WING3_B, 255)
|
||||
H.a_wing = dna.GetUIValueRange(DNA_UI_WING_ALPHA, 255)
|
||||
|
||||
// Playerscale
|
||||
var/size = dna.GetUIValueRange(DNA_UI_PLAYERSCALE, player_sizes_list.len)
|
||||
@@ -256,6 +259,7 @@
|
||||
H.r_tail3 = dna.GetUIValueRange(DNA_UI_TAIL3_R, 255)
|
||||
H.g_tail3 = dna.GetUIValueRange(DNA_UI_TAIL3_G, 255)
|
||||
H.b_tail3 = dna.GetUIValueRange(DNA_UI_TAIL3_B, 255)
|
||||
H.a_tail = dna.GetUIValueRange(DNA_UI_TAIL_ALPHA, 255)
|
||||
|
||||
// Technically custom_species is not part of the UI, but this place avoids merge problems.
|
||||
H.custom_species = dna.custom_species
|
||||
|
||||
Reference in New Issue
Block a user