Merge pull request #149 from raysfire/dev

v2020.0808

4 files changed, 123 insertions, 784 deletions

diff --git a/scripts/TF2Crosshairs.png b/scripts/TF2Crosshairs.png
new file mode 100644
index 0000000..dd01892
--- /dev/null
+++ b/scripts/TF2Crosshairs.png
diff --git a/scripts/hudanimations_custom.txt b/scripts/hudanimations_custom.txt
index af4d0e2..d245234 100644
--- a/scripts/hudanimations_custom.txt
+++ b/scripts/hudanimations_custom.txt
@@ -1,58 +1,54 @@
 // Bonus Health Pulse
 event HudHealthBonusPulse
 {
-	Animate	PlayerStatusHealthBonusImage 		Alpha	"255"				Linear 0.0 0.2
-	Animate	PlayerStatusHealthBonusImage 		Alpha	"0"					Linear 0.2 0.4
+	Animate	PlayerStatusHealthBonusImage	Alpha		"255"				Linear 0.0 0.2
+	Animate	PlayerStatusHealthBonusImage	Alpha		"0"					Linear 0.2 0.4
 
-	Animate PlayerStatusHealthValue				FgColor "Health Buff" 		Accel 0.0 0.0
-	Animate PlayerStatusHealthValueSpectator	FgColor "Health Buff" 		Accel 0.0 0.0
-	Animate PlayerStatusHealthValueFreezePanel 	FgColor "Health Buff" 		Accel 0.0 0.0
+	Animate	PlayerStatusHealthValue			FgColor		"Health Buff"		Accel 0.0 0.0
+	Animate	GuiPlayerHealth					FgColor		"Health Buff"		Accel 0.0 0.0
 
-	RunEvent HudHealthBonusPulseLoop			0.4
+	RunEvent HudHealthBonusPulseLoop		0.4
 }
 
 event HudHealthBonusPulseStop
 {
-	StopEvent HudHealthBonusPulse				0.0
-	StopEvent HudHealthBonusPulseLoop			0.0
+	StopEvent HudHealthBonusPulse			0.0
+	StopEvent HudHealthBonusPulseLoop		0.0
 
-	Animate PlayerStatusHealthValue				FgColor "Health Normal" 	Accel 0.0 0.0
-	Animate PlayerStatusHealthValueSpectator 	FgColor "Health Normal" 	Accel 0.0 0.0
-	Animate PlayerStatusHealthValueFreezePanel 	FgColor "Health Normal" 	Accel 0.0 0.0
+	Animate	PlayerStatusHealthValue			FgColor		"Health Normal"		Accel 0.0 0.0
+	Animate	GuiPlayerHealth					FgColor		"Health Normal"		Accel 0.0 0.0
 }
 //==================================================================================
 // Low Health Pulse
 event HudHealthDyingPulse
 {
-	Animate	PlayerStatusHealthBonusImage 		Alpha	"255"				Linear 0.0 0.2
-	Animate	PlayerStatusHealthBonusImage 		Alpha	"0"					Linear 0.2 0.2
+	Animate	PlayerStatusHealthBonusImage	Alpha		"255"				Linear 0.0 0.2
+	Animate	PlayerStatusHealthBonusImage	Alpha		"0"					Linear 0.2 0.2
 
-	Animate PlayerStatusHealthValue				FgColor	"Health Hurt" 		Accel 0.0 0.0
-	Animate PlayerStatusHealthValueSpectator 	FgColor "Health Hurt" 		Accel 0.0 0.0
-	Animate PlayerStatusHealthValueFreezePanel	FgColor "Health Hurt" 		Accel 0.0 0.0
+	Animate	PlayerStatusHealthValue			FgColor		"Health Hurt"		Accel 0.0 0.0
+	Animate	GuiPlayerHealth					FgColor		"Health Hurt"		Accel 0.0 0.0
 
-	RunEvent HudHealthDyingPulseLoop			0.4
+	RunEvent HudHealthDyingPulseLoop		0.4
 }
 
 event HudHealthDyingPulseStop
 {
-	StopEvent HudHealthDyingPulse 				0.0
-	StopEvent HudHealthDyingPulseLoop 			0.0
+	StopEvent HudHealthDyingPulse 			0.0
+	StopEvent HudHealthDyingPulseLoop 		0.0
 
-	Animate PlayerStatusHealthValue				FgColor	"Health Normal" 	Accel 0.0 0.0
-	Animate PlayerStatusHealthValueSpectator 	FgColor "Health Normal" 	Accel 0.0 0.0
-	Animate PlayerStatusHealthValueFreezePanel	FgColor "Health Normal" 	Accel 0.0 0.0
+	Animate PlayerStatusHealthValue			FgColor		"Health Normal"		Accel 0.0 0.0
+	Animate GuiPlayerHealth					FgColor		"Health Normal"		Accel 0.0 0.0
 }
 //==================================================================================
 // Low Ammo Pulse
 event HudLowAmmoPulse
 {
-	Animate	HudWeaponLowAmmoImage			Alpha	"255"						Linear 0.0	0.075
-	Animate	HudWeaponLowAmmoImage			Alpha	"0"							Linear 0.125 0.075
+	Animate	HudWeaponLowAmmoImage			Alpha		"255"				Linear 0.0	0.075
+	Animate	HudWeaponLowAmmoImage			Alpha		"0"					Linear 0.125 0.075
 
-	Animate AmmoInClip 						FgColor	"Ammo In Clip Low"			Linear 0.0 0.0
-	Animate AmmoInReserve 					FgColor "Ammo In Reserve Low" 		Linear 0.0 0.0
-	Animate AmmoNoClip 						FgColor "Ammo In Clip Low"			Linear 0.0 0.0
+	Animate	AmmoInClip						FgColor		"Ammo In Clip Low"		Linear 0.0 0.0
+	Animate	AmmoInReserve					FgColor		"Ammo In Reserve Low"	Linear 0.0 0.0
+	Animate	AmmoNoClip						FgColor		"Ammo In Clip Low"		Linear 0.0 0.0
 
 	RunEvent HudLowAmmoPulseLoop			0.4
 }
@@ -62,16 +58,16 @@ event HudLowAmmoPulseStop
 	StopEvent HudLowAmmoPulse 				0.0
 	StopEvent HudLowAmmoPulseLoop 			0.0
 
-	Animate AmmoInClip						FgColor	"Ammo In Clip"				Accel 0.0 0.0
-	Animate AmmoInReserve					FgColor	"Ammo In Reserve"			Accel 0.0 0.0
-	Animate AmmoNoClip						FgColor	"Ammo In Clip"				Accel 0.0 0.0
+	Animate AmmoInClip						FgColor		"Ammo In Clip"		Accel 0.0 0.0
+	Animate AmmoInReserve					FgColor		"Ammo In Reserve"	Accel 0.0 0.0
+	Animate AmmoNoClip						FgColor		"Ammo In Clip"		Accel 0.0 0.0
 }
 //==================================================================================
 // Ubercharge Meters
 event HudMedicCharged
 {
 	RunEvent HudMedicOrangePulseCharge 		0.0
-//	RunEvent HudMedicSolidColorCharge 	0.0
+//	RunEvent HudMedicSolidColorCharge 		0.0
 //	RunEvent HudMedicRainbowCharged 		0.0
 
 	RunEvent HudMedicChargedLoop			0.6
@@ -79,39 +75,39 @@ event HudMedicCharged
 
 event HudMedicRainbowCharged
 {
-	Animate	ChargeLabel 					FgColor	"ColorGreen"				Linear 0.0 0.1
-	Animate	ChargeLabel 					FgColor	"ColorCyan"					Linear 0.1 0.1
-	Animate	ChargeLabel 					FgColor	"ColorBlue"					Linear 0.2 0.1
-	Animate	ChargeLabel 					FgColor	"ColorMagenta"				Linear 0.3 0.1
-	Animate	ChargeLabel 					FgColor	"ColorRed"					Linear 0.4 0.1
-	Animate	ChargeLabel 					FgColor	"ColorYellow"				Linear 0.5 0.1
+	Animate	ChargeLabel 					FgColor		"ColorGreen"		Linear 0.0 0.1
+	Animate	ChargeLabel 					FgColor		"ColorCyan"			Linear 0.1 0.1
+	Animate	ChargeLabel 					FgColor		"ColorBlue"			Linear 0.2 0.1
+	Animate	ChargeLabel 					FgColor		"ColorMagenta"		Linear 0.3 0.1
+	Animate	ChargeLabel 					FgColor		"ColorRed"			Linear 0.4 0.1
+	Animate	ChargeLabel 					FgColor		"ColorYellow"		Linear 0.5 0.1
 
-	Animate	ChargeMeter 					FgColor	"ColorGreen"				Linear 0.0 0.1
-	Animate	ChargeMeter 					FgColor	"ColorCyan"					Linear 0.1 0.1
-	Animate	ChargeMeter 					FgColor	"ColorBlue"					Linear 0.2 0.1
-	Animate	ChargeMeter 					FgColor	"ColorMagenta"				Linear 0.3 0.1
-	Animate	ChargeMeter 					FgColor	"ColorRed"					Linear 0.4 0.1
-	Animate	ChargeMeter 					FgColor	"ColorYellow"				Linear 0.5 0.1
+	Animate	ChargeMeter 					FgColor		"ColorGreen"		Linear 0.0 0.1
+	Animate	ChargeMeter 					FgColor		"ColorCyan"			Linear 0.1 0.1
+	Animate	ChargeMeter 					FgColor		"ColorBlue"			Linear 0.2 0.1
+	Animate	ChargeMeter 					FgColor		"ColorMagenta"		Linear 0.3 0.1
+	Animate	ChargeMeter 					FgColor		"ColorRed"			Linear 0.4 0.1
+	Animate	ChargeMeter 					FgColor		"ColorYellow"		Linear 0.5 0.1
 
 	RunEvent HudMedicChargedLoop			0.6
 }
 
 event HudMedicSolidColorCharge
 {
-	Animate ChargeLabel						FgColor	"Solid Color Uber"			Linear 0.0 0.0
+	Animate ChargeLabel						FgColor		"Solid Color Uber"	Linear 0.0 0.0
 
-	Animate ChargeMeter						FgColor	"Solid Color Uber"			Linear 0.0 0.0
+	Animate ChargeMeter						FgColor		"Solid Color Uber"	Linear 0.0 0.0
 
 	RunEvent HudMedicChargedLoop			0.6
 }
 
 event HudMedicOrangePulseCharge
 {
-	Animate	ChargeLabel 					FgColor	"Flashing Uber Color1"		Linear 0.0 0.3
-	Animate	ChargeLabel 					FgColor	"Flashing Uber Color2"		Linear 0.3 0.3
+	Animate	ChargeLabel 					FgColor		"Flashing Uber Color1"	Linear 0.0 0.3
+	Animate	ChargeLabel 					FgColor		"Flashing Uber Color2"	Linear 0.3 0.3
 
-	Animate	ChargeMeter 					FgColor	"Flashing Uber Color1"		Linear 0.0 0.3
-	Animate	ChargeMeter 					FgColor	"Flashing Uber Color2"		Linear 0.3 0.3
+	Animate	ChargeMeter 					FgColor		"Flashing Uber Color1"	Linear 0.0 0.3
+	Animate	ChargeMeter 					FgColor		"Flashing Uber Color2"	Linear 0.3 0.3
 
 	RunEvent HudMedicChargedLoop			0.6
 }
@@ -124,76 +120,48 @@ event HudMedicChargedStop
 	StopEvent HudMedicOrangePulseCharge		0.0
 	StopEvent HudMedicChargedLoop			0.0
 
-	Animate	ChargeMeter						FgColor	"Uber Bar Color"			Linear 0.0 0.0001
-	Animate	ChargeLabel 					FgColor	"Ammo In Clip"				Linear 0.0 0.0001
+	Animate	ChargeMeter						FgColor		"Uber Bar Color"	Linear 0.0 0.0001
+	Animate	ChargeLabel 					FgColor		"Ammo In Clip"		Linear 0.0 0.0001
 }
 //==================================================================================
 // Hitmarker Pulse
 event DamagedPlayer
 {
-//StopEvent HitMarker 					0.0
-//RunEvent HitMarker 						0.01
+	StopEvent HitMarker 					0.0
+	RunEvent HitMarker 						0.01
 }
 
 event HitMarker
 {
-	Animate RaysCrosshair	 				FgColor	"CrosshairDamage" 			Linear 0.0	0.0
-	Animate RaysCrosshair	 				FgColor	"Crosshair" 				Linear 0.15	0.0
-	Animate KonrWings	 					FgColor	"CrosshairDamage" 			Linear 0.0	0.0
-	Animate KonrWings	 					FgColor	"Crosshair" 				Linear 0.15	0.0
-	Animate KnucklesCrosses	 				FgColor	"CrosshairDamage" 			Linear 0.0	0.0
-	Animate KnucklesCrosses	 				FgColor	"Crosshair" 				Linear 0.15	0.0
-	Animate BasicCross	 					FgColor	"CrosshairDamage" 			Linear 0.0	0.0
-	Animate BasicCross	 					FgColor	"Crosshair" 				Linear 0.15	0.0
-	Animate BasicCrossLarge	 				FgColor	"CrosshairDamage" 			Linear 0.0	0.0
-	Animate BasicCrossLarge	 				FgColor	"Crosshair" 				Linear 0.15	0.0
-	Animate BasicCrossSmall	 				FgColor	"CrosshairDamage" 			Linear 0.0	0.0
-	Animate BasicCrossSmall	 				FgColor	"Crosshair" 				Linear 0.15	0.0
-	Animate BasicDot	 					FgColor	"CrosshairDamage" 			Linear 0.0	0.0
-	Animate BasicDot	 					FgColor	"Crosshair" 				Linear 0.15	0.0
-	Animate CircleDot	 					FgColor	"CrosshairDamage" 			Linear 0.0	0.0
-	Animate CircleDot	 					FgColor	"Crosshair" 				Linear 0.15	0.0
-	Animate OpenCross	 					FgColor	"CrosshairDamage" 			Linear 0.0	0.0
-	Animate OpenCross	 					FgColor	"Crosshair" 				Linear 0.15	0.0
-	Animate OpenCrossDot	 				FgColor	"CrosshairDamage" 			Linear 0.0	0.0
-	Animate OpenCrossDot	 				FgColor	"Crosshair" 				Linear 0.15	0.0
-	Animate ScatterSpread	 				FgColor	"CrosshairDamage" 			Linear 0.0	0.0
-	Animate ScatterSpread	 				FgColor	"Crosshair" 				Linear 0.15	0.0
-	Animate ThinCircle	 					FgColor	"CrosshairDamage" 			Linear 0.0	0.0
-	Animate ThinCircle	 					FgColor	"Crosshair" 				Linear 0.15	0.0
-	Animate Wings	 						FgColor	"CrosshairDamage" 			Linear 0.0	0.0
-	Animate Wings	 						FgColor	"Crosshair" 				Linear 0.15	0.0
-	Animate WingsPlus	 					FgColor	"CrosshairDamage" 			Linear 0.0	0.0
-	Animate WingsPlus	 					FgColor	"Crosshair" 				Linear 0.15	0.0
-	Animate WingsSmall	 					FgColor	"CrosshairDamage" 			Linear 0.0	0.0
-	Animate WingsSmall	 					FgColor	"Crosshair" 				Linear 0.15	0.0
-	Animate WingsSmallDot	 				FgColor	"CrosshairDamage" 			Linear 0.0	0.0
-	Animate WingsSmallDot	 				FgColor	"Crosshair" 				Linear 0.15	0.0
+	Animate	CustomCrosshair					FgColor		"CrosshairDamage"	Linear 0.0	0.0
+	Animate	CustomCrosshair					FgColor		"Crosshair"			Linear 0.15	0.0
 }
 //==================================================================================
 // Spy Disguise
 event HudSpyDisguiseFadeIn
 {
-//	RunEvent HudSpyDisguiseChanged		0.0
-//	Animate PlayerStatusSpyImage			Alpha	"255"						Linear 0.9	0.1
+//	RunEvent HudSpyDisguiseChanged			0.0
+//	Animate PlayerStatusSpyImage			Alpha		"255"				Linear 0.9	0.1
 }
 
 event HudSpyDisguiseFadeOut
 {
-//	RunEvent HudSpyDisguiseChanged		0.0
-//	Animate PlayerStatusSpyImage			Alpha	"0"							Linear 0.9	0.1
+//	RunEvent HudSpyDisguiseChanged			0.0
+//	Animate PlayerStatusSpyImage			Alpha		"0"					Linear 0.9	0.1
 }
 //==================================================================================
 
 event HudSnapShotReminderIn
 {
-    RunEvent HudHealthDyingPulseStop 	10.0
-    RunEvent HudHealthBonusPulseStop 	10.0
-    RunEvent HudLowAmmoPulseStop 		10.0
-    RunEvent HudMedicChargedStop 		10.0
+    RunEvent DefaultAnimHudSnapShotReminderIn	0.0
+    
+    RunEvent HudHealthBonusPulseStop 		0.0
+    RunEvent HudHealthDyingPulseStop 		0.0
+    RunEvent HudLowAmmoPulseStop 			0.0
+    RunEvent HudMedicChargedStop 			0.0
 }
 //==================================================================================
-// Do not move chat window
-event CompetitiveGame_LowerChatWindow { }
-event CompetitiveGame_RestoreChatWindow { }
-event HudTournament_MoveChatWindow { }
\ No newline at end of file
+
+event CompetitiveGame_LowerChatWindow	{ }
+event CompetitiveGame_RestoreChatWindow	{ }
+event HudTournament_MoveChatWindow 		{ }
\ No newline at end of file
diff --git a/scripts/hudlayout.res b/scripts/hudlayout.res
index 89f93c0..93fb1e5 100644
--- a/scripts/hudlayout.res
+++ b/scripts/hudlayout.res
@@ -1,653 +1,27 @@
 "Resource/HudLayout.res"
 {
 	//--------------------------------------------------------------
+	// HUD CROSSHAIR
+	//--------------------------------------------------------------
 	// Set visible and enabled to 1 to use.
 	// Change xpos and ypos values if not perfectly centered.
+	// Change labelText to the corresponding crosshair in TF2Crosshairs.png.
 	//--------------------------------------------------------------
-	// RAYSHUD CROSSHAIRS
-	//--------------------------------------------------------------
-	"RaysCrosshair"
-	{
-		"controlName"	"CExLabel"
-		"fieldName"	 	"RaysCrosshair"
-		"visible"		"0"
-		"enabled"		"0"
-		"zpos"			"2"
-		"xpos"			"c-103"
-		"ypos"			"c-100"
-		"wide"			"200"
-		"tall"			"200"
-		"font"			"Crosshairs14"
-		"labelText"		"3"
-		"textAlignment"	"center"
-		"fgcolor"		"Crosshair"
-	}
-	//--------------------------------------------------------------
-	// KONRWINGS
-	//--------------------------------------------------------------
-	"KonrWings"
-	{
-		"controlName"	"CExLabel"
-		"fieldName"	 	"KonrWings"
-		"visible"		"0"
-		"enabled"		"0"
-		"zpos"			"2"
-		"xpos"			"c-108"
-		"ypos"			"c-99"
-		"wide"			"200"
-		"tall"			"200"
-		"font"			"KonrWings24"
-		"labelText"		"i"
-		"textAlignment"	"center"
-		"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"			"KnucklesCrosses26"
-		"labelText"		"i"
-		"textAlignment"	"center"
-		"fgcolor" 		"Crosshair"
-	}
-
-	//--------------------------------------------------------------
-	// CROSSHAIRS
-	//--------------------------------------------------------------
-
-	"BasicCross"
-	{
-		"controlName"	"CExLabel"
-		"fieldName"	 	"BasicCross"
-		"visible"		"0"
-		"enabled"		"0"
-		"zpos"			"2"
-		"xpos"			"c-102"
-		"ypos"			"c-99"
-		"wide"			"200"
-		"tall"			"200"
-		"font"			"Crosshairs26"
-		"labelText"		"2"
-		"textAlignment"	"center"
-		"fgcolor"		"Crosshair"
-	}
-
-	"BasicCrossLarge"
-	{
-		"controlName"	"CExLabel"
-		"fieldName"	 	"BasicCrossLarge"
-		"visible"		"0"
-		"enabled"		"0"
-		"zpos"			"2"
-		"xpos"			"c-102"
-		"ypos"			"c-98"
-		"wide"			"200"
-		"tall"			"200"
-		"font"			"Crosshairs32"
-		"labelText"		"2"
-		"textAlignment"	"center"
-		"fgcolor"		"Crosshair"
-	}
-
-	"BasicCrossSmall"
-	{
-		"controlName"	"CExLabel"
-		"fieldName"	 	"BasicCrossSmall"
-		"visible"		"0"
-		"enabled"		"0"
-		"zpos"			"2"
-		"xpos"			"c-101"
-		"ypos"			"c-99"
-		"wide"			"200"
-		"tall"			"200"
-		"font"			"Crosshairs18"
-		"labelText"		"2"
-		"textAlignment"	"center"
-		"fgcolor"		"Crosshair"
-	}
-
-	"BasicDot"
-	{
-		"controlName"	"CExLabel"
-		"fieldName"	 	"BasicDot"
-		"visible"		"0"
-		"enabled"		"0"
-		"zpos"			"2"
-		"xpos"			"c-103"
-		"ypos"			"c-100"
-		"wide"			"201"
-		"tall"			"201"
-		"font"			"Crosshairs24"
-		"labelText"		"3"
-		"textAlignment"	"center"
-		"fgcolor"		"Crosshair"
-	}
-
-	"CircleDot"
-	{
-		"controlName"	"CExLabel"
-		"fieldName"	 	"CircleDot"
-		"visible"		"0"
-		"enabled"		"0"
-		"zpos"			"2"
-		"xpos"			"c-100"
-		"ypos"			"c-96"
-		"wide"			"200"
-		"tall"			"200"
-		"font"			"Crosshairs34"
-		"labelText"		"8"
-		"textAlignment"	"center"
-		"fgcolor"		"Crosshair"
-	}
-
-	"OpenCross"
-	{
-		"controlName"	"CExLabel"
-		"fieldName"	 	"OpenCross"
-		"visible"		"0"
-		"enabled"		"0"
-		"zpos"			"2"
-		"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"			"Crosshairs24"
-		"labelText"		"h"
-		"textAlignment"	"center"
-		"fgcolor"		"Crosshair"
-	}
-
-	"ScatterSpread"
-	{
-		"controlName"	"CExLabel"
-		"fieldName"	 	"ScatterSpread"
-		"visible"		"0"
-		"enabled"		"0"
-		"zpos"			"2"
-		"xpos"			"c-99"
-		"ypos"			"c-99"
-		"wide"			"200"
-		"tall"			"200"
-		"font"			"Crosshairs32"
-		"labelText"		"0"
-		"textAlignment"	"center"
-		"fgcolor"		"Crosshair"
-	}
-
-	"ThinCircle"
-	{
-		"controlName"	"CExLabel"
-		"fieldName"	 	"ThinCircle"
-		"visible"		"0"
-		"enabled"		"0"
-		"zpos"			"2"
-		"xpos"			"c-100"
-		"ypos"			"c-96"
-		"wide"			"200"
-		"tall"			"200"
-		"font"			"Crosshairs34"
-		"labelText"		"9"
-		"textAlignment"	"center"
-		"fgcolor"		"Crosshair"
-	}
-
-	"Wings"
-	{
-		"controlName"	"CExLabel"
-		"fieldName"	 	"Wings"
-		"visible"		"0"
-		"enabled"		"0"
-		"zpos"			"2"
-		"xpos"			"c-100"
-		"ypos"			"c-97"
-		"wide"			"200"
-		"tall"			"200"
-		"font"			"Crosshairs34"
-		"labelText"		"d"
-		"textAlignment"	"center"
-		"fgcolor"		"Crosshair"
-	}
-
-	"WingsPlus"
-	{
-		"controlName"	"CExLabel"
-		"fieldName"	 	"WingsPlus"
-		"visible"		"0"
-		"enabled"		"0"
-		"zpos"			"2"
-		"xpos"			"c-100"
-		"ypos"			"c-97"
-		"wide"			"200"
-		"tall"			"200"
-		"font"			"Crosshairs34"
-		"labelText"		"c"
-		"textAlignment"	"center"
-		"fgcolor"		"Crosshair"
-	}
-
-	"WingsSmall"
-	{
-		"controlName"	"CExLabel"
-		"fieldName"	 	"WingsSmall"
-		"visible"		"0"
-		"enabled"		"0"
-		"zpos"			"2"
-		"xpos"			"c-100"
-		"ypos"			"c-97"
-		"wide"			"200"
-		"tall"			"200"
-		"font"			"Crosshairs34"
-		"labelText"		"g"
-		"textAlignment"	"center"
-		"fgcolor"		"Crosshair"
-	}
-
-	"WingsSmallDot"
-	{
-		"controlName"	"CExLabel"
-		"fieldName"	 	"WingsSmallDot"
-		"visible"		"0"
-		"enabled"		"0"
-		"zpos"			"2"
-		"xpos"			"c-100"
-		"ypos"			"c-97"
-		"wide"			"200"
-		"tall"			"200"
-		"font"			"Crosshairs34"
-		"labelText"		"f"
-		"textAlignment"	"center"
-		"fgcolor"		"Crosshair"
-	}
-
-	//--------------------------------------------------------------
-	// 16:9 CROSSHAIRS (Enable all for best result)
-	//--------------------------------------------------------------
-	"16x9Crosshair_vertical1"
-	{
-		"ControlName"	"ImagePanel"
-		"fieldName"		"VerticalLine"
-		"xpos"			"427"
-		"ypos"			"75"
-		"zpos"			"-5"
-		"wide"			"1"
-		"tall"			"154"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"0"
-		"enabled"		"0"
-		"fillcolor"		"255 255 255 255"
-		"alpha" 		"50"
-	}
-
-	"16x9Crosshair_horizontal1"
-	{
-		"ControlName"	"ImagePanel"
-		"fieldName"		"VerticalLine"
-		"xpos"			"40"
-		"ypos"			"240"
-		"zpos"			"-5"
-		"wide"			"374"
-		"tall"			"1"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"0"
-		"enabled"		"0"
-		"fillcolor"		"255 255 255 255"
-		"alpha" 		"50"
-	}
-
-	"16x9Crosshair_horizontal2"
-	{
-		"ControlName"	"ImagePanel"
-		"fieldName"		"VerticalLine"
-		"xpos"			"439"
-		"ypos"			"240"
-		"zpos"			"-5"
-		"wide"			"374"
-		"tall"			"1"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"0"
-		"enabled"		"0"
-		"fillcolor"		"255 255 255 255"
-		"alpha" 		"50"
-	}
-
-	"16x9dark_top"
-	{
-		"ControlName"	"ImagePanel"
-		"fieldName"		"VerticalLine"
-		"xpos"			"426"
-		"ypos"			"190"
-		"zpos"			"-5"
-		"wide"			""
-		"tall"			"38"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"0"
-		"enabled"		"0"
-		"fillcolor"		"255 255 255 255"
-		"alpha" 		"100"
-	}
-	"16x9dark_bottom"
-	{
-		"ControlName"	"ImagePanel"
-		"fieldName"		"VerticalLine"
-		"xpos"			"427"
-		"ypos"			"252"
-		"zpos"			"-5"
-		"wide"			"1"
-		"tall"			"38"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"0"
-		"enabled"		"0"
-		"fillcolor"		"255 255 255 255"
-		"alpha" 		"150"
-	}
-	"16x9dark_left"
-	{
-		"ControlName"	"ImagePanel"
-		"fieldName"		"VerticalLine"
-		"xpos"			"365"
-		"ypos"			"240"
-		"zpos"			"-5"
-		"wide"			"50"
-		"tall"			"1"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"0"
-		"enabled"		"0"
-		"fillcolor"		"255 255 255 255"
-		"alpha" 		"100"
-	}
-
-	"16x9dark_right"
-	{
-		"ControlName"	"ImagePanel"
-		"fieldName"		"VerticalLine"
-		"xpos"			"439"
-		"ypos"			"240"
-		"zpos"			"-5"
-		"wide"			"50"
-		"tall"			"1"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"0"
-		"enabled"		"0"
-		"fillcolor"		"255 255 255 255"
-		"alpha" 		"100"
-	}
-
-	//--------------------------------------------------------------
-	// 16:10 CROSSHAIRS (Enable all for best result)
-	//--------------------------------------------------------------
-	"16x10Crosshair_vertical1"
-	{
-		"ControlName"	"ImagePanel"
-		"fieldName"		"VerticalLine"
-		"xpos"			"384"
-		"ypos"			"55"
-		"zpos"			"-5"
-		"wide"			"1"
-		"tall"			"170"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"0"
-		"enabled"		"0"
-		"fillcolor"		"255 255 255 255"
-		"alpha"			"50"
-	}
-
-	"16x10Crosshair_horizontal1"
-	{
-		"ControlName"	"ImagePanel"
-		"fieldName"		"VerticalLine"
-		"xpos"			"35"
-		"ypos"			"240"
-		"zpos"			"-5"
-		"wide"			"330"
-		"tall"			"1"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"0"
-		"enabled"		"0"
-		"fillcolor"		"255 255 255 255"
-		"alpha" 		"50"
-	}
-
-	"16x10Crosshair_horizontal2"
-	{
-		"ControlName"	"ImagePanel"
-		"fieldName"		"VerticalLine"
-		"xpos"			"403"
-		"ypos"			"240"
-		"zpos"			"-5"
-		"wide"			"330"
-		"tall"			"1"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"0"
-		"enabled"		"0"
-		"fillcolor"		"255 255 255 255"
-		"alpha" 		"50"
-	}
-
-	"16x10dark_top"
-	{
-		"ControlName"	"ImagePanel"
-		"fieldName"		"VerticalLine"
-		"xpos"			"384"
-		"ypos"			"187"
-		"zpos"			"-5"
-		"wide"			"1"
-		"tall"			"38"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"0"
-		"enabled"		"0"
-		"fillcolor"		"255 255 255 255"
-		"alpha" 		"100"
-	}
-
-	"16x10dark_bottom"
-	{
-		"ControlName"	"ImagePanel"
-		"fieldName"		"VerticalLine"
-		"xpos"			"384"
-		"ypos"			"254"
-		"zpos"			"-5"
-		"wide"			"1"
-		"tall"			"38"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"0"
-		"enabled"		"0"
-		"fillcolor"		"255 255 255 255"
-		"alpha" 		"150"
-	}
-
-	"16x10dark_left"
-	{
-		"ControlName"	"ImagePanel"
-		"fieldName"		"VerticalLine"
-		"xpos"			"315"
-		"ypos"			"240"
-		"zpos"			"-5"
-		"wide"			"50"
-		"tall"			"1"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"0"
-		"enabled"		"0"
-		"fillcolor"		"255 255 255 255"
-		"alpha" 		"100"
-	}
-
-	"16x10dark_right"
-	{
-		"ControlName"	"ImagePanel"
-		"fieldName"		"VerticalLine"
-		"xpos"			"403"
-		"ypos"			"240"
-		"zpos"			"-5"
-		"wide"			"50"
-		"tall"			"1"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"0"
-		"enabled"		"0"
-		"fillcolor"		"255 255 255 255"
-		"alpha" 		"100"
-	}
-
-	//--------------------------------------------------------------
-	// 4:3 CROSSHAIRS (Enable all for best result)
-	//--------------------------------------------------------------
-	"4x3Crosshair_vertical1"
-	{
-		"ControlName"	"ImagePanel"
-		"fieldName"		"VerticalLine"
-		"xpos"			"319"
-		"ypos"			"70"
-		"zpos"			"-5"
-		"wide"			"1"
-		"tall"			"154"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"0"
-		"enabled"		"0"
-		"fillcolor"		"255 255 255 255"
-		"alpha"			"50"
-	}
-
-	"4x3Crosshair_horizontal1"
-	{
-		"ControlName"	"ImagePanel"
-		"fieldName"		"VerticalLine"
-		"xpos"			"10"
-		"ypos"			"240"
-		"zpos"			"-5"
-		"wide"			"290"
-		"tall"			"1"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"0"
-		"enabled"		"0"
-		"fillcolor"		"255 255 255 255"
-		"alpha" 		"50"
-	}
-
-	"4x3Crosshair_horizontal2"
-	{
-		"ControlName"	"ImagePanel"
-		"fieldName"		"VerticalLine"
-		"xpos"			"340"
-		"ypos"			"240"
-		"zpos"			"-5"
-		"wide"			"290"
-		"tall"			"1"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"0"
-		"enabled"		"0"
-		"fillcolor"		"255 255 255 255"
-		"alpha" 		"50"
-	}
-
-	"4x3dark_top"
-	{
-		"ControlName"	"ImagePanel"
-		"fieldName"		"VerticalLine"
-		"xpos"			"319"
-		"ypos"			"186"
-		"zpos"			"-5"
-		"wide"			"1"
-		"tall"			"38"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"0"
-		"enabled"		"0"
-		"fillcolor"		"255 255 255 255"
-		"alpha" 		"100"
-	}
-
-	"4x3dark_bottom"
-	{
-		"ControlName"	"ImagePanel"
-		"fieldName"		"VerticalLine"
-		"xpos"			"319"
-		"ypos"			"255"
-		"zpos"			"-5"
-		"wide"			"1"
-		"tall"			"38"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"0"
-		"enabled"		"0"
-		"fillcolor"		"255 255 255 255"
-		"alpha" 		"150"
-	}
-
-	"4x3dark_left"
-	{
-		"ControlName"	"ImagePanel"
-		"fieldName"		"VerticalLine"
-		"xpos"			"250"
-		"ypos"			"240"
-		"zpos"			"-5"
-		"wide"			"50"
-		"tall"			"1"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"0"
-		"enabled"		"0"
-		"fillcolor"		"255 255 255 255"
-		"alpha" 		"100"
-	}
-
-	"4x3dark_right"
-	{
-		"ControlName"	"ImagePanel"
-		"fieldName"		"VerticalLine"
-		"xpos"			"340"
-		"ypos"			"240"
-		"zpos"			"-5"
-		"wide"			"50"
-		"tall"			"1"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"0"
-		"enabled"		"0"
-		"fillcolor"		"255 255 255 255"
-		"alpha" 		"100"
+	CustomCrosshair
+	{
+		"visible"			"0"
+		"enabled"			"0"
+		"labelText"			"<"
+		"controlName"		"CExLabel"
+		"fieldName"			"CustomCrosshair"
+		"zpos"				"2"
+		"xpos"				"c-50"
+		"ypos"				"c-49"
+		"wide"				"100"
+		"tall"				"100"
+		"font"				"Size:18 | Outline:OFF"
+		"textAlignment"		"center"
+		"fgcolor"			"Crosshair"
 	}
 	//--------------------------------------------------------------
 	// TRANSPARENT VIEWMODEL
@@ -675,8 +49,8 @@
 		"fieldName"			"HudPlayerStatus"
 		"visible"			"1"
 		"enabled"			"1"
-		"xpos"				"-15"
-		"ypos"				"1"
+		"xpos"				"0"
+		"ypos"				"0"
 		"wide"				"f0"
 		"tall"				"480"
 	}
@@ -686,11 +60,11 @@
 		"fieldName"			"HudWeaponAmmo"
 		"visible"			"1"
 		"enabled"			"1"
-		"xpos"				"c80"
+		"xpos"				"c70"
 		"ypos"				"c70"
-		"xpos_minmode"		"c40"
+		"xpos_minmode"		"c25"
 		"ypos_minmode"		"c30"
-		"wide"				"100"
+		"wide"				"110"
 		"tall"				"50"
 	}
 
@@ -844,11 +218,12 @@
 	{
 		"fieldName"				"CHudAccountPanel"
 		"xpos"					"c200"
-		"xpos_minmode"			"c135"
-		"ypos"					"c15"
-		"ypos_minmode"			"c17"
-		"wide"					"116"
-		"tall"  				"180"
+		"xpos_minmode"			"c130"
+		"ypos"					"c130"
+		"zpos"					"0"
+		"ypos_minmode"			"c83"
+		"wide"					"50"
+		"tall"  				"70"
 		"visible" 				"1"
 		"enabled" 				"1"
 		"PaintBackgroundType"	"2"
@@ -887,8 +262,8 @@
 		"fieldName" 			"DisguiseStatus"
 		"visible"				"1"
 		"enabled"				"1"
-		"xpos"					"20"
-		"ypos"					"r50"
+		"xpos"					"15"
+		"ypos"					"r40"
 		"wide"					"150"
 		"tall"					"30"
 	}
@@ -951,7 +326,7 @@
 		"visible"				"1"
 		"enabled"				"1"
 		"xpos"					"0"
-		"ypos"					"0"
+		"ypos"					"c70"
 		"wide"					"640"
 		"tall"					"480"
 		"PaintBackgroundType"	"2"
@@ -1096,7 +471,7 @@
 		"visible" 				"1"
 		"enabled" 				"1"
 		"xpos"	 				"r592"
-		"ypos"	 				"20"
+		"ypos"	 				"22"
 		"wide"	 				"580"
 		"tall"	 				"468"
 		"MaxDeathNotices" 		"5"
@@ -1105,12 +480,12 @@
 		"LineSpacing"			"0"
 		"CornerRadius"			"2"
 		"RightJustify"			"1"
-		"TextFont"				"CerbeticaBold12"
+		"TextFont"				"HudFontSmallest"
 		"TeamBlue"				"HUDBlueTeamSolid"
 		"TeamRed"				"HUDRedTeamSolid"
 		"IconColor"				"HudWhite"
 		"LocalPlayerColor"		"65 65 65 255"
-		"BaseBackgroundColor"	"46 43 42 175"
+		"BaseBackgroundColor"	"TransparentBlack"
 		"LocalBackgroundColor"	"245 229 196 200"
 	}
 
@@ -1189,10 +564,10 @@
 		"enabled" 			"1"
 		"wide"	 			"640"
 		"tall"	 			"480"
-		"xpos"				"c-220"
-		"ypos"				"c108"
-		"xpos_minmode"		"c-150"
-		"ypos_minmode"		"c62"
+		"xpos"				"c-210"
+		"ypos"				"c125"
+		"xpos_minmode"		"c-145"
+		"ypos_minmode"		"c70"
 		"zpos" 				"2"
 		"TextFont"			"Default"
 		"ItemFont"			"Default"
@@ -1204,11 +579,11 @@
 		"fieldName" 		"HudCloseCaption"
 		"visible"			"1"
 		"enabled"			"1"
-		"xpos"				"c188"
+		"xpos"				"c205"
 		"ypos"				"302"
 		"wide"				"150"
 		"tall"				"60"
-		"xpos_minmode"		"c115"
+		"xpos_minmode"		"c170"
 		"ypos_minmode"		"273"
 		"wide_minmode"		"120"
 		"tall_minmode"		"40"
@@ -1564,7 +939,7 @@
 		"enabled" 			"1"
 		"xpos"				"c-200"
 		"ypos"				"c-75"
-		"ypos_minmode"		"c95"
+		"ypos_minmode"		"c105"
 		"zpos"				"1"
 		"wide"				"400"
 		"tall"				"150"
@@ -1578,7 +953,7 @@
 		"enabled" 			"1"
 		"xpos"				"c-200"
 		"ypos"				"c-75"
-		"ypos_minmode"		"c95"
+		"ypos_minmode"		"c105"
 		"zpos"				"1"
 		"wide"				"400"
 		"tall"				"150"
@@ -1592,7 +967,7 @@
 		"enabled" 			"1"
 		"xpos"				"c-105"
 		"ypos"				"c-75"
-		"ypos_minmode"		"c95"
+		"ypos_minmode"		"c105"
 		"zpos"				"1"
 		"wide"				"200"
 		"tall"				"150"
@@ -1662,10 +1037,10 @@
 		"fieldName"			"HudArenaNotification"
 		"visible"			"0"
 		"enabled"			"1"
-		"xpos"				"c-160"
+		"xpos"				"c-140"
 		"ypos"				"75"
-		"wide"				"320"
-		"tall"				"150"
+		"wide"				"280"
+		"tall"				"75"
 	}
 
 	HudArenaCapPointCountdown
@@ -1697,14 +1072,10 @@
 		"visible"			"0"
 		"enabled"			"1"
 		"xpos"				"c-125"
-		"ypos"				"5"
-		"xpos_minmode"		"0"
-		"ypos_minmode"		"0"
+		"ypos"				"0"
 		"zpos"				"12"
 		"wide"				"250"
 		"tall"				"80"
-		"wide_minmode"		"f0"
-		"tall_minmode"		"480"
 	}
 
 	HudTournamentSetup
@@ -1712,10 +1083,10 @@
 		"fieldName"			"HudTournamentSetup"
 		"visible"			"0"
 		"enabled"			"1"
-		"xpos"				"c-90"
+		"xpos"				"c0"
 		"ypos"				"-70"
 		"wide"				"180"
-		"tall"				"65"
+		"tall"				"55"
 	}
 
 	HudStopWatch
@@ -1723,7 +1094,7 @@
 		"fieldName"			"HudStopWatch"
 		"visible"			"1"
 		"enabled"			"1"
-		"xpos"				"c-40"
+		"xpos"				"c-44"
 		"ypos"				"27"
 		"zpos"				"0"
 		"wide"				"80"
@@ -1801,12 +1172,12 @@
 	{
 		"ControlName"		"EditablePanel"
 		"fieldName"			"HudAchievementTracker"
-		"xpos"				"r145"
-		"NormalY"			"340"
-		"EngineerY"			"340"
-		"zpos"				"2"
+		"xpos"				"5"
+		"NormalY"			"300"
+		"EngineerY"			"150"
+		"zpos"				"0"
 		"wide"				"200"
-		"tall"				"280"
+		"tall"				"100"
 		"visible"			"1"
 		"enabled"			"1"
 	}
@@ -1962,8 +1333,8 @@
 		"visible" 			"1"
 		"enabled" 			"1"
 		"xpos"				"c-235"
-		"ypos"				"c125"
-		"zpos"				"10"
+		"ypos"				"c135"
+		"zpos"				"0"
 		"wide"				"470"
 		"tall"				"200"
 		"PaintBackgroundType" "0"
diff --git a/scripts/knucklescrosses.png b/scripts/knucklescrosses.png
deleted file mode 100644
index e3935cb..0000000
--- a/scripts/knucklescrosses.png
+++ /dev/null