23.0.6 - misc mvm fixes

fixed and adjusted some things related to mvm - overlapping canteens - enemy upgrade being slightly misaligned with robot bomb
Vexcenot · Oct 6, 2024 · fd3e6f7 · fd3e6f7
1 parent 674e2c3
commit fd3e6f7
Show file tree

Hide file tree

Showing 6 changed files with 52 additions and 14 deletions.
diff --git a/resource/ui/customizations/mvmbottle/bottle_left.res b/resource/ui/customizations/mvmbottle/bottle_left.res
@@ -6,8 +6,8 @@
         "fieldName"     "HudItemEffectMeter"
         "visible"       "1"
         "enabled"       "1"
-        "xpos"          "c-300"   [$WIN32]
-        "ypos"          "r75"  [$WIN32]
+        "xpos"          "c-302"   [$WIN32]
+        "ypos"          "r72"  [$WIN32]
         "wide"          "100"
         "tall"          "60"
         "MeterFG"       "White"

diff --git a/resource/ui/customizations/mvmbottle/bottle_right.res b/resource/ui/customizations/mvmbottle/bottle_right.res
@@ -6,8 +6,8 @@
         "fieldName"     "HudItemEffectMeter"
         "visible"       "1"
         "enabled"       "1"
-        "xpos"          "c200"   [$WIN32]
-        "ypos"          "r132"  [$WIN32]
+        "xpos"          "c220"   [$WIN32]
+        "ypos"          "r128"  [$WIN32]
         "wide"          "100"
         "tall"          "60"
         "MeterFG"       "White"

diff --git a/resource/ui/hudmannvsmachinestatus.res b/resource/ui/hudmannvsmachinestatus.res
@@ -48,7 +48,7 @@
 	{
 		"ControlName"		"CInWorldCurrencyStatus"
 		"fieldName"			"InWorldCurrencyPanel"
-		"xpos"				"c-286"
+		"xpos"				"c-288"
 		"ypos"				"r15"
 		"wide"				"100"
 		"tall"				"100"
@@ -78,7 +78,7 @@
 	{
 		"ControlName"	"EditablePanel"
 		"fieldName"		"UpgradeLevelContainer"
-		"xpos"			"0"
+		"xpos"			"10"
 		"ypos"			"5"
 		"wide"			"640"
 		"tall"			"480"

diff --git a/resource/ui/hudobjectiveflagpanel.res b/resource/ui/hudobjectiveflagpanel.res
@@ -80,14 +80,14 @@
 		{
 			"visible"		"0"
 		}
-				"if_no_flags"
+		"if_no_flags"
 		{
 			"visible"	"0"
 		}
-"if_hybrid"
-{
-    "visible"    "0"
-}
+		"if_hybrid"
+		{
+		    "visible"    "0"
+		}
 
 
 	}
@@ -608,6 +608,25 @@
 		"fgcolor"		"Black"
 
 		"pin_to_sibling"	"BlueScore"
+
+		"if_hybrid"
+		{
+			"visible"	"0"
+		}
+
+		"if_mvm"
+		{
+			"visible"	"0"
+		}
+
+		"if_specialdelivery"
+		{
+			"visible"	"0"
+		}
+		"if_no_flags"
+		{
+			"visible"	"0"
+		}
 	}
 
 	"RedScore"
@@ -641,7 +660,7 @@
 		{
 			"visible"	"0"
 		}
-				"if_no_flags"
+		"if_no_flags"
 		{
 			"visible"	"0"
 		}
@@ -665,6 +684,25 @@
 		"fgcolor"		"Black"
 
 		"pin_to_sibling"	"RedScore"
+
+		"if_hybrid"
+		{
+			"visible"	"0"
+		}
+
+		"if_mvm"
+		{
+			"visible"	"0"
+		}
+
+		"if_specialdelivery"
+		{
+			"visible"	"0"
+		}
+		"if_no_flags"
+		{
+			"visible"	"0"
+		}
 	}
 
 	"OutlineImage"

diff --git a/resource/ui/mainmenuoverride.res b/resource/ui/mainmenuoverride.res
@@ -2293,7 +2293,7 @@
 		"dulltext"		"0"
 		"brighttext"	"0"
 		"default"		"1"
-		"command"		"engine showconsole; clear; echo middle mann v23.0.5; echo last updated: 04/10/24" //mostly used for bug reporting, remind self to update this string after every release
+		"command"		"engine showconsole; clear; echo middle mann v23.0.6; echo last updated: 06/10/24" //mostly used for bug reporting, remind self to update this string after every release
 		"labeltext"		"Console"
 		"sound_depressed"	"UI/buttonclick.wav"
 		"sound_released"	"UI/buttonclickrelease.wav"

diff --git a/scripts/hudlayout.res b/scripts/hudlayout.res
@@ -1334,7 +1334,7 @@
 	{
 		"ControlName"				"CCurrencyStatusPanel"
 		"fieldName"					"CurrencyStatusPanel"
-		"xpos"						"c-319"
+		"xpos"						"c-321"
 		"ypos"						"r103"
 		"wide"						"100"
 		"tall"						"100"