From be64786d576eda63418b3653e72d7ccd9203b2fa Mon Sep 17 00:00:00 2001
From: GenericHeroGuy <genericheroguy@noreply.codeberg.org>
Date: Fri, 24 Jan 2025 17:35:45 +0100
Subject: [PATCH] Update skincolors

---
 src/doomdef.h         |   2 +-
 src/info/skincolors.h | 262 +++++++++++++-----------------------------
 2 files changed, 79 insertions(+), 185 deletions(-)

diff --git a/src/doomdef.h b/src/doomdef.h
index 3a2c3d502..c24e1000f 100644
--- a/src/doomdef.h
+++ b/src/doomdef.h
@@ -240,7 +240,7 @@ typedef enum
 	MAXSKINCOLORS,
 
 	FIRSTRAINBOWCOLOR = SKINCOLOR_PINK,
-	FIRSTSUPERCOLOR = SKINCOLOR_SUPER1,
+	FIRSTSUPERCOLOR = SKINCOLOR_SUPERSILVER1,
 	NUMSUPERCOLORS = ((SKINCOLOR_FIRSTFREESLOT - FIRSTSUPERCOLOR)/5)
 } skincolornum_t;
 
diff --git a/src/info/skincolors.h b/src/info/skincolors.h
index 7de0a514c..9c43bb3d9 100644
--- a/src/info/skincolors.h
+++ b/src/info/skincolors.h
@@ -11,44 +11,39 @@ _(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)
-_(SUNSET)
+_(SUNSLAM)
 _(CREAMSICLE)
 _(ORANGE)
-_(PUMPKIN)
 _(ROSEWOOD)
-_(BURGUNDY)
 _(TANGERINE)
-_(PEACH)
-_(CARAMEL)
+_(TAN)
 _(CREAM)
 _(GOLD)
 _(ROYAL)
 _(BRONZE)
 _(COPPER)
-_(QUARRY)
 _(YELLOW)
 _(MUSTARD)
-_(CROCODILE)
+_(BANANA)
 _(OLIVE)
+_(CROCODILE)
+_(PERIDOT)
 _(VOMIT)
 _(GARDEN)
 _(LIME)
@@ -57,19 +52,19 @@ _(TEA)
 _(PISTACHIO)
 _(MOSS)
 _(CAMOUFLAGE)
-_(ROBOHOOD)
 _(MINT)
 _(GREEN)
 _(PINETREE)
-_(EMERALD)
+_(TURTLE)
 _(SWAMP)
 _(DREAM)
 _(PLAGUE)
+_(EMERALD)
 _(ALGAE)
-_(CARIBBEAN)
-_(AZURE)
-_(AQUA)
+_(AQUAMARINE)
+_(TURQUOISE)
 _(TEAL)
+_(ROBIN)
 _(CYAN)
 _(JAWZ) // Oni's torment
 _(CERULEAN)
@@ -78,20 +73,23 @@ _(PLATINUM)
 _(SLATE)
 _(STEEL)
 _(THUNDER)
+_(NOVA)
 _(RUST)
 _(WRISTWATCH)
 _(JET)
 _(SAPPHIRE) // sweet mother, i cannot weave - slender aphrodite has overcome me with longing for a girl
+_(ULTRAMARINE)
 _(PERIWINKLE)
 _(BLUE)
+_(MIDNIGHT)
 _(BLUEBERRY)
-_(NOVA)
-_(PASTEL)
-_(MOONSLAM)
-_(ULTRAVIOLET)
-_(DUSK)
-_(BUBBLEGUM)
+_(THISTLE)
 _(PURPLE)
+_(PASTEL)
+_(MOONSET)
+_(DUSK)
+_(VIOLET)
+_(MAGENTA)
 _(FUCHSIA)
 _(TOXIC)
 _(MAUVE)
@@ -99,174 +97,70 @@ _(LAVENDER)
 _(BYZANTIUM)
 _(POMEGRANATE)
 _(LILAC)
-_(BONE) // vanilla colors - shoutouts to Sonic Team Jr.
-_(CARBON)
-_(INK)
-_(GHOST)
-_(MARBLE)
-_(BLUEBELL)
-_(CHOCOLATE)
-_(TAN)
-_(PEACHY)
-_(QUAIL)
-_(LANTERN)
-_(APRICOT)
-_(SANDY)
-_(BANANA)
-_(SUNFLOWER)
-_(OLIVINE)
-_(PERIDOT)
-_(APPLE)
-_(SEAFOAM)
-_(FOREST)
-_(TOPAZ)
-_(FROST)
-_(WAVE)
-_(ICY)
-_(PEACOCK)
-_(VAPOR)
-_(GEMSTONE)
-_(NEON)
-_(PLUM)
-_(VIOLET)
-_(MAGENTA)
-_(THISTLE)
-_(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)
-_(TURQUOISE)
-_(PEGASUS)
-_(PLASMA)
-_(COMET)
-_(LIGHTNING)
-_(VACATION)
-_(ULTRAMARINE)
-_(DEPTHS)
-_(DIANNE)
-_(EXOTIC)
-_(SNOW)
-_(MOON)
-_(LUNAR)
-_(ONYX)
-_(LAPIS)
-_(ORCA)
-_(STORM)
-_(MIDNIGHT)
-_(COTTONCANDY) // this color was a pain to get right
-_(CYBER) // this one too
-_(AMETHYST)
-_(IRIS)
-_(GOTHIC)
-_(GRAPE)
-_(INDIGO)
-_(SAKURA)
-_(DISCO)
-_(MULBERRY)
-_(BOYSENBERRY)
-_(MYSTIC)
-_(WICKED)
+_(BLOSSOM)
+_(TAFFY)
 
 // Super special awesome Super flashing colors!
-// Super Sonic Yellow
-_(SUPER1)
-_(SUPER2)
-_(SUPER3)
-_(SUPER4)
-_(SUPER5)
+_(SUPERSILVER1)
+_(SUPERSILVER2)
+_(SUPERSILVER3)
+_(SUPERSILVER4)
+_(SUPERSILVER5)
 
-// Super Tails Orange
-_(TSUPER1)
-_(TSUPER2)
-_(TSUPER3)
-_(TSUPER4)
-_(TSUPER5)
+_(SUPERRED1)
+_(SUPERRED2)
+_(SUPERRED3)
+_(SUPERRED4)
+_(SUPERRED5)
 
-// Super Knuckles Red
-_(KSUPER1)
-_(KSUPER2)
-_(KSUPER3)
-_(KSUPER4)
-_(KSUPER5)
+_(SUPERORANGE1)
+_(SUPERORANGE2)
+_(SUPERORANGE3)
+_(SUPERORANGE4)
+_(SUPERORANGE5)
 
-// Hyper Sonic Pink
-_(PSUPER1)
-_(PSUPER2)
-_(PSUPER3)
-_(PSUPER4)
-_(PSUPER5)
+_(SUPERGOLD1)
+_(SUPERGOLD2)
+_(SUPERGOLD3)
+_(SUPERGOLD4)
+_(SUPERGOLD5)
 
-// Hyper Sonic Blue
-_(BSUPER1)
-_(BSUPER2)
-_(BSUPER3)
-_(BSUPER4)
-_(BSUPER5)
+_(SUPERPERIDOT1)
+_(SUPERPERIDOT2)
+_(SUPERPERIDOT3)
+_(SUPERPERIDOT4)
+_(SUPERPERIDOT5)
 
-// Aqua Super
-_(ASUPER1)
-_(ASUPER2)
-_(ASUPER3)
-_(ASUPER4)
-_(ASUPER5)
+_(SUPERSKY1)
+_(SUPERSKY2)
+_(SUPERSKY3)
+_(SUPERSKY4)
+_(SUPERSKY5)
 
-// Hyper Sonic Green
-_(GSUPER1)
-_(GSUPER2)
-_(GSUPER3)
-_(GSUPER4)
-_(GSUPER5)
+_(SUPERPURPLE1)
+_(SUPERPURPLE2)
+_(SUPERPURPLE3)
+_(SUPERPURPLE4)
+_(SUPERPURPLE5)
 
-// Hyper Sonic White
-_(WSUPER1)
-_(WSUPER2)
-_(WSUPER3)
-_(WSUPER4)
-_(WSUPER5)
+_(SUPERRUST1)
+_(SUPERRUST2)
+_(SUPERRUST3)
+_(SUPERRUST4)
+_(SUPERRUST5)
 
-// Creamy Super (Shadow?)
-_(CSUPER1)
-_(CSUPER2)
-_(CSUPER3)
-_(CSUPER4)
-_(CSUPER5)
+_(SUPERTAN1)
+_(SUPERTAN2)
+_(SUPERTAN3)
+_(SUPERTAN4)
+_(SUPERTAN5)
+
+_(CHAOSEMERALD1)
+_(CHAOSEMERALD2)
+_(CHAOSEMERALD3)
+_(CHAOSEMERALD4)
+_(CHAOSEMERALD5)
+_(CHAOSEMERALD6)
+_(CHAOSEMERALD7)
+
+_(INVINCFLASH)