diff --git a/raw/scripts/_inf_alive_rewards.gsc b/raw/scripts/_inf_alive_rewards.gsc index ab1f2c7..c5d0477 100644 --- a/raw/scripts/_inf_alive_rewards.gsc +++ b/raw/scripts/_inf_alive_rewards.gsc @@ -14,6 +14,10 @@ init() maps\mp\killstreaks\_airdrop::addCrateType( "nuke_drop", "nuke", 1, maps\mp\killstreaks\_airdrop::nukeCrateThink ); maps\mp\killstreaks\_airdrop::addCrateType( "airdrop", "ammo", 17, ::ammoCrateThink ); maps\mp\killstreaks\_airdrop::addCrateType( "airdrop_mega", "ammo", 12, ::ammoCrateThink ); + maps\mp\killstreaks\_airdrop::addCrateType( "airdrop_assault", "ammo", 12, ::ammoCrateThink ); + maps\mp\killstreaks\_airdrop::addCrateType( "airdrop_osprey_gunner", "ammo", 12, ::ammoCrateThink ); + maps\mp\killstreaks\_airdrop::addCrateType( "airdrop_grnd", "ammo", 12, ::ammoCrateThink ); + maps\mp\killstreaks\_airdrop::addCrateType( "airdrop_support", "ammo", 12, ::ammoCrateThink ); thread onConnect(); } @@ -153,10 +157,7 @@ ammoCrateThink( dropType ) self endon ( "death" ); self.usedBy = []; - if ( dropType == "airdrop" || !level.teamBased ) - maps\mp\killstreaks\_airdrop::crateSetupForUse( game["strings"]["ammo_hint"], "all", "waypoint_ammo_friendly" ); - else - maps\mp\killstreaks\_airdrop::crateSetupForUse( game["strings"]["ammo_hint"], "all", "waypoint_ammo_friendly" ); + maps\mp\killstreaks\_airdrop::crateSetupForUse( game["strings"]["ammo_hint"], "all", "waypoint_ammo_friendly" ); self thread maps\mp\killstreaks\_airdrop::crateOtherCaptureThink(); self thread maps\mp\killstreaks\_airdrop::crateOwnerCaptureThink(); diff --git a/raw/scripts/_inf_model.gsc b/raw/scripts/_inf_model.gsc index e2b93f1..969b396 100644 --- a/raw/scripts/_inf_model.gsc +++ b/raw/scripts/_inf_model.gsc @@ -41,63 +41,12 @@ connected() self waittill( "spawned_player" ); waittillframeend; - if ( self.pers["team"] == "allies" ) - { - self giveAllPerks(); - } - else - { - self giveAllPerks(); - self setOffhandSecondaryClass( "smoke" ); - self giveWeapon( "bouncingbetty_mp" ); - self giveWeapon( "smoke_grenade_mp" ); - self setWeaponAmmoClip( "smoke_grenade_mp", 1 ); - } - } -} + if ( self.pers["team"] != "axis" ) continue; -giveAllPerks() -{ - perks = []; - perks[ perks.size ] = "specialty_longersprint"; - perks[ perks.size ] = "specialty_fastreload"; - perks[ perks.size ] = "specialty_scavenger"; - perks[ perks.size ] = "specialty_blindeye"; - perks[ perks.size ] = "specialty_paint"; - perks[ perks.size ] = "specialty_hardline"; - perks[ perks.size ] = "specialty_coldblooded"; - perks[ perks.size ] = "specialty_quickdraw"; - - perks[ perks.size ] = "_specialty_blastshield"; - perks[ perks.size ] = "specialty_blastshield"; - perks[ perks.size ] = "specialty_detectexplosive"; - perks[ perks.size ] = "specialty_autospot"; - perks[ perks.size ] = "specialty_bulletaccuracy"; - - perks[ perks.size ] = "specialty_quieter"; - perks[ perks.size ] = "specialty_stalker"; - - perks[ perks.size ] = "specialty_bulletpenetration"; - perks[ perks.size ] = "specialty_marksman"; - perks[ perks.size ] = "specialty_sharp_focus"; - perks[ perks.size ] = "specialty_holdbreathwhileads"; - perks[ perks.size ] = "specialty_longerrange"; - perks[ perks.size ] = "specialty_fastermelee"; - perks[ perks.size ] = "specialty_reducedsway"; - perks[ perks.size ] = "specialty_lightweight"; - - foreach ( perkName in perks ) - { - if ( !self _hasPerk( perkName ) ) - { - self givePerk( perkName, false ); - - if ( maps\mp\gametypes\_class::isPerkUpgraded( perkName ) ) - { - perkUpgrade = tablelookup( "mp/perktable.csv", 1, perkName, 8 ); - self givePerk( perkUpgrade, false ); - } - } + self setOffhandSecondaryClass( "smoke" ); + self _giveWeapon( "bouncingbetty_mp" ); + self _giveWeapon( "smoke_grenade_mp" ); + self setWeaponAmmoClip( "smoke_grenade_mp", 1 ); } }