field names lowercased

This commit is contained in:
ineed bots 2023-12-22 02:03:27 -06:00
parent 10e0d2eb7d
commit 37da9c0a31
7 changed files with 1844 additions and 1844 deletions

View File

@ -15,7 +15,7 @@
*/
init()
{
level.bw_VERSION = "2.1.0";
level.bw_version = "2.1.0";
if ( getDvar( "bots_main" ) == "" )
{
@ -220,27 +220,27 @@ init()
game[ "botWarfare" ] = true;
}
level.defuseObject = undefined;
level.bots_smokeList = List();
level.bots_fragList = List();
level.defuseobject = undefined;
level.bots_smokelist = List();
level.bots_fraglist = List();
level.bots_minSprintDistance = 315;
level.bots_minSprintDistance *= level.bots_minSprintDistance;
level.bots_minGrenadeDistance = 256;
level.bots_minGrenadeDistance *= level.bots_minGrenadeDistance;
level.bots_maxGrenadeDistance = 1024;
level.bots_maxGrenadeDistance *= level.bots_maxGrenadeDistance;
level.bots_maxKnifeDistance = 128;
level.bots_maxKnifeDistance *= level.bots_maxKnifeDistance;
level.bots_goalDistance = 27.5;
level.bots_goalDistance *= level.bots_goalDistance;
level.bots_noADSDistance = 200;
level.bots_noADSDistance *= level.bots_noADSDistance;
level.bots_maxShotgunDistance = 500;
level.bots_maxShotgunDistance *= level.bots_maxShotgunDistance;
level.bots_listenDist = 100;
level.bots_minsprintdistance = 315;
level.bots_minsprintdistance *= level.bots_minsprintdistance;
level.bots_mingrenadedistance = 256;
level.bots_mingrenadedistance *= level.bots_mingrenadedistance;
level.bots_maxgrenadedistance = 1024;
level.bots_maxgrenadedistance *= level.bots_maxgrenadedistance;
level.bots_maxknifedistance = 128;
level.bots_maxknifedistance *= level.bots_maxknifedistance;
level.bots_goaldistance = 27.5;
level.bots_goaldistance *= level.bots_goaldistance;
level.bots_noadsdistance = 200;
level.bots_noadsdistance *= level.bots_noadsdistance;
level.bots_maxshotgundistance = 500;
level.bots_maxshotgundistance *= level.bots_maxshotgundistance;
level.bots_listendist = 100;
level.smokeRadius = 255;
level.smokeradius = 255;
level.bots = [];
@ -322,7 +322,7 @@ onPlayerDamage( eInflictor, eAttacker, iDamage, iDFlags, sMeansOfDeath, sWeapon,
self maps\mp\bots\_bot_script::onDamage( eInflictor, eAttacker, iDamage, iDFlags, sMeansOfDeath, sWeapon, vPoint, vDir, sHitLoc, timeOffset );
}
self [[ level.prevCallbackPlayerDamage ]]( eInflictor, eAttacker, iDamage, iDFlags, sMeansOfDeath, sWeapon, vPoint, vDir, sHitLoc, timeOffset );
self [[ level.prevcallbackplayerdamage ]]( eInflictor, eAttacker, iDamage, iDFlags, sMeansOfDeath, sWeapon, vPoint, vDir, sHitLoc, timeOffset );
}
/*
@ -336,7 +336,7 @@ onPlayerKilled( eInflictor, eAttacker, iDamage, sMeansOfDeath, sWeapon, vDir, sH
self maps\mp\bots\_bot_script::onKilled( eInflictor, eAttacker, iDamage, sMeansOfDeath, sWeapon, vDir, sHitLoc, timeOffset, deathAnimDuration );
}
self [[ level.prevCallbackPlayerKilled ]]( eInflictor, eAttacker, iDamage, sMeansOfDeath, sWeapon, vDir, sHitLoc, timeOffset, deathAnimDuration );
self [[ level.prevcallbackplayerkilled ]]( eInflictor, eAttacker, iDamage, sMeansOfDeath, sWeapon, vDir, sHitLoc, timeOffset, deathAnimDuration );
}
/*
@ -346,11 +346,11 @@ hook_callbacks()
{
level waittill( "prematch_over" ); // iw4madmin waits this long for some reason...
wait 0.05; // so we need to be one frame after it sets up its callbacks.
level.prevCallbackPlayerDamage = level.callbackPlayerDamage;
level.callbackPlayerDamage = ::onPlayerDamage;
level.prevcallbackplayerdamage = level.callbackplayerdamage;
level.callbackplayerdamage = ::onPlayerDamage;
level.prevCallbackPlayerKilled = level.callbackPlayerKilled;
level.callbackPlayerKilled = ::onPlayerKilled;
level.prevcallbackplayerkilled = level.callbackplayerkilled;
level.callbackplayerkilled = ::onPlayerKilled;
}
/*
@ -360,11 +360,11 @@ fixGamemodes()
{
for ( i = 0; i < 19; i++ )
{
if ( isDefined( level.bombZones ) && level.gametype == "sd" )
if ( isDefined( level.bombzones ) && level.gametype == "sd" )
{
for ( i = 0; i < level.bombZones.size; i++ )
for ( i = 0; i < level.bombzones.size; i++ )
{
level.bombZones[ i ].onUse = ::onUsePlantObjectFix;
level.bombzones[ i ].onuse = ::onUsePlantObjectFix;
}
break;
@ -377,7 +377,7 @@ fixGamemodes()
break;
}
if ( isDefined( level.bombZones ) && level.gametype == "dd" )
if ( isDefined( level.bombzones ) && level.gametype == "dd" )
{
level thread fixDem();
@ -395,20 +395,20 @@ fixDem()
{
for ( ;; )
{
level.bombAPlanted = level.aPlanted;
level.bombBPlanted = level.bPlanted;
level.bombaplanted = level.aplanted;
level.bombbplanted = level.bplanted;
for ( i = 0; i < level.bombZones.size; i++ )
for ( i = 0; i < level.bombzones.size; i++ )
{
bombzone = level.bombZones[ i ];
bombzone = level.bombzones[ i ];
if ( isDefined( bombzone.trigger.trigger_off ) )
{
bombzone.bombExploded = true;
bombzone.bombexploded = true;
}
else
{
bombzone.bombExploded = undefined;
bombzone.bombexploded = undefined;
}
}
@ -427,14 +427,14 @@ fixKoth()
{
wait 0.05;
if ( !isDefined( level.radioObject ) )
if ( !isDefined( level.radioobject ) )
{
continue;
}
for ( i = level.radios.size - 1; i >= 0; i-- )
{
if ( level.radioObject != level.radios[ i ].gameobject )
if ( level.radioobject != level.radios[ i ].gameobject )
{
continue;
}
@ -443,7 +443,7 @@ fixKoth()
break;
}
while ( isDefined( level.radioObject ) && level.radio.gameobject == level.radioObject )
while ( isDefined( level.radioobject ) && level.radio.gameobject == level.radioobject )
{
wait 0.05;
}
@ -461,12 +461,12 @@ addNotifyOnAirdrops_loop()
{
airdrop = dropCrates[ i ];
if ( isDefined( airdrop.doingPhysics ) )
if ( isDefined( airdrop.doingphysics ) )
{
continue;
}
airdrop.doingPhysics = true;
airdrop.doingphysics = true;
airdrop thread doNotifyOnAirdrop();
}
}
@ -491,7 +491,7 @@ doNotifyOnAirdrop()
self endon( "death" );
self waittill( "physics_finished" );
self.doingPhysics = false;
self.doingphysics = false;
if ( isDefined( self.owner ) )
{
@ -525,7 +525,7 @@ onPlayerConnect()
{
level waittill( "connected", player );
player.bot_isScrambled = false;
player.bot_isscrambled = false;
player thread onGrenadeFire();
player thread onWeaponFired();
@ -542,7 +542,7 @@ watchScrabler_loop()
for ( i = level.players.size - 1; i >= 0; i-- )
{
player = level.players[ i ];
player.bot_isScrambled = false;
player.bot_isscrambled = false;
}
for ( i = level.players.size - 1; i >= 0; i-- )
@ -568,7 +568,7 @@ watchScrabler_loop()
continue;
}
if ( level.teamBased && player2.team == player.team )
if ( level.teambased && player2.team == player.team )
{
continue;
}
@ -578,7 +578,7 @@ watchScrabler_loop()
continue;
}
player2.bot_isScrambled = true;
player2.bot_isscrambled = true;
}
}
}
@ -1222,7 +1222,7 @@ AddToFragList( who )
grenade thread thinkFrag();
level.bots_fragList ListAdd( grenade );
level.bots_fraglist ListAdd( grenade );
}
/*
@ -1239,7 +1239,7 @@ thinkFrag()
wait 0.05;
}
level.bots_fragList ListRemove( self );
level.bots_fraglist ListRemove( self );
}
/*
@ -1254,7 +1254,7 @@ AddToSmokeList()
grenade thread thinkSmoke();
level.bots_smokeList ListAdd( grenade );
level.bots_smokelist ListAdd( grenade );
}
/*
@ -1272,7 +1272,7 @@ thinkSmoke()
self.state = "smoking";
wait 11.5;
level.bots_smokeList ListRemove( self );
level.bots_smokelist ListRemove( self );
}
/*

View File

@ -87,14 +87,14 @@ start_onnuke_call()
for ( ;; )
{
while ( !isDefined( level.nukeIncoming ) && !isDefined( level.moabIncoming ) )
while ( !isDefined( level.nukeincoming ) && !isDefined( level.moabincoming ) )
{
wait 0.05 + randomInt( 4 );
}
self thread bot_onnukecall_watch();
wait level.nukeTimer + 5;
wait level.nuketimer + 5;
}
}
@ -109,9 +109,9 @@ start_death_watch()
{
self waittill( "death" );
self thread bot_chat_death_watch( self.lastAttacker, self.bots_lastKS );
self thread bot_chat_death_watch( self.lastattacker, self.bots_lastks );
self.bots_lastKS = 0;
self.bots_lastks = 0;
}
}
@ -155,23 +155,23 @@ start_killed_watch()
{
self endon( "disconnect" );
self.bots_lastKS = 0;
self.bots_lastks = 0;
for ( ;; )
{
self waittill( "killed_enemy" );
if ( self.bots_lastKS < self.pers[ "cur_kill_streak" ] )
if ( self.bots_lastks < self.pers[ "cur_kill_streak" ] )
{
for ( i = self.bots_lastKS + 1; i <= self.pers[ "cur_kill_streak" ]; i++ )
for ( i = self.bots_lastks + 1; i <= self.pers[ "cur_kill_streak" ]; i++ )
{
self thread bot_chat_streak( i );
}
}
self.bots_lastKS = self.pers[ "cur_kill_streak" ];
self.bots_lastks = self.pers[ "cur_kill_streak" ];
self thread bot_chat_killed_watch( self.lastKilledPlayer );
self thread bot_chat_killed_watch( self.lastkilledplayer );
}
}
@ -587,7 +587,7 @@ endgame_chat()
}
}
if ( level.teamBased )
if ( level.teambased )
{
winningteam = maps\mp\gametypes\_gamescore::getWinningTeam();
@ -1019,7 +1019,7 @@ bot_onnukecall_watch()
switch ( randomint( 4 ) )
{
case 0:
if ( level.nukeInfo.player != self )
if ( level.nukeinfo.player != self )
{
self BotDoChat( 30, "Wow who got a nuke?" );
}
@ -1031,9 +1031,9 @@ bot_onnukecall_watch()
break;
case 1:
if ( level.nukeInfo.player != self )
if ( level.nukeinfo.player != self )
{
self BotDoChat( 30, "lol " + level.nukeInfo.player.name + " is a hacker" );
self BotDoChat( 30, "lol " + level.nukeinfo.player.name + " is a hacker" );
}
else
{
@ -1047,7 +1047,7 @@ bot_onnukecall_watch()
break;
case 3:
if ( level.nukeInfo.team != self.team )
if ( level.nukeinfo.team != self.team )
{
self BotDoChat( 30, "man my team sucks ):" );
}
@ -1285,9 +1285,9 @@ bot_chat_killed_watch( victim )
break;
case 40:
if ( isDefined( victim.attackerData ) && isDefined( victim.attackerData[ self.guid ] ) && isDefined( victim.attackerData[ self.guid ].weapon ) )
if ( isDefined( victim.attackerdata ) && isDefined( victim.attackerdata[ self.guid ] ) && isDefined( victim.attackerdata[ self.guid ].weapon ) )
{
message = ( "Man, I sure love my " + getBaseWeaponName( victim.attackerData[ self.guid ].weapon ) + "!" );
message = ( "Man, I sure love my " + getBaseWeaponName( victim.attackerdata[ self.guid ].weapon ) + "!" );
}
break;
@ -1566,9 +1566,9 @@ bot_chat_death_watch( killer, last_ks )
break;
case 60:
if ( isDefined( self.attackerData ) && isDefined( self.attackerData[ killer.guid ] ) && isDefined( self.attackerData[ killer.guid ].weapon ) )
if ( isDefined( self.attackerdata ) && isDefined( self.attackerdata[ killer.guid ] ) && isDefined( self.attackerdata[ killer.guid ].weapon ) )
{
message = "Wow! Nice " + getBaseWeaponName( self.attackerData[ killer.guid ].weapon ) + " you got there, " + killer.name + "!";
message = "Wow! Nice " + getBaseWeaponName( self.attackerdata[ killer.guid ].weapon ) + " you got there, " + killer.name + "!";
}
break;
@ -2001,7 +2001,7 @@ bot_chat_crate_cap_watch( state, aircare, player, d, e, f, g )
break;
case 5:
self BotDoChat( 10, ":3 i got my " + aircare.crateType );
self BotDoChat( 10, ":3 i got my " + aircare.cratetype );
break;
}
}
@ -2026,7 +2026,7 @@ bot_chat_crate_cap_watch( state, aircare, player, d, e, f, g )
break;
case 4:
self BotDoChat( 10, "hahaah jajaja i took your " + aircare.crateType );
self BotDoChat( 10, "hahaah jajaja i took your " + aircare.cratetype );
break;
}
}
@ -2053,7 +2053,7 @@ bot_chat_crate_cap_watch( state, aircare, player, d, e, f, g )
break;
case 4:
self BotDoChat( 10, "Wow! there goes my " + aircare.crateType + "!" );
self BotDoChat( 10, "Wow! there goes my " + aircare.cratetype + "!" );
break;
}

View File

@ -112,7 +112,7 @@ resetBotVars()
self.bot.second_next_wp = -1;
self.bot.towards_goal = undefined;
self.bot.astar = [];
self.bot.moveTo = self.origin;
self.bot.moveto = self.origin;
self.bot.stop_move = false;
self.bot.greedy_path = false;
self.bot.climbing = false;
@ -363,7 +363,7 @@ watchUsingRemote()
self watchUsingMinigun();
}
if ( isDefined( level.ac130Player ) && level.ac130player == self )
if ( isDefined( level.ac130player ) && level.ac130player == self )
{
self thread watchAc130Weapon();
self watchUsingAc130();
@ -406,7 +406,7 @@ watchAc130Weapon()
self endon( "disconnect" );
self endon( "spawned_player" );
while ( isDefined( level.ac130Player ) && level.ac130player == self )
while ( isDefined( level.ac130player ) && level.ac130player == self )
{
curWeap = self GetCurrentWeapon();
@ -431,7 +431,7 @@ watchUsingAc130()
{
self endon( "ac130player_removed" );
while ( isDefined( level.ac130Player ) && level.ac130player == self )
while ( isDefined( level.ac130player ) && level.ac130player == self )
{
self switchToWeapon( "ac130_105mm_mp" );
wait 1 + randomInt( 2 );
@ -546,7 +546,7 @@ watchC4Thrown( c4 )
continue;
}
if ( ( level.teamBased && self.team == player.team ) || player.sessionstate != "playing" || !isReallyAlive( player ) )
if ( ( level.teambased && self.team == player.team ) || player.sessionstate != "playing" || !isReallyAlive( player ) )
{
continue;
}
@ -585,7 +585,7 @@ watchC4Thrown( c4 )
*/
doBotMovement_loop( data )
{
move_To = self.bot.moveTo;
move_To = self.bot.moveto;
angles = self GetPlayerAngles();
dir = ( 0, 0, 0 );
@ -612,12 +612,12 @@ doBotMovement_loop( data )
// climb through windows
if ( self isMantling() )
{
data.wasMantling = true;
data.wasmantling = true;
self crouch();
}
else if ( data.wasMantling )
else if ( data.wasmantling )
{
data.wasMantling = false;
data.wasmantling = false;
self stand();
}
@ -672,7 +672,7 @@ doBotMovement()
self endon( "death" );
data = spawnStruct();
data.wasMantling = false;
data.wasmantling = false;
for ( data.i = 0; true; data.i += 0.05 )
{
@ -711,11 +711,11 @@ grenade_danager_loop()
{
myEye = self getEye();
for ( i = level.bots_fragList.count - 1; i >= 0; i-- )
for ( i = level.bots_fraglist.count - 1; i >= 0; i-- )
{
frag = level.bots_fragList.data[ i ];
frag = level.bots_fraglist.data[ i ];
if ( level.teamBased && frag.team == self.team )
if ( level.teambased && frag.team == self.team )
{
continue;
}
@ -758,7 +758,7 @@ grenade_danager()
continue;
}
if ( self.bot.isfrozen || level.gameEnded || !gameFlag( "prematch_done" ) )
if ( self.bot.isfrozen || level.gameended || !gameFlag( "prematch_done" ) )
{
continue;
}
@ -804,7 +804,7 @@ stance_loop()
toStance = "crouch";
}
if ( self.hasRiotShieldEquipped && isDefined( self.bot.target ) && isDefined( self.bot.target.entity ) && isPlayer( self.bot.target.entity ) )
if ( self.hasriotshieldequipped && isDefined( self.bot.target ) && isDefined( self.bot.target.entity ) && isPlayer( self.bot.target.entity ) )
{
toStance = "crouch";
}
@ -835,7 +835,7 @@ stance_loop()
chance = self.pers[ "bots" ][ "behavior" ][ "sprint" ];
if ( getTime() - self.lastSpawnTime < 5000 )
if ( getTime() - self.lastspawntime < 5000 )
{
chance *= 2;
}
@ -865,7 +865,7 @@ stance_loop()
return;
}
if ( !isDefined( self.bot.towards_goal ) || DistanceSquared( self.origin, physicsTrace( self getEye(), self getEye() + anglesToForward( self getPlayerAngles() ) * 1024, false, undefined ) ) < level.bots_minSprintDistance || getConeDot( self.bot.towards_goal, self.origin, self GetPlayerAngles() ) < 0.75 )
if ( !isDefined( self.bot.towards_goal ) || DistanceSquared( self.origin, physicsTrace( self getEye(), self getEye() + anglesToForward( self getPlayerAngles() ) * 1024, false, undefined ) ) < level.bots_minsprintdistance || getConeDot( self.bot.towards_goal, self.origin, self GetPlayerAngles() ) < 0.75 )
{
return;
}
@ -941,7 +941,7 @@ reload_thread()
wait 2.5;
if ( self.bot.isfrozen || level.gameEnded || !gameFlag( "prematch_done" ) )
if ( self.bot.isfrozen || level.gameended || !gameFlag( "prematch_done" ) )
{
return;
}
@ -1130,7 +1130,7 @@ target_loop()
{
if ( isDefined( level.ac130player ) && level.ac130player == self )
{
vehEnt = level.ac130.planeModel;
vehEnt = level.ac130.planemodel;
}
if ( isDefined( level.chopper ) && isDefined( level.chopper.gunner ) && level.chopper.gunner == self )
@ -1176,7 +1176,7 @@ target_loop()
entOrigin += self.bot.script_target_offset;
}
if ( ignoreSmoke || ( SmokeTrace( myEye, entOrigin, level.smokeRadius ) ) && bulletTracePassed( myEye, entOrigin, false, ent ) )
if ( ignoreSmoke || ( SmokeTrace( myEye, entOrigin, level.smokeradius ) ) && bulletTracePassed( myEye, entOrigin, false, ent ) )
{
if ( !isObjDef )
{
@ -1225,7 +1225,7 @@ target_loop()
isObjDef = isDefined( obj );
if ( ( level.teamBased && self.team == player.team ) || player.sessionstate != "playing" || !isReallyAlive( player ) )
if ( ( level.teambased && self.team == player.team ) || player.sessionstate != "playing" || !isReallyAlive( player ) )
{
if ( isObjDef )
{
@ -1261,8 +1261,8 @@ target_loop()
( traceAnkleRight[ "fraction" ] >= 1.0 || traceAnkleRight[ "surfacetype" ] == "glass" ) )
&& ( ignoreSmoke ||
SmokeTrace( myEye, player.origin, level.smokeRadius ) ||
daDist < level.bots_maxKnifeDistance * 4 )
SmokeTrace( myEye, player.origin, level.smokeradius ) ||
daDist < level.bots_maxknifedistance * 4 )
&& ( getConeDot( player.origin, self.origin, myAngles ) >= myFov ||
( isObjDef && obj.trace_time ) ) );
@ -1460,12 +1460,12 @@ watchToLook()
continue;
}
if ( self.bot.target.dist > level.bots_maxShotgunDistance * 2 )
if ( self.bot.target.dist > level.bots_maxshotgundistance * 2 )
{
continue;
}
if ( self.bot.target.dist <= level.bots_maxKnifeDistance )
if ( self.bot.target.dist <= level.bots_maxknifedistance )
{
continue;
}
@ -1512,7 +1512,7 @@ watchToLook()
}
else
{
if ( getConeDot( self.bot.target.last_seen_pos, self.origin, self getPlayerAngles() ) < 0.8 || self.bot.target.dist <= level.bots_noADSDistance )
if ( getConeDot( self.bot.target.last_seen_pos, self.origin, self getPlayerAngles() ) < 0.8 || self.bot.target.dist <= level.bots_noadsdistance )
{
continue;
}
@ -1661,7 +1661,7 @@ aim_loop()
{
nade = self getValidGrenade();
if ( isDefined( nade ) && rand <= self.pers[ "bots" ][ "behavior" ][ "nade" ] && bulletTracePassed( eyePos, eyePos + ( 0, 0, 75 ), false, self ) && bulletTracePassed( last_pos, last_pos + ( 0, 0, 100 ), false, target ) && dist > level.bots_minGrenadeDistance && dist < level.bots_maxGrenadeDistance )
if ( isDefined( nade ) && rand <= self.pers[ "bots" ][ "behavior" ][ "nade" ] && bulletTracePassed( eyePos, eyePos + ( 0, 0, 75 ), false, self ) && bulletTracePassed( last_pos, last_pos + ( 0, 0, 100 ), false, target ) && dist > level.bots_mingrenadedistance && dist < level.bots_maxgrenadedistance )
{
time = 0.5;
@ -1750,7 +1750,7 @@ aim_loop()
}
}
knifeDist = level.bots_maxKnifeDistance;
knifeDist = level.bots_maxknifedistance;
if ( self _hasPerk( "specialty_extendedmelee" ) )
{
@ -1793,14 +1793,14 @@ aim_loop()
}
}
if ( curweap == "at4_mp" && entIsVehicle( self.bot.target.entity ) && ( !IsDefined( self.stingerStage ) || self.stingerStage != 2 ) )
if ( curweap == "at4_mp" && entIsVehicle( self.bot.target.entity ) && ( !IsDefined( self.stingerstage ) || self.stingerstage != 2 ) )
{
return;
}
if ( trace_time > reaction_time )
{
if ( ( !canADS || adsAmount >= 1.0 || self InLastStand() || self GetStance() == "prone" ) && ( conedot > 0.99 || dist < level.bots_maxKnifeDistance ) && getDvarInt( "bots_play_fire" ) )
if ( ( !canADS || adsAmount >= 1.0 || self InLastStand() || self GetStance() == "prone" ) && ( conedot > 0.99 || dist < level.bots_maxknifedistance ) && getDvarInt( "bots_play_fire" ) )
{
self botFire( curweap );
}
@ -1878,7 +1878,7 @@ aim_loop()
}
}
if ( ( !canADS || adsAmount >= 1.0 || self InLastStand() || self GetStance() == "prone" ) && ( conedot > 0.95 || dist < level.bots_maxKnifeDistance ) && getDvarInt( "bots_play_fire" ) )
if ( ( !canADS || adsAmount >= 1.0 || self InLastStand() || self GetStance() == "prone" ) && ( conedot > 0.95 || dist < level.bots_maxknifedistance ) && getDvarInt( "bots_play_fire" ) )
{
self botFire( curweap );
}
@ -1933,7 +1933,7 @@ aim()
return;
}
if ( !gameFlag( "prematch_done" ) || level.gameEnded || self.bot.isfrozen || self maps\mp\_flashgrenades::isFlashbanged() )
if ( !gameFlag( "prematch_done" ) || level.gameended || self.bot.isfrozen || self maps\mp\_flashgrenades::isFlashbanged() )
{
continue;
}
@ -2037,7 +2037,7 @@ canAds( dist, curweap )
return false;
}
far = level.bots_noADSDistance;
far = level.bots_noadsdistance;
if ( self _hasPerk( "specialty_bulletaccuracy" ) )
{
@ -2086,12 +2086,12 @@ isInRange( dist, curweap )
return true;
}
if ( ( weapclass == "spread" || self.bot.is_cur_akimbo ) && dist > level.bots_maxShotgunDistance )
if ( ( weapclass == "spread" || self.bot.is_cur_akimbo ) && dist > level.bots_maxshotgundistance )
{
return false;
}
if ( curweap == "riotshield_mp" && dist > level.bots_maxKnifeDistance )
if ( curweap == "riotshield_mp" && dist > level.bots_maxknifedistance )
{
return false;
}
@ -2167,9 +2167,9 @@ walk_loop()
dist = 16;
if ( level.waypointCount )
if ( level.waypointcount )
{
goal = level.waypoints[ randomInt( level.waypointCount ) ].origin;
goal = level.waypoints[ randomInt( level.waypointcount ) ].origin;
}
else
{
@ -2253,7 +2253,7 @@ walk()
continue;
}
if ( level.gameEnded || !gameFlag( "prematch_done" ) || self.bot.isfrozen || self.bot.stop_move )
if ( level.gameended || !gameFlag( "prematch_done" ) || self.bot.isfrozen || self.bot.stop_move )
{
continue;
}
@ -2345,7 +2345,7 @@ initAStar( goal )
{
team = undefined;
if ( level.teamBased )
if ( level.teambased )
{
team = self.team;
}
@ -2367,7 +2367,7 @@ removeAStar()
{
remove = self.bot.astar.size - 1;
if ( level.teamBased )
if ( level.teambased )
{
RemoveWaypointUsage( self.bot.astar[ remove ], self.team );
}
@ -2505,11 +2505,11 @@ movetowards( goal )
if ( self.bot.issprinting )
{
tempGoalDist = level.bots_goalDistance * 2;
tempGoalDist = level.bots_goaldistance * 2;
}
else
{
tempGoalDist = level.bots_goalDistance;
tempGoalDist = level.bots_goaldistance;
}
while ( distanceSquared( self.origin, goal ) > tempGoalDist )
@ -2578,11 +2578,11 @@ movetowards( goal )
if ( self.bot.issprinting )
{
tempGoalDist = level.bots_goalDistance * 2;
tempGoalDist = level.bots_goaldistance * 2;
}
else
{
tempGoalDist = level.bots_goalDistance;
tempGoalDist = level.bots_goaldistance;
}
if ( stucks >= 2 )
@ -2988,7 +2988,7 @@ crouch()
*/
prone()
{
if ( self IsUsingRemote() || self.hasRiotShieldEquipped )
if ( self IsUsingRemote() || self.hasriotshieldequipped )
{
return;
}
@ -3002,7 +3002,7 @@ prone()
*/
botSetMoveTo( where )
{
self.bot.moveTo = where;
self.bot.moveto = where;
}
/*
@ -3055,7 +3055,7 @@ bot_lookat( pos, time, vel, doAimPredict )
self endon( "spawned_player" );
level endon ( "game_ended" );
if ( level.gameEnded || !gameFlag( "prematch_done" ) || self.bot.isfrozen || !getDvarInt( "bots_play_aim" ) )
if ( level.gameended || !gameFlag( "prematch_done" ) || self.bot.isfrozen || !getDvarInt( "bots_play_aim" ) )
{
return;
}

File diff suppressed because it is too large Load Diff

View File

@ -553,7 +553,7 @@ HasThreat()
*/
IsDefusing()
{
return ( isDefined( self.isDefusing ) && self.isDefusing );
return ( isDefined( self.isdefusing ) && self.isdefusing );
}
/*
@ -561,7 +561,7 @@ IsDefusing()
*/
isPlanting()
{
return ( isDefined( self.isPlanting ) && self.isPlanting );
return ( isDefined( self.isplanting ) && self.isplanting );
}
/*
@ -569,7 +569,7 @@ isPlanting()
*/
isBombCarrier()
{
return ( isDefined( self.isBombCarrier ) && self.isBombCarrier );
return ( isDefined( self.isbombcarrier ) && self.isbombcarrier );
}
/*
@ -577,7 +577,7 @@ isBombCarrier()
*/
isInUse()
{
return ( isDefined( self.inUse ) && self.inUse );
return ( isDefined( self.inuse ) && self.inuse );
}
/*
@ -585,7 +585,7 @@ isInUse()
*/
inLastStand()
{
return ( isDefined( self.lastStand ) && self.lastStand );
return ( isDefined( self.laststand ) && self.laststand );
}
/*
@ -593,7 +593,7 @@ inLastStand()
*/
isBeingRevived()
{
return ( isDefined( self.beingRevived ) && self.beingRevived );
return ( isDefined( self.beingrevived ) && self.beingrevived );
}
/*
@ -601,7 +601,7 @@ isBeingRevived()
*/
inFinalStand()
{
return ( isDefined( self.inFinalStand ) && self.inFinalStand );
return ( isDefined( self.infinalstand ) && self.infinalstand );
}
/*
@ -609,7 +609,7 @@ inFinalStand()
*/
isFlagCarrier()
{
return ( isDefined( self.carryFlag ) && self.carryFlag );
return ( isDefined( self.carryflag ) && self.carryflag );
}
/*
@ -617,7 +617,7 @@ isFlagCarrier()
*/
IsStunned()
{
return ( isdefined( self.concussionEndTime ) && self.concussionEndTime > gettime() );
return ( isdefined( self.concussionendtime ) && self.concussionendtime > gettime() );
}
/*
@ -625,7 +625,7 @@ IsStunned()
*/
isArtShocked()
{
return ( isDefined( self.beingArtilleryShellshocked ) && self.beingArtilleryShellshocked );
return ( isDefined( self.beingartilleryshellshocked ) && self.beingartilleryshellshocked );
}
/*
@ -658,7 +658,7 @@ getValidTube()
*/
allowClassChoiceUtil()
{
entry = tableLookup( "mp/gametypesTable.csv", 0, level.gameType, 4 );
entry = tableLookup( "mp/gametypesTable.csv", 0, level.gametype, 4 );
if ( !isDefined( entry ) || entry == "" )
{
@ -673,7 +673,7 @@ allowClassChoiceUtil()
*/
allowTeamChoiceUtil()
{
entry = tableLookup( "mp/gametypesTable.csv", 0, level.gameType, 5 );
entry = tableLookup( "mp/gametypesTable.csv", 0, level.gametype, 5 );
if ( !isDefined( entry ) || entry == "" )
{
@ -1053,9 +1053,9 @@ RaySphereIntersect( start, end, spherePos, radius )
*/
SmokeTrace( start, end, rad )
{
for ( i = level.bots_smokeList.count - 1; i >= 0; i-- )
for ( i = level.bots_smokelist.count - 1; i >= 0; i-- )
{
nade = level.bots_smokeList.data[ i ];
nade = level.bots_smokelist.data[ i ];
if ( nade.state != "smoking" )
{
@ -1282,10 +1282,10 @@ readWpsFromFile( mapname )
*/
load_waypoints()
{
level.waypointCount = 0;
level.waypointUsage = [];
level.waypointUsage[ "allies" ] = [];
level.waypointUsage[ "axis" ] = [];
level.waypointcount = 0;
level.waypointusage = [];
level.waypointusage[ "allies" ] = [];
level.waypointusage[ "axis" ] = [];
if ( !isDefined( level.waypoints ) )
{
@ -1321,9 +1321,9 @@ load_waypoints()
BotBuiltinPrintConsole( "No waypoints loaded!" );
}
level.waypointCount = level.waypoints.size;
level.waypointcount = level.waypoints.size;
for ( i = 0; i < level.waypointCount; i++ )
for ( i = 0; i < level.waypointcount; i++ )
{
if ( !isDefined( level.waypoints[ i ].children ) || !isDefined( level.waypoints[ i ].children.size ) )
{
@ -1340,7 +1340,7 @@ load_waypoints()
level.waypoints[ i ].type = "crouch";
}
level.waypoints[ i ].childCount = undefined;
level.waypoints[ i ].childcount = undefined;
}
}
@ -1422,7 +1422,7 @@ getWaypointsOfType( type )
{
answer = [];
for ( i = 0; i < level.waypointCount; i++ )
for ( i = 0; i < level.waypointcount; i++ )
{
wp = level.waypoints[ i ];
@ -2425,21 +2425,21 @@ ReverseHeapAStar( item, item2 )
*/
RemoveWaypointUsage( wp, team )
{
if ( !isDefined( level.waypointUsage ) )
if ( !isDefined( level.waypointusage ) )
{
return;
}
if ( !isDefined( level.waypointUsage[ team ][ wp + "" ] ) )
if ( !isDefined( level.waypointusage[ team ][ wp + "" ] ) )
{
return;
}
level.waypointUsage[ team ][ wp + "" ]--;
level.waypointusage[ team ][ wp + "" ]--;
if ( level.waypointUsage[ team ][ wp + "" ] <= 0 )
if ( level.waypointusage[ team ][ wp + "" ] <= 0 )
{
level.waypointUsage[ team ][ wp + "" ] = undefined;
level.waypointusage[ team ][ wp + "" ] = undefined;
}
}
@ -2451,7 +2451,7 @@ GetNearestWaypointWithSight( pos )
candidate = undefined;
dist = 2147483647;
for ( i = 0; i < level.waypointCount; i++ )
for ( i = 0; i < level.waypointcount; i++ )
{
if ( !bulletTracePassed( pos + ( 0, 0, 15 ), level.waypoints[ i ].origin + ( 0, 0, 15 ), false, undefined ) )
{
@ -2480,7 +2480,7 @@ GetNearestWaypoint( pos )
candidate = undefined;
dist = 2147483647;
for ( i = 0; i < level.waypointCount; i++ )
for ( i = 0; i < level.waypointcount; i++ )
{
curdis = DistanceSquared( level.waypoints[ i ].origin, pos );
@ -2575,14 +2575,14 @@ AStarSearch( start, goal, team, greedy_path )
while ( isDefined( bestNode ) )
{
if ( isdefined( team ) && isDefined( level.waypointUsage ) )
if ( isdefined( team ) && isDefined( level.waypointusage ) )
{
if ( !isDefined( level.waypointUsage[ team ][ bestNode.index + "" ] ) )
if ( !isDefined( level.waypointusage[ team ][ bestNode.index + "" ] ) )
{
level.waypointUsage[ team ][ bestNode.index + "" ] = 0;
level.waypointusage[ team ][ bestNode.index + "" ] = 0;
}
level.waypointUsage[ team ][ bestNode.index + "" ]++;
level.waypointusage[ team ][ bestNode.index + "" ]++;
}
// construct path
@ -2602,13 +2602,13 @@ AStarSearch( start, goal, team, greedy_path )
penalty = 1;
if ( !greedy_path && isdefined( team ) && isDefined( level.waypointUsage ) )
if ( !greedy_path && isdefined( team ) && isDefined( level.waypointusage ) )
{
temppen = 1;
if ( isDefined( level.waypointUsage[ team ][ child + "" ] ) )
if ( isDefined( level.waypointusage[ team ][ child + "" ] ) )
{
temppen = level.waypointUsage[ team ][ child + "" ]; // consider how many bots are taking this path
temppen = level.waypointusage[ team ][ child + "" ]; // consider how many bots are taking this path
}
if ( temppen > 1 )
@ -2771,30 +2771,30 @@ onUsePlantObjectFix( player )
// player logString( "bomb planted: " + self.label );
// disable all bomb zones except this one
for ( index = 0; index < level.bombZones.size; index++ )
for ( index = 0; index < level.bombzones.size; index++ )
{
if ( level.bombZones[ index ] == self )
if ( level.bombzones[ index ] == self )
{
continue;
}
level.bombZones[ index ] maps\mp\gametypes\_gameobjects::disableObject();
level.bombzones[ index ] maps\mp\gametypes\_gameobjects::disableObject();
}
player playSound( "mp_bomb_plant" );
player notify ( "bomb_planted" );
// if ( !level.hardcoreMode )
// if ( !level.hardcoremode )
// iPrintLn( &"MP_EXPLOSIVES_PLANTED_BY", player );
leaderDialog( "bomb_planted" );
level thread teamPlayerCardSplash( "callout_bombplanted", player );
level.bombOwner = player;
level.bombowner = player;
player thread maps\mp\gametypes\_hud_message::SplashNotify( "plant", maps\mp\gametypes\_rank::getScoreInfoValue( "plant" ) );
player thread maps\mp\gametypes\_rank::giveRankXP( "plant" );
player.bombPlantedTime = getTime();
player.bombplantedtime = getTime();
maps\mp\gametypes\_gamescore::givePlayerScore( "plant", player );
player incPlayerStat( "bombsplanted", 1 );
player thread maps\mp\_matchdata::logGameEvent( "plant", player.origin );
@ -2807,30 +2807,30 @@ onUsePlantObjectFix( player )
bombPlantedFix( destroyedObj, player )
{
maps\mp\gametypes\_gamelogic::pauseTimer();
level.bombPlanted = true;
level.bombplanted = true;
destroyedObj.visuals[ 0 ] thread maps\mp\gametypes\_gamelogic::playTickingSound();
level.tickingObject = destroyedObj.visuals[ 0 ];
level.tickingobject = destroyedObj.visuals[ 0 ];
level.timeLimitOverride = true;
setGameEndTime( int( gettime() + ( level.bombTimer * 1000 ) ) );
level.timelimitoverride = true;
setGameEndTime( int( gettime() + ( level.bombtimer * 1000 ) ) );
setDvar( "ui_bomb_timer", 1 );
if ( !level.multiBomb )
if ( !level.multibomb )
{
level.sdBomb maps\mp\gametypes\_gameobjects::allowCarry( "none" );
level.sdBomb maps\mp\gametypes\_gameobjects::setVisibleTeam( "none" );
level.sdBomb maps\mp\gametypes\_gameobjects::setDropped();
level.sdBombModel = level.sdBomb.visuals[ 0 ];
level.sdbomb maps\mp\gametypes\_gameobjects::allowCarry( "none" );
level.sdbomb maps\mp\gametypes\_gameobjects::setVisibleTeam( "none" );
level.sdbomb maps\mp\gametypes\_gameobjects::setDropped();
level.sdbombmodel = level.sdbomb.visuals[ 0 ];
}
else
{
for ( index = 0; index < level.players.size; index++ )
{
if ( isDefined( level.players[ index ].carryIcon ) )
if ( isDefined( level.players[ index ].carryicon ) )
{
level.players[ index ].carryIcon destroyElem();
level.players[ index ].carryicon destroyElem();
}
}
@ -2841,9 +2841,9 @@ bombPlantedFix( destroyedObj, player )
forward = vectornormalize( forward - common_scripts\utility::vector_multiply( trace[ "normal" ], vectordot( forward, trace[ "normal" ] ) ) );
dropAngles = vectortoangles( forward );
level.sdBombModel = spawn( "script_model", trace[ "position" ] );
level.sdBombModel.angles = dropAngles;
level.sdBombModel setModel( "prop_suitcase_bomb" );
level.sdbombmodel = spawn( "script_model", trace[ "position" ] );
level.sdbombmodel.angles = dropAngles;
level.sdbombmodel setModel( "prop_suitcase_bomb" );
}
destroyedObj maps\mp\gametypes\_gameobjects::allowUse( "none" );
@ -2857,12 +2857,12 @@ bombPlantedFix( destroyedObj, player )
label = destroyedObj maps\mp\gametypes\_gameobjects::getLabel();
// create a new object to defuse with.
trigger = destroyedObj.bombDefuseTrig;
trigger.origin = level.sdBombModel.origin;
trigger = destroyedObj.bombdefusetrig;
trigger.origin = level.sdbombmodel.origin;
visuals = [];
defuseObject = maps\mp\gametypes\_gameobjects::createUseObject( game[ "defenders" ], trigger, visuals, ( 0, 0, 32 ) );
defuseObject maps\mp\gametypes\_gameobjects::allowUse( "friendly" );
defuseObject maps\mp\gametypes\_gameobjects::setUseTime( level.defuseTime );
defuseObject maps\mp\gametypes\_gameobjects::setUseTime( level.defusetime );
defuseObject maps\mp\gametypes\_gameobjects::setUseText( &"MP_DEFUSING_EXPLOSIVE" );
defuseObject maps\mp\gametypes\_gameobjects::setUseHintText( &"PLATFORM_HOLD_TO_DEFUSE_EXPLOSIVES" );
defuseObject maps\mp\gametypes\_gameobjects::setVisibleTeam( "any" );
@ -2871,27 +2871,27 @@ bombPlantedFix( destroyedObj, player )
defuseObject maps\mp\gametypes\_gameobjects::set3DIcon( "friendly", "waypoint_defuse" + label );
defuseObject maps\mp\gametypes\_gameobjects::set3DIcon( "enemy", "waypoint_defend" + label );
defuseObject.label = label;
defuseObject.onBeginUse = maps\mp\gametypes\sd::onBeginUse;
defuseObject.onEndUse = maps\mp\gametypes\sd::onEndUse;
defuseObject.onUse = maps\mp\gametypes\sd::onUseDefuseObject;
defuseObject.useWeapon = "briefcase_bomb_defuse_mp";
defuseObject.onbeginuse = maps\mp\gametypes\sd::onBeginUse;
defuseObject.onenduse = maps\mp\gametypes\sd::onEndUse;
defuseObject.onuse = maps\mp\gametypes\sd::onUseDefuseObject;
defuseObject.useweapon = "briefcase_bomb_defuse_mp";
level.defuseObject = defuseObject;
level.defuseobject = defuseObject;
maps\mp\gametypes\sd::BombTimerWait();
setDvar( "ui_bomb_timer", 0 );
destroyedObj.visuals[ 0 ] maps\mp\gametypes\_gamelogic::stopTickingSound();
if ( level.gameEnded || level.bombDefused )
if ( level.gameended || level.bombdefused )
{
return;
}
level.bombExploded = true;
level.bombexploded = true;
explosionOrigin = level.sdBombModel.origin;
level.sdBombModel hide();
explosionOrigin = level.sdbombmodel.origin;
level.sdbombmodel hide();
if ( isdefined( player ) )
{
@ -2912,14 +2912,14 @@ bombPlantedFix( destroyedObj, player )
thread playSoundinSpace( "exp_suitcase_bomb_main", explosionOrigin );
if ( isDefined( destroyedObj.exploderIndex ) )
if ( isDefined( destroyedObj.exploderindex ) )
{
exploder( destroyedObj.exploderIndex );
exploder( destroyedObj.exploderindex );
}
for ( index = 0; index < level.bombZones.size; index++ )
for ( index = 0; index < level.bombzones.size; index++ )
{
level.bombZones[ index ] maps\mp\gametypes\_gameobjects::disableObject();
level.bombzones[ index ] maps\mp\gametypes\_gameobjects::disableObject();
}
defuseObject maps\mp\gametypes\_gameobjects::disableObject();
@ -3001,21 +3001,21 @@ botGiveLoadout( team, class, allowCopycat )
class_num = maps\mp\gametypes\_class::getClassIndex( class );
self.class_num = class_num;
loadoutPrimary = maps\mp\gametypes\_class::table_getWeapon( level.classTableName, class_num, 0 );
loadoutPrimaryAttachment = maps\mp\gametypes\_class::table_getWeaponAttachment( level.classTableName, class_num, 0, 0 );
loadoutPrimaryAttachment2 = maps\mp\gametypes\_class::table_getWeaponAttachment( level.classTableName, class_num, 0, 1 );
loadoutPrimaryCamo = maps\mp\gametypes\_class::table_getWeaponCamo( level.classTableName, class_num, 0 );
loadoutSecondaryCamo = maps\mp\gametypes\_class::table_getWeaponCamo( level.classTableName, class_num, 1 );
loadoutSecondary = maps\mp\gametypes\_class::table_getWeapon( level.classTableName, class_num, 1 );
loadoutSecondaryAttachment = maps\mp\gametypes\_class::table_getWeaponAttachment( level.classTableName, class_num, 1, 0 );
loadoutSecondaryAttachment2 = maps\mp\gametypes\_class::table_getWeaponAttachment( level.classTableName, class_num, 1, 1 );;
loadoutSecondaryCamo = maps\mp\gametypes\_class::table_getWeaponCamo( level.classTableName, class_num, 1 );
loadoutEquipment = maps\mp\gametypes\_class::table_getEquipment( level.classTableName, class_num, 0 );
loadoutPerk1 = maps\mp\gametypes\_class::table_getPerk( level.classTableName, class_num, 1 );
loadoutPerk2 = maps\mp\gametypes\_class::table_getPerk( level.classTableName, class_num, 2 );
loadoutPerk3 = maps\mp\gametypes\_class::table_getPerk( level.classTableName, class_num, 3 );
loadoutOffhand = maps\mp\gametypes\_class::table_getOffhand( level.classTableName, class_num );
loadoutDeathstreak = maps\mp\gametypes\_class::table_getDeathstreak( level.classTableName, class_num );
loadoutPrimary = maps\mp\gametypes\_class::table_getWeapon( level.classtablename, class_num, 0 );
loadoutPrimaryAttachment = maps\mp\gametypes\_class::table_getWeaponAttachment( level.classtablename, class_num, 0, 0 );
loadoutPrimaryAttachment2 = maps\mp\gametypes\_class::table_getWeaponAttachment( level.classtablename, class_num, 0, 1 );
loadoutPrimaryCamo = maps\mp\gametypes\_class::table_getWeaponCamo( level.classtablename, class_num, 0 );
loadoutSecondaryCamo = maps\mp\gametypes\_class::table_getWeaponCamo( level.classtablename, class_num, 1 );
loadoutSecondary = maps\mp\gametypes\_class::table_getWeapon( level.classtablename, class_num, 1 );
loadoutSecondaryAttachment = maps\mp\gametypes\_class::table_getWeaponAttachment( level.classtablename, class_num, 1, 0 );
loadoutSecondaryAttachment2 = maps\mp\gametypes\_class::table_getWeaponAttachment( level.classtablename, class_num, 1, 1 );;
loadoutSecondaryCamo = maps\mp\gametypes\_class::table_getWeaponCamo( level.classtablename, class_num, 1 );
loadoutEquipment = maps\mp\gametypes\_class::table_getEquipment( level.classtablename, class_num, 0 );
loadoutPerk1 = maps\mp\gametypes\_class::table_getPerk( level.classtablename, class_num, 1 );
loadoutPerk2 = maps\mp\gametypes\_class::table_getPerk( level.classtablename, class_num, 2 );
loadoutPerk3 = maps\mp\gametypes\_class::table_getPerk( level.classtablename, class_num, 3 );
loadoutOffhand = maps\mp\gametypes\_class::table_getOffhand( level.classtablename, class_num );
loadoutDeathstreak = maps\mp\gametypes\_class::table_getDeathstreak( level.classtablename, class_num );
}
if ( loadoutPerk1 != "specialty_bling" )
@ -3026,7 +3026,7 @@ botGiveLoadout( team, class, allowCopycat )
if ( loadoutPerk1 != "specialty_onemanarmy" && loadoutSecondary == "onemanarmy" )
{
loadoutSecondary = maps\mp\gametypes\_class::table_getWeapon( level.classTableName, 10, 1 );
loadoutSecondary = maps\mp\gametypes\_class::table_getWeapon( level.classtablename, 10, 1 );
}
// loadoutSecondaryCamo = "none";
@ -3065,7 +3065,7 @@ botGiveLoadout( team, class, allowCopycat )
}
if ( level.killstreakRewards )
if ( level.killstreakrewards )
{
if ( getDvarInt( "scr_classic" ) == 1 )
{
@ -3090,10 +3090,10 @@ botGiveLoadout( team, class, allowCopycat )
secondaryName = maps\mp\gametypes\_class::buildWeaponName( loadoutSecondary, loadoutSecondaryAttachment, loadoutSecondaryAttachment2 );
self _giveWeapon( secondaryName, int( tableLookup( "mp/camoTable.csv", 1, loadoutSecondaryCamo, 0 ) ) );
self.loadoutPrimaryCamo = int( tableLookup( "mp/camoTable.csv", 1, loadoutPrimaryCamo, 0 ) );
self.loadoutPrimary = loadoutPrimary;
self.loadoutSecondary = loadoutSecondary;
self.loadoutSecondaryCamo = int( tableLookup( "mp/camoTable.csv", 1, loadoutSecondaryCamo, 0 ) );
self.loadoutprimarycamo = int( tableLookup( "mp/camoTable.csv", 1, loadoutPrimaryCamo, 0 ) );
self.loadoutprimary = loadoutPrimary;
self.loadoutsecondary = loadoutSecondary;
self.loadoutsecondarycamo = int( tableLookup( "mp/camoTable.csv", 1, loadoutSecondaryCamo, 0 ) );
self SetOffhandPrimaryClass( "other" );
@ -3109,13 +3109,13 @@ botGiveLoadout( team, class, allowCopycat )
// these special case giving pistol death have to come before
// perk loadout to ensure player perk icons arent overwritten
if ( level.dieHardMode )
if ( level.diehardmode )
{
self maps\mp\perks\_perks::givePerk( "specialty_pistoldeath" );
}
// only give the deathstreak for the initial spawn for this life.
if ( loadoutDeathStreak != "specialty_null" && ( getTime() - self.spawnTime ) < 0.1 )
if ( loadoutDeathStreak != "specialty_null" && ( getTime() - self.spawntime ) < 0.1 )
{
deathVal = int( tableLookup( "mp/perkTable.csv", 1, loadoutDeathStreak, 6 ) );
@ -3146,10 +3146,10 @@ botGiveLoadout( team, class, allowCopycat )
// Primary Weapon
primaryName = maps\mp\gametypes\_class::buildWeaponName( loadoutPrimary, loadoutPrimaryAttachment, loadoutPrimaryAttachment2 );
self _giveWeapon( primaryName, self.loadoutPrimaryCamo );
self _giveWeapon( primaryName, self.loadoutprimarycamo );
// fix changing from a riotshield class to a riotshield class during grace period not giving a shield
if ( primaryName == "riotshield_mp" && level.inGracePeriod )
if ( primaryName == "riotshield_mp" && level.ingraceperiod )
{
self notify ( "weapon_change", "riotshield_mp" );
}
@ -3198,12 +3198,12 @@ botGiveLoadout( team, class, allowCopycat )
}
primaryWeapon = primaryName;
self.primaryWeapon = primaryWeapon;
self.secondaryWeapon = secondaryName;
self.primaryweapon = primaryWeapon;
self.secondaryweapon = secondaryName;
self botPlayerModelForWeapon( self.pers[ "primaryWeapon" ], getBaseWeaponName( secondaryName ) );
self.isSniper = ( weaponClass( self.primaryWeapon ) == "sniper" );
self.issniper = ( weaponClass( self.primaryweapon ) == "sniper" );
self maps\mp\gametypes\_weapons::updateMoveSpeedScale( "primary" );

File diff suppressed because it is too large Load Diff

View File

@ -62,7 +62,7 @@ init()
setDvar( "player_sustainAmmo", 1 );
level.waypoints = [];
level.waypointCount = 0;
level.waypointcount = 0;
level waittill( "connected", player );
player thread onPlayerSpawned();
@ -84,8 +84,8 @@ StartDev()
self endon( "disconnect" );
self endon( "death" );
level.wpToLink = -1;
level.autoLink = false;
level.wptolink = -1;
level.autolink = false;
self.nearest = -1;
self takeAllWeapons();
@ -187,13 +187,13 @@ updateWaypointsStats()
{
wait 0.05;
totalWpsHud setText( level.waypointCount );
totalWpsHud setText( level.waypointcount );
closest = -1;
myEye = self getEye();
myAngles = self GetPlayerAngles();
for ( i = 0; i < level.waypointCount; i++ )
for ( i = 0; i < level.waypointcount; i++ )
{
if ( closest == -1 || closer( self.origin, level.waypoints[ i ].origin, level.waypoints[ closest ].origin ) )
{
@ -234,7 +234,7 @@ updateWaypointsStats()
type setText( buildTypeString( self.nearest ) );
wpToLink setText( level.wpToLink );
wpToLink setText( level.wptolink );
infotext.x = infotext.x - 2;
@ -309,17 +309,17 @@ watchAutoLinkCommand()
{
self waittill( "[{+frag}]" );
if ( level.autoLink )
if ( level.autolink )
{
self iPrintlnBold( "Auto link disabled" );
level.autoLink = false;
level.wpToLink = -1;
level.autolink = false;
level.wptolink = -1;
}
else
{
self iPrintlnBold( "Auto link enabled" );
level.autoLink = true;
level.wpToLink = self.nearest;
level.autolink = true;
level.wptolink = self.nearest;
}
}
}
@ -400,7 +400,7 @@ watchSaveWaypointsCommand()
logprint( "\n\n" + mpnm + "()\n{\n/*" );
logprint( "*/waypoints = [];\n/*" );
for ( i = 0; i < level.waypointCount; i++ )
for ( i = 0; i < level.waypointcount; i++ )
{
logprint( "*/waypoints[ " + i + " ] = spawnstruct();\n/*" );
logprint( "*/waypoints[ " + i + " ].origin = " + level.waypoints[ i ].origin + ";\n/*" );
@ -427,11 +427,11 @@ watchSaveWaypointsCommand()
filename = "waypoints/" + getdvar( "mapname" ) + "_wp.csv";
PrintLn( "********* Start Bot Warfare WPDump *********" );
PrintLn( level.waypointCount );
PrintLn( level.waypointcount );
BotBuiltinFileWrite( filename, level.waypointCount + "\n", "write" );
BotBuiltinFileWrite( filename, level.waypointcount + "\n", "write" );
for ( i = 0; i < level.waypointCount; i++ )
for ( i = 0; i < level.waypointcount; i++ )
{
str = "";
wp = level.waypoints[ i ];
@ -491,17 +491,17 @@ LoadWaypoints()
checkForWarnings()
{
if ( level.waypointCount <= 0 )
if ( level.waypointcount <= 0 )
{
self iprintln( "WARNING: waypointCount is " + level.waypointCount );
self iprintln( "WARNING: waypointCount is " + level.waypointcount );
}
if ( level.waypointCount != level.waypoints.size )
if ( level.waypointcount != level.waypoints.size )
{
self iprintln( "WARNING: waypointCount is not " + level.waypoints.size );
}
for ( i = 0; i < level.waypointCount; i++ )
for ( i = 0; i < level.waypointcount; i++ )
{
if ( !isDefined( level.waypoints[ i ] ) )
{
@ -556,9 +556,9 @@ checkForWarnings()
// check reachability, assume bidirectional graph
wpIdx = randomInt( level.waypointCount );
wpIdx = randomInt( level.waypointcount );
for ( i = 0; i < level.waypointCount; i++ )
for ( i = 0; i < level.waypointcount; i++ )
{
if ( i % 5 == 0 )
{
@ -580,46 +580,46 @@ UnLinkWaypoint( nwp )
{
if ( nwp == -1 || distance( self.origin, level.waypoints[ nwp ].origin ) > getDvarFloat( "bots_main_debug_minDist" ) )
{
self iprintln( "Waypoint Unlink Cancelled " + level.wpToLink );
level.wpToLink = -1;
self iprintln( "Waypoint Unlink Cancelled " + level.wptolink );
level.wptolink = -1;
return;
}
if ( level.wpToLink == -1 || nwp == level.wpToLink )
if ( level.wptolink == -1 || nwp == level.wptolink )
{
level.wpToLink = nwp;
level.wptolink = nwp;
self iprintln( "Waypoint Unlink Started " + nwp );
return;
}
level.waypoints[ nwp ].children = array_remove( level.waypoints[ nwp ].children, level.wpToLink );
level.waypoints[ level.wpToLink ].children = array_remove( level.waypoints[ level.wpToLink ].children, nwp );
level.waypoints[ nwp ].children = array_remove( level.waypoints[ nwp ].children, level.wptolink );
level.waypoints[ level.wptolink ].children = array_remove( level.waypoints[ level.wptolink ].children, nwp );
self iprintln( "Waypoint " + nwp + " Broken to " + level.wpToLink );
level.wpToLink = -1;
self iprintln( "Waypoint " + nwp + " Broken to " + level.wptolink );
level.wptolink = -1;
}
LinkWaypoint( nwp )
{
if ( nwp == -1 || distance( self.origin, level.waypoints[ nwp ].origin ) > getDvarFloat( "bots_main_debug_minDist" ) )
{
self iprintln( "Waypoint Link Cancelled " + level.wpToLink );
level.wpToLink = -1;
self iprintln( "Waypoint Link Cancelled " + level.wptolink );
level.wptolink = -1;
return;
}
if ( level.wpToLink == -1 || nwp == level.wpToLink )
if ( level.wptolink == -1 || nwp == level.wptolink )
{
level.wpToLink = nwp;
level.wptolink = nwp;
self iprintln( "Waypoint Link Started " + nwp );
return;
}
weGood = true;
for ( i = level.waypoints[ level.wpToLink ].children.size - 1; i >= 0; i-- )
for ( i = level.waypoints[ level.wptolink ].children.size - 1; i >= 0; i-- )
{
child = level.waypoints[ level.wpToLink ].children[ i ];
child = level.waypoints[ level.wptolink ].children[ i ];
if ( child == nwp )
{
@ -634,7 +634,7 @@ LinkWaypoint( nwp )
{
child = level.waypoints[ nwp ].children[ i ];
if ( child == level.wpToLink )
if ( child == level.wptolink )
{
weGood = false;
break;
@ -644,16 +644,16 @@ LinkWaypoint( nwp )
if ( !weGood )
{
self iprintln( "Waypoint Link Cancelled " + nwp + " and " + level.wpToLink + " already linked." );
level.wpToLink = -1;
self iprintln( "Waypoint Link Cancelled " + nwp + " and " + level.wptolink + " already linked." );
level.wptolink = -1;
return;
}
level.waypoints[ level.wpToLink ].children[ level.waypoints[ level.wpToLink ].children.size ] = nwp;
level.waypoints[ nwp ].children[ level.waypoints[ nwp ].children.size ] = level.wpToLink;
level.waypoints[ level.wptolink ].children[ level.waypoints[ level.wptolink ].children.size ] = nwp;
level.waypoints[ nwp ].children[ level.waypoints[ nwp ].children.size ] = level.wptolink;
self iprintln( "Waypoint " + nwp + " Linked to " + level.wpToLink );
level.wpToLink = -1;
self iprintln( "Waypoint " + nwp + " Linked to " + level.wptolink );
level.wptolink = -1;
}
DeleteWaypoint( nwp )
@ -664,7 +664,7 @@ DeleteWaypoint( nwp )
return;
}
level.wpToLink = -1;
level.wptolink = -1;
for ( i = level.waypoints[ nwp ].children.size - 1; i >= 0; i-- )
{
@ -673,7 +673,7 @@ DeleteWaypoint( nwp )
level.waypoints[ child ].children = array_remove( level.waypoints[ child ].children, nwp );
}
for ( i = 0; i < level.waypointCount; i++ )
for ( i = 0; i < level.waypointcount; i++ )
{
for ( h = level.waypoints[ i ].children.size - 1; h >= 0; h-- )
{
@ -684,11 +684,11 @@ DeleteWaypoint( nwp )
}
}
for ( entry = 0; entry < level.waypointCount; entry++ )
for ( entry = 0; entry < level.waypointcount; entry++ )
{
if ( entry == nwp )
{
while ( entry < level.waypointCount - 1 )
while ( entry < level.waypointcount - 1 )
{
level.waypoints[ entry ] = level.waypoints[ entry + 1 ];
entry++;
@ -699,74 +699,74 @@ DeleteWaypoint( nwp )
}
}
level.waypointCount--;
level.waypointcount--;
self iprintln( "DelWp " + nwp );
}
AddWaypoint()
{
level.waypoints[ level.waypointCount ] = spawnstruct();
level.waypoints[ level.waypointcount ] = spawnstruct();
pos = self getOrigin();
level.waypoints[ level.waypointCount ].origin = pos;
level.waypoints[ level.waypointcount ].origin = pos;
if ( isDefined( self.javelinTargetPoint ) )
if ( isDefined( self.javelintargetpoint ) )
{
level.waypoints[ level.waypointCount ].type = "javelin";
level.waypoints[ level.waypointcount ].type = "javelin";
}
else if ( self AdsButtonPressed() )
{
level.waypoints[ level.waypointCount ].type = "climb";
level.waypoints[ level.waypointcount ].type = "climb";
}
else if ( self AttackButtonPressed() && self UseButtonPressed() )
{
level.waypoints[ level.waypointCount ].type = "tube";
level.waypoints[ level.waypointcount ].type = "tube";
}
else if ( self AttackButtonPressed() )
{
level.waypoints[ level.waypointCount ].type = "grenade";
level.waypoints[ level.waypointcount ].type = "grenade";
}
else if ( self UseButtonPressed() )
{
level.waypoints[ level.waypointCount ].type = "claymore";
level.waypoints[ level.waypointcount ].type = "claymore";
}
else
{
level.waypoints[ level.waypointCount ].type = self getStance();
level.waypoints[ level.waypointcount ].type = self getStance();
}
level.waypoints[ level.waypointCount ].angles = self getPlayerAngles();
level.waypoints[ level.waypointcount ].angles = self getPlayerAngles();
level.waypoints[ level.waypointCount ].children = [];
level.waypoints[ level.waypointcount ].children = [];
if ( level.waypoints[ level.waypointCount ].type == "javelin" )
if ( level.waypoints[ level.waypointcount ].type == "javelin" )
{
level.waypoints[ level.waypointCount ].jav_point = self.javelinTargetPoint;
level.waypoints[ level.waypointcount ].jav_point = self.javelintargetpoint;
}
self iprintln( level.waypoints[ level.waypointCount ].type + " Waypoint " + level.waypointCount + " Added at " + pos );
self iprintln( level.waypoints[ level.waypointcount ].type + " Waypoint " + level.waypointcount + " Added at " + pos );
if ( level.autoLink )
if ( level.autolink )
{
if ( level.wpToLink == -1 )
if ( level.wptolink == -1 )
{
level.wpToLink = level.waypointCount - 1;
level.wptolink = level.waypointcount - 1;
}
level.waypointCount++;
self LinkWaypoint( level.waypointCount - 1 );
level.waypointcount++;
self LinkWaypoint( level.waypointcount - 1 );
}
else
{
level.waypointCount++;
level.waypointcount++;
}
}
DeleteAllWaypoints()
{
level.waypoints = [];
level.waypointCount = 0;
level.waypointcount = 0;
self iprintln( "DelAllWps" );
}
@ -828,19 +828,19 @@ initHudElem( txt, xl, yl )
{
hud = NewClientHudElem( self );
hud setText( txt );
hud.alignX = "left";
hud.alignY = "top";
hud.horzAlign = "left";
hud.vertAlign = "top";
hud.alignx = "left";
hud.aligny = "top";
hud.horzalign = "left";
hud.vertalign = "top";
hud.x = xl;
hud.y = yl;
hud.foreground = true;
hud.fontScale = 1;
hud.fontscale = 1;
hud.font = "objective";
hud.alpha = 1;
hud.glow = 0;
hud.glowColor = ( 0, 0, 0 );
hud.glowAlpha = 1;
hud.glowcolor = ( 0, 0, 0 );
hud.glowalpha = 1;
hud.color = ( 1.0, 1.0, 1.0 );
self thread destroyOnDeath( hud );
@ -852,19 +852,19 @@ initHudElem2()
{
infotext = NewHudElem();
infotext setText( "^1[{+smoke}]-AddWp ^2[{+melee}]-LinkWp ^3[{+reload}]-UnLinkWp ^4[{+actionslot 3}]-DeleteWp ^5[{+actionslot 4}]-DelAllWps ^6[{+actionslot 2}]-LoadWPS ^7[{+actionslot 1}]-SaveWp" );
infotext.alignX = "center";
infotext.alignY = "bottom";
infotext.horzAlign = "center";
infotext.vertAlign = "bottom";
infotext.alignx = "center";
infotext.aligny = "bottom";
infotext.horzalign = "center";
infotext.vertalign = "bottom";
infotext.x = -800;
infotext.y = 25;
infotext.foreground = true;
infotext.fontScale = 1.35;
infotext.fontscale = 1.35;
infotext.font = "objective";
infotext.alpha = 1;
infotext.glow = 0;
infotext.glowColor = ( 0, 0, 0 );
infotext.glowAlpha = 1;
infotext.glowcolor = ( 0, 0, 0 );
infotext.glowalpha = 1;
infotext.color = ( 1.0, 1.0, 1.0 );
self thread destroyOnDeath( infotext );
@ -875,10 +875,10 @@ initHudElem2()
initHudElem3()
{
bar = level createServerBar( ( 0.5, 0.5, 0.5 ), 1000, 25 );
bar.alignX = "center";
bar.alignY = "bottom";
bar.horzAlign = "center";
bar.vertAlign = "bottom";
bar.alignx = "center";
bar.aligny = "bottom";
bar.horzalign = "center";
bar.vertalign = "bottom";
bar.y = 30;
bar.foreground = true;
@ -892,10 +892,10 @@ initHudElem4()
OptionsBG = NewClientHudElem( self );
OptionsBG.x = 100;
OptionsBG.y = 2;
OptionsBG.alignX = "left";
OptionsBG.alignY = "top";
OptionsBG.horzAlign = "left";
OptionsBG.vertAlign = "top";
OptionsBG.alignx = "left";
OptionsBG.aligny = "top";
OptionsBG.horzalign = "left";
OptionsBG.vertalign = "top";
OptionsBG setshader( "black", 200, 60 );
OptionsBG.alpha = 0.4;