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

Staffs upgraded: fix not using staff melee after obtaining One Inch Punch and respawning

Browse Source
This commit is contained in:
Jbleezy
2023-03-31 01:13:35 -07:00
parent 8842169677
commit 3a620769bc
2 changed files with 111 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

110
scripts/zm/replaced/zm_tomb_craftables.gsc
View File

@ -432,3 +432,113 @@ swap_staff_hint_craftable()
self sethintstring(self.stub.hint_string);
}
track_staff_weapon_respawn( player )
{
self notify( "kill_track_staff_weapon_respawn" );
self endon( "kill_track_staff_weapon_respawn" );
player endon( "disconnect" );
self thread track_staff_weapon_respawn_player_disconnect_monitor( player );
s_elemental_staff = get_staff_info_from_weapon_name( self.weaponname, 1 );
s_upgraded_staff = s_elemental_staff.upgrade;
if ( !isdefined( self.base_weaponname ) )
self.base_weaponname = s_elemental_staff.weapname;
flag_clear( self.base_weaponname + "_enabled" );
for ( has_weapon = 0; isalive( player ); has_weapon = 0 )
{
if ( isdefined( s_elemental_staff.charger.is_inserted ) && s_elemental_staff.charger.is_inserted || isdefined( s_upgraded_staff.charger.is_inserted ) && s_upgraded_staff.charger.is_inserted || isdefined( s_upgraded_staff.ee_in_use ) && s_upgraded_staff.ee_in_use )
has_weapon = 1;
else
{
weapons = player getweaponslistprimaries();
foreach ( weapon in weapons )
{
n_melee_element = 0;
if ( weapon == self.base_weaponname )
{
s_elemental_staff.prev_ammo_stock = player getweaponammostock( weapon );
s_elemental_staff.prev_ammo_clip = player getweaponammoclip( weapon );
has_weapon = 1;
}
else if ( weapon == s_upgraded_staff.weapname )
{
s_upgraded_staff.prev_ammo_stock = player getweaponammostock( weapon );
s_upgraded_staff.prev_ammo_clip = player getweaponammoclip( weapon );
has_weapon = 1;
n_melee_element = s_upgraded_staff.enum;
}
if ( player hasweapon( "staff_revive_zm" ) )
{
s_upgraded_staff.revive_ammo_stock = player getweaponammostock( "staff_revive_zm" );
s_upgraded_staff.revive_ammo_clip = player getweaponammoclip( "staff_revive_zm" );
}
if ( has_weapon )
{
cur_weapon = player getcurrentweapon();
cur_melee_weapon = player get_player_melee_weapon();
if ( !issubstr( cur_melee_weapon, "one_inch_punch" ) && n_melee_element != 0 )
{
if ( cur_weapon != weapon && ( isdefined( player.use_staff_melee ) && player.use_staff_melee ) )
{
player update_staff_accessories( 0 );
continue;
}
if ( cur_weapon == weapon && !( isdefined( player.use_staff_melee ) && player.use_staff_melee ) )
player update_staff_accessories( n_melee_element );
}
}
}
}
if ( !has_weapon )
break;
wait 0.5;
}
b_staff_in_use = 0;
a_players = getplayers();
foreach ( check_player in a_players )
{
weapons = check_player getweaponslistprimaries();
foreach ( weapon in weapons )
{
if ( weapon == self.base_weaponname || weapon == s_upgraded_staff.weapname )
b_staff_in_use = 1;
}
}
if ( !b_staff_in_use )
{
model = getent( "craftable_" + self.base_weaponname, "targetname" );
model show();
flag_set( self.base_weaponname + "_enabled" );
}
clear_player_staff( self.base_weaponname, player );
}
track_staff_weapon_respawn_player_disconnect_monitor( player )
{
self notify( "track_staff_weapon_respawn_player_disconnect_monitor" );
self endon( "track_staff_weapon_respawn_player_disconnect_monitor" );
player waittill( "disconnect" );
model = getent( "craftable_" + self.base_weaponname, "targetname" );
model show();
flag_set( self.base_weaponname + "_enabled" );
}

1
scripts/zm/zm_tomb/zm_tomb_reimagined.gsc
View File

@ -42,6 +42,7 @@ main()
replaceFunc(maps\mp\zm_tomb_challenges::challenges_init, scripts\zm\replaced\zm_tomb_challenges::challenges_init);
replaceFunc(maps\mp\zm_tomb_craftables::init_craftables, scripts\zm\replaced\zm_tomb_craftables::init_craftables);
replaceFunc(maps\mp\zm_tomb_craftables::include_craftables, scripts\zm\replaced\zm_tomb_craftables::include_craftables);
replaceFunc(maps\mp\zm_tomb_craftables::track_staff_weapon_respawn, scripts\zm\replaced\zm_tomb_craftables::track_staff_weapon_respawn);
replaceFunc(maps\mp\zm_tomb_dig::init_shovel, scripts\zm\replaced\zm_tomb_dig::init_shovel);
replaceFunc(maps\mp\zm_tomb_dig::waittill_dug, scripts\zm\replaced\zm_tomb_dig::waittill_dug);
replaceFunc(maps\mp\zm_tomb_dig::increment_player_perk_purchase_limit, scripts\zm\replaced\zm_tomb_dig::increment_player_perk_purchase_limit);