Merge pull request #126 from raysfire/dev

v2019.0406

1 files changed, 118 insertions, 114 deletions

diff --git a/customizations/Player Health/HudPlayerHealth-default.res b/customizations/Player Health/HudPlayerHealth-default.res
index d0f62fd..c53bb41 100644
--- a/customizations/Player Health/HudPlayerHealth-default.res
+++ b/customizations/Player Health/HudPlayerHealth-default.res
@@ -1,5 +1,5 @@
 "Resource/UI/HudPlayerHealth.res"
-{	
+{
 	// Player Health Data
 	"HudPlayerHealth"
 	{
@@ -12,11 +12,11 @@
 		"wide"			"250"
 		"tall"			"120"
 		"visible"		"1"
-		"enabled"		"1"	
-		"HealthBonusPosAdj"	"35"
-		"HealthDeathWarning"	"0.49"
+		"enabled"		"1"
+		"HealthBonusPosAdj"			"35"
+		"HealthDeathWarning"		"0.49"
 		"HealthDeathWarningColor"	"HUDDeathWarning"
-	}	
+	}
 
 	"PlayerStatusHealthImage"
 	{
@@ -32,7 +32,7 @@
 		"enabled"		"1"
 		"scaleImage"	"1"
 		"alpha"			"0"
-	}		
+	}
 
 	"PlayerStatusHealthImageBG"
 	{
@@ -42,8 +42,8 @@
 		"tall"			"0"
 		"visible"		"0"
 		"enabled"		"0"
-	}	
-
+	}
+	
 	"PlayerStatusHealthBonusImage"
 	{
 		"ControlName"	"ImagePanel"
@@ -61,9 +61,9 @@
 		"visible"		"0"
 		"enabled"		"1"
 		"image"			"../hud/health_over_bg"
-		"scaleImage"	"1"	
+		"scaleImage"	"1"
 	}
-
+	
 	"PlayerStatusHealthValue"
 	{
 		"ControlName"	"CExLabel"
@@ -76,18 +76,18 @@
 		"visible"		"1"
 		"enabled"		"1"
 		"labelText"		"%Health%"
-		"textAlignment"	"center"	
+		"textAlignment"	"center"
 		"font"			"CerbeticaBold56"
 		"font_minmode"	"CerbeticaBold32"
 		"fgcolor"		"Health Normal"
 	}
-
+	
 	"PlayerStatusHealthValueShadow"
 	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"PlayerStatusHealthValueShadow"
-		"xpos"			"2"
-		"ypos"			"2"
+		"xpos"			"-2"
+		"ypos"			"-2"
 		"zpos"			"5"
 		"wide"			"300"
 		"tall"			"100"
@@ -98,8 +98,12 @@
 		"font"			"CerbeticaBold56"
 		"font_minmode"	"CerbeticaBold32"
 		"fgcolor"		"TransparentBlack"
+		
+		"pin_to_sibling"		"PlayerStatusHealthValue"
+		"pin_corner_to_sibling"	"PIN_TOPLEFT"
+		"pin_to_sibling_corner"	"PIN_TOPLEFT"
 	}
-
+	
 	"PlayerStatusMaxHealthValue"
 	{
 		"ControlName"	"CExLabel"
@@ -115,13 +119,13 @@
 		"ControlName"	"EditablePanel"
 		"fieldName"		"PlayerStatusAnchor"
 		"xpos"			"0"
-		"ypos"			"15"
-		"wide"			"24"
-		"tall"			"24"
+		"ypos"			"10"
+		"wide"			"23"
+		"tall"			"23"
 		"visible"		"1"
 		"enabled"		"1"
 	}
-
+	
 	"PlayerStatusBleedImage"
 	{
 		"ControlName"	"ImagePanel"
@@ -129,8 +133,8 @@
 		"xpos"			"0"
 		"ypos"			"0"
 		"zpos"			"7"
-		"wide"			"24"
-		"tall"			"24"
+		"wide"			"23"
+		"tall"			"23"
 		"visible"		"1"
 		"enabled"		"1"
 		"scaleImage"	"1"	
@@ -139,8 +143,8 @@
 		"pin_to_sibling"		"PlayerStatusAnchor"
 		"pin_corner_to_sibling"	"1"
 		"pin_to_sibling_corner"	"1"
-	}		
-
+	}
+	
 	"PlayerStatusMilkImage"
 	{
 		"ControlName"	"ImagePanel"
@@ -148,8 +152,8 @@
 		"xpos"			"0"
 		"ypos"			"0"
 		"zpos"			"7"
-		"wide"			"24"
-		"tall"			"24"
+		"wide"			"23"
+		"tall"			"23"
 		"visible"		"1"
 		"enabled"		"1"
 		"scaleImage"	"1"	
@@ -159,7 +163,7 @@
 		"pin_corner_to_sibling"	"1"
 		"pin_to_sibling_corner"	"1"
 	}
-
+	
 	"PlayerStatusGasImage"
 	{
 		"ControlName"	"ImagePanel"
@@ -167,8 +171,8 @@
 		"xpos"			"0"
 		"ypos"			"0"
 		"zpos"			"7"
-		"wide"			"24"
-		"tall"			"24"
+		"wide"			"23"
+		"tall"			"23"
 		"visible"		"1"
 		"enabled"		"1"
 		"scaleImage"	"1"	
@@ -178,7 +182,7 @@
 		"pin_corner_to_sibling"	"1"
 		"pin_to_sibling_corner"	"1"
 	}
-
+	
 	"PlayerStatusMarkedForDeathImage"
 	{
 		"ControlName"	"ImagePanel"
@@ -186,8 +190,8 @@
 		"xpos"			"0"
 		"ypos"			"0"
 		"zpos"			"7"
-		"wide"			"24"
-		"tall"			"24"
+		"wide"			"23"
+		"tall"			"23"
 		"visible"		"1"
 		"enabled"		"1"
 		"scaleImage"	"1"	
@@ -197,7 +201,7 @@
 		"pin_corner_to_sibling"	"1"
 		"pin_to_sibling_corner"	"1"
 	}
-
+	
 	"PlayerStatusMarkedForDeathSilentImage"
 	{
 		"ControlName"	"ImagePanel"
@@ -205,8 +209,8 @@
 		"xpos"			"0"
 		"ypos"			"0"
 		"zpos"			"7"
-		"wide"			"24"
-		"tall"			"24"
+		"wide"			"23"
+		"tall"			"23"
 		"visible"		"1"
 		"enabled"		"1"
 		"scaleImage"	"1"	
@@ -219,56 +223,56 @@
 	
 	"PlayerStatus_MedicUberBulletResistImage"
 	{
-		"ControlName" 	"ImagePanel"
-		"fieldName" 	"PlayerStatus_MedicUberBulletResistImage"
+		"ControlName"	"ImagePanel"
+		"fieldName"		"PlayerStatus_MedicUberBulletResistImage"
 		"xpos"			"0"
 		"ypos"			"0"
 		"zpos"			"7"
-		"wide"			"24"
-		"tall"			"24"
+		"wide"			"23"
+		"tall"			"23"
 		"visible"		"1"
 		"enabled"		"1"
-		"scaleImage"	"1"	
+		"scaleImage"	"1"
 		"image"			"../HUD/defense_buff_bullet_blue"
-		"fgcolor" 		"TanDark"
+		"fgcolor"		"TanDark"
 		"pin_to_sibling"		"PlayerStatusAnchor"
 		"pin_corner_to_sibling"	"1"
 		"pin_to_sibling_corner"	"1"
-	}	
+	}
 	
 	"PlayerStatus_MedicUberBlastResistImage"
 	{
-		"ControlName" 	"ImagePanel"
-		"fieldName" 	"PlayerStatus_MedicUberBlastResistImage"
+		"ControlName"	"ImagePanel"
+		"fieldName"		"PlayerStatus_MedicUberBlastResistImage"
 		"xpos"			"0"
 		"ypos"			"0"
 		"zpos"			"7"
-		"wide"			"24"
-		"tall"			"24"
+		"wide"			"23"
+		"tall"			"23"
 		"visible"		"1"
 		"enabled"		"1"
-		"scaleImage"	"1"	
+		"scaleImage"	"1"
 		"image"			"../HUD/defense_buff_explosion_blue"
-		"fgcolor" 		"TanDark"
+		"fgcolor"		"TanDark"
 		"pin_to_sibling"		"PlayerStatusAnchor"
 		"pin_corner_to_sibling"	"1"
 		"pin_to_sibling_corner"	"1"
-	}	
+	}
 	
 	"PlayerStatus_MedicUberFireResistImage"
 	{
-		"ControlName" 	"ImagePanel"
-		"fieldName" 	"PlayerStatus_MedicUberFireResistImage"
+		"ControlName"	"ImagePanel"
+		"fieldName"		"PlayerStatus_MedicUberFireResistImage"
 		"xpos"			"0"
 		"ypos"			"0"
 		"zpos"			"7"
-		"wide"			"24"
-		"tall"			"24"
+		"wide"			"23"
+		"tall"			"23"
 		"visible"		"1"
 		"enabled"		"1"
-		"scaleImage"	"1"	
+		"scaleImage"	"1"
 		"image"			"../HUD/defense_buff_fire_blue"
-		"fgcolor" 		"TanDark"
+		"fgcolor"		"TanDark"
 		"pin_to_sibling"		"PlayerStatusAnchor"
 		"pin_corner_to_sibling"	"1"
 		"pin_to_sibling_corner"	"1"
@@ -276,56 +280,56 @@
 	
 	"PlayerStatus_MedicSmallBulletResistImage"
 	{
-		"ControlName" 	"ImagePanel"
-		"fieldName" 	"PlayerStatus_MedicSmallBulletResistImage"
+		"ControlName"	"ImagePanel"
+		"fieldName"		"PlayerStatus_MedicSmallBulletResistImage"
 		"xpos"			"0"
 		"ypos"			"0"
 		"zpos"			"7"
-		"wide"			"24"
-		"tall"			"24"
+		"wide"			"23"
+		"tall"			"23"
 		"visible"		"1"
 		"enabled"		"1"
-		"scaleImage"	"1"	
+		"scaleImage"	"1"
 		"image"			"../HUD/defense_buff_bullet_blue"
-		"fgcolor" 		"TanDark"
+		"fgcolor"		"TanDark"
 		"pin_to_sibling"		"PlayerStatusAnchor"
 		"pin_corner_to_sibling"	"1"
 		"pin_to_sibling_corner"	"1"
-	}	
+	}
 	
 	"PlayerStatus_MedicSmallBlastResistImage"
 	{
-		"ControlName" 	"ImagePanel"
-		"fieldName" 	"PlayerStatus_MedicSmallBlastResistImage"
+		"ControlName"	"ImagePanel"
+		"fieldName"		"PlayerStatus_MedicSmallBlastResistImage"
 		"xpos"			"0"
 		"ypos"			"0"
 		"zpos"			"7"
-		"wide"			"24"
-		"tall"			"24"
+		"wide"			"23"
+		"tall"			"23"
 		"visible"		"1"
 		"enabled"		"1"
-		"scaleImage"	"1"	
+		"scaleImage"	"1"
 		"image"			"../HUD/defense_buff_explosion_blue"
-		"fgcolor" 		"TanDark"
+		"fgcolor"		"TanDark"
 		"pin_to_sibling"		"PlayerStatusAnchor"
 		"pin_corner_to_sibling"	"1"
 		"pin_to_sibling_corner"	"1"
-	}	
+	}
 	
 	"PlayerStatus_MedicSmallFireResistImage"
 	{
-		"ControlName" 	"ImagePanel"
-		"fieldName" 	"PlayerStatus_MedicSmallFireResistImage"
+		"ControlName"	"ImagePanel"
+		"fieldName"		"PlayerStatus_MedicSmallFireResistImage"
 		"xpos"			"0"
 		"ypos"			"0"
 		"zpos"			"7"
-		"wide"			"24"
-		"tall"			"24"
+		"wide"			"23"
+		"tall"			"23"
 		"visible"		"1"
 		"enabled"		"1"
-		"scaleImage"	"1"	
+		"scaleImage"	"1"
 		"image"			"../HUD/defense_buff_fire_blue"
-		"fgcolor" 		"TanDark"
+		"fgcolor"		"TanDark"
 		"pin_to_sibling"		"PlayerStatusAnchor"
 		"pin_corner_to_sibling"	"1"
 		"pin_to_sibling_corner"	"1"
@@ -338,8 +342,8 @@
 		"xpos"			"0"
 		"ypos"			"0"
 		"zpos"			"7"
-		"wide"			"24"
-		"tall"			"24"
+		"wide"			"23"
+		"tall"			"23"
 		"visible"		"1"
 		"enabled"		"1"
 		"scaleImage"	"1"	
@@ -357,8 +361,8 @@
 		"xpos"			"0"
 		"ypos"			"0"
 		"zpos"			"7"
-		"wide"			"24"
-		"tall"			"24"
+		"wide"			"23"
+		"tall"			"23"
 		"visible"		"1"
 		"enabled"		"1"
 		"scaleImage"	"1"	
@@ -376,8 +380,8 @@
 		"xpos"			"0"
 		"ypos"			"0"
 		"zpos"			"7"
-		"wide"			"24"
-		"tall"			"24"
+		"wide"			"23"
+		"tall"			"23"
 		"visible"		"1"
 		"enabled"		"1"
 		"scaleImage"	"1"	
@@ -395,8 +399,8 @@
 		"xpos"			"0"
 		"ypos"			"0"
 		"zpos"			"7"
-		"wide"			"24"
-		"tall"			"24"
+		"wide"			"23"
+		"tall"			"23"
 		"visible"		"1"
 		"enabled"		"1"
 		"scaleImage"	"1"	
@@ -414,11 +418,11 @@
 		"xpos"			"0"
 		"ypos"			"0"
 		"zpos"			"7"
-		"wide"			"24"
-		"tall"			"24"
+		"wide"			"23"
+		"tall"			"23"
 		"visible"		"1"
 		"enabled"		"1"
-		"scaleImage"	"1"	
+		"scaleImage"	"1"
 		"fgcolor"		"TanDark"
 		"pin_to_sibling"		"PlayerStatusAnchor"
 		"pin_corner_to_sibling"	"1"
@@ -432,11 +436,11 @@
 		"xpos"			"0"
 		"ypos"			"0"
 		"zpos"			"7"
-		"wide"			"24"
-		"tall"			"24"
+		"wide"			"23"
+		"tall"			"23"
 		"visible"		"1"
 		"enabled"		"1"
-		"scaleImage"	"1"	
+		"scaleImage"	"1"
 		"fgcolor"		"TanDark"
 		"pin_to_sibling"		"PlayerStatusAnchor"
 		"pin_corner_to_sibling"	"1"
@@ -450,8 +454,8 @@
 		"xpos"			"0"
 		"ypos"			"0"
 		"zpos"			"7"
-		"wide"			"24"
-		"tall"			"24"
+		"wide"			"23"
+		"tall"			"23"
 		"visible"		"1"
 		"enabled"		"1"
 		"scaleImage"	"1"	
@@ -469,8 +473,8 @@
 		"xpos"			"0"
 		"ypos"			"0"
 		"zpos"			"7"
-		"wide"			"24"
-		"tall"			"24"
+		"wide"			"23"
+		"tall"			"23"
 		"visible"		"1"
 		"enabled"		"1"
 		"scaleImage"	"1"	
@@ -488,8 +492,8 @@
 		"xpos"			"0"
 		"ypos"			"0"
 		"zpos"			"7"
-		"wide"			"24"
-		"tall"			"24"
+		"wide"			"23"
+		"tall"			"23"
 		"visible"		"1"
 		"enabled"		"1"
 		"scaleImage"	"1"	
@@ -507,8 +511,8 @@
 		"xpos"			"0"
 		"ypos"			"0"
 		"zpos"			"7"
-		"wide"			"24"
-		"tall"			"24"
+		"wide"			"23"
+		"tall"			"23"
 		"visible"		"1"
 		"enabled"		"1"
 		"scaleImage"	"1"	
@@ -526,8 +530,8 @@
 		"xpos"			"0"
 		"ypos"			"0"
 		"zpos"			"7"
-		"wide"			"24"
-		"tall"			"24"
+		"wide"			"23"
+		"tall"			"23"
 		"visible"		"1"
 		"enabled"		"1"
 		"scaleImage"	"1"	
@@ -545,8 +549,8 @@
 		"xpos"			"0"
 		"ypos"			"0"
 		"zpos"			"7"
-		"wide"			"24"
-		"tall"			"24"
+		"wide"			"23"
+		"tall"			"23"
 		"visible"		"1"
 		"enabled"		"1"
 		"scaleImage"	"1"	
@@ -564,8 +568,8 @@
 		"xpos"			"0"
 		"ypos"			"0"
 		"zpos"			"7"
-		"wide"			"24"
-		"tall"			"24"
+		"wide"			"23"
+		"tall"			"23"
 		"visible"		"1"
 		"enabled"		"1"
 		"scaleImage"	"1"
@@ -583,8 +587,8 @@
 		"xpos"			"0"
 		"ypos"			"0"
 		"zpos"			"7"
-		"wide"			"24"
-		"tall"			"24"
+		"wide"			"23"
+		"tall"			"23"
 		"visible"		"1"
 		"enabled"		"1"
 		"scaleImage"	"1"	
@@ -602,8 +606,8 @@
 		"xpos"			"0"
 		"ypos"			"0"
 		"zpos"			"7"
-		"wide"			"24"
-		"tall"			"24"
+		"wide"			"23"
+		"tall"			"23"
 		"visible"		"1"
 		"enabled"		"1"
 		"scaleImage"	"1"	
@@ -621,8 +625,8 @@
 		"xpos"			"0"
 		"ypos"			"0"
 		"zpos"			"7"
-		"wide"			"24"
-		"tall"			"24"
+		"wide"			"23"
+		"tall"			"23"
 		"visible"		"1"
 		"enabled"		"1"
 		"scaleImage"	"1"	
@@ -640,8 +644,8 @@
 		"xpos"			"0"
 		"ypos"			"0"
 		"zpos"			"7"
-		"wide"			"24"
-		"tall"			"24"
+		"wide"			"23"
+		"tall"			"23"
 		"visible"		"1"
 		"enabled"		"1"
 		"scaleImage"	"1"	
@@ -659,8 +663,8 @@
 		"xpos"			"0"
 		"ypos"			"0"
 		"zpos"			"7"
-		"wide"			"24"
-		"tall"			"24"
+		"wide"			"23"
+		"tall"			"23"
 		"visible"		"1"
 		"enabled"		"1"
 		"scaleImage"	"1"	
@@ -678,8 +682,8 @@
 		"xpos"			"0"
 		"ypos"			"0"
 		"zpos"			"7"
-		"wide"			"24"
-		"tall"			"24"
+		"wide"			"23"
+		"tall"			"23"
 		"visible"		"1"
 		"enabled"		"1"
 		"scaleImage"	"1"