KBNHud v515: Optimist Edition

Jotunn · Feb 25, 2024 · c445242 · c445242
1 parent 141bf36
commit c445242
Show file tree

Hide file tree

Showing 7 changed files with 80 additions and 24 deletions.
diff --git a/.github/README.md b/.github/README.md
@@ -1,10 +1,10 @@
 
 ![alt text](https://i.imgur.com/ehYUnaI.png)
 
-v514: Supercell Edition
+v515: Optimist Edition
 ======
 
-Here's to decades gone past and decades to come. Take care, everyone!
+To decades gone past and decades to come. Take care, everyone!
 -------
 
 Info and links

diff --git a/^customizations/^basefiles/mainmenuoverride.res b/^customizations/^basefiles/mainmenuoverride.res
@@ -1663,7 +1663,7 @@
 		"ypos"									"c-100"
 		"zpos"									"12"
 		"wide"									"50"
-		"tall"									"50"
+		"tall"									"25"
 		"visible"								"1"
 		"PaintBackgroundType"					"0"
 
@@ -1675,13 +1675,13 @@
 			"ypos"								"0"
 			"zpos"								"1"
 			"wide"								"50"
-			"tall"								"50"
+			"tall"								"25"
 			"autoResize"						"0"
 			"pinCorner"							"3"
 			"visible"							"1"
 			"enabled"							"1"
 			"tabPosition"						"0"
-			"font"								"Symbols 50"
+			"font"								"Symbols 26"
 			"fgcolor_override"					"White"
 			"textAlignment"						"center"
 			"textinsetx"						"0"
@@ -1699,6 +1699,50 @@
 			"paintbackground"					"0"				
 		}
 	}
+	"DemoUI2"
+	{
+		"ControlName"							"EditablePanel"
+		"fieldname"								"DemoUI2"
+		"xpos"									"c97"
+		"ypos"									"c-75"
+		"zpos"									"12"
+		"wide"									"50"
+		"tall"									"25"
+		"visible"								"1"
+		"PaintBackgroundType"					"0"
+
+		"SubButton"
+		{
+			"ControlName"						"CExImageButton"
+			"fieldName"							"SubButton"
+			"xpos"								"0"
+			"ypos"								"0"
+			"zpos"								"1"
+			"wide"								"50"
+			"tall"								"25"
+			"autoResize"						"0"
+			"pinCorner"							"3"
+			"visible"							"1"
+			"enabled"							"1"
+			"tabPosition"						"0"
+			"font"								"Symbols 26"
+			"fgcolor_override"					"White"
+			"textAlignment"						"center"
+			"textinsetx"						"0"
+			"textinsety"						"0"
+			"use_proportional_insets" 			"0"
+			"dulltext"							"0"
+			"brighttext"						"0"
+			"default"							"1"
+
+			"sound_depressed"					"UI/buttonclick.wav"
+			"sound_released"					"UI/buttonclickrelease.wav"
+
+			"border_default"					"NewMenuLessSolidBG"
+			"border_armed"						"NewMenuArmedBG"
+			"paintbackground"					"0"
+		}
+	}
 	"SteamWorkshop"
 	{
 		"ControlName"							"EditablePanel"

diff --git a/resource/gamemenu.res b/resource/gamemenu.res
@@ -26,15 +26,15 @@
 			echo ``````````````````````````````````````````@@@``````````````````````````````````;
 			echo ```````````````````````````````````````````@```````````````````````````````````;
 			echo -------------------------------------------------------------------------------;
-			echo ------------------------ KBNHud v514 - Supercell Edition ----------------------;
+			echo ------------------------ KBNHud v515 - Optimist Edition -----------------------;
 			echo -------------------------- To check for updates go to: -----------------------;
 			echo --------------------------- github.com/Jotunn/kbnhud --------------------------;
 			echo ------------------------- comfig.app/huds/page/kbnhud -------------------------;
 			echo ----------------------- steamcommunity.com/groups/KBNHud ----------------------;
-			echo --- Here's to decades gone past and decades to come. Take care, everyone! ---;
+			echo ------- To decades gone past and decades to come! Take care, everyone! --------;
 			echo -------------------------------------------------------------------------------"
-		"label" 			"KBNHud v514"
-		"tooltip"			"Supercell Edition; November 12, 2023"
+		"label" 			"KBNHud v515"
+		"tooltip"			"Optimist Edition; February 25, 2024"
     }
 	////////////////////////Left Column//////////////////////////
 	"Inventory"
@@ -127,7 +127,12 @@
 	{
 		"label" 			"ð"
 		"command" 			"engine hud_combattext 1; hud_combattext_red 255; hud_combattext_green 110; hud_combattext_blue 255"
-		"OnlyInGame"		"1"
+		"OnlyInGame"		"1""DemoUI"
+	{
+		"label" 			"Ï"
+		"command" 			"engine demoui"
+		"tooltip"			"Demo UI"
+	}
 	}
 	"ScoreboardToggle"
 	{
@@ -225,6 +230,12 @@
 		"command" 			"engine demoui"
 		"tooltip"			"Demo UI"
 	}
+	"DemoUI2"
+	{
+		"label" 			"Ï"
+		"command" 			"engine demoui2"
+		"tooltip"			"Demo UI 2"
+	}
 	"SteamWorkshop"
 	{
 		"label" 			"b"

diff --git a/resource/ui/econ/inspectionpanel.res b/resource/ui/econ/inspectionpanel.res
@@ -723,4 +723,4 @@
 			"sound_released"	"UI/buttonclickrelease.wav"
 		}
 	}
-}
+}
diff --git a/resource/ui/huditemeffectmeter_pyro.res b/resource/ui/huditemeffectmeter_pyro.res
@@ -6,5 +6,6 @@
 	{
 		"fieldName"		"HudItemEffectMeter"
 		"xpos"			"c-62"
+		"ypos"			"r171"
 	}
 }
diff --git a/resource/ui/hudroundcounter.res b/resource/ui/hudroundcounter.res
@@ -5,43 +5,43 @@
 		"fieldName"		"RoundCounter"
 		"xpos"			"cs-0.5"
 		"ypos"			"-2"
-		"zpos"			"10"		
+		"zpos"			"10"
 		"wide"			"300"
 		"tall"			"25"
 		"visible"		"1"
 		"enabled"		"1"
 		"proportionaltoparent"	"1"
 
 		"starting_width"	"15"
-		"width_per_round"	"15"
-		"indicator_start_offset"	"16"
-		"indicator_max_wide"	"46"
+		"width_per_round"	"10"
+		"indicator_start_offset"	"18"
+		"indicator_max_wide"	"36"
 
 		"RoundIndicatorPanel_kv"
 		{
-			"ypos"				"5"
-			"wide"				"4"
-			"tall"				"4"
+			"ypos"				"9"
+			"wide"				"3"
+			"tall"				"3"
 			"zpos"				"7"
 			"image"				"../hud/comp_round_counter_dot_bg"
 			"scaleimage"		"1"
 		}
 
 		"RoundWinPanelRed_kv"
 		{
-			"ypos"				"0"
-			"wide"				"14"
-			"tall"				"14"
+			"ypos"				"5"
+			"wide"				"11"
+			"tall"				"11"
 			"zpos"				"8"
 			"image"				"../hud/comp_round_counter_light_red"
 			"scaleimage"		"1"
 		}
 
 		"RoundWinPanelBlue_kv"
 		{
-			"ypos"				"0"
-			"wide"				"14"
-			"tall"				"14"
+			"ypos"				"5"
+			"wide"				"11"
+			"tall"				"11"
 			"zpos"				"8"
 			"image"				"../hud/comp_round_counter_light_blue"
 			"scaleimage"		"1"

diff --git a/v514 CHANGELOG.txt → v515 CHANGELOG.txt b/v514 CHANGELOG.txt → v515 CHANGELOG.txt