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

Use map menu images for map vote

Add correct sort to map vote text HUD
Add fade to Power Station menu image
This commit is contained in:
Jbleezy 2024-01-24 21:37:00 -08:00
parent c32cb4ab1f
commit 8c5df96cd8
6 changed files with 125 additions and 39 deletions

View File

@ -15,6 +15,18 @@ if %ERRORLEVEL% NEQ 0 pause
"%OAT_BASE%\Linker.exe" ^
--load "%cd%\zone_source\common_mp.ff" ^
--load "%OAT_GAME%\zone\all\patch_ui_zm.ff" ^
--load "%OAT_GAME%\zone\all\ui_zm.ff" ^
--base-folder "%OAT_BASE%" ^
--asset-search-path "%cd%" ^
--source-search-path "%cd%\zone_source" ^
--output-folder "%cd%\zone_source" common_zm
if %ERRORLEVEL% NEQ 0 pause
"%OAT_BASE%\Linker.exe" ^
--load "%cd%\zone_source\common_mp.ff" ^
--load "%cd%\zone_source\common_zm.ff" ^
--load "%OAT_GAME%\zone\all\zm_transit_patch.ff" ^
--load "%OAT_GAME%\zone\all\zm_transit.ff" ^
--base-folder "%OAT_BASE%" ^
@ -26,6 +38,7 @@ if %ERRORLEVEL% NEQ 0 pause
"%OAT_BASE%\Linker.exe" ^
--load "%cd%\zone_source\common_mp.ff" ^
--load "%cd%\zone_source\common_zm.ff" ^
--load "%cd%\zone_source\zm_transit.ff" ^
--load "%OAT_GAME%\zone\all\zm_nuked_patch.ff" ^
--load "%OAT_GAME%\zone\all\zm_nuked.ff" ^
@ -38,6 +51,7 @@ if %ERRORLEVEL% NEQ 0 pause
"%OAT_BASE%\Linker.exe" ^
--load "%cd%\zone_source\common_mp.ff" ^
--load "%cd%\zone_source\common_zm.ff" ^
--load "%cd%\zone_source\zm_transit.ff" ^
--load "%cd%\zone_source\zm_nuked.ff" ^
--load "%OAT_GAME%\zone\all\zm_highrise_patch.ff" ^
@ -51,6 +65,7 @@ if %ERRORLEVEL% NEQ 0 pause
"%OAT_BASE%\Linker.exe" ^
--load "%cd%\zone_source\common_mp.ff" ^
--load "%cd%\zone_source\common_zm.ff" ^
--load "%cd%\zone_source\zm_transit.ff" ^
--load "%cd%\zone_source\zm_nuked.ff" ^
--load "%cd%\zone_source\zm_highrise.ff" ^
@ -67,6 +82,7 @@ if %ERRORLEVEL% NEQ 0 pause
"%OAT_BASE%\Linker.exe" ^
--load "%cd%\zone_source\common_mp.ff" ^
--load "%cd%\zone_source\common_zm.ff" ^
--load "%cd%\zone_source\zm_transit.ff" ^
--load "%cd%\zone_source\zm_nuked.ff" ^
--load "%cd%\zone_source\zm_highrise.ff" ^
@ -83,6 +99,7 @@ if %ERRORLEVEL% NEQ 0 pause
"%OAT_BASE%\Linker.exe" ^
--load "%cd%\zone_source\common_mp.ff" ^
--load "%cd%\zone_source\common_zm.ff" ^
--load "%cd%\zone_source\zm_transit.ff" ^
--load "%cd%\zone_source\zm_nuked.ff" ^
--load "%cd%\zone_source\zm_highrise.ff" ^
@ -99,6 +116,7 @@ if %ERRORLEVEL% NEQ 0 pause
"%OAT_BASE%\Linker.exe" ^
--load "%cd%\zone_source\common_mp.ff" ^
--load "%cd%\zone_source\common_zm.ff" ^
--load "%cd%\zone_source\zm_transit.ff" ^
--load "%cd%\zone_source\zm_nuked.ff" ^
--load "%cd%\zone_source\zm_highrise.ff" ^

View File

@ -13,21 +13,19 @@ init()
precache_shaders()
{
precacheshader("menu_zm_popup");
precacheshader("loadscreen_zm_transit_zclassic_transit");
precacheshader("loadscreen_zm_highrise_zclassic_rooftop");
precacheshader("loadscreen_zm_prison_zclassic_prison");
precacheshader("loadscreen_zm_buried_zclassic_processing");
precacheshader("loadscreen_zm_tomb_zclassic_tomb");
precacheshader("loadscreen_zm_transit_zstandard_transit");
precacheshader("loadscreen_zm_transit_zstandard_farm");
precacheshader("loadscreen_zm_transit_zstandard_town");
precacheshader("loadscreen_zm_nuked_zstandard_nuked");
precacheshader("loadscreen_zm_transit_zgrief_transit");
precacheshader("loadscreen_zm_transit_zgrief_farm");
precacheshader("loadscreen_zm_transit_zgrief_town");
precacheshader("loadscreen_zm_prison_zgrief_cellblock");
precacheshader("loadscreen_zm_buried_zgrief_street");
precacheshader("loadscreen_zm_transit_dr_zcleansed_diner");
precacheshader("menu_zm_transit_zclassic_transit");
precacheshader("menu_zm_highrise_zclassic_rooftop");
precacheshader("menu_zm_prison_zclassic_prison");
precacheshader("menu_zm_buried_zclassic_processing");
precacheshader("menu_zm_tomb_zclassic_tomb");
precacheshader("menu_zm_transit_zsurvival_transit");
precacheshader("menu_zm_transit_zsurvival_diner");
precacheshader("menu_zm_transit_zsurvival_farm");
precacheshader("menu_zm_transit_zsurvival_town");
precacheshader("menu_zm_nuked_zsurvival_nuked");
precacheshader("menu_zm_prison_zencounter_cellblock");
precacheshader("menu_zm_buried_zencounter_street");
precacheshader("menu_zm_map_transit_blit_power");
}
random_map_rotation()
@ -318,7 +316,7 @@ create_map_image_hud(image, x, y)
hud.sort = -1;
hud.foreground = 1;
hud.alpha = 1;
hud setShader(image, 175, 85);
hud setShader(image, 180, 95);
return hud;
}
@ -334,6 +332,7 @@ create_map_name_hud(name, x, y)
hud.vertalign = "middle";
hud.alignx = "center";
hud.aligny = "middle";
hud.sort = 1;
hud.foreground = 1;
hud.alpha = 1;
hud setText(name);
@ -352,6 +351,7 @@ create_map_gametype_hud(name, x, y)
hud.vertalign = "middle";
hud.alignx = "center";
hud.aligny = "middle";
hud.sort = 1;
hud.foreground = 1;
hud.alpha = 1;
hud setText(name);
@ -370,6 +370,7 @@ create_map_vote_count_hud(x, y)
hud.vertalign = "middle";
hud.alignx = "center";
hud.aligny = "middle";
hud.sort = 1;
hud.foreground = 1;
hud.alpha = 1;
hud setValue(0);
@ -731,28 +732,64 @@ get_name_for_loc(map, location, gametype)
get_image_for_loc(map, location, gametype)
{
if (location == "diner")
gamemode = get_gamemode_for_gametype(gametype);
if (location == "power")
{
return "loadscreen_zm_transit_dr_zcleansed_diner";
}
else if (location == "power" || location == "tunnel" || location == "cornfield")
{
return "loadscreen_zm_transit_zstandard_transit";
}
else if (location == "nuked")
{
return "loadscreen_zm_nuked_zstandard_nuked";
}
else if (location == "docks")
{
return "loadscreen_zm_prison_zgrief_cellblock";
}
else if (location == "maze")
{
return "loadscreen_zm_buried_zgrief_street";
return "menu_zm_map_transit_blit_power";
}
return "loadscreen_" + map + "_" + gametype + "_" + location;
if (map == "zm_transit" && gamemode != "zclassic")
{
gamemode = "zsurvival";
}
if (location == "diner")
{
gamemode = "zencounter";
}
if (location == "tunnel" || location == "cornfield")
{
gamemode = "zsurvival";
location = "transit";
}
if (location == "nuked")
{
gamemode = "zsurvival";
}
if (location == "cellblock" || location == "docks")
{
gamemode = "zencounter";
location = "cellblock";
}
if (location == "street" || location == "maze")
{
gamemode = "zencounter";
location = "street";
}
return "menu_" + map + "_" + gamemode + "_" + location;
}
get_gamemode_for_gametype(gametype)
{
gamemode = "zclassic";
if (gametype == "zstandard")
{
gamemode = "zsurvival";
}
if (gametype == "zgrief")
{
gamemode = "zencounter";
}
return gamemode;
}
rotation_string_to_array(string)

View File

@ -261,6 +261,10 @@ CoD.MapInfoImage.ZombieUpdate = function(f6_arg0, f6_arg1, f6_arg2)
end
function GetMapMaterialName(map, gamemode, location)
if location == "power" then
return "menu_zm_map_transit_blit_power"
end
if map == "zm_transit" and gamemode ~= "zclassic" then
gamemode = "zsurvival"
end
@ -269,10 +273,6 @@ function GetMapMaterialName(map, gamemode, location)
gamemode = "zencounter"
end
if location == "power" then
return "menu_zm_map_transit_blit_power"
end
if location == "tunnel" or location == "cornfield" then
gamemode = "zsurvival"
location = "transit"

View File

@ -0,0 +1,30 @@
>game,T6
>type,fastfile
>name,common_zm
material,menu_zm_transit_zclassic_transit
material,menu_zm_highrise_zclassic_rooftop
material,menu_zm_prison_zclassic_prison
material,menu_zm_buried_zclassic_processing
material,menu_zm_tomb_zclassic_tomb
material,menu_zm_transit_zsurvival_transit
material,menu_zm_transit_zencounter_diner
material,menu_zm_transit_zsurvival_farm
material,menu_zm_transit_zsurvival_town
material,menu_zm_nuked_zsurvival_nuked
material,menu_zm_prison_zencounter_cellblock
material,menu_zm_buried_zencounter_street
material,menu_zm_map_transit_blit_power
image,menu_zm_transit_zclassic_transit
image,menu_zm_highrise_zclassic_rooftop
image,menu_zm_prison_select_mob
image,menu_zm_buried_zclassic_processing
image,menu_zm_tomb_zclassic_tomb
image,menu_zm_transit_zsurvival_transit
image,menu_zm_transit_zsurvival_diner
image,menu_zm_transit_zsurvival_farm
image,menu_zm_transit_zsurvival_town
image,menu_zm_nuketown_select
image,menu_zm_prison_select_grief_cellblock
image,menu_zm_buried_zencounter_street
image,menu_zm_map_transit_blit_power

View File

@ -3,6 +3,7 @@
>name,mod
include,common_mp
include,common_zm
include,zm_transit
include,zm_nuked
include,zm_highrise