Merge pull request #160 from raysfire/dev

v2020.1230

3 files changed, 43 insertions, 42 deletions

diff --git a/scripts/TF2Crosshairs.png b/scripts/TF2Crosshairs.png
index dd01892..643ae9f 100644
--- a/scripts/TF2Crosshairs.png
+++ b/scripts/TF2Crosshairs.png
diff --git a/scripts/hudanimations_custom.txt b/scripts/hudanimations_custom.txt
index a1b2b6b..5b47cf8 100644
--- a/scripts/hudanimations_custom.txt
+++ b/scripts/hudanimations_custom.txt
@@ -124,7 +124,7 @@ event HudMedicChargedStop
 	Animate	ChargeLabel 				FgColor		"Ammo In Clip"		Linear 0.0 0.0001
 }
 //==================================================================================
-// Hitmarker Pulse
+
 event DamagedPlayer
 {
 	StopEvent HitMarker 				0.0
@@ -137,6 +137,7 @@ event HitMarker
 	Animate	CustomCrosshair				FgColor		"Crosshair"			Linear 0.10	0.10001
 }
 //==================================================================================
+
 // Spy Disguise
 event HudSpyDisguiseFadeIn
 {
@@ -162,26 +163,25 @@ event HudSpyDisguiseChanged
 
 event HudSnapShotReminderIn
 {
-    RunEvent DefaultAnimHudSnapShotReminderIn	0.0
-    RunEvent HudHealthBonusPulseStop 			0.0
-    RunEvent HudHealthDyingPulseStop 			0.0
-    RunEvent HudLowAmmoPulseStop 				0.0
-    RunEvent HudMedicChargedStop 				0.0
+    RunEvent HudHealthDyingPulseStop 			10.0
+    RunEvent HudHealthBonusPulseStop 			10.0
+    RunEvent HudLowAmmoPulseStop 				10.0
+    RunEvent HudMedicChargedStop 				10.0
 }
 //==================================================================================
 
-event CompetitiveGame_LowerChatWindow
-{ 
-	Animate HudChat ypos r120 Accel 0 0
+event TeamStatus_PlayerDead
+{
+	SetVisible	respawntime	1	0
 }
 
-event CompetitiveGame_RestoreChatWindow
-{ 
-	Animate HudChat ypos 25 Accel 0 0
+event TeamStatus_PlayerAlive
+{
+	SetVisible	respawntime	0	0.2
 }
 
-event HudTournament_MoveChatWindow
-{
-	RunEvent CompetitiveGame_LowerChatWindow 0
-	RunEvent CompetitiveGame_RestoreChatWindow 0
-}
\ No newline at end of file
+//==================================================================================
+
+event CompetitiveGame_LowerChatWindow { }
+event CompetitiveGame_RestoreChatWindow { }
+event HudTournament_MoveChatWindow { }
diff --git a/scripts/hudlayout.res b/scripts/hudlayout.res
index 9a6b1e9..390e5f6 100644
--- a/scripts/hudlayout.res
+++ b/scripts/hudlayout.res
@@ -14,11 +14,11 @@
 		"labelText"			"<"
 		"controlName"		"CExLabel"
 		"fieldName"			"CustomCrosshair"
-		"zpos"				"2"
-		"xpos"				"c-50"
-		"ypos"				"c-49"
-		"wide"				"100"
-		"tall"				"100"
+		"zpos"				"0"
+		"xpos"				"cs-0.4999"
+		"ypos"				"cs-0.4990"
+		"wide"				"f0"
+		"tall"				"f0"
 		"font"				"Size:18 | Outline:OFF"
 		"textAlignment"		"center"
 		"fgcolor"			"Crosshair"
@@ -76,7 +76,7 @@
 		"xpos"				"0"
 		"ypos"				"0"
 		"wide"				"f0"
-		"tall"				"480"
+		"tall"				"f0"
 	}
 
 	HudKothTimeStatus
@@ -84,14 +84,14 @@
 		"fieldName" 		"HudKothTimeStatus"
 		"visible"			"1"
 		"enabled"			"1"
-		"xpos"				"c-75"
+		"xpos"				"c-65"
 		"ypos"				"0"
 		"zpos"				"5"
 		"wide"				"200"
 		"tall"				"60"
 
-		"blue_active_xpos"	"25"
-		"red_active_xpos"	"75"
+		"blue_active_xpos"	"15"
+		"red_active_xpos"	"65"
 	}
 
 	HudItemEffectMeter
@@ -120,12 +120,13 @@
 
 	HudDemomanCharge
 	{
-		"fieldName"			"HudItemEffectMeter"
+		"fieldName"			"HudDemomanCharge"
 		"visible"			"1"
 		"enabled"			"1"
-		"xpos"				"c-75"
-		"ypos"				"c25"
-		"wide"				"200"
+		"xpos"				"0"
+		"ypos"				"0"
+		"zpos"				"1"
+		"wide"				"f0"
 		"tall"				"500"
 		"MeterFG"			"White"
 		"MeterBG"			"Gray"
@@ -222,7 +223,7 @@
 		"ypos"					"c130"
 		"zpos"					"0"
 		"ypos_minmode"			"c83"
-		"wide"					"50"
+		"wide"					"55"
 		"tall"  				"70"
 		"visible" 				"1"
 		"enabled" 				"1"
@@ -274,7 +275,7 @@
 		"visible" 				"0"
 		"enabled" 				"1"
 		"xpos"					"c-100"
-		"ypos"					"246"
+		"ypos"					"250"
 		"ypos_minmode"			"c80"
 		"wide"					"600"
 		"tall"					"50"
@@ -287,7 +288,7 @@
 		"visible" 				"0"
 		"enabled" 				"1"
 		"xpos"					"c-100"
-		"ypos"					"c100"
+		"ypos"					"c120"
 		"wide"					"600"
 		"tall"					"50"
 		"priority"				"40"
@@ -301,7 +302,7 @@
 		"visible" 				"0"
 		"enabled" 				"1"
 		"xpos"					"c-100"
-		"ypos"					"c130"
+		"ypos"					"c120"
 		"ypos_minmode"			"c120"
 		"wide"					"600"
 		"tall"					"50"
@@ -314,7 +315,7 @@
 		"visible"				"1"
 		"enabled"				"1"
 		"xpos"					"5"
-		"ypos"					"0"
+		"ypos"					"c-100"
 		"wide"					"640"
 		"tall"					"480"
 		"PaintBackgroundType"	"2"
@@ -361,9 +362,9 @@
 	HudRoundTimer
 	{
 		"fieldName"				"HudRoundTimer"
-		"xpos"					"c-20"
+		"xpos"					"0"
 		"ypos"					"440"
-		"wide"					"120"
+		"wide"					"f0"
 		"tall"  				"40"
 		"visible" 				"1"
 		"enabled" 				"1"
@@ -408,8 +409,8 @@
 		"fieldName"				"HudDamageIndicator"
 		"visible" 				"1"
 		"enabled" 				"1"
-		"MinimumWidth" 			"10"
-		"MaximumWidth"			"10"
+		"MinimumWidth" 			"15"
+		"MaximumWidth"			"15"
 		"StartRadius"			"80"
 		"EndRadius"				"80"
 		"MinimumHeight"			"30"
@@ -471,7 +472,7 @@
 		"visible" 				"1"
 		"enabled" 				"1"
 		"xpos"	 				"r592"
-		"ypos"	 				"22"
+		"ypos"	 				"25"
 		"wide"	 				"580"
 		"tall"	 				"468"
 		"MaxDeathNotices"		"5"
@@ -1094,10 +1095,10 @@
 		"fieldName"			"HudStopWatch"
 		"visible"			"1"
 		"enabled"			"1"
-		"xpos"				"c-44"
+		"xpos"				"c-115"
 		"ypos"				"27"
 		"zpos"				"0"
-		"wide"				"80"
+		"wide"				"90"
 		"tall"				"15"
 	}