diff options
| author | BobTheBob <32057864+BobTheBob9@users.noreply.github.com> | 2022-01-19 02:23:57 +0000 |
|---|---|---|
| committer | BobTheBob <32057864+BobTheBob9@users.noreply.github.com> | 2022-01-19 02:23:57 +0000 |
| commit | dda0f0240c1a19eeb321d362e751b397a63996ec (patch) | |
| tree | b2c270fd94d5897639a1a1ad17b3c3e777833325 /Northstar.Custom/mod/scripts/vscripts/burnmeter | |
| parent | 917da6226d0aa62717f4ec2abe644589dd8e0e42 (diff) | |
| parent | 190349255d45ae88f7b6d2ad872a5df15699d97a (diff) | |
| download | NorthstarMods-dda0f0240c1a19eeb321d362e751b397a63996ec.tar.gz NorthstarMods-dda0f0240c1a19eeb321d362e751b397a63996ec.zip | |
Merge branch 'main' of https://github.com/R2Northstar/NorthstarMods
Diffstat (limited to 'Northstar.Custom/mod/scripts/vscripts/burnmeter')
| -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" ) ) |