From dc777890ccf185b38985bc401e9d3fd28a32135f Mon Sep 17 00:00:00 2001 From: NepDisk Date: Mon, 27 Jan 2025 18:05:52 -0500 Subject: [PATCH] colorshit --- src/d_main.cpp | 211 ++++++++++++++++++++++++++++++++++++++++- src/doomdef.h | 2 +- src/g_demo.c | 2 +- src/info/skincolors.h | 213 +++++++++++++++++++++++++++++++----------- src/p_enemy.c | 14 +-- src/r_skins.c | 6 +- 6 files changed, 382 insertions(+), 66 deletions(-) diff --git a/src/d_main.cpp b/src/d_main.cpp index 023c56ecc..586231fd9 100644 --- a/src/d_main.cpp +++ b/src/d_main.cpp @@ -613,7 +613,7 @@ static bool D_Display(void) } if (demo.rewinding) - V_DrawFadeScreen(TC_RAINBOW, (leveltime & 0x20) ? SKINCOLOR_PASTEL : SKINCOLOR_MOONSET); + V_DrawFadeScreen(TC_RAINBOW, (leveltime & 0x20) ? SKINCOLOR_PASTEL : SKINCOLOR_MOONSLAM); // vid size change is now finished if it was on... vid.recalc = 0; @@ -1245,6 +1245,175 @@ D_ConvertVersionNumbers (void) #endif } +static skincolor_t skincolorsconvert[MAXSKINCOLORS] = { + {"Walnut", { 3, 6, 32, 33, 35, 37, 51, 52, 54, 55, 57, 58, 60, 61, 63, 30}, SKINCOLOR_CAMOUFLAGE,8, V_BROWNMAP, true}, // SKINCOLOR_WALNUT + {"Salmon", {120, 120, 120, 121, 121, 122, 123, 124, 126, 127, 129, 131, 133, 135, 137, 139}, SKINCOLOR_TEA,8, V_PINKMAP, true}, // SKINCOLOR_SALMON + {"Brick", { 64, 67, 70, 73, 146, 147, 148, 150, 118, 118, 119, 119, 156, 159, 141, 143}, SKINCOLOR_RUST,8, V_PINKMAP, true}, // SKINCOLOR_BRICK + {"Cherry", {120, 65, 67, 69, 71, 124, 125, 127, 132, 133, 135, 136, 138, 139, 140, 141}, SKINCOLOR_HANDHELD,10, V_REDMAP, true}, // SKINCOLOR_CHERRY + {"Flame", {120, 97, 112, 113, 113, 85, 87, 126, 149, 150, 151, 252, 253, 254, 255, 29}, SKINCOLOR_CARIBBEAN,10, V_REDMAP, true}, // SKINCOLOR_FLAM + {"Pumpkin", { 82, 83, 84, 85, 87, 89, 90, 92, 94, 152, 153, 155, 157, 159, 141, 142}, SKINCOLOR_BLUEBERRY,8, V_ORANGEMAP, true}, // SKINCOLOR_PUMPKIN + {"Burgundy", { 84, 86, 89, 91, 152, 154, 155, 157, 158, 159, 140, 141, 142, 143, 31, 31}, SKINCOLOR_JET,8, V_ORANGEMAP, true}, // SKINCOLOR_BURGUNDY + {"Quarry", { 96, 97, 98, 99, 104, 105, 106, 107, 117, 152, 154, 156, 159, 141, 142, 143}, SKINCOLOR_AZURE,8, V_YELLOWMAP, true}, // SKINCOLOR_QUARRY + {"Robo-Hood", {120, 176, 160, 165, 167, 168, 169, 182, 182, 171, 60, 61, 63, 29, 30, 31}, SKINCOLOR_VOMIT,8, V_GREENMAP, true}, // SKINCOLOR_ROBOHOOD + {"Caribbean", {120, 176, 177, 160, 185, 220, 216, 217, 229, 229, 204, 205, 206, 254, 255, 31}, SKINCOLOR_FLAME,8, V_SKYMAP, true}, // SKINCOLOR_CARIBBEAN + {"Azure", {120, 96, 97, 98, 177, 220, 216, 217, 218, 204, 252, 253, 254, 255, 30, 31}, SKINCOLOR_QUARRY,8, V_SKYMAP, true}, // SKINCOLOR_AZURE + {"Aqua", {120, 208, 208, 210, 212, 214, 220, 220, 220, 221, 221, 222, 222, 223, 223, 191}, SKINCOLOR_YELLOW,8, V_SKYMAP, true}, // SKINCOLOR_AQUA + {"Ultraviolet", {120, 64, 81, 122, 192, 249, 203, 221, 221, 219, 219, 223, 223, 191, 191, 31}, SKINCOLOR_MAUVE,10, V_PURPLEMAP, true}, // SKINCOLOR_ULTRAVIOLET + {"Bubblegum", {120, 96, 64, 121, 67, 144, 123, 192, 193, 194, 195, 196, 197, 198, 199, 30}, SKINCOLOR_CROCODILE,8, V_PINKMAP, true}, // SKINCOLOR_BUBBLEGUM + + + + {"Bone", {120, 120, 0, 1, 3, 5, 7, 10, 12, 14, 16, 19, 22, 24, 26, 29}, SKINCOLOR_INK,8, 0, true}, // SKINCOLOR_BONE + {"Carbon", { 3, 6, 10, 13, 17, 20, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31}, SKINCOLOR_MARBLE,8, V_GRAYMAP, true}, // SKINCOLOR_CARBON + {"Ink", { 0, 2, 5, 10, 15, 20, 25, 26, 27, 28, 30, 30, 30, 31, 31, 31}, SKINCOLOR_BONE,8, V_GRAYMAP, true}, // SKINCOLOR_INK + {"Ghost", {120, 120, 0, 1, 1, 224, 225, 225, 226, 202, 203, 204, 205, 206, 207, 29}, SKINCOLOR_PEACHY,12, 0, true}, // SKINCOLOR_GHOST + {"Marble", {120, 1, 4, 6, 8, 10, 202, 202, 203, 203, 204, 204, 205, 205, 206, 207}, SKINCOLOR_CARBON,8, V_SKYMAP, true}, // SKINCOLOR_MARBLE + {"Bluebell", {224, 225, 226, 227, 228, 228, 229, 204, 204, 205, 205, 198, 198, 199, 241, 244}, SKINCOLOR_LANTERN,10, V_SKYMAP, true}, // SKINCOLOR_BLUEBELL + {"Chocolate", { 77, 48, 49, 52, 55, 57, 59, 60, 61, 25, 26, 27, 28, 29, 30, 31}, SKINCOLOR_TAN,8, V_BROWNMAP, true}, // SKINCOLOR_CHOCOLATE + {"Peachy", { 64, 66, 68, 82, 83, 72, 74, 146, 147, 148, 149, 150, 151, 135, 137, 139}, SKINCOLOR_GHOST,8, V_TANMAP, true}, // SKINCOLOR_PEACHY + {"Quail", { 68, 70, 72, 74, 76, 78, 148, 149, 251, 252, 253, 254, 255, 29, 30, 31}, SKINCOLOR_WAVE,8, V_TANMAP, true}, // SKINCOLOR_QUAIL + {"Lantern", { 0, 176, 113, 84, 86, 89, 92, 94, 153, 154, 136, 137, 138, 199, 255, 31}, SKINCOLOR_BLUEBELL,8, V_GOLDMAP, true}, // SKINCOLOR_LANTERN + {"Apricot", { 66, 68, 70, 71, 73, 84, 85, 86, 87, 88, 90, 92, 93, 94, 153, 155}, SKINCOLOR_FROST,10, V_ORANGEMAP, true}, // SKINCOLOR_APRICOT + {"Sandy", {112, 113, 114, 115, 116, 54, 56, 57, 58, 59, 60, 254, 254, 255, 255, 244}, SKINCOLOR_PEACOCK,8, V_GOLDMAP, true}, // SKINCOLOR_SANDY + {"Sunflower", { 97, 98, 99, 112, 113, 105, 106, 107, 107, 108, 170, 171, 172, 173, 174, 175}, SKINCOLOR_MAGENTA,8, V_GREENMAP, true}, // SKINCOLOR_SUNFLOWER + {"Olivine", {120, 97, 97, 176, 176, 160, 160, 184, 184, 185, 185, 186, 187, 188, 189, 190}, SKINCOLOR_VIOLET,8, V_GREENMAP, true}, // SKINCOLOR_OLIVINE + {"Apple", { 99, 101, 113, 105, 106, 107, 107, 168, 169, 170, 171, 171, 172, 173, 174, 175}, SKINCOLOR_GEMSTONE,8, V_GREENMAP, true}, // SKINCOLOR_APPLE + {"Seafoam", {120, 97, 176, 177, 178, 179, 180, 221, 222, 222, 223, 223, 240, 242, 244, 31}, SKINCOLOR_PLUM,10, V_GREENMAP, true}, // SKINCOLOR_SEAFOAM + {"Forest", {164, 166, 167, 168, 169, 170, 171, 172, 173, 174, 174, 175, 175, 31, 31, 31}, SKINCOLOR_NEON,8, V_GREENMAP, true}, // SKINCOLOR_FOREST + {"Topaz", {120, 208, 209, 211, 211, 161, 161, 162, 162, 163, 163, 165, 167, 169, 171, 173}, SKINCOLOR_APRICOT,8, V_SKYMAP, true}, // SKINCOLOR_TOPAZ + {"Frost", {120, 0, 208, 247, 247, 211, 213, 220, 216, 217, 221, 222, 223, 173, 174, 175}, SKINCOLOR_APRICOT,8, V_SKYMAP, true}, // SKINCOLOR_FROST + {"Wave", {120, 208, 210, 213, 215, 216, 217, 218, 219, 205, 198, 198, 199, 199, 207, 243}, SKINCOLOR_QUAIL,8, V_SKYMAP, true}, // SKINCOLOR_WAVE + {"Icy", {120, 120, 120, 120, 208, 210, 213, 214, 215, 216, 229, 229, 204, 205, 206, 207}, SKINCOLOR_BANANA,10, V_SKYMAP, true}, // SKINCOLOR_ICY + {"Peacock", {214, 215, 216, 217, 218, 219, 219, 223, 223, 173, 240, 241, 243, 244, 245, 246}, SKINCOLOR_SANDY,8, V_BLUEMAP, true}, // SKINCOLOR_PEACOCK + {"Vapor", {209, 211, 212, 213, 214, 215, 227, 228, 229, 204, 197, 197, 198, 198, 199, 255}, SKINCOLOR_THISTLE,8, V_BLUEMAP, true}, // SKINCOLOR_VAPOR + {"Gemstone", {224, 225, 226, 227, 228, 229, 204, 196, 197, 197, 198, 198, 199, 255, 142, 31}, SKINCOLOR_APPLE,8, V_PURPLEMAP, true}, // SKINCOLOR_GEMSTONE + {"Neon", {192, 193, 194, 195, 196, 197, 197, 198, 198, 199, 199, 255, 255, 29, 30, 31}, SKINCOLOR_FOREST,8, V_PURPLEMAP, true}, // SKINCOLOR_NEON + {"Plum", {145, 147, 148, 149, 150, 151, 197, 197, 198, 198, 199, 199, 140, 141, 142, 143}, SKINCOLOR_SEAFOAM,10, V_PURPLEMAP, true}, // SKINCOLOR_PLUM + {"Diamond", {120, 1, 2, 3, 225, 226, 202, 14, 16, 18, 20, 22, 24, 26, 28, 30}, SKINCOLOR_EARTHWORM,8, 0, true}, // SKINCOLOR_DIAMOND + {"Raven", {224, 225, 226, 202, 37, 39, 19, 21, 23, 25, 27, 28, 29, 29, 30, 31}, SKINCOLOR_CROW,8, V_GRAYMAP, true}, // SKINCOLOR_RAVEN + {"Mud", { 34, 37, 39, 41, 43, 44, 45, 46, 47, 61, 62, 63, 28, 29, 30, 31}, SKINCOLOR_ONYX,8, V_BROWNMAP, true}, // SKINCOLOR_MUD + {"Earthworm", { 0, 121, 122, 145, 146, 147, 37, 38, 40, 42, 44, 46, 47, 62, 63, 174}, SKINCOLOR_DIAMOND,8, V_PINKMAP, true}, // SKINCOLOR_EARTHWORM + {"Yogurt", { 0, 80, 65, 66, 68, 70, 145, 124, 147, 148, 149, 150, 151, 152, 154, 156}, SKINCOLOR_CHARTEUSE,12, V_PINKMAP, true}, // SKINCOLOR_YOGURT + {"Pearl", {120, 0, 0, 64, 64, 121, 67, 144, 145, 146, 147, 148, 149, 150, 151, 133}, SKINCOLOR_STORM,8, V_PINKMAP, true}, // SKINCOLOR_PEARL + {"Strawberry", {120, 96, 97, 98, 176, 81, 144, 124, 126, 129, 132, 134, 136, 138, 139, 140}, SKINCOLOR_SLIME,8, V_REDMAP, true}, // SKINCOLOR_STRAWBERRY + {"Soda", { 81, 82, 83, 74, 76, 88, 90, 130, 132, 134, 155, 158, 140, 141, 142, 143}, SKINCOLOR_LEAF,9, V_REDMAP, true}, // SKINCOLOR_SODA + {"Bloodcell", {145, 146, 148, 149, 150, 151, 133, 134, 135, 136, 138, 139, 140, 141, 142, 143}, SKINCOLOR_INDIGO,8, V_REDMAP, true}, // SKINCOLOR_BLOODCELL + {"Mahogany", {133, 134, 135, 136, 137, 138, 139, 139, 140, 141, 142, 142, 143, 143, 30, 31}, SKINCOLOR_JUNGLE,6, V_REDMAP, true}, // SKINCOLOR_MAHOGANY + {"Fiery", { 80, 81, 83, 85, 86, 88, 90, 130, 132, 133, 135, 137, 138, 140, 141, 142}, SKINCOLOR_COMET,8, V_ORANGEMAP, true}, // SKINCOLOR_FIERY + {"Spice", { 99, 101, 113, 114, 115, 116, 92, 93, 95, 153, 136, 138, 139, 140, 142, 143}, SKINCOLOR_DEPTHS,8, V_GOLDMAP, true}, // SKINCOLOR_SPICE + {"King", { 96, 97, 99, 176, 113, 114, 77, 149, 151, 153, 155, 157, 159, 140, 142, 31}, SKINCOLOR_NEBULA,8, V_GOLDMAP, true}, // SKINCOLOR_KING + {"Hot Dog", { 96, 97, 98, 100, 102, 113, 85, 87, 90, 130, 132, 134, 136, 138, 140, 142}, SKINCOLOR_LAPIS,8, V_GOLDMAP, true}, // SKINCOLOR_HOTDOG + {"Carnation", { 96, 97, 98, 65, 122, 123, 124, 125, 148, 149, 251, 252, 253, 254, 255, 29}, SKINCOLOR_VACATION,8, V_PINKMAP, true}, // SKINCOLOR_CARNATION + {"Candy", { 81, 122, 123, 124, 125, 149, 150, 151, 252, 253, 254, 199, 255, 243, 245, 31}, SKINCOLOR_DIANNE,8, V_PINKMAP, true}, // SKINCOLOR_CANDY + {"Nebula", { 65, 122, 145, 248, 249, 250, 53, 55, 58, 60, 61, 199, 255, 29, 30, 31}, SKINCOLOR_KING,8, V_LAVENDERMAP, true}, // SKINCOLOR_NEBULA + {"Steampunk", { 2, 4, 7, 32, 34, 78, 48, 90, 92, 94, 95, 153, 155, 157, 159, 140}, SKINCOLOR_PLASMA,8, V_BROWNMAP, true}, // SKINCOLOR_STEAMPUNK + {"Amber", { 68, 72, 85, 87, 89, 91, 117, 117, 118, 118, 119, 156, 159, 140, 141, 143}, SKINCOLOR_MIDNIGHT,8, V_ORANGEMAP, true}, // SKINCOLOR_AMBER + {"Carrot", { 80, 67, 83, 84, 85, 77, 116, 108, 170, 171, 190, 173, 173, 174, 191, 175}, SKINCOLOR_GRAPE,8, V_GREENMAP, true}, // SKINCOLOR_CARROT + {"Cheese", { 80, 81, 82, 83, 84, 75, 78, 49, 52, 55, 57, 59, 60, 61, 62, 63}, SKINCOLOR_LIGHTNING,8, V_BROWNMAP, true}, // SKINCOLOR_CHEESE + {"Dune", {120, 96, 80, 81, 82, 70, 72, 75, 79, 91, 93, 152, 154, 156, 158, 140}, SKINCOLOR_PEPPERMINT,9, V_BROWNMAP, true}, // SKINCOLOR_DUNE + {"Brass", { 96, 98, 112, 113, 114, 115, 116, 117, 118, 58, 59, 60, 61, 62, 63, 28}, SKINCOLOR_LUNAR,8, V_GOLDMAP, true}, // SKINCOLOR_BRASS + {"Citrine", {120, 97, 97, 176, 176, 176, 105, 105, 105, 106, 106, 107, 107, 108, 108, 182}, SKINCOLOR_BYZANTIUM,8, V_YELLOWMAP, true}, // SKINCOLOR_CITRINE + {"Lemon", {120, 120, 96, 96, 97, 98, 99, 100, 101, 113, 105, 106, 107, 108, 109, 110}, SKINCOLOR_ORCA,8, V_YELLOWMAP, true}, // SKINCOLOR_LEMON + {"Casket", {104, 105, 106, 107, 107, 108, 108, 182, 109, 183, 110, 63, 191, 111, 30, 31}, SKINCOLOR_TURQUOISE,8, V_GREENMAP, true}, // SKINCOLOR_CASKET + {"Khaki", { 65, 68, 70, 73, 32, 34, 36, 38, 108, 108, 182, 109, 183, 110, 174, 31}, SKINCOLOR_SNOW,8, V_GREENMAP, true}, // SKINCOLOR_KHAKI + {"Light", {120, 96, 97, 98, 99, 100, 176, 177, 178, 179, 15, 18, 21, 24, 27, 29}, SKINCOLOR_COTTONCANDY,10, V_GREENMAP, true}, // SKINCOLOR_LIGHT + {"Peppermint", {120, 120, 96, 96, 97, 176, 177, 178, 165, 167, 221, 222, 223, 173, 174, 175}, SKINCOLOR_DUNE,9, V_GREENMAP, true}, // SKINCOLOR_PEPPERMINT + {"Laser", { 96, 98, 100, 102, 104, 160, 184, 185, 186, 187, 188, 222, 223, 239, 242, 244}, SKINCOLOR_MULBERRY,9, V_GREENMAP, true}, // SKINCOLOR_LASER + {"Asparagus", { 98, 176, 177, 177, 178, 178, 179, 179, 180, 181, 182, 171, 172, 173, 174, 175}, SKINCOLOR_IRIS,8, V_GREENMAP, true}, // SKINCOLOR_ASPARAGUS + {"Army", { 97, 98, 176, 177, 178, 179, 180, 181, 20, 22, 24, 25, 27, 29, 30, 31}, SKINCOLOR_AMETHYST,12, V_GREENMAP, true}, // SKINCOLOR_ARMY + {"Crow", { 1, 4, 7, 179, 180, 181, 108, 42, 44, 23, 24, 26, 27, 28, 29, 31}, SKINCOLOR_RAVEN,8, V_GREENMAP, true}, // SKINCOLOR_CROW + {"Charteuse", { 96, 97, 98, 176, 160, 161, 162, 164, 165, 167, 168, 170, 171, 172, 173, 174}, SKINCOLOR_YOGURT,10, V_GREENMAP, true}, // SKINCOLOR_CHARTEUSE + {"Slime", {176, 160, 184, 185, 185, 186, 165, 107, 108, 108, 109, 109, 110, 63, 174, 111}, SKINCOLOR_STRAWBERRY,8, V_GREENMAP, true}, // SKINCOLOR_SLIME + {"Leaf", {176, 160, 184, 184, 185, 186, 187, 168, 169, 170, 171, 172, 173, 174, 175, 31}, SKINCOLOR_SODA,9, V_GREENMAP, true}, // SKINCOLOR_LEAF + {"Jungle", {184, 163, 165, 187, 168, 169, 182, 182, 109, 183, 254, 199, 255, 142, 143, 31}, SKINCOLOR_MAHOGANY,8, V_GREENMAP, true}, // SKINCOLOR_JUNGLE + {"Evergreen", { 0, 200, 201, 226, 227, 217, 221, 189, 171, 190, 173, 174, 174, 175, 30, 31}, SKINCOLOR_PEGASUS,8, V_SKYMAP, true}, // SKINCOLOR_EVERGREEN + {"Tropic", { 97, 176, 160, 184, 184, 185, 185, 220, 217, 221, 222, 223, 173, 191, 175, 31}, SKINCOLOR_DISCO,12, V_GREENMAP, true}, // SKINCOLOR_TROPIC + {"Iguana", {177, 161, 163, 164, 165, 166, 221, 221, 219, 219, 206, 206, 240, 242, 244, 246}, SKINCOLOR_LAKESIDE,6, V_GREENMAP, true}, // SKINCOLOR_IGUANA + {"Spearmint", {120, 96, 97, 176, 160, 162, 220, 216, 217, 221, 222, 171, 172, 173, 174, 175}, SKINCOLOR_CYBER,12, V_GREENMAP, true}, // SKINCOLOR_SPEARMINT + {"Patina", {209, 210, 212, 214, 220, 220, 165, 166, 180, 181, 182, 109, 110, 191, 111, 30}, SKINCOLOR_MYSTIC,10, V_SKYMAP, true}, // SKINCOLOR_PATINA + {"Lakeside", { 96, 99, 177, 162, 220, 216, 217, 221, 222, 171, 46, 61, 62, 63, 28, 30}, SKINCOLOR_IGUANA,10, V_BLUEMAP, true}, // SKINCOLOR_LAKESIDE + {"Electric", {120, 120, 0, 0, 208, 208, 247, 247, 211, 213, 220, 217, 221, 222, 223, 174}, SKINCOLOR_SAKURA,10, V_SKYMAP, true}, // SKINCOLOR_ELECTRIC + {"Pegasus", {120, 120, 0, 1, 200, 200, 209, 211, 213, 215, 216, 217, 221, 222, 223, 207}, SKINCOLOR_EVERGREEN,8, V_SKYMAP, true}, // SKINCOLOR_PEGASUS + {"Plasma", {120, 0, 208, 247, 247, 212, 213, 215, 216, 229, 230, 233, 235, 237, 239, 241}, SKINCOLOR_STEAMPUNK,8, V_SKYMAP, true}, // SKINCOLOR_PLASMA + {"Comet", {120, 120, 0, 208, 247, 247, 213, 215, 216, 217, 218, 204, 205, 206, 207, 28}, SKINCOLOR_FIERY,8, V_SKYMAP, true}, // SKINCOLOR_COMET + {"Lightning", {120, 96, 97, 98, 176, 209, 212, 215, 216, 228, 229, 230, 233, 235, 237, 240}, SKINCOLOR_CHEESE,10, V_SKYMAP, true}, // SKINCOLOR_LIGHTNING + {"Vacation", { 97, 176, 160, 162, 220, 216, 217, 229, 230, 233, 235, 237, 239, 242, 244, 246}, SKINCOLOR_CARNATION,8, V_GREENMAP, true}, // SKINCOLOR_VACATION + {"Depths", {247, 213, 215, 216, 217, 204, 205, 237, 238, 239, 240, 241, 243, 244, 245, 246}, SKINCOLOR_SPICE,8, V_BLUEMAP, true}, // SKINCOLOR_DEPTHS + {"Dianne", { 0, 3, 6, 9, 12, 203, 218, 222, 222, 223, 25, 26, 27, 28, 29, 30}, SKINCOLOR_CANDY,10, V_SKYMAP, true}, // SKINCOLOR_DIANNE + {"Exotic", { 80, 121, 67, 70, 73, 32, 35, 181, 222, 222, 223, 223, 207, 243, 245, 31}, SKINCOLOR_ULTRAMARINE,8, V_TANMAP, true}, // SKINCOLOR_EXOTIC + {"Snow", { 0, 200, 208, 210, 225, 226, 226, 227, 228, 203, 204, 205, 206, 207, 29, 30}, SKINCOLOR_KHAKI,8, 0, true}, // SKINCOLOR_SNOW + {"Moon", {104, 113, 105, 106, 107, 108, 205, 206, 240, 241, 242, 243, 244, 245, 246, 31}, SKINCOLOR_BOYSENBERRY,8, V_YELLOWMAP, true}, // SKINCOLOR_MOON + {"Lunar", {225, 226, 202, 203, 204, 205, 206, 238, 239, 241, 242, 243, 244, 245, 246, 31}, SKINCOLOR_BRASS,10, V_SKYMAP, true}, // SKINCOLOR_LUNAR + {"Onyx", {200, 201, 202, 203, 204, 205, 205, 206, 206, 207, 207, 243, 243, 244, 245, 246}, SKINCOLOR_MUD,6, V_SKYMAP, true}, // SKINCOLOR_ONYX + {"Lapis", {210, 212, 214, 216, 229, 230, 231, 233, 234, 235, 236, 238, 240, 242, 244, 246}, SKINCOLOR_HOTDOG,8, V_BLUEMAP, true}, // SKINCOLOR_LAPIS + {"Orca", {120, 120, 0, 0, 1, 200, 224, 225, 226, 227, 228, 229, 204, 205, 206, 207}, SKINCOLOR_LEMON,10, 0, true}, // SKINCOLOR_ORCA + {"Storm", { 0, 1, 2, 4, 201, 202, 202, 228, 229, 230, 232, 234, 236, 238, 240, 242}, SKINCOLOR_PEARL,8, V_SKYMAP, true}, // SKINCOLOR_STORM + {"Cotton Candy", {120, 80, 121, 67, 122, 201, 201, 215, 215, 216, 217, 218, 205, 206, 240, 243}, SKINCOLOR_LIGHT,10, V_SKYMAP, true}, // SKINCOLOR_COTTONCANDY + {"Cyber", { 64, 81, 70, 145, 192, 248, 228, 229, 230, 231, 233, 234, 236, 238, 240, 242}, SKINCOLOR_SPEARMINT,12, V_LAVENDERMAP, true}, // SKINCOLOR_CYBER + {"Amethyst", {121, 122, 123, 192, 248, 249, 203, 229, 230, 233, 235, 236, 238, 239, 241, 243}, SKINCOLOR_ARMY,10, V_LAVENDERMAP, true}, // SKINCOLOR_AMETHYST + {"Iris", {0, 208, 210, 225, 226, 202, 249, 250, 251, 252, 253, 254, 199, 255, 29, 31}, SKINCOLOR_ASPARAGUS,12, V_LAVENDERMAP, true}, // SKINCOLOR_IRIS + {"Gothic", {208, 209, 225, 227, 203, 204, 252, 253, 137, 139, 140, 255, 255, 244, 245, 246}, SKINCOLOR_WICKED,8, V_SKYMAP, true}, // SKINCOLOR_GOTHIC + {"Grape", { 65, 122, 192, 193, 194, 195, 196, 197, 198, 238, 239, 241, 242, 243, 245, 31}, SKINCOLOR_CARROT,10, V_PURPLEMAP, true}, // SKINCOLOR_GRAPE + {"Indigo", {192, 194, 195, 196, 197, 198, 199, 239, 240, 241, 242, 243, 244, 245, 246, 31}, SKINCOLOR_BLOODCELL,10, V_PURPLEMAP, true}, // SKINCOLOR_INDIGO + {"Sakura", {64, 66, 122, 123, 192, 193, 193, 194, 130, 131, 133, 134, 136, 137, 199, 255}, SKINCOLOR_ELECTRIC,9, V_PINKMAP, true}, // SKINCOLOR_SAKURA + {"Disco", {192, 193, 194, 195, 196, 197, 136, 137, 138, 139, 140, 141, 142, 143, 30, 31}, SKINCOLOR_TROPIC,8, V_PURPLEMAP, true}, // SKINCOLOR_DISCO + {"Mulberry", {121, 123, 124, 125, 126, 127, 130, 196, 197, 197, 198, 199, 140, 141, 142, 143}, SKINCOLOR_LASER,8, V_PINKMAP, true}, // SKINCOLOR_MULBERRY + {"Boysenberry", {123, 125, 127, 130, 132, 134, 198, 198, 199, 199, 255, 255, 244, 245, 246, 31}, SKINCOLOR_MOON,10, V_REDMAP, true}, // SKINCOLOR_BOYSENBERRY + {"Mystic", {122, 145, 248, 249, 250, 251, 197, 197, 198, 198, 199, 199, 255, 255, 29, 31}, SKINCOLOR_PATINA,8, V_PURPLEMAP, true}, // SKINCOLOR_MYSTIC + {"Wicked", {121, 5, 10, 15, 20, 253, 254, 254, 255, 255, 29, 245, 245, 246, 246, 31}, SKINCOLOR_GOTHIC,10, V_SKYMAP, true}, // SKINCOLOR_WICKED + + {"SUPER1", {120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 96, 100, 104, 113, 116, 119}, SKINCOLOR_PERIWINKLE,8, 0, false}, // SKINCOLOR_SUPER1 + {"SUPER2", {120, 120, 120, 120, 120, 120, 120, 120, 96, 98, 101, 104, 113, 115, 117, 119}, SKINCOLOR_PERIWINKLE,8, 0, false}, // SKINCOLOR_SUPER2 + {"SUPER3", {120, 120, 120, 120, 120, 120, 96, 98, 100, 102, 104, 113, 114, 116, 117, 119}, SKINCOLOR_PERIWINKLE,8, 0, false}, // SKINCOLOR_SUPER3 + {"SUPER4", {120, 120, 120, 120, 96, 97, 99, 100, 102, 104, 113, 114, 115, 116, 117, 119}, SKINCOLOR_PERIWINKLE,8, 0, false}, // SKINCOLOR_SUPER4 + {"SUPER5", {120, 120, 96, 120, 120, 120, 120, 120, 104, 113, 114, 115, 116, 117, 118, 119}, SKINCOLOR_PERIWINKLE,8, 0, false}, // SKINCOLOR_SUPER5 + {"TSUPER1", {120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 80, 82, 85, 115, 117, 119}, SKINCOLOR_SAPPHIRE,8, 0, false}, // SKINCOLOR_TSUPER1 + {"TSUPER2", {120, 120, 120, 120, 120, 120, 120, 120, 80, 81, 83, 85, 115, 116, 117, 119}, SKINCOLOR_SAPPHIRE,8, 0, false}, // SKINCOLOR_TSUPER2 + {"TSUPER3", {120, 120, 120, 120, 120, 120, 80, 81, 82, 83, 85, 115, 116, 117, 118, 119}, SKINCOLOR_SAPPHIRE,8, 0, false}, // SKINCOLOR_TSUPER3 + {"TSUPER4", {120, 120, 120, 120, 80, 81, 82, 83, 84, 85, 115, 115, 116, 117, 118, 119}, SKINCOLOR_SAPPHIRE,8, 0, false}, // SKINCOLOR_TSUPER4 + {"TSUPER5", {120, 120, 80, 80, 81, 82, 83, 84, 85, 115, 115, 116, 117, 117, 118, 119}, SKINCOLOR_SAPPHIRE,8, 0, false}, // SKINCOLOR_TSUPER5 + {"KSUPER1", {120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 121, 123, 125, 127, 129, 132}, SKINCOLOR_CYAN,8, 0, false}, // SKINCOLOR_KSUPER1 + {"KSUPER2", {120, 120, 120, 120, 120, 120, 120, 120, 121, 122, 124, 125, 127, 128, 130, 132}, SKINCOLOR_CYAN,8, 0, false}, // SKINCOLOR_KSUPER2 + {"KSUPER3", {120, 120, 120, 120, 120, 120, 121, 122, 123, 124, 125, 127, 128, 129, 130, 132}, SKINCOLOR_CYAN,8, 0, false}, // SKINCOLOR_KSUPER3 + {"KSUPER4", {120, 120, 120, 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132}, SKINCOLOR_CYAN,8, 0, false}, // SKINCOLOR_KSUPER4 + {"KSUPER5", {120, 120, 121, 121, 122, 123, 124, 125, 126, 126, 127, 128, 129, 130, 131, 132}, SKINCOLOR_CYAN,8, 0, false}, // SKINCOLOR_KSUPER5 + {"PSUPER1", {120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 0, 122, 124, 248, 251, 255}, SKINCOLOR_CYAN,8, 0, false}, // SKINCOLOR_PSUPER1 + {"PSUPER2", {120, 120, 120, 120, 120, 120, 120, 120, 0, 121, 122, 124, 248, 250, 252, 255}, SKINCOLOR_CYAN,8, 0, false}, // SKINCOLOR_PSUPER2 + {"PSUPER3", {120, 120, 120, 120, 120, 120, 0, 121, 122, 123, 124, 248, 249, 251, 253, 255}, SKINCOLOR_CYAN,8, 0, false}, // SKINCOLOR_PSUPER3 + {"PSUPER4", {120, 120, 120, 120, 0, 121, 122, 123, 124, 248, 249, 250, 251, 252, 253, 255}, SKINCOLOR_CYAN,8, 0, false}, // SKINCOLOR_PSUPER4 + {"PSUPER5", {120, 120, 0, 121, 122, 123, 124, 248, 248, 249, 250, 251, 252, 253, 254, 255}, SKINCOLOR_CYAN,8, 0, false}, // SKINCOLOR_PSUPER5 + {"BSUPER1", {120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 224, 225, 227, 228, 230, 232}, SKINCOLOR_NONE,8, 0, false}, // SKINCOLOR_BSUPER1 + {"BSUPER2", {120, 120, 120, 120, 120, 120, 120, 120, 224, 225, 226, 227, 228, 229, 230, 232}, SKINCOLOR_NONE,8, 0, false}, // SKINCOLOR_BSUPER2 + {"BSUPER3", {120, 120, 120, 120, 120, 120, 224, 224, 225, 226, 227, 228, 229, 230, 231, 232}, SKINCOLOR_NONE,8, 0, false}, // SKINCOLOR_BSUPER3 + {"BSUPER4", {120, 120, 120, 120, 224, 224, 225, 226, 226, 227, 228, 229, 229, 230, 231, 232}, SKINCOLOR_NONE,8, 0, false}, // SKINCOLOR_BSUPER4 + {"BSUPER5", {120, 120, 224, 224, 225, 225, 226, 227, 227, 228, 228, 229, 230, 230, 231, 232}, SKINCOLOR_NONE,8, 0, false}, // SKINCOLOR_BSUPER5 + {"ASUPER1", {120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 208, 210, 212, 215, 220, 222}, SKINCOLOR_RUST,8, 0, false}, // SKINCOLOR_ASUPER1 + {"ASUPER2", {120, 120, 120, 120, 120, 120, 120, 120, 208, 209, 211, 213, 215, 220, 221, 223}, SKINCOLOR_RUST,8, 0, false}, // SKINCOLOR_ASUPER2 + {"ASUPER3", {120, 120, 120, 120, 120, 120, 208, 209, 210, 211, 212, 213, 215, 220, 221, 223}, SKINCOLOR_RUST,8, 0, false}, // SKINCOLOR_ASUPER3 + {"ASUPER4", {120, 120, 120, 120, 208, 209, 210, 211, 212, 213, 214, 215, 220, 221, 222, 223}, SKINCOLOR_RUST,8, 0, false}, // SKINCOLOR_ASUPER4 + {"ASUPER5", {120, 120, 208, 208, 209, 210, 211, 211, 212, 213, 214, 215, 220, 221, 222, 223}, SKINCOLOR_RUST,8, 0, false}, // SKINCOLOR_ASUPER5 + {"GSUPER1", {120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 176, 160, 163, 167, 171, 175}, SKINCOLOR_BLUEBERRY,8, 0, false}, // SKINCOLOR_GSUPER1 + {"GSUPER2", {120, 120, 120, 120, 120, 120, 120, 120, 176, 176, 160, 163, 166, 169, 172, 175}, SKINCOLOR_BLUEBERRY,8, 0, false}, // SKINCOLOR_GSUPER2 + {"GSUPER3", {120, 120, 120, 120, 120, 120, 176, 176, 160, 162, 164, 166, 168, 170, 172, 175}, SKINCOLOR_BLUEBERRY,8, 0, false}, // SKINCOLOR_GSUPER3 + {"GSUPER4", {120, 120, 120, 120, 176, 176, 176, 160, 161, 163, 165, 167, 169, 171, 173, 175}, SKINCOLOR_BLUEBERRY,8, 0, false}, // SKINCOLOR_GSUPER4 + {"GSUPER5", {120, 120, 176, 176, 176, 160, 161, 163, 164, 166, 167, 169, 170, 172, 173, 175}, SKINCOLOR_BLUEBERRY,8, 0, false}, // SKINCOLOR_GSUPER5 + {"WSUPER1", {120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120}, SKINCOLOR_NONE,8, 0, false}, // SKINCOLOR_WSUPER1 + {"WSUPER2", {120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 0, 4, 9}, SKINCOLOR_NONE,8, 0, false}, // SKINCOLOR_WSUPER2 + {"WSUPER3", {120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 0, 2, 4, 6, 8, 11}, SKINCOLOR_NONE,8, 0, false}, // SKINCOLOR_WSUPER3 + {"WSUPER4", {120, 120, 120, 120, 120, 120, 120, 0, 1, 3, 4, 6, 8, 9, 11, 13}, SKINCOLOR_NONE,8, 0, false}, // SKINCOLOR_WSUPER4 + {"WSUPER5", {120, 120, 120, 120, 0, 1, 2, 4, 5, 6, 8, 9, 10, 12, 13, 15}, SKINCOLOR_NONE,8, 0, false}, // SKINCOLOR_WSUPER5 + { "CSUPER1", {120, 120, 120, 120, 120, 120, 120, 120, 120, 120, 96, 98, 99, 81, 73, 79}, SKINCOLOR_NONE,8, 0, false}, // SKINCOLOR_CSUPER1 + {"CSUPER2", {120, 120, 120, 120, 120, 120, 120, 120, 96, 97, 98, 81, 81, 71, 75, 79}, SKINCOLOR_NONE,8, 0, false}, // SKINCOLOR_CSUPER2 + {"CSUPER3", {120, 120, 120, 120, 120, 120, 96, 97, 98, 99, 81, 81, 70, 73, 76, 79}, SKINCOLOR_NONE,8, 0, false}, // SKINCOLOR_CSUPER3 + {"CSUPER4", {120, 120, 120, 120, 96, 96, 97, 98, 99, 81, 81, 70, 72, 74, 76, 79}, SKINCOLOR_NONE,8, 0, false}, // SKINCOLOR_CSUPER4 + {"CSUPER5", {120, 120, 96, 96, 97, 98, 98, 99, 81, 81, 69, 71, 73, 75, 77, 79}, SKINCOLOR_NONE,8, 0, false}, // SKINCOLOR_CSUPER5 +}; + +static UINT8 rmap(UINT8 color, UINT8 ramp) +{ + return R_GetPaletteRemap(skincolorsconvert[color].ramp[ramp]); +} + // // D_SRB2Main // @@ -1726,6 +1895,46 @@ void D_SRB2Main(void) //------------------------------------------------ COMMAND LINE PARAMS + if (M_CheckParm("-convertinteralcolor")) + { + + for (int i=0; i < 143; i++) + { + UINT8 c1 = rmap(i, 0); + UINT8 c2 = rmap(i, 1); + UINT8 c3 = rmap(i, 2); + UINT8 c4 = rmap(i, 3); + UINT8 c5 = rmap(i, 4); + UINT8 c6 = rmap(i, 5); + UINT8 c7 = rmap(i, 6); + UINT8 c8 = rmap(i, 7); + UINT8 c9 = rmap(i, 8); + UINT8 c10 = rmap(i, 9); + UINT8 c11 = rmap(i, 10); + UINT8 c12 = rmap(i, 11); + UINT8 c13 = rmap(i, 12); + UINT8 c14 = rmap(i, 13); + UINT8 c15 = rmap(i, 14); + UINT8 c16 = rmap(i, 15); + + char *name = skincolorsconvert[i].name; + char *capsname = skincolorsconvert[i].name; + strupr(capsname); + + CONS_Printf("Color SKINCOLOR_%s\n", capsname); + CONS_Printf("Name = %s\n", name); + CONS_Printf("Ramp = %d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d\n", c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,c12,c13,c14,c15,c16); + CONS_Printf("InvColor = %d\n", skincolorsconvert[i].invcolor); + CONS_Printf("InvShade = %d\n", skincolorsconvert[i].invshade); + CONS_Printf("ChatColor = %d\n", skincolorsconvert[i].invshade); + CONS_Printf("Accessible = %d\n\n", skincolorsconvert[i].accessible); + + + } + CONS_Printf("Colors converted. Exiting.\n"); + I_Quit(); + } + // this must be done after loading gamedata, // to avoid setting off the corrupted gamedata code in G_LoadGameData if a SOC with custom gamedata is added // -- Monster Iestyn 20/02/20 diff --git a/src/doomdef.h b/src/doomdef.h index bb4beb041..a2c0bec26 100644 --- a/src/doomdef.h +++ b/src/doomdef.h @@ -244,7 +244,7 @@ typedef enum MAXSKINCOLORS, FIRSTRAINBOWCOLOR = SKINCOLOR_PINK, - FIRSTSUPERCOLOR = SKINCOLOR_SUPERSILVER1, + FIRSTSUPERCOLOR = SKINCOLOR_SUPER1, NUMSUPERCOLORS = ((SKINCOLOR_FIRSTFREESLOT - FIRSTSUPERCOLOR)/5) } skincolornum_t; diff --git a/src/g_demo.c b/src/g_demo.c index ba4ba9e02..9e2366356 100644 --- a/src/g_demo.c +++ b/src/g_demo.c @@ -1371,7 +1371,7 @@ skippedghosttic: g->mo->color = skin->supercolor; } else - g->mo->color = SKINCOLOR_SUPERGOLD1; + g->mo->color = SKINCOLOR_SUPER1; g->mo->color += abs( ( (signed)( (unsigned)leveltime >> 1 ) % 9) - 4); break; case GHC_INVINCIBLE: // Mario invincibility (P_CheckInvincibilityTimer) diff --git a/src/info/skincolors.h b/src/info/skincolors.h index 9c43bb3d9..5adfc6b69 100644 --- a/src/info/skincolors.h +++ b/src/info/skincolors.h @@ -11,26 +11,33 @@ _(ARTICHOKE) _(PIGEON) _(SEPIA) _(BEIGE) +_(WALNUT) _(CARAMEL) _(PEACH) _(BROWN) _(LEATHER) +_(SALMON) _(PINK) _(ROSE) +_(BRICK) _(CINNAMON) _(RUBY) _(RASPBERRY) +_(CHERRY) _(RED) _(CRIMSON) _(MAROON) _(LEMONADE) +_(FLAME) _(SCARLET) _(KETCHUP) _(DAWN) _(SUNSLAM) _(CREAMSICLE) _(ORANGE) +_(PUMPKIN) _(ROSEWOOD) +_(BURGUNDY) _(TANGERINE) _(TAN) _(CREAM) @@ -38,6 +45,7 @@ _(GOLD) _(ROYAL) _(BRONZE) _(COPPER) +_(QUARRY) _(YELLOW) _(MUSTARD) _(BANANA) @@ -52,6 +60,7 @@ _(TEA) _(PISTACHIO) _(MOSS) _(CAMOUFLAGE) +_(ROBOHOOD) _(MINT) _(GREEN) _(PINETREE) @@ -61,6 +70,9 @@ _(DREAM) _(PLAGUE) _(EMERALD) _(ALGAE) +_(CARIBBEAN) +_(AZURE) +_(AQUA) _(AQUAMARINE) _(TURQUOISE) _(TEAL) @@ -83,10 +95,12 @@ _(PERIWINKLE) _(BLUE) _(MIDNIGHT) _(BLUEBERRY) +_(ULTRAVIOLET) +_(BUBBLEGUM) _(THISTLE) _(PURPLE) _(PASTEL) -_(MOONSET) +_(MOONSLAM) _(DUSK) _(VIOLET) _(MAGENTA) @@ -100,67 +114,158 @@ _(LILAC) _(BLOSSOM) _(TAFFY) -// Super special awesome Super flashing colors! -_(SUPERSILVER1) -_(SUPERSILVER2) -_(SUPERSILVER3) -_(SUPERSILVER4) -_(SUPERSILVER5) +_(BONE) // vanilla colors - shoutouts to Sonic Team Jr. +_(CARBON) +_(INK) +_(GHOST) +_(MARBLE) +_(BLUEBELL) +_(CHOCOLATE) +_(PEACHY) +_(QUAIL) +_(LANTERN) +_(APRICOT) +_(SANDY) +_(SUNFLOWER) +_(OLIVINE) +_(APPLE) +_(SEAFOAM) +_(FOREST) +_(TOPAZ) +_(FROST) +_(WAVE) +_(ICY) +_(PEACOCK) +_(VAPOR) +_(GEMSTONE) +_(NEON) +_(PLUM) -_(SUPERRED1) -_(SUPERRED2) -_(SUPERRED3) -_(SUPERRED4) -_(SUPERRED5) +_(DIAMOND) // custom color expansion begins here +_(RAVEN) +_(MUD) +_(EARTHWORM) +_(YOGURT) +_(PEARL) +_(STRAWBERRY) +_(SODA) +_(BLOODCELL) +_(MAHOGANY) +_(FIERY) +_(SPICE) +_(KING) +_(HOTDOG) +_(CARNATION) +_(CANDY) +_(NEBULA) +_(STEAMPUNK) +_(AMBER) +_(CARROT) +_(CHEESE) +_(DUNE) +_(BRASS) +_(CITRINE) +_(LEMON) +_(CASKET) +_(KHAKI) +_(LIGHT) +_(PEPPERMINT) +_(LASER) +_(ASPARAGUS) +_(ARMY) +_(CROW) +_(CHARTEUSE) +_(SLIME) +_(LEAF) +_(JUNGLE) +_(EVERGREEN) +_(TROPIC) +_(IGUANA) +_(SPEARMINT) +_(PATINA) +_(LAKESIDE) +_(ELECTRIC) +_(PEGASUS) +_(PLASMA) +_(COMET) +_(LIGHTNING) +_(VACATION) +_(DEPTHS) +_(DIANNE) +_(EXOTIC) +_(SNOW) +_(MOON) +_(LUNAR) +_(ONYX) +_(LAPIS) +_(ORCA) +_(STORM) +_(COTTONCANDY) // this color was a pain to get right +_(CYBER) // this one too +_(AMETHYST) +_(IRIS) +_(GOTHIC) +_(GRAPE) +_(INDIGO) +_(SAKURA) +_(DISCO) +_(MULBERRY) +_(BOYSENBERRY) +_(MYSTIC) +_(WICKED) -_(SUPERORANGE1) -_(SUPERORANGE2) -_(SUPERORANGE3) -_(SUPERORANGE4) -_(SUPERORANGE5) +_(SUPER1) // Super Sonic Yellow +_(SUPER2) +_(SUPER3) +_(SUPER4) +_(SUPER5) -_(SUPERGOLD1) -_(SUPERGOLD2) -_(SUPERGOLD3) -_(SUPERGOLD4) -_(SUPERGOLD5) +_(TSUPER1) // Super Tails Orange +_(TSUPER2) +_(TSUPER3) +_(TSUPER4) +_(TSUPER5) -_(SUPERPERIDOT1) -_(SUPERPERIDOT2) -_(SUPERPERIDOT3) -_(SUPERPERIDOT4) -_(SUPERPERIDOT5) +_(KSUPER1) // Super Knuckles Red +_(KSUPER2) +_(KSUPER3) +_(KSUPER4) +_(KSUPER5) -_(SUPERSKY1) -_(SUPERSKY2) -_(SUPERSKY3) -_(SUPERSKY4) -_(SUPERSKY5) +_(PSUPER1) // Hyper Sonic Pink +_(PSUPER2) +_(PSUPER3) +_(PSUPER4) +_(PSUPER5) -_(SUPERPURPLE1) -_(SUPERPURPLE2) -_(SUPERPURPLE3) -_(SUPERPURPLE4) -_(SUPERPURPLE5) +_(BSUPER1) // Hyper Sonic Blue +_(BSUPER2) +_(BSUPER3) +_(BSUPER4) +_(BSUPER5) -_(SUPERRUST1) -_(SUPERRUST2) -_(SUPERRUST3) -_(SUPERRUST4) -_(SUPERRUST5) +_(ASUPER1) // Aqua Super +_(ASUPER2) +_(ASUPER3) +_(ASUPER4) +_(ASUPER5) -_(SUPERTAN1) -_(SUPERTAN2) -_(SUPERTAN3) -_(SUPERTAN4) -_(SUPERTAN5) +_(GSUPER1) // Hyper Sonic Green +_(GSUPER2) +_(GSUPER3) +_(GSUPER4) +_(GSUPER5) -_(CHAOSEMERALD1) -_(CHAOSEMERALD2) -_(CHAOSEMERALD3) -_(CHAOSEMERALD4) -_(CHAOSEMERALD5) -_(CHAOSEMERALD6) -_(CHAOSEMERALD7) +_(WSUPER1) // Hyper Sonic White +_(WSUPER2) +_(WSUPER3) +_(WSUPER4) +_(WSUPER5) + +_(CSUPER1) // Creamy Super (Shadow?) +_(CSUPER2) +_(CSUPER3) +_(CSUPER4) +_(CSUPER5) _(INVINCFLASH) diff --git a/src/p_enemy.c b/src/p_enemy.c index 4ab8ca3e0..214a14bd3 100644 --- a/src/p_enemy.c +++ b/src/p_enemy.c @@ -2534,16 +2534,16 @@ void A_Boss1Laser(mobj_t *actor) tic_t dur; static const UINT8 LASERCOLORS[] = { - SKINCOLOR_SUPERRED3, - SKINCOLOR_SUPERRED4, - SKINCOLOR_SUPERRED5, + SKINCOLOR_KSUPER3, + SKINCOLOR_KSUPER4, + SKINCOLOR_KSUPER5, SKINCOLOR_KETCHUP, SKINCOLOR_RED, SKINCOLOR_RED, SKINCOLOR_KETCHUP, - SKINCOLOR_SUPERRED5, - SKINCOLOR_SUPERRED4, - SKINCOLOR_SUPERRED3, + SKINCOLOR_KSUPER5, + SKINCOLOR_KSUPER4, + SKINCOLOR_KSUPER3, }; if (LUA_CallAction(A_BOSS1LASER, actor)) @@ -12706,7 +12706,7 @@ void A_RolloutSpawn(mobj_t *actor) if (actor->target->flags2 & MF2_AMBUSH) { - actor->target->color = SKINCOLOR_SUPERRUST3; + actor->target->color = SKINCOLOR_CSUPER1; actor->target->colorized = true; } } diff --git a/src/r_skins.c b/src/r_skins.c index aa722a168..867b205c1 100644 --- a/src/r_skins.c +++ b/src/r_skins.c @@ -114,7 +114,7 @@ static void Sk_SetDefaultValue(skin_t *skin) strncpy(skin->facemmap, "MISSING", 9); skin->starttranscolor = 96; skin->prefcolor = SKINCOLOR_GREEN; - skin->supercolor = SKINCOLOR_SUPERGOLD1; + skin->supercolor = SKINCOLOR_SUPER1; skin->prefoppositecolor = 0; // use tables skin->kartspeed = 5; @@ -604,7 +604,7 @@ static boolean R_ProcessPatchableFields(skin_t *skin, char *stoken, char *value, else if (!stricmp(stoken, "supercolor")) { UINT16 color = R_GetSuperColorByName(value); - skin->supercolor = (color ? color : SKINCOLOR_SUPERGOLD1); + skin->supercolor = (color ? color : SKINCOLOR_SUPER1); } #define GETFLOAT(field) else if (!stricmp(stoken, #field)) skin->field = FLOAT_TO_FIXED(atof(value)); @@ -635,6 +635,8 @@ static boolean R_ProcessPatchableFields(skin_t *skin, char *stoken, char *value, // 1, true, yes are all valid values GETFLAG(HIRES) GETFLAG(MACHINE) + GETFLAG(NOGIBS) + GETFLAG(OLDDEATH) #undef GETFLAG #define GETPATCH(field) else if (compat && !stricmp(stoken, #field)) strncpy(skin->field, value, 8);