Fix railgun / crosshair colors

Add a consistent color band to pakQ3VR, which supersedes both pak8a and
pak3a, and keeps bands consistent across baseq3/missionpack without
changes to either of the other pk3 files.

Demo video: https://youtube.com/shorts/N9rZJ-VkIu8

Author: ernie

assets/pakQ3VR/menu/art/fx_base.tga

@@ -73,8 +73,8 @@ typedef struct {
 
 static playersettings_t	s_playersettings;
 
-static int gamecodetoui[] = {4,2,3,0,5,1,6};
-static int uitogamecode[] = {4,6,2,3,1,5,7};
+static int gamecodetoui[] = {0,2,1,4,5,3,6};
+static int uitogamecode[] = {1,3,2,6,4,5,7};
 
 static const char *handicap_items[] = {
 	"None",
@@ -236,8 +236,10 @@ static void PlayerSettings_DrawEffects( void *self ) {
 
 	UI_DrawProportionalString( item->generic.x, item->generic.y, "Effects", style, color );
 
+	int markerX = item->generic.x + 64 + (item->curvalue * 112 / 6);
+
 	UI_DrawHandlePic( item->generic.x + 64, item->generic.y + PROP_HEIGHT + 8, 128, 8, s_playersettings.fxBasePic );
-	UI_DrawHandlePic( item->generic.x + 64 + item->curvalue * 16 + 8, item->generic.y + PROP_HEIGHT + 6, 16, 12, s_playersettings.fxPic[item->curvalue] );
+	UI_DrawHandlePic( markerX, item->generic.y + PROP_HEIGHT + 6, 16, 12, s_playersettings.fxPic[item->curvalue] );
 }
 
 

code/q3_ui/ui_playersettings.c

@@ -406,8 +406,10 @@ static void CrosshairColor_Draw( void *self ) {
 	UI_DrawString( x - SMALLCHAR_WIDTH, y, s->generic.name, style|UI_RIGHT, color );
 
 	// Draw color picker
+	int markerX = x + SMALLCHAR_WIDTH + (s->curvalue * 112 / 6);
+
 	UI_DrawHandlePic( x + SMALLCHAR_WIDTH, y + 4, 128, 8, s_preferences.fxBasePic );
-	UI_DrawHandlePic( x + SMALLCHAR_WIDTH + s->curvalue * 16 + 8, y + 2, 16, 12, s_preferences.fxPic[s->curvalue] );
+	UI_DrawHandlePic( markerX, y + 2, 16, 12, s_preferences.fxPic[s->curvalue] );
 }
 
 

code/q3_ui/ui_preferences.c

@@ -115,8 +115,8 @@ static char* netnames[] = {
 static char quake3worldMessage[] = "Visit www.quake3world.com - News, Community, Events, Files";
 #endif
 
-static int gamecodetoui[] = {0,1,2,3,4,5,6};
-static int uitogamecode[] = {1,2,3,4,5,6,7};
+static int gamecodetoui[] = {0,2,1,4,5,3,6};
+static int uitogamecode[] = {1,3,2,6,4,5,7};
 
 
 static void UI_StartServerRefresh(qboolean full, qboolean force);
@@ -1296,9 +1296,10 @@ static void UI_DrawEffects(rectDef_t *rect, float scale, vec4_t color) {
 	static int gamecodetofxpic[] = {0,2,1,4,5,3,6};
 	int gameColorCode = uitogamecode[uiInfo.effectsColor];
 	int fxPicIndex = gamecodetofxpic[gameColorCode - 1];
+	int markerX = rect->x + (uiInfo.effectsColor * 112 / 6);
 
 	UI_DrawHandlePic( rect->x, rect->y - 14, 128, 8, uiInfo.uiDC.Assets.fxBasePic );
-	UI_DrawHandlePic( rect->x + uiInfo.effectsColor * 16 + 8, rect->y - 16, 16, 12, uiInfo.uiDC.Assets.fxPic[fxPicIndex] );
+	UI_DrawHandlePic( markerX, rect->y - 16, 16, 12, uiInfo.uiDC.Assets.fxPic[fxPicIndex] );
 }
 
 static void UI_DrawMapPreview(rectDef_t *rect, float scale, vec4_t color, qboolean net) {
@@ -1911,9 +1912,10 @@ static void UI_DrawCrosshairColor(rectDef_t *rect, float scale, vec4_t color) {
 	}
 	int uiColorIndex = gamecodetoui[gameColorCode - 1];
 	int fxPicIndex = gamecodetofxpic[gameColorCode - 1];
+	int markerX = rect->x + (uiColorIndex * 112 / 6);
 
 	UI_DrawHandlePic( rect->x, rect->y - 10, 128, 8, uiInfo.uiDC.Assets.fxBasePic );
-	UI_DrawHandlePic( rect->x + uiColorIndex * 16 + 8, rect->y - 12, 16, 12, uiInfo.uiDC.Assets.fxPic[fxPicIndex] );
+	UI_DrawHandlePic( markerX, rect->y - 12, 16, 12, uiInfo.uiDC.Assets.fxPic[fxPicIndex] );
 }
 
 /*
@@ -2744,13 +2746,15 @@ static qboolean UI_CrosshairColor_HandleKey(int flags, float *special, int key)
 	int select = UI_SelectForKey(key);
 	if (select != 0) {
 		int currentColor = (int)trap_Cvar_VariableValue("cg_crosshairColor");
-		currentColor += select;
+		int uiIndex = gamecodetoui[currentColor - 1];
+		uiIndex += select;
 
-		if (currentColor > 7) {
-			currentColor = 1;
-		} else if (currentColor < 1) {
-			currentColor = 7;
+		if (uiIndex > 6) {
+			uiIndex = 0;
+		} else if (uiIndex < 0) {
+			uiIndex = 6;
 		}
+		currentColor = uitogamecode[uiIndex];
 		trap_Cvar_SetValue("cg_crosshairColor", currentColor);
 		// Enable health-based coloring for white, disable for custom colors
 		if (currentColor == 7) {