This commit is contained in:
INeedBots 2020-09-27 12:47:54 -06:00
parent d8be52143e
commit 229666ef89

View File

@ -31,6 +31,11 @@ init()
level.classMap["custom8"] = 7; level.classMap["custom8"] = 7;
level.classMap["custom9"] = 8; level.classMap["custom9"] = 8;
level.classMap["custom10"] = 9; level.classMap["custom10"] = 9;
level.classMap["custom11"] = 10;
level.classMap["custom12"] = 11;
level.classMap["custom13"] = 12;
level.classMap["custom14"] = 13;
level.classMap["custom15"] = 14;
level.classMap["copycat"] = -1; level.classMap["copycat"] = -1;
@ -429,14 +434,23 @@ giveLoadout( team, class, allowCopycat )
if ( loadoutPerk1 != "specialty_onemanarmy" && loadoutSecondary == "onemanarmy" ) if ( loadoutPerk1 != "specialty_onemanarmy" && loadoutSecondary == "onemanarmy" )
loadoutSecondary = table_getWeapon( level.classTableName, 10, 1 ); loadoutSecondary = table_getWeapon( level.classTableName, 10, 1 );
loadoutSecondaryCamo = "none"; //loadoutSecondaryCamo = "none";
if ( level.killstreakRewards ) if ( level.killstreakRewards )
{ {
loadoutKillstreak1 = self getPlayerData( "killstreaks", 0 ); if ( getDvarInt( "scr_classic" ) == 1 )
loadoutKillstreak2 = self getPlayerData( "killstreaks", 1 ); {
loadoutKillstreak3 = self getPlayerData( "killstreaks", 2 ); loadoutKillstreak1 = "uav";
loadoutKillstreak2 = "precision_airstrike";
loadoutKillstreak3 = "helicopter";
}
else
{
loadoutKillstreak1 = self getPlayerData( "killstreaks", 0 );
loadoutKillstreak2 = self getPlayerData( "killstreaks", 1 );
loadoutKillstreak3 = self getPlayerData( "killstreaks", 2 );
}
} }
else else
{ {
@ -456,8 +470,8 @@ giveLoadout( team, class, allowCopycat )
self SetOffhandPrimaryClass( "other" ); self SetOffhandPrimaryClass( "other" );
// Action Slots // Action Slots
self _SetActionSlot( 1, "" ); //self _SetActionSlot( 1, "" );
//self _SetActionSlot( 1, "nightvision" ); self _SetActionSlot( 1, "nightvision" );
self _SetActionSlot( 3, "altMode" ); self _SetActionSlot( 3, "altMode" );
self _SetActionSlot( 4, "" ); self _SetActionSlot( 4, "" );
@ -839,7 +853,7 @@ setKillstreaks( streak1, streak2, streak3 )
{ {
self.killStreaks = []; self.killStreaks = [];
if ( self _hasPerk( "specialty_hardline" ) ) if ( self _hasPerk( "specialty_hardline" ) && ( getDvarInt( "scr_classic" ) != 1 ) )
modifier = -1; modifier = -1;
else else
modifier = 0; modifier = 0;
@ -868,6 +882,12 @@ setKillstreaks( streak1, streak2, streak3 )
streakVal = int( tableLookup( "mp/killstreakTable.csv", 1, streak2, 4 ) ); streakVal = int( tableLookup( "mp/killstreakTable.csv", 1, streak2, 4 ) );
//else //else
// streakVal = int( tableLookup( "mp/killstreakTable.csv", 1, streak2, 5 ) ); // streakVal = int( tableLookup( "mp/killstreakTable.csv", 1, streak2, 5 ) );
if ( ( getDvarInt( "scr_classic" ) == 1 ) && ( streak2 == "precision_airstrike" ) )
{
streakVal = ( streakVal - 1 );
}
killStreaks[streakVal + modifier] = streak2; killStreaks[streakVal + modifier] = streak2;
} }
@ -1017,6 +1037,11 @@ isValidPrimary( refString )
case "mg4": case "mg4":
case "m240": case "m240":
case "aug": case "aug":
case "peacekeeper":
case "ak47classic":
case "ak74u":
case "m40a3":
case "dragunov":
return true; return true;
default: default:
assertMsg( "Replacing invalid primary weapon: " + refString ); assertMsg( "Replacing invalid primary weapon: " + refString );
@ -1048,6 +1073,7 @@ isValidSecondary( refString )
case "m1014": case "m1014":
case "spas12": case "spas12":
case "onemanarmy": case "onemanarmy":
case "deserteaglegold":
return true; return true;
default: default:
assertMsg( "Replacing invalid secondary weapon: " + refString ); assertMsg( "Replacing invalid secondary weapon: " + refString );