INSANEMODE/BO2-Reimagined
1
0
Fork 0
mirror of https://github.com/JezuzLizard/BO2-Reimagined.git synced 2025-06-07 21:59:49 -05:00
Code Issues Releases Wiki Activity

Containment and Meat: correct waypoint shader names

Browse Source
This commit is contained in:
Jbleezy 2024-01-05 20:52:46 -08:00
parent 281ac985af
commit ad2374c613
10 changed files with 37 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
images/hud_ctf_flag_icon_green.iwi → images/waypoint_target_circle.iwi
View File

0
images/waypoint_time_bomb.iwi → images/white_waypoint_capture.iwi
View File

0
images/compass_waypoint_contested.iwi → images/white_waypoint_contested.iwi
View File

0
images/waypoint_dogtags.iwi → images/white_waypoint_defend.iwi
View File

0
images/waypoint_return.iwi → images/white_waypoint_escort.iwi
View File

0
images/waypoint_flag_grab.iwi → images/white_waypoint_grab.iwi
View File

0
images/waypoint_flag_capture.iwi → images/white_waypoint_kill.iwi
View File

0
images/waypoint_recon_artillery_strike.iwi → images/white_waypoint_target.iwi
View File

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

@ -30,14 +30,14 @@ init()
return; return;
} }
precacheshader("hud_ctf_flag_icon_green"); precacheshader("waypoint_target");
precacheshader("waypoint_flag_grab"); precacheshader("white_waypoint_target");
precacheshader("waypoint_flag_capture"); precacheshader("white_waypoint_capture");
precacheshader("waypoint_return"); precacheshader("white_waypoint_defend");
precacheshader("waypoint_recon_artillery_strike"); precacheshader("white_waypoint_contested");
precacheshader("waypoint_capture"); precacheshader("white_waypoint_grab");
precacheshader("waypoint_dogtags"); precacheshader("white_waypoint_kill");
precacheshader("compass_waypoint_contested"); precacheshader("white_waypoint_escort");
if (level.script == "zm_prison") if (level.script == "zm_prison")
{ {
@ -228,7 +228,7 @@ grief_score_hud()
level.grief_score_hud[team1].obj_icon.foreground = 1; level.grief_score_hud[team1].obj_icon.foreground = 1;
level.grief_score_hud[team1].obj_icon.archived = 0; level.grief_score_hud[team1].obj_icon.archived = 0;
level.grief_score_hud[team1].obj_icon.alpha = 0; level.grief_score_hud[team1].obj_icon.alpha = 0;
level.grief_score_hud[team1].obj_icon setShader("hud_ctf_flag_icon_green", level.grief_score_hud[team1].obj_icon.width, level.grief_score_hud[team1].obj_icon.height); level.grief_score_hud[team1].obj_icon setShader("waypoint_target", level.grief_score_hud[team1].obj_icon.width, level.grief_score_hud[team1].obj_icon.height);
level.grief_score_hud[team1].obj_icon.og_x = level.grief_score_hud[team1].obj_icon.x; level.grief_score_hud[team1].obj_icon.og_x = level.grief_score_hud[team1].obj_icon.x;
@ -2550,7 +2550,7 @@ containment_think()
player containment_set_obj_waypoint_off_screen(next_zone_name, next_zone, 1); player containment_set_obj_waypoint_off_screen(next_zone_name, next_zone, 1);
} }
player containment_set_obj_waypoint_icon("waypoint_recon_artillery_strike", 1); player containment_set_obj_waypoint_icon("white_waypoint_target", 1);
} }
wait 0.05; wait 0.05;
@ -2667,7 +2667,7 @@ containment_think()
player containment_set_obj_waypoint_off_screen(next_zone_name, next_zone, 1); player containment_set_obj_waypoint_off_screen(next_zone_name, next_zone, 1);
} }
player containment_set_obj_waypoint_icon("waypoint_recon_artillery_strike", 1); player containment_set_obj_waypoint_icon("white_waypoint_target", 1);
} }
else else
{ {
@ -2705,7 +2705,7 @@ containment_think()
foreach (player in players) foreach (player in players)
{ {
player.obj_waypoint.color = (1, 1, 0); player.obj_waypoint.color = (1, 1, 0);
player containment_set_obj_waypoint_icon("compass_waypoint_contested"); player containment_set_obj_waypoint_icon("white_waypoint_contested");
} }
grief_score_hud_set_obj_icon("contested"); grief_score_hud_set_obj_icon("contested");
@ -2731,12 +2731,12 @@ containment_think()
if (player.team == "axis") if (player.team == "axis")
{ {
player.obj_waypoint.color = (0, 1, 0); player.obj_waypoint.color = (0, 1, 0);
player containment_set_obj_waypoint_icon("waypoint_dogtags"); player containment_set_obj_waypoint_icon("white_waypoint_defend");
} }
else else
{ {
player.obj_waypoint.color = (1, 0, 0); player.obj_waypoint.color = (1, 0, 0);
player containment_set_obj_waypoint_icon("waypoint_capture"); player containment_set_obj_waypoint_icon("white_waypoint_capture");
} }
} }
@ -2762,12 +2762,12 @@ containment_think()
if (player.team == "axis") if (player.team == "axis")
{ {
player.obj_waypoint.color = (1, 0, 0); player.obj_waypoint.color = (1, 0, 0);
player containment_set_obj_waypoint_icon("waypoint_capture"); player containment_set_obj_waypoint_icon("white_waypoint_capture");
} }
else else
{ {
player.obj_waypoint.color = (0, 1, 0); player.obj_waypoint.color = (0, 1, 0);
player containment_set_obj_waypoint_icon("waypoint_dogtags"); player containment_set_obj_waypoint_icon("white_waypoint_defend");
} }
} }
@ -2799,7 +2799,7 @@ containment_think()
} }
player.obj_waypoint.color = (1, 1, 1); player.obj_waypoint.color = (1, 1, 1);
player containment_set_obj_waypoint_icon("waypoint_recon_artillery_strike"); player containment_set_obj_waypoint_icon("white_waypoint_target");
} }
grief_score_hud_set_obj_icon("neutral"); grief_score_hud_set_obj_icon("neutral");
@ -3233,12 +3233,12 @@ meat_think()
if (player.team == level.meat_player.team) if (player.team == level.meat_player.team)
{ {
player.obj_waypoint.color = (0, 1, 0); player.obj_waypoint.color = (0, 1, 0);
player.obj_waypoint setWaypoint(1, "waypoint_return"); player.obj_waypoint setWaypoint(1, "white_waypoint_escort");
} }
else else
{ {
player.obj_waypoint.color = (1, 0, 0); player.obj_waypoint.color = (1, 0, 0);
player.obj_waypoint setWaypoint(1, "waypoint_flag_capture"); player.obj_waypoint setWaypoint(1, "white_waypoint_kill");
} }
player.obj_waypoint setTargetEnt(level.meat_player.head_icon_origin); player.obj_waypoint setTargetEnt(level.meat_player.head_icon_origin);
@ -3278,7 +3278,7 @@ meat_think()
{ {
player.obj_waypoint.alpha = 1; player.obj_waypoint.alpha = 1;
player.obj_waypoint.color = (1, 1, 1); player.obj_waypoint.color = (1, 1, 1);
player.obj_waypoint setWaypoint(1, "waypoint_flag_grab"); player.obj_waypoint setWaypoint(1, "white_waypoint_grab");
player.obj_waypoint setTargetEnt(level.item_meat.obj_waypoint_origin); player.obj_waypoint setTargetEnt(level.item_meat.obj_waypoint_origin);
} }
} }
@ -3298,7 +3298,7 @@ meat_think()
{ {
player.obj_waypoint.alpha = 1; player.obj_waypoint.alpha = 1;
player.obj_waypoint.color = (1, 1, 1); player.obj_waypoint.color = (1, 1, 1);
player.obj_waypoint setWaypoint(1, "waypoint_flag_grab"); player.obj_waypoint setWaypoint(1, "white_waypoint_grab");
player.obj_waypoint setTargetEnt(level.meat_powerup.obj_waypoint_origin); player.obj_waypoint setTargetEnt(level.meat_powerup.obj_waypoint_origin);
} }
} }

35
zone_source/includes/materials.zone
View File

@ -12,16 +12,14 @@ material,hud_obit_case
material,hud_obit_dogs material,hud_obit_dogs
material,hud_obit_hind material,hud_obit_hind
material,tactical_gren_reticle material,tactical_gren_reticle
material,waypoint_target
material,hud_ctf_flag_icon_green material,white_waypoint_target
material,waypoint_flag_grab material,white_waypoint_capture
material,waypoint_flag_capture material,white_waypoint_defend
material,waypoint_return material,white_waypoint_contested
material,waypoint_recon_artillery_strike material,white_waypoint_grab
material,waypoint_capture material,white_waypoint_escort
material,waypoint_dogtags material,white_waypoint_kill
material,compass_waypoint_contested
image,cac_mods_tact_knife image,cac_mods_tact_knife
image,hud_obit_turret image,hud_obit_turret
image,hud_obit_hk_drone image,hud_obit_hk_drone
@ -36,12 +34,11 @@ image,hud_obit_case
image,hud_obit_dogs image,hud_obit_dogs
image,hud_obit_hind image,hud_obit_hind
image,tactical_gren_reticle image,tactical_gren_reticle
image,waypoint_target_circle
image,hud_ctf_flag_icon_green image,white_waypoint_target
image,waypoint_flag_grab image,white_waypoint_capture
image,waypoint_flag_capture image,white_waypoint_defend
image,waypoint_return image,white_waypoint_contested
image,waypoint_recon_artillery_strike image,white_waypoint_grab
image,waypoint_capture image,white_waypoint_escort
image,waypoint_dogtags image,white_waypoint_kill
image,compass_waypoint_contested