From 4a1ef60a686b1a2a8090821af8989fa09633c106 Mon Sep 17 00:00:00 2001 From: Jbleezy Date: Thu, 20 Apr 2023 20:15:36 -0700 Subject: [PATCH] Adjust revive and bleedout bar HUD sort --- scripts/zm/_zm_reimagined.gsc | 19 +++++++++++-------- scripts/zm/replaced/_zm.gsc | 3 +++ scripts/zm/replaced/_zm_afterlife.gsc | 6 ++++++ scripts/zm/replaced/_zm_chugabud.gsc | 3 +++ scripts/zm/replaced/_zm_laststand.gsc | 6 ++++++ scripts/zm/replaced/zm_prison_sq_final.gsc | 1 - scripts/zm/zgrief/zgrief_reimagined.gsc | 1 - 7 files changed, 29 insertions(+), 10 deletions(-) diff --git a/scripts/zm/_zm_reimagined.gsc b/scripts/zm/_zm_reimagined.gsc index 33b04e0e..be9ac4bc 100644 --- a/scripts/zm/_zm_reimagined.gsc +++ b/scripts/zm/_zm_reimagined.gsc @@ -530,9 +530,9 @@ health_bar_hud() hud.foreground = 1; hud.bar.foreground = 1; hud.barframe.foreground = 1; - hud.sort = 0; - hud.bar.sort = 1; - hud.barframe.sort = 2; + hud.sort = 1; + hud.bar.sort = 2; + hud.barframe.sort = 3; hud_text = createfontstring("objective", 1.2); hud_text.alignx = "left"; @@ -1854,16 +1854,14 @@ bleedout_bar_hud() flag_wait( "initial_blackscreen_passed" ); - if(flag("solo_game")) - { - return; - } - hud = self createbar((1, 0, 0), level.secondaryprogressbarwidth * 2, level.secondaryprogressbarheight); hud setpoint("CENTER", undefined, level.secondaryprogressbarx, -1 * level.secondaryprogressbary); hud.hidewheninmenu = 1; hud.bar.hidewheninmenu = 1; hud.barframe.hidewheninmenu = 1; + hud.sort = 1; + hud.bar.sort = 2; + hud.barframe.sort = 3; hud hideelem(); hud thread destroy_on_intermission(); @@ -1878,6 +1876,11 @@ bleedout_bar_hud() continue; } + if(flag("solo_game")) + { + continue; + } + self thread bleedout_bar_hud_updatebar(hud); hud showelem(); diff --git a/scripts/zm/replaced/_zm.gsc b/scripts/zm/replaced/_zm.gsc index a9facac5..d58d65a1 100644 --- a/scripts/zm/replaced/_zm.gsc +++ b/scripts/zm/replaced/_zm.gsc @@ -1666,6 +1666,9 @@ wait_and_revive() self.beingrevivedprogressbar.hidewheninmenu = 1; self.beingrevivedprogressbar.bar.hidewheninmenu = 1; self.beingrevivedprogressbar.barframe.hidewheninmenu = 1; + self.beingrevivedprogressbar.sort = 1; + self.beingrevivedprogressbar.bar.sort = 2; + self.beingrevivedprogressbar.barframe.sort = 3; } self.beingrevivedprogressbar updatebar( 0.01, 1 / solo_revive_time ); flag_wait_or_timeout( "instant_revive", solo_revive_time ); diff --git a/scripts/zm/replaced/_zm_afterlife.gsc b/scripts/zm/replaced/_zm_afterlife.gsc index afb48d3c..4fc9d77b 100644 --- a/scripts/zm/replaced/_zm_afterlife.gsc +++ b/scripts/zm/replaced/_zm_afterlife.gsc @@ -302,6 +302,9 @@ afterlife_revive_do_revive( playerbeingrevived, revivergun ) playerbeingrevived_player.beingrevivedprogressbar.hidewheninmenu = 1; playerbeingrevived_player.beingrevivedprogressbar.bar.hidewheninmenu = 1; playerbeingrevived_player.beingrevivedprogressbar.barframe.hidewheninmenu = 1; + playerbeingrevived_player.beingrevivedprogressbar.sort = 1; + playerbeingrevived_player.beingrevivedprogressbar.bar.sort = 2; + playerbeingrevived_player.beingrevivedprogressbar.barframe.sort = 3; playerbeingrevived_player.beingrevivedprogressbar thread scripts\zm\_zm_reimagined::destroy_on_intermission(); } @@ -309,6 +312,9 @@ afterlife_revive_do_revive( playerbeingrevived, revivergun ) { self.reviveprogressbar = self createprimaryprogressbar(); self.reviveprogressbar.bar.color = (0.5, 0.5, 1); + self.reviveprogressbar.sort = 1; + self.reviveprogressbar.bar.sort = 2; + self.reviveprogressbar.barframe.sort = 3; self.reviveprogressbar thread scripts\zm\_zm_reimagined::destroy_on_intermission(); } diff --git a/scripts/zm/replaced/_zm_chugabud.gsc b/scripts/zm/replaced/_zm_chugabud.gsc index 5ea72f64..337dcac8 100644 --- a/scripts/zm/replaced/_zm_chugabud.gsc +++ b/scripts/zm/replaced/_zm_chugabud.gsc @@ -258,6 +258,9 @@ chugabud_bleed_timeout_hud_create( delay ) hud.hidewheninmenu = 1; hud.bar.hidewheninmenu = 1; hud.barframe.hidewheninmenu = 1; + hud.sort = 1; + hud.bar.sort = 2; + hud.barframe.sort = 3; hud thread scripts\zm\_zm_reimagined::destroy_on_intermission(); hud updatebar(1); diff --git a/scripts/zm/replaced/_zm_laststand.gsc b/scripts/zm/replaced/_zm_laststand.gsc index dc454f50..4c7957f8 100644 --- a/scripts/zm/replaced/_zm_laststand.gsc +++ b/scripts/zm/replaced/_zm_laststand.gsc @@ -58,6 +58,9 @@ revive_do_revive( playerbeingrevived, revivergun ) playerbeingrevived_player.beingrevivedprogressbar.hidewheninmenu = 1; playerbeingrevived_player.beingrevivedprogressbar.bar.hidewheninmenu = 1; playerbeingrevived_player.beingrevivedprogressbar.barframe.hidewheninmenu = 1; + playerbeingrevived_player.beingrevivedprogressbar.sort = 1; + playerbeingrevived_player.beingrevivedprogressbar.bar.sort = 2; + playerbeingrevived_player.beingrevivedprogressbar.barframe.sort = 3; playerbeingrevived_player.beingrevivedprogressbar thread scripts\zm\_zm_reimagined::destroy_on_intermission(); } @@ -65,6 +68,9 @@ revive_do_revive( playerbeingrevived, revivergun ) { self.reviveprogressbar = self createprimaryprogressbar(); self.reviveprogressbar.bar.color = (0.5, 0.5, 1); + self.reviveprogressbar.sort = 1; + self.reviveprogressbar.bar.sort = 2; + self.reviveprogressbar.barframe.sort = 3; self.reviveprogressbar thread scripts\zm\_zm_reimagined::destroy_on_intermission(); } diff --git a/scripts/zm/replaced/zm_prison_sq_final.gsc b/scripts/zm/replaced/zm_prison_sq_final.gsc index 82085446..be962236 100644 --- a/scripts/zm/replaced/zm_prison_sq_final.gsc +++ b/scripts/zm/replaced/zm_prison_sq_final.gsc @@ -428,7 +428,6 @@ final_showdown_create_icon( player, enemy ) hud_elem = newclienthudelem( player ); hud_elem.alpha = 1; hud_elem.archived = 1; - hud_elem.foreground = 1; hud_elem.hidewheninmenu = 1; hud_elem.color = (1, 0, 0); hud_elem setwaypoint( 1, "waypoint_kill_red" ); diff --git a/scripts/zm/zgrief/zgrief_reimagined.gsc b/scripts/zm/zgrief/zgrief_reimagined.gsc index 5c994cda..755bc156 100644 --- a/scripts/zm/zgrief/zgrief_reimagined.gsc +++ b/scripts/zm/zgrief/zgrief_reimagined.gsc @@ -1080,7 +1080,6 @@ obj_waypoint() self.obj_waypoint.vertalign = "user_center"; self.obj_waypoint.alpha = 0; self.obj_waypoint.hidewheninmenu = 1; - self.obj_waypoint.foreground = 1; self.obj_waypoint setWaypoint(1, level.obj_waypoint_icon); self thread obj_waypoint_destroy_on_end_game();