minor stuff

Jofre-Problem · Dec 12, 2023 · 2d035e3 · 2d035e3
1 parent 863b12f
commit 2d035e3
Show file tree

Hide file tree

Showing 9 changed files with 131 additions and 83 deletions.
diff --git a/resource/chat_english.txt b/resource/chat_english.txt
diff --git a/resource/ui/charinfopanel.res b/resource/ui/charinfopanel.res
@@ -3,42 +3,84 @@
 
 "Resource/UI/CharInfoPanel.res"
 {
-	"SHORTCUTLABEL"
+			"bgg4"						{			ControlName				ImagePanel			FieldName				
+			"bgg4"
+		"xpos"			"0"
+		"ypos"			"0"
+		"wide"			"120"
+		"tall"			"15"
+			fillColor				"Primary"			
+	}	
+
+
+		"slash4"
+		{
+			"ControlName"		"CExLabel"
+			"fieldName"		"slash4"
+			"font"			"NewIcons20"
+			"labelText"		"É"//"%kills%"
+			"textAlignment"		"west"
+			"xpos" 			"-1"					//"c-60"//			"180"
+			"ypos"			"0"
+			"zpos"			"1"
+			"wide"			"30"
+			"tall"			"15"
+
+			"fgcolor"		"Primary"		"pin_to_sibling"	"bgg4"
+					"pin_corner_to_sibling"					"PIN_TOPLEFT"
+		"pin_to_sibling_corner"					"PIN_TOPRIGHT"	
+		}
+	"icon"
 	{
 		"ControlName"	"CExLabel"
-		"fieldName"		"SHORTCUTLABEL"
-		"font"		"NotoBold16"
-		"labelText"		"(Q) Back"
-		"textAlignment"	"west"
-		"xpos"		"130"
-		"ypos"		"2"
-		"zpos"		"6990"
-		"wide"		"65"
-		"tall"		"25"
-		"visible"		"1"
-		"enabled"		"1"
-		"fgcolor"		"NotoGray"
-	}	
+		"fieldName"		"icon"
+		"font"			"NewIcons15"
+		"labelText"		"R"
+		"textAlignment"	"center"
+		"xpos"			"0"
+		"ypos"			"0"
+		"zpos"			"10"
+		"wide"			"20"
+		"tall"			"15"
+		"fgcolor_override"	"notoblack"
+	}		
+		"Slider"
+	{
+		"ControlName"		"CCvarSlider"
+		"fieldName"		"Slider"
+		"xpos"		"20"
+		"ypos"		"3" //18
+		"wide"		"100"
+		"tall"		"13"
+		"zpos"		"5001"
+		"leftText"		""
+		"rightText"		""
+		"minvalue"		"0"
+		"maxvalue"		"6"
+		"font"	"blank"
+		"cvar_name"		"mat_color_projection"
+	}
 	"TimePanelBGReal"
 	{
 		"ControlName"		"ScalableImagePanel"
 		"fieldName"		"TimePanelBGReal"
-		"xpos"			"5"
-		"ypos"			"3"
+		"xpos"			"-2"
+		"ypos"			"-4"
 		"zpos"			"7000"
 		"wide"			"22"
 		"tall"			"o1"
 		"visible"		"1"
 		"enabled"		"1"
 		"image"			"replay/thumbnails/l4d2/survivaltimerclock"	
 		"scaleImage"		"1"	
+		"pin_to_sibling"	"lostjudgmentbgtimer"
 	}	
 	"Time_hour10"
 	{
 		"ControlName"			"ImagePanel"
 		"fieldName"				"Time_hour10"
-		"xpos"					"35"
-		"ypos"					"5"
+		"xpos"					"cs-0.5-38+13"
+		"ypos"					"36"
 	"drawcolor"				"notowhite"
 		"enabled"				"1"
 		"scaleimage"			"1"
@@ -56,6 +98,19 @@
 		"tall"	"f0"
 		"zpos"					"-1000"
 	}	
+	"lostjudgmentbgtimer"
+	{
+		"ControlName"			"ImagePanel"
+		"fieldName"				"lostjudgmentbgtimer"
+		"xpos"	"cs-0.5"
+		"ypos"					"30"
+	"fillcolor"				"16 16 16 200"
+		"enabled"				"1"
+		"scaleimage"			"1"
+		"wide"	"120"
+		"tall"	"29"
+		"zpos"					"1"
+	}		
 	"character_info"		// drawn over main menu
 	{
 		ControlName				EditablePanel
@@ -122,7 +177,7 @@
 		"visible"									"1"
 		"enabled"									"1"
 		"proportionaltoparent"						"1"
-		"labelText"									"Back"
+		"labelText"									""
 		"font"										"NotoBold24"
 		"textAlignment"								"center"
 		"default"									"0"
@@ -136,6 +191,7 @@
 
 		"armedFgColor_override"						"notogray"
 		"defaultFgColor_override"					"blank"
+		"alpha"	"200"
 	}
 
 	"BackShortKey"

diff --git a/resource/ui/classloadoutpanel.res b/resource/ui/classloadoutpanel.res
@@ -230,39 +230,39 @@
 		"enabled"		"1"
 		"fgcolor_override" "NotoGray"
 	}	
+	"icon"
+	{
+		"ControlName"	"CExLabel"
+		"fieldName"		"icon"
+		"font"			"NewIcons57"
+		"labelText"		"Z"
+		"textAlignment"	"center"
+		"xpos"			"30"
+		"ypos"			"40"
+		"zpos"			"10"
+		"wide"			"50"
+		"tall"			"o1"
+		"fgcolor_override"	"NOTOWHITE"
+		"mouseinputenabled"	"0"
+	}		
 	"ClassLabel"
 	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"ClassLabel"
-		"font"			"Future30"
+		"font"			"Size 24 Uber"
 		"labelText"		"#ClassBeingEquipped"
-		"textAlignment"	"west"
-		"xpos"			"-8"
-		"ypos"			"rs1-35"
-		"zpos"			"-2"
-		"fgcolor_override"	"NotoGray"
-		"wide"			"f0"
-		"tall"			"25"
-		"auto_wide_tocontents"	"1"
-		"bgcolor_override"	"DarkBrown"
+		"textAlignment"	"center"
+		"xpos"			"-15"
+		"ypos"			"-14"
+		"zpos"			"11"
+		"fgcolor_override"	"DarkBrown"
+		"wide"			"20"
+		"tall"			"20"
+		"bgcolor_override"	"notowhite"
+		"pin_to_sibling"	"icon"
+		"mouseinputenabled"	"0"
 	}	
-		"polybar1slash_V2"
-		{
-			"ControlName"		"CExLabel"
-			"fieldName"		"polybar1slash_V2"
-			"font"			"NewIcons57"
-			"labelText"		"l"
-			"textAlignment"		"west"
-			"xpos" 			"-8"					//"c-60"//			"180"
-			"ypos"			"0"
-			"zpos"			"-3"
-			"wide"			"30"
-			"tall"			"25"
-
-			"fgcolor"		"DarkBrown"
-"pin_to_sibling"	"ClassLabel"
-		"pin_corner_to_sibling"					"PIN_TOPLEFT"
-		"pin_to_sibling_corner"					"PIN_TOPRIGHT"	}	
+
 	"TauntLoadoutButton"
 	{
 		ControlName					CExButton
@@ -491,15 +491,15 @@
 	{
 		"ControlName"		"CExImageButton"
 		"fieldName"			"RedTeamButton"
-			"pin_to_sibling"	"infobg"
-		xpos							-15		// align with preset C
-		ypos							20
-		"zpos"				"40"
-		"wide"				"12"
-		"tall"				"13"
+
+		xpos							38
+		ypos							74
+		"zpos"				"0"
+		"wide"				"18"
+		"tall"				"15"
 		"labelText"			"O"
 		"textAlignment"		"center"
-		"font"				"NewIcons12"
+		"font"				"NewIcons20"
 		"command"			"sv_cheats 1; r_skin 0"
 		"fgcolor"					"red"
 		"defaultFgColor_override" 	"red"
@@ -517,13 +517,13 @@
 		"fieldName"			"BlueTeamButton"
 		"xpos"				"0"
 		"ypos"				"0"
-		"zpos"				"40"
-		"wide"				"12"
-		"tall"				"13"
+		"zpos"				"0"
+		"wide"				"18"
+		"tall"				"15"
 		"tabPosition"		"0"
 		"labelText"			"O"
 		"textAlignment"		"center"
-		"font"				"NewIcons12"
+		"font"				"NewIcons20"
 		"command"			"sv_cheats 1; r_skin 1"
 		"fgcolor"					"blue"
 		"defaultFgColor_override" 	"blue"

diff --git a/resource/ui/craftingpanel.res b/resource/ui/craftingpanel.res
@@ -1,3 +1,4 @@
+#base "../../../../cfg/jp_mm_bg.txt"
 "Resource/UI/CraftingPanel.res"
 {
 	"crafting_panel"
@@ -139,7 +140,7 @@
 		"wide"			"300"
 		"tall"			"350"
 		//
-		"bgcolor_override"	"Blank"
+		"bgcolor_override"	"0 0 0 100"
 
 		"RecipeTitle"
 		{

diff --git a/resource/ui/econ/inspectionpanel.res b/resource/ui/econ/inspectionpanel.res
@@ -1,18 +1,7 @@
-
+#base "../../../../../cfg/jp_mm_bg.txt"
 "Resource/UI/TradingPanel.res"
 {
-	"bg"
-	{
-		"ControlName"			"ImagePanel"
-		"fieldName"				"bg"
-		"ypos"					"0"
-	"fillcolor"				"16 16 16 255"
-		"enabled"				"1"
-		"scaleimage"			"1"
-		"wide"	"f0"
-		"tall"	"f0"
-		"zpos"					"-1000"
-	}	
+
 
 	"ItemName"
 	{		

diff --git a/resource/ui/econ/tradingpanel.res b/resource/ui/econ/tradingpanel.res
@@ -1,4 +1,5 @@
 #base "../../ui2/lead_bg.res"
+#base "../../../../../cfg/jp_mm_bg.txt"
 "Resource/UI/TradingPanel.res"
 {
 	"MMBackgroundPanel"

diff --git a/resource/ui/econ/tradingstartdialog.res b/resource/ui/econ/tradingstartdialog.res
@@ -1,3 +1,4 @@
+#base "../../../../../cfg/jp_mm_bg.txt"
 "Resource/UI/TradingStartDialog.res"
 {
 	"TradingStartDialog"

diff --git a/resource/ui/hudmatchstatus.res b/resource/ui/hudmatchstatus.res
@@ -129,7 +129,7 @@
 	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"RankUpLabel"
-		"font"			"Size 16"
+		"font"			"Notobold16"
 		"xpos"			"cs-0.5"
 		"ypos"			"80"
 		"wide"			"600"
@@ -148,7 +148,7 @@
 	{
 		"ControlName"	"CExLabel"
 		"fieldName"		"RankUpShadowLabel"
-		"font"			"Size 16"
+		"font"			"Notobold16"
 		"xpos"			"cs-0.5+2"
 		"ypos"			"80+2"
 		"wide"			"600"

diff --git a/resource/ui/hudobjectivetimepanel.res b/resource/ui/hudobjectivetimepanel.res
@@ -30,11 +30,11 @@
 		"tall"			"12"
 		"visible"		"0"
 		"enabled"		"1"
-		"labelText"		"#game_Overtime"
+		"labelText"		"Ù"
 		"textAlignment"		"center"
 
-		"font"			"Regular12"
-		"fgcolor_override"		"White"
+		"font"			"NewIcons15"
+		"fgcolor_override"		"notoWhite"
 		"proportionaltoparent"		"1"
 	}
 
@@ -49,11 +49,11 @@
 		"tall"			"12"
 		"visible"		"0"
 		"enabled"		"1"
-		"labelText"		"#game_SuddenDeath"
+		"labelText"		"2"
 		"textAlignment"		"center"
 
-		"font"			"Regular12"
-		"fgcolor_override"		"White"
+		"font"			"NewIcons15"
+		"fgcolor_override"		"notoWhite"
 		"proportionaltoparent"		"1"
 	}
 
@@ -65,14 +65,14 @@
 		"ypos"			"25"
 		"zpos"			"5"
 		"wide"			"200"
-		"tall"			"12"
+		"tall"			"15"
 		"visible"		"0" 
 		"enabled"		"1"
-		"labelText"		"#game_Setup"
+		"labelText"		"Ñ"
 		"textAlignment"		"center"
 
-		"font"			"Regular12"
-		"fgcolor_override"		"White"
+		"font"			"NewIcons15"
+		"fgcolor_override"		"notoWhite"
 		"proportionaltoparent"		"1"
 	}