Various bug fixes, early support for killstreams

4 files changed, 215 insertions, 28 deletions

diff --git a/minmode/resource/ClientScheme.res b/minmode/resource/ClientScheme.res
index abf5c66..9767629 100644
--- a/minmode/resource/ClientScheme.res
+++ b/minmode/resource/ClientScheme.res
@@ -868,7 +868,7 @@ Scheme
 			"1"
 			{
 				"name"		"Cerbetica_edited"
-				"tall"		"32"
+				"tall"		"28"
 				"additive"	"0"
 				"antialias" "1"
 			}
@@ -878,7 +878,7 @@ Scheme
 			"1"
 			{
 				"name"		"Cerbetica_edited"
-				"tall"		"28"
+				"tall"		"24"
 				"additive"	"0"
 				"antialias" "1"
 			}
@@ -888,7 +888,7 @@ Scheme
 			"1"
 			{
 				"name"		"Cerbetica_edited"
-				"tall"		"28"
+				"tall"		"22"
 				"additive"	"0"
 				"antialias" "1"
 			}
@@ -898,7 +898,7 @@ Scheme
 			"1"
 			{
 				"name"		"Cerbetica_edited"
-				"tall"		"28"
+				"tall"		"22"
 				"additive"	"0"
 				"antialias" "1"
 			}
diff --git a/minmode/resource/ui/winpanel.res b/minmode/resource/ui/winpanel.res
index 054aebd..52a611b 100644
--- a/minmode/resource/ui/winpanel.res
+++ b/minmode/resource/ui/winpanel.res
@@ -5,7 +5,7 @@
 		"ControlName"		"EditablePanel"

 		"fieldName"		"TeamScoresPanel"

 		"xpos"			"0"

-		"ypos"			"56"

+		"ypos"			"36"

 		"wide"			"200"

 		"tall"			"100"

 		"visible"		"1"

@@ -102,7 +102,7 @@
 			"textAlignment"		"east"

 			"xpos"			"122"

 			"ypos"			"13"

-			"zpos"			"10"

+			"zpos"			"1"

 			"wide"			"75"

 			"tall"			"28"

 			"autoResize"	"0"

@@ -170,10 +170,10 @@
 		"ControlName"	"ImagePanel"

 		"fieldName"		"WinPanelBackground2"

 		"xpos"			"0"

-		"ypos"			"95"

+		"ypos"			"75"

 		"zpos"			"0"

 		"wide"			"300"

-		"tall"			"118"

+		"tall"			"140"

 		"visible"		"1"

 		"enabled"		"1"

 		"scaleImage"		"1"	

@@ -189,7 +189,7 @@
 		"fieldName"		"WinningTeamLabel"

 		"font"			"CerbeticaBold20"

 		"xpos"			"10"

-		"ypos"			"94"

+		"ypos"			"74"

 		"zpos"			"1"

 		"wide"			"180"

 		"tall"			"40"

@@ -209,7 +209,7 @@
 		"font"			"CerbeticaBold20"

 		"fgcolor"		"TransparentBlack"

 		"xpos"			"11"

-		"ypos"			"95"

+		"ypos"			"75"

 		"zpos"			"1"

 		"wide"			"180"

 		"tall"			"40"

@@ -228,7 +228,7 @@
 		"fieldName"		"AdvancingTeamLabel"

 		"font"			"CerbeticaBold20"

 		"xpos"			"10"

-		"ypos"			"99"

+		"ypos"			"79"

 		"zpos"			"1"

 		"wide"			"180"

 		"tall"			"20"

@@ -248,7 +248,7 @@
 		"font"			"CerbeticaBold20"

 		"fgcolor"		"black"

 		"xpos"			"10"

-		"ypos"			"100"

+		"ypos"			"80"

 		"zpos"			"1"

 		"wide"			"180"

 		"tall"			"20"

@@ -286,7 +286,7 @@
 		"fieldName"		"DetailsLabel"

 		"font"			"Cerbetica9"

 		"xpos"			"10"

-		"ypos"			"122"

+		"ypos"			"102"

 		"zpos"			"1"

 		"wide"			"180"

 		"tall"			"20"

@@ -322,7 +322,7 @@
 		"fieldName"		"TopPlayerLabel"

 		"font"			"Cerbetica9"

 		"xpos"			"15"

-		"ypos"			"140"

+		"ypos"			"120"

 		"zpos"			"3"

 		"wide"			"200"

 		"tall"			"20"

@@ -341,7 +341,7 @@
 		"fieldName"		"PointsThisRoundLabel"

 		"font"			"Cerbetica9"

 		"xpos"			"45"

-		"ypos"			"140"

+		"ypos"			"120"

 		"zpos"			"3"

 		"wide"			"140"

 		"tall"			"20"

@@ -359,7 +359,7 @@
 		"ControlName"		"ImagePanel"

 		"fieldName"		"HorizontalLine"

 		"xpos"			"15"

-		"ypos"			"155"

+		"ypos"			"135"

 		"zpos"			"3"

 		"wide"			"170"

 		"tall"			"1"

@@ -376,7 +376,7 @@
 		"ControlName"		"CAvatarImagePanel"

 		"fieldName"		"Player1Avatar"

 		"xpos"			"22"

-		"ypos"			"160"

+		"ypos"			"140"

 		"zpos"			"3"

 		"wide"			"14"

 		"tall"			"14"

@@ -391,7 +391,7 @@
 		"ControlName"		"CExLabel"

 		"fieldName"		"Player1Name"

 		"xpos"			"48"	[$WIN32]

-		"ypos"			"157"

+		"ypos"			"137"

 		"zpos"			"3"

 		"wide"			"75"	[$WIN32]

 		"tall"			"20"

@@ -409,7 +409,7 @@
 		"ControlName"		"CExLabel"

 		"fieldName"		"Player1Class"

 		"xpos"			"128"

-		"ypos"			"157"

+		"ypos"			"137"

 		"zpos"			"3"

 		"wide"			"35"

 		"tall"			"20"

@@ -427,7 +427,7 @@
 		"ControlName"		"CExLabel"

 		"fieldName"		"Player1Score"

 		"xpos"			"145"

-		"ypos"			"157"

+		"ypos"			"137"

 		"zpos"			"3"

 		"wide"			"30"

 		"tall"			"20"

@@ -445,7 +445,7 @@
 		"ControlName"		"CAvatarImagePanel"

 		"fieldName"		"Player2Avatar"

 		"xpos"			"22"

-		"ypos"			"176"

+		"ypos"			"156"

 		"zpos"			"3"

 		"wide"			"14"

 		"tall"			"14"

@@ -460,7 +460,7 @@
 		"ControlName"		"CExLabel"

 		"fieldName"		"Player2Name"

 		"xpos"			"48"

-		"ypos"			"173"

+		"ypos"			"153"

 		"zpos"			"3"

 		"wide"			"75"

 		"tall"			"20"

@@ -478,7 +478,7 @@
 		"ControlName"		"CExLabel"

 		"fieldName"		"Player2Class"

 		"xpos"			"128"

-		"ypos"			"173"

+		"ypos"			"153"

 		"zpos"			"3"

 		"wide"			"35"

 		"tall"			"20"

@@ -496,7 +496,7 @@
 		"ControlName"		"CExLabel"

 		"fieldName"		"Player2Score"

 		"xpos"			"145"

-		"ypos"			"173"

+		"ypos"			"153"

 		"zpos"			"3"

 		"wide"			"30"

 		"tall"			"20"

@@ -514,7 +514,7 @@
 		"ControlName"		"CAvatarImagePanel"

 		"fieldName"		"Player3Avatar"

 		"xpos"			"22"

-		"ypos"			"192"

+		"ypos"			"172"

 		"zpos"			"3"

 		"wide"			"14"

 		"tall"			"14"

@@ -529,7 +529,7 @@
 		"ControlName"		"CExLabel"

 		"fieldName"		"Player3Name"

 		"xpos"			"48"

-		"ypos"			"189"

+		"ypos"			"169"

 		"zpos"			"3"

 		"wide"			"75"

 		"tall"			"20"

@@ -547,7 +547,7 @@
 		"ControlName"		"CExLabel"

 		"fieldName"		"Player3Class"

 		"xpos"			"128"

-		"ypos"			"189"

+		"ypos"			"169"

 		"zpos"			"3"

 		"wide"			"35"

 		"tall"			"20"

@@ -565,7 +565,135 @@
 		"ControlName"		"CExLabel"

 		"fieldName"		"Player3Score"

 		"xpos"			"145"

-		"ypos"			"189"

+		"ypos"			"169"

+		"zpos"			"3"

+		"wide"			"30"

+		"tall"			"20"

+		"autoResize"		"0"

+		"pinCorner"		"0"

+		"visible"		"1"

+		"enabled"		"1"

+		"labelText"		""

+		"textAlignment"		"east"

+		"dulltext"		"0"

+		"brighttext"		"0"

+	}

+	

+	"KillStreakLeaderLabel"

+	{	

+		"ControlName"	"CExLabel"

+		"fieldName"		"KillStreakLeaderLabel"

+		"font"			"Cerbetica9"

+		"xpos"			"15"

+		"ypos"			"184"

+		"zpos"			"3"

+		"wide"			"200"

+		"tall"			"20"

+		"autoResize"	"0"

+		"pinCorner"		"0"

+		"visible"		"1"

+		"enabled"		"1"

+		"labelText"		"#Winpanel_KillStreakLeader"

+		"fgcolor_override" "TanLight"

+		"textAlignment"	"west"

+		"dulltext"		"0"

+		"brighttext"	"0"

+	}

+	"KillStreakMaxCountLabel"

+	{	

+		"ControlName"	"CExLabel"

+		"fieldName"		"KillStreakMaxCountLabel"

+		"font"			"Cerbetica9"

+		"xpos"			"136"

+		"ypos"			"0"

+		"zpos"			"3"

+		"wide"			"140"

+		"tall"			"20"

+		"autoResize"	"0"

+		"pinCorner"		"0"

+		"visible"		"1"

+		"enabled"		"1"

+		"labelText"		"#Winpanel_KillStreakMaxCount"

+		"textAlignment"	"east"

+		"dulltext"		"0"

+		"brighttext"	"0"

+	}

+	"HorizontalLine2"

+	{

+		"ControlName"		"ImagePanel"

+		"fieldName"		"HorizontalLine2"

+		"xpos"			"15"

+		"ypos"			"199"

+		"zpos"			"3"

+		"wide"			"170"

+		"tall"			"1"

+		"autoResize"	"0"

+		"pinCorner"		"0"

+		"visible"		"1"

+		"enabled"		"1"

+		"tabPosition"	"0"	

+		"fillcolor"		"250 234 201 255"

+		"PaintBackgroundType"	"0"

+	}

+	"KillStreakPlayer1Avatar"		[$WIN32]

+	{

+		"ControlName"		"CAvatarImagePanel"

+		"fieldName"		"KillStreakPlayer1Avatar"

+		"xpos"			"22"

+		"ypos"			"216"

+		"zpos"			"3"

+		"wide"			"14"

+		"tall"			"14"

+		"visible"		"1"

+		"enabled"		"1"

+		"image"			""

+		"scaleImage"		"1"	

+		"color_outline"		"52 48 45 255"

+	}

+	"KillStreakPlayer1Name"

+	{	

+		"ControlName"		"CExLabel"

+		"fieldName"		"KillStreakPlayer1Name"

+		"xpos"			"50"	[$WIN32]

+		"xpos"			"14"	[$X360]

+		"ypos"			"213"

+		"zpos"			"3"

+		"wide"			"128"	[$WIN32]

+		"wide"			"150"	[$X360]

+		"tall"			"20"

+		"autoResize"		"0"

+		"pinCorner"		"0"

+		"visible"		"1"

+		"enabled"		"1"

+		"labelText"		""

+		"textAlignment"		"west"

+		"dulltext"		"0"

+		"brighttext"		"0"

+	}

+	"KillStreakPlayer1Class"

+	{	

+		"ControlName"		"CExLabel"

+		"fieldName"		"KillStreakPlayer1Class"

+		"xpos"			"180"

+		"ypos"			"213"

+		"zpos"			"3"

+		"wide"			"200"

+		"tall"			"20"

+		"autoResize"		"0"

+		"pinCorner"		"0"

+		"visible"		"1"

+		"enabled"		"1"

+		"labelText"		""

+		"textAlignment"		"west"

+		"dulltext"		"0"

+		"brighttext"		"0"

+	}

+	"KillStreakPlayer1Score"

+	{	

+		"ControlName"		"CExLabel"

+		"fieldName"		"KillStreakPlayer1Score"

+		"xpos"			"240"

+		"ypos"			"213"

 		"zpos"			"3"

 		"wide"			"30"

 		"tall"			"20"

diff --git a/minmode/scripts/HudAnimations_tf.txt b/minmode/scripts/HudAnimations_tf.txt
index 7d154b4..188f0a2 100644
--- a/minmode/scripts/HudAnimations_tf.txt
+++ b/minmode/scripts/HudAnimations_tf.txt
@@ -823,4 +823,50 @@ event HudReadyPulseEnd
 	StopEvent HudReadyPulseLoop		0.0
 }
 
+	// Respec in Win
+event RespecEarnedPulse
+{
+	Animate	RespecTextLabelWin	FgColor	"TanLight"		Linear 0.0 0.1
+	Animate	RespecTextLabelWin	FgColor	"RedSolid"		Linear 0.3 0.4
+	
+	RunEvent RespecEarnedPulseLoop		0.5
+}
+
+event RespecEarnedPulseLoop
+{
+	RunEvent RespecEarnedPulse			0.0
+}
+
+event RespecEarnedPulseEnd
+{
+	Animate	RespecTextLabelWin 	FgColor		"TanLight"		Linear 0.0 0.1
+	
+	StopEvent RespecEarnedPulse			0.0
+	StopEvent RespecEarnedPulseLoop		0.0
+}
+
+// Respec on Loss
+event RespecEarnedPulseLoss
+{
+	Animate	RespecTextLabelLoss	FgColor	"TanLight"		Linear 0.0 0.1
+	Animate	RespecTextLabelLoss	FgColor	"RedSolid"		Linear 0.3 0.4
+	
+	RunEvent RespecEarnedPulseLoopLoss		0.5
+}
+
+event RespecEarnedPulseLoopLoss
+{
+	RunEvent RespecEarnedPulseLoss			0.0
+}
+
+event RespecEarnedPulseEndLoss
+{
+	Animate	RespecTextLabelLoss FgColor		"TanLight"		Linear 0.0 0.1
+	Animate	RespecTextLabelLoss FgColor		"TanLight"		Linear 0.0 0.1
+	
+	StopEvent RespecEarnedPulseLoss		0.0
+	StopEvent RespecEarnedPulseLoopLoss	0.0
+}
+
+//
 
diff --git a/minmode/scripts/hudlayout.res b/minmode/scripts/hudlayout.res
index ac481b0..662990b 100644
--- a/minmode/scripts/hudlayout.res
+++ b/minmode/scripts/hudlayout.res
@@ -2091,4 +2091,17 @@
 		"wide"			"320"
 		"tall"			"150"
 	}
+	
+		"CTFKillStreakNotice"
+	{
+		"fieldName"		"CTFKillStreakNotice"
+		"xpos"			"0"			
+		"ypos"			"0"
+		"wide"			"640"
+		"tall"			"480"
+		"visible"		"1"
+		"enabled"		"1"
+		"bgcolor_override"	"0 0 0 0"
+		"PaintBackgroundType"	"0" // rounded corners
+	}
 }