diff --git a/src/dehacked.c b/src/dehacked.c
index 11aed24d043415d019bb048bd0be0e2d29c11a3a..d346de5fb76d66c66ee171da3c3919efe80b0d93 100644
--- a/src/dehacked.c
+++ b/src/dehacked.c
@@ -8199,24 +8199,61 @@ static const char *COLOR_ENUMS[] = { // Rejigged for Kart.
"POMEGRANATE", // 62 // SKINCOLOR_POMEGRANATE
"LILAC", // 63 // SKINCOLOR_LILAC
- // Super special awesome Super flashing colors!
- "SUPER1", // SKINCOLOR_SUPER1
- "SUPER2", // SKINCOLOR_SUPER2,
- "SUPER3", // SKINCOLOR_SUPER3,
- "SUPER4", // SKINCOLOR_SUPER4,
- "SUPER5", // SKINCOLOR_SUPER5,
- // Super Tails
- "TSUPER1", // SKINCOLOR_TSUPER1,
- "TSUPER2", // SKINCOLOR_TSUPER2,
- "TSUPER3", // SKINCOLOR_TSUPER3,
- "TSUPER4", // SKINCOLOR_TSUPER4,
- "TSUPER5", // SKINCOLOR_TSUPER5,
- // Super Knuckles
- "KSUPER1", // SKINCOLOR_KSUPER1,
- "KSUPER2", // SKINCOLOR_KSUPER2,
- "KSUPER3", // SKINCOLOR_KSUPER3,
- "KSUPER4", // SKINCOLOR_KSUPER4,
- "KSUPER5" // SKINCOLOR_KSUPER5,
+ // Special super colors
+ // Super Sonic Yellow
+ "SUPER1", // SKINCOLOR_SUPER1
+ "SUPER2", // SKINCOLOR_SUPER2,
+ "SUPER3", // SKINCOLOR_SUPER3,
+ "SUPER4", // SKINCOLOR_SUPER4,
+ "SUPER5", // SKINCOLOR_SUPER5,
+ // Super Tails Orange
+ "TSUPER1", // SKINCOLOR_TSUPER1,
+ "TSUPER2", // SKINCOLOR_TSUPER2,
+ "TSUPER3", // SKINCOLOR_TSUPER3,
+ "TSUPER4", // SKINCOLOR_TSUPER4,
+ "TSUPER5", // SKINCOLOR_TSUPER5,
+ // Super Knuckles Red
+ "KSUPER1", // SKINCOLOR_KSUPER1,
+ "KSUPER2", // SKINCOLOR_KSUPER2,
+ "KSUPER3", // SKINCOLOR_KSUPER3,
+ "KSUPER4", // SKINCOLOR_KSUPER4,
+ "KSUPER5", // SKINCOLOR_KSUPER5,
+ // Hyper Sonic Pink
+ "PSUPER1", // SKINCOLOR_PSUPER1,
+ "PSUPER2", // SKINCOLOR_PSUPER2,
+ "PSUPER3", // SKINCOLOR_PSUPER3,
+ "PSUPER4", // SKINCOLOR_PSUPER4,
+ "PSUPER5", // SKINCOLOR_PSUPER5,
+ // Hyper Sonic Blue
+ "BSUPER1", // SKINCOLOR_BSUPER1,
+ "BSUPER2", // SKINCOLOR_BSUPER2,
+ "BSUPER3", // SKINCOLOR_BSUPER3,
+ "BSUPER4", // SKINCOLOR_BSUPER4,
+ "BSUPER5" // SKINCOLOR_BSUPER5,
+ // Hyper Sonic Green
+ "GSUPER1", // SKINCOLOR_GSUPER1,
+ "GSUPER2", // SKINCOLOR_GSUPER2,
+ "GSUPER3", // SKINCOLOR_GSUPER3,
+ "GSUPER4", // SKINCOLOR_GSUPER4,
+ "GSUPER5", // SKINCOLOR_GSUPER5,
+ // Hyper Sonic White
+ "WSUPER1", // SKINCOLOR_WSUPER1,
+ "WSUPER2", // SKINCOLOR_WSUPER2,
+ "WSUPER3", // SKINCOLOR_WSUPER3,
+ "WSUPER4", // SKINCOLOR_WSUPER4,
+ "WSUPER5", // SKINCOLOR_WSUPER5,
+ // Creamy Super (Shadow?)
+ "CSUPER1", // SKINCOLOR_CSUPER1,
+ "CSUPER2", // SKINCOLOR_CSUPER2,
+ "CSUPER3", // SKINCOLOR_CSUPER3,
+ "CSUPER4", // SKINCOLOR_CSUPER4,
+ "CSUPER5", // SKINCOLOR_CSUPER5,
+ // Aqua Super
+ "ASUPER1", // SKINCOLOR_ASUPER1,
+ "ASUPER2", // SKINCOLOR_ASUPER2,
+ "ASUPER3", // SKINCOLOR_ASUPER3,
+ "ASUPER4", // SKINCOLOR_ASUPER4,
+ "ASUPER5" // SKINCOLOR_ASUPER5,
};
static const char *const POWERS_LIST[] = {
diff --git a/src/doomdef.h b/src/doomdef.h
index ab863c6f64b7b9597864c57fe88603ef28a3aa7a..338bd7e64c50c9120cc240077ec9f6ef1dc59b01 100644
--- a/src/doomdef.h
+++ b/src/doomdef.h
@@ -319,26 +319,69 @@ typedef enum
MAXSKINCOLORS,
// Super special awesome Super flashing colors!
+ // Super Sonic Yellow
SKINCOLOR_SUPER1 = MAXSKINCOLORS,
SKINCOLOR_SUPER2,
SKINCOLOR_SUPER3,
SKINCOLOR_SUPER4,
SKINCOLOR_SUPER5,
- // Super Tails
+ // Super Tails Orange
SKINCOLOR_TSUPER1,
SKINCOLOR_TSUPER2,
SKINCOLOR_TSUPER3,
SKINCOLOR_TSUPER4,
SKINCOLOR_TSUPER5,
- // Super Knuckles
+ // Super Knuckles Red
SKINCOLOR_KSUPER1,
SKINCOLOR_KSUPER2,
SKINCOLOR_KSUPER3,
SKINCOLOR_KSUPER4,
SKINCOLOR_KSUPER5,
+ // Hyper Sonic Pink
+ SKINCOLOR_PSUPER1,
+ SKINCOLOR_PSUPER2,
+ SKINCOLOR_PSUPER3,
+ SKINCOLOR_PSUPER4,
+ SKINCOLOR_PSUPER5,
+
+ // Hyper Sonic Blue
+ SKINCOLOR_BSUPER1,
+ SKINCOLOR_BSUPER2,
+ SKINCOLOR_BSUPER3,
+ SKINCOLOR_BSUPER4,
+ SKINCOLOR_BSUPER5,
+
+ // Hyper Sonic Green
+ SKINCOLOR_GSUPER1,
+ SKINCOLOR_GSUPER2,
+ SKINCOLOR_GSUPER3,
+ SKINCOLOR_GSUPER4,
+ SKINCOLOR_GSUPER5,
+
+ // Hyper Sonic White
+ SKINCOLOR_WSUPER1,
+ SKINCOLOR_WSUPER2,
+ SKINCOLOR_WSUPER3,
+ SKINCOLOR_WSUPER4,
+ SKINCOLOR_WSUPER5,
+
+ // Creamy Super (Shadow?)
+ SKINCOLOR_CSUPER1,
+ SKINCOLOR_CSUPER2,
+ SKINCOLOR_CSUPER3,
+ SKINCOLOR_CSUPER4,
+ SKINCOLOR_CSUPER5,
+
+ // Aqua Super
+ SKINCOLOR_ASUPER1,
+ SKINCOLOR_ASUPER2,
+ SKINCOLOR_ASUPER3,
+ SKINCOLOR_ASUPER4,
+ SKINCOLOR_ASUPER5,
+
MAXTRANSLATIONS
} skincolors_t;
diff --git a/src/k_kart.c b/src/k_kart.c
index ffa24abdbac323f42412c625470df0d8f83fc5c6..eb3a4fc12d3b4011addf4f1f3093656814182aeb 100644
--- a/src/k_kart.c
+++ b/src/k_kart.c
@@ -178,7 +178,7 @@ const UINT8 KartColor_Opposite[MAXSKINCOLORS*2] =
SKINCOLOR_JAWZ,6 // 63 // SKINCOLOR_LILAC
};
-UINT8 colortranslations[MAXSKINCOLORS][16] = {
+UINT8 colortranslations[MAXTRANSLATIONS][16] = {
{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, // SKINCOLOR_NONE
{120, 120, 120, 120, 0, 2, 5, 8, 9, 11, 14, 17, 20, 22, 25, 28}, // SKINCOLOR_WHITE
{ 0, 1, 2, 3, 5, 7, 9, 12, 13, 15, 18, 20, 23, 25, 27, 30}, // SKINCOLOR_SILVER
@@ -243,6 +243,53 @@ UINT8 colortranslations[MAXSKINCOLORS][16] = {
{144, 248, 249, 250, 251, 252, 253, 254, 255, 255, 29, 29, 30, 30, 31, 31}, // SKINCOLOR_BYZANTIUM
{144, 145, 146, 147, 148, 149, 150, 251, 251, 252, 252, 253, 254, 255, 29, 30}, // SKINCOLOR_POMEGRANATE
{120, 120, 120, 121, 121, 122, 122, 123, 192, 248, 249, 250, 251, 252, 253, 254}, // SKINCOLOR_LILAC
+ // MAXSKINCOLORS
+ {120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 96, 100, 104, 113, 116, 119}, // SKINCOLOR_SUPER1
+ {120, 120, 120, 120, 120, 120, 120, 120, 96, 98, 101, 104, 113, 115, 117, 119}, // SKINCOLOR_SUPER2
+ {120, 120, 120, 120, 120, 120, 96, 98, 100, 102, 104, 113, 114, 116, 117, 119}, // SKINCOLOR_SUPER3
+ {120, 120, 120, 120, 96, 97, 99, 100, 102, 104, 113, 114, 115, 116, 117, 119}, // SKINCOLOR_SUPER4
+ {120, 120, 96, 120, 120, 120, 120, 120, 104, 113, 114, 115, 116, 117, 118, 119}, // SKINCOLOR_SUPER5
+ {120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 80, 82, 85, 115, 117, 119}, // SKINCOLOR_TSUPER1
+ {120, 120, 120, 120, 120, 120, 120, 120, 80, 81, 83, 85, 115, 116, 117, 119}, // SKINCOLOR_TSUPER2
+ {120, 120, 120, 120, 120, 120, 80, 81, 82, 83, 85, 115, 116, 117, 118, 119}, // SKINCOLOR_TSUPER3
+ {120, 120, 120, 120, 80, 81, 82, 83, 84, 85, 115, 115, 116, 117, 118, 119}, // SKINCOLOR_TSUPER4
+ {120, 120, 80, 80, 81, 82, 83, 84, 85, 115, 115, 116, 117, 117, 118, 119}, // SKINCOLOR_TSUPER5
+ {120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 121, 123, 125, 127, 129, 132}, // SKINCOLOR_KSUPER1
+ {120, 120, 120, 120, 120, 120, 120, 120, 121, 122, 124, 125, 127, 128, 130, 132}, // SKINCOLOR_KSUPER2
+ {120, 120, 120, 120, 120, 120, 121, 122, 123, 124, 125, 127, 128, 129, 130, 132}, // SKINCOLOR_KSUPER3
+ {120, 120, 120, 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132}, // SKINCOLOR_KSUPER4
+ {120, 120, 121, 121, 122, 123, 124, 125, 126, 126, 127, 128, 129, 130, 131, 132}, // SKINCOLOR_KSUPER5
+ {120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 0, 122, 124, 248, 251, 255}, // SKINCOLOR_PSUPER1
+ {120, 120, 120, 120, 120, 120, 120, 120, 0, 121, 122, 124, 248, 250, 252, 255}, // SKINCOLOR_PSUPER2
+ {120, 120, 120, 120, 120, 120, 0, 121, 122, 123, 124, 248, 249, 251, 253, 255}, // SKINCOLOR_PSUPER3
+ {120, 120, 120, 120, 0, 121, 122, 123, 124, 248, 249, 250, 251, 252, 253, 255}, // SKINCOLOR_PSUPER4
+ {120, 120, 0, 121, 122, 123, 124, 248, 248, 249, 250, 251, 252, 253, 254, 255}, // SKINCOLOR_PSUPER5
+ {120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 224, 225, 227, 228, 230, 232}, // SKINCOLOR_BSUPER1
+ {120, 120, 120, 120, 120, 120, 120, 120, 224, 225, 226, 227, 228, 229, 230, 232}, // SKINCOLOR_BSUPER2
+ {120, 120, 120, 120, 120, 120, 224, 224, 225, 226, 227, 228, 229, 230, 231, 232}, // SKINCOLOR_BSUPER3
+ {120, 120, 120, 120, 224, 224, 225, 226, 226, 227, 228, 229, 229, 230, 231, 232}, // SKINCOLOR_BSUPER4
+ {120, 120, 224, 224, 225, 225, 226, 227, 227, 228, 228, 229, 230, 230, 231, 232}, // SKINCOLOR_BSUPER5
+ {120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 176, 160, 163, 167, 171, 175}, // SKINCOLOR_GSUPER1
+ {120, 120, 120, 120, 120, 120, 120, 120, 176, 176, 160, 163, 166, 169, 172, 175}, // SKINCOLOR_GSUPER2
+ {120, 120, 120, 120, 120, 120, 176, 176, 160, 162, 164, 166, 168, 170, 172, 175}, // SKINCOLOR_GSUPER3
+ {120, 120, 120, 120, 176, 176, 176, 160, 161, 163, 165, 167, 169, 171, 173, 175}, // SKINCOLOR_GSUPER4
+ {120, 120, 176, 176, 176, 160, 161, 163, 164, 166, 167, 169, 170, 172, 173, 175}, // SKINCOLOR_GSUPER5
+ {120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120}, // SKINCOLOR_WSUPER1
+ {120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 0, 4, 9}, // SKINCOLOR_WSUPER2
+ {120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 0, 2, 4, 6, 8, 11}, // SKINCOLOR_WSUPER3
+ {120, 120, 120, 120, 120, 120, 120, 0, 1, 3, 4, 6, 8, 9, 11, 13}, // SKINCOLOR_WSUPER4
+ {120, 120, 120, 120, 0, 1, 2, 4, 5, 6, 8, 9, 10, 12, 13, 15}, // SKINCOLOR_WSUPER5
+ {120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 96, 98, 99, 81, 73, 79}, // SKINCOLOR_CSUPER1
+ {120, 120, 120, 120, 120, 120, 120, 120, 96, 97, 98, 81, 81, 71, 75, 79}, // SKINCOLOR_CSUPER2
+ {120, 120, 120, 120, 120, 120, 96, 97, 98, 99, 81, 81, 70, 73, 76, 79}, // SKINCOLOR_CSUPER3
+ {120, 120, 120, 120, 96, 96, 97, 98, 99, 81, 81, 70, 72, 74, 76, 79}, // SKINCOLOR_CSUPER4
+ {120, 120, 96, 96, 97, 98, 98, 99, 81, 81, 69, 71, 73, 75, 77, 79}, // SKINCOLOR_CSUPER5
+ {120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 208, 210, 212, 215, 220, 222}, // SKINCOLOR_ASUPER1
+ {120, 120, 120, 120, 120, 120, 120, 120, 208, 209, 211, 213, 215, 220, 221, 223}, // SKINCOLOR_ASUPER2
+ {120, 120, 120, 120, 120, 120, 208, 209, 210, 211, 212, 213, 215, 220, 221, 223}, // SKINCOLOR_ASUPER3
+ {120, 120, 120, 120, 208, 209, 210, 211, 212, 213, 214, 215, 220, 221, 222, 223}, // SKINCOLOR_ASUPER4
+ {120, 120, 208, 208, 209, 210, 211, 211, 212, 213, 214, 215, 220, 221, 222, 223}, // SKINCOLOR_ASUPER5
+ // MAXTRANSLATIONS
};
// Define for getting accurate color brightness readings according to how the human eye sees them.
diff --git a/src/k_kart.h b/src/k_kart.h
index dc37956aff5775292208038d95ef91d9cd3aea6a..e193b6623c82231168455cef3cdfd33d53efd6b4 100644
--- a/src/k_kart.h
+++ b/src/k_kart.h
@@ -11,7 +11,7 @@
#define KART_FULLTURN 800
-UINT8 colortranslations[MAXSKINCOLORS][16];
+UINT8 colortranslations[MAXTRANSLATIONS][16];
extern const char *KartColor_Names[MAXSKINCOLORS];
extern const UINT8 KartColor_Opposite[MAXSKINCOLORS*2];
void K_RainbowColormap(UINT8 *dest_colormap, UINT8 skincolor);