diff options
| author | Connie Price <contact@connieprice.co.uk> | 2022-01-16 21:57:00 +0000 |
|---|---|---|
| committer | Barichello <artur@barichello.me> | 2022-01-17 17:46:37 -0300 |
| commit | 4c2bf1f7519d1164ea66c806f3c0a056f53c87a5 (patch) | |
| tree | e7086d5b779e3c498a2e9855c50fa9a29dc32626 /Northstar.Custom/mod/scripts/vscripts | |
| parent | bd9cfac5499a76b0a952af2363110e3db44b3178 (diff) | |
| download | NorthstarMods-4c2bf1f7519d1164ea66c806f3c0a056f53c87a5.tar.gz NorthstarMods-4c2bf1f7519d1164ea66c806f3c0a056f53c87a5.zip | |
Fixed using boosts with primary equipped melee weapons.
Diffstat (limited to 'Northstar.Custom/mod/scripts/vscripts')
| -rw-r--r-- | Northstar.Custom/mod/scripts/vscripts/burnmeter/sh_burnmeter.gnut | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Northstar.Custom/mod/scripts/vscripts/burnmeter/sh_burnmeter.gnut b/Northstar.Custom/mod/scripts/vscripts/burnmeter/sh_burnmeter.gnut index 4705ef64..ac9ffab3 100644 --- a/Northstar.Custom/mod/scripts/vscripts/burnmeter/sh_burnmeter.gnut +++ b/Northstar.Custom/mod/scripts/vscripts/burnmeter/sh_burnmeter.gnut @@ -168,11 +168,11 @@ BurnReward function BurnReward_GetById( int id ) BurnReward function BurnReward_GetByRef( string ref ) { Assert( ref in burn.burnRewards ) - + // more hacks for arena if ( !( ref in burn.burnRewards ) && GetCurrentPlaylistVarString( "boost_store_mode", "off" ) == "arena" ) return GetArenaLoadoutItemAsBurnReward( ref ) - + return burn.burnRewards[ref] } @@ -381,7 +381,8 @@ bool function OnWeaponAttemptOffhandSwitch_burncardweapon( entity weapon ) entity ownerPlayer = weapon.GetWeaponOwner() Assert( ownerPlayer.IsPlayer() ) - if ( ownerPlayer.IsUsingOffhandWeapon() ) + entity activeWeapon = ownerPlayer.GetActiveWeapon() + if ( ownerPlayer.IsUsingOffhandWeapon() && !( activeWeapon.GetWeaponInfoFileKeyField( "fire_mode" ) == "offhand_melee" && activeWeapon.IsReadyToFire() ) ) return false if ( weapon.HasMod( "burn_card_weapon_mod" ) ) |