Playtesting Fixes

- Fixed the floating health ID not appearing

17 files changed, 170 insertions, 54 deletions

diff --git a/resource/ui/ControlPointCountdown.res b/resource/ui/ControlPointCountdown.res
index fb28d66..6e3d2d6 100644
--- a/resource/ui/ControlPointCountdown.res
+++ b/resource/ui/ControlPointCountdown.res
@@ -17,7 +17,7 @@
 		"wrap"			"0"

 		"labelText"		"%capturetime%"

 		"textAlignment"	"center"

-		"fgcolor"		"NeutralWhite"

-		"bgcolor"		"NeutralWhite"

+		"fgcolor"		"TanLight"

+		"bgcolor"		"TanLight"

 	}

 }
\ No newline at end of file
diff --git a/resource/ui/HudItemEffectMeter_ParticleCannon.res b/resource/ui/HudItemEffectMeter_ParticleCannon.res
index 451f2c5..76ca31c 100644
--- a/resource/ui/HudItemEffectMeter_ParticleCannon.res
+++ b/resource/ui/HudItemEffectMeter_ParticleCannon.res
@@ -5,7 +5,7 @@
 	"HudItemEffectMeter"

 	{

 		"ypos"					"c93"

-		"ypos_minmode"			"c46"

+		"ypos_minmode"			"c53"

 	}

 	

 	"ItemEffectMeterLabel"

diff --git a/resource/ui/HudItemEffectMeter_Sapper.res b/resource/ui/HudItemEffectMeter_Sapper.res
index ef09bbf..2ca1265 100644
--- a/resource/ui/HudItemEffectMeter_Sapper.res
+++ b/resource/ui/HudItemEffectMeter_Sapper.res
@@ -4,7 +4,7 @@
 {
 	"HudItemEffectMeter"
 	{	
-		"ypos"					"c133"
+		"ypos"					"c83"
 		"ypos_minmode"			"c46"
 	}
 	
diff --git a/resource/ui/HudObjectiveTimePanel.res b/resource/ui/HudObjectiveTimePanel.res
index 5871475..0090d9a 100644
--- a/resource/ui/HudObjectiveTimePanel.res
+++ b/resource/ui/HudObjectiveTimePanel.res
@@ -98,9 +98,9 @@
 		if_match
 		{
 			"font"			"HudFontSmallestBold"
-			"xpos"			"c0"
+			"xpos"			"13"
 			"wide"			"p1"
-			"ypos"			"22"
+			"ypos"			"23"
 			"font"			"Cerbetica10"
 			"proportionaltoparent"	"1"
 		}
diff --git a/resource/ui/HudPlayerHealth.res b/resource/ui/HudPlayerHealth.res
index 31917ba..c9fc1bd 100644
--- a/resource/ui/HudPlayerHealth.res
+++ b/resource/ui/HudPlayerHealth.res
@@ -119,7 +119,7 @@
 		"ControlName"	"EditablePanel"
 		"fieldName"		"PlayerStatusAnchor"
 		"xpos"			"0"
-		"ypos"			"15"
+		"ypos"			"10"
 		"wide"			"23"
 		"tall"			"23"
 		"visible"		"1"
diff --git a/resource/ui/ObjectiveStatusEscort.res b/resource/ui/ObjectiveStatusEscort.res
index 1e77809..d89bb4f 100644
--- a/resource/ui/ObjectiveStatusEscort.res
+++ b/resource/ui/ObjectiveStatusEscort.res
@@ -365,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"
@@ -374,7 +374,7 @@
 			
 			"if_multiple_trains"
 			{
-				"xpos"		"20"
+				"xpos"		"19"
 				"wide"		"5"
 				"tall"		"10"
 			}
@@ -412,19 +412,19 @@
 			"if_multiple_trains"
 			{
 				"font"		"ItemFontAttribSmall"
-				"xpos"		"25"
+				"xpos"		"24"
 				"wide"		"30"
 				"tall"		"10"
 			}			
 			
 			"if_multiple_trains_top"
 			{
-				"ypos"		"46"
+				"ypos"		"45"
 			}
 			
 			"if_multiple_trains_bottom"
 			{
-				"ypos"		"82"
+				"ypos"		"81"
 			}	
 		}
 		
diff --git a/resource/ui/SpectatorGUIHealth.res b/resource/ui/SpectatorGUIHealth.res
index 6dbc974..611538d 100644
--- a/resource/ui/SpectatorGUIHealth.res
+++ b/resource/ui/SpectatorGUIHealth.res
@@ -42,10 +42,10 @@
 		"scaleImage"	"1"
 	}
 	
-	"PlayerStatusHealthValueSpec"
+	"PlayerStatusHealthValue"
 	{
 		"ControlName"	"CExLabel"
-		"fieldName"		"PlayerStatusHealthValueSpec"
+		"fieldName"		"PlayerStatusHealthValue"
 		"xpos"			"2"
 		"ypos"			"19"
 		"zpos"			"5"
@@ -59,10 +59,10 @@
 		"fgcolor"		"Health Normal"
 	}
 	
-	"PlayerStatusHealthValueSpecShadow"
+	"PlayerStatusHealthValueShadow"
 	{
 		"ControlName"	"CExLabel"
-		"fieldName"		"PlayerStatusHealthValueSpecShadow"
+		"fieldName"		"PlayerStatusHealthValueShadow"
 		"xpos"			"-1"
 		"ypos"			"-1"
 		"zpos"			"5"
@@ -75,7 +75,7 @@
 		"font"			"CerbeticaBold16"
 		"fgcolor"		"TransparentBlack"
 		
-		"pin_to_sibling"		"PlayerStatusHealthValueSpec"
+		"pin_to_sibling"		"PlayerStatusHealthValue"
 		"pin_corner_to_sibling"	"PIN_TOPLEFT"
 		"pin_to_sibling_corner"	"PIN_TOPLEFT"
 	}
diff --git a/resource/ui/classloadoutpanel.res b/resource/ui/classloadoutpanel.res
index 5100678..f0b0b70 100644
--- a/resource/ui/classloadoutpanel.res
+++ b/resource/ui/classloadoutpanel.res
@@ -248,7 +248,7 @@
 		"fieldName"		"PassiveAttribsLabel"
 		"font"			"ItemFontAttribLarge"
 		"xpos"			"c-135"
-		"ypos"			"120"
+		"ypos"			"128"
 		"zpos"			"0"	
 		"wide"			"270"
 		"tall"			"240"
@@ -379,7 +379,7 @@
 		"labelText"		""
 		"xpos"			"c-166"
 		"ypos"			"c-180"
-		"zpos"			"10"
+		"zpos"			"2"
 		"wide"			"25"
 		"tall"			"25"
 		"autoResize"	"0"
diff --git a/resource/ui/disguise_menu/HudMenuSpyDisguise.res b/resource/ui/disguise_menu/HudMenuSpyDisguise.res
index ea3e31f..6fb4cfd 100644
--- a/resource/ui/disguise_menu/HudMenuSpyDisguise.res
+++ b/resource/ui/disguise_menu/HudMenuSpyDisguise.res
@@ -13,7 +13,7 @@
 		"enabled"			"1"

 		"scaleImage"		"1"	

 		"icon"				"hud_menu_bg"

-		"iconColor"			"White"

+		"fillcolor"			"0 0 0 200"

 	}

 	

 	"TitleLabel"

diff --git a/resource/ui/econ/BackpackPanel.res b/resource/ui/econ/BackpackPanel.res
index 74c6637..2fb6603 100644
--- a/resource/ui/econ/BackpackPanel.res
+++ b/resource/ui/econ/BackpackPanel.res
@@ -176,13 +176,13 @@
 	{
 		"ControlName"		"CExLabel"
 		"fieldName"			"ClassLabel"
-		"font"				"HudFontMediumSmallBold"
+		"font"				"HudFontMediumSmall"
 		"labelText"			"#ClassBeingEquipped"
 		"textAlignment"		"west"
 		"xpos"				"c-280"
 		"ypos"				"15"
 		"zpos"				"1"
-		"wide"				"210"
+		"wide"				"250"
 		"tall"				"25"
 		"autoResize"		"0"
 		"pinCorner"			"0"
@@ -244,7 +244,7 @@
 		"ControlName"		"CheckButton"
 		"fieldName"			"ShowBaseItemsCheckbox"
 		"labelText"			"#ShowBaseItemsCheckBox"
-		"font"				"Cerbetica10"
+		"font"				"HudFontSmallestBold"
 		"textAlignment"		"east"
 		"xpos"				"c-29"
 		"ypos"				"15"
diff --git a/resource/ui/econ/confirmdialog.res b/resource/ui/econ/confirmdialog.res
new file mode 100644
index 0000000..714c82b
--- /dev/null
+++ b/resource/ui/econ/confirmdialog.res
@@ -0,0 +1,114 @@
+"Resource/UI/ConfirmDialog.res"
+{
+	"ConfirmDialog"
+	{
+		"ControlName"			"Frame"
+		"fieldName"				"ConfirmDialog"
+		"xpos"					"c-150"
+		"ypos"					"140"
+		"wide"					"324"
+		"tall"					"200"
+		"autoResize"			"0"
+		"pinCorner"				"0"
+		"visible"				"1"
+		"enabled"				"1"
+		"tabPosition"			"0"
+		"settitlebarvisible"	"0"
+		"PaintBackgroundType"	"0"
+		"paintbackground"		"1"
+		"paintborder"			"1"
+		"border"				"CyanBorderThick"
+		"bgcolor_override"		"DarkGrey"
+	}
+	
+	"TitleLabel"
+	{
+		"ControlName"			"CExLabel"
+		"fieldName"				"TitleLabel"
+		"font"					"Cerbetica32"
+		"labelText"				"#ConfirmTitle"
+		"textAlignment"			"center"
+		"xpos"					"0"
+		"ypos"					"15"
+		"zpos"					"1"
+		"wide"					"324"
+		"tall"					"23"
+		"autoResize"			"1"
+		"pinCorner"				"0"
+		"visible"				"1"
+		"enabled"				"1"
+	}
+	
+	"ExplanationLabel"
+	{
+		"ControlName"			"CExLabel"
+		"fieldName"				"ExplanationLabel"
+		"font"					"EconFontSmall"
+		"labelText"				"%text%"
+		"textAlignment"			"center"
+		"xpos"					"40"
+		"ypos"					"50"
+		"zpos"					"1"
+		"wide"					"324"
+		"tall"					"170"
+		"autoResize"			"1"
+		"pinCorner"				"0"
+		"visible"				"1"
+		"enabled"				"1"
+	}
+	
+	"CancelButton"
+	{
+		"ControlName"			"CExButton"
+		"fieldName"				"CancelButton"
+		"xpos"					"190"
+		"ypos"					"165"
+		"zpos"					"20"
+		"wide"					"124"
+		"tall"					"20"
+		"autoResize"			"0"
+		"pinCorner"				"0"
+		"visible"				"1"
+		"enabled"				"1"
+		"tabPosition"			"0"
+		"labelText"				"#GameUI_CancelBold"
+		"font"					"HudFontSmall"
+		"textAlignment"			"center"
+		"textinsetx"			"50"
+		"dulltext"				"0"
+		"brighttext"			"0"
+		"Command"				"cancel"
+		"sound_depressed"		"UI/buttonclick.wav"
+		"sound_released"		"UI/buttonclickrelease.wav"
+		"border_default"		"ButtonHover"
+		"border_armed"			"ButtonHover"
+	}
+	
+	"ConfirmButton"
+	{
+		"ControlName"			"CExButton"
+		"fieldName"				"ConfirmButton"
+		"xpos"					"10"
+		"ypos"					"165"
+		"zpos"					"20"
+		"wide"					"175"
+		"tall"					"20"
+		"default"				"1"
+		"autoResize"			"0"
+		"pinCorner"				"0"
+		"visible"				"1"
+		"enabled"				"1"
+		"tabPosition"			"0"
+		"labelText"				"#ConfirmButtonText"
+		"font"					"HudFontSmall"
+		"textAlignment"			"center"
+		"textinsetx"			"50"
+		"dulltext"				"0"
+		"brighttext"			"0"
+		"Command"				"confirm"
+		"sound_depressed"		"UI/buttonclick.wav"
+		"sound_released"		"UI/buttonclickrelease.wav"
+		"border_default"		"ButtonHover"
+		"border_armed"			"ButtonHover"
+	}
+}
\ No newline at end of file
diff --git a/resource/ui/hudmenutauntselection.res b/resource/ui/hudmenutauntselection.res
index d89c941..5e7dd7c 100644
--- a/resource/ui/hudmenutauntselection.res
+++ b/resource/ui/hudmenutauntselection.res
@@ -13,7 +13,7 @@
 		"enabled"		"1"
 		"scaleImage"	"1"	
 		"icon"			"hud_menu_bg"
-		"fillcolor"		"0 0 0 100"
+		"fillcolor"		"0 0 0 200"
 	}
 	
 	"Divider"
diff --git a/resource/ui/itemselectionpanel.res b/resource/ui/itemselectionpanel.res
index ba9b773..61802f9 100644
--- a/resource/ui/itemselectionpanel.res
+++ b/resource/ui/itemselectionpanel.res
@@ -307,8 +307,8 @@
 	{
 		"ControlName"	"CExButton"
 		"fieldName"		"ShowSelection"
-		"xpos"			"c100"
-		"ypos"			"340"
+		"xpos"			"c-288"
+		"ypos"			"290"
 		"zpos"			"20"
 		"wide"			"200"
 		"tall"			"25"
diff --git a/resource/ui/matchmakingdashboard.res b/resource/ui/matchmakingdashboard.res
index 3263af5..7aa5fcb 100644
--- a/resource/ui/matchmakingdashboard.res
+++ b/resource/ui/matchmakingdashboard.res
@@ -287,6 +287,7 @@
 				"visible"		"1"
 				"proportionaltoparent"	"1"
 				"border"		"ReplayDefaultBorder"
+				"bgcolor_override"	"DarkGrey"
 			}
 
 			"QueueLogoButton"
@@ -432,7 +433,7 @@
 				"armedFgColor_override" "235 226 202 255"
 				"depressedFgColor_override" "TanDarker"
 				"image_drawcolor"	"TextColor"
-				"image_armedcolor"	"LightRed"
+				"image_armedcolor"	"255 0 0 255"
 				
 				"SubImage"
 				{
@@ -489,6 +490,7 @@
 				"visible"		"1"
 				"proportionaltoparent"	"1"
 				"border"		"ReplayDefaultBorder"
+				"bgcolor_override"	"DarkGrey"
 			}
 
 			"PromptText"
@@ -692,8 +694,8 @@
 			"sound_depressed"	"UI/buttonclick.wav"
 			"sound_released"	"UI/buttonclickrelease.wav"
 
-		//	"armedBgColor_override"		"CreditsGreen"
-		//	"defaultBgColor_override"	"GreenSolid"
+			"armedBgColor_override"		"170 221 183 155"
+			"defaultBgColor_override"	"170 221 183 55"
 
 			"defaultFgColor_override"	"TanLight"
 			"armedFgColor_override"		"TanLight"
diff --git a/resource/ui/winpanel.res b/resource/ui/winpanel.res
index a4e35e7..1c51b4e 100644
--- a/resource/ui/winpanel.res
+++ b/resource/ui/winpanel.res
@@ -64,11 +64,11 @@
 		{

 			"ControlName"		"CExLabel"

 			"fieldName"			"BlueTeamScore"

-			"font"				"Cerbetica44"

+			"font"				"Cerbetica48"

 			"labelText"			"%blueteamscore%"

 			"textAlignment"		"east"

 			"xpos"				"15"

-			"ypos"				"-19"

+			"ypos"				"-12"

 			"zpos"				"3"

 			"wide"				"80"

 			"tall"				"70"

@@ -81,12 +81,12 @@
 		{

 			"ControlName"		"CExLabel"

 			"fieldName"			"BlueTeamScoreDropshadow"

-			"font"				"Cerbetica44"

+			"font"				"Cerbetica48"

 			"fgcolor"			"TransparentBlack"

 			"labelText"			"%blueteamscore%"

 			"textAlignment"		"east"

-			"xpos"				"-2"

-			"ypos"				"-2"

+			"xpos"				"-1"

+			"ypos"				"-1"

 			"zpos"				"3"

 			"wide"				"80"

 			"tall"				"70"

@@ -138,11 +138,11 @@
 		{

 			"ControlName"		"CExLabel"

 			"fieldName"			"RedTeamScore"

-			"font"				"Cerbetica44"

+			"font"				"Cerbetica48"

 			"labelText"			"%redteamscore%"

 			"textAlignment"		"west"

 			"xpos"				"105"

-			"ypos"				"-19"

+			"ypos"				"-12"

 			"zpos"				"3"

 			"wide"				"80"

 			"tall"				"70"

@@ -155,11 +155,11 @@
 		{

 			"ControlName"		"CExLabel"

 			"fieldName"			"RedTeamScoreDropshadow"

-			"font"				"Cerbetica44"

+			"font"				"Cerbetica48"

 			"labelText"			"%redteamscore%"

 			"textAlignment"		"west"

-			"xpos"				"-2"

-			"ypos"				"-2"

+			"xpos"				"-1"

+			"ypos"				"-1"

 			"zpos"				"2"

 			"wide"				"80"

 			"tall"				"70"

diff --git a/scripts/HudAnimations_custom.txt b/scripts/HudAnimations_custom.txt
index afb3d50..d69e63d 100644
--- a/scripts/HudAnimations_custom.txt
+++ b/scripts/HudAnimations_custom.txt
@@ -1,10 +1,10 @@
 // Bonus Health Pulse
 event HudHealthBonusPulse
 {
-	Animate	PlayerStatusHealthBonusImage 		Alpha	"255"					Linear 0.0 0.2
-	Animate	PlayerStatusHealthBonusImage 		Alpha	"0"						Linear 0.2 0.4
+	Animate	PlayerStatusHealthBonusImage 		Alpha	"255"				Linear 0.0 0.2
+	Animate	PlayerStatusHealthBonusImage 		Alpha	"0"					Linear 0.2 0.4
 	
-	Animate PlayerStatusHealthValue 		 	FgColor "Health Buff" 			Accel 0.0 0.0
+	Animate PlayerStatusHealthValue				FgColor "Health Buff" 		Accel 0.0 0.0
 	Animate PlayerStatusHealthValueSpectator 	FgColor "Health Buff" 		Accel 0.0 0.0
 	Animate PlayerStatusHealthValueFreezePanel 	FgColor "Health Buff" 		Accel 0.0 0.0
 
@@ -13,7 +13,7 @@ event HudHealthBonusPulse
 
 event HudHealthBonusPulseStop
 {
-	Animate PlayerStatusHealthValue 			FgColor "Health Normal" 		Accel 0.0 0.0
+	Animate PlayerStatusHealthValue				FgColor "Health Normal" 	Accel 0.0 0.0
 	Animate PlayerStatusHealthValueSpectator 	FgColor "Health Normal" 	Accel 0.0 0.0
 	Animate PlayerStatusHealthValueFreezePanel 	FgColor "Health Normal" 	Accel 0.0 0.0
 	
@@ -24,10 +24,10 @@ event HudHealthBonusPulseStop
 // Low Health Pulse
 event HudHealthDyingPulse
 {
-	Animate	PlayerStatusHealthBonusImage 		Alpha	"255"					Linear 0.0 0.2
-	Animate	PlayerStatusHealthBonusImage 		Alpha	"0"						Linear 0.2 0.2
+	Animate	PlayerStatusHealthBonusImage 		Alpha	"255"				Linear 0.0 0.2
+	Animate	PlayerStatusHealthBonusImage 		Alpha	"0"					Linear 0.2 0.2
 	
-	Animate PlayerStatusHealthValue 		 	FgColor	"Health Hurt" 			Accel 0.0 0.0
+	Animate PlayerStatusHealthValue				FgColor	"Health Hurt" 		Accel 0.0 0.0
 	Animate PlayerStatusHealthValueSpectator 	FgColor "Health Hurt" 		Accel 0.0 0.0
 	Animate PlayerStatusHealthValueFreezePanel	FgColor "Health Hurt" 		Accel 0.0 0.0
 	
@@ -36,7 +36,7 @@ event HudHealthDyingPulse
 
 event HudHealthDyingPulseStop
 {
-	Animate PlayerStatusHealthValue 			FgColor	"Health Normal" 		Accel 0.0 0.0
+	Animate PlayerStatusHealthValue				FgColor	"Health Normal" 	Accel 0.0 0.0
 	Animate PlayerStatusHealthValueSpectator 	FgColor "Health Normal" 	Accel 0.0 0.0
 	Animate PlayerStatusHealthValueFreezePanel	FgColor "Health Normal" 	Accel 0.0 0.0
 	
@@ -131,8 +131,8 @@ event HudMedicChargedStop
 // Hitmarker Pulse
 event DamagedPlayer 
 {
-//	StopEvent HitMarker 					0.0
-//	RunEvent HitMarker 						0.01
+//StopEvent HitMarker 					0.0
+//RunEvent HitMarker 						0.01
 }
 
 event HitMarker
diff --git a/scripts/hudlayout.res b/scripts/hudlayout.res
index cd0ea2f..6a7ef54 100644
--- a/scripts/hudlayout.res
+++ b/scripts/hudlayout.res
@@ -937,7 +937,7 @@
 		"ypos_minmode"			"315"
 		"zpos"					"1"
 		"wide"	 				"600"
-		"tall"	 				"47"
+		"tall"	 				"50"
 		"priority"				"100"
 	}
 	
@@ -950,7 +950,7 @@
 		"ypos"					"270"
 		"zpos"					"1"
 		"wide"	 				"600"
-		"tall"	 				"47"
+		"tall"	 				"50"
 		"priority"				"40"
 		"x_offset" 				"20"
 		"y_offset" 				"20"
@@ -962,11 +962,11 @@
 		"visible" 				"0"
 		"enabled" 				"1"
 		"xpos"					"c-100"
-		"ypos"					"276"
+		"ypos"					"c100"
 		"ypos_minmode"			"290"
 		"zpos"					"1"
 		"wide"					"600"
-		"tall"					"45"
+		"tall"					"50"
 		"priority"				"35"
 	}