Installer Changes https://github.com/raysfire/rayshud/issues/101

- Reorganized customization options folder to be compatible with the installer
- Moved several customization options from rayshud/resource/ui to rayshud/customizations
- Removed 4:3 customization files, because they do nothing
- Added back main menu character images (toggled manually or via installer)
- Added rayshud-crosshair outline fonts
- Updated the Classic Main Menu to be compatible with the Blue Moon Update
- Fixed KonrWings entries being located in client scheme fonts instead of crosshairs
- Fixed not every default background being displayed when custom backgrounds are disabled
- Fixed map type label clipping into the map name on the loading screen
- Updated several files to be compatible with the installer

2 files changed, 145 insertions, 129 deletions

diff --git a/scripts/HudAnimations_custom.txt b/scripts/HudAnimations_custom.txt
index 11aebd7..d7c5ad6 100644
--- a/scripts/HudAnimations_custom.txt
+++ b/scripts/HudAnimations_custom.txt
@@ -85,19 +85,15 @@ event HitMarker
 event HudSpyDisguiseFadeIn
 {
 	//RunEvent HudSpyDisguiseChanged	0
-	//Animate PlayerStatusSpyImage			Alpha		"255"			Linear 0.9 0.1	
-	
-	//Uncomment the line below for spy disguise image.
+	//Animate PlayerStatusSpyImage			Alpha		"255"			Linear 0.9 0.1
 	//Animate PlayerStatusClassImage			Alpha		"255"			Linear 0.0 0.0
 }
 
 event HudSpyDisguiseFadeOut
 {
 	//RunEvent HudSpyDisguiseChanged	0
-	//Animate PlayerStatusSpyImage			Alpha		"0"				Linear 0.9 0.1	
-	
-	//Uncomment the line below for spy disguise image.
-	//Animate PlayerStatusClassImage			Alpha		"0"				Linear 0.0 0.0	
+	//Animate PlayerStatusSpyImage			Alpha		"0"				Linear 0.9 0.1
+	//Animate PlayerStatusClassImage			Alpha		"0"				Linear 0.0 0.0
 }
 
 //====================================
@@ -105,9 +101,9 @@ event HudSpyDisguiseFadeOut
 
 event HudMedicCharged
 {
-	//RunEvent HudMedicRainbowCharged 0.0
-	//RunEvent HudMedicSolidColorCharge 0.0
 	RunEvent HudMedicOrangePulseCharge 0.0
+	//RunEvent HudMedicSolidColorCharge 0.0
+	//RunEvent HudMedicRainbowCharged 0.0
 	
 	RunEvent HudMedicChargedLoop	0.6
 }
diff --git a/scripts/hudlayout.res b/scripts/hudlayout.res
index f0b5702..529e2b0 100644
--- a/scripts/hudlayout.res
+++ b/scripts/hudlayout.res
@@ -1,67 +1,70 @@
 "Resource/HudLayout.res"
 {
 	//--------------------------------------------------------------
-	// Set visible and enabled to 1 to use. Change labelText to the
-	// corresponding crosshair in KnucklesCrosses.png. Change xpos
-	// and ypos values if not perfectly centered.
-	//--------------------------------------------------------------
-	// KNUCKLESCROSSES
-	//--------------------------------------------------------------
-	"KnucklesCrosses"
-	{
-		"visible" 			"0"
-		"enabled" 			"0"
-		"labelText"			"i"
-		"controlName"		"CExLabel"
-		"fieldName"	 		"KnucklesCrosses"
-		"zpos"				"0"
-		"xpos" 		 		"c-25"
-		"ypos" 		 		"c-24"
-		"wide" 		 		"50"
-		"tall" 		 		"50"
-		"font"				"size:26,outline:off"
-		"textAlignment"		"center"
-		"fgcolor" 			"Crosshair"
-	}
+	// Set visible and enabled to 1 to use.
+	// Change xpos and ypos values if not perfectly centered.
 	//--------------------------------------------------------------
 	// RAYSHUD CROSSHAIRS
 	//--------------------------------------------------------------
-	"xHairCircle"
+	"RaysCrosshair"
 	{
 		"controlName"	"CExLabel"
-		"fieldName"	 	"xHairCircle"
-		"font"			"xHairCircle"
+		"fieldName"	 	"RaysCrosshair"
 		"visible"		"0"
 		"enabled"		"0"
 		"zpos"			"2"
-		"xpos"			"c-100"
-		"ypos"			"c-102"
-		"wide"			"201"
+		"xpos"			"c-102"
+		"ypos"			"c-99"
+		"wide"			"200"
 		"tall"			"200"
-		"font"			"xHairCircle"	//"xHairCircleOutline"
-		"labelText"		"o"
+		"font"			"Crosshairs26"
+		"labelText"		"2"
 		"textAlignment"	"center"
-		"fgcolor"		"255 255 255 100"
+		"fgcolor"		"Crosshair"
 	}
-	
-	"ScatterSpread"
+	//--------------------------------------------------------------
+	// KONRWINGS
+	//--------------------------------------------------------------
+	"KonrWings"
 	{
 		"controlName"	"CExLabel"
-		"fieldName"	 	"ScatterSpread"
+		"fieldName"	 	"KonrWings"
 		"visible"		"0"
 		"enabled"		"0"
 		"zpos"			"2"
-		"xpos"			"c-99"
+		"xpos"			"c-108"
 		"ypos"			"c-99"
 		"wide"			"200"
 		"tall"			"200"
-		"font"			"Crosshairs32"	//"CrosshairsOutline32"
-		"labelText"		"0"
+		"font"			"KonrWings24"
+		"labelText"		"i"
 		"textAlignment"	"center"
-		"outline"		"1"
-		"fgcolor"		"255 255 255 255"
+		"fgcolor"		"Crosshair"
 	}
-	
+	//--------------------------------------------------------------
+	// KNUCKLESCROSSES
+	//--------------------------------------------------------------
+	"KnucklesCrosses"
+	{
+		"controlName"	"CExLabel"
+		"fieldName"	 	"KnucklesCrosses"
+		"visible" 		"0"
+		"enabled" 		"0"
+		"zpos"			"0"
+		"xpos" 		 	"c-25"
+		"ypos" 		 	"c-24"
+		"wide" 		 	"50"
+		"tall" 		 	"50"
+		"font"			"size:26,outline:off"
+		"labelText"		"i"
+		"textAlignment"	"center"
+		"fgcolor" 		"Crosshair"
+	}
+
+	//--------------------------------------------------------------
+	// CROSSHAIRS
+	//--------------------------------------------------------------
+
 	"BasicCross"
 	{
 		"controlName"	"CExLabel"
@@ -73,44 +76,44 @@
 		"ypos"			"c-99"
 		"wide"			"200"
 		"tall"			"200"
-		"font"			"Crosshairs26"	//"CrosshairsOutline26"
+		"font"			"Crosshairs26"
 		"labelText"		"2"
 		"textAlignment"	"center"
-		"fgcolor"		"255 255 255 255"
+		"fgcolor"		"Crosshair"
 	}
-	
-	"BasicCrossSmall"
+
+	"BasicCrossLarge"
 	{
 		"controlName"	"CExLabel"
-		"fieldName"	 	"BasicCrossSmall"
+		"fieldName"	 	"BasicCrossLarge"
 		"visible"		"0"
 		"enabled"		"0"
 		"zpos"			"2"
-		"xpos"			"c-101"
-		"ypos"			"c-99"
+		"xpos"			"c-102"
+		"ypos"			"c-98"
 		"wide"			"200"
 		"tall"			"200"
-		"font"			"Crosshairs18"	//"CrosshairsOutline18"
+		"font"			"Crosshairs32"
 		"labelText"		"2"
 		"textAlignment"	"center"
-		"fgcolor"		"255 255 255 255"
+		"fgcolor"		"Crosshair"
 	}
 	
-	"BasicCrossLarge"
+	"BasicCrossSmall"
 	{
 		"controlName"	"CExLabel"
-		"fieldName"	 	"BasicCrossLarge"
+		"fieldName"	 	"BasicCrossSmall"
 		"visible"		"0"
 		"enabled"		"0"
 		"zpos"			"2"
-		"xpos"			"c-102"
-		"ypos"			"c-98"
+		"xpos"			"c-101"
+		"ypos"			"c-99"
 		"wide"			"200"
 		"tall"			"200"
-		"font"			"Crosshairs32"	//"CrosshairsOutline32"
+		"font"			"Crosshairs18"
 		"labelText"		"2"
 		"textAlignment"	"center"
-		"fgcolor"		"255 255 255 255"
+		"fgcolor"		"Crosshair"
 	}
 	
 	"BasicDot"
@@ -124,10 +127,10 @@
 		"ypos"			"c-100"
 		"wide"			"201"
 		"tall"			"201"
-		"font"			"Crosshairs24"	//"CrosshairsOutline24"
+		"font"			"Crosshairs24"
 		"labelText"		"3"
 		"textAlignment"	"center"
-		"fgcolor"		"255 255 255 255"
+		"fgcolor"		"Crosshair"
 	}
 
 	"CircleDot"
@@ -141,84 +144,101 @@
 		"ypos"			"c-96"
 		"wide"			"200"
 		"tall"			"200"
-		"font"			"Crosshairs34"	//"CrosshairsOutline34"
+		"font"			"Crosshairs34"
 		"labelText"		"8"
 		"textAlignment"	"center"
-		"fgcolor"		"255 255 255 255"
+		"fgcolor"		"Crosshair"
 	}
 	
-	"ThinCircle"
+	"OpenCross"
 	{
 		"controlName"	"CExLabel"
-		"fieldName"	 	"ThinCircle"
+		"fieldName"	 	"OpenCross"
 		"visible"		"0"
 		"enabled"		"0"
 		"zpos"			"2"
-		"xpos"			"c-100"
-		"ypos"			"c-96"
+		"xpos"			"c-85"
+		"ypos"			"c-100"
+		"wide"			"199"
+		"tall"			"200"
+		"font"			"Crosshairs24"
+		"labelText"		"i"
+		"textAlignment"	"center"
+		"fgcolor"		"Crosshair"
+	}
+	
+	"OpenCrossDot"
+	{
+		"controlName"	"CExLabel"
+		"fieldName"	 	"OpenCrossDot"
+		"visible"		"0"
+		"enabled"		"0"
+		"zpos"			"2"
+		"xpos"			"c-85"
+		"ypos"			"c-100"
 		"wide"			"200"
 		"tall"			"200"
-		"font"			"Crosshairs34"	//"CrosshairsOutline34"
-		"labelText"		"9"
+		"font"			"Crosshairs24"
+		"labelText"		"h"
 		"textAlignment"	"center"
-		"fgcolor"		"255 255 255 255"
+		"fgcolor"		"Crosshair"
 	}
 	
-	"WingsPlus"
+	"ScatterSpread"
 	{
 		"controlName"	"CExLabel"
-		"fieldName"	 	"WingsPlus"
+		"fieldName"	 	"ScatterSpread"
 		"visible"		"0"
 		"enabled"		"0"
 		"zpos"			"2"
-		"xpos"			"c-100"
-		"ypos"			"c-97"
+		"xpos"			"c-99"
+		"ypos"			"c-99"
 		"wide"			"200"
 		"tall"			"200"
-		"font"			"Crosshairs34"	//"CrosshairsOutline34"
-		"labelText"		"c"
+		"font"			"Crosshairs32"
+		"labelText"		"0"
 		"textAlignment"	"center"
-		"fgcolor"		"255 255 255 255"
+		"fgcolor"		"Crosshair"
 	}
 	
-	"Wings"
+	"ThinCircle"
 	{
 		"controlName"	"CExLabel"
-		"fieldName"	 	"Wings"
+		"fieldName"	 	"ThinCircle"
 		"visible"		"0"
 		"enabled"		"0"
 		"zpos"			"2"
 		"xpos"			"c-100"
-		"ypos"			"c-97"
+		"ypos"			"c-96"
 		"wide"			"200"
 		"tall"			"200"
-		"font"			"Crosshairs34"	//"CrosshairsOutline34"
-		"labelText"		"d"
+		"font"			"Crosshairs34"
+		"labelText"		"9"
 		"textAlignment"	"center"
-		"fgcolor"		"255 255 255 255"
+		"fgcolor"		"Crosshair"
 	}
 	
-	"WingsSmallDot"
+	"ThinCross"
 	{
 		"controlName"	"CExLabel"
-		"fieldName"	 	"WingsSmallDot"
+		"fieldName"	 	"ThinCross"
 		"visible"		"0"
 		"enabled"		"0"
 		"zpos"			"2"
 		"xpos"			"c-100"
-		"ypos"			"c-97"
+		"ypos"			"c-103"
 		"wide"			"200"
 		"tall"			"200"
-		"font"			"Crosshairs34"	//"CrosshairsOutline34"
-		"labelText"		"f"
+		"font"			"Symbol24"
+		"labelText"		"+"
 		"textAlignment"	"center"
-		"fgcolor"		"0 0 0 0"
+		"fgcolor"		"Crosshair"
 	}
 	
-	"WingsSmall"
+	"Wings"
 	{
 		"controlName"	"CExLabel"
-		"fieldName"	 	"WingsSmall"
+		"fieldName"	 	"Wings"
 		"visible"		"0"
 		"enabled"		"0"
 		"zpos"			"2"
@@ -226,78 +246,78 @@
 		"ypos"			"c-97"
 		"wide"			"200"
 		"tall"			"200"
-		"font"			"Crosshairs34"	//"CrosshairsOutline34"
-		"labelText"		"g"
+		"font"			"Crosshairs34"
+		"labelText"		"d"
 		"textAlignment"	"center"
-		"fgcolor"		"255 255 255 255"
+		"fgcolor"		"Crosshair"
 	}
 	
-	"OpenCross"
+	"WingsPlus"
 	{
 		"controlName"	"CExLabel"
-		"fieldName"	 	"OpenCross"
+		"fieldName"	 	"WingsPlus"
 		"visible"		"0"
 		"enabled"		"0"
 		"zpos"			"2"
-		"xpos"			"c-85"
-		"ypos"			"c-100"
-		"wide"			"199"
+		"xpos"			"c-100"
+		"ypos"			"c-97"
+		"wide"			"200"
 		"tall"			"200"
-		"font"			"Crosshairs24"	//"CrosshairsOutline24"
-		"labelText"		"i"
+		"font"			"Crosshairs34"
+		"labelText"		"c"
 		"textAlignment"	"center"
-		"fgcolor"		"255 255 255 255"
+		"fgcolor"		"Crosshair"
 	}
 	
-	"OpenCrossDot"
+	"WingsSmall"
 	{
 		"controlName"	"CExLabel"
-		"fieldName"	 	"OpenCrossDot"
+		"fieldName"	 	"WingsSmall"
 		"visible"		"0"
 		"enabled"		"0"
 		"zpos"			"2"
-		"xpos"			"c-85"
-		"ypos"			"c-100"
-		"wide"			"199"
+		"xpos"			"c-100"
+		"ypos"			"c-97"
+		"wide"			"200"
 		"tall"			"200"
-		"font"			"Crosshairs24"	//"CrosshairsOutline24"
-		"labelText"		"h"
+		"font"			"Crosshairs34"
+		"labelText"		"g"
 		"textAlignment"	"center"
-		"fgcolor"		"255 255 255 255"
+		"fgcolor"		"Crosshair"
 	}
 	
-	"ThinCross"
+	"WingsSmallDot"
 	{
 		"controlName"	"CExLabel"
-		"fieldName"	 	"ThinCross"
+		"fieldName"	 	"WingsSmallDot"
 		"visible"		"0"
 		"enabled"		"0"
 		"zpos"			"2"
 		"xpos"			"c-100"
-		"ypos"			"c-103"
+		"ypos"			"c-97"
 		"wide"			"200"
 		"tall"			"200"
-		"font"			"Symbol24"	//"SymbolOutline24"
-		"labelText"		"+"
+		"font"			"Crosshairs34"
+		"labelText"		"f"
 		"textAlignment"	"center"
-		"fgcolor"		"255 255 255 255"
+		"fgcolor"		"Crosshair"
 	}
 	
-	"KonrWings"
+	"xHairCircle"
 	{
 		"controlName"	"CExLabel"
-		"fieldName"	 	"KonrWings"
+		"fieldName"	 	"xHairCircle"
 		"visible"		"0"
 		"enabled"		"0"
 		"zpos"			"2"
-		"xpos"			"c-108"
-		"ypos"			"c-99"
+		"xpos"			"c-100"
+		"ypos"			"c-102"
 		"wide"			"200"
 		"tall"			"200"
-		"font"			"KonrWings24"	//"KonrWingsOutline24"
-		"labelText"		"i"
+		"font"			"xHairCircle"
+		"labelText"		"o"
 		"textAlignment"	"center"
-		"fgcolor"		"255 255 255 255"
+		"fgcolor"		"Crosshair"
 	}
 	
 	//fighter pilot crosshair, enable all of then together for best results (16x9 resolution)
@@ -2151,4 +2171,4 @@
 		"mouseinputenabled"		"0"
 		"alpha"					"100"
 	}
-}
\ No newline at end of file
+}