1
0
mirror of https://github.com/JezuzLizard/BO2-Reimagined.git synced 2025-06-10 23:27:57 -05:00

MOTD and Origins: swap lethal grenades

This commit is contained in:
Jbleezy
2024-02-13 16:33:23 -08:00
parent a2faed30bd
commit 56cf7e518b
14 changed files with 100 additions and 20 deletions

View File

@ -146,8 +146,6 @@ init()
setscoreboardcolumns_gametype();
set_lethal_grenade_init();
set_dvars();
weapon_changes();
@ -1201,16 +1199,6 @@ setscoreboardcolumns_gametype()
}
}
set_lethal_grenade_init()
{
if (level.script != "zm_transit" && level.script != "zm_nuked" && level.script != "zm_highrise" && level.script != "zm_tomb")
{
return;
}
level.zombie_lethal_grenade_player_init = "sticky_grenade_zm";
}
swap_staminup_perk()
{
vending_triggers = getentarray("zombie_vending", "targetname");
@ -1450,6 +1438,10 @@ weapon_changes()
include_weapon("held_spork_zm_alcatraz", 0);
register_melee_weapon_for_level("held_spork_zm_alcatraz");
include_weapon("sticky_grenade_zm", 0);
add_zombie_weapon("sticky_grenade_zm", undefined, &"ZOMBIE_WEAPON_STICKY_GRENADE", 250, "wpck_explo", "", 250);
register_lethal_grenade_for_level("sticky_grenade_zm");
maps\mp\zombies\_zm_weapons::register_zombie_weapon_callback("willy_pete_zm", ::player_give_willy_pete);
register_tactical_grenade_for_level("willy_pete_zm");
level.zombie_weapons["willy_pete_zm"].is_in_box = 1;
@ -1568,6 +1560,11 @@ weapon_changes()
include_weapon("sa58_upgraded_zm", 0);
add_zombie_weapon("sa58_zm", "sa58_upgraded_zm", &"WEAPON_SA58", 1000, "wpck_fal", "", undefined, 1);
}
if (level.script == "zm_transit" || level.script == "zm_nuked" || level.script == "zm_highrise" || level.script == "zm_prison")
{
level.zombie_lethal_grenade_player_init = "sticky_grenade_zm";
}
}
player_give_willy_pete()

View File

@ -102,4 +102,17 @@ wolf_spit_out_powerup()
if (isdefined(power_ups[0]))
power_ups[0] movez(120, 4);
}
hellhole_projectile_watch()
{
self endon("disconnect");
while (true)
{
self waittill("grenade_fire", grenade, weapname);
if (is_lethal_grenade(weapname))
self thread hellhole_grenades(grenade);
}
}

View File

@ -0,0 +1,48 @@
#include clientscripts\mp\zm_prison;
#include clientscripts\mp\_utility;
#include clientscripts\mp\_filter;
#include clientscripts\mp\zombies\_zm_weapons;
#include clientscripts\mp\zombies\_zm_utility;
#include clientscripts\mp\zm_prison_ffotd;
#include clientscripts\mp\zombies\_zm_perk_electric_cherry;
#include clientscripts\mp\zombies\_zm_perk_divetonuke;
#include clientscripts\mp\zm_alcatraz_classic;
#include clientscripts\mp\_visionset_mgr;
#include clientscripts\mp\zm_prison_fx;
#include clientscripts\mp\zm_alcatraz_amb;
#include clientscripts\mp\zombies\_zm_ai_brutus;
#include clientscripts\mp\zm_alcatraz_grief_cellblock;
#include clientscripts\mp\zombies\_zm;
#include clientscripts\mp\zombies\_zm_craftables;
#include clientscripts\mp\zombies\_zm_magicbox_prison;
#include clientscripts\mp\zombies\_zm_weap_riotshield_prison;
#include clientscripts\mp\zombies\_zm_weap_blundersplat;
#include clientscripts\mp\zombies\_zm_weap_tomahawk;
#include clientscripts\mp\zm_prison_spoon;
#include clientscripts\mp\zm_prison_weap_quest;
#include clientscripts\mp\zombies\_zm_equipment;
entityspawned_alcatraz(localclientnum)
{
if (!isdefined(self.type))
{
return;
}
if (self.type == "player")
self thread playerspawned(localclientnum);
if (self.type == "missile")
{
switch (self.weapon)
{
case "sticky_grenade_zm":
self thread clientscripts\mp\_sticky_grenade::spawned(localclientnum);
break;
case "blundersplat_explosive_dart_zm":
self thread clientscripts\mp\zombies\_zm_weap_blundersplat::spawned(localclientnum);
break;
}
}
}

View File

@ -3,8 +3,11 @@
main()
{
replaceFunc(clientscripts\mp\zm_prison::entityspawned_alcatraz, scripts\zm\replaced\zm_prison::entityspawned_alcatraz);
replaceFunc(clientscripts\mp\zombies\_zm_ai_brutus::brutusfootstepcbfunc, scripts\zm\replaced\_zm_ai_brutus::brutusfootstepcbfunc);
level thread clientscripts\mp\_sticky_grenade::main();
if (is_gametype_active("zstandard"))
{
level.zombiemode_using_additionalprimaryweapon_perk = 1;

View File

@ -26,6 +26,7 @@ main()
replaceFunc(maps\mp\zm_alcatraz_traps::tower_trap_trigger_think, scripts\zm\replaced\zm_alcatraz_traps::tower_trap_trigger_think);
replaceFunc(maps\mp\zm_alcatraz_travel::move_gondola, scripts\zm\replaced\zm_alcatraz_travel::move_gondola);
replaceFunc(maps\mp\zm_alcatraz_weap_quest::grief_soul_catcher_state_manager, scripts\zm\replaced\zm_alcatraz_weap_quest::grief_soul_catcher_state_manager);
replaceFunc(maps\mp\zm_alcatraz_weap_quest::hellhole_projectile_watch, scripts\zm\replaced\zm_alcatraz_weap_quest::hellhole_projectile_watch);
replaceFunc(maps\mp\zm_alcatraz_distance_tracking::delete_zombie_noone_looking, scripts\zm\replaced\zm_alcatraz_distance_tracking::delete_zombie_noone_looking);
replaceFunc(maps\mp\zm_prison_spoon::give_player_spoon_upon_receipt, scripts\zm\replaced\zm_prison_spoon::give_player_spoon_upon_receipt);
replaceFunc(maps\mp\zm_prison_spoon::dip_the_spoon, scripts\zm\replaced\zm_prison_spoon::dip_the_spoon);
@ -87,6 +88,8 @@ init()
player_initial_spawn_override();
player_respawn_override();
level thread maps\mp\_sticky_grenade::init();
level thread updatecraftables();
level thread grief_brutus_spawn_after_time();
}