From 620aa955ea3f77cc4d339f77be20616c201bf3d3 Mon Sep 17 00:00:00 2001
From: Jofre Problem? <70734327+Jofre-Problem@users.noreply.github.com>
Date: Tue, 5 Jul 2022 12:47:37 -0500
Subject: [PATCH] fix

---
 _jofrenew/resource/ui/spectatorguihealth.res | 201 ++++++++++---------
 1 file changed, 108 insertions(+), 93 deletions(-)

diff --git a/_jofrenew/resource/ui/spectatorguihealth.res b/_jofrenew/resource/ui/spectatorguihealth.res
index 64675c3a..a6b7d389 100644
--- a/_jofrenew/resource/ui/spectatorguihealth.res
+++ b/_jofrenew/resource/ui/spectatorguihealth.res
@@ -2,133 +2,148 @@
 {
 	"PlayerStatusHealthImage"
 	{
-		"ControlName"	"ImagePanel"
-		"fieldName"		"PlayerStatusHealthImage"
-		"xpos"			"9"
-		"ypos"			"9"
-		"zpos"			"3"
-		"wide"			"0"
-		"tall"			"0"
-		"visible"			"1"
-		"enabled"			"1"
-		"scaleImage"	"1"
-	}
+		"ypos"			"r-9999"
+	}		
 	"PlayerStatusHealthImageBG"
 	{
-		"ControlName"	"ImagePanel"
-		"fieldName"		"PlayerStatusHealthImageBG"
-		"xpos"			"8"
-		"ypos"			"8"
-		"zpos"			"3"
-		"wide"			"0"
-		"tall"			"22"
-		"visible"		"1"
-		"enabled"		"1"
-		"image"			"../hud/health_bg"
-		"scaleImage"	"1"
-	}
+"ypos"			"r-9999"
+	}	
 	"BuildingStatusHealthImageBG"
 	{
-		"ControlName"	"ImagePanel"
-		"fieldName"		"BuildingStatusHealthImageBG"
-		"xpos"			"9999"
-		"xpos"			"5"
-		"zpos"			"2"
-		"wide"			"0"
-		"tall"			"20"
-		"visible"			"1"
-		"enabled"			"1"
-	}
+	"ypos"		"r-290"
+	}	
 	"PlayerStatusHealthBonusImage"
 	{
-		"ControlName"	"ImagePanel"
-		"fieldName"		"PlayerStatusHealthBonusImage"
-		"xpos"			"999"
-		"ypos"			"9"
-		"zpos"			"3"
-		"wide"			"0"
+	"ypos"			"r-9999"
+	}
+	"PlayerStatusHealthValueID"
+	{
+		"ControlName"	"CExLabel"
+		"fieldName"		"PlayerStatusHealthValueID"
+		"xpos"			"0"
+		"ypos"			"11"
+		"zpos"			"5"
+		"wide"			"p0.768"
 		"tall"			"20"
-		"visible"		"0"
+		"visible"		"1"
 		"enabled"		"1"
-		"image"			"../hud/health_over_bg"
-		"scaleImage"	"1"
+		"labelText"		"%Health%"
+		"textAlignment"	"center"	
+		"font"			"Killfeed"
+		"fgcolor"		"W_ColorIcons1"
 	}
-	"HurtBG"
+	"PlayerStatusHealthValueID2"
 	{
-		"ControlName"	"ImagePanel"
-		"fieldName"		"HurtBG"
-		"xpos"			"0"
-		"ypos"			"0"
-		"zpos"			"3"
-		"wide"			"32"
-		"alpha"			"0"
-		"tall"			"16"
+		"ControlName"	"CExLabel"
+		"fieldName"		"PlayerStatusHealthValueID2"
+		"xpos"			"-40"
+		"ypos"			"420"
+		"zpos"			"5"
+		"wide"			"655"
+		"tall"			"15"
 		"visible"		"1"
 		"enabled"		"1"
-		"fillcolor"		"softred"
+		"labelText"		"%Health%"
+		"textAlignment"	"center"	
+		"font"			"Killfeed"
+		"fgcolor"		"W_ColorIcons1"
 	}
-	"BuffBG"
+	"PlayerStatusHealthValueS"
 	{
-		"ControlName"	"ImagePanel"
-		"fieldName"		"BuffBG"
+		"ControlName"	"CExLabel"
+		"fieldName"		"PlayerStatusHealthValueS"
 		"xpos"			"0"
 		"ypos"			"0"
-		"zpos"			"3"
-		"wide"			"32"
-		"alpha"			"0"
-		"tall"			"16"
+		"zpos"			"5"
+		"wide"			"654"
+		"tall"			"20"
 		"visible"		"1"
-		"enabled"		"1"
-		"fillcolor"		"softgreen" //use softgreen for green buffs
-	}
-
-	"PlayerStatusHealthValueMain2"
+		//"enabled"		"1"
+		"labelText"		"%Health%"
+		"textAlignment"	"center"	
+		"font"			"KillfeedBlur"
+		"fgcolor"		"0 0 0 255"
+	"pin_to_sibling"	"PlayerStatusHealthValueID"
+	}	
+	"PlayerStatusHealthValue2S"
+	{
+		"ControlName"	"CExLabel"
+		"fieldName"		"PlayerStatusHealthValue2S"
+		"xpos"			"0"
+		"ypos"			"0"
+		"zpos"			"5"
+		"wide"			"655"
+		"tall"			"15"
+		"visible"		"1"
+		//"enabled"		"1"
+		"labelText"		"%Health%"
+		"textAlignment"	"center"	
+		"font"			"KillfeedBlur"
+		"fgcolor"		"0 0 0 255"
+		"pin_to_sibling"	"PlayerStatusHealthValueID2"
+	}	
+	"PlayerStatusHealthValueID3"
 	{
-		"ControlName"		"Label"
-		"fieldName"		"PlayerStatusHealthValueMain2"
-		"xpos"			"0"//-9
-		"ypos"			"0"//11
-		"zpos"			"8"
-		"wide"			"32"
-		"tall"			"17"
+		"ControlName"	"CExLabel"
+		"fieldName"		"PlayerStatusHealthValueID3"
+		"xpos"			"0"
+		"ypos"			"1010"
+		"zpos"			"5"
+		"wide"			"40"
+		"tall"			"24"
 		"visible"		"1"
 		"enabled"		"1"
-		"labeltext"		"%Health%"
-		"font"			"productbold16"
-		"textAlignment"		"center"
-		"fgcolor_override"		"220 220 220 255"
+		"labelText"		"%Health%"
+		"textAlignment"	"center"	
+		"font"			"SpecTargetIDhp"
+		"fgcolor"		"W_ColorIcons1"
 	}
-	"PlayerStatusHealthValueTGS"
+	"PlayerStatusHealthValue3S"
 	{
-		"ControlName"		"Label"
-		"fieldName"		"PlayerStatusHealthValueTGS"
-		"xpos"			"1"//-9
-		"ypos"			"1"//11
-		"zpos"			"8"
-		"wide"			"30"
-		"tall"			"0"
+		"ControlName"	"CExLabel"
+		"fieldName"		"PlayerStatusHealthValue3S"
+		"xpos"			"0"
+		"ypos"			"1011"
+		"zpos"			"5"
+		"wide"			"40"
+		"tall"			"24"
 		"visible"		"1"
 		"enabled"		"1"
-		"labeltext"		"%Health%"
-		"font"			"bold14"
-		"textAlignment"		"center"
-		"fgcolor_override"		"0 0 0 140"
-	}
+		"labelText"		"%Health%"
+		"textAlignment"	"center"	
+		"font"			"SpecTargetIDhp"
+		"fgcolor"		"0 0 0 100"
+	}			
 	"PlayerStatusPlayerLevel"
 	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"PlayerStatusPlayerLevel"
 		"xpos"			"8"
 		"xpos_minmode"	"0"
-		"ypos"			"9"	[$WIN32]
-		"ypos"			"0"	[$X360]
+		"ypos"			"9"
 		"zpos"			"5"
 		"wide"			"16"
 		"tall"			"12"
 		"visible"		"0"
 		"enabled"		"1"
-		"textAlignment"	"center"
+		"textAlignment"	"center"	
 		"font"			"ScoreboardVerySmall"
 		"fgcolor"		"TFOrange"
-	}
-}
+	}	
+	"PlayerStatusHealthValue"
+	{
+		"ControlName"	"CExLabel"
+		"fieldName"		"PlayerStatusHealthValue"
+		"xpos"			"0"
+		"ypos"			"11"
+		"zpos"			"5"
+		"wide"			"40"
+		"tall"			"0"
+		"visible"		"1"
+		"enabled"		"1"
+		"labelText"		"%Health%"
+		"textAlignment"	"west"	
+		"font"			"Killfeed"
+		"fgcolor"		"W_ColorIcons1"
+	}							
+}
\ No newline at end of file