Skip to content

Commit

Permalink
Fixed Multiple Amped Weapons Timers (#500)
Browse files Browse the repository at this point in the history
* Add files via upload

* Delete _burnmeter.gnut

* Add files via upload

Fixed multiple Amped Weapon uses not resetting the timer

* Add eject quotes (#527)

* Upload cl_titan_cockpit.nut

* Add eject string in script

* Moved to client

* index issue + removed else so always returns

* Apply suggestions from code review

Co-authored-by: Jack <66967891+ASpoonPlaysGames@users.noreply.github.com>

* Rest of the suggestions 

because github makes me want to cry

* Commit suggestions from review

GitHub really hates batching suggestions

Co-authored-by: Jack <66967891+ASpoonPlaysGames@users.noreply.github.com>

* Add files via upload

* Delete _burnmeter.gnut

* Rename _burnmeter.gnut.txt to _burnmeter.gnut

* Update _burnmeter.gnut

* Update _burnmeter.gnut

* Update _burnmeter.gnut

* Update _burnmeter.gnut

Co-authored-by: JMM889901 <41163714+JMM889901@users.noreply.github.com>
Co-authored-by: Jack <66967891+ASpoonPlaysGames@users.noreply.github.com>
  • Loading branch information
3 people authored Jan 3, 2023
1 parent 27e000e commit a203eea
Showing 1 changed file with 5 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -294,10 +294,14 @@ void function InitBurnMeterPersistentData( entity player )
void function PlayerUsesAmpedWeaponsBurncard( entity player )
{
thread PlayerUsesAmpedWeaponsBurncardThreaded( player )

}

void function PlayerUsesAmpedWeaponsBurncardThreaded( entity player )
{
player.Signal( "StopAmpedWeapons" )
player.EndSignal("StopAmpedWeapons")

array<entity> weapons = player.GetMainWeapons()
//weapons.extend( player.GetOffhandWeapons() ) // idk? unsure of vanilla behaviour here
foreach ( entity weapon in weapons )
Expand Down Expand Up @@ -606,4 +610,4 @@ void function PlayerUsesReaperfallBurncard( entity player )
DispatchSpawn( reaper )

thread SuperSpectre_WarpFall( reaper )
}
}

0 comments on commit a203eea

Please sign in to comment.