From 3184d2a7b05be71d988b1e1e18627588f2307491 Mon Sep 17 00:00:00 2001 From: TehRealSalt Date: Mon, 2 Jul 2018 13:54:01 -0400 Subject: [PATCH] Removed Amber & Jade, added Canary & Lime, changed Blueberry & Mint --- src/dehacked.c | 40 +++++++++---------- src/doomdef.h | 4 +- src/hardware/hw_md2.c | 12 +++--- src/k_kart.c | 89 ++++++++++++++++++++++--------------------- 4 files changed, 73 insertions(+), 72 deletions(-) diff --git a/src/dehacked.c b/src/dehacked.c index 2684dff2..3af497cd 100644 --- a/src/dehacked.c +++ b/src/dehacked.c @@ -7463,31 +7463,31 @@ static const char *COLOR_ENUMS[] = { // Rejigged for Kart. "CRIMSON", // 14 // SKINCOLOR_CRIMSON "DAWN", // 15 // SKINCOLOR_DAWN "ORANGE", // 16 // SKINCOLOR_ORANGE - "AMBER", // 17 // SKINCOLOR_AMBER - "PUMPKIN", // 18 // SKINCOLOR_PUMPKIN - "BRONZE", // 19 // SKINCOLOR_BRONZE - "ROSEWOOD", // 20 // SKINCOLOR_ROSEWOOD - "BURGUNDY", // 21 // SKINCOLOR_BURGUNDY - "SEPIA", // 22 // SKINCOLOR_SEPIA - "BEIGE", // 23 // SKINCOLOR_BEIGE - "BROWN", // 24 // SKINCOLOR_BROWN - "LEATHER", // 25 // SKINCOLOR_LEATHER - "TANGERINE", // 26 // SKINCOLOR_TANGERINE - "YELLOW", // 27 // SKINCOLOR_YELLOW + "PUMPKIN", // 17 // SKINCOLOR_PUMPKIN + "BRONZE", // 18 // SKINCOLOR_BRONZE + "ROSEWOOD", // 19 // SKINCOLOR_ROSEWOOD + "BURGUNDY", // 20 // SKINCOLOR_BURGUNDY + "SEPIA", // 21 // SKINCOLOR_SEPIA + "BEIGE", // 22 // SKINCOLOR_BEIGE + "BROWN", // 23 // SKINCOLOR_BROWN + "LEATHER", // 24 // SKINCOLOR_LEATHER + "TANGERINE", // 25 // SKINCOLOR_TANGERINE + "YELLOW", // 26 // SKINCOLOR_YELLOW + "CANARY", // 27 // SKINCOLOR_CANARY "PEACH", // 28 // SKINCOLOR_PEACH "CREAMSICLE", // 29 // SKINCOLOR_CREAMSICLE "GOLD", // 30 // SKINCOLOR_GOLD "CARAMEL", // 31 // SKINCOLOR_CARAMEL "VOMIT", // 32 // SKINCOLOR_VOMIT - "GARDEN", // 33 // SKINCOLOR_GARDEN - "TEA", // 34 // SKINCOLOR_TEA - "ARMY", // 35 // SKINCOLOR_ARMY - "PISTACHIO", // 36 // SKINCOLOR_PISTACHIO - "ROBOHOOD", // 37 // SKINCOLOR_ROBOHOOD - "OLIVE", // 38 // SKINCOLOR_OLIVE - "MOSS", // 39 // SKINCOLOR_MOSS - "MINT", // 40 // SKINCOLOR_MINT - "JADE", // 41 // SKINCOLOR_JADE + "LIME", // 33 // SKINCOLOR_LIME + "GARDEN", // 34 // SKINCOLOR_GARDEN + "TEA", // 35 // SKINCOLOR_TEA + "ARMY", // 36 // SKINCOLOR_ARMY + "PISTACHIO", // 37 // SKINCOLOR_PISTACHIO + "ROBOHOOD", // 38 // SKINCOLOR_ROBOHOOD + "OLIVE", // 39 // SKINCOLOR_OLIVE + "MOSS", // 40 // SKINCOLOR_MOSS + "MINT", // 41 // SKINCOLOR_MINT "EMERALD", // 42 // SKINCOLOR_EMERALD "GREEN", // 43 // SKINCOLOR_GREEN "PINETREE", // 44 // SKINCOLOR_PINETREE diff --git a/src/doomdef.h b/src/doomdef.h index 3d6ee2f4..70198bfe 100644 --- a/src/doomdef.h +++ b/src/doomdef.h @@ -248,7 +248,6 @@ typedef enum SKINCOLOR_CRIMSON, SKINCOLOR_DAWN, SKINCOLOR_ORANGE, - SKINCOLOR_AMBER, SKINCOLOR_PUMPKIN, SKINCOLOR_BRONZE, SKINCOLOR_ROSEWOOD, @@ -259,11 +258,13 @@ typedef enum SKINCOLOR_LEATHER, SKINCOLOR_TANGERINE, SKINCOLOR_YELLOW, + SKINCOLOR_CANARY, SKINCOLOR_PEACH, SKINCOLOR_CREAMSICLE, SKINCOLOR_GOLD, SKINCOLOR_CARAMEL, SKINCOLOR_VOMIT, + SKINCOLOR_LIME, SKINCOLOR_GARDEN, SKINCOLOR_TEA, SKINCOLOR_ARMY, @@ -272,7 +273,6 @@ typedef enum SKINCOLOR_OLIVE, SKINCOLOR_MOSS, SKINCOLOR_MINT, - SKINCOLOR_JADE, SKINCOLOR_EMERALD, SKINCOLOR_GREEN, SKINCOLOR_PINETREE, diff --git a/src/hardware/hw_md2.c b/src/hardware/hw_md2.c index 02ad128c..41007fd5 100644 --- a/src/hardware/hw_md2.c +++ b/src/hardware/hw_md2.c @@ -1013,9 +1013,6 @@ static void HWR_CreateBlendedTexture(GLPatch_t *gpatch, GLPatch_t *blendgpatch, case SKINCOLOR_ORANGE: blendcolor = V_GetColor(87); break; - case SKINCOLOR_AMBER: - blendcolor = V_GetColor(91); - break; case SKINCOLOR_PUMPKIN: blendcolor = V_GetColor(95); break; @@ -1046,6 +1043,9 @@ static void HWR_CreateBlendedTexture(GLPatch_t *gpatch, GLPatch_t *blendgpatch, case SKINCOLOR_YELLOW: blendcolor = V_GetColor(104); break; + case SKINCOLOR_CANARY: + blendcolor = V_GetColor(91); + break; case SKINCOLOR_PEACH: blendcolor = V_GetColor(71); break; @@ -1061,6 +1061,9 @@ static void HWR_CreateBlendedTexture(GLPatch_t *gpatch, GLPatch_t *blendgpatch, case SKINCOLOR_VOMIT: blendcolor = V_GetColor(114); break; + case SKINCOLOR_LIME: + blendcolor = V_GetColor(114); + break; case SKINCOLOR_GARDEN: blendcolor = V_GetColor(179); break; @@ -1085,9 +1088,6 @@ static void HWR_CreateBlendedTexture(GLPatch_t *gpatch, GLPatch_t *blendgpatch, case SKINCOLOR_MINT: blendcolor = V_GetColor(163); break; - case SKINCOLOR_JADE: - blendcolor = V_GetColor(185); - break; case SKINCOLOR_EMERALD: blendcolor = V_GetColor(187); break; diff --git a/src/k_kart.c b/src/k_kart.c index 81eebb2b..cf3a064f 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -57,7 +57,6 @@ const char *KartColor_Names[MAXSKINCOLORS] = "Crimson", // 14 // SKINCOLOR_CRIMSON "Dawn", // 15 // SKINCOLOR_DAWN "Orange", // 16 // SKINCOLOR_ORANGE - "Amber", // 17 // SKINCOLOR_AMBER "Pumpkin", // 18 // SKINCOLOR_PUMPKIN "Bronze", // 19 // SKINCOLOR_BRONZE "Rosewood", // 20 // SKINCOLOR_ROSEWOOD @@ -68,20 +67,21 @@ const char *KartColor_Names[MAXSKINCOLORS] = "Leather", // 25 // SKINCOLOR_LEATHER "Tangerine", // 26 // SKINCOLOR_TANGERINE "Yellow", // 27 // SKINCOLOR_YELLOW - "Peach", // 28 // SKINCOLOR_PEACH - "Creamsicle", // 29 // SKINCOLOR_CREAMSICLE - "Gold", // 30 // SKINCOLOR_GOLD - "Caramel", // 31 // SKINCOLOR_CARAMEL - "Vomit", // 32 // SKINCOLOR_VOMIT - "Garden", // 33 // SKINCOLOR_GARDEN - "Tea", // 34 // SKINCOLOR_TEA - "Army", // 35 // SKINCOLOR_ARMY - "Pistachio", // 36 // SKINCOLOR_PISTACHIO - "Robo-Hood", // 37 // SKINCOLOR_ROBOHOOD - "Olive", // 38 // SKINCOLOR_OLIVE - "Moss", // 39 // SKINCOLOR_MOSS + "Canary", // 28 // SKINCOLOR_CANARY + "Peach", // 29 // SKINCOLOR_PEACH + "Creamsicle", // 30 // SKINCOLOR_CREAMSICLE + "Gold", // 31 // SKINCOLOR_GOLD + "Caramel", // 32 // SKINCOLOR_CARAMEL + "Vomit", // 33 // SKINCOLOR_VOMIT + "Lime", // 33 // SKINCOLOR_LIME + "Garden", // 34 // SKINCOLOR_GARDEN + "Tea", // 35 // SKINCOLOR_TEA + "Army", // 36 // SKINCOLOR_ARMY + "Pistachio", // 37 // SKINCOLOR_PISTACHIO + "Robo-Hood", // 38 // SKINCOLOR_ROBOHOOD + "Olive", // 39 // SKINCOLOR_OLIVE + "Moss", // 40 // SKINCOLOR_MOSS "Mint", // 40 // SKINCOLOR_MINT - "Jade", // 41 // SKINCOLOR_JADE "Emerald", // 42 // SKINCOLOR_EMERALD "Green", // 43 // SKINCOLOR_GREEN "Pinetree", // 44 // SKINCOLOR_PINETREE @@ -120,37 +120,37 @@ const UINT8 KartColor_Opposite[MAXSKINCOLORS*2] = SKINCOLOR_SWAMP,8, // 08 // SKINCOLOR_SALMON SKINCOLOR_ARMY,8, // 09 // SKINCOLOR_PINK SKINCOLOR_PINETREE,8, // 10 // SKINCOLOR_RASPBERRY - SKINCOLOR_JADE,8, // 11 // SKINCOLOR_RUBY + SKINCOLOR_EMERALD,8, // 11 // SKINCOLOR_RUBY SKINCOLOR_GREEN,8, // 12 // SKINCOLOR_RED SKINCOLOR_MOSS,8, // 13 // SKINCOLOR_ROSE SKINCOLOR_MINT,8, // 14 // SKINCOLOR_CRIMSON SKINCOLOR_NAVY,8, // 15 // SKINCOLOR_DAWN SKINCOLOR_BLUE,8, // 16 // SKINCOLOR_ORANGE - SKINCOLOR_SAPPHIRE,8, // 17 // SKINCOLOR_AMBER - SKINCOLOR_PERIWINKLE,8, // 18 // SKINCOLOR_PUMPKIN - SKINCOLOR_STEEL,8, // 19 // SKINCOLOR_BRONZE - SKINCOLOR_STEEL,8, // 20 // SKINCOLOR_ROSEWOOD - SKINCOLOR_SLATE,8, // 21 // SKINCOLOR_BURGUNDY - SKINCOLOR_LEATHER,8, // 22 // SKINCOLOR_SEPIA - SKINCOLOR_BROWN,8, // 23 // SKINCOLOR_BEIGE - SKINCOLOR_BEIGE,8, // 24 // SKINCOLOR_BROWN - SKINCOLOR_SEPIA,8, // 25 // SKINCOLOR_LEATHER - SKINCOLOR_INDIGO,8, // 26 // SKINCOLOR_TANGERINE - SKINCOLOR_INDIGO,8, // 27 // SKINCOLOR_YELLOW + SKINCOLOR_PERIWINKLE,8, // 17 // SKINCOLOR_PUMPKIN + SKINCOLOR_STEEL,8, // 18 // SKINCOLOR_BRONZE + SKINCOLOR_STEEL,8, // 19 // SKINCOLOR_ROSEWOOD + SKINCOLOR_SLATE,8, // 20 // SKINCOLOR_BURGUNDY + SKINCOLOR_LEATHER,8, // 21 // SKINCOLOR_SEPIA + SKINCOLOR_BROWN,8, // 22 // SKINCOLOR_BEIGE + SKINCOLOR_BEIGE,8, // 23 // SKINCOLOR_BROWN + SKINCOLOR_SEPIA,8, // 24 // SKINCOLOR_LEATHER + SKINCOLOR_INDIGO,8, // 25 // SKINCOLOR_TANGERINE + SKINCOLOR_INDIGO,8, // 26 // SKINCOLOR_YELLOW + SKINCOLOR_INDIGO,8, // 27 // SKINCOLOR_CANARY SKINCOLOR_BROWN,8, // 28 // SKINCOLOR_PEACH SKINCOLOR_BLUEBERRY,8, // 29 // SKINCOLOR_CREAMSICLE SKINCOLOR_LAVENDER,8, // 30 // SKINCOLOR_GOLD SKINCOLOR_BEIGE,8, // 31 // SKINCOLOR_CARAMEL SKINCOLOR_PURPLE,8, // 32 // SKINCOLOR_VOMIT - SKINCOLOR_BYZANTIUM,8, // 33 // SKINCOLOR_GARDEN - SKINCOLOR_LAVENDER,8, // 34 // SKINCOLOR_TEA - SKINCOLOR_LAVENDER,8, // 35 // SKINCOLOR_ARMY - SKINCOLOR_PURPLE,8, // 36 // SKINCOLOR_PISTACHIO - SKINCOLOR_LILAC,8, // 37 // SKINCOLOR_ROBOHOOD - SKINCOLOR_LILAC,8, // 38 // SKINCOLOR_OLIVE - SKINCOLOR_LAVENDER,8, // 39 // SKINCOLOR_MOSS - SKINCOLOR_CRIMSON,8, // 40 // SKINCOLOR_MINT - SKINCOLOR_RUBY,8, // 41 // SKINCOLOR_JADE + SKINCOLOR_PURPLE,8, // 33 // SKINCOLOR_LIME + SKINCOLOR_BYZANTIUM,8, // 34 // SKINCOLOR_GARDEN + SKINCOLOR_LAVENDER,8, // 35 // SKINCOLOR_TEA + SKINCOLOR_LAVENDER,8, // 36 // SKINCOLOR_ARMY + SKINCOLOR_PURPLE,8, // 37 // SKINCOLOR_PISTACHIO + SKINCOLOR_LILAC,8, // 38 // SKINCOLOR_ROBOHOOD + SKINCOLOR_LILAC,8, // 39 // SKINCOLOR_OLIVE + SKINCOLOR_LAVENDER,8, // 40 // SKINCOLOR_MOSS + SKINCOLOR_CRIMSON,8, // 41 // SKINCOLOR_MINT SKINCOLOR_RUBY,8, // 42 // SKINCOLOR_EMERALD SKINCOLOR_RED,8, // 43 // SKINCOLOR_GREEN SKINCOLOR_RASPBERRY,8, // 44 // SKINCOLOR_PINETREE @@ -163,7 +163,7 @@ const UINT8 KartColor_Opposite[MAXSKINCOLORS*2] = SKINCOLOR_RED,8, // 51 // SKINCOLOR_TEAL SKINCOLOR_PEACH,8, // 52 // SKINCOLOR_STEEL SKINCOLOR_ORANGE,8, // 53 // SKINCOLOR_BLUE - SKINCOLOR_AMBER,8, // 54 // SKINCOLOR_SAPPHIRE + SKINCOLOR_ORANGE,8, // 54 // SKINCOLOR_SAPPHIRE SKINCOLOR_DAWN,8, // 55 // SKINCOLOR_NAVY SKINCOLOR_CREAMSICLE,8, // 56 // SKINCOLOR_BLUEBERRY SKINCOLOR_SLATE,8, // 57 // SKINCOLOR_JET @@ -193,7 +193,6 @@ UINT8 colortranslations[MAXSKINCOLORS][16] = { {130, 131, 132, 133, 134, 136, 137, 138, 139, 139, 140, 140, 141, 141, 142, 143}, // SKINCOLOR_CRIMSON {120, 121, 122, 123, 124, 147, 147, 148, 90, 91, 92, 93, 94, 95, 152, 154}, // SKINCOLOR_DAWN { 80, 81, 82, 83, 84, 85, 86, 88, 89, 91, 94, 95, 154, 156, 158, 159}, // SKINCOLOR_ORANGE - { 80, 81, 83, 85, 86, 88, 90, 91, 93, 95, 152, 153, 154, 156, 157, 159}, // SKINCOLOR_AMBER { 84, 85, 86, 87, 88, 90, 92, 93, 94, 95, 152, 153, 154, 156, 157, 159}, // SKINCOLOR_PUMPKIN {112, 113, 114, 115, 116, 117, 118, 119, 156, 157, 158, 159, 141, 141, 142, 143}, // SKINCOLOR_BRONZE { 90, 91, 92, 93, 94, 152, 153, 154, 155, 156, 157, 158, 159, 139, 141, 143}, // SKINCOLOR_ROSEWOOD @@ -204,11 +203,13 @@ UINT8 colortranslations[MAXSKINCOLORS][16] = { { 51, 52, 53, 55, 56, 57, 58, 60, 61, 63, 28, 28, 29, 29, 30, 31}, // SKINCOLOR_LEATHER { 98, 98, 112, 112, 113, 113, 84, 85, 87, 89, 91, 93, 95, 153, 156, 159}, // SKINCOLOR_TANGERINE { 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 { 64, 65, 67, 68, 70, 71, 73, 74, 76, 77, 79, 48, 50, 53, 56, 59}, // SKINCOLOR_PEACH {120, 120, 80, 80, 81, 82, 83, 83, 84, 85, 86, 88, 89, 91, 93, 95}, // SKINCOLOR_CREAMSICLE {112, 112, 112, 113, 113, 114, 114, 115, 115, 116, 116, 117, 117, 118, 118, 119}, // SKINCOLOR_GOLD { 64, 66, 68, 70, 72, 74, 76, 78, 48, 50, 52, 54, 56, 58, 60, 62}, // SKINCOLOR_CARAMEL {121, 144, 145, 72, 73, 84, 114, 115, 107, 108, 109, 183, 223, 207, 30, 246}, // SKINCOLOR_VOMIT + { 96, 97, 99, 100, 102, 104, 160, 162, 164, 166, 168, 171, 223, 223, 207, 31}, // SKINCOLOR_LIME { 98, 99, 112, 101, 113, 114, 106, 179, 180, 180, 181, 182, 183, 173, 174, 175}, // SKINCOLOR_GARDEN {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 @@ -216,8 +217,7 @@ UINT8 colortranslations[MAXSKINCOLORS][16] = { {176, 176, 177, 178, 165, 166, 167, 167, 168, 169, 182, 182, 182, 183, 183, 183}, // SKINCOLOR_ROBOHOOD {105, 105, 105, 106, 106, 107, 107, 108, 108, 109, 109, 110, 110, 111, 111, 31}, // SKINCOLOR_OLIVE {178, 178, 178, 179, 179, 180, 181, 182, 183, 172, 172, 173, 173, 174, 174, 175}, // SKINCOLOR_MOSS - {160, 160, 161, 161, 162, 162, 163, 163, 164, 165, 166, 167, 168, 170, 171, 173}, // SKINCOLOR_MINT - {160, 160, 160, 184, 184, 184, 185, 185, 185, 186, 187, 187, 188, 188, 189, 190}, // SKINCOLOR_JADE + {120, 176, 176, 176, 177, 163, 164, 165, 167, 221, 221, 222, 223, 207, 207, 31}, // SKINCOLOR_MINT {160, 184, 184, 185, 185, 186, 186, 187, 187, 188, 188, 189, 189, 190, 191, 175}, // SKINCOLOR_EMERALD {160, 161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175}, // SKINCOLOR_GREEN {160, 161, 162, 164, 165, 167, 169, 170, 171, 171, 172, 173, 174, 175, 30, 31}, // SKINCOLOR_PINETREE @@ -232,7 +232,7 @@ UINT8 colortranslations[MAXSKINCOLORS][16] = { {224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239}, // SKINCOLOR_BLUE {208, 210, 212, 214, 216, 229, 231, 232, 233, 235, 236, 237, 238, 239, 241, 244}, // SKINCOLOR_SAPPHIRE {200, 201, 202, 203, 204, 205, 206, 238, 239, 240, 241, 242, 243, 244, 245, 246}, // SKINCOLOR_NAVY - {225, 226, 227, 228, 229, 230, 232, 234, 236, 238, 239, 240, 242, 243, 244, 246}, // SKINCOLOR_BLUEBERRY + {228, 229, 230, 231, 232, 233, 234, 235, 237, 238, 239, 240, 242, 243, 244, 245}, // SKINCOLOR_BLUEBERRY {200, 201, 202, 203, 204, 205, 206, 207, 28, 28, 29, 29, 30, 30, 31, 31}, // SKINCOLOR_JET {120, 120, 120, 121, 121, 122, 122, 123, 192, 248, 249, 250, 251, 252, 253, 254}, // SKINCOLOR_LILAC {192, 192, 248, 249, 250, 251, 204, 204, 205, 205, 206, 206, 207, 29, 30, 31}, // SKINCOLOR_DUSK @@ -241,10 +241,11 @@ UINT8 colortranslations[MAXSKINCOLORS][16] = { {192, 248, 249, 250, 251, 252, 253, 254, 255, 255, 29, 29, 30, 30, 31, 31}, // SKINCOLOR_BYZANTIUM {192, 193, 194, 195, 196, 197, 198, 199, 255, 255, 29, 29, 30, 30, 31, 31}, // SKINCOLOR_INDIGO /* Removed Colours - {120, 121, 123, 124, 126, 127, 129, 130, 132, 133, 135, 136, 138, 139, 141, 143}, // SKINCOLOR_RUBY, replaced by 2.2 backport - {224, 225, 226, 228, 229, 231, 232, 234, 235, 237, 238, 240, 241, 243, 244, 246}, // SKINCOLOR_SAPPHIRE, merged into blueberry - {228, 229, 230, 231, 232, 233, 234, 235, 237, 238, 239, 240, 242, 243, 244, 246}, // SKINCOLOR_BLUEBERRY, before merger - {224, 225, 226, 212, 213, 213, 214, 215, 220, 221, 172, 222, 173, 223, 174, 175}, // SKINCOLOR_FROST, merged into AQUA + {120, 121, 123, 124, 126, 127, 129, 130, 132, 133, 135, 136, 138, 139, 141, 143}, // 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 + {224, 225, 226, 228, 229, 231, 232, 234, 235, 237, 238, 240, 241, 243, 244, 246}, // 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 + {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 { 1, 145, 125, 73, 83, 114, 106, 180, 187, 168, 219, 205, 236, 206, 199, 255}, // SKINCOLOR_RAINBOW, is Vomit 2.0 */