Changed default zone settings/beam. (#462)

The new beam is the new CS:GO beam but without the halo sprite. It looks
as good in CS:S too and the difference is very minor for CS:GO users.

configs/shavit-zones.cfg

@@ -1,22 +1,13 @@
 // Absolutely DON'T delete subkeys from this file.
 //
-// visible defaults to 1
+// Visible defaults to 1.
-// other values default to 255, except for width which is 2.0
+// Other values default to 255, except for width which is 0.5.
 "Zones"
 {
-	// zone sprites
+	"Sprites"
-	"CS:S"
 	{
-		"beam"			"shavit/zonev2_sprite.vmt"
+		"beam"			"shavit/zone_beam.vmt"
-		"halo"			"none"
+		"downloads"		"materials/shavit/zone_beam.vtf; materials/shavit/zone_beam.vmt"
-		"downloads"		"materials/shavit/zonev2_sprite.vtf; materials/shavit/zonev2_sprite.vmt"
-	}
-
-	"CS:GO"
-	{
-		"beam"			"shavit/zonecsgo_sprite.vmt"
-		"halo"			"none"
-		"downloads"		"materials/shavit/zonecsgo_sprite.vtf; materials/shavit/zonecsgo_sprite.vmt"
 	}
 
 	"Colors"
@@ -27,7 +18,7 @@
 			"red"		"67"
 			"green"		"210"
 			"blue"		"230"
-			"width"		"2.0"
+			"width"		"0.5"
 		}
 
 		"End"
@@ -36,7 +27,7 @@
 			"red"		"165"
 			"green"		"19"
 			"blue"		"194"
-			"width"		"2.0"
+			"width"		"0.5"
 		}
 
 		"Glitch_Respawn"
@@ -45,7 +36,7 @@
 			"red"		"255"
 			"green"		"200"
 			"blue"		"0"
-			"width"		"2.0"
+			"width"		"0.5"
 		}
 
 		"Glitch_Stop"
@@ -53,7 +44,7 @@
 			"visible"	"0"
 			"green"		"200"
 			"blue"		"0"
-			"width"		"2.0"
+			"width"		"0.5"
 		}
 
 		"Glitch_Slay"
@@ -61,7 +52,7 @@
 			"visible"	"0"
 			"green"		"200"
 			"blue"		"0"
-			"width"		"2.0"
+			"width"		"0.5"
 		}
 
 		"Freestyle"
@@ -71,7 +62,7 @@
 			"green"		"25"
 			"blue"		"255"
 			"alpha"		"195"
-			"width"		"2.0"
+			"width"		"0.5"
 		}
 
 		"Nolimit"
@@ -81,7 +72,7 @@
 			"green"		"3"
 			"blue"		"255"
 			"alpha"		"50"
-			"width"		"2.0"
+			"width"		"0.5"
 		}
 
 		"Teleport"
@@ -107,7 +98,7 @@
 			"green"		"196"
 			"blue"		"92"
 			"alpha"		"175"
-			"width"		"5.5"
+			"width"		"2.5"
 		}
 	}
 }

materials/shavit/zonecsgo_sprite.vmt

@@ -1,6 +0,0 @@
-"Sprite"
-{
-	"$spriteorientation" "vp_parallel"
-	"$spriteorigin" "[ 0.50 0.50 ]"
-	"$basetexture" "shavit/zonecsgo_sprite"
-}

materials/shavit/zonev2_halo.vmt

@@ -1,8 +0,0 @@
-"UnlitGeneric"
-{
-	"$baseTexture" "shavit/zonev2_halo"
-
-	"$additive" 0
-	"$vertexcolor" 1
-	"$vertexalpha" 1
-}

materials/shavit/zonev2_sprite.vmt

@@ -1,8 +0,0 @@
-"UnlitGeneric"
-{
-	"$baseTexture" "shavit/zonev2_sprite"
-
-	"$additive" 0
-	"$vertexcolor" 1
-	"$vertexalpha" 1
-}

scripting/shavit-zones.sp

@@ -53,13 +53,6 @@ char gS_ZoneNames[][] =
 	"Easybhop Zone" // forces easybhop whether if the player is in non-easy styles or if the server has different settings
 };
 
-enum
-{
-	sBeamSprite,
-	sHaloSprite,
-	ZONESPRITES_SIZE
-}
-
 enum
 {
 	bVisible,
@@ -108,8 +101,7 @@ float gV_ZoneCenter[MAX_ZONES][3];
 int gI_EntityZone[4096];
 bool gB_ZonesCreated = false;
 
-// beamsprite, used to draw the zone
+char gS_BeamSprite[PLATFORM_MAX_PATH];
-char gS_Sprites[ZONESPRITES_SIZE][PLATFORM_MAX_PATH];
 int gI_BeamSprite = -1;
 int gI_HaloSprite = -1;
 
@@ -465,9 +457,8 @@ bool LoadZonesConfig()
 		return false;
 	}
 
-	kv.JumpToKey((gEV_Type == Engine_CSS)? "CS:S":"CS:GO");
+	kv.JumpToKey("Sprites");
-	kv.GetString("beam", gS_Sprites[sBeamSprite], PLATFORM_MAX_PATH);
+	kv.GetString("beam", gS_BeamSprite, PLATFORM_MAX_PATH);
-	kv.GetString("halo", gS_Sprites[sHaloSprite], PLATFORM_MAX_PATH);
 
 	char[] sDownloads = new char[PLATFORM_MAX_PATH * 8];
 	kv.GetString("downloads", sDownloads, (PLATFORM_MAX_PATH * 8));
@@ -518,8 +509,8 @@ void LoadZoneSettings()
 
 	if(gB_UseCustomSprite)
 	{
-		gI_BeamSprite = PrecacheModel(gS_Sprites[sBeamSprite], true);
+		gI_BeamSprite = PrecacheModel(gS_BeamSprite, true);
-		gI_HaloSprite = (StrEqual(gS_Sprites[sHaloSprite], "none"))? 0:PrecacheModel(gS_Sprites[sHaloSprite], true);
+		gI_HaloSprite = 0;
 	}
 
 	else