Moved "Playing To", fixed flag sometimes not aligning properly

4 files changed, 497 insertions, 37 deletions

diff --git a/minmode/resource/ui/HudObjectiveFlagPanel-minmode.res b/minmode/resource/ui/HudObjectiveFlagPanel-minmode.res
new file mode 100644
index 0000000..dc6e158
--- /dev/null
+++ b/minmode/resource/ui/HudObjectiveFlagPanel-minmode.res
@@ -0,0 +1,462 @@
+"Resource/UI/HudObjectiveFlagPanel.res"
+{	
+	"ObjectiveStatusFlagPanel"
+	{
+		"ControlName"		"EditablePanel"
+		"fieldName"			"ObjectiveStatusFlagPanel"
+		"xpos"				"0"
+		"ypos"				"0"
+		"zpos"				"1"
+		"wide"				"f0"
+		"tall"				"480"
+		"visible"			"0"
+		"enabled"			"0"
+		
+		"if_hybrid"
+		{
+			"zpos"			"-1"
+		}
+	}
+	
+	"LeftSideBG"
+	{
+		"ControlName"	"ImagePanel"
+		"fieldName"		"LeftSideBG"
+		"xpos"			"c-120"
+		"ypos"			"r30"	
+		"zpos"			"-1"
+		"wide"			"120"
+		"tall"			"100"
+		"visible"		"0"
+		"enabled"		"0"
+		"fillcolor"		"70 130 180 153"
+		"scaleImage"	"1"	
+		
+		"if_hybrid"
+		{
+			"visible"	"0"
+		}
+		
+		"if_mvm"
+		{
+			"visible"	"0"
+		}
+		
+		"if_specialdelivery"
+		{
+			"visible"	"0"
+		}
+	}
+		
+	"RightSideBG"
+	{
+		"ControlName"	"ImagePanel"
+		"fieldName"		"RightSideBG"
+		"xpos"			"c0"
+		"ypos"			"r30"	[$WIN32]
+		"zpos"			"-1"
+		"wide"			"120"
+		"tall"			"100"
+		"visible"		"0"
+		"enabled"		"0"
+		"fillcolor"		"205 92 92 153"
+		"scaleImage"	"1"	
+		
+		"if_hybrid"
+		{
+			"visible"	"0"
+		}
+		
+		"if_mvm"
+		{
+			"visible"	"0"
+		}
+		
+		"if_specialdelivery"
+		{
+			"visible"	"0"
+		}
+	}
+		
+	"OutlineBG"
+	{
+		"ControlName"	"ImagePanel"
+		"fieldName"		"OutlineBG"
+		"xpos"			"c-140"
+		"ypos"			"r75"	[$WIN32]
+		"ypos"			"r96"	[$X360]
+		"zpos"			"2"
+		"wide"			"280"
+		"tall"			"80"
+		"visible"		"0"
+		"enabled"		"0"
+		"image"			"../hud/objectives_flagpanel_bg_outline"
+		"scaleImage"	"1"	
+		
+		"if_hybrid"
+		{
+			"visible"	"0"
+		}
+		
+		"if_mvm"
+		{
+			"visible"	"0"
+		}
+		
+		"if_specialdelivery"
+		{
+			"visible"	"0"
+		}
+	}
+	
+	"BlueScore"
+	{
+		"ControlName"	"CExLabel"
+		"fieldName"		"BlueScore"
+		"xpos"			"c-57"
+		"ypos"			"r33"
+		"zpos"			"8"
+		"wide"			"50"
+		"tall"			"35"
+		"visible"		"1"
+		"enabled"		"1"
+		"textAlignment"	"east"	
+		"labelText"		"%bluescore%"
+		"font"			"Cerbetica40"
+		"fgcolor"		"TanLight"
+		
+		"if_hybrid"
+		{
+			"visible"	"0"
+		}
+		
+		"if_mvm"
+		{
+			"visible"	"0"
+		}
+		
+		"if_specialdelivery"
+		{
+			"visible"	"0"
+		}
+	}	
+		
+	"BlueScoreShadow"
+	{
+		"ControlName"	"CExLabel"
+		"fieldName"		"BlueScoreShadow"
+		"xpos"			"c-56"
+		"ypos"			"r32"
+		"zpos"			"8"
+		"wide"			"50"
+		"tall"			"35"
+		"visible"		"1"
+		"enabled"		"1"
+		"textAlignment"	"east"	
+		"labelText"		"%bluescore%"
+		"font"			"Cerbetica40"
+		"fgcolor"		"70 130 180 153"
+		
+		"if_hybrid"
+		{
+			"visible"	"0"
+		}
+		
+		"if_mvm"
+		{
+			"visible"	"0"
+		}
+		
+		"if_specialdelivery"
+		{
+			"visible"	"0"
+		}
+	}	
+							
+	"RedScore"
+	{
+		"ControlName"	"CExLabel"
+		"fieldName"		"RedScore"
+		"xpos"			"c7"
+		"ypos"			"r33"
+		"zpos"			"8"
+		"wide"			"50"
+		"tall"			"35"
+		"visible"		"1"
+		"enabled"		"1"
+		"textAlignment"	"west"	
+		"labelText"		"%redscore%"
+		"font"			"Cerbetica40"
+		"fgcolor"		"TanLight"		
+		
+		"if_hybrid"
+		{
+			"visible"	"0"
+		}
+		
+		"if_mvm"
+		{
+			"visible"	"0"
+		}
+		
+		"if_specialdelivery"
+		{
+			"visible"	"0"
+		}
+	}	
+		
+	"RedScoreShadow"
+	{
+		"ControlName"	"CExLabel"
+		"fieldName"		"RedScoreShadow"
+		"xpos"			"c8"
+		"ypos"			"r32"
+		"zpos"			"8"
+		"wide"			"50"
+		"tall"			"35"
+		"visible"		"1"
+		"enabled"		"1"
+		"textAlignment"	"west"	
+		"labelText"		"%redscore%"
+		"font"			"Cerbetica40"
+		"fgcolor"		"205 50 50 153"		
+		
+		"if_hybrid"
+		{
+			"visible"	"0"
+		}
+		
+		"if_mvm"
+		{
+			"visible"	"0"
+		}
+		
+		"if_specialdelivery"
+		{
+			"visible"	"0"
+		}
+	}	
+															
+	"OutlineImage"
+	{
+		"ControlName"	"CTFImagePanel"
+		"fieldName"		"OutlineImage"
+		"xpos"			"c-50"
+		"ypos"			"r127"	[$WIN32]
+		"ypos"			"r148"	[$X360]
+		"zpos"			"9"
+		"wide"			"100"
+		"tall"			"50"
+		"visible"		"1"
+		"enabled"		"1"
+		"image"			"../hud/objectives_flagpanel_carried_outline"
+		"scaleImage"	"1"	
+	}		
+	
+	"CarriedImage"
+	{
+		"ControlName"	"ImagePanel"
+		"fieldName"		"CarriedImage"
+		"xpos"			"9999"
+		"ypos"			"9999"	[$WIN32]
+		"zpos"			"10"
+		"wide"			"100"
+		"tall"			"100"
+		"visible"		"0"
+		"enabled"		"1"
+		"image"			"../hud/objectives_flagpanel_carried_red"
+		"scaleImage"	"1"
+		
+		"if_hybrid"
+		{
+			"ypos"		"r142"
+		}
+		
+		"if_specialdelivery"
+		{
+			"visible"	"r142"
+		}
+	}		
+	
+	"PlayingTo"
+	{
+		"ControlName"	"CExLabel"
+		"fieldName"		"PlayingTo"
+		"xpos"			"c-70"	[$WIN32]
+		"ypos"			"26"	[$WIN32]
+		"zpos"			"4"
+		"wide"			"140"	[$WIN32]
+		"tall"			"30"
+		"visible"		"1"
+		"enabled"		"1"
+		"labelText"		"#TF_PlayingTo"
+		"textAlignment"	"center"
+		"dulltext"		"0"
+		"brighttext"	"0"
+		"font"			"Cerbetica12"
+		"fgcolor"		"TanLight"
+		
+		"if_hybrid"
+		{
+			"visible"	"0"
+		}
+		
+		"if_mvm"
+		{
+			"visible"	"0"
+		}
+		
+		"if_specialdelivery"
+		{
+			"visible"	"0"
+		}
+	}
+			
+	"PlayingToBG"
+	{
+		"ControlName"	"ImagePanel"
+		"fieldName"		"PlayingToBG"
+		"xpos"			"9999"	[$WIN32]
+		"ypos"			"9999"	[$WIN32]
+		"zpos"			"3"
+		"wide"			"100"	[$WIN32]
+		"tall"			"20"	[$WIN32]
+		"visible"		"0"
+		"enabled"		"0"
+		"fillcolor"		"0 0 0 100"
+		"scaleImage"	"1"	
+		
+		"if_hybrid"
+		{
+			"visible"	"0"
+		}
+		
+		"if_mvm"
+		{
+			"visible"	"0"
+		}
+		
+		"if_specialdelivery"
+		{
+			"visible"	"0"
+		}
+	}	
+		
+		"BlueFlag"
+	{
+		"ControlName"	"CTFFlagStatus"
+		"fieldName"		"BlueFlag"
+		"xpos"			"c-165"
+		"ypos"			"r80"	[$WIN32]
+		"zpos"			"-1"
+		"wide"			"160"
+		"tall"			"90"
+		"visible"		"1"
+		"enabled"		"1"
+		
+		"if_hybrid"
+		{
+			"visible"	"0"
+			"ypos"		"r103"
+		}
+		
+		"if_hybrid_single"
+		{
+			"xpos"		"c-80"
+			"ypos"		"r103"
+		}
+		
+		"if_hybrid_double"
+		{
+			"xpos"		"c-115"
+			"ypos"		"r103"
+		}
+
+		"if_specialdelivery"
+		{
+			"ypos"		"r75"
+		}
+		
+		"if_no_flags"
+		{
+			"visible"	"0"
+		}
+	}
+			
+	"RedFlag"
+	{
+		"ControlName"	"CTFFlagStatus"
+		"fieldName"		"RedFlag"
+		"xpos"			"c5"
+		"ypos"			"r80"
+		"zpos"			"5"
+		"wide"			"160"
+		"tall"			"90"
+		"visible"		"1"
+		"enabled"		"1"
+				
+		"if_hybrid"
+		{
+			"visible"	"0"
+			"ypos"		"r100"
+		}
+		
+		"if_hybrid_single"
+		{
+			"xpos"		"c-80"
+		}
+		
+		"if_hybrid_double"
+		{
+			"xpos"		"c-45"
+		}
+
+		"if_specialdelivery"
+		{
+			"ypos"		"r75"
+		}
+		
+		"if_no_flags"
+		{
+			"visible"	"0"
+		}
+	}	
+			
+	"CaptureFlag"
+	{
+		"ControlName"	"CTFArrowPanel"
+		"fieldName"		"CaptureFlag"
+		"xpos"			"c-28"
+		"ypos"			"r100"	[$WIN32]
+		"zpos"			"5"
+		"wide"			"56"
+		"tall"			"56"
+		"visible"		"0"
+		"enabled"		"1"
+		
+		"if_hybrid"
+		{
+			"ypos"		"r100"
+		}
+		
+		"if_specialdelivery"
+		{
+			"ypos"		"r100"
+		}
+	}
+	
+	"SpecCarriedImage"
+	{
+		"ControlName"	"ImagePanel"
+		"fieldName"		"SpecCarriedImage"
+		"xpos"			"9999"
+		"ypos"			"9999"	[$WIN32]
+		"zpos"			"10"
+		"wide"			"100"
+		"tall"			"100"
+		"visible"		"0"
+		"enabled"		"0"
+		"image"			"../hud/objectives_flagpanel_carried_red"
+		"scaleImage"	"1"
+	}			
+}
diff --git a/minmode/resource/ui/HudObjectiveFlagPanel.res b/minmode/resource/ui/HudObjectiveFlagPanel.res
index b6aa72a..abdb66e 100644
--- a/minmode/resource/ui/HudObjectiveFlagPanel.res
+++ b/minmode/resource/ui/HudObjectiveFlagPanel.res
@@ -9,8 +9,8 @@
 		"zpos"				"1"

 		"wide"				"f0"

 		"tall"				"480"

-		"visible"			"0"

-		"enabled"			"0"

+		"visible"			"1"

+		"enabled"			"1"

 		

 		"if_hybrid"

 		{

@@ -23,12 +23,12 @@
 		"ControlName"	"ImagePanel"

 		"fieldName"		"LeftSideBG"

 		"xpos"			"c-120"

-		"ypos"			"r30"	

+		"ypos"			"r20"	

 		"zpos"			"-1"

 		"wide"			"120"

-		"tall"			"100"

-		"visible"		"0"

-		"enabled"		"0"

+		"tall"			"14"

+		"visible"		"1"

+		"enabled"		"1"

 		"fillcolor"		"70 130 180 153"

 		"scaleImage"	"1"	

 		

@@ -53,13 +53,13 @@
 		"ControlName"	"ImagePanel"

 		"fieldName"		"RightSideBG"

 		"xpos"			"c0"

-		"ypos"			"r30"	[$WIN32]

+		"ypos"			"r20"	[$WIN32]

 		"zpos"			"-1"

 		"wide"			"120"

-		"tall"			"100"

-		"visible"		"0"

-		"enabled"		"0"

-		"fillcolor"		"205 92 92 153"

+		"tall"			"14"

+		"visible"		"1"

+		"enabled"		"1"

+		"fillcolor"		"205 50 50 153"

 		"scaleImage"	"1"	

 		

 		"if_hybrid"

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

 		"labelText"		"%bluescore%"

 		"font"			"Cerbetica40"

-		"fgcolor"		"70 130 180 153"

+		"fgcolor"		"Black"

 		

 		"if_hybrid"

 		{

@@ -219,7 +219,7 @@
 		"textAlignment"	"west"	

 		"labelText"		"%redscore%"

 		"font"			"Cerbetica40"

-		"fgcolor"		"205 50 50 153"		

+		"fgcolor"		"Black"		

 		

 		"if_hybrid"

 		{

@@ -278,12 +278,12 @@
 		}

 	}		

 	

-	"PlayingTo"

+		"PlayingTo"

 	{

 		"ControlName"	"CExLabel"

 		"fieldName"		"PlayingTo"

 		"xpos"			"c-70"	[$WIN32]

-		"ypos"			"r56"	[$WIN32]

+		"ypos"			"26"	[$WIN32]

 		"zpos"			"4"

 		"wide"			"140"	[$WIN32]

 		"tall"			"30"

@@ -293,7 +293,7 @@
 		"textAlignment"	"center"

 		"dulltext"		"0"

 		"brighttext"	"0"

-		"font"			"Cerbetica16"

+		"font"			"Cerbetica12"

 		"fgcolor"		"TanLight"

 		

 		"if_hybrid"

@@ -310,20 +310,20 @@
 		{

 			"visible"	"0"

 		}

-	}	

+	}

 			

 	"PlayingToBG"

 	{

 		"ControlName"	"ImagePanel"

 		"fieldName"		"PlayingToBG"

-		"xpos"			"9999"	[$WIN32]

-		"ypos"			"9999"	[$WIN32]

+		"xpos"			"c-50"	[$WIN32]

+		"ypos"			"r50"	[$WIN32]

 		"zpos"			"3"

 		"wide"			"100"	[$WIN32]

 		"tall"			"20"	[$WIN32]

-		"visible"		"0"

-		"enabled"		"0"

-		"fillcolor"		"0 0 0 100"

+		"visible"		"1"

+		"enabled"		"1"

+		"fillcolor"		"0 0 0 0"

 		"scaleImage"	"1"	

 		

 		"if_hybrid"

@@ -375,7 +375,6 @@
 		"if_specialdelivery"

 		{

 			"ypos"		"r75"

-			"ypos"		"r103"

 		}

 		

 		"if_no_flags"

@@ -414,7 +413,7 @@
 

 		"if_specialdelivery"

 		{

-			"ypos"		"r70"

+			"ypos"		"r75"

 		}

 		

 		"if_no_flags"

diff --git a/resource/ui/HudObjectiveFlagPanel-minmode.res b/resource/ui/HudObjectiveFlagPanel-minmode.res
index b6aa72a..98517a0 100644
--- a/resource/ui/HudObjectiveFlagPanel-minmode.res
+++ b/resource/ui/HudObjectiveFlagPanel-minmode.res
@@ -283,7 +283,7 @@
 		"ControlName"	"CExLabel"

 		"fieldName"		"PlayingTo"

 		"xpos"			"c-70"	[$WIN32]

-		"ypos"			"r56"	[$WIN32]

+		"ypos"			"26"	[$WIN32]

 		"zpos"			"4"

 		"wide"			"140"	[$WIN32]

 		"tall"			"30"

@@ -293,7 +293,7 @@
 		"textAlignment"	"center"

 		"dulltext"		"0"

 		"brighttext"	"0"

-		"font"			"Cerbetica16"

+		"font"			"Cerbetica12"

 		"fgcolor"		"TanLight"

 		

 		"if_hybrid"

@@ -310,7 +310,7 @@
 		{

 			"visible"	"0"

 		}

-	}	

+	}

 			

 	"PlayingToBG"

 	{

@@ -375,7 +375,6 @@
 		"if_specialdelivery"

 		{

 			"ypos"		"r75"

-			"ypos"		"r103"

 		}

 		

 		"if_no_flags"

@@ -414,7 +413,7 @@
 

 		"if_specialdelivery"

 		{

-			"ypos"		"r70"

+			"ypos"		"r75"

 		}

 		

 		"if_no_flags"

diff --git a/resource/ui/HudObjectiveFlagPanel.res b/resource/ui/HudObjectiveFlagPanel.res
index 36076bf..abdb66e 100644
--- a/resource/ui/HudObjectiveFlagPanel.res
+++ b/resource/ui/HudObjectiveFlagPanel.res
@@ -278,12 +278,12 @@
 		}

 	}		

 	

-	"PlayingTo"

+		"PlayingTo"

 	{

 		"ControlName"	"CExLabel"

 		"fieldName"		"PlayingTo"

 		"xpos"			"c-70"	[$WIN32]

-		"ypos"			"r56"	[$WIN32]

+		"ypos"			"26"	[$WIN32]

 		"zpos"			"4"

 		"wide"			"140"	[$WIN32]

 		"tall"			"30"

@@ -293,7 +293,7 @@
 		"textAlignment"	"center"

 		"dulltext"		"0"

 		"brighttext"	"0"

-		"font"			"Cerbetica16"

+		"font"			"Cerbetica12"

 		"fgcolor"		"TanLight"

 		

 		"if_hybrid"

@@ -310,7 +310,7 @@
 		{

 			"visible"	"0"

 		}

-	}	

+	}

 			

 	"PlayingToBG"

 	{

@@ -342,13 +342,13 @@
 		}

 	}	

 		

-	"BlueFlag"

+		"BlueFlag"

 	{

 		"ControlName"	"CTFFlagStatus"

 		"fieldName"		"BlueFlag"

 		"xpos"			"c-165"

 		"ypos"			"r80"	[$WIN32]

-		"zpos"			"5"

+		"zpos"			"-1"

 		"wide"			"160"

 		"tall"			"90"

 		"visible"		"1"

@@ -374,7 +374,7 @@
 

 		"if_specialdelivery"

 		{

-			"ypos"		"r103"

+			"ypos"		"r75"

 		}

 		

 		"if_no_flags"

@@ -413,7 +413,7 @@
 

 		"if_specialdelivery"

 		{

-			"ypos"		"r103"

+			"ypos"		"r75"

 		}

 		

 		"if_no_flags"