From 5db6823d5d4434c399b91a97755bfa934300a9a1 Mon Sep 17 00:00:00 2001
From: ibruton <raysfire64@gmail.com>
Date: Tue, 12 Jul 2016 05:36:41 -0500
Subject: Updated timers to support casual + comp modes

---
 minmode/resource/ui/HudObjectiveKothTimePanel.res | 10 +++----
 minmode/resource/ui/HudObjectiveTimePanel.res     | 28 +++++++++----------
 minmode/resource/ui/HudStopWatch.res              | 33 +++++++++++++++++------
 3 files changed, 44 insertions(+), 27 deletions(-)

(limited to 'minmode/resource/ui')

diff --git a/minmode/resource/ui/HudObjectiveKothTimePanel.res b/minmode/resource/ui/HudObjectiveKothTimePanel.res
index de34813..f618016 100644
--- a/minmode/resource/ui/HudObjectiveKothTimePanel.res
+++ b/minmode/resource/ui/HudObjectiveKothTimePanel.res
@@ -2,7 +2,7 @@
 {	
 	"HudKothTimeStatus"
 	{
-		if_comp
+		if_match
 		{
 			"zpos"		"5"
 		}
@@ -20,7 +20,7 @@
 		"visible"			"1"
 		"enabled"			"1"
 		
-		if_comp
+		if_match
 		{
 			"proportionaltoparent"	"1"
 			"xpos"					"cs-.7"
@@ -50,7 +50,7 @@
 			"textAlignment"	"center"
 			"labelText"		"0:00"
 			
-			if_comp
+			if_match
 			{
 				"proportionaltoparent"	"1"
 
@@ -82,7 +82,7 @@
 		"delta_lifetime" 	"1.5"
 		"delta_item_font" 	"Cerbetica22"
 		
-		if_comp
+		if_match
 		{
 			"proportionaltoparent"	"1"
 			"xpos"					"cs-0.77"
@@ -119,7 +119,7 @@
 			"textAlignment"		"center"
 			"labelText"			"0:00"
 			
-			if_comp
+			if_match
 			{
 				"proportionaltoparent"	"1"
 
diff --git a/minmode/resource/ui/HudObjectiveTimePanel.res b/minmode/resource/ui/HudObjectiveTimePanel.res
index 5580706..c50cd14 100644
--- a/minmode/resource/ui/HudObjectiveTimePanel.res
+++ b/minmode/resource/ui/HudObjectiveTimePanel.res
@@ -18,7 +18,7 @@
 		"draw_corner_width" "0"
 		"draw_corner_height" "0"
 
-		if_comp
+		if_match
 		{
 			"visible"	"0"
 		}		
@@ -44,7 +44,7 @@
 		"color_warning"			"TimerProgress.Warning"
 		"percent_warning"		"0.75"
 		
-		if_comp
+		if_match
 		{
 			"visible"	"0"
 		}
@@ -67,7 +67,7 @@
 		"wrap"			"0"
 		"font"			"Cerbetica12"
 		
-		if_comp
+		if_match
 		{
 			"proportionaltoparent"	"1"
 			"wide"					"36"
@@ -93,7 +93,7 @@
 		"image"			"../hud/objectives_timepanel_suddendeath"	
 		"scaleImage"		"1"	
 		
-		if_comp
+		if_match
 		{
 			"wide"	"0"
 		}
@@ -116,12 +116,12 @@
 		"wrap"			"0"
 		"font"			"Cerbetica12"
 		
-		if_comp
+		if_match
 		{
 			"proportionaltoparent"	"1"
 			"font"					"HudFontSmallestBold"
-			"xpos"					"10"
-			"wide"					"36"
+			"xpos"					"c0"
+			"wide"					"72"
 			"ypos"					"22"
 			"font"			"Cerbetica10"
 
@@ -144,7 +144,7 @@
 		"image"			"../hud/objectives_timepanel_suddendeath"	
 		"scaleImage"		"1"	
 	
-		if_comp
+		if_match
 		{
 			"wide"	"0"
 		}	
@@ -169,7 +169,7 @@
 		"wrap"			"0"
 		"font"			"Cerbetica12"
 		
-		if_comp
+		if_match
 		{
 			"proportionaltoparent"	"1"
 			"xpos"					"cs-0.5"
@@ -194,7 +194,7 @@
 		"image"			"../hud/objectives_timepanel_suddendeath"	
 		"scaleImage"		"1"	
 		
-		if_comp
+		if_match
 		{
 			"wide"	"0"
 		}		
@@ -217,7 +217,7 @@
 		"wrap"			"0"
 		"font"			"Cerbetica12"
 		
-		if_comp
+		if_match
 		{
 			"proportionaltoparent"	"1"
 			"xpos"					"cs-0.5"
@@ -242,7 +242,7 @@
 		"image"			"../hud/objectives_timepanel_suddendeath"	
 		"scaleImage"		"1"	
 		
-		if_comp
+		if_match
 		{
 			"wide"	"0"
 		}		
@@ -269,7 +269,7 @@
 		"wrap"			"0"
 		"font"			"Cerbetica14"
 		
-		if_comp
+		if_match
 		{
 			"proportionaltoparent"	"1"
 			"xpos"					"cs-0.5"
@@ -298,7 +298,7 @@
 		"image"			"../hud/objectives_timepanel_suddendeath"	
 		"scaleImage"		"1"	
 		
-		if_comp
+		if_match
 		{
 			"wide"	"0"
 		}			
diff --git a/minmode/resource/ui/HudStopWatch.res b/minmode/resource/ui/HudStopWatch.res
index fd18a6d..549f76f 100644
--- a/minmode/resource/ui/HudStopWatch.res
+++ b/minmode/resource/ui/HudStopWatch.res
@@ -55,9 +55,8 @@
 		
 		if_comp
 		{		
-			"font"	"Cerbetica"
-			"xpos"	"-4"
-			"ypos"	"r32"
+			"xpos"	"0"
+			"ypos"	"28"
 		}
 		
 		"TimePanelValue"
@@ -74,6 +73,13 @@
 			"visible"		"1"
 			"enabled"		"1"
 			"textAlignment"		"east"
+			
+			if_comp
+			{
+				"xpos"		"-170"
+				"font"		"Cerbetica12"
+				"ypos"		"0"
+			}
 		}	
 	}
 
@@ -97,8 +103,9 @@
 		
 		if_comp
 		{
-			"xpos"	"190"
-			"ypos"	"r34"
+			"font"	"Cerbetica12"
+			"xpos"	"146"
+			"ypos"	"28"
 		}
 	}
 	"StopWatchPointsLabel"
@@ -106,7 +113,7 @@
 		"ControlName"		"CExLabel"
 		"fieldName"		"StopWatchPointsLabel"
 		"font"			"Cerbetica20"
-		"labelText"		"%pointslabel%"
+		"labelText"		"captures"
 		"textAlignment"		"west"
 		"xpos"			"192"
 		"ypos"			"-3"
@@ -121,8 +128,9 @@
 		
 		if_comp
 		{
-			"xpos"	"204"
-			"ypos"	"r34"
+			"font"	"Cerbetica12"
+			"xpos"	"158"
+			"ypos"	"28"
 		}
 	}
 
@@ -143,6 +151,15 @@
 		"visible"		"0"
 		"enabled"		"1"
 		"wrap"			"1"
+		
+		if_comp
+		{
+			"font"	"Cerbetica12"
+			"textAlignment"	"center"
+			"wide"	"80"
+			"xpos"	"100"
+			"ypos"	"28"
+		}
 	}
 
 	"HudStopWatchDescriptionBG"
-- 
cgit v1.2.3