INSANEMODE/BO2-Reimagined
1
0
Fork 0
mirror of https://github.com/JezuzLizard/BO2-Reimagined.git synced 2025-06-28 08:00:14 -05:00
Code Issues Releases Wiki Activity

Staffs: inserting at Crazy Place requires current weapon

Browse Source
This commit is contained in:
Jbleezy
2023-04-06 02:20:30 -07:00
parent 269158ed7c
commit 4aaa0a9c28
2 changed files with 39 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
README.md
View File

@ -249,6 +249,7 @@
* Can no longer collect souls in The Crazy Place from staff kills * 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 * Can collect souls in The Crazy Place after upgrading to fill 5% of max ammo per soul
* Picking up a staff at The Crazy Place while holding a staff places the other staff at The Crazy Place * Picking up a staff at The Crazy Place while holding a staff places the other staff at The Crazy Place
* Insterting a staff in The Crazy Place requires player's current weapon to be the staff
* Fixed triggers for inserting and picking up staffs in The Crazy Place * Fixed triggers for inserting and picking up staffs in The Crazy Place
* Fixed being able to carry multiple staffs by picking up a staff with staff revive weapon out * Fixed being able to carry multiple staffs by picking up a staff with staff revive weapon out
* Get full ammo when initially picked up after upgrading (normally missing one clip) * Get full ammo when initially picked up after upgrading (normally missing one clip)

39
scripts/zm/replaced/zm_tomb_main_quest.gsc
View File

@ -245,7 +245,7 @@ waittill_staff_inserted()
if ( isdefined( player ) ) if ( isdefined( player ) )
{ {
weapon_available = player hasweapon( self.weapname ); weapon_available = player getcurrentweapon() == self.weapname;
if ( weapon_available ) if ( weapon_available )
player takeweapon( self.weapname ); player takeweapon( self.weapname );
@ -272,6 +272,10 @@ waittill_staff_inserted()
self playsound( "zmb_squest_charge_place_staff" ); self playsound( "zmb_squest_charge_place_staff" );
return; return;
} }
else
{
self.charge_trigger thread insert_staff_hint_charger(player, self.enum);
}
} }
} }
@ -362,6 +366,39 @@ can_pickup_staff()
return !b_has_staff || b_staff_equipped; return !b_has_staff || b_staff_equipped;
} }
insert_staff_hint_charger(player, enum)
{
num = player getentitynumber();
self.playertrigger[num] notify("insert_staff_hint_charger");
self.playertrigger[num] endon("insert_staff_hint_charger");
self.playertrigger[num] endon("death");
element = "";
if (enum == 1)
{
element = "Fire";
}
else if (enum == 2)
{
element = "Wind";
}
else if (enum == 3)
{
element = "Lightning";
}
else if (enum == 4)
{
element = "Ice";
}
self.playertrigger[num] sethintstring(element + " Staff Required");
wait 3;
self.playertrigger[num] sethintstring(self.hint_string);
}
swap_staff_hint_charger(player) swap_staff_hint_charger(player)
{ {
num = player getentitynumber(); num = player getentitynumber();