Merge pull request #126 from raysfire/dev

v2019.0406

1 files changed, 200 insertions, 181 deletions

diff --git a/resource/ui/ObjectiveStatusEscort.res b/resource/ui/ObjectiveStatusEscort.res
index b99627c..d89bb4f 100644
--- a/resource/ui/ObjectiveStatusEscort.res
+++ b/resource/ui/ObjectiveStatusEscort.res
@@ -23,18 +23,18 @@
 	
 	"LevelBar"
 	{
-		"ControlName"	"ImagePanel"
-		"fieldName"		"LevelBar"	
-		"xpos"			"73"
-		"ypos"			"123"
-		"zpos"			"0"
-		"wide"			"254"
-		"tall"			"4"
-		"visible"		"1"
-		"enabled"		"1"
-		"labelText"		""
-		"image"			"../hud/cart_track"
-		"scaleImage"	"1"
+		"ControlName"		"ImagePanel"
+		"fieldName"			"LevelBar"	
+		"xpos"				"73"
+		"ypos"				"123"
+		"zpos"				"0"
+		"wide"				"254"
+		"tall"				"4"
+		"visible"			"1"
+		"enabled"			"1"
+		"labelText"			""
+		"image"				"../hud/cart_track"
+		"scaleImage"		"1"
 		
 		"if_multiple_trains"
 		{
@@ -47,7 +47,6 @@
 		"if_single_with_hills"
 		{
 			"ypos"			"120"
-			"ypos_minmode"	"120"
 			"tall"			"12"
 			"image"			"../hud/cart_track_neutral_opaque"
 		}
@@ -56,7 +55,7 @@
 	"ProgressBar"
 	{
 		"ControlName"	"CTFHudEscortProgressBar"
-		"fieldName"		"ProgressBar"	
+		"fieldName"		"ProgressBar"
 		"xpos"			"73"
 		"ypos"			"123"
 		"zpos"			"4"
@@ -77,31 +76,34 @@
 	
 	"HomeCPIcon"
 	{
-		"ControlName"	"ImagePanel"
-		"fieldName"		"HomeCPIcon"
-		"xpos"			"64"
-		"ypos"			"116"
-		"zpos"			"1"
-		"wide"			"18"
-		"tall"			"18"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"1"
-		"enabled"		"1"
-		"tabPosition"	"0"
-		"labelText"		""
-		"image"			"../hud/cart_home_blue"
-		"scaleImage"	"1"	
+		"ControlName"		"ImagePanel"
+		"fieldName"			"HomeCPIcon"
+		"xpos"				"64"
+		"ypos"				"116"
+		"zpos"				"1"
+		"wide"				"18"
+		"tall"				"18"
+		"autoResize"		"0"
+		"pinCorner"			"0"
+		"visible"			"1"
+		"enabled"			"1"
+		"tabPosition"		"0"
+		"labelText"			""
+		"image"				"../hud/cart_home_blue"
+		"scaleImage"		"1"	
 		
-		"if_team_red" {
+		"if_team_red"
+		{
 			"image"			"../hud/cart_home_red"
 		}
 		
-		"if_single_with_hills_blue" {
+		"if_single_with_hills_blue"
+		{
 			"image"			"../hud/cart_home_blue_opaque"
 		}		
 		
-		"if_single_with_hills_red" {
+		"if_single_with_hills_red"
+		{
 			"image"			"../hud/cart_home_red_opaque"
 		}		
 		
@@ -114,41 +116,45 @@
 			"image"			"../hud/cart_track_neutral_opaque"
 		}
 		
-		"if_multiple_trains_top" {
+		"if_multiple_trains_top"
+		{
 			"ypos"			"114"
 		}
 		
-		"if_multiple_trains_bottom" {
+		"if_multiple_trains_bottom"
+		{
 			"ypos"			"114"
 		}
 		
-		"if_multiple_trains_red" {
+		"if_multiple_trains_red"
+		{
 			"image"			"../hud/cart_home_red_square"
 		}
 		
-		"if_multiple_trains_blue" {
+		"if_multiple_trains_blue"
+		{
 			"image"			"../hud/cart_home_blue_square"
 		}
 	}
 	
 	"SimpleControlPointTemplate"
 	{
-		"ControlName"	"ImagePanel"
-		"fieldName"		"SimpleControlPointTemplate"
-		"xpos"			"65"
-		"ypos"			"116"
-		"zpos"			"1"
-		"wide"			"18"
-		"tall"			"18"
-		"autoResize"	"0"
-		"pinCorner"		"0"
-		"visible"		"0"
-		"enabled"		"1"
-		"tabPosition"	"0"
-		"labelText"		""
-		"image"			"../hud/cart_point_neutral"
-		"scaleImage"	"1"	
-
+		"ControlName"		"ImagePanel"
+		"fieldName"			"SimpleControlPointTemplate"
+		"xpos"				"65"
+		"ypos"				"116"
+		"zpos"				"1"
+		"wide"				"18"
+		"tall"				"18"
+		"autoResize"		"0"
+		"pinCorner"			"0"
+		"visible"			"0"
+		"enabled"			"1"
+		"tabPosition"		"0"
+		"labelText"			""
+		"image"				"../hud/cart_point_neutral"
+		"scaleImage"		"1"	
+		
 		"if_multiple_trains"
 		{
 			"xpos"			"61"
@@ -161,16 +167,16 @@
 
 	"EscortItemPanel"
 	{
-		"ControlName"	"EditablePanel"
-		"fieldName"		"EscortItemPanel"
-		"xpos"			"0"
-		"ypos"			"48"
-		"zpos"			"2"
-		"wide"			"52"
-		"tall"			"75"
-		"visible"		"1"
-		"enabled"		"1"
-
+		"ControlName"		"EditablePanel"
+		"fieldName"			"EscortItemPanel"
+		"xpos"				"0"
+		"ypos"				"48"
+		"zpos"				"2"
+		"wide"				"52"
+		"tall"				"75"
+		"visible"			"1"
+		"enabled"			"1"
+		
 		"if_multiple_trains"
 		{
 			"ypos"			"48"
@@ -200,18 +206,20 @@
 			
 			"if_multiple_trains"
 			{
-				"font"			"ItemFontAttribSmall"
-				"xpos"			"21"
-				"wide"			"11"
-				"tall"			"10"
+				"font"		"ItemFontAttribSmall"
+				"xpos"		"21"
+				"wide"		"11"
+				"tall"		"10"
 			}
 			
-			"if_multiple_trains_top" {
-				"ypos"			"46"
+			"if_multiple_trains_top"
+			{
+				"ypos"		"46"
 			}
 			
-			"if_multiple_trains_bottom" {
-				"ypos"			"82"
+			"if_multiple_trains_bottom"
+			{
+				"ypos"		"82"
 			}
 		}
 		
@@ -233,20 +241,22 @@
 			"image"			"../hud/cart_neutral"
 			"scaleImage"	"1"
 			
-			"if_team_blue" {
-				"image"			"../hud/cart_blue"
+			"if_team_blue"
+			{
+				"image"		"../hud/cart_blue"
 			}		
 			
-			"if_team_red" {
-				"image"			"../hud/cart_red"
+			"if_team_red"
+			{
+				"image"		"../hud/cart_red"
 			}
 			
 			"if_multiple_trains"
 			{
-				"xpos"			"11"
-				"ypos"			"43"
-				"wide"			"30"
-				"tall"			"30"
+				"xpos"		"11"
+				"ypos"		"43"
+				"wide"		"30"
+				"tall"		"30"
 			}
 		}
 		
@@ -268,20 +278,22 @@
 			"image"			"../hud/cart_neutral_bottom"
 			"scaleImage"	"1"	
 			
-			"if_team_blue" {
-				"image"			"../hud/cart_blue_bottom"
+			"if_team_blue"
+			{
+				"image"		"../hud/cart_blue_bottom"
 			}			
 			
-			"if_team_red" {
-				"image"			"../hud/cart_red_bottom"
+			"if_team_red"
+			{
+				"image"		"../hud/cart_red_bottom"
 			}
 			
 			"if_multiple_trains"
 			{
-				"xpos"			"11"
-				"ypos"			"71"
-				"wide"			"30"
-				"tall"			"30"
+				"xpos"		"11"
+				"ypos"		"71"
+				"wide"		"30"
+				"tall"		"30"
 			}
 		}
 		
@@ -305,8 +317,8 @@
 			
 			"if_multiple_trains_bottom"
 			{
-				"xpos"			"-5"
-				"ypos"			"75"
+				"xpos"		"-5"
+				"ypos"		"75"
 			}
 		}
 		
@@ -330,17 +342,19 @@
 			
 			"if_multiple_trains"
 			{
-				"xpos"			"22"
-				"wide"			"8"
-				"tall"			"8"
+				"xpos"		"22"
+				"wide"		"8"
+				"tall"		"8"
 			}
 			
-			"if_multiple_trains_top" {
-				"ypos"			"46"
+			"if_multiple_trains_top"
+			{
+				"ypos"		"46"
 			}	
 			
-			"if_multiple_trains_bottom" {
-				"ypos"			"83"
+			"if_multiple_trains_bottom"
+			{
+				"ypos"		"83"
 			}	
 		}
 		
@@ -351,8 +365,8 @@
 			"xpos"			"20"
 			"ypos"			"52"
 			"zpos"			"3"
-			"wide"			"4"
-			"tall"			"8"
+			"wide"			"3"
+			"tall"			"7"
 			"visible"		"0"
 			"enabled"		"1"
 			"image"			"capture_icon_white"
@@ -360,17 +374,19 @@
 			
 			"if_multiple_trains"
 			{
-				"xpos"			"20"
-				"wide"			"5"
-				"tall"			"10"
+				"xpos"		"19"
+				"wide"		"5"
+				"tall"		"10"
 			}
 			
-			"if_multiple_trains_top" {
-				"ypos"			"45"
+			"if_multiple_trains_top"
+			{
+				"ypos"		"45"
 			}	
 			
-			"if_multiple_trains_bottom" {
-				"ypos"			"81"
+			"if_multiple_trains_bottom"
+			{
+				"ypos"		"81"
 			}
 		}
 
@@ -395,18 +411,20 @@
 			
 			"if_multiple_trains"
 			{
-				"font"			"ItemFontAttribSmall"
-				"xpos"			"25"
-				"wide"			"30"
-				"tall"			"10"
+				"font"		"ItemFontAttribSmall"
+				"xpos"		"24"
+				"wide"		"30"
+				"tall"		"10"
 			}			
 			
-			"if_multiple_trains_top" {
-				"ypos"			"46"
+			"if_multiple_trains_top"
+			{
+				"ypos"		"45"
 			}
 			
-			"if_multiple_trains_bottom" {
-				"ypos"			"82"
+			"if_multiple_trains_bottom"
+			{
+				"ypos"		"81"
 			}	
 		}
 		
@@ -435,11 +453,13 @@
 				"tall"			"8"
 			}
 			
-			"if_multiple_trains_top" {
+			"if_multiple_trains_top"
+			{
 				"ypos"			"46"
 			}	
 			
-			"if_multiple_trains_bottom" {
+			"if_multiple_trains_bottom"
+			{
 				"ypos"			"83"
 			}
 		}
@@ -463,89 +483,88 @@
 				"wide"			"65"
 				"tall"			"42"
 			}
-
+			
 			"Teardrop"
 			{
-				"ControlName"		"CIconPanel"
-				"fieldName"			"Teardrop"
-				"xpos"				"0"
-				"ypos"				"0"
-				"zpos"				"0"
-				"wide"				"54"
-				"wide_minmode"		"35"
-				"tall"				"65"
-				"tall_minmode"		"42"
-				"visible"			"1"
-				"enabled"			"1"
-				"scaleImage"		"1"
-				"icon"				"cappoint_progressbar_teardrop"
-				"iconColor"			"255 255 255 255"
+				"ControlName"	"CIconPanel"
+				"fieldName"		"Teardrop"
+				"xpos"			"0"
+				"ypos"			"0"
+				"zpos"			"0"
+				"wide"			"54"
+				"tall"			"65"
+				"wide_minmode"	"35"
+				"tall_minmode"	"42"
+				"visible"		"1"
+				"enabled"		"1"
+				"scaleImage"	"1"
+				"icon"			"cappoint_progressbar_teardrop"
+				"iconColor"		"White"
 				
 				"if_multiple_trains"
 				{
-					"xpos"			"0"
-					"ypos"			"0"
-					"wide"			"35"
-					"tall"			"42"
+					"xpos"		"0"
+					"ypos"		"0"
+					"wide"		"35"
+					"tall"		"42"
 				}
 			}
 
 			"ProgressText"
 			{	
-				"ControlName"		"Label"
-				"fieldName"			"ProgressText"
-				"font"				"DefaultSmall"
-				"font_minmode"		"DefaultVerySmall"
-				"xpos"				"9999"
-				"ypos"				"9999"
-				"zpos"				"23"
-				"wide"				"54"
-				"wide_minmode"		"35"
-				"tall"				"40"
-				"tall_minmode"		"28"
-				"autoResize"		"0"
-				"pinCorner"			"0"
-				"visible"			"0"
-				"enabled"			"1"
-				"labelText"			"progress"
-				"dulltext"			"0"
-				"brighttext"		"0"
-				"centerwrap"		"1"
+				"ControlName"	"Label"
+				"fieldName"		"ProgressText"
+				"font"			"DefaultSmall"
+				"font_minmode"	"DefaultVerySmall"
+				"xpos"			"9999"
+				"ypos"			"9999"
+				"zpos"			"23"
+				"wide"			"54"
+				"tall"			"40"
+				"wide_minmode"	"35"
+				"tall_minmode"	"28"
+				"autoResize"	"0"
+				"pinCorner"		"0"
+				"visible"		"0"
+				"enabled"		"1"
+				"labelText"		"progress"
+				"dulltext"		"0"
+				"brighttext"	"0"
+				"centerwrap"	"1"
 				
 				"if_multiple_trains"
 				{
-					"font"			"Cerbetica8"
-					"xpos"			"0"
-					"ypos"			"3"
-					"wide"			"35"
-					"tall"			"28"
+					"font"		"Cerbetica8"
+					"xpos"		"0"
+					"ypos"		"3"
+					"wide"		"35"
+					"tall"		"28"
 				}
 			}
 
 			"Blocked"
 			{
-				"ControlName"		"CIconPanel"
-				"fieldName"			"Blocked"
-				"xpos"				"2"
-				"ypos"				"2"
-				"ypos_minmode"		"2"	
-				"zpos"				"1"
-				"wide"				"50"
-				"wide_minmode"		"31"
-				"tall"				"50"
-				"tall_minmode"		"31"
-				"visible"			"1"
-				"enabled"			"1"
-				"scaleImage"		"1"
-				"icon"				"cappoint_progressbar_blocked"
-				"iconColor"			"255 255 255 255"
+				"ControlName"	"CIconPanel"
+				"fieldName"		"Blocked"
+				"xpos"			"2"
+				"ypos"			"2"
+				"zpos"			"1"
+				"wide"			"50"
+				"tall"			"50"
+				"wide_minmode"	"31"
+				"tall_minmode"	"31"
+				"visible"		"1"
+				"enabled"		"1"
+				"scaleImage"	"1"
+				"icon"			"cappoint_progressbar_blocked"
+				"iconColor"		"White"
 				
 				"if_multiple_trains"
 				{
-					"xpos"			"2"
-					"ypos"			"2"
-					"wide"			"31"
-					"tall"			"31"
+					"xpos"		"2"
+					"ypos"		"2"
+					"wide"		"31"
+					"tall"		"31"
 				}
 			}
 			
@@ -557,8 +576,8 @@
 				"ypos"			"8"
 				"zpos"			"1"
 				"wide"			"30"
-				"wide_minmode"	"20"
 				"tall"			"30"
+				"wide_minmode"	"20"
 				"tall_minmode"	"20"
 				"autoResize"	"0"
 				"pinCorner"		"0"
@@ -571,10 +590,10 @@
 				
 				"if_multiple_trains"
 				{
-					"xpos"			"8"
-					"ypos"			"8"
-					"wide"			"20"
-					"tall"			"20"
+					"xpos"		"8"
+					"ypos"		"8"
+					"wide"		"20"
+					"tall"		"20"
 				}
 			}
 		}