From 721a5f9b4b57fd1c4237cde298b665e2b91f93ca Mon Sep 17 00:00:00 2001
From: Sryder13 <sryder13@gmail.com>
Date: Thu, 23 Jul 2015 21:43:30 +0100
Subject: [PATCH] Default Translation color + Neon Green change

---
 src/r_draw.c   | 30 ++++++++++++++----------------
 src/r_things.c |  2 +-
 2 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/src/r_draw.c b/src/r_draw.c
index 6689e6c29..5f4f28cfc 100644
--- a/src/r_draw.c
+++ b/src/r_draw.c
@@ -121,7 +121,7 @@ UINT32 nflatxshift, nflatyshift, nflatshiftup, nflatmask;
 #define METALSONIC_TT_CACHE_INDEX (MAXSKINS + 2)
 #define ALLWHITE_TT_CACHE_INDEX (MAXSKINS + 3)
 #define SKIN_RAMP_LENGTH 16
-#define DEFAULT_STARTTRANSCOLOR 160
+#define DEFAULT_STARTTRANSCOLOR 96
 #define NUM_PALETTE_ENTRIES 256
 
 static UINT8** translationtablecache[MAXSKINS + 4] = {NULL};
@@ -347,7 +347,7 @@ static void R_GenerateTranslationColormap(UINT8 *dest_colormap, INT32 skinnum, U
 		break;
 
 	case SKINCOLOR_PEACH:
-		// 10 color rame, from 2 color ranges
+		// 10 colors
 		for (i = 0; i < SKIN_RAMP_LENGTH; i++)
 		{
 			if (10*i/16 == 0)
@@ -360,7 +360,7 @@ static void R_GenerateTranslationColormap(UINT8 *dest_colormap, INT32 skinnum, U
 		break;
 
 	case SKINCOLOR_BEIGE:
-		// 13 color range, from 2 color ranges
+		// 13 colors
 		for (i = 0; i < SKIN_RAMP_LENGTH; i++)
 		{
 			if (13*i/16 == 12)
@@ -396,7 +396,7 @@ static void R_GenerateTranslationColormap(UINT8 *dest_colormap, INT32 skinnum, U
 		break;
 
 	case SKINCOLOR_GOLD:
-		// 10 color range, from 2 color ranges
+		// 10 colors
 		for (i = 0; i < SKIN_RAMP_LENGTH; i++)
 		{
 			if (10*i/16 == 0)
@@ -409,7 +409,7 @@ static void R_GenerateTranslationColormap(UINT8 *dest_colormap, INT32 skinnum, U
 		break;
 
 	case SKINCOLOR_TAN:
-		// 8 color range, from 3 color ranges
+		// 8 colors
 		for (i = 0; i < SKIN_RAMP_LENGTH; i++)
 		{
 			if (8*i/16 == 0)
@@ -426,13 +426,13 @@ static void R_GenerateTranslationColormap(UINT8 *dest_colormap, INT32 skinnum, U
 		break;
 
 	case SKINCOLOR_OLIVE:
-		// 7 color ramp
+		// 7 colors
 		for (i = 0; i < SKIN_RAMP_LENGTH; i++)
 			dest_colormap[starttranscolor + i] = (UINT8)(skinbasecolors[color - 1] + (7*i/SKIN_RAMP_LENGTH));
 		break;
 
 	case SKINCOLOR_YELLOW:
-		// 10 color range, from 2 color ranges
+		// 10 colors
 		for (i = 0; i < SKIN_RAMP_LENGTH; i++)
 		{
 			if (10*i/16 == 0)
@@ -445,20 +445,18 @@ static void R_GenerateTranslationColormap(UINT8 *dest_colormap, INT32 skinnum, U
 		break;
 
 	case SKINCOLOR_NEONGREEN:
-		// Multi-color ramp
+		// 8 colors
 		for (i = 0; i < SKIN_RAMP_LENGTH; i++)
 		{
-			if (10*i/16 <= 1)
-				dest_colormap[starttranscolor + i] = 0x60 + 10*i/16; // Brighter green
-			else if (10*i/16 < 9)
-				dest_colormap[starttranscolor + i] = (UINT8)(skinbasecolors[color - 1] + (10*i/SKIN_RAMP_LENGTH) - 2); // Neon green
+			if (8*i/16 == 7)
+				dest_colormap[starttranscolor + i] = 0x6E; // Darkest
 			else
-				dest_colormap[starttranscolor + i] = 0x6F;
+				dest_colormap[starttranscolor + i] = (UINT8)(skinbasecolors[color - 1] + (8*i/SKIN_RAMP_LENGTH)); // Neon green
 		}
 		break;
 
 	case SKINCOLOR_TEAL:
-		// 6 color ramp
+		// 6 colors
 		for (i = 0; i < SKIN_RAMP_LENGTH; i++)
 		{
 			if (6*i/16 == 0)
@@ -483,7 +481,7 @@ static void R_GenerateTranslationColormap(UINT8 *dest_colormap, INT32 skinnum, U
 		break;
 
 	case SKINCOLOR_STEELBLUE:
-		// 8 color range, from 2 color ranges
+		// 8 colors
 		for (i = 0; i < SKIN_RAMP_LENGTH; i++)
 		{
 			if (8*i/16 <= 1)
@@ -496,7 +494,7 @@ static void R_GenerateTranslationColormap(UINT8 *dest_colormap, INT32 skinnum, U
 		break;
 
 	case SKINCOLOR_LAVENDER:
-		// 10 color range, from 2 color ranges
+		// 10 colors
 		for (i = 0; i < SKIN_RAMP_LENGTH; i++)
 		{
 			if (10*i/16 <= 1)
diff --git a/src/r_things.c b/src/r_things.c
index 9a8b1319b..3b46d4d3d 100644
--- a/src/r_things.c
+++ b/src/r_things.c
@@ -2235,7 +2235,7 @@ static void Sk_SetDefaultValue(skin_t *skin)
 	strncpy(skin->face, "MISSING", 8);
 	strncpy(skin->superface, "MISSING", 8);
 
-	skin->starttranscolor = 160;
+	skin->starttranscolor = 96;
 	skin->prefcolor = SKINCOLOR_GREEN;
 
 	skin->normalspeed = 36<<FRACBITS;