1
0
mirror of https://github.com/JezuzLizard/BO2-Reimagined.git synced 2025-06-27 15:40:34 -05:00

Staffs: fix Crazy Place triggers

This commit is contained in:
Jbleezy
2023-03-29 19:50:54 -07:00
parent 15f262ea89
commit 444f6009a4
3 changed files with 29 additions and 3 deletions

View File

@ -230,6 +230,7 @@
* Upgrade only requires collecting souls in The Crazy Place
* Can no longer collect souls in The Crazy Place from staff kills
* Can collect souls in The Crazy Place after upgrading to fill 5% of max ammo per soul
* Fixed triggers for inserting and picking up staffs in The Crazy Place
* Get full ammo when initially picked up after upgrading (normally missing one clip)
* Max ammo no longer fills clip ammo
* Upgraded: kill on any round
@ -355,8 +356,8 @@
* Parts automatically picked up
* Can be built at any table on all maps
* Zombies no longer attack (except Zombie Shield)
* Can no longer be destroyed by 2 grenades
* Can be destroyed by taking 1500 damage
* No longer destroyed by 2 grenades
* Can no longer be picked up after being destroyed
### Zombie Shield
@ -511,7 +512,7 @@
* Zombies spawn in the Docks Gates zone when in the Docks zone
* Grief: added Smoke Grenades to the Mystery Box
* Grief: added Richtofen's Head meat powerup model
* Fixed being able to hit a death barrier when jumping off the Upper Docks
* Fixed being able to hit a death barrier when jumping off the Docks Bridge
* Fixed locked hint string not showing on Blundergat Upgrade buildable table
#### Docks
@ -623,7 +624,7 @@
#### Grief
* Gain score by making enemy players bleed out
* Make 25 enemy players bleed out to win the game
* Make 15 enemy players bleed out to win the game
* Players respawn after being down for 10 seconds
* Players retain perks

View File

@ -214,6 +214,27 @@ zombie_killed_override( einflictor, attacker, idamage, smeansofdeath, sweapon, v
}
}
place_staff_in_charger()
{
flag_set( "charger_ready_" + self.enum );
v_trigger_pos = self.charger.origin;
v_trigger_pos = ( v_trigger_pos[0], v_trigger_pos[1], v_trigger_pos[2] - 30.0 );
if ( !isDefined( self.charge_trigger ) )
{
self.charge_trigger = tomb_spawn_trigger_radius( v_trigger_pos, 120, 1, ::staff_charger_get_player_msg );
self.charge_trigger.require_look_at = 1;
self.charge_trigger.staff_data = self;
}
self.trigger set_unitrigger_hint_string( "" );
insert_message = self staff_get_insert_message();
self.charge_trigger set_unitrigger_hint_string( insert_message );
self.charge_trigger trigger_on();
waittill_staff_inserted();
}
waittill_staff_inserted()
{
while ( true )
@ -235,6 +256,7 @@ waittill_staff_inserted()
self.charger.is_inserted = 1;
self thread debug_staff_charge();
maps\mp\zm_tomb_craftables::clear_player_staff( self.weapname );
self.charge_trigger set_unitrigger_hint_string( "" );
self.charge_trigger trigger_off();
if ( isdefined( self.charger.angles ) )
@ -423,6 +445,7 @@ run_gramophone_teleporter( str_vinyl_record )
else
{
self.gramophone_model stopsounds();
self.gramophone_model ghost();
player playsound( "zmb_craftable_pickup" );
flag_clear( "gramophone_placed" );
//level setclientfield( "piece_record_zm_player", 1 );
@ -509,6 +532,7 @@ run_gramophone_door( str_vinyl_record )
else
{
trig_position.gramophone_model stopsounds();
trig_position.gramophone_model ghost();
flag_clear( "gramophone_placed" );
player playsound( "zmb_craftable_pickup" );
//level setclientfield( "piece_record_zm_player", 1 );

View File

@ -24,6 +24,7 @@
main()
{
replaceFunc(maps\mp\zm_tomb_main_quest::main_quest_init, scripts\zm\replaced\zm_tomb_main_quest::main_quest_init);
replaceFunc(maps\mp\zm_tomb_main_quest::place_staff_in_charger, scripts\zm\replaced\zm_tomb_main_quest::place_staff_in_charger);
replaceFunc(maps\mp\zm_tomb_main_quest::watch_for_player_pickup_staff, scripts\zm\replaced\zm_tomb_main_quest::watch_for_player_pickup_staff);
replaceFunc(maps\mp\zm_tomb_main_quest::staff_upgraded_reload, scripts\zm\replaced\zm_tomb_main_quest::staff_upgraded_reload);
replaceFunc(maps\mp\zm_tomb_main_quest::watch_staff_ammo_reload, scripts\zm\replaced\zm_tomb_main_quest::watch_staff_ammo_reload);