cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 03:57:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Adds Secondary (Facial) Hair Colours to Genome

Browse Source
This commit is contained in:
KasparoVy
2017-04-13 23:09:09 -04:00
parent e9156ef71b
commit fa2d5fc3f3
2 changed files with 52 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/dna/dna2.dm
+36 -30
View File
@@ -20,37 +20,43 @@
#define DNA_UI_HAIR_R 1
#define DNA_UI_HAIR_G 2
#define DNA_UI_HAIR_B 3
#define DNA_UI_BEARD_R 4
#define DNA_UI_BEARD_G 5
#define DNA_UI_BEARD_B 6
#define DNA_UI_SKIN_TONE 7
#define DNA_UI_SKIN_R 8
#define DNA_UI_SKIN_G 9
#define DNA_UI_SKIN_B 10
#define DNA_UI_HACC_R 11
#define DNA_UI_HACC_G 12
#define DNA_UI_HACC_B 13
#define DNA_UI_HEAD_MARK_R 14
#define DNA_UI_HEAD_MARK_G 15
#define DNA_UI_HEAD_MARK_B 16
#define DNA_UI_BODY_MARK_R 17
#define DNA_UI_BODY_MARK_G 18
#define DNA_UI_BODY_MARK_B 19
#define DNA_UI_TAIL_MARK_R 20
#define DNA_UI_TAIL_MARK_G 21
#define DNA_UI_TAIL_MARK_B 22
#define DNA_UI_EYES_R 23
#define DNA_UI_EYES_G 24
#define DNA_UI_EYES_B 25
#define DNA_UI_GENDER 26
#define DNA_UI_BEARD_STYLE 27
#define DNA_UI_HAIR_STYLE 28
#define DNA_UI_HAIR2_R 4
#define DNA_UI_HAIR2_G 5
#define DNA_UI_HAIR2_B 6
#define DNA_UI_BEARD_R 7
#define DNA_UI_BEARD_G 8
#define DNA_UI_BEARD_B 9
#define DNA_UI_BEARD2_R 10
#define DNA_UI_BEARD2_G 11
#define DNA_UI_BEARD2_B 12
#define DNA_UI_SKIN_TONE 13
#define DNA_UI_SKIN_R 14
#define DNA_UI_SKIN_G 15
#define DNA_UI_SKIN_B 16
#define DNA_UI_HACC_R 17
#define DNA_UI_HACC_G 18
#define DNA_UI_HACC_B 19
#define DNA_UI_HEAD_MARK_R 20
#define DNA_UI_HEAD_MARK_G 21
#define DNA_UI_HEAD_MARK_B 22
#define DNA_UI_BODY_MARK_R 23
#define DNA_UI_BODY_MARK_G 24
#define DNA_UI_BODY_MARK_B 25
#define DNA_UI_TAIL_MARK_R 26
#define DNA_UI_TAIL_MARK_G 27
#define DNA_UI_TAIL_MARK_B 28
#define DNA_UI_EYES_R 29
#define DNA_UI_EYES_G 30
#define DNA_UI_EYES_B 31
#define DNA_UI_GENDER 32
#define DNA_UI_BEARD_STYLE 33
#define DNA_UI_HAIR_STYLE 34
/*#define DNA_UI_BACC_STYLE 23*/
#define DNA_UI_HACC_STYLE 29
#define DNA_UI_HEAD_MARK_STYLE 30
#define DNA_UI_BODY_MARK_STYLE 31
#define DNA_UI_TAIL_MARK_STYLE 32
#define DNA_UI_LENGTH 32 // Update this when you add something, or you WILL break shit.
#define DNA_UI_HACC_STYLE 35
#define DNA_UI_HEAD_MARK_STYLE 36
#define DNA_UI_BODY_MARK_STYLE 37
#define DNA_UI_TAIL_MARK_STYLE 38
#define DNA_UI_LENGTH 38 // Update this when you add something, or you WILL break shit.
#define DNA_SE_LENGTH 55 // Was STRUCDNASIZE, size 27. 15 new blocks added = 42, plus room to grow.
code/game/dna/dna2_helpers.dm
+16
View File
@@ -190,6 +190,10 @@
head_organ.g_hair = GetUIValueRange(DNA_UI_HAIR_G, 255)
head_organ.b_hair = GetUIValueRange(DNA_UI_HAIR_B, 255)
head_organ.r_hair_sec = GetUIValueRange(DNA_UI_HAIR2_R, 255)
head_organ.g_hair_sec = GetUIValueRange(DNA_UI_HAIR2_G, 255)
head_organ.b_hair_sec = GetUIValueRange(DNA_UI_HAIR2_B, 255)
//Facial Hair
var/beard = GetUIValueRange(DNA_UI_BEARD_STYLE,facial_hair_styles_list.len)
if((beard > 0) && (beard <= facial_hair_styles_list.len))
@@ -199,6 +203,10 @@
head_organ.g_facial = GetUIValueRange(DNA_UI_BEARD_G, 255)
head_organ.b_facial = GetUIValueRange(DNA_UI_BEARD_B, 255)
head_organ.r_facial_sec = GetUIValueRange(DNA_UI_BEARD2_R, 255)
head_organ.g_facial_sec = GetUIValueRange(DNA_UI_BEARD2_G, 255)
head_organ.b_facial_sec = GetUIValueRange(DNA_UI_BEARD2_B, 255)
//Head Accessories
var/headacc = GetUIValueRange(DNA_UI_HACC_STYLE,head_accessory_styles_list.len)
if((headacc > 0) && (headacc <= head_accessory_styles_list.len))
@@ -256,10 +264,18 @@
SetUIValueRange(DNA_UI_HAIR_G, H.g_hair, 255, 1)
SetUIValueRange(DNA_UI_HAIR_B, H.b_hair, 255, 1)
SetUIValueRange(DNA_UI_HAIR2_R, H.r_hair_sec, 255, 1)
SetUIValueRange(DNA_UI_HAIR2_G, H.g_hair_sec, 255, 1)
SetUIValueRange(DNA_UI_HAIR2_B, H.b_hair_sec, 255, 1)
SetUIValueRange(DNA_UI_BEARD_R, H.r_facial, 255, 1)
SetUIValueRange(DNA_UI_BEARD_G, H.g_facial, 255, 1)
SetUIValueRange(DNA_UI_BEARD_B, H.b_facial, 255, 1)
SetUIValueRange(DNA_UI_BEARD2_R, H.r_facial_sec, 255, 1)
SetUIValueRange(DNA_UI_BEARD2_G, H.g_facial_sec, 255, 1)
SetUIValueRange(DNA_UI_BEARD2_B, H.b_facial_sec, 255, 1)
SetUIValueRange(DNA_UI_HACC_R, H.r_headacc, 255, 1)
SetUIValueRange(DNA_UI_HACC_G, H.g_headacc, 255, 1)
SetUIValueRange(DNA_UI_HACC_B, H.b_headacc, 255, 1)