INSANEMODE/BO2-Reimagined
1
0
Fork 0
mirror of https://github.com/JezuzLizard/BO2-Reimagined.git synced 2025-06-13 00:28:03 -05:00
Code Issues Releases Wiki Activity

Adjust revive and bleedout bar HUD sort

Browse Source
This commit is contained in:
Jbleezy
2023-04-20 20:15:36 -07:00
parent 4d1ef8ecec
commit 4a1ef60a68
7 changed files with 29 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
scripts/zm/_zm_reimagined.gsc
View File

@ -530,9 +530,9 @@ health_bar_hud()
hud.foreground = 1; hud.foreground = 1;
hud.bar.foreground = 1; hud.bar.foreground = 1;
hud.barframe.foreground = 1; hud.barframe.foreground = 1;
hud.sort = 0; hud.sort = 1;
hud.bar.sort = 1; hud.bar.sort = 2;
hud.barframe.sort = 2; hud.barframe.sort = 3;
hud_text = createfontstring("objective", 1.2); hud_text = createfontstring("objective", 1.2);
hud_text.alignx = "left"; hud_text.alignx = "left";
@ -1854,16 +1854,14 @@ bleedout_bar_hud()
flag_wait( "initial_blackscreen_passed" ); flag_wait( "initial_blackscreen_passed" );
if(flag("solo_game"))
{
return;
}
hud = self createbar((1, 0, 0), level.secondaryprogressbarwidth * 2, level.secondaryprogressbarheight); hud = self createbar((1, 0, 0), level.secondaryprogressbarwidth * 2, level.secondaryprogressbarheight);
hud setpoint("CENTER", undefined, level.secondaryprogressbarx, -1 * level.secondaryprogressbary); hud setpoint("CENTER", undefined, level.secondaryprogressbarx, -1 * level.secondaryprogressbary);
hud.hidewheninmenu = 1; hud.hidewheninmenu = 1;
hud.bar.hidewheninmenu = 1; hud.bar.hidewheninmenu = 1;
hud.barframe.hidewheninmenu = 1; hud.barframe.hidewheninmenu = 1;
hud.sort = 1;
hud.bar.sort = 2;
hud.barframe.sort = 3;
hud hideelem(); hud hideelem();
hud thread destroy_on_intermission(); hud thread destroy_on_intermission();
@ -1878,6 +1876,11 @@ bleedout_bar_hud()
continue; continue;
} }
if(flag("solo_game"))
{
continue;
}
self thread bleedout_bar_hud_updatebar(hud); self thread bleedout_bar_hud_updatebar(hud);
hud showelem(); hud showelem();

3
scripts/zm/replaced/_zm.gsc
View File

@ -1666,6 +1666,9 @@ wait_and_revive()
self.beingrevivedprogressbar.hidewheninmenu = 1; self.beingrevivedprogressbar.hidewheninmenu = 1;
self.beingrevivedprogressbar.bar.hidewheninmenu = 1; self.beingrevivedprogressbar.bar.hidewheninmenu = 1;
self.beingrevivedprogressbar.barframe.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 ); self.beingrevivedprogressbar updatebar( 0.01, 1 / solo_revive_time );
flag_wait_or_timeout( "instant_revive", solo_revive_time ); flag_wait_or_timeout( "instant_revive", solo_revive_time );

6
scripts/zm/replaced/_zm_afterlife.gsc
View File

@ -302,6 +302,9 @@ afterlife_revive_do_revive( playerbeingrevived, revivergun )
playerbeingrevived_player.beingrevivedprogressbar.hidewheninmenu = 1; playerbeingrevived_player.beingrevivedprogressbar.hidewheninmenu = 1;
playerbeingrevived_player.beingrevivedprogressbar.bar.hidewheninmenu = 1; playerbeingrevived_player.beingrevivedprogressbar.bar.hidewheninmenu = 1;
playerbeingrevived_player.beingrevivedprogressbar.barframe.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(); 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 = self createprimaryprogressbar();
self.reviveprogressbar.bar.color = (0.5, 0.5, 1); 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(); self.reviveprogressbar thread scripts\zm\_zm_reimagined::destroy_on_intermission();
} }

3
scripts/zm/replaced/_zm_chugabud.gsc
View File

@ -258,6 +258,9 @@ chugabud_bleed_timeout_hud_create( delay )
hud.hidewheninmenu = 1; hud.hidewheninmenu = 1;
hud.bar.hidewheninmenu = 1; hud.bar.hidewheninmenu = 1;
hud.barframe.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 thread scripts\zm\_zm_reimagined::destroy_on_intermission();
hud updatebar(1); hud updatebar(1);

6
scripts/zm/replaced/_zm_laststand.gsc
View File

@ -58,6 +58,9 @@ revive_do_revive( playerbeingrevived, revivergun )
playerbeingrevived_player.beingrevivedprogressbar.hidewheninmenu = 1; playerbeingrevived_player.beingrevivedprogressbar.hidewheninmenu = 1;
playerbeingrevived_player.beingrevivedprogressbar.bar.hidewheninmenu = 1; playerbeingrevived_player.beingrevivedprogressbar.bar.hidewheninmenu = 1;
playerbeingrevived_player.beingrevivedprogressbar.barframe.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(); 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 = self createprimaryprogressbar();
self.reviveprogressbar.bar.color = (0.5, 0.5, 1); 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(); self.reviveprogressbar thread scripts\zm\_zm_reimagined::destroy_on_intermission();
} }

1
scripts/zm/replaced/zm_prison_sq_final.gsc
View File

@ -428,7 +428,6 @@ final_showdown_create_icon( player, enemy )
hud_elem = newclienthudelem( player ); hud_elem = newclienthudelem( player );
hud_elem.alpha = 1; hud_elem.alpha = 1;
hud_elem.archived = 1; hud_elem.archived = 1;
hud_elem.foreground = 1;
hud_elem.hidewheninmenu = 1; hud_elem.hidewheninmenu = 1;
hud_elem.color = (1, 0, 0); hud_elem.color = (1, 0, 0);
hud_elem setwaypoint( 1, "waypoint_kill_red" ); hud_elem setwaypoint( 1, "waypoint_kill_red" );

1
scripts/zm/zgrief/zgrief_reimagined.gsc
View File

@ -1080,7 +1080,6 @@ obj_waypoint()
self.obj_waypoint.vertalign = "user_center"; self.obj_waypoint.vertalign = "user_center";
self.obj_waypoint.alpha = 0; self.obj_waypoint.alpha = 0;
self.obj_waypoint.hidewheninmenu = 1; self.obj_waypoint.hidewheninmenu = 1;
self.obj_waypoint.foreground = 1;
self.obj_waypoint setWaypoint(1, level.obj_waypoint_icon); self.obj_waypoint setWaypoint(1, level.obj_waypoint_icon);
self thread obj_waypoint_destroy_on_end_game(); self thread obj_waypoint_destroy_on_end_game();