diff --git a/README.md b/README.md index c66ba8e3..ae0627f0 100644 --- a/README.md +++ b/README.md @@ -871,6 +871,7 @@ * Moved Quick Revive to Speed Cola's location on Borough * Moved Speed Cola to its location on Buried * Moved Stamin-Up to Vulture Aid's location on Buried +* Added Head Chopper buildable * Buildables can spawn at Church buildable table * Added better randomization for buildables diff --git a/scripts/zm/_zm_reimagined.gsc b/scripts/zm/_zm_reimagined.gsc index 38f1890f..949509c9 100644 --- a/scripts/zm/_zm_reimagined.gsc +++ b/scripts/zm/_zm_reimagined.gsc @@ -1936,7 +1936,6 @@ buildbuildables() updatebuildables(); removebuildable("turbine", "buried"); - removebuildable("headchopper_zm", "buried"); // TODO - remove line when headchopper anims work on Borough } } } diff --git a/scripts/zm/replaced/zm_buried.csc b/scripts/zm/replaced/zm_buried.csc new file mode 100644 index 00000000..12368ec3 --- /dev/null +++ b/scripts/zm/replaced/zm_buried.csc @@ -0,0 +1,70 @@ +#include clientscripts\mp\zm_buried; +#include clientscripts\mp\_utility; +#include clientscripts\mp\zombies\_zm_weapons; +#include clientscripts\mp\zombies\_zm_utility; +#include clientscripts\mp\_visionset_mgr; +#include clientscripts\mp\_audio; +#include clientscripts\mp\zm_buried_ffotd; +#include clientscripts\mp\zm_buried_sq; +#include clientscripts\mp\zombies\_zm_perk_divetonuke; +#include clientscripts\mp\zombies\_zm_perk_vulture; +#include clientscripts\mp\zm_buried_fx; +#include clientscripts\mp\zm_buried_buildables; +#include clientscripts\mp\zm_buried_classic; +#include clientscripts\mp\zm_buried_maze; +#include clientscripts\mp\zm_buried_amb; +#include clientscripts\mp\zombies\_zm_turned; +#include clientscripts\mp\zm_buried_turned_street; +#include clientscripts\mp\zm_buried_grief_street; +#include clientscripts\mp\zombies\_zm; +#include clientscripts\mp\zombies\_zm_weap_time_bomb; +#include clientscripts\mp\zombies\_zm_weap_cymbal_monkey; +#include clientscripts\mp\zombies\_zm_weap_tazer_knuckles; +#include clientscripts\mp\zombies\_zm_weap_slowgun; +#include clientscripts\mp\zombies\_zm_ai_ghost; +#include clientscripts\mp\zombies\_zm_equip_turbine; +#include clientscripts\mp\zombies\_zm_equip_springpad; +#include clientscripts\mp\zombies\_zm_equip_subwoofer; +#include clientscripts\mp\zombies\_zm_equip_headchopper; + +start_zombie_stuff() +{ + include_weapons(); + include_powerups(); + include_equipment_for_level(); + clientscripts\mp\zombies\_zm::init(); + init_level_specific_wall_buy_fx(); + registerclientfield("world", "buried_sq_maxis_eye_glow_override", 12000, 1, "int", ::buried_sq_maxis_eye_glow_override, 1); + registerclientfield("allplayers", "buried_sq_richtofen_player_eyes_stuhlinger", 12000, 1, "int", ::buried_sq_richtofen_player_eyes_stuhlinger, 0); + registerclientfield("allplayers", "phd_flopper_effects", 12000, 1, "int", ::buried_phd_flopper_effects, 0); + + if (is_gametype_active("zclassic")) + clientscripts\mp\zombies\_zm_weap_time_bomb::init_time_bomb(); + + clientscripts\mp\zombies\_zm_weap_cymbal_monkey::init(); + clientscripts\mp\zombies\_zm_weap_tazer_knuckles::init(); + clientscripts\mp\zombies\_zm_weap_slowgun::init(); + + if (getdvar(#"createfx") != "") + return; + + if (level.scr_zm_ui_gametype == "zclassic") + { + clientscripts\mp\zombies\_zm_ai_ghost::init_animtree(); + clientscripts\mp\zombies\_zm_equip_turbine::init(); + clientscripts\mp\zombies\_zm_equip_turbine::init_animtree(); + clientscripts\mp\zombies\_zm_equip_springpad::init_animtree(); + clientscripts\mp\zombies\_zm_equip_subwoofer::init(); + clientscripts\mp\zombies\_zm_equip_subwoofer::init_animtree(); + clientscripts\mp\zombies\_zm_equip_headchopper::init_animtree(); + } + else if (level.scr_zm_map_start_location == "street") + { + clientscripts\mp\zombies\_zm_equip_turbine::init(); + clientscripts\mp\zombies\_zm_equip_turbine::init_animtree(); + clientscripts\mp\zombies\_zm_equip_springpad::init_animtree(); + clientscripts\mp\zombies\_zm_equip_subwoofer::init(); + clientscripts\mp\zombies\_zm_equip_subwoofer::init_animtree(); + clientscripts\mp\zombies\_zm_equip_headchopper::init_animtree(); + } +} \ No newline at end of file diff --git a/scripts/zm/zm_buried/zm_buried_reimagined.csc b/scripts/zm/zm_buried/zm_buried_reimagined.csc index 88e71696..663aed79 100644 --- a/scripts/zm/zm_buried/zm_buried_reimagined.csc +++ b/scripts/zm/zm_buried/zm_buried_reimagined.csc @@ -1,6 +1,11 @@ #include clientscripts\mp\_utility; #include clientscripts\mp\zombies\_zm_utility; +main() +{ + replaceFunc(clientscripts\mp\zm_buried::start_zombie_stuff, scripts\zm\replaced\zm_buried::start_zombie_stuff); +} + init() { prepare_chalk_weapon_list(); diff --git a/zone_source/includes/clientscripts.zone b/zone_source/includes/clientscripts.zone index 0b759176..ce0f46e0 100644 --- a/zone_source/includes/clientscripts.zone +++ b/zone_source/includes/clientscripts.zone @@ -3,4 +3,5 @@ script,scripts/zm/zm_buried/zm_buried_reimagined.csc script,scripts/zm/zgrief/zgrief_reimagined.csc script,scripts/zm/replaced/_zm.csc script,scripts/zm/replaced/_zm_weapons.csc +script,scripts/zm/replaced/zm_buried.csc script,scripts/zm/replaced/zgrief.csc \ No newline at end of file