1
0
mirror of https://github.com/JezuzLizard/BO2-Reimagined.git synced 2025-06-07 21:59:49 -05:00

HUD: make update zone name and fade in zone name separate LUI events

This commit is contained in:
Jbleezy 2024-06-02 21:02:21 -07:00
parent e0f1a70311
commit d4aa6940b3
2 changed files with 14 additions and 9 deletions

View File

@ -186,8 +186,9 @@ precache_strings()
{ {
precacheString(&"set_dvar_from_dvar"); precacheString(&"set_dvar_from_dvar");
precacheString(&"hud_update_health"); precacheString(&"hud_update_health");
precacheString(&"hud_update_zone_fade_out"); precacheString(&"hud_update_zone_name");
precacheString(&"hud_update_zone_fade_in"); precacheString(&"hud_fade_out_zone_name");
precacheString(&"hud_fade_in_zone_name");
precacheString(&"r_fog"); precacheString(&"r_fog");
precacheString(&"r_fog_settings"); precacheString(&"r_fog_settings");
@ -1044,14 +1045,15 @@ zone_name_hud()
{ {
if (vars["prev_zone_name"] != &"") if (vars["prev_zone_name"] != &"")
{ {
self luinotifyevent(&"hud_update_zone_fade_out"); self luinotifyevent(&"hud_fade_out_zone_name");
wait 0.25; wait 0.25;
} }
if (vars["zone_name"] != &"") if (vars["zone_name"] != &"")
{ {
self luinotifyevent(&"hud_update_zone_fade_in", 1, vars["zone_name"]); self luinotifyevent(&"hud_update_zone_name", 1, vars["zone_name"]);
self luinotifyevent(&"hud_fade_in_zone_name");
wait 0.25; wait 0.25;
} }

View File

@ -115,8 +115,9 @@ LUI.createMenu.ReimaginedArea = function(LocalClientIndex)
zoneNameWidget:registerEventHandler("hud_update_bit_" .. CoD.BIT_PLAYER_DEAD, CoD.Reimagined.ZoneNameArea.UpdateVisibility) zoneNameWidget:registerEventHandler("hud_update_bit_" .. CoD.BIT_PLAYER_DEAD, CoD.Reimagined.ZoneNameArea.UpdateVisibility)
zoneNameWidget:registerEventHandler("hud_update_bit_" .. CoD.BIT_IS_SCOPED, CoD.Reimagined.ZoneNameArea.UpdateVisibility) zoneNameWidget:registerEventHandler("hud_update_bit_" .. CoD.BIT_IS_SCOPED, CoD.Reimagined.ZoneNameArea.UpdateVisibility)
zoneNameWidget:registerEventHandler("hud_update_bit_" .. CoD.BIT_IS_PLAYER_ZOMBIE, CoD.Reimagined.ZoneNameArea.UpdateVisibility) zoneNameWidget:registerEventHandler("hud_update_bit_" .. CoD.BIT_IS_PLAYER_ZOMBIE, CoD.Reimagined.ZoneNameArea.UpdateVisibility)
zoneNameWidget:registerEventHandler("hud_update_zone_fade_out", CoD.Reimagined.ZoneNameArea.FadeOutZoneName) zoneNameWidget:registerEventHandler("hud_update_zone_name", CoD.Reimagined.ZoneNameArea.UpdateZoneName)
zoneNameWidget:registerEventHandler("hud_update_zone_fade_in", CoD.Reimagined.ZoneNameArea.FadeInZoneName) zoneNameWidget:registerEventHandler("hud_fade_out_zone_name", CoD.Reimagined.ZoneNameArea.FadeOutZoneName)
zoneNameWidget:registerEventHandler("hud_fade_in_zone_name", CoD.Reimagined.ZoneNameArea.FadeInZoneName)
return safeArea return safeArea
end end
@ -174,13 +175,15 @@ CoD.Reimagined.ZoneNameArea.UpdateVisibility = function(Menu, ClientInstance)
end end
end end
CoD.Reimagined.ZoneNameArea.UpdateZoneName = function(Menu, ClientInstance)
local zoneName = Engine.Localize(Engine.GetIString(ClientInstance.data[1], "CS_LOCALIZED_STRINGS"))
Menu.zoneNameText:setText(zoneName)
end
CoD.Reimagined.ZoneNameArea.FadeOutZoneName = function(Menu, ClientInstance) CoD.Reimagined.ZoneNameArea.FadeOutZoneName = function(Menu, ClientInstance)
Menu.zoneNameText:animateToState("fade_out", 250) Menu.zoneNameText:animateToState("fade_out", 250)
end end
CoD.Reimagined.ZoneNameArea.FadeInZoneName = function(Menu, ClientInstance) CoD.Reimagined.ZoneNameArea.FadeInZoneName = function(Menu, ClientInstance)
local zoneName = Engine.Localize(Engine.GetIString(ClientInstance.data[1], "CS_LOCALIZED_STRINGS"))
Menu.zoneNameText:setText(zoneName)
Menu.zoneNameText:animateToState("fade_in", 250) Menu.zoneNameText:animateToState("fade_in", 250)
end end