Installer Changes

- Added additional KonrWings sizes
- Rearranged variables to better work with the latest installer

2 files changed, 310 insertions, 21 deletions

diff --git a/resource/scheme/clientscheme_colors.res b/resource/scheme/clientscheme_colors.res
index c82b4eb..296829d 100644
--- a/resource/scheme/clientscheme_colors.res
+++ b/resource/scheme/clientscheme_colors.res
@@ -8,6 +8,17 @@ Scheme
 		"Ammo In Reserve"				"72 255 255 255"
 		"Ammo In Clip Low"				"255 42 130 255"
 		"Ammo In Reserve Low"			"255 128 28 255"
+		"Health Normal"					"235 226 202 255"
+		"Health Buff"					"48 255 48 255"
+		"Health Hurt"					"255 153 0 255"
+		"Uber Bar Color"				"235 226 202 255"
+		"Solid Color Uber"				"255 50 255 255"
+		"Flashing Uber Color1"			"255 165 0 255"
+		"Flashing Uber Color2"			"255 69 0 255"
+		"Heal Numbers"					"48 255 48 255"
+		"Damage Numbers"				"72 255 255 255"
+		"Crosshair"						"242 242 242 255"
+		"CrosshairDamage"				"255 0 0 255"
 		
 		//refers to watching stvs/killcam shots
 		"Spec Health Normal"			"235 226 202 255"
@@ -19,32 +30,11 @@ Scheme
 		"Alternate Spec Health Buff"	"48 255 48 255"			
 		"Alternate Spec Health Hurt"	"255 153 0 255"
 		
-		//refers to player health/targetids
-		"Health Normal"					"235 226 202 255"
-		"Health Buff"					"48 255 48 255"
-		"Health Hurt"					"255 153 0 255"
-		
 		//alternate colors for flashing values
 		"Alternate Health Normal"		"235 226 202 255"
 		"Alternate Health Buff"			"48 255 48 255"			
 		"Alternate Health Hurt"			"255 153 0 255"
 		
-		"Uber Bar Color"				"235 226 202 255"
-		
-		//solid color uber disabled by default; to enable, uncomment lines in hudanimations_tf.txt
-		"Solid Color Uber"				"255 50 255 255"
-		
-		"Flashing Uber Color1"			"255 165 0 255"
-		"Flashing Uber Color2"			"255 69 0 255"
-		//"Ubercharge Amount"			"48 255 48 255" // disabled temporarily; currently controlled by ammo in clip color
-		
-		"Heal Numbers"					"48 255 48 255"
-		"Damage Numbers"				"72 255 255 255"
-		
-		//crosshair colors
-		"Crosshair"						"242 242 242 255"
-		"CrosshairDamage"				"255 0 0 255"
-		
 		//'Last DamageHeal Info' refers to the number that appears above hp
 		"Last DamageHeal Info"			"72 255 255 255"
 		
diff --git a/resource/scheme/clientscheme_xhairs.res b/resource/scheme/clientscheme_xhairs.res
index f533cb7..7c8419d 100644
--- a/resource/scheme/clientscheme_xhairs.res
+++ b/resource/scheme/clientscheme_xhairs.res
@@ -1279,6 +1279,98 @@ Scheme
 			}
 		}
 		
+		"KonrWings8"
+		{
+			"1"
+			{
+				"name"			"Garm3nFont"
+				"tall"			"8"
+				"weight"		"0"
+				"antialias"		"1"
+			}
+		}
+		
+		"KonrWings8Outline"
+		{
+			"1"
+			{
+				"name"			"Garm3nFont"
+				"tall"			"8"
+				"weight"		"0"
+				"antialias"		"1"
+				"outline"		"1"
+			}
+		}
+		
+		"KonrWings10"
+		{
+			"1"
+			{
+				"name"			"Garm3nFont"
+				"tall"			"10"
+				"weight"		"0"
+				"antialias"		"1"
+			}
+		}
+		
+		"KonrWings10Outline"
+		{
+			"1"
+			{
+				"name"			"Garm3nFont"
+				"tall"			"10"
+				"weight"		"0"
+				"antialias"		"1"
+				"outline"		"1"
+			}
+		}
+		
+		"KonrWings12"
+		{
+			"1"
+			{
+				"name"			"Garm3nFont"
+				"tall"			"12"
+				"weight"		"0"
+				"antialias"		"1"
+			}
+		}
+		
+		"KonrWings12Outline"
+		{
+			"1"
+			{
+				"name"			"Garm3nFont"
+				"tall"			"12"
+				"weight"		"0"
+				"antialias"		"1"
+				"outline"		"1"
+			}
+		}
+		
+		"KonrWings14"
+		{
+			"1"
+			{
+				"name"			"Garm3nFont"
+				"tall"			"14"
+				"weight"		"0"
+				"antialias"		"1"
+			}
+		}
+		
+		"KonrWings14Outline"
+		{
+			"1"
+			{
+				"name"			"Garm3nFont"
+				"tall"			"14"
+				"weight"		"0"
+				"antialias"		"1"
+				"outline"		"1"
+			}
+		}
+		
 		"KonrWings16"
 		{
 			"1"
@@ -1302,6 +1394,75 @@ Scheme
 			}
 		}
 		
+		"KonrWings18"
+		{
+			"1"
+			{
+				"name"			"Garm3nFont"
+				"tall"			"18"
+				"weight"		"0"
+				"antialias"		"1"
+			}
+		}
+		
+		"KonrWings18Outline"
+		{
+			"1"
+			{
+				"name"			"Garm3nFont"
+				"tall"			"18"
+				"weight"		"0"
+				"antialias"		"1"
+				"outline"		"1"
+			}
+		}
+		
+		"KonrWings20"
+		{
+			"1"
+			{
+				"name"			"Garm3nFont"
+				"tall"			"20"
+				"weight"		"0"
+				"antialias"		"1"
+			}
+		}
+		
+		"KonrWings20Outline"
+		{
+			"1"
+			{
+				"name"			"Garm3nFont"
+				"tall"			"20"
+				"weight"		"0"
+				"antialias"		"1"
+				"outline"		"1"
+			}
+		}
+		
+		"KonrWings22"
+		{
+			"1"
+			{
+				"name"			"Garm3nFont"
+				"tall"			"22"
+				"weight"		"0"
+				"antialias"		"1"
+			}
+		}
+		
+		"KonrWings22Outline"
+		{
+			"1"
+			{
+				"name"			"Garm3nFont"
+				"tall"			"22"
+				"weight"		"0"
+				"antialias"		"1"
+				"outline"		"1"
+			}
+		}
+		
 		"KonrWings24"
 		{
 			"1"
@@ -1325,6 +1486,75 @@ Scheme
 			}
 		}
 		
+		"KonrWings26"
+		{
+			"1"
+			{
+				"name"			"Garm3nFont"
+				"tall"			"26"
+				"weight"		"0"
+				"antialias"		"1"
+			}
+		}
+		
+		"KonrWings26Outline"
+		{
+			"1"
+			{
+				"name"			"Garm3nFont"
+				"tall"			"26"
+				"weight"		"0"
+				"antialias"		"1"
+				"outline"		"1"
+			}
+		}
+		
+		"KonrWings28"
+		{
+			"1"
+			{
+				"name"			"Garm3nFont"
+				"tall"			"28"
+				"weight"		"0"
+				"antialias"		"1"
+			}
+		}
+		
+		"KonrWings28Outline"
+		{
+			"1"
+			{
+				"name"			"Garm3nFont"
+				"tall"			"28"
+				"weight"		"0"
+				"antialias"		"1"
+				"outline"		"1"
+			}
+		}
+		
+		"KonrWings30"
+		{
+			"1"
+			{
+				"name"			"Garm3nFont"
+				"tall"			"30"
+				"weight"		"0"
+				"antialias"		"1"
+			}
+		}
+		
+		"KonrWings30Outline"
+		{
+			"1"
+			{
+				"name"			"Garm3nFont"
+				"tall"			"30"
+				"weight"		"0"
+				"antialias"		"1"
+				"outline"		"1"
+			}
+		}
+		
 		"KonrWings32"
 		{
 			"1"
@@ -1348,6 +1578,75 @@ Scheme
 			}
 		}
 		
+		"KonrWings34"
+		{
+			"1"
+			{
+				"name"			"Garm3nFont"
+				"tall"			"34"
+				"weight"		"0"
+				"antialias"		"1"
+			}
+		}
+		
+		"KonrWings34Outline"
+		{
+			"1"
+			{
+				"name"			"Garm3nFont"
+				"tall"			"34"
+				"weight"		"0"
+				"antialias"		"1"
+				"outline"		"1"
+			}
+		}
+		
+		"KonrWings36"
+		{
+			"1"
+			{
+				"name"			"Garm3nFont"
+				"tall"			"36"
+				"weight"		"0"
+				"antialias"		"1"
+			}
+		}
+		
+		"KonrWings36Outline"
+		{
+			"1"
+			{
+				"name"			"Garm3nFont"
+				"tall"			"36"
+				"weight"		"0"
+				"antialias"		"1"
+				"outline"		"1"
+			}
+		}
+		
+		"KonrWings38"
+		{
+			"1"
+			{
+				"name"			"Garm3nFont"
+				"tall"			"38"
+				"weight"		"0"
+				"antialias"		"1"
+			}
+		}
+		
+		"KonrWings38Outline"
+		{
+			"1"
+			{
+				"name"			"Garm3nFont"
+				"tall"			"38"
+				"weight"		"0"
+				"antialias"		"1"
+				"outline"		"1"
+			}
+		}
+		
 		"KonrWings40"
 		{
 			"1"