diff --git a/README.md b/README.md index 8d932f92..5d7b1bb2 100644 --- a/README.md +++ b/README.md @@ -758,6 +758,7 @@ * Initial perk no longer always spawns in the starting area in solo * Initial perk spawns at round 1 in coop * Perks spawn every 5 rounds +* Increased intermission time from 7.5 seconds to 15 seconds ### Die Rise * Removed key diff --git a/scripts/zm/replaced/_zm_gametype.gsc b/scripts/zm/replaced/_zm_gametype.gsc index 1b433459..244bf0d0 100644 --- a/scripts/zm/replaced/_zm_gametype.gsc +++ b/scripts/zm/replaced/_zm_gametype.gsc @@ -535,6 +535,7 @@ head_icon_create() hud setShader(game["icons"][self.team], 6, 6); hud setWaypoint(1); hud setTargetEnt(self.head_icon_origin); + hud thread scripts\zm\_zm_reimagined::destroy_on_intermission(); if (is_player_valid(self)) { diff --git a/scripts/zm/replaced/zm_nuked.gsc b/scripts/zm/replaced/zm_nuked.gsc index cd2bde45..dc8842a5 100644 --- a/scripts/zm/replaced/zm_nuked.gsc +++ b/scripts/zm/replaced/zm_nuked.gsc @@ -87,4 +87,51 @@ give_team_characters() self setmovespeedscale(1); self setsprintduration(4); self setsprintcooldown(0); +} + +moon_rocket_follow_path() +{ + rocket_start_struct = getstruct("inertmission_rocket_start", "targetname"); + rocket_end_struct = getstruct("inertmission_rocket_end", "targetname"); + rocket_cam_start_struct = getstruct("intermission_rocket_cam_start", "targetname"); + rocket_cam_end_struct = getstruct("intermission_rocket_cam_end", "targetname"); + rocket_camera_ent = spawn("script_model", rocket_cam_start_struct.origin); + rocket_camera_ent.angles = rocket_cam_start_struct.angles; + rocket = getent("intermission_rocket", "targetname"); + rocket show(); + rocket.origin = rocket_start_struct.origin; + camera = spawn("script_model", rocket_cam_start_struct.origin); + camera.angles = rocket_cam_start_struct.angles; + camera setmodel("tag_origin"); + exploder(676); + players = get_players(); + + foreach (player in players) + { + player setclientuivisibilityflag("hud_visible", 0); + player thread player_rocket_rumble(); + player thread intermission_rocket_blur(); + player setdepthoffield(0, 128, 7000, 10000, 6, 1.8); + player camerasetposition(camera); + player camerasetlookat(); + player cameraactivate(1); + } + + rocket moveto(rocket_end_struct.origin, 16.5); + rocket rotateto(rocket_end_struct.angles, 18.5); + camera moveto(rocket_cam_end_struct.origin, 16.5); + camera rotateto(rocket_cam_end_struct.angles, 15.5); + playfxontag(level._effect["rocket_entry"], rocket, "tag_fx"); + playfxontag(level._effect["rocket_entry_light"], rocket, "tag_fx"); + wait 15; + flag_set("rocket_hit_nuketown"); +} + +sndgameend() +{ + level waittill("intermission"); + + wait 7.5; + + playsoundatposition("zmb_endgame", (0, 0, 0)); } \ No newline at end of file diff --git a/scripts/zm/zm_nuked/zm_nuked_reimagined.gsc b/scripts/zm/zm_nuked/zm_nuked_reimagined.gsc index 6cbee69c..daf29f85 100644 --- a/scripts/zm/zm_nuked/zm_nuked_reimagined.gsc +++ b/scripts/zm/zm_nuked/zm_nuked_reimagined.gsc @@ -5,6 +5,8 @@ main() { replaceFunc(maps\mp\zm_nuked::give_team_characters, scripts\zm\replaced\zm_nuked::give_team_characters); + replaceFunc(maps\mp\zm_nuked::moon_rocket_follow_path, scripts\zm\replaced\zm_nuked::moon_rocket_follow_path); + replaceFunc(maps\mp\zm_nuked::sndgameend, scripts\zm\replaced\zm_nuked::sndgameend); replaceFunc(maps\mp\zm_nuked_gamemodes::init, scripts\zm\replaced\zm_nuked_gamemodes::init); replaceFunc(maps\mp\zm_nuked_perks::init_nuked_perks, scripts\zm\replaced\zm_nuked_perks::init_nuked_perks); replaceFunc(maps\mp\zm_nuked_perks::perks_from_the_sky, scripts\zm\replaced\zm_nuked_perks::perks_from_the_sky);