From ad2374c6135dd8fcb9613d56ac7303bd4ee31a13 Mon Sep 17 00:00:00 2001 From: Jbleezy Date: Fri, 5 Jan 2024 20:52:46 -0800 Subject: [PATCH] Containment and Meat: correct waypoint shader names --- ...n_green.iwi => waypoint_target_circle.iwi} | Bin ...me_bomb.iwi => white_waypoint_capture.iwi} | Bin ...ested.iwi => white_waypoint_contested.iwi} | Bin ..._dogtags.iwi => white_waypoint_defend.iwi} | Bin ...t_return.iwi => white_waypoint_escort.iwi} | Bin ..._flag_grab.iwi => white_waypoint_grab.iwi} | Bin ...ag_capture.iwi => white_waypoint_kill.iwi} | Bin ...y_strike.iwi => white_waypoint_target.iwi} | Bin scripts/zm/zgrief/zgrief_reimagined.gsc | 42 +++++++++--------- zone_source/includes/materials.zone | 35 +++++++-------- 10 files changed, 37 insertions(+), 40 deletions(-) rename images/{hud_ctf_flag_icon_green.iwi => waypoint_target_circle.iwi} (100%) rename images/{waypoint_time_bomb.iwi => white_waypoint_capture.iwi} (100%) rename images/{compass_waypoint_contested.iwi => white_waypoint_contested.iwi} (100%) rename images/{waypoint_dogtags.iwi => white_waypoint_defend.iwi} (100%) rename images/{waypoint_return.iwi => white_waypoint_escort.iwi} (100%) rename images/{waypoint_flag_grab.iwi => white_waypoint_grab.iwi} (100%) rename images/{waypoint_flag_capture.iwi => white_waypoint_kill.iwi} (100%) rename images/{waypoint_recon_artillery_strike.iwi => white_waypoint_target.iwi} (100%) diff --git a/images/hud_ctf_flag_icon_green.iwi b/images/waypoint_target_circle.iwi similarity index 100% rename from images/hud_ctf_flag_icon_green.iwi rename to images/waypoint_target_circle.iwi diff --git a/images/waypoint_time_bomb.iwi b/images/white_waypoint_capture.iwi similarity index 100% rename from images/waypoint_time_bomb.iwi rename to images/white_waypoint_capture.iwi diff --git a/images/compass_waypoint_contested.iwi b/images/white_waypoint_contested.iwi similarity index 100% rename from images/compass_waypoint_contested.iwi rename to images/white_waypoint_contested.iwi diff --git a/images/waypoint_dogtags.iwi b/images/white_waypoint_defend.iwi similarity index 100% rename from images/waypoint_dogtags.iwi rename to images/white_waypoint_defend.iwi diff --git a/images/waypoint_return.iwi b/images/white_waypoint_escort.iwi similarity index 100% rename from images/waypoint_return.iwi rename to images/white_waypoint_escort.iwi diff --git a/images/waypoint_flag_grab.iwi b/images/white_waypoint_grab.iwi similarity index 100% rename from images/waypoint_flag_grab.iwi rename to images/white_waypoint_grab.iwi diff --git a/images/waypoint_flag_capture.iwi b/images/white_waypoint_kill.iwi similarity index 100% rename from images/waypoint_flag_capture.iwi rename to images/white_waypoint_kill.iwi diff --git a/images/waypoint_recon_artillery_strike.iwi b/images/white_waypoint_target.iwi similarity index 100% rename from images/waypoint_recon_artillery_strike.iwi rename to images/white_waypoint_target.iwi diff --git a/scripts/zm/zgrief/zgrief_reimagined.gsc b/scripts/zm/zgrief/zgrief_reimagined.gsc index 1380e240..df65c993 100644 --- a/scripts/zm/zgrief/zgrief_reimagined.gsc +++ b/scripts/zm/zgrief/zgrief_reimagined.gsc @@ -30,14 +30,14 @@ init() return; } - precacheshader("hud_ctf_flag_icon_green"); - precacheshader("waypoint_flag_grab"); - precacheshader("waypoint_flag_capture"); - precacheshader("waypoint_return"); - precacheshader("waypoint_recon_artillery_strike"); - precacheshader("waypoint_capture"); - precacheshader("waypoint_dogtags"); - precacheshader("compass_waypoint_contested"); + precacheshader("waypoint_target"); + precacheshader("white_waypoint_target"); + precacheshader("white_waypoint_capture"); + precacheshader("white_waypoint_defend"); + precacheshader("white_waypoint_contested"); + precacheshader("white_waypoint_grab"); + precacheshader("white_waypoint_kill"); + precacheshader("white_waypoint_escort"); 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.archived = 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; @@ -2550,7 +2550,7 @@ containment_think() 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; @@ -2667,7 +2667,7 @@ containment_think() 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 { @@ -2705,7 +2705,7 @@ containment_think() foreach (player in players) { 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"); @@ -2731,12 +2731,12 @@ containment_think() if (player.team == "axis") { 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 { 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") { 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 { 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 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"); @@ -3233,12 +3233,12 @@ meat_think() if (player.team == level.meat_player.team) { player.obj_waypoint.color = (0, 1, 0); - player.obj_waypoint setWaypoint(1, "waypoint_return"); + player.obj_waypoint setWaypoint(1, "white_waypoint_escort"); } else { 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); @@ -3278,7 +3278,7 @@ meat_think() { player.obj_waypoint.alpha = 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); } } @@ -3298,7 +3298,7 @@ meat_think() { player.obj_waypoint.alpha = 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); } } diff --git a/zone_source/includes/materials.zone b/zone_source/includes/materials.zone index 8aa457ba..6ee0888e 100644 --- a/zone_source/includes/materials.zone +++ b/zone_source/includes/materials.zone @@ -12,16 +12,14 @@ material,hud_obit_case material,hud_obit_dogs material,hud_obit_hind material,tactical_gren_reticle - -material,hud_ctf_flag_icon_green -material,waypoint_flag_grab -material,waypoint_flag_capture -material,waypoint_return -material,waypoint_recon_artillery_strike -material,waypoint_capture -material,waypoint_dogtags -material,compass_waypoint_contested - +material,waypoint_target +material,white_waypoint_target +material,white_waypoint_capture +material,white_waypoint_defend +material,white_waypoint_contested +material,white_waypoint_grab +material,white_waypoint_escort +material,white_waypoint_kill image,cac_mods_tact_knife image,hud_obit_turret image,hud_obit_hk_drone @@ -36,12 +34,11 @@ image,hud_obit_case image,hud_obit_dogs image,hud_obit_hind image,tactical_gren_reticle - -image,hud_ctf_flag_icon_green -image,waypoint_flag_grab -image,waypoint_flag_capture -image,waypoint_return -image,waypoint_recon_artillery_strike -image,waypoint_capture -image,waypoint_dogtags -image,compass_waypoint_contested \ No newline at end of file +image,waypoint_target_circle +image,white_waypoint_target +image,white_waypoint_capture +image,white_waypoint_defend +image,white_waypoint_contested +image,white_waypoint_grab +image,white_waypoint_escort +image,white_waypoint_kill \ No newline at end of file