diff --git a/scripts/zm/_zm_reimagined.gsc b/scripts/zm/_zm_reimagined.gsc index 073c11ee..f20c743d 100644 --- a/scripts/zm/_zm_reimagined.gsc +++ b/scripts/zm/_zm_reimagined.gsc @@ -3061,6 +3061,16 @@ should_respawn() return 0; } +setclientdvarall(dvar, value) +{ + players = get_players(); + + foreach (player in players) + { + player setclientdvar(dvar, value); + } +} + remove_status_icons_on_intermission() { level waittill("intermission"); diff --git a/scripts/zm/replaced/_zm_game_module.gsc b/scripts/zm/replaced/_zm_game_module.gsc index 0a013464..c26ac411 100644 --- a/scripts/zm/replaced/_zm_game_module.gsc +++ b/scripts/zm/replaced/_zm_game_module.gsc @@ -182,6 +182,7 @@ round_end(winner) level.snr_round_number++; setDvar("ui_round_number", level.snr_round_number); + scripts\zm\_zm_reimagined::setclientdvarall("ui_round_number", getdvarint("ui_round_number")); level thread maps\mp\zombies\_zm_audio_announcer::leaderdialog("grief_restarted"); diff --git a/scripts/zm/zgrief/zgrief_reimagined.csc b/scripts/zm/zgrief/zgrief_reimagined.csc new file mode 100644 index 00000000..d8c943fb --- /dev/null +++ b/scripts/zm/zgrief/zgrief_reimagined.csc @@ -0,0 +1,14 @@ +#include clientscripts\mp\_utility; +#include clientscripts\mp\zombies\_zm_utility; + +init() +{ + init_dvars(); +} + +init_dvars() +{ + setdvar("ui_gametype_obj", ""); + setdvar("ui_gametype_pro", 0); + setdvar("ui_round_number", 0); +} \ No newline at end of file diff --git a/scripts/zm/zgrief/zgrief_reimagined.gsc b/scripts/zm/zgrief/zgrief_reimagined.gsc index f7cd740b..1380e240 100644 --- a/scripts/zm/zgrief/zgrief_reimagined.gsc +++ b/scripts/zm/zgrief/zgrief_reimagined.gsc @@ -541,6 +541,10 @@ powerup_fade_over_time() grief_onplayerconnect() { + self setclientdvar("ui_gametype_obj", getdvar("ui_gametype_obj")); + self setclientdvar("ui_gametype_pro", getdvarint("ui_gametype_pro")); + self setclientdvar("ui_round_number", getdvarint("ui_round_number")); + self thread on_player_spawned(); self thread on_player_spectate(); self thread on_player_downed(); diff --git a/ui_mp/t6/hud/scoreboard.lua b/ui_mp/t6/hud/scoreboard.lua index 18f9679b..c1480e5a 100644 --- a/ui_mp/t6/hud/scoreboard.lua +++ b/ui_mp/t6/hud/scoreboard.lua @@ -101,7 +101,11 @@ function GetGameModeDisplayName() if UIExpression.DvarString(nil, "ui_gametype") == "zclassic" then return Engine.Localize("ZMUI_ZCLASSIC_GAMEMODE") elseif UIExpression.DvarString(nil, "ui_gametype") == "zgrief" then - return Engine.Localize("ZMUI_" .. UIExpression.DvarString(nil, "ui_gametype_obj")) + if UIExpression.DvarInt(nil, "ui_gametype_pro") == 1 then + return Engine.Localize("ZMUI_" .. UIExpression.DvarString(nil, "ui_gametype_obj") .. "_PRO") + else + return Engine.Localize("ZMUI_" .. UIExpression.DvarString(nil, "ui_gametype_obj")) + end end return Engine.Localize("ZMUI_" .. UIExpression.DvarString(nil, "ui_gametype")) diff --git a/zone_source/includes/clientscripts.zone b/zone_source/includes/clientscripts.zone index bb2e3462..d98bc084 100644 --- a/zone_source/includes/clientscripts.zone +++ b/zone_source/includes/clientscripts.zone @@ -1,4 +1,5 @@ script,scripts/zm/_zm_reimagined.csc script,scripts/zm/zm_buried/zm_buried_reimagined.csc +script,scripts/zm/zgrief/zgrief_reimagined.csc script,scripts/zm/replaced/_zm.csc script,scripts/zm/replaced/_zm_weapons.csc \ No newline at end of file