toggle onemanarmy flare

This commit is contained in:
ineedbots 2021-09-01 21:21:54 -06:00
parent 562d7f5cf5
commit f7016cd704
5 changed files with 33 additions and 8 deletions

View File

@ -593,6 +593,7 @@ set scr_deleteNadeOnTeamChange "1"
// _perkfunctions
set combathighIsJuiced "1"
set onemanarmyRefillsTubes "1"
set fix_onemanarmyFlareBug "0"
// _killstreaks
set scr_killstreak_rollover "1"

View File

@ -593,6 +593,7 @@ set scr_deleteNadeOnTeamChange "1"
// _perkfunctions
set combathighIsJuiced "1"
set onemanarmyRefillsTubes "1"
set fix_onemanarmyFlareBug "0"
// _killstreaks
set scr_killstreak_rollover "1"

View File

@ -591,6 +591,7 @@ set scr_deleteNadeOnTeamChange "1"
// _perkfunctions
set combathighIsJuiced "1"
set onemanarmyRefillsTubes "1"
set fix_onemanarmyFlareBug "0"
// _killstreaks
set scr_killstreak_rollover "1"

View File

@ -629,8 +629,12 @@ selectOneManArmyClass()
level endon ( "game_ended" );
self _disableWeaponSwitch();
self _disableOffhandWeapons();
self _disableUsability();
if (level.fix_onemanarmyFlareBug)
{
self _disableOffhandWeapons();
self _disableUsability();
}
self openPopupMenu( game["menu_onemanarmy"] );
@ -639,22 +643,34 @@ selectOneManArmyClass()
self waittill ( "menuresponse", menu, className );
self _enableWeaponSwitch();
self _enableOffhandWeapons();
self _enableUsability();
if (level.fix_onemanarmyFlareBug)
{
self _enableOffhandWeapons();
self _enableUsability();
}
if ( className == "back" || !isOneManArmyMenu( menu ) || self isUsingRemote() )
{
if ( self getCurrentWeapon() == "onemanarmy_mp" )
{
self _disableWeaponSwitch();
self _disableOffhandWeapons();
self _disableUsability();
if (level.fix_onemanarmyFlareBug)
{
self _disableOffhandWeapons();
self _disableUsability();
}
self switchToWeapon( self getLastWeapon() );
self waittill ( "weapon_change" );
self _enableWeaponSwitch();
self _enableOffhandWeapons();
self _enableUsability();
if (level.fix_onemanarmyFlareBug)
{
self _enableOffhandWeapons();
self _enableUsability();
}
}
return;
}

View File

@ -12,6 +12,9 @@
- onemanarmyRefillsTubes <bool>
false - (default) One Man Army does not refill the gl attachment
true - it does
- fix_onemanarmyFlareBug <bool>
true - (default) fixes it
*/
#include common_scripts\utility;
@ -200,6 +203,9 @@ init()
setDvarIfUninitialized( "onemanarmyRefillsTubes", false );
level.onemanarmyRefillsTubes = getDvarInt( "onemanarmyRefillsTubes" );
setDvarIfUninitialized( "fix_onemanarmyFlareBug", true );
level.fix_onemanarmyFlareBug = getDvarInt( "fix_onemanarmyFlareBug" );
initPerkDvars();
level thread onPlayerConnect();