MvM fixes

2 files changed, 394 insertions, 262 deletions

diff --git a/resource/ui/HudMannVsMachineStatus.res b/resource/ui/HudMannVsMachineStatus.res
index 16aaad1..a15f4ba 100644
--- a/resource/ui/HudMannVsMachineStatus.res
+++ b/resource/ui/HudMannVsMachineStatus.res
@@ -1,262 +1,261 @@
-"Resource/UI/HudMannVsMachineStatus.res"

-{	

-	"WaveStatusPanel"

-	{

-		"ControlName"		"CWaveStatusPanel"

-		"fieldName"			"WaveStatusPanel"

-		"xpos"				"c-200"

-		"ypos"				"0"

-		"zpos"				"0"

-		"wide"				"400"

-		"tall"				"67"

-		"ypos_minmode"		"-7"

-		"visible"			"1"

-		"enabled"			"1"

-	}

-	

-	"WaveCompleteSummaryPanel"

-	{

-		"ControlName"		"CWaveCompleteSummaryPanel"

-		"fieldName"			"WaveCompleteSummaryPanel"

-		"xpos"				"c-125"

-		"ypos"				"120"

-		"zpos"				"0"

-		"wide"				"400"

-		"tall"				"400"

-		"visible"			"1"

-		"enabled"			"1"

-	}

-	

-	"TankStatusPanel"

-	{

-		"ControlName"		"CTankStatusPanel"

-		"fieldName"			"TankStatusPanel"

-		"xpos"				"0"

-		"ypos"				"0"

-		"zpos"				"0"

-		"wide"				"200"

-		"tall"				"100"

-		"visible"			"1"

-		"enabled"			"1"

-		

-		"pin_to_sibling"               "WaveStatusPanel"

-		"pin_corner_to_sibling"        "4"          

-		"pin_to_sibling_corner"        "6"  

-	}

-	

-	"CurrencyStatusPanel"

-	{

-		"ControlName"		"CCurrencyStatusPanel"

-		"fieldName"			"CurrencyStatusPanel"

-		"xpos"				"c-190"

-		"ypos"				"r90"

-		"wide"				"100"

-		"tall"				"100"

-		"visible" 			"1"

-		"enabled" 			"1"

-	}

-	

-	"InWorldCurrencyPanel"

-	{

-		"ControlName" 		"CInWorldCurrencyStatus"

-		"fieldName" 		"InWorldCurrencyPanel"

-		"xpos"				"c-190"

-		"ypos" 				"r65"

-		"wide" 				"100"

-		"tall" 				"20"

-		"visible" 			"1"

-		"enabled" 			"1"

-	}

-

-

-

-	"WarningSwoop"

-	{

-		"ControlName"	"CWarningSwoop"

-		"fieldName"		"WarningSwoop"

-		"xpos"			"c-12"

-		"ypos"			"0"

-		"zpos"			"10"

-		"wide"			"24"

-		"tall"			"220"

-		"visible"		"0"

-		"enabled"		"1"

-		"image"			"../sprites/obj_icons/warning_highlight"

-		"scaleImage"	"1"

-		"time"			"0.3"		

-	}

-	

-	"UpgradeLevelContainer"

-	{

-		"ControlName"	"EditablePanel"

-		"fieldName"		"UpgradeLevelContainer"

-		"xpos"			"0"

-		"ypos"			"0"

-		"wide"			"640"

-		"tall"			"480"

-		"visible"		"0"

-					

-		"UpgradeProgressTrack"

-		{

-			"ControlName"	"CMvMBombCarrierProgress"

-			"fieldName"		"UpgradeProgressTrack"

-			"xpos"			"c-50"

-			"ypos"			"r35"

-			"wide"			"640"

-			"tall"			"480"

-			"visible"		"1"	

-		}

-		

-		"UpgradeLevel1" 

-		{

-			"ControlName"	"ImagePanel"

-			"fieldName"		"UpgradeLevel1"

-			"xpos"			"c32"

-			"ypos"			"r24"

-			"wide"			"20"

-			"tall"			"20"

-			"autoResize"	"0"

-			"pinCorner"		"0"

-			"visible"		"1"

-			"enabled"		"1"

-			"tabPosition"	"0"

-			"image"			"../hud/hud_mvm_bomb_upgrade_1_disabled"

-			"scaleImage"	"1"

-		}

-		

-		"UpgradeLevel2" 

-		{

-			"ControlName"	"ImagePanel"

-			"fieldName"		"UpgradeLevel2"

-			"xpos"			"c32"

-			"ypos"			"r42"

-			"wide"			"20"

-			"tall"			"20"

-			"autoResize"	"0"

-			"pinCorner"		"0"

-			"visible"		"1"

-			"enabled"		"1"

-			"tabPosition"	"0"

-			"image"			"../hud/hud_mvm_bomb_upgrade_2_disabled"

-			"scaleImage"	"1"

-		}

-		

-		"UpgradeLevel3" 

-		{

-			"ControlName"	"ImagePanel"

-			"fieldName"		"UpgradeLevel3"

-			"xpos"			"c32"

-			"ypos"			"r60"

-			"wide"			"20"

-			"tall"			"20"

-			"autoResize"	"0"

-			"pinCorner"		"0"

-			"visible"		"1"

-			"enabled"		"1"

-			"tabPosition"	"0"

-			"image"			"../hud/hud_mvm_bomb_upgrade_3_disabled"

-			"scaleImage"	"1"

-		}

-

-		"UpgradeLevelBoss" 

-		{

-			"ControlName"	"ImagePanel"

-			"fieldName"		"UpgradeLevelBoss"

-			"xpos"			"c32"

-			"ypos"			"r46"

-			"wide"			"20"

-			"tall"			"40"

-			"autoResize"	"0"

-			"pinCorner"		"0"

-			"visible"		"0"

-			"enabled"		"1"

-			"tabPosition"	"0"

-			"image"			"../hud/hud_mvm_bomb_upgrade_boss"

-			"scaleImage"	"1"

-		}

-	}

-	

-	"VictorySplash"

-	{

-		"ControlName"		"CVictorySplash"

-		"fieldName"			"VictorySplash"

-		"xpos"				"0"

-		"ypos"				"0"

-		//"zpos"				"102"

-		"wide"				"f0"

-		"tall"				"480"

-		"visible"			"0"

-		"enabled"			"1"			

-	}

-	

-	"VictoryPanelContainer"

-	{

-		"ControlName"	"CMvMVictoryPanelContainer"

-		"fieldName"		"VictoryPanelContainer"

-		"xpos"			"0"

-		"ypos"			"0"

-		"wide"			"f0"

-		"tall"			"480"

-		"visible"		"0"

-	}

-	

-	"WaveLossPanel"

-	{

-		"ControlName"	"CMvMWaveLossPanel"

-		"fieldName"		"WaveLossPanel"

-		"xpos"			"0"

-		"ypos"			"0"

-		"wide"			"f0"

-		"tall"			"480"

-		"visible"		"0"

-	}

-	

-	"ServerChangeMessage"

-	{

-		"ControlName"	"EditablePanel"

-		"fieldName"		"ServerChangeMessage"

-		"xpos"			"0"

-		"ypos"			"0"

-		"wide"			"f0"

-		"tall"			"480"

-		"visible"		"0"

-		

-		"Background"

-		{

-			"ControlName"		"ScalableImagePanel"

-			"fieldName"		"Background"

-			"xpos"			"c-150"

-			"ypos"			"400"

-			"wide"			"300"

-			"tall"			"20"

-			"autoResize"	"0"

-			"pinCorner"		"0"

-			"visible"		"1"

-			"enabled"		"1"

-			"image"			"../hud/color_panel_red"

-

-			"src_corner_height"	"22"				// pixels inside the image

-			"src_corner_width"	"22"

-		

-			"draw_corner_width"	"5"				// screen size of the corners ( and sides ), proportional

-			"draw_corner_height" 	"5"	

-		}

-	

-		"ServerChangeLabel"

-		{

-			"ControlName"	"CExLabel"

-			"fieldName"		"ServerChangeLabel"

-			"font"			"HudFontSmall"

-			"textAlignment"	"center"

-			"labelText"		"%servermessage%"

-			"xpos"			"c-150"

-			"ypos"			"400"

-			"wide"			"300"

-			"tall"			"20"

-			"visible"		"1"

-			"enabled"		"1"

-			"fgcolor"		"tanlight"		

-		}

-	}

-	

-}

+"Resource/UI/HudMannVsMachineStatus.res"
+{	
+	"WaveStatusPanel"
+	{
+		"ControlName"		"CWaveStatusPanel"
+		"fieldName"			"WaveStatusPanel"
+		"xpos"				"c-300"
+		"ypos"				"0"
+		"zpos"				"0"
+		"wide"				"600"
+		"tall"				"67"
+		"visible"			"1"
+		"enabled"			"1"
+	}
+	
+	"WaveCompleteSummaryPanel"
+	{
+		"ControlName"		"CWaveCompleteSummaryPanel"
+		"fieldName"			"WaveCompleteSummaryPanel"
+		"xpos"				"c-125"
+		"ypos"				"120"
+		"zpos"				"0"
+		"wide"				"400"
+		"tall"				"400"
+		"visible"			"1"
+		"enabled"			"1"
+	}
+	
+	"TankStatusPanel"
+	{
+		"ControlName"		"CTankStatusPanel"
+		"fieldName"			"TankStatusPanel"
+		"xpos"				"0"
+		"ypos"				"0"
+		"zpos"				"0"
+		"wide"				"200"
+		"tall"				"100"
+		"visible"			"1"
+		"enabled"			"1"
+		
+		"pin_to_sibling"               "WaveStatusPanel"
+		"pin_corner_to_sibling"        "4"          
+		"pin_to_sibling_corner"        "6"  
+	}
+	
+	"CurrencyStatusPanel"
+	{
+		"ControlName"		"CCurrencyStatusPanel"
+		"fieldName"			"CurrencyStatusPanel"
+		"xpos"				"c-190"
+		"ypos"				"r90"
+		"wide"				"100"
+		"tall"				"100"
+		"visible" 			"1"
+		"enabled" 			"1"
+	}
+	
+	"InWorldCurrencyPanel"
+	{
+		"ControlName" 		"CInWorldCurrencyStatus"
+		"fieldName" 		"InWorldCurrencyPanel"
+		"xpos"				"c-190"
+		"ypos" 				"r65"
+		"wide" 				"100"
+		"tall" 				"20"
+		"visible" 			"1"
+		"enabled" 			"1"
+	}
+
+
+
+	"WarningSwoop"
+	{
+		"ControlName"	"CWarningSwoop"
+		"fieldName"		"WarningSwoop"
+		"xpos"			"c-12"
+		"ypos"			"0"
+		"zpos"			"10"
+		"wide"			"24"
+		"tall"			"220"
+		"visible"		"0"
+		"enabled"		"1"
+		"image"			"../sprites/obj_icons/warning_highlight"
+		"scaleImage"	"1"
+		"time"			"0.3"		
+	}
+	
+	"UpgradeLevelContainer"
+	{
+		"ControlName"	"EditablePanel"
+		"fieldName"		"UpgradeLevelContainer"
+		"xpos"			"0"
+		"ypos"			"0"
+		"wide"			"640"
+		"tall"			"480"
+		"visible"		"0"
+					
+		"UpgradeProgressTrack"
+		{
+			"ControlName"	"CMvMBombCarrierProgress"
+			"fieldName"		"UpgradeProgressTrack"
+			"xpos"			"c-50"
+			"ypos"			"r35"
+			"wide"			"640"
+			"tall"			"480"
+			"visible"		"1"	
+		}
+		
+		"UpgradeLevel1" 
+		{
+			"ControlName"	"ImagePanel"
+			"fieldName"		"UpgradeLevel1"
+			"xpos"			"c32"
+			"ypos"			"r24"
+			"wide"			"20"
+			"tall"			"20"
+			"autoResize"	"0"
+			"pinCorner"		"0"
+			"visible"		"1"
+			"enabled"		"1"
+			"tabPosition"	"0"
+			"image"			"../hud/hud_mvm_bomb_upgrade_1_disabled"
+			"scaleImage"	"1"
+		}
+		
+		"UpgradeLevel2" 
+		{
+			"ControlName"	"ImagePanel"
+			"fieldName"		"UpgradeLevel2"
+			"xpos"			"c32"
+			"ypos"			"r42"
+			"wide"			"20"
+			"tall"			"20"
+			"autoResize"	"0"
+			"pinCorner"		"0"
+			"visible"		"1"
+			"enabled"		"1"
+			"tabPosition"	"0"
+			"image"			"../hud/hud_mvm_bomb_upgrade_2_disabled"
+			"scaleImage"	"1"
+		}
+		
+		"UpgradeLevel3" 
+		{
+			"ControlName"	"ImagePanel"
+			"fieldName"		"UpgradeLevel3"
+			"xpos"			"c32"
+			"ypos"			"r60"
+			"wide"			"20"
+			"tall"			"20"
+			"autoResize"	"0"
+			"pinCorner"		"0"
+			"visible"		"1"
+			"enabled"		"1"
+			"tabPosition"	"0"
+			"image"			"../hud/hud_mvm_bomb_upgrade_3_disabled"
+			"scaleImage"	"1"
+		}
+
+		"UpgradeLevelBoss" 
+		{
+			"ControlName"	"ImagePanel"
+			"fieldName"		"UpgradeLevelBoss"
+			"xpos"			"c32"
+			"ypos"			"r46"
+			"wide"			"20"
+			"tall"			"40"
+			"autoResize"	"0"
+			"pinCorner"		"0"
+			"visible"		"0"
+			"enabled"		"1"
+			"tabPosition"	"0"
+			"image"			"../hud/hud_mvm_bomb_upgrade_boss"
+			"scaleImage"	"1"
+		}
+	}
+	
+	"VictorySplash"
+	{
+		"ControlName"		"CVictorySplash"
+		"fieldName"			"VictorySplash"
+		"xpos"				"0"
+		"ypos"				"0"
+		//"zpos"				"102"
+		"wide"				"f0"
+		"tall"				"480"
+		"visible"			"0"
+		"enabled"			"1"			
+	}
+	
+	"VictoryPanelContainer"
+	{
+		"ControlName"	"CMvMVictoryPanelContainer"
+		"fieldName"		"VictoryPanelContainer"
+		"xpos"			"0"
+		"ypos"			"0"
+		"wide"			"f0"
+		"tall"			"480"
+		"visible"		"0"
+	}
+	
+	"WaveLossPanel"
+	{
+		"ControlName"	"CMvMWaveLossPanel"
+		"fieldName"		"WaveLossPanel"
+		"xpos"			"0"
+		"ypos"			"0"
+		"wide"			"f0"
+		"tall"			"480"
+		"visible"		"0"
+	}
+	
+	"ServerChangeMessage"
+	{
+		"ControlName"	"EditablePanel"
+		"fieldName"		"ServerChangeMessage"
+		"xpos"			"0"
+		"ypos"			"0"
+		"wide"			"f0"
+		"tall"			"480"
+		"visible"		"0"
+		
+		"Background"
+		{
+			"ControlName"		"ScalableImagePanel"
+			"fieldName"		"Background"
+			"xpos"			"c-150"
+			"ypos"			"400"
+			"wide"			"300"
+			"tall"			"20"
+			"autoResize"	"0"
+			"pinCorner"		"0"
+			"visible"		"1"
+			"enabled"		"1"
+			"image"			"../hud/color_panel_red"
+
+			"src_corner_height"	"22"				// pixels inside the image
+			"src_corner_width"	"22"
+		
+			"draw_corner_width"	"5"				// screen size of the corners ( and sides ), proportional
+			"draw_corner_height" 	"5"	
+		}
+	
+		"ServerChangeLabel"
+		{
+			"ControlName"	"CExLabel"
+			"fieldName"		"ServerChangeLabel"
+			"font"			"HudFontSmall"
+			"textAlignment"	"center"
+			"labelText"		"%servermessage%"
+			"xpos"			"c-150"
+			"ypos"			"400"
+			"wide"			"300"
+			"tall"			"20"
+			"visible"		"1"
+			"enabled"		"1"
+			"fgcolor"		"tanlight"		
+		}
+	}
+	
+}
diff --git a/resource/ui/WaveStatusPanel.res b/resource/ui/WaveStatusPanel.res
new file mode 100644
index 0000000..83a5093
--- /dev/null
+++ b/resource/ui/WaveStatusPanel.res
@@ -0,0 +1,133 @@
+"Resource/UI/WaveStatusPanel.res"
+{
+	"Background"
+	{
+		"ControlName"		"ScalableImagePanel"
+		"fieldName"		"Background"
+		"xpos"			"c-300"
+		"ypos"			"2"
+		"zpos"			"-1"
+		"wide"			"600"
+		"tall"			"35"
+		"autoResize"	"0"
+		"pinCorner"		"0"
+		"visible"		"1"
+		"enabled"		"1"
+		"image"			"../HUD/tournament_panel_brown"
+
+		"src_corner_height"	"22"				// pixels inside the image
+		"src_corner_width"	"22"
+	
+		"draw_corner_width"	"0"				// screen size of the corners ( and sides ), proportional
+		"draw_corner_height" 	"0"	
+	}
+	
+	"WaveCountLabel"
+	{
+		"ControlName"	"CExLabel"
+		"fieldName"		"WaveCountLabel"
+		"font"			"CerbeticaBold16"
+		"fgcolor"		"TanLight"
+		"xpos"			"0"
+		"ypos"			"6"
+		"zpos"			"3"
+		"wide"			"600"
+		"tall"			"15"
+		"xpos_minmode"	"0"
+		"wide_minmode"	"600"
+		"visible"		"1"
+		"enabled"		"1"
+		"textAlignment"				"center"
+		"textAlignment_minmode"		"center"
+		"labelText"					"%wave_count%"
+	}
+	
+	"SeparatorBar"
+	{
+		"ControlName"	"Panel"
+		"fieldName"		"SeparatorBar"
+		"xpos"			"0"
+		"ypos"			"0"
+		"zpos"			"3"
+		"wide"			"1"
+		"tall"			"30"
+		"visible"		"0"
+		"enabled"		"1"
+		"scaleImage"	"1"
+		"PaintBackgroundType" "2"
+		"bgcolor_override"	"TanLight"
+		
+		if_verbose
+		{
+			"visible"		"1"
+		}
+	}
+	
+	"SupportLabel"
+	{
+		"ControlName"	"CExLabel"
+		"fieldName"		"SupportLabel"
+		"font"			"CerbeticaBold12"
+		"fgcolor"		"TanLight"
+		"xpos"			"55"
+		"ypos"			"6"
+		"zpos"			"3"
+		"wide"			"60"
+		"tall"			"15"
+		"visible"		"0"
+		"enabled"		"1"
+		"textAlignment"				"west"
+		"labelText"					"#TF_MVM_Support"
+		
+		if_verbose
+		{
+			"visible"		"1"
+		}		
+	}
+	
+	"ProgressBar"
+	{
+		"ControlName"	"ScalableImagePanel"
+		"fieldName"		"ProgressBar"
+		"xpos"			"c-217"
+		"ypos"			"20"
+		"zpos"			"3"
+		"wide"			"178"
+		"tall"			"10"
+		"xpos_minmode"	"c-217"
+		"ypos_minmode"	"20"
+		"wide_minmode"	"178"
+		"visible"		"1"
+		"enabled"		"1"
+		"image"			"../HUD/tournament_panel_blu"
+		
+		"src_corner_height"	"22"				// pixels inside the image
+		"src_corner_width"	"22"
+	
+		"draw_corner_width"	"0"				// screen size of the corners ( and sides ), proportional
+		"draw_corner_height" 	"0"	
+	}
+	
+	"ProgressBarBG"
+	{
+		"ControlName"	"ScalableImagePanel"
+		"fieldName"		"ProgressBarBG"
+		"xpos"			"c-218"
+		"ypos"			"19"
+		"zpos"			"3"
+		"wide"			"180"
+		"tall"			"12"
+		"xpos_minmode"	"c-218"
+		"ypos_minmode"	"19"
+		"wide_minmode"	"180"
+		"visible"		"1"
+		"enabled"		"1"
+		"image"			"../HUD/tournament_panel_tan"
+		
+		"src_corner_height"	"22"				// pixels inside the image
+		"src_corner_width"	"22"
+	
+		"draw_corner_width"	"0"				// screen size of the corners ( and sides ), proportional
+		"draw_corner_height" 	"0"	
+	}
+}