1
0
mirror of https://github.com/JezuzLizard/BO2-Reimagined.git synced 2025-06-11 15:48:05 -05:00

Grief: friendly team score HUD always on left

This commit is contained in:
Jbleezy
2022-01-06 05:47:50 -08:00
parent 8f8f408ac3
commit 2006e84f0c
2 changed files with 107 additions and 53 deletions

View File

@ -131,7 +131,8 @@ round_end(winner, force_win)
if(isDefined(winner)) if(isDefined(winner))
{ {
level.grief_score[winner]++; level.grief_score[winner]++;
level.grief_hud.score[team] setValue(level.grief_score[winner]); level.grief_hud.team["axis"].score[team] setValue(level.grief_score[winner]);
level.grief_hud.team["allies"].score[team] setValue(level.grief_score[winner]);
setteamscore(team, level.grief_score[winner]); setteamscore(team, level.grief_score[winner]);
if(level.grief_score[winner] == level.grief_winning_score || force_win) if(level.grief_score[winner] == level.grief_winning_score || force_win)

View File

@ -111,11 +111,12 @@ set_team()
grief_score_hud() grief_score_hud()
{ {
level.grief_hud = spawnstruct(); level.grief_hud = spawnStruct();
level.grief_hud.icon = []; level.grief_hud.team = [];
level.grief_hud.score = []; level.grief_hud.team["axis"] = spawnStruct();
icon = []; level.grief_hud.team["allies"] = spawnStruct();
icon = [];
icon["axis"] = "faction_cia"; icon["axis"] = "faction_cia";
icon["allies"] = "faction_cdc"; icon["allies"] = "faction_cdc";
if(level.script == "zm_prison") if(level.script == "zm_prison")
@ -124,60 +125,112 @@ grief_score_hud()
icon["allies"] = "faction_guards"; icon["allies"] = "faction_guards";
} }
level.grief_hud.icon["axis"] = newHudElem(); level.grief_hud.team["axis"].icon["axis"] = newTeamHudElem("axis");
level.grief_hud.icon["axis"].alignx = "center"; level.grief_hud.team["axis"].icon["axis"].alignx = "center";
level.grief_hud.icon["axis"].aligny = "top"; level.grief_hud.team["axis"].icon["axis"].aligny = "top";
level.grief_hud.icon["axis"].horzalign = "user_center"; level.grief_hud.team["axis"].icon["axis"].horzalign = "user_center";
level.grief_hud.icon["axis"].vertalign = "user_top"; level.grief_hud.team["axis"].icon["axis"].vertalign = "user_top";
level.grief_hud.icon["axis"].x += 67.5; level.grief_hud.team["axis"].icon["axis"].x -= 67.5;
level.grief_hud.icon["axis"].y += 2; level.grief_hud.team["axis"].icon["axis"].y += 2;
level.grief_hud.icon["axis"].hideWhenInMenu = 1; level.grief_hud.team["axis"].icon["axis"].hideWhenInMenu = 1;
level.grief_hud.icon["axis"].alpha = 0; level.grief_hud.team["axis"].icon["axis"].alpha = 0;
level.grief_hud.icon["axis"] setShader(icon["axis"], 32, 32); level.grief_hud.team["axis"].icon["axis"] setShader(icon["axis"], 32, 32);
level.grief_hud.icon["allies"] = newHudElem(); level.grief_hud.team["axis"].icon["allies"] = newTeamHudElem("axis");
level.grief_hud.icon["allies"].alignx = "center"; level.grief_hud.team["axis"].icon["allies"].alignx = "center";
level.grief_hud.icon["allies"].aligny = "top"; level.grief_hud.team["axis"].icon["allies"].aligny = "top";
level.grief_hud.icon["allies"].horzalign = "user_center"; level.grief_hud.team["axis"].icon["allies"].horzalign = "user_center";
level.grief_hud.icon["allies"].vertalign = "user_top"; level.grief_hud.team["axis"].icon["allies"].vertalign = "user_top";
level.grief_hud.icon["allies"].x -= 67.5; level.grief_hud.team["axis"].icon["allies"].x += 67.5;
level.grief_hud.icon["allies"].y += 2; level.grief_hud.team["axis"].icon["allies"].y += 2;
level.grief_hud.icon["allies"].hideWhenInMenu = 1; level.grief_hud.team["axis"].icon["allies"].hideWhenInMenu = 1;
level.grief_hud.icon["allies"].alpha = 0; level.grief_hud.team["axis"].icon["allies"].alpha = 0;
level.grief_hud.icon["allies"] setShader(icon["allies"], 32, 32); level.grief_hud.team["axis"].icon["allies"] setShader(icon["allies"], 32, 32);
level.grief_hud.score["axis"] = newHudElem(); level.grief_hud.team["axis"].score["axis"] = newTeamHudElem("axis");
level.grief_hud.score["axis"].alignx = "center"; level.grief_hud.team["axis"].score["axis"].alignx = "center";
level.grief_hud.score["axis"].aligny = "top"; level.grief_hud.team["axis"].score["axis"].aligny = "top";
level.grief_hud.score["axis"].horzalign = "user_center"; level.grief_hud.team["axis"].score["axis"].horzalign = "user_center";
level.grief_hud.score["axis"].vertalign = "user_top"; level.grief_hud.team["axis"].score["axis"].vertalign = "user_top";
level.grief_hud.score["axis"].x += 22.5; level.grief_hud.team["axis"].score["axis"].x -= 22.5;
level.grief_hud.score["axis"].y -= 4; level.grief_hud.team["axis"].score["axis"].y -= 4;
level.grief_hud.score["axis"].fontscale = 3.5; level.grief_hud.team["axis"].score["axis"].fontscale = 3.5;
level.grief_hud.score["axis"].color = (0.21, 0, 0); level.grief_hud.team["axis"].score["axis"].color = (0.21, 0, 0);
level.grief_hud.score["axis"].hideWhenInMenu = 1; level.grief_hud.team["axis"].score["axis"].hideWhenInMenu = 1;
level.grief_hud.score["axis"].alpha = 0; level.grief_hud.team["axis"].score["axis"].alpha = 0;
level.grief_hud.score["axis"] setValue(0); level.grief_hud.team["axis"].score["axis"] setValue(0);
level.grief_hud.score["allies"] = newHudElem(); level.grief_hud.team["axis"].score["allies"] = newTeamHudElem("axis");
level.grief_hud.score["allies"].alignx = "center"; level.grief_hud.team["axis"].score["allies"].alignx = "center";
level.grief_hud.score["allies"].aligny = "top"; level.grief_hud.team["axis"].score["allies"].aligny = "top";
level.grief_hud.score["allies"].horzalign = "user_center"; level.grief_hud.team["axis"].score["allies"].horzalign = "user_center";
level.grief_hud.score["allies"].vertalign = "user_top"; level.grief_hud.team["axis"].score["allies"].vertalign = "user_top";
level.grief_hud.score["allies"].x -= 22.5; level.grief_hud.team["axis"].score["allies"].x += 22.5;
level.grief_hud.score["allies"].y -= 4; level.grief_hud.team["axis"].score["allies"].y -= 4;
level.grief_hud.score["allies"].fontscale = 3.5; level.grief_hud.team["axis"].score["allies"].fontscale = 3.5;
level.grief_hud.score["allies"].color = (0.21, 0, 0); level.grief_hud.team["axis"].score["allies"].color = (0.21, 0, 0);
level.grief_hud.score["allies"].hideWhenInMenu = 1; level.grief_hud.team["axis"].score["allies"].hideWhenInMenu = 1;
level.grief_hud.score["allies"].alpha = 0; level.grief_hud.team["axis"].score["allies"].alpha = 0;
level.grief_hud.score["allies"] setValue(0); level.grief_hud.team["axis"].score["allies"] setValue(0);
level.grief_hud.team["allies"].icon["axis"] = newTeamHudElem("allies");
level.grief_hud.team["allies"].icon["axis"].alignx = "center";
level.grief_hud.team["allies"].icon["axis"].aligny = "top";
level.grief_hud.team["allies"].icon["axis"].horzalign = "user_center";
level.grief_hud.team["allies"].icon["axis"].vertalign = "user_top";
level.grief_hud.team["allies"].icon["axis"].x += 67.5;
level.grief_hud.team["allies"].icon["axis"].y += 2;
level.grief_hud.team["allies"].icon["axis"].hideWhenInMenu = 1;
level.grief_hud.team["allies"].icon["axis"].alpha = 0;
level.grief_hud.team["allies"].icon["axis"] setShader(icon["axis"], 32, 32);
level.grief_hud.team["allies"].icon["allies"] = newTeamHudElem("allies");
level.grief_hud.team["allies"].icon["allies"].alignx = "center";
level.grief_hud.team["allies"].icon["allies"].aligny = "top";
level.grief_hud.team["allies"].icon["allies"].horzalign = "user_center";
level.grief_hud.team["allies"].icon["allies"].vertalign = "user_top";
level.grief_hud.team["allies"].icon["allies"].x -= 67.5;
level.grief_hud.team["allies"].icon["allies"].y += 2;
level.grief_hud.team["allies"].icon["allies"].hideWhenInMenu = 1;
level.grief_hud.team["allies"].icon["allies"].alpha = 0;
level.grief_hud.team["allies"].icon["allies"] setShader(icon["allies"], 32, 32);
level.grief_hud.team["allies"].score["axis"] = newTeamHudElem("allies");
level.grief_hud.team["allies"].score["axis"].alignx = "center";
level.grief_hud.team["allies"].score["axis"].aligny = "top";
level.grief_hud.team["allies"].score["axis"].horzalign = "user_center";
level.grief_hud.team["allies"].score["axis"].vertalign = "user_top";
level.grief_hud.team["allies"].score["axis"].x += 22.5;
level.grief_hud.team["allies"].score["axis"].y -= 4;
level.grief_hud.team["allies"].score["axis"].fontscale = 3.5;
level.grief_hud.team["allies"].score["axis"].color = (0.21, 0, 0);
level.grief_hud.team["allies"].score["axis"].hideWhenInMenu = 1;
level.grief_hud.team["allies"].score["axis"].alpha = 0;
level.grief_hud.team["allies"].score["axis"] setValue(0);
level.grief_hud.team["allies"].score["allies"] = newTeamHudElem("allies");
level.grief_hud.team["allies"].score["allies"].alignx = "center";
level.grief_hud.team["allies"].score["allies"].aligny = "top";
level.grief_hud.team["allies"].score["allies"].horzalign = "user_center";
level.grief_hud.team["allies"].score["allies"].vertalign = "user_top";
level.grief_hud.team["allies"].score["allies"].x -= 22.5;
level.grief_hud.team["allies"].score["allies"].y -= 4;
level.grief_hud.team["allies"].score["allies"].fontscale = 3.5;
level.grief_hud.team["allies"].score["allies"].color = (0.21, 0, 0);
level.grief_hud.team["allies"].score["allies"].hideWhenInMenu = 1;
level.grief_hud.team["allies"].score["allies"].alpha = 0;
level.grief_hud.team["allies"].score["allies"] setValue(0);
flag_wait( "initial_blackscreen_passed" ); flag_wait( "initial_blackscreen_passed" );
level.grief_hud.icon["axis"].alpha = 1; level.grief_hud.team["axis"].icon["axis"].alpha = 1;
level.grief_hud.icon["allies"].alpha = 1; level.grief_hud.team["axis"].icon["allies"].alpha = 1;
level.grief_hud.score["axis"].alpha = 1; level.grief_hud.team["axis"].score["axis"].alpha = 1;
level.grief_hud.score["allies"].alpha = 1; level.grief_hud.team["axis"].score["allies"].alpha = 1;
level.grief_hud.team["allies"].icon["axis"].alpha = 1;
level.grief_hud.team["allies"].icon["allies"].alpha = 1;
level.grief_hud.team["allies"].score["axis"].alpha = 1;
level.grief_hud.team["allies"].score["allies"].alpha = 1;
} }
set_grief_vars() set_grief_vars()