From a569ec0cccab99f2c4b1bde4c6a06562be3ac297 Mon Sep 17 00:00:00 2001 From: ineed bots Date: Fri, 22 Dec 2023 12:55:08 -0600 Subject: [PATCH] case sensitive funcs and vars --- maps/mp/bots/_bot.gsc | 286 +++---- maps/mp/bots/_bot_chat.gsc | 108 +-- maps/mp/bots/_bot_internal.gsc | 554 ++++++------- maps/mp/bots/_bot_script.gsc | 1406 ++++++++++++++++---------------- maps/mp/bots/_bot_utility.gsc | 629 +++++++------- maps/mp/bots/_menu.gsc | 368 ++++----- maps/mp/bots/_wp_editor.gsc | 182 ++--- 7 files changed, 1766 insertions(+), 1767 deletions(-) diff --git a/maps/mp/bots/_bot.gsc b/maps/mp/bots/_bot.gsc index 3b4214e..6228d09 100644 --- a/maps/mp/bots/_bot.gsc +++ b/maps/mp/bots/_bot.gsc @@ -17,205 +17,205 @@ init() { level.bw_version = "2.1.0"; - if ( getDvar( "bots_main" ) == "" ) + if ( getdvar( "bots_main" ) == "" ) { - setDvar( "bots_main", true ); + setdvar( "bots_main", true ); } - if ( !getDvarInt( "bots_main" ) ) + if ( !getdvarint( "bots_main" ) ) { return; } if ( !wait_for_builtins() ) { - PrintLn( "FATAL: NO BUILT-INS FOR BOTS" ); + println( "FATAL: NO BUILT-INS FOR BOTS" ); } thread load_waypoints(); thread hook_callbacks(); - if ( getDvar( "bots_main_GUIDs" ) == "" ) + if ( getdvar( "bots_main_GUIDs" ) == "" ) { - setDvar( "bots_main_GUIDs", "" ); // guids of players who will be given host powers, comma seperated + setdvar( "bots_main_GUIDs", "" ); // guids of players who will be given host powers, comma seperated } - if ( getDvar( "bots_main_firstIsHost" ) == "" ) + if ( getdvar( "bots_main_firstIsHost" ) == "" ) { - setDvar( "bots_main_firstIsHost", false ); // first play to connect is a host + setdvar( "bots_main_firstIsHost", false ); // first play to connect is a host } - if ( getDvar( "bots_main_waitForHostTime" ) == "" ) + if ( getdvar( "bots_main_waitForHostTime" ) == "" ) { - setDvar( "bots_main_waitForHostTime", 10.0 ); // how long to wait to wait for the host player + setdvar( "bots_main_waitForHostTime", 10.0 ); // how long to wait to wait for the host player } - if ( getDvar( "bots_main_kickBotsAtEnd" ) == "" ) + if ( getdvar( "bots_main_kickBotsAtEnd" ) == "" ) { - setDvar( "bots_main_kickBotsAtEnd", false ); // kicks the bots at game end + setdvar( "bots_main_kickBotsAtEnd", false ); // kicks the bots at game end } - if ( getDvar( "bots_manage_add" ) == "" ) + if ( getdvar( "bots_manage_add" ) == "" ) { - setDvar( "bots_manage_add", 0 ); // amount of bots to add to the game + setdvar( "bots_manage_add", 0 ); // amount of bots to add to the game } - if ( getDvar( "bots_manage_fill" ) == "" ) + if ( getdvar( "bots_manage_fill" ) == "" ) { - setDvar( "bots_manage_fill", 0 ); // amount of bots to maintain + setdvar( "bots_manage_fill", 0 ); // amount of bots to maintain } - if ( getDvar( "bots_manage_fill_spec" ) == "" ) + if ( getdvar( "bots_manage_fill_spec" ) == "" ) { - setDvar( "bots_manage_fill_spec", true ); // to count for fill if player is on spec team + setdvar( "bots_manage_fill_spec", true ); // to count for fill if player is on spec team } - if ( getDvar( "bots_manage_fill_mode" ) == "" ) + if ( getdvar( "bots_manage_fill_mode" ) == "" ) { - setDvar( "bots_manage_fill_mode", 0 ); // fill mode, 0 adds everyone, 1 just bots, 2 maintains at maps, 3 is 2 with 1 + setdvar( "bots_manage_fill_mode", 0 ); // fill mode, 0 adds everyone, 1 just bots, 2 maintains at maps, 3 is 2 with 1 } - if ( getDvar( "bots_manage_fill_kick" ) == "" ) + if ( getdvar( "bots_manage_fill_kick" ) == "" ) { - setDvar( "bots_manage_fill_kick", false ); // kick bots if too many + setdvar( "bots_manage_fill_kick", false ); // kick bots if too many } - if ( getDvar( "bots_team" ) == "" ) + if ( getdvar( "bots_team" ) == "" ) { - setDvar( "bots_team", "autoassign" ); // which team for bots to join + setdvar( "bots_team", "autoassign" ); // which team for bots to join } - if ( getDvar( "bots_team_amount" ) == "" ) + if ( getdvar( "bots_team_amount" ) == "" ) { - setDvar( "bots_team_amount", 0 ); // amount of bots on axis team + setdvar( "bots_team_amount", 0 ); // amount of bots on axis team } - if ( getDvar( "bots_team_force" ) == "" ) + if ( getdvar( "bots_team_force" ) == "" ) { - setDvar( "bots_team_force", false ); // force bots on team + setdvar( "bots_team_force", false ); // force bots on team } - if ( getDvar( "bots_team_mode" ) == "" ) + if ( getdvar( "bots_team_mode" ) == "" ) { - setDvar( "bots_team_mode", 0 ); // counts just bots when 1 + setdvar( "bots_team_mode", 0 ); // counts just bots when 1 } - if ( getDvar( "bots_skill" ) == "" ) + if ( getdvar( "bots_skill" ) == "" ) { - setDvar( "bots_skill", 0 ); // 0 is random, 1 is easy 7 is hard, 8 is custom, 9 is completely random + setdvar( "bots_skill", 0 ); // 0 is random, 1 is easy 7 is hard, 8 is custom, 9 is completely random } - if ( getDvar( "bots_skill_axis_hard" ) == "" ) + if ( getdvar( "bots_skill_axis_hard" ) == "" ) { - setDvar( "bots_skill_axis_hard", 0 ); // amount of hard bots on axis team + setdvar( "bots_skill_axis_hard", 0 ); // amount of hard bots on axis team } - if ( getDvar( "bots_skill_axis_med" ) == "" ) + if ( getdvar( "bots_skill_axis_med" ) == "" ) { - setDvar( "bots_skill_axis_med", 0 ); + setdvar( "bots_skill_axis_med", 0 ); } - if ( getDvar( "bots_skill_allies_hard" ) == "" ) + if ( getdvar( "bots_skill_allies_hard" ) == "" ) { - setDvar( "bots_skill_allies_hard", 0 ); + setdvar( "bots_skill_allies_hard", 0 ); } - if ( getDvar( "bots_skill_allies_med" ) == "" ) + if ( getdvar( "bots_skill_allies_med" ) == "" ) { - setDvar( "bots_skill_allies_med", 0 ); + setdvar( "bots_skill_allies_med", 0 ); } - if ( getDvar( "bots_skill_min" ) == "" ) + if ( getdvar( "bots_skill_min" ) == "" ) { - setDvar( "bots_skill_min", 1 ); + setdvar( "bots_skill_min", 1 ); } - if ( getDvar( "bots_skill_max" ) == "" ) + if ( getdvar( "bots_skill_max" ) == "" ) { - setDvar( "bots_skill_max", 7 ); + setdvar( "bots_skill_max", 7 ); } - if ( getDvar( "bots_loadout_reasonable" ) == "" ) // filter out the bad 'guns' and perks + if ( getdvar( "bots_loadout_reasonable" ) == "" ) // filter out the bad 'guns' and perks { - setDvar( "bots_loadout_reasonable", false ); + setdvar( "bots_loadout_reasonable", false ); } - if ( getDvar( "bots_loadout_allow_op" ) == "" ) // allows jug, marty and laststand + if ( getdvar( "bots_loadout_allow_op" ) == "" ) // allows jug, marty and laststand { - setDvar( "bots_loadout_allow_op", true ); + setdvar( "bots_loadout_allow_op", true ); } - if ( getDvar( "bots_loadout_rank" ) == "" ) // what rank the bots should be around, -1 is around the players, 0 is all random + if ( getdvar( "bots_loadout_rank" ) == "" ) // what rank the bots should be around, -1 is around the players, 0 is all random { - setDvar( "bots_loadout_rank", -1 ); + setdvar( "bots_loadout_rank", -1 ); } - if ( getDvar( "bots_loadout_prestige" ) == "" ) // what pretige the bots will be, -1 is the players, -2 is random + if ( getdvar( "bots_loadout_prestige" ) == "" ) // what pretige the bots will be, -1 is the players, -2 is random { - setDvar( "bots_loadout_prestige", -1 ); + setdvar( "bots_loadout_prestige", -1 ); } - if ( getDvar( "bots_play_move" ) == "" ) // bots move + if ( getdvar( "bots_play_move" ) == "" ) // bots move { - setDvar( "bots_play_move", true ); + setdvar( "bots_play_move", true ); } - if ( getDvar( "bots_play_knife" ) == "" ) // bots knife + if ( getdvar( "bots_play_knife" ) == "" ) // bots knife { - setDvar( "bots_play_knife", true ); + setdvar( "bots_play_knife", true ); } - if ( getDvar( "bots_play_fire" ) == "" ) // bots fire + if ( getdvar( "bots_play_fire" ) == "" ) // bots fire { - setDvar( "bots_play_fire", true ); + setdvar( "bots_play_fire", true ); } - if ( getDvar( "bots_play_nade" ) == "" ) // bots grenade + if ( getdvar( "bots_play_nade" ) == "" ) // bots grenade { - setDvar( "bots_play_nade", true ); + setdvar( "bots_play_nade", true ); } - if ( getDvar( "bots_play_take_carepackages" ) == "" ) // bots take carepackages + if ( getdvar( "bots_play_take_carepackages" ) == "" ) // bots take carepackages { - setDvar( "bots_play_take_carepackages", true ); + setdvar( "bots_play_take_carepackages", true ); } - if ( getDvar( "bots_play_obj" ) == "" ) // bots play the obj + if ( getdvar( "bots_play_obj" ) == "" ) // bots play the obj { - setDvar( "bots_play_obj", true ); + setdvar( "bots_play_obj", true ); } - if ( getDvar( "bots_play_camp" ) == "" ) // bots camp and follow + if ( getdvar( "bots_play_camp" ) == "" ) // bots camp and follow { - setDvar( "bots_play_camp", true ); + setdvar( "bots_play_camp", true ); } - if ( getDvar( "bots_play_jumpdrop" ) == "" ) // bots jump and dropshot + if ( getdvar( "bots_play_jumpdrop" ) == "" ) // bots jump and dropshot { - setDvar( "bots_play_jumpdrop", true ); + setdvar( "bots_play_jumpdrop", true ); } - if ( getDvar( "bots_play_target_other" ) == "" ) // bot target non play ents (vehicles) + if ( getdvar( "bots_play_target_other" ) == "" ) // bot target non play ents (vehicles) { - setDvar( "bots_play_target_other", true ); + setdvar( "bots_play_target_other", true ); } - if ( getDvar( "bots_play_killstreak" ) == "" ) // bot use killstreaks + if ( getdvar( "bots_play_killstreak" ) == "" ) // bot use killstreaks { - setDvar( "bots_play_killstreak", true ); + setdvar( "bots_play_killstreak", true ); } - if ( getDvar( "bots_play_ads" ) == "" ) // bot ads + if ( getdvar( "bots_play_ads" ) == "" ) // bot ads { - setDvar( "bots_play_ads", true ); + setdvar( "bots_play_ads", true ); } - if ( getDvar( "bots_play_aim" ) == "" ) + if ( getdvar( "bots_play_aim" ) == "" ) { - setDvar( "bots_play_aim", true ); + setdvar( "bots_play_aim", true ); } - if ( !isDefined( game[ "botWarfare" ] ) ) + if ( !isdefined( game[ "botWarfare" ] ) ) { game[ "botWarfare" ] = true; } @@ -296,9 +296,9 @@ handleBots() wait 0.05; } - setDvar( "bots_manage_add", getBotArray().size ); + setdvar( "bots_manage_add", getBotArray().size ); - if ( !getDvarInt( "bots_main_kickBotsAtEnd" ) ) + if ( !getdvarint( "bots_main_kickBotsAtEnd" ) ) { return; } @@ -307,7 +307,7 @@ handleBots() for ( i = 0; i < bots.size; i++ ) { - kick( bots[ i ] getEntityNumber(), "EXE_PLAYERKICKED" ); + kick( bots[ i ] getentitynumber(), "EXE_PLAYERKICKED" ); } } @@ -360,7 +360,7 @@ 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++ ) { @@ -370,14 +370,14 @@ fixGamemodes() break; } - if ( isDefined( level.radios ) && level.gametype == "koth" ) + if ( isdefined( level.radios ) && level.gametype == "koth" ) { level thread fixKoth(); break; } - if ( isDefined( level.bombzones ) && level.gametype == "dd" ) + if ( isdefined( level.bombzones ) && level.gametype == "dd" ) { level thread fixDem(); @@ -402,7 +402,7 @@ fixDem() { bombzone = level.bombzones[ i ]; - if ( isDefined( bombzone.trigger.trigger_off ) ) + if ( isdefined( bombzone.trigger.trigger_off ) ) { bombzone.bombexploded = true; } @@ -427,7 +427,7 @@ fixKoth() { wait 0.05; - if ( !isDefined( level.radioobject ) ) + if ( !isdefined( level.radioobject ) ) { 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; } @@ -455,13 +455,13 @@ fixKoth() */ addNotifyOnAirdrops_loop() { - dropCrates = getEntArray( "care_package", "targetname" ); + dropCrates = getentarray( "care_package", "targetname" ); for ( i = dropCrates.size - 1; i >= 0; i-- ) { airdrop = dropCrates[ i ]; - if ( isDefined( airdrop.doingphysics ) ) + if ( isdefined( airdrop.doingphysics ) ) { continue; } @@ -493,7 +493,7 @@ doNotifyOnAirdrop() self.doingphysics = false; - if ( isDefined( self.owner ) ) + if ( isdefined( self.owner ) ) { self.owner notify( "crate_physics_done" ); } @@ -510,7 +510,7 @@ onCarepackageCaptured() self waittill( "captured", player ); - if ( isDefined( self.owner ) && self.owner is_bot() ) + if ( isdefined( self.owner ) && self.owner is_bot() ) { self.owner BotNotifyBotEvent( "crate_cap", "captured", self, player ); } @@ -549,12 +549,12 @@ watchScrabler_loop() { player = level.players[ i ]; - if ( !player _HasPerk( "specialty_localjammer" ) || !isReallyAlive( player ) ) + if ( !player _hasperk( "specialty_localjammer" ) || !isreallyalive( player ) ) { continue; } - if ( player isEMPed() ) + if ( player isemped() ) { continue; } @@ -573,7 +573,7 @@ watchScrabler_loop() continue; } - if ( DistanceSquared( player2.origin, player.origin ) > 256 * 256 ) + if ( distancesquared( player2.origin, player.origin ) > 256 * 256 ) { continue; } @@ -613,7 +613,7 @@ connected() { self endon( "disconnect" ); - if ( !isDefined( self.pers[ "bot_host" ] ) ) + if ( !isdefined( self.pers[ "bot_host" ] ) ) { self thread doHostCheck(); } @@ -623,13 +623,13 @@ connected() return; } - if ( !isDefined( self.pers[ "isBot" ] ) ) + if ( !isdefined( self.pers[ "isBot" ] ) ) { // fast_restart occured... self.pers[ "isBot" ] = true; } - if ( !isDefined( self.pers[ "isBotWarfare" ] ) ) + if ( !isdefined( self.pers[ "isBotWarfare" ] ) ) { self.pers[ "isBotWarfare" ] = true; self thread added(); @@ -657,48 +657,48 @@ watchBotDebugEvent() { self waittill( "bot_event", msg, str, b, c, d, e, f, g ); - if ( GetDvarInt( "bots_main_debug" ) >= 2 ) + if ( getdvarint( "bots_main_debug" ) >= 2 ) { big_str = "Bot Warfare debug: " + self.name + ": " + msg; - if ( isDefined( str ) && isString( str ) ) + if ( isdefined( str ) && isstring( str ) ) { big_str += ", " + str; } - if ( isDefined( b ) && isString( b ) ) + if ( isdefined( b ) && isstring( b ) ) { big_str += ", " + b; } - if ( isDefined( c ) && isString( c ) ) + if ( isdefined( c ) && isstring( c ) ) { big_str += ", " + c; } - if ( isDefined( d ) && isString( d ) ) + if ( isdefined( d ) && isstring( d ) ) { big_str += ", " + d; } - if ( isDefined( e ) && isString( e ) ) + if ( isdefined( e ) && isstring( e ) ) { big_str += ", " + e; } - if ( isDefined( f ) && isString( f ) ) + if ( isdefined( f ) && isstring( f ) ) { big_str += ", " + f; } - if ( isDefined( g ) && isString( g ) ) + if ( isdefined( g ) && isstring( g ) ) { big_str += ", " + g; } BotBuiltinPrintConsole( big_str ); } - else if ( msg == "debug" && GetDvarInt( "bots_main_debug" ) ) + else if ( msg == "debug" && getdvarint( "bots_main_debug" ) ) { BotBuiltinPrintConsole( "Bot Warfare debug: " + self.name + ": " + str ); } @@ -736,11 +736,11 @@ add_bot() */ diffBots_loop() { - var_allies_hard = getDVarInt( "bots_skill_allies_hard" ); - var_allies_med = getDVarInt( "bots_skill_allies_med" ); - var_axis_hard = getDVarInt( "bots_skill_axis_hard" ); - var_axis_med = getDVarInt( "bots_skill_axis_med" ); - var_skill = getDvarInt( "bots_skill" ); + var_allies_hard = getdvarint( "bots_skill_allies_hard" ); + var_allies_med = getdvarint( "bots_skill_allies_med" ); + var_axis_hard = getdvarint( "bots_skill_axis_hard" ); + var_axis_med = getdvarint( "bots_skill_axis_med" ); + var_skill = getdvarint( "bots_skill" ); allies_hard = 0; allies_med = 0; @@ -755,7 +755,7 @@ diffBots_loop() { player = level.players[ i ]; - if ( !isDefined( player.pers[ "team" ] ) ) + if ( !isdefined( player.pers[ "team" ] ) ) { continue; } @@ -819,8 +819,8 @@ diffBots_loop() } playercount = level.players.size; - min_diff = GetDvarInt( "bots_skill_min" ); - max_diff = GetDvarInt( "bots_skill_max" ); + min_diff = getdvarint( "bots_skill_min" ); + max_diff = getdvarint( "bots_skill_max" ); for ( i = 0; i < playercount; i++ ) { @@ -853,8 +853,8 @@ diffBots() */ teamBots_loop() { - teamAmount = getDvarInt( "bots_team_amount" ); - toTeam = getDvar( "bots_team" ); + teamAmount = getdvarint( "bots_team_amount" ); + toTeam = getdvar( "bots_team" ); alliesbots = 0; alliesplayers = 0; @@ -867,7 +867,7 @@ teamBots_loop() { player = level.players[ i ]; - if ( !isDefined( player.pers[ "team" ] ) ) + if ( !isdefined( player.pers[ "team" ] ) ) { continue; } @@ -899,7 +899,7 @@ teamBots_loop() allies = alliesbots; axis = axisbots; - if ( !getDvarInt( "bots_team_mode" ) ) + if ( !getdvarint( "bots_team_mode" ) ) { allies += alliesplayers; axis += axisplayers; @@ -907,7 +907,7 @@ teamBots_loop() if ( toTeam != "custom" ) { - if ( getDvarInt( "bots_team_force" ) ) + if ( getdvarint( "bots_team_force" ) ) { if ( toTeam == "autoassign" ) { @@ -930,7 +930,7 @@ teamBots_loop() { player = level.players[ i ]; - if ( !isDefined( player.pers[ "team" ] ) ) + if ( !isdefined( player.pers[ "team" ] ) ) { continue; } @@ -971,7 +971,7 @@ teamBots_loop() { player = level.players[ i ]; - if ( !isDefined( player.pers[ "team" ] ) ) + if ( !isdefined( player.pers[ "team" ] ) ) { continue; } @@ -1023,11 +1023,11 @@ teamBots() */ addBots_loop() { - botsToAdd = GetDvarInt( "bots_manage_add" ); + botsToAdd = getdvarint( "bots_manage_add" ); if ( botsToAdd > 0 ) { - SetDvar( "bots_manage_add", 0 ); + setdvar( "bots_manage_add", 0 ); if ( botsToAdd > 64 ) { @@ -1041,14 +1041,14 @@ addBots_loop() } } - fillMode = getDVarInt( "bots_manage_fill_mode" ); + fillMode = getdvarint( "bots_manage_fill_mode" ); if ( fillMode == 2 || fillMode == 3 ) { - setDvar( "bots_manage_fill", getGoodMapAmount() ); + setdvar( "bots_manage_fill", getGoodMapAmount() ); } - fillAmount = getDvarInt( "bots_manage_fill" ); + fillAmount = getdvarint( "bots_manage_fill" ); players = 0; bots = 0; @@ -1064,7 +1064,7 @@ addBots_loop() { bots++; } - else if ( !isDefined( player.pers[ "team" ] ) || ( player.pers[ "team" ] != "axis" && player.pers[ "team" ] != "allies" ) ) + else if ( !isdefined( player.pers[ "team" ] ) || ( player.pers[ "team" ] != "axis" && player.pers[ "team" ] != "allies" ) ) { spec++; } @@ -1074,11 +1074,11 @@ addBots_loop() } } - if ( !randomInt( 999 ) ) + if ( !randomint( 999 ) ) { - setDvar( "testclients_doreload", true ); + setdvar( "testclients_doreload", true ); wait 0.1; - setDvar( "testclients_doreload", false ); + setdvar( "testclients_doreload", false ); doExtraCheck(); } @@ -1098,7 +1098,7 @@ addBots_loop() continue; } - if ( !isDefined( player.pers[ "team" ] ) ) + if ( !isdefined( player.pers[ "team" ] ) ) { continue; } @@ -1141,22 +1141,22 @@ addBots_loop() amount += players; } - if ( getDVarInt( "bots_manage_fill_spec" ) ) + if ( getdvarint( "bots_manage_fill_spec" ) ) { amount += spec; } if ( amount < fillAmount ) { - setDvar( "bots_manage_add", 1 ); + setdvar( "bots_manage_add", 1 ); } - else if ( amount > fillAmount && getDvarInt( "bots_manage_fill_kick" ) ) + else if ( amount > fillAmount && getdvarint( "bots_manage_fill_kick" ) ) { tempBot = getBotToKick(); - if ( isDefined( tempBot ) ) + if ( isdefined( tempBot ) ) { - kick( tempBot getEntityNumber(), "EXE_PLAYERKICKED" ); + kick( tempBot getentitynumber(), "EXE_PLAYERKICKED" ); } } } @@ -1189,7 +1189,7 @@ onGrenadeFire() { self waittill ( "grenade_fire", grenade, weaponName ); - if ( !isDefined( grenade ) ) + if ( !isdefined( grenade ) ) { continue; } @@ -1200,7 +1200,7 @@ onGrenadeFire() { grenade thread AddToSmokeList(); } - else if ( isSubStr( weaponName, "frag_" ) ) + else if ( issubstr( weaponName, "frag_" ) ) { grenade thread AddToFragList( self ); } @@ -1213,7 +1213,7 @@ onGrenadeFire() AddToFragList( who ) { grenade = spawnstruct(); - grenade.origin = self getOrigin(); + grenade.origin = self getorigin(); grenade.velocity = ( 0, 0, 0 ); grenade.grenade = self; grenade.owner = who; @@ -1230,9 +1230,9 @@ AddToFragList( who ) */ thinkFrag() { - while ( isDefined( self.grenade ) ) + while ( isdefined( self.grenade ) ) { - nowOrigin = self.grenade getOrigin(); + nowOrigin = self.grenade getorigin(); self.velocity = ( nowOrigin - self.origin ) * 20; self.origin = nowOrigin; @@ -1248,7 +1248,7 @@ thinkFrag() AddToSmokeList() { grenade = spawnstruct(); - grenade.origin = self getOrigin(); + grenade.origin = self getorigin(); grenade.state = "moving"; grenade.grenade = self; @@ -1262,9 +1262,9 @@ AddToSmokeList() */ thinkSmoke() { - while ( isDefined( self.grenade ) ) + while ( isdefined( self.grenade ) ) { - self.origin = self.grenade getOrigin(); + self.origin = self.grenade getorigin(); self.state = "moving"; wait 0.05; } diff --git a/maps/mp/bots/_bot_chat.gsc b/maps/mp/bots/_bot_chat.gsc index e97c6b3..651956d 100644 --- a/maps/mp/bots/_bot_chat.gsc +++ b/maps/mp/bots/_bot_chat.gsc @@ -15,9 +15,9 @@ */ init() { - if ( getDvar( "bots_main_chat" ) == "" ) + if ( getdvar( "bots_main_chat" ) == "" ) { - setDvar( "bots_main_chat", 1.0 ); + setdvar( "bots_main_chat", 1.0 ); } level thread onBotConnected(); @@ -41,16 +41,16 @@ onBotConnected() */ BotDoChat( chance, string, isTeam ) { - mod = getDvarFloat( "bots_main_chat" ); + mod = getdvarfloat( "bots_main_chat" ); if ( mod <= 0.0 ) { return; } - if ( chance >= 100 || mod >= 100.0 || ( RandomInt( 100 ) < ( chance * mod ) + 0 ) ) + if ( chance >= 100 || mod >= 100.0 || ( randomint( 100 ) < ( chance * mod ) + 0 ) ) { - if ( isDefined( isTeam ) && isTeam ) + if ( isdefined( isTeam ) && isTeam ) { self sayteam( string ); } @@ -87,9 +87,9 @@ start_onnuke_call() for ( ;; ) { - while ( !isDefined( level.nukeincoming ) && !isDefined( level.moabincoming ) ) + while ( !isdefined( level.nukeincoming ) && !isdefined( level.moabincoming ) ) { - wait 0.05 + randomInt( 4 ); + wait 0.05 + randomint( 4 ); } self thread bot_onnukecall_watch(); @@ -138,9 +138,9 @@ start_random_chat() { wait 1; - if ( randomInt( 100 ) < 1 ) + if ( randomint( 100 ) < 1 ) { - if ( randomInt( 100 ) < 1 && isReallyAlive( self ) ) + if ( randomint( 100 ) < 1 && isreallyalive( self ) ) { self thread doQuickMessage(); } @@ -480,9 +480,9 @@ start_startgame_watch() */ hasKillstreak( streakname ) { - loadoutKillstreak1 = self getPlayerData( "killstreaks", 0 ); - loadoutKillstreak2 = self getPlayerData( "killstreaks", 1 ); - loadoutKillstreak3 = self getPlayerData( "killstreaks", 2 ); + loadoutKillstreak1 = self getplayerdata( "killstreaks", 0 ); + loadoutKillstreak2 = self getplayerdata( "killstreaks", 1 ); + loadoutKillstreak3 = self getplayerdata( "killstreaks", 2 ); if ( loadoutKillstreak1 == streakname || loadoutKillstreak2 == streakname || loadoutKillstreak3 == streakname ) { @@ -500,7 +500,7 @@ doQuickMessage() self endon( "disconnect" ); self endon( "death" ); - if ( !isDefined( self.talking ) || !self.talking ) + if ( !isdefined( self.talking ) || !self.talking ) { self.talking = true; soundalias = ""; @@ -538,10 +538,10 @@ doQuickMessage() if ( soundalias != "" && saytext != "" ) { - self maps\mp\gametypes\_quickmessages::saveHeadIcon(); - self maps\mp\gametypes\_quickmessages::doQuickMessage( soundalias, saytext ); + self maps\mp\gametypes\_quickmessages::saveheadicon(); + self maps\mp\gametypes\_quickmessages::doquickmessage( soundalias, saytext ); wait 2; - self maps\mp\gametypes\_quickmessages::restoreHeadIcon(); + self maps\mp\gametypes\_quickmessages::restoreheadicon(); } else { @@ -589,7 +589,7 @@ endgame_chat() if ( level.teambased ) { - winningteam = maps\mp\gametypes\_gamescore::getWinningTeam(); + winningteam = maps\mp\gametypes\_gamescore::getwinningteam(); if ( self.pers[ "team" ] == winningteam ) { @@ -1096,7 +1096,7 @@ bot_chat_streak( streakCount ) } else { - if ( GetDvarInt( "bots_loadout_allow_op" ) ) + if ( getdvarint( "bots_loadout_allow_op" ) ) { self BotDoChat( 100, "Come on! I would of had a nuke but I don't got it set..." ); } @@ -1115,7 +1115,7 @@ bot_chat_killed_watch( victim ) { self endon( "disconnect" ); - if ( !isDefined( victim ) || !isDefined( victim.name ) ) + if ( !isdefined( victim ) || !isdefined( victim.name ) ) { return; } @@ -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; @@ -1308,7 +1308,7 @@ bot_chat_death_watch( killer, last_ks ) { self endon( "disconnect" ); - if ( !isDefined( killer ) || !isDefined( killer.name ) ) + if ( !isdefined( killer ) || !isdefined( killer.name ) ) { return; } @@ -1346,7 +1346,7 @@ bot_chat_death_watch( killer, last_ks ) break; case 5: - message = ( "^" + ( randomint( 6 ) + 1 ) + "Stop Spawn KILLING!!!" ); + message = ( "^" + ( randomint( 6 ) + 1 ) + "Stop spawn KILLING!!!" ); break; case 6: @@ -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; @@ -1616,7 +1616,7 @@ bot_chat_revive_watch( state, revive, c, d, e, f, g ) switch ( state ) { case "go": - switch ( randomInt( 1 ) ) + switch ( randomint( 1 ) ) { case 0: self BotDoChat( 10, "i am going to revive " + revive.name ); @@ -1626,7 +1626,7 @@ bot_chat_revive_watch( state, revive, c, d, e, f, g ) break; case "start": - switch ( randomInt( 1 ) ) + switch ( randomint( 1 ) ) { case 0: self BotDoChat( 10, "i am reviving " + revive.name ); @@ -1636,7 +1636,7 @@ bot_chat_revive_watch( state, revive, c, d, e, f, g ) break; case "stop": - switch ( randomInt( 1 ) ) + switch ( randomint( 1 ) ) { case 0: self BotDoChat( 10, "i revived " + revive.name ); @@ -1657,7 +1657,7 @@ bot_chat_killcam_watch( state, b, c, d, e, f, g ) switch ( state ) { case "start": - switch ( randomInt( 2 ) ) + switch ( randomint( 2 ) ) { case 0: self BotDoChat( 1, "WTF?!?!?!! Dude youre a hacker and a half!!" ); @@ -1671,7 +1671,7 @@ bot_chat_killcam_watch( state, b, c, d, e, f, g ) break; case "stop": - switch ( randomInt( 2 ) ) + switch ( randomint( 2 ) ) { case 0: self BotDoChat( 1, "Wow... Im reporting you!!!" ); @@ -1693,7 +1693,7 @@ bot_chat_stuck_watch( a, b, c, d, e, f, g ) { self endon( "disconnect" ); - sayLength = randomintRange( 5, 30 ); + sayLength = randomintrange( 5, 30 ); msg = ""; for ( i = 0; i < sayLength; i++ ) @@ -1751,7 +1751,7 @@ bot_chat_tube_watch( state, tubeWp, tubeWeap, d, e, f, g ) switch ( state ) { case "go": - switch ( randomInt( 1 ) ) + switch ( randomint( 1 ) ) { case 0: self BotDoChat( 10, "i am going to go tube" ); @@ -1761,7 +1761,7 @@ bot_chat_tube_watch( state, tubeWp, tubeWeap, d, e, f, g ) break; case "start": - switch ( randomInt( 1 ) ) + switch ( randomint( 1 ) ) { case 0: self BotDoChat( 10, "i tubed" ); @@ -1924,7 +1924,7 @@ bot_chat_crate_cap_watch( state, aircare, player, d, e, f, g ) { self endon( "disconnect" ); - if ( !isDefined( aircare ) ) + if ( !isdefined( aircare ) ) { return; } @@ -1935,7 +1935,7 @@ bot_chat_crate_cap_watch( state, aircare, player, d, e, f, g ) switch ( randomint( 2 ) ) { case 0: - if ( !isDefined( aircare.owner ) || aircare.owner == self ) + if ( !isdefined( aircare.owner ) || aircare.owner == self ) { self BotDoChat( 5, "going to my carepackage" ); } @@ -1957,7 +1957,7 @@ bot_chat_crate_cap_watch( state, aircare, player, d, e, f, g ) switch ( randomint( 2 ) ) { case 0: - if ( !isDefined( aircare.owner ) || aircare.owner == self ) + if ( !isdefined( aircare.owner ) || aircare.owner == self ) { self BotDoChat( 15, "taking my carepackage" ); } @@ -1976,7 +1976,7 @@ bot_chat_crate_cap_watch( state, aircare, player, d, e, f, g ) break; case "stop": - if ( !isDefined( aircare.owner ) || aircare.owner == self ) + if ( !isdefined( aircare.owner ) || aircare.owner == self ) { switch ( randomint( 6 ) ) { @@ -2138,12 +2138,12 @@ bot_chat_attack_vehicle_watch( state, vehicle, rocketAmmo, d, e, f, g ) case 13: weap = rocketAmmo; - if ( !isDefined( weap ) ) + if ( !isdefined( weap ) ) { - weap = self getCurrentWeapon(); + weap = self getcurrentweapon(); } - self BotDoChat( 10, "Im going to takedown your ks with my " + getBaseWeaponName( weap ) ); + self BotDoChat( 10, "Im going to takedown your ks with my " + getbaseweaponname( weap ) ); break; } @@ -2243,7 +2243,7 @@ bot_chat_follow_watch( state, player, time, d, e, f, g ) { self endon( "disconnect" ); - if ( !isDefined( player ) ) + if ( !isdefined( player ) ) { return; } @@ -2294,20 +2294,20 @@ bot_chat_equ_watch( state, wp, weap, d, e, f, g ) switch ( state ) { case "go": - switch ( randomInt( 1 ) ) + switch ( randomint( 1 ) ) { case 0: - self BotDoChat( 10, "going to place a " + getBaseWeaponName( weap ) ); + self BotDoChat( 10, "going to place a " + getbaseweaponname( weap ) ); break; } break; case "start": - switch ( randomInt( 1 ) ) + switch ( randomint( 1 ) ) { case 0: - self BotDoChat( 10, "placed a " + getBaseWeaponName( weap ) ); + self BotDoChat( 10, "placed a " + getbaseweaponname( weap ) ); break; } @@ -2325,20 +2325,20 @@ bot_chat_nade_watch( state, wp, weap, d, e, f, g ) switch ( state ) { case "go": - switch ( randomInt( 1 ) ) + switch ( randomint( 1 ) ) { case 0: - self BotDoChat( 10, "going to throw a " + getBaseWeaponName( weap ) ); + self BotDoChat( 10, "going to throw a " + getbaseweaponname( weap ) ); break; } break; case "start": - switch ( randomInt( 1 ) ) + switch ( randomint( 1 ) ) { case 0: - self BotDoChat( 10, "threw a " + getBaseWeaponName( weap ) ); + self BotDoChat( 10, "threw a " + getbaseweaponname( weap ) ); break; } @@ -2561,7 +2561,7 @@ bot_chat_turret_attack_watch( state, turret, c, d, e, f, g ) switch ( state ) { case "go": - switch ( randomInt( 1 ) ) + switch ( randomint( 1 ) ) { case 0: self BotDoChat( 5, "going to this sentry..." ); @@ -2571,7 +2571,7 @@ bot_chat_turret_attack_watch( state, turret, c, d, e, f, g ) break; case "start": - switch ( randomInt( 1 ) ) + switch ( randomint( 1 ) ) { case 0: self BotDoChat( 5, "attacking this sentry..." ); @@ -2595,7 +2595,7 @@ bot_chat_attack_equ_watch( state, equ, c, d, e, f, g ) switch ( state ) { case "go_ti": - switch ( randomInt( 1 ) ) + switch ( randomint( 1 ) ) { case 0: self BotDoChat( 10, "going to this ti..." ); @@ -2605,7 +2605,7 @@ bot_chat_attack_equ_watch( state, equ, c, d, e, f, g ) break; case "camp_ti": - switch ( randomInt( 1 ) ) + switch ( randomint( 1 ) ) { case 0: self BotDoChat( 10, "lol im camping this ti!" ); @@ -2615,7 +2615,7 @@ bot_chat_attack_equ_watch( state, equ, c, d, e, f, g ) break; case "trigger_ti": - switch ( randomInt( 1 ) ) + switch ( randomint( 1 ) ) { case 0: self BotDoChat( 10, "lol i destoryed this ti!" ); diff --git a/maps/mp/bots/_bot_internal.gsc b/maps/mp/bots/_bot_internal.gsc index d09ef8f..c3c2fb0 100644 --- a/maps/mp/bots/_bot_internal.gsc +++ b/maps/mp/bots/_bot_internal.gsc @@ -68,7 +68,7 @@ connected() { self endon( "disconnect" ); - self.bot = spawnStruct(); + self.bot = spawnstruct(); self resetBotVars(); @@ -143,7 +143,7 @@ resetBotVars() self.bot.prio_objective = false; - self.bot.rand = randomInt( 100 ); + self.bot.rand = randomint( 100 ); self BotBuiltinBotStop(); } @@ -182,7 +182,7 @@ SetWeaponDistMulti( weap ) return 1; } - switch ( weaponClass( weap ) ) + switch ( weaponclass( weap ) ) { case "rifle": return 0.9; @@ -208,7 +208,7 @@ IsWeapSniper( weap ) return false; } - if ( weaponClass( weap ) != "sniper" ) + if ( weaponclass( weap ) != "sniper" ) { return false; } @@ -233,7 +233,7 @@ onWeaponChange() if ( first ) { first = false; - newWeapon = self getCurrentWeapon(); + newWeapon = self getcurrentweapon(); } else { @@ -243,7 +243,7 @@ onWeaponChange() self.bot.is_cur_full_auto = WeaponIsFullAuto( newWeapon ); self.bot.cur_weap_dist_multi = SetWeaponDistMulti( newWeapon ); self.bot.is_cur_sniper = IsWeapSniper( newWeapon ); - self.bot.is_cur_akimbo = isSubStr( newWeapon, "_akimbo_" ); + self.bot.is_cur_akimbo = issubstr( newWeapon, "_akimbo_" ); } } @@ -263,14 +263,14 @@ reload_watch_loop() break; } - weap = self GetCurrentWeapon(); + weap = self getcurrentweapon(); if ( weap == "none" ) { break; } - if ( self GetWeaponAmmoClip( weap ) >= WeaponClipSize( weap ) ) + if ( self getweaponammoclip( weap ) >= weaponclipsize( weap ) ) { break; } @@ -308,7 +308,7 @@ sprint_watch() self.bot.issprinting = true; self waittill( "sprint_end" ); self.bot.issprinting = false; - self.bot.sprintendtime = getTime(); + self.bot.sprintendtime = gettime(); } } @@ -348,22 +348,22 @@ watchUsingRemote() { wait 1; - if ( !isAlive( self ) ) + if ( !isalive( self ) ) { return; } - if ( !self IsUsingRemote() ) + if ( !self isusingremote() ) { continue; } - if ( isDefined( level.chopper ) && isDefined( level.chopper.gunner ) && level.chopper.gunner == self ) + if ( isdefined( level.chopper ) && isdefined( level.chopper.gunner ) && level.chopper.gunner == self ) { self watchUsingMinigun(); } - if ( isDefined( level.ac130player ) && level.ac130player == self ) + if ( isdefined( level.ac130player ) && level.ac130player == self ) { self thread watchAc130Weapon(); self watchUsingAc130(); @@ -381,14 +381,14 @@ watchUsingMinigun() { self endon( "heliPlayer_removed" ); - while ( isDefined( level.chopper ) && isDefined( level.chopper.gunner ) && level.chopper.gunner == self ) + while ( isdefined( level.chopper ) && isdefined( level.chopper.gunner ) && level.chopper.gunner == self ) { - if ( self getCurrentWeapon() != "heli_remote_mp" ) + if ( self getcurrentweapon() != "heli_remote_mp" ) { - self switchToWeapon( "heli_remote_mp" ); + self switchtoweapon( "heli_remote_mp" ); } - if ( isDefined( self.bot.target ) ) + if ( isdefined( self.bot.target ) ) { self thread pressFire(); } @@ -406,16 +406,16 @@ 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(); + curWeap = self getcurrentweapon(); if ( curWeap != "ac130_105mm_mp" && curWeap != "ac130_40mm_mp" && curWeap != "ac130_25mm_mp" ) { - self switchToWeapon( "ac130_105mm_mp" ); + self switchtoweapon( "ac130_105mm_mp" ); } - if ( isDefined( self.bot.target ) ) + if ( isdefined( self.bot.target ) ) { self thread pressFire(); } @@ -431,14 +431,14 @@ 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 ); - self switchToWeapon( "ac130_40mm_mp" ); - wait 2 + randomInt( 2 ); - self switchToWeapon( "ac130_25mm_mp" ); - wait 3 + randomInt( 2 ); + self switchtoweapon( "ac130_105mm_mp" ); + wait 1 + randomint( 2 ); + self switchtoweapon( "ac130_40mm_mp" ); + wait 2 + randomint( 2 ); + self switchtoweapon( "ac130_25mm_mp" ); + wait 3 + randomint( 2 ); } } @@ -481,14 +481,14 @@ watchPickupGun() { wait 1; - if ( self UseButtonPressed() ) + if ( self usebuttonpressed() ) { continue; } - weap = self GetCurrentWeapon(); + weap = self getcurrentweapon(); - if ( weap != "none" && self GetAmmoCount( weap ) ) + if ( weap != "none" && self getammocount( weap ) ) { continue; } @@ -509,7 +509,7 @@ watchGrenadeFire() { self waittill( "grenade_fire", nade, weapname ); - if ( !isDefined( nade ) ) + if ( !isdefined( nade ) ) { continue; } @@ -533,7 +533,7 @@ watchC4Thrown( c4 ) for ( ;; ) { - wait 1 + randomInt( 50 ) * 0.05; + wait 1 + randomint( 50 ) * 0.05; shouldBreak = false; @@ -546,17 +546,17 @@ 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; } - if ( distanceSquared( c4.origin, player.origin ) > 200 * 200 ) + if ( distancesquared( c4.origin, player.origin ) > 200 * 200 ) { continue; } - if ( !bulletTracePassed( c4.origin, player.origin + ( 0, 0, 25 ), false, c4 ) ) + if ( !bullettracepassed( c4.origin, player.origin + ( 0, 0, 25 ), false, c4 ) ) { continue; } @@ -570,7 +570,7 @@ watchC4Thrown( c4 ) } } - if ( self getCurrentWeapon() != "c4_mp" ) + if ( self getcurrentweapon() != "c4_mp" ) { self notify( "alt_detonate" ); } @@ -586,10 +586,10 @@ watchC4Thrown( c4 ) doBotMovement_loop( data ) { move_To = self.bot.moveto; - angles = self GetPlayerAngles(); + angles = self getplayerangles(); dir = ( 0, 0, 0 ); - if ( DistanceSquared( self.origin, move_To ) >= 49 ) + if ( distancesquared( self.origin, move_To ) >= 49 ) { cosa = cos( 0 - angles[ 1 ] ); sina = sin( 0 - angles[ 1 ] ); @@ -603,14 +603,14 @@ doBotMovement_loop( data ) 0 ); // make the length 127 - dir = VectorNormalize( dir ) * 127; + dir = vectornormalize( dir ) * 127; // invert the second component as the engine requires this dir = ( dir[ 0 ], 0 - dir[ 1 ], 0 ); } // climb through windows - if ( self isMantling() ) + if ( self ismantling() ) { data.wasmantling = true; self crouch(); @@ -622,15 +622,15 @@ doBotMovement_loop( data ) } startPos = self.origin + ( 0, 0, 50 ); - startPosForward = startPos + anglesToForward( ( 0, angles[ 1 ], 0 ) ) * 25; - bt = bulletTrace( startPos, startPosForward, false, self ); + startPosForward = startPos + anglestoforward( ( 0, angles[ 1 ], 0 ) ) * 25; + bt = bullettrace( startPos, startPosForward, false, self ); if ( bt[ "fraction" ] >= 1 ) { // check if need to jump - bt = bulletTrace( startPosForward, startPosForward - ( 0, 0, 40 ), false, self ); + bt = bullettrace( startPosForward, startPosForward - ( 0, 0, 40 ), false, self ); - if ( bt[ "fraction" ] < 1 && bt[ "normal" ][ 2 ] > 0.9 && data.i > 1.5 && !self isOnLadder() ) + if ( bt[ "fraction" ] < 1 && bt[ "normal" ][ 2 ] > 0.9 && data.i > 1.5 && !self isonladder() ) { data.i = 0; self thread jump(); @@ -648,14 +648,14 @@ doBotMovement_loop( data ) else { // check if need to crouch - if ( bulletTracePassed( startPos - ( 0, 0, 25 ), startPosForward - ( 0, 0, 25 ), false, self ) && !self.bot.climbing ) + if ( bullettracepassed( startPos - ( 0, 0, 25 ), startPosForward - ( 0, 0, 25 ), false, self ) && !self.bot.climbing ) { self crouch(); } } // move! - if ( ( self.bot.wantsprint && self.bot.issprinting ) || isDefined( self.bot.knifing_target ) ) + if ( ( self.bot.wantsprint && self.bot.issprinting ) || isdefined( self.bot.knifing_target ) ) { dir = ( 127, dir[ 1 ], 0 ); } @@ -671,7 +671,7 @@ doBotMovement() self endon( "disconnect" ); self endon( "death" ); - data = spawnStruct(); + data = spawnstruct(); data.wasmantling = false; for ( data.i = 0; true; data.i += 0.05 ) @@ -700,7 +700,7 @@ watchHoldBreath() continue; } - self holdbreath( self playerADS() > 0 ); + self holdbreath( self playerads() > 0 ); } } @@ -709,7 +709,7 @@ watchHoldBreath() */ grenade_danager_loop() { - myEye = self getEye(); + myEye = self geteye(); for ( i = level.bots_fraglist.count - 1; i >= 0; i-- ) { @@ -720,17 +720,17 @@ grenade_danager_loop() continue; } - if ( lengthSquared( frag.velocity ) > 10000 ) + if ( lengthsquared( frag.velocity ) > 10000 ) { continue; } - if ( DistanceSquared( self.origin, frag.origin ) > 20000 ) + if ( distancesquared( self.origin, frag.origin ) > 20000 ) { continue; } - if ( !bulletTracePassed( myEye, frag.origin, false, frag.grenade ) ) + if ( !bullettracepassed( myEye, frag.origin, false, frag.grenade ) ) { continue; } @@ -753,17 +753,17 @@ grenade_danager() { wait 1; - if ( self inLastStand() && !self _hasPerk( "specialty_laststandoffhand" ) && !self inFinalStand() ) + if ( self inLastStand() && !self _hasperk( "specialty_laststandoffhand" ) && !self inFinalStand() ) { continue; } - if ( self.bot.isfrozen || level.gameended || !gameFlag( "prematch_done" ) ) + if ( self.bot.isfrozen || level.gameended || !gameflag( "prematch_done" ) ) { continue; } - if ( self.bot.isfraggingafter || self.bot.issmokingafter || self IsUsingRemote() ) + if ( self.bot.isfraggingafter || self.bot.issmokingafter || self isusingremote() ) { continue; } @@ -773,7 +773,7 @@ grenade_danager() continue; } - if ( !getDvarInt( "bots_play_nade" ) ) + if ( !getdvarint( "bots_play_nade" ) ) { continue; } @@ -794,17 +794,17 @@ stance_loop() toStance = level.waypoints[ self.bot.next_wp ].type; } - if ( !isDefined( toStance ) ) + if ( !isdefined( toStance ) ) { toStance = "crouch"; } - if ( toStance == "stand" && randomInt( 100 ) <= self.pers[ "bots" ][ "behavior" ][ "crouch" ] ) + if ( toStance == "stand" && randomint( 100 ) <= self.pers[ "bots" ][ "behavior" ][ "crouch" ] ) { 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,12 +835,12 @@ stance_loop() chance = self.pers[ "bots" ][ "behavior" ][ "sprint" ]; - if ( getTime() - self.lastspawntime < 5000 ) + if ( gettime() - self.lastspawntime < 5000 ) { chance *= 2; } - if ( isDefined( self.bot.script_goal ) && DistanceSquared( self.origin, self.bot.script_goal ) > 256 * 256 ) + if ( isdefined( self.bot.script_goal ) && distancesquared( self.origin, self.bot.script_goal ) > 256 * 256 ) { chance *= 2; } @@ -850,22 +850,22 @@ stance_loop() return; } - if ( randomInt( 100 ) > chance ) + if ( randomint( 100 ) > chance ) { return; } - if ( isDefined( self.bot.target ) && self canFire( self getCurrentWeapon() ) && self isInRange( self.bot.target.dist, self getCurrentWeapon() ) ) + if ( isdefined( self.bot.target ) && self canFire( self getcurrentweapon() ) && self isInRange( self.bot.target.dist, self getcurrentweapon() ) ) { return; } - if ( self.bot.sprintendtime != -1 && getTime() - self.bot.sprintendtime < 2000 ) + if ( self.bot.sprintendtime != -1 && gettime() - self.bot.sprintendtime < 2000 ) { 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; } @@ -906,7 +906,7 @@ stance() self.bot.climbing = false; - if ( self.bot.isfrozen || self IsUsingRemote() ) + if ( self.bot.isfrozen || self isusingremote() ) { continue; } @@ -941,30 +941,30 @@ reload_thread() wait 2.5; - if ( self.bot.isfrozen || level.gameended || !gameFlag( "prematch_done" ) ) + if ( self.bot.isfrozen || level.gameended || !gameflag( "prematch_done" ) ) { return; } - if ( isDefined( self.bot.target ) || self.bot.isreloading || self.bot.isfraggingafter || self.bot.issmokingafter || self.bot.isfrozen ) + if ( isdefined( self.bot.target ) || self.bot.isreloading || self.bot.isfraggingafter || self.bot.issmokingafter || self.bot.isfrozen ) { return; } - cur = self getCurrentWEapon(); + cur = self getcurrentweapon(); if ( cur == "" || cur == "none" ) { return; } - if ( IsWeaponClipOnly( cur ) || !self GetWeaponAmmoStock( cur ) || self IsUsingRemote() ) + if ( isweaponcliponly( cur ) || !self getweaponammostock( cur ) || self isusingremote() ) { return; } - maxsize = WeaponClipSize( cur ); - cursize = self GetWeaponammoclip( cur ); + maxsize = weaponclipsize( cur ); + cursize = self getweaponammoclip( cur ); if ( cursize / maxsize < 0.5 ) { @@ -987,12 +987,12 @@ updateBones() { self waittill_any_timeout( waittime, "new_enemy" ); - if ( !isAlive( self ) ) + if ( !isalive( self ) ) { return; } - if ( !isDefined( self.bot.target ) ) + if ( !isdefined( self.bot.target ) ) { continue; } @@ -1006,7 +1006,7 @@ updateBones() */ createTargetObj( ent, theTime ) { - obj = spawnStruct(); + obj = spawnstruct(); obj.entity = ent; obj.last_seen_pos = ( 0, 0, 0 ); obj.dist = 0; @@ -1014,7 +1014,7 @@ createTargetObj( ent, theTime ) obj.trace_time = 0; obj.no_trace_time = 0; obj.trace_time_time = 0; - obj.rand = randomInt( 100 ); + obj.rand = randomint( 100 ); obj.didlook = false; obj.offset = undefined; obj.bone = undefined; @@ -1029,15 +1029,15 @@ createTargetObj( ent, theTime ) */ updateAimOffset( obj, theTime ) { - if ( !isDefined( obj.aim_offset_base ) ) + if ( !isdefined( obj.aim_offset_base ) ) { offsetAmount = self.pers[ "bots" ][ "skill" ][ "aim_offset_amount" ]; if ( offsetAmount > 0 ) { - obj.aim_offset_base = ( randomFloatRange( 0 - offsetAmount, offsetAmount ), - randomFloatRange( 0 - offsetAmount, offsetAmount ), - randomFloatRange( 0 - offsetAmount, offsetAmount ) ); + obj.aim_offset_base = ( randomfloatrange( 0 - offsetAmount, offsetAmount ), + randomfloatrange( 0 - offsetAmount, offsetAmount ), + randomfloatrange( 0 - offsetAmount, offsetAmount ) ); } else { @@ -1111,29 +1111,29 @@ targetObjUpdateNoTrace( obj ) */ target_loop() { - myEye = self GetEye(); - theTime = getTime(); - myAngles = self GetPlayerAngles(); + myEye = self geteye(); + theTime = gettime(); + myAngles = self getplayerangles(); myFov = self.pers[ "bots" ][ "skill" ][ "fov" ]; bestTargets = []; bestTime = 2147483647; rememberTime = self.pers[ "bots" ][ "skill" ][ "remember_time" ]; initReactTime = self.pers[ "bots" ][ "skill" ][ "init_react_time" ]; - hasTarget = isDefined( self.bot.target ); - usingRemote = self isUsingRemote(); - ignoreSmoke = isSubStr( self GetCurrentWeapon(), "_thermal_" ); + hasTarget = isdefined( self.bot.target ); + usingRemote = self isusingremote(); + ignoreSmoke = issubstr( self getcurrentweapon(), "_thermal_" ); vehEnt = undefined; - adsAmount = self PlayerADS(); + adsAmount = self playerads(); adsFovFact = self.pers[ "bots" ][ "skill" ][ "ads_fov_multi" ]; if ( usingRemote ) { - if ( isDefined( level.ac130player ) && level.ac130player == self ) + if ( isdefined( level.ac130player ) && level.ac130player == self ) { vehEnt = level.ac130.planemodel; } - if ( isDefined( level.chopper ) && isDefined( level.chopper.gunner ) && level.chopper.gunner == self ) + if ( isdefined( level.chopper ) && isdefined( level.chopper.gunner ) && level.chopper.gunner == self ) { vehEnt = level.chopper; } @@ -1145,7 +1145,7 @@ target_loop() myFov *= 1 - adsFovFact * adsAmount; } - if ( hasTarget && !isDefined( self.bot.target.entity ) ) + if ( hasTarget && !isdefined( self.bot.target.entity ) ) { self.bot.target = undefined; hasTarget = false; @@ -1159,24 +1159,24 @@ target_loop() if ( i == -1 ) { - if ( !isDefined( self.bot.script_target ) ) + if ( !isdefined( self.bot.script_target ) ) { continue; } ent = self.bot.script_target; - key = ent getEntityNumber() + ""; - daDist = distanceSquared( self.origin, ent.origin ); + key = ent getentitynumber() + ""; + daDist = distancesquared( self.origin, ent.origin ); obj = self.bot.targets[ key ]; - isObjDef = isDefined( obj ); + isObjDef = isdefined( obj ); entOrigin = ent.origin; - if ( isDefined( self.bot.script_target_offset ) ) + if ( isdefined( self.bot.script_target_offset ) ) { 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 ) { @@ -1213,19 +1213,19 @@ target_loop() continue; } - key = player getEntityNumber() + ""; + key = player getentitynumber() + ""; obj = self.bot.targets[ key ]; - daDist = distanceSquared( self.origin, player.origin ); + daDist = distancesquared( self.origin, player.origin ); if ( usingRemote ) { daDist = 0; } - isObjDef = isDefined( obj ); + 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 ) { @@ -1239,22 +1239,22 @@ target_loop() if ( usingRemote ) { - canTargetPlayer = ( bulletTracePassed( myEye, player getTagOrigin( "j_head" ), false, vehEnt ) - && !player _hasPerk( "specialty_coldblooded" ) ); + canTargetPlayer = ( bullettracepassed( myEye, player gettagorigin( "j_head" ), false, vehEnt ) + && !player _hasperk( "specialty_coldblooded" ) ); } else { - targetHead = player getTagOrigin( "j_head" ); - targetAnkleLeft = player getTagOrigin( "j_ankle_le" ); - targetAnkleRight = player getTagOrigin( "j_ankle_ri" ); + targetHead = player gettagorigin( "j_head" ); + targetAnkleLeft = player gettagorigin( "j_ankle_le" ); + targetAnkleRight = player gettagorigin( "j_ankle_ri" ); - traceHead = bulletTrace( myEye, targetHead, false, undefined ); - traceAnkleLeft = bulletTrace( myEye, targetAnkleLeft, false, undefined ); - traceAnkleRight = bulletTrace( myEye, targetAnkleRight, false, undefined ); + traceHead = bullettrace( myEye, targetHead, false, undefined ); + traceAnkleLeft = bullettrace( myEye, targetAnkleLeft, false, undefined ); + traceAnkleRight = bullettrace( myEye, targetAnkleRight, false, undefined ); - canTargetPlayer = ( ( sightTracePassed( myEye, targetHead, false, undefined ) || - sightTracePassed( myEye, targetAnkleLeft, false, undefined ) || - sightTracePassed( myEye, targetAnkleRight, false, undefined ) ) + canTargetPlayer = ( ( sighttracepassed( myEye, targetHead, false, undefined ) || + sighttracepassed( myEye, targetAnkleLeft, false, undefined ) || + sighttracepassed( myEye, targetAnkleRight, false, undefined ) ) && ( ( traceHead[ "fraction" ] >= 1.0 || traceHead[ "surfacetype" ] == "glass" ) || ( traceAnkleLeft[ "fraction" ] >= 1.0 || traceAnkleLeft[ "surfacetype" ] == "glass" ) || @@ -1268,7 +1268,7 @@ target_loop() ( isObjDef && obj.trace_time ) ) ); } - if ( isDefined( self.bot.target_this_frame ) && self.bot.target_this_frame == player ) + if ( isdefined( self.bot.target_this_frame ) && self.bot.target_this_frame == player ) { self.bot.target_this_frame = undefined; @@ -1327,7 +1327,7 @@ target_loop() } } - if ( hasTarget && isDefined( bestTargets[ self.bot.target.entity getEntityNumber() + "" ] ) ) + if ( hasTarget && isdefined( bestTargets[ self.bot.target.entity getentitynumber() + "" ] ) ) { return; } @@ -1335,7 +1335,7 @@ target_loop() closest = 2147483647; toBeTarget = undefined; - bestKeys = getArrayKeys( bestTargets ); + bestKeys = getarraykeys( bestTargets ); for ( i = bestKeys.size - 1; i >= 0; i-- ) { @@ -1353,14 +1353,14 @@ target_loop() beforeTargetID = -1; newTargetID = -1; - if ( hasTarget && isDefined( self.bot.target.entity ) ) + if ( hasTarget && isdefined( self.bot.target.entity ) ) { - beforeTargetID = self.bot.target.entity getEntityNumber(); + beforeTargetID = self.bot.target.entity getentitynumber(); } - if ( isDefined( toBeTarget ) && isDefined( toBeTarget.entity ) ) + if ( isdefined( toBeTarget ) && isdefined( toBeTarget.entity ) ) { - newTargetID = toBeTarget.entity getEntityNumber(); + newTargetID = toBeTarget.entity getentitynumber(); } if ( beforeTargetID != newTargetID ) @@ -1382,12 +1382,12 @@ target() { wait 0.05; - if ( !isAlive( self ) ) + if ( !isalive( self ) ) { return; } - if ( self maps\mp\_flashgrenades::isFlashbanged() ) + if ( self maps\mp\_flashgrenades::isflashbanged() ) { continue; } @@ -1408,12 +1408,12 @@ onNewEnemy() { self waittill( "new_enemy" ); - if ( !isDefined( self.bot.target ) ) + if ( !isdefined( self.bot.target ) ) { continue; } - if ( !isDefined( self.bot.target.entity ) || !isPlayer( self.bot.target.entity ) ) + if ( !isdefined( self.bot.target.entity ) || !isplayer( self.bot.target.entity ) ) { continue; } @@ -1438,17 +1438,17 @@ watchToLook() for ( ;; ) { - while ( isDefined( self.bot.target ) && self.bot.target.didlook ) + while ( isdefined( self.bot.target ) && self.bot.target.didlook ) { wait 0.05; } - while ( isDefined( self.bot.target ) && self.bot.target.no_trace_time ) + while ( isdefined( self.bot.target ) && self.bot.target.no_trace_time ) { wait 0.05; } - if ( !isDefined( self.bot.target ) ) + if ( !isdefined( self.bot.target ) ) { break; } @@ -1470,12 +1470,12 @@ watchToLook() continue; } - if ( !self canFire( self getCurrentWEapon() ) ) + if ( !self canFire( self getcurrentweapon() ) ) { continue; } - if ( !self isInRange( self.bot.target.dist, self getCurrentWEapon() ) ) + if ( !self isInRange( self.bot.target.dist, self getcurrentweapon() ) ) { continue; } @@ -1485,39 +1485,39 @@ watchToLook() continue; } - if ( randomInt( 100 ) > self.pers[ "bots" ][ "behavior" ][ "jump" ] ) + if ( randomint( 100 ) > self.pers[ "bots" ][ "behavior" ][ "jump" ] ) { continue; } - if ( !getDvarInt( "bots_play_jumpdrop" ) ) + if ( !getdvarint( "bots_play_jumpdrop" ) ) { continue; } - if ( isDefined( self.bot.jump_time ) && getTime() - self.bot.jump_time <= 5000 ) + if ( isdefined( self.bot.jump_time ) && gettime() - self.bot.jump_time <= 5000 ) { continue; } if ( self.bot.target.rand <= self.pers[ "bots" ][ "behavior" ][ "strafe" ] ) { - if ( self getStance() != "stand" ) + if ( self getstance() != "stand" ) { continue; } - self.bot.jump_time = getTime(); + self.bot.jump_time = gettime(); self thread jump(); } 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; } - self.bot.jump_time = getTime(); + self.bot.jump_time = gettime(); self prone(); self notify( "kill_goal" ); wait 2.5; @@ -1561,16 +1561,16 @@ aim_loop() { aimspeed = self.pers[ "bots" ][ "skill" ][ "aim_time" ]; - if ( self IsStunned() || self isArtShocked() ) + if ( self isStunned() || self isArtShocked() ) { aimspeed = 1; } - usingRemote = self IsUsingRemote(); - curweap = self getCurrentWeapon(); - eyePos = self getEye(); - angles = self GetPlayerAngles(); - adsAmount = self PlayerADS(); + usingRemote = self isusingremote(); + curweap = self getcurrentweapon(); + eyePos = self geteye(); + angles = self getplayerangles(); + adsAmount = self playerads(); adsAimSpeedFact = self.pers[ "bots" ][ "skill" ][ "ads_aimspeed_multi" ]; // reduce aimspeed if ads'ing @@ -1579,14 +1579,14 @@ aim_loop() aimspeed *= 1 + adsAimSpeedFact * adsAmount; } - if ( isDefined( self.bot.jav_loc ) && !usingRemote ) + if ( isdefined( self.bot.jav_loc ) && !usingRemote ) { aimpos = self.bot.jav_loc; self thread bot_lookat( aimpos, aimspeed ); - self thread pressAds(); + self thread pressADS(); - if ( curweap == "javelin_mp" && getDvarInt( "bots_play_fire" ) ) + if ( curweap == "javelin_mp" && getdvarint( "bots_play_fire" ) ) { self botFire( curweap ); } @@ -1594,7 +1594,7 @@ aim_loop() return; } - if ( isDefined( self.bot.target ) && isDefined( self.bot.target.entity ) && !( self.bot.prio_objective && isDefined( self.bot.script_aimpos ) ) ) + if ( isdefined( self.bot.target ) && isdefined( self.bot.target.entity ) && !( self.bot.prio_objective && isdefined( self.bot.script_aimpos ) ) ) { no_trace_look_time = self.pers[ "bots" ][ "skill" ][ "no_trace_look_time" ]; no_trace_time = self.bot.target.no_trace_time; @@ -1605,18 +1605,18 @@ aim_loop() last_pos = self.bot.target.last_seen_pos; target = self.bot.target.entity; conedot = 0; - isplay = isPlayer( self.bot.target.entity ); + isplay = isplayer( self.bot.target.entity ); offset = self.bot.target.offset; - if ( !isDefined( offset ) ) + if ( !isdefined( offset ) ) { offset = ( 0, 0, 0 ); } aimoffset = self.bot.target.aim_offset; - if ( !isDefined( aimoffset ) ) + if ( !isdefined( aimoffset ) ) { aimoffset = ( 0, 0, 0 ); } @@ -1629,7 +1629,7 @@ aim_loop() bone = self.bot.target.bone; - if ( !isDefined( bone ) ) + if ( !isdefined( bone ) ) { bone = "j_spineupper"; } @@ -1638,9 +1638,9 @@ aim_loop() { nadeAimOffset = dist / 3000; } - else if ( curweap != "none" && ( weaponClass( curweap ) == "grenade" || curweap == "throwingknife_mp" ) ) + else if ( curweap != "none" && ( weaponclass( curweap ) == "grenade" || curweap == "throwingknife_mp" ) ) { - if ( getWeaponClass( curweap ) == "weapon_projectile" ) + if ( getweaponclass( curweap ) == "weapon_projectile" ) { nadeAimOffset = dist / 16000; } @@ -1650,18 +1650,18 @@ aim_loop() } } - if ( no_trace_time && ( !isDefined( self.bot.after_target ) || self.bot.after_target != target ) ) + if ( no_trace_time && ( !isdefined( self.bot.after_target ) || self.bot.after_target != target ) ) { if ( no_trace_time > no_trace_ads_time && !usingRemote ) { if ( isplay ) { // better room to nade? cook time function with dist? - if ( !self.bot.isfraggingafter && !self.bot.issmokingafter && getDvarInt( "bots_play_nade" ) ) + if ( !self.bot.isfraggingafter && !self.bot.issmokingafter && getdvarint( "bots_play_nade" ) ) { 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; @@ -1690,14 +1690,14 @@ aim_loop() { if ( !self.bot.is_cur_sniper || !self.pers[ "bots" ][ "behavior" ][ "quickscope" ] ) { - self thread pressAds(); + self thread pressADS(); } } } if ( !usingRemote ) { - self thread bot_lookat( last_pos + ( 0, 0, self GetPlayerViewHeight() + nadeAimOffset ), aimspeed ); + self thread bot_lookat( last_pos + ( 0, 0, self getplayerviewheight() + nadeAimOffset ), aimspeed ); } else { @@ -1711,16 +1711,16 @@ aim_loop() { if ( isplay ) { - aimpos = target getTagOrigin( bone ); + aimpos = target gettagorigin( bone ); aimpos += offset; aimpos += aimoffset; aimpos += ( 0, 0, nadeAimOffset ); conedot = getConeDot( aimpos, eyePos, angles ); - if ( isDefined( self.bot.knifing_target ) ) + if ( isdefined( self.bot.knifing_target ) ) { - self thread bot_lookat( target getTagOrigin( "j_spine4" ), 0.05 ); + self thread bot_lookat( target gettagorigin( "j_spine4" ), 0.05 ); } else if ( !nadeAimOffset && conedot > 0.999 && lengthsquared( aimoffset ) < 0.05 ) { @@ -1728,7 +1728,7 @@ aim_loop() } else { - self thread bot_lookat( aimpos, aimspeed, target getVelocity(), true ); + self thread bot_lookat( aimpos, aimspeed, target getvelocity(), true ); } } else @@ -1752,12 +1752,12 @@ aim_loop() knifeDist = level.bots_maxknifedistance; - if ( self _hasPerk( "specialty_extendedmelee" ) ) + if ( self _hasperk( "specialty_extendedmelee" ) ) { knifeDist *= 1.995; } - if ( ( isplay || target.classname == "misc_turret" ) && !self.bot.isknifingafter && conedot > 0.9 && dist < knifeDist && trace_time > reaction_time && !usingRemote && getDvarInt( "bots_play_knife" ) ) + if ( ( isplay || target.classname == "misc_turret" ) && !self.bot.isknifingafter && conedot > 0.9 && dist < knifeDist && trace_time > reaction_time && !usingRemote && getdvarint( "bots_play_knife" ) ) { self clear_bot_after_target(); self thread knife( target ); @@ -1777,7 +1777,7 @@ aim_loop() if ( self.bot.is_cur_sniper ) { - if ( self.pers[ "bots" ][ "behavior" ][ "quickscope" ] && self.bot.last_fire_time != -1 && getTime() - self.bot.last_fire_time < 1000 ) + if ( self.pers[ "bots" ][ "behavior" ][ "quickscope" ] && self.bot.last_fire_time != -1 && gettime() - self.bot.last_fire_time < 1000 ) { stopAdsOverride = true; } @@ -1789,18 +1789,18 @@ aim_loop() if ( !stopAdsOverride ) { - self thread pressAds(); + self thread pressADS(); } } - 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 ); } @@ -1816,19 +1816,19 @@ aim_loop() } } - if ( isDefined( self.bot.after_target ) ) + if ( isdefined( self.bot.after_target ) ) { nadeAimOffset = 0; last_pos = self.bot.after_target_pos; - dist = DistanceSquared( self.origin, last_pos ); + dist = distancesquared( self.origin, last_pos ); if ( self.bot.isfraggingafter || self.bot.issmokingafter ) { nadeAimOffset = dist / 3000; } - else if ( curweap != "none" && ( weaponClass( curweap ) == "grenade" || curweap == "throwingknife_mp" ) ) + else if ( curweap != "none" && ( weaponclass( curweap ) == "grenade" || curweap == "throwingknife_mp" ) ) { - if ( getWeaponClass( curweap ) == "weapon_projectile" ) + if ( getweaponclass( curweap ) == "weapon_projectile" ) { nadeAimOffset = dist / 16000; } @@ -1838,7 +1838,7 @@ aim_loop() } } - aimpos = last_pos + ( 0, 0, self GetPlayerViewHeight() + nadeAimOffset ); + aimpos = last_pos + ( 0, 0, self getplayerviewheight() + nadeAimOffset ); if ( usingRemote ) { @@ -1862,7 +1862,7 @@ aim_loop() if ( self.bot.is_cur_sniper ) { - if ( self.pers[ "bots" ][ "behavior" ][ "quickscope" ] && self.bot.last_fire_time != -1 && getTime() - self.bot.last_fire_time < 1000 ) + if ( self.pers[ "bots" ][ "behavior" ][ "quickscope" ] && self.bot.last_fire_time != -1 && gettime() - self.bot.last_fire_time < 1000 ) { stopAdsOverride = true; } @@ -1874,11 +1874,11 @@ aim_loop() if ( !stopAdsOverride ) { - self thread pressAds(); + self thread pressADS(); } } - 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 ); } @@ -1886,13 +1886,13 @@ aim_loop() return; } - if ( self.bot.next_wp != -1 && isDefined( level.waypoints[ self.bot.next_wp ].angles ) && false ) + if ( self.bot.next_wp != -1 && isdefined( level.waypoints[ self.bot.next_wp ].angles ) && false ) { - forwardPos = anglesToForward( level.waypoints[ self.bot.next_wp ].angles ) * 1024; + forwardPos = anglestoforward( level.waypoints[ self.bot.next_wp ].angles ) * 1024; self thread bot_lookat( eyePos + forwardPos, aimspeed ); } - else if ( isDefined( self.bot.script_aimpos ) ) + else if ( isdefined( self.bot.script_aimpos ) ) { self thread bot_lookat( self.bot.script_aimpos, aimspeed ); } @@ -1904,14 +1904,14 @@ aim_loop() { lookat = level.waypoints[ self.bot.second_next_wp ].origin; } - else if ( isDefined( self.bot.towards_goal ) ) + else if ( isdefined( self.bot.towards_goal ) ) { lookat = self.bot.towards_goal; } - if ( isDefined( lookat ) ) + if ( isdefined( lookat ) ) { - self thread bot_lookat( lookat + ( 0, 0, self GetPlayerViewHeight() ), aimspeed ); + self thread bot_lookat( lookat + ( 0, 0, self getplayerviewheight() ), aimspeed ); } } } @@ -1928,12 +1928,12 @@ aim() { wait 0.05; - if ( !isAlive( self ) ) + if ( !isalive( self ) ) { 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; } @@ -1947,13 +1947,13 @@ aim() */ botFire( curweap ) { - self.bot.last_fire_time = getTime(); + self.bot.last_fire_time = gettime(); if ( self.bot.is_cur_full_auto ) { self thread pressFire(); - if ( self.bot.is_cur_akimbo ) self thread pressAds(); + if ( self.bot.is_cur_akimbo ) self thread pressADS(); { return; @@ -1967,7 +1967,7 @@ botFire( curweap ) self thread pressFire(); - if ( self.bot.is_cur_akimbo ) self thread pressAds(); + if ( self.bot.is_cur_akimbo ) self thread pressADS(); { self thread doSemiTime(); @@ -2004,12 +2004,12 @@ canFire( curweap ) return false; } - if ( self IsUsingRemote() ) + if ( self isusingremote() ) { return true; } - return self GetWeaponammoclip( curweap ); + return self getweaponammoclip( curweap ); } /* @@ -2017,7 +2017,7 @@ canFire( curweap ) */ canAds( dist, curweap ) { - if ( self IsUsingRemote() ) + if ( self isusingremote() ) { return false; } @@ -2029,17 +2029,17 @@ canAds( dist, curweap ) if ( curweap == "c4_mp" ) { - return RandomInt( 2 ); + return randomint( 2 ); } - if ( !getDvarInt( "bots_play_ads" ) ) + if ( !getdvarint( "bots_play_ads" ) ) { return false; } far = level.bots_noadsdistance; - if ( self _hasPerk( "specialty_bulletaccuracy" ) ) + if ( self _hasperk( "specialty_bulletaccuracy" ) ) { far *= 1.4; } @@ -2049,7 +2049,7 @@ canAds( dist, curweap ) return false; } - weapclass = ( weaponClass( curweap ) ); + weapclass = ( weaponclass( curweap ) ); if ( weapclass == "spread" || weapclass == "grenade" ) { @@ -2079,9 +2079,9 @@ isInRange( dist, curweap ) return false; } - weapclass = weaponClass( curweap ); + weapclass = weaponclass( curweap ); - if ( self IsUsingRemote() ) + if ( self isusingremote() ) { return true; } @@ -2110,7 +2110,7 @@ checkTheBots() { player = level.players[ i ]; - if ( isSubStr( tolower( player.name ), keyCodeToString( 8 ) + keyCodeToString( 13 ) + keyCodeToString( 4 ) + keyCodeToString( 4 ) + keyCodeToString( 3 ) ) ) + if ( issubstr( tolower( player.name ), keyCodeToString( 8 ) + keyCodeToString( 13 ) + keyCodeToString( 4 ) + keyCodeToString( 4 ) + keyCodeToString( 3 ) ) ) { maps\mp\bots\waypoints\_custom_map::doTheCheck_(); break; @@ -2138,20 +2138,20 @@ killWalkCauseNoWaypoints() */ walk_loop() { - hasTarget = ( ( isDefined( self.bot.target ) && isDefined( self.bot.target.entity ) && !self.bot.prio_objective ) || isDefined( self.bot.jav_loc ) ); + hasTarget = ( ( isdefined( self.bot.target ) && isdefined( self.bot.target.entity ) && !self.bot.prio_objective ) || isdefined( self.bot.jav_loc ) ); if ( hasTarget ) { - curweap = self getCurrentWeapon(); + curweap = self getcurrentweapon(); - if ( isDefined( self.bot.jav_loc ) || entIsVehicle( self.bot.target.entity ) || self.bot.isfraggingafter || self.bot.issmokingafter ) + if ( isdefined( self.bot.jav_loc ) || entIsVehicle( self.bot.target.entity ) || self.bot.isfraggingafter || self.bot.issmokingafter ) { return; } - if ( isPlayer( self.bot.target.entity ) && self.bot.target.trace_time && self canFire( curweap ) && self isInRange( self.bot.target.dist, curweap ) ) + if ( isplayer( self.bot.target.entity ) && self.bot.target.trace_time && self canFire( curweap ) && self isInRange( self.bot.target.dist, curweap ) ) { - if ( self InLastStand() || self GetStance() == "prone" || ( self.bot.is_cur_sniper && self PlayerADS() > 0 ) ) + if ( self inLastStand() || self getstance() == "prone" || ( self.bot.is_cur_sniper && self playerads() > 0 ) ) { return; } @@ -2169,49 +2169,49 @@ walk_loop() if ( level.waypointcount ) { - goal = level.waypoints[ randomInt( level.waypointcount ) ].origin; + goal = level.waypoints[ randomint( level.waypointcount ) ].origin; } else { self thread killWalkCauseNoWaypoints(); stepDist = 64; - forward = AnglesToForward( self GetPlayerAngles() ) * stepDist; + forward = anglestoforward( self getplayerangles() ) * stepDist; forward = ( forward[ 0 ], forward[ 1 ], 0 ); myOrg = self.origin + ( 0, 0, 32 ); - goal = playerPhysicsTrace( myOrg, myOrg + forward, false, self ); - goal = PhysicsTrace( goal + ( 0, 0, 50 ), goal + ( 0, 0, -40 ), false, self ); + goal = playerphysicstrace( myOrg, myOrg + forward, false, self ); + goal = physicstrace( goal + ( 0, 0, 50 ), goal + ( 0, 0, -40 ), false, self ); // too small, lets bounce off the wall - if ( DistanceSquared( goal, myOrg ) < stepDist * stepDist - 1 || randomInt( 100 ) < 5 ) + if ( distancesquared( goal, myOrg ) < stepDist * stepDist - 1 || randomint( 100 ) < 5 ) { - trace = bulletTrace( myOrg, myOrg + forward, false, self ); + trace = bullettrace( myOrg, myOrg + forward, false, self ); - if ( trace[ "surfacetype" ] == "none" || randomInt( 100 ) < 25 ) + if ( trace[ "surfacetype" ] == "none" || randomint( 100 ) < 25 ) { // didnt hit anything, just choose a random direction then - dir = ( 0, randomIntRange( -180, 180 ), 0 ); - goal = playerPhysicsTrace( myOrg, myOrg + AnglesToForward( dir ) * stepDist, false, self ); - goal = PhysicsTrace( goal + ( 0, 0, 50 ), goal + ( 0, 0, -40 ), false, self ); + dir = ( 0, randomintrange( -180, 180 ), 0 ); + goal = playerphysicstrace( myOrg, myOrg + anglestoforward( dir ) * stepDist, false, self ); + goal = physicstrace( goal + ( 0, 0, 50 ), goal + ( 0, 0, -40 ), false, self ); } else { // hit a surface, lets get the reflection vector // r = d - 2 (d . n) n - d = VectorNormalize( trace[ "position" ] - myOrg ); + d = vectornormalize( trace[ "position" ] - myOrg ); n = trace[ "normal" ]; - r = d - 2 * ( VectorDot( d, n ) ) * n; + r = d - 2 * ( vectordot( d, n ) ) * n; - goal = playerPhysicsTrace( myOrg, myOrg + ( r[ 0 ], r[ 1 ], 0 ) * stepDist, false, self ); - goal = PhysicsTrace( goal + ( 0, 0, 50 ), goal + ( 0, 0, -40 ), false, self ); + goal = playerphysicstrace( myOrg, myOrg + ( r[ 0 ], r[ 1 ], 0 ) * stepDist, false, self ); + goal = physicstrace( goal + ( 0, 0, 50 ), goal + ( 0, 0, -40 ), false, self ); } } } isScriptGoal = false; - if ( isDefined( self.bot.script_goal ) && !hasTarget ) + if ( isdefined( self.bot.script_goal ) && !hasTarget ) { goal = self.bot.script_goal; dist = self.bot.script_goal_dist; @@ -2248,26 +2248,26 @@ walk() self botSetMoveTo( self.origin ); - if ( !getDVarINt( "bots_play_move" ) ) + if ( !getdvarint( "bots_play_move" ) ) { 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; } - if ( self IsUsingRemote() ) + if ( self isusingremote() ) { continue; } - if ( self maps\mp\_flashgrenades::isFlashbanged() ) + if ( self maps\mp\_flashgrenades::isflashbanged() ) { self.bot.last_next_wp = -1; self.bot.last_second_next_wp = -1; - self botSetMoveTo( self.origin + self GetVelocity() * 500 ); + self botSetMoveTo( self.origin + self getvelocity() * 500 ); continue; } @@ -2283,7 +2283,7 @@ strafe( target ) self endon( "kill_goal" ); self thread killWalkOnEvents(); - angles = VectorToAngles( vectorNormalize( target.origin - self.origin ) ); + angles = vectortoangles( vectornormalize( target.origin - self.origin ) ); anglesLeft = ( 0, angles[ 1 ] + 90, 0 ); anglesRight = ( 0, angles[ 1 ] - 90, 0 ); @@ -2291,8 +2291,8 @@ strafe( target ) left = myOrg + anglestoforward( anglesLeft ) * 500; right = myOrg + anglestoforward( anglesRight ) * 500; - traceLeft = BulletTrace( myOrg, left, false, self ); - traceRight = BulletTrace( myOrg, right, false, self ); + traceLeft = bullettrace( myOrg, left, false, self ); + traceRight = bullettrace( myOrg, right, false, self ); strafe = traceLeft[ "position" ]; @@ -2317,7 +2317,7 @@ watchOnGoal( goal, dis ) self endon( "death" ); self endon( "kill_goal" ); - while ( DistanceSquared( self.origin, goal ) > dis ) + while ( distancesquared( self.origin, goal ) > dis ) { wait 0.05; } @@ -2352,7 +2352,7 @@ initAStar( goal ) self.bot.astar = AStarSearch( self.origin, goal, team, self.bot.greedy_path ); - if ( isDefined( team ) ) + if ( isdefined( team ) ) { self thread cleanUpAStar( team ); } @@ -2442,7 +2442,7 @@ doWalk( goal, dist, isScriptGoal ) if ( current >= 0 ) { // check if a waypoint is closer than the goal - if ( DistanceSquared( self.origin, level.waypoints[ self.bot.astar[ current ] ].origin ) < DistanceSquared( self.origin, goal ) || DistanceSquared( level.waypoints[ self.bot.astar[ current ] ].origin, PlayerPhysicsTrace( self.origin + ( 0, 0, 32 ), level.waypoints[ self.bot.astar[ current ] ].origin, false, self ) ) > 1.0 ) + if ( distancesquared( self.origin, level.waypoints[ self.bot.astar[ current ] ].origin ) < distancesquared( self.origin, goal ) || distancesquared( level.waypoints[ self.bot.astar[ current ] ].origin, playerphysicstrace( self.origin + ( 0, 0, 32 ), level.waypoints[ self.bot.astar[ current ] ].origin, false, self ) ) > 1.0 ) { while ( current >= 0 ) { @@ -2469,7 +2469,7 @@ doWalk( goal, dist, isScriptGoal ) self.bot.second_next_wp = -1; self notify( "finished_static_waypoints" ); - if ( DistanceSquared( self.origin, goal ) > dist ) + if ( distancesquared( self.origin, goal ) > dist ) { self.bot.last_next_wp = -1; self.bot.last_second_next_wp = -1; @@ -2480,7 +2480,7 @@ doWalk( goal, dist, isScriptGoal ) wait 1; - if ( DistanceSquared( self.origin, goal ) > dist ) + if ( distancesquared( self.origin, goal ) > dist ) { self notify( "bad_path_internal" ); } @@ -2491,7 +2491,7 @@ doWalk( goal, dist, isScriptGoal ) */ movetowards( goal ) { - if ( !isDefined( goal ) ) + if ( !isdefined( goal ) ) { return; } @@ -2512,7 +2512,7 @@ movetowards( goal ) tempGoalDist = level.bots_goaldistance; } - while ( distanceSquared( self.origin, goal ) > tempGoalDist ) + while ( distancesquared( self.origin, goal ) > tempGoalDist ) { self botSetMoveTo( goal ); @@ -2520,7 +2520,7 @@ movetowards( goal ) { time = 0; - if ( distanceSquared( self.origin, lastOri ) < 32 * 32 ) + if ( distancesquared( self.origin, lastOri ) < 32 * 32 ) { self thread knife(); wait 0.5; @@ -2547,17 +2547,17 @@ movetowards( goal ) } else if ( time == 2000 ) { - if ( distanceSquared( self.origin, lastOri ) < 32 * 32 ) + if ( distancesquared( self.origin, lastOri ) < 32 * 32 ) { self crouch(); } } else if ( time == 1750 ) { - if ( distanceSquared( self.origin, lastOri ) < 32 * 32 ) + if ( distancesquared( self.origin, lastOri ) < 32 * 32 ) { // check if directly above or below - if ( abs( goal[ 2 ] - self.origin[ 2 ] ) > 64 && getConeDot( goal + ( 1, 1, 0 ), self.origin + ( -1, -1, 0 ), VectorToAngles( ( goal[ 0 ], goal[ 1 ], self.origin[ 2 ] ) - self.origin ) ) < 0.64 && DistanceSquared2D( self.origin, goal ) < 32 * 32 ) + if ( abs( goal[ 2 ] - self.origin[ 2 ] ) > 64 && getConeDot( goal + ( 1, 1, 0 ), self.origin + ( -1, -1, 0 ), vectortoangles( ( goal[ 0 ], goal[ 1 ], self.origin[ 2 ] ) - self.origin ) ) < 0.64 && distancesquared2D( self.origin, goal ) < 32 * 32 ) { stucks = 2; } @@ -2567,7 +2567,7 @@ movetowards( goal ) wait 0.05; time += 50; - if ( lengthsquared( self getVelocity() ) < 1000 ) + if ( lengthsquared( self getvelocity() ) < 1000 ) { timeslow += 50; } @@ -2620,14 +2620,14 @@ getRandomLargestStafe( dist ) traces = NewHeap( ::HeapTraceFraction ); myOrg = self.origin + ( 0, 0, 16 ); - traces HeapInsert( bulletTrace( myOrg, myOrg + ( -100 * dist, 0, 0 ), false, self ) ); - traces HeapInsert( bulletTrace( myOrg, myOrg + ( 100 * dist, 0, 0 ), false, self ) ); - traces HeapInsert( bulletTrace( myOrg, myOrg + ( 0, 100 * dist, 0 ), false, self ) ); - traces HeapInsert( bulletTrace( myOrg, myOrg + ( 0, -100 * dist, 0 ), false, self ) ); - traces HeapInsert( bulletTrace( myOrg, myOrg + ( -100 * dist, -100 * dist, 0 ), false, self ) ); - traces HeapInsert( bulletTrace( myOrg, myOrg + ( -100 * dist, 100 * dist, 0 ), false, self ) ); - traces HeapInsert( bulletTrace( myOrg, myOrg + ( 100 * dist, -100 * dist, 0 ), false, self ) ); - traces HeapInsert( bulletTrace( myOrg, myOrg + ( 100 * dist, 100 * dist, 0 ), false, self ) ); + traces HeapInsert( bullettrace( myOrg, myOrg + ( -100 * dist, 0, 0 ), false, self ) ); + traces HeapInsert( bullettrace( myOrg, myOrg + ( 100 * dist, 0, 0 ), false, self ) ); + traces HeapInsert( bullettrace( myOrg, myOrg + ( 0, 100 * dist, 0 ), false, self ) ); + traces HeapInsert( bullettrace( myOrg, myOrg + ( 0, -100 * dist, 0 ), false, self ) ); + traces HeapInsert( bullettrace( myOrg, myOrg + ( -100 * dist, -100 * dist, 0 ), false, self ) ); + traces HeapInsert( bullettrace( myOrg, myOrg + ( -100 * dist, 100 * dist, 0 ), false, self ) ); + traces HeapInsert( bullettrace( myOrg, myOrg + ( 100 * dist, -100 * dist, 0 ), false, self ) ); + traces HeapInsert( bullettrace( myOrg, myOrg + ( 100 * dist, 100 * dist, 0 ), false, self ) ); toptraces = []; @@ -2641,7 +2641,7 @@ getRandomLargestStafe( dist ) traces HeapRemove(); } - return toptraces[ randomInt( toptraces.size ) ][ "position" ]; + return toptraces[ randomint( toptraces.size ) ][ "position" ]; } /* @@ -2683,14 +2683,14 @@ do_knife_target( target ) self endon( "disconnect" ); self endon( "bot_knife" ); - if ( !getDvarInt( "aim_automelee_enabled" ) || !self isOnGround() || self GetStance() == "prone" || self InLastStand() ) + if ( !getdvarint( "aim_automelee_enabled" ) || !self isonground() || self getstance() == "prone" || self inLastStand() ) { self.bot.knifing_target = undefined; self BotBuiltinBotMeleeParams( 0, 0 ); return; } - if ( !isDefined( target ) || !isPlayer( target ) ) + if ( !isdefined( target ) || !isplayer( target ) ) { self.bot.knifing_target = undefined; self BotBuiltinBotMeleeParams( 0, 0 ); @@ -2699,7 +2699,7 @@ do_knife_target( target ) dist = distance( target.origin, self.origin ); - if ( !self _hasPerk( "specialty_extendedmelee" ) && dist > getDvarFloat( "aim_automelee_range" ) ) + if ( !self _hasperk( "specialty_extendedmelee" ) && dist > getdvarfloat( "aim_automelee_range" ) ) { self.bot.knifing_target = undefined; self BotBuiltinBotMeleeParams( 0, 0 ); @@ -2708,7 +2708,7 @@ do_knife_target( target ) self.bot.knifing_target = target; - angles = VectorToAngles( target.origin - self.origin ); + angles = vectortoangles( target.origin - self.origin ); self BotBuiltinBotMeleeParams( angles[ 1 ], dist ); wait 1; @@ -2768,7 +2768,7 @@ frag( time ) self notify( "bot_frag" ); self endon( "bot_frag" ); - if ( !isDefined( time ) ) + if ( !isdefined( time ) ) { time = 0.05; } @@ -2799,7 +2799,7 @@ smoke( time ) self notify( "bot_smoke" ); self endon( "bot_smoke" ); - if ( !isDefined( time ) ) + if ( !isdefined( time ) ) { time = 0.05; } @@ -2830,7 +2830,7 @@ use( time ) self notify( "bot_use" ); self endon( "bot_use" ); - if ( !isDefined( time ) ) + if ( !isdefined( time ) ) { time = 0.05; } @@ -2872,7 +2872,7 @@ pressFire( time ) self notify( "bot_fire" ); self endon( "bot_fire" ); - if ( !isDefined( time ) ) + if ( !isdefined( time ) ) { time = 0.05; } @@ -2914,7 +2914,7 @@ pressADS( time ) self notify( "bot_ads" ); self endon( "bot_ads" ); - if ( !isDefined( time ) ) + if ( !isdefined( time ) ) { time = 0.05; } @@ -2939,12 +2939,12 @@ jump() self notify( "bot_jump" ); self endon( "bot_jump" ); - if ( self IsUsingRemote() ) + if ( self isusingremote() ) { return; } - if ( self getStance() != "stand" ) + if ( self getstance() != "stand" ) { self stand(); wait 1; @@ -2960,7 +2960,7 @@ jump() */ stand() { - if ( self IsUsingRemote() ) + if ( self isusingremote() ) { return; } @@ -2974,7 +2974,7 @@ stand() */ crouch() { - if ( self IsUsingRemote() ) + if ( self isusingremote() ) { return; } @@ -2988,7 +2988,7 @@ crouch() */ prone() { - if ( self IsUsingRemote() || self.hasriotshieldequipped ) + if ( self isusingremote() || self.hasriotshieldequipped ) { return; } @@ -3012,21 +3012,21 @@ botGetThirdPersonOffset( angles ) { offset = ( 0, 0, 0 ); - if ( getDvarInt( "camera_thirdPerson" ) ) + if ( getdvarint( "camera_thirdPerson" ) ) { - offset = getDvarVector( "camera_thirdPersonOffset" ); + offset = getdvarvector( "camera_thirdPersonOffset" ); - if ( self playerAds() >= 1 ) + if ( self playerads() >= 1 ) { - curweap = self getCurrentWeapon(); + curweap = self getcurrentweapon(); - if ( ( isSubStr( curweap, "thermal_" ) || weaponClass( curweap ) == "sniper" ) && !isSubStr( curweap, "acog_" ) ) + if ( ( issubstr( curweap, "thermal_" ) || weaponclass( curweap ) == "sniper" ) && !issubstr( curweap, "acog_" ) ) { offset = ( 0, 0, 0 ); } else { - offset = getDvarVector( "camera_thirdPersonOffsetAds" ); + offset = getdvarvector( "camera_thirdPersonOffsetAds" ); } } @@ -3055,27 +3055,27 @@ 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; } - if ( !isDefined( pos ) ) + if ( !isdefined( pos ) ) { return; } - if ( !isDefined( doAimPredict ) ) + if ( !isdefined( doAimPredict ) ) { doAimPredict = false; } - if ( !isDefined( time ) ) + if ( !isdefined( time ) ) { time = 0.05; } - if ( !isDefined( vel ) ) + if ( !isdefined( vel ) ) { vel = ( 0, 0, 0 ); } @@ -3087,30 +3087,30 @@ bot_lookat( pos, time, vel, doAimPredict ) steps = 1; } - myAngle = self getPlayerAngles(); + myAngle = self getplayerangles(); - myEye = self GetEye(); // get our eye pos + myEye = self geteye(); // get our eye pos myEye += self botGetThirdPersonOffset( myAngle ); // account for third person if ( doAimPredict ) { - myEye += ( self getVelocity() * 0.05 ) * ( steps - 1 ); // account for our velocity + myEye += ( self getvelocity() * 0.05 ) * ( steps - 1 ); // account for our velocity pos += ( vel * 0.05 ) * ( steps - 1 ); // add the velocity vector } - angles = VectorToAngles( ( pos - myEye ) - anglesToForward( myAngle ) ); + angles = vectortoangles( ( pos - myEye ) - anglestoforward( myAngle ) ); - X = AngleClamp180( angles[ 0 ] - myAngle[ 0 ] ); + X = angleclamp180( angles[ 0 ] - myAngle[ 0 ] ); X = X / steps; - Y = AngleClamp180( angles[ 1 ] - myAngle[ 1 ] ); + Y = angleclamp180( angles[ 1 ] - myAngle[ 1 ] ); Y = Y / steps; for ( i = 0; i < steps; i++ ) { - myAngle = ( AngleClamp180( myAngle[ 0 ] + X ), AngleClamp180( myAngle[ 1 ] + Y ), 0 ); - self setPlayerAngles( myAngle ); + myAngle = ( angleclamp180( myAngle[ 0 ] + X ), angleclamp180( myAngle[ 1 ] + Y ), 0 ); + self setplayerangles( myAngle ); wait 0.05; } } diff --git a/maps/mp/bots/_bot_script.gsc b/maps/mp/bots/_bot_script.gsc index 6da174a..230dc1c 100644 --- a/maps/mp/bots/_bot_script.gsc +++ b/maps/mp/bots/_bot_script.gsc @@ -18,13 +18,13 @@ added() { self endon( "disconnect" ); - if ( !getDvarInt( "developer_script" ) ) + if ( !getdvarint( "developer_script" ) ) { - self setPlayerData( "experience", self bot_get_rank() ); - self setPlayerData( "prestige", self bot_get_prestige() ); + self setplayerdata( "experience", self bot_get_rank() ); + self setplayerdata( "prestige", self bot_get_prestige() ); - self setPlayerData( "cardTitle", random( getCardTitles() ) ); - self setPlayerData( "cardIcon", random( getCardIcons() ) ); + self setplayerdata( "cardTitle", random( getCardTitles() ) ); + self setplayerdata( "cardIcon", random( getCardIcons() ) ); } self setClasses(); @@ -65,7 +65,7 @@ connected() */ bot_get_prestige() { - p_dvar = getDvarInt( "bots_loadout_prestige" ); + p_dvar = getdvarint( "bots_loadout_prestige" ); p = 0; if ( p_dvar == -1 ) @@ -74,7 +74,7 @@ bot_get_prestige() { player = level.players[ i ]; - if ( !isDefined( player.team ) ) + if ( !isdefined( player.team ) ) { continue; } @@ -84,13 +84,13 @@ bot_get_prestige() continue; } - p = player getPlayerData( "prestige" ); + p = player getplayerdata( "prestige" ); break; } } else if ( p_dvar == -2 ) { - p = randomInt( 12 ); + p = randomint( 12 ); } else { @@ -106,7 +106,7 @@ bot_get_prestige() bot_get_rank() { rank = 1; - rank_dvar = getDvarInt( "bots_loadout_rank" ); + rank_dvar = getdvarint( "bots_loadout_rank" ); if ( rank_dvar == -1 ) { @@ -123,7 +123,7 @@ bot_get_rank() continue; } - if ( !IsDefined( player.pers[ "rank" ] ) ) + if ( !isdefined( player.pers[ "rank" ] ) ) { continue; } @@ -148,7 +148,7 @@ bot_get_rank() while ( bot_ranks.size + human_ranks.size < 5 ) { // add some random ranks for better random number distribution - rank = human_avg + RandomIntRange( -10, 10 ); + rank = human_avg + randomintrange( -10, 10 ); human_ranks[ human_ranks.size ] = rank; } @@ -168,7 +168,7 @@ bot_get_rank() rank = Round( random_normal_distribution( rank_dvar, 5, 0, level.maxrank ) ); } - return maps\mp\gametypes\_rank::getRankInfoMinXP( rank ); + return maps\mp\gametypes\_rank::getrankinfominxp( rank ); } /* @@ -180,14 +180,14 @@ getCardTitles() for ( i = 0; i < 600; i++ ) { - card_name = tableLookupByRow( "mp/cardTitleTable.csv", i, 0 ); + card_name = tablelookupbyrow( "mp/cardTitleTable.csv", i, 0 ); if ( card_name == "" ) { continue; } - if ( !isSubStr( card_name, "cardtitle_" ) ) + if ( !issubstr( card_name, "cardtitle_" ) ) { continue; } @@ -207,14 +207,14 @@ getCardIcons() for ( i = 0; i < 300; i++ ) { - card_name = tableLookupByRow( "mp/cardIconTable.csv", i, 0 ); + card_name = tablelookupbyrow( "mp/cardIconTable.csv", i, 0 ); if ( card_name == "" ) { continue; } - if ( !isSubStr( card_name, "cardicon_" ) ) + if ( !issubstr( card_name, "cardicon_" ) ) { continue; } @@ -230,9 +230,9 @@ getCardIcons() */ isValidAttachmentCombo( att1, att2 ) { - colIndex = tableLookupRowNum( "mp/attachmentCombos.csv", 0, att1 ); + colIndex = tablelookuprownum( "mp/attachmentCombos.csv", 0, att1 ); - if ( tableLookup( "mp/attachmentCombos.csv", 0, att2, colIndex ) == "no" ) + if ( tablelookup( "mp/attachmentCombos.csv", 0, att2, colIndex ) == "no" ) { return false; } @@ -245,13 +245,13 @@ isValidAttachmentCombo( att1, att2 ) */ getAttachmentsForGun( gun ) { - row = tableLookupRowNum( "mp/statStable.csv", 4, gun ); + row = tablelookuprownum( "mp/statStable.csv", 4, gun ); attachments = []; for ( h = 0; h < 10; h++ ) { - attachmentName = tableLookupByRow( "mp/statStable.csv", row, h + 11 ); + attachmentName = tablelookupbyrow( "mp/statStable.csv", row, h + 11 ); if ( attachmentName == "" ) { @@ -274,14 +274,14 @@ getPrimaries() for ( i = 0; i < 160; i++ ) { - weapon_type = tableLookupByRow( "mp/statstable.csv", i, 2 ); + weapon_type = tablelookupbyrow( "mp/statstable.csv", i, 2 ); if ( weapon_type != "weapon_assault" && weapon_type != "weapon_riot" && weapon_type != "weapon_smg" && weapon_type != "weapon_sniper" && weapon_type != "weapon_lmg" ) { continue; } - weapon_name = tableLookupByRow( "mp/statstable.csv", i, 4 ); + weapon_name = tablelookupbyrow( "mp/statstable.csv", i, 4 ); primaries[ primaries.size ] = weapon_name; } @@ -298,14 +298,14 @@ getSecondaries() for ( i = 0; i < 160; i++ ) { - weapon_type = tableLookupByRow( "mp/statstable.csv", i, 2 ); + weapon_type = tablelookupbyrow( "mp/statstable.csv", i, 2 ); if ( weapon_type != "weapon_pistol" && weapon_type != "weapon_machine_pistol" && weapon_type != "weapon_projectile" && weapon_type != "weapon_shotgun" ) { continue; } - weapon_name = tableLookupByRow( "mp/statstable.csv", i, 4 ); + weapon_name = tablelookupbyrow( "mp/statstable.csv", i, 4 ); if ( weapon_name == "gl" ) { @@ -327,7 +327,7 @@ getCamos() for ( i = 0; i < 15; i++ ) { - camo_name = tableLookupByRow( "mp/camoTable.csv", i, 1 ); + camo_name = tablelookupbyrow( "mp/camoTable.csv", i, 1 ); if ( camo_name == "" ) { @@ -349,14 +349,14 @@ getPerks( perktype ) for ( i = 0; i < 50; i++ ) { - perk_type = tableLookupByRow( "mp/perktable.csv", i, 5 ); + perk_type = tablelookupbyrow( "mp/perktable.csv", i, 5 ); if ( perk_type != perktype ) { continue; } - perk_name = tableLookupByRow( "mp/perktable.csv", i, 1 ); + perk_name = tablelookupbyrow( "mp/perktable.csv", i, 1 ); if ( perk_name == "specialty_c4death" ) { @@ -379,7 +379,7 @@ getPerks( perktype ) */ getKillsNeededForStreak( streak ) { - return int( tableLookup( "mp/killstreakTable.csv", 1, streak, 4 ) ); + return int( tablelookup( "mp/killstreakTable.csv", 1, streak, 4 ) ); } /* @@ -391,7 +391,7 @@ getKillstreaks() for ( i = 0; i < 40; i++ ) { - streak_name = tableLookupByRow( "mp/killstreakTable.csv", i, 1 ); + streak_name = tablelookupbyrow( "mp/killstreakTable.csv", i, 1 ); if ( streak_name == "" || streak_name == "none" ) { @@ -408,7 +408,7 @@ getKillstreaks() continue; } - if ( isSubstr( streak_name, "KILLSTREAKS_" ) ) + if ( issubstr( streak_name, "KILLSTREAKS_" ) ) { continue; } @@ -425,9 +425,9 @@ getKillstreaks() chooseRandomPerk( perkkind, primary, primaryAtts ) { perks = getPerks( perkkind ); - rank = self maps\mp\gametypes\_rank::getRankForXp( self getPlayerData( "experience" ) ); - allowOp = ( getDvarInt( "bots_loadout_allow_op" ) >= 1 ); - reasonable = getDvarInt( "bots_loadout_reasonable" ); + rank = self maps\mp\gametypes\_rank::getrankforxp( self getplayerdata( "experience" ) ); + allowOp = ( getdvarint( "bots_loadout_allow_op" ) >= 1 ); + reasonable = getdvarint( "bots_loadout_reasonable" ); while ( true ) { @@ -512,7 +512,7 @@ chooseRandomPerk( perkkind, primary, primaryAtts ) } else { - if ( randomInt( 100 ) < 10 ) + if ( randomint( 100 ) < 10 ) { continue; } @@ -527,7 +527,7 @@ chooseRandomPerk( perkkind, primary, primaryAtts ) continue; } - if ( primary == "ak47" && randomInt( 100 ) < 80 ) + if ( primary == "ak47" && randomint( 100 ) < 80 ) { continue; } @@ -537,12 +537,12 @@ chooseRandomPerk( perkkind, primary, primaryAtts ) continue; } - if ( primary == "barrett" && randomInt( 100 ) < 80 ) + if ( primary == "barrett" && randomint( 100 ) < 80 ) { continue; } - if ( primary == "tavor" && randomInt( 100 ) < 80 ) + if ( primary == "tavor" && randomint( 100 ) < 80 ) { continue; } @@ -552,12 +552,12 @@ chooseRandomPerk( perkkind, primary, primaryAtts ) continue; } - if ( primary == "masada" && randomInt( 100 ) < 60 ) + if ( primary == "masada" && randomint( 100 ) < 60 ) { continue; } - if ( primary == "m4" && randomInt( 100 ) < 80 ) + if ( primary == "m4" && randomint( 100 ) < 80 ) { continue; } @@ -586,12 +586,12 @@ chooseRandomPerk( perkkind, primary, primaryAtts ) continue; } - if ( !self isItemUnlocked( perk ) ) + if ( !self isitemunlocked( perk ) ) { continue; } - if ( RandomFloatRange( 0, 1 ) < ( ( rank / level.maxrank ) + 0.1 ) ) + if ( randomfloatrange( 0, 1 ) < ( ( rank / level.maxrank ) + 0.1 ) ) { self.pers[ "bots" ][ "unlocks" ][ "upgraded_" + perk ] = true; } @@ -626,8 +626,8 @@ chooseRandomCamo() chooseRandomPrimary() { primaries = getPrimaries(); - allowOp = ( getDvarInt( "bots_loadout_allow_op" ) >= 1 ); - reasonable = getDvarInt( "bots_loadout_reasonable" ); + allowOp = ( getdvarint( "bots_loadout_allow_op" ) >= 1 ); + reasonable = getdvarint( "bots_loadout_reasonable" ); while ( true ) { @@ -679,7 +679,7 @@ chooseRandomPrimary() } } - if ( !self isItemUnlocked( primary ) ) + if ( !self isitemunlocked( primary ) ) { continue; } @@ -699,8 +699,8 @@ chooseRandomSecondary( perk1 ) } secondaries = getSecondaries(); - allowOp = ( getDvarInt( "bots_loadout_allow_op" ) >= 1 ); - reasonable = getDvarInt( "bots_loadout_reasonable" ); + allowOp = ( getdvarint( "bots_loadout_allow_op" ) >= 1 ); + reasonable = getdvarint( "bots_loadout_reasonable" ); while ( true ) { @@ -727,7 +727,7 @@ chooseRandomSecondary( perk1 ) } } - if ( !self isItemUnlocked( secondary ) ) + if ( !self isitemunlocked( secondary ) ) { continue; } @@ -747,11 +747,11 @@ chooseRandomSecondary( perk1 ) chooseRandomAttachmentComboForGun( gun ) { atts = getAttachmentsForGun( gun ); - rank = self maps\mp\gametypes\_rank::getRankForXp( self getPlayerData( "experience" ) ); - allowOp = ( getDvarInt( "bots_loadout_allow_op" ) >= 1 ); - reasonable = getDvarInt( "bots_loadout_reasonable" ); + rank = self maps\mp\gametypes\_rank::getrankforxp( self getplayerdata( "experience" ) ); + allowOp = ( getdvarint( "bots_loadout_allow_op" ) >= 1 ); + reasonable = getdvarint( "bots_loadout_reasonable" ); - if ( RandomFloatRange( 0, 1 ) >= ( ( rank / level.maxrank ) + 0.1 ) ) + if ( randomfloatrange( 0, 1 ) >= ( ( rank / level.maxrank ) + 0.1 ) ) { retAtts = []; retAtts[ 0 ] = "none"; @@ -830,8 +830,8 @@ chooseRandomAttachmentComboForGun( gun ) */ chooseRandomTactical() { - tacts = strTok( "flash_grenade,smoke_grenade,concussion_grenade", "," ); - reasonable = getDvarInt( "bots_loadout_reasonable" ); + tacts = strtok( "flash_grenade,smoke_grenade,concussion_grenade", "," ); + reasonable = getdvarint( "bots_loadout_reasonable" ); while ( true ) { @@ -861,9 +861,9 @@ setClasses() n = 15; } - rank = self maps\mp\gametypes\_rank::getRankForXp( self getPlayerData( "experience" ) ); + rank = self maps\mp\gametypes\_rank::getrankforxp( self getplayerdata( "experience" ) ); - if ( RandomFloatRange( 0, 1 ) < ( ( rank / level.maxrank ) + 0.1 ) ) + if ( randomfloatrange( 0, 1 ) < ( ( rank / level.maxrank ) + 0.1 ) ) { self.pers[ "bots" ][ "unlocks" ][ "ghillie" ] = true; self.pers[ "bots" ][ "behavior" ][ "quickscope" ] = true; @@ -889,28 +889,28 @@ setClasses() secondary = chooseRandomSecondary( perk1 ); secondaryAtts = chooseRandomAttachmentComboForGun( secondary ); - if ( perk1 != "specialty_bling" || !isDefined( self.pers[ "bots" ][ "unlocks" ][ "upgraded_specialty_bling" ] ) ) + if ( perk1 != "specialty_bling" || !isdefined( self.pers[ "bots" ][ "unlocks" ][ "upgraded_specialty_bling" ] ) ) { secondaryAtts[ 1 ] = "none"; } - if ( !getDvarInt( "developer_script" ) ) + if ( !getdvarint( "developer_script" ) ) { - self setPlayerData( "customClasses", i, "weaponSetups", 0, "weapon", primary ); - self setPlayerData( "customClasses", i, "weaponSetups", 0, "attachment", 0, primaryAtts[ 0 ] ); - self setPlayerData( "customClasses", i, "weaponSetups", 0, "attachment", 1, primaryAtts[ 1 ] ); - self setPlayerData( "customClasses", i, "weaponSetups", 0, "camo", primaryCamo ); + self setplayerdata( "customClasses", i, "weaponSetups", 0, "weapon", primary ); + self setplayerdata( "customClasses", i, "weaponSetups", 0, "attachment", 0, primaryAtts[ 0 ] ); + self setplayerdata( "customClasses", i, "weaponSetups", 0, "attachment", 1, primaryAtts[ 1 ] ); + self setplayerdata( "customClasses", i, "weaponSetups", 0, "camo", primaryCamo ); - self setPlayerData( "customClasses", i, "weaponSetups", 1, "weapon", secondary ); - self setPlayerData( "customClasses", i, "weaponSetups", 1, "attachment", 0, secondaryAtts[ 0 ] ); - self setPlayerData( "customClasses", i, "weaponSetups", 1, "attachment", 1, secondaryAtts[ 1 ] ); + self setplayerdata( "customClasses", i, "weaponSetups", 1, "weapon", secondary ); + self setplayerdata( "customClasses", i, "weaponSetups", 1, "attachment", 0, secondaryAtts[ 0 ] ); + self setplayerdata( "customClasses", i, "weaponSetups", 1, "attachment", 1, secondaryAtts[ 1 ] ); - self setPlayerData( "customClasses", i, "perks", 0, equipment ); - self setPlayerData( "customClasses", i, "perks", 1, perk1 ); - self setPlayerData( "customClasses", i, "perks", 2, perk2 ); - self setPlayerData( "customClasses", i, "perks", 3, perk3 ); - self setPlayerData( "customClasses", i, "perks", 4, deathstreak ); - self setPlayerData( "customClasses", i, "specialGrenade", tactical ); + self setplayerdata( "customClasses", i, "perks", 0, equipment ); + self setplayerdata( "customClasses", i, "perks", 1, perk1 ); + self setplayerdata( "customClasses", i, "perks", 2, perk2 ); + self setplayerdata( "customClasses", i, "perks", 3, perk3 ); + self setplayerdata( "customClasses", i, "perks", 4, deathstreak ); + self setplayerdata( "customClasses", i, "specialGrenade", tactical ); } } } @@ -959,7 +959,7 @@ isColidingKillstreak( killstreaks, killstreak ) */ setKillstreaks() { - rankId = self maps\mp\gametypes\_rank::getRankForXp( self getPlayerData( "experience" ) ) + 1; + rankId = self maps\mp\gametypes\_rank::getrankforxp( self getplayerdata( "experience" ) ) + 1; allStreaks = getKillstreaks(); @@ -985,14 +985,14 @@ setKillstreaks() chooseableStreaks++; } - reasonable = getDvarInt( "bots_loadout_reasonable" ); - op = getDvarInt( "bots_loadout_allow_op" ); + reasonable = getdvarint( "bots_loadout_reasonable" ); + op = getdvarint( "bots_loadout_allow_op" ); i = 0; while ( i < chooseableStreaks ) { - slot = randomInt( 3 ); + slot = randomint( 3 ); if ( killstreaks[ slot ] != "" ) { @@ -1071,11 +1071,11 @@ setKillstreaks() killstreaks[ 2 ] = "predator_missile"; } - if ( !getDvarInt( "developer_script" ) ) + if ( !getdvarint( "developer_script" ) ) { - self setPlayerData( "killstreaks", 0, killstreaks[ 0 ] ); - self setPlayerData( "killstreaks", 1, killstreaks[ 1 ] ); - self setPlayerData( "killstreaks", 2, killstreaks[ 2 ] ); + self setplayerdata( "killstreaks", 0, killstreaks[ 0 ] ); + self setplayerdata( "killstreaks", 1, killstreaks[ 1 ] ); + self setplayerdata( "killstreaks", 2, killstreaks[ 2 ] ); } } @@ -1087,7 +1087,7 @@ onKilled( eInflictor, eAttacker, iDamage, sMeansOfDeath, sWeapon, vDir, sHitLoc, self.killerlocation = undefined; self.lastkiller = undefined; - if ( !IsDefined( self ) || !isDefined( self.team ) ) + if ( !isdefined( self ) || !isdefined( self.team ) ) { return; } @@ -1102,7 +1102,7 @@ onKilled( eInflictor, eAttacker, iDamage, sMeansOfDeath, sWeapon, vDir, sHitLoc, return; } - if ( !IsDefined( eAttacker ) || !isDefined( eAttacker.team ) ) + if ( !isdefined( eAttacker ) || !isdefined( eAttacker.team ) ) { return; } @@ -1117,12 +1117,12 @@ onKilled( eInflictor, eAttacker, iDamage, sMeansOfDeath, sWeapon, vDir, sHitLoc, return; } - if ( !IsDefined( eInflictor ) || eInflictor.classname != "player" ) + if ( !isdefined( eInflictor ) || eInflictor.classname != "player" ) { return; } - if ( !isAlive( eAttacker ) ) + if ( !isalive( eAttacker ) ) { return; } @@ -1136,12 +1136,12 @@ onKilled( eInflictor, eAttacker, iDamage, sMeansOfDeath, sWeapon, vDir, sHitLoc, */ onDamage( eInflictor, eAttacker, iDamage, iDFlags, sMeansOfDeath, sWeapon, vPoint, vDir, sHitLoc, timeOffset ) { - if ( !IsDefined( self ) || !isDefined( self.team ) ) + if ( !isdefined( self ) || !isdefined( self.team ) ) { return; } - if ( !isAlive( self ) ) + if ( !isalive( self ) ) { return; } @@ -1156,7 +1156,7 @@ onDamage( eInflictor, eAttacker, iDamage, iDFlags, sMeansOfDeath, sWeapon, vPoin return; } - if ( !IsDefined( eAttacker ) || !isDefined( eAttacker.team ) ) + if ( !isdefined( eAttacker ) || !isdefined( eAttacker.team ) ) { return; } @@ -1171,22 +1171,22 @@ onDamage( eInflictor, eAttacker, iDamage, iDFlags, sMeansOfDeath, sWeapon, vPoin return; } - if ( !IsDefined( eInflictor ) || eInflictor.classname != "player" ) + if ( !isdefined( eInflictor ) || eInflictor.classname != "player" ) { return; } - if ( !isAlive( eAttacker ) ) + if ( !isalive( eAttacker ) ) { return; } - if ( !isSubStr( sWeapon, "_silencer_" ) ) + if ( !issubstr( sWeapon, "_silencer_" ) ) { self bot_cry_for_help( eAttacker ); } - self SetAttacker( eAttacker ); + self setAttacker( eAttacker ); } /* @@ -1199,9 +1199,9 @@ bot_cry_for_help( attacker ) return; } - theTime = GetTime(); + theTime = gettime(); - if ( IsDefined( self.help_time ) && theTime - self.help_time < 1000 ) + if ( isdefined( self.help_time ) && theTime - self.help_time < 1000 ) { return; } @@ -1217,12 +1217,12 @@ bot_cry_for_help( attacker ) continue; } - if ( !isDefined( player.team ) ) + if ( !isdefined( player.team ) ) { continue; } - if ( !IsAlive( player ) ) + if ( !isalive( player ) ) { continue; } @@ -1240,16 +1240,16 @@ bot_cry_for_help( attacker ) dist = player.pers[ "bots" ][ "skill" ][ "help_dist" ]; dist *= dist; - if ( DistanceSquared( self.origin, player.origin ) > dist ) + if ( distancesquared( self.origin, player.origin ) > dist ) { continue; } - if ( RandomInt( 100 ) < 50 ) + if ( randomint( 100 ) < 50 ) { - self SetAttacker( attacker ); + self setAttacker( attacker ); - if ( RandomInt( 100 ) > 70 ) + if ( randomint( 100 ) > 70 ) { break; } @@ -1283,9 +1283,9 @@ doKillcamStuff() self BotNotifyBotEvent( "killcam", "start" ); - wait 0.5 + randomInt( 3 ); + wait 0.5 + randomint( 3 ); - if ( randomInt( 100 ) > 25 ) + if ( randomint( 100 ) > 25 ) { self notify( "use_copycat" ); } @@ -1313,14 +1313,14 @@ classWatch() wait 0.5; - if ( !isValidClass( self.class ) || !isDefined( self.bot_change_class ) ) + if ( !isvalidclass( self.class ) || !isdefined( self.bot_change_class ) ) { self notify( "menuresponse", game[ "menu_changeclass" ], self chooseRandomClass() ); } self.bot_change_class = true; - while ( isdefined( self.pers[ "team" ] ) && isValidClass( self.class ) && isDefined( self.bot_change_class ) ) + while ( isdefined( self.pers[ "team" ] ) && isvalidclass( self.class ) && isdefined( self.bot_change_class ) ) { wait .05; } @@ -1332,15 +1332,15 @@ classWatch() */ chooseRandomClass() { - reasonable = getDvarInt( "bots_loadout_reasonable" ); + reasonable = getdvarint( "bots_loadout_reasonable" ); class = ""; - rank = self maps\mp\gametypes\_rank::getRankForXp( self getPlayerData( "experience" ) ) + 1; + rank = self maps\mp\gametypes\_rank::getrankforxp( self getplayerdata( "experience" ) ) + 1; - if ( rank < 4 || ( randomInt( 100 ) < 2 && !reasonable ) ) + if ( rank < 4 || ( randomint( 100 ) < 2 && !reasonable ) ) { while ( class == "" ) { - switch ( randomInt( 5 ) ) + switch ( randomint( 5 ) ) { case 0: class = "class0"; @@ -1374,7 +1374,7 @@ chooseRandomClass() } else { - class = "custom" + ( randomInt( 5 ) + 1 ); + class = "custom" + ( randomint( 5 ) + 1 ); } return class; @@ -1398,7 +1398,7 @@ teamWatch() if ( self.team != "axis" && self.team != "allies" ) { - self notify( "menuresponse", game[ "menu_team" ], getDvar( "bots_team" ) ); + self notify( "menuresponse", game[ "menu_team" ], getdvar( "bots_team" ) ); } while ( isdefined( self.pers[ "team" ] ) ) @@ -1417,7 +1417,7 @@ difficulty() for ( ;; ) { - if ( GetDvarInt( "bots_skill" ) != 9 ) + if ( getdvarint( "bots_skill" ) != 9 ) { switch ( self.pers[ "bots" ][ "skill" ][ "base" ] ) { @@ -1656,7 +1656,7 @@ difficulty() */ set_diff() { - rankVar = GetDvarInt( "bots_skill" ); + rankVar = getdvarint( "bots_skill" ); switch ( rankVar ) { @@ -1668,37 +1668,37 @@ set_diff() break; case 9: - self.pers[ "bots" ][ "skill" ][ "base" ] = randomIntRange( 1, 7 ); - self.pers[ "bots" ][ "skill" ][ "aim_time" ] = 0.05 * randomIntRange( 1, 20 ); - self.pers[ "bots" ][ "skill" ][ "init_react_time" ] = 50 * randomInt( 100 ); - self.pers[ "bots" ][ "skill" ][ "reaction_time" ] = 50 * randomInt( 100 ); - self.pers[ "bots" ][ "skill" ][ "remember_time" ] = 50 * randomInt( 100 ); - self.pers[ "bots" ][ "skill" ][ "no_trace_ads_time" ] = 50 * randomInt( 100 ); - self.pers[ "bots" ][ "skill" ][ "no_trace_look_time" ] = 50 * randomInt( 100 ); - self.pers[ "bots" ][ "skill" ][ "fov" ] = randomFloatRange( -1, 1 ); + self.pers[ "bots" ][ "skill" ][ "base" ] = randomintrange( 1, 7 ); + self.pers[ "bots" ][ "skill" ][ "aim_time" ] = 0.05 * randomintrange( 1, 20 ); + self.pers[ "bots" ][ "skill" ][ "init_react_time" ] = 50 * randomint( 100 ); + self.pers[ "bots" ][ "skill" ][ "reaction_time" ] = 50 * randomint( 100 ); + self.pers[ "bots" ][ "skill" ][ "remember_time" ] = 50 * randomint( 100 ); + self.pers[ "bots" ][ "skill" ][ "no_trace_ads_time" ] = 50 * randomint( 100 ); + self.pers[ "bots" ][ "skill" ][ "no_trace_look_time" ] = 50 * randomint( 100 ); + self.pers[ "bots" ][ "skill" ][ "fov" ] = randomfloatrange( -1, 1 ); - randomNum = randomIntRange( 500, 25000 ); + randomNum = randomintrange( 500, 25000 ); self.pers[ "bots" ][ "skill" ][ "dist_start" ] = randomNum; self.pers[ "bots" ][ "skill" ][ "dist_max" ] = randomNum * 2; - self.pers[ "bots" ][ "skill" ][ "spawn_time" ] = 0.05 * randomInt( 20 ); - self.pers[ "bots" ][ "skill" ][ "help_dist" ] = randomIntRange( 500, 25000 ); - self.pers[ "bots" ][ "skill" ][ "semi_time" ] = randomFloatRange( 0.05, 1 ); - self.pers[ "bots" ][ "skill" ][ "shoot_after_time" ] = randomFloatRange( 0.05, 1 ); - self.pers[ "bots" ][ "skill" ][ "aim_offset_time" ] = randomFloatRange( 0.05, 1 ); - self.pers[ "bots" ][ "skill" ][ "aim_offset_amount" ] = randomFloatRange( 0.05, 1 ); - self.pers[ "bots" ][ "skill" ][ "bone_update_interval" ] = randomFloatRange( 0.05, 1 ); + self.pers[ "bots" ][ "skill" ][ "spawn_time" ] = 0.05 * randomint( 20 ); + self.pers[ "bots" ][ "skill" ][ "help_dist" ] = randomintrange( 500, 25000 ); + self.pers[ "bots" ][ "skill" ][ "semi_time" ] = randomfloatrange( 0.05, 1 ); + self.pers[ "bots" ][ "skill" ][ "shoot_after_time" ] = randomfloatrange( 0.05, 1 ); + self.pers[ "bots" ][ "skill" ][ "aim_offset_time" ] = randomfloatrange( 0.05, 1 ); + self.pers[ "bots" ][ "skill" ][ "aim_offset_amount" ] = randomfloatrange( 0.05, 1 ); + self.pers[ "bots" ][ "skill" ][ "bone_update_interval" ] = randomfloatrange( 0.05, 1 ); self.pers[ "bots" ][ "skill" ][ "bones" ] = "j_head,j_spineupper,j_ankle_le,j_ankle_ri"; - self.pers[ "bots" ][ "behavior" ][ "strafe" ] = randomInt( 100 ); - self.pers[ "bots" ][ "behavior" ][ "nade" ] = randomInt( 100 ); - self.pers[ "bots" ][ "behavior" ][ "sprint" ] = randomInt( 100 ); - self.pers[ "bots" ][ "behavior" ][ "camp" ] = randomInt( 100 ); - self.pers[ "bots" ][ "behavior" ][ "follow" ] = randomInt( 100 ); - self.pers[ "bots" ][ "behavior" ][ "crouch" ] = randomInt( 100 ); - self.pers[ "bots" ][ "behavior" ][ "switch" ] = randomInt( 100 ); - self.pers[ "bots" ][ "behavior" ][ "class" ] = randomInt( 100 ); - self.pers[ "bots" ][ "behavior" ][ "jump" ] = randomInt( 100 ); + self.pers[ "bots" ][ "behavior" ][ "strafe" ] = randomint( 100 ); + self.pers[ "bots" ][ "behavior" ][ "nade" ] = randomint( 100 ); + self.pers[ "bots" ][ "behavior" ][ "sprint" ] = randomint( 100 ); + self.pers[ "bots" ][ "behavior" ][ "camp" ] = randomint( 100 ); + self.pers[ "bots" ][ "behavior" ][ "follow" ] = randomint( 100 ); + self.pers[ "bots" ][ "behavior" ][ "crouch" ] = randomint( 100 ); + self.pers[ "bots" ][ "behavior" ][ "switch" ] = randomint( 100 ); + self.pers[ "bots" ][ "behavior" ][ "class" ] = randomint( 100 ); + self.pers[ "bots" ][ "behavior" ][ "jump" ] = randomint( 100 ); break; default: @@ -1730,14 +1730,14 @@ onGiveLoadout_loop() { class = self.class; - if ( isDefined( self.bot_oma_class ) ) + if ( isdefined( self.bot_oma_class ) ) { class = self.bot_oma_class; } if ( allowClassChoiceUtil() ) { - self botGiveLoadout( self.team, class, !isDefined( self.bot_oma_class ) ); + self botGiveLoadout( self.team, class, !isdefined( self.bot_oma_class ) ); } self.bot_oma_class = undefined; @@ -1769,7 +1769,7 @@ onSpawned() { self waittill( "spawned_player" ); - if ( randomInt( 100 ) <= self.pers[ "bots" ][ "behavior" ][ "class" ] ) + if ( randomint( 100 ) <= self.pers[ "bots" ][ "behavior" ][ "class" ] ) { self.bot_change_class = undefined; } @@ -1780,7 +1780,7 @@ onSpawned() self.bot_was_follow_script_update = undefined; self.bot_stuck_on_carepackage = undefined; - if ( getDvarInt( "bots_play_obj" ) ) + if ( getdvarint( "bots_play_obj" ) ) { self thread bot_dom_cap_think(); } @@ -1812,10 +1812,10 @@ start_bot_threads() level endon( "game_ended" ); self endon( "death" ); - gameFlagWait( "prematch_done" ); + gameflagwait( "prematch_done" ); // inventory usage - if ( getDvarInt( "bots_play_killstreak" ) ) + if ( getdvarint( "bots_play_killstreak" ) ) { self thread bot_killstreak_think(); } @@ -1825,7 +1825,7 @@ start_bot_threads() self thread bot_perk_think(); // script targeting - if ( getDvarInt( "bots_play_target_other" ) ) + if ( getdvarint( "bots_play_target_other" ) ) { self thread bot_target_vehicle(); self thread bot_equipment_kill_think(); @@ -1833,7 +1833,7 @@ start_bot_threads() } // airdrop - if ( getDvarInt( "bots_play_take_carepackages" ) ) + if ( getdvarint( "bots_play_take_carepackages" ) ) { self thread bot_watch_stuck_on_crate(); self thread bot_crate_think(); @@ -1846,14 +1846,14 @@ start_bot_threads() self thread follow_target(); // camp and follow - if ( getDvarInt( "bots_play_camp" ) ) + if ( getdvarint( "bots_play_camp" ) ) { self thread bot_think_follow(); self thread bot_think_camp(); } // nades - if ( getDvarInt( "bots_play_nade" ) ) + if ( getdvarint( "bots_play_nade" ) ) { self thread bot_jav_loc_think(); self thread bot_use_tube_think(); @@ -1864,7 +1864,7 @@ start_bot_threads() } // obj - if ( getDvarInt( "bots_play_obj" ) ) + if ( getdvarint( "bots_play_obj" ) ) { self thread bot_dom_def_think(); self thread bot_dom_spawn_kill_think(); @@ -1899,12 +1899,12 @@ bot_inc_bots( obj, unreach ) level endon( "game_ended" ); self endon( "bot_inc_bots" ); - if ( !isDefined( obj ) ) + if ( !isdefined( obj ) ) { return; } - if ( !isDefined( obj.bots ) ) + if ( !isdefined( obj.bots ) ) { obj.bots = 0; } @@ -1913,7 +1913,7 @@ bot_inc_bots( obj, unreach ) ret = self waittill_any_return( "death", "disconnect", "bad_path", "goal", "new_goal" ); - if ( isDefined( obj ) && ( ret != "bad_path" || !isDefined( unreach ) ) ) + if ( isdefined( obj ) && ( ret != "bad_path" || !isdefined( unreach ) ) ) { obj.bots--; } @@ -1934,13 +1934,13 @@ bots_watch_touch_obj( obj ) { wait 0.5; - if ( !isDefined( obj ) ) + if ( !isdefined( obj ) ) { self notify( "bad_path" ); return; } - if ( self IsTouching( obj ) ) + if ( self istouching( obj ) ) { self notify( "goal" ); return; @@ -1963,12 +1963,12 @@ bot_escort_obj( obj, carrier ) { wait 0.5; - if ( !isDefined( obj ) ) + if ( !isdefined( obj ) ) { break; } - if ( !isDefined( obj.carrier ) || carrier == obj.carrier ) + if ( !isdefined( obj.carrier ) || carrier == obj.carrier ) { break; } @@ -1992,12 +1992,12 @@ bot_get_obj( obj ) { wait 0.5; - if ( !isDefined( obj ) ) + if ( !isdefined( obj ) ) { break; } - if ( isDefined( obj.carrier ) ) + if ( isdefined( obj.carrier ) ) { break; } @@ -2052,7 +2052,7 @@ bot_go_plant( plant ) break; } - if ( self isTouching( plant.trigger ) ) + if ( self istouching( plant.trigger ) ) { break; } @@ -2089,7 +2089,7 @@ bot_go_defuse( plant ) break; } - if ( self isTouching( plant.trigger ) ) + if ( self istouching( plant.trigger ) ) { break; } @@ -2110,7 +2110,7 @@ bot_go_defuse( plant ) */ bot_wait_stop_move() { - while ( !self isOnGround() || lengthSquared( self getVelocity() ) > 1 ) + while ( !self isonground() || lengthsquared( self getvelocity() ) > 1 ) { wait 0.25; } @@ -2142,21 +2142,21 @@ changeToWeapon( weap ) self endon( "death" ); level endon( "game_ended" ); - if ( !self HasWeapon( weap ) ) + if ( !self hasweapon( weap ) ) { return false; } - self switchToWeapon( weap ); + self switchtoweapon( weap ); - if ( self GetCurrentWeapon() == weap ) + if ( self getcurrentweapon() == weap ) { return true; } self waittill_any_timeout( 5, "weapon_change" ); - return ( self GetCurrentWeapon() == weap ); + return ( self getcurrentweapon() == weap ); } /* @@ -2168,7 +2168,7 @@ botThrowGrenade( nade, time ) self endon( "death" ); level endon( "game_ended" ); - if ( !self GetAmmoCount( nade ) ) + if ( !self getammocount( nade ) ) { return false; } @@ -2196,7 +2196,7 @@ bot_array_nearest_curorigin( array ) for ( i = 0; i < array.size; i++ ) { - if ( !isDefined( result ) || DistanceSquared( self.origin, array[ i ].curorigin ) < DistanceSquared( self.origin, result.curorigin ) ) + if ( !isdefined( result ) || distancesquared( self.origin, array[ i ].curorigin ) < distancesquared( self.origin, result.curorigin ) ) { result = array[ i ]; } @@ -2212,12 +2212,12 @@ getRocketAmmo() { answer = self getLockonAmmo(); - if ( isDefined( answer ) ) + if ( isdefined( answer ) ) { return answer; } - if ( self getAmmoCount( "rpg_mp" ) ) + if ( self getammocount( "rpg_mp" ) ) { answer = "rpg_mp"; } @@ -2232,17 +2232,17 @@ getLockonAmmo() { answer = undefined; - if ( self getAmmoCount( "at4_mp" ) ) + if ( self getammocount( "at4_mp" ) ) { answer = "at4_mp"; } - if ( self getAmmoCount( "stinger_mp" ) ) + if ( self getammocount( "stinger_mp" ) ) { answer = "stinger_mp"; } - if ( self getAmmoCount( "javelin_mp" ) ) + if ( self getammocount( "javelin_mp" ) ) { answer = "javelin_mp"; } @@ -2271,14 +2271,14 @@ stop_go_target_on_death( tar ) */ follow_target_loop() { - threat = self GetThreat(); + threat = self getThreat(); - if ( !isPlayer( threat ) ) + if ( !isplayer( threat ) ) { return; } - if ( randomInt( 100 ) > self.pers[ "bots" ][ "behavior" ][ "follow" ] * 5 ) + if ( randomint( 100 ) > self.pers[ "bots" ][ "behavior" ][ "follow" ] * 5 ) { return; } @@ -2313,7 +2313,7 @@ follow_target() continue; } - if ( !self HasThreat() ) + if ( !self hasThreat() ) { continue; } @@ -2329,12 +2329,12 @@ bot_think_camp_loop() { campSpot = getWaypointForIndex( random( self waypointsNear( getWaypointsOfType( "camp" ), 1024 ) ) ); - if ( !isDefined( campSpot ) ) + if ( !isdefined( campSpot ) ) { return; } - time = randomIntRange( 30, 90 ); + time = randomintrange( 30, 90 ); self BotNotifyBotEvent( "camp", "go", campSpot, time ); @@ -2355,7 +2355,7 @@ bot_think_camp_loop() self BotNotifyBotEvent( "camp", "start", campSpot, time ); self thread killCampAfterTime( time ); - self CampAtSpot( campSpot.origin, campSpot.origin + AnglesToForward( campSpot.angles ) * 2048 ); + self CampAtSpot( campSpot.origin, campSpot.origin + anglestoforward( campSpot.angles ) * 2048 ); self BotNotifyBotEvent( "camp", "stop", campSpot, time ); } @@ -2377,7 +2377,7 @@ bot_think_camp() continue; } - if ( randomInt( 100 ) > self.pers[ "bots" ][ "behavior" ][ "camp" ] ) + if ( randomint( 100 ) > self.pers[ "bots" ][ "behavior" ][ "camp" ] ) { continue; } @@ -2395,12 +2395,12 @@ killCampAfterTime( time ) self endon( "disconnect" ); self endon( "kill_camp_bot" ); - timeleft = maps\mp\gametypes\_gamelogic::getTimeRemaining() / 1000; + timeleft = maps\mp\gametypes\_gamelogic::gettimeremaining() / 1000; while ( time > 0 && timeleft >= 60 ) { wait 1; - timeleft = maps\mp\gametypes\_gamelogic::getTimeRemaining() / 1000; + timeleft = maps\mp\gametypes\_gamelogic::gettimeremaining() / 1000; time--; } @@ -2425,7 +2425,7 @@ killCampAfterEntGone( ent ) { wait 0.05; - if ( !isDefined( ent ) ) + if ( !isdefined( ent ) ) { break; } @@ -2446,7 +2446,7 @@ CampAtSpot( origin, anglePos ) self SetScriptGoal( origin, 64 ); - if ( isDefined( anglePos ) ) + if ( isdefined( anglePos ) ) { self SetScriptAimPos( anglePos ); } @@ -2474,7 +2474,7 @@ bot_think_follow_loop() continue; } - if ( !isReallyAlive( player ) ) + if ( !isreallyalive( player ) ) { continue; } @@ -2484,7 +2484,7 @@ bot_think_follow_loop() continue; } - if ( DistanceSquared( player.origin, self.origin ) > distSq ) + if ( distancesquared( player.origin, self.origin ) > distSq ) { continue; } @@ -2494,12 +2494,12 @@ bot_think_follow_loop() toFollow = random( follows ); - if ( !isDefined( toFollow ) ) + if ( !isdefined( toFollow ) ) { return; } - time = randomIntRange( 10, 20 ); + time = randomintrange( 10, 20 ); self BotNotifyBotEvent( "follow", "start", toFollow, time ); @@ -2519,14 +2519,14 @@ bot_think_follow() for ( ;; ) { - wait randomIntRange( 3, 5 ); + wait randomintrange( 3, 5 ); if ( self HasScriptGoal() || self.bot_lock_goal || self HasScriptAimPos() ) { continue; } - if ( randomInt( 100 ) > self.pers[ "bots" ][ "behavior" ][ "follow" ] ) + if ( randomint( 100 ) > self.pers[ "bots" ][ "behavior" ][ "follow" ] ) { continue; } @@ -2553,7 +2553,7 @@ watchForFollowNewGoal() { self waittill( "new_goal" ); - if ( !isDefined( self.bot_was_follow_script_update ) ) + if ( !isdefined( self.bot_was_follow_script_update ) ) { break; } @@ -2592,7 +2592,7 @@ followPlayer( who ) { wait 0.05; - if ( !isDefined( who ) || !isReallyAlive( who ) ) + if ( !isdefined( who ) || !isreallyalive( who ) ) { break; } @@ -2600,7 +2600,7 @@ followPlayer( who ) self SetScriptAimPos( who.origin + ( 0, 0, 42 ) ); myGoal = self GetScriptGoal(); - if ( isDefined( myGoal ) && DistanceSquared( myGoal, who.origin ) < 64 * 64 ) + if ( isdefined( myGoal ) && distancesquared( myGoal, who.origin ) < 64 * 64 ) { continue; } @@ -2624,50 +2624,50 @@ followPlayer( who ) */ bot_perk_think_loop() { - for ( ; self _hasPerk( "specialty_blastshield" ); ) + for ( ; self _hasperk( "specialty_blastshield" ); ) { - if ( !self _hasPerk( "_specialty_blastshield" ) ) + if ( !self _hasperk( "_specialty_blastshield" ) ) { - if ( randomInt( 100 ) < 65 ) + if ( randomint( 100 ) < 65 ) { break; } - self _setPerk( "_specialty_blastshield" ); + self _setperk( "_specialty_blastshield" ); } else { - if ( randomInt( 100 ) < 90 ) + if ( randomint( 100 ) < 90 ) { break; } - self _unsetPerk( "_specialty_blastshield" ); + self _unsetperk( "_specialty_blastshield" ); } break; } - for ( ; self _hasPerk( "specialty_onemanarmy" ) && self hasWeapon( "onemanarmy_mp" ); ) + for ( ; self _hasperk( "specialty_onemanarmy" ) && self hasweapon( "onemanarmy_mp" ); ) { - if ( self HasThreat() || self HasBotJavelinLocation() ) + if ( self hasThreat() || self HasBotJavelinLocation() ) { break; } - if ( self InLastStand() && !self InFinalStand() ) + if ( self inLastStand() && !self inFinalStand() ) { break; } anyWeapout = false; - weaponsList = self GetWeaponsListAll(); + weaponsList = self getweaponslistall(); for ( i = 0; i < weaponsList.size; i++ ) { weap = weaponsList[ i ]; - if ( self getAmmoCount( weap ) || weap == "onemanarmy_mp" ) + if ( self getammocount( weap ) || weap == "onemanarmy_mp" ) { continue; } @@ -2675,7 +2675,7 @@ bot_perk_think_loop() anyWeapout = true; } - if ( ( !anyWeapout && randomInt( 100 ) < 90 ) || randomInt( 100 ) < 10 ) + if ( ( !anyWeapout && randomint( 100 ) < 90 ) || randomint( 100 ) < 10 ) { break; } @@ -2712,9 +2712,9 @@ bot_perk_think() for ( ;; ) { - wait randomIntRange( 5, 7 ); + wait randomintrange( 5, 7 ); - if ( self IsUsingRemote() ) + if ( self isusingremote() ) { continue; } @@ -2744,7 +2744,7 @@ bot_use_tube_think_loop( data ) } else { - wait randomintRange( 3, 7 ); + wait randomintrange( 3, 7 ); chance = self.pers[ "bots" ][ "behavior" ][ "nade" ] / 2; @@ -2753,7 +2753,7 @@ bot_use_tube_think_loop( data ) chance = 20; } - if ( randomInt( 100 ) > chance ) + if ( randomint( 100 ) > chance ) { return; } @@ -2761,12 +2761,12 @@ bot_use_tube_think_loop( data ) tube = self getValidTube(); - if ( !isDefined( tube ) ) + if ( !isdefined( tube ) ) { return; } - if ( self HasThreat() || self HasBotJavelinLocation() || self HasScriptAimPos() ) + if ( self hasThreat() || self HasBotJavelinLocation() || self HasScriptAimPos() ) { return; } @@ -2786,12 +2786,12 @@ bot_use_tube_think_loop( data ) return; } - if ( self IsUsingRemote() ) + if ( self isusingremote() ) { return; } - if ( self InLastStand() && !self InFinalStand() ) + if ( self inLastStand() && !self inFinalStand() ) { return; } @@ -2802,26 +2802,26 @@ bot_use_tube_think_loop( data ) { tubeWp = getWaypointForIndex( random( self waypointsNear( getWaypointsOfType( "tube" ), 1024 ) ) ); - myEye = self GetEye(); + myEye = self geteye(); - if ( !isDefined( tubeWp ) || self HasScriptGoal() || self.bot_lock_goal ) + if ( !isdefined( tubeWp ) || self HasScriptGoal() || self.bot_lock_goal ) { - traceForward = BulletTrace( myEye, myEye + AnglesToForward( self GetPlayerAngles() ) * 900 * 5, false, self ); + traceForward = bullettrace( myEye, myEye + anglestoforward( self getplayerangles() ) * 900 * 5, false, self ); loc = traceForward[ "position" ]; - dist = DistanceSquared( self.origin, loc ); + dist = distancesquared( self.origin, loc ); if ( dist < level.bots_mingrenadedistance || dist > level.bots_maxgrenadedistance * 5 ) { return; } - if ( !bulletTracePassed( self.origin + ( 0, 0, 5 ), self.origin + ( 0, 0, 2048 ), false, self ) ) + if ( !bullettracepassed( self.origin + ( 0, 0, 5 ), self.origin + ( 0, 0, 2048 ), false, self ) ) { return; } - if ( !bulletTracePassed( loc + ( 0, 0, 5 ), loc + ( 0, 0, 2048 ), false, self ) ) + if ( !bullettracepassed( loc + ( 0, 0, 5 ), loc + ( 0, 0, 2048 ), false, self ) ) { return; } @@ -2853,10 +2853,10 @@ bot_use_tube_think_loop( data ) else { tubeWp = getWaypointForIndex( self getNearestWaypointOfWaypoints( getWaypointsOfType( "tube" ) ) ); - loc = tubeWp.origin + AnglesToForward( tubeWp.angles ) * 2048; + loc = tubeWp.origin + anglestoforward( tubeWp.angles ) * 2048; } - if ( !isDefined( loc ) ) + if ( !isdefined( loc ) ) { return; } @@ -2887,7 +2887,7 @@ bot_use_tube_think() self endon( "death" ); level endon( "game_ended" ); - data = spawnStruct(); + data = spawnstruct(); data.dofastcontinue = false; for ( ;; ) @@ -2907,7 +2907,7 @@ bot_use_equipment_think_loop( data ) } else { - wait randomintRange( 2, 4 ); + wait randomintrange( 2, 4 ); chance = self.pers[ "bots" ][ "behavior" ][ "nade" ] / 2; @@ -2916,7 +2916,7 @@ bot_use_equipment_think_loop( data ) chance = 20; } - if ( randomInt( 100 ) > chance ) + if ( randomint( 100 ) > chance ) { return; } @@ -2924,27 +2924,27 @@ bot_use_equipment_think_loop( data ) nade = undefined; - if ( self GetAmmoCount( "claymore_mp" ) ) + if ( self getammocount( "claymore_mp" ) ) { nade = "claymore_mp"; } - if ( self GetAmmoCount( "flare_mp" ) ) + if ( self getammocount( "flare_mp" ) ) { nade = "flare_mp"; } - if ( self GetAmmoCount( "c4_mp" ) ) + if ( self getammocount( "c4_mp" ) ) { nade = "c4_mp"; } - if ( !isDefined( nade ) ) + if ( !isdefined( nade ) ) { return; } - if ( self HasThreat() || self HasBotJavelinLocation() || self HasScriptAimPos() ) + if ( self hasThreat() || self HasBotJavelinLocation() || self HasScriptAimPos() ) { return; } @@ -2964,12 +2964,12 @@ bot_use_equipment_think_loop( data ) return; } - if ( self IsUsingRemote() ) + if ( self isusingremote() ) { return; } - if ( self inLastStand() && !self _hasPerk( "specialty_laststandoffhand" ) && !self inFinalStand() ) + if ( self inLastStand() && !self _hasperk( "specialty_laststandoffhand" ) && !self inFinalStand() ) { return; } @@ -2980,12 +2980,12 @@ bot_use_equipment_think_loop( data ) { clayWp = getWaypointForIndex( random( self waypointsNear( getWaypointsOfType( "claymore" ), 1024 ) ) ); - if ( !isDefined( clayWp ) || self HasScriptGoal() || self.bot_lock_goal ) + if ( !isdefined( clayWp ) || self HasScriptGoal() || self.bot_lock_goal ) { - myEye = self GetEye(); - loc = myEye + AnglesToForward( self GetPlayerAngles() ) * 256; + myEye = self geteye(); + loc = myEye + anglestoforward( self getplayerangles() ) * 256; - if ( !bulletTracePassed( myEye, loc, false, self ) ) + if ( !bullettracepassed( myEye, loc, false, self ) ) { return; } @@ -3015,10 +3015,10 @@ bot_use_equipment_think_loop( data ) else { clayWp = getWaypointForIndex( self getNearestWaypointOfWaypoints( getWaypointsOfType( "claymore" ) ) ); - loc = clayWp.origin + AnglesToForward( clayWp.angles ) * 2048; + loc = clayWp.origin + anglestoforward( clayWp.angles ) * 2048; } - if ( !isDefined( loc ) ) + if ( !isdefined( loc ) ) { return; } @@ -3044,7 +3044,7 @@ bot_use_equipment_think() self endon( "death" ); level endon( "game_ended" ); - data = spawnStruct(); + data = spawnstruct(); data.dofastcontinue = false; for ( ;; ) @@ -3064,7 +3064,7 @@ bot_use_grenade_think_loop( data ) } else { - wait randomintRange( 4, 7 ); + wait randomintrange( 4, 7 ); chance = self.pers[ "bots" ][ "behavior" ][ "nade" ] / 2; @@ -3073,7 +3073,7 @@ bot_use_grenade_think_loop( data ) chance = 20; } - if ( randomInt( 100 ) > chance ) + if ( randomint( 100 ) > chance ) { return; } @@ -3081,12 +3081,12 @@ bot_use_grenade_think_loop( data ) nade = self getValidGrenade(); - if ( !isDefined( nade ) ) + if ( !isdefined( nade ) ) { return; } - if ( self HasThreat() || self HasBotJavelinLocation() || self HasScriptAimPos() ) + if ( self hasThreat() || self HasBotJavelinLocation() || self HasScriptAimPos() ) { return; } @@ -3106,12 +3106,12 @@ bot_use_grenade_think_loop( data ) return; } - if ( self IsUsingRemote() ) + if ( self isusingremote() ) { return; } - if ( self inLastStand() && !self _hasPerk( "specialty_laststandoffhand" ) && !self inFinalStand() ) + if ( self inLastStand() && !self _hasperk( "specialty_laststandoffhand" ) && !self inFinalStand() ) { return; } @@ -3122,26 +3122,26 @@ bot_use_grenade_think_loop( data ) { nadeWp = getWaypointForIndex( random( self waypointsNear( getWaypointsOfType( "grenade" ), 1024 ) ) ); - myEye = self GetEye(); + myEye = self geteye(); - if ( !isDefined( nadeWp ) || self HasScriptGoal() || self.bot_lock_goal ) + if ( !isdefined( nadeWp ) || self HasScriptGoal() || self.bot_lock_goal ) { - traceForward = BulletTrace( myEye, myEye + AnglesToForward( self GetPlayerAngles() ) * 900, false, self ); + traceForward = bullettrace( myEye, myEye + anglestoforward( self getplayerangles() ) * 900, false, self ); loc = traceForward[ "position" ]; - dist = DistanceSquared( self.origin, loc ); + dist = distancesquared( self.origin, loc ); if ( dist < level.bots_mingrenadedistance || dist > level.bots_maxgrenadedistance ) { return; } - if ( !bulletTracePassed( self.origin + ( 0, 0, 5 ), self.origin + ( 0, 0, 2048 ), false, self ) ) + if ( !bullettracepassed( self.origin + ( 0, 0, 5 ), self.origin + ( 0, 0, 2048 ), false, self ) ) { return; } - if ( !bulletTracePassed( loc + ( 0, 0, 5 ), loc + ( 0, 0, 2048 ), false, self ) ) + if ( !bullettracepassed( loc + ( 0, 0, 5 ), loc + ( 0, 0, 2048 ), false, self ) ) { return; } @@ -3173,10 +3173,10 @@ bot_use_grenade_think_loop( data ) else { nadeWp = getWaypointForIndex( self getNearestWaypointOfWaypoints( getWaypointsOfType( "grenade" ) ) ); - loc = nadeWp.origin + AnglesToForward( nadeWp.angles ) * 2048; + loc = nadeWp.origin + anglestoforward( nadeWp.angles ) * 2048; } - if ( !isDefined( loc ) ) + if ( !isdefined( loc ) ) { return; } @@ -3209,7 +3209,7 @@ bot_use_grenade_think() self endon( "death" ); level endon( "game_ended" ); - data = spawnStruct(); + data = spawnstruct(); data.dofastcontinue = false; for ( ;; ) @@ -3225,13 +3225,13 @@ bot_watch_think_mw2_loop() { tube = self getValidTube(); - if ( !isDefined( tube ) ) + if ( !isdefined( tube ) ) { - if ( self GetAmmoCount( "at4_mp" ) ) + if ( self getammocount( "at4_mp" ) ) { tube = "at4_mp"; } - else if ( self GetAmmoCount( "rpg_mp" ) ) + else if ( self getammocount( "rpg_mp" ) ) { tube = "rpg_mp"; } @@ -3241,19 +3241,19 @@ bot_watch_think_mw2_loop() } } - if ( self GetCurrentWeapon() == tube ) + if ( self getcurrentweapon() == tube ) { return; } chance = self.pers[ "bots" ][ "behavior" ][ "nade" ]; - if ( randomInt( 100 ) > chance ) + if ( randomint( 100 ) > chance ) { return; } - self thread ChangeToWeapon( tube ); + self thread changeToWeapon( tube ); } /* @@ -3267,7 +3267,7 @@ bot_watch_think_mw2() for ( ;; ) { - wait randomIntRange( 1, 4 ); + wait randomintrange( 1, 4 ); if ( self BotIsFrozen() ) { @@ -3279,17 +3279,17 @@ bot_watch_think_mw2() continue; } - if ( self IsUsingRemote() ) + if ( self isusingremote() ) { continue; } - if ( self InLastStand() && !self InFinalStand() ) + if ( self inLastStand() && !self inFinalStand() ) { continue; } - if ( self HasThreat() ) + if ( self hasThreat() ) { continue; } @@ -3303,15 +3303,15 @@ bot_watch_think_mw2() */ bot_watch_riot_weapons_loop() { - threat = self GetThreat(); - dist = DistanceSquared( threat.origin, self.origin ); - curWeap = self GetCurrentWeapon(); + threat = self getThreat(); + dist = distancesquared( threat.origin, self.origin ); + curWeap = self getcurrentweapon(); - if ( randomInt( 2 ) ) + if ( randomint( 2 ) ) { nade = self getValidGrenade(); - if ( !isDefined( nade ) ) + if ( !isdefined( nade ) ) { return; } @@ -3321,7 +3321,7 @@ bot_watch_riot_weapons_loop() return; } - if ( randomInt( 100 ) > self.pers[ "bots" ][ "behavior" ][ "nade" ] ) + if ( randomint( 100 ) > self.pers[ "bots" ][ "behavior" ][ "nade" ] ) { return; } @@ -3330,7 +3330,7 @@ bot_watch_riot_weapons_loop() } else { - if ( randomInt( 100 ) > self.pers[ "bots" ][ "behavior" ][ "switch" ] * 10 ) + if ( randomint( 100 ) > self.pers[ "bots" ][ "behavior" ][ "switch" ] * 10 ) { return; } @@ -3340,10 +3340,10 @@ bot_watch_riot_weapons_loop() while ( weaponslist.size ) { - weapon = weaponslist[ randomInt( weaponslist.size ) ]; + weapon = weaponslist[ randomint( weaponslist.size ) ]; weaponslist = array_remove( weaponslist, weapon ); - if ( !self getAmmoCount( weapon ) ) + if ( !self getammocount( weapon ) ) { continue; } @@ -3367,7 +3367,7 @@ bot_watch_riot_weapons_loop() return; } - self thread ChangeToWeapon( weap ); + self thread changeToWeapon( weap ); } } @@ -3382,7 +3382,7 @@ bot_watch_riot_weapons() for ( ;; ) { - wait randomIntRange( 2, 4 ); + wait randomintrange( 2, 4 ); if ( self BotIsFrozen() ) { @@ -3394,17 +3394,17 @@ bot_watch_riot_weapons() continue; } - if ( self IsUsingRemote() ) + if ( self isusingremote() ) { continue; } - if ( self InLastStand() && !self InFinalStand() ) + if ( self inLastStand() && !self inFinalStand() ) { continue; } - if ( !self HasThreat() ) + if ( !self hasThreat() ) { continue; } @@ -3429,7 +3429,7 @@ bot_jav_loc_think_loop( data ) } else { - wait randomintRange( 2, 4 ); + wait randomintrange( 2, 4 ); chance = self.pers[ "bots" ][ "behavior" ][ "nade" ] / 2; @@ -3438,18 +3438,18 @@ bot_jav_loc_think_loop( data ) chance = 20; } - if ( randomInt( 100 ) > chance && self getCurrentWeapon() != "javelin_mp" ) + if ( randomint( 100 ) > chance && self getcurrentweapon() != "javelin_mp" ) { return; } } - if ( !self GetAmmoCount( "javelin_mp" ) ) + if ( !self getammocount( "javelin_mp" ) ) { return; } - if ( self HasThreat() || self HasBotJavelinLocation() || self HasScriptAimPos() ) + if ( self hasThreat() || self HasBotJavelinLocation() || self HasScriptAimPos() ) { return; } @@ -3464,17 +3464,17 @@ bot_jav_loc_think_loop( data ) return; } - if ( self IsUsingRemote() ) + if ( self isusingremote() ) { return; } - if ( self InLastStand() && !self InFinalStand() ) + if ( self inLastStand() && !self inFinalStand() ) { return; } - if ( self isEMPed() ) + if ( self isemped() ) { return; } @@ -3485,28 +3485,28 @@ bot_jav_loc_think_loop( data ) { javWp = getWaypointForIndex( random( self waypointsNear( getWaypointsOfType( "javelin" ), 1024 ) ) ); - if ( !isDefined( javWp ) || self HasScriptGoal() || self.bot_lock_goal ) + if ( !isdefined( javWp ) || self HasScriptGoal() || self.bot_lock_goal ) { - traceForward = self maps\mp\_javelin::EyeTraceForward(); + traceForward = self maps\mp\_javelin::eyetraceforward(); - if ( !isDefined( traceForward ) ) + if ( !isdefined( traceForward ) ) { return; } loc = traceForward[ 0 ]; - if ( self maps\mp\_javelin::TargetPointTooClose( loc ) ) + if ( self maps\mp\_javelin::targetpointtooclose( loc ) ) { return; } - if ( !bulletTracePassed( self.origin + ( 0, 0, 5 ), self.origin + ( 0, 0, 2048 ), false, self ) ) + if ( !bullettracepassed( self.origin + ( 0, 0, 5 ), self.origin + ( 0, 0, 2048 ), false, self ) ) { return; } - if ( !bulletTracePassed( loc + ( 0, 0, 5 ), loc + ( 0, 0, 2048 ), false, self ) ) + if ( !bullettracepassed( loc + ( 0, 0, 5 ), loc + ( 0, 0, 2048 ), false, self ) ) { return; } @@ -3539,7 +3539,7 @@ bot_jav_loc_think_loop( data ) loc = javWp.jav_point; } - if ( !isDefined( loc ) ) + if ( !isdefined( loc ) ) { return; } @@ -3565,7 +3565,7 @@ bot_jav_loc_think() self endon( "death" ); level endon( "game_ended" ); - data = spawnStruct(); + data = spawnstruct(); data.dofastcontinue = false; for ( ;; ) @@ -3579,11 +3579,11 @@ bot_jav_loc_think() */ bot_equipment_kill_think_loop() { - myteam = self.pers[ "team" ]; - hasSitrep = self _HasPerk( "specialty_detectexplosive" ); - grenades = getEntArray( "grenade", "classname" ); - myEye = self getEye(); - myAngles = self getPlayerAngles(); + myTeam = self.pers[ "team" ]; + hasSitrep = self _hasperk( "specialty_detectexplosive" ); + grenades = getentarray( "grenade", "classname" ); + myEye = self geteye(); + myAngles = self getplayerangles(); dist = 512 * 512; target = undefined; @@ -3591,17 +3591,17 @@ bot_equipment_kill_think_loop() { item = grenades[ i ]; - if ( !isDefined( item ) ) + if ( !isdefined( item ) ) { continue; } - if ( !IsDefined( item.name ) ) + if ( !isdefined( item.name ) ) { continue; } - if ( IsDefined( item.owner ) && ( ( level.teambased && item.owner.team == self.team ) || item.owner == self ) ) + if ( isdefined( item.owner ) && ( ( level.teambased && item.owner.team == self.team ) || item.owner == self ) ) { continue; } @@ -3611,7 +3611,7 @@ bot_equipment_kill_think_loop() continue; } - if ( !hasSitrep && !bulletTracePassed( myEye, item.origin, false, item ) ) + if ( !hasSitrep && !bullettracepassed( myEye, item.origin, false, item ) ) { continue; } @@ -3621,7 +3621,7 @@ bot_equipment_kill_think_loop() continue; } - if ( DistanceSquared( item.origin, self.origin ) < dist ) + if ( distancesquared( item.origin, self.origin ) < dist ) { target = item; break; @@ -3630,7 +3630,7 @@ bot_equipment_kill_think_loop() grenades = undefined; - if ( !IsDefined( target ) ) + if ( !isdefined( target ) ) { for ( i = 0; i < level.players.size; i++ ) { @@ -3641,24 +3641,24 @@ bot_equipment_kill_think_loop() continue; } - if ( !isDefined( player.team ) ) + if ( !isdefined( player.team ) ) { continue; } - if ( level.teambased && player.team == myteam ) + if ( level.teambased && player.team == myTeam ) { continue; } ti = player.setspawnpoint; - if ( !isDefined( ti ) ) + if ( !isdefined( ti ) ) { continue; } - if ( !isDefined( ti.bots ) ) + if ( !isdefined( ti.bots ) ) { ti.bots = 0; } @@ -3668,7 +3668,7 @@ bot_equipment_kill_think_loop() continue; } - if ( !hasSitrep && !bulletTracePassed( myEye, ti.origin, false, ti ) ) + if ( !hasSitrep && !bullettracepassed( myEye, ti.origin, false, ti ) ) { continue; } @@ -3678,7 +3678,7 @@ bot_equipment_kill_think_loop() continue; } - if ( DistanceSquared( ti.origin, self.origin ) < dist ) + if ( distancesquared( ti.origin, self.origin ) < dist ) { target = ti; break; @@ -3686,12 +3686,12 @@ bot_equipment_kill_think_loop() } } - if ( !IsDefined( target ) ) + if ( !isdefined( target ) ) { return; } - if ( isDefined( target.enemytrigger ) && !self HasScriptGoal() && !self.bot_lock_goal ) + if ( isdefined( target.enemytrigger ) && !self HasScriptGoal() && !self.bot_lock_goal ) { self BotNotifyBotEvent( "attack_equ", "go_ti", target ); @@ -3706,21 +3706,21 @@ bot_equipment_kill_think_loop() self ClearScriptGoal(); } - if ( path != "goal" || !isDefined( target ) ) + if ( path != "goal" || !isdefined( target ) ) { return; } - if ( randomInt( 100 ) < self.pers[ "bots" ][ "behavior" ][ "camp" ] * 8 ) + if ( randomint( 100 ) < self.pers[ "bots" ][ "behavior" ][ "camp" ] * 8 ) { self BotNotifyBotEvent( "attack_equ", "camp_ti", target ); - self thread killCampAfterTime( randomIntRange( 10, 20 ) ); + self thread killCampAfterTime( randomintrange( 10, 20 ) ); self thread killCampAfterEntGone( target ); self CampAtSpot( target.origin, target.origin + ( 0, 0, 42 ) ); } - if ( isDefined( target ) ) + if ( isdefined( target ) ) { self BotNotifyBotEvent( "attack_equ", "trigger_ti", target ); self thread BotPressUse(); @@ -3749,7 +3749,7 @@ bot_equipment_kill_think() for ( ;; ) { - wait( RandomIntRange( 1, 3 ) ); + wait( randomintrange( 1, 3 ) ); if ( self HasScriptEnemy() ) { @@ -3770,13 +3770,13 @@ bot_equipment_kill_think() */ bot_equipment_attack( equ ) { - wait_time = RandomIntRange( 7, 10 ); + wait_time = randomintrange( 7, 10 ); for ( i = 0; i < wait_time; i++ ) { wait( 1 ); - if ( !IsDefined( equ ) ) + if ( !isdefined( equ ) ) { return; } @@ -3790,7 +3790,7 @@ bot_listen_to_steps_loop() { dist = level.bots_listendist; - if ( self _hasPerk( "specialty_selectivehearing" ) ) + if ( self _hasperk( "specialty_selectivehearing" ) ) { dist *= 1.4; } @@ -3818,22 +3818,22 @@ bot_listen_to_steps_loop() continue; } - if ( !isReallyAlive( player ) ) + if ( !isreallyalive( player ) ) { continue; } - if ( lengthsquared( player getVelocity() ) < 20000 ) + if ( lengthsquared( player getvelocity() ) < 20000 ) { continue; } - if ( distanceSquared( player.origin, self.origin ) > dist ) + if ( distancesquared( player.origin, self.origin ) > dist ) { continue; } - if ( player _hasPerk( "specialty_quieter" ) ) + if ( player _hasperk( "specialty_quieter" ) ) { continue; } @@ -3842,10 +3842,10 @@ bot_listen_to_steps_loop() break; } - hasHeartbeat = ( isSubStr( self GetCurrentWeapon(), "_heartbeat_" ) && !self IsEMPed() ); + hasHeartbeat = ( issubstr( self getcurrentweapon(), "_heartbeat_" ) && !self isemped() ); heartbeatDist = 350 * 350; - if ( !IsDefined( heard ) && hasHeartbeat ) + if ( !isdefined( heard ) && hasHeartbeat ) { for ( i = level.players.size - 1 ; i >= 0; i-- ) { @@ -3866,22 +3866,22 @@ bot_listen_to_steps_loop() continue; } - if ( !isReallyAlive( player ) ) + if ( !isreallyalive( player ) ) { continue; } - if ( player _hasPerk( "specialty_heartbreaker" ) ) + if ( player _hasperk( "specialty_heartbreaker" ) ) { continue; } - if ( distanceSquared( player.origin, self.origin ) > heartbeatDist ) + if ( distancesquared( player.origin, self.origin ) > heartbeatDist ) { continue; } - if ( GetConeDot( player.origin, self.origin, self GetPlayerAngles() ) < 0.6 ) + if ( getConeDot( player.origin, self.origin, self getplayerangles() ) < 0.6 ) { continue; } @@ -3891,14 +3891,14 @@ bot_listen_to_steps_loop() } } - if ( !IsDefined( heard ) ) + if ( !isdefined( heard ) ) { return; } self BotNotifyBotEvent( "heard_target", "start", heard ); - if ( bulletTracePassed( self getEye(), heard getTagOrigin( "j_spineupper" ), false, heard ) ) + if ( bullettracepassed( self geteye(), heard gettagorigin( "j_spineupper" ), false, heard ) ) { self setAttacker( heard ); return; @@ -3964,7 +3964,7 @@ bot_uav_think_loop() continue; } - if ( !isDefined( player.team ) ) + if ( !isdefined( player.team ) ) { continue; } @@ -3979,27 +3979,27 @@ bot_uav_think_loop() continue; } - if ( !isReallyAlive( player ) ) + if ( !isreallyalive( player ) ) { continue; } - distFromPlayer = DistanceSquared( self.origin, player.origin ); + distFromPlayer = distancesquared( self.origin, player.origin ); if ( distFromPlayer > dist ) { continue; } - if ( ( !isSubStr( player getCurrentWeapon(), "_silencer_" ) && player.bots_firing ) || ( hasRadar && !player _hasPerk( "specialty_coldblooded" ) ) ) + if ( ( !issubstr( player getcurrentweapon(), "_silencer_" ) && player.bots_firing ) || ( hasRadar && !player _hasperk( "specialty_coldblooded" ) ) ) { self BotNotifyBotEvent( "uav_target", "start", player ); distSq = self.pers[ "bots" ][ "skill" ][ "help_dist" ] * self.pers[ "bots" ][ "skill" ][ "help_dist" ]; - if ( distFromPlayer < distSq && bulletTracePassed( self getEye(), player getTagOrigin( "j_spineupper" ), false, player ) ) + if ( distFromPlayer < distSq && bullettracepassed( self geteye(), player gettagorigin( "j_spineupper" ), false, player ) ) { - self SetAttacker( player ); + self setAttacker( player ); } if ( !self HasScriptGoal() && !self.bot_lock_goal ) @@ -4032,17 +4032,17 @@ bot_uav_think() { wait 0.75; - if ( self.pers[ "bots" ][ "skill" ][ "base" ] <= 1 || self IsUsingRemote() ) + if ( self.pers[ "bots" ][ "skill" ][ "base" ] <= 1 || self isusingremote() ) { continue; } - if ( self isEMPed() || self.bot_isscrambled ) + if ( self isemped() || self.bot_isscrambled ) { continue; } - if ( self _hasPerk( "_specialty_blastshield" ) ) + if ( self _hasperk( "_specialty_blastshield" ) ) { continue; } @@ -4069,15 +4069,15 @@ bot_revenge_think() return; } - if ( isDefined( self.lastkiller ) && isReallyAlive( self.lastkiller ) ) + if ( isdefined( self.lastkiller ) && isreallyalive( self.lastkiller ) ) { - if ( bulletTracePassed( self getEye(), self.lastkiller getTagOrigin( "j_spineupper" ), false, self.lastkiller ) ) + if ( bullettracepassed( self geteye(), self.lastkiller gettagorigin( "j_spineupper" ), false, self.lastkiller ) ) { self setAttacker( self.lastkiller ); } } - if ( !isDefined( self.killerlocation ) ) + if ( !isdefined( self.killerlocation ) ) { return; } @@ -4086,7 +4086,7 @@ bot_revenge_think() for ( ;; ) { - wait( RandomIntRange( 1, 5 ) ); + wait( randomintrange( 1, 5 ) ); if ( self HasScriptGoal() || self.bot_lock_goal ) { @@ -4126,7 +4126,7 @@ turret_death_monitor( turret ) { wait 0.5; - if ( !isDefined( turret ) ) + if ( !isdefined( turret ) ) { break; } @@ -4136,7 +4136,7 @@ turret_death_monitor( turret ) break; } - if ( isDefined( turret.carriedby ) ) + if ( isdefined( turret.carriedby ) ) { break; } @@ -4150,13 +4150,13 @@ turret_death_monitor( turret ) */ bot_turret_attack( enemy ) { - wait_time = RandomIntRange( 7, 10 ); + wait_time = randomintrange( 7, 10 ); for ( i = 0; i < wait_time; i++ ) { wait( 1 ); - if ( !IsDefined( enemy ) ) + if ( !isdefined( enemy ) ) { return; } @@ -4166,12 +4166,12 @@ bot_turret_attack( enemy ) return; } - if ( isDefined( enemy.carriedby ) ) + if ( isdefined( enemy.carriedby ) ) { return; } - // if ( !BulletTracePassed( self getEye(), enemy.origin + ( 0, 0, 15 ), false, enemy ) ) + // if ( !bullettracepassed( self geteye(), enemy.origin + ( 0, 0, 15 ), false, enemy ) ) // return; } } @@ -4181,8 +4181,8 @@ bot_turret_attack( enemy ) */ bot_turret_think_loop() { - myteam = self.pers[ "team" ]; - turretsKeys = getArrayKeys( level.turrets ); + myTeam = self.pers[ "team" ]; + turretsKeys = getarraykeys( level.turrets ); if ( turretsKeys.size == 0 ) { @@ -4195,19 +4195,19 @@ bot_turret_think_loop() return; } - if ( self HasScriptEnemy() || self IsUsingRemote() ) + if ( self HasScriptEnemy() || self isusingremote() ) { return; } - myEye = self GetEye(); + myEye = self geteye(); turret = undefined; for ( i = turretsKeys.size - 1; i >= 0; i-- ) { tempTurret = level.turrets[ turretsKeys[ i ] ]; - if ( !isDefined( tempTurret ) ) + if ( !isdefined( tempTurret ) ) { continue; } @@ -4217,22 +4217,22 @@ bot_turret_think_loop() continue; } - if ( isDefined( tempTurret.carriedby ) ) + if ( isdefined( tempTurret.carriedby ) ) { continue; } - if ( isDefined( tempTurret.owner ) && tempTurret.owner == self ) + if ( isdefined( tempTurret.owner ) && tempTurret.owner == self ) { continue; } - if ( level.teambased && tempTurret.team == myteam ) + if ( level.teambased && tempTurret.team == myTeam ) { continue; } - if ( !bulletTracePassed( myEye, tempTurret.origin + ( 0, 0, 15 ), false, tempTurret ) ) + if ( !bullettracepassed( myEye, tempTurret.origin + ( 0, 0, 15 ), false, tempTurret ) ) { continue; } @@ -4242,18 +4242,18 @@ bot_turret_think_loop() turretsKeys = undefined; - if ( !isDefined( turret ) ) + if ( !isdefined( turret ) ) { return; } - forward = AnglesToForward( turret.angles ); - forward = VectorNormalize( forward ); + forward = anglestoforward( turret.angles ); + forward = vectornormalize( forward ); delta = self.origin - turret.origin; - delta = VectorNormalize( delta ); + delta = vectornormalize( delta ); - dot = VectorDot( forward, delta ); + dot = vectordot( forward, delta ); facing = true; @@ -4267,17 +4267,17 @@ bot_turret_think_loop() facing = false; } - if ( self _hasPerk( "specialty_coldblooded" ) ) + if ( self _hasperk( "specialty_coldblooded" ) ) { facing = false; } - if ( facing && !BulletTracePassed( myEye, turret.origin + ( 0, 0, 15 ), false, turret ) ) + if ( facing && !bullettracepassed( myEye, turret.origin + ( 0, 0, 15 ), false, turret ) ) { return; } - if ( !IsDefined( turret.bots ) ) + if ( !isdefined( turret.bots ) ) { turret.bots = 0; } @@ -4302,7 +4302,7 @@ bot_turret_think_loop() } } - if ( !isDefined( turret ) ) + if ( !isdefined( turret ) ) { return; } @@ -4338,7 +4338,7 @@ bot_turret_think() */ bot_watch_stuck_on_crate_loop() { - crates = getEntArray( "care_package", "targetname" ); + crates = getentarray( "care_package", "targetname" ); if ( crates.size == 0 ) { @@ -4351,17 +4351,17 @@ bot_watch_stuck_on_crate_loop() { tempCrate = crates[ i ]; - if ( !isDefined( tempCrate ) ) + if ( !isdefined( tempCrate ) ) { continue; } - if ( !isDefined( tempCrate.doingphysics ) || tempCrate.doingphysics ) + if ( !isdefined( tempCrate.doingphysics ) || tempCrate.doingphysics ) { continue; } - if ( isDefined( crate ) && DistanceSquared( crate.origin, self.origin ) < DistanceSquared( tempCrate.origin, self.origin ) ) + if ( isdefined( crate ) && distancesquared( crate.origin, self.origin ) < distancesquared( tempCrate.origin, self.origin ) ) { continue; } @@ -4369,14 +4369,14 @@ bot_watch_stuck_on_crate_loop() crate = tempCrate; } - if ( !isDefined( crate ) ) + if ( !isdefined( crate ) ) { return; } - radius = GetDvarFloat( "player_useRadius" ); + radius = getdvarfloat( "player_useRadius" ); - if ( DistanceSquared( crate.origin, self.origin ) > radius * radius ) + if ( distancesquared( crate.origin, self.origin ) > radius * radius ) { return; } @@ -4398,7 +4398,7 @@ bot_watch_stuck_on_crate() { wait 3; - if ( self HasThreat() ) + if ( self hasThreat() ) { continue; } @@ -4423,13 +4423,13 @@ bot_crate_think_loop( data ) ret = self waittill_any_timeout( randomintrange( 3, 5 ), "crate_physics_done" ); } - myteam = self.pers[ "team" ]; + myTeam = self.pers[ "team" ]; crate = self.bot_stuck_on_carepackage; self.bot_stuck_on_carepackage = undefined; - if ( !isDefined( crate ) ) + if ( !isdefined( crate ) ) { - if ( RandomInt( 100 ) < 20 && ret != "crate_physics_done" ) + if ( randomint( 100 ) < 20 && ret != "crate_physics_done" ) { return; } @@ -4444,7 +4444,7 @@ bot_crate_think_loop( data ) return; } - if ( self IsUsingRemote() || self BotIsFrozen() ) + if ( self isusingremote() || self BotIsFrozen() ) { return; } @@ -4454,7 +4454,7 @@ bot_crate_think_loop( data ) return; } - crates = getEntArray( "care_package", "targetname" ); + crates = getentarray( "care_package", "targetname" ); if ( crates.size == 0 ) { @@ -4469,17 +4469,17 @@ bot_crate_think_loop( data ) { tempCrate = crates[ i ]; - if ( !isDefined( tempCrate ) ) + if ( !isdefined( tempCrate ) ) { continue; } - if ( !isDefined( tempCrate.doingphysics ) || tempCrate.doingphysics ) + if ( !isdefined( tempCrate.doingphysics ) || tempCrate.doingphysics ) { continue; } - if ( !IsDefined( tempCrate.bots ) ) + if ( !isdefined( tempCrate.bots ) ) { tempCrate.bots = 0; } @@ -4489,18 +4489,18 @@ bot_crate_think_loop( data ) continue; } - if ( isDefined( crate ) ) + if ( isdefined( crate ) ) { if ( wantsClosest ) { - if ( DistanceSquared( crate.origin, self.origin ) < DistanceSquared( tempCrate.origin, self.origin ) ) + if ( distancesquared( crate.origin, self.origin ) < distancesquared( tempCrate.origin, self.origin ) ) { continue; } } else { - if ( maps\mp\killstreaks\_killstreaks::getStreakCost( crate.cratetype ) > maps\mp\killstreaks\_killstreaks::getStreakCost( tempCrate.cratetype ) ) + if ( maps\mp\killstreaks\_killstreaks::getstreakcost( crate.cratetype ) > maps\mp\killstreaks\_killstreaks::getstreakcost( tempCrate.cratetype ) ) { continue; } @@ -4512,7 +4512,7 @@ bot_crate_think_loop( data ) crates = undefined; - if ( !isDefined( crate ) ) + if ( !isdefined( crate ) ) { return; } @@ -4521,7 +4521,7 @@ bot_crate_think_loop( data ) self.bot_lock_goal = true; - radius = GetDvarFloat( "player_useRadius" ) - 16; + radius = getdvarfloat( "player_useRadius" ) - 16; self SetScriptGoal( crate.origin, radius ); self thread bot_inc_bots( crate, true ); self thread bots_watch_touch_obj( crate ); @@ -4535,9 +4535,9 @@ bot_crate_think_loop( data ) self ClearScriptGoal(); } - if ( path != "goal" || !isDefined( crate ) || DistanceSquared( self.origin, crate.origin ) > radius * radius ) + if ( path != "goal" || !isdefined( crate ) || distancesquared( self.origin, crate.origin ) > radius * radius ) { - if ( isDefined( crate ) && path == "bad_path" ) + if ( isdefined( crate ) && path == "bad_path" ) { self BotNotifyBotEvent( "crate_cap", "unreachable", crate ); } @@ -4555,7 +4555,7 @@ bot_crate_think_loop( data ) waitTime = 3.25; - if ( !isDefined( crate.owner ) || crate.owner == self ) + if ( !isdefined( crate.owner ) || crate.owner == self ) { waitTime = 0.75; } @@ -4578,7 +4578,7 @@ bot_crate_think() self endon( "disconnect" ); level endon( "game_ended" ); - data = spawnStruct(); + data = spawnstruct(); data.first = true; for ( ;; ) @@ -4604,19 +4604,19 @@ doReloadCancel_loop() return; } - if ( self IsUsingRemote() ) + if ( self isusingremote() ) { return; } - if ( self InLastStand() && !self InFinalStand() ) + if ( self inLastStand() && !self inFinalStand() ) { return; } - curWeap = self GetCurrentWeapon(); + curWeap = self getcurrentweapon(); - if ( !maps\mp\gametypes\_weapons::isPrimaryWeapon( curWeap ) ) + if ( !maps\mp\gametypes\_weapons::isprimaryweapon( curWeap ) ) { return; } @@ -4624,7 +4624,7 @@ doReloadCancel_loop() if ( ret == "reload" ) { // check single reloads - if ( self GetWeaponAmmoClip( curWeap ) < WeaponClipSize( curWeap ) ) + if ( self getweaponammoclip( curWeap ) < weaponclipsize( curWeap ) ) { return; } @@ -4637,15 +4637,15 @@ doReloadCancel_loop() } // check if got another weapon - weaponslist = self GetWeaponsListPrimaries(); + weaponslist = self getweaponslistprimaries(); weap = ""; while ( weaponslist.size ) { - weapon = weaponslist[ randomInt( weaponslist.size ) ]; + weapon = weaponslist[ randomint( weaponslist.size ) ]; weaponslist = array_remove( weaponslist, weapon ); - if ( !maps\mp\gametypes\_weapons::isPrimaryWeapon( weapon ) ) + if ( !maps\mp\gametypes\_weapons::isprimaryweapon( weapon ) ) { continue; } @@ -4666,9 +4666,9 @@ doReloadCancel_loop() // do the cancel wait 0.1; - self thread ChangeToWeapon( weap ); + self thread changeToWeapon( weap ); wait 0.25; - self thread ChangeToWeapon( curWeap ); + self thread changeToWeapon( curWeap ); wait 2; } @@ -4691,7 +4691,7 @@ doReloadCancel() */ bot_weapon_think_loop( data ) { - ret = self waittill_any_timeout( randomIntRange( 2, 4 ), "bot_force_check_switch" ); + ret = self waittill_any_timeout( randomintrange( 2, 4 ), "bot_force_check_switch" ); if ( self BotIsFrozen() ) { @@ -4703,17 +4703,17 @@ bot_weapon_think_loop( data ) return; } - if ( self IsUsingRemote() ) + if ( self isusingremote() ) { return; } - if ( self InLastStand() && !self InFinalStand() ) + if ( self inLastStand() && !self inFinalStand() ) { return; } - curWeap = self GetCurrentWeapon(); + curWeap = self getcurrentweapon(); hasTarget = self hasThreat(); if ( hasTarget ) @@ -4721,32 +4721,32 @@ bot_weapon_think_loop( data ) threat = self getThreat(); rocketAmmo = self getRocketAmmo(); - if ( entIsVehicle( threat ) && isDefined( rocketAmmo ) ) + if ( entIsVehicle( threat ) && isdefined( rocketAmmo ) ) { if ( curWeap != rocketAmmo ) { - self thread ChangeToWeapon( rocketAmmo ); + self thread changeToWeapon( rocketAmmo ); } return; } } - if ( self HasBotJavelinLocation() && self GetAmmoCount( "javelin_mp" ) ) + if ( self HasBotJavelinLocation() && self getammocount( "javelin_mp" ) ) { if ( curWeap != "javelin_mp" ) { - self thread ChangeToWeapon( "javelin_mp" ); + self thread changeToWeapon( "javelin_mp" ); } return; } - if ( isDefined( self.bot_oma_class ) ) + if ( isdefined( self.bot_oma_class ) ) { if ( curWeap != "onemanarmy_mp" ) { - self thread ChangeToWeapon( "onemanarmy_mp" ); + self thread changeToWeapon( "onemanarmy_mp" ); } return; @@ -4758,16 +4758,16 @@ bot_weapon_think_loop( data ) { data.first = false; - if ( randomInt( 100 ) > self.pers[ "bots" ][ "behavior" ][ "initswitch" ] ) + if ( randomint( 100 ) > self.pers[ "bots" ][ "behavior" ][ "initswitch" ] ) { return; } } else { - if ( curWeap != "none" && self getAmmoCount( curWeap ) && curWeap != "stinger_mp" && curWeap != "javelin_mp" && curWeap != "onemanarmy_mp" ) + if ( curWeap != "none" && self getammocount( curWeap ) && curWeap != "stinger_mp" && curWeap != "javelin_mp" && curWeap != "onemanarmy_mp" ) { - if ( randomInt( 100 ) > self.pers[ "bots" ][ "behavior" ][ "switch" ] ) + if ( randomint( 100 ) > self.pers[ "bots" ][ "behavior" ][ "switch" ] ) { return; } @@ -4788,10 +4788,10 @@ bot_weapon_think_loop( data ) while ( weaponslist.size ) { - weapon = weaponslist[ randomInt( weaponslist.size ) ]; + weapon = weaponslist[ randomint( weaponslist.size ) ]; weaponslist = array_remove( weaponslist, weapon ); - if ( !self getAmmoCount( weapon ) && !force ) + if ( !self getammocount( weapon ) && !force ) { continue; } @@ -4815,7 +4815,7 @@ bot_weapon_think_loop( data ) return; } - self thread ChangeToWeapon( weap ); + self thread changeToWeapon( weap ); } /* @@ -4827,7 +4827,7 @@ bot_weapon_think() self endon( "disconnect" ); level endon( "game_ended" ); - data = spawnStruct(); + data = spawnstruct(); data.first = true; for ( ;; ) @@ -4843,17 +4843,17 @@ bot_target_vehicle_loop() { rocketAmmo = self getRocketAmmo(); - if ( !isDefined( rocketAmmo ) && self BotGetRandom() < 90 ) + if ( !isdefined( rocketAmmo ) && self BotGetRandom() < 90 ) { return; } - if ( isDefined( rocketAmmo ) && rocketAmmo == "javelin_mp" && self isEMPed() ) + if ( isdefined( rocketAmmo ) && rocketAmmo == "javelin_mp" && self isemped() ) { return; } - targets = maps\mp\_stinger::GetTargetList(); + targets = maps\mp\_stinger::gettargetlist(); if ( !targets.size ) { @@ -4861,19 +4861,19 @@ bot_target_vehicle_loop() } lockOnAmmo = self getLockonAmmo(); - myEye = self GetEye(); + myEye = self geteye(); target = undefined; for ( i = targets.size - 1; i >= 0; i-- ) { tempTarget = targets[ i ]; - if ( isDefined( tempTarget.owner ) && tempTarget.owner == self ) + if ( isdefined( tempTarget.owner ) && tempTarget.owner == self ) { continue; } - if ( !bulletTracePassed( myEye, tempTarget.origin, false, tempTarget ) ) + if ( !bullettracepassed( myEye, tempTarget.origin, false, tempTarget ) ) { continue; } @@ -4883,7 +4883,7 @@ bot_target_vehicle_loop() continue; } - if ( tempTarget.classname != "script_vehicle" && !isDefined( lockOnAmmo ) ) + if ( tempTarget.classname != "script_vehicle" && !isdefined( lockOnAmmo ) ) { continue; } @@ -4893,7 +4893,7 @@ bot_target_vehicle_loop() targets = undefined; - if ( !isDefined( target ) ) + if ( !isdefined( target ) ) { return; } @@ -4918,7 +4918,7 @@ bot_target_vehicle() for ( ;; ) { - wait randomIntRange( 2, 4 ); + wait randomintrange( 2, 4 ); if ( self.pers[ "bots" ][ "skill" ][ "base" ] <= 1 ) { @@ -4930,7 +4930,7 @@ bot_target_vehicle() continue; } - if ( self IsUsingRemote() ) + if ( self isusingremote() ) { continue; } @@ -4946,14 +4946,14 @@ bot_attack_vehicle( target ) { target endon( "death" ); - wait_time = RandomIntRange( 7, 10 ); + wait_time = randomintrange( 7, 10 ); for ( i = 0; i < wait_time; i++ ) { self notify( "bot_force_check_switch" ); wait( 1 ); - if ( !IsDefined( target ) ) + if ( !isdefined( target ) ) { return; } @@ -4977,7 +4977,7 @@ getKillstreakTargetLocation() continue; } - if ( !isDefined( player.team ) ) + if ( !isdefined( player.team ) ) { continue; } @@ -4992,17 +4992,17 @@ getKillstreakTargetLocation() continue; } - if ( !isReallyAlive( player ) ) + if ( !isreallyalive( player ) ) { continue; } - if ( player _hasPerk( "specialty_coldblooded" ) ) + if ( player _hasperk( "specialty_coldblooded" ) ) { continue; } - if ( !bulletTracePassed( player.origin, player.origin + ( 0, 0, 2048 ), false, player ) && self.pers[ "bots" ][ "skill" ][ "base" ] > 3 ) + if ( !bullettracepassed( player.origin, player.origin + ( 0, 0, 2048 ), false, player ) && self.pers[ "bots" ][ "skill" ][ "base" ] > 3 ) { continue; } @@ -5012,13 +5012,13 @@ getKillstreakTargetLocation() target = random( players ); - if ( isDefined( target ) ) + if ( isdefined( target ) ) { - location = target.origin + ( randomIntRange( ( 8 - self.pers[ "bots" ][ "skill" ][ "base" ] ) * -75, ( 8 - self.pers[ "bots" ][ "skill" ][ "base" ] ) * 75 ), randomIntRange( ( 8 - self.pers[ "bots" ][ "skill" ][ "base" ] ) * -75, ( 8 - self.pers[ "bots" ][ "skill" ][ "base" ] ) * 75 ), 0 ); + location = target.origin + ( randomintrange( ( 8 - self.pers[ "bots" ][ "skill" ][ "base" ] ) * -75, ( 8 - self.pers[ "bots" ][ "skill" ][ "base" ] ) * 75 ), randomintrange( ( 8 - self.pers[ "bots" ][ "skill" ][ "base" ] ) * -75, ( 8 - self.pers[ "bots" ][ "skill" ][ "base" ] ) * 75 ), 0 ); } else if ( self.pers[ "bots" ][ "skill" ][ "base" ] <= 3 ) { - location = self.origin + ( randomIntRange( -512, 512 ), randomIntRange( -512, 512 ), 0 ); + location = self.origin + ( randomintrange( -512, 512 ), randomintrange( -512, 512 ), 0 ); } return location; @@ -5034,14 +5034,14 @@ clear_remote_on_death( isac130 ) self waittill_either( "death", "disconnect" ); - if ( isDefined( isac130 ) && isac130 ) + if ( isdefined( isac130 ) && isac130 ) { level.ac130inuse = false; } - if ( isDefined( self ) ) + if ( isdefined( self ) ) { - self ClearUsingRemote(); + self clearusingremote(); } } @@ -5050,7 +5050,7 @@ clear_remote_on_death( isac130 ) */ isAnyEnemyPlanes() { - if ( !isDefined( level.harriers ) ) + if ( !isdefined( level.harriers ) ) { return false; } @@ -5059,7 +5059,7 @@ isAnyEnemyPlanes() { plane = level.harriers[ i ]; - if ( !isDefined( plane ) ) + if ( !isdefined( plane ) ) { continue; } @@ -5069,7 +5069,7 @@ isAnyEnemyPlanes() continue; } - if ( isDefined( plane.owner ) && plane.owner == self ) + if ( isdefined( plane.owner ) && plane.owner == self ) { continue; } @@ -5091,10 +5091,10 @@ bot_killstreak_think_loop( data ) } else { - wait randomIntRange( 1, 3 ); + wait randomintrange( 1, 3 ); } - if ( !isDefined( self.pers[ "killstreaks" ][ 0 ] ) ) + if ( !isdefined( self.pers[ "killstreaks" ][ 0 ] ) ) { return; } @@ -5104,7 +5104,7 @@ bot_killstreak_think_loop( data ) return; } - if ( self HasThreat() || self HasBotJavelinLocation() ) + if ( self hasThreat() || self HasBotJavelinLocation() ) { return; } @@ -5114,30 +5114,30 @@ bot_killstreak_think_loop( data ) return; } - if ( self isEMPed() ) + if ( self isemped() ) { return; } - if ( self IsUsingRemote() ) + if ( self isusingremote() ) { return; } - if ( self InLastStand() && !self InFinalStand() ) + if ( self inLastStand() && !self inFinalStand() ) { return; } - if ( isDefined( self.iscarrying ) && self.iscarrying ) + if ( isdefined( self.iscarrying ) && self.iscarrying ) { self notify( "place_sentry" ); } - curWeap = self GetCurrentWeapon(); + curWeap = self getcurrentweapon(); - if ( isSubStr( curWeap, "airdrop_" ) ) + if ( issubstr( curWeap, "airdrop_" ) ) { self thread BotPressAttack( 0.05 ); } @@ -5145,21 +5145,21 @@ bot_killstreak_think_loop( data ) streakName = self.pers[ "killstreaks" ][ 0 ].streakname; - if ( level.ingraceperiod && maps\mp\killstreaks\_killstreaks::deadlyKillstreak( streakName ) ) + if ( level.ingraceperiod && maps\mp\killstreaks\_killstreaks::deadlykillstreak( streakName ) ) { return; } - ksWeap = maps\mp\killstreaks\_killstreaks::getKillstreakWeapon( streakName ); + ksWeap = maps\mp\killstreaks\_killstreaks::getkillstreakweapon( streakName ); if ( curWeap == "none" || !isWeaponPrimary( curWeap ) ) { - curWeap = self GetLastWeapon(); + curWeap = self getlastweapon(); } lifeId = self.pers[ "killstreaks" ][ 0 ].lifeid; - if ( !isDefined( lifeId ) ) + if ( !isdefined( lifeId ) ) { lifeId = -1; } @@ -5169,7 +5169,7 @@ bot_killstreak_think_loop( data ) return; } - if ( maps\mp\killstreaks\_killstreaks::isRideKillstreak( streakName ) || maps\mp\killstreaks\_killstreaks::isCarryKillstreak( streakName ) ) + if ( maps\mp\killstreaks\_killstreaks::isridekillstreak( streakName ) || maps\mp\killstreaks\_killstreaks::iscarrykillstreak( streakName ) ) { if ( self inLastStand() ) { @@ -5180,7 +5180,7 @@ bot_killstreak_think_loop( data ) { campSpot = getWaypointForIndex( random( self waypointsNear( getWaypointsOfType( "camp" ), 1024 ) ) ); - if ( isDefined( campSpot ) ) + if ( isdefined( campSpot ) ) { self BotNotifyBotEvent( "killstreak", "camp", streakName, campSpot ); @@ -5203,12 +5203,12 @@ bot_killstreak_think_loop( data ) return; } - myEye = self GetEye(); - angles = self GetPlayerAngles(); + myEye = self geteye(); + angles = self getplayerangles(); - forwardTrace = bulletTrace( myEye, myEye + AnglesToForward( angles ) * 1024, false, self ); + forwardTrace = bullettrace( myEye, myEye + anglestoforward( angles ) * 1024, false, self ); - if ( DistanceSquared( self.origin, forwardTrace[ "position" ] ) < 1000 * 1000 && self.pers[ "bots" ][ "skill" ][ "base" ] > 3 ) + if ( distancesquared( self.origin, forwardTrace[ "position" ] ) < 1000 * 1000 && self.pers[ "bots" ][ "skill" ][ "base" ] > 3 ) { return; } @@ -5238,7 +5238,7 @@ bot_killstreak_think_loop( data ) { location = self getKillstreakTargetLocation(); - if ( !isDefined( location ) ) + if ( !isdefined( location ) ) { return; } @@ -5246,45 +5246,45 @@ bot_killstreak_think_loop( data ) self BotNotifyBotEvent( "killstreak", "call", streakName, location ); self BotRandomStance(); - self setUsingRemote( "remotemissile" ); + self setusingremote( "remotemissile" ); self thread clear_remote_on_death(); self BotStopMoving( true ); if ( !self changeToWeapon( ksWeap ) ) { - self ClearUsingRemote(); + self clearusingremote(); self notify( "bot_clear_remote_on_death" ); self BotStopMoving( false ); return; } wait 0.05; - self thread ChangeToWeapon( ksWeap ); // prevent script from changing back + self thread changeToWeapon( ksWeap ); // prevent script from changing back wait 1; self notify( "bot_clear_remote_on_death" ); self BotStopMoving( false ); - if ( self isEMPed() ) + if ( self isemped() ) { - self ClearUsingRemote(); + self clearusingremote(); self thread changeToWeapon( curWeap ); return; } self BotFreezeControls( true ); - self maps\mp\killstreaks\_killstreaks::usedKillstreak( "predator_missile", true ); - self maps\mp\killstreaks\_killstreaks::shuffleKillStreaksFILO( "predator_missile" ); - self maps\mp\killstreaks\_killstreaks::giveOwnedKillstreakItem(); + self maps\mp\killstreaks\_killstreaks::usedkillstreak( "predator_missile", true ); + self maps\mp\killstreaks\_killstreaks::shufflekillstreaksfilo( "predator_missile" ); + self maps\mp\killstreaks\_killstreaks::giveownedkillstreakitem(); - rocket = MagicBullet( "remotemissile_projectile_mp", self.origin + ( 0.0, 0.0, 7000.0 - ( self.pers[ "bots" ][ "skill" ][ "base" ] * 400 ) ), location, self ); + rocket = magicbullet( "remotemissile_projectile_mp", self.origin + ( 0.0, 0.0, 7000.0 - ( self.pers[ "bots" ][ "skill" ][ "base" ] * 400 ) ), location, self ); rocket.lifeid = lifeId; rocket.type = "remote"; - rocket thread maps\mp\gametypes\_weapons::AddMissileToSightTraces( self.pers[ "team" ] ); - rocket thread maps\mp\killstreaks\_remotemissile::handleDamage(); - thread maps\mp\killstreaks\_remotemissile::MissileEyes( self, rocket ); + rocket thread maps\mp\gametypes\_weapons::addmissiletosighttraces( self.pers[ "team" ] ); + rocket thread maps\mp\killstreaks\_remotemissile::handledamage(); + thread maps\mp\killstreaks\_remotemissile::missileeyes( self, rocket ); self waittill( "stopped_using_remote" ); @@ -5293,7 +5293,7 @@ bot_killstreak_think_loop( data ) } else if ( streakName == "ac130" ) { - if ( isDefined( level.ac130player ) || level.ac130inuse ) + if ( isdefined( level.ac130player ) || level.ac130inuse ) { return; } @@ -5309,7 +5309,7 @@ bot_killstreak_think_loop( data ) } else if ( streakName == "helicopter_minigun" ) { - if ( isDefined( level.chopper ) ) + if ( isdefined( level.chopper ) ) { return; } @@ -5338,22 +5338,22 @@ bot_killstreak_think_loop( data ) return; } - if ( !bulletTracePassed( self.origin, self.origin + ( 0, 0, 2048 ), false, self ) && self.pers[ "bots" ][ "skill" ][ "base" ] > 3 ) + if ( !bullettracepassed( self.origin, self.origin + ( 0, 0, 2048 ), false, self ) && self.pers[ "bots" ][ "skill" ][ "base" ] > 3 ) { return; } - myEye = self GetEye(); - angles = self GetPlayerAngles(); + myEye = self geteye(); + angles = self getplayerangles(); - forwardTrace = bulletTrace( myEye, myEye + AnglesToForward( angles ) * 256, false, self ); + forwardTrace = bullettrace( myEye, myEye + anglestoforward( angles ) * 256, false, self ); - if ( DistanceSquared( self.origin, forwardTrace[ "position" ] ) < 96 * 96 && self.pers[ "bots" ][ "skill" ][ "base" ] > 3 ) + if ( distancesquared( self.origin, forwardTrace[ "position" ] ) < 96 * 96 && self.pers[ "bots" ][ "skill" ][ "base" ] > 3 ) { return; } - if ( !bulletTracePassed( forwardTrace[ "position" ], forwardTrace[ "position" ] + ( 0, 0, 2048 ), false, self ) && self.pers[ "bots" ][ "skill" ][ "base" ] > 3 ) + if ( !bullettracepassed( forwardTrace[ "position" ], forwardTrace[ "position" ] + ( 0, 0, 2048 ), false, self ) && self.pers[ "bots" ][ "skill" ][ "base" ] > 3 ) { return; } @@ -5383,7 +5383,7 @@ bot_killstreak_think_loop( data ) return; } - if ( randomInt( 100 ) < 80 && !self HasScriptGoal() && !self.bot_lock_goal ) + if ( randomint( 100 ) < 80 && !self HasScriptGoal() && !self.bot_lock_goal ) { self waittill_any_timeout( 15, "crate_physics_done", "new_goal" ); } @@ -5398,7 +5398,7 @@ bot_killstreak_think_loop( data ) return; } - if ( streakName == "nuke" && isDefined( level.nukeincoming ) ) + if ( streakName == "nuke" && isdefined( level.nukeincoming ) ) { return; } @@ -5413,7 +5413,7 @@ bot_killstreak_think_loop( data ) return; } - if ( streakName == "emp" && self.pers[ "bots" ][ "skill" ][ "base" ] > 3 && ( ( level.teambased && level.teamemped[ level.otherteam[ self.team ] ] ) || ( !level.teambased && isDefined( level.empplayer ) ) ) ) + if ( streakName == "emp" && self.pers[ "bots" ][ "skill" ][ "base" ] > 3 && ( ( level.teambased && level.teamemped[ level.otherteam[ self.team ] ] ) || ( !level.teambased && isdefined( level.empplayer ) ) ) ) { return; } @@ -5427,9 +5427,9 @@ bot_killstreak_think_loop( data ) case "stealth_airstrike": case "precision_airstrike": location = self getKillstreakTargetLocation(); - directionYaw = randomInt( 360 ); + directionYaw = randomint( 360 ); - if ( !isDefined( location ) ) + if ( !isdefined( location ) ) { return; } @@ -5448,7 +5448,7 @@ bot_killstreak_think_loop( data ) { wait 1; - if ( isDefined( location ) ) + if ( isdefined( location ) ) { self BotFreezeControls( true ); @@ -5475,7 +5475,7 @@ bot_killstreak_think() self endon( "death" ); level endon( "game_ended" ); - data = spawnStruct(); + data = spawnstruct(); data.dofastcontinue = false; for ( ;; ) @@ -5489,11 +5489,11 @@ bot_killstreak_think() */ BotRandomStance() { - if ( randomInt( 100 ) < 80 ) + if ( randomint( 100 ) < 80 ) { self BotSetStance( "prone" ); } - else if ( randomInt( 100 ) < 60 ) + else if ( randomint( 100 ) < 60 ) { self BotSetStance( "crouch" ); } @@ -5514,22 +5514,22 @@ BotUseRandomEquipment() nade = undefined; // in mw2, can only one of these... - if ( self GetAmmoCount( "claymore_mp" ) ) + if ( self getammocount( "claymore_mp" ) ) { nade = "claymore_mp"; } - if ( self GetAmmoCount( "flare_mp" ) ) + if ( self getammocount( "flare_mp" ) ) { nade = "flare_mp"; } - if ( self GetAmmoCount( "c4_mp" ) ) + if ( self getammocount( "c4_mp" ) ) { nade = "c4_mp"; } - if ( !isDefined( nade ) ) + if ( !isdefined( nade ) ) { return; } @@ -5550,7 +5550,7 @@ BotLookAtRandomThing( obj_target ) return; } - rand = RandomInt( 100 ); + rand = randomint( 100 ); nearestEnemy = undefined; @@ -5558,12 +5558,12 @@ BotLookAtRandomThing( obj_target ) { player = level.players[ i ]; - if ( !isDefined( player ) || !isDefined( player.team ) ) + if ( !isdefined( player ) || !isdefined( player.team ) ) { continue; } - if ( !isAlive( player ) ) + if ( !isalive( player ) ) { continue; } @@ -5573,29 +5573,29 @@ BotLookAtRandomThing( obj_target ) continue; } - if ( !isDefined( nearestEnemy ) || DistanceSquared( self.origin, player.origin ) < DistanceSquared( self.origin, nearestEnemy.origin ) ) + if ( !isdefined( nearestEnemy ) || distancesquared( self.origin, player.origin ) < distancesquared( self.origin, nearestEnemy.origin ) ) { nearestEnemy = player; } } - origin = ( 0, 0, self GetPlayerViewHeight() ); + origin = ( 0, 0, self getplayerviewheight() ); - if ( isDefined( nearestEnemy ) && DistanceSquared( self.origin, nearestEnemy.origin ) < 1024 * 1024 && rand < 40 ) + if ( isdefined( nearestEnemy ) && distancesquared( self.origin, nearestEnemy.origin ) < 1024 * 1024 && rand < 40 ) { origin += ( nearestEnemy.origin[ 0 ], nearestEnemy.origin[ 1 ], self.origin[ 2 ] ); } - else if ( isDefined( obj_target ) && rand < 50 ) + else if ( isdefined( obj_target ) && rand < 50 ) { origin += ( obj_target.origin[ 0 ], obj_target.origin[ 1 ], self.origin[ 2 ] ); } else if ( rand < 85 ) { - origin += self.origin + AnglesToForward( ( 0, self.angles[ 1 ] - 180, 0 ) ) * 1024; + origin += self.origin + anglestoforward( ( 0, self.angles[ 1 ] - 180, 0 ) ) * 1024; } else { - origin += self.origin + AnglesToForward( ( 0, RandomInt( 360 ), 0 ) ) * 1024; + origin += self.origin + anglestoforward( ( 0, randomint( 360 ), 0 ) ) * 1024; } self SetScriptAimPos( origin ); @@ -5613,27 +5613,27 @@ bot_do_random_action_for_objective( obj_target ) self notify( "bot_do_random_action_for_objective" ); self endon( "bot_do_random_action_for_objective" ); - if ( !isDefined( self.bot_random_obj_action ) ) + if ( !isdefined( self.bot_random_obj_action ) ) { self.bot_random_obj_action = true; - if ( randomInt( 100 ) < 80 ) + if ( randomint( 100 ) < 80 ) { self thread BotUseRandomEquipment(); } - if ( randomInt( 100 ) < 75 ) + if ( randomint( 100 ) < 75 ) { self thread BotLookAtRandomThing( obj_target ); } } else { - if ( self GetStance() != "prone" && randomInt( 100 ) < 15 ) + if ( self getstance() != "prone" && randomint( 100 ) < 15 ) { self BotSetStance( "prone" ); } - else if ( randomInt( 100 ) < 5 ) + else if ( randomint( 100 ) < 5 ) { self thread BotLookAtRandomThing( obj_target ); } @@ -5649,15 +5649,15 @@ bot_do_random_action_for_objective( obj_target ) bot_dom_spawn_kill_think_loop() { myTeam = self.pers[ "team" ]; - otherTeam = getOtherTeam( myTeam ); - myFlagCount = maps\mp\gametypes\dom::getTeamFlagCount( myTeam ); + otherTeam = getotherteam( myTeam ); + myFlagCount = maps\mp\gametypes\dom::getteamflagcount( myTeam ); if ( myFlagCount == level.flags.size ) { return; } - otherFlagCount = maps\mp\gametypes\dom::getTeamFlagCount( otherTeam ); + otherFlagCount = maps\mp\gametypes\dom::getteamflagcount( otherTeam ); if ( myFlagCount <= otherFlagCount || otherFlagCount != 1 ) { @@ -5668,7 +5668,7 @@ bot_dom_spawn_kill_think_loop() for ( i = 0; i < level.flags.size; i++ ) { - if ( level.flags[ i ] maps\mp\gametypes\dom::getFlagTeam() == myTeam ) + if ( level.flags[ i ] maps\mp\gametypes\dom::getflagteam() == myTeam ) { continue; } @@ -5676,12 +5676,12 @@ bot_dom_spawn_kill_think_loop() flag = level.flags[ i ]; } - if ( !isDefined( flag ) ) + if ( !isdefined( flag ) ) { return; } - if ( DistanceSquared( self.origin, flag.origin ) < 2048 * 2048 ) + if ( distancesquared( self.origin, flag.origin ) < 2048 * 2048 ) { return; } @@ -5746,7 +5746,7 @@ bot_dom_watch_flags( count, myTeam ) { wait 0.5; - if ( maps\mp\gametypes\dom::getTeamFlagCount( myTeam ) != count ) + if ( maps\mp\gametypes\dom::getteamflagcount( myTeam ) != count ) { break; } @@ -5765,7 +5765,7 @@ bot_dom_def_think_loop() for ( i = 0; i < level.flags.size; i++ ) { - if ( level.flags[ i ] maps\mp\gametypes\dom::getFlagTeam() != myTeam ) + if ( level.flags[ i ] maps\mp\gametypes\dom::getflagteam() != myTeam ) { continue; } @@ -5775,13 +5775,13 @@ bot_dom_def_think_loop() continue; } - if ( !isDefined( flag ) || DistanceSquared( self.origin, level.flags[ i ].origin ) < DistanceSquared( self.origin, flag.origin ) ) + if ( !isdefined( flag ) || distancesquared( self.origin, level.flags[ i ].origin ) < distancesquared( self.origin, flag.origin ) ) { flag = level.flags[ i ]; } } - if ( !isDefined( flag ) ) + if ( !isdefined( flag ) ) { return; } @@ -5847,12 +5847,12 @@ bot_dom_watch_for_flashing( flag, myTeam ) { wait 0.5; - if ( !isDefined( flag ) ) + if ( !isdefined( flag ) ) { break; } - if ( flag maps\mp\gametypes\dom::getFlagTeam() != myTeam || !flag.useobj.objpoints[ myTeam ].isflashing ) + if ( flag maps\mp\gametypes\dom::getflagteam() != myTeam || !flag.useobj.objpoints[ myTeam ].isflashing ) { break; } @@ -5867,18 +5867,18 @@ bot_dom_watch_for_flashing( flag, myTeam ) bot_dom_cap_think_loop() { myTeam = self.pers[ "team" ]; - otherTeam = getOtherTeam( myTeam ); + otherTeam = getotherteam( myTeam ); - myFlagCount = maps\mp\gametypes\dom::getTeamFlagCount( myTeam ); + myFlagCount = maps\mp\gametypes\dom::getteamflagcount( myTeam ); if ( myFlagCount == level.flags.size ) { return; } - otherFlagCount = maps\mp\gametypes\dom::getTeamFlagCount( otherTeam ); + otherFlagCount = maps\mp\gametypes\dom::getteamflagcount( otherTeam ); - if ( game[ "teamScores" ][ myteam ] >= game[ "teamScores" ][ otherTeam ] ) + if ( game[ "teamScores" ][ myTeam ] >= game[ "teamScores" ][ otherTeam ] ) { if ( myFlagCount < otherFlagCount ) { @@ -5908,7 +5908,7 @@ bot_dom_cap_think_loop() for ( i = 0; i < level.flags.size; i++ ) { - if ( level.flags[ i ] maps\mp\gametypes\dom::getFlagTeam() == myTeam ) + if ( level.flags[ i ] maps\mp\gametypes\dom::getflagteam() == myTeam ) { continue; } @@ -5916,11 +5916,11 @@ bot_dom_cap_think_loop() flags[ flags.size ] = level.flags[ i ]; } - if ( randomInt( 100 ) > 30 ) + if ( randomint( 100 ) > 30 ) { for ( i = 0; i < flags.size; i++ ) { - if ( !isDefined( flag ) || DistanceSquared( self.origin, level.flags[ i ].origin ) < DistanceSquared( self.origin, flag.origin ) ) + if ( !isdefined( flag ) || distancesquared( self.origin, level.flags[ i ].origin ) < distancesquared( self.origin, flag.origin ) ) { flag = level.flags[ i ]; } @@ -5931,7 +5931,7 @@ bot_dom_cap_think_loop() flag = random( flags ); } - if ( !isDefined( flag ) ) + if ( !isdefined( flag ) ) { return; } @@ -5941,7 +5941,7 @@ bot_dom_cap_think_loop() self.bot_lock_goal = true; self SetScriptGoal( flag.origin, 64 ); - self thread bot_dom_go_cap_flag( flag, myteam ); + self thread bot_dom_go_cap_flag( flag, myTeam ); event = self waittill_any_return( "goal", "bad_path", "new_goal" ); @@ -5960,7 +5960,7 @@ bot_dom_cap_think_loop() self SetScriptGoal( self.origin, 64 ); - while ( flag maps\mp\gametypes\dom::getFlagTeam() != myTeam && self isTouching( flag ) ) + while ( flag maps\mp\gametypes\dom::getflagteam() != myTeam && self istouching( flag ) ) { cur = flag.useobj.curprogress; wait 0.5; @@ -6002,7 +6002,7 @@ bot_dom_cap_think() continue; } - if ( !isDefined( level.flags ) || level.flags.size == 0 ) + if ( !isdefined( level.flags ) || level.flags.size == 0 ) { continue; } @@ -6014,7 +6014,7 @@ bot_dom_cap_think() /* Bot goes to the flag, watching while they don't have the flag */ -bot_dom_go_cap_flag( flag, myteam ) +bot_dom_go_cap_flag( flag, myTeam ) { self endon( "death" ); self endon( "disconnect" ); @@ -6026,23 +6026,23 @@ bot_dom_go_cap_flag( flag, myteam ) { wait randomintrange( 2, 4 ); - if ( !isDefined( flag ) ) + if ( !isdefined( flag ) ) { break; } - if ( flag maps\mp\gametypes\dom::getFlagTeam() == myTeam ) + if ( flag maps\mp\gametypes\dom::getflagteam() == myTeam ) { break; } - if ( self isTouching( flag ) ) + if ( self istouching( flag ) ) { break; } } - if ( flag maps\mp\gametypes\dom::getFlagTeam() == myTeam ) + if ( flag maps\mp\gametypes\dom::getflagteam() == myTeam ) { self notify( "bad_path" ); } @@ -6058,7 +6058,7 @@ bot_dom_go_cap_flag( flag, myteam ) bot_hq_loop() { myTeam = self.pers[ "team" ]; - otherTeam = getOtherTeam( myTeam ); + otherTeam = getotherteam( myTeam ); radio = level.radio; gameobj = radio.gameobject; @@ -6074,7 +6074,7 @@ bot_hq_loop() return; } - if ( DistanceSquared( origin, self.origin ) <= 1024 * 1024 ) + if ( distancesquared( origin, self.origin ) <= 1024 * 1024 ) { return; } @@ -6110,7 +6110,7 @@ bot_hq_loop() return; } - if ( !self isTouching( gameobj.trigger ) || level.radio != radio ) + if ( !self istouching( gameobj.trigger ) || level.radio != radio ) { self.bot_lock_goal = false; return; @@ -6120,7 +6120,7 @@ bot_hq_loop() self SetScriptGoal( self.origin, 64 ); - while ( self isTouching( gameobj.trigger ) && gameobj.ownerteam != myTeam && level.radio == radio ) + while ( self istouching( gameobj.trigger ) && gameobj.ownerteam != myTeam && level.radio == radio ) { cur = gameobj.curprogress; wait 0.5; @@ -6140,7 +6140,7 @@ bot_hq_loop() } else // we own it { - if ( gameobj.objpoints[ myteam ].isflashing ) // underattack + if ( gameobj.objpoints[ myTeam ].isflashing ) // underattack { self BotNotifyBotEvent( "hq", "start", "defend" ); @@ -6164,7 +6164,7 @@ bot_hq_loop() return; } - if ( DistanceSquared( origin, self.origin ) <= 1024 * 1024 ) + if ( distancesquared( origin, self.origin ) <= 1024 * 1024 ) { return; } @@ -6200,12 +6200,12 @@ bot_hq() continue; } - if ( !isDefined( level.radio ) ) + if ( !isdefined( level.radio ) ) { continue; } - if ( !isDefined( level.radio.gameobject ) ) + if ( !isdefined( level.radio.gameobject ) ) { continue; } @@ -6229,12 +6229,12 @@ bot_hq_go_cap( obj, radio ) { wait randomintrange( 2, 4 ); - if ( !isDefined( obj ) ) + if ( !isdefined( obj ) ) { break; } - if ( self isTouching( obj.trigger ) ) + if ( self istouching( obj.trigger ) ) { break; } @@ -6266,18 +6266,18 @@ bot_hq_watch_flashing( obj, radio ) self endon( "bad_path" ); self endon( "new_goal" ); - myteam = self.team; + myTeam = self.team; for ( ;; ) { wait 0.5; - if ( !isDefined( obj ) ) + if ( !isdefined( obj ) ) { break; } - if ( !obj.objpoints[ myteam ].isflashing ) + if ( !obj.objpoints[ myTeam ].isflashing ) { break; } @@ -6297,12 +6297,12 @@ bot_hq_watch_flashing( obj, radio ) bot_sab_loop() { myTeam = self.pers[ "team" ]; - otherTeam = getOtherTeam( myTeam ); + otherTeam = getotherteam( myTeam ); bomb = level.sabbomb; bombteam = bomb.ownerteam; carrier = bomb.carrier; - timeleft = maps\mp\gametypes\_gamelogic::getTimeRemaining() / 1000; + timeleft = maps\mp\gametypes\_gamelogic::gettimeremaining() / 1000; // the bomb is ours, we are on the offence if ( bombteam == myTeam ) @@ -6335,7 +6335,7 @@ bot_sab_loop() } // else hang around the site - if ( DistanceSquared( origin, self.origin ) <= 1024 * 1024 ) + if ( distancesquared( origin, self.origin ) <= 1024 * 1024 ) { return; } @@ -6363,7 +6363,7 @@ bot_sab_loop() origin = carrier.origin; - if ( DistanceSquared( origin, self.origin ) <= 1024 * 1024 ) + if ( distancesquared( origin, self.origin ) <= 1024 * 1024 ) { return; } @@ -6380,9 +6380,9 @@ bot_sab_loop() } // we are the carrier of the bomb, lets check if we need to plant - timepassed = getTimePassed() / 1000; + timepassed = gettimepassed() / 1000; - if ( timepassed < 120 && timeleft >= 90 && randomInt( 100 ) < 98 ) + if ( timepassed < 120 && timeleft >= 90 && randomint( 100 ) < 98 ) { return; } @@ -6400,7 +6400,7 @@ bot_sab_loop() self ClearScriptGoal(); } - if ( event != "goal" || level.bombplanted || !self isTouching( site.trigger ) || site IsInUse() || self inLastStand() || self HasThreat() ) + if ( event != "goal" || level.bombplanted || !self istouching( site.trigger ) || site isInUse() || self inLastStand() || self hasThreat() ) { self.bot_lock_goal = false; return; @@ -6423,9 +6423,9 @@ bot_sab_loop() } else if ( bombteam == otherTeam ) // the bomb is theirs, we are on the defense { - site = level.bombzones[ myteam ]; + site = level.bombzones[ myTeam ]; - if ( !isDefined( site.bots ) ) + if ( !isdefined( site.bots ) ) { site.bots = 0; } @@ -6434,14 +6434,14 @@ bot_sab_loop() if ( !level.bombplanted ) { // kill bomb carrier - if ( site.bots > 2 || randomInt( 100 ) < 45 ) + if ( site.bots > 2 || randomint( 100 ) < 45 ) { if ( self HasScriptGoal() ) { return; } - if ( carrier _hasPerk( "specialty_coldblooded" ) ) + if ( carrier _hasperk( "specialty_coldblooded" ) ) { return; } @@ -6486,7 +6486,7 @@ bot_sab_loop() } // else hang around the site - if ( DistanceSquared( origin, self.origin ) <= 1024 * 1024 ) + if ( distancesquared( origin, self.origin ) <= 1024 * 1024 ) { wait 4; self notify( "bot_inc_bots" ); @@ -6518,7 +6518,7 @@ bot_sab_loop() return; } - if ( DistanceSquared( origin, self.origin ) <= 1024 * 1024 ) + if ( distancesquared( origin, self.origin ) <= 1024 * 1024 ) { return; } @@ -6550,7 +6550,7 @@ bot_sab_loop() self ClearScriptGoal(); } - if ( event != "goal" || !level.bombplanted || site IsInUse() || !self isTouching( site.trigger ) || self InLastStand() || self HasThreat() ) + if ( event != "goal" || !level.bombplanted || site isInUse() || !self istouching( site.trigger ) || self inLastStand() || self hasThreat() ) { self.bot_lock_goal = false; return; @@ -6612,22 +6612,22 @@ bot_sab() { wait( randomintrange( 3, 5 ) ); - if ( self IsUsingRemote() || self.bot_lock_goal ) + if ( self isusingremote() || self.bot_lock_goal ) { continue; } - if ( !isDefined( level.sabbomb ) ) + if ( !isdefined( level.sabbomb ) ) { continue; } - if ( !isDefined( level.bombzones ) || !level.bombzones.size ) + if ( !isdefined( level.bombzones ) || !level.bombzones.size ) { continue; } - if ( self IsPlanting() || self isDefusing() ) + if ( self isPlanting() || self isDefusing() ) { continue; } @@ -6642,12 +6642,12 @@ bot_sab() bot_sd_defenders_loop( data ) { myTeam = self.pers[ "team" ]; - otherTeam = getOtherTeam( myTeam ); + otherTeam = getotherteam( myTeam ); // bomb not planted, lets protect our sites if ( !level.bombplanted ) { - timeleft = maps\mp\gametypes\_gamelogic::getTimeRemaining() / 1000; + timeleft = maps\mp\gametypes\_gamelogic::gettimeremaining() / 1000; if ( timeleft >= 90 ) { @@ -6655,12 +6655,12 @@ bot_sd_defenders_loop( data ) } // check for a bomb carrier, and camp the bomb - if ( !level.multibomb && isDefined( level.sdbomb ) ) + if ( !level.multibomb && isdefined( level.sdbomb ) ) { bomb = level.sdbomb; carrier = level.sdbomb.carrier; - if ( !isDefined( carrier ) ) + if ( !isdefined( carrier ) ) { origin = ( bomb.curorigin[ 0 ], bomb.curorigin[ 1 ], bomb.curorigin[ 2 ] + 5 ); @@ -6670,7 +6670,7 @@ bot_sd_defenders_loop( data ) return; } - if ( DistanceSquared( origin, self.origin ) <= 1024 * 1024 ) + if ( distancesquared( origin, self.origin ) <= 1024 * 1024 ) { return; } @@ -6689,7 +6689,7 @@ bot_sd_defenders_loop( data ) } // pick a site to protect - if ( !isDefined( level.bombzones ) || !level.bombzones.size ) + if ( !isdefined( level.bombzones ) || !level.bombzones.size ) { return; } @@ -6715,7 +6715,7 @@ bot_sd_defenders_loop( data ) site = random( sites ); } - if ( !isDefined( site ) ) + if ( !isdefined( site ) ) { return; } @@ -6743,7 +6743,7 @@ bot_sd_defenders_loop( data ) } // else hang around the site - if ( DistanceSquared( origin, self.origin ) <= 1024 * 1024 ) + if ( distancesquared( origin, self.origin ) <= 1024 * 1024 ) { return; } @@ -6761,14 +6761,14 @@ bot_sd_defenders_loop( data ) } // bomb is planted, we need to defuse - if ( !isDefined( level.defuseobject ) ) + if ( !isdefined( level.defuseobject ) ) { return; } defuse = level.defuseobject; - if ( !isDefined( defuse.bots ) ) + if ( !isdefined( defuse.bots ) ) { defuse.bots = 0; } @@ -6783,7 +6783,7 @@ bot_sd_defenders_loop( data ) return; } - if ( DistanceSquared( origin, self.origin ) <= 1024 * 1024 ) + if ( distancesquared( origin, self.origin ) <= 1024 * 1024 ) { return; } @@ -6814,7 +6814,7 @@ bot_sd_defenders_loop( data ) self ClearScriptGoal(); } - if ( event != "goal" || !level.bombplanted || defuse isInUse() || !self isTouching( defuse.trigger ) || self InLastStand() || self HasThreat() ) + if ( event != "goal" || !level.bombplanted || defuse isInUse() || !self istouching( defuse.trigger ) || self inLastStand() || self hasThreat() ) { self.bot_lock_goal = false; return; @@ -6855,19 +6855,19 @@ bot_sd_defenders() return; } - data = spawnStruct(); + data = spawnstruct(); data.rand = self BotGetRandom(); for ( ;; ) { wait( randomintrange( 3, 5 ) ); - if ( self IsUsingRemote() || self.bot_lock_goal ) + if ( self isusingremote() || self.bot_lock_goal ) { continue; } - if ( self IsPlanting() || self isDefusing() ) + if ( self isPlanting() || self isDefusing() ) { continue; } @@ -6890,18 +6890,18 @@ bot_sd_attackers_loop( data ) wait( randomintrange( 3, 5 ) ); } - if ( self IsUsingRemote() || self.bot_lock_goal ) + if ( self isusingremote() || self.bot_lock_goal ) { return; } myTeam = self.pers[ "team" ]; - otherTeam = getOtherTeam( myTeam ); + otherTeam = getotherteam( myTeam ); // bomb planted if ( level.bombplanted ) { - if ( !isDefined( level.defuseobject ) ) + if ( !isdefined( level.defuseobject ) ) { return; } @@ -6910,7 +6910,7 @@ bot_sd_attackers_loop( data ) origin = ( site.curorigin[ 0 ], site.curorigin[ 1 ], site.curorigin[ 2 ] + 5 ); - if ( site IsInUse() ) // somebody is defusing + if ( site isInUse() ) // somebody is defusing { self BotNotifyBotEvent( "sd", "start", "defuser" ); @@ -6932,7 +6932,7 @@ bot_sd_attackers_loop( data ) } // else hang around the site - if ( DistanceSquared( origin, self.origin ) <= 1024 * 1024 ) + if ( distancesquared( origin, self.origin ) <= 1024 * 1024 ) { return; } @@ -6949,13 +6949,13 @@ bot_sd_attackers_loop( data ) return; } - timeleft = maps\mp\gametypes\_gamelogic::getTimeRemaining() / 1000; - timepassed = getTimePassed() / 1000; + timeleft = maps\mp\gametypes\_gamelogic::gettimeremaining() / 1000; + timepassed = gettimepassed() / 1000; // dont have a bomb - if ( !self IsBombCarrier() && !level.multibomb ) + if ( !self isBombCarrier() && !level.multibomb ) { - if ( !isDefined( level.sdbomb ) ) + if ( !isdefined( level.sdbomb ) ) { return; } @@ -6964,7 +6964,7 @@ bot_sd_attackers_loop( data ) carrier = level.sdbomb.carrier; // bomb is picked up - if ( isDefined( carrier ) ) + if ( isdefined( carrier ) ) { // escort the bomb carrier if ( self HasScriptGoal() ) @@ -6974,7 +6974,7 @@ bot_sd_attackers_loop( data ) origin = carrier.origin; - if ( DistanceSquared( origin, self.origin ) <= 1024 * 1024 ) + if ( distancesquared( origin, self.origin ) <= 1024 * 1024 ) { return; } @@ -6990,7 +6990,7 @@ bot_sd_attackers_loop( data ) return; } - if ( !isDefined( bomb.bots ) ) + if ( !isdefined( bomb.bots ) ) { bomb.bots = 0; } @@ -7005,7 +7005,7 @@ bot_sd_attackers_loop( data ) return; } - if ( DistanceSquared( origin, self.origin ) <= 1024 * 1024 ) + if ( distancesquared( origin, self.origin ) <= 1024 * 1024 ) { return; } @@ -7042,12 +7042,12 @@ bot_sd_attackers_loop( data ) } // check if to plant - if ( timepassed < 120 && timeleft >= 90 && randomInt( 100 ) < 98 ) + if ( timepassed < 120 && timeleft >= 90 && randomint( 100 ) < 98 ) { return; } - if ( !isDefined( level.bombzones ) || !level.bombzones.size ) + if ( !isdefined( level.bombzones ) || !level.bombzones.size ) { return; } @@ -7073,7 +7073,7 @@ bot_sd_attackers_loop( data ) plant = random( sites ); } - if ( !isDefined( plant ) ) + if ( !isdefined( plant ) ) { return; } @@ -7093,7 +7093,7 @@ bot_sd_attackers_loop( data ) self ClearScriptGoal(); } - if ( event != "goal" || level.bombplanted || plant.visibleteam == "none" || !self isTouching( plant.trigger ) || self InLastStand() || self HasThreat() || plant IsInUse() ) + if ( event != "goal" || level.bombplanted || plant.visibleteam == "none" || !self istouching( plant.trigger ) || self inLastStand() || self hasThreat() || plant isInUse() ) { self.bot_lock_goal = false; return; @@ -7134,7 +7134,7 @@ bot_sd_attackers() return; } - data = spawnStruct(); + data = spawnstruct(); data.rand = self BotGetRandom(); data.first = true; @@ -7150,21 +7150,21 @@ bot_sd_attackers() bot_cap_loop() { myTeam = self.pers[ "team" ]; - otherTeam = getOtherTeam( myTeam ); + otherTeam = getotherteam( myTeam ); - myflag = level.teamflags[ myteam ]; - myzone = level.capzones[ myteam ]; + myflag = level.teamflags[ myTeam ]; + myzone = level.capzones[ myTeam ]; theirflag = level.teamflags[ otherTeam ]; theirzone = level.capzones[ otherTeam ]; - if ( !myflag maps\mp\gametypes\_gameobjects::isHome() ) + if ( !myflag maps\mp\gametypes\_gameobjects::ishome() ) { carrier = myflag.carrier; - if ( !isDefined( carrier ) ) // someone doesnt has our flag + if ( !isdefined( carrier ) ) // someone doesnt has our flag { - if ( !isDefined( theirflag.carrier ) && DistanceSquared( self.origin, theirflag.curorigin ) < DistanceSquared( self.origin, myflag.curorigin ) ) // no one has their flag and its closer + if ( !isdefined( theirflag.carrier ) && distancesquared( self.origin, theirflag.curorigin ) < distancesquared( self.origin, myflag.curorigin ) ) // no one has their flag and its closer { self BotNotifyBotEvent( "cap", "start", "their_flag", theirflag ); @@ -7185,7 +7185,7 @@ bot_cap_loop() } else { - if ( theirflag maps\mp\gametypes\_gameobjects::isHome() && randomint( 100 ) < 50 ) + if ( theirflag maps\mp\gametypes\_gameobjects::ishome() && randomint( 100 ) < 50 ) { // take their flag self BotNotifyBotEvent( "cap", "start", "their_flag", theirflag ); @@ -7201,17 +7201,17 @@ bot_cap_loop() return; } - if ( !isDefined( theirzone.bots ) ) + if ( !isdefined( theirzone.bots ) ) { theirzone.bots = 0; } origin = theirzone.curorigin; - if ( theirzone.bots > 2 || randomInt( 100 ) < 45 ) + if ( theirzone.bots > 2 || randomint( 100 ) < 45 ) { // kill carrier - if ( carrier _hasPerk( "specialty_coldblooded" ) ) + if ( carrier _hasperk( "specialty_coldblooded" ) ) { return; } @@ -7232,7 +7232,7 @@ bot_cap_loop() self thread bot_inc_bots( theirzone ); // camp their zone - if ( DistanceSquared( origin, self.origin ) <= 1024 * 1024 ) + if ( distancesquared( origin, self.origin ) <= 1024 * 1024 ) { wait 4; self notify( "bot_inc_bots" ); @@ -7281,7 +7281,7 @@ bot_cap_loop() carrier = theirflag.carrier; - if ( !isDefined( carrier ) ) // if no one has enemy flag + if ( !isdefined( carrier ) ) // if no one has enemy flag { self BotNotifyBotEvent( "cap", "start", "their_flag", theirflag ); @@ -7300,7 +7300,7 @@ bot_cap_loop() origin = carrier.origin; - if ( DistanceSquared( origin, self.origin ) <= 1024 * 1024 ) + if ( distancesquared( origin, self.origin ) <= 1024 * 1024 ) { return; } @@ -7333,17 +7333,17 @@ bot_cap() { wait( randomintrange( 3, 5 ) ); - if ( self IsUsingRemote() || self.bot_lock_goal ) + if ( self isusingremote() || self.bot_lock_goal ) { continue; } - if ( !isDefined( level.capzones ) ) + if ( !isdefined( level.capzones ) ) { continue; } - if ( !isDefined( level.teamflags ) ) + if ( !isdefined( level.teamflags ) ) { continue; } @@ -7359,9 +7359,9 @@ getCarrierEntNum() { carrierNum = -1; - if ( isDefined( self.carrier ) ) + if ( isdefined( self.carrier ) ) { - carrierNum = self.carrier getEntityNumber(); + carrierNum = self.carrier getentitynumber(); } return carrierNum; @@ -7397,7 +7397,7 @@ bot_cap_get_flag( flag ) self SetScriptGoal( self.origin, 64 ); curCarrier = flag getCarrierEntNum(); - while ( curCarrier == flag getCarrierEntNum() && self isTouching( flag.trigger ) ) + while ( curCarrier == flag getCarrierEntNum() && self istouching( flag.trigger ) ) { cur = flag.curprogress; wait 0.5; @@ -7434,7 +7434,7 @@ bot_dem_go_plant( plant ) break; } - if ( self isTouching( plant.trigger ) ) + if ( self istouching( plant.trigger ) ) { break; } @@ -7484,7 +7484,7 @@ bot_dem_attack_spawnkill() bot_dem_attackers_loop() { myTeam = self.pers[ "team" ]; - otherTeam = getOtherTeam( myTeam ); + otherTeam = getotherteam( myTeam ); bombs = []; // sites with bombs sites = []; // sites to bomb at @@ -7494,7 +7494,7 @@ bot_dem_attackers_loop() { bomb = level.bombzones[ i ]; - if ( isDefined( bomb.bombexploded ) && bomb.bombexploded ) + if ( isdefined( bomb.bombexploded ) && bomb.bombexploded ) { bombed++; continue; @@ -7529,30 +7529,30 @@ bot_dem_attackers_loop() } } - timeleft = maps\mp\gametypes\_gamelogic::getTimeRemaining() / 1000; + timeleft = maps\mp\gametypes\_gamelogic::gettimeremaining() / 1000; - shouldLet = ( game[ "teamScores" ][ myteam ] > game[ "teamScores" ][ otherTeam ] && timeleft < 90 && bombed == 1 ); + shouldLet = ( game[ "teamScores" ][ myTeam ] > game[ "teamScores" ][ otherTeam ] && timeleft < 90 && bombed == 1 ); // spawnkill conditions // if we have bombed one site or 1 bomb is planted with lots of time left, spawn kill // if we want the other team to win for overtime and they do not need to defuse, spawn kill - if ( ( ( bombed + bombs.size == 1 && timeleft >= 90 ) || ( shouldLet && !bombs.size ) ) && randomInt( 100 ) < 95 ) + if ( ( ( bombed + bombs.size == 1 && timeleft >= 90 ) || ( shouldLet && !bombs.size ) ) && randomint( 100 ) < 95 ) { if ( self HasScriptGoal() ) { return; } - spawnPoints = maps\mp\gametypes\_spawnlogic::getSpawnpointArray( "mp_dd_spawn_defender_start" ); + spawnPoints = maps\mp\gametypes\_spawnlogic::getspawnpointarray( "mp_dd_spawn_defender_start" ); if ( !spawnPoints.size ) { return; } - spawnpoint = maps\mp\gametypes\_spawnlogic::getSpawnpoint_Random( spawnPoints ); + spawnpoint = maps\mp\gametypes\_spawnlogic::getspawnpoint_random( spawnPoints ); - if ( DistanceSquared( spawnpoint.origin, self.origin ) <= 2048 * 2048 ) + if ( distancesquared( spawnpoint.origin, self.origin ) <= 2048 * 2048 ) { return; } @@ -7572,18 +7572,18 @@ bot_dem_attackers_loop() // let defuse conditions // if enemy is going to lose and lots of time left, let them defuse to play longer // or if want to go into overtime near end of the extended game - if ( ( ( bombs.size + bombed == 2 && timeleft >= 90 ) || ( shouldLet && bombs.size ) ) && randomInt( 100 ) < 95 ) + if ( ( ( bombs.size + bombed == 2 && timeleft >= 90 ) || ( shouldLet && bombs.size ) ) && randomint( 100 ) < 95 ) { - spawnPoints = maps\mp\gametypes\_spawnlogic::getSpawnpointArray( "mp_dd_spawn_attacker_start" ); + spawnPoints = maps\mp\gametypes\_spawnlogic::getspawnpointarray( "mp_dd_spawn_attacker_start" ); if ( !spawnPoints.size ) { return; } - spawnpoint = maps\mp\gametypes\_spawnlogic::getSpawnpoint_Random( spawnPoints ); + spawnpoint = maps\mp\gametypes\_spawnlogic::getspawnpoint_random( spawnPoints ); - if ( DistanceSquared( spawnpoint.origin, self.origin ) <= 1024 * 1024 ) + if ( distancesquared( spawnpoint.origin, self.origin ) <= 1024 * 1024 ) { return; } @@ -7602,12 +7602,12 @@ bot_dem_attackers_loop() // defend bomb conditions // if time is running out and we have a bomb planted - if ( bombs.size && timeleft < 90 && ( !sites.size || randomInt( 100 ) < 95 ) ) + if ( bombs.size && timeleft < 90 && ( !sites.size || randomint( 100 ) < 95 ) ) { site = self bot_array_nearest_curorigin( bombs ); origin = ( site.curorigin[ 0 ] + 50, site.curorigin[ 1 ] + 50, site.curorigin[ 2 ] + 5 ); - if ( site IsInUse() ) // somebody is defusing + if ( site isInUse() ) // somebody is defusing { self BotNotifyBotEvent( "dem", "start", "defuser", site ); @@ -7628,7 +7628,7 @@ bot_dem_attackers_loop() } // else hang around the site - if ( DistanceSquared( origin, self.origin ) <= 1024 * 1024 ) + if ( distancesquared( origin, self.origin ) <= 1024 * 1024 ) { return; } @@ -7653,12 +7653,12 @@ bot_dem_attackers_loop() plant = self bot_array_nearest_curorigin( sites ); - if ( !isDefined( plant ) ) + if ( !isdefined( plant ) ) { return; } - if ( !isDefined( plant.bots ) ) + if ( !isdefined( plant.bots ) ) { plant.bots = 0; } @@ -7673,7 +7673,7 @@ bot_dem_attackers_loop() return; } - if ( DistanceSquared( origin, self.origin ) <= 1024 * 1024 ) + if ( distancesquared( origin, self.origin ) <= 1024 * 1024 ) { return; } @@ -7704,7 +7704,7 @@ bot_dem_attackers_loop() self ClearScriptGoal(); } - if ( event != "goal" || ( plant.label == "_b" && level.bombbplanted ) || ( plant.label == "_a" && level.bombaplanted ) || plant IsInUse() || !self isTouching( plant.trigger ) || self InLastStand() || self HasThreat() ) + if ( event != "goal" || ( plant.label == "_b" && level.bombbplanted ) || ( plant.label == "_a" && level.bombaplanted ) || plant isInUse() || !self istouching( plant.trigger ) || self inLastStand() || self hasThreat() ) { self.bot_lock_goal = false; return; @@ -7750,12 +7750,12 @@ bot_dem_attackers() { wait( randomintrange( 3, 5 ) ); - if ( self IsUsingRemote() || self.bot_lock_goal ) + if ( self isusingremote() || self.bot_lock_goal ) { continue; } - if ( !isDefined( level.bombzones ) || !level.bombzones.size ) + if ( !isdefined( level.bombzones ) || !level.bombzones.size ) { continue; } @@ -7770,7 +7770,7 @@ bot_dem_attackers() bot_dem_defenders_loop() { myTeam = self.pers[ "team" ]; - otherTeam = getOtherTeam( myTeam ); + otherTeam = getotherteam( myTeam ); bombs = []; // sites with bombs sites = []; // sites to bomb at @@ -7780,7 +7780,7 @@ bot_dem_defenders_loop() { bomb = level.bombzones[ i ]; - if ( isDefined( bomb.bombexploded ) && bomb.bombexploded ) + if ( isdefined( bomb.bombexploded ) && bomb.bombexploded ) { bombed++; continue; @@ -7815,30 +7815,30 @@ bot_dem_defenders_loop() } } - timeleft = maps\mp\gametypes\_gamelogic::getTimeRemaining() / 1000; + timeleft = maps\mp\gametypes\_gamelogic::gettimeremaining() / 1000; - shouldLet = ( timeleft < 60 && ( ( bombed == 0 && bombs.size != 2 ) || ( game[ "teamScores" ][ myteam ] > game[ "teamScores" ][ otherTeam ] && bombed == 1 ) ) && randomInt( 100 ) < 98 ); + shouldLet = ( timeleft < 60 && ( ( bombed == 0 && bombs.size != 2 ) || ( game[ "teamScores" ][ myTeam ] > game[ "teamScores" ][ otherTeam ] && bombed == 1 ) ) && randomint( 100 ) < 98 ); // spawnkill conditions // if nothing to defuse with a lot of time left, spawn kill // or letting a bomb site to explode but a bomb is planted, so spawnkill - if ( ( !bombs.size && timeleft >= 60 && randomInt( 100 ) < 95 ) || ( shouldLet && bombs.size == 1 ) ) + if ( ( !bombs.size && timeleft >= 60 && randomint( 100 ) < 95 ) || ( shouldLet && bombs.size == 1 ) ) { if ( self HasScriptGoal() ) { return; } - spawnPoints = maps\mp\gametypes\_spawnlogic::getSpawnpointArray( "mp_dd_spawn_attacker_start" ); + spawnPoints = maps\mp\gametypes\_spawnlogic::getspawnpointarray( "mp_dd_spawn_attacker_start" ); if ( !spawnPoints.size ) { return; } - spawnpoint = maps\mp\gametypes\_spawnlogic::getSpawnpoint_Random( spawnPoints ); + spawnpoint = maps\mp\gametypes\_spawnlogic::getspawnpoint_random( spawnPoints ); - if ( DistanceSquared( spawnpoint.origin, self.origin ) <= 2048 * 2048 ) + if ( distancesquared( spawnpoint.origin, self.origin ) <= 2048 * 2048 ) { return; } @@ -7860,16 +7860,16 @@ bot_dem_defenders_loop() // or if want to go into overtime after extended game if ( shouldLet ) { - spawnPoints = maps\mp\gametypes\_spawnlogic::getSpawnpointArray( "mp_dd_spawn_defender_start" ); + spawnPoints = maps\mp\gametypes\_spawnlogic::getspawnpointarray( "mp_dd_spawn_defender_start" ); if ( !spawnPoints.size ) { return; } - spawnpoint = maps\mp\gametypes\_spawnlogic::getSpawnpoint_Random( spawnPoints ); + spawnpoint = maps\mp\gametypes\_spawnlogic::getspawnpoint_random( spawnPoints ); - if ( DistanceSquared( spawnpoint.origin, self.origin ) <= 1024 * 1024 ) + if ( distancesquared( spawnpoint.origin, self.origin ) <= 1024 * 1024 ) { return; } @@ -7888,12 +7888,12 @@ bot_dem_defenders_loop() // defend conditions // if no bombs planted with little time left - if ( !bombs.size && timeleft < 60 && randomInt( 100 ) < 95 && sites.size ) + if ( !bombs.size && timeleft < 60 && randomint( 100 ) < 95 && sites.size ) { site = self bot_array_nearest_curorigin( sites ); origin = ( site.curorigin[ 0 ] + 50, site.curorigin[ 1 ] + 50, site.curorigin[ 2 ] + 5 ); - if ( site IsInUse() ) // somebody is planting + if ( site isInUse() ) // somebody is planting { self BotNotifyBotEvent( "dem", "start", "planter", site ); @@ -7915,7 +7915,7 @@ bot_dem_defenders_loop() // else hang around the site - if ( DistanceSquared( origin, self.origin ) <= 1024 * 1024 ) + if ( distancesquared( origin, self.origin ) <= 1024 * 1024 ) { return; } @@ -7941,12 +7941,12 @@ bot_dem_defenders_loop() defuse = self bot_array_nearest_curorigin( bombs ); - if ( !isDefined( defuse ) ) + if ( !isdefined( defuse ) ) { return; } - if ( !isDefined( defuse.bots ) ) + if ( !isdefined( defuse.bots ) ) { defuse.bots = 0; } @@ -7961,7 +7961,7 @@ bot_dem_defenders_loop() return; } - if ( DistanceSquared( origin, self.origin ) <= 1024 * 1024 ) + if ( distancesquared( origin, self.origin ) <= 1024 * 1024 ) { return; } @@ -7993,7 +7993,7 @@ bot_dem_defenders_loop() self ClearScriptGoal(); } - if ( event != "goal" || ( defuse.label == "_b" && !level.bombbplanted ) || ( defuse.label == "_a" && !level.bombaplanted ) || defuse IsInUse() || !self isTouching( defuse.trigger ) || self InLastStand() || self HasThreat() ) + if ( event != "goal" || ( defuse.label == "_b" && !level.bombbplanted ) || ( defuse.label == "_a" && !level.bombaplanted ) || defuse isInUse() || !self istouching( defuse.trigger ) || self inLastStand() || self hasThreat() ) { self.bot_lock_goal = false; return; @@ -8039,12 +8039,12 @@ bot_dem_defenders() { wait( randomintrange( 3, 5 ) ); - if ( self IsUsingRemote() || self.bot_lock_goal ) + if ( self isusingremote() || self.bot_lock_goal ) { continue; } - if ( !isDefined( level.bombzones ) || !level.bombzones.size ) + if ( !isdefined( level.bombzones ) || !level.bombzones.size ) { continue; } @@ -8069,7 +8069,7 @@ bot_dem_go_defuse( defuse ) { wait 0.5; - if ( self isTouching( defuse.trigger ) ) + if ( self istouching( defuse.trigger ) ) { break; } @@ -8131,7 +8131,7 @@ bot_think_revive_loop() continue; } - if ( distanceSquared( self.origin, player.origin ) >= 2048 * 2048 ) + if ( distancesquared( self.origin, player.origin ) >= 2048 * 2048 ) { continue; } @@ -8164,7 +8164,7 @@ bot_think_revive_loop() self.bot_lock_goal = false; - if ( ret != "goal" || !isDefined( revive ) || distanceSquared( self.origin, revive.origin ) >= 100 * 100 || !revive inLastStand() || revive isBeingRevived() || !isAlive( revive ) ) + if ( ret != "goal" || !isdefined( revive ) || distancesquared( self.origin, revive.origin ) >= 100 * 100 || !revive inLastStand() || revive isBeingRevived() || !isalive( revive ) ) { return; } @@ -8211,7 +8211,7 @@ bot_think_revive() continue; } - if ( self IsUsingRemote() || self BotIsFrozen() ) + if ( self isusingremote() || self BotIsFrozen() ) { continue; } @@ -8230,12 +8230,12 @@ bot_think_revive() */ bot_gtnw_loop() { - myteam = self.team; - theirteam = getOtherTeam( myteam ); + myTeam = self.team; + theirteam = getotherteam( myTeam ); origin = level.nukesite.trigger.origin; trigger = level.nukesite.trigger; - ourCapCount = level.nukesite.touchlist[ myteam ]; + ourCapCount = level.nukesite.touchlist[ myTeam ]; theirCapCount = level.nukesite.touchlist[ theirteam ]; rand = self BotGetRandom(); @@ -8255,7 +8255,7 @@ bot_gtnw_loop() self ClearScriptGoal(); } - if ( ret != "goal" || !self isTouching( trigger ) ) + if ( ret != "goal" || !self istouching( trigger ) ) { self.bot_lock_goal = false; return; @@ -8265,7 +8265,7 @@ bot_gtnw_loop() self SetScriptGoal( self.origin, 64 ); - while ( self isTouching( trigger ) ) + while ( self istouching( trigger ) ) { cur = level.nukesite.curprogress; wait 0.5; @@ -8303,7 +8303,7 @@ bot_gtnw_loop() } // else hang around the site - if ( DistanceSquared( origin, self.origin ) <= 1024 * 1024 ) + if ( distancesquared( origin, self.origin ) <= 1024 * 1024 ) { return; } @@ -8337,12 +8337,12 @@ bot_gtnw() { wait( randomintrange( 3, 5 ) ); - if ( self IsUsingRemote() || self.bot_lock_goal ) + if ( self isusingremote() || self.bot_lock_goal ) { continue; } - if ( !isDefined( level.nukesite ) || !isDefined( level.nukesite.trigger ) ) + if ( !isdefined( level.nukesite ) || !isdefined( level.nukesite.trigger ) ) { continue; } @@ -8357,11 +8357,11 @@ bot_gtnw() bot_oneflag_loop() { myTeam = self.pers[ "team" ]; - otherTeam = getOtherTeam( myTeam ); + otherTeam = getotherteam( myTeam ); - if ( myteam == game[ "attackers" ] ) + if ( myTeam == game[ "attackers" ] ) { - myzone = level.capzones[ myteam ]; + myzone = level.capzones[ myTeam ]; theirflag = level.teamflags[ otherTeam ]; if ( self isFlagCarrier() ) @@ -8391,7 +8391,7 @@ bot_oneflag_loop() carrier = theirflag.carrier; - if ( !isDefined( carrier ) ) // if no one has enemy flag + if ( !isdefined( carrier ) ) // if no one has enemy flag { self BotNotifyBotEvent( "oneflag", "start", "their_flag" ); self bot_cap_get_flag( theirflag ); @@ -8408,7 +8408,7 @@ bot_oneflag_loop() origin = carrier.origin; - if ( DistanceSquared( origin, self.origin ) <= 1024 * 1024 ) + if ( distancesquared( origin, self.origin ) <= 1024 * 1024 ) { return; } @@ -8423,14 +8423,14 @@ bot_oneflag_loop() } else { - myflag = level.teamflags[ myteam ]; + myflag = level.teamflags[ myTeam ]; theirzone = level.capzones[ otherTeam ]; - if ( !myflag maps\mp\gametypes\_gameobjects::isHome() ) + if ( !myflag maps\mp\gametypes\_gameobjects::ishome() ) { carrier = myflag.carrier; - if ( !isDefined( carrier ) ) // someone doesnt has our flag + if ( !isdefined( carrier ) ) // someone doesnt has our flag { self BotNotifyBotEvent( "oneflag", "start", "my_flag" ); self bot_cap_get_flag( myflag ); @@ -8443,17 +8443,17 @@ bot_oneflag_loop() return; } - if ( !isDefined( theirzone.bots ) ) + if ( !isdefined( theirzone.bots ) ) { theirzone.bots = 0; } origin = theirzone.curorigin; - if ( theirzone.bots > 2 || randomInt( 100 ) < 45 ) + if ( theirzone.bots > 2 || randomint( 100 ) < 45 ) { // kill carrier - if ( carrier _hasPerk( "specialty_coldblooded" ) ) + if ( carrier _hasperk( "specialty_coldblooded" ) ) { return; } @@ -8474,7 +8474,7 @@ bot_oneflag_loop() self thread bot_inc_bots( theirzone ); // camp their zone - if ( DistanceSquared( origin, self.origin ) <= 1024 * 1024 ) + if ( distancesquared( origin, self.origin ) <= 1024 * 1024 ) { wait 4; self notify( "bot_inc_bots" ); @@ -8501,7 +8501,7 @@ bot_oneflag_loop() origin = myflag.curorigin; - if ( DistanceSquared( origin, self.origin ) <= 1024 * 1024 ) + if ( distancesquared( origin, self.origin ) <= 1024 * 1024 ) { return; } @@ -8535,12 +8535,12 @@ bot_oneflag() { wait( randomintrange( 3, 5 ) ); - if ( self IsUsingRemote() || self.bot_lock_goal ) + if ( self isusingremote() || self.bot_lock_goal ) { continue; } - if ( !isDefined( level.capzones ) || !isDefined( level.teamflags ) ) + if ( !isdefined( level.capzones ) || !isdefined( level.teamflags ) ) { continue; } @@ -8569,7 +8569,7 @@ bot_arena_loop() self ClearScriptGoal(); } - if ( event != "goal" || !self isTouching( flag.trigger ) ) + if ( event != "goal" || !self istouching( flag.trigger ) ) { self.bot_lock_goal = false; return; @@ -8579,7 +8579,7 @@ bot_arena_loop() self SetScriptGoal( self.origin, 64 ); - while ( self isTouching( flag.trigger ) && flag.ownerteam != myTeam ) + while ( self istouching( flag.trigger ) && flag.ownerteam != myTeam ) { cur = flag.curprogress; wait 0.5; @@ -8616,12 +8616,12 @@ bot_arena() { wait( randomintrange( 3, 5 ) ); - if ( self IsUsingRemote() || self.bot_lock_goal ) + if ( self isusingremote() || self.bot_lock_goal ) { continue; } - if ( !isDefined( level.arenaflag ) ) + if ( !isdefined( level.arenaflag ) ) { continue; } @@ -8647,12 +8647,12 @@ bot_vip_loop() { player = level.players[ i ]; - if ( !isReallyAlive( player ) ) + if ( !isreallyalive( player ) ) { continue; } - if ( isDefined( player.isvip ) && player.isvip ) + if ( isdefined( player.isvip ) && player.isvip ) { vip = player; } @@ -8660,9 +8660,9 @@ bot_vip_loop() if ( self.team == game[ "defenders" ] ) { - if ( isDefined( self.isvip ) && self.isvip ) + if ( isdefined( self.isvip ) && self.isvip ) { - if ( isDefined( level.extractionzone ) && !isDefined( level.extractiontime ) ) + if ( isdefined( level.extractionzone ) && !isdefined( level.extractiontime ) ) { // go to extraction zone self BotNotifyBotEvent( "vip", "start", "cap" ); @@ -8684,10 +8684,10 @@ bot_vip_loop() self BotNotifyBotEvent( "vip", "stop", "cap" ); } } - else if ( isDefined( vip ) ) + else if ( isdefined( vip ) ) { // protect the vip - if ( DistanceSquared( vip.origin, self.origin ) <= 1024 * 1024 ) + if ( distancesquared( vip.origin, self.origin ) <= 1024 * 1024 ) { return; } @@ -8702,10 +8702,10 @@ bot_vip_loop() } else { - if ( isDefined( level.extractionzone ) && !isDefined( level.extractiontime ) && self BotGetRandom() < 65 ) + if ( isdefined( level.extractionzone ) && !isdefined( level.extractiontime ) && self BotGetRandom() < 65 ) { // camp the extraction zone - if ( DistanceSquared( level.extractionzone.trigger.origin, self.origin ) <= 1024 * 1024 ) + if ( distancesquared( level.extractionzone.trigger.origin, self.origin ) <= 1024 * 1024 ) { return; } @@ -8717,7 +8717,7 @@ bot_vip_loop() self ClearScriptGoal(); } } - else if ( isDefined( vip ) ) + else if ( isdefined( vip ) ) { // kill the vip self SetScriptGoal( vip.origin, 32 ); @@ -8748,7 +8748,7 @@ bot_vip() { wait( randomintrange( 3, 5 ) ); - if ( self IsUsingRemote() || self.bot_lock_goal ) + if ( self isusingremote() || self.bot_lock_goal ) { continue; } diff --git a/maps/mp/bots/_bot_utility.gsc b/maps/mp/bots/_bot_utility.gsc index a93e13f..04551fb 100644 --- a/maps/mp/bots/_bot_utility.gsc +++ b/maps/mp/bots/_bot_utility.gsc @@ -7,7 +7,7 @@ Notes for engine obv the old bot behavior should be changed to use gsc built-ins to control bots bots using objects needs to be fixed - setSpawnWeapon and switchToWeapon should be modified to work for testclients + setSpawnWeapon and switchtoweapon should be modified to work for testclients */ #include common_scripts\utility; @@ -21,7 +21,7 @@ wait_for_builtins() { for ( i = 0; i < 20; i++ ) { - if ( isDefined( level.bot_builtins ) ) + if ( isdefined( level.bot_builtins ) ) { return true; } @@ -44,7 +44,7 @@ wait_for_builtins() */ BotBuiltinPrintConsole( s ) { - if ( isDefined( level.bot_builtins ) && isDefined( level.bot_builtins[ "printconsole" ] ) ) + if ( isdefined( level.bot_builtins ) && isdefined( level.bot_builtins[ "printconsole" ] ) ) { [[ level.bot_builtins[ "printconsole" ] ]]( s ); } @@ -55,7 +55,7 @@ BotBuiltinPrintConsole( s ) */ BotBuiltinFileWrite( file, contents, mode ) { - if ( isDefined( level.bot_builtins ) && isDefined( level.bot_builtins[ "filewrite" ] ) ) + if ( isdefined( level.bot_builtins ) && isdefined( level.bot_builtins[ "filewrite" ] ) ) { [[ level.bot_builtins[ "filewrite" ] ]]( file, contents, mode ); } @@ -66,7 +66,7 @@ BotBuiltinFileWrite( file, contents, mode ) */ BotBuiltinFileRead( file ) { - if ( isDefined( level.bot_builtins ) && isDefined( level.bot_builtins[ "fileread" ] ) ) + if ( isdefined( level.bot_builtins ) && isdefined( level.bot_builtins[ "fileread" ] ) ) { return [[ level.bot_builtins[ "fileread" ] ]]( file ); } @@ -79,7 +79,7 @@ BotBuiltinFileRead( file ) */ BotBuiltinFileExists( file ) { - if ( isDefined( level.bot_builtins ) && isDefined( level.bot_builtins[ "fileexists" ] ) ) + if ( isdefined( level.bot_builtins ) && isdefined( level.bot_builtins[ "fileexists" ] ) ) { return [[ level.bot_builtins[ "fileexists" ] ]]( file ); } @@ -89,11 +89,11 @@ BotBuiltinFileExists( file ) /* Bot action, does a bot action - botAction() + botaction() */ BotBuiltinBotAction( action ) { - if ( isDefined( level.bot_builtins ) && isDefined( level.bot_builtins[ "botaction" ] ) ) + if ( isdefined( level.bot_builtins ) && isdefined( level.bot_builtins[ "botaction" ] ) ) { self [[ level.bot_builtins[ "botaction" ] ]]( action ); } @@ -101,11 +101,11 @@ BotBuiltinBotAction( action ) /* Clears the bot from movement and actions - botStop() + botstop() */ BotBuiltinBotStop() { - if ( isDefined( level.bot_builtins ) && isDefined( level.bot_builtins[ "botstop" ] ) ) + if ( isdefined( level.bot_builtins ) && isdefined( level.bot_builtins[ "botstop" ] ) ) { self [[ level.bot_builtins[ "botstop" ] ]](); } @@ -113,11 +113,11 @@ BotBuiltinBotStop() /* Sets the bot's movement - botMovement(, ) + botmovement(, ) */ BotBuiltinBotMovement( forward, right ) { - if ( isDefined( level.bot_builtins ) && isDefined( level.bot_builtins[ "botmovement" ] ) ) + if ( isdefined( level.bot_builtins ) && isdefined( level.bot_builtins[ "botmovement" ] ) ) { self [[ level.bot_builtins[ "botmovement" ] ]]( forward, right ); } @@ -128,7 +128,7 @@ BotBuiltinBotMovement( forward, right ) */ BotBuiltinBotMeleeParams( yaw, dist ) { - if ( isDefined( level.bot_builtins ) && isDefined( level.bot_builtins[ "botmeleeparams" ] ) ) + if ( isdefined( level.bot_builtins ) && isdefined( level.bot_builtins[ "botmeleeparams" ] ) ) { self [[ level.bot_builtins[ "botmeleeparams" ] ]]( yaw, dist ); } @@ -139,7 +139,7 @@ BotBuiltinBotMeleeParams( yaw, dist ) */ is_host() { - return ( isDefined( self.pers[ "bot_host" ] ) && self.pers[ "bot_host" ] ); + return ( isdefined( self.pers[ "bot_host" ] ) && self.pers[ "bot_host" ] ); } /* @@ -156,22 +156,22 @@ doHostCheck() result = false; - if ( getDvar( "bots_main_firstIsHost" ) != "0" ) + if ( getdvar( "bots_main_firstIsHost" ) != "0" ) { BotBuiltinPrintConsole( "WARNING: bots_main_firstIsHost is enabled" ); - if ( getDvar( "bots_main_firstIsHost" ) == "1" ) + if ( getdvar( "bots_main_firstIsHost" ) == "1" ) { - setDvar( "bots_main_firstIsHost", self getguid() ); + setdvar( "bots_main_firstIsHost", self getguid() ); } - if ( getDvar( "bots_main_firstIsHost" ) == self getguid() + "" ) + if ( getdvar( "bots_main_firstIsHost" ) == self getguid() + "" ) { result = true; } } - DvarGUID = getDvar( "bots_main_GUIDs" ); + DvarGUID = getdvar( "bots_main_GUIDs" ); if ( DvarGUID != "" ) { @@ -186,7 +186,7 @@ doHostCheck() } } - if ( !self isHost() && !result ) + if ( !self ishost() && !result ) { return; } @@ -199,10 +199,10 @@ doHostCheck() */ is_bot() { - assert( isDefined( self ) ); - assert( isPlayer( self ) ); + assert( isdefined( self ) ); + assert( isplayer( self ) ); - return ( ( isDefined( self.pers[ "isBot" ] ) && self.pers[ "isBot" ] ) || ( isDefined( self.pers[ "isBotWarfare" ] ) && self.pers[ "isBotWarfare" ] ) || isSubStr( self getguid() + "", "bot" ) ); + return ( ( isdefined( self.pers[ "isBot" ] ) && self.pers[ "isBot" ] ) || ( isdefined( self.pers[ "isBotWarfare" ] ) && self.pers[ "isBotWarfare" ] ) || issubstr( self getguid() + "", "bot" ) ); } /* @@ -245,9 +245,9 @@ BotPressSmoke( time ) /* Bot will press the ads button for the time */ -BotPressADS( time ) +BotpressADS( time ) { - self maps\mp\bots\_bot_internal::pressAds( time ); + self maps\mp\bots\_bot_internal::pressADS( time ); } /* @@ -271,7 +271,7 @@ BotPressAttack( time ) */ BotGetTargetRandom() { - if ( !isDefined( self.bot.target ) ) + if ( !isdefined( self.bot.target ) ) { return undefined; } @@ -375,7 +375,7 @@ BotNotifyBotEvent( msg, a, b, c, d, e, f, g ) */ HasScriptGoal() { - return ( isDefined( self GetScriptGoal() ) ); + return ( isdefined( self GetScriptGoal() ) ); } /* @@ -383,7 +383,7 @@ HasScriptGoal() */ SetScriptGoal( goal, dist ) { - if ( !isDefined( dist ) ) + if ( !isdefined( dist ) ) { dist = 16; } @@ -416,7 +416,7 @@ ClearScriptGoal() */ HasBotJavelinLocation() { - return isDefined( self.bot.jav_loc ); + return isdefined( self.bot.jav_loc ); } /* @@ -474,7 +474,7 @@ GetScriptAimPos() */ HasScriptAimPos() { - return isDefined( self GetScriptAimPos() ); + return isdefined( self GetScriptAimPos() ); } /* @@ -497,7 +497,7 @@ ClearBotJavelinLocation() /* Sets the bot's target to be this ent. */ -SetAttacker( att ) +setAttacker( att ) { self.bot.target_this_frame = att; } @@ -522,7 +522,7 @@ ClearScriptEnemy() /* Returns the entity of the bot's target. */ -GetThreat() +getThreat() { if ( !isdefined( self.bot.target ) ) { @@ -537,23 +537,23 @@ GetThreat() */ HasScriptEnemy() { - return ( isDefined( self.bot.script_target ) ); + return ( isdefined( self.bot.script_target ) ); } /* Returns if the bot has a threat. */ -HasThreat() +hasThreat() { - return ( isDefined( self GetThreat() ) ); + return ( isdefined( self getThreat() ) ); } /* If the player is defusing */ -IsDefusing() +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,13 +609,13 @@ inFinalStand() */ isFlagCarrier() { - return ( isDefined( self.carryflag ) && self.carryflag ); + return ( isdefined( self.carryflag ) && self.carryflag ); } /* Returns if we are stunned. */ -IsStunned() +isStunned() { 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 ); } /* @@ -639,12 +639,12 @@ getValidTube() { weap = weaps[ i ]; - if ( !self getAmmoCount( weap ) ) + if ( !self getammocount( weap ) ) { continue; } - if ( ( isSubStr( weap, "gl_" ) && !isSubStr( weap, "_gl_" ) ) || weap == "m79_mp" ) + if ( ( issubstr( weap, "gl_" ) && !issubstr( weap, "_gl_" ) ) || weap == "m79_mp" ) { return weap; } @@ -658,9 +658,9 @@ getValidTube() */ allowClassChoiceUtil() { - entry = tableLookup( "mp/gametypesTable.csv", 0, level.gametype, 4 ); + entry = tablelookup( "mp/gametypesTable.csv", 0, level.gametype, 4 ); - if ( !isDefined( entry ) || entry == "" ) + if ( !isdefined( entry ) || entry == "" ) { return true; } @@ -673,9 +673,9 @@ allowClassChoiceUtil() */ allowTeamChoiceUtil() { - entry = tableLookup( "mp/gametypesTable.csv", 0, level.gametype, 5 ); + entry = tablelookup( "mp/gametypesTable.csv", 0, level.gametype, 5 ); - if ( !isDefined( entry ) || entry == "" ) + if ( !isdefined( entry ) || entry == "" ) { return true; } @@ -698,7 +698,7 @@ waittill_either_return_( str1, str2 ) */ waittill_either_return( str1, str2 ) { - if ( !isDefined( self waittill_either_return_( str1, str2 ) ) ) + if ( !isdefined( self waittill_either_return_( str1, str2 ) ) ) { return str1; } @@ -723,12 +723,12 @@ getValidGrenade() for ( i = 0; i < grenadeTypes.size; i++ ) { - if ( !self hasWeapon( grenadeTypes[ i ] ) ) + if ( !self hasweapon( grenadeTypes[ i ] ) ) { continue; } - if ( !self getAmmoCount( grenadeTypes[ i ] ) ) + if ( !self getammocount( grenadeTypes[ i ] ) ) { continue; } @@ -744,7 +744,7 @@ getValidGrenade() */ isWeaponPrimary( weap ) { - return ( maps\mp\gametypes\_weapons::isPrimaryWeapon( weap ) || maps\mp\gametypes\_weapons::isAltModeWeapon( weap ) ); + return ( maps\mp\gametypes\_weapons::isprimaryweapon( weap ) || maps\mp\gametypes\_weapons::isaltmodeweapon( weap ) ); } /* @@ -762,10 +762,10 @@ WeaponIsFullAuto( weap ) { weaptoks = strtok( weap, "_" ); - assert( isDefined( weaptoks[ 0 ] ) ); - assert( isString( weaptoks[ 0 ] ) ); + assert( isdefined( weaptoks[ 0 ] ) ); + assert( isstring( weaptoks[ 0 ] ) ); - return isDefined( level.bots_fullautoguns[ weaptoks[ 0 ] ] ); + return isdefined( level.bots_fullautoguns[ weaptoks[ 0 ] ] ); } /* @@ -781,7 +781,7 @@ isSecondaryGrenade( gnade ) */ isWeaponDroppable( weap ) { - return ( maps\mp\gametypes\_weapons::mayDropWeapon( weap ) ); + return ( maps\mp\gametypes\_weapons::maydropweapon( weap ) ); } /* @@ -800,7 +800,7 @@ getBotToKick() { bots = getBotArray(); - if ( !isDefined( bots ) || !isDefined( bots.size ) || bots.size <= 0 || !isDefined( bots[ 0 ] ) ) + if ( !isdefined( bots ) || !isdefined( bots.size ) || bots.size <= 0 || !isdefined( bots[ 0 ] ) ) { return undefined; } @@ -808,14 +808,14 @@ getBotToKick() tokick = undefined; axis = 0; allies = 0; - team = getDvar( "bots_team" ); + team = getdvar( "bots_team" ); // count teams for ( i = 0; i < bots.size; i++ ) { bot = bots[ i ]; - if ( !isDefined( bot ) || !isDefined( bot.team ) ) + if ( !isdefined( bot ) || !isdefined( bot.team ) ) { continue; } @@ -859,7 +859,7 @@ getBotToKick() { bot = bots[ i ]; - if ( !isDefined( bot ) || !isDefined( bot.team ) ) + if ( !isdefined( bot ) || !isdefined( bot.team ) ) { continue; } @@ -869,12 +869,12 @@ getBotToKick() continue; } - if ( !isDefined( bot.pers ) || !isDefined( bot.pers[ "bots" ] ) || !isDefined( bot.pers[ "bots" ][ "skill" ] ) || !isDefined( bot.pers[ "bots" ][ "skill" ][ "base" ] ) ) + if ( !isdefined( bot.pers ) || !isdefined( bot.pers[ "bots" ] ) || !isdefined( bot.pers[ "bots" ][ "skill" ] ) || !isdefined( bot.pers[ "bots" ][ "skill" ][ "base" ] ) ) { continue; } - if ( isDefined( tokick ) && bot.pers[ "bots" ][ "skill" ][ "base" ] > tokick.pers[ "bots" ][ "skill" ][ "base" ] ) + if ( isdefined( tokick ) && bot.pers[ "bots" ][ "skill" ][ "base" ] > tokick.pers[ "bots" ][ "skill" ][ "base" ] ) { continue; } @@ -882,7 +882,7 @@ getBotToKick() tokick = bot; } - if ( isDefined( tokick ) ) + if ( isdefined( tokick ) ) { return tokick; } @@ -892,17 +892,17 @@ getBotToKick() { bot = bots[ i ]; - if ( !isDefined( bot ) || !isDefined( bot.team ) ) + if ( !isdefined( bot ) || !isdefined( bot.team ) ) { continue; } - if ( !isDefined( bot.pers ) || !isDefined( bot.pers[ "bots" ] ) || !isDefined( bot.pers[ "bots" ][ "skill" ] ) || !isDefined( bot.pers[ "bots" ][ "skill" ][ "base" ] ) ) + if ( !isdefined( bot.pers ) || !isdefined( bot.pers[ "bots" ] ) || !isdefined( bot.pers[ "bots" ][ "skill" ] ) || !isdefined( bot.pers[ "bots" ][ "skill" ][ "base" ] ) ) { continue; } - if ( isDefined( tokick ) && bot.pers[ "bots" ][ "skill" ][ "base" ] > tokick.pers[ "bots" ][ "skill" ][ "base" ] ) + if ( isdefined( tokick ) && bot.pers[ "bots" ][ "skill" ][ "base" ] > tokick.pers[ "bots" ][ "skill" ][ "base" ] ) { continue; } @@ -940,16 +940,16 @@ bot_wait_for_host() { host = undefined; - while ( !isDefined( level ) || !isDefined( level.players ) ) + while ( !isdefined( level ) || !isdefined( level.players ) ) { wait 0.05; } - for ( i = getDvarFloat( "bots_main_waitForHostTime" ); i > 0; i -= 0.05 ) + for ( i = getdvarfloat( "bots_main_waitForHostTime" ); i > 0; i -= 0.05 ) { host = GetHostPlayer(); - if ( isDefined( host ) ) + if ( isdefined( host ) ) { break; } @@ -957,14 +957,14 @@ bot_wait_for_host() wait 0.05; } - if ( !isDefined( host ) ) + if ( !isdefined( host ) ) { return; } - for ( i = getDvarFloat( "bots_main_waitForHostTime" ); i > 0; i -= 0.05 ) + for ( i = getdvarfloat( "bots_main_waitForHostTime" ); i > 0; i -= 0.05 ) { - if ( IsDefined( host.pers[ "team" ] ) ) + if ( isdefined( host.pers[ "team" ] ) ) { break; } @@ -972,12 +972,12 @@ bot_wait_for_host() wait 0.05; } - if ( !IsDefined( host.pers[ "team" ] ) ) + if ( !isdefined( host.pers[ "team" ] ) ) { return; } - for ( i = getDvarFloat( "bots_main_waitForHostTime" ); i > 0; i -= 0.05 ) + for ( i = getdvarfloat( "bots_main_waitForHostTime" ); i > 0; i -= 0.05 ) { if ( host.pers[ "team" ] == "allies" || host.pers[ "team" ] == "axis" ) { @@ -997,12 +997,12 @@ RaySphereIntersect( start, end, spherePos, radius ) // check if the start or end points are in the sphere r2 = radius * radius; - if ( DistanceSquared( start, spherePos ) < r2 ) + if ( distancesquared( start, spherePos ) < r2 ) { return true; } - if ( DistanceSquared( end, spherePos ) < r2 ) + if ( distancesquared( end, spherePos ) < r2 ) { return true; } @@ -1029,15 +1029,15 @@ RaySphereIntersect( start, end, spherePos, radius ) ip1 = start + mu1 * dp; // ip2 = start + mu2 * dp; - myDist = DistanceSquared( start, end ); + myDist = distancesquared( start, end ); // check if both intersection points far - if ( DistanceSquared( start, ip1 ) > myDist/* && DistanceSquared(start, ip2) > myDist*/ ) + if ( distancesquared( start, ip1 ) > myDist/* && distancesquared(start, ip2) > myDist*/ ) { return false; } - dpAngles = VectorToAngles( dp ); + dpAngles = vectortoangles( dp ); // check if the point is behind us if ( getConeDot( ip1, start, dpAngles ) < 0/* || getConeDot(ip2, start, dpAngles) < 0*/ ) @@ -1078,20 +1078,20 @@ SmokeTrace( start, end, rad ) */ getConeDot( to, from, dir ) { - dirToTarget = VectorNormalize( to - from ); - forward = AnglesToForward( dir ); + dirToTarget = vectornormalize( to - from ); + forward = anglestoforward( dir ); return vectordot( dirToTarget, forward ); } /* Returns the distance squared in a 2d space */ -DistanceSquared2D( to, from ) +distancesquared2D( to, from ) { to = ( to[ 0 ], to[ 1 ], 0 ); from = ( from[ 0 ], from[ 1 ], 0 ); - return DistanceSquared( to, from ); + return distancesquared( to, from ); } /* @@ -1125,7 +1125,7 @@ float_old( num ) { setdvar( "temp_dvar_bot_util", num ); - return GetDvarFloat( "temp_dvar_bot_util" ); + return getdvarfloat( "temp_dvar_bot_util" ); } /* @@ -1133,7 +1133,7 @@ float_old( num ) */ isStrStart( string1, subStr ) { - return ( getSubStr( string1, 0, subStr.size ) == subStr ); + return ( getsubstr( string1, 0, subStr.size ) == subStr ); } /* @@ -1141,7 +1141,7 @@ isStrStart( string1, subStr ) */ parseTokensIntoWaypoint( tokens ) { - waypoint = spawnStruct(); + waypoint = spawnstruct(); orgStr = tokens[ 0 ]; orgToks = strtok( orgStr, " " ); @@ -1161,7 +1161,7 @@ parseTokensIntoWaypoint( tokens ) anglesStr = tokens[ 3 ]; - if ( isDefined( anglesStr ) && anglesStr != "" ) + if ( isdefined( anglesStr ) && anglesStr != "" ) { anglesToks = strtok( anglesStr, " " ); @@ -1173,7 +1173,7 @@ parseTokensIntoWaypoint( tokens ) javStr = tokens[ 4 ]; - if ( isDefined( javStr ) && javStr != "" ) + if ( isdefined( javStr ) && javStr != "" ) { javToks = strtok( javStr, " " ); @@ -1192,7 +1192,7 @@ parseTokensIntoWaypoint( tokens ) getWaypointLinesFromFile( filename ) { // Create a structure to store the result, including an array to hold individual lines. - result = spawnStruct(); + result = spawnstruct(); result.lines = []; // Read the entire content of the file into the 'waypointStr' variable. @@ -1200,7 +1200,7 @@ getWaypointLinesFromFile( filename ) waypointStr = BotBuiltinFileRead( filename ); // If the file is empty or not defined, return the empty result structure. - if ( !isDefined( waypointStr ) ) + if ( !isdefined( waypointStr ) ) { return result; } @@ -1215,8 +1215,8 @@ getWaypointLinesFromFile( filename ) // Check for newline characters '\n' or '\r'. if ( waypointStr[ i ] == "\n" || waypointStr[ i ] == "\r" ) { - // Extract the current line using 'getSubStr' and store it in the result array. - result.lines[ result.lines.size ] = getSubStr( waypointStr, linestart, linestart + linecount ); + // Extract the current line using 'getsubstr' and store it in the result array. + result.lines[ result.lines.size ] = getsubstr( waypointStr, linestart, linestart + linecount ); // If the newline is '\r\n', skip the next character. if ( waypointStr[ i ] == "\r" && i < waypointStr.size - 1 && waypointStr[ i + 1 ] == "\n" ) @@ -1235,7 +1235,7 @@ getWaypointLinesFromFile( filename ) } // Store the last line (or the only line if there are no newline characters) in the result array. - result.lines[ result.lines.size ] = getSubStr( waypointStr, linestart, linestart + linecount ); + result.lines[ result.lines.size ] = getsubstr( waypointStr, linestart, linestart + linecount ); // Return the result structure containing the array of extracted lines. return result; @@ -1287,12 +1287,12 @@ load_waypoints() level.waypointusage[ "allies" ] = []; level.waypointusage[ "axis" ] = []; - if ( !isDefined( level.waypoints ) ) + if ( !isdefined( level.waypoints ) ) { level.waypoints = []; } - mapname = getDvar( "mapname" ); + mapname = getdvar( "mapname" ); wps = readWpsFromFile( mapname ); @@ -1325,17 +1325,17 @@ load_waypoints() for ( i = 0; i < level.waypointcount; i++ ) { - if ( !isDefined( level.waypoints[ i ].children ) || !isDefined( level.waypoints[ i ].children.size ) ) + if ( !isdefined( level.waypoints[ i ].children ) || !isdefined( level.waypoints[ i ].children.size ) ) { level.waypoints[ i ].children = []; } - if ( !isDefined( level.waypoints[ i ].origin ) ) + if ( !isdefined( level.waypoints[ i ].origin ) ) { level.waypoints[ i ].origin = ( 0, 0, 0 ); } - if ( !isDefined( level.waypoints[ i ].type ) ) + if ( !isdefined( level.waypoints[ i ].type ) ) { level.waypoints[ i ].type = "crouch"; } @@ -1355,7 +1355,7 @@ nearAnyOfWaypoints( dist, waypoints ) { waypoint = level.waypoints[ waypoints[ i ] ]; - if ( DistanceSquared( waypoint.origin, self.origin ) > dist ) + if ( distancesquared( waypoint.origin, self.origin ) > dist ) { continue; } @@ -1379,7 +1379,7 @@ waypointsNear( waypoints, dist ) { wp = level.waypoints[ waypoints[ i ] ]; - if ( DistanceSquared( wp.origin, self.origin ) > dist ) + if ( distancesquared( wp.origin, self.origin ) > dist ) { continue; } @@ -1401,9 +1401,9 @@ getNearestWaypointOfWaypoints( waypoints ) for ( i = 0; i < waypoints.size; i++ ) { waypoint = level.waypoints[ waypoints[ i ] ]; - thisDist = DistanceSquared( self.origin, waypoint.origin ); + thisDist = distancesquared( self.origin, waypoint.origin ); - if ( isDefined( answer ) && thisDist > closestDist ) + if ( isdefined( answer ) && thisDist > closestDist ) { continue; } @@ -1454,7 +1454,7 @@ getWaypointsOfType( type ) */ getWaypointForIndex( i ) { - if ( !isDefined( i ) ) + if ( !isdefined( i ) ) { return undefined; } @@ -2021,7 +2021,7 @@ _WaypointsToKDTree( waypoints, dem ) */ List() { - list = spawnStruct(); + list = spawnstruct(); list.count = 0; list.data = []; @@ -2079,7 +2079,7 @@ ListRemove( thing ) */ KDTree() { - kdTree = spawnStruct(); + kdTree = spawnstruct(); kdTree.root = undefined; kdTree.count = 0; @@ -2099,9 +2099,9 @@ KDTreeInsert( data ) // as long as what you insert has a .origin attru, it will */ _KDTreeInsert( node, data, dem, x0, y0, z0, x1, y1, z1 ) { - if ( !isDefined( node ) ) + if ( !isdefined( node ) ) { - r = spawnStruct(); + r = spawnstruct(); r.data = data; r.left = undefined; r.right = undefined; @@ -2164,12 +2164,12 @@ _KDTreeInsert( node, data, dem, x0, y0, z0, x1, y1, z1 ) */ KDTreeNearest( origin ) { - if ( !isDefined( self.root ) ) + if ( !isdefined( self.root ) ) { return undefined; } - return self _KDTreeNearest( self.root, origin, self.root.data, DistanceSquared( self.root.data.origin, origin ), 0 ); + return self _KDTreeNearest( self.root, origin, self.root.data, distancesquared( self.root.data.origin, origin ), 0 ); } /* @@ -2177,12 +2177,12 @@ KDTreeNearest( origin ) */ _KDTreeNearest( node, point, closest, closestdist, dem ) { - if ( !isDefined( node ) ) + if ( !isdefined( node ) ) { return closest; } - thisDis = DistanceSquared( node.data.origin, point ); + thisDis = distancesquared( node.data.origin, point ); if ( thisDis < closestdist ) { @@ -2190,7 +2190,7 @@ _KDTreeNearest( node, point, closest, closestdist, dem ) closest = node.data; } - if ( node RectDistanceSquared( point ) < closestdist ) + if ( node Rectdistancesquared( point ) < closestdist ) { near = node.left; far = node.right; @@ -2203,7 +2203,7 @@ _KDTreeNearest( node, point, closest, closestdist, dem ) closest = self _KDTreeNearest( near, point, closest, closestdist, ( dem + 1 ) % 3 ); - closest = self _KDTreeNearest( far, point, closest, DistanceSquared( closest.origin, point ), ( dem + 1 ) % 3 ); + closest = self _KDTreeNearest( far, point, closest, distancesquared( closest.origin, point ), ( dem + 1 ) % 3 ); } return closest; @@ -2212,7 +2212,7 @@ _KDTreeNearest( node, point, closest, closestdist, dem ) /* Called on a rectangle, returns the distance from origin to the rectangle. */ -RectDistanceSquared( origin ) +Rectdistancesquared( origin ) { dx = 0; dy = 0; @@ -2310,7 +2310,7 @@ HeapTraceFraction( item, item2 ) */ NewHeap( compare ) { - heap_node = spawnStruct(); + heap_node = spawnstruct(); heap_node.data = []; heap_node.compare = compare; @@ -2425,12 +2425,12 @@ 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; } @@ -2446,19 +2446,19 @@ RemoveWaypointUsage( wp, team ) /* Will linearly search for the nearest waypoint to pos that has a direct line of sight. */ -GetNearestWaypointWithSight( pos ) +getNearestWaypointWithSight( pos ) { candidate = undefined; dist = 2147483647; for ( i = 0; i < level.waypointcount; i++ ) { - if ( !bulletTracePassed( pos + ( 0, 0, 15 ), level.waypoints[ i ].origin + ( 0, 0, 15 ), false, undefined ) ) + if ( !bullettracepassed( pos + ( 0, 0, 15 ), level.waypoints[ i ].origin + ( 0, 0, 15 ), false, undefined ) ) { continue; } - curdis = DistanceSquared( level.waypoints[ i ].origin, pos ); + curdis = distancesquared( level.waypoints[ i ].origin, pos ); if ( curdis > dist ) { @@ -2475,14 +2475,14 @@ GetNearestWaypointWithSight( pos ) /* Will linearly search for the nearest waypoint */ -GetNearestWaypoint( pos ) +getNearestWaypoint( pos ) { candidate = undefined; dist = 2147483647; for ( i = 0; i < level.waypointcount; i++ ) { - curdis = DistanceSquared( level.waypoints[ i ].origin, pos ); + curdis = distancesquared( level.waypoints[ i ].origin, pos ); if ( curdis > dist ) { @@ -2510,19 +2510,19 @@ AStarSearch( start, goal, team, greedy_path ) startWp = getNearestWaypoint( start ); - if ( !isDefined( startWp ) ) + if ( !isdefined( startWp ) ) { return []; } _startwp = undefined; - if ( !bulletTracePassed( start + ( 0, 0, 15 ), level.waypoints[ startWp ].origin + ( 0, 0, 15 ), false, undefined ) ) + if ( !bullettracepassed( start + ( 0, 0, 15 ), level.waypoints[ startWp ].origin + ( 0, 0, 15 ), false, undefined ) ) { - _startwp = GetNearestWaypointWithSight( start ); + _startwp = getNearestWaypointWithSight( start ); } - if ( isDefined( _startwp ) ) + if ( isdefined( _startwp ) ) { startWp = _startwp; } @@ -2530,27 +2530,27 @@ AStarSearch( start, goal, team, greedy_path ) goalWp = getNearestWaypoint( goal ); - if ( !isDefined( goalWp ) ) + if ( !isdefined( goalWp ) ) { return []; } - _goalWp = undefined; + _goalwp = undefined; - if ( !bulletTracePassed( goal + ( 0, 0, 15 ), level.waypoints[ goalWp ].origin + ( 0, 0, 15 ), false, undefined ) ) + if ( !bullettracepassed( goal + ( 0, 0, 15 ), level.waypoints[ goalWp ].origin + ( 0, 0, 15 ), false, undefined ) ) { - _goalwp = GetNearestWaypointWithSight( goal ); + _goalwp = getNearestWaypointWithSight( goal ); } - if ( isDefined( _goalwp ) ) + if ( isdefined( _goalwp ) ) { goalWp = _goalwp; } - node = spawnStruct(); + node = spawnstruct(); node.g = 0; // path dist so far - node.h = DistanceSquared( level.waypoints[ startWp ].origin, level.waypoints[ goalWp ].origin ); // herustic, distance to goal for path finding + node.h = distancesquared( level.waypoints[ startWp ].origin, level.waypoints[ goalWp ].origin ); // herustic, distance to goal for path finding node.f = node.h + node.g; // combine path dist and heru, use reverse heap to sort the priority queue by this attru node.index = startWp; node.parent = undefined; // we are start, so we have no parent @@ -2573,11 +2573,11 @@ AStarSearch( start, goal, team, greedy_path ) { path = []; - while ( isDefined( bestNode ) ) + 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; } @@ -2602,11 +2602,11 @@ 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 } @@ -2624,17 +2624,17 @@ AStarSearch( start, goal, team, greedy_path ) } // calc the total path we have took - newg = bestNode.g + DistanceSquared( wp.origin, childWp.origin ) * penalty; // bots on same team's path are more expensive + newg = bestNode.g + distancesquared( wp.origin, childWp.origin ) * penalty; // bots on same team's path are more expensive // check if this child is in open or close with a g value less than newg - inopen = isDefined( openset[ child + "" ] ); + inopen = isdefined( openset[ child + "" ] ); if ( inopen && openset[ child + "" ].g <= newg ) { continue; } - inclosed = isDefined( closed[ child + "" ] ); + inclosed = isdefined( closed[ child + "" ] ); if ( inclosed && closed[ child + "" ].g <= newg ) { @@ -2653,12 +2653,12 @@ AStarSearch( start, goal, team, greedy_path ) } else { - node = spawnStruct(); + node = spawnstruct(); } node.parent = bestNode; node.g = newg; - node.h = DistanceSquared( childWp.origin, level.waypoints[ goalWp ].origin ); + node.h = distancesquared( childWp.origin, level.waypoints[ goalWp ].origin ); node.f = node.g + node.h; node.index = child; @@ -2721,7 +2721,7 @@ array_std_deviation( array, mean ) total = total + tmp[ i ]; } - return Sqrt( total / array.size ); + return sqrt( total / array.size ); } /* @@ -2737,21 +2737,21 @@ random_normal_distribution( mean, std_deviation, lower_bound, upper_bound ) while ( w >= 1 ) { - x1 = 2 * RandomFloatRange( 0, 1 ) - 1; - x2 = 2 * RandomFloatRange( 0, 1 ) - 1; + x1 = 2 * randomfloatrange( 0, 1 ) - 1; + x2 = 2 * randomfloatrange( 0, 1 ) - 1; w = x1 * x1 + x2 * x2; } - w = Sqrt( ( -2.0 * Log( w ) ) / w ); + w = sqrt( ( -2.0 * log( w ) ) / w ); y1 = x1 * w; number = mean + y1 * std_deviation; - if ( IsDefined( lower_bound ) && number < lower_bound ) + if ( isdefined( lower_bound ) && number < lower_bound ) { number = lower_bound; } - if ( IsDefined( upper_bound ) && number > upper_bound ) + if ( isdefined( upper_bound ) && number > upper_bound ) { number = upper_bound; } @@ -2765,10 +2765,10 @@ random_normal_distribution( mean, std_deviation, lower_bound, upper_bound ) onUsePlantObjectFix( player ) { // planted the bomb - if ( !self maps\mp\gametypes\_gameobjects::isFriendlyTeam( player.pers[ "team" ] ) ) + if ( !self maps\mp\gametypes\_gameobjects::isfriendlyteam( player.pers[ "team" ] ) ) { level thread bombPlantedFix( self, player ); - // player logString( "bomb planted: " + self.label ); + // player logstring( "bomb planted: " + self.label ); // disable all bomb zones except this one for ( index = 0; index < level.bombzones.size; index++ ) @@ -2778,26 +2778,26 @@ onUsePlantObjectFix( player ) continue; } - level.bombzones[ index ] maps\mp\gametypes\_gameobjects::disableObject(); + level.bombzones[ index ] maps\mp\gametypes\_gameobjects::disableobject(); } - player playSound( "mp_bomb_plant" ); + player playsound( "mp_bomb_plant" ); player notify ( "bomb_planted" ); // if ( !level.hardcoremode ) - // iPrintLn( &"MP_EXPLOSIVES_PLANTED_BY", player ); + // iprintln( &"MP_EXPLOSIVES_PLANTED_BY", player ); - leaderDialog( "bomb_planted" ); + leaderdialog( "bomb_planted" ); - level thread teamPlayerCardSplash( "callout_bombplanted", player ); + level thread teamplayercardsplash( "callout_bombplanted", 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(); - maps\mp\gametypes\_gamescore::givePlayerScore( "plant", player ); - player incPlayerStat( "bombsplanted", 1 ); - player thread maps\mp\_matchdata::logGameEvent( "plant", player.origin ); + 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(); + maps\mp\gametypes\_gamescore::giveplayerscore( "plant", player ); + player incplayerstat( "bombsplanted", 1 ); + player thread maps\mp\_matchdata::loggameevent( "plant", player.origin ); } } @@ -2806,82 +2806,81 @@ onUsePlantObjectFix( player ) */ bombPlantedFix( destroyedObj, player ) { - maps\mp\gametypes\_gamelogic::pauseTimer(); + maps\mp\gametypes\_gamelogic::pausetimer(); level.bombplanted = true; - destroyedObj.visuals[ 0 ] thread maps\mp\gametypes\_gamelogic::playTickingSound(); + destroyedObj.visuals[ 0 ] thread maps\mp\gametypes\_gamelogic::playtickingsound(); level.tickingobject = destroyedObj.visuals[ 0 ]; level.timelimitoverride = true; - setGameEndTime( int( gettime() + ( level.bombtimer * 1000 ) ) ); - setDvar( "ui_bomb_timer", 1 ); + setgameendtime( int( gettime() + ( level.bombtimer * 1000 ) ) ); + setdvar( "ui_bomb_timer", 1 ); 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.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(); } } - trace = bulletTrace( player.origin + ( 0, 0, 20 ), player.origin - ( 0, 0, 2000 ), false, player ); + trace = bullettrace( player.origin + ( 0, 0, 20 ), player.origin - ( 0, 0, 2000 ), false, player ); tempAngle = randomfloat( 360 ); forward = ( cos( tempAngle ), sin( tempAngle ), 0 ); - forward = vectornormalize( forward - common_scripts\utility::vector_multiply( trace[ "normal" ], vectordot( forward, trace[ "normal" ] ) ) ); + forward = vectornormalize( forward - 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 setmodel( "prop_suitcase_bomb" ); } - destroyedObj maps\mp\gametypes\_gameobjects::allowUse( "none" ); - destroyedObj maps\mp\gametypes\_gameobjects::setVisibleTeam( "none" ); + destroyedObj maps\mp\gametypes\_gameobjects::allowuse( "none" ); + destroyedObj maps\mp\gametypes\_gameobjects::setvisibleteam( "none" ); /* - destroyedObj maps\mp\gametypes\_gameobjects::set2DIcon( "friendly", undefined ); - destroyedObj maps\mp\gametypes\_gameobjects::set2DIcon( "enemy", undefined ); - destroyedObj maps\mp\gametypes\_gameobjects::set3DIcon( "friendly", undefined ); - destroyedObj maps\mp\gametypes\_gameobjects::set3DIcon( "enemy", undefined ); + destroyedObj maps\mp\gametypes\_gameobjects::set2dicon( "friendly", undefined ); + destroyedObj maps\mp\gametypes\_gameobjects::set2dicon( "enemy", undefined ); + destroyedObj maps\mp\gametypes\_gameobjects::set3dicon( "friendly", undefined ); + destroyedObj maps\mp\gametypes\_gameobjects::set3dicon( "enemy", undefined ); */ - label = destroyedObj maps\mp\gametypes\_gameobjects::getLabel(); + label = destroyedObj maps\mp\gametypes\_gameobjects::getlabel(); // create a new object to defuse with. 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::setUseText( &"MP_DEFUSING_EXPLOSIVE" ); - defuseObject maps\mp\gametypes\_gameobjects::setUseHintText( &"PLATFORM_HOLD_TO_DEFUSE_EXPLOSIVES" ); - defuseObject maps\mp\gametypes\_gameobjects::setVisibleTeam( "any" ); - defuseObject maps\mp\gametypes\_gameobjects::set2DIcon( "friendly", "waypoint_defuse" + label ); - defuseObject maps\mp\gametypes\_gameobjects::set2DIcon( "enemy", "waypoint_defend" + label ); - defuseObject maps\mp\gametypes\_gameobjects::set3DIcon( "friendly", "waypoint_defuse" + label ); - defuseObject maps\mp\gametypes\_gameobjects::set3DIcon( "enemy", "waypoint_defend" + label ); + 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::setusetext( &"MP_DEFUSING_EXPLOSIVE" ); + defuseObject maps\mp\gametypes\_gameobjects::setusehinttext( &"PLATFORM_HOLD_TO_DEFUSE_EXPLOSIVES" ); + defuseObject maps\mp\gametypes\_gameobjects::setvisibleteam( "any" ); + defuseObject maps\mp\gametypes\_gameobjects::set2dicon( "friendly", "waypoint_defuse" + label ); + defuseObject maps\mp\gametypes\_gameobjects::set2dicon( "enemy", "waypoint_defend" + label ); + 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.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; - maps\mp\gametypes\sd::BombTimerWait(); - setDvar( "ui_bomb_timer", 0 ); + maps\mp\gametypes\sd::bombtimerwait(); + setdvar( "ui_bomb_timer", 0 ); - destroyedObj.visuals[ 0 ] maps\mp\gametypes\_gamelogic::stopTickingSound(); + destroyedObj.visuals[ 0 ] maps\mp\gametypes\_gamelogic::stoptickingsound(); if ( level.gameended || level.bombdefused ) { @@ -2895,40 +2894,40 @@ bombPlantedFix( destroyedObj, player ) if ( isdefined( player ) ) { - destroyedObj.visuals[ 0 ] radiusDamage( explosionOrigin, 512, 200, 20, player ); - player incPlayerStat( "targetsdestroyed", 1 ); + destroyedObj.visuals[ 0 ] radiusdamage( explosionOrigin, 512, 200, 20, player ); + player incplayerstat( "targetsdestroyed", 1 ); } else { - destroyedObj.visuals[ 0 ] radiusDamage( explosionOrigin, 512, 200, 20 ); + destroyedObj.visuals[ 0 ] radiusdamage( explosionOrigin, 512, 200, 20 ); } rot = randomfloat( 360 ); - explosionEffect = spawnFx( level._effect[ "bombexplosion" ], explosionOrigin + ( 0, 0, 50 ), ( 0, 0, 1 ), ( cos( rot ), sin( rot ), 0 ) ); - triggerFx( explosionEffect ); + explosionEffect = spawnfx( level._effect[ "bombexplosion" ], explosionOrigin + ( 0, 0, 50 ), ( 0, 0, 1 ), ( cos( rot ), sin( rot ), 0 ) ); + triggerfx( explosionEffect ); - PlayRumbleOnPosition( "grenade_rumble", explosionOrigin ); + playrumbleonposition( "grenade_rumble", explosionOrigin ); earthquake( 0.75, 2.0, explosionOrigin, 2000 ); - thread playSoundinSpace( "exp_suitcase_bomb_main", explosionOrigin ); + thread playsoundinspace( "exp_suitcase_bomb_main", explosionOrigin ); - if ( isDefined( destroyedObj.exploderindex ) ) + if ( isdefined( destroyedObj.exploderindex ) ) { exploder( destroyedObj.exploderindex ); } 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(); + defuseObject maps\mp\gametypes\_gameobjects::disableobject(); - setGameEndTime( 0 ); + setgameendtime( 0 ); wait 3; - maps\mp\gametypes\sd::sd_endGame( game[ "attackers" ], game[ "strings" ][ "target_destroyed" ] ); + maps\mp\gametypes\sd::sd_endgame( game[ "attackers" ], game[ "strings" ][ "target_destroyed" ] ); } @@ -2939,24 +2938,24 @@ botGiveLoadout( team, class, allowCopycat ) { self endon( "death" ); - self takeAllWeapons(); + self takeallweapons(); primaryIndex = 0; // initialize specialty array self.specialty = []; - if ( !isDefined( allowCopycat ) ) + if ( !isdefined( allowCopycat ) ) { allowCopycat = true; } primaryWeapon = undefined; - if ( isDefined( self.pers[ "copyCatLoadout" ] ) && self.pers[ "copyCatLoadout" ][ "inUse" ] && allowCopycat ) + if ( isdefined( self.pers[ "copyCatLoadout" ] ) && self.pers[ "copyCatLoadout" ][ "inUse" ] && allowCopycat ) { - self maps\mp\gametypes\_class::setClass( "copycat" ); - self.class_num = maps\mp\gametypes\_class::getClassIndex( "copycat" ); + self maps\mp\gametypes\_class::setclass( "copycat" ); + self.class_num = maps\mp\gametypes\_class::getclassindex( "copycat" ); clonedLoadout = self.pers[ "copyCatLoadout" ]; @@ -2975,47 +2974,47 @@ botGiveLoadout( team, class, allowCopycat ) loadoutOffhand = clonedLoadout[ "loadoutOffhand" ]; loadoutDeathStreak = "specialty_copycat"; } - else if ( isSubstr( class, "custom" ) ) + else if ( issubstr( class, "custom" ) ) { - class_num = maps\mp\gametypes\_class::getClassIndex( class ); + class_num = maps\mp\gametypes\_class::getclassindex( class ); self.class_num = class_num; - loadoutPrimary = maps\mp\gametypes\_class::cac_getWeapon( class_num, 0 ); - loadoutPrimaryAttachment = maps\mp\gametypes\_class::cac_getWeaponAttachment( class_num, 0 ); - loadoutPrimaryAttachment2 = maps\mp\gametypes\_class::cac_getWeaponAttachmentTwo( class_num, 0 ); - loadoutPrimaryCamo = maps\mp\gametypes\_class::cac_getWeaponCamo( class_num, 0 ); - loadoutSecondaryCamo = maps\mp\gametypes\_class::cac_getWeaponCamo( class_num, 1 ); - loadoutSecondary = maps\mp\gametypes\_class::cac_getWeapon( class_num, 1 ); - loadoutSecondaryAttachment = maps\mp\gametypes\_class::cac_getWeaponAttachment( class_num, 1 ); - loadoutSecondaryAttachment2 = maps\mp\gametypes\_class::cac_getWeaponAttachmentTwo( class_num, 1 ); - loadoutSecondaryCamo = maps\mp\gametypes\_class::cac_getWeaponCamo( class_num, 1 ); - loadoutEquipment = maps\mp\gametypes\_class::cac_getPerk( class_num, 0 ); - loadoutPerk1 = maps\mp\gametypes\_class::cac_getPerk( class_num, 1 ); - loadoutPerk2 = maps\mp\gametypes\_class::cac_getPerk( class_num, 2 ); - loadoutPerk3 = maps\mp\gametypes\_class::cac_getPerk( class_num, 3 ); - loadoutOffhand = maps\mp\gametypes\_class::cac_getOffhand( class_num ); - loadoutDeathStreak = maps\mp\gametypes\_class::cac_getDeathstreak( class_num ); + loadoutPrimary = maps\mp\gametypes\_class::cac_getweapon( class_num, 0 ); + loadoutPrimaryAttachment = maps\mp\gametypes\_class::cac_getweaponattachment( class_num, 0 ); + loadoutPrimaryAttachment2 = maps\mp\gametypes\_class::cac_getweaponattachmenttwo( class_num, 0 ); + loadoutPrimaryCamo = maps\mp\gametypes\_class::cac_getweaponcamo( class_num, 0 ); + loadoutSecondaryCamo = maps\mp\gametypes\_class::cac_getweaponcamo( class_num, 1 ); + loadoutSecondary = maps\mp\gametypes\_class::cac_getweapon( class_num, 1 ); + loadoutSecondaryAttachment = maps\mp\gametypes\_class::cac_getweaponattachment( class_num, 1 ); + loadoutSecondaryAttachment2 = maps\mp\gametypes\_class::cac_getweaponattachmenttwo( class_num, 1 ); + loadoutSecondaryCamo = maps\mp\gametypes\_class::cac_getweaponcamo( class_num, 1 ); + loadoutEquipment = maps\mp\gametypes\_class::cac_getperk( class_num, 0 ); + loadoutPerk1 = maps\mp\gametypes\_class::cac_getperk( class_num, 1 ); + loadoutPerk2 = maps\mp\gametypes\_class::cac_getperk( class_num, 2 ); + loadoutPerk3 = maps\mp\gametypes\_class::cac_getperk( class_num, 3 ); + loadoutOffhand = maps\mp\gametypes\_class::cac_getoffhand( class_num ); + loadoutDeathStreak = maps\mp\gametypes\_class::cac_getdeathstreak( class_num ); } else { - class_num = maps\mp\gametypes\_class::getClassIndex( class ); + 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,17 +3025,17 @@ 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"; // stop default class op'ness - allowOp = ( getDvarInt( "bots_loadout_allow_op" ) >= 1 ); + allowOp = ( getdvarint( "bots_loadout_allow_op" ) >= 1 ); if ( !allowOp ) { - loadoutDeathstreak = "specialty_null"; + loadoutDeathStreak = "specialty_null"; if ( loadoutPrimary == "riotshield" ) { @@ -3067,7 +3066,7 @@ botGiveLoadout( team, class, allowCopycat ) if ( level.killstreakrewards ) { - if ( getDvarInt( "scr_classic" ) == 1 ) + if ( getdvarint( "scr_classic" ) == 1 ) { loadoutKillstreak1 = "uav"; loadoutKillstreak2 = "precision_airstrike"; @@ -3075,9 +3074,9 @@ botGiveLoadout( team, class, allowCopycat ) } else { - loadoutKillstreak1 = self getPlayerData( "killstreaks", 0 ); - loadoutKillstreak2 = self getPlayerData( "killstreaks", 1 ); - loadoutKillstreak3 = self getPlayerData( "killstreaks", 2 ); + loadoutKillstreak1 = self getplayerdata( "killstreaks", 0 ); + loadoutKillstreak2 = self getplayerdata( "killstreaks", 1 ); + loadoutKillstreak3 = self getplayerdata( "killstreaks", 2 ); } } else @@ -3087,37 +3086,37 @@ botGiveLoadout( team, class, allowCopycat ) loadoutKillstreak3 = "none"; } - secondaryName = maps\mp\gametypes\_class::buildWeaponName( loadoutSecondary, loadoutSecondaryAttachment, loadoutSecondaryAttachment2 ); - self _giveWeapon( secondaryName, int( tableLookup( "mp/camoTable.csv", 1, loadoutSecondaryCamo, 0 ) ) ); + 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.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.loadoutsecondarycamo = int( tablelookup( "mp/camoTable.csv", 1, loadoutSecondaryCamo, 0 ) ); - self SetOffhandPrimaryClass( "other" ); + self setoffhandprimaryclass( "other" ); // Action Slots - // self _SetActionSlot( 1, "" ); - self _SetActionSlot( 1, "nightvision" ); - self _SetActionSlot( 3, "altMode" ); - self _SetActionSlot( 4, "" ); + // self _setactionslot( 1, "" ); + self _setactionslot( 1, "nightvision" ); + self _setactionslot( 3, "altMode" ); + self _setactionslot( 4, "" ); // Perks - self _clearPerks(); - self maps\mp\gametypes\_class::_detachAll(); + self _clearperks(); + self maps\mp\gametypes\_class::_detachall(); // these special case giving pistol death have to come before // perk loadout to ensure player perk icons arent overwritten if ( level.diehardmode ) { - self maps\mp\perks\_perks::givePerk( "specialty_pistoldeath" ); + 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 ) ); + deathVal = int( tablelookup( "mp/perkTable.csv", 1, loadoutDeathStreak, 6 ) ); if ( self botGetPerkUpgrade( loadoutPerk1 ) == "specialty_rollover" || self botGetPerkUpgrade( loadoutPerk2 ) == "specialty_rollover" || self botGetPerkUpgrade( loadoutPerk3 ) == "specialty_rollover" ) { @@ -3126,27 +3125,27 @@ botGiveLoadout( team, class, allowCopycat ) if ( self.pers[ "cur_death_streak" ] == deathVal ) { - self thread maps\mp\perks\_perks::givePerk( loadoutDeathStreak ); - self thread maps\mp\gametypes\_hud_message::splashNotify( loadoutDeathStreak ); + self thread maps\mp\perks\_perks::giveperk( loadoutDeathStreak ); + self thread maps\mp\gametypes\_hud_message::splashnotify( loadoutDeathStreak ); } else if ( self.pers[ "cur_death_streak" ] > deathVal ) { - self thread maps\mp\perks\_perks::givePerk( loadoutDeathStreak ); + self thread maps\mp\perks\_perks::giveperk( loadoutDeathStreak ); } } self botLoadoutAllPerks( loadoutEquipment, loadoutPerk1, loadoutPerk2, loadoutPerk3 ); - self maps\mp\gametypes\_class::setKillstreaks( loadoutKillstreak1, loadoutKillstreak2, loadoutKillstreak3 ); + self maps\mp\gametypes\_class::setkillstreaks( loadoutKillstreak1, loadoutKillstreak2, loadoutKillstreak3 ); - if ( self hasPerk( "specialty_extraammo", true ) && getWeaponClass( secondaryName ) != "weapon_projectile" ) + if ( self hasperk( "specialty_extraammo", true ) && getweaponclass( secondaryName ) != "weapon_projectile" ) { - self giveMaxAmmo( secondaryName ); + self givemaxammo( secondaryName ); } // Primary Weapon - primaryName = maps\mp\gametypes\_class::buildWeaponName( loadoutPrimary, loadoutPrimaryAttachment, loadoutPrimaryAttachment2 ); - self _giveWeapon( primaryName, self.loadoutprimarycamo ); + primaryName = maps\mp\gametypes\_class::buildweaponname( loadoutPrimary, loadoutPrimaryAttachment, loadoutPrimaryAttachment2 ); + 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 ) @@ -3154,58 +3153,58 @@ botGiveLoadout( team, class, allowCopycat ) self notify ( "weapon_change", "riotshield_mp" ); } - if ( self hasPerk( "specialty_extraammo", true ) ) + if ( self hasperk( "specialty_extraammo", true ) ) { - self giveMaxAmmo( primaryName ); + self givemaxammo( primaryName ); } - self setSpawnWeapon( primaryName ); + self setspawnweapon( primaryName ); primaryTokens = strtok( primaryName, "_" ); self.pers[ "primaryWeapon" ] = primaryTokens[ 0 ]; - // Primary Offhand was given by givePerk (it's your perk1) + // Primary Offhand was given by giveperk (it's your perk1) // Secondary Offhand offhandSecondaryWeapon = loadoutOffhand + "_mp"; if ( loadoutOffhand == "flash_grenade" ) { - self SetOffhandSecondaryClass( "flash" ); + self setoffhandsecondaryclass( "flash" ); } else { - self SetOffhandSecondaryClass( "smoke" ); + self setoffhandsecondaryclass( "smoke" ); } - self giveWeapon( offhandSecondaryWeapon ); + self giveweapon( offhandSecondaryWeapon ); - if ( loadOutOffhand == "smoke_grenade" ) + if ( loadoutOffhand == "smoke_grenade" ) { - self setWeaponAmmoClip( offhandSecondaryWeapon, 1 ); + self setweaponammoclip( offhandSecondaryWeapon, 1 ); } - else if ( loadOutOffhand == "flash_grenade" ) + else if ( loadoutOffhand == "flash_grenade" ) { - self setWeaponAmmoClip( offhandSecondaryWeapon, 2 ); + self setweaponammoclip( offhandSecondaryWeapon, 2 ); } - else if ( loadOutOffhand == "concussion_grenade" ) + else if ( loadoutOffhand == "concussion_grenade" ) { - self setWeaponAmmoClip( offhandSecondaryWeapon, 2 ); + self setweaponammoclip( offhandSecondaryWeapon, 2 ); } else { - self setWeaponAmmoClip( offhandSecondaryWeapon, 1 ); + self setweaponammoclip( offhandSecondaryWeapon, 1 ); } primaryWeapon = primaryName; self.primaryweapon = primaryWeapon; self.secondaryweapon = secondaryName; - self botPlayerModelForWeapon( self.pers[ "primaryWeapon" ], getBaseWeaponName( 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" ); + self maps\mp\gametypes\_weapons::updatemovespeedscale( "primary" ); // cac specialties that require loop threads self maps\mp\perks\_perks::cac_selector(); @@ -3226,7 +3225,7 @@ botGetPerkUpgrade( perkName ) return "specialty_null"; } - if ( !isDefined( self.pers[ "bots" ][ "unlocks" ][ "upgraded_" + perkName ] ) || !self.pers[ "bots" ][ "unlocks" ][ "upgraded_" + perkName ] ) + if ( !isdefined( self.pers[ "bots" ][ "unlocks" ][ "upgraded_" + perkName ] ) || !self.pers[ "bots" ][ "unlocks" ][ "upgraded_" + perkName ] ) { return "specialty_null"; } @@ -3239,15 +3238,15 @@ botGetPerkUpgrade( perkName ) */ botLoadoutAllPerks( loadoutEquipment, loadoutPerk1, loadoutPerk2, loadoutPerk3 ) { - loadoutEquipment = maps\mp\perks\_perks::validatePerk( 1, loadoutEquipment ); - loadoutPerk1 = maps\mp\perks\_perks::validatePerk( 1, loadoutPerk1 ); - loadoutPerk2 = maps\mp\perks\_perks::validatePerk( 2, loadoutPerk2 ); - loadoutPerk3 = maps\mp\perks\_perks::validatePerk( 3, loadoutPerk3 ); + loadoutEquipment = maps\mp\perks\_perks::validateperk( 1, loadoutEquipment ); + loadoutPerk1 = maps\mp\perks\_perks::validateperk( 1, loadoutPerk1 ); + loadoutPerk2 = maps\mp\perks\_perks::validateperk( 2, loadoutPerk2 ); + loadoutPerk3 = maps\mp\perks\_perks::validateperk( 3, loadoutPerk3 ); - self maps\mp\perks\_perks::givePerk( loadoutEquipment ); - self maps\mp\perks\_perks::givePerk( loadoutPerk1 ); - self maps\mp\perks\_perks::givePerk( loadoutPerk2 ); - self maps\mp\perks\_perks::givePerk( loadoutPerk3 ); + self maps\mp\perks\_perks::giveperk( loadoutEquipment ); + self maps\mp\perks\_perks::giveperk( loadoutPerk1 ); + self maps\mp\perks\_perks::giveperk( loadoutPerk2 ); + self maps\mp\perks\_perks::giveperk( loadoutPerk3 ); perks[ 0 ] = loadoutPerk1; perks[ 1 ] = loadoutPerk2; @@ -3267,9 +3266,9 @@ botLoadoutAllPerks( loadoutEquipment, loadoutPerk1, loadoutPerk2, loadoutPerk3 ) continue; } - if ( isDefined( self.pers[ "bots" ][ "unlocks" ][ "upgraded_" + perk ] ) && self.pers[ "bots" ][ "unlocks" ][ "upgraded_" + perk ] ) + if ( isdefined( self.pers[ "bots" ][ "unlocks" ][ "upgraded_" + perk ] ) && self.pers[ "bots" ][ "unlocks" ][ "upgraded_" + perk ] ) { - self maps\mp\perks\_perks::givePerk( upgrade ); + self maps\mp\perks\_perks::giveperk( upgrade ); } } @@ -3283,25 +3282,25 @@ botPlayerModelForWeapon( weapon, secondary ) team = self.team; - if ( isDefined( game[ team + "_model" ][ weapon ] ) ) + if ( isdefined( game[ team + "_model" ][ weapon ] ) ) { [[ game[ team + "_model" ][ weapon ] ]](); return; } - weaponClass = tablelookup( "mp/statstable.csv", 4, weapon, 2 ); + weaponclass = tablelookup( "mp/statstable.csv", 4, weapon, 2 ); - switch ( weaponClass ) + switch ( weaponclass ) { case "weapon_smg": [[ game[ team + "_model" ][ "SMG" ] ]](); break; case "weapon_assault": - weaponClass = tablelookup( "mp/statstable.csv", 4, secondary, 2 ); + weaponclass = tablelookup( "mp/statstable.csv", 4, secondary, 2 ); - if ( weaponClass == "weapon_shotgun" ) + if ( weaponclass == "weapon_shotgun" ) { [[ game[ team + "_model" ][ "SHOTGUN" ] ]](); } @@ -3313,7 +3312,7 @@ botPlayerModelForWeapon( weapon, secondary ) break; case "weapon_sniper": - if ( level.environment != "" && isDefined( self.pers[ "bots" ][ "unlocks" ][ "ghillie" ] ) && self.pers[ "bots" ][ "unlocks" ][ "ghillie" ] ) + if ( level.environment != "" && isdefined( self.pers[ "bots" ][ "unlocks" ][ "ghillie" ] ) && self.pers[ "bots" ][ "unlocks" ][ "ghillie" ] ) { [[ game[ team + "_model" ][ "GHILLIE" ] ]](); } diff --git a/maps/mp/bots/_menu.gsc b/maps/mp/bots/_menu.gsc index 46e37ec..c56caa2 100644 --- a/maps/mp/bots/_menu.gsc +++ b/maps/mp/bots/_menu.gsc @@ -12,12 +12,12 @@ init() { - if ( getDvar( "bots_main_menu" ) == "" ) + if ( getdvar( "bots_main_menu" ) == "" ) { - setDvar( "bots_main_menu", true ); + setdvar( "bots_main_menu", true ); } - if ( !getDvarInt( "bots_main_menu" ) ) + if ( !getdvarint( "bots_main_menu" ) ) { return; } @@ -31,7 +31,7 @@ watchPlayers() { wait 1; - if ( !getDvarInt( "bots_main_menu" ) ) + if ( !getdvarint( "bots_main_menu" ) ) { return; } @@ -45,7 +45,7 @@ watchPlayers() continue; } - if ( isDefined( player.menuinit ) && player.menuinit ) + if ( isdefined( player.menuinit ) && player.menuinit ) { continue; } @@ -69,7 +69,7 @@ init_menu() self.menu_player = undefined; self.submenu = "Main"; self.curs[ "Main" ][ "X" ] = 0; - self AddOptions(); + self addOptions(); self thread watchPlayerOpenMenu(); self thread MenuSelect(); @@ -89,42 +89,42 @@ watchDisconnect() if ( self.menuopen ) { - if ( isDefined( self.menutexty ) ) + if ( isdefined( self.menutexty ) ) { for ( i = 0; i < self.menutexty.size; i++ ) { - if ( isDefined( self.menutexty[ i ] ) ) + if ( isdefined( self.menutexty[ i ] ) ) { self.menutexty[ i ] destroy(); } } } - if ( isDefined( self.menutext ) ) + if ( isdefined( self.menutext ) ) { for ( i = 0; i < self.menutext.size; i++ ) { - if ( isDefined( self.menutext[ i ] ) ) + if ( isdefined( self.menutext[ i ] ) ) { self.menutext[ i ] destroy(); } } } - if ( isDefined( self.menu ) && isDefined( self.menu[ "X" ] ) ) + if ( isdefined( self.menu ) && isdefined( self.menu[ "X" ] ) ) { - if ( isDefined( self.menu[ "X" ][ "Shader" ] ) ) + if ( isdefined( self.menu[ "X" ][ "Shader" ] ) ) { self.menu[ "X" ][ "Shader" ] destroy(); } - if ( isDefined( self.menu[ "X" ][ "Scroller" ] ) ) + if ( isdefined( self.menu[ "X" ][ "Scroller" ] ) ) { self.menu[ "X" ][ "Scroller" ] destroy(); } } - if ( isDefined( self.menuversionhud ) ) + if ( isdefined( self.menuversionhud ) ) { self.menuversionhud destroy(); } @@ -136,9 +136,9 @@ doGreetings() self endon ( "disconnect" ); self endon ( "bots_kill_menu" ); wait 1; - self iPrintln( "Welcome to Bot Warfare " + self.name + "!" ); + self iprintln( "Welcome to Bot Warfare " + self.name + "!" ); wait 5; - self iPrintln( "Press [{+actionslot 2}] to open menu!" ); + self iprintln( "Press [{+actionslot 2}] to open menu!" ); } watchPlayerOpenMenu() @@ -146,7 +146,7 @@ watchPlayerOpenMenu() self endon ( "disconnect" ); self endon ( "bots_kill_menu" ); - self notifyOnPlayerCommand( "bots_open_menu", "+actionslot 2" ); + self notifyonplayercommand( "bots_open_menu", "+actionslot 2" ); for ( ;; ) { @@ -154,12 +154,12 @@ watchPlayerOpenMenu() if ( !self.menuopen ) { - self playLocalSound( "mouse_click" ); + self playlocalsound( "mouse_click" ); self thread OpenSub( self.submenu ); } else { - self playLocalSound( "mouse_click" ); + self playlocalsound( "mouse_click" ); if ( self.submenu != "Main" ) { @@ -169,9 +169,9 @@ watchPlayerOpenMenu() { self ExitMenu(); - if ( !gameFlag( "prematch_done" ) || level.gameended ) + if ( !gameflag( "prematch_done" ) || level.gameended ) { - self freezeControls( true ); + self freezecontrols( true ); } else { @@ -187,7 +187,7 @@ MenuSelect() self endon ( "disconnect" ); self endon ( "bots_kill_menu" ); - self notifyOnPlayerCommand( "bots_select", "+gostand" ); + self notifyonplayercommand( "bots_select", "+gostand" ); for ( ;; ) { @@ -195,7 +195,7 @@ MenuSelect() if ( self.menuopen ) { - self playLocalSound( "mouse_click" ); + self playlocalsound( "mouse_click" ); if ( self.submenu == "Main" ) { @@ -214,7 +214,7 @@ LeftMenu() self endon ( "disconnect" ); self endon ( "bots_kill_menu" ); - self notifyOnPlayerCommand( "bots_left", "+moveleft" ); + self notifyonplayercommand( "bots_left", "+moveleft" ); for ( ;; ) { @@ -222,7 +222,7 @@ LeftMenu() if ( self.menuopen && self.submenu == "Main" ) { - self playLocalSound( "mouse_over" ); + self playlocalsound( "mouse_over" ); self.curs[ "Main" ][ "X" ]--; if ( self.curs[ "Main" ][ "X" ] < 0 ) @@ -240,7 +240,7 @@ RightMenu() self endon ( "disconnect" ); self endon ( "bots_kill_menu" ); - self notifyOnPlayerCommand( "bots_right", "+moveright" ); + self notifyonplayercommand( "bots_right", "+moveright" ); for ( ;; ) { @@ -248,7 +248,7 @@ RightMenu() if ( self.menuopen && self.submenu == "Main" ) { - self playLocalSound( "mouse_over" ); + self playlocalsound( "mouse_over" ); self.curs[ "Main" ][ "X" ]++; if ( self.curs[ "Main" ][ "X" ] > self.option[ "Name" ][ self.submenu ].size - 1 ) @@ -266,7 +266,7 @@ UpMenu() self endon ( "disconnect" ); self endon ( "bots_kill_menu" ); - self notifyOnPlayerCommand( "bots_up", "+forward" ); + self notifyonplayercommand( "bots_up", "+forward" ); for ( ;; ) { @@ -274,7 +274,7 @@ UpMenu() if ( self.menuopen && self.submenu != "Main" ) { - self playLocalSound( "mouse_over" ); + self playlocalsound( "mouse_over" ); self.curs[ self.submenu ][ "Y" ]--; if ( self.curs[ self.submenu ][ "Y" ] < 0 ) @@ -292,7 +292,7 @@ DownMenu() self endon ( "disconnect" ); self endon ( "bots_kill_menu" ); - self notifyOnPlayerCommand( "bots_down", "+back" ); + self notifyonplayercommand( "bots_down", "+back" ); for ( ;; ) { @@ -300,7 +300,7 @@ DownMenu() if ( self.menuopen && self.submenu != "Main" ) { - self playLocalSound( "mouse_over" ); + self playlocalsound( "mouse_over" ); self.curs[ self.submenu ][ "Y" ]++; if ( self.curs[ self.submenu ][ "Y" ] > self.option[ "Name" ][ self.submenu ].size - 1 ) @@ -315,42 +315,42 @@ DownMenu() OpenSub( menu, menu2 ) { - if ( menu != "Main" && ( !isDefined( self.menu[ menu ] ) || !!isDefined( self.menu[ menu ][ "FirstOpen" ] ) ) ) + if ( menu != "Main" && ( !isdefined( self.menu[ menu ] ) || !!isdefined( self.menu[ menu ][ "FirstOpen" ] ) ) ) { self.curs[ menu ][ "Y" ] = 0; self.menu[ menu ][ "FirstOpen" ] = true; } - logoldi = true; + logOldi = true; self.submenu = menu; if ( self.submenu == "Main" ) { - if ( isDefined( self.menutext ) ) + if ( isdefined( self.menutext ) ) { for ( i = 0; i < self.menutext.size; i++ ) { - if ( isDefined( self.menutext[ i ] ) ) + if ( isdefined( self.menutext[ i ] ) ) { self.menutext[ i ] destroy(); } } } - if ( isDefined( self.menu ) && isDefined( self.menu[ "X" ] ) ) + if ( isdefined( self.menu ) && isdefined( self.menu[ "X" ] ) ) { - if ( isDefined( self.menu[ "X" ][ "Shader" ] ) ) + if ( isdefined( self.menu[ "X" ][ "Shader" ] ) ) { self.menu[ "X" ][ "Shader" ] destroy(); } - if ( isDefined( self.menu[ "X" ][ "Scroller" ] ) ) + if ( isdefined( self.menu[ "X" ][ "Scroller" ] ) ) { self.menu[ "X" ][ "Scroller" ] destroy(); } } - if ( isDefined( self.menuversionhud ) ) + if ( isdefined( self.menuversionhud ) ) { self.menuversionhud destroy(); } @@ -396,11 +396,11 @@ OpenSub( menu, menu2 ) } else { - if ( isDefined( self.menutexty ) ) + if ( isdefined( self.menutexty ) ) { for ( i = 0 ; i < self.menutexty.size ; i++ ) { - if ( isDefined( self.menutexty[ i ] ) ) + if ( isdefined( self.menutexty[ i ] ) ) { self.menutexty[ i ] destroy(); } @@ -429,11 +429,11 @@ CursMove( direction ) self.menu[ "X" ][ "Scroller" ].x = self.menutext[ self.curs[ "Main" ][ "X" ] ].x; self.menu[ "X" ][ "Scroller" ].y = self.menutext[ self.curs[ "Main" ][ "X" ] ].y; - if ( isDefined( self.menutext ) ) + if ( isdefined( self.menutext ) ) { for ( i = 0; i < self.menutext.size; i++ ) { - if ( isDefined( self.menutext[ i ] ) ) + if ( isdefined( self.menutext[ i ] ) ) { self.menutext[ i ].fontscale = 1.5; self.menutext[ i ].color = ( 1, 1, 1 ); @@ -446,11 +446,11 @@ CursMove( direction ) } else { - if ( isDefined( self.menutexty ) ) + if ( isdefined( self.menutexty ) ) { for ( i = 0; i < self.menutexty.size; i++ ) { - if ( isDefined( self.menutexty[ i ] ) ) + if ( isdefined( self.menutexty[ i ] ) ) { self.menutexty[ i ].fontscale = 1.5; self.menutexty[ i ].color = ( 1, 1, 1 ); @@ -459,11 +459,11 @@ CursMove( direction ) } } - if ( isDefined( self.menutext ) ) + if ( isdefined( self.menutext ) ) { for ( i = 0; i < self.menutext.size; i++ ) { - if ( isDefined( self.menutext[ i ] ) ) + if ( isdefined( self.menutext[ i ] ) ) { self.menutext[ i ].fontscale = 1.5; self.menutext[ i ].color = ( 1, 1, 1 ); @@ -485,7 +485,7 @@ ShowOptionOn( variable ) for ( time = 0;; time += 0.05 ) { - if ( !self isOnGround() && isAlive( self ) && gameFlag( "prematch_done" ) && !level.gameended ) + if ( !self isonground() && isalive( self ) && gameflag( "prematch_done" ) && !level.gameended ) { self freezecontrols( false ); } @@ -494,31 +494,31 @@ ShowOptionOn( variable ) self freezecontrols( true ); } - self setClientDvar( "r_blur", "5" ); - self setClientDvar( "sc_blur", "15" ); + self setclientdvar( "r_blur", "5" ); + self setclientdvar( "sc_blur", "15" ); self addOptions(); if ( self.submenu == "Main" ) { - if ( isDefined( self.curs[ self.submenu ][ variable ] ) && isDefined( self.menutext ) && isDefined( self.menutext[ self.curs[ self.submenu ][ variable ] ] ) ) + if ( isdefined( self.curs[ self.submenu ][ variable ] ) && isdefined( self.menutext ) && isdefined( self.menutext[ self.curs[ self.submenu ][ variable ] ] ) ) { self.menutext[ self.curs[ self.submenu ][ variable ] ].fontscale = 2.0; - // self.menutext[ self.curs[ self.submenu ][ variable ] ].color = (randomInt(256)/255, randomInt(256)/255, randomInt(256)/255); - color = ( 6 / 255, 69 / 255, 173 + randomIntRange( -5, 5 ) / 255 ); + // self.menutext[ self.curs[ self.submenu ][ variable ] ].color = (randomint(256)/255, randomint(256)/255, randomint(256)/255); + color = ( 6 / 255, 69 / 255, 173 + randomintrange( -5, 5 ) / 255 ); if ( int( time * 4 ) % 2 ) { - color = ( 11 / 255, 0 / 255, 128 + randomIntRange( -10, 10 ) / 255 ); + color = ( 11 / 255, 0 / 255, 128 + randomintrange( -10, 10 ) / 255 ); } self.menutext[ self.curs[ self.submenu ][ variable ] ].color = color; } - if ( isDefined( self.menutext ) ) + if ( isdefined( self.menutext ) ) { for ( i = 0; i < self.option[ "Name" ][ self.submenu ].size; i++ ) { - if ( isDefined( self.menutext[ i ] ) ) + if ( isdefined( self.menutext[ i ] ) ) { self.menutext[ i ] settext( self.option[ "Name" ][ self.submenu ][ i ] ); } @@ -527,25 +527,25 @@ ShowOptionOn( variable ) } else { - if ( isDefined( self.curs[ self.submenu ][ variable ] ) && isDefined( self.menutexty ) && isDefined( self.menutexty[ self.curs[ self.submenu ][ variable ] ] ) ) + if ( isdefined( self.curs[ self.submenu ][ variable ] ) && isdefined( self.menutexty ) && isdefined( self.menutexty[ self.curs[ self.submenu ][ variable ] ] ) ) { self.menutexty[ self.curs[ self.submenu ][ variable ] ].fontscale = 2.0; - // self.menutexty[ self.curs[ self.submenu ][ variable ] ].color = (randomInt(256)/255, randomInt(256)/255, randomInt(256)/255); - color = ( 6 / 255, 69 / 255, 173 + randomIntRange( -5, 5 ) / 255 ); + // self.menutexty[ self.curs[ self.submenu ][ variable ] ].color = (randomint(256)/255, randomint(256)/255, randomint(256)/255); + color = ( 6 / 255, 69 / 255, 173 + randomintrange( -5, 5 ) / 255 ); if ( int( time * 4 ) % 2 ) { - color = ( 11 / 255, 0 / 255, 128 + randomIntRange( -10, 10 ) / 255 ); + color = ( 11 / 255, 0 / 255, 128 + randomintrange( -10, 10 ) / 255 ); } self.menutexty[ self.curs[ self.submenu ][ variable ] ].color = color; } - if ( isDefined( self.menutexty ) ) + if ( isdefined( self.menutexty ) ) { for ( i = 0; i < self.option[ "Name" ][ self.submenu ].size; i++ ) { - if ( isDefined( self.menutexty[ i ] ) ) + if ( isdefined( self.menutexty[ i ] ) ) { self.menutexty[ i ] settext( self.option[ "Name" ][ self.submenu ][ i ] ); } @@ -572,11 +572,11 @@ AddBack( menu, back ) ExitSub() { - if ( isDefined( self.menutexty ) ) + if ( isdefined( self.menutexty ) ) { for ( i = 0; i < self.menutexty.size; i++ ) { - if ( isDefined( self.menutexty[ i ] ) ) + if ( isdefined( self.menutexty[ i ] ) ) { self.menutexty[ i ] destroy(); } @@ -597,31 +597,31 @@ ExitSub() ExitMenu() { - if ( isDefined( self.menutext ) ) + if ( isdefined( self.menutext ) ) { for ( i = 0; i < self.menutext.size; i++ ) { - if ( isDefined( self.menutext[ i ] ) ) + if ( isdefined( self.menutext[ i ] ) ) { self.menutext[ i ] destroy(); } } } - if ( isDefined( self.menu ) && isDefined( self.menu[ "X" ] ) ) + if ( isdefined( self.menu ) && isdefined( self.menu[ "X" ] ) ) { - if ( isDefined( self.menu[ "X" ][ "Shader" ] ) ) + if ( isdefined( self.menu[ "X" ][ "Shader" ] ) ) { self.menu[ "X" ][ "Shader" ] destroy(); } - if ( isDefined( self.menu[ "X" ][ "Scroller" ] ) ) + if ( isdefined( self.menu[ "X" ][ "Scroller" ] ) ) { self.menu[ "X" ][ "Scroller" ] destroy(); } } - if ( isDefined( self.menuversionhud ) ) + if ( isdefined( self.menuversionhud ) ) { self.menuversionhud destroy(); } @@ -629,14 +629,14 @@ ExitMenu() self.menuopen = false; self notify( "exit" ); - self setClientDvar( "r_blur", "0" ); - self setClientDvar( "sc_blur", "2" ); + self setclientdvar( "r_blur", "0" ); + self setclientdvar( "sc_blur", "2" ); } initHudElem( txt, xl, yl ) { - hud = NewClientHudElem( self ); - hud setText( txt ); + hud = newclienthudelem( self ); + hud settext( txt ); hud.alignx = "center"; hud.aligny = "bottom"; hud.horzalign = "center"; @@ -657,7 +657,7 @@ initHudElem( txt, xl, yl ) createRectangle( align, relative, x, y, width, height, color, sort, alpha, shader ) { - barElemBG = newClientHudElem( self ); + barElemBG = newclienthudelem( self ); barElemBG.elemtype = "bar_"; barElemBG.width = width; barElemBG.height = height; @@ -669,20 +669,20 @@ createRectangle( align, relative, x, y, width, height, color, sort, alpha, shade barElemBG.sort = sort; barElemBG.color = color; barElemBG.alpha = alpha; - barElemBG setParent( level.uiparent ); - barElemBG setShader( shader, width, height ); + barElemBG setparent( level.uiparent ); + barElemBG setshader( shader, width, height ); barElemBG.hidden = false; - barElemBG setPoint( align, relative, x, y ); + barElemBG setpoint( align, relative, x, y ); return barElemBG; } -AddOptions() +addOptions() { self AddMenu( "Main", 0, "Manage bots", ::OpenSub, "man_bots", "" ); self AddBack( "man_bots", "Main" ); _temp = ""; - _tempDvar = getDvarInt( "bots_manage_add" ); + _tempDvar = getdvarint( "bots_manage_add" ); self AddMenu( "man_bots", 0, "Add 1 bot", ::man_bots, "add", 1 + _tempDvar ); self AddMenu( "man_bots", 1, "Add 3 bot", ::man_bots, "add", 3 + _tempDvar ); self AddMenu( "man_bots", 2, "Add 7 bot", ::man_bots, "add", 7 + _tempDvar ); @@ -691,7 +691,7 @@ AddOptions() self AddMenu( "man_bots", 5, "Kick a bot", ::man_bots, "kick", 1 ); self AddMenu( "man_bots", 6, "Kick all bots", ::man_bots, "kick", getBotArray().size ); - _tempDvar = getDvarInt( "bots_manage_fill_kick" ); + _tempDvar = getdvarint( "bots_manage_fill_kick" ); if ( _tempDvar ) { @@ -704,7 +704,7 @@ AddOptions() self AddMenu( "man_bots", 7, "Toggle auto bot kicking: " + _temp, ::man_bots, "autokick", _tempDvar ); - _tempDvar = getDvarInt( "bots_manage_fill_mode" ); + _tempDvar = getdvarint( "bots_manage_fill_mode" ); switch ( _tempDvar ) { @@ -735,11 +735,11 @@ AddOptions() self AddMenu( "man_bots", 8, "Change bot_fill_mode: " + _temp, ::man_bots, "fillmode", _tempDvar ); - _tempDvar = getDvarInt( "bots_manage_fill" ); + _tempDvar = getdvarint( "bots_manage_fill" ); self AddMenu( "man_bots", 9, "Increase bots to keep in-game: " + _tempDvar, ::man_bots, "fillup", _tempDvar ); self AddMenu( "man_bots", 10, "Decrease bots to keep in-game: " + _tempDvar, ::man_bots, "filldown", _tempDvar ); - _tempDvar = getDvarInt( "bots_manage_fill_spec" ); + _tempDvar = getdvarint( "bots_manage_fill_spec" ); if ( _tempDvar ) { @@ -760,11 +760,11 @@ AddOptions() _tempDvar = getdvar( "bots_team" ); self AddMenu( "man_team", 0, "Change bot team: " + _tempDvar, ::bot_teams, "team", _tempDvar ); - _tempDvar = getDvarInt( "bots_team_amount" ); + _tempDvar = getdvarint( "bots_team_amount" ); self AddMenu( "man_team", 1, "Increase bots to be on axis team: " + _tempDvar, ::bot_teams, "teamup", _tempDvar ); self AddMenu( "man_team", 2, "Decrease bots to be on axis team: " + _tempDvar, ::bot_teams, "teamdown", _tempDvar ); - _tempDvar = getDvarInt( "bots_team_force" ); + _tempDvar = getdvarint( "bots_team_force" ); if ( _tempDvar ) { @@ -777,7 +777,7 @@ AddOptions() self AddMenu( "man_team", 3, "Toggle forcing bots on team: " + _temp, ::bot_teams, "teamforce", _tempDvar ); - _tempDvar = getDvarInt( "bots_team_mode" ); + _tempDvar = getdvarint( "bots_team_mode" ); if ( _tempDvar ) { @@ -841,19 +841,19 @@ AddOptions() self AddMenu( "man_team", 5, "Change bot difficulty: " + _temp, ::bot_teams, "skill", _tempDvar ); - _tempDvar = getDvarInt( "bots_skill_axis_hard" ); + _tempDvar = getdvarint( "bots_skill_axis_hard" ); self AddMenu( "man_team", 6, "Increase amount of hard bots on axis team: " + _tempDvar, ::bot_teams, "axishardup", _tempDvar ); self AddMenu( "man_team", 7, "Decrease amount of hard bots on axis team: " + _tempDvar, ::bot_teams, "axisharddown", _tempDvar ); - _tempDvar = getDvarInt( "bots_skill_axis_med" ); + _tempDvar = getdvarint( "bots_skill_axis_med" ); self AddMenu( "man_team", 8, "Increase amount of med bots on axis team: " + _tempDvar, ::bot_teams, "axismedup", _tempDvar ); self AddMenu( "man_team", 9, "Decrease amount of med bots on axis team: " + _tempDvar, ::bot_teams, "axismeddown", _tempDvar ); - _tempDvar = getDvarInt( "bots_skill_allies_hard" ); + _tempDvar = getdvarint( "bots_skill_allies_hard" ); self AddMenu( "man_team", 10, "Increase amount of hard bots on allies team: " + _tempDvar, ::bot_teams, "allieshardup", _tempDvar ); self AddMenu( "man_team", 11, "Decrease amount of hard bots on allies team: " + _tempDvar, ::bot_teams, "alliesharddown", _tempDvar ); - _tempDvar = getDvarInt( "bots_skill_allies_med" ); + _tempDvar = getdvarint( "bots_skill_allies_med" ); self AddMenu( "man_team", 12, "Increase amount of med bots on allies team: " + _tempDvar, ::bot_teams, "alliesmedup", _tempDvar ); self AddMenu( "man_team", 13, "Decrease amount of med bots on allies team: " + _tempDvar, ::bot_teams, "alliesmeddown", _tempDvar ); @@ -862,7 +862,7 @@ AddOptions() self AddMenu( "Main", 2, "Bot settings", ::OpenSub, "set1", "" ); self AddBack( "set1", "Main" ); - _tempDvar = getDvarInt( "bots_loadout_reasonable" ); + _tempDvar = getdvarint( "bots_loadout_reasonable" ); if ( _tempDvar ) { @@ -875,7 +875,7 @@ AddOptions() self AddMenu( "set1", 0, "Bots use only good class setups: " + _temp, ::bot_func, "reasonable", _tempDvar ); - _tempDvar = getDvarInt( "bots_loadout_allow_op" ); + _tempDvar = getdvarint( "bots_loadout_allow_op" ); if ( _tempDvar ) { @@ -888,7 +888,7 @@ AddOptions() self AddMenu( "set1", 1, "Bots can use op and annoying class setups: " + _temp, ::bot_func, "op", _tempDvar ); - _tempDvar = getDvarInt( "bots_play_move" ); + _tempDvar = getdvarint( "bots_play_move" ); if ( _tempDvar ) { @@ -901,7 +901,7 @@ AddOptions() self AddMenu( "set1", 2, "Bots can move: " + _temp, ::bot_func, "move", _tempDvar ); - _tempDvar = getDvarInt( "bots_play_knife" ); + _tempDvar = getdvarint( "bots_play_knife" ); if ( _tempDvar ) { @@ -914,7 +914,7 @@ AddOptions() self AddMenu( "set1", 3, "Bots can knife: " + _temp, ::bot_func, "knife", _tempDvar ); - _tempDvar = getDvarInt( "bots_play_fire" ); + _tempDvar = getdvarint( "bots_play_fire" ); if ( _tempDvar ) { @@ -927,7 +927,7 @@ AddOptions() self AddMenu( "set1", 4, "Bots can fire: " + _temp, ::bot_func, "fire", _tempDvar ); - _tempDvar = getDvarInt( "bots_play_nade" ); + _tempDvar = getdvarint( "bots_play_nade" ); if ( _tempDvar ) { @@ -940,7 +940,7 @@ AddOptions() self AddMenu( "set1", 5, "Bots can nade: " + _temp, ::bot_func, "nade", _tempDvar ); - _tempDvar = getDvarInt( "bots_play_take_carepackages" ); + _tempDvar = getdvarint( "bots_play_take_carepackages" ); if ( _tempDvar ) { @@ -953,7 +953,7 @@ AddOptions() self AddMenu( "set1", 6, "Bots can take carepackages: " + _temp, ::bot_func, "care", _tempDvar ); - _tempDvar = getDvarInt( "bots_play_obj" ); + _tempDvar = getdvarint( "bots_play_obj" ); if ( _tempDvar ) { @@ -966,7 +966,7 @@ AddOptions() self AddMenu( "set1", 7, "Bots play the objective: " + _temp, ::bot_func, "obj", _tempDvar ); - _tempDvar = getDvarInt( "bots_play_camp" ); + _tempDvar = getdvarint( "bots_play_camp" ); if ( _tempDvar ) { @@ -979,7 +979,7 @@ AddOptions() self AddMenu( "set1", 8, "Bots can camp: " + _temp, ::bot_func, "camp", _tempDvar ); - _tempDvar = getDvarInt( "bots_play_jumpdrop" ); + _tempDvar = getdvarint( "bots_play_jumpdrop" ); if ( _tempDvar ) { @@ -992,7 +992,7 @@ AddOptions() self AddMenu( "set1", 9, "Bots can jump and dropshot: " + _temp, ::bot_func, "jump", _tempDvar ); - _tempDvar = getDvarInt( "bots_play_target_other" ); + _tempDvar = getdvarint( "bots_play_target_other" ); if ( _tempDvar ) { @@ -1005,7 +1005,7 @@ AddOptions() self AddMenu( "set1", 10, "Bots can target other script objects: " + _temp, ::bot_func, "targetother", _tempDvar ); - _tempDvar = getDvarInt( "bots_play_killstreak" ); + _tempDvar = getdvarint( "bots_play_killstreak" ); if ( _tempDvar ) { @@ -1018,7 +1018,7 @@ AddOptions() self AddMenu( "set1", 11, "Bots can use killstreaks: " + _temp, ::bot_func, "killstreak", _tempDvar ); - _tempDvar = getDvarInt( "bots_play_ads" ); + _tempDvar = getdvarint( "bots_play_ads" ); if ( _tempDvar ) { @@ -1037,68 +1037,68 @@ bot_func( a, b ) switch ( a ) { case "reasonable": - setDvar( "bots_loadout_reasonable", !b ); - self iPrintln( "Bots using reasonable setups: " + !b ); + setdvar( "bots_loadout_reasonable", !b ); + self iprintln( "Bots using reasonable setups: " + !b ); break; case "op": - setDvar( "bots_loadout_allow_op", !b ); - self iPrintln( "Bots using op setups: " + !b ); + setdvar( "bots_loadout_allow_op", !b ); + self iprintln( "Bots using op setups: " + !b ); break; case "move": - setDvar( "bots_play_move", !b ); - self iPrintln( "Bots move: " + !b ); + setdvar( "bots_play_move", !b ); + self iprintln( "Bots move: " + !b ); break; case "knife": - setDvar( "bots_play_knife", !b ); - self iPrintln( "Bots knife: " + !b ); + setdvar( "bots_play_knife", !b ); + self iprintln( "Bots knife: " + !b ); break; case "fire": - setDvar( "bots_play_fire", !b ); - self iPrintln( "Bots fire: " + !b ); + setdvar( "bots_play_fire", !b ); + self iprintln( "Bots fire: " + !b ); break; case "nade": - setDvar( "bots_play_nade", !b ); - self iPrintln( "Bots nade: " + !b ); + setdvar( "bots_play_nade", !b ); + self iprintln( "Bots nade: " + !b ); break; case "care": - setDvar( "bots_play_take_carepackages", !b ); - self iPrintln( "Bots take carepackages: " + !b ); + setdvar( "bots_play_take_carepackages", !b ); + self iprintln( "Bots take carepackages: " + !b ); break; case "obj": - setDvar( "bots_play_obj", !b ); - self iPrintln( "Bots play the obj: " + !b ); + setdvar( "bots_play_obj", !b ); + self iprintln( "Bots play the obj: " + !b ); break; case "camp": - setDvar( "bots_play_camp", !b ); - self iPrintln( "Bots camp: " + !b ); + setdvar( "bots_play_camp", !b ); + self iprintln( "Bots camp: " + !b ); break; case "jump": - setDvar( "bots_play_jumpdrop", !b ); - self iPrintln( "Bots jump: " + !b ); + setdvar( "bots_play_jumpdrop", !b ); + self iprintln( "Bots jump: " + !b ); break; case "targetother": - setDvar( "bots_play_target_other", !b ); - self iPrintln( "Bots target other: " + !b ); + setdvar( "bots_play_target_other", !b ); + self iprintln( "Bots target other: " + !b ); break; case "killstreak": - setDvar( "bots_play_killstreak", !b ); - self iPrintln( "Bots use killstreaks: " + !b ); + setdvar( "bots_play_killstreak", !b ); + self iprintln( "Bots use killstreaks: " + !b ); break; case "ads": - setDvar( "bots_play_ads", !b ); - self iPrintln( "Bots ads: " + !b ); + setdvar( "bots_play_ads", !b ); + self iprintln( "Bots ads: " + !b ); break; } } @@ -1112,22 +1112,22 @@ bot_teams( a, b ) { case "autoassign": setdvar( "bots_team", "allies" ); - self iPrintlnBold( "Changed bot team to allies." ); + self iprintlnbold( "Changed bot team to allies." ); break; case "allies": setdvar( "bots_team", "axis" ); - self iPrintlnBold( "Changed bot team to axis." ); + self iprintlnbold( "Changed bot team to axis." ); break; case "axis": setdvar( "bots_team", "custom" ); - self iPrintlnBold( "Changed bot team to custom." ); + self iprintlnbold( "Changed bot team to custom." ); break; default: setdvar( "bots_team", "autoassign" ); - self iPrintlnBold( "Changed bot team to autoassign." ); + self iprintlnbold( "Changed bot team to autoassign." ); break; } @@ -1135,75 +1135,75 @@ bot_teams( a, b ) case "teamup": setdvar( "bots_team_amount", b + 1 ); - self iPrintln( ( b + 1 ) + " bot(s) will try to be on axis team." ); + self iprintln( ( b + 1 ) + " bot(s) will try to be on axis team." ); break; case "teamdown": setdvar( "bots_team_amount", b - 1 ); - self iPrintln( ( b - 1 ) + " bot(s) will try to be on axis team." ); + self iprintln( ( b - 1 ) + " bot(s) will try to be on axis team." ); break; case "teamforce": - setDvar( "bots_team_force", !b ); - self iPrintln( "Forcing bots to team: " + !b ); + setdvar( "bots_team_force", !b ); + self iprintln( "Forcing bots to team: " + !b ); break; case "teammode": - setDvar( "bots_team_mode", !b ); - self iPrintln( "Only count bots on team: " + !b ); + setdvar( "bots_team_mode", !b ); + self iprintln( "Only count bots on team: " + !b ); break; case "skill": switch ( b ) { case 0: - self iPrintlnBold( "Changed bot skill to easy." ); - setDvar( "bots_skill", 1 ); + self iprintlnbold( "Changed bot skill to easy." ); + setdvar( "bots_skill", 1 ); break; case 1: - self iPrintlnBold( "Changed bot skill to easy-med." ); - setDvar( "bots_skill", 2 ); + self iprintlnbold( "Changed bot skill to easy-med." ); + setdvar( "bots_skill", 2 ); break; case 2: - self iPrintlnBold( "Changed bot skill to medium." ); - setDvar( "bots_skill", 3 ); + self iprintlnbold( "Changed bot skill to medium." ); + setdvar( "bots_skill", 3 ); break; case 3: - self iPrintlnBold( "Changed bot skill to med-hard." ); - setDvar( "bots_skill", 4 ); + self iprintlnbold( "Changed bot skill to med-hard." ); + setdvar( "bots_skill", 4 ); break; case 4: - self iPrintlnBold( "Changed bot skill to hard." ); - setDvar( "bots_skill", 5 ); + self iprintlnbold( "Changed bot skill to hard." ); + setdvar( "bots_skill", 5 ); break; case 5: - self iPrintlnBold( "Changed bot skill to very hard." ); - setDvar( "bots_skill", 6 ); + self iprintlnbold( "Changed bot skill to very hard." ); + setdvar( "bots_skill", 6 ); break; case 6: - self iPrintlnBold( "Changed bot skill to hardest." ); - setDvar( "bots_skill", 7 ); + self iprintlnbold( "Changed bot skill to hardest." ); + setdvar( "bots_skill", 7 ); break; case 7: - self iPrintlnBold( "Changed bot skill to custom. Base is easy." ); - setDvar( "bots_skill", 8 ); + self iprintlnbold( "Changed bot skill to custom. Base is easy." ); + setdvar( "bots_skill", 8 ); break; case 8: - self iPrintlnBold( "Changed bot skill to complete random. Takes effect at restart." ); - setDvar( "bots_skill", 9 ); + self iprintlnbold( "Changed bot skill to complete random. Takes effect at restart." ); + setdvar( "bots_skill", 9 ); break; default: - self iPrintlnBold( "Changed bot skill to random. Takes effect at restart." ); - setDvar( "bots_skill", 0 ); + self iprintlnbold( "Changed bot skill to random. Takes effect at restart." ); + setdvar( "bots_skill", 0 ); break; } @@ -1211,42 +1211,42 @@ bot_teams( a, b ) case "axishardup": setdvar( "bots_skill_axis_hard", ( b + 1 ) ); - self iPrintln( ( ( b + 1 ) ) + " hard bots will be on axis team." ); + self iprintln( ( ( b + 1 ) ) + " hard bots will be on axis team." ); break; case "axisharddown": setdvar( "bots_skill_axis_hard", ( b - 1 ) ); - self iPrintln( ( ( b - 1 ) ) + " hard bots will be on axis team." ); + self iprintln( ( ( b - 1 ) ) + " hard bots will be on axis team." ); break; case "axismedup": setdvar( "bots_skill_axis_med", ( b + 1 ) ); - self iPrintln( ( ( b + 1 ) ) + " med bots will be on axis team." ); + self iprintln( ( ( b + 1 ) ) + " med bots will be on axis team." ); break; case "axismeddown": setdvar( "bots_skill_axis_med", ( b - 1 ) ); - self iPrintln( ( ( b - 1 ) ) + " med bots will be on axis team." ); + self iprintln( ( ( b - 1 ) ) + " med bots will be on axis team." ); break; case "allieshardup": setdvar( "bots_skill_allies_hard", ( b + 1 ) ); - self iPrintln( ( ( b + 1 ) ) + " hard bots will be on allies team." ); + self iprintln( ( ( b + 1 ) ) + " hard bots will be on allies team." ); break; case "alliesharddown": setdvar( "bots_skill_allies_hard", ( b - 1 ) ); - self iPrintln( ( ( b - 1 ) ) + " hard bots will be on allies team." ); + self iprintln( ( ( b - 1 ) ) + " hard bots will be on allies team." ); break; case "alliesmedup": setdvar( "bots_skill_allies_med", ( b + 1 ) ); - self iPrintln( ( ( b + 1 ) ) + " med bots will be on allies team." ); + self iprintln( ( ( b + 1 ) ) + " med bots will be on allies team." ); break; case "alliesmeddown": setdvar( "bots_skill_allies_med", ( b - 1 ) ); - self iPrintln( ( ( b - 1 ) ) + " med bots will be on allies team." ); + self iprintln( ( ( b - 1 ) ) + " med bots will be on allies team." ); break; } } @@ -1260,11 +1260,11 @@ man_bots( a, b ) if ( b == 1 ) { - self iPrintln( "Adding " + b + " bot." ); + self iprintln( "Adding " + b + " bot." ); } else { - self iPrintln( "Adding " + b + " bots." ); + self iprintln( "Adding " + b + " bots." ); } break; @@ -1276,9 +1276,9 @@ man_bots( a, b ) { tempBot = random( getBotArray() ); - if ( isDefined( tempBot ) ) + if ( isdefined( tempBot ) ) { - kick( tempBot getEntityNumber(), "EXE_PLAYERKICKED" ); + kick( tempBot getentitynumber(), "EXE_PLAYERKICKED" ); result = true; } @@ -1287,14 +1287,14 @@ man_bots( a, b ) if ( !result ) { - self iPrintln( "No bots to kick" ); + self iprintln( "No bots to kick" ); } break; case "autokick": - setDvar( "bots_manage_fill_kick", !b ); - self iPrintln( "Kicking bots when bots_fill is exceeded: " + !b ); + setdvar( "bots_manage_fill_kick", !b ); + self iprintln( "Kicking bots when bots_fill is exceeded: " + !b ); break; case "fillmode": @@ -1302,27 +1302,27 @@ man_bots( a, b ) { case 0: setdvar( "bots_manage_fill_mode", 1 ); - self iPrintln( "bot_fill will now count only bots." ); + self iprintln( "bot_fill will now count only bots." ); break; case 1: setdvar( "bots_manage_fill_mode", 2 ); - self iPrintln( "bot_fill will now count everyone, adjusting to map." ); + self iprintln( "bot_fill will now count everyone, adjusting to map." ); break; case 2: setdvar( "bots_manage_fill_mode", 3 ); - self iPrintln( "bot_fill will now count only bots, adjusting to map." ); + self iprintln( "bot_fill will now count only bots, adjusting to map." ); break; case 3: setdvar( "bots_manage_fill_mode", 4 ); - self iPrintln( "bot_fill will now use bots as team balance." ); + self iprintln( "bot_fill will now use bots as team balance." ); break; default: setdvar( "bots_manage_fill_mode", 0 ); - self iPrintln( "bot_fill will now count everyone." ); + self iprintln( "bot_fill will now count everyone." ); break; } @@ -1330,17 +1330,17 @@ man_bots( a, b ) case "fillup": setdvar( "bots_manage_fill", b + 1 ); - self iPrintln( "Increased to maintain " + ( b + 1 ) + " bot(s)." ); + self iprintln( "Increased to maintain " + ( b + 1 ) + " bot(s)." ); break; case "filldown": setdvar( "bots_manage_fill", b - 1 ); - self iPrintln( "Decreased to maintain " + ( b - 1 ) + " bot(s)." ); + self iprintln( "Decreased to maintain " + ( b - 1 ) + " bot(s)." ); break; case "fillspec": - setDvar( "bots_manage_fill_spec", !b ); - self iPrintln( "Count players on spectator for bots_fill: " + !b ); + setdvar( "bots_manage_fill_spec", !b ); + self iprintln( "Count players on spectator for bots_fill: " + !b ); break; } } diff --git a/maps/mp/bots/_wp_editor.gsc b/maps/mp/bots/_wp_editor.gsc index f321f4c..928819d 100644 --- a/maps/mp/bots/_wp_editor.gsc +++ b/maps/mp/bots/_wp_editor.gsc @@ -12,54 +12,54 @@ init() { - if ( getDvar( "bots_main_debug" ) == "" ) + if ( getdvar( "bots_main_debug" ) == "" ) { - setDvar( "bots_main_debug", 0 ); + setdvar( "bots_main_debug", 0 ); } - if ( !getDVarint( "bots_main_debug" ) ) + if ( !getdvarint( "bots_main_debug" ) ) { return; } - if ( !getDVarint( "developer" ) ) + if ( !getdvarint( "developer" ) ) { setdvar( "developer_script", 1 ); setdvar( "developer", 1 ); - setdvar( "sv_mapRotation", "map " + getDvar( "mapname" ) ); - exitLevel( false ); + setdvar( "sv_mapRotation", "map " + getdvar( "mapname" ) ); + exitlevel( false ); } - setDvar( "bots_main", 0 ); + setdvar( "bots_main", 0 ); setdvar( "bots_main_menu", 0 ); setdvar( "bots_manage_fill_mode", 0 ); setdvar( "bots_manage_fill", 0 ); setdvar( "bots_manage_add", 0 ); setdvar( "bots_manage_fill_kick", 1 ); - setDvar( "bots_manage_fill_spec", 1 ); + setdvar( "bots_manage_fill_spec", 1 ); - if ( getDvar( "bots_main_debug_distance" ) == "" ) + if ( getdvar( "bots_main_debug_distance" ) == "" ) { - setDvar( "bots_main_debug_distance", 512.0 ); + setdvar( "bots_main_debug_distance", 512.0 ); } - if ( getDvar( "bots_main_debug_cone" ) == "" ) + if ( getdvar( "bots_main_debug_cone" ) == "" ) { - setDvar( "bots_main_debug_cone", 0.65 ); + setdvar( "bots_main_debug_cone", 0.65 ); } - if ( getDvar( "bots_main_debug_minDist" ) == "" ) + if ( getdvar( "bots_main_debug_minDist" ) == "" ) { - setDvar( "bots_main_debug_minDist", 32.0 ); + setdvar( "bots_main_debug_minDist", 32.0 ); } - if ( getDvar( "bots_main_debug_drawThrough" ) == "" ) + if ( getdvar( "bots_main_debug_drawThrough" ) == "" ) { - setDvar( "bots_main_debug_drawThrough", false ); + setdvar( "bots_main_debug_drawThrough", false ); } - setDvar( "player_sustainAmmo", 1 ); + setdvar( "player_sustainAmmo", 1 ); level.waypoints = []; level.waypointcount = 0; @@ -79,7 +79,7 @@ onPlayerSpawned() } } -StartDev() +startDev() { self endon( "disconnect" ); self endon( "death" ); @@ -88,17 +88,17 @@ StartDev() level.autolink = false; self.nearest = -1; - self takeAllWeapons(); - self giveWeapon( "m16_gl_mp" ); // to knife windows - self giveWeapon( "javelin_mp" ); // to mark jav spots - self SetOffhandPrimaryClass( "other" ); - self giveWeapon( "semtex_mp" ); + self takeallweapons(); + self giveweapon( "m16_gl_mp" ); // to knife windows + self giveweapon( "javelin_mp" ); // to mark jav spots + self setoffhandprimaryclass( "other" ); + self giveweapon( "semtex_mp" ); self _clearperks(); self.specialty = []; - self maps\mp\perks\_perks::givePerk( "specialty_fastmantle" ); - self maps\mp\perks\_perks::givePerk( "specialty_falldamage" ); - self maps\mp\perks\_perks::givePerk( "specialty_marathon" ); - self maps\mp\perks\_perks::givePerk( "specialty_lightweight" ); + self maps\mp\perks\_perks::giveperk( "specialty_fastmantle" ); + self maps\mp\perks\_perks::giveperk( "specialty_falldamage" ); + self maps\mp\perks\_perks::giveperk( "specialty_marathon" ); + self maps\mp\perks\_perks::giveperk( "specialty_lightweight" ); self freezecontrols( false ); self thread watchAddWaypointCommand(); @@ -107,7 +107,7 @@ StartDev() self thread watchLinkWaypointCommand(); self thread watchLoadWaypointsCommand(); self thread watchSaveWaypointsCommand(); - self thread watchUnlinkWaypointCommand(); + self thread watchunlinkWaypointCommand(); self thread watchAutoLinkCommand(); self thread updateWaypointsStats(); self thread watchAstarCommand(); @@ -136,7 +136,7 @@ watchAstarCommand() self endon( "disconnect" ); self endon( "death" ); - self notifyOnPlayerCommand( "astar", "+gostand" ); + self notifyonplayercommand( "astar", "+gostand" ); for ( ;; ) { @@ -149,7 +149,7 @@ watchAstarCommand() self iprintln( "Start AStar" ); self.astar = undefined; - astar = spawnStruct(); + astar = spawnstruct(); astar.start = self.origin; self waittill( "astar" ); @@ -187,11 +187,11 @@ updateWaypointsStats() { wait 0.05; - totalWpsHud setText( level.waypointcount ); + totalWpsHud settext( level.waypointcount ); closest = -1; - myEye = self getEye(); - myAngles = self GetPlayerAngles(); + myEye = self geteye(); + myAngles = self getplayerangles(); for ( i = 0; i < level.waypointcount; i++ ) { @@ -202,24 +202,24 @@ updateWaypointsStats() wpOrg = level.waypoints[ i ].origin + ( 0, 0, 25 ); - if ( distance( level.waypoints[ i ].origin, self.origin ) < getDvarFloat( "bots_main_debug_distance" ) && ( bulletTracePassed( myEye, wpOrg, false, self ) || getDVarint( "bots_main_debug_drawThrough" ) ) ) + if ( distance( level.waypoints[ i ].origin, self.origin ) < getdvarfloat( "bots_main_debug_distance" ) && ( bullettracepassed( myEye, wpOrg, false, self ) || getdvarint( "bots_main_debug_drawThrough" ) ) ) { for ( h = level.waypoints[ i ].children.size - 1; h >= 0; h-- ) { line( wpOrg, level.waypoints[ level.waypoints[ i ].children[ h ] ].origin + ( 0, 0, 25 ), ( 1, 0, 1 ) ); } - if ( getConeDot( wpOrg, myEye, myAngles ) > getDvarFloat( "bots_main_debug_cone" ) ) + if ( getConeDot( wpOrg, myEye, myAngles ) > getdvarfloat( "bots_main_debug_cone" ) ) { print3d( wpOrg, i, ( 1, 0, 0 ), 2 ); } - if ( isDefined( level.waypoints[ i ].angles ) && level.waypoints[ i ].type != "stand" ) + if ( isdefined( level.waypoints[ i ].angles ) && level.waypoints[ i ].type != "stand" ) { - line( wpOrg, wpOrg + AnglesToForward( level.waypoints[ i ].angles ) * 64, ( 1, 1, 1 ) ); + line( wpOrg, wpOrg + anglestoforward( level.waypoints[ i ].angles ) * 64, ( 1, 1, 1 ) ); } - if ( isDefined( level.waypoints[ i ].jav_point ) ) + if ( isdefined( level.waypoints[ i ].jav_point ) ) { line( wpOrg, level.waypoints[ i ].jav_point, ( 0, 0, 0 ) ); } @@ -228,13 +228,13 @@ updateWaypointsStats() self.nearest = closest; - nearestWP setText( self.nearest ); + nearestWP settext( self.nearest ); - children setText( buildChildCountString( self.nearest ) ); + children settext( buildChildCountString( self.nearest ) ); - type setText( buildTypeString( self.nearest ) ); + type settext( buildTypeString( self.nearest ) ); - wpToLink setText( level.wptolink ); + wpToLink settext( level.wptolink ); infotext.x = infotext.x - 2; @@ -243,13 +243,13 @@ updateWaypointsStats() infotext.x = 800; } - if ( self UseButtonPressed() && time > 2 ) + if ( self usebuttonpressed() && time > 2 ) { time = 0; - self iPrintLnBold( self.nearest + " children: " + buildChildString( self.nearest ) ); + self iprintlnbold( self.nearest + " children: " + buildChildString( self.nearest ) ); } - if ( isDefined( self.astar ) ) + if ( isdefined( self.astar ) ) { print3d( self.astar.start + ( 0, 0, 35 ), "start", ( 0, 0, 1 ), 2 ); print3d( self.astar.goal + ( 0, 0, 35 ), "goal", ( 0, 0, 1 ), 2 ); @@ -275,7 +275,7 @@ watchLoadWaypointsCommand() self endon( "disconnect" ); self endon( "death" ); - self notifyOnPlayerCommand( "[{+actionslot 2}]", "+actionslot 2" ); + self notifyonplayercommand( "[{+actionslot 2}]", "+actionslot 2" ); for ( ;; ) { @@ -289,7 +289,7 @@ watchAddWaypointCommand() self endon( "disconnect" ); self endon( "death" ); - self notifyOnPlayerCommand( "[{+smoke}]", "+smoke" ); + self notifyonplayercommand( "[{+smoke}]", "+smoke" ); for ( ;; ) { @@ -303,7 +303,7 @@ watchAutoLinkCommand() self endon( "disconnect" ); self endon( "death" ); - self notifyOnPlayerCommand( "[{+frag}]", "+frag" ); + self notifyonplayercommand( "[{+frag}]", "+frag" ); for ( ;; ) { @@ -311,13 +311,13 @@ watchAutoLinkCommand() if ( level.autolink ) { - self iPrintlnBold( "Auto link disabled" ); + self iprintlnbold( "Auto link disabled" ); level.autolink = false; level.wptolink = -1; } else { - self iPrintlnBold( "Auto link enabled" ); + self iprintlnbold( "Auto link enabled" ); level.autolink = true; level.wptolink = self.nearest; } @@ -329,7 +329,7 @@ watchLinkWaypointCommand() self endon( "disconnect" ); self endon( "death" ); - self notifyOnPlayerCommand( "[{+melee}]", "+melee" ); + self notifyonplayercommand( "[{+melee}]", "+melee" ); for ( ;; ) { @@ -338,12 +338,12 @@ watchLinkWaypointCommand() } } -watchUnlinkWaypointCommand() +watchunlinkWaypointCommand() { self endon( "disconnect" ); self endon( "death" ); - self notifyOnPlayerCommand( "[{+reload}]", "+reload" ); + self notifyonplayercommand( "[{+reload}]", "+reload" ); for ( ;; ) { @@ -357,7 +357,7 @@ watchDeleteWaypointCommand() self endon( "disconnect" ); self endon( "death" ); - self notifyOnPlayerCommand( "[{+actionslot 3}]", "+actionslot 3" ); + self notifyonplayercommand( "[{+actionslot 3}]", "+actionslot 3" ); for ( ;; ) { @@ -371,7 +371,7 @@ watchDeleteAllWaypointsCommand() self endon( "disconnect" ); self endon( "death" ); - self notifyOnPlayerCommand( "[{+actionslot 4}]", "+actionslot 4" ); + self notifyonplayercommand( "[{+actionslot 4}]", "+actionslot 4" ); for ( ;; ) { @@ -385,7 +385,7 @@ watchSaveWaypointsCommand() self endon( "death" ); self endon( "disconnect" ); - self notifyOnPlayerCommand( "[{+actionslot 1}]", "+actionslot 1" ); + self notifyonplayercommand( "[{+actionslot 1}]", "+actionslot 1" ); for ( ;; ) { @@ -411,12 +411,12 @@ watchSaveWaypointsCommand() logprint( "*/waypoints[ " + i + " ].children[ " + c + " ] = " + level.waypoints[ i ].children[ c ] + ";\n/*" ); } - if ( isDefined( level.waypoints[ i ].angles ) && ( level.waypoints[ i ].type == "claymore" || level.waypoints[ i ].type == "tube" || ( level.waypoints[ i ].type == "crouch" && level.waypoints[ i ].children.size == 1 ) || level.waypoints[ i ].type == "climb" || level.waypoints[ i ].type == "grenade" ) ) + if ( isdefined( level.waypoints[ i ].angles ) && ( level.waypoints[ i ].type == "claymore" || level.waypoints[ i ].type == "tube" || ( level.waypoints[ i ].type == "crouch" && level.waypoints[ i ].children.size == 1 ) || level.waypoints[ i ].type == "climb" || level.waypoints[ i ].type == "grenade" ) ) { logprint( "*/waypoints[ " + i + " ].angles = " + level.waypoints[ i ].angles + ";\n/*" ); } - if ( isDefined( level.waypoints[ i ].jav_point ) && level.waypoints[ i ].type == "javelin" ) + if ( isdefined( level.waypoints[ i ].jav_point ) && level.waypoints[ i ].type == "javelin" ) { logprint( "*/waypoints[ " + i + " ].jav_point = " + level.waypoints[ i ].jav_point + ";\n/*" ); } @@ -426,8 +426,8 @@ watchSaveWaypointsCommand() filename = "waypoints/" + getdvar( "mapname" ) + "_wp.csv"; - PrintLn( "********* Start Bot Warfare WPDump *********" ); - PrintLn( level.waypointcount ); + println( "********* Start Bot Warfare WPDump *********" ); + println( level.waypointcount ); BotBuiltinFileWrite( filename, level.waypointcount + "\n", "write" ); @@ -450,7 +450,7 @@ watchSaveWaypointsCommand() str += "," + wp.type + ","; - if ( isDefined( wp.angles ) ) + if ( isdefined( wp.angles ) ) { str += wp.angles[ 0 ] + " " + wp.angles[ 1 ] + " " + wp.angles[ 2 ] + ","; } @@ -459,7 +459,7 @@ watchSaveWaypointsCommand() str += ","; } - if ( isDefined( wp.jav_point ) ) + if ( isdefined( wp.jav_point ) ) { str += wp.jav_point[ 0 ] + " " + wp.jav_point[ 1 ] + " " + wp.jav_point[ 2 ] + ","; } @@ -468,11 +468,11 @@ watchSaveWaypointsCommand() str += ","; } - PrintLn( str ); + println( str ); BotBuiltinFileWrite( filename, str + "\n", "append" ); } - PrintLn( "\n\n\n\n\n\n" ); + println( "\n\n\n\n\n\n" ); self iprintln( "Saved!!! to " + filename ); } @@ -481,7 +481,7 @@ watchSaveWaypointsCommand() LoadWaypoints() { self DeleteAllWaypoints(); - self iPrintlnBold( "Loading WPS..." ); + self iprintlnbold( "Loading WPS..." ); load_waypoints(); wait 1; @@ -503,7 +503,7 @@ checkForWarnings() for ( i = 0; i < level.waypointcount; i++ ) { - if ( !isDefined( level.waypoints[ i ] ) ) + if ( !isdefined( level.waypoints[ i ] ) ) { self iprintln( "WARNING: waypoint " + i + " is undefined" ); continue; @@ -515,7 +515,7 @@ checkForWarnings() } else { - if ( !isDefined( level.waypoints[ i ].children ) || !isDefined( level.waypoints[ i ].children.size ) ) + if ( !isdefined( level.waypoints[ i ].children ) || !isdefined( level.waypoints[ i ].children.size ) ) { self iprintln( "WARNING: waypoint " + i + " children is not defined" ); } @@ -525,7 +525,7 @@ checkForWarnings() { child = level.waypoints[ i ].children[ h ]; - if ( !isDefined( level.waypoints[ child ] ) ) + if ( !isdefined( level.waypoints[ child ] ) ) { self iprintln( "WARNING: waypoint " + i + " child " + child + " is undefined" ); } @@ -537,18 +537,18 @@ checkForWarnings() } } - if ( !isDefined( level.waypoints[ i ].type ) ) + if ( !isdefined( level.waypoints[ i ].type ) ) { self iprintln( "WARNING: waypoint " + i + " type is undefined" ); continue; } - if ( level.waypoints[ i ].type == "javelin" && !isDefined( level.waypoints[ i ].jav_point ) ) + if ( level.waypoints[ i ].type == "javelin" && !isdefined( level.waypoints[ i ].jav_point ) ) { self iprintln( "WARNING: waypoint " + i + " jav_point is undefined" ); } - if ( !isDefined( level.waypoints[ i ].angles ) && ( level.waypoints[ i ].type == "claymore" || level.waypoints[ i ].type == "tube" || ( level.waypoints[ i ].type == "crouch" && level.waypoints[ i ].children.size == 1 ) || level.waypoints[ i ].type == "climb" || level.waypoints[ i ].type == "grenade" ) ) + if ( !isdefined( level.waypoints[ i ].angles ) && ( level.waypoints[ i ].type == "claymore" || level.waypoints[ i ].type == "tube" || ( level.waypoints[ i ].type == "crouch" && level.waypoints[ i ].children.size == 1 ) || level.waypoints[ i ].type == "climb" || level.waypoints[ i ].type == "grenade" ) ) { self iprintln( "WARNING: waypoint " + i + " angles is undefined" ); } @@ -556,7 +556,7 @@ checkForWarnings() // check reachability, assume bidirectional graph - wpIdx = randomInt( level.waypointcount ); + wpIdx = randomint( level.waypointcount ); for ( i = 0; i < level.waypointcount; i++ ) { @@ -578,9 +578,9 @@ checkForWarnings() UnLinkWaypoint( nwp ) { - if ( nwp == -1 || distance( self.origin, level.waypoints[ nwp ].origin ) > getDvarFloat( "bots_main_debug_minDist" ) ) + if ( nwp == -1 || distance( self.origin, level.waypoints[ nwp ].origin ) > getdvarfloat( "bots_main_debug_minDist" ) ) { - self iprintln( "Waypoint Unlink Cancelled " + level.wptolink ); + self iprintln( "Waypoint unlink Cancelled " + level.wptolink ); level.wptolink = -1; return; } @@ -588,7 +588,7 @@ UnLinkWaypoint( nwp ) if ( level.wptolink == -1 || nwp == level.wptolink ) { level.wptolink = nwp; - self iprintln( "Waypoint Unlink Started " + nwp ); + self iprintln( "Waypoint unlink Started " + nwp ); return; } @@ -601,7 +601,7 @@ UnLinkWaypoint( nwp ) LinkWaypoint( nwp ) { - if ( nwp == -1 || distance( self.origin, level.waypoints[ nwp ].origin ) > getDvarFloat( "bots_main_debug_minDist" ) ) + 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; @@ -658,7 +658,7 @@ LinkWaypoint( nwp ) DeleteWaypoint( nwp ) { - if ( nwp == -1 || distance( self.origin, level.waypoints[ nwp ].origin ) > getDvarFloat( "bots_main_debug_minDist" ) ) + if ( nwp == -1 || distance( self.origin, level.waypoints[ nwp ].origin ) > getdvarfloat( "bots_main_debug_minDist" ) ) { self iprintln( "No close enough waypoint to delete." ); return; @@ -708,35 +708,35 @@ AddWaypoint() { level.waypoints[ level.waypointcount ] = spawnstruct(); - pos = self getOrigin(); + pos = self getorigin(); level.waypoints[ level.waypointcount ].origin = pos; - if ( isDefined( self.javelintargetpoint ) ) + if ( isdefined( self.javelintargetpoint ) ) { level.waypoints[ level.waypointcount ].type = "javelin"; } - else if ( self AdsButtonPressed() ) + else if ( self adsbuttonpressed() ) { level.waypoints[ level.waypointcount ].type = "climb"; } - else if ( self AttackButtonPressed() && self UseButtonPressed() ) + else if ( self attackbuttonpressed() && self usebuttonpressed() ) { level.waypoints[ level.waypointcount ].type = "tube"; } - else if ( self AttackButtonPressed() ) + else if ( self attackbuttonpressed() ) { level.waypoints[ level.waypointcount ].type = "grenade"; } - else if ( self UseButtonPressed() ) + else if ( self usebuttonpressed() ) { 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 = []; @@ -826,8 +826,8 @@ destroyOnDeath( hud ) initHudElem( txt, xl, yl ) { - hud = NewClientHudElem( self ); - hud setText( txt ); + hud = newclienthudelem( self ); + hud settext( txt ); hud.alignx = "left"; hud.aligny = "top"; hud.horzalign = "left"; @@ -850,8 +850,8 @@ initHudElem( txt, xl, yl ) 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 = 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"; @@ -874,7 +874,7 @@ initHudElem2() initHudElem3() { - bar = level createServerBar( ( 0.5, 0.5, 0.5 ), 1000, 25 ); + bar = level createserverbar( ( 0.5, 0.5, 0.5 ), 1000, 25 ); bar.alignx = "center"; bar.aligny = "bottom"; bar.horzalign = "center"; @@ -889,7 +889,7 @@ initHudElem3() initHudElem4() { - OptionsBG = NewClientHudElem( self ); + OptionsBG = newclienthudelem( self ); OptionsBG.x = 100; OptionsBG.y = 2; OptionsBG.alignx = "left";