INSANEMODE/BO2-Reimagined
1
0
Fork 0
mirror of https://github.com/JezuzLizard/BO2-Reimagined.git synced 2025-06-11 23:57:59 -05:00
Code Issues Releases Wiki Activity

Disable offhand weapons while throwing grenade

Browse Source
This commit is contained in:
Jbleezy
2023-04-30 13:19:25 -07:00
parent dbafbdcdf8
commit 6f5340cb54
3 changed files with 56 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
README.md
View File

@ -119,6 +119,7 @@
* Changed placeable mine damage scalar to 150 multiplied by round number (normally random number between 100 and 200 multiplied by round number) * Changed placeable mine damage scalar to 150 multiplied by round number (normally random number between 100 and 200 multiplied by round number)
* Capped placeable mine damage scalar at 9000 * Capped placeable mine damage scalar at 9000
* Disabled sniper scope sway * Disabled sniper scope sway
* Grenades can no longer be thrown faster than intended by throwing a grenade right after throwing one
### AN-94 ### AN-94
* Increased weapon cost from 1200 to 1500 * Increased weapon cost from 1200 to 1500

55
scripts/zm/_zm_reimagined.gsc
View File

@ -198,6 +198,7 @@ on_player_connect()
player thread on_player_revived(); player thread on_player_revived();
player thread on_player_fake_revive(); player thread on_player_fake_revive();
player thread grenade_fire_watcher();
player thread weapon_inspect_watcher(); player thread weapon_inspect_watcher();
} }
} }
@ -2621,6 +2622,60 @@ wallbuy_cost_changes()
} }
} }
grenade_fire_watcher()
{
level endon("end_game");
self endon("disconnect");
while(1)
{
self waittill("grenade_fire", grenade, weapname);
if (is_lethal_grenade(weapname) || is_tactical_grenade(weapname))
{
self thread temp_disable_offhand_weapons();
}
if (weapname == "willy_pete_zm" && !isDefined(self.smoke_grenade_cluster))
{
grenade thread smoke_grenade_cluster(self);
}
}
}
temp_disable_offhand_weapons()
{
self endon( "disconnect" );
self endon( "entering_last_stand" );
self disableOffhandWeapons();
while(self isThrowingGrenade())
{
wait 0.05;
}
if (!is_true(self.is_drinking) || is_melee_weapon(self getCurrentWeapon()))
{
self enableOffhandWeapons();
}
}
smoke_grenade_cluster(owner)
{
self waittill("explode", pos);
playsoundatposition( "zmb_land_meat", pos );
owner.smoke_grenade_cluster = true;
owner magicgrenadetype( "willy_pete_zm", pos, (0, 0, 0), 0 );
owner magicgrenadetype( "willy_pete_zm", pos, (0, 0, 0), 0 );
wait 0.05;
owner.smoke_grenade_cluster = undefined;
}
weapon_inspect_watcher() weapon_inspect_watcher()
{ {
level endon( "end_game" ); level endon( "end_game" );

32
scripts/zm/zgrief/zgrief_reimagined.gsc
View File

@ -695,7 +695,6 @@ grief_onplayerconnect()
self thread head_icon(); self thread head_icon();
self thread obj_waypoint(); self thread obj_waypoint();
self thread headstomp_watcher(); self thread headstomp_watcher();
self thread smoke_grenade_cluster_watcher();
self thread maps\mp\gametypes_zm\zmeat::create_item_meat_watcher(); self thread maps\mp\gametypes_zm\zmeat::create_item_meat_watcher();
self.killsconfirmed = 0; self.killsconfirmed = 0;
self.killsdenied = 0; self.killsdenied = 0;
@ -1081,37 +1080,6 @@ headstomp_watcher()
} }
} }
smoke_grenade_cluster_watcher()
{
level endon("end_game");
self endon("disconnect");
while(1)
{
self waittill("grenade_fire", grenade, weapname);
if(weapname == "willy_pete_zm" && !isDefined(self.smoke_grenade_cluster))
{
grenade thread smoke_grenade_cluster(self);
}
}
}
smoke_grenade_cluster(owner)
{
self waittill("explode", pos);
playsoundatposition( "zmb_land_meat", pos );
owner.smoke_grenade_cluster = true;
owner magicgrenadetype( "willy_pete_zm", pos, (0, 0, 0), 0 );
owner magicgrenadetype( "willy_pete_zm", pos, (0, 0, 0), 0 );
wait 0.05;
owner.smoke_grenade_cluster = undefined;
}
round_start_wait(time, initial) round_start_wait(time, initial)
{ {
level endon("end_game"); level endon("end_game");