Merge pull request 'New Skincolors' (#107) from newcolors into blankart-dev

Reviewed-on: https://codeberg.org/NepDisk/blankart/pulls/107

src/info/skincolors.h

@@ -1,6 +1,7 @@
+// SRB2K colors
 _(NONE)
 
-_(WHITE) // kart colors
+_(WHITE)
 _(SILVER)
 _(GREY)
 _(NICKEL)
@@ -62,7 +63,7 @@ _(ROBOHOOD)
 _(MINT)
 _(GREEN)
 _(PINETREE)
-_(EMERALD)
+_(TURTLE)
 _(SWAMP)
 _(DREAM)
 _(PLAGUE)
@@ -82,10 +83,10 @@ _(THUNDER)
 _(RUST)
 _(WRISTWATCH)
 _(JET)
-_(SAPPHIRE) // sweet mother, i cannot weave - slender aphrodite has overcome me with longing for a girl
+_(SAPPHIRE)
 _(PERIWINKLE)
 _(BLUE)
-_(BLUEBERRY)
+_(MIDNIGHT)
 _(NOVA)
 _(PASTEL)
 _(MOONSLAM)
@@ -101,170 +102,268 @@ _(BYZANTIUM)
 _(POMEGRANATE)
 _(LILAC)
 
-_(TAN) // v2 colors, i think? separated from the rest (yay compatmode!)
+// Ring Racers New Colors
+// These are listed after the Kart colors for backwards compatability
+_(SUNSLAM)
+_(TAN)
 _(BANANA)
 _(PERIDOT)
-_(TURTLE)
+_(EMERALD)
 _(AQUAMARINE)
 _(TURQUOISE)
 _(ROBIN)
 _(ULTRAMARINE)
-_(MIDNIGHT)
+_(BLUEBERRY)
 _(THISTLE)
+_(MOONSET)
 _(VIOLET)
 _(MAGENTA)
 _(BLOSSOM)
 _(TAFFY)
 
-_(BONE) // vanilla colors - shoutouts to Sonic Team Jr.
+// SRB2 Vanilla 2.2 Ports
+// featuring Viv's vivid colours (toast 21/07/17)
+// Tweaks & additions (Lach, Chrispy, sphere, Alice, MotorRoach & Saneko 26/10/22)
+// Conversion to Kart/Ring Racers style (BlanKart 21/04/25)
+_(BONE)
 _(CARBON)
 _(INK)
-_(GHOST)
+_(AETHER)
 _(MARBLE)
+_(MOONSTONE)
 _(BLUEBELL)
-_(CHOCOLATE)
+_(CHESTNUT)
+_(LATTE)
+_(BOULDER)
+_(BRASS)
+_(VINTAGE)
+_(ECRU)
+_(SANDSTORM)
+_(ROSEBUSH)
+_(LEEK)
+_(EGGPLANT)
+_(CERISE)
+_(CRANBERRY)
+_(PEPPER)
+_(MAHOGANY)
+_(BLAZING)
+_(GARNET)
 _(PEACHY)
 _(QUAIL)
-_(LANTERN)
+_(FOUNDATION)
+_(BURNING)
 _(APRICOT)
-_(SANDY)
-_(SUNFLOWER)
-_(OLIVINE)
-_(APPLE)
-_(SEAFOAM)
-_(FOREST)
 _(TOPAZ)
-_(FROST)
-_(WAVE)
-_(ICY)
-_(PEACOCK)
-_(VAPOR)
-_(GEMSTONE)
-_(NEON)
-_(PLUM)
-
-_(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)
+_(SANDY)
 _(LEMON)
 _(CASKET)
+_(PEAR)
+_(GECKO)
+_(VENOM)
+_(APPLE)
+_(HEADLIGHT)
+_(CHARTREUSE)
+_(FOREST)
+_(JADE)
+_(MASTER)
+_(HARLEQUIN)
+_(SEAFOAM)
+_(ISLAND)
+_(BOTTLE)
+_(OCEAN)
+_(WAVE)
+_(FROST)
+_(VACATION)
+_(HYDRO)
+_(SKY)
+_(MARINE)
+_(DEPTHS)
+_(FANTASY)
+_(ICY)
+_(DAYBREAK)
+_(ARCTIC)
+_(CORNFLOWER)
+_(COBALT)
+_(NIGHTFALL)
+_(GALAXY)
+_(VAPOR)
+_(MAJESTY)
+_(NOBLE)
+_(BERRY)
+_(SIBERITE)
+_(NEON)
+_(GRAPE)
+_(ARISTOCRAT)
+_(BLOOM)
+_(MALLOW)
+_(EVENTIDE)
+_(PLUM)
+_(PUNCH)
+_(FLAMINGO)
+_(FANCY)
+_(SANGRIA)
+_(VOLCANIC)
+
+// Custom Color Expansion
+// Featuring all new colors to best match Kart and Ring Racers
+_(IVORY)
+_(ABYSS)
+_(DIAMOND)
+_(RAVEN)
+_(NOIR)
+_(VANILLA)
+_(FIREFLY)
+_(COFFEE)
+_(CHOCOLATE)
+_(DUST)
+_(HICKORY)
+_(PEARL)
+_(ROSEGOLD)
+_(DRAGONFRUIT)
+_(STRAWBERRY)
+_(AMARANTH)
+_(PARROT)
+_(SODA)
+_(VERMILLION)
+_(WINE)
+_(BLOODCELL)
+_(SYRUP)
+_(SUNBURST)
+_(GRAPEFRUIT)
+_(DEEPFRY)
+_(SENTINEL)
+_(FIERY)
+_(AUTUMN)
+_(SPICE)
+_(SUMMER)
+_(HALLOWEEN)
+_(DUNE)
+_(CHEESE)
+_(CARROT)
+_(TIGER)
+_(SIENNA)
+_(AMBER)
+_(STEAMPUNK)
+_(BLONDE)
+_(DRAVITE)
+_(CANARY)
+_(HORNET)
+_(MOON)
 _(KHAKI)
-_(LIGHT)
-_(PEPPERMINT)
+_(PYRAMID)
 _(LASER)
-_(ASPARAGUS)
+_(DANDELION)
+_(SAGE)
+_(JUNGLE)
+_(PLANTATION)
+_(SCIENCE)
+_(WILD)
+_(JUNIPER)
+_(PEPPERMINT)
+_(SPRING)
+_(IGUANA)
+_(AVOCADO)
 _(ARMY)
 _(CROW)
-_(CHARTEUSE)
-_(SLIME)
+_(DIANNE)
+_(BEAN)
+_(CLOVER)
 _(LEAF)
-_(JUNGLE)
-_(EVERGREEN)
-_(TROPIC)
-_(IGUANA)
+_(SOUR)
+_(SLIME)
+_(WATERMELON)
+_(MIAMI)
 _(SPEARMINT)
-_(PATINA)
-_(LAKESIDE)
+_(CAPRI)
 _(ELECTRIC)
 _(PEGASUS)
-_(PLASMA)
-_(COMET)
-_(LIGHTNING)
-_(VACATION)
-_(DEPTHS)
-_(DIANNE)
-_(EXOTIC)
-_(SNOW)
-_(MOON)
+_(PIPEWORK)
+_(SACRAMENTO)
+_(EVERGREEN)
+_(CHILL)
+_(PEACOCK)
+_(WINTER)
+_(MECHA)
+_(POLAR)
+_(COTTONCANDY)
+_(SNOWMAN)
+_(CRYSTAL)
+_(WATERSTONE)
 _(LUNAR)
 _(ONYX)
+_(ASTRONAUT)
+_(COMET)
+_(MINSK)
 _(LAPIS)
-_(ORCA)
-_(STORM)
-_(COTTONCANDY) // this color was a pain to get right
-_(CYBER) // this one too
+_(GROWTH)
+_(NOCTURNE)
+_(ZIRCON)
+_(ORCHID)
+_(EMPERESS)
+_(NIGHTWALK)
 _(AMETHYST)
-_(IRIS)
 _(GOTHIC)
-_(GRAPE)
 _(INDIGO)
+_(CORDOVAN)
 _(SAKURA)
 _(DISCO)
 _(MULBERRY)
-_(BOYSENBERRY)
-_(MYSTIC)
+_(VELOUR)
 _(WICKED)
+_(GLAMOUR)
+_(UNICORN)
 
-_(SUPER1) // Super Sonic Yellow
+// Super Colors
+// Currently not implemented, using SRB2K's as a placeholder
+_(SUPER1)
 _(SUPER2)
 _(SUPER3)
 _(SUPER4)
 _(SUPER5)
 
-_(TSUPER1) // Super Tails Orange
+_(TSUPER1)
 _(TSUPER2)
 _(TSUPER3)
 _(TSUPER4)
 _(TSUPER5)
 
-_(KSUPER1) // Super Knuckles Red
+_(KSUPER1)
 _(KSUPER2)
 _(KSUPER3)
 _(KSUPER4)
 _(KSUPER5)
 
-_(PSUPER1) // Hyper Sonic Pink
+_(PSUPER1)
 _(PSUPER2)
 _(PSUPER3)
 _(PSUPER4)
 _(PSUPER5)
 
-_(BSUPER1) // Hyper Sonic Blue
+_(BSUPER1)
 _(BSUPER2)
 _(BSUPER3)
 _(BSUPER4)
 _(BSUPER5)
 
-_(ASUPER1) // Aqua Super
+_(ASUPER1)
 _(ASUPER2)
 _(ASUPER3)
 _(ASUPER4)
 _(ASUPER5)
 
-_(GSUPER1) // Hyper Sonic Green
+_(GSUPER1)
 _(GSUPER2)
 _(GSUPER3)
 _(GSUPER4)
 _(GSUPER5)
 
-_(WSUPER1) // Hyper Sonic White
+_(WSUPER1)
 _(WSUPER2)
 _(WSUPER3)
 _(WSUPER4)
 _(WSUPER5)
 
-_(CSUPER1) // Creamy Super (Shadow?)
+_(CSUPER1)
 _(CSUPER2)
 _(CSUPER3)
 _(CSUPER4)

src/k_color.c

@@ -20,12 +20,12 @@
 UINT16 altinvinccolors[16] = {
     SKINCOLOR_BLOODCELL,   // 0
     SKINCOLOR_FUCHSIA,     // 1
-    SKINCOLOR_LANTERN,     // 2
+    SKINCOLOR_MOON,        // 2
     SKINCOLOR_FIERY,       // 3
     SKINCOLOR_FLAME,       // 4
     SKINCOLOR_APRICOT,     // 5
     SKINCOLOR_GARDEN,      // 6
-    SKINCOLOR_OLIVINE,     // 7
+    SKINCOLOR_OLIVE,       // 7
     SKINCOLOR_LIME,        // 8
     SKINCOLOR_EMERALD,     // 9
     SKINCOLOR_NAVY,        // 10