lifning
/
SRB2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rename Colours

This commit is contained in:
Sryder13 2015-07-25 14:07:05 +01:00
parent 14b157b98d
commit 5209787ebd
6 changed files with 60 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/dehacked.c
View File

@ -7310,9 +7310,9 @@ static const char *COLOR_ENUMS[] = {
"GREY", // SKINCOLOR_GREY "GREY", // SKINCOLOR_GREY
"BLACK", // SKINCOLOR_BLACK "BLACK", // SKINCOLOR_BLACK
"CYAN", // SKINCOLOR_CYAN "CYAN", // SKINCOLOR_CYAN
"AQUAMARINE", // SKINCOLOR_AQUAMARINE "AQUA", // SKINCOLOR_AQUA
"TEAL", // SKINCOLOR_TEAL "TEAL", // SKINCOLOR_TEAL
"STEELBLUE", // SKINCOLOR_STEELBLUE "AZURE", // SKINCOLOR_AZURE
"BLUE", // SKINCOLOR_BLUE "BLUE", // SKINCOLOR_BLUE
"PEACH", // SKINCOLOR_PEACH "PEACH", // SKINCOLOR_PEACH
"TAN", // SKINCOLOR_TAN "TAN", // SKINCOLOR_TAN
@ -7322,12 +7322,12 @@ static const char *COLOR_ENUMS[] = {
"PURPLE", // SKINCOLOR_PURPLE "PURPLE", // SKINCOLOR_PURPLE
"MAGENTA", // SKINCOLOR_MAGENTA "MAGENTA", // SKINCOLOR_MAGENTA
"ORANGE", // SKINCOLOR_ORANGE "ORANGE", // SKINCOLOR_ORANGE
"ROSEWOOD", // SKINCOLOR_ROSEWOOD "RUST", // SKINCOLOR_RUST
"BEIGE", // SKINCOLOR_BEIGE "BEIGE", // SKINCOLOR_BEIGE
"BROWN", // SKINCOLOR_BROWN "BROWN", // SKINCOLOR_BROWN
"RED", // SKINCOLOR_RED "RED", // SKINCOLOR_RED
"DARKRED", // SKINCOLOR_DARKRED "CRIMSON", // SKINCOLOR_CRIMSON
"NEONGREEN", // SKINCOLOR_NEONGREEN "EMERALD", // SKINCOLOR_EMERALD
"GREEN", // SKINCOLOR_GREEN "GREEN", // SKINCOLOR_GREEN
"ZIM", // SKINCOLOR_ZIM "ZIM", // SKINCOLOR_ZIM
"PERIDOT", // SKINCOLOR_PERIDOT "PERIDOT", // SKINCOLOR_PERIDOT

10
src/doomdef.h
View File

@ -231,9 +231,9 @@ typedef enum
SKINCOLOR_GREY, SKINCOLOR_GREY,
SKINCOLOR_BLACK, SKINCOLOR_BLACK,
SKINCOLOR_CYAN, SKINCOLOR_CYAN,
SKINCOLOR_AQUAMARINE, SKINCOLOR_AQUA,
SKINCOLOR_TEAL, SKINCOLOR_TEAL,
SKINCOLOR_STEELBLUE, SKINCOLOR_AZURE,
SKINCOLOR_BLUE, SKINCOLOR_BLUE,
SKINCOLOR_PEACH, SKINCOLOR_PEACH,
SKINCOLOR_TAN, SKINCOLOR_TAN,
@ -243,12 +243,12 @@ typedef enum
SKINCOLOR_PURPLE, SKINCOLOR_PURPLE,
SKINCOLOR_MAGENTA, SKINCOLOR_MAGENTA,
SKINCOLOR_ORANGE, SKINCOLOR_ORANGE,
SKINCOLOR_ROSEWOOD, SKINCOLOR_RUST,
SKINCOLOR_BEIGE, SKINCOLOR_BEIGE,
SKINCOLOR_BROWN, SKINCOLOR_BROWN,
SKINCOLOR_RED, SKINCOLOR_RED,
SKINCOLOR_DARKRED, SKINCOLOR_CRIMSON,
SKINCOLOR_NEONGREEN, SKINCOLOR_EMERALD,
SKINCOLOR_GREEN, SKINCOLOR_GREEN,
SKINCOLOR_ZIM, SKINCOLOR_ZIM,
SKINCOLOR_PERIDOT, SKINCOLOR_PERIDOT,

2
src/g_game.c
View File

@ -123,7 +123,7 @@ boolean useNightsSS = false;
UINT8 skincolor_redteam = SKINCOLOR_RED; UINT8 skincolor_redteam = SKINCOLOR_RED;
UINT8 skincolor_blueteam = SKINCOLOR_BLUE; UINT8 skincolor_blueteam = SKINCOLOR_BLUE;
UINT8 skincolor_redring = SKINCOLOR_RED; UINT8 skincolor_redring = SKINCOLOR_RED;
UINT8 skincolor_bluering = SKINCOLOR_STEELBLUE; UINT8 skincolor_bluering = SKINCOLOR_AZURE;
tic_t countdowntimer = 0; tic_t countdowntimer = 0;
boolean countdowntimeup = false; boolean countdowntimeup = false;

52
src/m_cond.c
View File

@ -49,7 +49,7 @@ emblem_t emblemlocations[MAXEMBLEMS] =
"Streams come to an end\n" "Streams come to an end\n"
"where they can no longer fall.\n" "where they can no longer fall.\n"
"But if you went up...", 0}, "But if you went up...", 0},
{0, -336, 2064, 195, 1, 'E', SKINCOLOR_NEONGREEN, 0, {0, -336, 2064, 195, 1, 'E', SKINCOLOR_EMERALD, 0,
"This one's in plain sight.\n" "This one's in plain sight.\n"
"Why haven't you claimed it?\n" "Why haven't you claimed it?\n"
"Surely you saw it.", 0}, "Surely you saw it.", 0},
@ -77,7 +77,7 @@ emblem_t emblemlocations[MAXEMBLEMS] =
"Near the level's end,\n" "Near the level's end,\n"
"another bridge spans a lake.\n" "another bridge spans a lake.\n"
"What could be under...?", 0}, "What could be under...?", 0},
{0, -170, 491, 3821, 2, 'E', SKINCOLOR_NEONGREEN, 0, {0, -170, 491, 3821, 2, 'E', SKINCOLOR_EMERALD, 0,
"An ivied tunnel\n" "An ivied tunnel\n"
"has a corner that's sunlit.\n" "has a corner that's sunlit.\n"
"Go reach for the sky!", 0}, "Go reach for the sky!", 0},
@ -110,7 +110,7 @@ emblem_t emblemlocations[MAXEMBLEMS] =
"Spinning through small gaps\n" "Spinning through small gaps\n"
"can slip you into a cave.\n" "can slip you into a cave.\n"
"In that cave's first stretch...", 0}, "In that cave's first stretch...", 0},
{0, 2848, -9088, 488, 4, 'E', SKINCOLOR_NEONGREEN, 0, {0, 2848, -9088, 488, 4, 'E', SKINCOLOR_EMERALD, 0,
"The slime lake is deep,\n" "The slime lake is deep,\n"
"but reaching the floor takes height.\n" "but reaching the floor takes height.\n"
"Scream \"Geronimo!\"...", 0}, "Scream \"Geronimo!\"...", 0},
@ -138,7 +138,7 @@ emblem_t emblemlocations[MAXEMBLEMS] =
"There is a hallway\n" "There is a hallway\n"
"that a button floods with slime.\n" "that a button floods with slime.\n"
"Go through it again!", 0}, "Go through it again!", 0},
{0, -2468,-12128, 1312, 5, 'E', SKINCOLOR_NEONGREEN, 0, {0, -2468,-12128, 1312, 5, 'E', SKINCOLOR_EMERALD, 0,
"Jumping on turtles\n" "Jumping on turtles\n"
"will send you springing skyward.\n" "will send you springing skyward.\n"
"Now, do that six times...", 0}, "Now, do that six times...", 0},
@ -171,7 +171,7 @@ emblem_t emblemlocations[MAXEMBLEMS] =
"A caved-in hallway?\n" "A caved-in hallway?\n"
"The floor falls; the path goes down.\n" "The floor falls; the path goes down.\n"
"But those rocks looked weak...", 0}, "But those rocks looked weak...", 0},
{0, 12576, 16096, -992, 7, 'E', SKINCOLOR_NEONGREEN, 0, {0, 12576, 16096, -992, 7, 'E', SKINCOLOR_EMERALD, 0,
"The end is quite dry.\n" "The end is quite dry.\n"
"Some rocks dam the water in.\n" "Some rocks dam the water in.\n"
"Knuckles can fix that...", 0}, "Knuckles can fix that...", 0},
@ -199,7 +199,7 @@ emblem_t emblemlocations[MAXEMBLEMS] =
"In the current maze\n" "In the current maze\n"
"hides a dark room of columns.\n" "hides a dark room of columns.\n"
"Find it, then look up.", 0}, "Find it, then look up.", 0},
{0, 3104, 16192, 2408, 8, 'E', SKINCOLOR_NEONGREEN, 0, {0, 3104, 16192, 2408, 8, 'E', SKINCOLOR_EMERALD, 0,
"That same dragon's eye\n" "That same dragon's eye\n"
"hides another secret room.\n" "hides another secret room.\n"
"There, solve its riddle.", 0}, "There, solve its riddle.", 0},
@ -232,7 +232,7 @@ emblem_t emblemlocations[MAXEMBLEMS] =
"The final approach!\n" "The final approach!\n"
"A tower holds the emblem\n" "A tower holds the emblem\n"
"near a ring arrow.", 0}, "near a ring arrow.", 0},
{0, 9472, -5890, 710, 10, 'E', SKINCOLOR_NEONGREEN, 0, {0, 9472, -5890, 710, 10, 'E', SKINCOLOR_EMERALD, 0,
"The right starting path\n" "The right starting path\n"
"hides this near a canopy,\n" "hides this near a canopy,\n"
"high, where two trees meet.", 0}, "high, where two trees meet.", 0},
@ -260,7 +260,7 @@ emblem_t emblemlocations[MAXEMBLEMS] =
"Some of these bookshelves\n" "Some of these bookshelves\n"
"are not flush against the walls.\n" "are not flush against the walls.\n"
"Wonder why that is?", 0}, "Wonder why that is?", 0},
{0, 12708,-13536, 4768, 11, 'E', SKINCOLOR_NEONGREEN, 0, {0, 12708,-13536, 4768, 11, 'E', SKINCOLOR_EMERALD, 0,
"The ending's towers\n" "The ending's towers\n"
"are hiding a small alcove.\n" "are hiding a small alcove.\n"
"Check around outside.", 0}, "Check around outside.", 0},
@ -293,7 +293,7 @@ emblem_t emblemlocations[MAXEMBLEMS] =
"Not far from the start,\n" "Not far from the start,\n"
"if you climb toward the sky,\n" "if you climb toward the sky,\n"
"the cliffs hide something.", 0}, "the cliffs hide something.", 0},
{0, 12504, 6848, 3424, 13, 'E', SKINCOLOR_NEONGREEN, 0, {0, 12504, 6848, 3424, 13, 'E', SKINCOLOR_EMERALD, 0,
"Right by the exit,\n" "Right by the exit,\n"
"an emblem lies on a cliff.\n" "an emblem lies on a cliff.\n"
"Ride ropes to reach it.", 0}, "Ride ropes to reach it.", 0},
@ -321,7 +321,7 @@ emblem_t emblemlocations[MAXEMBLEMS] =
"Where once a bridge stood,\n" "Where once a bridge stood,\n"
"now magma falls from above.\n" "now magma falls from above.\n"
"The bridge dropped something...", 0}, "The bridge dropped something...", 0},
{0, 8287,-11043, 1328, 16, 'E', SKINCOLOR_NEONGREEN, 0, {0, 8287,-11043, 1328, 16, 'E', SKINCOLOR_EMERALD, 0,
"A lake of magma\n" "A lake of magma\n"
"ebbs and flows unendingly.\n" "ebbs and flows unendingly.\n"
"Wait for its nadir.", 0}, "Wait for its nadir.", 0},
@ -349,7 +349,7 @@ emblem_t emblemlocations[MAXEMBLEMS] =
"Don't jump too high here!\n" "Don't jump too high here!\n"
"No conveyor will catch you;\n" "No conveyor will catch you;\n"
"you'd fall to your death.", 0}, "you'd fall to your death.", 0},
{0, -6432, -6192, 584, 22, 'E', SKINCOLOR_NEONGREEN, 0, {0, -6432, -6192, 584, 22, 'E', SKINCOLOR_EMERALD, 0,
"Conveyors! Magma!\n" "Conveyors! Magma!\n"
"What an intense room this is!\n" "What an intense room this is!\n"
"But, what brought you here?", 0}, "But, what brought you here?", 0},
@ -377,7 +377,7 @@ emblem_t emblemlocations[MAXEMBLEMS] =
"Gears with missing teeth\n" "Gears with missing teeth\n"
"can hide a clever secret!\n" "can hide a clever secret!\n"
"Think Green Hill Zone boss.", 0}, "Think Green Hill Zone boss.", 0},
{0, 1920, 20608, 1064, 23, 'E', SKINCOLOR_NEONGREEN, 0, {0, 1920, 20608, 1064, 23, 'E', SKINCOLOR_EMERALD, 0,
"Just before you reach\n" "Just before you reach\n"
"the defective cargo bay,\n" "the defective cargo bay,\n"
"fly under a bridge.", 0}, "fly under a bridge.", 0},
@ -398,7 +398,7 @@ emblem_t emblemlocations[MAXEMBLEMS] =
"[PH] In the ceiling of the conveyor belt + laser hallway.", 0}, "[PH] In the ceiling of the conveyor belt + laser hallway.", 0},
{0,-13728,-13728, 1552, 24, 'D', SKINCOLOR_ORANGE, 0, {0,-13728,-13728, 1552, 24, 'D', SKINCOLOR_ORANGE, 0,
"[PH] On top of the platform with rows of spikes in reverse gravity.", 0}, "[PH] On top of the platform with rows of spikes in reverse gravity.", 0},
{0,-14944, 768, 1232, 24, 'E', SKINCOLOR_NEONGREEN, 0, {0,-14944, 768, 1232, 24, 'E', SKINCOLOR_EMERALD, 0,
"Follow the leader.", 0}, "Follow the leader.", 0},
*/ */
@ -430,7 +430,7 @@ emblem_t emblemlocations[MAXEMBLEMS] =
"The underground room\n" "The underground room\n"
"with platforms that fall and rise\n" "with platforms that fall and rise\n"
"only LOOKS empty...", 0}, "only LOOKS empty...", 0},
{0 , 4960, -6112, 1312, 30, 'E', SKINCOLOR_NEONGREEN, 0, {0 , 4960, -6112, 1312, 30, 'E', SKINCOLOR_EMERALD, 0,
"This one's straightforward.\n" "This one's straightforward.\n"
"What comes to mind when I say:\n" "What comes to mind when I say:\n"
"\"WELCOME TO WARP ZONE!\"?", 0}, "\"WELCOME TO WARP ZONE!\"?", 0},
@ -458,7 +458,7 @@ emblem_t emblemlocations[MAXEMBLEMS] =
"Much like the last one,\n" "Much like the last one,\n"
"you need to find some switches.\n" "you need to find some switches.\n"
"Only two, this time.", 0}, "Only two, this time.", 0},
{0, 13184, 18880, 6672, 40, 'E', SKINCOLOR_NEONGREEN, 0, {0, 13184, 18880, 6672, 40, 'E', SKINCOLOR_EMERALD, 0,
"The inner sanctum!\n" "The inner sanctum!\n"
"Teleport to its switches;\n" "Teleport to its switches;\n"
"then, check near the goal.", 0}, "then, check near the goal.", 0},
@ -486,7 +486,7 @@ emblem_t emblemlocations[MAXEMBLEMS] =
"A room of currents;\n" "A room of currents;\n"
"most of them are marked by spikes.\n" "most of them are marked by spikes.\n"
"This one? A corner.", 0}, "This one? A corner.", 0},
{0, -4128, 21344, 1120, 41, 'E', SKINCOLOR_NEONGREEN, 0, {0, -4128, 21344, 1120, 41, 'E', SKINCOLOR_EMERALD, 0,
"The only way to hit\n" "The only way to hit\n"
"all those gems at once is with\n" "all those gems at once is with\n"
"a radial blast.", 0}, "a radial blast.", 0},
@ -498,63 +498,63 @@ emblem_t emblemlocations[MAXEMBLEMS] =
// FLORAL FIELD // FLORAL FIELD
// --- // ---
{0, 5394, -996, 160, 50, 'N', SKINCOLOR_ROSEWOOD, 0, "", 0}, {0, 5394, -996, 160, 50, 'N', SKINCOLOR_RUST, 0, "", 0},
{ET_NGRADE, 0,0,0, 50, 'Q', SKINCOLOR_TEAL, GRADE_A, "", 0}, {ET_NGRADE, 0,0,0, 50, 'Q', SKINCOLOR_TEAL, GRADE_A, "", 0},
{ET_NTIME, 0,0,0, 50, 'T', SKINCOLOR_GREY, 40*TICRATE, "", 0}, {ET_NTIME, 0,0,0, 50, 'T', SKINCOLOR_GREY, 40*TICRATE, "", 0},
// TOXIC PLATEAU // TOXIC PLATEAU
// --- // ---
{0, 780, -1664, 32, 51, 'N', SKINCOLOR_ROSEWOOD, 0, "", 0}, {0, 780, -1664, 32, 51, 'N', SKINCOLOR_RUST, 0, "", 0},
{ET_NGRADE, 0,0,0, 51, 'Q', SKINCOLOR_TEAL, GRADE_A, "", 0}, {ET_NGRADE, 0,0,0, 51, 'Q', SKINCOLOR_TEAL, GRADE_A, "", 0},
{ET_NTIME, 0,0,0, 51, 'T', SKINCOLOR_GREY, 50*TICRATE, "", 0}, {ET_NTIME, 0,0,0, 51, 'T', SKINCOLOR_GREY, 50*TICRATE, "", 0},
// FLOODED COVE // FLOODED COVE
// --- // ---
{0, 1824, -1888, 2448, 52, 'N', SKINCOLOR_ROSEWOOD, 0, "", 0}, {0, 1824, -1888, 2448, 52, 'N', SKINCOLOR_RUST, 0, "", 0},
{ET_NGRADE, 0,0,0, 52, 'Q', SKINCOLOR_TEAL, GRADE_A, "", 0}, {ET_NGRADE, 0,0,0, 52, 'Q', SKINCOLOR_TEAL, GRADE_A, "", 0},
{ET_NTIME, 0,0,0, 52, 'T', SKINCOLOR_GREY, 90*TICRATE, "", 0}, {ET_NTIME, 0,0,0, 52, 'T', SKINCOLOR_GREY, 90*TICRATE, "", 0},
// CAVERN FORTRESS // CAVERN FORTRESS
// --- // ---
{0, -3089, -431, 1328, 53, 'N', SKINCOLOR_ROSEWOOD, 0, "", 0}, {0, -3089, -431, 1328, 53, 'N', SKINCOLOR_RUST, 0, "", 0},
{ET_NGRADE, 0,0,0, 53, 'Q', SKINCOLOR_TEAL, GRADE_A, "", 0}, {ET_NGRADE, 0,0,0, 53, 'Q', SKINCOLOR_TEAL, GRADE_A, "", 0},
{ET_NTIME, 0,0,0, 53, 'T', SKINCOLOR_GREY, 75*TICRATE, "", 0}, {ET_NTIME, 0,0,0, 53, 'T', SKINCOLOR_GREY, 75*TICRATE, "", 0},
// DUSTY WASTELAND // DUSTY WASTELAND
// --- // ---
{0, 957, 924, 2956, 54, 'N', SKINCOLOR_ROSEWOOD, 0, "", 0}, {0, 957, 924, 2956, 54, 'N', SKINCOLOR_RUST, 0, "", 0},
{ET_NGRADE, 0,0,0, 54, 'Q', SKINCOLOR_TEAL, GRADE_A, "", 0}, {ET_NGRADE, 0,0,0, 54, 'Q', SKINCOLOR_TEAL, GRADE_A, "", 0},
{ET_NTIME, 0,0,0, 54, 'T', SKINCOLOR_GREY, 65*TICRATE, "", 0}, {ET_NTIME, 0,0,0, 54, 'T', SKINCOLOR_GREY, 65*TICRATE, "", 0},
// MAGMA CAVES // MAGMA CAVES
// --- // ---
{0, -2752, 3104, 1800, 55, 'N', SKINCOLOR_ROSEWOOD, 0, "", 0}, {0, -2752, 3104, 1800, 55, 'N', SKINCOLOR_RUST, 0, "", 0},
{ET_NGRADE, 0,0,0, 55, 'Q', SKINCOLOR_TEAL, GRADE_A, "", 0}, {ET_NGRADE, 0,0,0, 55, 'Q', SKINCOLOR_TEAL, GRADE_A, "", 0},
{ET_NTIME, 0,0,0, 55, 'T', SKINCOLOR_GREY, 80*TICRATE, "", 0}, {ET_NTIME, 0,0,0, 55, 'T', SKINCOLOR_GREY, 80*TICRATE, "", 0},
// EGG SATELLITE // EGG SATELLITE
// --- // ---
{0, 5334, -609, 3426, 56, 'N', SKINCOLOR_ROSEWOOD, 0, "", 0}, {0, 5334, -609, 3426, 56, 'N', SKINCOLOR_RUST, 0, "", 0},
{ET_NGRADE, 0,0,0, 56, 'Q', SKINCOLOR_TEAL, GRADE_A, "", 0}, {ET_NGRADE, 0,0,0, 56, 'Q', SKINCOLOR_TEAL, GRADE_A, "", 0},
{ET_NTIME, 0,0,0, 56, 'T', SKINCOLOR_GREY, 120*TICRATE, "", 0}, {ET_NTIME, 0,0,0, 56, 'T', SKINCOLOR_GREY, 120*TICRATE, "", 0},
// BLACK HOLE // BLACK HOLE
// --- // ---
{0, 2108, 3776, 32, 57, 'N', SKINCOLOR_ROSEWOOD, 0, "", 0}, {0, 2108, 3776, 32, 57, 'N', SKINCOLOR_RUST, 0, "", 0},
{ET_NGRADE, 0,0,0, 57, 'Q', SKINCOLOR_TEAL, GRADE_A, "", 0}, {ET_NGRADE, 0,0,0, 57, 'Q', SKINCOLOR_TEAL, GRADE_A, "", 0},
{ET_NTIME, 0,0,0, 57, 'T', SKINCOLOR_GREY, 150*TICRATE, "", 0}, {ET_NTIME, 0,0,0, 57, 'T', SKINCOLOR_GREY, 150*TICRATE, "", 0},
// SPRING HILL // SPRING HILL
// --- // ---
{0, -1840, -1024, 1644, 58, 'N', SKINCOLOR_ROSEWOOD, 0, "", 0}, {0, -1840, -1024, 1644, 58, 'N', SKINCOLOR_RUST, 0, "", 0},
{ET_NGRADE, 0,0,0, 58, 'Q', SKINCOLOR_TEAL, GRADE_A, "", 0}, {ET_NGRADE, 0,0,0, 58, 'Q', SKINCOLOR_TEAL, GRADE_A, "", 0},
{ET_NTIME, 0,0,0, 58, 'T', SKINCOLOR_GREY, 60*TICRATE, "", 0}, {ET_NTIME, 0,0,0, 58, 'T', SKINCOLOR_GREY, 60*TICRATE, "", 0},
}; };
@ -565,7 +565,7 @@ extraemblem_t extraemblems[MAXEXTRAEMBLEMS] =
{"Game Complete", "Complete 1P Mode", 10, 'X', SKINCOLOR_BLUE, 0}, {"Game Complete", "Complete 1P Mode", 10, 'X', SKINCOLOR_BLUE, 0},
{"All Emeralds", "Complete 1P Mode with all Emeralds", 11, 'V', SKINCOLOR_GREY, 0}, {"All Emeralds", "Complete 1P Mode with all Emeralds", 11, 'V', SKINCOLOR_GREY, 0},
{"Perfect Bonus", "Perfect Bonus on a non-secret stage", 30, 'P', SKINCOLOR_GOLD, 0}, {"Perfect Bonus", "Perfect Bonus on a non-secret stage", 30, 'P', SKINCOLOR_GOLD, 0},
{"SRB1 Remake", "Complete SRB1 Remake", 21, 'O', SKINCOLOR_ROSEWOOD, 0}, {"SRB1 Remake", "Complete SRB1 Remake", 21, 'O', SKINCOLOR_RUST, 0},
{"NiGHTS Mastery", "Show your mastery of NiGHTS!", 22, 'W', SKINCOLOR_TEAL, 0}, {"NiGHTS Mastery", "Show your mastery of NiGHTS!", 22, 'W', SKINCOLOR_TEAL, 0},
}; };

40
src/r_draw.c
View File

@ -137,9 +137,9 @@ const char *Color_Names[MAXSKINCOLORS] =
"Grey", // SKINCOLOR_GREY "Grey", // SKINCOLOR_GREY
"Black", // SKINCOLOR_BLACK "Black", // SKINCOLOR_BLACK
"Cyan", // SKINCOLOR_CYAN "Cyan", // SKINCOLOR_CYAN
"Aquamarine",// SKINCOLOR_AQUAMARINE "Aqua", // SKINCOLOR_AQUAMARINE
"Teal", // SKINCOLOR_TEAL "Teal", // SKINCOLOR_TEAL
"Steel_Blue",// SKINCOLOR_STEELBLUE "Azure", // SKINCOLOR_AZURE
"Blue", // SKINCOLOR_BLUE "Blue", // SKINCOLOR_BLUE
"Peach", // SKINCOLOR_PEACH "Peach", // SKINCOLOR_PEACH
"Tan", // SKINCOLOR_TAN "Tan", // SKINCOLOR_TAN
@ -149,12 +149,12 @@ const char *Color_Names[MAXSKINCOLORS] =
"Purple", // SKINCOLOR_PURPLE "Purple", // SKINCOLOR_PURPLE
"Magenta", // SKINCOLOR_MAGENTA "Magenta", // SKINCOLOR_MAGENTA
"Orange", // SKINCOLOR_ORANGE "Orange", // SKINCOLOR_ORANGE
"Rosewood", // SKINCOLOR_ROSEWOOD "Rust", // SKINCOLOR_RUST
"Beige", // SKINCOLOR_BEIGE "Beige", // SKINCOLOR_BEIGE
"Brown", // SKINCOLOR_BROWN "Brown", // SKINCOLOR_BROWN
"Red", // SKINCOLOR_RED "Red", // SKINCOLOR_RED
"Dark_Red", // SKINCOLOR_DARKRED "Crimson", // SKINCOLOR_CRIMSON
"Neon_Green",// SKINCOLOR_NEONGREEN "Emerald", // SKINCOLOR_EMERALD
"Green", // SKINCOLOR_GREEN "Green", // SKINCOLOR_GREEN
"Zim", // SKINCOLOR_ZIM "Zim", // SKINCOLOR_ZIM
"Peridot", // SKINCOLOR_PERIDOT "Peridot", // SKINCOLOR_PERIDOT
@ -170,9 +170,9 @@ const UINT8 Color_Opposite[MAXSKINCOLORS*2] =
SKINCOLOR_SILVER,12,// SKINCOLOR_GREY SKINCOLOR_SILVER,12,// SKINCOLOR_GREY
SKINCOLOR_WHITE,8, // SKINCOLOR_BLACK SKINCOLOR_WHITE,8, // SKINCOLOR_BLACK
SKINCOLOR_NONE,8, // SKINCOLOR_CYAN SKINCOLOR_NONE,8, // SKINCOLOR_CYAN
SKINCOLOR_NONE,8, // SKINCOLOR_AQUAMARINE SKINCOLOR_NONE,8, // SKINCOLOR_AQUA
SKINCOLOR_NONE,8, // SKINCOLOR_TEAL SKINCOLOR_NONE,8, // SKINCOLOR_TEAL
SKINCOLOR_NONE,8, // SKINCOLOR_STEELBLUE SKINCOLOR_NONE,8, // SKINCOLOR_AZURE
SKINCOLOR_ORANGE,9, // SKINCOLOR_BLUE SKINCOLOR_ORANGE,9, // SKINCOLOR_BLUE
SKINCOLOR_NONE,8, // SKINCOLOR_PEACH SKINCOLOR_NONE,8, // SKINCOLOR_PEACH
SKINCOLOR_NONE,8, // SKINCOLOR_TAN SKINCOLOR_NONE,8, // SKINCOLOR_TAN
@ -182,12 +182,12 @@ const UINT8 Color_Opposite[MAXSKINCOLORS*2] =
SKINCOLOR_NONE,8, // SKINCOLOR_PURPLE SKINCOLOR_NONE,8, // SKINCOLOR_PURPLE
SKINCOLOR_NONE,8, // SKINCOLOR_MAGENTA SKINCOLOR_NONE,8, // SKINCOLOR_MAGENTA
SKINCOLOR_BLUE,12, // SKINCOLOR_ORANGE SKINCOLOR_BLUE,12, // SKINCOLOR_ORANGE
SKINCOLOR_NONE,8, // SKINCOLOR_ROSEWOOD SKINCOLOR_NONE,8, // SKINCOLOR_RUST
SKINCOLOR_NONE,8, // SKINCOLOR_BEIGE SKINCOLOR_NONE,8, // SKINCOLOR_BEIGE
SKINCOLOR_NONE,8, // SKINCOLOR_BROWN SKINCOLOR_NONE,8, // SKINCOLOR_BROWN
SKINCOLOR_GREEN,5, // SKINCOLOR_RED SKINCOLOR_GREEN,5, // SKINCOLOR_RED
SKINCOLOR_NONE,8, // SKINCOLOR_DARKRED SKINCOLOR_NONE,8, // SKINCOLOR_CRIMSON
SKINCOLOR_NONE,8, // SKINCOLOR_NEONGREEN SKINCOLOR_NONE,8, // SKINCOLOR_EMERALD
SKINCOLOR_RED,11, // SKINCOLOR_GREEN SKINCOLOR_RED,11, // SKINCOLOR_GREEN
SKINCOLOR_MAGENTA,3, // SKINCOLOR_ZIM SKINCOLOR_MAGENTA,3, // SKINCOLOR_ZIM
SKINCOLOR_NONE,8, // SKINCOLOR_PERIDOT SKINCOLOR_NONE,8, // SKINCOLOR_PERIDOT
@ -243,9 +243,9 @@ static void R_GenerateTranslationColormap(UINT8 *dest_colormap, INT32 skinnum, U
0x08, // SKINCOLOR_GREY 0x08, // SKINCOLOR_GREY
0x18, // SKINCOLOR_BLACK 0x18, // SKINCOLOR_BLACK
0x70, // SKINCOLOR_CYAN 0x70, // SKINCOLOR_CYAN
0xf8, // SKINCOLOR_AQUAMARINE 0xf8, // SKINCOLOR_AQUA
0x7c, // SKINCOLOR_TEAL 0x7c, // SKINCOLOR_TEAL
0x9a, // SKINCOLOR_STEELBLUE 0x9a, // SKINCOLOR_AZURE
0x82, // SKINCOLOR_BLUE 0x82, // SKINCOLOR_BLUE
0xc8, // SKINCOLOR_PEACH 0xc8, // SKINCOLOR_PEACH
0x54, // SKINCOLOR_TAN 0x54, // SKINCOLOR_TAN
@ -255,12 +255,12 @@ static void R_GenerateTranslationColormap(UINT8 *dest_colormap, INT32 skinnum, U
0x90, // SKINCOLOR_PURPLE 0x90, // SKINCOLOR_PURPLE
0xa3, // SKINCOLOR_MAGENTA 0xa3, // SKINCOLOR_MAGENTA
0x31, // SKINCOLOR_ORANGE 0x31, // SKINCOLOR_ORANGE
0x3a, // SKINCOLOR_ROSEWOOD 0x3a, // SKINCOLOR_RUST
0xe0, // SKINCOLOR_BEIGE 0xe0, // SKINCOLOR_BEIGE
0xd0, // SKINCOLOR_BROWN 0xd0, // SKINCOLOR_BROWN
0x21, // SKINCOLOR_RED 0x21, // SKINCOLOR_RED
0x28, // SKINCOLOR_DARKRED 0x28, // SKINCOLOR_CRIMSON
0xf0, // SKINCOLOR_NEONGREEN 0xf0, // SKINCOLOR_EMERALD
0x60, // SKINCOLOR_GREEN 0x60, // SKINCOLOR_GREEN
0x58, // SKINCOLOR_ZIM 0x58, // SKINCOLOR_ZIM
0xac, // SKINCOLOR_PERIDOT 0xac, // SKINCOLOR_PERIDOT
@ -330,7 +330,7 @@ static void R_GenerateTranslationColormap(UINT8 *dest_colormap, INT32 skinnum, U
dest_colormap[starttranscolor + i] = (UINT8)(skinbasecolors[color - 1] + (i >> 1)); dest_colormap[starttranscolor + i] = (UINT8)(skinbasecolors[color - 1] + (i >> 1));
break; break;
case SKINCOLOR_AQUAMARINE: case SKINCOLOR_AQUA:
// 10 colors // 10 colors
for (i = 0; i < SKIN_RAMP_LENGTH; i++) for (i = 0; i < SKIN_RAMP_LENGTH; i++)
{ {
@ -354,7 +354,7 @@ static void R_GenerateTranslationColormap(UINT8 *dest_colormap, INT32 skinnum, U
} }
break; break;
case SKINCOLOR_STEELBLUE: case SKINCOLOR_AZURE:
// 8 colors // 8 colors
for (i = 0; i < SKIN_RAMP_LENGTH; i++) for (i = 0; i < SKIN_RAMP_LENGTH; i++)
{ {
@ -458,7 +458,7 @@ static void R_GenerateTranslationColormap(UINT8 *dest_colormap, INT32 skinnum, U
} }
break; break;
case SKINCOLOR_ROSEWOOD: case SKINCOLOR_RUST:
// 9 colors // 9 colors
for (i = 0; i < SKIN_RAMP_LENGTH; i++) for (i = 0; i < SKIN_RAMP_LENGTH; i++)
{ {
@ -496,7 +496,7 @@ static void R_GenerateTranslationColormap(UINT8 *dest_colormap, INT32 skinnum, U
} }
break; break;
case SKINCOLOR_DARKRED: case SKINCOLOR_CRIMSON:
// 9 colors // 9 colors
for (i = 0; i < SKIN_RAMP_LENGTH; i++) for (i = 0; i < SKIN_RAMP_LENGTH; i++)
{ {
@ -509,7 +509,7 @@ static void R_GenerateTranslationColormap(UINT8 *dest_colormap, INT32 skinnum, U
} }
break; break;
case SKINCOLOR_NEONGREEN: case SKINCOLOR_EMERALD:
// 8 colors // 8 colors
for (i = 0; i < SKIN_RAMP_LENGTH; i++) for (i = 0; i < SKIN_RAMP_LENGTH; i++)
{ {

6
src/st_stuff.c
View File

@ -888,7 +888,7 @@ static void ST_drawFirstPersonHUD(void)
// [21:42] <+Rob> Beige - Lavender - Steel Blue - Peach - Orange - Purple - Silver - Yellow - Pink - Red - Blue - Green - Cyan - Gold // [21:42] <+Rob> Beige - Lavender - Steel Blue - Peach - Orange - Purple - Silver - Yellow - Pink - Red - Blue - Green - Cyan - Gold
static skincolors_t linkColor[14] = static skincolors_t linkColor[14] =
{SKINCOLOR_BEIGE, SKINCOLOR_LAVENDER, SKINCOLOR_STEELBLUE, SKINCOLOR_PEACH, SKINCOLOR_ORANGE, {SKINCOLOR_BEIGE, SKINCOLOR_LAVENDER, SKINCOLOR_AZURE, SKINCOLOR_PEACH, SKINCOLOR_ORANGE,
SKINCOLOR_MAGENTA, SKINCOLOR_SILVER, SKINCOLOR_SUPER4, SKINCOLOR_PINK, SKINCOLOR_RED, SKINCOLOR_MAGENTA, SKINCOLOR_SILVER, SKINCOLOR_SUPER4, SKINCOLOR_PINK, SKINCOLOR_RED,
SKINCOLOR_BLUE, SKINCOLOR_GREEN, SKINCOLOR_CYAN, SKINCOLOR_GOLD}; SKINCOLOR_BLUE, SKINCOLOR_GREEN, SKINCOLOR_CYAN, SKINCOLOR_GOLD};
@ -938,7 +938,7 @@ static void ST_drawNightsRecords(void)
V_DrawString(BASEVIDWIDTH/2 - 48, STRINGY(148), aflag, "BONUS:"); V_DrawString(BASEVIDWIDTH/2 - 48, STRINGY(148), aflag, "BONUS:");
V_DrawRightAlignedString(BASEVIDWIDTH/2 + 48, STRINGY(140), V_ORANGEMAP|aflag, va("%d", stplyr->finishedrings)); V_DrawRightAlignedString(BASEVIDWIDTH/2 + 48, STRINGY(140), V_ORANGEMAP|aflag, va("%d", stplyr->finishedrings));
V_DrawRightAlignedString(BASEVIDWIDTH/2 + 48, STRINGY(148), V_ORANGEMAP|aflag, va("%d", stplyr->finishedrings * 50)); V_DrawRightAlignedString(BASEVIDWIDTH/2 + 48, STRINGY(148), V_ORANGEMAP|aflag, va("%d", stplyr->finishedrings * 50));
ST_DrawNightsOverlayNum(BASEVIDWIDTH/2 + 48, STRINGY(160), aflag, stplyr->lastmarescore, nightsnum, SKINCOLOR_STEELBLUE); ST_DrawNightsOverlayNum(BASEVIDWIDTH/2 + 48, STRINGY(160), aflag, stplyr->lastmarescore, nightsnum, SKINCOLOR_AZURE);
// If new record, say so! // If new record, say so!
if (!(netgame || multiplayer) && G_GetBestNightsScore(gamemap, stplyr->lastmare + 1) <= stplyr->lastmarescore) if (!(netgame || multiplayer) && G_GetBestNightsScore(gamemap, stplyr->lastmare + 1) <= stplyr->lastmarescore)
@ -1220,7 +1220,7 @@ static void ST_drawNiGHTSHUD(void)
#endif #endif
) )
{ {
ST_DrawNightsOverlayNum(304, STRINGY(16), SPLITFLAGS(V_SNAPTOTOP)|V_SNAPTORIGHT, stplyr->marescore, nightsnum, SKINCOLOR_STEELBLUE); ST_DrawNightsOverlayNum(304, STRINGY(16), SPLITFLAGS(V_SNAPTOTOP)|V_SNAPTORIGHT, stplyr->marescore, nightsnum, SKINCOLOR_AZURE);
} }
if (!stplyr->exiting if (!stplyr->exiting