16 more colors
- Renamed Crimson to Maroon. - Renamed Scarlet back to Crimson. - Renamed Nova to Scarlet. - Added Brick, Flame, Sunset, Popcorn, Camouflage, Caribbean, Plague, Platinum, Rust, Nova, Ultraviolet, Moonslam, Bubblegum, Mauve, Royal, and Fairy - Updated Maroon, Robo-Hood, and Ketchup - Shifted positioning of Aqua Super
This commit is contained in:
parent
9210ab8497
commit
b95d0ac279
|
@ -8147,15 +8147,18 @@ static const char *COLOR_ENUMS[] = { // Rejigged for Kart.
|
||||||
"SALMON", // SKINCOLOR_SALMON
|
"SALMON", // SKINCOLOR_SALMON
|
||||||
"PINK", // SKINCOLOR_PINK
|
"PINK", // SKINCOLOR_PINK
|
||||||
"ROSE", // SKINCOLOR_ROSE
|
"ROSE", // SKINCOLOR_ROSE
|
||||||
|
"BRICK", // SKINCOLOR_BRICK
|
||||||
"RUBY", // SKINCOLOR_RUBY
|
"RUBY", // SKINCOLOR_RUBY
|
||||||
"RASPBERRY", // SKINCOLOR_RASPBERRY
|
"RASPBERRY", // SKINCOLOR_RASPBERRY
|
||||||
"CHERRY", // SKINCOLOR_CHERRY
|
"CHERRY", // SKINCOLOR_CHERRY
|
||||||
"RED", // SKINCOLOR_RED
|
"RED", // SKINCOLOR_RED
|
||||||
"SCARLET", // SKINCOLOR_SCARLET
|
|
||||||
"CRIMSON", // SKINCOLOR_CRIMSON
|
"CRIMSON", // SKINCOLOR_CRIMSON
|
||||||
"NOVA", // SKINCOLOR_NOVA
|
"MAROON", // SKINCOLOR_MAROON
|
||||||
|
"FLAME", // SKINCOLOR_FLAME
|
||||||
|
"SCARLET", // SKINCOLOR_SCARLET
|
||||||
"KETCHUP", // SKINCOLOR_KETCHUP
|
"KETCHUP", // SKINCOLOR_KETCHUP
|
||||||
"DAWN", // SKINCOLOR_DAWN
|
"DAWN", // SKINCOLOR_DAWN
|
||||||
|
"SUNSET", // SKINCOLOR_SUNSET
|
||||||
"CREAMSICLE", // SKINCOLOR_CREAMSICLE
|
"CREAMSICLE", // SKINCOLOR_CREAMSICLE
|
||||||
"ORANGE", // SKINCOLOR_ORANGE
|
"ORANGE", // SKINCOLOR_ORANGE
|
||||||
"PUMPKIN", // SKINCOLOR_PUMPKIN
|
"PUMPKIN", // SKINCOLOR_PUMPKIN
|
||||||
|
@ -8164,6 +8167,7 @@ static const char *COLOR_ENUMS[] = { // Rejigged for Kart.
|
||||||
"TANGERINE", // SKINCOLOR_TANGERINE
|
"TANGERINE", // SKINCOLOR_TANGERINE
|
||||||
"PEACH", // SKINCOLOR_PEACH
|
"PEACH", // SKINCOLOR_PEACH
|
||||||
"CARAMEL", // SKINCOLOR_CARAMEL
|
"CARAMEL", // SKINCOLOR_CARAMEL
|
||||||
|
"POPCORN", // SKINCOLOR_POPCORN
|
||||||
"CREAM", // SKINCOLOR_CREAM
|
"CREAM", // SKINCOLOR_CREAM
|
||||||
"GOLD", // SKINCOLOR_GOLD
|
"GOLD", // SKINCOLOR_GOLD
|
||||||
"BRONZE", // SKINCOLOR_BRONZE
|
"BRONZE", // SKINCOLOR_BRONZE
|
||||||
|
@ -8177,6 +8181,7 @@ static const char *COLOR_ENUMS[] = { // Rejigged for Kart.
|
||||||
"HANDHELD", // SKINCOLOR_HANDHELD
|
"HANDHELD", // SKINCOLOR_HANDHELD
|
||||||
"TEA", // SKINCOLOR_TEA
|
"TEA", // SKINCOLOR_TEA
|
||||||
"PISTACHIO", // SKINCOLOR_PISTACHIO
|
"PISTACHIO", // SKINCOLOR_PISTACHIO
|
||||||
|
"CAMOUFLAGE", // SKINCOLOR_CAMOUFLAGE
|
||||||
"ROBOHOOD", // SKINCOLOR_ROBOHOOD
|
"ROBOHOOD", // SKINCOLOR_ROBOHOOD
|
||||||
"MOSS", // SKINCOLOR_MOSS
|
"MOSS", // SKINCOLOR_MOSS
|
||||||
"MINT", // SKINCOLOR_MINT
|
"MINT", // SKINCOLOR_MINT
|
||||||
|
@ -8186,28 +8191,39 @@ static const char *COLOR_ENUMS[] = { // Rejigged for Kart.
|
||||||
"SWAMP", // SKINCOLOR_SWAMP
|
"SWAMP", // SKINCOLOR_SWAMP
|
||||||
"DREAM", // SKINCOLOR_DREAM
|
"DREAM", // SKINCOLOR_DREAM
|
||||||
"ALGAE", // SKINCOLOR_ALGAE
|
"ALGAE", // SKINCOLOR_ALGAE
|
||||||
|
"CARIBBEAN", // SKINCOLOR_CARIBBEAN
|
||||||
|
"PLAGUE", // SKINCOLOR_PLAGUE
|
||||||
"AQUA", // SKINCOLOR_AQUA
|
"AQUA", // SKINCOLOR_AQUA
|
||||||
"TEAL", // SKINCOLOR_TEAL
|
"TEAL", // SKINCOLOR_TEAL
|
||||||
"CYAN", // SKINCOLOR_CYAN
|
"CYAN", // SKINCOLOR_CYAN
|
||||||
"JAWZ", // SKINCOLOR_JAWZ
|
"JAWZ", // SKINCOLOR_JAWZ
|
||||||
"CERULEAN", // SKINCOLOR_CERULEAN
|
"CERULEAN", // SKINCOLOR_CERULEAN
|
||||||
"NAVY", // SKINCOLOR_NAVY
|
"NAVY", // SKINCOLOR_NAVY
|
||||||
|
"PLATINUM", // SKINCOLOR_PLATINUM
|
||||||
"SLATE", // SKINCOLOR_SLATE
|
"SLATE", // SKINCOLOR_SLATE
|
||||||
"STEEL", // SKINCOLOR_STEEL
|
"STEEL", // SKINCOLOR_STEEL
|
||||||
|
"RUST", // SKINCOLOR_RUST
|
||||||
"JET", // SKINCOLOR_JET
|
"JET", // SKINCOLOR_JET
|
||||||
"SAPPHIRE", // SKINCOLOR_SAPPHIRE
|
"SAPPHIRE", // SKINCOLOR_SAPPHIRE
|
||||||
"PERIWINKLE", // SKINCOLOR_PERIWINKLE
|
"PERIWINKLE", // SKINCOLOR_PERIWINKLE
|
||||||
"BLUE", // SKINCOLOR_BLUE
|
"BLUE", // SKINCOLOR_BLUE
|
||||||
"BLUEBERRY", // SKINCOLOR_BLUEBERRY
|
"BLUEBERRY", // SKINCOLOR_BLUEBERRY
|
||||||
|
"NOVA", // SKINCOLOR_NOVA
|
||||||
"PASTEL", // SKINCOLOR_PASTEL
|
"PASTEL", // SKINCOLOR_PASTEL
|
||||||
|
"ULTRAVIOLET", // SKINCOLOR_ULTRAVIOLET
|
||||||
"DUSK", // SKINCOLOR_DUSK
|
"DUSK", // SKINCOLOR_DUSK
|
||||||
|
"MOONSLAM", // SKINCOLOR_MOONSLAM
|
||||||
|
"BUBBLEGUM", // SKINCOLOR_BUBBLEGUM
|
||||||
"PURPLE", // SKINCOLOR_PURPLE
|
"PURPLE", // SKINCOLOR_PURPLE
|
||||||
"FUCHSIA", // SKINCOLOR_FUCHSIA
|
"FUCHSIA", // SKINCOLOR_FUCHSIA
|
||||||
"TOXIC", // SKINCOLOR_TOXIC
|
"TOXIC", // SKINCOLOR_TOXIC
|
||||||
|
"MAUVE", // SKINCOLOR_MAUVE
|
||||||
|
"ROYAL", // SKINCOLOR_ROYAL
|
||||||
"LAVENDER", // SKINCOLOR_LAVENDER
|
"LAVENDER", // SKINCOLOR_LAVENDER
|
||||||
"BYZANTIUM", // SKINCOLOR_BYZANTIUM
|
"BYZANTIUM", // SKINCOLOR_BYZANTIUM
|
||||||
"POMEGRANATE", // SKINCOLOR_POMEGRANATE
|
"POMEGRANATE", // SKINCOLOR_POMEGRANATE
|
||||||
"LILAC", // SKINCOLOR_LILAC
|
"LILAC", // SKINCOLOR_LILAC
|
||||||
|
"FAIRY", // SKINCOLOR_FAIRY
|
||||||
|
|
||||||
// Special super colors
|
// Special super colors
|
||||||
// Super Sonic Yellow
|
// Super Sonic Yellow
|
||||||
|
@ -8240,6 +8256,12 @@ static const char *COLOR_ENUMS[] = { // Rejigged for Kart.
|
||||||
"BSUPER3", // SKINCOLOR_BSUPER3,
|
"BSUPER3", // SKINCOLOR_BSUPER3,
|
||||||
"BSUPER4", // SKINCOLOR_BSUPER4,
|
"BSUPER4", // SKINCOLOR_BSUPER4,
|
||||||
"BSUPER5" // SKINCOLOR_BSUPER5,
|
"BSUPER5" // SKINCOLOR_BSUPER5,
|
||||||
|
// Aqua Super
|
||||||
|
"ASUPER1", // SKINCOLOR_ASUPER1,
|
||||||
|
"ASUPER2", // SKINCOLOR_ASUPER2,
|
||||||
|
"ASUPER3", // SKINCOLOR_ASUPER3,
|
||||||
|
"ASUPER4", // SKINCOLOR_ASUPER4,
|
||||||
|
"ASUPER5" // SKINCOLOR_ASUPER5,
|
||||||
// Hyper Sonic Green
|
// Hyper Sonic Green
|
||||||
"GSUPER1", // SKINCOLOR_GSUPER1,
|
"GSUPER1", // SKINCOLOR_GSUPER1,
|
||||||
"GSUPER2", // SKINCOLOR_GSUPER2,
|
"GSUPER2", // SKINCOLOR_GSUPER2,
|
||||||
|
@ -8258,12 +8280,6 @@ static const char *COLOR_ENUMS[] = { // Rejigged for Kart.
|
||||||
"CSUPER3", // SKINCOLOR_CSUPER3,
|
"CSUPER3", // SKINCOLOR_CSUPER3,
|
||||||
"CSUPER4", // SKINCOLOR_CSUPER4,
|
"CSUPER4", // SKINCOLOR_CSUPER4,
|
||||||
"CSUPER5", // SKINCOLOR_CSUPER5,
|
"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[] = {
|
static const char *const POWERS_LIST[] = {
|
||||||
|
|
|
@ -256,6 +256,7 @@ typedef enum
|
||||||
SKINCOLOR_GREY,
|
SKINCOLOR_GREY,
|
||||||
SKINCOLOR_NICKEL,
|
SKINCOLOR_NICKEL,
|
||||||
SKINCOLOR_BLACK,
|
SKINCOLOR_BLACK,
|
||||||
|
SKINCOLOR_POPCORN,
|
||||||
SKINCOLOR_SEPIA,
|
SKINCOLOR_SEPIA,
|
||||||
SKINCOLOR_BEIGE,
|
SKINCOLOR_BEIGE,
|
||||||
SKINCOLOR_BROWN,
|
SKINCOLOR_BROWN,
|
||||||
|
@ -263,15 +264,18 @@ typedef enum
|
||||||
SKINCOLOR_SALMON,
|
SKINCOLOR_SALMON,
|
||||||
SKINCOLOR_PINK,
|
SKINCOLOR_PINK,
|
||||||
SKINCOLOR_ROSE,
|
SKINCOLOR_ROSE,
|
||||||
|
SKINCOLOR_BRICK,
|
||||||
SKINCOLOR_RUBY,
|
SKINCOLOR_RUBY,
|
||||||
SKINCOLOR_RASPBERRY,
|
SKINCOLOR_RASPBERRY,
|
||||||
SKINCOLOR_CHERRY,
|
SKINCOLOR_CHERRY,
|
||||||
SKINCOLOR_RED,
|
SKINCOLOR_RED,
|
||||||
SKINCOLOR_SCARLET,
|
|
||||||
SKINCOLOR_CRIMSON,
|
SKINCOLOR_CRIMSON,
|
||||||
SKINCOLOR_NOVA,
|
SKINCOLOR_MAROON,
|
||||||
|
SKINCOLOR_FLAME,
|
||||||
|
SKINCOLOR_SCARLET,
|
||||||
SKINCOLOR_KETCHUP,
|
SKINCOLOR_KETCHUP,
|
||||||
SKINCOLOR_DAWN,
|
SKINCOLOR_DAWN,
|
||||||
|
SKINCOLOR_SUNSET,
|
||||||
SKINCOLOR_CREAMSICLE,
|
SKINCOLOR_CREAMSICLE,
|
||||||
SKINCOLOR_ORANGE,
|
SKINCOLOR_ORANGE,
|
||||||
SKINCOLOR_PUMPKIN,
|
SKINCOLOR_PUMPKIN,
|
||||||
|
@ -289,6 +293,7 @@ typedef enum
|
||||||
SKINCOLOR_OLIVE,
|
SKINCOLOR_OLIVE,
|
||||||
SKINCOLOR_VOMIT,
|
SKINCOLOR_VOMIT,
|
||||||
SKINCOLOR_GARDEN,
|
SKINCOLOR_GARDEN,
|
||||||
|
SKINCOLOR_CAMOUFLAGE,
|
||||||
SKINCOLOR_LIME,
|
SKINCOLOR_LIME,
|
||||||
SKINCOLOR_HANDHELD,
|
SKINCOLOR_HANDHELD,
|
||||||
SKINCOLOR_TEA,
|
SKINCOLOR_TEA,
|
||||||
|
@ -301,6 +306,8 @@ typedef enum
|
||||||
SKINCOLOR_EMERALD,
|
SKINCOLOR_EMERALD,
|
||||||
SKINCOLOR_SWAMP,
|
SKINCOLOR_SWAMP,
|
||||||
SKINCOLOR_DREAM,
|
SKINCOLOR_DREAM,
|
||||||
|
SKINCOLOR_PLAGUE,
|
||||||
|
SKINCOLOR_CARIBBEAN,
|
||||||
SKINCOLOR_ALGAE,
|
SKINCOLOR_ALGAE,
|
||||||
SKINCOLOR_AQUA,
|
SKINCOLOR_AQUA,
|
||||||
SKINCOLOR_TEAL,
|
SKINCOLOR_TEAL,
|
||||||
|
@ -308,24 +315,34 @@ typedef enum
|
||||||
SKINCOLOR_JAWZ, // Oni's torment
|
SKINCOLOR_JAWZ, // Oni's torment
|
||||||
SKINCOLOR_CERULEAN,
|
SKINCOLOR_CERULEAN,
|
||||||
SKINCOLOR_NAVY,
|
SKINCOLOR_NAVY,
|
||||||
|
SKINCOLOR_PLATINUM,
|
||||||
SKINCOLOR_SLATE,
|
SKINCOLOR_SLATE,
|
||||||
SKINCOLOR_STEEL,
|
SKINCOLOR_STEEL,
|
||||||
|
SKINCOLOR_RUST,
|
||||||
SKINCOLOR_JET,
|
SKINCOLOR_JET,
|
||||||
SKINCOLOR_SAPPHIRE, // sweet mother, i cannot weave - slender aphrodite has overcome me with longing for a girl
|
SKINCOLOR_SAPPHIRE, // sweet mother, i cannot weave - slender aphrodite has overcome me with longing for a girl
|
||||||
SKINCOLOR_PERIWINKLE,
|
SKINCOLOR_PERIWINKLE,
|
||||||
SKINCOLOR_BLUE,
|
SKINCOLOR_BLUE,
|
||||||
SKINCOLOR_BLUEBERRY,
|
SKINCOLOR_BLUEBERRY,
|
||||||
|
SKINCOLOR_NOVA,
|
||||||
SKINCOLOR_PASTEL,
|
SKINCOLOR_PASTEL,
|
||||||
|
SKINCOLOR_ULTRAVIOLET,
|
||||||
SKINCOLOR_DUSK,
|
SKINCOLOR_DUSK,
|
||||||
|
SKINCOLOR_MOONSLAM,
|
||||||
|
SKINCOLOR_BUBBLEGUM,
|
||||||
SKINCOLOR_PURPLE,
|
SKINCOLOR_PURPLE,
|
||||||
SKINCOLOR_FUCHSIA,
|
SKINCOLOR_FUCHSIA,
|
||||||
SKINCOLOR_TOXIC,
|
SKINCOLOR_TOXIC,
|
||||||
|
SKINCOLOR_MAUVE,
|
||||||
|
SKINCOLOR_ROYAL,
|
||||||
SKINCOLOR_LAVENDER,
|
SKINCOLOR_LAVENDER,
|
||||||
SKINCOLOR_BYZANTIUM,
|
SKINCOLOR_BYZANTIUM,
|
||||||
SKINCOLOR_POMEGRANATE,
|
SKINCOLOR_POMEGRANATE,
|
||||||
SKINCOLOR_LILAC,
|
SKINCOLOR_LILAC,
|
||||||
|
SKINCOLOR_FAIRY,
|
||||||
|
|
||||||
// Careful! MAXSKINCOLORS cannot be greater than 0x40 -- Which it is now.
|
// "Careful! MAXSKINCOLORS cannot be greater than 0x40 -- Which it is now."
|
||||||
|
// (This comment is a dirty liar! This is only limited by the integer type, so 255 for UINT8.)
|
||||||
MAXSKINCOLORS,
|
MAXSKINCOLORS,
|
||||||
|
|
||||||
// Super special awesome Super flashing colors!
|
// Super special awesome Super flashing colors!
|
||||||
|
@ -364,6 +381,13 @@ typedef enum
|
||||||
SKINCOLOR_BSUPER4,
|
SKINCOLOR_BSUPER4,
|
||||||
SKINCOLOR_BSUPER5,
|
SKINCOLOR_BSUPER5,
|
||||||
|
|
||||||
|
// Aqua Super
|
||||||
|
SKINCOLOR_ASUPER1,
|
||||||
|
SKINCOLOR_ASUPER2,
|
||||||
|
SKINCOLOR_ASUPER3,
|
||||||
|
SKINCOLOR_ASUPER4,
|
||||||
|
SKINCOLOR_ASUPER5,
|
||||||
|
|
||||||
// Hyper Sonic Green
|
// Hyper Sonic Green
|
||||||
SKINCOLOR_GSUPER1,
|
SKINCOLOR_GSUPER1,
|
||||||
SKINCOLOR_GSUPER2,
|
SKINCOLOR_GSUPER2,
|
||||||
|
@ -385,13 +409,6 @@ typedef enum
|
||||||
SKINCOLOR_CSUPER4,
|
SKINCOLOR_CSUPER4,
|
||||||
SKINCOLOR_CSUPER5,
|
SKINCOLOR_CSUPER5,
|
||||||
|
|
||||||
// Aqua Super
|
|
||||||
SKINCOLOR_ASUPER1,
|
|
||||||
SKINCOLOR_ASUPER2,
|
|
||||||
SKINCOLOR_ASUPER3,
|
|
||||||
SKINCOLOR_ASUPER4,
|
|
||||||
SKINCOLOR_ASUPER5,
|
|
||||||
|
|
||||||
MAXTRANSLATIONS
|
MAXTRANSLATIONS
|
||||||
} skincolors_t;
|
} skincolors_t;
|
||||||
|
|
||||||
|
|
97
src/k_kart.c
97
src/k_kart.c
|
@ -56,15 +56,18 @@ const char *KartColor_Names[MAXSKINCOLORS] =
|
||||||
"Salmon", // SKINCOLOR_SALMON
|
"Salmon", // SKINCOLOR_SALMON
|
||||||
"Pink", // SKINCOLOR_PINK
|
"Pink", // SKINCOLOR_PINK
|
||||||
"Rose", // SKINCOLOR_ROSE
|
"Rose", // SKINCOLOR_ROSE
|
||||||
|
"Brick", // SKINCOLOR_BRICK
|
||||||
"Ruby", // SKINCOLOR_RUBY
|
"Ruby", // SKINCOLOR_RUBY
|
||||||
"Raspberry", // SKINCOLOR_RASPBERRY
|
"Raspberry", // SKINCOLOR_RASPBERRY
|
||||||
"Cherry", // SKINCOLOR_CHERRY
|
"Cherry", // SKINCOLOR_CHERRY
|
||||||
"Red", // SKINCOLOR_RED
|
"Red", // SKINCOLOR_RED
|
||||||
"Scarlet", // SKINCOLOR_SCARLET
|
|
||||||
"Crimson", // SKINCOLOR_CRIMSON
|
"Crimson", // SKINCOLOR_CRIMSON
|
||||||
"Nova", // SKINCOLOR_NOVA
|
"Maroon", // SKINCOLOR_MAROON
|
||||||
|
"Flame", // SKINCOLOR_FLAME
|
||||||
|
"Scarlet", // SKINCOLOR_SCARLET
|
||||||
"Ketchup", // SKINCOLOR_KETCHUP
|
"Ketchup", // SKINCOLOR_KETCHUP
|
||||||
"Dawn", // SKINCOLOR_DAWN
|
"Dawn", // SKINCOLOR_DAWN
|
||||||
|
"Sunset", // SKINCOLOR_SUNSET
|
||||||
"Creamsicle", // SKINCOLOR_CREAMSICLE
|
"Creamsicle", // SKINCOLOR_CREAMSICLE
|
||||||
"Orange", // SKINCOLOR_ORANGE
|
"Orange", // SKINCOLOR_ORANGE
|
||||||
"Pumpkin", // SKINCOLOR_PUMPKIN
|
"Pumpkin", // SKINCOLOR_PUMPKIN
|
||||||
|
@ -73,6 +76,7 @@ const char *KartColor_Names[MAXSKINCOLORS] =
|
||||||
"Tangerine", // SKINCOLOR_TANGERINE
|
"Tangerine", // SKINCOLOR_TANGERINE
|
||||||
"Peach", // SKINCOLOR_PEACH
|
"Peach", // SKINCOLOR_PEACH
|
||||||
"Caramel", // SKINCOLOR_CARAMEL
|
"Caramel", // SKINCOLOR_CARAMEL
|
||||||
|
"Popcorn", // SKINCOLOR_POPCORN
|
||||||
"Cream", // SKINCOLOR_CREAM
|
"Cream", // SKINCOLOR_CREAM
|
||||||
"Gold", // SKINCOLOR_GOLD
|
"Gold", // SKINCOLOR_GOLD
|
||||||
"Bronze", // SKINCOLOR_BRONZE
|
"Bronze", // SKINCOLOR_BRONZE
|
||||||
|
@ -86,6 +90,7 @@ const char *KartColor_Names[MAXSKINCOLORS] =
|
||||||
"Handheld", // SKINCOLOR_HANDHELD
|
"Handheld", // SKINCOLOR_HANDHELD
|
||||||
"Tea", // SKINCOLOR_TEA
|
"Tea", // SKINCOLOR_TEA
|
||||||
"Pistachio", // SKINCOLOR_PISTACHIO
|
"Pistachio", // SKINCOLOR_PISTACHIO
|
||||||
|
"Camouflage", // SKINCOLOR_CAMOUFLAGE
|
||||||
"Robo-Hood", // SKINCOLOR_ROBOHOOD
|
"Robo-Hood", // SKINCOLOR_ROBOHOOD
|
||||||
"Moss", // SKINCOLOR_MOSS
|
"Moss", // SKINCOLOR_MOSS
|
||||||
"Mint", // SKINCOLOR_MINT
|
"Mint", // SKINCOLOR_MINT
|
||||||
|
@ -95,28 +100,39 @@ const char *KartColor_Names[MAXSKINCOLORS] =
|
||||||
"Swamp", // SKINCOLOR_SWAMP
|
"Swamp", // SKINCOLOR_SWAMP
|
||||||
"Dream", // SKINCOLOR_DREAM
|
"Dream", // SKINCOLOR_DREAM
|
||||||
"Algae", // SKINCOLOR_ALGAE
|
"Algae", // SKINCOLOR_ALGAE
|
||||||
|
"Caribbean", // SKINCOLOR_CARIBBEAN
|
||||||
|
"Plague", // SKINCOLOR_PLAGUE
|
||||||
"Aqua", // SKINCOLOR_AQUA
|
"Aqua", // SKINCOLOR_AQUA
|
||||||
"Teal", // SKINCOLOR_TEAL
|
"Teal", // SKINCOLOR_TEAL
|
||||||
"Cyan", // SKINCOLOR_CYAN
|
"Cyan", // SKINCOLOR_CYAN
|
||||||
"Jawz", // SKINCOLOR_JAWZ
|
"Jawz", // SKINCOLOR_JAWZ
|
||||||
"Cerulean", // SKINCOLOR_CERULEAN
|
"Cerulean", // SKINCOLOR_CERULEAN
|
||||||
"Navy", // SKINCOLOR_NAVY
|
"Navy", // SKINCOLOR_NAVY
|
||||||
|
"Platinum", // SKINCOLOR_PLATINUM
|
||||||
"Slate", // SKINCOLOR_SLATE
|
"Slate", // SKINCOLOR_SLATE
|
||||||
"Steel", // SKINCOLOR_STEEL
|
"Steel", // SKINCOLOR_STEEL
|
||||||
|
"Rust", // SKINCOLOR_RUST
|
||||||
"Jet", // SKINCOLOR_JET
|
"Jet", // SKINCOLOR_JET
|
||||||
"Sapphire", // SKINCOLOR_SAPPHIRE
|
"Sapphire", // SKINCOLOR_SAPPHIRE
|
||||||
"Periwinkle", // SKINCOLOR_PERIWINKLE
|
"Periwinkle", // SKINCOLOR_PERIWINKLE
|
||||||
"Blue", // SKINCOLOR_BLUE
|
"Blue", // SKINCOLOR_BLUE
|
||||||
"Blueberry", // SKINCOLOR_BLUEBERRY
|
"Blueberry", // SKINCOLOR_BLUEBERRY
|
||||||
|
"Nova", // SKINCOLOR_NOVA
|
||||||
"Pastel", // SKINCOLOR_PASTEL
|
"Pastel", // SKINCOLOR_PASTEL
|
||||||
|
"Ultraviolet", // SKINCOLOR_ULTRAVIOLET
|
||||||
"Dusk", // SKINCOLOR_DUSK
|
"Dusk", // SKINCOLOR_DUSK
|
||||||
|
"Moonslam", // SKINCOLOR_MOONSLAM
|
||||||
|
"Bubblegum", // SKINCOLOR_BUBBLEGUM
|
||||||
"Purple", // SKINCOLOR_PURPLE
|
"Purple", // SKINCOLOR_PURPLE
|
||||||
"Fuchsia", // SKINCOLOR_FUCHSIA
|
"Fuchsia", // SKINCOLOR_FUCHSIA
|
||||||
"Toxic", // SKINCOLOR_TOXIC
|
"Toxic", // SKINCOLOR_TOXIC
|
||||||
|
"Mauve", // SKINCOLOR_MAUVE
|
||||||
|
"Royal", // SKINCOLOR_ROYAL
|
||||||
"Lavender", // SKINCOLOR_LAVENDER
|
"Lavender", // SKINCOLOR_LAVENDER
|
||||||
"Byzantium", // SKINCOLOR_BYZANTIUM
|
"Byzantium", // SKINCOLOR_BYZANTIUM
|
||||||
"Pomegranate", // SKINCOLOR_POMEGRANATE
|
"Pomegranate", // SKINCOLOR_POMEGRANATE
|
||||||
"Lilac" // SKINCOLOR_LILAC
|
"Lilac", // SKINCOLOR_LILAC
|
||||||
|
"Fairy" // SKINCOLOR_FAIRY
|
||||||
};
|
};
|
||||||
|
|
||||||
// Color_Opposite replacement; frame setting has not been changed from 8 for most, should be done later
|
// Color_Opposite replacement; frame setting has not been changed from 8 for most, should be done later
|
||||||
|
@ -135,15 +151,18 @@ const UINT8 KartColor_Opposite[MAXSKINCOLORS*2] =
|
||||||
SKINCOLOR_TEA,8, // SKINCOLOR_SALMON
|
SKINCOLOR_TEA,8, // SKINCOLOR_SALMON
|
||||||
SKINCOLOR_PISTACHIO,8, // SKINCOLOR_PINK
|
SKINCOLOR_PISTACHIO,8, // SKINCOLOR_PINK
|
||||||
SKINCOLOR_MOSS,8, // SKINCOLOR_ROSE
|
SKINCOLOR_MOSS,8, // SKINCOLOR_ROSE
|
||||||
|
SKINCOLOR_RUST,8, // SKINCOLOR_BRICK
|
||||||
SKINCOLOR_SAPPHIRE,8, // SKINCOLOR_RUBY
|
SKINCOLOR_SAPPHIRE,8, // SKINCOLOR_RUBY
|
||||||
SKINCOLOR_MINT,8, // SKINCOLOR_RASPBERRY
|
SKINCOLOR_MINT,8, // SKINCOLOR_RASPBERRY
|
||||||
SKINCOLOR_HANDHELD,10, // SKINCOLOR_CHERRY
|
SKINCOLOR_HANDHELD,10, // SKINCOLOR_CHERRY
|
||||||
SKINCOLOR_GREEN,6, // SKINCOLOR_RED
|
SKINCOLOR_GREEN,6, // SKINCOLOR_RED
|
||||||
SKINCOLOR_PINETREE,6, // SKINCOLOR_SCARLET
|
SKINCOLOR_PINETREE,6, // SKINCOLOR_CRIMSON
|
||||||
SKINCOLOR_TOXIC,8, // SKINCOLOR_CRIMSON
|
SKINCOLOR_TOXIC,8, // SKINCOLOR_MAROON
|
||||||
SKINCOLOR_ALGAE,10, // SKINCOLOR_NOVA
|
SKINCOLOR_CARIBBEAN,10, // SKINCOLOR_FLAME
|
||||||
|
SKINCOLOR_ALGAE,10, // SKINCOLOR_SCARLET
|
||||||
SKINCOLOR_MUSTARD,10, // SKINCOLOR_KETCHUP
|
SKINCOLOR_MUSTARD,10, // SKINCOLOR_KETCHUP
|
||||||
SKINCOLOR_DUSK,8, // SKINCOLOR_DAWN
|
SKINCOLOR_DUSK,8, // SKINCOLOR_DAWN
|
||||||
|
SKINCOLOR_MOONSLAM,8, // SKINCOLOR_SUNSET
|
||||||
SKINCOLOR_PERIWINKLE,8, // SKINCOLOR_CREAMSICLE
|
SKINCOLOR_PERIWINKLE,8, // SKINCOLOR_CREAMSICLE
|
||||||
SKINCOLOR_BLUE,8, // SKINCOLOR_ORANGE
|
SKINCOLOR_BLUE,8, // SKINCOLOR_ORANGE
|
||||||
SKINCOLOR_BLUEBERRY,8, // SKINCOLOR_PUMPKIN
|
SKINCOLOR_BLUEBERRY,8, // SKINCOLOR_PUMPKIN
|
||||||
|
@ -152,6 +171,7 @@ const UINT8 KartColor_Opposite[MAXSKINCOLORS*2] =
|
||||||
SKINCOLOR_LIME,8, // SKINCOLOR_TANGERINE
|
SKINCOLOR_LIME,8, // SKINCOLOR_TANGERINE
|
||||||
SKINCOLOR_CYAN,8, // SKINCOLOR_PEACH
|
SKINCOLOR_CYAN,8, // SKINCOLOR_PEACH
|
||||||
SKINCOLOR_CERULEAN,8, // SKINCOLOR_CARAMEL
|
SKINCOLOR_CERULEAN,8, // SKINCOLOR_CARAMEL
|
||||||
|
SKINCOLOR_BUBBLEGUM,8, // SKINCOLOR_POPCORN
|
||||||
SKINCOLOR_COPPER,10, // SKINCOLOR_CREAM
|
SKINCOLOR_COPPER,10, // SKINCOLOR_CREAM
|
||||||
SKINCOLOR_SLATE,8, // SKINCOLOR_GOLD
|
SKINCOLOR_SLATE,8, // SKINCOLOR_GOLD
|
||||||
SKINCOLOR_STEEL,8, // SKINCOLOR_BRONZE
|
SKINCOLOR_STEEL,8, // SKINCOLOR_BRONZE
|
||||||
|
@ -165,37 +185,48 @@ const UINT8 KartColor_Opposite[MAXSKINCOLORS*2] =
|
||||||
SKINCOLOR_CHERRY,8, // SKINCOLOR_HANDHELD
|
SKINCOLOR_CHERRY,8, // SKINCOLOR_HANDHELD
|
||||||
SKINCOLOR_SALMON,8, // SKINCOLOR_TEA
|
SKINCOLOR_SALMON,8, // SKINCOLOR_TEA
|
||||||
SKINCOLOR_PINK,6, // SKINCOLOR_PISTACHIO
|
SKINCOLOR_PINK,6, // SKINCOLOR_PISTACHIO
|
||||||
|
SKINCOLOR_FAIRY,10, // SKINCOLOR_CAMOUFLAGE
|
||||||
SKINCOLOR_VOMIT,8, // SKINCOLOR_ROBOHOOD
|
SKINCOLOR_VOMIT,8, // SKINCOLOR_ROBOHOOD
|
||||||
SKINCOLOR_ROSE,8, // SKINCOLOR_MOSS
|
SKINCOLOR_ROSE,8, // SKINCOLOR_MOSS
|
||||||
SKINCOLOR_RASPBERRY,8, // SKINCOLOR_MINT
|
SKINCOLOR_RASPBERRY,8, // SKINCOLOR_MINT
|
||||||
SKINCOLOR_RED,8, // SKINCOLOR_GREEN
|
SKINCOLOR_RED,8, // SKINCOLOR_GREEN
|
||||||
SKINCOLOR_SCARLET,8, // SKINCOLOR_PINETREE
|
SKINCOLOR_CRIMSON,8, // SKINCOLOR_PINETREE
|
||||||
SKINCOLOR_PURPLE,8, // SKINCOLOR_EMERALD
|
SKINCOLOR_PURPLE,8, // SKINCOLOR_EMERALD
|
||||||
SKINCOLOR_BYZANTIUM,8, // SKINCOLOR_SWAMP
|
SKINCOLOR_BYZANTIUM,8, // SKINCOLOR_SWAMP
|
||||||
SKINCOLOR_POMEGRANATE,8, // SKINCOLOR_DREAM
|
SKINCOLOR_POMEGRANATE,8, // SKINCOLOR_DREAM
|
||||||
SKINCOLOR_NOVA,10, // SKINCOLOR_ALGAE
|
SKINCOLOR_SCARLET,10, // SKINCOLOR_ALGAE
|
||||||
|
SKINCOLOR_FLAME,8, // SKINCOLOR_CARIBBEAN
|
||||||
|
SKINCOLOR_NOVA,8, // SKINCOLOR_PLAGUE
|
||||||
SKINCOLOR_YELLOW,8, // SKINCOLOR_AQUA
|
SKINCOLOR_YELLOW,8, // SKINCOLOR_AQUA
|
||||||
SKINCOLOR_OLIVE,8, // SKINCOLOR_TEAL
|
SKINCOLOR_OLIVE,8, // SKINCOLOR_TEAL
|
||||||
SKINCOLOR_PEACH,8, // SKINCOLOR_CYAN
|
SKINCOLOR_PEACH,8, // SKINCOLOR_CYAN
|
||||||
SKINCOLOR_LILAC,10, // SKINCOLOR_JAWZ
|
SKINCOLOR_LILAC,10, // SKINCOLOR_JAWZ
|
||||||
SKINCOLOR_CARAMEL,8, // SKINCOLOR_CERULEAN
|
SKINCOLOR_CARAMEL,8, // SKINCOLOR_CERULEAN
|
||||||
SKINCOLOR_ROSEWOOD,8, // SKINCOLOR_NAVY
|
SKINCOLOR_ROSEWOOD,8, // SKINCOLOR_NAVY
|
||||||
|
SKINCOLOR_ROYAL,8, // SKINCOLOR_PLATINUM
|
||||||
SKINCOLOR_GOLD,10, // SKINCOLOR_SLATE
|
SKINCOLOR_GOLD,10, // SKINCOLOR_SLATE
|
||||||
SKINCOLOR_BRONZE,10, // SKINCOLOR_STEEL
|
SKINCOLOR_BRONZE,10, // SKINCOLOR_STEEL
|
||||||
|
SKINCOLOR_BRICK,10, // SKINCOLOR_RUST
|
||||||
SKINCOLOR_BURGUNDY,8, // SKINCOLOR_JET
|
SKINCOLOR_BURGUNDY,8, // SKINCOLOR_JET
|
||||||
SKINCOLOR_RUBY,6, // SKINCOLOR_SAPPHIRE
|
SKINCOLOR_RUBY,6, // SKINCOLOR_SAPPHIRE
|
||||||
SKINCOLOR_CREAMSICLE,8, // SKINCOLOR_PERIWINKLE
|
SKINCOLOR_CREAMSICLE,8, // SKINCOLOR_PERIWINKLE
|
||||||
SKINCOLOR_ORANGE,8, // SKINCOLOR_BLUE
|
SKINCOLOR_ORANGE,8, // SKINCOLOR_BLUE
|
||||||
SKINCOLOR_PUMPKIN,8, // SKINCOLOR_BLUEBERRY
|
SKINCOLOR_PUMPKIN,8, // SKINCOLOR_BLUEBERRY
|
||||||
|
SKINCOLOR_PLAGUE,10, // SKINCOLOR_NOVA
|
||||||
SKINCOLOR_FUCHSIA,11, // SKINCOLOR_PASTEL
|
SKINCOLOR_FUCHSIA,11, // SKINCOLOR_PASTEL
|
||||||
|
SKINCOLOR_MAUVE,10, // SKINCOLOR_ULTRAVIOLET
|
||||||
SKINCOLOR_DAWN,6, // SKINCOLOR_DUSK
|
SKINCOLOR_DAWN,6, // SKINCOLOR_DUSK
|
||||||
|
SKINCOLOR_SUNSET,10, // SKINCOLOR_MOONSLAM
|
||||||
SKINCOLOR_EMERALD,8, // SKINCOLOR_PURPLE
|
SKINCOLOR_EMERALD,8, // SKINCOLOR_PURPLE
|
||||||
SKINCOLOR_PASTEL,11, // SKINCOLOR_FUCHSIA
|
SKINCOLOR_PASTEL,11, // SKINCOLOR_FUCHSIA
|
||||||
SKINCOLOR_CRIMSON,8, // SKINCOLOR_TOXIC
|
SKINCOLOR_MAROON,8, // SKINCOLOR_TOXIC
|
||||||
|
SKINCOLOR_ULTRAVIOLET,8, // SKINCOLOR_MAUVE
|
||||||
|
SKINCOLOR_PLATINUM,6, // SKINCOLOR_ROYAL
|
||||||
SKINCOLOR_GARDEN,6, // SKINCOLOR_LAVENDER
|
SKINCOLOR_GARDEN,6, // SKINCOLOR_LAVENDER
|
||||||
SKINCOLOR_SWAMP,8, // SKINCOLOR_BYZANTIUM
|
SKINCOLOR_SWAMP,8, // SKINCOLOR_BYZANTIUM
|
||||||
SKINCOLOR_DREAM,8, // SKINCOLOR_POMEGRANATE
|
SKINCOLOR_DREAM,8, // SKINCOLOR_POMEGRANATE
|
||||||
SKINCOLOR_JAWZ,6 // SKINCOLOR_LILAC
|
SKINCOLOR_JAWZ,6, // SKINCOLOR_LILAC
|
||||||
|
SKINCOLOR_CAMOUFLAGE,8 // SKINCOLOR_FAIRY
|
||||||
};
|
};
|
||||||
|
|
||||||
UINT8 colortranslations[MAXTRANSLATIONS][16] = {
|
UINT8 colortranslations[MAXTRANSLATIONS][16] = {
|
||||||
|
@ -212,15 +243,18 @@ UINT8 colortranslations[MAXTRANSLATIONS][16] = {
|
||||||
{120, 120, 120, 121, 121, 122, 123, 124, 126, 127, 129, 131, 133, 135, 137, 139}, // SKINCOLOR_SALMON
|
{120, 120, 120, 121, 121, 122, 123, 124, 126, 127, 129, 131, 133, 135, 137, 139}, // SKINCOLOR_SALMON
|
||||||
{120, 121, 121, 122, 144, 145, 146, 147, 148, 149, 150, 151, 134, 136, 138, 140}, // SKINCOLOR_PINK
|
{120, 121, 121, 122, 144, 145, 146, 147, 148, 149, 150, 151, 134, 136, 138, 140}, // SKINCOLOR_PINK
|
||||||
{144, 145, 146, 147, 148, 149, 150, 151, 134, 135, 136, 137, 138, 139, 140, 141}, // SKINCOLOR_ROSE
|
{144, 145, 146, 147, 148, 149, 150, 151, 134, 135, 136, 137, 138, 139, 140, 141}, // SKINCOLOR_ROSE
|
||||||
|
{ 64, 67, 70, 73, 146, 147, 148, 150, 118, 118, 119, 119, 156, 159, 141, 143}, // SKINCOLOR_BRICK
|
||||||
{120, 121, 144, 145, 147, 149, 132, 133, 134, 136, 198, 198, 199, 255, 30, 31}, // SKINCOLOR_RUBY
|
{120, 121, 144, 145, 147, 149, 132, 133, 134, 136, 198, 198, 199, 255, 30, 31}, // SKINCOLOR_RUBY
|
||||||
{120, 121, 122, 123, 124, 125, 126, 127, 128, 130, 131, 134, 136, 137, 139, 140}, // SKINCOLOR_RASPBERRY
|
{120, 121, 122, 123, 124, 125, 126, 127, 128, 130, 131, 134, 136, 137, 139, 140}, // SKINCOLOR_RASPBERRY
|
||||||
{120, 65, 67, 69, 71, 124, 125, 127, 132, 133, 135, 136, 138, 139, 140, 141}, // SKINCOLOR_CHERRY
|
{120, 65, 67, 69, 71, 124, 125, 127, 132, 133, 135, 136, 138, 139, 140, 141}, // SKINCOLOR_CHERRY
|
||||||
{122, 123, 124, 126, 129, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142}, // SKINCOLOR_RED
|
{122, 123, 124, 126, 129, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, 142}, // SKINCOLOR_RED
|
||||||
{123, 125, 128, 131, 133, 135, 136, 138, 140, 140, 141, 141, 142, 142, 143, 31}, // SKINCOLOR_SCARLET
|
{123, 125, 128, 131, 133, 135, 136, 138, 140, 140, 141, 141, 142, 142, 143, 31}, // SKINCOLOR_CRIMSON
|
||||||
{123, 124, 126, 128, 132, 135, 137, 63, 28, 28, 28, 29, 29, 30, 30, 31}, // SKINCOLOR_CRIMSON
|
{123, 124, 126, 128, 132, 135, 137, 27, 28, 28, 28, 29, 29, 30, 30, 31}, // SKINCOLOR_MAROON
|
||||||
{ 99, 113, 113, 84, 85, 87, 126, 128, 130, 196, 197, 198, 199, 240, 243, 246}, // SKINCOLOR_NOVA
|
{120, 97, 112, 113, 113, 85, 87, 126, 149, 150, 151, 252, 253, 254, 255, 29}, // SKINCOLOR_FLAME
|
||||||
{104, 113, 113, 85, 86, 88, 128, 129, 131, 133, 134, 136, 138, 139, 141, 143}, // SKINCOLOR_KETCHUP
|
{ 99, 113, 113, 84, 85, 87, 126, 128, 130, 196, 197, 198, 199, 240, 243, 246}, // SKINCOLOR_SCARLET
|
||||||
|
{103, 113, 113, 84, 85, 88, 127, 130, 131, 133, 134, 136, 138, 139, 141, 143}, // SKINCOLOR_KETCHUP
|
||||||
{120, 121, 122, 123, 124, 147, 147, 148, 90, 91, 92, 93, 94, 95, 152, 154}, // SKINCOLOR_DAWN
|
{120, 121, 122, 123, 124, 147, 147, 148, 90, 91, 92, 93, 94, 95, 152, 154}, // SKINCOLOR_DAWN
|
||||||
|
{ 98, 112, 113, 84, 85, 87, 89, 149, 150, 251, 252, 206, 238, 240, 243, 246}, // SKINCOLOR_SUNSET
|
||||||
{120, 120, 80, 80, 81, 82, 83, 83, 84, 85, 86, 88, 89, 91, 93, 95}, // SKINCOLOR_CREAMSICLE
|
{120, 120, 80, 80, 81, 82, 83, 83, 84, 85, 86, 88, 89, 91, 93, 95}, // SKINCOLOR_CREAMSICLE
|
||||||
{ 80, 81, 82, 83, 84, 85, 86, 88, 89, 91, 94, 95, 154, 156, 158, 159}, // SKINCOLOR_ORANGE
|
{ 80, 81, 82, 83, 84, 85, 86, 88, 89, 91, 94, 95, 154, 156, 158, 159}, // SKINCOLOR_ORANGE
|
||||||
{ 82, 83, 84, 85, 87, 89, 90, 92, 94, 152, 153, 155, 157, 159, 141, 142}, // SKINCOLOR_PUMPKIN
|
{ 82, 83, 84, 85, 87, 89, 90, 92, 94, 152, 153, 155, 157, 159, 141, 142}, // SKINCOLOR_PUMPKIN
|
||||||
|
@ -229,6 +263,7 @@ UINT8 colortranslations[MAXTRANSLATIONS][16] = {
|
||||||
{ 98, 98, 112, 112, 113, 113, 84, 85, 87, 89, 91, 93, 95, 153, 156, 159}, // SKINCOLOR_TANGERINE
|
{ 98, 98, 112, 112, 113, 113, 84, 85, 87, 89, 91, 93, 95, 153, 156, 159}, // SKINCOLOR_TANGERINE
|
||||||
{120, 80, 66, 70, 72, 76, 148, 149, 150, 151, 153, 154, 156, 61, 62, 63}, // SKINCOLOR_PEACH
|
{120, 80, 66, 70, 72, 76, 148, 149, 150, 151, 153, 154, 156, 61, 62, 63}, // SKINCOLOR_PEACH
|
||||||
{ 64, 66, 68, 70, 72, 74, 76, 78, 48, 50, 52, 54, 56, 58, 60, 62}, // SKINCOLOR_CARAMEL
|
{ 64, 66, 68, 70, 72, 74, 76, 78, 48, 50, 52, 54, 56, 58, 60, 62}, // SKINCOLOR_CARAMEL
|
||||||
|
{120, 96, 97, 98, 99, 71, 32, 11, 13, 16, 18, 21, 23, 26, 28, 31}, // SKINCOLOR_POPCORN
|
||||||
{120, 120, 96, 96, 97, 82, 84, 77, 50, 54, 57, 59, 61, 63, 29, 31}, // SKINCOLOR_CREAM
|
{120, 120, 96, 96, 97, 82, 84, 77, 50, 54, 57, 59, 61, 63, 29, 31}, // SKINCOLOR_CREAM
|
||||||
{112, 112, 112, 113, 113, 114, 114, 115, 115, 116, 116, 117, 117, 118, 118, 119}, // SKINCOLOR_GOLD
|
{112, 112, 112, 113, 113, 114, 114, 115, 115, 116, 116, 117, 117, 118, 118, 119}, // SKINCOLOR_GOLD
|
||||||
{112, 113, 114, 115, 116, 117, 118, 119, 156, 157, 158, 159, 141, 141, 142, 143}, // SKINCOLOR_BRONZE
|
{112, 113, 114, 115, 116, 117, 118, 119, 156, 157, 158, 159, 141, 141, 142, 143}, // SKINCOLOR_BRONZE
|
||||||
|
@ -242,7 +277,8 @@ UINT8 colortranslations[MAXTRANSLATIONS][16] = {
|
||||||
{ 98, 104, 105, 105, 106, 167, 168, 169, 170, 171, 172, 173, 174, 175, 30, 31}, // SKINCOLOR_HANDHELD
|
{ 98, 104, 105, 105, 106, 167, 168, 169, 170, 171, 172, 173, 174, 175, 30, 31}, // SKINCOLOR_HANDHELD
|
||||||
{120, 120, 176, 176, 176, 177, 177, 178, 178, 179, 179, 180, 180, 181, 182, 183}, // SKINCOLOR_TEA
|
{120, 120, 176, 176, 176, 177, 177, 178, 178, 179, 179, 180, 180, 181, 182, 183}, // SKINCOLOR_TEA
|
||||||
{120, 120, 176, 176, 177, 177, 178, 179, 165, 166, 167, 168, 169, 170, 171, 172}, // SKINCOLOR_PISTACHIO
|
{120, 120, 176, 176, 177, 177, 178, 179, 165, 166, 167, 168, 169, 170, 171, 172}, // SKINCOLOR_PISTACHIO
|
||||||
{120, 176, 178, 165, 167, 168, 169, 182, 182, 171, 171, 172, 173, 174, 175, 30}, // SKINCOLOR_ROBOHOOD
|
{ 64, 66, 69, 32, 34, 37, 40, 182, 171, 172, 172, 173, 173, 174, 174, 175}, // SKINCOLOR_CAMOUFLAGE
|
||||||
|
{120, 176, 160, 165, 167, 168, 169, 182, 182, 171, 60, 61, 63, 29, 30, 31}, // SKINCOLOR_ROBOHOOD
|
||||||
{178, 178, 178, 179, 179, 180, 181, 182, 183, 172, 172, 173, 173, 174, 174, 175}, // SKINCOLOR_MOSS
|
{178, 178, 178, 179, 179, 180, 181, 182, 183, 172, 172, 173, 173, 174, 174, 175}, // SKINCOLOR_MOSS
|
||||||
{120, 176, 176, 176, 177, 163, 164, 165, 167, 221, 221, 222, 223, 207, 207, 31}, // SKINCOLOR_MINT
|
{120, 176, 176, 176, 177, 163, 164, 165, 167, 221, 221, 222, 223, 207, 207, 31}, // SKINCOLOR_MINT
|
||||||
{160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175}, // SKINCOLOR_GREEN
|
{160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175}, // SKINCOLOR_GREEN
|
||||||
|
@ -251,28 +287,39 @@ UINT8 colortranslations[MAXTRANSLATIONS][16] = {
|
||||||
{160, 184, 185, 186, 187, 188, 189, 190, 191, 191, 29, 29, 30, 30, 31, 31}, // SKINCOLOR_SWAMP
|
{160, 184, 185, 186, 187, 188, 189, 190, 191, 191, 29, 29, 30, 30, 31, 31}, // SKINCOLOR_SWAMP
|
||||||
{120, 120, 80, 80, 81, 177, 162, 164, 228, 228, 204, 204, 205, 205, 206, 207}, // SKINCOLOR_DREAM
|
{120, 120, 80, 80, 81, 177, 162, 164, 228, 228, 204, 204, 205, 205, 206, 207}, // SKINCOLOR_DREAM
|
||||||
{208, 209, 210, 211, 213, 220, 216, 167, 168, 188, 188, 189, 190, 191, 30, 31}, // SKINCOLOR_ALGAE
|
{208, 209, 210, 211, 213, 220, 216, 167, 168, 188, 188, 189, 190, 191, 30, 31}, // SKINCOLOR_ALGAE
|
||||||
|
{120, 176, 177, 160, 185, 220, 216, 217, 221, 230, 206, 206, 254, 255, 29, 31}, // SKINCOLOR_CARIBBEAN
|
||||||
|
{176, 160, 184, 185, 186, 187, 188, 230, 230, 206, 206, 207, 28, 29, 30, 31}, // SKINCOLOR_PLAGUE
|
||||||
{120, 208, 208, 210, 212, 214, 220, 220, 220, 221, 221, 222, 222, 223, 223, 191}, // SKINCOLOR_AQUA
|
{120, 208, 208, 210, 212, 214, 220, 220, 220, 221, 221, 222, 222, 223, 223, 191}, // SKINCOLOR_AQUA
|
||||||
{210, 213, 220, 220, 220, 216, 216, 221, 221, 221, 222, 222, 223, 223, 191, 31}, // SKINCOLOR_TEAL
|
{210, 213, 220, 220, 220, 216, 216, 221, 221, 221, 222, 222, 223, 223, 191, 31}, // SKINCOLOR_TEAL
|
||||||
{120, 120, 208, 208, 209, 210, 211, 212, 213, 215, 216, 217, 218, 219, 222, 223}, // SKINCOLOR_CYAN
|
{120, 120, 208, 208, 209, 210, 211, 212, 213, 215, 216, 217, 218, 219, 222, 223}, // SKINCOLOR_CYAN
|
||||||
{120, 120, 208, 209, 210, 226, 215, 216, 217, 229, 229, 205, 205, 206, 207, 31}, // SKINCOLOR_JAWZ
|
{120, 120, 208, 209, 210, 226, 215, 216, 217, 229, 229, 205, 205, 206, 207, 31}, // SKINCOLOR_JAWZ
|
||||||
{208, 209, 211, 213, 215, 216, 216, 217, 217, 218, 218, 219, 205, 206, 207, 207}, // SKINCOLOR_CERULEAN
|
{208, 209, 211, 213, 215, 216, 216, 217, 217, 218, 218, 219, 205, 206, 207, 207}, // SKINCOLOR_CERULEAN
|
||||||
{211, 212, 213, 215, 216, 218, 219, 205, 206, 206, 207, 207, 28, 29, 30, 31}, // SKINCOLOR_NAVY
|
{211, 212, 213, 215, 216, 218, 219, 205, 206, 206, 207, 207, 28, 29, 30, 31}, // SKINCOLOR_NAVY
|
||||||
|
{120, 0, 0, 200, 200, 201, 11, 14, 17, 218, 222, 223, 238, 240, 243, 246}, // SKINCOLOR_PLATINUM
|
||||||
{120, 120, 200, 200, 200, 201, 201, 201, 202, 202, 202, 203, 204, 205, 206, 207}, // SKINCOLOR_SLATE
|
{120, 120, 200, 200, 200, 201, 201, 201, 202, 202, 202, 203, 204, 205, 206, 207}, // SKINCOLOR_SLATE
|
||||||
{120, 200, 200, 201, 201, 202, 202, 203, 203, 204, 204, 205, 205, 206, 207, 31}, // SKINCOLOR_STEEL
|
{120, 200, 200, 201, 201, 202, 202, 203, 203, 204, 204, 205, 205, 206, 207, 31}, // SKINCOLOR_STEEL
|
||||||
|
{ 64, 66, 68, 70, 32, 34, 36, 203, 204, 205, 24, 25, 26, 28, 29, 31}, // SKINCOLOR_RUST
|
||||||
{225, 226, 227, 228, 229, 205, 205, 206, 207, 207, 28, 28, 29, 29, 30, 31}, // SKINCOLOR_JET
|
{225, 226, 227, 228, 229, 205, 205, 206, 207, 207, 28, 28, 29, 29, 30, 31}, // SKINCOLOR_JET
|
||||||
{208, 209, 211, 213, 215, 217, 229, 230, 232, 234, 236, 238, 240, 242, 244, 246}, // SKINCOLOR_SAPPHIRE
|
{208, 209, 211, 213, 215, 217, 229, 230, 232, 234, 236, 238, 240, 242, 244, 246}, // SKINCOLOR_SAPPHIRE
|
||||||
{120, 120, 224, 225, 226, 202, 227, 228, 229, 230, 231, 233, 235, 237, 239, 241}, // SKINCOLOR_PERIWINKLE
|
{120, 120, 224, 225, 226, 202, 227, 228, 229, 230, 231, 233, 235, 237, 239, 241}, // SKINCOLOR_PERIWINKLE
|
||||||
{224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 235, 236, 238, 242, 244, 246}, // SKINCOLOR_BLUE
|
{224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 235, 236, 238, 242, 244, 246}, // SKINCOLOR_BLUE
|
||||||
{226, 228, 229, 230, 232, 233, 235, 237, 239, 240, 242, 244, 246, 31, 31, 31}, // SKINCOLOR_BLUEBERRY
|
{226, 228, 229, 230, 232, 233, 235, 237, 239, 240, 242, 244, 246, 31, 31, 31}, // SKINCOLOR_BLUEBERRY
|
||||||
|
{120, 112, 82, 83, 84, 124, 248, 228, 228, 204, 205, 206, 207, 29, 30, 31}, // SKINCOLOR_NOVA
|
||||||
{120, 208, 209, 210, 211, 226, 202, 249, 194, 195, 196, 197, 198, 199, 255, 30}, // SKINCOLOR_PASTEL
|
{120, 208, 209, 210, 211, 226, 202, 249, 194, 195, 196, 197, 198, 199, 255, 30}, // SKINCOLOR_PASTEL
|
||||||
|
{120, 64, 81, 122, 192, 249, 203, 221, 221, 219, 219, 223, 223, 191, 191, 31}, // SKINCOLOR_ULTRAVIOLET
|
||||||
{121, 145, 192, 249, 250, 251, 204, 204, 205, 205, 206, 206, 207, 29, 30, 31}, // SKINCOLOR_DUSK
|
{121, 145, 192, 249, 250, 251, 204, 204, 205, 205, 206, 206, 207, 29, 30, 31}, // SKINCOLOR_DUSK
|
||||||
|
{120, 224, 201, 226, 202, 249, 250, 196, 197, 198, 199, 140, 141, 142, 143, 31}, // SKINCOLOR_MOONSLAM
|
||||||
|
{120, 96, 64, 121, 67, 144, 123, 192, 193, 194, 195, 196, 197, 198, 199, 30}, // SKINCOLOR_BUBBLEGUM
|
||||||
{121, 145, 192, 192, 193, 194, 195, 196, 196, 197, 197, 198, 198, 199, 30, 31}, // SKINCOLOR_PURPLE
|
{121, 145, 192, 192, 193, 194, 195, 196, 196, 197, 197, 198, 198, 199, 30, 31}, // SKINCOLOR_PURPLE
|
||||||
{120, 122, 124, 125, 126, 150, 196, 197, 198, 198, 199, 199, 240, 242, 244, 246}, // SKINCOLOR_FUCHSIA
|
{120, 122, 124, 125, 126, 150, 196, 197, 198, 198, 199, 199, 240, 242, 244, 246}, // SKINCOLOR_FUCHSIA
|
||||||
{120, 120, 176, 176, 177, 6, 8, 10, 249, 250, 196, 197, 198, 199, 143, 31}, // SKINCOLOR_TOXIC
|
{120, 120, 176, 176, 177, 6, 8, 10, 249, 250, 196, 197, 198, 199, 143, 31}, // SKINCOLOR_TOXIC
|
||||||
|
{ 96, 97, 98, 112, 113, 73, 146, 248, 249, 251, 205, 205, 206, 207, 29, 31}, // SKINCOLOR_MAUVE
|
||||||
|
{ 97, 112, 113, 113, 114, 78, 53, 252, 252, 253, 253, 254, 255, 29, 30, 31}, // SKINCOLOR_ROYAL
|
||||||
{121, 145, 192, 248, 249, 250, 251, 252, 252, 253, 253, 254, 254, 255, 30, 31}, // SKINCOLOR_LAVENDER
|
{121, 145, 192, 248, 249, 250, 251, 252, 252, 253, 253, 254, 254, 255, 30, 31}, // SKINCOLOR_LAVENDER
|
||||||
{144, 248, 249, 250, 251, 252, 253, 254, 255, 255, 29, 29, 30, 30, 31, 31}, // SKINCOLOR_BYZANTIUM
|
{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
|
{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
|
{120, 120, 120, 121, 121, 122, 122, 123, 192, 248, 249, 250, 251, 252, 253, 254}, // SKINCOLOR_LILAC
|
||||||
|
{120, 120, 121, 121, 122, 123, 10, 14, 16, 18, 20, 22, 24, 26, 28, 31}, // SKINCOLOR_FAIRY
|
||||||
// MAXSKINCOLORS
|
// 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, 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, 120, 120, 96, 98, 101, 104, 113, 115, 117, 119}, // SKINCOLOR_SUPER2
|
||||||
|
@ -299,6 +346,11 @@ UINT8 colortranslations[MAXTRANSLATIONS][16] = {
|
||||||
{120, 120, 120, 120, 120, 120, 224, 224, 225, 226, 227, 228, 229, 230, 231, 232}, // SKINCOLOR_BSUPER3
|
{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, 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, 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, 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
|
||||||
{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, 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, 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, 120, 120, 176, 176, 160, 162, 164, 166, 168, 170, 172, 175}, // SKINCOLOR_GSUPER3
|
||||||
|
@ -314,11 +366,6 @@ UINT8 colortranslations[MAXTRANSLATIONS][16] = {
|
||||||
{120, 120, 120, 120, 120, 120, 96, 97, 98, 99, 81, 81, 70, 73, 76, 79}, // SKINCOLOR_CSUPER3
|
{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, 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, 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
|
// MAXTRANSLATIONS
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -4317,7 +4364,7 @@ void K_KartPlayerThink(player_t *player, ticcmd_t *cmd)
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
player->mo->colorized = true;
|
player->mo->colorized = true;
|
||||||
player->mo->color = SKINCOLOR_SCARLET;
|
player->mo->color = SKINCOLOR_CRIMSON;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if (player->kartstuff[k_invincibilitytimer]) // setting players to use the star colormap and spawning afterimages
|
else if (player->kartstuff[k_invincibilitytimer]) // setting players to use the star colormap and spawning afterimages
|
||||||
|
@ -8698,13 +8745,13 @@ void K_drawKartHUD(void)
|
||||||
for (c = 1; c < MAXSKINCOLORS; c++)
|
for (c = 1; c < MAXSKINCOLORS; c++)
|
||||||
{
|
{
|
||||||
UINT8 *cm = R_GetTranslationColormap(TC_RAINBOW, c, 0);
|
UINT8 *cm = R_GetTranslationColormap(TC_RAINBOW, c, 0);
|
||||||
V_DrawFixedPatch(x<<FRACBITS, y<<FRACBITS, FRACUNIT, 0, facewantprefix[stplyr->skin], cm);
|
V_DrawFixedPatch(x<<FRACBITS, y<<FRACBITS, FRACUNIT>>1, 0, facewantprefix[stplyr->skin], cm);
|
||||||
|
|
||||||
x += 30;
|
x += 16;
|
||||||
if (x > BASEVIDWIDTH-30)
|
if (x > BASEVIDWIDTH-16)
|
||||||
{
|
{
|
||||||
x = 0;
|
x = 0;
|
||||||
y += 30;
|
y += 16;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue