diff --git a/README.md b/README.md index 24bb96ec..663cb312 100644 --- a/README.md +++ b/README.md @@ -94,6 +94,9 @@ ### Ray Gun * No longer limited to 4 players +### Ray Gun Mark 2 +* Limited to 1 player on all maps + ### Jet Gun * Kills whenever the right gauge is above 20% * Kills multiple enemies significantly faster @@ -226,6 +229,7 @@ * Pack-a-Punch automatically crafted * Navcard table automatically crafted * Fixed a zombie pathing exploit at Town in Bookstore +* Grief: added Ballistic Knife, Ray Gun, and Ray Gun Mark 2 to the Mystery Box #### Town * Moved Quick Revive to Stamin-Up's location on Town @@ -329,7 +333,6 @@ * Added player kills on scoreboard * Added player downed and bled out icons on scoreboard * EMP Grenades make downed enemy players bleed out -* Removed Ray Gun Mark 2 and Monkey Bombs from the Mystery Box * Meat powerup is able to drop when players are down * Message shows when the meat is on a player * Meleeing while the meat is moving no longer grabs the meat diff --git a/scripts/zm/_zm_reimagined.gsc b/scripts/zm/_zm_reimagined.gsc index 80399dc3..eb687df8 100644 --- a/scripts/zm/_zm_reimagined.gsc +++ b/scripts/zm/_zm_reimagined.gsc @@ -167,6 +167,7 @@ post_all_players_spawned() level.equipment_turret_needs_power = 0; level.equipment_subwoofer_needs_power = 0; level.limited_weapons["ray_gun_zm"] = undefined; + level.limited_weapons["raygun_mark2_zm"] = 1; level.zombie_vars["emp_stun_range"] = 420; level.zombie_vars["emp_perk_off_time"] = 60; //level.zombies_vars["jetgun_grind_range"] = 256; // TODO: get this to work diff --git a/scripts/zm/zgrief/zgrief_reimagined.gsc b/scripts/zm/zgrief/zgrief_reimagined.gsc index c9c667c9..e452fb9c 100644 --- a/scripts/zm/zgrief/zgrief_reimagined.gsc +++ b/scripts/zm/zgrief/zgrief_reimagined.gsc @@ -51,12 +51,6 @@ init() setteamscore("axis", 0); setteamscore("allies", 0); - if(isDefined(level.zombie_weapons["willy_pete_zm"])) - { - register_tactical_grenade_for_level( "willy_pete_zm" ); - level.zombie_weapons["willy_pete_zm"].is_in_box = 1; - } - player_spawn_override(); level thread grief_score_hud(); @@ -194,8 +188,6 @@ set_grief_vars() level.zombie_vars["zombie_health_increase"] = 0; level.zombie_vars["zombie_health_increase_multiplier"] = 0; level.zombie_vars["zombie_spawn_delay"] = 0.5; - level.zombie_weapons["raygun_mark2_zm"].is_in_box = 0; - level.zombie_weapons["cymbal_monkey_zm"].is_in_box = 0; level.zombie_powerups["meat_stink"].func_should_drop_with_regular_powerups = ::func_should_drop_meat; level.brutus_health = 20000; level.brutus_expl_dmg_req = 12000; @@ -208,6 +200,24 @@ set_grief_vars() level._game_module_player_laststand_callback = ::grief_laststand_weapon_save; level.onplayerspawned_restore_previous_weapons = ::grief_laststand_weapons_return; + if(isDefined(level.zombie_weapons["knife_ballistic_zm"])) + { + level.zombie_weapons["knife_ballistic_zm"].is_in_box = 1; + } + if(isDefined(level.zombie_weapons["ray_gun_zm"])) + { + level.zombie_weapons["ray_gun_zm"].is_in_box = 1; + } + if(isDefined(level.zombie_weapons["raygun_mark2_zm"])) + { + level.zombie_weapons["raygun_mark2_zm"].is_in_box = 1; + } + if(isDefined(level.zombie_weapons["willy_pete_zm"])) + { + register_tactical_grenade_for_level( "willy_pete_zm" ); + level.zombie_weapons["willy_pete_zm"].is_in_box = 1; + } + level.grief_winning_score = 3; level.grief_score = []; level.grief_score["A"] = 0; @@ -1747,4 +1757,9 @@ spawn_bots(num) level.bots[i] = addtestclient(); } } + + flag_wait( "initial_blackscreen_passed" ); + + iprintln("defined: " + isDefined(level.zombie_weapons["raygun_mark2_zm"])); + iprintln("in box: " + level.zombie_weapons["raygun_mark2_zm"].is_in_box); } \ No newline at end of file diff --git a/scripts/zm/zm_transit/zm_transit_reimagined.gsc b/scripts/zm/zm_transit/zm_transit_reimagined.gsc index 867c239b..491239e5 100644 --- a/scripts/zm/zm_transit/zm_transit_reimagined.gsc +++ b/scripts/zm/zm_transit/zm_transit_reimagined.gsc @@ -13,6 +13,8 @@ main() replaceFunc(maps/mp/zombies/_zm_weap_emp_bomb::emp_detonate, scripts/zm/replaced/_zm_weap_emp_bomb::emp_detonate); replaceFunc(maps/mp/zombies/_zm_equip_electrictrap::startelectrictrapdeploy, scripts/zm/replaced/_zm_equip_electrictrap::startelectrictrapdeploy); replaceFunc(maps/mp/zombies/_zm_equip_turret::startturretdeploy, scripts/zm/replaced/_zm_equip_turret::startturretdeploy); + + include_weapons_grief(); } init() @@ -32,6 +34,38 @@ init() level thread b23r_hint_string_fix(); } +include_weapons_grief() +{ + if ( getDvar( "g_gametype" ) != "zgrief" ) + { + return; + } + + include_weapon( "ray_gun_zm" ); + include_weapon( "ray_gun_upgraded_zm", 0 ); + include_weapon( "tazer_knuckles_zm", 0 ); + include_weapon( "knife_ballistic_no_melee_zm", 0 ); + include_weapon( "knife_ballistic_no_melee_upgraded_zm", 0 ); + include_weapon( "knife_ballistic_zm" ); + include_weapon( "knife_ballistic_upgraded_zm", 0 ); + include_weapon( "knife_ballistic_bowie_zm", 0 ); + include_weapon( "knife_ballistic_bowie_upgraded_zm", 0 ); + level._uses_retrievable_ballisitic_knives = 1; + maps/mp/zombies/_zm_weapons::add_limited_weapon( "knife_ballistic_zm", 1 ); + maps/mp/zombies/_zm_weapons::add_limited_weapon( "ray_gun_zm", 4 ); + maps/mp/zombies/_zm_weapons::add_limited_weapon( "ray_gun_upgraded_zm", 4 ); + maps/mp/zombies/_zm_weapons::add_limited_weapon( "knife_ballistic_upgraded_zm", 0 ); + maps/mp/zombies/_zm_weapons::add_limited_weapon( "knife_ballistic_no_melee_zm", 0 ); + maps/mp/zombies/_zm_weapons::add_limited_weapon( "knife_ballistic_no_melee_upgraded_zm", 0 ); + maps/mp/zombies/_zm_weapons::add_limited_weapon( "knife_ballistic_bowie_zm", 0 ); + maps/mp/zombies/_zm_weapons::add_limited_weapon( "knife_ballistic_bowie_upgraded_zm", 0 ); + include_weapon( "raygun_mark2_zm" ); + include_weapon( "raygun_mark2_upgraded_zm", 0 ); + maps/mp/zombies/_zm_weapons::add_weapon_to_content( "raygun_mark2_zm", "dlc3" ); + maps/mp/zombies/_zm_weapons::add_limited_weapon( "raygun_mark2_zm", 1 ); + maps/mp/zombies/_zm_weapons::add_limited_weapon( "raygun_mark2_upgraded_zm", 1 ); +} + screecher_spawner_changes() { level.screecher_spawners = getentarray( "screecher_zombie_spawner", "script_noteworthy" );