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

Jet Gun: cools down twice as fast

This commit is contained in:
Jbleezy
2020-02-13 22:44:58 -08:00
parent 9502ad7042
commit 05172208c5
2 changed files with 23 additions and 6 deletions

View File

@ -27,6 +27,7 @@
* Kills multiple enemies significantly faster * Kills multiple enemies significantly faster
* Must be firing weapon to kill * Must be firing weapon to kill
* Overheats while attempting to fire while meleeing * Overheats while attempting to fire while meleeing
* Cools down twice as fast
* Cools down while not holding weapon * Cools down while not holding weapon
* No longer automatically switched to weapon when picked up * No longer automatically switched to weapon when picked up
* No longer disassembles when overheated * No longer disassembles when overheated

View File

@ -74,7 +74,6 @@ post_all_players_spawned()
electric_trap_always_kill(); electric_trap_always_kill();
jetgun_disable_explode_overheat(); jetgun_disable_explode_overheat();
//jetgun_increase_grind_range(); // not working
slipgun_always_kill(); slipgun_always_kill();
slipgun_disable_reslip(); slipgun_disable_reslip();
@ -475,8 +474,6 @@ jetgun_fast_cooldown()
return; return;
} }
val = 0;
while ( 1 ) while ( 1 )
{ {
if (!IsDefined(self.jetgun_heatval)) if (!IsDefined(self.jetgun_heatval))
@ -487,16 +484,35 @@ jetgun_fast_cooldown()
if ( self getcurrentweapon() == "jetgun_zm" ) if ( self getcurrentweapon() == "jetgun_zm" )
{ {
if (self AttackButtonPressed() && self IsMeleeing()) if (self AttackButtonPressed())
{ {
self.jetgun_heatval += .85; if (self IsMeleeing())
{
self.jetgun_heatval += .85;
if (self.jetgun_heatval > 100)
{
self.jetgun_heatval = 100;
}
self setweaponoverheating( self.jetgun_overheating, self.jetgun_heatval );
}
}
else
{
self.jetgun_heatval -= .05;
if (self.jetgun_heatval < 0)
{
self.jetgun_heatval = 0;
}
self setweaponoverheating( self.jetgun_overheating, self.jetgun_heatval ); self setweaponoverheating( self.jetgun_overheating, self.jetgun_heatval );
} }
} }
else else
{ {
self.jetgun_heatval -= .05; self.jetgun_heatval -= .1;
if (self.jetgun_heatval < 0) if (self.jetgun_heatval < 0)
{ {