vivlim/Kart-Public
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Instead of doing productive things, I changed around skincolors again

Browse source 
- Renamed Ivory to White, removed Nickel and old White, and improved Silver and Grey.
- Improved Pink & Ruby.
- Added Ketchup, replaced Canary with Mustard.
- Removed Army.
This commit is contained in:
TehRealSalt 2018-09-13 02:07:00 -04:00
parent a794386d8e
commit eca535d369
3 changed files with 164 additions and 178 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

96
src/dehacked.c
View file

@ -7544,55 +7544,55 @@ static const char *const ML_LIST[16] = {
// Also includes Super colors // Also includes Super colors
static const char *COLOR_ENUMS[] = { // Rejigged for Kart. static const char *COLOR_ENUMS[] = { // Rejigged for Kart.
"NONE", // 00 // SKINCOLOR_NONE "NONE", // 00 // SKINCOLOR_NONE
"IVORY", // 01 // SKINCOLOR_IVORY "WHITE", // 01 // SKINCOLOR_WHITE
"WHITE", // 02 // SKINCOLOR_WHITE "SILVER", // 02 // SKINCOLOR_SILVER
"SILVER", // 03 // SKINCOLOR_SILVER "CLOUDY", // 03 // SKINCOLOR_CLOUDY
"CLOUDY", // 04 // SKINCOLOR_CLOUDY "GREY", // 04 // SKINCOLOR_GREY
"GREY", // 05 // SKINCOLOR_GREY "BLACK", // 05 // SKINCOLOR_BLACK
"NICKEL", // 06 // SKINCOLOR_NICKEL "SALMON", // 06 // SKINCOLOR_SALMON
"BLACK", // 07 // SKINCOLOR_BLACK "PINK", // 07 // SKINCOLOR_PINK
"SALMON", // 08 // SKINCOLOR_SALMON "ROSE", // 08 // SKINCOLOR_ROSE
"PINK", // 09 // SKINCOLOR_PINK "RASPBERRY", // 09 // SKINCOLOR_RASPBERRY
"ROSE", // 10 // SKINCOLOR_ROSE "RED", // 10 // SKINCOLOR_RED
"RASPBERRY", // 11 // SKINCOLOR_RASPBERRY "RUBY", // 11 // SKINCOLOR_RUBY
"RED", // 12 // SKINCOLOR_RED "CRIMSON", // 12 // SKINCOLOR_CRIMSON
"RUBY", // 13 // SKINCOLOR_RUBY "KETCHUP", // 13 // SKINCOLOR_KETCHUP
"CRIMSON", // 14 // SKINCOLOR_CRIMSON "DAWN", // 14 // SKINCOLOR_DAWN
"DAWN", // 15 // SKINCOLOR_DAWN "CREAMSICLE", // 15 // SKINCOLOR_CREAMSICLE
"CREAMSICLE", // 16 // SKINCOLOR_CREAMSICLE "ORANGE", // 16 // SKINCOLOR_ORANGE
"ORANGE", // 17 // SKINCOLOR_ORANGE "PUMPKIN", // 17 // SKINCOLOR_PUMPKIN
"PUMPKIN", // 18 // SKINCOLOR_PUMPKIN "ROSEWOOD", // 18 // SKINCOLOR_ROSEWOOD
"ROSEWOOD", // 19 // SKINCOLOR_ROSEWOOD "BURGUNDY", // 19 // SKINCOLOR_BURGUNDY
"BURGUNDY", // 20 // SKINCOLOR_BURGUNDY "BRONZE", // 20 // SKINCOLOR_BRONZE
"BRONZE", // 21 // SKINCOLOR_BRONZE "SEPIA", // 21 // SKINCOLOR_SEPIA
"SEPIA", // 22 // SKINCOLOR_SEPIA "BEIGE", // 22 // SKINCOLOR_BEIGE
"BEIGE", // 23 // SKINCOLOR_BEIGE "BROWN", // 23 // SKINCOLOR_BROWN
"BROWN", // 24 // SKINCOLOR_BROWN "LEATHER", // 24 // SKINCOLOR_LEATHER
"LEATHER", // 25 // SKINCOLOR_LEATHER "PEACH", // 25 // SKINCOLOR_PEACH
"PEACH", // 26 // SKINCOLOR_PEACH "CARAMEL", // 26 // SKINCOLOR_CARAMEL
"CARAMEL", // 27 // SKINCOLOR_CARAMEL "TANGERINE", // 27 // SKINCOLOR_TANGERINE
"TANGERINE", // 28 // SKINCOLOR_TANGERINE "GOLD", // 28 // SKINCOLOR_GOLD
"GOLD", // 29 // SKINCOLOR_GOLD "VOMIT", // 29 // SKINCOLOR_VOMIT
"VOMIT", // 30 // SKINCOLOR_VOMIT "YELLOW", // 30 // SKINCOLOR_YELLOW
"YELLOW", // 31 // SKINCOLOR_YELLOW "MUSTARD", // 31 // SKINCOLOR_MUSTARD
"CANARY", // 32 // SKINCOLOR_CANARY "OLIVE", // 32 // SKINCOLOR_OLIVE
"OLIVE", // 33 // SKINCOLOR_OLIVE "GARDEN", // 33 // SKINCOLOR_GARDEN
"GARDEN", // 34 // SKINCOLOR_GARDEN "LIME", // 34 // SKINCOLOR_LIME
"LIME", // 35 // SKINCOLOR_LIME "DREAM", // 35 // SKINCOLOR_DREAM
"TEA", // 36 // SKINCOLOR_TEA "TEA", // 36 // SKINCOLOR_TEA
"ARMY", // 37 // SKINCOLOR_ARMY "PISTACHIO", // 37 // SKINCOLOR_PISTACHIO
"PISTACHIO", // 38 // SKINCOLOR_PISTACHIO "MOSS", // 38 // SKINCOLOR_MOSS
"MOSS", // 39 // SKINCOLOR_MOSS "MINT", // 39 // SKINCOLOR_MINT
"MINT", // 40 // SKINCOLOR_MINT "GREEN", // 40 // SKINCOLOR_GREEN
"GREEN", // 41 // SKINCOLOR_GREEN "ROBOHOOD", // 41 // SKINCOLOR_ROBOHOOD
"ROBOHOOD", // 42 // SKINCOLOR_ROBOHOOD "PINETREE", // 42 // SKINCOLOR_PINETREE
"PINETREE", // 43 // SKINCOLOR_PINETREE "EMERALD", // 43 // SKINCOLOR_EMERALD
"EMERALD", // 44 // SKINCOLOR_EMERALD "SWAMP", // 44 // SKINCOLOR_SWAMP
"SWAMP", // 45 // SKINCOLOR_SWAMP "AQUA", // 45 // SKINCOLOR_AQUA
"AQUA", // 46 // SKINCOLOR_AQUA "TEAL", // 46 // SKINCOLOR_TEAL
"TEAL", // 47 // SKINCOLOR_TEAL "CYAN", // 47 // SKINCOLOR_CYAN
"CYAN", // 48 // SKINCOLOR_CYAN "CERULEAN", // 48 // SKINCOLOR_CERULEAN
"CERULEAN", // 49 // SKINCOLOR_CERULEAN "JAWZ", // 49 // SKINCOLOR_JAWZ
"SLATE", // 50 // SKINCOLOR_SLATE "SLATE", // 50 // SKINCOLOR_SLATE
"STEEL", // 51 // SKINCOLOR_STEEL "STEEL", // 51 // SKINCOLOR_STEEL
"PERIWINKLE", // 52 // SKINCOLOR_PERIWINKLE "PERIWINKLE", // 52 // SKINCOLOR_PERIWINKLE

8
src/doomdef.h
View file

@ -232,12 +232,10 @@ extern FILE *logstream;
typedef enum typedef enum
{ {
SKINCOLOR_NONE = 0, SKINCOLOR_NONE = 0,
SKINCOLOR_IVORY,
SKINCOLOR_WHITE, SKINCOLOR_WHITE,
SKINCOLOR_SILVER, SKINCOLOR_SILVER,
SKINCOLOR_CLOUDY, SKINCOLOR_CLOUDY,
SKINCOLOR_GREY, SKINCOLOR_GREY,
SKINCOLOR_NICKEL,
SKINCOLOR_BLACK, SKINCOLOR_BLACK,
SKINCOLOR_SALMON, SKINCOLOR_SALMON,
SKINCOLOR_PINK, SKINCOLOR_PINK,
@ -246,6 +244,7 @@ typedef enum
SKINCOLOR_RED, SKINCOLOR_RED,
SKINCOLOR_RUBY, SKINCOLOR_RUBY,
SKINCOLOR_CRIMSON, SKINCOLOR_CRIMSON,
SKINCOLOR_KETCHUP,
SKINCOLOR_DAWN, SKINCOLOR_DAWN,
SKINCOLOR_CREAMSICLE, SKINCOLOR_CREAMSICLE,
SKINCOLOR_ORANGE, SKINCOLOR_ORANGE,
@ -263,12 +262,12 @@ typedef enum
SKINCOLOR_GOLD, SKINCOLOR_GOLD,
SKINCOLOR_VOMIT, SKINCOLOR_VOMIT,
SKINCOLOR_YELLOW, SKINCOLOR_YELLOW,
SKINCOLOR_CANARY, SKINCOLOR_MUSTARD,
SKINCOLOR_OLIVE, SKINCOLOR_OLIVE,
SKINCOLOR_GARDEN, SKINCOLOR_GARDEN,
SKINCOLOR_LIME, SKINCOLOR_LIME,
SKINCOLOR_DREAM,
SKINCOLOR_TEA, SKINCOLOR_TEA,
SKINCOLOR_ARMY,
SKINCOLOR_PISTACHIO, SKINCOLOR_PISTACHIO,
SKINCOLOR_MOSS, SKINCOLOR_MOSS,
SKINCOLOR_MINT, SKINCOLOR_MINT,
@ -281,6 +280,7 @@ typedef enum
SKINCOLOR_TEAL, SKINCOLOR_TEAL,
SKINCOLOR_CYAN, SKINCOLOR_CYAN,
SKINCOLOR_CERULEAN, SKINCOLOR_CERULEAN,
SKINCOLOR_JAWZ, // Oni's torment
SKINCOLOR_SLATE, SKINCOLOR_SLATE,
SKINCOLOR_STEEL, SKINCOLOR_STEEL,
SKINCOLOR_PERIWINKLE, SKINCOLOR_PERIWINKLE,

238
src/k_kart.c
View file

@ -43,55 +43,55 @@
const char *KartColor_Names[MAXSKINCOLORS] = const char *KartColor_Names[MAXSKINCOLORS] =
{ {
"None", // 00 // SKINCOLOR_NONE "None", // 00 // SKINCOLOR_NONE
"Ivory", // 01 // SKINCOLOR_IVORY "White", // 01 // SKINCOLOR_WHITE
"White", // 02 // SKINCOLOR_WHITE "Silver", // 02 // SKINCOLOR_SILVER
"Silver", // 03 // SKINCOLOR_SILVER "Cloudy", // 03 // SKINCOLOR_CLOUDY
"Cloudy", // 04 // SKINCOLOR_CLOUDY "Grey", // 04 // SKINCOLOR_GREY
"Grey", // 05 // SKINCOLOR_GREY "Black", // 05 // SKINCOLOR_BLACK
"Nickel", // 06 // SKINCOLOR_NICKEL "Salmon", // 06 // SKINCOLOR_SALMON
"Black", // 07 // SKINCOLOR_BLACK "Pink", // 07 // SKINCOLOR_PINK
"Salmon", // 08 // SKINCOLOR_SALMON "Rose", // 08 // SKINCOLOR_ROSE
"Pink", // 09 // SKINCOLOR_PINK "Raspberry", // 09 // SKINCOLOR_RASPBERRY
"Rose", // 10 // SKINCOLOR_ROSE "Red", // 10 // SKINCOLOR_RED
"Raspberry", // 11 // SKINCOLOR_RASPBERRY "Ruby", // 11 // SKINCOLOR_RUBY
"Red", // 12 // SKINCOLOR_RED "Crimson", // 12 // SKINCOLOR_CRIMSON
"Ruby", // 13 // SKINCOLOR_RUBY "Ketchup", // 13 // SKINCOLOR_KETCHUP
"Crimson", // 14 // SKINCOLOR_CRIMSON "Dawn", // 14 // SKINCOLOR_DAWN
"Dawn", // 15 // SKINCOLOR_DAWN "Creamsicle", // 15 // SKINCOLOR_CREAMSICLE
"Creamsicle", // 16 // SKINCOLOR_CREAMSICLE "Orange", // 16 // SKINCOLOR_ORANGE
"Orange", // 17 // SKINCOLOR_ORANGE "Pumpkin", // 17 // SKINCOLOR_PUMPKIN
"Pumpkin", // 18 // SKINCOLOR_PUMPKIN "Rosewood", // 18 // SKINCOLOR_ROSEWOOD
"Rosewood", // 19 // SKINCOLOR_ROSEWOOD "Burgundy", // 19 // SKINCOLOR_BURGUNDY
"Burgundy", // 20 // SKINCOLOR_BURGUNDY "Bronze", // 20 // SKINCOLOR_BRONZE
"Bronze", // 21 // SKINCOLOR_BRONZE "Sepia", // 21 // SKINCOLOR_SEPIA
"Sepia", // 22 // SKINCOLOR_SEPIA "Beige", // 22 // SKINCOLOR_BEIGE
"Beige", // 23 // SKINCOLOR_BEIGE "Brown", // 23 // SKINCOLOR_BROWN
"Brown", // 24 // SKINCOLOR_BROWN "Leather", // 24 // SKINCOLOR_LEATHER
"Leather", // 25 // SKINCOLOR_LEATHER "Peach", // 25 // SKINCOLOR_PEACH
"Peach", // 26 // SKINCOLOR_PEACH "Caramel", // 26 // SKINCOLOR_CARAMEL
"Caramel", // 27 // SKINCOLOR_CARAMEL "Tangerine", // 27 // SKINCOLOR_TANGERINE
"Tangerine", // 28 // SKINCOLOR_TANGERINE "Gold", // 28 // SKINCOLOR_GOLD
"Gold", // 29 // SKINCOLOR_GOLD "Vomit", // 29 // SKINCOLOR_VOMIT
"Vomit", // 30 // SKINCOLOR_VOMIT "Yellow", // 30 // SKINCOLOR_YELLOW
"Yellow", // 31 // SKINCOLOR_YELLOW "Mustard", // 31 // SKINCOLOR_MUSTARD
"Canary", // 32 // SKINCOLOR_CANARY "Olive", // 32 // SKINCOLOR_OLIVE
"Olive", // 33 // SKINCOLOR_OLIVE "Garden", // 33 // SKINCOLOR_GARDEN
"Garden", // 34 // SKINCOLOR_GARDEN "Lime", // 34 // SKINCOLOR_LIME
"Lime", // 35 // SKINCOLOR_LIME "Dream", // 35 // SKINCOLOR_DREAM
"Tea", // 36 // SKINCOLOR_TEA "Tea", // 36 // SKINCOLOR_TEA
"Army", // 37 // SKINCOLOR_ARMY "Pistachio", // 37 // SKINCOLOR_PISTACHIO
"Pistachio", // 38 // SKINCOLOR_PISTACHIO "Moss", // 38 // SKINCOLOR_MOSS
"Moss", // 39 // SKINCOLOR_MOSS "Mint", // 39 // SKINCOLOR_MINT
"Mint", // 40 // SKINCOLOR_MINT "Green", // 40 // SKINCOLOR_GREEN
"Green", // 41 // SKINCOLOR_GREEN "Robo-Hood", // 41 // SKINCOLOR_ROBOHOOD
"Robo-Hood", // 42 // SKINCOLOR_ROBOHOOD "Pinetree", // 42 // SKINCOLOR_PINETREE
"Pinetree", // 43 // SKINCOLOR_PINETREE "Emerald", // 43 // SKINCOLOR_EMERALD
"Emerald", // 44 // SKINCOLOR_EMERALD "Swamp", // 44 // SKINCOLOR_SWAMP
"Swamp", // 45 // SKINCOLOR_SWAMP "Aqua", // 45 // SKINCOLOR_AQUA
"Aqua", // 46 // SKINCOLOR_AQUA "Teal", // 46 // SKINCOLOR_TEAL
"Teal", // 47 // SKINCOLOR_TEAL "Cyan", // 47 // SKINCOLOR_CYAN
"Cyan", // 48 // SKINCOLOR_CYAN "Cerulean", // 48 // SKINCOLOR_CERULEAN
"Cerulean", // 49 // SKINCOLOR_CERULEAN "Jawz", // 49 // SKINCOLOR_JAWZ
"Slate", // 50 // SKINCOLOR_SLATE "Slate", // 50 // SKINCOLOR_SLATE
"Steel", // 51 // SKINCOLOR_STEEL "Steel", // 51 // SKINCOLOR_STEEL
"Periwinkle", // 52 // SKINCOLOR_PERIWINKLE "Periwinkle", // 52 // SKINCOLOR_PERIWINKLE
@ -112,87 +112,86 @@ const char *KartColor_Names[MAXSKINCOLORS] =
const UINT8 KartColor_Opposite[MAXSKINCOLORS*2] = const UINT8 KartColor_Opposite[MAXSKINCOLORS*2] =
{ {
SKINCOLOR_NONE,8, // 00 // SKINCOLOR_NONE SKINCOLOR_NONE,8, // 00 // SKINCOLOR_NONE
SKINCOLOR_BLACK,8, // 01 // SKINCOLOR_IVORY SKINCOLOR_BLACK,8, // 01 // SKINCOLOR_WHITE
SKINCOLOR_NICKEL,8, // 02 // SKINCOLOR_WHITE SKINCOLOR_GREY,8, // 02 // SKINCOLOR_SILVER
SKINCOLOR_GREY,8, // 03 // SKINCOLOR_SILVER SKINCOLOR_CLOUDY,8, // 03 // SKINCOLOR_CLOUDY
SKINCOLOR_CLOUDY,8, // 04 // SKINCOLOR_CLOUDY SKINCOLOR_SILVER,8, // 04 // SKINCOLOR_GREY
SKINCOLOR_SILVER,8, // 05 // SKINCOLOR_GREY SKINCOLOR_WHITE,8, // 05 // SKINCOLOR_BLACK
SKINCOLOR_WHITE,8, // 06 // SKINCOLOR_NICKEL SKINCOLOR_TEA,8, // 06 // SKINCOLOR_SALMON
SKINCOLOR_IVORY,8, // 07 // SKINCOLOR_BLACK SKINCOLOR_PISTACHIO,8, // 07 // SKINCOLOR_PINK
SKINCOLOR_TEA,8, // 08 // SKINCOLOR_SALMON SKINCOLOR_MOSS,8, // 08 // SKINCOLOR_ROSE
SKINCOLOR_ARMY,8, // 09 // SKINCOLOR_PINK SKINCOLOR_MINT,10, // 09 // SKINCOLOR_RASPBERRY
SKINCOLOR_MOSS,8, // 10 // SKINCOLOR_ROSE SKINCOLOR_GREEN,8, // 10 // SKINCOLOR_RED
SKINCOLOR_MINT,10, // 11 // SKINCOLOR_RASPBERRY SKINCOLOR_SAPPHIRE,8, // 11 // SKINCOLOR_RUBY
SKINCOLOR_GREEN,8, // 12 // SKINCOLOR_RED SKINCOLOR_PINETREE,6, // 12 // SKINCOLOR_CRIMSON
SKINCOLOR_EMERALD,6, // 13 // SKINCOLOR_RUBY SKINCOLOR_MUSTARD,6, // 13 // SKINCOLOR_KETCHUP
SKINCOLOR_PINETREE,6, // 14 // SKINCOLOR_CRIMSON SKINCOLOR_DUSK,8, // 14 // SKINCOLOR_DAWN
SKINCOLOR_DUSK,8, // 15 // SKINCOLOR_DAWN SKINCOLOR_PERIWINKLE,8, // 15 // SKINCOLOR_CREAMSICLE
SKINCOLOR_PERIWINKLE,8, // 16 // SKINCOLOR_CREAMSICLE SKINCOLOR_BLUE,8, // 16 // SKINCOLOR_ORANGE
SKINCOLOR_BLUE,8, // 17 // SKINCOLOR_ORANGE SKINCOLOR_BLUEBERRY,8, // 17 // SKINCOLOR_PUMPKIN
SKINCOLOR_BLUEBERRY,8, // 18 // SKINCOLOR_PUMPKIN SKINCOLOR_NAVY,8, // 18 // SKINCOLOR_ROSEWOOD
SKINCOLOR_NAVY,8, // 19 // SKINCOLOR_ROSEWOOD SKINCOLOR_JET,8, // 19 // SKINCOLOR_BURGUNDY
SKINCOLOR_JET,8, // 20 // SKINCOLOR_BURGUNDY SKINCOLOR_AQUA,8, // 20 // SKINCOLOR_BRONZE
SKINCOLOR_STEEL,8, // 21 // SKINCOLOR_BRONZE SKINCOLOR_LEATHER,6, // 21 // SKINCOLOR_SEPIA
SKINCOLOR_LEATHER,6, // 22 // SKINCOLOR_SEPIA SKINCOLOR_BROWN,2, // 22 // SKINCOLOR_BEIGE
SKINCOLOR_BROWN,2, // 23 // SKINCOLOR_BEIGE SKINCOLOR_BEIGE,8, // 23 // SKINCOLOR_BROWN
SKINCOLOR_BEIGE,8, // 24 // SKINCOLOR_BROWN SKINCOLOR_SEPIA,8, // 24 // SKINCOLOR_LEATHER
SKINCOLOR_SEPIA,8, // 25 // SKINCOLOR_LEATHER SKINCOLOR_SLATE,8, // 25 // SKINCOLOR_PEACH
SKINCOLOR_SLATE,8, // 26 // SKINCOLOR_PEACH SKINCOLOR_STEEL,8, // 26 // SKINCOLOR_CARAMEL
SKINCOLOR_TEAL,8, // 27 // SKINCOLOR_CARAMEL SKINCOLOR_LIME,8, // 27 // SKINCOLOR_TANGERINE
SKINCOLOR_LIME,8, // 28 // SKINCOLOR_TANGERINE SKINCOLOR_CYAN,8, // 28 // SKINCOLOR_GOLD
SKINCOLOR_LAVENDER,6, // 29 // SKINCOLOR_GOLD SKINCOLOR_ROBOHOOD,8, // 29 // SKINCOLOR_VOMIT
SKINCOLOR_ROBOHOOD,8, // 30 // SKINCOLOR_VOMIT SKINCOLOR_CERULEAN,8, // 30 // SKINCOLOR_YELLOW
SKINCOLOR_BYZANTIUM,8, // 31 // SKINCOLOR_YELLOW SKINCOLOR_KETCHUP,8, // 31 // SKINCOLOR_MUSTARD
SKINCOLOR_PURPLE,8, // 32 // SKINCOLOR_CANARY SKINCOLOR_TEAL,8, // 32 // SKINCOLOR_OLIVE
SKINCOLOR_INDIGO,8, // 33 // SKINCOLOR_OLIVE SKINCOLOR_LAVENDER,8, // 33 // SKINCOLOR_GARDEN
SKINCOLOR_AQUA,8, // 34 // SKINCOLOR_GARDEN SKINCOLOR_TANGERINE,8, // 34 // SKINCOLOR_LIME
SKINCOLOR_TANGERINE,8, // 35 // SKINCOLOR_LIME SKINCOLOR_BYZANTIUM,6, // 35 // SKINCOLOR_DREAM
SKINCOLOR_SALMON,8, // 36 // SKINCOLOR_TEA SKINCOLOR_SALMON,8, // 36 // SKINCOLOR_TEA
SKINCOLOR_PINK,6, // 37 // SKINCOLOR_ARMY SKINCOLOR_PINK,8, // 37 // SKINCOLOR_PISTACHIO
SKINCOLOR_CYAN,8, // 38 // SKINCOLOR_PISTACHIO SKINCOLOR_ROSE,8, // 38 // SKINCOLOR_MOSS
SKINCOLOR_ROSE,8, // 39 // SKINCOLOR_MOSS SKINCOLOR_RASPBERRY,6, // 39 // SKINCOLOR_MINT
SKINCOLOR_RASPBERRY,6, // 40 // SKINCOLOR_MINT SKINCOLOR_RED,8, // 40 // SKINCOLOR_GREEN
SKINCOLOR_RED,8, // 41 // SKINCOLOR_GREEN SKINCOLOR_VOMIT,8, // 41 // SKINCOLOR_ROBOHOOD
SKINCOLOR_VOMIT,8, // 42 // SKINCOLOR_ROBOHOOD SKINCOLOR_CRIMSON,8, // 42 // SKINCOLOR_PINETREE
SKINCOLOR_CRIMSON,8, // 43 // SKINCOLOR_PINETREE SKINCOLOR_PURPLE,8, // 43 // SKINCOLOR_EMERALD
SKINCOLOR_RUBY,8, // 44 // SKINCOLOR_EMERALD SKINCOLOR_INDIGO,6, // 44 // SKINCOLOR_SWAMP
SKINCOLOR_SAPPHIRE,8, // 45 // SKINCOLOR_SWAMP SKINCOLOR_BRONZE,7, // 45 // SKINCOLOR_AQUA
SKINCOLOR_GARDEN,10, // 46 // SKINCOLOR_AQUA SKINCOLOR_OLIVE,10, // 46 // SKINCOLOR_TEAL
SKINCOLOR_CARAMEL,8, // 47 // SKINCOLOR_TEAL SKINCOLOR_GOLD,8, // 47 // SKINCOLOR_CYAN
SKINCOLOR_PISTACHIO,6, // 48 // SKINCOLOR_CYAN SKINCOLOR_YELLOW,8, // 48 // SKINCOLOR_CERULEAN
SKINCOLOR_LILAC,8, // 49 // SKINCOLOR_CERULEAN SKINCOLOR_LILAC,6, // 49 // SKINCOLOR_JAWZ
SKINCOLOR_PEACH,8, // 50 // SKINCOLOR_SLATE SKINCOLOR_PEACH,8, // 50 // SKINCOLOR_SLATE
SKINCOLOR_BRONZE,10, // 51 // SKINCOLOR_STEEL SKINCOLOR_CARAMEL,8, // 51 // SKINCOLOR_STEEL
SKINCOLOR_CREAMSICLE,8, // 52 // SKINCOLOR_PERIWINKLE SKINCOLOR_CREAMSICLE,8, // 52 // SKINCOLOR_PERIWINKLE
SKINCOLOR_ORANGE,8, // 53 // SKINCOLOR_BLUE SKINCOLOR_ORANGE,8, // 53 // SKINCOLOR_BLUE
SKINCOLOR_SWAMP,8, // 54 // SKINCOLOR_SAPPHIRE SKINCOLOR_RUBY,8, // 54 // SKINCOLOR_SAPPHIRE
SKINCOLOR_PUMPKIN,8, // 55 // SKINCOLOR_BLUEBERRY SKINCOLOR_PUMPKIN,8, // 55 // SKINCOLOR_BLUEBERRY
SKINCOLOR_ROSEWOOD,8, // 56 // SKINCOLOR_NAVY SKINCOLOR_ROSEWOOD,8, // 56 // SKINCOLOR_NAVY
SKINCOLOR_BURGUNDY,6, // 57 // SKINCOLOR_JET SKINCOLOR_BURGUNDY,6, // 57 // SKINCOLOR_JET
SKINCOLOR_DAWN,8, // 58 // SKINCOLOR_DUSK SKINCOLOR_DAWN,8, // 58 // SKINCOLOR_DUSK
SKINCOLOR_CANARY,8, // 59 // SKINCOLOR_PURPLE SKINCOLOR_EMERALD,8, // 59 // SKINCOLOR_PURPLE
SKINCOLOR_GOLD,10, // 60 // SKINCOLOR_LAVENDER SKINCOLOR_GARDEN,8, // 60 // SKINCOLOR_LAVENDER
SKINCOLOR_OLIVE,8, // 61 // SKINCOLOR_INDIGO SKINCOLOR_SWAMP,6, // 61 // SKINCOLOR_INDIGO
SKINCOLOR_YELLOW,8, // 62 // SKINCOLOR_BYZANTIUM SKINCOLOR_DREAM,8, // 62 // SKINCOLOR_BYZANTIUM
SKINCOLOR_CERULEAN,8 // 63 // SKINCOLOR_LILAC SKINCOLOR_JAWZ,6 // 63 // SKINCOLOR_LILAC
}; };
UINT8 colortranslations[MAXSKINCOLORS][16] = { UINT8 colortranslations[MAXSKINCOLORS][16] = {
{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, // SKINCOLOR_NONE { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, // SKINCOLOR_NONE
{120, 120, 120, 120, 0, 1, 3, 4, 6, 7, 10, 14, 18, 22, 25, 28}, // SKINCOLOR_IVORY {120, 120, 120, 120, 0, 1, 3, 4, 6, 7, 10, 14, 18, 22, 25, 28}, // SKINCOLOR_WHITE
{120, 120, 0, 1, 3, 4, 6, 7, 9, 11, 13, 16, 19, 23, 26, 29}, // SKINCOLOR_WHITE
{ 0, 1, 3, 5, 6, 8, 10, 11, 13, 15, 16, 18, 20, 24, 27, 30}, // SKINCOLOR_SILVER { 0, 1, 3, 5, 6, 8, 10, 11, 13, 15, 16, 18, 20, 24, 27, 30}, // SKINCOLOR_SILVER
{ 1, 3, 5, 7, 9, 11, 13, 15, 17, 19, 21, 23, 25, 27, 29, 31}, // SKINCOLOR_CLOUDY { 1, 3, 5, 7, 9, 11, 13, 15, 17, 19, 21, 23, 25, 27, 29, 31}, // SKINCOLOR_CLOUDY
{ 8, 9, 10, 12, 13, 15, 16, 19, 19, 20, 21, 23, 25, 27, 29, 31}, // SKINCOLOR_GREY { 8, 9, 10, 12, 13, 15, 16, 19, 19, 20, 21, 23, 25, 27, 29, 31}, // SKINCOLOR_GREY
{ 16, 16, 17, 18, 19, 20, 21, 23, 24, 25, 26, 27, 28, 29, 30, 31}, // SKINCOLOR_NICKEL
{ 16, 17, 19, 21, 22, 24, 26, 27, 27, 28, 28, 29, 29, 30, 30, 31}, // SKINCOLOR_BLACK { 16, 17, 19, 21, 22, 24, 26, 27, 27, 28, 28, 29, 29, 30, 30, 31}, // SKINCOLOR_BLACK
{120, 120, 120, 121, 121, 122, 122, 123, 124, 125, 126, 128, 129, 131, 133, 135}, // SKINCOLOR_SALMON {120, 120, 120, 121, 121, 122, 122, 123, 124, 125, 126, 128, 129, 131, 133, 135}, // SKINCOLOR_SALMON
{121, 121, 121, 121, 121, 122, 144, 145, 146, 147, 148, 149, 150, 150, 150, 151}, // SKINCOLOR_PINK {121, 121, 122, 144, 144, 145, 145, 146, 147, 148, 149, 150, 151, 134, 136, 138}, // 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
{120, 121, 122, 123, 124, 125, 126, 127, 128, 130, 131, 133, 134, 136, 137, 139}, // SKINCOLOR_RASPBERRY {120, 121, 122, 123, 124, 125, 126, 127, 128, 130, 131, 133, 134, 136, 137, 139}, // SKINCOLOR_RASPBERRY
{125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140}, // SKINCOLOR_RED {125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140}, // SKINCOLOR_RED
{120, 121, 144, 146, 149, 132, 132, 133, 134, 135, 197, 197, 198, 198, 199, 255}, // SKINCOLOR_RUBY {121, 122, 145, 146, 147, 149, 131, 132, 133, 134, 135, 197, 197, 198, 199, 255}, // SKINCOLOR_RUBY
{130, 131, 132, 133, 134, 136, 137, 138, 139, 139, 140, 140, 141, 141, 142, 143}, // SKINCOLOR_CRIMSON {130, 131, 132, 133, 134, 136, 137, 138, 139, 139, 140, 140, 141, 141, 142, 143}, // SKINCOLOR_CRIMSON
{104, 113, 113, 85, 86, 88, 128, 129, 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
{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
@ -210,12 +209,12 @@ UINT8 colortranslations[MAXSKINCOLORS][16] = {
{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
{121, 144, 145, 72, 73, 84, 114, 115, 107, 108, 109, 183, 223, 207, 30, 246}, // SKINCOLOR_VOMIT {121, 144, 145, 72, 73, 84, 114, 115, 107, 108, 109, 183, 223, 207, 30, 246}, // SKINCOLOR_VOMIT
{ 96, 97, 98, 100, 101, 102, 104, 113, 114, 115, 116, 117, 118, 119, 156, 159}, // SKINCOLOR_YELLOW { 96, 97, 98, 100, 101, 102, 104, 113, 114, 115, 116, 117, 118, 119, 156, 159}, // SKINCOLOR_YELLOW
{ 96, 97, 99, 100, 102, 104, 105, 105, 106, 107, 107, 108, 109, 109, 110, 111}, // SKINCOLOR_CANARY { 96, 98, 99, 112, 113, 114, 114, 106, 106, 107, 107, 108, 108, 109, 110, 111}, // SKINCOLOR_MUSTARD
{105, 105, 105, 106, 106, 107, 107, 108, 108, 109, 109, 110, 110, 111, 111, 31}, // SKINCOLOR_OLIVE {105, 105, 105, 106, 106, 107, 107, 108, 108, 109, 109, 110, 110, 111, 111, 31}, // SKINCOLOR_OLIVE
{ 98, 99, 112, 101, 113, 114, 106, 179, 180, 180, 181, 182, 183, 173, 174, 175}, // SKINCOLOR_GARDEN { 98, 99, 112, 101, 113, 114, 106, 179, 180, 180, 181, 182, 183, 173, 174, 175}, // SKINCOLOR_GARDEN
{ 96, 97, 99, 100, 102, 104, 160, 162, 164, 166, 168, 171, 223, 223, 207, 31}, // SKINCOLOR_LIME { 96, 97, 99, 100, 102, 104, 160, 162, 164, 166, 168, 171, 223, 223, 207, 31}, // SKINCOLOR_LIME
{ 96, 98, 99, 112, 113, 178, 179, 165, 203, 203, 204, 204, 205, 205, 206, 207}, // SKINCOLOR_DREAM
{120, 120, 176, 176, 176, 177, 177, 178, 178, 179, 180, 180, 181, 181, 182, 183}, // SKINCOLOR_TEA {120, 120, 176, 176, 176, 177, 177, 178, 178, 179, 180, 180, 181, 181, 182, 183}, // SKINCOLOR_TEA
{176, 176, 176, 177, 177, 178, 178, 179, 179, 180, 180, 181, 181, 182, 182, 183}, // SKINCOLOR_ARMY
{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
{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
@ -228,6 +227,7 @@ UINT8 colortranslations[MAXSKINCOLORS][16] = {
{210, 213, 220, 220, 220, 221, 221, 221, 221, 222, 222, 222, 223, 223, 191, 31}, // SKINCOLOR_TEAL {210, 213, 220, 220, 220, 221, 221, 221, 221, 222, 222, 222, 223, 223, 191, 31}, // SKINCOLOR_TEAL
{120, 208, 209, 210, 211, 212, 213, 215, 216, 216, 216, 217, 217, 218, 218, 219}, // SKINCOLOR_CYAN {120, 208, 209, 210, 211, 212, 213, 215, 216, 216, 216, 217, 217, 218, 218, 219}, // SKINCOLOR_CYAN
{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
{120, 120, 208, 209, 210, 226, 215, 216, 217, 229, 229, 205, 205, 206, 207, 31}, // SKINCOLOR_JAWZ
{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
{120, 224, 225, 226, 226, 227, 228, 228, 229, 230, 231, 234, 235, 237, 239, 241}, // SKINCOLOR_PERIWINKLE {120, 224, 225, 226, 226, 227, 228, 228, 229, 230, 231, 234, 235, 237, 239, 241}, // SKINCOLOR_PERIWINKLE
@ -243,9 +243,9 @@ UINT8 colortranslations[MAXSKINCOLORS][16] = {
{192, 248, 249, 250, 251, 252, 253, 254, 255, 255, 29, 29, 30, 30, 31, 31}, // SKINCOLOR_BYZANTIUM {192, 248, 249, 250, 251, 252, 253, 254, 255, 255, 29, 29, 30, 30, 31, 31}, // SKINCOLOR_BYZANTIUM
{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
/* Removed Colours /* Removed Colours
{120, 121, 123, 124, 126, 127, 129, 130, 132, 133, 135, 136, 138, 139, 141, 143}, // SKINCOLOR_RUBY, removed for other colors {120, 121, 123, 124, 126, 127, 129, 130, 132, 133, 135, 136, 138, 139, 141, 143}, // old SKINCOLOR_RUBY, removed for other colors
{ 80, 81, 83, 85, 86, 88, 90, 91, 93, 95, 152, 153, 154, 156, 157, 159}, // SKINCOLOR_AMBER, removed for other colors { 80, 81, 83, 85, 86, 88, 90, 91, 93, 95, 152, 153, 154, 156, 157, 159}, // SKINCOLOR_AMBER, removed for other colors
{224, 225, 226, 228, 229, 231, 232, 234, 235, 237, 238, 240, 241, 243, 244, 246}, // SKINCOLOR_SAPPHIRE, removed for other colors {224, 225, 226, 228, 229, 231, 232, 234, 235, 237, 238, 240, 241, 243, 244, 246}, // old SKINCOLOR_SAPPHIRE, removed for other colors
{160, 160, 160, 184, 184, 184, 185, 185, 185, 186, 187, 187, 188, 188, 189, 190}, // SKINCOLOR_JADE, removed for other colors {160, 160, 160, 184, 184, 184, 185, 185, 185, 186, 187, 187, 188, 188, 189, 190}, // SKINCOLOR_JADE, removed for other colors
{224, 225, 226, 212, 213, 213, 214, 215, 220, 221, 172, 222, 173, 223, 174, 175}, // SKINCOLOR_FROST, merged into Aqua {224, 225, 226, 212, 213, 213, 214, 215, 220, 221, 172, 222, 173, 223, 174, 175}, // SKINCOLOR_FROST, merged into Aqua
{ 72, 73, 74, 75, 76, 77, 78, 79, 48, 49, 50, 51, 52, 53, 54, 55}, // SKINCOLOR_CARAMEL, new Caramel was previously Shiny Caramel { 72, 73, 74, 75, 76, 77, 78, 79, 48, 49, 50, 51, 52, 53, 54, 55}, // SKINCOLOR_CARAMEL, new Caramel was previously Shiny Caramel
@ -2215,7 +2215,6 @@ static void K_SpawnDriftSparks(player_t *player)
{ {
fixed_t newx; fixed_t newx;
fixed_t newy; fixed_t newy;
//fixed_t ground;
mobj_t *spark; mobj_t *spark;
angle_t travelangle; angle_t travelangle;
INT32 i; INT32 i;
@ -2233,25 +2232,12 @@ static void K_SpawnDriftSparks(player_t *player)
if (!player->kartstuff[k_drift] || player->kartstuff[k_driftcharge] < K_GetKartDriftSparkValue(player)) if (!player->kartstuff[k_drift] || player->kartstuff[k_driftcharge] < K_GetKartDriftSparkValue(player))
return; return;
/*if (player->mo->eflags & MFE_VERTICALFLIP)
ground = player->mo->ceilingz - FixedMul(mobjinfo[MT_DRIFTSPARK].height, player->mo->scale);
else
ground = player->mo->floorz;*/
travelangle = player->mo->angle-(ANGLE_45/5)*player->kartstuff[k_drift]; travelangle = player->mo->angle-(ANGLE_45/5)*player->kartstuff[k_drift];
for (i = 0; i < 2; i++) for (i = 0; i < 2; i++)
{ {
newx = player->mo->x + P_ReturnThrustX(player->mo, travelangle + ((i&1) ? -1 : 1)*ANGLE_135, FixedMul(32*FRACUNIT, player->mo->scale)); newx = player->mo->x + P_ReturnThrustX(player->mo, travelangle + ((i&1) ? -1 : 1)*ANGLE_135, FixedMul(32*FRACUNIT, player->mo->scale));
newy = player->mo->y + P_ReturnThrustY(player->mo, travelangle + ((i&1) ? -1 : 1)*ANGLE_135, FixedMul(32*FRACUNIT, player->mo->scale)); newy = player->mo->y + P_ReturnThrustY(player->mo, travelangle + ((i&1) ? -1 : 1)*ANGLE_135, FixedMul(32*FRACUNIT, player->mo->scale));
/*#ifdef ESLOPE
if (player->mo->standingslope)
{
ground = P_GetZAt(player->mo->standingslope, newx, newy);
if (player->mo->eflags & MFE_VERTICALFLIP)
ground -= FixedMul(mobjinfo[MT_DRIFTSPARK].height, player->mo->scale);
}
#endif*/
spark = P_SpawnMobj(newx, newy, player->mo->z, MT_DRIFTSPARK); spark = P_SpawnMobj(newx, newy, player->mo->z, MT_DRIFTSPARK);
P_SetTarget(&spark->target, player->mo); P_SetTarget(&spark->target, player->mo);