From 4783e1c9e1d2346c62a0631d8c0af8f01d9affe9 Mon Sep 17 00:00:00 2001 From: ChocoTaco Date: Tue, 25 Mar 2025 01:06:24 -0400 Subject: [PATCH 01/48] dtStats 10.55 --- Classic/scripts/autoexec/z_dtStats.cs | 52 ++++++++++++++------------- 1 file changed, 27 insertions(+), 25 deletions(-) diff --git a/Classic/scripts/autoexec/z_dtStats.cs b/Classic/scripts/autoexec/z_dtStats.cs index 2789968..4b124e3 100644 --- a/Classic/scripts/autoexec/z_dtStats.cs +++ b/Classic/scripts/autoexec/z_dtStats.cs @@ -15,7 +15,7 @@ // Note See bottom of file for full log ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// //-----------Settings----------- -$dtStats::version = 10.53; +$dtStats::version = 10.55; //disable stats system $dtStats::Enable = $Host::dtStatsEnable $= "" ? ($Host::dtStatsEnable = 1) : $Host::dtStatsEnable; if(!$dtStats::Enable){ return;}// so it disables with a restart @@ -31,7 +31,7 @@ $dtStats::midAirMessage = $Host::dtStatsMidAirMessage $= "" ? ($Host::dtStatsMi //capture best cap times restart required if changed //only enable if evo system is not available -$dtStats::ctfTimes = $Host::dtStatsCTFTimes $= "" ? ($Host::dtStatsCTFTimes = 0) : $Host::dtStatsCTFTimes; +$dtStats::ctfTimes = $Host::dtStatsCTFTimes $= "" ? ($Host::dtStatsCTFTimes = 1) : $Host::dtStatsCTFTimes; //number of players before it starts counting captimes $dtStats::ctfTimesPlayerLimit = $Host::dtStatsCTFTimesPlayerLimit $= "" ? ($Host::dtStatsCTFTimesPlayerLimit = 8) : $Host::dtStatsCTFTimesPlayerLimit; @@ -66,7 +66,7 @@ $dtStats::sortSpeed = 64; //To rebuild the leaderboards manually type lStatsCycle(1) into the console; //This time marks the end of day and to rebuild the leaderboards, best set this time when the server is normally empty or low numbers -$dtStats::buildSetTime = $Host::dtStatsBuildSetTime $= "" ? ($Host::dtStatsBuildSetTime = "5\t00\tam") : $Host::dtStatsBuildSetTime; +$dtStats::buildSetTime = $Host::dtStatsBuildSetTime $= "" ? ($Host::dtStatsBuildSetTime = "8\t00\tam") : $Host::dtStatsBuildSetTime; // top 15 players per cat, best not to change $dtStats::topAmount = 15; @@ -7034,11 +7034,11 @@ function dtMinMax(%statName,%group,%minMax,%value,%client){ dtGameStat.name[%statName] = getTaggedString(%client.name); dtGameStat.client[%statName] = %client; } - case 3: + case 3://value counter; dtGameStat.statTrack[%statName, %client] += %value; - %minMax = dtGameStat.statTrack[%statName, %client]; - if(dtGameStat.stat[%statName] < %value || dtGameStat.stat[%statName] $= ""){ - dtGameStat.stat[%statName] = %value; + %curValue = dtGameStat.statTrack[%statName, %client]; + if(dtGameStat.stat[%statName] < %curValue || dtGameStat.stat[%statName] $= ""){ + dtGameStat.stat[%statName] = %curValue; dtGameStat.name[%statName] = getTaggedString(%client.name); dtGameStat.client[%statName] = %client; } @@ -10471,7 +10471,7 @@ function statsMenu(%client,%game){ %mon = $lData::mon[%lType, %client.lgame, %page]; if(%build $= "Build" && !$dtStatsImgBuild){ genBigStats(%client.lgame, %lType, getField(%mon,0),getField(%mon,1)); - messageAll('MsgStats', '\c3Stats build started, server performance may degrade for a few minutes~wfx/misc/hunters_greed.wav'); + messageAll('MsgStats', '\c3Stats image build started, server performance may degrade for a few minutes~wfx/misc/hunters_greed.wav'); $dtStatsImgBuild = 1; } } @@ -12236,7 +12236,7 @@ function lStatsCycle(%build,%runReset){ // starts and manages the build/sort cyc $dtStats::hostTimeLimit = $Host::TimeLimit; if(isGameRun()){//if for some reason the game is running extend the time limit untill done Game.voteChangeTimeLimit(1,$Host::TimeLimit+120); - messageAll('MsgStats', '\c3Stats build started, adjusting time limit temporarily'); + messageAll('MsgStats', '\c3Stats build started, adjusting time limit temporarily~wfx/misc/hunters_horde.wav'); $dtStats::timeChange =1; } } @@ -16665,10 +16665,11 @@ function genBigMapStats(%count){ else{ genBigMapStats(%count++); } - } + } else{ $dtStats::tmCompile = 0; error("map stats compile done"); + messageAll('MsgStats', '\c3Map stats image build has finished~wfx/misc/hunters_greed.wav'); } } @@ -16954,21 +16955,21 @@ function imgCycle3(%img, %count){ } } -function dumpTest(){ - deleteVariables("$textColor*"); - addGLText("abcdefghijklmnop", 0, 30, "3 213 151", 15, 500); - new fileObject(img); - RootGroup.add(img); - img.openForWrite("serverStats/statsImg/test.ppm"); - img.x = 256; - img.y = 256; - img.writeLine("P3"); - img.writeLine(img.x SPC img.y); - img.writeLine("255"); - img.yc = 0; - img.py = 0; - imgCycle(img); -} +//function dumpTest(){ + //deleteVariables("$textColor*"); + //addGLText("abcdefghijklmnop", 0, 30, "3 213 151", 15, 500); + //new fileObject(img); + //RootGroup.add(img); + //img.openForWrite("serverStats/statsImg/test.ppm"); + //img.x = 256; + //img.y = 256; + //img.writeLine("P3"); + //img.writeLine(img.x SPC img.y); + //img.writeLine("255"); + //img.yc = 0; + //img.py = 0; + //imgCycle(img); +//} function isInsideBorder(%img,%x, %y) { @@ -17086,6 +17087,7 @@ function imgCycle(%img){ %img.delete(); deleteVariables("$textColor*"); error("Stats Image Done"); + messageAll('MsgStats', '\c3Stats image build has finished~wfx/misc/hunters_greed.wav'); $dtStatsImgBuild = 0; } } From 73e3ba13187d0d7b8a81689e488da878e4a87d55 Mon Sep 17 00:00:00 2001 From: ChocoTaco Date: Tue, 25 Mar 2025 01:21:36 -0400 Subject: [PATCH 02/48] dtStats 10.57 --- Classic/scripts/autoexec/z_dtStats.cs | 28 ++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/Classic/scripts/autoexec/z_dtStats.cs b/Classic/scripts/autoexec/z_dtStats.cs index 4b124e3..b10738f 100644 --- a/Classic/scripts/autoexec/z_dtStats.cs +++ b/Classic/scripts/autoexec/z_dtStats.cs @@ -15,7 +15,7 @@ // Note See bottom of file for full log ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// //-----------Settings----------- -$dtStats::version = 10.55; +$dtStats::version = 10.57; //disable stats system $dtStats::Enable = $Host::dtStatsEnable $= "" ? ($Host::dtStatsEnable = 1) : $Host::dtStatsEnable; if(!$dtStats::Enable){ return;}// so it disables with a restart @@ -30,7 +30,7 @@ $dtStats::midAirHeight = 10; $dtStats::midAirMessage = $Host::dtStatsMidAirMessage $= "" ? ($Host::dtStatsMidAirMessage = 1) : $Host::dtStatsMidAirMessage; //capture best cap times restart required if changed -//only enable if evo system is not available +//only enable if evo system is not available $dtStats::ctfTimes = $Host::dtStatsCTFTimes $= "" ? ($Host::dtStatsCTFTimes = 1) : $Host::dtStatsCTFTimes; //number of players before it starts counting captimes $dtStats::ctfTimesPlayerLimit = $Host::dtStatsCTFTimesPlayerLimit $= "" ? ($Host::dtStatsCTFTimesPlayerLimit = 8) : $Host::dtStatsCTFTimesPlayerLimit; @@ -66,7 +66,7 @@ $dtStats::sortSpeed = 64; //To rebuild the leaderboards manually type lStatsCycle(1) into the console; //This time marks the end of day and to rebuild the leaderboards, best set this time when the server is normally empty or low numbers -$dtStats::buildSetTime = $Host::dtStatsBuildSetTime $= "" ? ($Host::dtStatsBuildSetTime = "8\t00\tam") : $Host::dtStatsBuildSetTime; +$dtStats::buildSetTime = $Host::dtStatsBuildSetTime $= "" ? ($Host::dtStatsBuildSetTime = "5\t00\tam") : $Host::dtStatsBuildSetTime; // top 15 players per cat, best not to change $dtStats::topAmount = 15; @@ -1768,7 +1768,7 @@ $statsName["scoreMax"] = "Highest Score" TAB "Kmh"; $statsName["grabSpeedMax"] = "Max Grab Speed" TAB "Kmh"; $statsName["flagCatchSpeedMax"] = "Flag Catch Speed" TAB "Khm"; $statsName["maFlagCatchSpeedMax"] = "MidAir Flag Speed" TAB "Kmh"; -$statsName["interceptSpeedMax"] = "Flag Intercept Speed" TAB "Kmh"; +$statsName["interceptSpeedMax"] = "Intercept Speed" TAB "Kmh"; $statsName["interceptFlagSpeedMax"] = "Flag Speed Grab" TAB "Kmh"; $statsName["maHitDistMax"] = "Midair Distance" TAB "Meter"; $statsName["maHitHeightMax"] = "Highest MidAir" TAB "Meter"; @@ -3400,8 +3400,15 @@ package dtStats{ else %othertotdistance = mFloor(%cl.totalDistance); if(%cl.totalShockHits == 0) %shockhits = 0; else %shockhits = mFloor(%cl.totalShockHits); - messageClient( %client, 'MsgDebriefAddLine', "", ' %1%2%3%4%5%6%7%8%%%9', - %cl.name, %score, %kills, %mas, %avgSpeed, %avgDistance, %othertotdistance, %shockPercent, %shockhits); + + if(%client == %cl){ + messageClient( %client, 'MsgDebriefAddLine', "", ' %1%2%3%4%5%6%7%8%%%9', + StripMLControlChars(getTaggedString(%cl.name)), %score, %kills, %mas, %avgSpeed, %avgDistance, %othertotdistance, %shockPercent, %shockhits); + } + else{ + messageClient( %client, 'MsgDebriefAddLine', "", ' %1%2%3%4%5%6%7%8%%%9', + StripMLControlChars(getTaggedString(%cl.name)), %score, %kills, %mas, %avgSpeed, %avgDistance, %othertotdistance, %shockPercent, %shockhits); + } if(%score) %totscore += %score; if(%kills) %totkills += %kills; @@ -3415,7 +3422,6 @@ package dtStats{ if(%shockhits){ %totshockhits += %shockhits; } } - messageClient( %client, 'MsgDebriefAddLine', "", '%1%2%3%4%5%6%7%8%%%9\n', " Totals:", %totscore, %totkills, %totmas, mFloor(%totspeed/%speeds), mFloor(%totdistance/%dists), %alltotdistance, mFloor(%totshockpercent/%shocks), %totshockhits); extendedDebrief(%game, %client); @@ -4620,7 +4626,7 @@ function DMHud(%game, %client, %tag){// note in this game type the score hud can messageClient( %client, 'SetLineHud', "", %tag, %index, '%5\t%1%2%3%4%6', %cl.name, %clScore, %clKills, %clDeaths, %clStyle, %clBonus); } - //else for observers, create an anchor around the player name so they can be observed + //else for observers, create an anchor around the player name so they can be observed else { messageClient( %client, 'SetLineHud', "", %tag, %index, '%5\t%1%2%3%4%7', @@ -4980,7 +4986,7 @@ function CTFHud(%game, %client, %tag){// defaultGame/evo messageClient(%client, 'SetLineHud', "", %tag, %index, '\t%5%1%2\t%6%3%4', %team1Client.name, %team1ClientScore, %team2Client.name, %team2ClientScore, %col1Style, %col2Style); } else{ //else for observers, create an anchor around the player name so they can be observed - messageClient(%client, 'SetLineHud', "", %tag, %index, '\t%5%1%2\t%6%3%4', %team1Client.name, %team1ClientScore, %team2Client.name, %team2ClientScore, %col1Style, %col2Style); + messageClient(%client, 'SetLineHud', "", %tag, %index, '\t%5%1%2\t%6%3%4', %team1Client.name, %team1ClientScore, %team2Client.name, %team2ClientScore, %col1Style, %col2Style,%team1Client,%team2Client); } %index++; } @@ -18875,7 +18881,7 @@ function renderCTFMapTextTM(%id){ schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); %line = hasValueC(getField($pugMapData[1,"name","flagCatchTG"],0),%noValue,"",-1); schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[1,"data","flagCatchTG"],0),%noValue," Sec",2); + %line = hasValueC(getField($pugMapData[1,"data","flagCatchTG"],0),%noValue,"",2); schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); %lineCount++; @@ -19112,7 +19118,7 @@ function renderCTFMapTextTM(%id){ schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); %line = hasValueC(getField($pugMapData[2,"name","flagCatchTG"],0),%noValue,"",-1); schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[2,"data","flagCatchTG"],0),%noValue," Sec",1); + %line = hasValueC(getField($pugMapData[2,"data","flagCatchTG"],0),%noValue,"",1); schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); %lineCountTeam2++; From 9a4bc680883db8c6865de6206d02e6a0cd022b0b Mon Sep 17 00:00:00 2001 From: ChocoTaco Date: Thu, 27 Mar 2025 21:42:23 -0400 Subject: [PATCH 03/48] Update GameGui.cs Removed spaces --- Classic/scripts/GameGui.cs | 120 ++++++++++++++++++------------------- 1 file changed, 60 insertions(+), 60 deletions(-) diff --git a/Classic/scripts/GameGui.cs b/Classic/scripts/GameGui.cs index bb7daf0..e7bac6e 100644 --- a/Classic/scripts/GameGui.cs +++ b/Classic/scripts/GameGui.cs @@ -4,7 +4,7 @@ // //------------------------------------------------------------------------------ -// z0dd - ZOD: Execute the mission and game type skip lists so that +// z0dd - ZOD: Execute the mission and game type skip lists so that // arrays are put into memory for function buildMissionList. exec("prefs/MissionSkip.cs", true); exec("prefs/GameTypeSkip.cs", true); @@ -57,12 +57,12 @@ function GameGui::onSleep( %this ) %ctrl = "GM_" @ %this.pane @ "Pane"; if ( isObject( %ctrl ) ) %ctrl.onDeactivate(); - + // if( isObject( $dummySeq ) ) -// { +// { // $dummySeq.delete(); // } - + Canvas.popDialog(LaunchToolbarDlg); } @@ -124,7 +124,7 @@ function GM_JoinPane::onActivate( %this ) GMJ_Browser.lastQuery = $PlayingOnline ? "Master" : "LanServers"; GMJ_Browser.runQuery(); } - + if ( isObject( BrowserMap ) ) { BrowserMap.pop(); @@ -151,7 +151,7 @@ function GM_JoinPane::onDeactivate( %this ) BrowserMap.pop(); BrowserMap.delete(); } - + GM_VersionText.setVisible( false ); $pref::ServerBrowser::InfoWindowOpen = GMJ_Browser.infoWindowOpen; @@ -324,15 +324,15 @@ function GMJ_Browser::runQuery( %this ) if ( %regionMask $= "" ) %regionMask = 4294967295; - queryMasterServer( - $JoinGamePort, - 0, // Flags - %rulesSet, // Rules Set - %missionType, // Mission Type - getField( %filter, 3 ), // Min Players + queryMasterServer( + $JoinGamePort, + 0, // Flags + %rulesSet, // Rules Set + %missionType, // Mission Type + getField( %filter, 3 ), // Min Players %maxPlayers, // Max Players - %maxBots, // Max Bots - %regionMask, // Region Mask + %maxBots, // Max Bots + %regionMask, // Region Mask getField( %filter, 6 ), // Max Ping getField( %filter, 8 ), // Min CPU Speed getField( %filter, 9 ) ); // Filter flags @@ -379,15 +379,15 @@ function GMJ_Browser::onDatabaseRow( %this, %row, %isLastRow, %key ) if ( %isLastRow ) { GMJ_StatusText.setValue( "Querying the master server..." ); - queryMasterServer( - $JoinGamePort, // Port - 0, // Flags - "Any", // Rules Set - "Any", // Mission Type - 0, // Min Players + queryMasterServer( + $JoinGamePort, // Port + 0, // Flags + "Any", // Rules Set + "Any", // Mission Type + 0, // Min Players 255, // Max Players - 32, // Max Bots - 0xFFFFFFFF, // Region Mask + 32, // Max Bots + 0xFFFFFFFF, // Region Mask 0, // Max Ping 0, // Min CPU Speed 0, // Filter flags @@ -479,7 +479,7 @@ function GMJ_Browser::insertIPAddress( %this ) alxPlay( InputDeniedSound, 0, 0, 0 ); return; } - + IPEntry.setText( "IP:" ); Canvas.pushDialog( EnterIPDlg ); } @@ -493,8 +493,8 @@ function EnterIPDlg::onDone( %this ) %address = "IP:" @ %address; if ( strpos( %address, ":", 3 ) == -1 ) %address = %address @ ":28000"; - - echo( "Starting ping to server " @ %address @ "..." ); + + echo( "Starting ping to server " @ %address @ "..." ); pushServerAddress( %address ); GMJ_Browser.selectRowByAddress( %address, true ); } @@ -652,8 +652,8 @@ function SI_ContentWindow::fill( %this, %content ) %string = %string NL "\n" @ ServerInfoDlg.headerStyle @ "PLAYERSTEAMSCORE"; for ( %i = 0; %i < %playerCount; %i++ ) { - %playerEntry = getRecord( %content, %record ); - %string = %string NL "" SPC getField( %playerEntry, 0 ) @ "" + %playerEntry = getRecord( %content, %record ); + %string = %string NL "" SPC getField( %playerEntry, 0 ) @ "" SPC getField( %playerEntry, 1 ) @ "" SPC getField( %playerEntry, 2 ) @ ""; %record++; } @@ -666,7 +666,7 @@ function SI_ContentWindow::fill( %this, %content ) %string = "" @ ServerInfoDlg.headerStyle @ "PLAYERSSCORE"; for ( %i = 0; %i < %playerCount; %i++ ) { - %playerEntry = getRecord( %content, %record ); + %playerEntry = getRecord( %content, %record ); %string = %string NL "" SPC getField( %playerEntry, 0 ) @ "" SPC getField( %playerEntry, 2 ); %record++; } @@ -684,7 +684,7 @@ function ServerInfoDlg::onSleep( %this ) $pref::ServerBrowser::InfoWindowPos = SI_Window.getPosition(); $pref::ServerBrowser::InfoWindowExtent = SI_Window.getExtent(); $pref::ServerBrowser::InfoWindowBarPos = getWord( SI_InfoScroll.getExtent(), 1 ); - + GMJ_InfoBtn.setActive( true ); } @@ -733,7 +733,7 @@ function GM_HostPane::onActivate( %this ) GameGui.pane = "Host"; $HostGameType = $PlayingOnline ? "Online" : "LAN"; - + buildMissionTypePopup( GMH_MissionType ); // --------------------------------------------------- // z0dd - ZOD, 9/29/02. Removed T2 demo code from here @@ -794,7 +794,7 @@ function buildMissionTypePopup( %popup ) %popup.clear(); for( %type = 0; %type < $HostTypeCount; %type++ ) %popup.add( $HostTypeDisplayName[%type], %type ); - %popup.sort( true ); + %popup.sort( true ); } //------------------------------------------------------------------------------ @@ -972,7 +972,7 @@ function addRotationMap(%missionFile, %gameType, %freeForAll, %cycle, %minPlayer $HostMissionFile[%mis] = %missionFile; $HostMissionName[%mis] = %missionFile; $BotEnabled[%mis] = isFile("terrains/" @ %missionFile @".nav"); - + // Load custom display name %f = new FileObject(); @@ -1281,7 +1281,7 @@ function getNextMission(%missionName, %gameType) deleteVariables("$MapPlayed*"); if($Host::botsEnabled && $BotMissionCount[%type] >= $MapPlayedCount) deleteVariables("$MapPlayed*"); - + %length = 0; %index = -1; // Build array of missions @@ -1311,7 +1311,7 @@ function getNextMission(%missionName, %gameType) // Randomize if set by pref or if the mission played was not on the cycle // TODO: Actually make it go on to the next mission in the list instead of randomize when a mission not in the cycle is played? // error("LENGTH: "@%length); - if ($Host::ClassicRandomMissions || !%list[%index])// { + if ($Host::ClassicRandomMissions || !%list[%index])// { %index = getRandom(1, %length);// error("INDEX: "@%index); } // Otherwise, on to the next mission else @@ -1400,8 +1400,8 @@ function StartHostedGame() if ( $Host::Dedicated ) { - MessageBoxYesNo( "WARNING", - "You are about to launch a dedicated server and quit Tribes 2. Do you want to continue?", + MessageBoxYesNo( "WARNING", + "You are about to launch a dedicated server and quit Tribes 2. Do you want to continue?", "tryToLaunchDedicatedServer(" @ $Host::PureServer @ ");" ); return; } @@ -1454,7 +1454,7 @@ function GMH_BotsEnabledTgl::onAction( %this ) %id = GMH_MissionList.getRowId( %i ); GMH_MissionList.setRowActive( %id, $BotEnabled[%id] ); } - + GMH_EnableBotsGroup.setVisible(true); %misId = GMH_MissionList.getSelectedId(); GMH_StartGameBtn.setActive( $BotEnabled[%misId] ); @@ -1501,7 +1501,7 @@ function GMH_BotsEnabledTgl::onAction( %this ) %id = GMH_MissionList.getRowId( %i ); GMH_MissionList.setRowActive( %id, $BotEnabled[%id] ); } - + GMH_EnableBotsGroup.setVisible(true); %misId = GMH_MissionList.getSelectedId(); GMH_StartGameBtn.setActive( $BotEnabled[%misId] ); @@ -1534,7 +1534,7 @@ function validateMaxPlayers() // --------------------------------------------------- // z0dd - ZOD, 9/29/02. Removed T2 demo code from here - + //and make sure the bot sliders reflect the changes.. setBotCountSlider(); // --------------------------------------------------- @@ -1576,7 +1576,7 @@ function AdvancedHostDlg::onWake( %this ) if ( $Host::HiVisibility ) AH_HiVisibilityRdo.setValue( true ); else - AH_HiFPSRdo.setValue( true ); + AH_HiFPSRdo.setValue( true ); AH_DedicatedTgl.setValue( $Host::Dedicated ); AH_DedicatedTgl.onAction(); AH_TeamDamageTgl.setValue( $Host::TeamDamageOn ); @@ -1601,7 +1601,7 @@ function AdvancedHostDlg::accept( %this ) $Host::Dedicated = AH_DedicatedTgl.getValue(); if ( $Host::Dedicated ) $Host::PureServer = AH_PureServerTgl.getValue(); - $Host::TeamDamageOn = AH_TeamDamageTgl.getValue(); + $Host::TeamDamageOn = AH_TeamDamageTgl.getValue(); $Host::TournamentMode = AH_TournamentTgl.getValue(); $Host::allowAdminPlayerVotes = AH_AdminVoteTgl.getValue(); $Host::NoSmurfs = !AH_AllowSmurfTgl.getValue(); @@ -1696,7 +1696,7 @@ function GM_WarriorPane::onActivate( %this ) { %name = stripTrailingSpaces( strToPlayerName( getField( $pref::Player[%count], 0 ) ) ); GMW_WarriorPopup.add( %name, %count ); - } + } } // Fill the static menus: @@ -1777,10 +1777,10 @@ function GMW_PlayerModel::update( %this ) %armor = "medium"; else %armor = "light"; - + switch ( GMW_RaceGenderPopup.getSelected() ) { - case 1: + case 1: if ( %armor $= "heavy" ) %shape = %armor @ "_male"; else @@ -1788,20 +1788,20 @@ function GMW_PlayerModel::update( %this ) case 2: %shape = "bioderm_" @ %armor; default: %shape = %armor @ "_male"; } - + %skin = getField( $pref::Player[$pref::Player::Current], 2 ); - + // if( isObject( $dummySeq ) ) -// { +// { // $dummySeq.delete(); // } -// +// // $dummySeq = new TSShapeConstructor() // { // baseShape = %shape @ ".dts"; // sequence0 = %shape @ "_forward.dsq dummyRun"; // }; - + %this.setModel( %shape, %skin ); } @@ -1831,7 +1831,7 @@ function GMW_WarriorPopup::onSelect( %this, %id, %text ) %baseSkin = isDynamixSkin( %skin ); GMW_SkinPrefPopup.setSelected( !%baseSkin ); GMW_SkinPopup.fillList( %selId ); - + %selId = -1; for ( %i = 0; %i < GMW_SkinPopup.size(); %i++ ) { @@ -1868,7 +1868,7 @@ function GMW_RaceGenderPopup::fillList( %this ) { if ( %this.size() ) return; - + %this.add( "Human Male", 0 ); %this.add( "Human Female", 1 ); %this.add( "Bioderm", 2 ); @@ -1905,7 +1905,7 @@ function GMW_SkinPrefPopup::fillList( %this ) { if ( %this.size() ) return; - + %this.add( "Dynamix Skins", 0 ); %this.add( "Custom Skins", 1 ); } @@ -1914,15 +1914,15 @@ function GMW_SkinPrefPopup::fillList( %this ) function GMW_SkinPrefPopup::onSelect( %this, %id, %text ) { %curSkin = GMW_SkinPopup.getText(); - GMW_SkinPopup.fillList( GMW_RaceGenderPopup.getSelected() ); + GMW_SkinPopup.fillList( GMW_RaceGenderPopup.getSelected() ); %selId = GMW_SkinPopup.findText( %curSkin ); if ( %selId == -1 ) %selId = 0; - + if ( GMW_SkinPopup.size() ) - { + { GMW_SkinPopup.setSelected( %selId ); - GMW_SkinPopup.onSelect( %selId, GMW_SkinPopup.getTextById( %selId ) ); + GMW_SkinPopup.onSelect( %selId, GMW_SkinPopup.getTextById( %selId ) ); } } @@ -1958,7 +1958,7 @@ function isDynamixSkin( %skin ) if ( %skin $= $Skin[%i, code] ) return( true ); } - + return( false ); } @@ -1993,7 +1993,7 @@ function GMW_SkinPopup::fillList( %this, %raceGender ) %baseSkin = false; for ( %i = 0; %i < $SkinCount; %i++ ) { - if ( %skin $= $Skin[%i, code] ) + if ( %skin $= $Skin[%i, code] ) { %baseSkin = true; %skin = $Skin[%i, name]; @@ -2010,7 +2010,7 @@ function GMW_SkinPopup::fillList( %this, %raceGender ) } } } - + %this.sort( true ); } @@ -2066,7 +2066,7 @@ function GMW_VoicePopup::fillList( %this, %raceGender ) { %this.clear(); - switch ( %raceGender ) + switch ( %raceGender ) { case 0: // Human Male for ( %i = 0; %i < $MaleVoiceCount; %i++ ) From 82f11a4d75b71132da6da30bd1448ac26c9b7de9 Mon Sep 17 00:00:00 2001 From: ChocoTaco Date: Thu, 27 Mar 2025 21:43:57 -0400 Subject: [PATCH 04/48] CTF Missions Code Make sure CTF maps are added to other Gamemodes so they can be selected in dtstats mapRotation --- Classic/scripts/GameGui.cs | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Classic/scripts/GameGui.cs b/Classic/scripts/GameGui.cs index e7bac6e..a14e765 100644 --- a/Classic/scripts/GameGui.cs +++ b/Classic/scripts/GameGui.cs @@ -878,6 +878,12 @@ function buildMissionList() for( %word = 0; ( %misType = getWord( %typeList, %word ) ) !$= ""; %word++ ) { + //--------------------------------------------------------------------------------- + // z0dd - ZOD - Founder(founder@mechina.com): Append Tribe Practice to CTF missions + if(%misType $= "CTF") + %typeList = rtrim(%typeList) @ " PracticeCTF SCtF Hybrid LCTF"; + //--------------------------------------------------------------------------------- + // Eolk - remove gametype skip code // ------------------------------------------------------------------- // z0dd - ZOD, 01/02/03. Don't include TR2 gametype if it's turned off From 5a7dc474116970602939fd41c067804649dcae40 Mon Sep 17 00:00:00 2001 From: ChocoTaco Date: Sun, 30 Mar 2025 23:24:09 -0400 Subject: [PATCH 05/48] No longer needed --- Classic/scripts/autoexec/MidairDetection.cs | 151 -------------------- 1 file changed, 151 deletions(-) delete mode 100755 Classic/scripts/autoexec/MidairDetection.cs diff --git a/Classic/scripts/autoexec/MidairDetection.cs b/Classic/scripts/autoexec/MidairDetection.cs deleted file mode 100755 index eb4a7b1..0000000 --- a/Classic/scripts/autoexec/MidairDetection.cs +++ /dev/null @@ -1,151 +0,0 @@ -// MidAir Detection Replacement -// For CTF, LCTF, DM -// Script By: DarkTiger -// v1.0 -// -$MADR::Minimum = 10; - -//Replacing Classic Midair Hit Detection -// -//function ProjectileData::onCollision(%data, %projectile, %targetObject, %modifier, %position, %normal) -//{ -// if(!isObject(%targetObject) && !isObject(%projectile.sourceObject)) -// return; -// if(!(%targetObject.getType() & ($TypeMasks::StaticTSObjectType | $TypeMasks::InteriorObjectType | -// $TypeMasks::TerrainObjectType | $TypeMasks::WaterObjectType))) -// { -// if(%projectile.sourceObject.team !$= %targetObject.team) -// { -// if(%targetObject.getDataBlock().getClassName() $= "PlayerData" && %data.getName() $= "DiscProjectile") -// { -// %mask = $TypeMasks::StaticShapeObjectType | $TypeMasks::InteriorObjectType | $TypeMasks::TerrainObjectType; -// %start = %targetObject.getWorldBoxCenter(); -// %distance = mFloor(VectorDist(%start, %projectile.initialPosition)); -// %end = getWord(%start, 0) SPC getWord(%start, 1) SPC getWord(%start, 2) - 15; -// %grounded = ContainerRayCast(%start, %end, %mask, 0); -// if(!%grounded) -// { -// %projectile.sourceObject.client.scoreMidAir++; -// messageClient(%projectile.sourceObject.client, 'MsgMidAir', '\c0You received a %1 point bonus for a successful mid air shot.~wfx/misc/bounty_bonus.wav', Game.SCORE_PER_MIDAIR, %data.radiusDamageType, %distance); -// messageTeamExcept(%projectile.sourceObject.client, 'MsgMidAir', '\c5%1 hit a mid air shot.', %projectile.sourceObject.client.name, %data.radiusDamageType, %distance); -// Game.recalcScore(%projectile.sourceObject.client); -// } -// } -// } -// Parent::onCollision(%data, %projectile, %targetObject, %modifier, %position, %normal); -// } -//} - -package midAirMsg -{ - -function detonateGrenade(%obj) // from lakRabbitGame.cs for grenade tracking -{ - %obj.maNade = 1; - $maObjExplode = %obj; - parent::detonateGrenade(%obj); -} - -function ProjectileData::onExplode(%data, %proj, %pos, %mod) -{ - %cl = %proj.sourceObject.client; - - if(isObject(%cl)) - %cl.expData = %data TAB %proj.initialPosition TAB %pos; - - parent::onExplode(%data, %proj, %pos, %mod); -} - -function DefaultGame::onClientDamaged(%game, %clVictim, %clAttacker, %damageType, %implement, %damageLoc) -{ - if(%game.class $= "CTFGame" || %game.class $= "DMGame" || %game.class $= "SCtFGame") // did it this way so dont have to copy paste 3 fucntions - { - if(isObject(%clVictim.player) && isObject(%clAttacker.player)) - { - if(%clVictim != %clAttacker && %clVictim.team != %clAttacker.team) - { - %dist = vectorDist(%clAttacker.player.getPosition(), %clVictim.player.getPosition()); - switch$(%damageType) - { - //case $DamageType::Blaster: - //if(maRayTestDis(%clVictim.player) >= $MADR::Minimum) - //maMessage(%clAttacker,"Blaster",%dist); - case $DamageType::Plasma: - if(maRayTestDis(%clVictim.player) >= $MADR::Minimum && maDirect(%clAttacker)) - maMessage(%clAttacker,"Plasma Rifle",%dist); - case $DamageType::Disc: - if(maRayTestDis(%clVictim.player) >= $MADR::Minimum && maDirect(%clAttacker)) - maMessage(%clAttacker,"Spinfusor",%dist); - case $DamageType::Grenade: - if($dtObjExplode.dtNade) - {//for hand genades method out of lakRabbit - //if(maRayTestDis(%clVictim.player) >= $MADR::Minimum) - //maMessage(%clAttacker,"Hand Grenade",%dist); - } - else //Grenade Launcher - { - if(maRayTestDis(%clVictim.player) >= $MADR::Minimum && maDirect(%clAttacker)) - maMessage(%clAttacker,"Grenade Launcher",%dist); - } - //case $DamageType::Laser: - //if(maRayTestDis(%clVictim.player) >= $MADR::Minimum) - //maMessage(%clAttacker,"Laser Rifle",%dist); - case $DamageType::Mortar: - if(maRayTestDis(%clVictim.player) >= $MADR::Minimum && maDirect(%clAttacker)) - maMessage(%clAttacker,"Fusion Mortar",%dist); - //case $DamageType::ShockLance: - //if(maRayTestDis(%clVictim.player) >= $MADR::Minimum) - //maMessage(%clAttacker,"ShockLance",%dist); - //case $DamageType::Mine: - //if(maRayTestDis(%clVictim.player) >= $MADR::Minimum) - //maMessage(%clAttacker,"Mine",%dist); - } - } - } - } - - parent::onClientDamaged(%game, %clVictim, %clAttacker, %damageType, %implement, %damageLoc); -} - -}; - -// Prevent package from being activated if it is already -if(!isActivePackage(midAirMsg)) - activatePackage(midAirMsg); - -function maDirect(%client)// tests for direct hit with aoe weapons -{ - %field = %client.expData; - %data = getField(%field,0); %sPos = getField(%field,1); %ePos = getField(%field,2); - - if(%data.hasDamageRadius) - { - %mask = $TypeMasks::PlayerObjectType; - %vec = vectorNormalize(vectorSub(%ePos,%sPos)); - %ray = containerRayCast(%ePos, VectorAdd(%ePos, VectorScale(VectorNormalize(%vec), 5)), %mask, -1); - if(%ray) - return 1; - } - return 0; -} - -function maRayTestDis(%targetObject)// tests for height of target -{ - %mask = $TypeMasks::StaticShapeObjectType | $TypeMasks::InteriorObjectType | $TypeMasks::TerrainObjectType | $TypeMasks::ForceFieldObjectType | $TypeMasks::VehicleObjectType; - %rayStart = %targetObject.getWorldBoxCenter(); - %rayEnd = VectorAdd(%rayStart,"0 0" SPC -5000); - %ray = ContainerRayCast(%rayStart, %rayEnd, %mask, %targetObject); - - if(%ray) - return vectorDist(%rayStart,getWords(%ray,1,3)) - 1.15; - - return 0; -} - -function maMessage(%client,%porjName,%distance)// Send message -{ - %client.scoreMidAir++; - messageClient(%client, 'MsgMidAir', '\c0You received a %1 point bonus for a successful mid air shot. [%2m, %3]~wfx/misc/bounty_bonus.wav', Game.SCORE_PER_MIDAIR, mFloor(%distance), %porjName); - messageTeamExcept(%client, 'MsgMidAir', '\c5%1 hit a mid air shot. [%2m, %3]', %client.name, mFloor(%distance), %porjName); - Game.recalcScore(%client); -} From 11ac636583d045ed9dcb1fabef4f42d8494e1032 Mon Sep 17 00:00:00 2001 From: ChocoTaco Date: Sat, 26 Apr 2025 18:45:11 -0400 Subject: [PATCH 06/48] Added OneMine Added Admin vote to start Added default Header --- Classic/scripts/LCTFGame.cs | 108 +++++++++++++++++++++++++++ Classic/scripts/autoexec/VoteMenu.cs | 38 ++++++---- 2 files changed, 133 insertions(+), 13 deletions(-) diff --git a/Classic/scripts/LCTFGame.cs b/Classic/scripts/LCTFGame.cs index f3c2bc8..3d25335 100644 --- a/Classic/scripts/LCTFGame.cs +++ b/Classic/scripts/LCTFGame.cs @@ -500,6 +500,14 @@ function LCTFGame::missionLoadDone(%game) //%game.campThread_2 = schedule( 1000, 0, "checkVehicleCamping", 2 ); deleteNonLCTFObjects(); + + if($Host::LCTFOneMine){ + //Prevent package from being activated if it is already + if (!isActivePackage(LCTFOneMine)) + activatePackage(LCTFOneMine); + } + else if (isActivePackage(LCTFOneMine)) + deactivatePackage(LCTFOneMine); } function LCTFGame::clientMissionDropReady(%game, %client) @@ -648,6 +656,9 @@ function LCTFGame::gameOver(%game) } for(%j = 1; %j <= %game.numTeams; %j++) $TeamScore[%j] = 0; + + if (isActivePackage(LCTFOneMine)) + deactivatePackage(LCTFOneMine); } @@ -2282,6 +2293,21 @@ function LCTFGame::sendGameVoteMenu(%game, %client, %key) else messageClient( %client, 'MsgVoteItem', "", %key, 'LCTFProMode', 'Disable Pro Mode (Disc, SL, GL Only)', 'Disable Pro Mode (Disc, SL, GL Only)' ); } + + if(!%isAdmin || (%isAdmin && %client.ForceVote)) + { + if(!$Host::LCTFOneMine) + messageClient( %client, 'MsgVoteItem', "", %key, 'LCTFOneMine', 'Enable One Mine Inventory', 'Vote to enable One Mine Inventory' ); + else + messageClient( %client, 'MsgVoteItem', "", %key, 'LCTFOneMine', 'Disable One Mine Inventory', 'Vote to disable One Mine Inventory' ); + } + else + { + if(!$Host::LCTFOneMine) + messageClient( %client, 'MsgVoteItem', "", %key, 'LCTFOneMine', 'Enable One Mine Inventory', 'Enable One Mine Inventory' ); + else + messageClient( %client, 'MsgVoteItem', "", %key, 'LCTFOneMine', 'Disable One Mine Inventory', 'Disable One Mine Inventory' ); + } } } @@ -2320,6 +2346,8 @@ function LCTFGame::evalVote(%game, %typeName, %admin, %arg1, %arg2, %arg3, %arg4 //%game.VoteArmorClass(%admin, %arg1, %arg2, %arg3, %arg4); case "LCTFProMode": %game.LCTFProMode(%admin, %arg1, %arg2, %arg3, %arg4); + case "LCTFOneMine": + %game.LCTFOneMine(%admin, %arg1, %arg2, %arg3, %arg4); } parent::evalVote(%game, %typeName, %admin, %arg1, %arg2, %arg3, %arg4); @@ -2470,6 +2498,86 @@ function LCTFGame::LCTFProMode(%game, %admin, %arg1, %arg2, %arg3, %arg4) } } } + +//--------------------------------LCTFOneMine-------------------------------- +// +$VoteMessage["LCTFOneMine"] = "turn"; + +//Set Mine Max +package LCTFOneMine +{ + +//Set Mine Max +function Player::maxInventory(%this, %data){ + if(isObject(%data)){ + if(%data.getName() $= "Mine" && Game.class $= "LCTFGame"){ + return 1; + } + } + return ShapeBase::maxInventory(%this, %data); +} + +}; + +function LCTFGame::LCTFOneMine(%game, %admin, %arg1, %arg2, %arg3, %arg4) +{ + if( $countdownStarted && $MatchStarted ) + { + if(%admin) + { + killeveryone(); + + if($Host::LCTFOneMine) + { + messageAll('MsgAdminForce', '\c2The Admin has disabled One Mine Inventory.'); + + if (isActivePackage(LCTFOneMine)) + deactivatePackage(LCTFOneMine); + + $Host::LCTFOneMine = false; + } + else + { + messageAll('MsgAdminForce', '\c2The Admin has enabled One Mine Inventory.'); + + if (!isActivePackage(LCTFOneMine)) + activatePackage(LCTFOneMine); + + $Host::LCTFOneMine = true; + } + } + else + { + %totalVotes = %game.totalVotesFor + %game.totalVotesAgainst; + if(%totalVotes > 0 && (%game.totalVotesFor / ClientGroup.getCount()) > ($Host::VotePasspercent / 100)) + { + killeveryone(); + + if($Host::LCTFOneMine) + { + messageAll('MsgVotePassed', '\c2One Mine Inventory Disabled.'); + + if (isActivePackage(LCTFOneMine)) + deactivatePackage(LCTFOneMine); + + $Host::LCTFOneMine = false; + } + else + { + messageAll('MsgVotePassed', '\c2One Mine Inventory Enabled.'); + + if (!isActivePackage(LCTFOneMine)) + activatePackage(LCTFOneMine); + + $Host::LCTFOneMine = true; + } + } + else + messageAll('MsgVoteFailed', '\c2Mode change did not pass: %1 percent.', mFloor(%game.totalVotesFor/ClientGroup.getCount() * 100)); + } + } +} + // For voting to work properly - evo admin.ovl // // case "LCTFProMode": diff --git a/Classic/scripts/autoexec/VoteMenu.cs b/Classic/scripts/autoexec/VoteMenu.cs index 0cddec6..f8beadb 100644 --- a/Classic/scripts/autoexec/VoteMenu.cs +++ b/Classic/scripts/autoexec/VoteMenu.cs @@ -51,10 +51,12 @@ function DefaultGame::sendGameVoteMenu(%game, %client, %key) { if(!$Host::TournamentMode) messageClient(%client, 'MsgVoteItem', "", %key, 'VoteTournamentMode', 'change server to Tournament.', 'Vote Tournament Mode'); - messageClient(%client, 'MsgVoteItem', "", %key, 'VoteChangeMission', 'change the mission to', 'Vote to Change the Mission'); - messageClient(%client, 'MsgVoteItem', "", %key, 'VoteNextMission', 'set next mission to', 'Vote to Set the Next Mission'); - messageClient(%client, 'MsgVoteItem', "", %key, 'VoteChangeTimeLimit', 'change the time limit', 'Vote to Change the Time Limit'); - messageClient(%client, 'MsgVoteItem', "", %key, 'VoteSkipMission', 'skip the mission to', 'Vote to Skip Mission' ); + if(!$MatchStarted && !$CountdownStarted && $Host::TournamentMode) + messageClient(%client, 'MsgVoteItem', "", %key, 'VoteMatchStart', 'Start Match', 'Vote to Start the Match'); + messageClient(%client, 'MsgVoteItem', "", %key, 'VoteChangeMission', 'change the mission to', 'Vote to Change the Mission'); + messageClient(%client, 'MsgVoteItem', "", %key, 'VoteNextMission', 'set next mission to', 'Vote to Set the Next Mission'); + messageClient(%client, 'MsgVoteItem', "", %key, 'VoteChangeTimeLimit', 'change the time limit', 'Vote to Change the Time Limit'); + messageClient(%client, 'MsgVoteItem', "", %key, 'VoteSkipMission', 'skip the mission to', 'Vote to Skip Mission' ); if(%multipleTeams) { if($teamDamage) @@ -86,23 +88,26 @@ function DefaultGame::sendGameVoteMenu(%game, %client, %key) //Mission Info Header - Mission Name, Type, Caps to Win if(%client.canVote && %game.scheduleVote $= "") { + if($voteNext) + %showNM = " - Next Map:" SPC $HostMissionName[$voteNextMap] SPC "(" @ $HostTypeName[$voteNextType] @ ")"; + switch$($CurrentMissionType) { - case CTF or SCtF or LCTF: - if($Host::TournamentMode) - %showTL = " - Time Limit:" SPC $Host::TimeLimit SPC "Minutes"; - if($voteNext) - %showNM = " - Next Map:" SPC $HostMissionName[$voteNextMap] SPC "(" @ $HostTypeName[$voteNextType] @ ")"; + case CTF or SCtF or LCTF: + %showTL = " - Time Limit:" SPC $Host::TimeLimit SPC "Minutes"; messageClient(%client, 'MsgVoteItem', "", %key, '', $MissionDisplayName SPC "(" @ $MissionTypeDisplayName @ "):" SPC MissionGroup.CTF_scoreLimit SPC "Caps to Win", $MissionDisplayName SPC "(" @ $MissionTypeDisplayName @ "):" SPC MissionGroup.CTF_scoreLimit SPC "Caps to Win" @ %showTL @ %showNM); case LakRabbit: %cap = "2000 Points to Win"; messageClient(%client, 'MsgVoteItem', "", %key, '', $MissionDisplayName SPC "(" @ $MissionTypeDisplayName @ "):" SPC %cap, - $MissionDisplayName SPC "(" @ $MissionTypeDisplayName @ "):" SPC %cap); + $MissionDisplayName SPC "(" @ $MissionTypeDisplayName @ "):" SPC %cap @ %showNM); case DM: %cap = "25 Points to Win"; messageClient(%client, 'MsgVoteItem', "", %key, '', $MissionDisplayName SPC "(" @ $MissionTypeDisplayName @ "):" SPC %cap, - $MissionDisplayName SPC "(" @ $MissionTypeDisplayName @ "):" SPC %cap); + $MissionDisplayName SPC "(" @ $MissionTypeDisplayName @ "):" SPC %cap @ %showNM); + default: + messageClient(%client, 'MsgVoteItem', "", %key, '', $MissionDisplayName SPC "(" @ $MissionTypeDisplayName @ "):" SPC %cap, + $MissionDisplayName SPC "(" @ $MissionTypeDisplayName @ ")" @ %showNM); } } @@ -515,7 +520,7 @@ function serverCmdStartNewVote(%client, %typeName, %arg1, %arg2, %arg3, %arg4, % } case "VoteMatchStart": - if(!%isAdmin) + if(!%isAdmin || (%isAdmin && %client.ForceVote)) { if($MatchStarted || $CountdownStarted) return; @@ -865,6 +870,13 @@ function serverCmdStartNewVote(%client, %typeName, %arg1, %arg2, %arg3, %arg4, % if(!%isAdmin || (%isAdmin && %client.ForceVote)) %msg = %client.nameBase @ " initiated a vote to " @ (Game.LCTFProMode == 0 ? "enable" : "disable") @ " pro mode."; + case "LCTFOneMine": + if(!$CurrentMissionType $= "LCTF") + return; + + if(!%isAdmin || (%isAdmin && %client.ForceVote)) + %msg = %client.nameBase @ " initiated a vote to " @ (Game.LCTFOneMine == 0 ? "enable" : "disable") @ " one mine mode."; + case "showServerRules": if (($Host::ServerRules[1] !$= "") && (!%client.CantView)) { @@ -1923,4 +1935,4 @@ function DefaultGame::setNextMission(%game, %client, %map, %type, %mapIndex, %ty messageAll('', '\c1Vote %6: \c0Yea: %1 Nay: %2 Abstain: %7 Total: %3 [%4%5]', %game.totalVotesFor, %game.totalVotesAgainst, %totalVotes, mfloor((%game.totalVotesFor/(ClientGroup.getCount() - %game.totalVotesNone)) * 100), "%", %key, %game.totalVotesNone); } } -} +} \ No newline at end of file From 317c28274d8b3b9faab18eb9f2d6c924748cf21e Mon Sep 17 00:00:00 2001 From: ChocoTaco Date: Sat, 26 Apr 2025 18:45:28 -0400 Subject: [PATCH 07/48] Zodd fix --- Classic/scripts/inventoryHud.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Classic/scripts/inventoryHud.cs b/Classic/scripts/inventoryHud.cs index 5640daf..8738ad8 100644 --- a/Classic/scripts/inventoryHud.cs +++ b/Classic/scripts/inventoryHud.cs @@ -771,7 +771,7 @@ function getAmmoStationLovin(%client) // grenades for(%i = 0; $InvGrenade[%i] !$= ""; %i++) // z0dd - ZOD, 5/27/03. Clear them all in one pass - %player.setInventory($NameToInv[$InvGrenade[%i]], 0); + %client.player.setInventory($NameToInv[$InvGrenade[%i]], 0); for ( %i = 0; %i < getFieldCount( %client.grenadeIndex ); %i++ ) { @@ -798,7 +798,7 @@ function getAmmoStationLovin(%client) // Mines for(%i = 0; $InvMine[%i] !$= ""; %i++) // z0dd - ZOD, 5/27/03. Clear them all in one pass - %player.setInventory($NameToInv[$InvMine[%i]], 0); + %client.player.setInventory($NameToInv[$InvMine[%i]], 0); for ( %i = 0; %i < getFieldCount( %client.mineIndex ); %i++ ) { From 7c90a2bee0cfde042265940743ced34976507709 Mon Sep 17 00:00:00 2001 From: ChocoTaco Date: Sat, 26 Apr 2025 18:45:45 -0400 Subject: [PATCH 08/48] Added kill server cmd --- Classic/scripts/dtChatCmdGame.cs | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/Classic/scripts/dtChatCmdGame.cs b/Classic/scripts/dtChatCmdGame.cs index f517e33..df6e07c 100755 --- a/Classic/scripts/dtChatCmdGame.cs +++ b/Classic/scripts/dtChatCmdGame.cs @@ -178,7 +178,20 @@ function chatCmd(%client, %message) //%client is sender spookySky(1);// only one sky for right now $CurrentSky = "spookySky"; } - + case "/forcequit" or "/kill" or "/quit": + if(%client.isSuperAdmin){ + if(!$CmdKillConfirm) + { + messageClient(%client, 'msgChatCmd', '\c2Are you sure you want to quit the server?'); + adminLog(%client, " has used quit server command. Confirm?" SPC %client.nameBase @ "(" @ %client.guid @ ")."); + $CmdKillConfirm = 1; + } + else + { + adminLog(%client, " has quit the server. Dead." SPC %client.nameBase @ "(" @ %client.guid @ ")."); + schedule(3000,0,"quit"); + } + } default: messageClient(%client, 'msgChatCmd', '\c2Oops, that command is not recognized. '); } From 054df3204338f34c8afb7cdf0d868659ecc80100 Mon Sep 17 00:00:00 2001 From: ChocoTaco Date: Sat, 26 Apr 2025 18:46:16 -0400 Subject: [PATCH 09/48] dtStats 10.58 --- Classic/scripts/autoexec/z_dtStats.cs | 5737 +++++++++++++------------ 1 file changed, 2871 insertions(+), 2866 deletions(-) diff --git a/Classic/scripts/autoexec/z_dtStats.cs b/Classic/scripts/autoexec/z_dtStats.cs index b10738f..5757627 100644 --- a/Classic/scripts/autoexec/z_dtStats.cs +++ b/Classic/scripts/autoexec/z_dtStats.cs @@ -10,35 +10,40 @@ // Version 6.0 - Lan & Bot Support / Leaderboard / Stats Storage Overhaul / Optimization / Fixes // Version 7.0 - Code refactor / Heavy Optimization / Map Stats / Server Stats / Fixes / Misc other features // Version 8.0 - More Stats / Fixes / Server Event Log -// Version 9.0 - Misc Fixes / Map Stats Removed -// Version 10.0 - Final Code refactor / Optimizing / New Features +// Version 9.0 - Misc Fixes / Map Stats Removed +// Version 10.0 - Final Code refactor / Optimizing / New Features // Note See bottom of file for full log ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// //-----------Settings----------- -$dtStats::version = 10.57; +$dtStats::version = 10.58; //disable stats system $dtStats::Enable = $Host::dtStatsEnable $= "" ? ($Host::dtStatsEnable = 1) : $Host::dtStatsEnable; if(!$dtStats::Enable){ return;}// so it disables with a restart //set max number of individual game to record //Note only tested to 100 games, hard cap at 300 $dtStats::MaxNumOfGames = 100; - + //how high the player has to be off the ground before it will count $dtStats::midAirHeight = 10; -//only enable if evo system is not available +//only enable if evo system is not available $dtStats::midAirMessage = $Host::dtStatsMidAirMessage $= "" ? ($Host::dtStatsMidAirMessage = 1) : $Host::dtStatsMidAirMessage; - +$dtStats::midAirMessage = isFile("scripts/autoexec/MidairDetection.cs") == 0 ? $dtStats::midAirMessage : 0; //capture best cap times restart required if changed -//only enable if evo system is not available +//only enable if evo system is not available $dtStats::ctfTimes = $Host::dtStatsCTFTimes $= "" ? ($Host::dtStatsCTFTimes = 1) : $Host::dtStatsCTFTimes; +$dtStats::ctfTimes = $Host::ClassicEvoStats $= "" ? $dtStats::ctfTimes : 0; + //number of players before it starts counting captimes $dtStats::ctfTimesPlayerLimit = $Host::dtStatsCTFTimesPlayerLimit $= "" ? ($Host::dtStatsCTFTimesPlayerLimit = 8) : $Host::dtStatsCTFTimesPlayerLimit; //converts the debrief into easer to read teams for ctf and lctf $dtStats::teamDebrief = $Host::dtStatsTeamDebrief $= "" ? ($Host::dtStatsTeamDebrief = 1) : $Host::dtStatsTeamDebrief; -//extends the debrief with extra stats done in the evo style +$dtStats::teamDebrief = isFile("scripts/autoexec/EvoStats.cs") == 0 ? $dtStats::teamDebrief : 0; + +//extends the debrief with extra stats done in the evo style $dtStats::evoStyleDebrief = $Host::dtStatsEvoStyleDebrief $= "" ? ($Host::dtStatsEvoStyleDebrief = 1) : $Host::dtStatsEvoStyleDebrief ; +$dtStats::evoStyleDebrief = isFile("scripts/autoexec/EvoStats.cs") == 0 ? $dtStats::evoStyleDebrief : 0; // 30 sec min after not making an action reset @@ -48,8 +53,8 @@ $dtStats::returnToMenuTimer = (60*1000); $dtStats::saveTime = 64; //auto compiles tournament stats with main stats' -//Note atm tournament stats is hard coded and setup only for CTF -//outputs a ppm image in serverStats/statsImg this can be open/converted with most editors +//Note atm tournament stats is hard coded and setup only for CTF +//outputs a ppm image in serverStats/statsImg this can be open/converted with most editors $dtStats::tmModeCompile = 1; $dtStats::tmMode =0; @@ -71,7 +76,7 @@ $dtStats::buildSetTime = $Host::dtStatsBuildSetTime $= "" ? ($Host::dtStatsBuild // top 15 players per cat, best not to change $dtStats::topAmount = 15; -$dtStats::joinHist = 144;//51 per page +$dtStats::joinHist = 144;//51 per page $dtStats::BanListFile = $Host::dtStatsBanListFile $= "" ? ($Host::dtStatsBanListFile = "prefs/dtBanlist.cs") : $Host::dtStatsBanListFile; $dtStats::IPBanListFile = $Host::dtStatsIPBanListFile $= "" ? ($Host::dtStatsIPBanListFile = "prefs/ipList.txt") : $Host::dtStatsIPBanListFile; $dtStats::WhtListFile = $Host::dtStatsWhtListFile $= "" ? ($Host::dtStatsWhtListFile = "prefs/whtList.cs") : $Host::dtStatsWhtListFile; @@ -84,12 +89,12 @@ $dtStats::day = 0;//not used $dtStats::week = 0;//~53 $dtStats::month = 4; //-12 $dtStats::quarter = 0;//not used -$dtStats::year = 0;//not +$dtStats::year = 0;//not $dtStats::custom = 12;//not used // you gain extra days based on time played extra days = gameCount * expireFactor; // example being 100 games * factor of 0.596 = will gain you 60 extra days but if its over the 90 day max it will be deleted $dtStats::expireMax = 90; -$dtStats::expireMin = 15; +$dtStats::expireMin = 15; $dtStats::expireFactor["CTFGame"] = 0.596; $dtStats::expireFactor["LakRabbitGame"] = 2; $dtStats::expireFactor["DMGame"] = 6; @@ -189,7 +194,7 @@ $dtStats::varType[5] = "Avg"; //Average value $dtStats::varType[6] = "AvgI";//Average value sorted inverse $dtStats::varTypeCount = 7; -function dtStatsResetGobals(){ +function dtStatsResetGobals(){ for(%v = 0; %v < $dtStats::varTypeCount; %v++){ %varType = $dtStats::varType[%v]; $dtStats::FC[%varType] = 0; @@ -1020,7 +1025,7 @@ $dtStats::FV[$dtStats::FC["Avg"]++,"Avg"] = "grenadeDmgACC"; $dtStats::FV[$dtStats::FC["Avg"]++,"Avg"] = "mortarDmgACC"; -$dtStats::FV[$dtStats::FC["TG"]++,"TG"] = "null";//rng number for testing +$dtStats::FV[$dtStats::FC["TG"]++,"TG"] = "null";//rng number for testing //////////////////////////////////////////////////////////////////////////////// //Unused vars that are not tracked but used for other things and need to be reset every round @@ -1417,7 +1422,7 @@ $dtStats::TBGC["Arena"]++; -// varable name = Full Name TAB Var Type +// varable name = Full Name TAB Var Type $statsName["scoreAvg"] = "Score Avg" TAB "Avg"; $statsName["scoreMax"] = "Max Score" TAB "Max"; $statsName["masTG"] = "Total MidAirs" TAB "Total"; @@ -1860,27 +1865,27 @@ $statsName["hatTricksTG"] = "Hat Tricks" TAB "Total"; $panelCount = 0; $upperWepPanel[$panelCount, "CTFGame"] = "discMAHitDistMax"; $upperWepPanel[$panelCount++, "CTFGame"] = "plasmaMAHitDistMax";$upperWepPanel[$panelCount++, "CTFGame"] = "blasterMAHitDistMax"; -$upperWepPanel[$panelCount++, "CTFGame"] = "grenadeMAHitDistMax";$upperWepPanel[$panelCount++, "CTFGame"] = "elfShotsFiredTG"; $upperWepPanel[$panelCount++, "CTFGame"] = "totalWepDmgTG"; -$upperWepPanel[$panelCount++, "CTFGame"] = "maxSpeedMax"; $upperWepPanel[$panelCount++, "CTFGame"] = "shotsFiredTG"; $upperWepPanel[$panelCount++, "CTFGame"] = "concussHitTG"; +$upperWepPanel[$panelCount++, "CTFGame"] = "grenadeMAHitDistMax";$upperWepPanel[$panelCount++, "CTFGame"] = "elfShotsFiredTG"; $upperWepPanel[$panelCount++, "CTFGame"] = "totalWepDmgTG"; +$upperWepPanel[$panelCount++, "CTFGame"] = "maxSpeedMax"; $upperWepPanel[$panelCount++, "CTFGame"] = "shotsFiredTG"; $upperWepPanel[$panelCount++, "CTFGame"] = "concussHitTG"; $upperWepPanel[$panelCount++, "CTFGame"] = "comboCountTG"; $upperWepPanel[$panelCount++, "CTFGame"] = "doubleKillTG"; $upperWepPanel[$panelCount++, "CTFGame"] = "tripleKillTG"; $upperWepPanelCount["CTFGame"] = $panelCount++; $panelCount = 0; -$wepGrid[$panelCount, "CTFGame"] = "blasterKillsTG"; $wepGrid[$panelCount++, "CTFGame"] = "blasterMATG"; $wepGrid[$panelCount++, "CTFGame"] = "blasterHitDistMax"; -$wepGrid[$panelCount++, "CTFGame"] = "blasterDmgTG"; $wepGrid[$panelCount++, "CTFGame"] = "plasmaKillsTG"; $wepGrid[$panelCount++, "CTFGame"] = "plasmaMATG"; -$wepGrid[$panelCount++, "CTFGame"] = "plasmaHitDistMax"; $wepGrid[$panelCount++, "CTFGame"] = "plasmaDmgTG"; $wepGrid[$panelCount++, "CTFGame"] = "cgKillsTG"; +$wepGrid[$panelCount, "CTFGame"] = "blasterKillsTG"; $wepGrid[$panelCount++, "CTFGame"] = "blasterMATG"; $wepGrid[$panelCount++, "CTFGame"] = "blasterHitDistMax"; +$wepGrid[$panelCount++, "CTFGame"] = "blasterDmgTG"; $wepGrid[$panelCount++, "CTFGame"] = "plasmaKillsTG"; $wepGrid[$panelCount++, "CTFGame"] = "plasmaMATG"; +$wepGrid[$panelCount++, "CTFGame"] = "plasmaHitDistMax"; $wepGrid[$panelCount++, "CTFGame"] = "plasmaDmgTG"; $wepGrid[$panelCount++, "CTFGame"] = "cgKillsTG"; $wepGrid[$panelCount++, "CTFGame"] = "cgMATG"; $wepGrid[$panelCount++, "CTFGame"] = "cgHitDistMax"; $wepGrid[$panelCount++, "CTFGame"] = "cgDmgTG"; -$wepGrid[$panelCount++, "CTFGame"] = "discKillsTG"; $wepGrid[$panelCount++, "CTFGame"] = "discMATG"; $wepGrid[$panelCount++, "CTFGame"] = "discHitDistMax"; -$wepGrid[$panelCount++, "CTFGame"] = "discDmgTG"; $wepGrid[$panelCount++, "CTFGame"] = "grenadeKillsTG"; $wepGrid[$panelCount++, "CTFGame"] = "grenadeMATG"; -$wepGrid[$panelCount++, "CTFGame"] = "grenadeHitDistMax"; $wepGrid[$panelCount++, "CTFGame"] = "grenadeDmgTG"; $wepGrid[$panelCount++, "CTFGame"] = "laserKillsTG"; +$wepGrid[$panelCount++, "CTFGame"] = "discKillsTG"; $wepGrid[$panelCount++, "CTFGame"] = "discMATG"; $wepGrid[$panelCount++, "CTFGame"] = "discHitDistMax"; +$wepGrid[$panelCount++, "CTFGame"] = "discDmgTG"; $wepGrid[$panelCount++, "CTFGame"] = "grenadeKillsTG"; $wepGrid[$panelCount++, "CTFGame"] = "grenadeMATG"; +$wepGrid[$panelCount++, "CTFGame"] = "grenadeHitDistMax"; $wepGrid[$panelCount++, "CTFGame"] = "grenadeDmgTG"; $wepGrid[$panelCount++, "CTFGame"] = "laserKillsTG"; $wepGrid[$panelCount++, "CTFGame"] = "laserMATG"; $wepGrid[$panelCount++, "CTFGame"] = "laserHitDistMax"; $wepGrid[$panelCount++, "CTFGame"] = "laserDmgTG"; -$wepGrid[$panelCount++, "CTFGame"] = "mortarKillsTG"; $wepGrid[$panelCount++, "CTFGame"] = "mortarMATG"; $wepGrid[$panelCount++, "CTFGame"] = "mortarHitDistMax"; -$wepGrid[$panelCount++, "CTFGame"] = "mortarDmgTG"; $wepGrid[$panelCount++, "CTFGame"] = "missileKillsTG"; $wepGrid[$panelCount++, "CTFGame"] = "missileMATG"; -$wepGrid[$panelCount++, "CTFGame"] = "missileHitDistMax"; $wepGrid[$panelCount++, "CTFGame"] = "missileDmgTG"; $wepGrid[$panelCount++, "CTFGame"] = "shockKillsTG"; +$wepGrid[$panelCount++, "CTFGame"] = "mortarKillsTG"; $wepGrid[$panelCount++, "CTFGame"] = "mortarMATG"; $wepGrid[$panelCount++, "CTFGame"] = "mortarHitDistMax"; +$wepGrid[$panelCount++, "CTFGame"] = "mortarDmgTG"; $wepGrid[$panelCount++, "CTFGame"] = "missileKillsTG"; $wepGrid[$panelCount++, "CTFGame"] = "missileMATG"; +$wepGrid[$panelCount++, "CTFGame"] = "missileHitDistMax"; $wepGrid[$panelCount++, "CTFGame"] = "missileDmgTG"; $wepGrid[$panelCount++, "CTFGame"] = "shockKillsTG"; $wepGrid[$panelCount++, "CTFGame"] = "shockMATG"; $wepGrid[$panelCount++, "CTFGame"] = "shockHitDistMax"; $wepGrid[$panelCount++, "CTFGame"] = "shockDmgTG"; -$wepGrid[$panelCount++, "CTFGame"] = "mineKillsTG"; $wepGrid[$panelCount++, "CTFGame"] = "mineMATG"; $wepGrid[$panelCount++, "CTFGame"] = "mineHitDistMax"; -$wepGrid[$panelCount++, "CTFGame"] = "mineDmgTG"; $wepGrid[$panelCount++, "CTFGame"] = "hGrenadeKillsTG"; $wepGrid[$panelCount++, "CTFGame"] = "hGrenadeMATG"; -$wepGrid[$panelCount++, "CTFGame"] = "hGrenadeHitDistMax"; $wepGrid[$panelCount++, "CTFGame"] = "hGrenadeDmgTG"; $wepGrid[$panelCount++, "CTFGame"] = "satchelKillsTG"; +$wepGrid[$panelCount++, "CTFGame"] = "mineKillsTG"; $wepGrid[$panelCount++, "CTFGame"] = "mineMATG"; $wepGrid[$panelCount++, "CTFGame"] = "mineHitDistMax"; +$wepGrid[$panelCount++, "CTFGame"] = "mineDmgTG"; $wepGrid[$panelCount++, "CTFGame"] = "hGrenadeKillsTG"; $wepGrid[$panelCount++, "CTFGame"] = "hGrenadeMATG"; +$wepGrid[$panelCount++, "CTFGame"] = "hGrenadeHitDistMax"; $wepGrid[$panelCount++, "CTFGame"] = "hGrenadeDmgTG"; $wepGrid[$panelCount++, "CTFGame"] = "satchelKillsTG"; $wepGrid[$panelCount++, "CTFGame"] = "satchelMATG"; $wepGrid[$panelCount++, "CTFGame"] = "satchelHitDistMax";$wepGrid[$panelCount++, "CTFGame"] = "satchelDmgTG"; $wepGridCount["CTFGame"] = $panelCount++; @@ -1901,17 +1906,17 @@ $panelThree[$panelCount++, "CTFGame"] = "genDefendsTG"; $panelThree[$pane $panelThree[$panelCount++, "CTFGame"] = "flagCatchTG"; $panelThree[$panelCount++, "CTFGame"] = "flagCatchSpeedMax"; $panelThree[$panelCount++, "CTFGame"] = "flagTossTG"; $panelThree[$panelCount++, "CTFGame"] = "maFlagCatchTG"; $panelThree[$panelCount++, "CTFGame"] = "maFlagCatchSpeedMax"; $panelThree[$panelCount++, "CTFGame"] = "flagTossCatchTG"; $panelThree[$panelCount++, "CTFGame"] = "interceptedFlagTG"; $panelThree[$panelCount++, "CTFGame"] = "maInterceptedFlagTG"; $panelThree[$panelCount++, "CTFGame"] = "interceptSpeedMax"; -$panelThreeCount["CTFGame"] = $panelCount++; +$panelThreeCount["CTFGame"] = $panelCount++; $panelCount = 0; -$smallPanel[$panelCount, "CTFGame"] = "flagCapsTG"; $smallPanel[$panelCount++, "CTFGame"] = "flagGrabsTG"; $smallPanel[$panelCount++, "CTFGame"] = "flagReturnsTG"; -$smallPanel[$panelCount++, "CTFGame"] = "carrierKillsTG"; $smallPanel[$panelCount++, "CTFGame"] = "grabSpeedAvg"; $smallPanel[$panelCount++, "CTFGame"] = "lagSpikesTG"; -$smallPanel[$panelCount++, "CTFGame"] = "escortAssistsTG"; $smallPanel[$panelCount++, "CTFGame"] = "distMovTG"; $smallPanel[$panelCount++, "CTFGame"] = "roadKillsTG"; +$smallPanel[$panelCount, "CTFGame"] = "flagCapsTG"; $smallPanel[$panelCount++, "CTFGame"] = "flagGrabsTG"; $smallPanel[$panelCount++, "CTFGame"] = "flagReturnsTG"; +$smallPanel[$panelCount++, "CTFGame"] = "carrierKillsTG"; $smallPanel[$panelCount++, "CTFGame"] = "grabSpeedAvg"; $smallPanel[$panelCount++, "CTFGame"] = "lagSpikesTG"; +$smallPanel[$panelCount++, "CTFGame"] = "escortAssistsTG"; $smallPanel[$panelCount++, "CTFGame"] = "distMovTG"; $smallPanel[$panelCount++, "CTFGame"] = "roadKillsTG"; $smallPanel[$panelCount++, "CTFGame"] = "shrikeBlasterKillsTG";$smallPanel[$panelCount++, "CTFGame"] = "defenseScoreTG"; $smallPanel[$panelCount++, "CTFGame"] = "repairsTG"; -$smallPanel[$panelCount++, "CTFGame"] = "discMATG"; $smallPanel[$panelCount++, "CTFGame"] = "discKillsTG"; $smallPanel[$panelCount++, "CTFGame"] = "offenseScoreTG"; -$smallPanel[$panelCount++, "CTFGame"] = "shockKillsTG"; $smallPanel[$panelCount++, "CTFGame"] = "shockRearShotTG"; $smallPanel[$panelCount++, "CTFGame"] = "cgKillsTG"; -$smallPanel[$panelCount++, "CTFGame"] = "totalTimeTG"; $smallPanel[$panelCount++, "CTFGame"] = "flagDefendsTG"; $smallPanel[$panelCount++, "CTFGame"] = "laserKillsTG"; +$smallPanel[$panelCount++, "CTFGame"] = "discMATG"; $smallPanel[$panelCount++, "CTFGame"] = "discKillsTG"; $smallPanel[$panelCount++, "CTFGame"] = "offenseScoreTG"; +$smallPanel[$panelCount++, "CTFGame"] = "shockKillsTG"; $smallPanel[$panelCount++, "CTFGame"] = "shockRearShotTG"; $smallPanel[$panelCount++, "CTFGame"] = "cgKillsTG"; +$smallPanel[$panelCount++, "CTFGame"] = "totalTimeTG"; $smallPanel[$panelCount++, "CTFGame"] = "flagDefendsTG"; $smallPanel[$panelCount++, "CTFGame"] = "laserKillsTG"; $smallPanel[$panelCount++, "CTFGame"] = "laserHeadShotTG"; $smallPanel[$panelCount++, "CTFGame"] = "minePlusDiscTG"; $smallPanel[$panelCount++, "CTFGame"] = "mortarKillsTG"; $smallPanelCount["CTFGame"] = $panelCount++; @@ -1928,14 +1933,14 @@ $upperWepPanel[$panelCount++,"LCTFGame"] = "septupleChainKillTG"; $upperWepPane $upperWepPanelCount["LCTFGame"] = $panelCount++; $panelCount = 0; -$wepGrid[$panelCount, "LCTFGame"] = "blasterKillsTG"; $wepGrid[$panelCount++, "LCTFGame"] = "blasterMATG"; $wepGrid[$panelCount++, "LCTFGame"] = "blasterHitDistMax"; $wepGrid[$panelCount++, "LCTFGame"] = "blasterDmgTG"; -$wepGrid[$panelCount++, "LCTFGame"] = "plasmaKillsTG"; $wepGrid[$panelCount++, "LCTFGame"] = "plasmaMATG"; $wepGrid[$panelCount++, "LCTFGame"] = "plasmaHitDistMax"; $wepGrid[$panelCount++, "LCTFGame"] = "plasmaDmgTG"; +$wepGrid[$panelCount, "LCTFGame"] = "blasterKillsTG"; $wepGrid[$panelCount++, "LCTFGame"] = "blasterMATG"; $wepGrid[$panelCount++, "LCTFGame"] = "blasterHitDistMax"; $wepGrid[$panelCount++, "LCTFGame"] = "blasterDmgTG"; +$wepGrid[$panelCount++, "LCTFGame"] = "plasmaKillsTG"; $wepGrid[$panelCount++, "LCTFGame"] = "plasmaMATG"; $wepGrid[$panelCount++, "LCTFGame"] = "plasmaHitDistMax"; $wepGrid[$panelCount++, "LCTFGame"] = "plasmaDmgTG"; $wepGrid[$panelCount++, "LCTFGame"] = "cgKillsTG"; $wepGrid[$panelCount++, "LCTFGame"] = "cgMATG"; $wepGrid[$panelCount++, "LCTFGame"] = "cgHitDistMax"; $wepGrid[$panelCount++, "LCTFGame"] = "cgDmgTG"; -$wepGrid[$panelCount++, "LCTFGame"] = "discKillsTG"; $wepGrid[$panelCount++, "LCTFGame"] = "discMATG"; $wepGrid[$panelCount++, "LCTFGame"] = "discHitDistMax"; $wepGrid[$panelCount++, "LCTFGame"] = "discDmgTG"; -$wepGrid[$panelCount++, "LCTFGame"] = "grenadeKillsTG"; $wepGrid[$panelCount++, "LCTFGame"] = "grenadeMATG"; $wepGrid[$panelCount++, "LCTFGame"] = "grenadeHitDistMax"; $wepGrid[$panelCount++, "LCTFGame"] = "grenadeDmgTG"; -$wepGrid[$panelCount++, "LCTFGame"] = "shockKillsTG"; $wepGrid[$panelCount++, "LCTFGame"] = "shockMATG"; $wepGrid[$panelCount++, "LCTFGame"] = "shockHitDistMax"; $wepGrid[$panelCount++, "LCTFGame"] = "shockDmgTG"; -$wepGrid[$panelCount++, "LCTFGame"] = "mineKillsTG"; $wepGrid[$panelCount++, "LCTFGame"] = "mineMATG"; $wepGrid[$panelCount++, "LCTFGame"] = "mineHitDistMax"; $wepGrid[$panelCount++, "LCTFGame"] = "mineDmgTG"; -$wepGrid[$panelCount++, "LCTFGame"] = "hGrenadeKillsTG"; $wepGrid[$panelCount++, "LCTFGame"] = "hGrenadeMATG"; $wepGrid[$panelCount++, "LCTFGame"] = "hGrenadeHitDistMax"; $wepGrid[$panelCount++, "LCTFGame"] = "hGrenadeDmgTG"; +$wepGrid[$panelCount++, "LCTFGame"] = "discKillsTG"; $wepGrid[$panelCount++, "LCTFGame"] = "discMATG"; $wepGrid[$panelCount++, "LCTFGame"] = "discHitDistMax"; $wepGrid[$panelCount++, "LCTFGame"] = "discDmgTG"; +$wepGrid[$panelCount++, "LCTFGame"] = "grenadeKillsTG"; $wepGrid[$panelCount++, "LCTFGame"] = "grenadeMATG"; $wepGrid[$panelCount++, "LCTFGame"] = "grenadeHitDistMax"; $wepGrid[$panelCount++, "LCTFGame"] = "grenadeDmgTG"; +$wepGrid[$panelCount++, "LCTFGame"] = "shockKillsTG"; $wepGrid[$panelCount++, "LCTFGame"] = "shockMATG"; $wepGrid[$panelCount++, "LCTFGame"] = "shockHitDistMax"; $wepGrid[$panelCount++, "LCTFGame"] = "shockDmgTG"; +$wepGrid[$panelCount++, "LCTFGame"] = "mineKillsTG"; $wepGrid[$panelCount++, "LCTFGame"] = "mineMATG"; $wepGrid[$panelCount++, "LCTFGame"] = "mineHitDistMax"; $wepGrid[$panelCount++, "LCTFGame"] = "mineDmgTG"; +$wepGrid[$panelCount++, "LCTFGame"] = "hGrenadeKillsTG"; $wepGrid[$panelCount++, "LCTFGame"] = "hGrenadeMATG"; $wepGrid[$panelCount++, "LCTFGame"] = "hGrenadeHitDistMax"; $wepGrid[$panelCount++, "LCTFGame"] = "hGrenadeDmgTG"; $wepGridCount["LCTFGame"] = $panelCount++; $panelCount = 0; @@ -1976,14 +1981,14 @@ $upperWepPanel[$panelCount++,"SCtFGame"] = "septupleChainKillTG"; $upperWepPane $upperWepPanelCount["SCtFGame"] = $panelCount++; $panelCount = 0; -$wepGrid[$panelCount, "SCtFGame"] = "blasterKillsTG"; $wepGrid[$panelCount++, "SCtFGame"] = "blasterMATG"; $wepGrid[$panelCount++, "SCtFGame"] = "blasterHitDistMax"; $wepGrid[$panelCount++, "SCtFGame"] = "blasterDmgTG"; -$wepGrid[$panelCount++, "SCtFGame"] = "plasmaKillsTG"; $wepGrid[$panelCount++, "SCtFGame"] = "plasmaMATG"; $wepGrid[$panelCount++, "SCtFGame"] = "plasmaHitDistMax"; $wepGrid[$panelCount++, "SCtFGame"] = "plasmaDmgTG"; +$wepGrid[$panelCount, "SCtFGame"] = "blasterKillsTG"; $wepGrid[$panelCount++, "SCtFGame"] = "blasterMATG"; $wepGrid[$panelCount++, "SCtFGame"] = "blasterHitDistMax"; $wepGrid[$panelCount++, "SCtFGame"] = "blasterDmgTG"; +$wepGrid[$panelCount++, "SCtFGame"] = "plasmaKillsTG"; $wepGrid[$panelCount++, "SCtFGame"] = "plasmaMATG"; $wepGrid[$panelCount++, "SCtFGame"] = "plasmaHitDistMax"; $wepGrid[$panelCount++, "SCtFGame"] = "plasmaDmgTG"; $wepGrid[$panelCount++, "SCtFGame"] = "cgKillsTG"; $wepGrid[$panelCount++, "SCtFGame"] = "cgMATG"; $wepGrid[$panelCount++, "SCtFGame"] = "cgHitDistMax"; $wepGrid[$panelCount++, "SCtFGame"] = "cgDmgTG"; -$wepGrid[$panelCount++, "SCtFGame"] = "discKillsTG"; $wepGrid[$panelCount++, "SCtFGame"] = "discMATG"; $wepGrid[$panelCount++, "SCtFGame"] = "discHitDistMax"; $wepGrid[$panelCount++, "SCtFGame"] = "discDmgTG"; -$wepGrid[$panelCount++, "SCtFGame"] = "grenadeKillsTG"; $wepGrid[$panelCount++, "SCtFGame"] = "grenadeMATG"; $wepGrid[$panelCount++, "SCtFGame"] = "grenadeHitDistMax"; $wepGrid[$panelCount++, "SCtFGame"] = "grenadeDmgTG"; -$wepGrid[$panelCount++, "SCtFGame"] = "shockKillsTG"; $wepGrid[$panelCount++, "SCtFGame"] = "shockMATG"; $wepGrid[$panelCount++, "SCtFGame"] = "shockHitDistMax"; $wepGrid[$panelCount++, "SCtFGame"] = "shockDmgTG"; -$wepGrid[$panelCount++, "SCtFGame"] = "mineKillsTG"; $wepGrid[$panelCount++, "SCtFGame"] = "mineMATG"; $wepGrid[$panelCount++, "SCtFGame"] = "mineHitDistMax"; $wepGrid[$panelCount++, "SCtFGame"] = "mineDmgTG"; -$wepGrid[$panelCount++, "SCtFGame"] = "hGrenadeKillsTG"; $wepGrid[$panelCount++, "SCtFGame"] = "hGrenadeMATG"; $wepGrid[$panelCount++, "SCtFGame"] = "hGrenadeHitDistMax"; $wepGrid[$panelCount++, "SCtFGame"] = "hGrenadeDmgTG"; +$wepGrid[$panelCount++, "SCtFGame"] = "discKillsTG"; $wepGrid[$panelCount++, "SCtFGame"] = "discMATG"; $wepGrid[$panelCount++, "SCtFGame"] = "discHitDistMax"; $wepGrid[$panelCount++, "SCtFGame"] = "discDmgTG"; +$wepGrid[$panelCount++, "SCtFGame"] = "grenadeKillsTG"; $wepGrid[$panelCount++, "SCtFGame"] = "grenadeMATG"; $wepGrid[$panelCount++, "SCtFGame"] = "grenadeHitDistMax"; $wepGrid[$panelCount++, "SCtFGame"] = "grenadeDmgTG"; +$wepGrid[$panelCount++, "SCtFGame"] = "shockKillsTG"; $wepGrid[$panelCount++, "SCtFGame"] = "shockMATG"; $wepGrid[$panelCount++, "SCtFGame"] = "shockHitDistMax"; $wepGrid[$panelCount++, "SCtFGame"] = "shockDmgTG"; +$wepGrid[$panelCount++, "SCtFGame"] = "mineKillsTG"; $wepGrid[$panelCount++, "SCtFGame"] = "mineMATG"; $wepGrid[$panelCount++, "SCtFGame"] = "mineHitDistMax"; $wepGrid[$panelCount++, "SCtFGame"] = "mineDmgTG"; +$wepGrid[$panelCount++, "SCtFGame"] = "hGrenadeKillsTG"; $wepGrid[$panelCount++, "SCtFGame"] = "hGrenadeMATG"; $wepGrid[$panelCount++, "SCtFGame"] = "hGrenadeHitDistMax"; $wepGrid[$panelCount++, "SCtFGame"] = "hGrenadeDmgTG"; $wepGridCount["SCtFGame"] = $panelCount++; $panelCount = 0; @@ -2075,14 +2080,14 @@ $upperWepPanel[$panelCount++,"ArenaGame"] = "laserDeathsTG"; $upperWepPan $upperWepPanelCount["ArenaGame"] = $panelCount++; $panelCount = 0; -$wepGrid[$panelCount, "ArenaGame"] = "blasterKillsTG"; $wepGrid[$panelCount++, "ArenaGame"] = "blasterMATG"; $wepGrid[$panelCount++, "ArenaGame"] = "blasterHitDistMax"; $wepGrid[$panelCount++, "ArenaGame"] = "blasterDmgTG"; -$wepGrid[$panelCount++, "ArenaGame"] = "plasmaKillsTG"; $wepGrid[$panelCount++, "ArenaGame"] = "plasmaMATG"; $wepGrid[$panelCount++, "ArenaGame"] = "plasmaHitDistMax"; $wepGrid[$panelCount++, "ArenaGame"] = "plasmaDmgTG"; +$wepGrid[$panelCount, "ArenaGame"] = "blasterKillsTG"; $wepGrid[$panelCount++, "ArenaGame"] = "blasterMATG"; $wepGrid[$panelCount++, "ArenaGame"] = "blasterHitDistMax"; $wepGrid[$panelCount++, "ArenaGame"] = "blasterDmgTG"; +$wepGrid[$panelCount++, "ArenaGame"] = "plasmaKillsTG"; $wepGrid[$panelCount++, "ArenaGame"] = "plasmaMATG"; $wepGrid[$panelCount++, "ArenaGame"] = "plasmaHitDistMax"; $wepGrid[$panelCount++, "ArenaGame"] = "plasmaDmgTG"; $wepGrid[$panelCount++, "ArenaGame"] = "cgKillsTG"; $wepGrid[$panelCount++, "ArenaGame"] = "cgMATG"; $wepGrid[$panelCount++, "ArenaGame"] = "cgHitDistMax"; $wepGrid[$panelCount++, "ArenaGame"] = "cgDmgTG"; -$wepGrid[$panelCount++, "ArenaGame"] = "discKillsTG"; $wepGrid[$panelCount++, "ArenaGame"] = "discMATG"; $wepGrid[$panelCount++, "ArenaGame"] = "discHitDistMax"; $wepGrid[$panelCount++, "ArenaGame"] = "discDmgTG"; -$wepGrid[$panelCount++, "ArenaGame"] = "grenadeKillsTG"; $wepGrid[$panelCount++, "ArenaGame"] = "grenadeMATG"; $wepGrid[$panelCount++, "ArenaGame"] = "grenadeHitDistMax"; $wepGrid[$panelCount++, "ArenaGame"] = "grenadeDmgTG"; -$wepGrid[$panelCount++, "ArenaGame"] = "laserKillsTG"; $wepGrid[$panelCount++, "ArenaGame"] = "laserMATG"; $wepGrid[$panelCount++, "ArenaGame"] = "laserHitDistMax"; $wepGrid[$panelCount++, "ArenaGame"] = "laserDmgTG"; -$wepGrid[$panelCount++, "ArenaGame"] = "shockKillsTG"; $wepGrid[$panelCount++, "ArenaGame"] = "shockMATG"; $wepGrid[$panelCount++, "ArenaGame"] = "shockHitDistMax"; $wepGrid[$panelCount++, "ArenaGame"] = "shockDmgTG"; -$wepGrid[$panelCount++, "ArenaGame"] = "hGrenadeKillsTG"; $wepGrid[$panelCount++, "ArenaGame"] = "hGrenadeMATG"; $wepGrid[$panelCount++, "ArenaGame"] = "hGrenadeHitDistMax"; $wepGrid[$panelCount++, "ArenaGame"] = "hGrenadeDmgTG"; +$wepGrid[$panelCount++, "ArenaGame"] = "discKillsTG"; $wepGrid[$panelCount++, "ArenaGame"] = "discMATG"; $wepGrid[$panelCount++, "ArenaGame"] = "discHitDistMax"; $wepGrid[$panelCount++, "ArenaGame"] = "discDmgTG"; +$wepGrid[$panelCount++, "ArenaGame"] = "grenadeKillsTG"; $wepGrid[$panelCount++, "ArenaGame"] = "grenadeMATG"; $wepGrid[$panelCount++, "ArenaGame"] = "grenadeHitDistMax"; $wepGrid[$panelCount++, "ArenaGame"] = "grenadeDmgTG"; +$wepGrid[$panelCount++, "ArenaGame"] = "laserKillsTG"; $wepGrid[$panelCount++, "ArenaGame"] = "laserMATG"; $wepGrid[$panelCount++, "ArenaGame"] = "laserHitDistMax"; $wepGrid[$panelCount++, "ArenaGame"] = "laserDmgTG"; +$wepGrid[$panelCount++, "ArenaGame"] = "shockKillsTG"; $wepGrid[$panelCount++, "ArenaGame"] = "shockMATG"; $wepGrid[$panelCount++, "ArenaGame"] = "shockHitDistMax"; $wepGrid[$panelCount++, "ArenaGame"] = "shockDmgTG"; +$wepGrid[$panelCount++, "ArenaGame"] = "hGrenadeKillsTG"; $wepGrid[$panelCount++, "ArenaGame"] = "hGrenadeMATG"; $wepGrid[$panelCount++, "ArenaGame"] = "hGrenadeHitDistMax"; $wepGrid[$panelCount++, "ArenaGame"] = "hGrenadeDmgTG"; $wepGridCount["ArenaGame"] = $panelCount++; //discKillGround $panelCount = 0; @@ -2093,39 +2098,39 @@ $panelThree[$panelCount++,"ArenaGame"] = "ctrlKKillsTG"; $panelThree[$panelC $panelThree[$panelCount++,"ArenaGame"] = "timeTLAvg"; $panelThree[$panelCount++,"ArenaGame"] = "maxSpeedMax"; $panelThree[$panelCount++,"ArenaGame"] = "discJumpTG"; $panelThree[$panelCount++,"ArenaGame"] = "lagSpikesTG"; $panelThree[$panelCount++,"ArenaGame"] = "outOfBoundDeathsTG"; $panelThree[$panelCount++,"ArenaGame"] = "teamkillCountTG"; $panelThree[$panelCount++,"ArenaGame"] = "EVKillsTG"; $panelThree[$panelCount++,"ArenaGame"] = "idleTimeTG"; $panelThree[$panelCount++,"ArenaGame"] = "firstKillTG"; -$panelThree[$panelCount++,"ArenaGame"] = "airTimeTG"; $panelThree[$panelCount++,"ArenaGame"] = "groundTimeTG"; $panelThree[$panelCount++,"ArenaGame"] = "lastKillTG"; +$panelThree[$panelCount++,"ArenaGame"] = "airTimeTG"; $panelThree[$panelCount++,"ArenaGame"] = "groundTimeTG"; $panelThree[$panelCount++,"ArenaGame"] = "lastKillTG"; $panelThree[$panelCount++,"ArenaGame"] = "totalMATG"; $panelThree[$panelCount++,"ArenaGame"] = "groundKillsTG"; $panelThree[$panelCount++,"ArenaGame"] = "chatallCountTG"; $panelThree[$panelCount++,"ArenaGame"] = "concussHitTG"; $panelThree[$panelCount++,"ArenaGame"] = "maHitDistMax"; $panelThree[$panelCount++,"ArenaGame"] = "maHitHeightMax"; $panelThree[$panelCount++,"ArenaGame"] = "armorLKTG"; $panelThree[$panelCount++,"ArenaGame"] = "armorMKTG"; $panelThree[$panelCount++,"ArenaGame"] = "roundsWonTG"; $panelThree[$panelCount++,"ArenaGame"] = "groundDeathsTG"; $panelThree[$panelCount++,"ArenaGame"] = "deadDistMax"; $panelThree[$panelCount++,"ArenaGame"] = "deathKillsTG"; -$panelThree[$panelCount++,"ArenaGame"] = "discReflectHitTG"; $panelThree[$panelCount++,"ArenaGame"] = "discReflectKillTG"; $panelThree[$panelCount++,"ArenaGame"] = "killerDiscJumpTG"; -$panelThreeCount["ArenaGame"] = $panelCount++; - -$panelCount = 0; -$smallPanel[$panelCount,"ArenaGame"] = "discKillGroundTG"; -$smallPanel[$panelCount++,"ArenaGame"] = "discKillsTG"; -$smallPanel[$panelCount++,"ArenaGame"] = "discMATG"; -$smallPanel[$panelCount++,"ArenaGame"] = "discMAHitDistMax"; -$smallPanel[$panelCount++,"ArenaGame"] = "laserKillsTG"; -$smallPanel[$panelCount++,"ArenaGame"] = "laserHeadShotTG"; +$panelThree[$panelCount++,"ArenaGame"] = "discReflectHitTG"; $panelThree[$panelCount++,"ArenaGame"] = "discReflectKillTG"; $panelThree[$panelCount++,"ArenaGame"] = "killerDiscJumpTG"; +$panelThreeCount["ArenaGame"] = $panelCount++; + +$panelCount = 0; +$smallPanel[$panelCount,"ArenaGame"] = "discKillGroundTG"; +$smallPanel[$panelCount++,"ArenaGame"] = "discKillsTG"; +$smallPanel[$panelCount++,"ArenaGame"] = "discMATG"; +$smallPanel[$panelCount++,"ArenaGame"] = "discMAHitDistMax"; +$smallPanel[$panelCount++,"ArenaGame"] = "laserKillsTG"; +$smallPanel[$panelCount++,"ArenaGame"] = "laserHeadShotTG"; $smallPanel[$panelCount++,"ArenaGame"] = "laserHitDistMax"; -$smallPanel[$panelCount++,"ArenaGame"] = "totalTimeTG"; - -$smallPanel[$panelCount++,"ArenaGame"] = "hGrenadeKillsTG"; +$smallPanel[$panelCount++,"ArenaGame"] = "totalTimeTG"; + +$smallPanel[$panelCount++,"ArenaGame"] = "hGrenadeKillsTG"; $smallPanel[$panelCount++,"ArenaGame"] = "shockKillsTG"; -$smallPanel[$panelCount++,"ArenaGame"] = "shockMATG"; -$smallPanel[$panelCount++,"ArenaGame"] = "shockRearShotTG"; -$smallPanel[$panelCount++,"ArenaGame"] = "grenadeKillsTG"; -$smallPanel[$panelCount++,"ArenaGame"] = "grenadeMATG"; +$smallPanel[$panelCount++,"ArenaGame"] = "shockMATG"; +$smallPanel[$panelCount++,"ArenaGame"] = "shockRearShotTG"; +$smallPanel[$panelCount++,"ArenaGame"] = "grenadeKillsTG"; +$smallPanel[$panelCount++,"ArenaGame"] = "grenadeMATG"; $smallPanel[$panelCount++,"ArenaGame"] = "grenadeMAHitDistMax"; $smallPanel[$panelCount++,"ArenaGame"] = "lArmorTimeTG"; - -$smallPanel[$panelCount++,"ArenaGame"] = "assistTG"; -$smallPanel[$panelCount++,"ArenaGame"] = "plasmaKillsTG"; + +$smallPanel[$panelCount++,"ArenaGame"] = "assistTG"; +$smallPanel[$panelCount++,"ArenaGame"] = "plasmaKillsTG"; $smallPanel[$panelCount++,"ArenaGame"] = "plasmaMATG"; -$smallPanel[$panelCount++,"ArenaGame"] = "plasmaMAHitDistMax"; -$smallPanel[$panelCount++,"ArenaGame"] = "blasterKillsTG"; -$smallPanel[$panelCount++,"ArenaGame"] = "blasterMATG"; +$smallPanel[$panelCount++,"ArenaGame"] = "plasmaMAHitDistMax"; +$smallPanel[$panelCount++,"ArenaGame"] = "blasterKillsTG"; +$smallPanel[$panelCount++,"ArenaGame"] = "blasterMATG"; $smallPanel[$panelCount++,"ArenaGame"] = "blasterMAHitDistMax"; $smallPanel[$panelCount++,"ArenaGame"] = "mArmorTimeTG"; $smallPanelCount["ArenaGame"] = $panelCount++; @@ -2134,27 +2139,27 @@ $smallPanelCount["ArenaGame"] = $panelCount++; $panelCount = 0; $upperWepPanel[$panelCount, "DefaultGame"] = "discMAHitDistMax"; $upperWepPanel[$panelCount++, "DefaultGame"] = "plasmaMAHitDistMax";$upperWepPanel[$panelCount++, "DefaultGame"] = "blasterMAHitDistMax"; -$upperWepPanel[$panelCount++, "DefaultGame"] = "grenadeMAHitDistMax";$upperWepPanel[$panelCount++, "DefaultGame"] = "elfShotsFiredTG"; $upperWepPanel[$panelCount++, "DefaultGame"] = "totalWepDmgTG"; -$upperWepPanel[$panelCount++, "DefaultGame"] = "maxSpeedMax"; $upperWepPanel[$panelCount++, "DefaultGame"] = "shotsFiredTG"; $upperWepPanel[$panelCount++, "DefaultGame"] = "concussHitTG"; +$upperWepPanel[$panelCount++, "DefaultGame"] = "grenadeMAHitDistMax";$upperWepPanel[$panelCount++, "DefaultGame"] = "elfShotsFiredTG"; $upperWepPanel[$panelCount++, "DefaultGame"] = "totalWepDmgTG"; +$upperWepPanel[$panelCount++, "DefaultGame"] = "maxSpeedMax"; $upperWepPanel[$panelCount++, "DefaultGame"] = "shotsFiredTG"; $upperWepPanel[$panelCount++, "DefaultGame"] = "concussHitTG"; $upperWepPanel[$panelCount++, "DefaultGame"] = "comboCountTG"; $upperWepPanel[$panelCount++, "DefaultGame"] = "concussHitTG"; $upperWepPanel[$panelCount++, "DefaultGame"] = "tripleKillTG"; $upperWepPanelCount["DefaultGame"] = $panelCount++; $panelCount = 0; -$wepGrid[$panelCount, "DefaultGame"] = "blasterKillsTG"; $wepGrid[$panelCount++, "DefaultGame"] = "blasterMATG"; $wepGrid[$panelCount++, "DefaultGame"] = "blasterHitDistMax"; -$wepGrid[$panelCount++, "DefaultGame"] = "blasterDmgTG"; $wepGrid[$panelCount++, "DefaultGame"] = "plasmaKillsTG"; $wepGrid[$panelCount++, "DefaultGame"] = "plasmaMATG"; -$wepGrid[$panelCount++, "DefaultGame"] = "plasmaHitDistMax"; $wepGrid[$panelCount++, "DefaultGame"] = "plasmaDmgTG"; $wepGrid[$panelCount++, "DefaultGame"] = "cgKillsTG"; +$wepGrid[$panelCount, "DefaultGame"] = "blasterKillsTG"; $wepGrid[$panelCount++, "DefaultGame"] = "blasterMATG"; $wepGrid[$panelCount++, "DefaultGame"] = "blasterHitDistMax"; +$wepGrid[$panelCount++, "DefaultGame"] = "blasterDmgTG"; $wepGrid[$panelCount++, "DefaultGame"] = "plasmaKillsTG"; $wepGrid[$panelCount++, "DefaultGame"] = "plasmaMATG"; +$wepGrid[$panelCount++, "DefaultGame"] = "plasmaHitDistMax"; $wepGrid[$panelCount++, "DefaultGame"] = "plasmaDmgTG"; $wepGrid[$panelCount++, "DefaultGame"] = "cgKillsTG"; $wepGrid[$panelCount++, "DefaultGame"] = "cgMATG"; $wepGrid[$panelCount++, "DefaultGame"] = "cgHitDistMax"; $wepGrid[$panelCount++, "DefaultGame"] = "cgDmgTG"; -$wepGrid[$panelCount++, "DefaultGame"] = "discKillsTG"; $wepGrid[$panelCount++, "DefaultGame"] = "discMATG"; $wepGrid[$panelCount++, "DefaultGame"] = "discHitDistMax"; -$wepGrid[$panelCount++, "DefaultGame"] = "discDmgTG"; $wepGrid[$panelCount++, "DefaultGame"] = "grenadeKillsTG"; $wepGrid[$panelCount++, "DefaultGame"] = "grenadeMATG"; -$wepGrid[$panelCount++, "DefaultGame"] = "grenadeHitDistMax"; $wepGrid[$panelCount++, "DefaultGame"] = "grenadeDmgTG"; $wepGrid[$panelCount++, "DefaultGame"] = "laserKillsTG"; +$wepGrid[$panelCount++, "DefaultGame"] = "discKillsTG"; $wepGrid[$panelCount++, "DefaultGame"] = "discMATG"; $wepGrid[$panelCount++, "DefaultGame"] = "discHitDistMax"; +$wepGrid[$panelCount++, "DefaultGame"] = "discDmgTG"; $wepGrid[$panelCount++, "DefaultGame"] = "grenadeKillsTG"; $wepGrid[$panelCount++, "DefaultGame"] = "grenadeMATG"; +$wepGrid[$panelCount++, "DefaultGame"] = "grenadeHitDistMax"; $wepGrid[$panelCount++, "DefaultGame"] = "grenadeDmgTG"; $wepGrid[$panelCount++, "DefaultGame"] = "laserKillsTG"; $wepGrid[$panelCount++, "DefaultGame"] = "laserMATG"; $wepGrid[$panelCount++, "DefaultGame"] = "laserHitDistMax"; $wepGrid[$panelCount++, "DefaultGame"] = "laserDmgTG"; -$wepGrid[$panelCount++, "DefaultGame"] = "mortarKillsTG"; $wepGrid[$panelCount++, "DefaultGame"] = "mortarMATG"; $wepGrid[$panelCount++, "DefaultGame"] = "mortarHitDistMax"; -$wepGrid[$panelCount++, "DefaultGame"] = "mortarDmgTG"; $wepGrid[$panelCount++, "DefaultGame"] = "missileKillsTG"; $wepGrid[$panelCount++, "DefaultGame"] = "missileMATG"; -$wepGrid[$panelCount++, "DefaultGame"] = "missileHitDistMax"; $wepGrid[$panelCount++, "DefaultGame"] = "missileDmgTG"; $wepGrid[$panelCount++, "DefaultGame"] = "shockKillsTG"; +$wepGrid[$panelCount++, "DefaultGame"] = "mortarKillsTG"; $wepGrid[$panelCount++, "DefaultGame"] = "mortarMATG"; $wepGrid[$panelCount++, "DefaultGame"] = "mortarHitDistMax"; +$wepGrid[$panelCount++, "DefaultGame"] = "mortarDmgTG"; $wepGrid[$panelCount++, "DefaultGame"] = "missileKillsTG"; $wepGrid[$panelCount++, "DefaultGame"] = "missileMATG"; +$wepGrid[$panelCount++, "DefaultGame"] = "missileHitDistMax"; $wepGrid[$panelCount++, "DefaultGame"] = "missileDmgTG"; $wepGrid[$panelCount++, "DefaultGame"] = "shockKillsTG"; $wepGrid[$panelCount++, "DefaultGame"] = "shockMATG"; $wepGrid[$panelCount++, "DefaultGame"] = "shockHitDistMax"; $wepGrid[$panelCount++, "DefaultGame"] = "shockDmgTG"; -$wepGrid[$panelCount++, "DefaultGame"] = "mineKillsTG"; $wepGrid[$panelCount++, "DefaultGame"] = "mineMATG"; $wepGrid[$panelCount++, "DefaultGame"] = "mineHitDistMax"; -$wepGrid[$panelCount++, "DefaultGame"] = "mineDmgTG"; $wepGrid[$panelCount++, "DefaultGame"] = "hGrenadeKillsTG"; $wepGrid[$panelCount++, "DefaultGame"] = "hGrenadeMATG"; -$wepGrid[$panelCount++, "DefaultGame"] = "hGrenadeHitDistMax"; $wepGrid[$panelCount++, "DefaultGame"] = "hGrenadeDmgTG"; $wepGrid[$panelCount++, "DefaultGame"] = "satchelKillsTG"; +$wepGrid[$panelCount++, "DefaultGame"] = "mineKillsTG"; $wepGrid[$panelCount++, "DefaultGame"] = "mineMATG"; $wepGrid[$panelCount++, "DefaultGame"] = "mineHitDistMax"; +$wepGrid[$panelCount++, "DefaultGame"] = "mineDmgTG"; $wepGrid[$panelCount++, "DefaultGame"] = "hGrenadeKillsTG"; $wepGrid[$panelCount++, "DefaultGame"] = "hGrenadeMATG"; +$wepGrid[$panelCount++, "DefaultGame"] = "hGrenadeHitDistMax"; $wepGrid[$panelCount++, "DefaultGame"] = "hGrenadeDmgTG"; $wepGrid[$panelCount++, "DefaultGame"] = "satchelKillsTG"; $wepGrid[$panelCount++, "DefaultGame"] = "satchelMATG"; $wepGrid[$panelCount++, "DefaultGame"] = "satchelHitDistMax";$wepGrid[$panelCount++, "DefaultGame"] = "satchelDmgTG"; $wepGridCount["DefaultGame"] = $panelCount++; @@ -2280,7 +2285,7 @@ package dtStats{ } function CTFGame::clientMissionDropReady(%game, %client){ parent::clientMissionDropReady(%game, %client); - + if($dtStats::ctfTimes){ %team1 = $dtServer::capTimes[cleanMapName($missionName),%game.class,1]; %team2 = $dtServer::capTimes[cleanMapName($missionName),%game.class,1]; @@ -2288,17 +2293,17 @@ package dtStats{ %time2 = %game.formatTime(getField(%team2,0), true); %name1 = getField(%team1,1); %name2 = getField(%team1,2); - BottomPrint(%client, "Best caps on " @ $CurrentMission @ ":\n" @ getTaggedString(%game.getTeamName(1)) @ ":" SPC %name1 @ " in " @ %time1 @ " seconds\n" @ getTaggedString(%game.getTeamName(2)) @ ":" SPC %name2 @ " in " @ %time2 @ " seconds", 20, 3); + BottomPrint(%client, "Best caps on " @ $CurrentMission @ ":\n" @ getTaggedString(%game.getTeamName(1)) @ ":" SPC %name1 @ " in " @ %time1 @ " seconds\n" @ getTaggedString(%game.getTeamName(2)) @ ":" SPC %name2 @ " in " @ %time2 @ " seconds", 20, 3); } dtStatsMissionDropReady(%game, %client);//common } function CTFGame::gameOver( %game ){ - dtStatsGameOver(%game); + dtStatsGameOver(%game); parent::gameOver(%game); } function CTFGame::onClientKilled(%game, %clVictim, %clKiller, %damageType, %implement, %damageLocation){ clientKillStats(%game,%clVictim, %clKiller, %damageType, %implement, %damageLocation);//for stats collection - if(%clKiller.team != %clVictim.team && isObject(%clKiller.player)){// note test for vehicles + if(%clKiller.team != %clVictim.team && isObject(%clKiller.player)){// note test for vehicles %dist = vectorDist($dtStats::FlagPos[%clKiller.team], %clKiller.player.getPosition()); if(%dist > ($dtStats::FlagTotalDist*0.5)){// kill made closer to the enemy flag %clKiller.dtStats.stat["OffKills"]++; @@ -2388,9 +2393,9 @@ package dtStats{ else parent::updateScoreHud(%game, %client, %tag); } - function ArenaGame::sendDebriefing(%game, %client){ + function ArenaGame::sendDebriefing(%game, %client){ if(%client.isWatchOnly){ - parent::sendDebriefing(%game, %client); + parent::sendDebriefing(%game, %client); return; } messageClient( %client, 'MsgClearDebrief', "" ); @@ -2416,7 +2421,7 @@ package dtStats{ messageClient( %client, 'MsgDebriefResult', "", 'Team %1 and Team %2 tie!', %game.getTeamName(%firstTeam), %game.getTeamName(%secondTeam) ); else messageClient( %client, 'MsgDebriefResult', "", 'The mission ended in a tie.' ); - + if ( $Arena::Pref::TrackHighScores && Game.class $= "ArenaGame" ){ if ( %game.newHighScoreFlag ) messageClient( %client, 'MsgDebriefResult', "", '%1 has set a NEW INDIVIDUAL RECORD for this mission with a score of %2!', $Arena::HighScores::Name[$currentMission], $Arena::HighScores::Score[$currentMission] ); @@ -2428,7 +2433,7 @@ package dtStats{ messageClient( %client, 'MsgDebriefResult', "", 'But there are not enough human players here to set a new high score.' ); } messageClient( %client, 'MsgDebriefAddLine', "", ' ' ); - + messageClient( %client, 'MsgDebriefAddLine', "", '\nPLAYERTEAMSCOREKILLSKDRASSISTSDISC MA' ); @@ -2462,7 +2467,7 @@ package dtStats{ } messageClient( %client, 'MsgDebriefAddLine', "", %line, StripMLControlChars(getTaggedString(%cl.name)), %game.getTeamName(%cl.team), %score, %kills , %deaths, cropFloat(%cl.dtStats.stat["kdr"],2), %cl.dtStats.stat["assist"], %cl.dtStats.stat["discMA"] ); - %count[%highTeam]++; + %count[%highTeam]++; %notDone = false; for ( %team = 1; %team - 1 < %game.numTeams; %team++ ) { @@ -2473,7 +2478,7 @@ package dtStats{ } } } - + //now go through an list all the observers: %count = ClientGroup.getCount(); %printedHeader = false; @@ -2489,9 +2494,9 @@ package dtStats{ %score = %cl.score $= "" ? 0 : %cl.score; %kills = %cl.kills $= "" ? 0 : %cl.kills; %deaths = %cl.deaths $= "" ? 0 : %cl.deaths; - + messageClient(%client, 'MsgDebriefAddLine', "", '\nOBSERVERSSCOREKILLSKDRASSISTSDISC MA'); - + } //print out the client @@ -2507,7 +2512,7 @@ package dtStats{ } } extendedDebrief(%game, %client); - + } else{ parent::sendDebriefing(%game, %client);// note not default game @@ -2555,7 +2560,7 @@ package dtStats{ %time2 = %game.formatTime(getField(%team2,0), true); %name1 = getField(%team1,1); %name2 = getField(%team1,2); - BottomPrint(%client, "Best caps on " @ $CurrentMission @ ":\n" @ getTaggedString(%game.getTeamName(1)) @ ":" SPC %name1 @ " in " @ %time1 @ " seconds\n" @ getTaggedString(%game.getTeamName(2)) @ ":" SPC %name2 @ " in " @ %time2 @ " seconds", 20, 3); + BottomPrint(%client, "Best caps on " @ $CurrentMission @ ":\n" @ getTaggedString(%game.getTeamName(1)) @ ":" SPC %name1 @ " in " @ %time1 @ " seconds\n" @ getTaggedString(%game.getTeamName(2)) @ ":" SPC %name2 @ " in " @ %time2 @ " seconds", 20, 3); } dtStatsMissionDropReady(%game, %client);//common } @@ -2577,7 +2582,7 @@ package dtStats{ clientKillStats(%game,%clVictim, %clKiller, %damageType, %implement, %damageLocation);//for stats collection parent::onClientKilled(%game, %clVictim, %clKiller, %damageType, %implement, %damageLocation); } - + function LCTFGame::processGameLink(%game, %client, %arg1, %arg2, %arg3, %arg4, %arg5){ if($dtStats::Enable || %client.isSuperAdmin) dtGameLink(%game, %client, %arg1, %arg2, %arg3, %arg4, %arg5); @@ -2590,7 +2595,7 @@ package dtStats{ else parent::updateScoreHud(%game, %client, %tag); } - + function SCtFGame::clientMissionDropReady(%game, %client){ parent::clientMissionDropReady(%game, %client); if($dtStats::ctfTimes){ @@ -2600,7 +2605,7 @@ package dtStats{ %time2 = %game.formatTime(getField(%team2,0), true); %name1 = getField(%team1,1); %name2 = getField(%team1,2); - BottomPrint(%client, "Best caps on " @ $CurrentMission @ ":\n" @ getTaggedString(%game.getTeamName(1)) @ ":" SPC %name1 @ " in " @ %time1 @ " seconds\n" @ getTaggedString(%game.getTeamName(2)) @ ":" SPC %name2 @ " in " @ %time2 @ " seconds", 20, 3); + BottomPrint(%client, "Best caps on " @ $CurrentMission @ ":\n" @ getTaggedString(%game.getTeamName(1)) @ ":" SPC %name1 @ " in " @ %time1 @ " seconds\n" @ getTaggedString(%game.getTeamName(2)) @ ":" SPC %name2 @ " in " @ %time2 @ " seconds", 20, 3); } dtStatsMissionDropReady(%game, %client);//common } @@ -2621,7 +2626,7 @@ package dtStats{ } parent::onClientKilled(%game, %clVictim, %clKiller, %damageType, %implement, %damageLocation); } - + function SCtFGame::processGameLink(%game, %client, %arg1, %arg2, %arg3, %arg4, %arg5){ if($dtStats::Enable || %client.isSuperAdmin) dtGameLink(%game, %client, %arg1, %arg2, %arg3, %arg4, %arg5); @@ -2636,28 +2641,28 @@ package dtStats{ } /////////////////////////////////////////////////////////////////////////////// function DefaultGame::missionLoadDone(%game){ - parent::missionLoadDone(%game); + parent::missionLoadDone(%game); if(isObject(dtGameStat)){ - dtGameStat.delete(); + dtGameStat.delete(); } - $dtStats::MapStart = 1;//rebuild custom map list after first load + $dtStats::MapStart = 1;//rebuild custom map list after first load buildMissionList();// this way to prevent locking a person out of selecting a start map - + dtSaveServerVars(); dtScanForRepair(); if(%game.class $= "CTFGame" || %game.class $= "LCTFGame" || %game.class $= "SCtFGame"){ $dtStats::FlagPos[1] = $TeamFlag[1].getPosition(); $dtStats::FlagPos[2] = $TeamFlag[2].getPosition(); - $dtStats::FlagTotalDist = vectorDist($dtStats::FlagPos[1], $dtStats::FlagPos[2]); + $dtStats::FlagTotalDist = vectorDist($dtStats::FlagPos[1], $dtStats::FlagPos[2]); } $dtStats::gameID = formattimestring("yymmddHHnnss"); if($dtStats::debugEchos) error("GAME ID" SPC $dtStats::gameID SPC "//////////////////////////////"); - if($TB::TBEnable[$dtStats::gtNameShort[%game.class]] && !$Host::TournamentMode){// note this happens before clients start there load + if($TB::TBEnable[$dtStats::gtNameShort[%game.class]] && !$Host::TournamentMode){// note this happens before clients start there load ballenceTeams(%game,0); } - } - + } + function DefaultGame::forceObserver( %game, %client, %reason ){ parent::forceObserver( %game, %client, %reason ); if(%reason $= "spawnTimeout"){ @@ -2678,7 +2683,7 @@ package dtStats{ function chatMessageAll( %sender, %msgString, %a1, %a2, %a3, %a4, %a5, %a6, %a7, %a8, %a9, %a10 ){ if ( getsubstr(detag(%a2),0,1) $= "#" ){ error("dtchatcommandtest"); - return; + return; } parent::chatMessageAll( %sender, %msgString, %a1, %a2, %a3, %a4, %a5, %a6, %a7, %a8, %a9, %a10 ); %sender.dtStats.stat["chatallCount"]++; @@ -2801,7 +2806,7 @@ package dtStats{ if(isActivePackage(dtStatsGame)) deactivatePackage(dtStatsGame); } - + function ArenaGame::activatePackages(%game){ parent::activatePackages(%game); if(isActivePackage(dtStatsGame)){ @@ -2862,7 +2867,7 @@ package dtStats{ %cl = %projectile.sourceObject.client; if(isObject(%cl)){ %cl.lastExp = %data TAB %projectile.initialPosition TAB %position TAB %projectile.getWorldBox(); - %cl.lastExpTime = getSimTime(); + %cl.lastExpTime = getSimTime(); } parent::onCollision(%data, %projectile, %targetObject, %modifier, %position, %normal); } @@ -2997,8 +3002,8 @@ package dtStats{ } parent::onDamage(%this, %obj); } - - + + function CTFGame::recalcScore(%game, %cl){ parent::recalcScore(%game, %cl); %dtStats = %cl.dtStats; @@ -3023,12 +3028,12 @@ package dtStats{ } function CTFGame::awardScoreTkDestroy(%game, %cl, %obj){ parent::awardScoreTkDestroy(%game, %cl, %obj); - %cl.dtStats.stat["tkDestroys"] = %cl.tkDestroys; + %cl.dtStats.stat["tkDestroys"] = %cl.tkDestroys; } function CTFGame::awardScoreFlagCap(%game, %cl, %flag){ parent::awardScoreFlagCap(%game, %cl, %flag); - %cl.dtStats.stat["flagCaps"] = %cl.flagCaps; + %cl.dtStats.stat["flagCaps"]++; dtMinMax("flagCaps", "flag", 1, %cl.dtStats.stat["flagCaps"], %cl); } function CTFGame::awardScoreFlagTouch(%game, %cl, %flag){ @@ -3062,18 +3067,18 @@ package dtStats{ case "DeployedStationInventory": %cl.dtStats.stat["depStationDestroys"] = %cl.depStationDestroys; case "MPBTeleporter": - %cl.dtStats.stat["mpbtstationDestroys"] = %cl.mpbtstationDestroys; + %cl.dtStats.stat["mpbtstationDestroys"] = %cl.mpbtstationDestroys; } } function CTFGame::awardScoreVehicleDestroyed(%game, %client, %vehicleType, %mult, %passengers){ %val = parent::awardScoreVehicleDestroyed(%game, %client, %vehicleType, %mult, %passengers); switch$(%vehicleType){// add stas here - case "Grav Cycle": + case "Grav Cycle": %client.dtStats.stat["gravCycleDes"]++; case "Assault Tank": %client.dtStats.stat["assaultTankDes"]++; - case "MPB": + case "MPB": %client.dtStats.stat["MPBDes"]++; case "Turbograv": %client.dtStats.stat["turbogravDes"]++; @@ -3082,15 +3087,15 @@ package dtStats{ case "Heavy Transport": %client.dtStats.stat["heavyTransportDes"]++; } - %client.dtStats.stat["vehicleScore"] = %client.vehicleScore; - %client.dtStats.stat["vehicleBonus"] = %client.vehicleBonus; + %client.dtStats.stat["vehicleScore"] = %client.vehicleScore; + %client.dtStats.stat["vehicleBonus"] = %client.vehicleBonus; return %val; } function CTFGame::awardScoreFlagDefend(%game, %killerID){ %val = parent::awardScoreFlagDefend(%game, %killerID); %killerID.dtStats.stat["flagDefends"] = %killerID.flagDefends; dtMinMax("flagDefends", "flag", 1, %killerID.dtStats.stat["flagDefends"], %killerID); - return %val; + return %val; } function CTFGame::awardScoreGenDefend(%game, %killerID){ %val = parent::awardScoreGenDefend(%game, %killerID); @@ -3153,7 +3158,7 @@ package dtStats{ %client.dtStats.stat["depInvRepairs"] = %client.depInvRepairs; dtMinMax("repairs", "misc", 3, 1, %client); case "MPBTeleporter": - %client.dtStats.stat["mpbtstationRepairs"] = %client.mpbtstationRepairs; + %client.dtStats.stat["mpbtstationRepairs"] = %client.mpbtstationRepairs; dtMinMax("repairs", "misc", 3, 1, %client); } } @@ -3209,7 +3214,7 @@ package dtStats{ %client.dtStats.stat["assists"] = %client.assists; %client.dtStats.stat["roundKills"] = %client.roundKills; %client.dtStats.stat["hatTricks"] = %client.hatTricks; - + } function LCTFGame::recalcScore(%game, %cl){ @@ -3228,7 +3233,7 @@ package dtStats{ } function LCTFGame::awardScoreFlagCap(%game, %cl, %flag){ parent::awardScoreFlagCap(%game, %cl, %flag); - %cl.dtStats.stat["flagCaps"] = %cl.flagCaps; + %cl.dtStats.stat["flagCaps"]++; dtMinMax("flagCaps", "flag", 1, %cl.dtStats.stat["flagCaps"], %cl); } function LCTFGame::awardScoreFlagTouch(%game, %cl, %flag){ @@ -3259,14 +3264,14 @@ package dtStats{ %val = parent::awardScoreFlagDefend(%game, %killerID); %killerID.dtStats.stat["flagDefends"] = %killerID.flagDefends; dtMinMax("flagDefends", "flag", 1, %killerID.dtStats.stat["flagDefends"], %killerID); - return %val; + return %val; } function LCTFGame::awardScoreStalemateReturn(%game, %cl){ %val = parent::awardScoreStalemateReturn(%game, %cl); %cl.dtStats.stat["stalemateReturn"]++; return %val; } - + function SCtFGame::recalcScore(%game, %cl){ parent::recalcScore(%game, %cl); %dtStats = %cl.dtStats; @@ -3283,7 +3288,7 @@ package dtStats{ } function SCtFGame::awardScoreFlagCap(%game, %cl, %flag){ parent::awardScoreFlagCap(%game, %cl, %flag); - %cl.dtStats.stat["flagCaps"] = %cl.flagCaps; + %cl.dtStats.stat["flagCaps"]++; dtMinMax("flagCaps", "flag", 1, %cl.dtStats.stat["flagCaps"], %cl); } function SCtFGame::awardScoreFlagTouch(%game, %cl, %flag){ @@ -3314,7 +3319,7 @@ package dtStats{ %val = parent::awardScoreFlagDefend(%game, %killerID); %killerID.dtStats.stat["flagDefends"] = %killerID.flagDefends; dtMinMax("flagDefends", "flag", 1, %killerID.dtStats.stat["flagDefends"], %killerID); - return %val; + return %val; } function SCtFGame::awardScoreStalemateReturn(%game, %cl){ %val = parent::awardScoreStalemateReturn(%game, %cl); @@ -3347,7 +3352,7 @@ package dtStats{ // new debriefing stuff function LakRabbitGame::sendDebriefing( %game, %client ){ if(%client.isWatchOnly){ - parent::sendDebriefing(%game, %client); + parent::sendDebriefing(%game, %client); return; } messageClient( %client, 'MsgClearDebrief', "" ); @@ -3400,14 +3405,14 @@ package dtStats{ else %othertotdistance = mFloor(%cl.totalDistance); if(%cl.totalShockHits == 0) %shockhits = 0; else %shockhits = mFloor(%cl.totalShockHits); - + if(%client == %cl){ messageClient( %client, 'MsgDebriefAddLine', "", ' %1%2%3%4%5%6%7%8%%%9', StripMLControlChars(getTaggedString(%cl.name)), %score, %kills, %mas, %avgSpeed, %avgDistance, %othertotdistance, %shockPercent, %shockhits); } else{ messageClient( %client, 'MsgDebriefAddLine', "", ' %1%2%3%4%5%6%7%8%%%9', - StripMLControlChars(getTaggedString(%cl.name)), %score, %kills, %mas, %avgSpeed, %avgDistance, %othertotdistance, %shockPercent, %shockhits); + StripMLControlChars(getTaggedString(%cl.name)), %score, %kills, %mas, %avgSpeed, %avgDistance, %othertotdistance, %shockPercent, %shockhits); } if(%score) %totscore += %score; @@ -3427,8 +3432,8 @@ package dtStats{ extendedDebrief(%game, %client); } else{ - parent::sendDebriefing(%game, %client); - extendedDebrief(%game, %client); + parent::sendDebriefing(%game, %client); + extendedDebrief(%game, %client); } } }; @@ -3436,7 +3441,7 @@ package dtStats{ // that way we get called first then the gametype can do whatever -// there is no main function for these +// there is no main function for these function LCTFGame::awardScoreDeath(%game, %victimID){ parent::awardScoreDeath(%game, %victimID); %victimID.dtStats.stat["deaths"] = %victimID.deaths; @@ -3480,7 +3485,7 @@ function CTFGame::awardScoreTeamkill(%game, %victimID, %killerID){ function CTFGame::sendDebriefing(%game, %client){ if(%client.isWatchOnly){ - parent::sendDebriefing(%game, %client); + parent::sendDebriefing(%game, %client); return; } messageClient( %client, 'MsgClearDebrief', "" ); @@ -3495,7 +3500,7 @@ function CTFGame::sendDebriefing(%game, %client){ function LCTFGame::sendDebriefing(%game, %client){ if(%client.isWatchOnly){ - parent::sendDebriefing(%game, %client); + parent::sendDebriefing(%game, %client); return; } messageClient( %client, 'MsgClearDebrief', "" ); @@ -3510,7 +3515,7 @@ function LCTFGame::sendDebriefing(%game, %client){ function SCtFGame::sendDebriefing(%game, %client){ if(%client.isWatchOnly){ - parent::sendDebriefing(%game, %client); + parent::sendDebriefing(%game, %client); return; } messageClient( %client, 'MsgClearDebrief', "" ); @@ -3591,7 +3596,7 @@ function DefaultGame::sendCTFDebrif(%game,%client){ } messageClient( %client, 'MsgDebriefAddLine', "", %line, StripMLControlChars(getTaggedString(%cl.name)), %game.getTeamName(%cl.team), %score, %kills, %cl.dtStats.stat["assist"], %cl.dtStats.stat["OffKills"], %cl.dtStats.stat["DefKills"], %cl.dtStats.stat["discMA"],%nameColor); - %count[%highTeam]++; + %count[%highTeam]++; %notDone = false; for ( %team = 1; %team - 1 < %game.numTeams; %team++ ) { @@ -3602,7 +3607,7 @@ function DefaultGame::sendCTFDebrif(%game,%client){ } } } - + //now go through an list all the observers: %count = ClientGroup.getCount(); %printedHeader = false; @@ -3626,16 +3631,16 @@ function DefaultGame::sendCTFDebrif(%game,%client){ %line = '%9%1 %2%3%4%5%6%7%8'; } else{ - %line = '%9%1 %2%3%4%5%6%7%8'; + %line = '%9%1 %2%3%4%5%6%7%8'; } messageClient( %client, 'MsgDebriefAddLine', "", %line,StripMLControlChars(getTaggedString(%cl.name)), "", %score, %kills, %cl.dtStats.stat["assist"], %cl.dtStats.stat["OffKills"], %cl.dtStats.stat["DefKills"], %cl.dtStats.stat["discMA"],%nameColor ); } - } + } } function extendedDebrief(%game, %client){ - if($dtStats::evoStyleDebrief && !%client.isWatchOnly){ - if(dtGameStat.gc["flag"] > 0){ + if($dtStats::evoStyleDebrief && !%client.isWatchOnly){ + if(dtGameStat.gc["flag"] > 0){ messageClient( %client, 'MsgDebriefAddLine', "", ' ' ); messageClient( %client, 'MsgDebriefAddLine', "", 'FLAG STATS\tPLAYER\t' ); if(dtGameStat.stat["heldTimeSec"] > 0) @@ -3679,37 +3684,37 @@ function extendedDebrief(%game, %client){ if(dtGameStat.stat["mortarMA"] > 0){ %line = 'Mortar\t%5%1\t%2\t%6%3\t%4m'; messageClient( %client, 'MsgDebriefAddLine', "", %line, StripMLControlChars(hasValueS(dtGameStat.name["mortarMA"],"NA")), dtGameStat.stat["mortarMA"], StripMLControlChars(hasValueS(dtGameStat.name["mortarMAHitDist"],"NA")), mFormatFloat(dtGameStat.stat["mortarMAHitDist"], "%.2f"),(%client == dtGameStat.client["mortarMA"]) ? "" : "", (%client == dtGameStat.client["mortarMAHitDist"]) ? "" : ""); - } + } } if(dtGameStat.gc["misc"] > 0){ messageClient( %client, 'MsgDebriefAddLine', "", ' ' ); messageClient( %client, 'MsgDebriefAddLine', "", 'MISC' ); if(dtGameStat.stat["laserHeadShot"] > 0) messageClient( %client, 'MsgDebriefAddLine', "", 'Headhunter\t%3%1\t%2',StripMLControlChars(dtGameStat.name["laserHeadShot"]),dtGameStat.stat["laserHeadShot"],(%client == dtGameStat.client["flagReturns"]) ? "" : ""); - if(dtGameStat.stat["laserHitDist"] > 0) + if(dtGameStat.stat["laserHitDist"] > 0) messageClient( %client, 'MsgDebriefAddLine', "", 'Longest Snipe\t%3%1\t%2m',StripMLControlChars(dtGameStat.name["laserHitDist"]),mFormatFloat(dtGameStat.stat["laserHitDist"], "%.2f"),(%client == dtGameStat.client["laserHitDist"]) ? "" : ""); - if(dtGameStat.stat["shockRearShot"] > 0) + if(dtGameStat.stat["shockRearShot"] > 0) messageClient( %client, 'MsgDebriefAddLine', "", 'Taser Tailgater\t%3%1\t%2',StripMLControlChars(dtGameStat.name["shockRearShot"]),dtGameStat.stat["shockRearShot"],(%client == dtGameStat.client["shockRearShot"]) ? "" : ""); - if(dtGameStat.stat["repairs"] > 0) + if(dtGameStat.stat["repairs"] > 0) messageClient( %client, 'MsgDebriefAddLine', "", 'Fixer Upper\t%3%1\t%2',StripMLControlChars(dtGameStat.name["repairs"]),dtGameStat.stat["repairs"],(%client == dtGameStat.client["repairs"]) ? "" : ""); } - + if(dtGameStat.gc["wep"] > 0){ messageClient( %client, 'MsgDebriefAddLine', "", ' ' ); messageClient( %client, 'MsgDebriefAddLine', "", '\tPLAYER\tDMG\tPLAYER\tKILLS'); - + if(dtGameStat.stat["blasterKills"] > 0){ %line = 'Blaster Master\t%5%1\t%2\t%6%3\t%4'; %color1 = (%client == dtGameStat.client["blasterDmg"]) ? "" : ""; %color2 = (%client == dtGameStat.client["blasterKills"]) ? "" : ""; messageClient( %client, 'MsgDebriefAddLine', "", %line, StripMLControlChars(hasValueS(dtGameStat.name["blasterDmg"],"NA")), mFormatFloat(dtGameStat.stat["blasterDmg"], "%.2f"), StripMLControlChars(hasValueS(dtGameStat.name["blasterKills"],"NA")), dtGameStat.stat["blasterKills"],%color1,%color2); - } + } if(dtGameStat.stat["plasmaKills"] > 0){ %line = 'Plasma Roaster\t%5%1\t%2\t%6%3\t%4'; %color1 = (%client == dtGameStat.client["plasmaDmg"]) ? "" : ""; %color2 = (%client == dtGameStat.client["plasmaKills"]) ? "" : ""; messageClient( %client, 'MsgDebriefAddLine', "", %line, StripMLControlChars(hasValueS(dtGameStat.name["plasmaDmg"],"NA")), mFormatFloat(dtGameStat.stat["plasmaDmg"], "%.2f"), StripMLControlChars(hasValueS(dtGameStat.name["plasmaKills"],"NA")), dtGameStat.stat["plasmaKills"],%color1,%color2); - } + } if(dtGameStat.stat["discKills"] > 0){ %line = 'Disc-O-maniac\t%5%1\t%2\t%6%3\t%4'; %color1 = (%client == dtGameStat.client["discDmg"]) ? "" : ""; @@ -3890,10 +3895,10 @@ package dtStatsGame{ clientDmgStats(%data,%position,%sourceObject,%targetObject, %damageType,%amount); parent::damageObject(%data, %targetObject, %sourceObject, %position, %amount, %damageType, %momVec, %mineSC); } - + function SensorJammerPackImage::onMount(%data, %obj, %slot){ parent::onMount(%data, %obj, %slot); - %obj.client.dtStats.stat["jammer"]++; + %obj.client.dtStats.stat["jammer"]++; } //0 Fire 1 ??? 2 jump 3 jet 4 gernade 5 mine @@ -4030,10 +4035,10 @@ package dtStatsGame{ } function CTFGame::boundaryLoseFlag(%game, %player){ %flag = %player.holdingFlag; - + %ftime = getSimTime() - %game.dtTotalFlagTime[%flag]; %player.client.dtStats.stat["flagTimeMin"] += (%ftime/1000)/60; - + %game.dtTotalFlagTime[%flag] = 0; parent::boundaryLoseFlag(%game, %player); } @@ -4101,13 +4106,13 @@ package dtStatsGame{ if(%game.dtTotalFlagTime[%flag]){ %heldTime = (getSimTime() - %game.dtTotalFlagTime[%flag])/1000; %dtStats.stat["flagTimeMin"] += %heldTime/60; - + if(%heldTime < %dtStats.stat["heldTimeSec"] || !%dtStats.stat["heldTimeSec"]){ %dtStats.stat["heldTimeSec"] = %heldTime; dtMinMax("heldTimeSec", "flag", 2, %heldTime, %player.client); - - - } + + + } if($dtStats::ctfTimes){ %heldTimeMS = getSimTime() - %game.dtTotalFlagTime[%flag]; %fTime = %game.formatTime(%heldTimeMS, true); @@ -4120,7 +4125,7 @@ package dtStatsGame{ %saved = "\c2Saved: \c3-" @ %game.formatTime(%oldTime - %heldTimeMS, true) @ "\c2"; } //schedule(2000, 0, "messageAll", 'MsgCTFNewRecord', "\c2It's a new record! Time: \c3"@ %fTime @"\c2 " @ %saved @ "~wfx/misc/hunters_horde.wav"); - schedule(4000, 0, "messageAll", 'MsgCTFNewRecord', '\c2It\'s a new %3 record! Time: \c3%1 \c2%2 ~wfx/misc/hunters_horde.wav',%fTime,%saved,$TeamName[%clTeam]); + schedule(4000, 0, "messageAll", 'MsgCTFNewRecord', '\c2It\'s a new %3 record! Time: \c3%1 \c2%2 ~wfx/misc/hunters_horde.wav',%fTime,%saved,$TeamName[%clTeam]); $dtServer::capTimes[%mapName,%game.class,%clTeam] = %heldTimeMS TAB %dtStats.name; } } @@ -4144,10 +4149,10 @@ package dtStatsGame{ ///////////////////////////////////////////////////////////////////////////// function LCTFGame::playerDroppedFlag(%game, %player){ %flag = %player.holdingFlag; - + %ftime = getSimTime() - %game.dtTotalFlagTime[%flag]; %player.client.dtStats.stat["flagTimeMin"] += (%ftime/1000)/60; - + %game.dtTotalFlagTime[%flag] = 0; if(%player.getState() !$= "Dead"){ %player.client.dtStats.stat["flagToss"]++; @@ -4161,10 +4166,10 @@ package dtStatsGame{ } function LCTFGame::boundaryLoseFlag(%game, %player){ %flag = %player.holdingFlag; - + %ftime = getSimTime() - %game.dtTotalFlagTime[%flag]; %player.client.dtStats.stat["flagTimeMin"] += (%ftime/1000)/60; - + %game.dtTotalFlagTime[%flag] = 0; parent::boundaryLoseFlag(%game, %player); } @@ -4225,7 +4230,7 @@ package dtStatsGame{ } if(%game.dtTotalFlagTime[%flag]){ %heldTime = (getSimTime() - %game.dtTotalFlagTime[%flag])/1000; - %dtStats.stat["flagTimeMin"] += %heldTime/60; + %dtStats.stat["flagTimeMin"] += %heldTime/60; if(%heldTime < %dtStats.stat["heldTimeSec"] || !%dtStats.stat["heldTimeSec"]){ %dtStats.stat["heldTimeSec"] = %heldTime; dtMinMax("heldTimeSec", "flag", 2, %heldTime, %player.client); @@ -4263,14 +4268,14 @@ package dtStatsGame{ } parent::playerTouchOwnFlag(%game, %player, %flag); } - - + + function SCtFGame::playerDroppedFlag(%game, %player){ %flag = %player.holdingFlag; - + %ftime = getSimTime() - %game.dtTotalFlagTime[%flag]; %player.client.dtStats.stat["flagTimeMin"] += (%ftime/1000)/60; - + %game.dtTotalFlagTime[%flag] = 0; if(%player.getState() !$= "Dead"){ %player.client.dtStats.stat["flagToss"]++; @@ -4284,10 +4289,10 @@ package dtStatsGame{ } function SCtFGame::boundaryLoseFlag(%game, %player){ %flag = %player.holdingFlag; - + %ftime = getSimTime() - %game.dtTotalFlagTime[%flag]; %player.client.dtStats.stat["flagTimeMin"] += (%ftime/1000)/60; - + %game.dtTotalFlagTime[%flag] = 0; parent::boundaryLoseFlag(%game, %player); } @@ -4348,7 +4353,7 @@ package dtStatsGame{ } if(%game.dtTotalFlagTime[%flag]){ %heldTime = (getSimTime() - %game.dtTotalFlagTime[%flag])/1000; - %dtStats.stat["flagTimeMin"] += %heldTime/60; + %dtStats.stat["flagTimeMin"] += %heldTime/60; if(%heldTime < %dtStats.stat["heldTimeSec"] || !%dtStats.stat["heldTimeSec"]){ %dtStats.stat["heldTimeSec"] = %heldTime; dtMinMax("heldTimeSec", "flag", 2, %heldTime, %player.client); @@ -4498,7 +4503,7 @@ function ArenaHud( %game, %client, %tag ) for ( %iTeam = 1; %iTeam <= Game.numTeams; %iTeam++ ) { // Send team name - + %teamPlayerCount = tsPlayerCountTeam( %iTeam ); %teamPlayerCountPlural = %teamPlayerCount == 1 ? "" : "s"; @@ -4626,7 +4631,7 @@ function DMHud(%game, %client, %tag){// note in this game type the score hud can messageClient( %client, 'SetLineHud', "", %tag, %index, '%5\t%1%2%3%4%6', %cl.name, %clScore, %clKills, %clDeaths, %clStyle, %clBonus); } - //else for observers, create an anchor around the player name so they can be observed + //else for observers, create an anchor around the player name so they can be observed else { messageClient( %client, 'SetLineHud', "", %tag, %index, '%5\t%1%2%3%4%7', @@ -5022,7 +5027,7 @@ function CTFHud(%game, %client, %tag){// defaultGame/evo %index++; } - //for(%i = 10; %i <= 32; %i++){ + //for(%i = 10; %i <= 32; %i++){ //messageClient(%client, 'SetLineHud', "", %tag, %index, ' [RobotoGg %1]', %i); //%index++; //} @@ -5034,7 +5039,7 @@ function dtStatsMissionDropReady(%game, %client){ // called when client has fini if($dtStats::debugEchos){error("dtStatsMissionDropReady GUID = " SPC %client.guid);} if($HostGamePlayerCount > $dtServer::maxPlayers[cleanMapName($CurrentMission),%game.class]) $dtServer::maxPlayers[cleanMapName($CurrentMission),%game.class] = $HostGamePlayerCount; - + %client.lp = "";//last position for distMove %client.lgame = %game.class; %foundOld = 0; @@ -5054,7 +5059,7 @@ function dtStatsMissionDropReady(%game, %client){ // called when client has fini %client.dtStats = %dtStats; %dtStats.client = %client; %dtStats.clientLeft = 0; - %dtStats.stat["clientQuit"] = 0; + %dtStats.stat["clientQuit"] = 0; %dtStats.markForDelete = 0; if(%dtStats.leftID == $dtStats::leftID){ $dtServer::mapReconnects[cleanMapName($CurrentMission),%game.class]++; @@ -5087,7 +5092,7 @@ function dtStatsMissionDropReady(%game, %client){ // called when client has fini else{ %dtStats = %client.dtStats; } - + %dtStats.joinPCT = (isGameRun() == 1) ? %game.getGamePct() : 0; updateTeamTime(%dtStats, -1); %dtStats.team = %client.team;// should be 0 @@ -5120,7 +5125,7 @@ function dtStatsClientLeaveGame(%client){ %client.dtStats.leftPCT = Game.getGamePct(); if(isGameRun() && %client.score != 0){ updateTeamTime(%client.dtStats, %client.dtStats.team); - armorTimer(%client.dtStats, 0, 1); + armorTimer(%client.dtStats, 0, 1); } } else{ @@ -5135,27 +5140,27 @@ function dtStatsGameOver( %game ){ $dtStats::LastMissionCM = $CurrentMission; $dtStats::LastGameType = %game.class; $dtStats::LastGameID = $dtStats::gameID; - + $dtStats::tmMode = $Host::TournamentMode; - - if(%game.class $= "CTFGame" || %game.class $= "LCTFGame" || %game.class $= "SCtFGame" || %game.class $= "ArenaGame" ){ + + if(%game.class $= "CTFGame" || %game.class $= "LCTFGame" || %game.class $= "SCtFGame" || %game.class $= "ArenaGame" ){ if($dtStats::tmMode){ if(!isObject(pugList)){ - new simGroup(pugList); - rootGroup.add(pugList); + new simGroup(pugList); + rootGroup.add(pugList); } %tmClass = "TM" @ %game.class; if(!isObject(%tmClass)){ new simGroup(%tmClass){ game = %game.class; - }; - pugList.add(%tmClass); + }; + pugList.add(%tmClass); } %so = new scriptObject(){ pugID = $dtStats::gameID; mapName = $MissionDisplayName; date = formattimestring("M-d-yy"); - teamOne = $TeamScore[1]; + teamOne = $TeamScore[1]; teamTwo = $TeamScore[2]; gameType = %game.class; count = %tmClass.count; @@ -5165,7 +5170,7 @@ function dtStatsGameOver( %game ){ if(%tmClass.getCount() > 50){ %max = 0; for(%i = 0; %i < %tmClass.getCount(); %i++){ - %obj = %tmClass.getObject(%i); + %obj = %tmClass.getObject(%i); %delta = getTimeDelta(%obj.mark); if(%max < %delta){ %max = %delta; @@ -5179,21 +5184,21 @@ function dtStatsGameOver( %game ){ } else{ if(!isObject(pubList)){ - new simGroup(pubList); - rootGroup.add(pubList); + new simGroup(pubList); + rootGroup.add(pubList); } %gmClass = "GM" @ %game.class; if(!isObject(%gmClass)){ new simGroup(%gmClass){ game = %game.class; - }; - pubList.add(%gmClass); + }; + pubList.add(%gmClass); } %so = new scriptObject(){ pugID = $dtStats::gameID; mapName = $MissionDisplayName; date = formattimestring("M-d-yy"); - teamOne = $TeamScore[1]; + teamOne = $TeamScore[1]; teamTwo = $TeamScore[2]; gameType = %game.class; count = %gmClass.count; @@ -5203,7 +5208,7 @@ function dtStatsGameOver( %game ){ if(%gmClass.getCount() > 100){ %max = 0; for(%i = 0; %i < %gmClass.getCount(); %i++){ - %obj = %gmClass.getObject(%i); + %obj = %gmClass.getObject(%i); %delta = getTimeDelta(%obj.mark); if(%max < %delta){ %max = %delta; @@ -5213,14 +5218,14 @@ function dtStatsGameOver( %game ){ if(isObject(%delObj)){ %delObj.delete(); } - } + } } } - + if(%game.getGamePct() > 90){ $dtServer::playCount[cleanMapName($CurrentMission),%game.class]++; $dtServer::lastPlay[cleanMapName($CurrentMission),%game.class] = getDayNum() TAB getYear() TAB formattimestring("mm/dd/yy hh:nn:a"); - if(%game.numTeams > 1){ + if(%game.numTeams > 1){ if($teamScore[1] > $teamScore[2]){ $dtServer::teamOneWin[cleanMapName($CurrentMission),%game.class]++; $dtServer::teamTwoLoss[cleanMapName($CurrentMission),%game.class]++; @@ -5233,7 +5238,7 @@ function dtStatsGameOver( %game ){ } else $dtServer::skipCount[cleanMapName($CurrentMission),%game.class]++; - + if(!$dtStats::statsSave){//in case of admin skip map and it has not finished saving the old map $dtStats::statsSave = 1; statsGroup.stat["firstKill"] = 0; @@ -5256,7 +5261,7 @@ function dtStatsGameOver( %game ){ } else if($dtStats::reloadTotal){ %time += $dtStats::saveTime; - schedule(%time,0,"loadGameTotalStats",%dtStats,%game.class); + schedule(%time,0,"loadGameTotalStats",%dtStats,%game.class); } %time += $dtStats::saveTime; schedule(%time,0,"incGameStats",%dtStats,%game.class); @@ -5269,7 +5274,7 @@ function dtStatsGameOver( %game ){ %client.dtStats.isBot = (%client.isWatchOnly == 1); %client.viewMenu = %client.viewClient = %client.viewStats = 0;//reset hud %client.lastPage = 1; %client.lgame = %game; - + if($dtStats::Enable){ %game.postGameStats(%dtStats); if(!%dtStats.gameData[%game.class, $dtStats::tmMode]){ @@ -5278,7 +5283,7 @@ function dtStatsGameOver( %game ){ } else if($dtStats::reloadTotal){ %time += $dtStats::saveTime; - schedule(%time,0,"loadGameTotalStats",%dtStats,%game.class); + schedule(%time,0,"loadGameTotalStats",%dtStats,%game.class); } %time += $dtStats::saveTime; // this will chain them schedule(%time ,0,"incGameStats",%dtStats,%game.class); //resetDtStats after incGame @@ -5286,7 +5291,7 @@ function dtStatsGameOver( %game ){ schedule(%time,0,"saveGameTotalStats",%dtStats,%game.class); // } else{ - resetDtStats(%dtStats,%game.class,0); + resetDtStats(%dtStats,%game.class,0); } } else{ @@ -5329,20 +5334,20 @@ function endGameTB(%game){ loadTBMap(%game); } if($TB::TBLog[$dtStats::gtNameShort[%game.class]]){ - logTB(%game);// log the outcome + logTB(%game);// log the outcome } for(%x = 0; %x < statsGroup.getCount(); %x++){ %dtStats = statsGroup.getObject(%x); calcTBScores(%dtStats,%game); } - saveTBMap(%game);// save map stats + saveTBMap(%game);// save map stats } } function calcTBScores(%dtStats,%game){ if(%game.class $= "CTFGame" || %game.class $= "LCTFGame" || %game.class $= "SCtFGame" || %game.class $= "ArenaGame"){ if($dtStats::debugEchos){error("calcTBScores" SPC %dtStats SPC %game);} - + if(%dtStats.tScore $= ""){ %dtStats.tScore = 0; } @@ -5355,8 +5360,8 @@ function calcTBScores(%dtStats,%game){ if(!getFieldCount(%dtStats.mGScore)){ %dtStats.mGScore = "0\t0\t0\t0\t0\t0\t0\t0\t0\t0\t0\t0\t0\t0\t0\t0"; } - - if(isObject(%dtStats) && ((getSimTime() - $missionStartTime) > ((15 * 60) * 1000))){// make sre we dident short cycle + + if(isObject(%dtStats) && ((getSimTime() - $missionStartTime) > ((15 * 60) * 1000))){// make sre we dident short cycle %tgame = $dtStats::gtNameShort[%game.class]; %tScore = 0; for(%i = 0; %i < $TB::statGroupCount[%tgame]; %i++){ @@ -5369,12 +5374,12 @@ function calcTBScores(%dtStats,%game){ %tScore += %dtstats.stat[%var] * (%w/100); } } - + if(%tScore > 0){ %dtStats.tScore = expoMovAvg(%dtStats.tScore, %tScore); %dtStats.mTScore = expoMovAvg(%dtStats.mTScore, %tScore); } - + if(%gScore > 0){ %value = getField(%dtStats.gScore,%i); @@ -5386,7 +5391,7 @@ function calcTBScores(%dtStats,%game){ %newValue = expoMovAvg(%value , %gScore); %dtStats.mGScore = setField(%dtStats.mGScore, %i, %newValue); } - + } } } @@ -5402,7 +5407,7 @@ function logTB(%game) { for (%t = 1; %t <= %game.numTeams; %t++) { // teams %log.writeLine("Game Score" SPC $TeamScore[%t]); %output = "Team" @ %t SPC "Rating" SPC $dtTeamScore[%t] @ %t; - + // Print role headers for (%r = 0; %r < %numRoles; %r++) { %output = %output @ "\tRole" @ %r; @@ -5410,7 +5415,7 @@ function logTB(%game) { echo(%output); %log.writeLine(%output); %maxClients = 0; - + // Find the max number of clients in any role to determine rows needed for (%r = 0; %r < %numRoles; %r++) { if ($TT::LOGC[%t, %r] > %maxClients) { @@ -5431,12 +5436,12 @@ function logTB(%game) { echo(%row); %log.writeLine(%row); } - + echo("\n"); // Extra line break for clarity } - + + %log.writeLine(""); %log.writeLine(""); - %log.writeLine(""); %log.writeLine("Teams Summary:"); for (%i = 0; %i < %game.numTeams; %i++) { %log.writeLine("Team " @ %i + 1 @ " - " @ $dtTeamScore[%i + 1]); @@ -5450,19 +5455,19 @@ function logTB(%game) { %dtStats = $dtTeamList[%i+1,%j]; %msg = "\t" SPC %dtStats.name; for (%v = 0; %v < %numRoles; %v++) { - %msg = %msg SPC "\t" SPC getField(%dtStats.mGScore,%v); - %teamStats[%i+1,%v] += getField(%dtStats.mGScore,%v); - } + %msg = %msg SPC "\t" SPC getField(%dtStats.mGScore,%v); + %teamStats[%i+1,%v] += getField(%dtStats.mGScore,%v); + } %log.writeLine(%msg); } - %teamMsg ="\t"; + %teamMsg ="\t"; for (%v = 0; %v < $weightsTestCount; %v++) { %teamMsg = %teamMsg SPC "\t" SPC %teamStats[%i+1,%v]; } %log.writeLine(%teamMsg); } %log.writeLine("Team Score Dif" SPC mabs($dtTeamScore[1] - $dtTeamScore[2])); - + %log.close(); %log.delete(); } @@ -5473,10 +5478,10 @@ function listTBInfo(%val){ if(%val){ calcTBScores(%dtStats,Game); } - echo(%dtStats.sel SPC "Score" SPC %dtStats.name SPC %dtStats.tScore SPC %dtStats.gScore); + echo(%dtStats.sel SPC "Score" SPC %dtStats.name SPC %dtStats.tScore SPC %dtStats.gScore); } if(%val == 2){ - ballenceTeams(Game,0); + ballenceTeams(Game,0); } } function listStat(){ @@ -5490,24 +5495,24 @@ function forceTeamBal(){ %dtStats = statsGroup.getObject(%x); calcTBScores(%dtStats,Game); } - ballenceTeams(Game,1); + ballenceTeams(Game,1); } function ballenceTeams(%game,%forceTeam){ if(%game.class $= "CTFGame" || %game.class $= "LCTFGame" || %game.class $= "SCtFGame" || %game.class $= "ArenaGame"){ if($dtStats::debugEchos){error("ballenceTeams" SPC %game.class SPC %forceTeam);} if(statsGroup.getCount() < 1){ - return; + return; } - loadTBMap(%game);// load up exisitng map stats + loadTBMap(%game);// load up exisitng map stats %tgame = $dtStats::gtNameShort[%game.class]; if(isObject(statCol)){ - statCol.delete(); + statCol.delete(); } new simGroup(statCol); - statCol.tzc = 0; + statCol.tzc = 0; statCol.rbc = 0; RootGroup.add(statCol); - + for (%i = 0; %i < ClientGroup.getCount(); %i++){ %client = ClientGroup.getObject(%i); if(!%client.team){ @@ -5515,8 +5520,8 @@ function ballenceTeams(%game,%forceTeam){ statCol.tzc++; } } - - + + for (%y = 0; %y < $TB::statGroupCount[%tgame]; %y++) { %set = new simSet(); %set.rbc = 0; @@ -5529,34 +5534,34 @@ function ballenceTeams(%game,%forceTeam){ %lg = getField(%dtStats.gScore,%y); %rateing = (%map > (%lg*0.75)) ? %map :%lg;//0.75 makes it so it favors map stats unless theres a massive disparity if(%dtStats.client.team != 0 && (%rateing > 0 || %y == 0)){ - %set.add(%dtStats); - } + %set.add(%dtStats); + } } } - + %len = %set.getCount(); // sort are groups by there group scores for (%i = 0; %i < %len - 1; %i++) { for (%j = 0; %j < %len - %i - 1; %j++) { %aObj = %set.getObject(%j); %bObj = %set.getObject(%j + 1); - + %aMap = getField(%aObj.mGScore,%y); %aLG = getField(%aObj.gScore,%y); %A = (%aMap > (%aLG * 0.75)) ? %aMap : %aLG;//derate the last game score so it favors the map score unless it not avalable or lacking - + %bMap = getField(%bObj.mGScore,%y); %bLG = getField(%bObj.gScore,%y); %B = (%bMap > (%bLG * 0.75)) ? %bMap : %bLG; if (%A < %B) { %set.bringToFront(%bObj); - } + } } - } + } } - + deleteVariables("$TT::*"); for (%i = 0; %i < %game.numTeams; %i++) { - $dtTeamScore[%i+1] = 0; - $dtTeamCount[%i+1] = 0; + $dtTeamScore[%i+1] = 0; + $dtTeamCount[%i+1] = 0; for(%x = 0; %x < statsGroup.getCount(); %x++){ $TT::LOGC[%i+1,%x] = 0; } @@ -5567,18 +5572,18 @@ function ballenceTeams(%game,%forceTeam){ %x = (statCol.getCount() > 1) ? 1 : 0; // Start at 1 if more than one role %rt = 0; %end = 0; - %lockedGroups = 0; + %lockedGroups = 0; while (!%end) { %x = (%rt++ % %game.numTeams == 0) ? %x + 1 : %x; // Cycle every `numTeams` loops - if (%x >= statCol.getCount()) { + if (%x >= statCol.getCount()) { %x = 1; %rt = 1; if (%lockedGroups >= statCol.getCount() - 1) { // All groups are empty - %x = 0; + %x = 0; } } - + %role = statCol.getObject(%x); if (!%role || %role.rbc) { // If group is locked, continue @@ -5621,7 +5626,7 @@ function ballenceTeams(%game,%forceTeam){ } } } - + // team zero for(%i = 0; %i < statCol.tzc; %i++){ @@ -5630,10 +5635,10 @@ function ballenceTeams(%game,%forceTeam){ } } } - + function expoMovAvg(%ema, %value){ %alpha = 0.2; - return %alpha * %value + (1 - %alpha) * %ema; + return %alpha * %value + (1 - %alpha) * %ema; } @@ -5646,9 +5651,9 @@ function saveTBVars(){ function saveTBMap(%game){ if($dtStats::debugEchos){error("saveTBMap" SPC %game);} if($TB::TBEnable[$dtStats::gtNameShort[%game.class]]){//($HostGamePlayerCount - $HostGameBotCount) >= $dtStats::TBMinPlayers) - %fobj = new fileObject(); - RootGroup.add(%fobj); - %path = "serverStats/TB/map/" @ $dtStats::LastMissionCM @ "-" @ %game.class @ ".cs"; //note $dtStats::LastMissionCM is set in gameover + %fobj = new fileObject(); + RootGroup.add(%fobj); + %path = "serverStats/TB/map/" @ $dtStats::LastMissionCM @ "-" @ %game.class @ ".cs"; //note $dtStats::LastMissionCM is set in gameover %fobj.openForWrite(%path); %fobj.writeLine("res"); %fobj.writeLine("res"); @@ -5658,28 +5663,28 @@ function saveTBMap(%game){ %fobj.writeLine("res"); %fobj.writeLine("res"); %fobj.writeLine("res"); - + for(%x = 0; %x < statsGroup.getCount(); %x++){ %dtStats = statsGroup.getObject(%x); - if(getFieldCount($tempMap::data[%dtStats.guid]) < 5){ // write new entires + if(getFieldCount($tempMap::data[%dtStats.guid]) < 5){ // write new entires %newData = %dtStats.guid TAB %dtStats.name TAB dtMarkDate() TAB %dtStats.mTScore TAB %dtStats.mGScore; %line = strreplace(%newData ,"\t","%t"); %fobj.writeLine(%line); } } for(%i = 0; %i < $tempMap::count; %i++){ - %guid = $tempMap::guid[%i]; + %guid = $tempMap::guid[%i]; %dtStats = $dtStats::tbLookUP[%guid]; if(isObject(%dtStats)){ %newData = %guid TAB %dtStats.name TAB dtMarkDate() TAB %dtStats.mTScore TAB %dtStats.mGScore; %line = strreplace(%newData ,"\t","%t"); - %fobj.writeLine(%line); + %fobj.writeLine(%line); } else{ %date = getField($tempMap::data[%guid],2); - if(getTimeDelta(%date) < (1440*180)){// skip over old old stuff + if(getTimeDelta(%date) < (1440*180)){// skip over old old stuff %line = strreplace($tempMap::data[%guid],"\t","%t"); - %fobj.writeLine(%line); + %fobj.writeLine(%line); } } } @@ -5692,10 +5697,10 @@ function loadTBMap(%game){ if($dtStats::debugEchos){error("loadTBMap" SPC %game);} if($TB::TBEnable[$dtStats::gtNameShort[%game.class]]){ deleteVariables("$tempMap::*"); - %path = "serverStats/TB/map/" @ $CurrentMission @ "-" @ %game.class @ ".cs"; + %path = "serverStats/TB/map/" @ $CurrentMission @ "-" @ %game.class @ ".cs"; if(isFile(%path)){ - %fobj = new fileObject(); - RootGroup.add(%fobj); + %fobj = new fileObject(); + RootGroup.add(%fobj); %fobj.openForRead(%path); %unused = %fobj.readline(); //reserved %unused = %fobj.readline(); @@ -5745,7 +5750,7 @@ function DefaultGame::postGameStats(%game,%dtStats){ //stats to add up at the en if(!isObject(%dtStats)) return; %dtStats.stat["tournamentMode"] = $Host::TournamentMode; - + %dtStats.stat["null"] = getRandom(1,100); %dtStats.stat["kdr"] = %dtStats.stat["deaths"] ? (%dtStats.stat["kills"]/%dtStats.stat["deaths"]) : %dtStats.stat["kills"]; @@ -5827,13 +5832,13 @@ function DefaultGame::postGameStats(%game,%dtStats){ //stats to add up at the en if(%dtStats.stat["blasterShotsFired"] < 15) %dtStats.stat["blasterACC"] = 0; - + if(%dtStats.stat["missileShotsFired"] < 8) %dtStats.stat["missileACC"] = 0; if(%dtStats.stat["hGrenadeShotsFired"] < 6) %dtStats.stat["hGrenadeACC"] = 0; - + if(%dtStats.stat["mineShotsFired"] < 6) %dtStats.stat["mineACC"] = 0; @@ -5872,8 +5877,8 @@ function DefaultGame::postGameStats(%game,%dtStats){ //stats to add up at the en %dtStats.stat["depTurretRepairs"]; %dtStats.stat["capEfficiency"] = (%dtStats.stat["flagGrabs"] > 0) ? (%dtStats.stat["flagCaps"] / %dtStats.stat["flagGrabs"]) : 0; - - + + if(statsGroup.team[1] == statsGroup.team[2]){ %dtStats.stat["winCount"] = 0; %dtStats.stat["lossCount"] = 0; @@ -5895,7 +5900,7 @@ function DefaultGame::postGameStats(%game,%dtStats){ //stats to add up at the en %dtStats.stat["flagTimeMin"] = (%dtStats.flagTimeMS / 1000)/60; } else if(%game.class $= "ArenaGame"){ - %dtStats.stat["WLR"] = (%dtStats.stat["roundsLost"] > 0) ? %dtStats.stat["roundsWon"] / %dtStats.stat["roundsLost"] : %dtStats.stat["roundsWon"]; + %dtStats.stat["WLR"] = (%dtStats.stat["roundsLost"] > 0) ? %dtStats.stat["roundsWon"] / %dtStats.stat["roundsLost"] : %dtStats.stat["roundsWon"]; if(%dtStats.stat["discShotsFired"]){ %dtStats.stat["discMARatio"] = %dtStats.stat["discMA"] / %dtStats.stat["discShotsFired"]; } @@ -6038,7 +6043,7 @@ function ArenaGame::getGamePct(%game){ %scorePct = 0; for ( %i = 1; %i <= %game.numTeams; %i++ ){ %score = ($TeamScore[%i] / %game.roundLimit) * 100; - %scorePct = (%score > %scorePct) ? %score : %scorePct; + %scorePct = (%score > %scorePct) ? %score : %scorePct; } if(%scorePct > %timePct) return %scorePct; @@ -6133,7 +6138,7 @@ function cleanName(%nm){ } function cleanMapName(%nm){ - return stripChars(%nm," !_\"#$%&'()*+,-./:;<=>?@[\\]^'{|}~\t\n\r0123456789"); + return stripChars(%nm," !_\"#$%&'()*+,-./:;<=>?@[\\]^'{|}~\t\n\r0123456789"); } function setGUIDName(%client){ @@ -6241,12 +6246,12 @@ function loadGameStats(%dtStats,%game){// called when client joins server.cs onC if(%dtStats.guid !$= ""){ loadGameTotalStats(%dtStats,%game); if($dtStats::tmMode){ - %filename = "serverStats/statsTM/" @ %game @ "/" @ %dtStats.guid @ "g.cs"; + %filename = "serverStats/statsTM/" @ %game @ "/" @ %dtStats.guid @ "g.cs"; } else{ %filename = "serverStats/stats/" @ %game @ "/" @ %dtStats.guid @ "g.cs"; } - + if(isFile(%filename)){ %file = new FileObject(); RootGroup.add(%file); @@ -6267,7 +6272,7 @@ function loadGameStats(%dtStats,%game){// called when client joins server.cs onC function loadGameTotalStats(%dtStats,%game){ if($dtStats::debugEchos){error("loadGameTotalStats GUID = " SPC %dtStats.guid);} if($dtStats::tmMode){ - %filename = "serverStats/statsTM/" @ %game @ "/" @ %dtStats.guid @ "t.cs"; + %filename = "serverStats/statsTM/" @ %game @ "/" @ %dtStats.guid @ "t.cs"; } else{ %filename = "serverStats/stats/" @ %game @ "/" @ %dtStats.guid @ "t.cs"; @@ -6294,7 +6299,7 @@ function loadGameTotalStats(%dtStats,%game){ %q0 = getField(%dateLine,7);%q1 = getField(%dateLine,8); %y0 = getField(%dateLine,9);%y1 = getField(%dateLine,10); %c0 = getField(%dateLine,11);%c1 = getField(%dateLine,12); - + if(%day){ %d0 = %d1; %d1 = %d;} //if there was a change flip new with old and reset new if(%week){%w0 = %w1;%w1 = %w;} if(%month){%m0 = %m1;%m1 = %m;} @@ -6313,7 +6318,7 @@ function loadGameTotalStats(%dtStats,%game){ %q0 = getField(%line,7);%q1 = getField(%line,8); %y0 = getField(%line,9);%y1 = getField(%line,10); %c0 = getField(%line,11);%c1 = getField(%line,12); - + if(%day){ %d0 = %d1; %d1 = 0;} //if there was a change flip new with old and reset new if(%week){%w0 = %w1;%w1 = 0;} if(%month){%m0 = %m1;%m1 = 0;} @@ -6331,13 +6336,13 @@ function loadGameTotalStats(%dtStats,%game){ } function saveGameTotalStats(%dtStats,%game){ if($dtStats::debugEchos){error("saveGameTotalStats GUID = " SPC %dtStats.guid);} - if(%dtStats.guid !$= "" && !%dtStats.isBot){// dont save if we are dont have a guid or is a bot + if(%dtStats.guid !$= "" && !%dtStats.isBot){// dont save if we are dont have a guid or is a bot if(%dtStats.gameStats["statsOverWrite","g",%game,$dtStats::tmMode] $= ""){%dtStats.gameStats["statsOverWrite","g",%game,$dtStats::tmMode] = 0;} %fileTotal = new FileObject(); RootGroup.add(%fileTotal); if($dtStats::tmMode){ - %fileNameTotal = "serverStats/statsTM/"@ %game @ "/" @ %dtStats.guid @ "t.cs"; + %fileNameTotal = "serverStats/statsTM/"@ %game @ "/" @ %dtStats.guid @ "t.cs"; } else{ %fileNameTotal = "serverStats/stats/"@ %game @ "/" @ %dtStats.guid @ "t.cs"; @@ -6436,17 +6441,17 @@ function incGameStats(%dtStats,%game) {// record that games stats and inc by one setValueField(%dtStats,"gameID","g",%game,%c,$dtStats::gameID); setValueField(%dtStats,"gamePCT","g",%game,%c,%dtStats.gamePCT); setValueField(%dtStats,"versionNum","g",%game,%c,$dtStats::version); - + for(%q = 0; %q < $statsVars::count[%game]; %q++){ %varNameType = $statsVars::varNameType[%q,%game]; %varName = $statsVars::varName[%q,%game]; %varType = $statsVars::varType[%varNameType,%game]; - + switch$(%varType){ case "Game": %val = %dtStats.stat[%varName]; setValueField(%dtStats,%varNameType,"g",%game,%c,%val); - + case "TG": %val = %dtStats.stat[%varName]; setValueField(%dtStats,%varNameType,"g",%game,%c,%val); @@ -6482,7 +6487,7 @@ function incGameStats(%dtStats,%game) {// record that games stats and inc by one if(%val < %t && %val != 0 || !%t){ setValueField(%dtStats,%varNameType,"t",%game,%x,%val); } - else{ + else{ setValueField(%dtStats,%varNameType,"t",%game,%x,%t); } } @@ -6736,7 +6741,7 @@ function hasValue(%val){//make sure we have at least something in the field spot //%dtStats.stat["suicides"] = %client.suicides; //%dtStats.stat["escortAssists"] = %client.escortAssists; //%dtStats.stat["teamKills"] = %client.teamKills; - //%dtStats.stat["tkDestroys"] = %client.tkDestroys; + //%dtStats.stat["tkDestroys"] = %client.tkDestroys; //%dtStats.stat["flagCaps"] = %client.flagCaps; //%dtStats.stat["flagGrabs"] = %client.flagGrabs; //%dtStats.stat["genDestroys"] = %client.genDestroys; @@ -6744,14 +6749,14 @@ function hasValue(%val){//make sure we have at least something in the field spot //%dtStats.stat["turretDestroys"] = %client.turretDestroys; //%dtStats.stat["iStationDestroys"] = %client.iStationDestroys; //%dtStats.stat["vstationDestroys"] = %client.vstationDestroys; - //%dtStats.stat["mpbtstationDestroys"] = %client.mpbtstationDestroys; + //%dtStats.stat["mpbtstationDestroys"] = %client.mpbtstationDestroys; //%dtStats.stat["solarDestroys"] = %client.solarDestroys; //%dtStats.stat["sentryDestroys"] = %client.sentryDestroys; //%dtStats.stat["depSensorDestroys"] = %client.depSensorDestroys; //%dtStats.stat["depTurretDestroys"] = %client.depTurretDestroys; //%dtStats.stat["depStationDestroys"] = %client.depStationDestroys; - //%dtStats.stat["vehicleScore"] = %client.vehicleScore; - //%dtStats.stat["vehicleBonus"] = %client.vehicleBonus; + //%dtStats.stat["vehicleScore"] = %client.vehicleScore; + //%dtStats.stat["vehicleBonus"] = %client.vehicleBonus; // //%dtStats.stat["flagDefends"] = %client.flagDefends; //%dtStats.stat["defenseScore"] = %client.defenseScore; @@ -6819,14 +6824,14 @@ function resGameStats(%client,%game){// copy data back over to client %client.turretDestroys = %dtStats.stat["turretDestroys"]; %client.iStationDestroys = %dtStats.stat["iStationDestroys"]; %client.vstationDestroys = %dtStats.stat["vstationDestroys"]; - %client.mpbtstationDestroys = %dtStats.stat["mpbtstationDestroys"]; + %client.mpbtstationDestroys = %dtStats.stat["mpbtstationDestroys"]; %client.solarDestroys = %dtStats.stat["solarDestroys"]; %client.sentryDestroys = %dtStats.stat["sentryDestroys"]; %client.depSensorDestroys = %dtStats.stat["depSensorDestroys"]; %client.depTurretDestroys = %dtStats.stat["depTurretDestroys"]; %client.depStationDestroys = %dtStats.stat["depStationDestroys"]; - %client.vehicleScore = %dtStats.stat["vehicleScore"]; - %client.vehicleBonus = %dtStats.stat["vehicleBonus"]; + %client.vehicleScore = %dtStats.stat["vehicleScore"]; + %client.vehicleBonus = %dtStats.stat["vehicleBonus"]; %client.flagDefends = %dtStats.stat["flagDefends"]; %client.defenseScore = %dtStats.stat["defenseScore"]; @@ -6869,7 +6874,7 @@ function resGameStats(%client,%game){// copy data back over to client %client.totalSnipes = %dtStats.stat["totalSnipes"]; %client.totalShockHits = %dtStats.stat["totalShockHits"]; %client.totalShocks = %dtStats.stat["totalShocks"]; - + %client.snipeKills = %dtStats.stat["snipeKills"]; %client.roundsWon = %dtStats.stat["roundsWon"]; %client.roundsLost = %dtStats.stat["roundsLost"]; @@ -6913,7 +6918,7 @@ function resetDtStats(%dtStats,%game,%slow){ //%var = $dtStats::uGFV[%i,%game];; //%dtStats.stat[%var]= 0; //} - + for(%i = 1; %i <= $dtStats::unusedCount; %i++){//script unused %var = $dtStats::unused[%i]; %dtStats.stat[%var]= 0; @@ -7072,7 +7077,7 @@ function clientKillStats(%game,%clVictim, %clKiller, %damageType, %implement, %d } %killerDT = %clKiller.dtStats; %victimDT = %clVictim.dtStats; - + if(%clKiller.killBy == %clVictim){ %clKiller.killBy = 0; %killerDT.stat["revenge"]++; @@ -7166,25 +7171,25 @@ function clientKillStats(%game,%clVictim, %clKiller, %damageType, %implement, %d if(rayTest(%victimPlayer, $dtStats::midAirHeight)){%vcAir =1;}else{%vcAir =2;} if(rayTest(%killerPlayer, $dtStats::midAirHeight)){%kcAir =1;}else{%kcAir =2;} %vdis = rayTestDis(%victimPlayer); - + switch$(%victimPlayer.getArmorSize()){ - case "Light":%killerDT.stat["armorL"]++; + case "Light":%killerDT.stat["armorL"]++; switch$(%killerPlayer.getArmorSize()){ - case "Light": %killerDT.stat["armorLL"]++;%killerDT.stat["armorLK"]++; - case "Medium":%killerDT.stat["armorML"]++;%killerDT.stat["armorMK"]++; - case "Heavy": %killerDT.stat["armorHL"]++;%killerDT.stat["armorHK"]++; + case "Light": %killerDT.stat["armorLL"]++;%killerDT.stat["armorLK"]++; + case "Medium":%killerDT.stat["armorML"]++;%killerDT.stat["armorMK"]++; + case "Heavy": %killerDT.stat["armorHL"]++;%killerDT.stat["armorHK"]++; } - case "Medium": %killerDT.stat["armorM"]++; + case "Medium": %killerDT.stat["armorM"]++; switch$(%killerPlayer.getArmorSize()){ - case "Light": %killerDT.stat["armorLM"]++;%killerDT.stat["armorLK"]++; - case "Medium":%killerDT.stat["armorMM"]++;%killerDT.stat["armorMK"]++; - case "Heavy": %killerDT.stat["armorHM"]++;%killerDT.stat["armorHK"]++; + case "Light": %killerDT.stat["armorLM"]++;%killerDT.stat["armorLK"]++; + case "Medium":%killerDT.stat["armorMM"]++;%killerDT.stat["armorMK"]++; + case "Heavy": %killerDT.stat["armorHM"]++;%killerDT.stat["armorHK"]++; } - case "Heavy":%killerDT.stat["armorH"]++; + case "Heavy":%killerDT.stat["armorH"]++; switch$(%killerPlayer.getArmorSize()){ case "Light": %killerDT.stat["armorLH"]++;%killerDT.stat["armorLK"]++; - case "Medium":%killerDT.stat["armorMH"]++;%killerDT.stat["armorMK"]++; - case "Heavy": %killerDT.stat["armorHH"]++;%killerDT.stat["armorHK"]++; + case "Medium":%killerDT.stat["armorMH"]++;%killerDT.stat["armorMK"]++; + case "Heavy": %killerDT.stat["armorHH"]++;%killerDT.stat["armorHK"]++; } } //------------------------------------------------------------------------------ @@ -7214,9 +7219,9 @@ function clientKillStats(%game,%clVictim, %clKiller, %damageType, %implement, %d %killerDT.stat["cloakersKilled"]++; } if(getSimTime() - %killerPlayer.isCloakTime < 2000 && %killerPlayer.isCloakTime > 0){ - %killerDT.stat["cloakerKills"]++; + %killerDT.stat["cloakerKills"]++; } - + switch$(%damageType){// list of all damage types to track see damageTypes.cs case $DamageType::Bullet: %killerDT.stat["cgKills"]++; @@ -7234,7 +7239,7 @@ function clientKillStats(%game,%clVictim, %clKiller, %damageType, %implement, %d if(%clKiller.mdHit){%killerDT.stat["minePlusDiscKill"]++;} if(getSimTime() - %clKiller.discReflect < 256){%killerDT.stat["discReflectKill"]++;} - + dtMinMax("discKills", "wep", 1, %killerDT.stat["discKills"], %clKiller); dtMinMax("minePlusDiscKill", "wep", 1, %killerDT.stat["minePlusDiscKill"], %clKiller); case $DamageType::Grenade: @@ -7509,8 +7514,8 @@ function rayTestDis(%targetObject){ function testHit2(%sClient,%tgClient){ %plr = %tgClient.player; %b = getField(%sClient.lastExp,3); - %a = %plr.getWorldBox(); - + %a = %plr.getWorldBox(); + %hit = (getWord(%a, 0) <= getWord(%b, 3) && getWord(%a, 3) >= getWord(%b, 0)) && (getWord(%a, 1) <= getWord(%b, 4) && getWord(%a, 4) >= getWord(%b, 1)) && (getWord(%a, 2)<= getWord(%b, 5) && getWord(%a, 5) >= getWord(%b, 2)); @@ -7614,14 +7619,14 @@ function clientDmgStats(%data, %position, %sourceObject, %targetObject, %damageT %targetClient.lastHitBy = %sourceClient; %targetClient.lastHitTime = getSimTime(); - + if(%targetObject.isShielded && %damageType != $DamageType::Blaster){ %amount = %data.checkShields(%targetObject, %position, %amount, %damageType); if(!%amount){ - %targetDT.stat["shieldPackDmg"] += %amount; + %targetDT.stat["shieldPackDmg"] += %amount; } } - + if(%targetClient.EVDamageType && %targetClient.EVDamageType != %damageType && (getSimTime() - %targetClient.EVDamagetime) < 3000){ // they were hit by something befor they were killed %sourceDT.stat["EVHitWep"]++; @@ -7641,8 +7646,8 @@ function clientDmgStats(%data, %position, %sourceObject, %targetObject, %damageT if(%targetObject.isCloaked()){ %targetObject.isCloakTime = getSimTime(); - } - + } + //%dmgL = %targetObject.getDamageLocation(%position); %rayTest = rayTestDis(%targetObject); if(%rayTest >= $dtStats::midAirHeight && %damageType == $DamageType::Disc){ @@ -7672,7 +7677,7 @@ function clientDmgStats(%data, %position, %sourceObject, %targetObject, %damageT dtMidAirMessage(%sourceClient,"Blaster", %dis, %sourceDT.stat["blasterMA"]); } if(getSimTime() - %sourceObject.client.blasterReflect < 256){%sourceDT.stat["blasterReflectHit"]++;} - + case $DamageType::Plasma: %sourceDT.stat["plasmaDmg"] += %amount; dtMinMax("plasmaDmg", "wep", 1, %sourceDT.stat["plasmaDmg"], %sourceClient); @@ -7903,9 +7908,9 @@ function dtMidAirMessage(%client,%porjName,%distance, %count){ if(%porjName !$= "Blaster"){ messageTeamExcept(%client, 'MsgMidAir', '\c5%1 hit a mid air shot. [%2m, %3]', %client.name, mFloor(%distance), %porjName); } - Game.recalcScore(%client); + Game.recalcScore(%client); } -} +} function dtHeadShotMessage(%client,%distance){ if($dtStats::midAirMessage && Game.class !$= "LakRabbitGame" && !%client.isAIControlled()){ @@ -7913,17 +7918,17 @@ function dtHeadShotMessage(%client,%distance){ messageClient(%client, 'MsgMidAir', '\c0Headshot distance of [%1m]~wfx/misc/bounty_bonus.wav', mFloor(%distance)); //messageTeamExcept(%client, 'MsgMidAir', '\c5%1 hit a head shot. [%2m, %3]', %client.name, mFloor(%distance), %porjName); } -} +} function dtLaserShotMessage(%client,%distance){ if($dtStats::midAirMessage && Game.class !$= "LakRabbitGame" && !%client.isAIControlled()){ - bottomPrint(%client, "HIT! Distance is " @ mFloor(%distance) @ " meters.", 4); + bottomPrint(%client, "HIT! Distance is " @ mFloor(%distance) @ " meters.", 4); //messageTeamExcept(%client, 'MsgMidAir', '\c5%1 hit a head shot. [%2m, %3]', %client.name, mFloor(%distance), %porjName); } -} +} function clientShotsFired(%data, %sourceObject, %projectile){ // could do a fov check to see if we are trying to aim at a player - + %dtStats = %sourceObject.client.dtStats; if(!isObject(%dtStats)) return; @@ -7934,7 +7939,7 @@ function clientShotsFired(%data, %sourceObject, %projectile){ // could do a fov %dtStats.stat["shotsFired"]++; %sourceClient.dtShotSpeed = %projectile.dtShotSpeed = mFloor(vectorLen(%sourceObject.getVelocity()) * 3.6); - + switch$(%damageType){// list of all damage types to track see damageTypes.cs case $DamageType::Bullet: %dtStats.stat["cgShotsFired"]++; @@ -8144,19 +8149,19 @@ function statsMenu(%client,%game){ messageClient(%client, 'SetLineHud', "", %tag, %index++, "Try your best to use different stats in groups 1-11"); messageClient(%client, 'SetLineHud', "", %tag, %index++, "Limit crossover for important roles; use it more for niche ones."); messageClient(%client, 'SetLineHud', "", %tag, %index++, "Stat crossover between groups can pull players into unintended roles."); - + case "TBX": %opt0 = %client.GlArg3; %opt1 = %client.GlArg4; %opt2 = %client.GlArg5; if(%client.tgame $= ""){ - %client.tgame = $dtStats::gtNameShort[%game]; + %client.tgame = $dtStats::gtNameShort[%game]; } switch$(%opt0){ case "AG": $TB::statGroupCount[%client.tgame]++; - if($TB::statGroupCount[%client.tgame] > 11){//cap it no need for this many - $TB::statGroupCount[%client.tgame] = 12; + if($TB::statGroupCount[%client.tgame] > 11){//cap it no need for this many + $TB::statGroupCount[%client.tgame] = 12; } case "RG": $TB::statGroupCount[%client.tgame]--; @@ -8164,7 +8169,7 @@ function statsMenu(%client,%game){ $TB::statGroupCount[%client.tgame] = 1; } case "G": - %client.tgame = %opt1; + %client.tgame = %opt1; case "Enable": $TB::TBEnable[%client.tgame] = !$TB::TBEnable[%client.tgame]; case "FORCE": @@ -8175,7 +8180,7 @@ function statsMenu(%client,%game){ case "Log": $TB::TBLog[%client.tgame] = !$TB::TBLog[%client.tgame]; case "RESET": - deleteVariables("$TB::*"); + deleteVariables("$TB::*"); $TB::TBEnable[%client.tgame] = 0; $TB::TBLog[%client.tgame] = 0; $TB::statGroupCount[%client.tgame] = 1; @@ -8184,14 +8189,14 @@ function statsMenu(%client,%game){ %client.GlArg4 = 0; %client.GlArg5 = 0; if($TB::statGroupCount[%client.tgame] $= ""){ - $TB::statGroupCount[%client.tgame] = 1; + $TB::statGroupCount[%client.tgame] = 1; } saveTBVars(); %line = 'Team Balancer'; messageClient( %client, 'SetScoreHudHeader', "",%line); %line = ' Back - Return To Score Screen [RESET ALL] [Read Me]'; messageClient( %client, 'SetScoreHudSubheader', "",%line); - + if(%client.tgame $= "CTF"){ %line = '[CTF] [LCTF] [Arena]'; messageClient(%client, 'SetLineHud', "", %tag, %index++, %line); @@ -8207,29 +8212,29 @@ function statsMenu(%client,%game){ messageClient(%client, 'SetLineHud', "", %tag, %index++, ""); if($TB::TBEnable[%client.tgame]){ %line = 'Team Balancer [Disable]'; - messageClient(%client, 'SetLineHud', "", %tag, %index++, %line); + messageClient(%client, 'SetLineHud', "", %tag, %index++, %line); } else{ %line = 'Team Balancer [Enable]'; messageClient(%client, 'SetLineHud', "", %tag, %index++, %line); - } + } if($TB::TBLog[%client.tgame]){ %line = 'Balancer Logging [Disable]'; - messageClient(%client, 'SetLineHud', "", %tag, %index++, %line); + messageClient(%client, 'SetLineHud', "", %tag, %index++, %line); } else{ %line = 'Balancer Logging [Enable]'; messageClient(%client, 'SetLineHud', "", %tag, %index++, %line); } - messageClient(%client, 'SetLineHud', "", %tag, %index++, ""); + messageClient(%client, 'SetLineHud', "", %tag, %index++, ""); if($TB::TBEnable[%client.tgame]){ %line = '[Force Team Balance] - May Cause the server to hitch'; - messageClient(%client, 'SetLineHud', "", %tag, %index++, %line); - messageClient(%client, 'SetLineHud', "", %tag, %index++, ""); + messageClient(%client, 'SetLineHud', "", %tag, %index++, %line); + messageClient(%client, 'SetLineHud', "", %tag, %index++, ""); } %line = 'Add Groups/Roles - 12 Max <%1> '; messageClient(%client, 'SetLineHud', "", %tag, %index++, %line, $TB::statGroupCount[%client.tgame]); - + for(%i = 0; %i < $TB::statGroupCount[%client.tgame]; %i++){ if((%i % 4) == 0){ %line = "Group" SPC %i SPC "\t"; @@ -8251,7 +8256,7 @@ function statsMenu(%client,%game){ messageClient(%client, 'SetLineHud', "", %tag, %index++, %line); messageClient(%client, 'SetLineHud', "", %tag, %index++, %line2); } - + case "TBV": %opt0 = %client.GlArg3; %opt1 = %client.GlArg4; @@ -8260,16 +8265,16 @@ function statsMenu(%client,%game){ %client.curPage = 1; } if(%client.tgame $= ""){ - %client.tgame = $dtStats::gtNameShort[%game.class]; + %client.tgame = $dtStats::gtNameShort[%game.class]; } if(%client.arrowRes $= ""){ - %client.arrowRes = 1; + %client.arrowRes = 1; } if(%client.editGrp $= ""){ - %client.editGrp = 0; + %client.editGrp = 0; } %perPage = 16;// num of games listed per page - + switch$(%opt0){ case "X": %client.editGrp = %opt1; @@ -8288,12 +8293,12 @@ function statsMenu(%client,%game){ if($TB::statCount[%client.tgame,%client.editGrp] $= ""){ $TB::statCount[%client.tgame, %client.editGrp] = 0; } - + if($TB::statWeight[%var,%client.tgame, %client.editGrp] $= ""){ %count = $TB::statCount[%client.tgame,%client.editGrp]; $TB::statName[%count,%client.tgame,%client.editGrp] = %var; $TB::statWeight[%count,%client.tgame,%client.editGrp] = 100; - + $TB::statIndex[%var, %client.tgame, %client.editGrp] = %count; $TB::statCount[%client.tgame,%client.editGrp]++; } @@ -8306,7 +8311,7 @@ function statsMenu(%client,%game){ $TB::statName[%i, %client.tgame, %client.editGrp] = $TB::statName[%i + 1, %client.tgame, %client.editGrp]; $TB::statWeight[%i, %client.tgame, %client.editGrp] = $TB::statWeight[%i + 1, %client.tgame, %client.editGrp]; // Update index for the moved stat - %movedVar = $TB::statName[%i, %client.tgame, %client.editGrp]; + %movedVar = $TB::statName[%i, %client.tgame, %client.editGrp]; $TB::statIndex[%movedVar, %client.tgame, %client.editGrp] = %i; } @@ -8314,7 +8319,7 @@ function statsMenu(%client,%game){ %last = $TB::statCount[%client.tgame, %client.editGrp] - 1; $TB::statName[%last, %client.tgame, %client.editGrp] = ""; $TB::statWeight[%last, %client.tgame, %client.editGrp] = ""; - + // Remove reference from index mapping $TB::statIndex[%var, %client.tgame, %client.editGrp] = ""; @@ -8329,10 +8334,10 @@ function statsMenu(%client,%game){ case "B": %client.curPage--; if(%client.curPage < 1){ - %client.curPage = 1; + %client.curPage = 1; } - case "R": - %client.curPage = 1; + case "R": + %client.curPage = 1; case "AR": %client.arrowRes = %opt1; } @@ -8366,7 +8371,7 @@ function statsMenu(%client,%game){ %line = 'Variable NameAdd/RemoveAdjust Weight Group Crossover'; messageClient( %client, 'SetLineHud', "", %tag, %index++, %line); - + //$dtStats::TBG[$dtStats::TBGC["ArenaGame"]++,"ArenaGame"] = "laserKillDist"; //$dtStats::TBGC["ArenaGame"]++; @@ -8377,18 +8382,18 @@ function statsMenu(%client,%game){ %var = $dtStats::TBG[%indexInArray, %client.tgame]; %sindex = $TB::statIndex[%var, %client.tgame, %client.editGrp]; // Skip over "Game" category variables but continue looping - if (%sindex $= "") { + if (%sindex $= "") { %line = ' %3ADD'; messageClient(%client, 'SetLineHud', "", %tag, %index++, %line, "AS", %indexInArray, %var); - } + } else { %g = ""; for(%m = 0; %m < $TB::statGroupCount[%client.tgame]; %m++){ - %si = $TB::statIndex[%var, %client.tgame, %m]; + %si = $TB::statIndex[%var, %client.tgame, %m]; if(%si !$= ""){ - %g = %g SPC %m; + %g = %g SPC %m; } - } + } %w = $TB::statWeight[%sindex, %client.tgame, %client.editGrp]; %line = ' %3\tRmv\t <%4> \t%6'; messageClient(%client, 'SetLineHud', "", %tag, %index++, %line, "RS", %indexInArray, %var, mFormatFloat(%w / 100, "%.2f"),%client.arrowRes,%g); @@ -8400,7 +8405,7 @@ function statsMenu(%client,%game){ case "SP": if(!%client.isSuperAdmin){ error(%client.nameBase SPC "failed to access server panel"); - return; + return; } %opt1 = %client.GlArg4; %opt2 = %client.GlArg5; @@ -8418,11 +8423,11 @@ function statsMenu(%client,%game){ //$dtJoinListCount++; if(!%client.curPage) %client.curPage = 1; - + messageClient(%client, 'SetScoreHudHeader', "", "Auth Queue"); - + //rmvFailJoin(%index) - + if(getWord(%opt2,0) $= "GUID"){ %data = $dtJoinList[getWord(%opt2,1)]; //$dtJoinList[0] = %name TAB %guid TAB %ip TAB %reason TAB %type; @@ -8434,8 +8439,8 @@ function statsMenu(%client,%game){ } %client.GlArg5 = 0; %f = 48 * (%client.curPage - 1); - } - else{ + } + else{ switch$(%opt2){ case "NP"://next page %client.curPage++; @@ -8446,19 +8451,19 @@ function statsMenu(%client,%game){ %client.GlArg5 = 0; %f = 48 * (%client.curPage - 1); case "CLR"://back page - deleteVariables("$dtJoinList*"); + deleteVariables("$dtJoinList*"); $dtJoinListCount = 0; %client.curPage = 1; %client.GlArg5 = 0; %f = 0; case "CLRP": - for(%x = 0; %x < $dtJoinListCount ; %x++) { + for(%x = 0; %x < $dtJoinListCount ; %x++) { %guid = getField($dtJoinList[%x],1); if(isObject($dtWhtList::WhiteList[%guid])){ $dtJoinListGuid[%guid] = ""; - for(%i = %x; %i < $dtJoinListCount - 1; %i++) { - $dtJoinList[%i] =$dtJoinList[%i+1]; - } + for(%i = %x; %i < $dtJoinListCount - 1; %i++) { + $dtJoinList[%i] =$dtJoinList[%i+1]; + } $dtJoinList[%i] = ""; $dtJoinListCount--; %x--; @@ -8468,16 +8473,16 @@ function statsMenu(%client,%game){ %client.GlArg5 = 0; default: %client.curPage = 1; - %f = 0; - + %f = 0; + } } - + %amount = $dtJoinListCount; %lns = mFloor(%amount/3); %leftOver = %amount - (%lns * 3); %numPages = mCeil(%amount/48); - + if(%numPages > 1){ if(%client.curPage < %numPages && %client.curPage == 1){// %line = ' Back - Return To Score Screen - Next Page >'; @@ -8491,24 +8496,24 @@ function statsMenu(%client,%game){ %line = ' Back - Return To Score Screen - < Back Page'; messageClient( %client, 'SetScoreHudSubheader', "", %line ,0, "WLQUEUE"); } - + } else{ - messageClient( %client, 'SetScoreHudSubheader', "", ' Back - Return To Score Screen',0); + messageClient( %client, 'SetScoreHudSubheader', "", ' Back - Return To Score Screen',0); } %line = 'Sorted recent to old with a rolling cap of %4 '; messageClient( %client, 'SetLineHud', "", %tag, %index++, %line,0,"WLQUEUE","CLR",$dtStats::joinHist,"CLRP"); - + for(%i = (%client.curPage - 1) * 16; %i < %client.curPage * 16 && %i < %lns; %i++){ %vsc1 = %f; %f++; %vsc2 = %f; %f++; %vsc3 = %f; %f++; - + %AR1 = isObject($dtWhtList::WhiteList[getField($dtJoinList[%vsc1],1)]) ? "Remove" : "Add"; - %plr1 = %vsc1 @ ":" @ getField($dtJoinList[%vsc1],0) SPC %AR1; + %plr1 = %vsc1 @ ":" @ getField($dtJoinList[%vsc1],0) SPC %AR1; %AR2 = isObject($dtWhtList::WhiteList[getField($dtJoinList[%vsc2],1)]) ? "Remove" : "Add"; - %plr2 = %vsc2 @ ":" @ getField($dtJoinList[%vsc2],0) SPC %AR2; + %plr2 = %vsc2 @ ":" @ getField($dtJoinList[%vsc2],0) SPC %AR2; %AR3 = isObject($dtWhtList::WhiteList[getField($dtJoinList[%vsc3],1)]) ? "Remove" : "Add"; %plr3 = %vsc3 @ ":" @ getField($dtJoinList[%vsc3],0) SPC %AR3; - + %line = '\t%3\t%4\t%5'; messageClient( %client, 'SetLineHud', "", %tag, %index++, %line, 0, "WLQUEUE", %plr1, %plr2, %plr3, "GUID" SPC %vsc1, "GUID" SPC %vsc2, "GUID" SPC %vsc3, 1); } @@ -8516,27 +8521,27 @@ function statsMenu(%client,%game){ if(%leftOver == 2){ %vsc1 = %f; %f++; %vsc2 = %f; %f++; %AR1 = isObject($dtWhtList::WhiteList[getField($dtJoinList[%vsc1],1)]) ? "Remove" : "Add"; - %plr1 = %vsc1 @ ":" @ getField($dtJoinList[%vsc1],0) SPC %AR1; + %plr1 = %vsc1 @ ":" @ getField($dtJoinList[%vsc1],0) SPC %AR1; %AR2 = isObject($dtWhtList::WhiteList[getField($dtJoinList[%vsc2],1)]) ? "Remove" : "Add"; %plr2 = %vsc2 @ ":" @ getField($dtJoinList[%vsc2],0) SPC %AR2; %line = '\t%3\t%4\t%5'; messageClient( %client, 'SetLineHud', "", %tag, %index++, %line, 0, "WLQUEUE", %plr1, %plr2, "", "GUID" SPC %vsc1, "GUID" SPC %vsc2, ""); - } + } else if(%leftOver == 1){ %vsc1 = %f; %f++; %AR1 = isObject($dtWhtList::WhiteList[getField($dtJoinList[%vsc1],1)]) ? "Remove" : "Add"; - %plr1 = %vsc1 @ ":" @ getField($dtJoinList[%vsc1],0) SPC %AR1; + %plr1 = %vsc1 @ ":" @ getField($dtJoinList[%vsc1],0) SPC %AR1; %line = '\t%3\t%4\t%5'; messageClient( %client, 'SetLineHud', "", %tag, %index++, %line, 0, "WLQUEUE", %plr1, "", "", "GUID" SPC %vsc1, "", ""); } - } + } return; case "STATS"://add from stats if(!%client.curPage) %client.curPage = 1; messageClient(%client, 'SetScoreHudHeader', "", "White List Add From Stats"); - + if(getWord(%opt2,0) $= "GUID"){// make sure its valid client and guid if(!isObject($dtWhtList::WhiteList[getWord(%opt2,1)])) pushWhiteList(getWord(%opt2,1), getField($guidInfo[getWord(%opt2,1)],0)); @@ -8544,8 +8549,8 @@ function statsMenu(%client,%game){ rmvWhiteListGuid(getWord(%opt2,1)); %client.GlArg5 = 0; %f = 45 * (%client.curPage - 1); - } - else{ + } + else{ switch$(%opt2){ case "NP"://next page %client.curPage++; @@ -8594,7 +8599,7 @@ function statsMenu(%client,%game){ if(%gameCountM >= 48){ pushWhiteList(%guid, getField($guidInfo[%guid],0)); } - } + } case "A64": for(%i = 0; %i < $guidListCount; %i++){ %guid = $guidList[%i]; @@ -8604,22 +8609,22 @@ function statsMenu(%client,%game){ } } default: - %client.curPage = 1; - %f = 0; + %client.curPage = 1; + %f = 0; } } - + %line = 'Add all, games played monthly - <8><16><24><32><48><64>'; - messageClient( %client, 'SetLineHud', "", %tag, %index++, %line,0,"STATS"); - + messageClient( %client, 'SetLineHud', "", %tag, %index++, %line,0,"STATS"); + %line = 'Game count: Player Name, Server averages: Day %3, Week %4, Month %5.'; messageClient( %client, 'SetLineHud', "", %tag, %index++, %line,0,"STATS",getField($guidAvgs,0),getField($guidAvgs,1),getField($guidAvgs,2)); - + %amount = $guidListCount;// safer method instead of client group do to how offton it changes %lns = mFloor(%amount/3); %leftOver = %amount - (%lns * 3); %numPages = mCeil(%amount/45); - + if(%numPages > 1){ if(%client.curPage < %numPages && %client.curPage == 1){// %line = ' Back - Return To Score Screen - Next Page >'; @@ -8633,22 +8638,22 @@ function statsMenu(%client,%game){ %line = ' Back - Return To Score Screen - < Back Page'; messageClient( %client, 'SetScoreHudSubheader', "", %line ,0, "STATS"); } - + } else{ - messageClient( %client, 'SetScoreHudSubheader', "", ' Back - Return To Score Screen', 0, "WHITELIST"); + messageClient( %client, 'SetScoreHudSubheader', "", ' Back - Return To Score Screen', 0, "WHITELIST"); } - + for(%i = (%client.curPage - 1) * 15; %i < %client.curPage * 15 && %i < %lns; %i++){ %vsc1 = %f; %f++; %vsc2 = %f; %f++; %vsc3 = %f; %f++; - + %AR1 = isObject($dtWhtList::WhiteList[$guidList[%vsc1]]) ? "Remove" : "Add"; - %plr1 = getField($guidInfo[$guidList[%vsc1]],3) @ ":" @ getField($guidInfo[$guidList[%vsc1]],0) SPC %AR1; + %plr1 = getField($guidInfo[$guidList[%vsc1]],3) @ ":" @ getField($guidInfo[$guidList[%vsc1]],0) SPC %AR1; %AR2 = isObject($dtWhtList::WhiteList[$guidList[%vsc2]]) ? "Remove" : "Add"; - %plr2 = getField($guidInfo[$guidList[%vsc2]],3) @ ":" @ getField($guidInfo[$guidList[%vsc2]],0) SPC %AR2; + %plr2 = getField($guidInfo[$guidList[%vsc2]],3) @ ":" @ getField($guidInfo[$guidList[%vsc2]],0) SPC %AR2; %AR3 = isObject($dtWhtList::WhiteList[$guidList[%vsc3]]) ? "Remove" : "Add"; %plr3 = getField($guidInfo[$guidList[%vsc3]],3) @ ":" @ getField($guidInfo[$guidList[%vsc3]],0) SPC %AR3; - + %line = '\t%3\t%4\t%5'; messageClient( %client, 'SetLineHud', "", %tag, %index++, %line, 0, "STATS", %plr1, %plr2, %plr3, "GUID" SPC $guidList[%vsc1], "GUID" SPC $guidList[%vsc2], "GUID" SPC $guidList[%vsc3]); } @@ -8656,16 +8661,16 @@ function statsMenu(%client,%game){ if(%leftOver == 2){ %vsc1 = %f; %f++; %vsc2 = %f; %f++; %AR1 = isObject($dtWhtList::WhiteList[$guidList[%vsc1]]) ? "Remove" : "Add"; - %plr1 = getField($guidInfo[$guidList[%vsc1]],3) @ ":" @ getField($guidInfo[$guidList[%vsc1]],0) SPC %AR1; + %plr1 = getField($guidInfo[$guidList[%vsc1]],3) @ ":" @ getField($guidInfo[$guidList[%vsc1]],0) SPC %AR1; %AR2 = isObject($dtWhtList::WhiteList[$guidList[%vsc2]]) ? "Remove" : "Add"; %plr2 = getField($guidInfo[$guidList[%vsc2]],3) @ ":" @ getField($guidInfo[$guidList[%vsc2]],0) SPC %AR2; %line = '\t%3\t%4\t%5'; messageClient( %client, 'SetLineHud', "", %tag, %index++, %line, 0, "STATS", %plr1, %plr2, "", "GUID" SPC $guidList[%vsc1], "GUID" SPC $guidList[%vsc2], ""); - } + } else if(%leftOver == 1){ %vsc1 = %f; %f++; %AR1 = isObject($dtWhtList::WhiteList[$guidList[%vsc1]]) ? "Remove" : "Add"; - %plr1 = getField($guidInfo[$guidList[%vsc1]],3) @ ":" @ getField($guidInfo[$guidList[%vsc1]],0) SPC %AR1; + %plr1 = getField($guidInfo[$guidList[%vsc1]],3) @ ":" @ getField($guidInfo[$guidList[%vsc1]],0) SPC %AR1; %line = '\t%3\t%4\t%5'; messageClient( %client, 'SetLineHud', "", %tag, %index++, %line, 0, "STATS", %plr1, "", "", "GUID" SPC $guidList[%vsc1], "", ""); } @@ -8674,9 +8679,9 @@ function statsMenu(%client,%game){ case "SERVER"://add from current server if(!%client.curPage) %client.curPage = 1; - + messageClient(%client, 'SetScoreHudHeader', "", "White List Add From Server"); - + if(getWord(%opt2,0) $= "RMV"){// make sure its valid client and guid %clObj = getWord(%opt2,1); if(!isObject($dtWhtList::WhiteList[%clObj.guid])) @@ -8686,7 +8691,7 @@ function statsMenu(%client,%game){ %client.GlArg5 = 0; %f = 51 * (%client.curPage - 1); } - else{ + else{ switch$(%opt2){ case "NP"://next page %client.curPage++; @@ -8700,16 +8705,16 @@ function statsMenu(%client,%game){ case "RM": default: %client.curPage = 1; - %f = 0; - + %f = 0; + } } - + %amount = isObject(statsGroup) ? statsGroup.getCount() : 0;// safer method instead of client group do to how offton it changes %lns = mFloor(%amount/3); %leftOver = %amount - (%lns * 3); %numPages = mCeil(%amount/51); - + if(%numPages > 1){ if(%client.curPage < %numPages && %client.curPage == 1){// %line = ' Back - Return To Score Screen - Next Page > - '; @@ -8723,22 +8728,22 @@ function statsMenu(%client,%game){ %line = ' Back - Return To Score Screen - < Back Page - '; messageClient( %client, 'SetScoreHudSubheader', "", %line ,0, "SERVER"); } - + } else{ - messageClient( %client, 'SetScoreHudSubheader', "", ' Back - Return To Score Screen - ',0, "WHITELIST"); + messageClient( %client, 'SetScoreHudSubheader', "", ' Back - Return To Score Screen - ',0, "WHITELIST"); } - + for(%i = (%client.curPage - 1) * 17; %i < %client.curPage * 17 && %i < %lns; %i++){ %vsc1 = %f; %f++; %vsc2 = %f; %f++; %vsc3 = %f; %f++; - + %AR1 = isObject($dtWhtList::WhiteList[statsGroup.getObject(%vsc1).guid]) ? "Remove" : "Add"; - %plr1 = %vsc1 @ ":" @ statsGroup.getObject(%vsc1).name SPC %AR1; + %plr1 = %vsc1 @ ":" @ statsGroup.getObject(%vsc1).name SPC %AR1; %AR2 = isObject($dtWhtList::WhiteList[statsGroup.getObject(%vsc2).guid]) ? "Remove" : "Add"; - %plr2 = %vsc2 @ ":" @ statsGroup.getObject(%vsc2).name SPC %AR2; + %plr2 = %vsc2 @ ":" @ statsGroup.getObject(%vsc2).name SPC %AR2; %AR3 = isObject($dtWhtList::WhiteList[statsGroup.getObject(%vsc3).guid]) ? "Remove" : "Add"; %plr3 = %vsc3 @ ":" @ statsGroup.getObject(%vsc3).name SPC %AR3; - + %line = '\t%3\t%4\t%5'; messageClient( %client, 'SetLineHud', "", %tag, %index++, %line, 0, "SERVER", %plr1, %plr2, %plr3, "RMV" SPC statsGroup.getObject(%vsc1), "RMV" SPC statsGroup.getObject(%vsc2), "RMV" SPC statsGroup.getObject(%vsc3)); } @@ -8746,16 +8751,16 @@ function statsMenu(%client,%game){ if(%leftOver == 2){ %vsc1 = %f; %f++; %vsc2 = %f; %f++; %AR1 = isObject($dtWhtList::WhiteList[statsGroup.getObject(%vsc1).guid]) ? "Remove" : "Add"; - %plr1 = %vsc1 @ ":" @ statsGroup.getObject(%vsc1).name SPC %AR1; + %plr1 = %vsc1 @ ":" @ statsGroup.getObject(%vsc1).name SPC %AR1; %AR2 = isObject($dtWhtList::WhiteList[statsGroup.getObject(%vsc2).guid]) ? "Remove" : "Add"; - %plr2 = %vsc2 @ ":" @ statsGroup.getObject(%vsc2).name SPC %AR2; + %plr2 = %vsc2 @ ":" @ statsGroup.getObject(%vsc2).name SPC %AR2; %line = '\t%3\t%4\t%5'; messageClient( %client, 'SetLineHud', "", %tag, %index++, %line, 0, "SERVER", %plr1, %plr2, "", "RMV" SPC statsGroup.getObject(%vsc1), "RMV" SPC statsGroup.getObject(%vsc2), ""); - } + } else if(%leftOver == 1){ %vsc1 = %f; %f++; %AR1 = isObject($dtWhtList::WhiteList[statsGroup.getObject(%vsc1).guid]) ? "Remove" : "Add"; - %plr1 = %vsc1 @ ":" @ statsGroup.getObject(%vsc1).name SPC %AR1; + %plr1 = %vsc1 @ ":" @ statsGroup.getObject(%vsc1).name SPC %AR1; %line = '\t%3\t%4\t%5'; messageClient( %client, 'SetLineHud', "", %tag, %index++, %line, 0, "SERVER", %plr1, "", "", "RMV" SPC statsGroup.getObject(%vsc1), "", ""); } @@ -8764,15 +8769,15 @@ function statsMenu(%client,%game){ case "WHITELIST": if(!%client.curPage) %client.curPage = 1; - + messageClient( %client, 'SetScoreHudHeader', "", "White List"); - + if(getWord(%opt2,0) $= "RMV" && isObject(serverSafeList.getObject(getWord(%opt2,1)))){ rmvWhiteListIndex(getWord(%opt2,1)); %client.GlArg5 = 0; %f = 51 * (%client.curPage - 1); - } - else{ + } + else{ switch$(%opt2){ case "NP"://next page %client.curPage++; @@ -8784,15 +8789,15 @@ function statsMenu(%client,%game){ %f = 51 * (%client.curPage - 1); default: %client.curPage = 1; - %f = 0; + %f = 0; } } - + %amount = isObject(serverSafeList) ? serverSafeList.getCount() : 0; %lns = mFloor(%amount/3); %leftOver = %amount - (%lns * 3); %numPages = mCeil(%amount/51); - + if(%numPages > 1){ if(%client.curPage < %numPages && %client.curPage == 1){// %line = ' Back - Return To Score Screen - Next Page > - Add/Rmv From '; @@ -8806,32 +8811,32 @@ function statsMenu(%client,%game){ %line = ' Back - Return To Score Screen - < Back Page'; messageClient( %client, 'SetScoreHudSubheader', "", %line ,0, "WHITELIST"); } - + } else{ - messageClient( %client, 'SetScoreHudSubheader', "", ' Back - Return To Score Screen - Add/Rmv From ',0); + messageClient( %client, 'SetScoreHudSubheader', "", ' Back - Return To Score Screen - Add/Rmv From ',0); } - + for(%i = (%client.curPage - 1) * 17; %i < %client.curPage * 17 && %i < %lns; %i++){ %vsc1 = %f; %f++; %vsc2 = %f; %f++; %vsc3 = %f; %f++; - %plr1 = %vsc1 @ ":" @ serverSafeList.getObject(%vsc1).name SPC "Remove"; - %plr2 = %vsc2 @ ":" @ serverSafeList.getObject(%vsc2).name SPC "Remove"; + %plr1 = %vsc1 @ ":" @ serverSafeList.getObject(%vsc1).name SPC "Remove"; + %plr2 = %vsc2 @ ":" @ serverSafeList.getObject(%vsc2).name SPC "Remove"; %plr3 = %vsc3 @ ":" @ serverSafeList.getObject(%vsc3).name SPC "Remove"; - + %line = '\t%3\t%4\t%5'; messageClient( %client, 'SetLineHud', "", %tag, %index++, %line, 0, "WHITELIST", %plr1, %plr2, %plr3, "RMV" SPC %vsc1, "RMV" SPC %vsc2, "RMV" SPC %vsc3); } if(%numPages == %client.curPage){ if(%leftOver == 2){ %vsc1 = %f; %f++; %vsc2 = %f; %f++; - %plr1 = %vsc1 @ ":" @ serverSafeList.getObject(%vsc1).name SPC "Remove"; - %plr2 = %vsc2 @ ":" @ serverSafeList.getObject(%vsc2).name SPC "Remove"; + %plr1 = %vsc1 @ ":" @ serverSafeList.getObject(%vsc1).name SPC "Remove"; + %plr2 = %vsc2 @ ":" @ serverSafeList.getObject(%vsc2).name SPC "Remove"; %line = '\t%3\t%4\t%5'; messageClient( %client, 'SetLineHud', "", %tag, %index++, %line, 0, "WHITELIST", %plr1, %plr2, "", "RMV" SPC %vsc1, "RMV" SPC %vsc2, ""); - } + } else if(%leftOver == 1){ %vsc1 = %f; %f++; - %plr1 = %vsc1 @ ":" @ serverSafeList.getObject(%vsc1).name SPC "Remove"; + %plr1 = %vsc1 @ ":" @ serverSafeList.getObject(%vsc1).name SPC "Remove"; %line = '\t%3\t%4\t%5'; messageClient( %client, 'SetLineHud', "", %tag, %index++, %line, 0, "WHITELIST", %plr1, "", "", "RMV" SPC %vsc1, "", ""); } @@ -8840,9 +8845,9 @@ function statsMenu(%client,%game){ case "BL": if(!%client.curPage) %client.curPage = 1; - + messageClient( %client, 'SetScoreHudHeader', "", "Ban/Kick List"); - + if(getWord(%opt2,0) $= "RMV" && dtBanList.getObject(getWord(%opt2,0) != -1)){ unbanUserObj(dtBanList.getObject(getWord(%opt2,1)));//function makes echo report %client.GlArg5 = 0; @@ -8855,8 +8860,8 @@ function statsMenu(%client,%game){ saveBanList(); } - messageClient( %client, 'SetScoreHudSubheader', "", ' Back - Return To Score Screen',0); - + messageClient( %client, 'SetScoreHudSubheader', "", ' Back - Return To Score Screen',0); + %banlistCount = 0; for(%i = 0; %i < dtBanList.getCount(); %i++){ %banObj = dtBanList.getObject(%i); @@ -8867,7 +8872,7 @@ function statsMenu(%client,%game){ } else{ %plrLine = %plrLine @ "\t" @ %banObj.name @ ":" @ numReduce(%banObj.banLengthMin - getTimeDelta(%banObj.banDateTime),0); - %line = %line @ "\tUnban - Perma"; + %line = %line @ "\tUnban - Perma"; } %banlistCount++; if(!(%banlistCount % 3)){ @@ -8882,7 +8887,7 @@ function statsMenu(%client,%game){ messageClient( %client, 'SetLineHud', "", %tag, %index++, %plrLine); messageClient( %client, 'SetLineHud', "", %tag, %index++, %line); } - + return; case "RESET": %client.GlArg4 = 0; @@ -8894,24 +8899,24 @@ function statsMenu(%client,%game){ case "WLRESET": messageClient( %client, 'SetScoreHudHeader', "", "Confirm?"); messageClient( %client, 'SetScoreHudSubheader', "", ' Back - Return To Score Screen',0); - messageClient( %client, 'SetLineHud', "", %tag, %index++, ''); + messageClient( %client, 'SetLineHud', "", %tag, %index++, ''); %line = ' DELETE WHITELIST? '; messageClient( %client, 'SetLineHud', "", %tag, %index++, %line,0,"WLRESETSTEP2"); return; - + case "buildStats": if(!$dtStats::building){ compileStats(); %client.GlArg4 = 0; } - + %client.GlArg4 = 0; case "customAdd": $dtServerVars::custom++; $dtStats::curCustom = $dtServerVars::custom; %client.GlArg4 = 0; if(isEventPending(%client.expSch)){ - cancel(%client.expSch); + cancel(%client.expSch); } %client.expSch = schedule(10000,0,"export", "$dtServerVars::*", "serverStats/serverVars.cs", false ); $dtStats::reloadTotal = 1; @@ -8920,7 +8925,7 @@ function statsMenu(%client,%game){ $dtStats::curCustom = $dtServerVars::custom; %client.GlArg4 = 0; if(isEventPending(%client.expSch)){ - cancel(%client.expSch); + cancel(%client.expSch); } %client.expSch = schedule(10000,0,"export", "$dtServerVars::*", "serverStats/serverVars.cs", false ); $dtStats::reloadTotal = 1; @@ -8983,20 +8988,20 @@ function statsMenu(%client,%game){ } } else{ - %line = ' + Disable tournament mode to compile stats'; - messageClient( %client, 'SetLineHud', "", %tag, %index++, %line); + %line = ' + Disable tournament mode to compile stats'; + messageClient( %client, 'SetLineHud', "", %tag, %index++, %line); } } else{ - %line = ' + No Tournament Map Stats To Compile'; - messageClient( %client, 'SetLineHud', "", %tag, %index++, %line); + %line = ' + No Tournament Map Stats To Compile'; + messageClient( %client, 'SetLineHud', "", %tag, %index++, %line); } %glist = 0; if(isObject(pubList)){ for(%i = 0; %i < pubList.getCount(); %i++){ %gobj = pubList.getObject(%i); %glist += %gobj.getCount(); - } + } } if(%glist > 0){ if(!$Host::TournamentMode){ @@ -9010,18 +9015,18 @@ function statsMenu(%client,%game){ } } else{ - %line = ' + Disable tournament mode to compile stats'; - messageClient( %client, 'SetLineHud', "", %tag, %index++, %line); + %line = ' + Disable tournament mode to compile stats'; + messageClient( %client, 'SetLineHud', "", %tag, %index++, %line); } } else{ - %line = ' + No Map Stats To Compile'; - messageClient( %client, 'SetLineHud', "", %tag, %index++, %line); + %line = ' + No Map Stats To Compile'; + messageClient( %client, 'SetLineHud', "", %tag, %index++, %line); } } else{ %line = ' + Map stats can only be enabled in CTF - LCTF'; - messageClient( %client, 'SetLineHud', "", %tag, %index++, %line); + messageClient( %client, 'SetLineHud', "", %tag, %index++, %line); } %line = ' + Map Play Statistics'; @@ -9030,14 +9035,14 @@ function statsMenu(%client,%game){ messageClient( %client, 'SetLineHud', "", %tag, %index++, %line,0,1, ML.TypeIndex[$CurrentMissionType]); //------------------------------------------------------------------------------ // messageClient( %client, 'SetLineHud', "", %tag, %index++, ""); - + %line = ' + Server Health Info - Last Event = %1 Minutes'; %evTime = ((getSimTime() - $dtStats:lastEvent)/1000)/60; messageClient( %client, 'SetLineHud', "", %tag, %index++, %line,%evTime); - + %line = ' + Team Balancer'; messageClient( %client, 'SetLineHud', "", %tag, %index++, %line); - + %statIndex = $dtServerVars::custom > 1 ? $dtServerVars::custom : 1; %line = ' + Custom Stat Interval - Current Index: < %4 >'; messageClient( %client, 'SetLineHud', "", %tag, %index++, %line,0,0,0,%statIndex); @@ -9049,10 +9054,10 @@ function statsMenu(%client,%game){ // %line = ' + Stop Player Plot'; // messageClient( %client, 'SetLineHud', "", %tag, %index++, %line,0,"plotDisable"); // } - + messageClient( %client, 'SetLineHud', "", %tag, %index++, ""); - - + + if($dtServerVars::WhiteListMode){ %line = ' + Disable Whitelist - Disabling will open the server to anyone'; messageClient( %client, 'SetLineHud', "", %tag, %index++, %line,0,"LISTENABLE",0); @@ -9061,7 +9066,7 @@ function statsMenu(%client,%game){ %line = ' + Enable Whitelist - Enabling will locked the server to approve accounts only'; messageClient( %client, 'SetLineHud', "", %tag, %index++, %line,0,"LISTENABLE",1); } - + if(isFile($dtStats::IPBanListFile)){ if($dtServerVars::IPBanListMode){ %line = ' + Disable IP Ban List - Disables only this feature'; @@ -9072,29 +9077,29 @@ function statsMenu(%client,%game){ messageClient( %client, 'SetLineHud', "", %tag, %index++, %line,0,"IPBANLISTENABLE",1); } } - + %line = ' + View Ban List - Unban a player'; messageClient( %client, 'SetLineHud', "", %tag, %index++, %line, 0, "BL", "RS"); - + %line = ' + View White List - Add or Remove player from list, ban/kick auto removes'; messageClient( %client, 'SetLineHud', "", %tag, %index++, %line,0,"WHITELIST", "RS"); - + %line = ' + White List Queue - There are %4 accounts that need approval'; messageClient( %client, 'SetLineHud', "", %tag, %index++, %line,0,"WLQUEUE", "RS",$dtJoinListCount); - + messageClient( %client, 'SetLineHud', "", %tag, %index++, ""); - + %line = ' + Reset White List - Clears everything'; messageClient( %client, 'SetLineHud', "", %tag, %index++, %line,0,"WLRESET",0); - + messageClient( %client, 'SetLineHud', "", %tag, %index++, ""); - - + + case "CST": %opt0 = %client.GlArg3; %opt1 = %client.GlArg4; %opt2 = %client.GlArg5; - + switch$(%opt0){ case "tmc": if(!$dtStats::tmCompile){ @@ -9105,14 +9110,14 @@ function statsMenu(%client,%game){ case "rmv": %opt1.select = 0; case "add": - %opt1.select = 1; + %opt1.select = 1; case "del": if(isObject(%opt1)){ %opt1.delete(); pugList.schedule(1000,"save","serverStats/pugLog.cs", 0); } } - + messageClient( %client, 'SetScoreHudHeader', "", "Map Stats Compile"); if($dtStatsImgBuild || $dtStats::tmCompile){ %line = ' Back - Return To Score Screen Stats Compiling '; @@ -9121,31 +9126,31 @@ function statsMenu(%client,%game){ else{ if(($HostGamePlayerCount - $HostGameBotCount) < 6){ %line = ' Back - Return To Score Screen Compile Selected Stats'; - messageClient( %client, 'SetScoreHudSubheader', "", %line,0); + messageClient( %client, 'SetScoreHudSubheader', "", %line,0); } else{ %line = ' Back - Return To Score Screen Compile Stats Locked'; messageClient( %client, 'SetScoreHudSubheader', "", %line,0); } } - - %hasCount = 0; %line = ""; + + %hasCount = 0; %line = ""; for(%i = 0; %i < pugList.getCount(); %i++){ %grpObj = pugList.getObject(%i); for(%x = 0; %x < %grpObj.getCount(); %x++){ %mid = %grpObj.getObject(%x); if(%client.statSlot == %mid.statSlot){ %line = %mid.mapName SPC %mid.teamOne SPC %mid.teamTwo SPC %mid.gameType SPC %mid.date; - messageClient( %client, 'SetLineHud', "", %tag, %index++, %line); - if(!%mid.select){ + messageClient( %client, 'SetLineHud', "", %tag, %index++, %line); + if(!%mid.select){ %line = " "; } else{ - %line = " "; + %line = " "; } - - messageClient( %client, 'SetLineHud', "", %tag, %index++, %line); + + messageClient( %client, 'SetLineHud', "", %tag, %index++, %line); } } } @@ -9154,7 +9159,7 @@ function statsMenu(%client,%game){ //pugID = $dtStats::gameID; //mapName = $MissionDisplayName; //date = formattimestring("M-d-yy"); - //teamOne = $TeamScore[1]; + //teamOne = $TeamScore[1]; //teamTwo = $TeamScore[2]; //gameType = %game.class; //}; @@ -9163,7 +9168,7 @@ function statsMenu(%client,%game){ %opt0 = %client.GlArg3; %opt1 = %client.GlArg4; %opt2 = %client.GlArg5; - + switch$(%opt0){ case "gmc": if(!$dtStats::tmCompile){ @@ -9174,14 +9179,14 @@ function statsMenu(%client,%game){ case "rmv": %opt1.select = 0; case "add": - %opt1.select = 1; + %opt1.select = 1; case "del": if(isObject(%opt1)){ %opt1.delete(); pubList.schedule(1000,"save","serverStats/pubLog.cs", 0); } } - + messageClient( %client, 'SetScoreHudHeader', "", "Map Stats Compile"); if($dtStatsImgBuild || $dtStats::tmCompile){ %line = ' Back - Return To Score Screen Stats Compiling '; @@ -9190,34 +9195,34 @@ function statsMenu(%client,%game){ else{ if(($HostGamePlayerCount - $HostGameBotCount) < 6){ %line = ' Back - Return To Score Screen Compile Selected Stats'; - messageClient( %client, 'SetScoreHudSubheader', "", %line,0); + messageClient( %client, 'SetScoreHudSubheader', "", %line,0); } else{ %line = ' Back - Return To Score Screen Compile Stats Locked'; - messageClient( %client, 'SetScoreHudSubheader', "", %line,0); + messageClient( %client, 'SetScoreHudSubheader', "", %line,0); } } - %hasCount = 0; %line = ""; + %hasCount = 0; %line = ""; for(%i = 0; %i < pubList.getCount(); %i++){ %grpObj = pubList.getObject(%i); for(%x = 0; %x < %grpObj.getCount(); %x++){ %mid = %grpObj.getObject(%x); if(%client.statSlot == %mid.statSlot){ %line = %mid.mapName SPC %mid.teamOne SPC %mid.teamTwo SPC %mid.gameType SPC %mid.date; - messageClient( %client, 'SetLineHud', "", %tag, %index++, %line); - if(!%mid.select){ + messageClient( %client, 'SetLineHud', "", %tag, %index++, %line); + if(!%mid.select){ %line = " "; } else{ - %line = " "; + %line = " "; } - - messageClient( %client, 'SetLineHud', "", %tag, %index++, %line); + + messageClient( %client, 'SetLineHud', "", %tag, %index++, %line); } } - } + } case "MAP": %opt0 = %client.GlArg3; %opt1 = %client.GlArg4; @@ -9260,14 +9265,14 @@ function statsMenu(%client,%game){ %client.GlArg3 = 0; %client.GlArg4 = 0; if( ML.curMapList $= ""){ - ML.curMapList = 0; + ML.curMapList = 0; } messageClient( %client, 'SetScoreHudHeader', "", "Map Config"); %line = ' Back - Return To Score Screen Reset All To Default '; - + messageClient( %client, 'SetScoreHudSubheader', "", %line,0); - messageClient( %client, 'SetLineHud', "", %tag, %index++, 'Number of maps for given player numbers'); - + messageClient( %client, 'SetLineHud', "", %tag, %index++, 'Number of maps for given player numbers'); + if(!$dtMapRebuild && ML.curMapList != 3){ deleteVariables("$dtMapMinMax*"); for ( %i = 0; %i < ML.getCount(); %i++ ){ @@ -9276,17 +9281,17 @@ function statsMenu(%client,%game){ if(getField(%ms,0)){ for ( %r = getField(%ms,2); %r <= getField(%ms,3); %r++ ){ if(!getFieldCount($dtMapMinMax[%r, ML.TypeName[%client.gmType],ML.curMapList])){ - $dtMapMinMax[%r, ML.TypeName[%client.gmType],ML.curMapList] = %i; + $dtMapMinMax[%r, ML.TypeName[%client.gmType],ML.curMapList] = %i; } else{ - $dtMapMinMax[%r, ML.TypeName[%client.gmType],ML.curMapList] = $dtMapMinMax[%r, ML.TypeName[%client.gmType],ML.curMapList] TAB %i; + $dtMapMinMax[%r, ML.TypeName[%client.gmType],ML.curMapList] = $dtMapMinMax[%r, ML.TypeName[%client.gmType],ML.curMapList] TAB %i; } } } } $dtMapRebuild = 1; } - + %vv = 70; %line = ""; for(%z = 0; %z < 64; %z++){ @@ -9299,18 +9304,18 @@ function statsMenu(%client,%game){ %line = %line @ %z+1 @ "-" @ getFieldCount(%maps) @ "\t"; } if((%z % 8) == 7){ - messageClient( %client, 'SetLineHud', "", %tag, %index++, %line); + messageClient( %client, 'SetLineHud', "", %tag, %index++, %line); %line = ""; } } - + if((%z-1 % 8) < 7) - messageClient( %client, 'SetLineHud', "", %tag, %index++, %line); - - + messageClient( %client, 'SetLineHud', "", %tag, %index++, %line); + + %vv = 100; %line = ""; - for(%z = 0; %z < ML.TypeCount; %z++){ + for(%z = 0; %z < ML.TypeCount; %z++){ if(%z $= %client.gmType){ %line = %line @ "|" @ ML.TypeName[%z]@ "|\t"; } @@ -9318,15 +9323,15 @@ function statsMenu(%client,%game){ %line = %line @ "|" @ ML.TypeName[%z] @ "|\t"; } if((%z % 5) == 4){ - messageClient( %client, 'SetLineHud', "", %tag, %index++, %line); - %line = ""; + messageClient( %client, 'SetLineHud', "", %tag, %index++, %line); + %line = ""; } } if((%z-1 % 5) != 4){ - messageClient( %client, 'SetLineHud', "", %tag, %index++, %line); + messageClient( %client, 'SetLineHud', "", %tag, %index++, %line); } - - //messageClient( %client, 'SetLineHud', "", %tag, %index++, ''); + + //messageClient( %client, 'SetLineHud', "", %tag, %index++, ''); if(ML.enable){ if(!ML.saveMapPlayed){ %line = ' + Disable Map Custom Rotation - Enable Non Repeat Map Rotation'; @@ -9342,9 +9347,9 @@ function statsMenu(%client,%game){ %line = ' + Enable Map Custom Rotation - overrides other map systems for this one'; messageClient( %client, 'SetLineHud', "", %tag, %index++, %line,%client.gmType,3,0); } - + messageClient( %client, 'SetLineHud', "", %tag, %index++, ''); - + %mapList = ML.curMapList; switch(%mapList){ case 0: @@ -9362,24 +9367,24 @@ function statsMenu(%client,%game){ } %line = ' |Edit Rotation|\t |Edit Rotation|\t |Edit Rotation|\t |Edit Rotation|'; messageClient( %client, 'SetLineHud', "", %tag, %index++, %line); - + case "MF": %opt0 = %client.GlArg3; %opt1 = %client.GlArg4; %opt2 = %client.GlArg5; - switch(%opt0){ + switch(%opt0){ case 1:// page next %client.curPageMF++; - case 2:// page back; - %client.curPageMF--; + case 2:// page back; + %client.curPageMF--; if(%client.curPageMF < 0){ - %client.curPageMF = 0; + %client.curPageMF = 0; } - case 3: + case 3: %client.curPageMF = 0; case 4: %fields = $dtFixedMapList[%opt1, ML.TypeName[%client.gmType]]; - $dtFixedMapList[%opt1, ML.TypeName[%client.gmType]] = setField(%fields,2, %opt2); + $dtFixedMapList[%opt1, ML.TypeName[%client.gmType]] = setField(%fields,2, %opt2); case 5:// remove fixed if($dtFixedMapCount[ML.TypeName[%client.gmType]]){ $dtFixedMapCount[ML.TypeName[%client.gmType]]--; @@ -9389,19 +9394,19 @@ function statsMenu(%client,%game){ } case 6://move up if(%opt1-1 > -1){ - %A = $dtFixedMapList[%opt1-1, ML.TypeName[%client.gmType]]; - %B = $dtFixedMapList[%opt1, ML.TypeName[%client.gmType]]; + %A = $dtFixedMapList[%opt1-1, ML.TypeName[%client.gmType]]; + %B = $dtFixedMapList[%opt1, ML.TypeName[%client.gmType]]; $dtFixedMapList[%opt1-1, ML.TypeName[%client.gmType]] = %B; $dtFixedMapList[%opt1, ML.TypeName[%client.gmType]] = %A; } case 7://move down if(%opt1+1 < $dtFixedMapCount[ML.TypeName[%client.gmType]]){ - %A = $dtFixedMapList[%opt1+1, ML.TypeName[%client.gmType]]; - %B = $dtFixedMapList[%opt1, ML.TypeName[%client.gmType]]; + %A = $dtFixedMapList[%opt1+1, ML.TypeName[%client.gmType]]; + %B = $dtFixedMapList[%opt1, ML.TypeName[%client.gmType]]; $dtFixedMapList[%opt1+1, ML.TypeName[%client.gmType]] = %B; $dtFixedMapList[%opt1, ML.TypeName[%client.gmType]] = %A; } - case 8://first + case 8://first if($dtFixedMapCount[ML.TypeName[%client.gmType]] > 1){ %element = $dtFixedMapList[%opt1, ML.TypeName[%client.gmType]]; for (%i = %opt1; %i > 0; %i--) { @@ -9411,7 +9416,7 @@ function statsMenu(%client,%game){ } case 9://last if($dtFixedMapCount[ML.TypeName[%client.gmType]] > 1){ - %element = $dtFixedMapList[%opt1, ML.TypeName[%client.gmType]]; + %element = $dtFixedMapList[%opt1, ML.TypeName[%client.gmType]]; %size = $dtFixedMapCount[ML.TypeName[%client.gmType]] - 1; for (%i = %opt1; %i < %size; %i++) { $dtFixedMapList[%i, ML.TypeName[%client.gmType]] = $dtFixedMapList[%i + 1, ML.TypeName[%client.gmType]]; @@ -9422,12 +9427,12 @@ function statsMenu(%client,%game){ if(%opt0 > 3){ saveMapRot(); if(ML.enable && %client.curMapList == ML.curMapList ){ - buildMissionList(); + buildMissionList(); } } - %client.GlArg3 = 0; + %client.GlArg3 = 0; messageClient( %client, 'SetScoreHudHeader', "", " Fixed Map Rotation"); - + if((%client.curPageMF+1) * 16 < $dtFixedMapCount[ML.TypeName[%client.gmType]]){ if(%client.curPageMF == 0){ %line = ' Back - Return To Score Screen - Next Page >'; @@ -9441,7 +9446,7 @@ function statsMenu(%client,%game){ %line = ' Back - Return To Score Screen - < Back Page'; messageClient( %client, 'SetScoreHudSubheader', "", %line ,%Client); } - + } else{ if(%client.curPageMF > 0){ @@ -9449,29 +9454,29 @@ function statsMenu(%client,%game){ messageClient( %client, 'SetScoreHudSubheader', "", %line); } else{ - messageClient( %client, 'SetScoreHudSubheader', "", ' Back - Return To Score Screen'); + messageClient( %client, 'SetScoreHudSubheader', "", ' Back - Return To Score Screen'); } } - - - + + + %line = 'Map List \t Rmv-Remove A-Allow Vote X-Deny F-First L-Last'; - messageClient( %client, 'SetLineHud', "", %tag, %index++, %line); - + messageClient( %client, 'SetLineHud', "", %tag, %index++, %line); + %r = 0; - for(%i = %client.curPageMF * 16; %i < $dtFixedMapCount[ML.TypeName[%client.gmType]] && %r < 16; %i++){ + for(%i = %client.curPageMF * 16; %i < $dtFixedMapCount[ML.TypeName[%client.gmType]] && %r < 16; %i++){ %mapFields = $dtFixedMapList[%i, ML.TypeName[%client.gmType]]; %name2 = getField(%mapFields,1); %name2 = (strLen(%name2) > 21) ? getSubStr(%name2, 0, 21) @ ".." : %name2; - + %vote = (getField(%mapFields,2) == 0) ? "A" : "X"; %move = "U" SPC "D"; %first = "F" SPC "L"; %line = ""@ %i @ ":" @ %name2 @ "\tRmv" SPC %vote SPC %move SPC %first; - messageClient( %client, 'SetLineHud', "", %tag, %index++, %line); - %r++; + messageClient( %client, 'SetLineHud', "", %tag, %index++, %line); + %r++; } - + case "M": %opt0 = %client.GlArg3; %opt1 = %client.GlArg4; @@ -9485,10 +9490,10 @@ function statsMenu(%client,%game){ %mapObj.typeOptions[ML.TypeName[%client.gmType], %client.curMapList] = setField(%options,0, 0); } else{ - %mapObj.typeOptions[ML.TypeName[%client.gmType], %client.curMapList] = setField(%options,0, 1); + %mapObj.typeOptions[ML.TypeName[%client.gmType], %client.curMapList] = setField(%options,0, 1); } } - $dtMapRebuild = 0; + $dtMapRebuild = 0; if(ML.enable && ML.curMapList == %client.curMapList){ buildMissionList(); } @@ -9498,11 +9503,11 @@ function statsMenu(%client,%game){ %client.curPage = 0; %client.pageZ[%client.curPage] = 0; case 3://next page - %client.curPage++; + %client.curPage++; case 4://back page %client.curPage--; if(%client.curPage == 0){ - %client.pageZ[%client.curPage] = 0; + %client.pageZ[%client.curPage] = 0; } if(%client.curPage < 0){ %client.curPage = 0; @@ -9530,11 +9535,11 @@ function statsMenu(%client,%game){ %mapObj = ML.getObject(%z); if(%mapObj.typeList[ML.TypeName[%client.gmType]]){ %options = %mapObj.typeOptions[ML.TypeName[%client.gmType], %client.curMapList]; - %mapObj.typeOptions[ML.TypeName[%client.gmType], %client.curMapList] = setField(%options,0, 1); + %mapObj.typeOptions[ML.TypeName[%client.gmType], %client.curMapList] = setField(%options,0, 1); } } } - $dtMapRebuild = 0; + $dtMapRebuild = 0; if(ML.enable && ML.curMapList == %client.curMapList){ buildMissionList(); } @@ -9550,7 +9555,7 @@ function statsMenu(%client,%game){ $dtFixedMapCount[ML.TypeName[%client.gmType]]--; if($dtFixedMapCount[ML.TypeName[%client.gmType]] < 1){ $dtFixedMapCount[ML.TypeName[%client.gmType]] = 0; - break; + break; } } } @@ -9561,11 +9566,11 @@ function statsMenu(%client,%game){ %mapObj = ML.getObject(%z); if(%mapObj.typeList[ML.TypeName[%client.gmType]]){ %options = %mapObj.typeOptions[ML.TypeName[%client.gmType], %client.curMapList]; - %mapObj.typeOptions[ML.TypeName[%client.gmType], %client.curMapList] = setField(%options,0, 0); + %mapObj.typeOptions[ML.TypeName[%client.gmType], %client.curMapList] = setField(%options,0, 0); } } } - $dtMapRebuild = 0; + $dtMapRebuild = 0; if(ML.enable && ML.curMapList == %client.curMapList){ buildMissionList(); } @@ -9580,7 +9585,7 @@ function statsMenu(%client,%game){ if(!isEventPending($saveMR)){ $saveMR = schedule(5000, 0, "export", "$dtFixedMap*", "serverStats/fixMapRot.cs", false ); } - $dtMapRebuild = 0; + $dtMapRebuild = 0; if(ML.enable && ML.curMapList == %client.curMapList){ buildMissionList(); } @@ -9588,7 +9593,7 @@ function statsMenu(%client,%game){ case 9:// remove fixed case 10://vote %fields = $dtFixedMapList[%opt1, ML.TypeName[%client.gmType]]; - $dtFixedMapList[%opt1, ML.TypeName[%client.gmType]] = setField(%fields,2, %opt2); + $dtFixedMapList[%opt1, ML.TypeName[%client.gmType]] = setField(%fields,2, %opt2); case 11: // add all bots maps if(%client.curMapList == 3){ for(%z = 0; %z < ML.getCount(); %z++){ @@ -9607,11 +9612,11 @@ function statsMenu(%client,%game){ %bot = isFile("terrains/" @ %mapObj.file @".nav"); if(%mapObj.typeList[ML.TypeName[%client.gmType]] && %bot){ %options = %mapObj.typeOptions[ML.TypeName[%client.gmType], %client.curMapList]; - %mapObj.typeOptions[ML.TypeName[%client.gmType], %client.curMapList] = setField(%options,0, 1); + %mapObj.typeOptions[ML.TypeName[%client.gmType], %client.curMapList] = setField(%options,0, 1); } } } - $dtMapRebuild = 0; + $dtMapRebuild = 0; if(ML.enable && ML.curMapList == %client.curMapList){ buildMissionList(); } @@ -9627,10 +9632,10 @@ function statsMenu(%client,%game){ %line = "Click Here To View Fixed Map List - Current Map Count =" SPC $dtFixedMapCount[ML.TypeName[%client.gmType]]; messageClient( %client, 'SetLineHud', "", %tag, %index++, %line); } - - %line = ""; - %r = 0; - %lineCount = 0; + + %line = ""; + %r = 0; + %lineCount = 0; %dtmc = (%client.curPage) * 16; for(%z = %client.pageZ[%client.curPage]; %z < ML.getCount(); %z++){ %mapObj = ML.getObject(%z); @@ -9643,11 +9648,11 @@ function statsMenu(%client,%game){ %name = (strLen(%name) > %clip) ? getSubStr(%name, 0,%clip) @ ".." : %name; %line = %line @ %line = "" @ %name @ "\t|Add|\t"; if((%r % 2) == 1){ - messageClient( %client, 'SetLineHud', "", %tag, %index++, %line); - %line = ""; + messageClient( %client, 'SetLineHud', "", %tag, %index++, %line); + %line = ""; if( %lineCount++ > 15){ - %client.pageZ[%client.curPage+1] = %z;// the next page stoping point - break; + %client.pageZ[%client.curPage+1] = %z;// the next page stoping point + break; } } %r++; @@ -9661,11 +9666,11 @@ function statsMenu(%client,%game){ %A = (getField(%options,0) == 0) ? "|Add" : "|Rmv"; %line = %line @ %name @ "\t" @ %A @ "|Opt|\t"; if((%r % 2) == 1){ - messageClient( %client, 'SetLineHud', "", %tag, %index++, %line); - %line = ""; + messageClient( %client, 'SetLineHud', "", %tag, %index++, %line); + %line = ""; if( %lineCount++ > 16){ - %client.pageZ[%client.curPage+1] = %z;// the next page stoping point - break; + %client.pageZ[%client.curPage+1] = %z;// the next page stoping point + break; } } %r++; @@ -9673,7 +9678,7 @@ function statsMenu(%client,%game){ } } } - + if(%z < ML.getCount()){ if(%client.curPage == 0){ %line = ' Back - Return To Score Screen - Next Page > * = Bot Support'; @@ -9687,7 +9692,7 @@ function statsMenu(%client,%game){ %line = ' Back - Return To Score Screen - < Back Page * = Bot Support'; messageClient( %client, 'SetScoreHudSubheader', "", %line ,%Client); } - + } else{ if(%client.curPage > 0){ @@ -9695,10 +9700,10 @@ function statsMenu(%client,%game){ messageClient( %client, 'SetScoreHudSubheader', "", %line); } else{ - messageClient( %client, 'SetScoreHudSubheader', "", '> Back - Return To Score Screen * = Bot Support'); + messageClient( %client, 'SetScoreHudSubheader', "", '> Back - Return To Score Screen * = Bot Support'); } } - case "MO":// map options + case "MO":// map options %opt0 = %client.GlArg3; %opt1 = %client.GlArg4; %opt2 = %client.GlArg5; @@ -9712,26 +9717,26 @@ function statsMenu(%client,%game){ %max = getField(%options,3); %p = getField(%options,2) + 4; if(%p > %max){ - %p = %max-1; + %p = %max-1; } %mapObj.typeOptions[ML.TypeName[%client.gmType], %client.curMapList] = setField(%options, 2, %p); case 3://- %p = getField(%options,2) - 4; if(%p < 0){ - %p = 0; + %p = 0; } %mapObj.typeOptions[ML.TypeName[%client.gmType], %client.curMapList] = setField(%options, 2, %p); case 4://+ %p = getField(%options,3) + 4; if(%p > 63){ - %p = 64; + %p = 64; } %mapObj.typeOptions[ML.TypeName[%client.gmType], %client.curMapList] = setField(%options, 3, %p); case 5://- %min = getField(%options,2); %p = getField(%options, 3) - 4; - if(%p < %min){// cant be smaller then min - %p = %min + 1; + if(%p < %min){// cant be smaller then min + %p = %min + 1; } %mapObj.typeOptions[ML.TypeName[%client.gmType], %client.curMapList] = setField(%options, 3, %p); case 6:// prio @@ -9741,8 +9746,8 @@ function statsMenu(%client,%game){ %mapObj.typeOptions[ML.TypeName[%client.gmType], %client.curMapList] = setField(%options,5, 0); } else{ - %mapObj.typeOptions[ML.TypeName[%client.gmType], %client.curMapList] = %options = setField(%options,5,1); - %mapObj.typeOptions[ML.TypeName[%client.gmType], %client.curMapList] = setField(%options,7,0); + %mapObj.typeOptions[ML.TypeName[%client.gmType], %client.curMapList] = %options = setField(%options,5,1); + %mapObj.typeOptions[ML.TypeName[%client.gmType], %client.curMapList] = setField(%options,7,0); } case 8:// week select %week = getField(%options,6); @@ -9760,8 +9765,8 @@ function statsMenu(%client,%game){ %mapObj.typeOptions[ML.TypeName[%client.gmType], %client.curMapList] = setField(%options,7,0); } else{ - %mapObj.typeOptions[ML.TypeName[%client.gmType], %client.curMapList] = %options = setField(%options,7,1); - %mapObj.typeOptions[ML.TypeName[%client.gmType], %client.curMapList] = setField(%options,5, 0); + %mapObj.typeOptions[ML.TypeName[%client.gmType], %client.curMapList] = %options = setField(%options,7,1); + %mapObj.typeOptions[ML.TypeName[%client.gmType], %client.curMapList] = setField(%options,5, 0); } case 10:// Month select %month = getField(%options,8); @@ -9780,14 +9785,14 @@ function statsMenu(%client,%game){ if(%opt2){ %p = getField(%options,10) + 1; if(%p > 24){ - %p = 0; + %p = 0; } %mapObj.typeOptions[ML.TypeName[%client.gmType], %client.curMapList] = setField(%options, 10, %p); } else{ %p = getField(%options,10) - 1; if(%p < 0){ - %p = 24; + %p = 24; } %mapObj.typeOptions[ML.TypeName[%client.gmType], %client.curMapList] = setField(%options, 10, %p); } @@ -9795,14 +9800,14 @@ function statsMenu(%client,%game){ if(%opt2){ %p = getField(%options,11) + 1; if(%p > 60){ - %p = 0; + %p = 0; } %mapObj.typeOptions[ML.TypeName[%client.gmType], %client.curMapList] = setField(%options, 11, %p); } else{ %p = getField(%options,11) - 1; if(%p < 0){ - %p = 60; + %p = 60; } %mapObj.typeOptions[ML.TypeName[%client.gmType], %client.curMapList] = setField(%options, 11, %p); } @@ -9810,14 +9815,14 @@ function statsMenu(%client,%game){ if(%opt2){ %p = getField(%options,12) + 1; if(%p > 31){ - %p = 0; + %p = 0; } %mapObj.typeOptions[ML.TypeName[%client.gmType], %client.curMapList] = setField(%options, 12, %p); } else{ %p = getField(%options,12) - 1; if(%p < 0){ - %p = 31; + %p = 31; } %mapObj.typeOptions[ML.TypeName[%client.gmType], %client.curMapList] = setField(%options, 12, %p); } @@ -9825,14 +9830,14 @@ function statsMenu(%client,%game){ if(%opt2){ %p = getField(%options,13) + 1; if(%p > 12){ - %p = 1; + %p = 1; } %mapObj.typeOptions[ML.TypeName[%client.gmType], %client.curMapList] = setField(%options, 13, %p); } else{ %p = getField(%options,13) - 1; if(%p < 0){ - %p = 12; + %p = 12; } %mapObj.typeOptions[ML.TypeName[%client.gmType], %client.curMapList] = setField(%options, 13, %p); } @@ -9849,20 +9854,20 @@ function statsMenu(%client,%game){ %mapObj.typeOptions[ML.TypeName[%client.gmType], %client.curMapList] = setField(%options,15, %opt2); case 18:// year if(%opt2){ - %p = getField(%options,16) + 5; + %p = getField(%options,16) + 5; %mapObj.typeOptions[ML.TypeName[%client.gmType], %client.curMapList] = setField(%options, 16, %p); } else{ %p = getField(%options,16) - 5; if(%p < 0){ - %p = 0; + %p = 0; } %mapObj.typeOptions[ML.TypeName[%client.gmType], %client.curMapList] = setField(%options, 16, %p); } } if(%opt1 > 0){ - $dtMapRebuild = 0; + $dtMapRebuild = 0; saveMapRot(); if(ML.enable && ML.curMapList == %client.curMapList){ buildMissionList(); @@ -9872,10 +9877,10 @@ function statsMenu(%client,%game){ %client.GlArg5 = 0; %options = %mapObj.typeOptions[ML.TypeName[%client.gmType], %client.curMapList]; messageClient( %client, 'SetScoreHudHeader', "", "" @ %mapObj.name); - messageClient( %client, 'SetScoreHudSubheader', "", ' Back - Return To Score Screen',0); - + messageClient( %client, 'SetScoreHudSubheader', "", ' Back - Return To Score Screen',0); + %vote = getField(%options,1); // (getField(%options,1) == 0) ? "Enable" : "Disable"; - //messageClient( %client, 'SetLineHud', "", %tag, %index++, "Vote Only " @ %vote @ " - Removes map from rotation but can be voted on"); + //messageClient( %client, 'SetLineHud', "", %tag, %index++, "Vote Only " @ %vote @ " - Removes map from rotation but can be voted on"); switch(%vote){ case 0: messageClient( %client, 'SetLineHud', "", %tag, %index++, "Vote Option |Normal| Vote Only Rotation Only"); @@ -9884,13 +9889,13 @@ function statsMenu(%client,%game){ case 2: messageClient( %client, 'SetLineHud', "", %tag, %index++, "Vote Option Normal Vote Only |Rotation Only|"); } - + messageClient( %client, 'SetLineHud', "", %tag, %index++, "Min Players < "@ getField(%options,2) @" > - Minium number of players"); messageClient( %client, 'SetLineHud', "", %tag, %index++, "Max Players < "@ getField(%options,3) @" > - Maxium number of players"); - + messageClient( %client, 'SetLineHud', "", %tag, %index++, "--------------------------------------------Advance Settings--------------------------------------------"); - - %prio = getField(%options,4); + + %prio = getField(%options,4); switch(%prio){ case 1: messageClient( %client, 'SetLineHud', "", %tag, %index++, "Priority Level |1| 2 3 4 5 - how often a map shows up, 3 being normal"); @@ -9903,13 +9908,13 @@ function statsMenu(%client,%game){ case 5: messageClient( %client, 'SetLineHud', "", %tag, %index++, "Priority Level 1 2 3 4 |5| - how often a map shows up, 3 being normal"); } - + %week = (getField(%options,5) == 0) ? "Enable" : "Disable"; messageClient( %client, 'SetLineHud', "", %tag, %index++, "Weekly Restrictions " @ %week @ " - Contorl which day of the week a map will show up"); - + %weekDay = getField(%options,6); %wd[0] = "Sun";%wd[1] = "Mon";%wd[2] = "Tue";%wd[3] = "Wed";%wd[4] = "Thu";%wd[5] = "Fri";%wd[6] = "Sat"; - %line = ""; + %line = ""; for(%i =0; %i < 7; %i++){ %w = getSubStr(%weekDay,%i,1); if(%w){ @@ -9919,13 +9924,13 @@ function statsMenu(%client,%game){ %line = %line @ " " @ %wd[%i] @ " "; } } - + %month = (getField(%options,7) == 0) ? "Enable" : "Disable"; messageClient( %client, 'SetLineHud', "", %tag, %index++, %line); - + messageClient( %client, 'SetLineHud', "", %tag, %index++, "Monthly Restrictions "@ %month @" - Control how often a map can show up during a month"); - %mw = getField(%options,8); - %line = ""; + %mw = getField(%options,8); + %line = ""; for(%i =0; %i < 31; %i++){ %w = getSubStr(%mw,%i,1); if(%w){ @@ -9935,24 +9940,24 @@ function statsMenu(%client,%game){ %line = %line @ " " @ %i+1 @ ""; } if((%i % 7) == 6){ - messageClient( %client, 'SetLineHud', "", %tag, %index++, %line); + messageClient( %client, 'SetLineHud', "", %tag, %index++, %line); %line = ""; } } - messageClient( %client, 'SetLineHud', "", %tag, %index++, %line @ "- Note maps will only show up on these if month allows"); - + messageClient( %client, 'SetLineHud', "", %tag, %index++, %line @ "- Note maps will only show up on these if month allows"); + %event = (getField(%options,9) == 0) ? "Enable" : "Disable"; if(getField(%options,15)){ - %etype ="Set next - Force switch - "; + %etype ="Set next - Force switch - "; } else{ - %etype ="Set Next - Force switch - "; + %etype ="Set Next - Force switch - "; } - + messageClient( %client, 'SetLineHud', "", %tag, %index++, "Event Map - " @ %event @ " - " @ %etype @ " maps at set time and day "); - + messageClient( %client, 'SetLineHud', "", %tag, %index++, "Current Server Time and Date" SPC formattimestring("HH:nn d-m-yy")); - + %hour = "<" @ getField(%options,10) @ "H>"; %min = "<" @ getField(%options,11) @ "m>"; %eventTime = "Event Length <" @ getField(%options,16) @ "m>"; @@ -9966,10 +9971,10 @@ function statsMenu(%client,%game){ case "EV": %opt1 = %client.GlArg4; %opt2 = %client.GlArg5; - + messageClient( %client, 'SetScoreHudHeader', "", "Event Panel"); messageClient( %client, 'SetScoreHudSubheader', "", ' Back - Return To Score Screen',0); - + for(%i = $dtStats::eventMax; %i > 0; %i--){ %v = (%i+$dtServer::eventLogCount) % $dtStats::eventMax; %log = $dtServer::eventLog[%v]; @@ -9982,7 +9987,7 @@ function statsMenu(%client,%game){ %vLPage = %client.GlArg4; %field5 = strreplace(%client.GlArg5,"-","\t"); if(%client.lgame !$= getField(%field5,0)){ - %new = 1; + %new = 1; } %client.lgame = %switch = getField(%field5,0); %client.cat = %cat = getField(%field5,1); @@ -10011,7 +10016,7 @@ function statsMenu(%client,%game){ $dtServer::teamOneLoss[%map, %client.lgame] = 0; $dtServer::teamTwoWin[%map, %client.lgame] = 0; $dtServer::teamTwoLoss[%map, %client.lgame] = 0; - + $dtServerVars::serverCrash[%map, %client.lgame] = 0; } $dtServer::serverHangTotal = 0; @@ -10202,7 +10207,7 @@ function statsMenu(%client,%game){ "Max-Plr", "Lag", "Hitch" TAB - "T1 W/L" TAB + "T1 W/L" TAB "T2 W/L"); for(%z = (%vLPage - 1) * %perPage; %z < %vLPage * %perPage && %z < $mapID::countGame[%client.lgame]; %z++){ %map = $mapID::IDNameGame[%z+1,%client.lgame]; @@ -10214,12 +10219,12 @@ function statsMenu(%client,%game){ %mp = $dtServer::maxPlayers[%map,%client.lgame]; %cr = $dtServer::hostHangMap[%map,%client.lgame]; %sh = $dtServer::serverHangMap[%map,%client.lgame]; - + %t1w= $dtServer::teamOneWin[%map,%client.lgame]; %t1l= $dtServer::teamOneLoss[%map,%client.lgame]; %t2w= $dtServer::teamTwoWin[%map,%client.lgame]; %t2l= $dtServer::teamTwoLoss[%map,%client.lgame]; - + %v1 = %pc ? %pc : 0; %v2 = %sc ? %sc : 0; %v3 = %vc ? %vc : 0; @@ -10227,12 +10232,12 @@ function statsMenu(%client,%game){ %v5 = %mp ? %mp : 0; %v6 = %cr ? %cr : 0; %v7 = %sh ? %sh : 0; - + %v8 = %t1w ? %t1w : 0; %v9 = %t1l ? %t1l : 0; %v10 = %t2w ? %t2w : 0; %v11 = %t2l ? %t2l : 0; - + %line = '%1 %2\t%3\t%4\t%5\t%6\t%7\t%8\t%9'; messageClient( %client, 'SetLineHud', "", %tag, %index++, %line,%z+1,%map,%v1,%v2,%v3,%v4 @ " / " @ %v44,%v5,%v6,%v7 TAB %v8 @ " / " @ %v9 TAB %v10 @ " / " @ %v11); } @@ -10261,10 +10266,10 @@ function statsMenu(%client,%game){ } if(%hasCount > 0) messageClient( %client, 'SetLineHud', "", %tag, %index++, "" SPC %line); - - - - + + + + case "SZ":////////////////////////////////////////////////////////////////////////////////////////////////// %vLPage = %client.GlArg4; %field5 = strreplace(%client.GlArg5,"-","\t"); @@ -10287,8 +10292,8 @@ function statsMenu(%client,%game){ switch$(%cat){ case 1://kills for (%j = %i+1; %j < statsGroup.getCount(); %j++){ - %dtStatsJ = statsGroup.getObject(%j); - %dtStatsM = statsGroup.getObject(%maxCount); + %dtStatsJ = statsGroup.getObject(%j); + %dtStatsM = statsGroup.getObject(%maxCount); %pc1 = getGameDataAvg(%client.lgame,%dtStatsJ,"killsTG"); %pc2 = getGameDataAvg(%client.lgame,%dtStatsM,"killsTG"); if (%pc1 > %pc2) @@ -10301,7 +10306,7 @@ function statsMenu(%client,%game){ } %client.GlArg5 = %client.roll @ "-C"; } - + messageClient( %client, 'SetScoreHudHeader', "", "8 Game Averages"); %line = 'Return To Score Screen [Capper] [Offensive] [Defensive] [Base Ops]'; messageClient( %client, 'SetScoreHudSubheader', "",%line,0); @@ -10330,12 +10335,12 @@ function statsMenu(%client,%game){ %v6 = getGameDataAvg(%client.lgame,%dtStats,"killsTG"); %v7 = getGameDataAvg(%client.lgame,%dtStats,"killsTG"); %v8 = getGameDataAvg(%client.lgame,%dtStats,"killsTG"); - + if(isObject(%dtStats.client.player) && %dtStats.client.player.team == 1){ - %line = '%1\t%2\t%3\t%4\t%5\t%6\t%7\t%8\t%9'; + %line = '%1\t%2\t%3\t%4\t%5\t%6\t%7\t%8\t%9'; } else if(isObject(%dtStats.client.player) && %dtStats.client.player.team == 2){ - %line = '%1\t%2\t%3\t%4\t%5\t%6\t%7\t%8\t%9'; + %line = '%1\t%2\t%3\t%4\t%5\t%6\t%7\t%8\t%9'; } else{ %line = '%1\t%2\t%3\t%4\t%5\t%6\t%7\t%8\t%9'; @@ -10364,12 +10369,12 @@ function statsMenu(%client,%game){ %v6 = getGameDataAvg(%client.lgame,%dtStats,"killsTG"); %v7 = getGameDataAvg(%client.lgame,%dtStats,"killsTG"); %v8 = getGameDataAvg(%client.lgame,%dtStats,"killsTG"); - + if(isObject(%dtStats.client.player) && %dtStats.client.player.team == 1){ - %line = '%1\t%2\t%3\t%4\t%5\t%6\t%7\t%8\t%9'; + %line = '%1\t%2\t%3\t%4\t%5\t%6\t%7\t%8\t%9'; } else if(isObject(%dtStats.client.player) && %dtStats.client.player.team == 2){ - %line = '%1\t%2\t%3\t%4\t%5\t%6\t%7\t%8\t%9'; + %line = '%1\t%2\t%3\t%4\t%5\t%6\t%7\t%8\t%9'; } else{ %line = '%1\t%2\t%3\t%4\t%5\t%6\t%7\t%8\t%9'; @@ -10398,12 +10403,12 @@ function statsMenu(%client,%game){ %v6 = getGameDataAvg(%client.lgame,%dtStats,"killsTG"); %v7 = getGameDataAvg(%client.lgame,%dtStats,"killsTG"); %v8 = getGameDataAvg(%client.lgame,%dtStats,"killsTG"); - + if(isObject(%dtStats.client.player) && %dtStats.client.player.team == 1){ - %line = '%1\t%2\t%3\t%4\t%5\t%6\t%7\t%8\t%9'; + %line = '%1\t%2\t%3\t%4\t%5\t%6\t%7\t%8\t%9'; } else if(isObject(%dtStats.client.player) && %dtStats.client.player.team == 2){ - %line = '%1\t%2\t%3\t%4\t%5\t%6\t%7\t%8\t%9'; + %line = '%1\t%2\t%3\t%4\t%5\t%6\t%7\t%8\t%9'; } else{ %line = '%1\t%2\t%3\t%4\t%5\t%6\t%7\t%8\t%9'; @@ -10432,12 +10437,12 @@ function statsMenu(%client,%game){ %v6 = getGameDataAvg(%client.lgame,%dtStats,"killsTG"); %v7 = getGameDataAvg(%client.lgame,%dtStats,"killsTG"); %v8 = getGameDataAvg(%client.lgame,%dtStats,"killsTG"); - + if(isObject(%dtStats.client.player) && %dtStats.client.player.team == 1){ - %line = '%1\t%2\t%3\t%4\t%5\t%6\t%7\t%8\t%9'; + %line = '%1\t%2\t%3\t%4\t%5\t%6\t%7\t%8\t%9'; } else if(isObject(%dtStats.client.player) && %dtStats.client.player.team == 2){ - %line = '%1\t%2\t%3\t%4\t%5\t%6\t%7\t%8\t%9'; + %line = '%1\t%2\t%3\t%4\t%5\t%6\t%7\t%8\t%9'; } else{ %line = '%1\t%2\t%3\t%4\t%5\t%6\t%7\t%8\t%9'; @@ -10478,7 +10483,7 @@ function statsMenu(%client,%game){ if(%build $= "Build" && !$dtStatsImgBuild){ genBigStats(%client.lgame, %lType, getField(%mon,0),getField(%mon,1)); messageAll('MsgStats', '\c3Stats image build started, server performance may degrade for a few minutes~wfx/misc/hunters_greed.wav'); - $dtStatsImgBuild = 1; + $dtStatsImgBuild = 1; } } else if(!%page){ @@ -10523,7 +10528,7 @@ function statsMenu(%client,%game){ else messageClient( %client, 'SetScoreHudSubheader', "", ' Return To Score Screen \t Generate Img For %4 \t Server Admin Panel ',0,%client.lgame,1,%lType $= "month" ? monthString(%mon) : ("custom" SPC %mon) , %page, %lType); } - else + else messageClient( %client, 'SetScoreHudSubheader', "", ' Return To Score Screen',0,%game,1); @@ -10578,7 +10583,7 @@ function statsMenu(%client,%game){ } else{ %line = ' [View %6 Stats] Previous %6 | Next %6'; - messageClient( %client, 'SetLineHud', "", %tag, %index++, %line,0,%lType,%page-1,%page+1,%client.lgame,%lTypeNameShort,%vn); + messageClient( %client, 'SetLineHud', "", %tag, %index++, %line,0,%lType,%page-1,%page+1,%client.lgame,%lTypeNameShort,%vn); } } else{ @@ -10586,19 +10591,19 @@ function statsMenu(%client,%game){ messageClient( %client, 'SetLineHud', "", %tag, %index++, "" @ " [View Custom Stats]"); } else{ - messageClient( %client, 'SetLineHud', "", %tag, %index++, "" @ " [View Monthly Stats]"); + messageClient( %client, 'SetLineHud', "", %tag, %index++, "" @ " [View Monthly Stats]"); } } } else{//no data for selected game type - + if(%client.isSuperAdmin){ if($dtStatsImgBuild || $dtStats::tmCompile) messageClient( %client, 'SetScoreHudSubheader', "", ' Return To Score Screen \t Generate Img For %4 \t Server Admin Panel ',0,%client.lgame,1,monthString(%mon),%page); else messageClient( %client, 'SetScoreHudSubheader', "", ' Return To Score Screen \t Generate Img For %4 \t Server Admin Panel ',0,%client.lgame,1,monthString(%mon),%page); } - else + else messageClient( %client, 'SetScoreHudSubheader', "", ' Return To Score Screen',0,%game,1); %header = 'No data at this time, check in 24 hours'; messageClient( %client, 'SetLineHud', "", %tag, %index++, %header,%i1,%i2,%i3,%i4++,%i5,%i6,%i7); @@ -10618,7 +10623,7 @@ function statsMenu(%client,%game){ messageClient( %client, 'SetLineHud', "", %tag, %index++, "" @ " [View Custom Stats]"); } else{ - messageClient( %client, 'SetLineHud', "", %tag, %index++, "" @ " [View Monthly Stats]"); + messageClient( %client, 'SetLineHud', "", %tag, %index++, "" @ " [View Monthly Stats]"); } } case "GLBOARDS": @@ -10888,7 +10893,7 @@ function statsMenu(%client,%game){ %nameTitle2 = "" @ %var2Title SPC "" @ %i2; %nameTitle3 = "" @ %var3Title SPC "" @ %i3; messageClient( %client, 'SetLineHud', "", %tag, %index++, %line,0,0,%nameTitle1,%nameTitle2,%nameTitle3,%vsc1,%vsc2,%vsc3); - + case "LCTFGame" or "SCtFGame": //1 %var1 = "scoreTG"; %var1Title = "Score Total:"; %var1Name = "Score Total"; %var1TypeName = "Total"; @@ -12215,7 +12220,7 @@ function getTimeDayDelta(%d, %year){ function autoCompileStats(){ if(!$Host::TournamentMode){ if(!$dtStats::building){ - lStatsCycle(1, 1); + lStatsCycle(1, 1); } else{ error("Stats Already Compiling"); @@ -12225,7 +12230,7 @@ function autoCompileStats(){ function compileStats(){ if(!$dtStats::building){ - lStatsCycle(1, 1); + lStatsCycle(1, 1); } else{ error("Stats Already Compiling"); @@ -12515,8 +12520,8 @@ function sortLStats(%c,%game,%lType){ LFData.writeLine(%n); LFData.writeLine(%s); LFData.writeLine(%g); - } - + } + if(%c++ < $statsVars::count[%game]){ schedule($dtStats::sortSpeed,0,"sortLStats",%c,%game,%lType); } @@ -12901,7 +12906,7 @@ function buildTest(%mode){ function preLoadTurStats(%gameIndex){ //queue up files for processing if(!%gameIndex){ $dtGameIndex = 0; - $dtStats::tmCompile = 1; + $dtStats::tmCompile = 1; } if(%gameIndex < $dtStats::gameTypeCount){ %game = $dtStats::gameType[$dtGameIndex]; @@ -12923,7 +12928,7 @@ function preLoadTurStats(%gameIndex){ //queue up files for processing preLoadTurStats($dtGameIndex++); } } - else{ + else{ dtSaveServerVars(); compileGameImage(-1); } @@ -12936,7 +12941,7 @@ function loadTurStatsData(%file,%game,%fileNum,%total){ RootGroup.add(%fObj); %fObj.OpenForRead(%file); %guid = getField(strreplace(getField(strreplace(%file,"/","\t"),3),"g","\t"),0); - + %playerName = getField(strreplace(%fObj.readline(),"%t","\t"),1);//1 %statsOverWrite = getField(strreplace(%fObj.readline(),"%t","\t"),1);//2 %totalGames = getField(strreplace(%fObj.readline(),"%t","\t"),1);//3 @@ -12966,11 +12971,11 @@ function loadTurStatsData(%file,%game,%fileNum,%total){ break; } else{ - %gameList[%x] = -1; + %gameList[%x] = -1; } } } - + %gListCount = 0; if(%found){// only if we found a matching ID %obj = new scriptObject(); @@ -12991,10 +12996,10 @@ function loadTurStatsData(%file,%game,%fileNum,%total){ case "TG"://ttl is not used in game stats %obj.LStatsT[%var] += getField(%line,%gameList[%x]); case "Max": - if(getField(%line,%gameList[%x]) > %obj.LStatsT[%var] || %gListCount == 0) + if(getField(%line,%gameList[%x]) > %obj.LStatsT[%var] || %gListCount == 0) %obj.LStatsT[%var] = getField(%line,%gameList[%x]); case "Min": - if(getField(%line,%gameList[%x]) < %obj.LStatsT[%var] || %gListCount == 0) + if(getField(%line,%gameList[%x]) < %obj.LStatsT[%var] || %gListCount == 0) %obj.LStatsT[%var] = getField(%line,%gameList[%x]); case "Avg" or "AvgI": %temp[%var] += getField(%line,%gameList[%x]); @@ -13002,12 +13007,12 @@ function loadTurStatsData(%file,%game,%fileNum,%total){ } } else{ - %obj.LStats[%var] = setField(%obj.LStats[%var],%x, 0); + %obj.LStats[%var] = setField(%obj.LStats[%var],%x, 0); } } } } - + %fObj.close(); %fObj.delete(); if(%fileNum >= %total-1){ @@ -13030,9 +13035,9 @@ function sortTurStats(%c, %gameIndex, %game){ RootGroup.add(LFData); LFData.openForWrite("serverStats/gmData/" @ cleanMapName($dtStats::pugMap[%game, %gameIndex]) @ "-" @ %game @ "-" @ $dtStats::pugIDS[%game, %gameIndex] @ "-G.cs"); LFData.writeLine($dtStats::pugMap[%game,%gameIndex] @ "%t" @ %game @ "%t" @ $dtStats::pugIDS[%game,%gameIndex] @ "%t" @ $dtStats::pugDate[%game, %gameIndex] @ "%t" @ $dtStats::pugFS[%game,%gameIndex]); - - // build out header - %var = "scoreTG"; + + // build out header + %var = "scoreTG"; %len = serverStats.getCount(); for (%i = 0; %i < %len - 1; %i++) { for (%j = 0; %j < %len - %i - 1; %j++) { @@ -13045,22 +13050,22 @@ function sortTurStats(%c, %gameIndex, %game){ serverStats.bringToFront(%bObj); } } - } + } - %teamOneNameLine[0] = 1 TAB "name"; + %teamOneNameLine[0] = 1 TAB "name"; %teamOneDataLine[1] = 1 TAB "score"; %teamOneDataLine[2] = 1 TAB "off"; %teamOneDataLine[3] = 1 TAB "def"; %teamOneDataLine[4] = 1 TAB "kills"; %teamOneDataLine[5] = 1 TAB "caps"; - - %teamTwoNameLine[0] = 2 TAB "name"; + + %teamTwoNameLine[0] = 2 TAB "name"; %teamTwoDataLine[1] = 2 TAB "score"; %teamTwoDataLine[2] = 2 TAB "off"; %teamTwoDataLine[3] = 2 TAB "def"; %teamTwoDataLine[4] = 2 TAB "kills"; %teamTwoDataLine[5] = 2 TAB "caps"; - + for (%i = 0; %i < %len; %i++) { %sObj = serverStats.getObject(%i); %team = getField(%sObj.LStats["dtTeamGame"], %gameIndex); @@ -13087,15 +13092,15 @@ function sortTurStats(%c, %gameIndex, %game){ LFData.writeLine(strreplace(%teamOneDataLine[3],"\t","%t")); LFData.writeLine(strreplace(%teamOneDataLine[4],"\t","%t")); //LFData.writeLine(strreplace(%teamOneDataLine[5],"\t","%t")); - + LFData.writeLine(strreplace(%teamTwoNameLine[0],"\t","%t")); LFData.writeLine(strreplace(%teamTwoDataLine[1],"\t","%t")); LFData.writeLine(strreplace(%teamTwoDataLine[2],"\t","%t")); LFData.writeLine(strreplace(%teamTwoDataLine[3],"\t","%t")); LFData.writeLine(strreplace(%teamTwoDataLine[4],"\t","%t")); //LFData.writeLine(strreplace(%teamTwoDataLine[5],"\t","%t")); - } - + } + %var = $statsVars::varNameType[%c,%game]; %cat = $statsVars::varType[%var,%game]; if(%cat !$= "Game"){ @@ -13112,7 +13117,7 @@ function sortTurStats(%c, %gameIndex, %game){ serverStats.bringToFront(%bObj); } } - } + } } else{ %len = serverStats.getCount(); @@ -13127,20 +13132,20 @@ function sortTurStats(%c, %gameIndex, %game){ serverStats.bringToFront(%bObj); } } - } + } } - - %teamOneNameLine = 1 TAB "name" TAB %var; + + %teamOneNameLine = 1 TAB "name" TAB %var; %teamOneDataLine = 1 TAB "data" TAB %var; - - %teamTwoNameLine = 2 TAB "name" TAB %var; - %teamTwoDataLine = 2 TAB "data" TAB %var; - - %teamAllNameLine = 0 TAB "name" TAB %var; - %teamAllDataLine = 0 TAB "data" TAB %var; - %teamAllTeamLine = 0 TAB "team" TAB %var; - + + %teamTwoNameLine = 2 TAB "name" TAB %var; + %teamTwoDataLine = 2 TAB "data" TAB %var; + + %teamAllNameLine = 0 TAB "name" TAB %var; + %teamAllDataLine = 0 TAB "data" TAB %var; + %teamAllTeamLine = 0 TAB "team" TAB %var; + %write0 = 0; %write1 = 0; %write2 = 0; @@ -13209,10 +13214,10 @@ function sortTurStatsT(%c, %game){ LFData.openForWrite(%file); //LFData.writeLine(strreplace($dtStats::pugIDS[%game],"\t","%t")); //LFData.writeLine(strreplace($dtStats::pugMap[%game],"\t","%t")); - //LFData.writeLine(strreplace($dtStats::pugDate[%game],"\t","%t")); + //LFData.writeLine(strreplace($dtStats::pugDate[%game],"\t","%t")); //LFData.writeLine(strreplace($dtStats::pugFS[%game],"\t","%t")); - } - + } + %var = $statsVars::varNameType[%c,%game]; %cat = $statsVars::varType[%var,%game]; if(%cat !$= "Game"){ @@ -13229,10 +13234,10 @@ function sortTurStatsT(%c, %game){ serverStats.bringToFront(%bObj); } } - } + } } else{ - + %len = serverStats.getCount(); for (%i = 0; %i < %len - 1; %i++) { for (%j = 0; %j < %len - %i - 1; %j++) { @@ -13245,12 +13250,12 @@ function sortTurStatsT(%c, %game){ serverStats.bringToFront(%bObj); } } - } - } - - %teamAllNameLine = "name" TAB %var; - %teamAllDataLine = "data" TAB %var; - + } + } + + %teamAllNameLine = "name" TAB %var; + %teamAllDataLine = "data" TAB %var; + %write = 0; for (%i = 0; %i < %len; %i++) { %sObj = serverStats.getObject(%i); @@ -13286,7 +13291,7 @@ $dtStats::prefTestIdleTime = 60*1000;// if no one is playing just run slow $dtStats::prefTolerance = 128;//this number is to account for base line performance and differences between engine simTime and realtime $dtStats::prefLog = 0; // enable logging of server hangs $dtStats::eventLockout = 15*1000;//every 10 sec -$dtStats::tsLimit = 0.22; //note this value is heavly effected by packet rate so if you change this be sure to test low and high client rates +$dtStats::tsLimit = 0.22; //note this value is heavly effected by packet rate so if you change this be sure to test low and high client rates $dtStats::tsCountLimit = 8; $dtStats::tsStat = 0; function prefTest(%time,%skip){ @@ -13323,7 +13328,7 @@ function getRealFlagPos(%team){ %pos = $TeamFlag[%team].carrier.getPosition(); } else{ - %pos = $TeamFlag[%team].getPosition(); + %pos = $TeamFlag[%team].getPosition(); } return %pos; } @@ -13348,20 +13353,20 @@ function dtPingStats(){ %cl.dtStats.stat["timeNearTeamFS"] += ($dtStats::prefTestTime/1000)/60; } else{ - %cl.dtStats.stat["timeFarTeamFS"] += ($dtStats::prefTestTime/1000)/60; + %cl.dtStats.stat["timeFarTeamFS"] += ($dtStats::prefTestTime/1000)/60; } - + %feDist = vectorDist(%fePos,getWords(%tform,0,2)); if(%fDist < 50){ %cl.dtStats.stat["timeNearEnemyFS"] += ($dtStats::prefTestTime/1000)/60; } else{ - %cl.dtStats.stat["timeFarEnemyFS"] += ($dtStats::prefTestTime/1000)/60; + %cl.dtStats.stat["timeFarEnemyFS"] += ($dtStats::prefTestTime/1000)/60; } %rfpos = getRealFlagPos(%cl.team); %oTeam = (%cl.team == 1) ? 2 : 1; %rfEPos = getRealFlagPos(%oTeam); - + if(vectorDist(%rfpos, getWords(%tform,0,2)) < 50){ %cl.dtStats.stat["timeNearFlag"] += ($dtStats::prefTestTime/1000)/60; } @@ -13423,7 +13428,7 @@ function dtPingStats(){ %speed = vectorLen(%vel); %iVel = VectorLen(%player.dtLV) / %factor; %fVel = %speed / %factor; - + %player.vdot[%player.vdotCount++ % 3] = VectorDot(VectorNormalize(%vel), VectorNormalize(%player.lastVelocity)); %dotTotal = (%player.vdotCount > 3) ? ((%player.vdot[0] + %player.vdot[1] + %player.vdot[2])/3) : 0; if (%speed > 6 && %iVel > 0.01 && %fVel > 0.01 && %deltaP > 0.01 && %dotTotal > 0.9){ @@ -13431,32 +13436,32 @@ function dtPingStats(){ %least2 = mAbs(%fVel - %deltaP); %least = (%least2 < %least) ? %least2 : %least; %distortion = (%least / %deltaP); - + %client.tsDistortion = %distortion; - + if(%distortion < 1){// clamp it so random large values dont mess things up %client.dstTotal += %distortion; %client.dstCount++; %client.dstAvg = %client.dstTotal / %client.dstCount; - + if(%client.dstCount > 30){// limit sample size - %client.dstTotal *= (1 - 0.3); - %client.dstCount *= (1 - 0.3); + %client.dstTotal *= (1 - 0.3); + %client.dstCount *= (1 - 0.3); } - - if( %client.dstAvg > $tsLimit && %client.dstCount > 15){ + + if( %client.dstAvg > $tsLimit && %client.dstCount > 15){ %client.dstHighAvg++; } - + if(%distortion > $dtStats::tsLimit){ if(%client.distortionCount < $dtStats::tsCountLimit){ - %client.distortionCount++; + %client.distortionCount++; } - if(%client.distortionCount >= $tsCountLimit){ + if(%client.distortionCount >= $tsCountLimit){ %client.tsc++; } } else if(%distortion < $tsLimit && %client.distortionCount > 0) - %client.distortionCount--; + %client.distortionCount--; } } } @@ -13526,7 +13531,7 @@ function dtPingStats(){ } $dtStats::eventMax = 32; function dtEventLog(%log,%save){ - + if(%count >= $dtStats::eventMax){ $dtServer::eventLogCount = 0; } @@ -13630,20 +13635,20 @@ function dtLoadServerVars(){// keep function at the bottom if(isFile("serverStats/teamWL.cs")) exec("serverStats/teamWL.cs"); if(isFile("serverStats/capTimes.cs") && $dtStats::ctfTimes) - exec("serverStats/capTimes.cs"); + exec("serverStats/capTimes.cs"); if(isFile("serverStats/mapPlayRot.cs")) - exec("serverStats/mapPlayRot.cs"); + exec("serverStats/mapPlayRot.cs"); if(isFile("serverStats/pugLog.cs")) exec("serverStats/pugLog.cs"); if(isFile("serverStats/pubLog.cs")) - exec("serverStats/pubLog.cs"); + exec("serverStats/pubLog.cs"); if(isFile("serverStats/tbVars.cs")) - exec("serverStats/tbVars.cs"); + exec("serverStats/tbVars.cs"); $dtServer::eventLogCount = 0; if(isFile("serverStats/eventLog.cs")) exec("serverStats/eventLog.cs"); - - + + dtEventLog("Server Start" SPC formattimestring("hh:nn:a mm-dd-yy"), 0); @@ -13673,7 +13678,7 @@ function savePrx(){ $DemoFile = %file; pathMapData.OpenForWrite(%file); writePrx(0); - + } function writePrx(%x){ $pathMaps::saving = 1; @@ -13729,7 +13734,7 @@ function pathDataPoint(%client){ } } else{ - stopPlayerPlot(); + stopPlayerPlot(); } } @@ -13741,12 +13746,12 @@ function scanHeightMap(){ for(%x = -512; %x < 512; %x++){ %xO = %x * 2; %rayStart = %xO SPC %yO SPC 5000; // +5000 - %rayEnd = %xO SPC %yO SPC -5000; //- 5000 for 45 + %rayEnd = %xO SPC %yO SPC -5000; //- 5000 for 45 %ground = ContainerRayCast(%rayStart, %rayEnd, %mask, 0); if(%ground){ %pos = getWords(%ground, 1, 3); %depth = 5000 - vectorDist(%rayStart,%pos);// getTerrainHeight(%x SPC %y SPC 0); - $depth::min = $depthMin = ($depthMin < %depth) ? $depthMin : %depth; // find are min and max elevation + $depth::min = $depthMin = ($depthMin < %depth) ? $depthMin : %depth; // find are min and max elevation $depth::max = $depthMax = ($depthMax > %depth) ? $depthMax : %depth; $depth::array[%x,%y] = %depth; } @@ -13781,7 +13786,7 @@ function pathMapSave(%x){ // save for (%y = -512; %y < 512; %y++){ %depth =$depth::array[%x,%y]; %col = mFloor((%depth - $depth::min) * %colRange); - %color = %col SPC %col SPC %col; + %color = %col SPC %col SPC %col; pathFileObj.writeLine(%color @ "\n"); } if($pathMaps::debugEcho){error("pathMapSave" SPC %x SPC "out of" SPC 128);} @@ -13790,7 +13795,7 @@ function pathMapSave(%x){ // save } else{ pathFileObj.close(); - pathFileObj.delete(); + pathFileObj.delete(); $pathMaps::SaveStart = 0; error("Finished Path Map"); if($pm::buildCount++ <= $pm::count){ @@ -13822,7 +13827,7 @@ function loadDTBanlist(){ exec($dtStats::BanListFile); if(isObject(dtBanList)){ RootGroup.add(dtBanList); - for (%i = 0; %i < dtBanList.getCount(); %i++){//keeps less junk in the ban file + for (%i = 0; %i < dtBanList.getCount(); %i++){//keeps less junk in the ban file %obj = dtBanList.getObject(%i); %delta = getTimeDelta(%obj.banDateTime); if (%delta > %obj.banLengthMin){ @@ -13833,12 +13838,12 @@ function loadDTBanlist(){ if(%obj.guid !$= "") $dtBanTemp::GUID[%obj.guid ] = %obj; if(%obj.ip !$= "") - $dtBanTemp::IP[%obj.ip] = %obj; + $dtBanTemp::IP[%obj.ip] = %obj; } } } } - + if(isFile($dtStats::WhtListFile)){ $dtWhtList:WLCount = 0; exec($dtStats::WhtListFile); @@ -13847,10 +13852,10 @@ function loadDTBanlist(){ for (%i = 0; %i < serverSafeList.getCount(); %i++){ %obj = serverSafeList.getObject(%index); $dtWhtList::WhiteList[%obj.guid] = %obj; - } + } } } - + loadIPListM(); } } @@ -13864,7 +13869,7 @@ function loadIPListM(){ RootGroup.add(%file); %file.OpenForRead($dtStats::IPBanListFile); schedule(10000, 0,"loadIPBanList",%file); - } + } } function loadIPBanList(%file){ %i = 0; @@ -13873,8 +13878,8 @@ function loadIPBanList(%file){ while( !%file.isEOF() && %i++ < 1000 && !$ipcountLimit){ %line = %file.readline(); if(strLen(%line) > 7){ - if(strstr(%line, "/") != -1){ - %real = getRealTime(); + if(strstr(%line, "/") != -1){ + %real = getRealTime(); %amount = getCIDRRange(trim(%line)); } else{ @@ -13882,7 +13887,7 @@ function loadIPBanList(%file){ $dtIPList[%ip] = 1; $ipcount++; if($ipcount > 2000000){ - $ipcountLimit =1; + $ipcountLimit =1; } } } @@ -13892,7 +13897,7 @@ function loadIPBanList(%file){ } else{ %file.close(); - %file.delete(); + %file.delete(); } } function getCIDRRange(%ip) { @@ -13905,9 +13910,9 @@ function getCIDRRange(%ip) { } // Convert IP address to integer %ipArray = strreplace(%ip, ".", "\t"); - - %binIP = decToBin2(getField(%ipArray,0)) @ decToBin2(getField(%ipArray,1)) @ decToBin2(getField(%ipArray,2)) @ decToBin2(getField(%ipArray,3)); - %h = getSubStr(%binIP, 0, %ipMask) @ %host; + + %binIP = decToBin2(getField(%ipArray,0)) @ decToBin2(getField(%ipArray,1)) @ decToBin2(getField(%ipArray,2)) @ decToBin2(getField(%ipArray,3)); + %h = getSubStr(%binIP, 0, %ipMask) @ %host; %b = getSubStr(%binIP, 0, %ipMask) @ %broad; %start = binToDec2(getSubStr(%h,0,8)) TAB binToDec2(getSubStr(%h,8,8)) TAB binToDec2(getSubStr(%h,16,8)) TAB binToDec2(getSubStr(%h,24,8)); %end = binToDec2(getSubStr(%b,0,8)) TAB binToDec2(getSubStr(%b,8,8)) TAB binToDec2(getSubStr(%b,16,8)) TAB binToDec2(getSubStr(%b,24,8)); @@ -13931,16 +13936,16 @@ function getCIDRRange(%ip) { for (%l = getField(%start,3); %l <= getField(%end,3); %l++) { %currentIP = %i @ "_" @ %j @ "_" @ %k @ "_" @ %l; $dtIPList[%currentIP] = 1; - $ipcount++; + $ipcount++; %ipcount++; if($ipcount > 2000000){ - $ipcountLimit = 1; + $ipcountLimit = 1; } } } } } - return %ipcount; + return %ipcount; } function decToBin2(%dec){ @@ -13975,7 +13980,7 @@ package dtBanSys{ //Reapply the gag function GameConnection::onConnect( %client, %name, %raceGender, %skin, %voice, %voicePitch ){ parent::onConnect( %client, %name, %raceGender, %skin, %voice, %voicePitch ); - + %client.isGagged = ($chatGagged[getClientCleanIP(%client)] || $chatGagged[%client.guid]); //restore status } @@ -13997,7 +14002,7 @@ package dtBanSys{ banDateTime = dtMarkDate(); banLengthMin = %time; }; - dtBanList.add(%banObj); + dtBanList.add(%banObj); if(!%bareIP) $dtBanTemp::IP[%bareIP] = %banObj; if(%guid){ @@ -14013,7 +14018,7 @@ package dtBanSys{ %obj = $dtBanTemp::GUID[%bareIP]; %obj.guid = %guid; } - + saveBanList(); } @@ -14023,7 +14028,7 @@ package dtBanSys{ if(isObject(%obj) && %obj.banDateTime > 0){ %delta = getTimeDelta(%obj.banDateTime); if (%delta < %obj.banLengthMin){ - pushFailJoin(%obj.name, %obj.gui, 0, "Kick/Ban" SPC %obj.banDateTime - %delta SPC "Minutes Left", 1); + pushFailJoin(%obj.name, %obj.gui, 0, "Kick/Ban" SPC %obj.banDateTime - %delta SPC "Minutes Left", 1); return 1; } else{ @@ -14056,14 +14061,14 @@ package dtBanSys{ function dtIsAdmin(%client,%guid){ - %totalRecords = getFieldCount( $Host::AdminList ); + %totalRecords = getFieldCount( $Host::AdminList ); for(%i = 0; %i < %totalRecords; %i++) { %record = getField( getRecord( $Host::AdminList, 0 ), %i); if(%record == %guid) return true; } - + %totalRecords = getFieldCount( $Host::superAdminList ); for(%i = 0; %i < %totalRecords; %i++) { @@ -14071,35 +14076,35 @@ function dtIsAdmin(%client,%guid){ if(%record == %guid) return true; } - + return false; } -function banList_checkClientGUID(%client, %guid){// only one we care about in whitelist mode +function banList_checkClientGUID(%client, %guid){// only one we care about in whitelist mode %obj = $dtBanTemp::GUID[%guid]; if (isObject(%obj) && %obj.banDateTime > 0){ %delta = getTimeDelta(%obj.banDateTime); if (%delta < %obj.banLengthMin){ pushFailJoin(%obj.name, %guid, 0, "Kick/Ban" SPC %obj.banLengthMin - %delta SPC "Minutes Left",1); - + %client.setDisconnectReason("You are not allowed to play on this server."); %client.delete(); return 1; } else{ - unbanUserObj(%obj); + unbanUserObj(%obj); } } - + %realName = getField(%client.t2csri_authInfo, 0 ); if(%realName !$= "") %name = trim(%realName); else %name = trim(stripChars( detag( getTaggedString( %fc.name ) ), "\cp\co\c6\c7\c8\c9\c0" )); - %safe = ( dtIsAdmin(%client,%guid) || isObject($dtWhtList::WhiteList[%guid])); + %safe = ( dtIsAdmin(%client,%guid) || isObject($dtWhtList::WhiteList[%guid])); if(!%safe){ pushFailJoin(%name, %guid, 0, "Not Whitelisted", 0); if($dtServerVars::WhiteListMode){ @@ -14108,32 +14113,32 @@ function banList_checkClientGUID(%client, %guid){// only one we care about in wh return 1; } } - - %ip = getClientCleanIP(%client);// this is here in case of banned ip is a whitelisted account + + %ip = getClientCleanIP(%client);// this is here in case of banned ip is a whitelisted account if($dtServerVars::IPBanListMode && $dtIPList[%ip] && !isObject($dtWhtList::WhiteList[%guid])){ pushFailJoin(%name, %client.guid, %ip, "IP Ban List", 2); %client.setDisconnectReason("You are not allowed to play on this server."); %client.delete(); - return 1; + return 1; } return 0; } -function pushFailJoin(%name, %guid, %ip, %reason, %type){// rolling buffer +function pushFailJoin(%name, %guid, %ip, %reason, %type){// rolling buffer if(%guid && ! $dtJoinListGuid[%guid]){ - if($dtJoinListCount < $dtStats::joinHist){// limit the list size + if($dtJoinListCount < $dtStats::joinHist){// limit the list size if($dtJoinListCount > 0){ for (%i = $dtJoinListCount - 1; %i >= 0; %i--) { - $dtJoinList[%i + 1] = $dtJoinList[%i]; + $dtJoinList[%i + 1] = $dtJoinList[%i]; } } $dtJoinListGuid[%guid] = 1; $dtJoinList[0] = %name TAB %guid TAB %ip TAB %reason TAB %type; - $dtJoinListCount++; + $dtJoinListCount++; } else{ for (%i = $dtJoinListCount - 1; %i >= 0; %i--) { - $dtJoinList[%i + 1] = $dtJoinList[%i]; + $dtJoinList[%i + 1] = $dtJoinList[%i]; } $dtJoinListGuid[getField($dtJoinList[$dtJoinListCount],1)] = "";// clear out the last one $dtJoinList[0] = %name TAB %guid TAB %ip TAB %reason TAB %type; @@ -14149,8 +14154,8 @@ function pushWhiteList(%guid,%name){ } if(!$dtWhtList::WhiteList[%guid]){ if(%name $= "") - %name = "NONAME" @ %guid; - + %name = "NONAME" @ %guid; + %id = new scriptObject(){ name = %name; guid = %guid; @@ -14165,7 +14170,7 @@ function rmvWhiteListGuid(%guid){ %obj = $dtWhtList::WhiteList[%guid]; if(isObject(%obj)){ error("Player" SPC %obj.name SPC %obj.guid SPC "Removed"); - $dtWhtList::WhiteList[%guid] = ""; + $dtWhtList::WhiteList[%guid] = ""; %obj.delete(); saveWhtList(); } @@ -14183,7 +14188,7 @@ function rmvWhiteListIndex(%index){ function unbanUserObj(%obj){ if(isObject(%obj)){ $dtBanTemp::IP[%obj.ip] = ""; - $dtBanTemp::GUID[%obj.guid] = ""; + $dtBanTemp::GUID[%obj.guid] = ""; error(%obj.name SPC %obj.guid SPC "UNBANNED"); %obj.delete(); saveBanList(); @@ -14192,7 +14197,7 @@ function unbanUserObj(%obj){ function unbanIndex(%index){ if(!%index){ - for (%i = 0; %i < dtBanList.getCount(); %i++){//keeps less junk in the ban file + for (%i = 0; %i < dtBanList.getCount(); %i++){//keeps less junk in the ban file %obj = dtBanList.getObject(%i); error(%i SPC %obj.name SPC %obj.guid SPC strReplace(%obj.ip, "_", ".")); } @@ -14202,7 +14207,7 @@ function unbanIndex(%index){ %obj = dtBanList.getObject(%index); if(isObject(%obj)){ $dtBanTemp::IP[%obj.ip] = ""; - $dtBanTemp::GUID[%obj.guid] = ""; + $dtBanTemp::GUID[%obj.guid] = ""; error(%obj.name SPC %obj.guid SPC "UNBANNED"); %obj.delete(); saveBanList(); @@ -14231,21 +14236,21 @@ function getClientBanName(%guid, %ip){ } return "NONAME"; } - + function getClientCleanIP(%client){// variable access bug workaround %ip = %client.getAddress(); %ip = getSubStr(%ip, 3, strLen(%ip)); %ip = getSubStr(%ip, 0, strstr(%ip, ":")); - %ip = strReplace(%ip, ".", "_"); - return %ip; + %ip = strReplace(%ip, ".", "_"); + return %ip; } function getCleanIP(%ip){ // variable access bug workaround if (getSubStr(%ip, 0, 3) $= "IP:"){ %ip = getSubStr(%ip, 3, strLen(%ip)); %ip = getSubStr(%ip, 0, strstr(%ip, ":")); - %ip = strReplace(%ip, ".", "_"); - return %ip; + %ip = strReplace(%ip, ".", "_"); + return %ip; } return 0; } @@ -14254,26 +14259,26 @@ function getTimeDelta(%dateTime){ //banDateTime = "05\t01\t2024\t13\t00"; %d = getWord(%dateTime,0); %m = getWord(%dateTime,1); %y = getWord(%dateTime,2); %h = getWord(%dateTime,3); %n = getWord(%dateTime,4); - - %curDD = formattimestring("dd");%curMM = formattimestring("mm");%curYY = formattimestring("yy"); + + %curDD = formattimestring("dd");%curMM = formattimestring("mm");%curYY = formattimestring("yy"); %dcA = %dcB = 0; - + %days[2] = (%y % 4 == 0) ? "29" : "28"; - %days[1] = "31";%days[3] = "31"; %days[4] = "30"; - %days[5] = "31"; %days[6] = "30"; %days[7] = "31"; - %days[8] = "31"; %days[9] = "30"; %days[10] = "31"; + %days[1] = "31";%days[3] = "31"; %days[4] = "30"; + %days[5] = "31"; %days[6] = "30"; %days[7] = "31"; + %days[8] = "31"; %days[9] = "30"; %days[10] = "31"; %days[11] = "30"; %days[12] = "31"; - + for(%i = 1; %i <= %m-1; %i++){ %dcA += %days[%i]; - } - + } + %dcA += %d; - + %days[2] = (%curYY % 4 == 0) ? "29" : "28"; for(%i = 1; %i <= %curMM-1; %i++){ %dcB += %days[%i]; - } + } %dcB += %curDD; %dif = formattimestring("yy") - %y; @@ -14321,7 +14326,7 @@ function banSaveExport(%file){ } %fobj.writeLine("};"); %fobj.close(); - %fobj.delete(); + %fobj.delete(); } function saveWhtList(){ @@ -14347,11 +14352,11 @@ function buildServerGuidList(){ %guid = getField(strreplace(getField(strreplace(%file,"/","\t"),3),"t","\t"),0); if(getFieldCount($dtBanTemp::GUID[%guid]) > 0)// skip banned clients continue; - + %fobj.openForRead(%file); %fobj.readline(); //skip %gameCount = strreplace(%fobj.readline(),"%t","\t"); - + %d0 = getField(%gameCount,1);%d1 = getField(%gameCount,2); %d = (%d0 > %d1) ? %d0 : %d1; %w0 = getField(%gameCount,3);%w1 = getField(%gameCount,4); @@ -14360,12 +14365,12 @@ function buildServerGuidList(){ %m = (%m0 > %m1) ? %m0 : %m1; %q0 = getField(%gameCount,7);%q1 = getField(%gameCount,8); %q = (%q0 > %q1) ? %q0 : %q1; - %y0 = getField(%gameCount,9);%y1 = getField(%gameCount,10); - %y = (%y0 > %y1) ? %y0 : %y1; - + %y0 = getField(%gameCount,9);%y1 = getField(%gameCount,10); + %y = (%y0 > %y1) ? %y0 : %y1; + if(getFieldCount($guidInfo[%guid]) == 6){ if(getField($guidInfo[%guid],5) < %y){// update if this info is better - $guidInfo[%guid] = %name TAB %d TAB %w TAB %m TAB %q TAB %y; + $guidInfo[%guid] = %name TAB %d TAB %w TAB %m TAB %q TAB %y; } } else{ @@ -14373,16 +14378,16 @@ function buildServerGuidList(){ %td += %d; %tw += %w; %tm += %m; %tq += %q; %ty += %y; %name = getField(strreplace(%fobj.readline(),"%t","\t"),1); $guidInfo[%guid] = %name TAB %d TAB %w TAB %m TAB %q TAB %y; - $guidList[$guidListCount]= %guid; $guidListCount++; + $guidList[$guidListCount]= %guid; $guidListCount++; $guidAvgs = mFloor(%td/$guidListCount) TAB mFloor(%tw/$guidListCount) TAB mFloor(%tm/$guidListCount) TAB mFloor(%tq/$guidListCount) TAB mFloor(%ty/$guidListCount); - } + } } %fobj.close(); - } + } } } %fobj.delete(); -} +} if (!isActivePackage(dtBanSys)){ @@ -14400,14 +14405,14 @@ if (!isActivePackage(dtBanSys)){ function genFakeWhiteList(%amount){ deleteVariables("$dtWhtList::WhiteList*"); serverSafeList.delete(); - for (%i = 0; %i < %amount; %i++){ + for (%i = 0; %i < %amount; %i++){ pushWhiteList(20056 + %i, "ThisIsALongName" @ %i); } -} +} function genFakeBanList(%amount){ dtBanList.delete(); - for (%i = 0; %i < %amount; %i++){ + for (%i = 0; %i < %amount; %i++){ BanList::add(20056 + %i, "IP:192.168.0." @ %i @":28000", getRandom(10,500)); } } @@ -14415,7 +14420,7 @@ function genFakeBanList(%amount){ //function genFakeJoinList(%amount){ //deleteVariables("$dtJoinList*"); //$dtJoinListCount = 0; - //for (%i = 0; %i < %amount; %i++){ + //for (%i = 0; %i < %amount; %i++){ //pushFailJoin("ThisIsALongName" @ %i, 2005+%i, 0, "Test Message",getRandom(0,2)); //} //} @@ -14425,13 +14430,13 @@ function banList_bareIP(%ip){ %ip = strReplace(%ip, ".", "_"); if($dtIPList[%ip]){ pushFailJoin(%name, %client.guid, %ip, "IP Ban List", 2); - return 2; + return 2; } %obj = $dtBanTemp::IP[%ip]; if(isObject(%obj) && %obj.banDateTime > 0){ %delta = getTimeDelta(%obj.banDateTime); if (%delta < %obj.banLengthMin){ - pushFailJoin(%obj.name, %obj.gui, 0, "Kick/Ban" SPC %obj.banDateTime - %delta SPC "Minutes Left", 1); + pushFailJoin(%obj.name, %obj.gui, 0, "Kick/Ban" SPC %obj.banDateTime - %delta SPC "Minutes Left", 1); return 1; } else{ @@ -16346,12 +16351,12 @@ $fontInfo["remapTable","T2",32] = "-1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -// 0 1 2 3 4 5 6 +// 0 1 2 3 4 5 6 //xOffset yOffset width height xOrigin yOrigin xIncrement -//glyph font type rendering +//glyph font type rendering function addGLText(%text, %sX, %sY, %color, %type, %size, %clipLimit) { if ($fontInfo["fontHeight",%type,%size] > 0){ - %line = %sY;// are line postion + %line = %sY;// are line postion %cc = strCmp(".",""); %rm = getWord($fontInfo["remapTable",%type,%size],strCmp(".","")); %pinfo =$fontInfo["charInfoList",%type,%size,%rm]; @@ -16364,7 +16369,7 @@ function addGLText(%text, %sX, %sY, %color, %type, %size, %clipLimit) { %charInfo = $fontInfo["charInfoList",%type,%size,%charIndex]; %sY = ($fontInfo["baseLine",%type,%size] - getWord(%charInfo,5)) + %line; %sX += getWord(%charInfo,4); - //if (sX > this.width) // we have hit the end of are image + //if (sX > this.width) // we have hit the end of are image // return 0; %ln += getWord(%charInfo,6) - getWord(%charInfo,4); if (%ln < %clipLimit) { @@ -16373,7 +16378,7 @@ function addGLText(%text, %sX, %sY, %color, %type, %size, %clipLimit) { %pixel = getWord($fontInfo["bitmap",%type,%size,%y + getWord(%charInfo,1)],%x + getWord(%charInfo,0)); if (%pixel > 0) { $textColor[(%sX + %x),(%sY + %y)] = %pixel SPC %color; - } + } else { $textColor[(%sX + %x),(%sY + %y)] = "0 0 0 0"; } @@ -16381,7 +16386,7 @@ function addGLText(%text, %sX, %sY, %color, %type, %size, %clipLimit) { } %sX += getWord(%charInfo,6) - getWord(%charInfo,4); } - else {// adds .. becuase of clip limit + else {// adds .. becuase of clip limit for (%z = 0; %z < 2; %z++) { %sY = ($fontInfo["baseLine",%type,%size] - getWord(%pinfo,5)) + %line; %sX += getWord(%pinfo,4); @@ -16390,7 +16395,7 @@ function addGLText(%text, %sX, %sY, %color, %type, %size, %clipLimit) { %pixel = getWord($fontInfo["bitmap",%type,%size,%y + getWord(%pinfo,1)],%x + getWord(%pinfo,0)); if (%pixel > 0) { $textColor[(%sX + %x),(%sY + %y)] = %pixel SPC %color; - } + } else { $textColor[(%sX + %x),(%sY + %y)] = "0 0 0 0"; } @@ -16417,14 +16422,14 @@ function getTextPosPixels(%text, %sX, %sY, %type, %size) { %charInfo = $fontInfo["charInfoList",%type,%size,%charIndex]; %sY = ($fontInfo["baseLine",%type,%size] - getWord(%charInfo,5)) + %line; %sX += getWord(%charInfo,4); - //if (sX > this.width) // we have hit the end of are image + //if (sX > this.width) // we have hit the end of are image // return 0; %ln += getWord(%charInfo,6) - getWord(%charInfo,4); %sX += getWord(%charInfo,6) - getWord(%charInfo,4); %length += getWord(%charInfo,6) - getWord(%charInfo,4); } } - return %sX TAB %length; + return %sX TAB %length; } } @@ -16458,15 +16463,15 @@ function genBigStats(%game, %lType, %mon, %year){ %mainySize = 1115; %leftmargin = 4; if(%lType $= "month"){ - %header = "Monthly Stats For" SPC monthString(%mon) SPC %year SPC "-" SPC $dtStats::gtNameLong[%game]; + %header = "Monthly Stats For" SPC monthString(%mon) SPC %year SPC "-" SPC $dtStats::gtNameLong[%game]; } else if(%lType $= "custom"){ - %header = $dtStats::gtNameLong[%game] SPC "Stats" SPC %mon; + %header = $dtStats::gtNameLong[%game] SPC "Stats" SPC %mon; } %hsize = getTextLengthInPixels(%header, "RC", 30);//30 schedule(%callTime * %callCount++,0,"addGLText",%header, mFloor(%mainXSize / 2) - mFloor(%hsize / 2), 50, "11 239 231", "RC", 30, 500);//30 - %gameOutput = %game;// in case its renamed we stil want the output file to have the gametype - if($smallPanel[0,%game] $= ""){// if we have no data for this gametype switch to are default list + %gameOutput = %game;// in case its renamed we stil want the output file to have the gametype + if($smallPanel[0,%game] $= ""){// if we have no data for this gametype switch to are default list %game = "DefaultGame"; } //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// @@ -16556,13 +16561,13 @@ function genBigStats(%game, %lType, %mon, %year){ schedule(%callTime * %callCount++,0,"addGLText","Accuracy", (%tabspace * 1) + %xOffset, ((%vertSpace * (%i + 1)) + %yOffset) + (%y * %gridYOffset), "11 239 231", "RC", 15, 500); schedule(%callTime * %callCount++,0,"addGLText","Wep Combo", (%tabspace * 2) + %xOffset, ((%vertSpace * (%i + 1)) + %yOffset) + (%y * %gridYOffset), "11 239 231", "RC", 15, 500); schedule(%callTime * %callCount++,0,"addGLText","Speed", (%tabspace * 3) + %xOffset, ((%vertSpace * (%i + 1)) + %yOffset) + (%y * %gridYOffset), "11 239 231", "RC", 15, 500); - schedule(%callTime * %callCount++,0,"addGLText","Damage", (%tabspace * 4) + %xOffset, ((%vertSpace * (%i + 1)) + %yOffset) + (%y * %gridYOffset), "11 239 231", "RC", 15, 500); + schedule(%callTime * %callCount++,0,"addGLText","Damage", (%tabspace * 4) + %xOffset, ((%vertSpace * (%i + 1)) + %yOffset) + (%y * %gridYOffset), "11 239 231", "RC", 15, 500); %weapons = "Blaster\tPlasma Rifle\tSpinfusor\tGrenade Launcher\tMortar\tShocklance\tMine\tHand Grenade"; - } + } - %wepLn = mFloor($wepGridCount[%game] / 4) + 1; + %wepLn = mFloor($wepGridCount[%game] / 4) + 1; %wepCount = %i + %wepLn; %w = -1; %r = -1; @@ -16570,16 +16575,16 @@ function genBigStats(%game, %lType, %mon, %year){ for (%i = %i + 1; %i < %wepCount; %i++) { %varname = $wepGrid[%r++,%game]; %nameData1 = $lData::name[%varname,%gameOutput,%lType,%mon,%year]; - + %varname = $wepGrid[%r++,%game]; %nameData2 = $lData::name[%varname,%gameOutput,%lType,%mon,%year]; - + %varname = $wepGrid[%r++,%game]; %nameData3 = $lData::name[%varname,%gameOutput,%lType,%mon,%year]; - + %varname = $wepGrid[%r++,%game]; %nameData4 = $lData::name[%varname,%gameOutput,%lType,%mon,%year]; - + schedule(%callTime * %callCount++,0,"addGLText",getField(%weapons, %w++), %xOffset, ((%vertSpace * (%i + 1)) + %yOffset) + (%y * %gridYOffset), "11 239 231", "RC", 15, %maxNameSize); schedule(%callTime * %callCount++,0,"addGLText",getField(%nameData1, 0), (%tabspace * 1) + %xOffset, ((%vertSpace * (%i + 1)) + %yOffset) + (%y * %gridYOffset), "3 213 151", "RC", 15, %maxNameSize); schedule(%callTime * %callCount++,0,"addGLText",getField(%nameData2, 0), (%tabspace * 2) + %xOffset, ((%vertSpace * (%i + 1)) + %yOffset) + (%y * %gridYOffset), "3 213 151", "RC", 15, %maxNameSize); @@ -16641,8 +16646,8 @@ function genBigStats(%game, %lType, %mon, %year){ } } - } - schedule(%callTime * %callCount++, 0, "dumpImg",%gameOutput @ "-" @ %lType @ "-" @ %mon @ "-" @ %year); + } + schedule(%callTime * %callCount++, 0, "dumpImg",%gameOutput @ "-" @ %lType @ "-" @ %mon @ "-" @ %year); } function dumpImg(%name){ @@ -16669,9 +16674,9 @@ function genBigMapStats(%count){ genMapStatsImg(%game, %count); } else{ - genBigMapStats(%count++); + genBigMapStats(%count++); } - } + } else{ $dtStats::tmCompile = 0; error("map stats compile done"); @@ -16689,11 +16694,11 @@ function genMapStatsImg(%game,%count){ %mainXSize =1860; %mainySize = 1115; %leftmargin = 4; - %header = "Map Stats For" SPC $dtStats::pugDate[%game, 0] SPC "-" SPC $dtStats::gtNameLong[%game]; + %header = "Map Stats For" SPC $dtStats::pugDate[%game, 0] SPC "-" SPC $dtStats::gtNameLong[%game]; %hsize = getTextLengthInPixels(%header, "RC", 30);//30 schedule(%callTime * %callCount++,0,"addGLText",%header, mFloor(%mainXSize / 2) - mFloor(%hsize / 2), 50, "11 239 231", "RC", 30, 500);//30 - %gameOutput = %game;// in case its renamed we stil want the output file to have the gametype - if($smallPanel[0,%game] $= ""){// if we have no data for this gametype switch to are default list + %gameOutput = %game;// in case its renamed we stil want the output file to have the gametype + if($smallPanel[0,%game] $= ""){// if we have no data for this gametype switch to are default list %game = "DefaultGame"; } //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// @@ -16783,13 +16788,13 @@ function genMapStatsImg(%game,%count){ schedule(%callTime * %callCount++,0,"addGLText","Accuracy", (%tabspace * 1) + %xOffset, ((%vertSpace * (%i + 1)) + %yOffset) + (%y * %gridYOffset), "11 239 231", "RC", 15, 500); schedule(%callTime * %callCount++,0,"addGLText","Wep Combo", (%tabspace * 2) + %xOffset, ((%vertSpace * (%i + 1)) + %yOffset) + (%y * %gridYOffset), "11 239 231", "RC", 15, 500); schedule(%callTime * %callCount++,0,"addGLText","Speed", (%tabspace * 3) + %xOffset, ((%vertSpace * (%i + 1)) + %yOffset) + (%y * %gridYOffset), "11 239 231", "RC", 15, 500); - schedule(%callTime * %callCount++,0,"addGLText","Damage", (%tabspace * 4) + %xOffset, ((%vertSpace * (%i + 1)) + %yOffset) + (%y * %gridYOffset), "11 239 231", "RC", 15, 500); + schedule(%callTime * %callCount++,0,"addGLText","Damage", (%tabspace * 4) + %xOffset, ((%vertSpace * (%i + 1)) + %yOffset) + (%y * %gridYOffset), "11 239 231", "RC", 15, 500); %weapons = "Blaster\tPlasma Rifle\tSpinfusor\tGrenade Launcher\tMortar\tShocklance\tMine\tHand Grenade"; - } + } - %wepLn = mFloor($wepGridCount[%game] / 4) + 1; + %wepLn = mFloor($wepGridCount[%game] / 4) + 1; %wepCount = %i + %wepLn; %w = -1; %r = -1; @@ -16797,16 +16802,16 @@ function genMapStatsImg(%game,%count){ for (%i = %i + 1; %i < %wepCount; %i++) { %varname = $wepGrid[%r++,%game]; %nameData1 = $gData::name[%varname,%gameOutput] !$= "" ? $gData::name[%varname,%gameOutput] : "NA"; - + %varname = $wepGrid[%r++,%game]; %nameData2 = $gData::name[%varname,%gameOutput] !$= "" ? $gData::name[%varname,%gameOutput] : "NA"; - + %varname = $wepGrid[%r++,%game]; %nameData3 = $gData::name[%varname,%gameOutput] !$= "" ? $gData::name[%varname,%gameOutput] : "NA"; - + %varname = $wepGrid[%r++,%game]; %nameData4 = $gData::name[%varname,%gameOutput] !$= "" ? $gData::name[%varname,%gameOutput] : "NA"; - + schedule(%callTime * %callCount++,0,"addGLText",getField(%weapons, %w++), %xOffset, ((%vertSpace * (%i + 1)) + %yOffset) + (%y * %gridYOffset), "11 239 231", "RC", 15, %maxNameSize); schedule(%callTime * %callCount++,0,"addGLText",getField(%nameData1, 0), (%tabspace * 1) + %xOffset, ((%vertSpace * (%i + 1)) + %yOffset) + (%y * %gridYOffset), "3 213 151", "RC", 15, %maxNameSize); schedule(%callTime * %callCount++,0,"addGLText",getField(%nameData2, 0), (%tabspace * 2) + %xOffset, ((%vertSpace * (%i + 1)) + %yOffset) + (%y * %gridYOffset), "3 213 151", "RC", 15, %maxNameSize); @@ -16868,8 +16873,8 @@ function genMapStatsImg(%game,%count){ } } - } - schedule(%callTime * %callCount++, 0, "dumpMapImg",%gameOutput @ "-" @ dtMarkDate(), %count); + } + schedule(%callTime * %callCount++, 0, "dumpMapImg",%gameOutput @ "-" @ dtMarkDate(), %count); } function dumpMapImg(%name, %count){ @@ -16888,7 +16893,7 @@ function dumpMapImg(%name, %count){ } function imgCycle3(%img, %count){ - + %pct = mFloor((%img.yc / %img.y) * 100); if(%pct != %img.pct){ error("Saving Stats image" SPC %pct @ "%"); @@ -16901,7 +16906,7 @@ function imgCycle3(%img, %count){ %border = 45; %headersize = 42; %leftmargin = 4; - + %px = 0; %py = 0; %y = %img.yc; @@ -16911,12 +16916,12 @@ function imgCycle3(%img, %count){ for (%x = 0; %x < %img.x; %x++) { %color = "20 45 45"; if(isInsideBorderO(%img, %x-1, %y-5, 22, 17, 20)){ - %color = "0 118 118"; + %color = "0 118 118"; %color = lerpColor("32 60 69", %color, (%img.yc / %img.y)*1.5); } if(isInsideBorderO(%img, %x-1, %y-5, 42, 37, 4)){ - %color = "0 150 160"; + %color = "0 150 160"; %color = lerpColor(%color, "32 60 69", (%img.yc / %img.y) * 0.25); } if (%x > %border && %y > %border && %px < (%img.x - 88)) { @@ -16939,7 +16944,7 @@ function imgCycle3(%img, %count){ } %fd = $textColor[%x,%y]; if(getWord(%fd,0) > 0){ - %opacity = 1 - (getWord(%fd,0) / 255); + %opacity = 1 - (getWord(%fd,0) / 255); %r = mFloor((1 - %opacity) * getWord(%fd,1) + %opacity * getWord(%color,0)); %g = mFloor((1 - %opacity) * getWord(%fd,2) + %opacity * getWord(%color,1)); %b = mFloor((1 - %opacity) * getWord(%fd,3) + %opacity * getWord(%color,2)); @@ -16950,14 +16955,14 @@ function imgCycle3(%img, %count){ } } %img.yc++; - if(%img.yc < %img.y) + if(%img.yc < %img.y) schedule(32,0,"imgCycle3",%img); else{ %img.close(); - %img.delete(); + %img.delete(); deleteVariables("$textColor*"); error("Stats Image Done"); - genBigMapStats(%count++); + genBigMapStats(%count++); } } @@ -16982,12 +16987,12 @@ function isInsideBorder(%img,%x, %y) { %borderSize = 20; %imgx = %img.x; %imgy = %img.y; - + %right = %x >= (%imgx - %borderSize); %left = %x <= %borderSize; %top = %y <= %borderSize; %bottom = %y >= (%imgy - %borderSize); - //error(%right SPC %left SPC %top SPC %bottom); + //error(%right SPC %left SPC %top SPC %bottom); return %right || %left || %top || %bottom; } @@ -16995,19 +17000,19 @@ function isInsideBorderO(%img, %x, %y, %offsetX, %offsetY, %borderSize) { // %borderSize = 4; %imgx = %img.x; %imgy = %img.y; - + %left = %x >= %offsetX && %x <= %borderSize + %offsetX && %y >= %offsetY && %y <= %imgy - %offsetY; %right = %x >= %imgx - %offsetX - %borderSize && %x <= %imgx - %offsetX && %y >= %offsetY && %y <= %imgy - %offsetY; %top = %y >= %offsetY && %y <= %borderSize + %offsetY && %x >= %offsetX && %x <= %imgx - %offsetX; %bottom = %y >= %imgy - %offsetY - %borderSize && %y <= %imgy - %offsetY && %x >= %offsetX && %x <= %imgx - %offsetX; - + return %left || %right || %top || %bottom; } function lerpColor(%color1, %color2, %t) { if(%t > 1) %t = 1; else if (%t < 0) %t = 0; - + %r1 = getWord(%color1,0); %g1 = getWord(%color1,1); %b1 = getWord(%color1,2); @@ -17021,10 +17026,10 @@ function lerpColor(%color1, %color2, %t) { %lerpedB = mFloor(%b1 + (%b2 - %b1) * %t); return %lerpedR SPC %lerpedG SPC %lerpedB; -} +} function imgCycle(%img){ - + %pct = mFloor((%img.yc / %img.y) * 100); if(%pct != %img.pct){ error("Saving Stats image" SPC %pct @ "%"); @@ -17037,7 +17042,7 @@ function imgCycle(%img){ %border = 45; %headersize = 42; %leftmargin = 4; - + %px = 0; %py = 0; %y = %img.yc; @@ -17047,12 +17052,12 @@ function imgCycle(%img){ for (%x = 0; %x < %img.x; %x++) { %color = "20 45 45"; if(isInsideBorderO(%img, %x-1, %y-5, 22, 17, 20)){ - %color = "0 118 118"; + %color = "0 118 118"; %color = lerpColor("32 60 69", %color, (%img.yc / %img.y)*1.5); } if(isInsideBorderO(%img, %x-1, %y-5, 42, 37, 4)){ - %color = "0 150 160"; + %color = "0 150 160"; %color = lerpColor(%color, "32 60 69", (%img.yc / %img.y) * 0.25); } if (%x > %border && %y > %border && %px < (%img.x - 88)) { @@ -17075,7 +17080,7 @@ function imgCycle(%img){ } %fd = $textColor[%x,%y]; if(getWord(%fd,0) > 0){ - %opacity = 1 - (getWord(%fd,0) / 255); + %opacity = 1 - (getWord(%fd,0) / 255); %r = mFloor((1 - %opacity) * getWord(%fd,1) + %opacity * getWord(%color,0)); %g = mFloor((1 - %opacity) * getWord(%fd,2) + %opacity * getWord(%color,1)); %b = mFloor((1 - %opacity) * getWord(%fd,3) + %opacity * getWord(%color,2)); @@ -17086,11 +17091,11 @@ function imgCycle(%img){ } } %img.yc++; - if(%img.yc < %img.y) + if(%img.yc < %img.y) schedule(32,0,"imgCycle",%img); else{ %img.close(); - %img.delete(); + %img.delete(); deleteVariables("$textColor*"); error("Stats Image Done"); messageAll('MsgStats', '\c3Stats image build has finished~wfx/misc/hunters_greed.wav'); @@ -17117,36 +17122,36 @@ function compileGameImage(%gameIndex){ RootGroup.add(%fobj); %fobj.openForRead(%file); $pugMapInfo = strreplace(%fobj.readLine(),"%t","\t"); - + %line = strreplace(%fobj.readLine(),"%t","\t"); - $pugMapName[1] = getFields(%line, 2, getFieldCount(%line)-1); - %line = strreplace(%fobj.readLine(),"%t","\t"); - $pugMapScore[1] = getFields(%line, 2, getFieldCount(%line)-1); + $pugMapName[1] = getFields(%line, 2, getFieldCount(%line)-1); %line = strreplace(%fobj.readLine(),"%t","\t"); - $pugMapOff[1] = getFields(%line, 2, getFieldCount(%line)-1); + $pugMapScore[1] = getFields(%line, 2, getFieldCount(%line)-1); %line = strreplace(%fobj.readLine(),"%t","\t"); - $pugMapDef[1] = getFields(%line, 2, getFieldCount(%line)-1); + $pugMapOff[1] = getFields(%line, 2, getFieldCount(%line)-1); %line = strreplace(%fobj.readLine(),"%t","\t"); - $pugMapKills[1] = getFields(%line, 2, getFieldCount(%line)-1); - - + $pugMapDef[1] = getFields(%line, 2, getFieldCount(%line)-1); %line = strreplace(%fobj.readLine(),"%t","\t"); - $pugMapName[2] = getFields(%line, 2, getFieldCount(%line)-1); - %line = strreplace(%fobj.readLine(),"%t","\t"); - $pugMapScore[2] = getFields(%line, 2, getFieldCount(%line)-1); + $pugMapKills[1] = getFields(%line, 2, getFieldCount(%line)-1); + + %line = strreplace(%fobj.readLine(),"%t","\t"); - $pugMapOff[2] = getFields(%line, 2, getFieldCount(%line)-1); + $pugMapName[2] = getFields(%line, 2, getFieldCount(%line)-1); %line = strreplace(%fobj.readLine(),"%t","\t"); - $pugMapDef[2] = getFields(%line, 2, getFieldCount(%line)-1); + $pugMapScore[2] = getFields(%line, 2, getFieldCount(%line)-1); %line = strreplace(%fobj.readLine(),"%t","\t"); - $pugMapKills[2] = getFields(%line, 2, getFieldCount(%line)-1); - + $pugMapOff[2] = getFields(%line, 2, getFieldCount(%line)-1); + %line = strreplace(%fobj.readLine(),"%t","\t"); + $pugMapDef[2] = getFields(%line, 2, getFieldCount(%line)-1); + %line = strreplace(%fobj.readLine(),"%t","\t"); + $pugMapKills[2] = getFields(%line, 2, getFieldCount(%line)-1); + while ( !%fobj.isEOF() ){ %line = strreplace(%fobj.readLine(),"%t","\t"); %team = getField(%line,0); %type = getField(%line,1); %var = getField(%line,2); - $pugMapData[%team,%type,%var] = getFields(%line, 3, getFieldCount(%line)-1); + $pugMapData[%team,%type,%var] = getFields(%line, 3, getFieldCount(%line)-1); } switch$(%game){ case "CTFGame": renderCTFMapTextTM(%id); @@ -17157,8 +17162,8 @@ function compileGameImage(%gameIndex){ compileGameImage(0); } } - - }// we are out of pugs of this game type so lets reset and advance game type + + }// we are out of pugs of this game type so lets reset and advance game type else{ $dtGameIndex++; compileGameImage(0); @@ -17187,7 +17192,7 @@ function hasValueC(%val,%return,%return2,%x){ if(!%x) return %int @ %return2; %dec = getSubStr(%val, %dot + 1, %x); - return %int @ "." @ %dec @ %return2; + return %int @ "." @ %dec @ %return2; } } return %val @ %return2; @@ -17197,33 +17202,33 @@ function renderArenaMapTextTM(%id){ deleteVariables("$textColor*"); %sizeX = 1280+20; %sizeY = 810; - + %callTime = 8; %spaceing = 20; %justLeft = 355; %justLeft2 = 55; - %header = getField($pugMapInfo,0) SPC "ARENA"; + %header = getField($pugMapInfo,0) SPC "ARENA"; %header = stripChars(%header, "!\"#$%&'()*+,./:;<=>?@[\\]^'{|}~\t\n\r1234567890"); %header = strreplace(%header,"-", " "); %header = strreplace(%header,"_", " "); - + %hsize = getTextLengthInPixels(%header, "T2", 32);//30 - schedule(%callTime * %callCount++,0,"addGLText",%header, mFloor(%sizeX / 2) - mFloor(%hsize / 2), 55, "11 239 231", "T2", 32, 1000);//30 - + schedule(%callTime * %callCount++,0,"addGLText",%header, mFloor(%sizeX / 2) - mFloor(%hsize / 2), 55, "11 239 231", "T2", 32, 1000);//30 + %date = getField($pugMapInfo,3); %hsize = getTextLengthInPixels(%date, "RC", 12); schedule(%callTime * %callCount++,0,"addGLText",%date, mFloor(%sizeX / 2) - mFloor(%hsize / 2), 85, "11 239 231", "RC", 12, 500); - - %line = "Team 1"; + + %line = "Team 1"; schedule(%callTime * %callCount++,0,"addGLText",%line, %justLeft, 100, "11 239 231", "RC", 30, 500); - %line = getWord(getField($pugMapInfo,4),0); - schedule(%callTime * %callCount++,0,"addGLText",%line, %justLeft+100, 100, "11 239 231", "RC", 30, 500); - %line = "Team 2"; + %line = getWord(getField($pugMapInfo,4),0); + schedule(%callTime * %callCount++,0,"addGLText",%line, %justLeft+100, 100, "11 239 231", "RC", 30, 500); + %line = "Team 2"; schedule(%callTime * %callCount++,0,"addGLText",%line, %justLeft+300, 100, "11 239 231", "RC", 30, 500); - %line = getWord(getField($pugMapInfo,4),1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %justLeft+400, 100, "11 239 231", "RC", 30, 500); - + %line = getWord(getField($pugMapInfo,4),1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %justLeft+400, 100, "11 239 231", "RC", 30, 500); + schedule(%callTime * %callCount++,0,"addGLText","Player", %justLeft, 130, "11 239 231", "RC", 15, 500); schedule(%callTime * %callCount++,0,"addGLText","Score", %justLeft+130, 130, "11 239 231", "RC", 15, 500); schedule(%callTime * %callCount++,0,"addGLText","Off", %justLeft+170, 130, "11 239 231", "RC", 15, 500); @@ -17234,574 +17239,574 @@ function renderArenaMapTextTM(%id){ schedule(%callTime * %callCount++,0,"addGLText","Off", %justLeft+470, 130, "11 239 231", "RC", 15, 500); schedule(%callTime * %callCount++,0,"addGLText","Def", %justLeft+510, 130, "11 239 231", "RC", 15, 500); schedule(%callTime * %callCount++,0,"addGLText","Kills", %justLeft+550, 130, "11 239 231", "RC", 15, 500); - + %team1Size = getFieldCount($pugMapName[1]); %team2Size = getFieldCount($pugMapName[2]); - %teamsize = (%team1Size >%team2Size) ? %team1Size :%team2Size; + %teamsize = (%team1Size >%team2Size) ? %team1Size :%team2Size; %teamsize = %teamsize <= 32 ? %teamsize : 32; for(%i=0; %i < %teamsize; %i++){ if(%i < %team1Size && %i < %team2Size){ - %line = %i+1 @ "." @ getField($pugMapName[1],%i); + %line = %i+1 @ "." @ getField($pugMapName[1],%i); schedule(%callTime * %callCount++,0,"addGLText",%line, %justLeft, 150 + (%i*20), "11 239 231", "RC", 15, 130); %line = getField($pugMapScore[1],%i); schedule(%callTime * %callCount++,0,"addGLText",%line, %justLeft+130, 150 + (%i*20), "11 239 231", "RC", 15, 500); %line = getField($pugMapOff[1],%i); schedule(%callTime * %callCount++,0,"addGLText",%line, %justLeft+170, 150 + (%i*20), "11 239 231", "RC", 15, 500); - %line = getField($pugMapDef[1],%i); + %line = getField($pugMapDef[1],%i); schedule(%callTime * %callCount++,0,"addGLText",%line, %justLeft+210, 150 + (%i*20), "11 239 231", "RC", 15, 500); - %line = getField($pugMapKills[1],%i); + %line = getField($pugMapKills[1],%i); schedule(%callTime * %callCount++,0,"addGLText",%line, %justLeft+250, 150 + (%i*20), "11 239 231", "RC", 15, 500); - %line = %i+1 @ "." @ getField($pugMapName[2],%i); - schedule(%callTime * %callCount++,0,"addGLText",%line, %justLeft+300, 150 + (%i*20), "11 239 231", "RC", 15, 130); - %line = getField($pugMapScore[2],%i); - schedule(%callTime * %callCount++,0,"addGLText",%line, %justLeft+430, 150 + (%i*20), "11 239 231", "RC", 15, 500); - %line = getField($pugMapOff[2],%i); - schedule(%callTime * %callCount++,0,"addGLText",%line, %justLeft+470, 150 + (%i*20), "11 239 231", "RC", 15, 500); - %line = getField($pugMapDef[2],%i); - schedule(%callTime * %callCount++,0,"addGLText",%line, %justLeft+510, 150 + (%i*20), "11 239 231", "RC", 15, 500); - %line = getField($pugMapKills[2],%i); - schedule(%callTime * %callCount++,0,"addGLText",%line, %justLeft+550, 150 + (%i*20), "11 239 231", "RC", 15, 500); - } - else if(%i < %team1Size && %i >= %team2Size){ - %line = %i+1 @ "." @ getField($pugMapName[1],%i); - schedule(%callTime * %callCount++,0,"addGLText",%line, %justLeft, 150 + (%i*20), "11 239 231", "RC", 15, 130); - %line = getField($pugMapScore[1],%i); - schedule(%callTime * %callCount++,0,"addGLText",%line, %justLeft+130, 150 + (%i*20), "11 239 231", "RC", 15, 500); - %line = getField($pugMapOff[1],%i); - schedule(%callTime * %callCount++,0,"addGLText",%line, %justLeft+170, 150 + (%i*20), "11 239 231", "RC", 15, 500); - %line = getField($pugMapDef[1],%i); - schedule(%callTime * %callCount++,0,"addGLText",%line, %justLeft+210, 150 + (%i*20), "11 239 231", "RC", 15, 500); - %line = getField($pugMapKills[1],%i); - schedule(%callTime * %callCount++,0,"addGLText",%line, %justLeft+250, 150 + (%i*20), "11 239 231", "RC", 15, 500); - } - else if(%i >= %team1Size && %i < %team2Size){ - %line = %i+1 @ "." @ getField($pugMapName[2],%i); + %line = %i+1 @ "." @ getField($pugMapName[2],%i); schedule(%callTime * %callCount++,0,"addGLText",%line, %justLeft+300, 150 + (%i*20), "11 239 231", "RC", 15, 130); %line = getField($pugMapScore[2],%i); schedule(%callTime * %callCount++,0,"addGLText",%line, %justLeft+430, 150 + (%i*20), "11 239 231", "RC", 15, 500); %line = getField($pugMapOff[2],%i); schedule(%callTime * %callCount++,0,"addGLText",%line, %justLeft+470, 150 + (%i*20), "11 239 231", "RC", 15, 500); - %line = getField($pugMapDef[2],%i); + %line = getField($pugMapDef[2],%i); schedule(%callTime * %callCount++,0,"addGLText",%line, %justLeft+510, 150 + (%i*20), "11 239 231", "RC", 15, 500); - %line = getField($pugMapKills[2],%i); + %line = getField($pugMapKills[2],%i); schedule(%callTime * %callCount++,0,"addGLText",%line, %justLeft+550, 150 + (%i*20), "11 239 231", "RC", 15, 500); } - } - - - //%line = getTaggedString($teamName[1]) SPC "Team"; - //schedule(%callTime * %callCount++,0,"addGLText",%line, %justLeft2, 100, "11 239 231", "RC", 30, 500); - + else if(%i < %team1Size && %i >= %team2Size){ + %line = %i+1 @ "." @ getField($pugMapName[1],%i); + schedule(%callTime * %callCount++,0,"addGLText",%line, %justLeft, 150 + (%i*20), "11 239 231", "RC", 15, 130); + %line = getField($pugMapScore[1],%i); + schedule(%callTime * %callCount++,0,"addGLText",%line, %justLeft+130, 150 + (%i*20), "11 239 231", "RC", 15, 500); + %line = getField($pugMapOff[1],%i); + schedule(%callTime * %callCount++,0,"addGLText",%line, %justLeft+170, 150 + (%i*20), "11 239 231", "RC", 15, 500); + %line = getField($pugMapDef[1],%i); + schedule(%callTime * %callCount++,0,"addGLText",%line, %justLeft+210, 150 + (%i*20), "11 239 231", "RC", 15, 500); + %line = getField($pugMapKills[1],%i); + schedule(%callTime * %callCount++,0,"addGLText",%line, %justLeft+250, 150 + (%i*20), "11 239 231", "RC", 15, 500); + } + else if(%i >= %team1Size && %i < %team2Size){ + %line = %i+1 @ "." @ getField($pugMapName[2],%i); + schedule(%callTime * %callCount++,0,"addGLText",%line, %justLeft+300, 150 + (%i*20), "11 239 231", "RC", 15, 130); + %line = getField($pugMapScore[2],%i); + schedule(%callTime * %callCount++,0,"addGLText",%line, %justLeft+430, 150 + (%i*20), "11 239 231", "RC", 15, 500); + %line = getField($pugMapOff[2],%i); + schedule(%callTime * %callCount++,0,"addGLText",%line, %justLeft+470, 150 + (%i*20), "11 239 231", "RC", 15, 500); + %line = getField($pugMapDef[2],%i); + schedule(%callTime * %callCount++,0,"addGLText",%line, %justLeft+510, 150 + (%i*20), "11 239 231", "RC", 15, 500); + %line = getField($pugMapKills[2],%i); + schedule(%callTime * %callCount++,0,"addGLText",%line, %justLeft+550, 150 + (%i*20), "11 239 231", "RC", 15, 500); + } + } + + + //%line = getTaggedString($teamName[1]) SPC "Team"; + //schedule(%callTime * %callCount++,0,"addGLText",%line, %justLeft2, 100, "11 239 231", "RC", 30, 500); + %noValue = "NA"; %nameOffset = 120; %dataOffset = 130; %lineCount = 0; - %lineCountTeam2 = 0; + %lineCountTeam2 = 0; %justLeftTeam2 = 955; //%textln = getTextPosPixels(%line, 0, 0, "RC", 15); - %line = "Flag Grabs:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[1,"name","flagGrabsTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[1,"data","flagGrabsTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); - %lineCount++; - - %line = "Flag Caps:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[1,"name","flagCapsTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[1,"data","flagCapsTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); - %lineCount++; - - %line = "Flag Grab Speed:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[1,"name","grabSpeedMax"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[1,"data","grabSpeedMax"],0),%noValue," Kmh",1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); - %lineCount++; - - %line = "Flag Catch:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[1,"name","flagCatchTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[1,"data","flagCatchTG"],0),%noValue," Sec",2); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); - %lineCount++; - - %line = "Carrier Kills:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[1,"name","carrierKillsTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[1,"data","carrierKillsTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); - %lineCount++; - - %line = "Flag Defends:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[1,"name","flagDefendsTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[1,"data","flagDefendsTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); - %lineCount++; - - %line = "Escort Assists:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[1,"name","escortAssistsTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[1,"data","escortAssistsTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); - %lineCount++; - - %line = "Flags Thrown:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[1,"name","flagTossTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[1,"data","flagTossTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); - %lineCount++; - - %line = "Flag Returns:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[1,"name","flagReturnsTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[1,"data","flagReturnsTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); - %lineCount++; - - %line = "Flag Concuss:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[1,"name","concussFlagTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[1,"data","concussFlagTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); - %lineCount++; - - %line = "Flag Catch Speed:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[1,"name","flagCatchSpeedMax"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[1,"data","flagCatchSpeedMax"],0),%noValue," Kmh",0); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); - %lineCount++; - - %line = "Flag MA Catches:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[1,"name","maFlagCatchTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[1,"data","maFlagCatchTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); - %lineCount++; - - %line = "Intercepted Flags:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[1,"name","interceptedFlagTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[1,"data","interceptedFlagTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); - %lineCount++; - - %line = "Intercept Speed:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[1,"name","interceptSpeedMax"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[1,"data","interceptSpeedMax"],0),%noValue," Kmh",0); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); - %lineCount++; - - %line = "Intercepted Flags MA:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[1,"name","maInterceptedFlagTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[1,"data","maInterceptedFlagTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); - %lineCount++; - - %line = "Offensive Kills:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[1,"name","OffKillsTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[1,"data","OffKillsTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); - %lineCount++; - - %line = "Defensive Kills:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[1,"name","DefKillsTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[1,"data","DefKillsTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); - %lineCount++; - - %line = "Kill Assist:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[1,"name","assistTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[1,"data","assistTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); - %lineCount++; - - %line = "Distance Moved:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[1,"name","distMovTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[1,"data","distMovTG"],0),%noValue," Km",0); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); - %lineCount++; - - %line = "Highest Avg Speed:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[1,"name","avgSpeedAvg"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[1,"data","avgSpeedAvg"],0),%noValue," Kmh",0); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); - %lineCount++; - - %line = "Highest Top Speed:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[1,"name","maxSpeedMax"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[1,"data","maxSpeedMax"],0),%noValue," Kmh",0); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); - %lineCount++; - - %line = "Concuss Hits:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[1,"name","concussHitTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[1,"data","concussHitTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); - %lineCount++; - - %line = "Weapon Combos:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[1,"name","comboCountTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[1,"data","comboCountTG"],0),%noValue,"",0); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); - %lineCount++; - - %line = "First Kill:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[1,"name","firstKillTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[1,"data","firstKillTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); - %lineCount++; - - %line = "Last Kill:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[1,"name","lastKillTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[1,"data","lastKillTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); - %lineCount++; - - %line = "Best KDR:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[1,"name","kdrAvg"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[1,"data","kdrAvg"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); - %lineCount++; - - %line = "Shots Fired:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[1,"name","shotsFiredTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[1,"data","shotsFiredTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); - %lineCount++; - - %line = "Total Damage:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[1,"name","totalWepDmgTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[1,"data","totalWepDmgTG"],0),%noValue,"",0); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); - %lineCount++; - - %line = "Kill Streak:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[1,"name","killStreakMax"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[1,"data","killStreakMax"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); - %lineCount++; - - %line = "Mine + Disc Kills:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[1,"name","minePlusDiscKillTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[1,"data","minePlusDiscKillTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); - %lineCount++; - - %line = "Rear Shocklance:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[1,"name","shockRearShotTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[1,"data","shockRearShotTG"],0),%noValue,"",-1); + %line = "Flag Grabs:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[1,"name","flagGrabsTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[1,"data","flagGrabsTG"],0),%noValue,"",-1); schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); %lineCount++; - - - %line = "Flag Grabs:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[2,"name","flagGrabsTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[2,"data","flagGrabsTG"],0),%noValue,"",-1); + %line = "Flag Caps:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[1,"name","flagCapsTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[1,"data","flagCapsTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); + %lineCount++; + + %line = "Flag Grab Speed:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[1,"name","grabSpeedMax"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[1,"data","grabSpeedMax"],0),%noValue," Kmh",1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); + %lineCount++; + + %line = "Flag Catch:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[1,"name","flagCatchTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[1,"data","flagCatchTG"],0),%noValue," Sec",2); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); + %lineCount++; + + %line = "Carrier Kills:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[1,"name","carrierKillsTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[1,"data","carrierKillsTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); + %lineCount++; + + %line = "Flag Defends:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[1,"name","flagDefendsTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[1,"data","flagDefendsTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); + %lineCount++; + + %line = "Escort Assists:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[1,"name","escortAssistsTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[1,"data","escortAssistsTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); + %lineCount++; + + %line = "Flags Thrown:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[1,"name","flagTossTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[1,"data","flagTossTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); + %lineCount++; + + %line = "Flag Returns:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[1,"name","flagReturnsTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[1,"data","flagReturnsTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); + %lineCount++; + + %line = "Flag Concuss:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[1,"name","concussFlagTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[1,"data","concussFlagTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); + %lineCount++; + + %line = "Flag Catch Speed:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[1,"name","flagCatchSpeedMax"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[1,"data","flagCatchSpeedMax"],0),%noValue," Kmh",0); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); + %lineCount++; + + %line = "Flag MA Catches:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[1,"name","maFlagCatchTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[1,"data","maFlagCatchTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); + %lineCount++; + + %line = "Intercepted Flags:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[1,"name","interceptedFlagTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[1,"data","interceptedFlagTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); + %lineCount++; + + %line = "Intercept Speed:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[1,"name","interceptSpeedMax"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[1,"data","interceptSpeedMax"],0),%noValue," Kmh",0); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); + %lineCount++; + + %line = "Intercepted Flags MA:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[1,"name","maInterceptedFlagTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[1,"data","maInterceptedFlagTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); + %lineCount++; + + %line = "Offensive Kills:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[1,"name","OffKillsTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[1,"data","OffKillsTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); + %lineCount++; + + %line = "Defensive Kills:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[1,"name","DefKillsTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[1,"data","DefKillsTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); + %lineCount++; + + %line = "Kill Assist:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[1,"name","assistTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[1,"data","assistTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); + %lineCount++; + + %line = "Distance Moved:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[1,"name","distMovTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[1,"data","distMovTG"],0),%noValue," Km",0); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); + %lineCount++; + + %line = "Highest Avg Speed:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[1,"name","avgSpeedAvg"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[1,"data","avgSpeedAvg"],0),%noValue," Kmh",0); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); + %lineCount++; + + %line = "Highest Top Speed:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[1,"name","maxSpeedMax"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[1,"data","maxSpeedMax"],0),%noValue," Kmh",0); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); + %lineCount++; + + %line = "Concuss Hits:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[1,"name","concussHitTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[1,"data","concussHitTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); + %lineCount++; + + %line = "Weapon Combos:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[1,"name","comboCountTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[1,"data","comboCountTG"],0),%noValue,"",0); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); + %lineCount++; + + %line = "First Kill:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[1,"name","firstKillTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[1,"data","firstKillTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); + %lineCount++; + + %line = "Last Kill:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[1,"name","lastKillTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[1,"data","lastKillTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); + %lineCount++; + + %line = "Best KDR:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[1,"name","kdrAvg"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[1,"data","kdrAvg"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); + %lineCount++; + + %line = "Shots Fired:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[1,"name","shotsFiredTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[1,"data","shotsFiredTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); + %lineCount++; + + %line = "Total Damage:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[1,"name","totalWepDmgTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[1,"data","totalWepDmgTG"],0),%noValue,"",0); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); + %lineCount++; + + %line = "Kill Streak:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[1,"name","killStreakMax"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[1,"data","killStreakMax"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); + %lineCount++; + + %line = "Mine + Disc Kills:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[1,"name","minePlusDiscKillTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[1,"data","minePlusDiscKillTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); + %lineCount++; + + %line = "Rear Shocklance:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[1,"name","shockRearShotTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[1,"data","shockRearShotTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); + %lineCount++; + + + + %line = "Flag Grabs:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[2,"name","flagGrabsTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[2,"data","flagGrabsTG"],0),%noValue,"",-1); schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); %lineCountTeam2++; - - %line = "Flag Caps:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[2,"name","flagCapsTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[2,"data","flagCapsTG"],0),%noValue,"",-1); + + %line = "Flag Caps:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[2,"name","flagCapsTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[2,"data","flagCapsTG"],0),%noValue,"",-1); schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); %lineCountTeam2++; - - %line = "Flag Grab Speed:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[2,"name","grabSpeedMax"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[2,"data","grabSpeedMax"],0),%noValue," Kmh",1); + + %line = "Flag Grab Speed:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[2,"name","grabSpeedMax"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[2,"data","grabSpeedMax"],0),%noValue," Kmh",1); schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); %lineCountTeam2++; - - %line = "Flag Catch:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[2,"name","flagCatchTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[2,"data","flagCatchTG"],0),%noValue," Sec",1); + + %line = "Flag Catch:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[2,"name","flagCatchTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[2,"data","flagCatchTG"],0),%noValue," Sec",1); schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); %lineCountTeam2++; - - %line = "Carrier Kills:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[2,"name","carrierKillsTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[2,"data","carrierKillsTG"],0),%noValue,"",-1); + + %line = "Carrier Kills:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[2,"name","carrierKillsTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[2,"data","carrierKillsTG"],0),%noValue,"",-1); schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); %lineCountTeam2++; - - %line = "Flag Defends:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[2,"name","flagDefendsTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[2,"data","flagDefendsTG"],0),%noValue,"",-1); + + %line = "Flag Defends:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[2,"name","flagDefendsTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[2,"data","flagDefendsTG"],0),%noValue,"",-1); schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); %lineCountTeam2++; - - %line = "Escort Assists:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[2,"name","escortAssists"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[2,"data","escortAssists"],0),%noValue,"",-1); + + %line = "Escort Assists:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[2,"name","escortAssists"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[2,"data","escortAssists"],0),%noValue,"",-1); schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); %lineCountTeam2++; - - %line = "Flags Thrown:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[2,"name","flagTossTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[2,"data","flagTossTG"],0),%noValue,"",-1); + + %line = "Flags Thrown:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[2,"name","flagTossTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[2,"data","flagTossTG"],0),%noValue,"",-1); schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); %lineCountTeam2++; - - %line = "Flag Returns:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[2,"name","flagReturnsTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[2,"data","flagReturnsTG"],0),%noValue,"",-1); + + %line = "Flag Returns:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[2,"name","flagReturnsTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[2,"data","flagReturnsTG"],0),%noValue,"",-1); schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); %lineCountTeam2++; - - %line = "Flag Concuss:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[2,"name","concussFlagTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[2,"data","concussFlagTG"],0),%noValue,"",-1); + + %line = "Flag Concuss:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[2,"name","concussFlagTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[2,"data","concussFlagTG"],0),%noValue,"",-1); schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); %lineCountTeam2++; - - %line = "Flag Catch Speed:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[2,"name","flagCatchSpeedMax"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[2,"data","flagCatchSpeedMax"],0),%noValue," Kmh",0); + + %line = "Flag Catch Speed:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[2,"name","flagCatchSpeedMax"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[2,"data","flagCatchSpeedMax"],0),%noValue," Kmh",0); schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); %lineCountTeam2++; - - %line = "Flag MA Catches:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[2,"name","maFlagCatchTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[2,"data","maFlagCatchTG"],0),%noValue,"",-1); + + %line = "Flag MA Catches:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[2,"name","maFlagCatchTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[2,"data","maFlagCatchTG"],0),%noValue,"",-1); schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); %lineCountTeam2++; - - %line = "Intercepted Flags:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[2,"name","interceptedFlagTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[2,"data","interceptedFlagTG"],0),%noValue,"",-1); + + %line = "Intercepted Flags:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[2,"name","interceptedFlagTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[2,"data","interceptedFlagTG"],0),%noValue,"",-1); schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); %lineCountTeam2++; - - %line = "Intercept Speed:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[2,"name","interceptSpeedMax"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[2,"data","interceptSpeedMax"],0),%noValue," Kmh",0); + + %line = "Intercept Speed:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[2,"name","interceptSpeedMax"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[2,"data","interceptSpeedMax"],0),%noValue," Kmh",0); schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); %lineCountTeam2++; - - %line = "Intercepted Flags MA:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[2,"name","maInterceptedFlagTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[2,"data","maInterceptedFlagTG"],0),%noValue,"",-1); + + %line = "Intercepted Flags MA:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[2,"name","maInterceptedFlagTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[2,"data","maInterceptedFlagTG"],0),%noValue,"",-1); schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); %lineCountTeam2++; - - %line = "Offensive Kills:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[2,"name","OffKillsTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[2,"data","OffKillsTG"],0),%noValue,"",-1); + + %line = "Offensive Kills:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[2,"name","OffKillsTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[2,"data","OffKillsTG"],0),%noValue,"",-1); schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); %lineCountTeam2++; - - %line = "Defensive Kills:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[2,"name","DefKillsTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[2,"data","DefKillsTG"],0),%noValue,"",-1); + + %line = "Defensive Kills:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[2,"name","DefKillsTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[2,"data","DefKillsTG"],0),%noValue,"",-1); schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); %lineCountTeam2++; - - %line = "Kill Assist:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[2,"name","assistTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[2,"data","assistTG"],0),%noValue,"",-1); + + %line = "Kill Assist:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[2,"name","assistTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[2,"data","assistTG"],0),%noValue,"",-1); schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); %lineCountTeam2++; - - %line = "Distance Moved:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[2,"name","distMovTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[2,"data","distMovTG"],0),%noValue," Km",0); + + %line = "Distance Moved:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[2,"name","distMovTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[2,"data","distMovTG"],0),%noValue," Km",0); schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); %lineCountTeam2++; - - %line = "Highest Avg Speed:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[2,"name","avgSpeedAvg"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[2,"data","avgSpeedAvg"],0),%noValue," Kmh",0); + + %line = "Highest Avg Speed:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[2,"name","avgSpeedAvg"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[2,"data","avgSpeedAvg"],0),%noValue," Kmh",0); schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); %lineCountTeam2++; - - %line = "Highest Top Speed:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[2,"name","maxSpeedMax"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[2,"data","maxSpeedMax"],0),%noValue," Kmh",0); + + %line = "Highest Top Speed:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[2,"name","maxSpeedMax"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[2,"data","maxSpeedMax"],0),%noValue," Kmh",0); schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); %lineCountTeam2++; - - %line = "Concuss Hits:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[2,"name","concussHitTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[2,"data","concussHitTG"],0),%noValue,"",0); + + %line = "Concuss Hits:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[2,"name","concussHitTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[2,"data","concussHitTG"],0),%noValue,"",0); schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); %lineCountTeam2++; - - %line = "Weapon Combos:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[2,"name","comboCountTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[2,"data","comboCountTG"],0),%noValue,"",-1); + + %line = "Weapon Combos:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[2,"name","comboCountTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[2,"data","comboCountTG"],0),%noValue,"",-1); schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); %lineCountTeam2++; - - %line = "First Kill:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[2,"name","firstKillTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[2,"data","firstKillTG"],0),%noValue,"",-1); + + %line = "First Kill:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[2,"name","firstKillTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[2,"data","firstKillTG"],0),%noValue,"",-1); schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); %lineCountTeam2++; - - %line = "Last Kill:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[2,"name","lastKillTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[2,"data","lastKillTG"],0),%noValue,"",-1); + + %line = "Last Kill:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[2,"name","lastKillTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[2,"data","lastKillTG"],0),%noValue,"",-1); schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); %lineCountTeam2++; - - %line = "Best KDR:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[2,"name","kdrAvg"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[2,"data","kdrAvg"],0),%noValue,"",-1); + + %line = "Best KDR:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[2,"name","kdrAvg"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[2,"data","kdrAvg"],0),%noValue,"",-1); schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); %lineCountTeam2++; - - %line = "Shots Fired:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[2,"name","shotsFiredTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[2,"data","shotsFiredTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); - %lineCountTeam2++; - - %line = "Total Damage:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[2,"name","totalWepDmgTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[2,"data","totalWepDmgTG"],0),%noValue,"",0); + + %line = "Shots Fired:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[2,"name","shotsFiredTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[2,"data","shotsFiredTG"],0),%noValue,"",-1); schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); %lineCountTeam2++; - - %line = "Kill Streak:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[2,"name","killStreakMax"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[2,"data","killStreakMax"],0),%noValue,"",-1); + + %line = "Total Damage:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[2,"name","totalWepDmgTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[2,"data","totalWepDmgTG"],0),%noValue,"",0); schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); %lineCountTeam2++; - - %line = "Mine + Disc Kills:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[2,"name","minePlusDiscKillTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[2,"data","minePlusDiscKillTG"],0),%noValue,"",-1); + + %line = "Kill Streak:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[2,"name","killStreakMax"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[2,"data","killStreakMax"],0),%noValue,"",-1); schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); %lineCountTeam2++; - - %line = "Rear Shocklance:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[2,"name","shockRearShotTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[2,"data","shockRearShotTG"],0),%noValue,"",-1); + + %line = "Mine + Disc Kills:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[2,"name","minePlusDiscKillTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[2,"data","minePlusDiscKillTG"],0),%noValue,"",-1); schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); %lineCountTeam2++; - + + %line = "Rear Shocklance:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[2,"name","shockRearShotTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[2,"data","shockRearShotTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); + %lineCountTeam2++; + %wepLineCount = %vehLineCount = 24; - - + + %killOffSet = 50; %killValue = 150; %midAirs =185; @@ -17810,149 +17815,149 @@ function renderArenaMapTextTM(%id){ %damageValue = 420; %dist = 455; %distValue = 555; - %line = "Weapons"; + %line = "Weapons"; schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft, 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 500); - %line = "Kills"; + %line = "Kills"; schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %killOffSet , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 500); - %line = ""; + %line = ""; schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %killValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 500); - %line = "MidAirs"; + %line = "MidAirs"; schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %midAirs , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 500); - %line = ""; + %line = ""; schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %midAirValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 500); - %line = "MA Distance"; + %line = "MA Distance"; schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %damage , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 500); - %line = ""; + %line = ""; schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %damageValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 500); - %line = "Damage"; + %line = "Damage"; schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %dist , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 500); - %line = ""; + %line = ""; schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %distValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 500); %wepLineCount++; - - - %line = "Blaster"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft, 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[0,"name","blasterKillsTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %killOffSet , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %line = hasValueC(getField($pugMapData[0,"data","blasterKillsTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %killValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %line = hasValueC(getField($pugMapData[0,"name","blasterMATG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %midAirs , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %line = hasValueC(getField($pugMapData[0,"data","blasterMATG"],0),0,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %midAirValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %line = hasValueC(getField($pugMapData[0,"name","blasterMAHitDistMax"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %damage , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %line = hasValueC(getField($pugMapData[0,"data","blasterMAHitDistMax"],0),0,"",0); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %damageValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %line = hasValueC(getField($pugMapData[0,"name","blasterDmgTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %dist , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %line = hasValueC(getField($pugMapData[0,"data","blasterDmgTG"],0),0,"",1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %distValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %wepLineCount++; - - %line = "Plasma"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft, 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[0,"name","plasmaKillsTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %killOffSet , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %line = hasValueC(getField($pugMapData[0,"data","plasmaKillsTG"],0),0,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %killValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %line = hasValueC(getField($pugMapData[0,"name","plasmaMATG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %midAirs , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %line = hasValueC(getField($pugMapData[0,"data","plasmaMATG"],0),0,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %midAirValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %line = hasValueC(getField($pugMapData[0,"name","plasmaMAHitDistMax"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %damage , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %line = hasValueC(getField($pugMapData[0,"data","plasmaMAHitDistMax"],0),0,"",0); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %damageValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %line = hasValueC(getField($pugMapData[0,"name","plasmaDmgTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %dist , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %line = hasValueC(getField($pugMapData[0,"data","plasmaDmgTG"],0),0,"",1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %distValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %wepLineCount++; - - %line = "Chaingun"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft, 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[0,"name","cgKillsTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %killOffSet , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %line = hasValueC(getField($pugMapData[0,"data","cgKillsTG"],0),0,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %killValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %line = hasValueC(getField($pugMapData[0,"name","cgMATG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %midAirs , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %line = hasValueC(getField($pugMapData[0,"data","cgMATG"],0),0,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %midAirValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %line = hasValueC(getField($pugMapData[0,"name","cgMAHitDistMax"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %damage , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %line = hasValueC(getField($pugMapData[0,"data","cgMAHitDistMax"],0),0,"",0); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %damageValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %line = hasValueC(getField($pugMapData[0,"name","cgDmgTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %dist , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %line = hasValueC(getField($pugMapData[0,"data","cgDmgTG"],0),0,"",1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %distValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %wepLineCount++; - - %line = "Spinfusor"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft, 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[0,"name","discKillsTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %killOffSet , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %line = hasValueC(getField($pugMapData[0,"data","discKillsTG"],0),0,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %killValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %line = hasValueC(getField($pugMapData[0,"name","discMATG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %midAirs , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %line = hasValueC(getField($pugMapData[0,"data","discMATG"],0),0,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %midAirValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %line = hasValueC(getField($pugMapData[0,"name","discMAHitDistMax"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %damage , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %line = hasValueC(getField($pugMapData[0,"data","discMAHitDistMax"],0),0,"",0); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %damageValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %line = hasValueC(getField($pugMapData[0,"name","discDmgTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %dist , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %line = hasValueC(getField($pugMapData[0,"data","discDmgTG"],0),0,"",1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %distValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %wepLineCount++; - - %line = "Grenade"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft, 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[0,"name","grenadeKillsTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %killOffSet , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %line = hasValueC(getField($pugMapData[0,"data","grenadeKillsTG"],0),0,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %killValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %line = hasValueC(getField($pugMapData[0,"name","grenadeMATG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %midAirs , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %line = hasValueC(getField($pugMapData[0,"data","grenadeMATG"],0),0,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %midAirValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %line = hasValueC(getField($pugMapData[0,"name","grenadeMAHitDistMax"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %damage , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %line = hasValueC(getField($pugMapData[0,"data","grenadeMAHitDistMax"],0),0,"",0); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %damageValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %line = hasValueC(getField($pugMapData[0,"name","grenadeDmgTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %dist , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %line = hasValueC(getField($pugMapData[0,"data","grenadeDmgTG"],0),0,"",1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %distValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %wepLineCount++; - %line = "Shock"; + + %line = "Blaster"; schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft, 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[0,"name","shockKillsTG"],0),%noValue,"",-1); + %line = hasValueC(getField($pugMapData[0,"name","blasterKillsTG"],0),%noValue,"",-1); schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %killOffSet , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %line = hasValueC(getField($pugMapData[0,"data","shockKillsTG"],0),0,"",-1); + %line = hasValueC(getField($pugMapData[0,"data","blasterKillsTG"],0),%noValue,"",-1); schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %killValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %line = hasValueC(getField($pugMapData[0,"name","shockMATG"],0),%noValue,"",-1); + %line = hasValueC(getField($pugMapData[0,"name","blasterMATG"],0),%noValue,"",-1); schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %midAirs , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %line = hasValueC(getField($pugMapData[0,"data","shockMATG"],0),0,"",-1); + %line = hasValueC(getField($pugMapData[0,"data","blasterMATG"],0),0,"",-1); schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %midAirValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %line = hasValueC(getField($pugMapData[0,"name","shockMAHitDistMax"],0),%noValue,"",-1); + %line = hasValueC(getField($pugMapData[0,"name","blasterMAHitDistMax"],0),%noValue,"",-1); schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %damage , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %line = hasValueC(getField($pugMapData[0,"data","shockMAHitDistMax"],0),0,"",1); + %line = hasValueC(getField($pugMapData[0,"data","blasterMAHitDistMax"],0),0,"",0); schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %damageValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %line = hasValueC(getField($pugMapData[0,"name","shockDmgTG"],0),%noValue,"",-1); + %line = hasValueC(getField($pugMapData[0,"name","blasterDmgTG"],0),%noValue,"",-1); schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %dist , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %line = hasValueC(getField($pugMapData[0,"data","shockDmgTG"],0),0,"",1); + %line = hasValueC(getField($pugMapData[0,"data","blasterDmgTG"],0),0,"",1); schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %distValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %wepLineCount++; %wepLineCount++; - + %line = "Plasma"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft, 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[0,"name","plasmaKillsTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %killOffSet , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); + %line = hasValueC(getField($pugMapData[0,"data","plasmaKillsTG"],0),0,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %killValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); + %line = hasValueC(getField($pugMapData[0,"name","plasmaMATG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %midAirs , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); + %line = hasValueC(getField($pugMapData[0,"data","plasmaMATG"],0),0,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %midAirValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); + %line = hasValueC(getField($pugMapData[0,"name","plasmaMAHitDistMax"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %damage , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); + %line = hasValueC(getField($pugMapData[0,"data","plasmaMAHitDistMax"],0),0,"",0); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %damageValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); + %line = hasValueC(getField($pugMapData[0,"name","plasmaDmgTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %dist , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); + %line = hasValueC(getField($pugMapData[0,"data","plasmaDmgTG"],0),0,"",1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %distValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); + %wepLineCount++; + + %line = "Chaingun"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft, 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[0,"name","cgKillsTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %killOffSet , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); + %line = hasValueC(getField($pugMapData[0,"data","cgKillsTG"],0),0,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %killValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); + %line = hasValueC(getField($pugMapData[0,"name","cgMATG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %midAirs , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); + %line = hasValueC(getField($pugMapData[0,"data","cgMATG"],0),0,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %midAirValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); + %line = hasValueC(getField($pugMapData[0,"name","cgMAHitDistMax"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %damage , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); + %line = hasValueC(getField($pugMapData[0,"data","cgMAHitDistMax"],0),0,"",0); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %damageValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); + %line = hasValueC(getField($pugMapData[0,"name","cgDmgTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %dist , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); + %line = hasValueC(getField($pugMapData[0,"data","cgDmgTG"],0),0,"",1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %distValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); + %wepLineCount++; + + %line = "Spinfusor"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft, 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[0,"name","discKillsTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %killOffSet , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); + %line = hasValueC(getField($pugMapData[0,"data","discKillsTG"],0),0,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %killValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); + %line = hasValueC(getField($pugMapData[0,"name","discMATG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %midAirs , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); + %line = hasValueC(getField($pugMapData[0,"data","discMATG"],0),0,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %midAirValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); + %line = hasValueC(getField($pugMapData[0,"name","discMAHitDistMax"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %damage , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); + %line = hasValueC(getField($pugMapData[0,"data","discMAHitDistMax"],0),0,"",0); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %damageValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); + %line = hasValueC(getField($pugMapData[0,"name","discDmgTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %dist , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); + %line = hasValueC(getField($pugMapData[0,"data","discDmgTG"],0),0,"",1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %distValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); + %wepLineCount++; + + %line = "Grenade"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft, 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[0,"name","grenadeKillsTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %killOffSet , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); + %line = hasValueC(getField($pugMapData[0,"data","grenadeKillsTG"],0),0,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %killValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); + %line = hasValueC(getField($pugMapData[0,"name","grenadeMATG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %midAirs , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); + %line = hasValueC(getField($pugMapData[0,"data","grenadeMATG"],0),0,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %midAirValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); + %line = hasValueC(getField($pugMapData[0,"name","grenadeMAHitDistMax"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %damage , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); + %line = hasValueC(getField($pugMapData[0,"data","grenadeMAHitDistMax"],0),0,"",0); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %damageValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); + %line = hasValueC(getField($pugMapData[0,"name","grenadeDmgTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %dist , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); + %line = hasValueC(getField($pugMapData[0,"data","grenadeDmgTG"],0),0,"",1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %distValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); + %wepLineCount++; + + %line = "Shock"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft, 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[0,"name","shockKillsTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %killOffSet , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); + %line = hasValueC(getField($pugMapData[0,"data","shockKillsTG"],0),0,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %killValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); + %line = hasValueC(getField($pugMapData[0,"name","shockMATG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %midAirs , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); + %line = hasValueC(getField($pugMapData[0,"data","shockMATG"],0),0,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %midAirValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); + %line = hasValueC(getField($pugMapData[0,"name","shockMAHitDistMax"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %damage , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); + %line = hasValueC(getField($pugMapData[0,"data","shockMAHitDistMax"],0),0,"",1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %damageValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); + %line = hasValueC(getField($pugMapData[0,"name","shockDmgTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %dist , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); + %line = hasValueC(getField($pugMapData[0,"data","shockDmgTG"],0),0,"",1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %distValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); + %wepLineCount++; + %wepLineCount++; + + if(%id $= "") return; %img = new fileObject(); @@ -17966,7 +17971,7 @@ function renderArenaMapTextTM(%id){ %img.yc = 0; %img.py = 0; %img.pct = 0; - schedule(%callTime * %callCount++, 0, "pugImgCycle2",%img); + schedule(%callTime * %callCount++, 0, "pugImgCycle2",%img); } function renderLCTFMapTextTM(%id){ @@ -17974,33 +17979,33 @@ function renderLCTFMapTextTM(%id){ deleteVariables("$textColor*"); %sizeX = 1280+20; %sizeY = 810; - + %callTime = 8; %spaceing = 20; %justLeft = 355; %justLeft2 = 55; - %header = getField($pugMapInfo,0) SPC "LCTF"; + %header = getField($pugMapInfo,0) SPC "LCTF"; %header = stripChars(%header, "!\"#$%&'()*+,./:;<=>?@[\\]^'{|}~\t\n\r1234567890"); %header = strreplace(%header,"-", " "); %header = strreplace(%header,"_", " "); - + %hsize = getTextLengthInPixels(%header, "T2", 32);//30 - schedule(%callTime * %callCount++,0,"addGLText",%header, mFloor(%sizeX / 2) - mFloor(%hsize / 2), 55, "11 239 231", "T2", 32, 1000);//30 - + schedule(%callTime * %callCount++,0,"addGLText",%header, mFloor(%sizeX / 2) - mFloor(%hsize / 2), 55, "11 239 231", "T2", 32, 1000);//30 + %date = getField($pugMapInfo,3); %hsize = getTextLengthInPixels(%date, "RC", 12); schedule(%callTime * %callCount++,0,"addGLText",%date, mFloor(%sizeX / 2) - mFloor(%hsize / 2), 85, "11 239 231", "RC", 12, 500); - - %line = "Storm"; + + %line = "Storm"; schedule(%callTime * %callCount++,0,"addGLText",%line, %justLeft, 100, "11 239 231", "RC", 30, 500); - %line = getWord(getField($pugMapInfo,4),0); - schedule(%callTime * %callCount++,0,"addGLText",%line, %justLeft+100, 100, "11 239 231", "RC", 30, 500); - %line = "Inferno"; + %line = getWord(getField($pugMapInfo,4),0); + schedule(%callTime * %callCount++,0,"addGLText",%line, %justLeft+100, 100, "11 239 231", "RC", 30, 500); + %line = "Inferno"; schedule(%callTime * %callCount++,0,"addGLText",%line, %justLeft+300, 100, "11 239 231", "RC", 30, 500); - %line = getWord(getField($pugMapInfo,4),1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %justLeft+400, 100, "11 239 231", "RC", 30, 500); - + %line = getWord(getField($pugMapInfo,4),1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %justLeft+400, 100, "11 239 231", "RC", 30, 500); + schedule(%callTime * %callCount++,0,"addGLText","Player", %justLeft, 130, "11 239 231", "RC", 15, 500); schedule(%callTime * %callCount++,0,"addGLText","Score", %justLeft+130, 130, "11 239 231", "RC", 15, 500); schedule(%callTime * %callCount++,0,"addGLText","Off", %justLeft+170, 130, "11 239 231", "RC", 15, 500); @@ -18011,574 +18016,574 @@ function renderLCTFMapTextTM(%id){ schedule(%callTime * %callCount++,0,"addGLText","Off", %justLeft+470, 130, "11 239 231", "RC", 15, 500); schedule(%callTime * %callCount++,0,"addGLText","Def", %justLeft+510, 130, "11 239 231", "RC", 15, 500); schedule(%callTime * %callCount++,0,"addGLText","Kills", %justLeft+550, 130, "11 239 231", "RC", 15, 500); - + %team1Size = getFieldCount($pugMapName[1]); %team2Size = getFieldCount($pugMapName[2]); - %teamsize = (%team1Size >%team2Size) ? %team1Size :%team2Size; + %teamsize = (%team1Size >%team2Size) ? %team1Size :%team2Size; %teamsize = %teamsize <= 32 ? %teamsize : 32; for(%i=0; %i < %teamsize; %i++){ if(%i < %team1Size && %i < %team2Size){ - %line = %i+1 @ "." @ getField($pugMapName[1],%i); + %line = %i+1 @ "." @ getField($pugMapName[1],%i); schedule(%callTime * %callCount++,0,"addGLText",%line, %justLeft, 150 + (%i*20), "11 239 231", "RC", 15, 130); %line = getField($pugMapScore[1],%i); schedule(%callTime * %callCount++,0,"addGLText",%line, %justLeft+130, 150 + (%i*20), "11 239 231", "RC", 15, 500); %line = getField($pugMapOff[1],%i); schedule(%callTime * %callCount++,0,"addGLText",%line, %justLeft+170, 150 + (%i*20), "11 239 231", "RC", 15, 500); - %line = getField($pugMapDef[1],%i); + %line = getField($pugMapDef[1],%i); schedule(%callTime * %callCount++,0,"addGLText",%line, %justLeft+210, 150 + (%i*20), "11 239 231", "RC", 15, 500); - %line = getField($pugMapKills[1],%i); + %line = getField($pugMapKills[1],%i); schedule(%callTime * %callCount++,0,"addGLText",%line, %justLeft+250, 150 + (%i*20), "11 239 231", "RC", 15, 500); - %line = %i+1 @ "." @ getField($pugMapName[2],%i); - schedule(%callTime * %callCount++,0,"addGLText",%line, %justLeft+300, 150 + (%i*20), "11 239 231", "RC", 15, 130); - %line = getField($pugMapScore[2],%i); - schedule(%callTime * %callCount++,0,"addGLText",%line, %justLeft+430, 150 + (%i*20), "11 239 231", "RC", 15, 500); - %line = getField($pugMapOff[2],%i); - schedule(%callTime * %callCount++,0,"addGLText",%line, %justLeft+470, 150 + (%i*20), "11 239 231", "RC", 15, 500); - %line = getField($pugMapDef[2],%i); - schedule(%callTime * %callCount++,0,"addGLText",%line, %justLeft+510, 150 + (%i*20), "11 239 231", "RC", 15, 500); - %line = getField($pugMapKills[2],%i); - schedule(%callTime * %callCount++,0,"addGLText",%line, %justLeft+550, 150 + (%i*20), "11 239 231", "RC", 15, 500); - } - else if(%i < %team1Size && %i >= %team2Size){ - %line = %i+1 @ "." @ getField($pugMapName[1],%i); - schedule(%callTime * %callCount++,0,"addGLText",%line, %justLeft, 150 + (%i*20), "11 239 231", "RC", 15, 130); - %line = getField($pugMapScore[1],%i); - schedule(%callTime * %callCount++,0,"addGLText",%line, %justLeft+130, 150 + (%i*20), "11 239 231", "RC", 15, 500); - %line = getField($pugMapOff[1],%i); - schedule(%callTime * %callCount++,0,"addGLText",%line, %justLeft+170, 150 + (%i*20), "11 239 231", "RC", 15, 500); - %line = getField($pugMapDef[1],%i); - schedule(%callTime * %callCount++,0,"addGLText",%line, %justLeft+210, 150 + (%i*20), "11 239 231", "RC", 15, 500); - %line = getField($pugMapKills[1],%i); - schedule(%callTime * %callCount++,0,"addGLText",%line, %justLeft+250, 150 + (%i*20), "11 239 231", "RC", 15, 500); - } - else if(%i >= %team1Size && %i < %team2Size){ - %line = %i+1 @ "." @ getField($pugMapName[2],%i); + %line = %i+1 @ "." @ getField($pugMapName[2],%i); schedule(%callTime * %callCount++,0,"addGLText",%line, %justLeft+300, 150 + (%i*20), "11 239 231", "RC", 15, 130); %line = getField($pugMapScore[2],%i); schedule(%callTime * %callCount++,0,"addGLText",%line, %justLeft+430, 150 + (%i*20), "11 239 231", "RC", 15, 500); %line = getField($pugMapOff[2],%i); schedule(%callTime * %callCount++,0,"addGLText",%line, %justLeft+470, 150 + (%i*20), "11 239 231", "RC", 15, 500); - %line = getField($pugMapDef[2],%i); + %line = getField($pugMapDef[2],%i); schedule(%callTime * %callCount++,0,"addGLText",%line, %justLeft+510, 150 + (%i*20), "11 239 231", "RC", 15, 500); - %line = getField($pugMapKills[2],%i); + %line = getField($pugMapKills[2],%i); schedule(%callTime * %callCount++,0,"addGLText",%line, %justLeft+550, 150 + (%i*20), "11 239 231", "RC", 15, 500); } - } - - - //%line = getTaggedString($teamName[1]) SPC "Team"; - //schedule(%callTime * %callCount++,0,"addGLText",%line, %justLeft2, 100, "11 239 231", "RC", 30, 500); - + else if(%i < %team1Size && %i >= %team2Size){ + %line = %i+1 @ "." @ getField($pugMapName[1],%i); + schedule(%callTime * %callCount++,0,"addGLText",%line, %justLeft, 150 + (%i*20), "11 239 231", "RC", 15, 130); + %line = getField($pugMapScore[1],%i); + schedule(%callTime * %callCount++,0,"addGLText",%line, %justLeft+130, 150 + (%i*20), "11 239 231", "RC", 15, 500); + %line = getField($pugMapOff[1],%i); + schedule(%callTime * %callCount++,0,"addGLText",%line, %justLeft+170, 150 + (%i*20), "11 239 231", "RC", 15, 500); + %line = getField($pugMapDef[1],%i); + schedule(%callTime * %callCount++,0,"addGLText",%line, %justLeft+210, 150 + (%i*20), "11 239 231", "RC", 15, 500); + %line = getField($pugMapKills[1],%i); + schedule(%callTime * %callCount++,0,"addGLText",%line, %justLeft+250, 150 + (%i*20), "11 239 231", "RC", 15, 500); + } + else if(%i >= %team1Size && %i < %team2Size){ + %line = %i+1 @ "." @ getField($pugMapName[2],%i); + schedule(%callTime * %callCount++,0,"addGLText",%line, %justLeft+300, 150 + (%i*20), "11 239 231", "RC", 15, 130); + %line = getField($pugMapScore[2],%i); + schedule(%callTime * %callCount++,0,"addGLText",%line, %justLeft+430, 150 + (%i*20), "11 239 231", "RC", 15, 500); + %line = getField($pugMapOff[2],%i); + schedule(%callTime * %callCount++,0,"addGLText",%line, %justLeft+470, 150 + (%i*20), "11 239 231", "RC", 15, 500); + %line = getField($pugMapDef[2],%i); + schedule(%callTime * %callCount++,0,"addGLText",%line, %justLeft+510, 150 + (%i*20), "11 239 231", "RC", 15, 500); + %line = getField($pugMapKills[2],%i); + schedule(%callTime * %callCount++,0,"addGLText",%line, %justLeft+550, 150 + (%i*20), "11 239 231", "RC", 15, 500); + } + } + + + //%line = getTaggedString($teamName[1]) SPC "Team"; + //schedule(%callTime * %callCount++,0,"addGLText",%line, %justLeft2, 100, "11 239 231", "RC", 30, 500); + %noValue = "NA"; %nameOffset = 120; %dataOffset = 130; %lineCount = 0; - %lineCountTeam2 = 0; + %lineCountTeam2 = 0; %justLeftTeam2 = 955; //%textln = getTextPosPixels(%line, 0, 0, "RC", 15); - %line = "Flag Grabs:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[1,"name","flagGrabsTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[1,"data","flagGrabsTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); - %lineCount++; - - %line = "Flag Caps:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[1,"name","flagCapsTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[1,"data","flagCapsTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); - %lineCount++; - - %line = "Flag Grab Speed:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[1,"name","grabSpeedMax"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[1,"data","grabSpeedMax"],0),%noValue," Kmh",1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); - %lineCount++; - - %line = "Flag Catch:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[1,"name","flagCatchTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[1,"data","flagCatchTG"],0),%noValue," Sec",2); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); - %lineCount++; - - %line = "Carrier Kills:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[1,"name","carrierKillsTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[1,"data","carrierKillsTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); - %lineCount++; - - %line = "Flag Defends:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[1,"name","flagDefendsTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[1,"data","flagDefendsTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); - %lineCount++; - - %line = "Escort Assists:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[1,"name","escortAssistsTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[1,"data","escortAssistsTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); - %lineCount++; - - %line = "Flags Thrown:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[1,"name","flagTossTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[1,"data","flagTossTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); - %lineCount++; - - %line = "Flag Returns:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[1,"name","flagReturnsTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[1,"data","flagReturnsTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); - %lineCount++; - - %line = "Flag Concuss:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[1,"name","concussFlagTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[1,"data","concussFlagTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); - %lineCount++; - - %line = "Flag Catch Speed:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[1,"name","flagCatchSpeedMax"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[1,"data","flagCatchSpeedMax"],0),%noValue," Kmh",0); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); - %lineCount++; - - %line = "Flag MA Catches:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[1,"name","maFlagCatchTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[1,"data","maFlagCatchTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); - %lineCount++; - - %line = "Intercepted Flags:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[1,"name","interceptedFlagTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[1,"data","interceptedFlagTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); - %lineCount++; - - %line = "Intercept Speed:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[1,"name","interceptSpeedMax"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[1,"data","interceptSpeedMax"],0),%noValue," Kmh",0); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); - %lineCount++; - - %line = "Intercepted Flags MA:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[1,"name","maInterceptedFlagTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[1,"data","maInterceptedFlagTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); - %lineCount++; - - %line = "Offensive Kills:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[1,"name","OffKillsTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[1,"data","OffKillsTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); - %lineCount++; - - %line = "Defensive Kills:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[1,"name","DefKillsTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[1,"data","DefKillsTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); - %lineCount++; - - %line = "Kill Assist:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[1,"name","assistTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[1,"data","assistTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); - %lineCount++; - - %line = "Distance Moved:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[1,"name","distMovTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[1,"data","distMovTG"],0),%noValue," Km",0); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); - %lineCount++; - - %line = "Highest Avg Speed:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[1,"name","avgSpeedAvg"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[1,"data","avgSpeedAvg"],0),%noValue," Kmh",0); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); - %lineCount++; - - %line = "Highest Top Speed:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[1,"name","maxSpeedMax"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[1,"data","maxSpeedMax"],0),%noValue," Kmh",0); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); - %lineCount++; - - %line = "Concuss Hits:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[1,"name","concussHitTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[1,"data","concussHitTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); - %lineCount++; - - %line = "Weapon Combos:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[1,"name","comboCountTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[1,"data","comboCountTG"],0),%noValue,"",0); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); - %lineCount++; - - %line = "First Kill:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[1,"name","firstKillTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[1,"data","firstKillTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); - %lineCount++; - - %line = "Last Kill:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[1,"name","lastKillTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[1,"data","lastKillTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); - %lineCount++; - - %line = "Best KDR:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[1,"name","kdrAvg"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[1,"data","kdrAvg"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); - %lineCount++; - - %line = "Shots Fired:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[1,"name","shotsFiredTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[1,"data","shotsFiredTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); - %lineCount++; - - %line = "Total Damage:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[1,"name","totalWepDmgTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[1,"data","totalWepDmgTG"],0),%noValue,"",0); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); - %lineCount++; - - %line = "Kill Streak:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[1,"name","killStreakMax"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[1,"data","killStreakMax"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); - %lineCount++; - - %line = "Mine + Disc Kills:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[1,"name","minePlusDiscKillTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[1,"data","minePlusDiscKillTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); - %lineCount++; - - %line = "Rear Shocklance:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[1,"name","shockRearShotTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[1,"data","shockRearShotTG"],0),%noValue,"",-1); + %line = "Flag Grabs:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[1,"name","flagGrabsTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[1,"data","flagGrabsTG"],0),%noValue,"",-1); schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); %lineCount++; - - - %line = "Flag Grabs:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[2,"name","flagGrabsTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[2,"data","flagGrabsTG"],0),%noValue,"",-1); + %line = "Flag Caps:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[1,"name","flagCapsTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[1,"data","flagCapsTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); + %lineCount++; + + %line = "Flag Grab Speed:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[1,"name","grabSpeedMax"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[1,"data","grabSpeedMax"],0),%noValue," Kmh",1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); + %lineCount++; + + %line = "Flag Catch:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[1,"name","flagCatchTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[1,"data","flagCatchTG"],0),%noValue," Sec",2); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); + %lineCount++; + + %line = "Carrier Kills:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[1,"name","carrierKillsTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[1,"data","carrierKillsTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); + %lineCount++; + + %line = "Flag Defends:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[1,"name","flagDefendsTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[1,"data","flagDefendsTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); + %lineCount++; + + %line = "Escort Assists:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[1,"name","escortAssistsTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[1,"data","escortAssistsTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); + %lineCount++; + + %line = "Flags Thrown:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[1,"name","flagTossTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[1,"data","flagTossTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); + %lineCount++; + + %line = "Flag Returns:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[1,"name","flagReturnsTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[1,"data","flagReturnsTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); + %lineCount++; + + %line = "Flag Concuss:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[1,"name","concussFlagTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[1,"data","concussFlagTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); + %lineCount++; + + %line = "Flag Catch Speed:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[1,"name","flagCatchSpeedMax"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[1,"data","flagCatchSpeedMax"],0),%noValue," Kmh",0); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); + %lineCount++; + + %line = "Flag MA Catches:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[1,"name","maFlagCatchTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[1,"data","maFlagCatchTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); + %lineCount++; + + %line = "Intercepted Flags:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[1,"name","interceptedFlagTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[1,"data","interceptedFlagTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); + %lineCount++; + + %line = "Intercept Speed:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[1,"name","interceptSpeedMax"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[1,"data","interceptSpeedMax"],0),%noValue," Kmh",0); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); + %lineCount++; + + %line = "Intercepted Flags MA:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[1,"name","maInterceptedFlagTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[1,"data","maInterceptedFlagTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); + %lineCount++; + + %line = "Offensive Kills:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[1,"name","OffKillsTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[1,"data","OffKillsTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); + %lineCount++; + + %line = "Defensive Kills:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[1,"name","DefKillsTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[1,"data","DefKillsTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); + %lineCount++; + + %line = "Kill Assist:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[1,"name","assistTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[1,"data","assistTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); + %lineCount++; + + %line = "Distance Moved:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[1,"name","distMovTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[1,"data","distMovTG"],0),%noValue," Km",0); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); + %lineCount++; + + %line = "Highest Avg Speed:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[1,"name","avgSpeedAvg"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[1,"data","avgSpeedAvg"],0),%noValue," Kmh",0); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); + %lineCount++; + + %line = "Highest Top Speed:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[1,"name","maxSpeedMax"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[1,"data","maxSpeedMax"],0),%noValue," Kmh",0); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); + %lineCount++; + + %line = "Concuss Hits:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[1,"name","concussHitTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[1,"data","concussHitTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); + %lineCount++; + + %line = "Weapon Combos:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[1,"name","comboCountTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[1,"data","comboCountTG"],0),%noValue,"",0); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); + %lineCount++; + + %line = "First Kill:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[1,"name","firstKillTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[1,"data","firstKillTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); + %lineCount++; + + %line = "Last Kill:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[1,"name","lastKillTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[1,"data","lastKillTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); + %lineCount++; + + %line = "Best KDR:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[1,"name","kdrAvg"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[1,"data","kdrAvg"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); + %lineCount++; + + %line = "Shots Fired:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[1,"name","shotsFiredTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[1,"data","shotsFiredTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); + %lineCount++; + + %line = "Total Damage:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[1,"name","totalWepDmgTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[1,"data","totalWepDmgTG"],0),%noValue,"",0); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); + %lineCount++; + + %line = "Kill Streak:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[1,"name","killStreakMax"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[1,"data","killStreakMax"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); + %lineCount++; + + %line = "Mine + Disc Kills:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[1,"name","minePlusDiscKillTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[1,"data","minePlusDiscKillTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); + %lineCount++; + + %line = "Rear Shocklance:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[1,"name","shockRearShotTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[1,"data","shockRearShotTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); + %lineCount++; + + + + %line = "Flag Grabs:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[2,"name","flagGrabsTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[2,"data","flagGrabsTG"],0),%noValue,"",-1); schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); %lineCountTeam2++; - - %line = "Flag Caps:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[2,"name","flagCapsTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[2,"data","flagCapsTG"],0),%noValue,"",-1); + + %line = "Flag Caps:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[2,"name","flagCapsTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[2,"data","flagCapsTG"],0),%noValue,"",-1); schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); %lineCountTeam2++; - - %line = "Flag Grab Speed:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[2,"name","grabSpeedMax"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[2,"data","grabSpeedMax"],0),%noValue," Kmh",1); + + %line = "Flag Grab Speed:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[2,"name","grabSpeedMax"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[2,"data","grabSpeedMax"],0),%noValue," Kmh",1); schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); %lineCountTeam2++; - - %line = "Flag Catch:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[2,"name","flagCatchTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[2,"data","flagCatchTG"],0),%noValue," Sec",1); + + %line = "Flag Catch:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[2,"name","flagCatchTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[2,"data","flagCatchTG"],0),%noValue," Sec",1); schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); %lineCountTeam2++; - - %line = "Carrier Kills:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[2,"name","carrierKillsTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[2,"data","carrierKillsTG"],0),%noValue,"",-1); + + %line = "Carrier Kills:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[2,"name","carrierKillsTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[2,"data","carrierKillsTG"],0),%noValue,"",-1); schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); %lineCountTeam2++; - - %line = "Flag Defends:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[2,"name","flagDefendsTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[2,"data","flagDefendsTG"],0),%noValue,"",-1); + + %line = "Flag Defends:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[2,"name","flagDefendsTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[2,"data","flagDefendsTG"],0),%noValue,"",-1); schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); %lineCountTeam2++; - - %line = "Escort Assists:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[2,"name","escortAssists"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[2,"data","escortAssists"],0),%noValue,"",-1); + + %line = "Escort Assists:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[2,"name","escortAssists"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[2,"data","escortAssists"],0),%noValue,"",-1); schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); %lineCountTeam2++; - - %line = "Flags Thrown:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[2,"name","flagTossTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[2,"data","flagTossTG"],0),%noValue,"",-1); + + %line = "Flags Thrown:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[2,"name","flagTossTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[2,"data","flagTossTG"],0),%noValue,"",-1); schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); %lineCountTeam2++; - - %line = "Flag Returns:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[2,"name","flagReturnsTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[2,"data","flagReturnsTG"],0),%noValue,"",-1); + + %line = "Flag Returns:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[2,"name","flagReturnsTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[2,"data","flagReturnsTG"],0),%noValue,"",-1); schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); %lineCountTeam2++; - - %line = "Flag Concuss:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[2,"name","concussFlagTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[2,"data","concussFlagTG"],0),%noValue,"",-1); + + %line = "Flag Concuss:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[2,"name","concussFlagTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[2,"data","concussFlagTG"],0),%noValue,"",-1); schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); %lineCountTeam2++; - - %line = "Flag Catch Speed:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[2,"name","flagCatchSpeedMax"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[2,"data","flagCatchSpeedMax"],0),%noValue," Kmh",0); + + %line = "Flag Catch Speed:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[2,"name","flagCatchSpeedMax"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[2,"data","flagCatchSpeedMax"],0),%noValue," Kmh",0); schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); %lineCountTeam2++; - - %line = "Flag MA Catches:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[2,"name","maFlagCatchTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[2,"data","maFlagCatchTG"],0),%noValue,"",-1); + + %line = "Flag MA Catches:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[2,"name","maFlagCatchTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[2,"data","maFlagCatchTG"],0),%noValue,"",-1); schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); %lineCountTeam2++; - - %line = "Intercepted Flags:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[2,"name","interceptedFlagTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[2,"data","interceptedFlagTG"],0),%noValue,"",-1); + + %line = "Intercepted Flags:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[2,"name","interceptedFlagTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[2,"data","interceptedFlagTG"],0),%noValue,"",-1); schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); %lineCountTeam2++; - - %line = "Intercept Speed:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[2,"name","interceptSpeedMax"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[2,"data","interceptSpeedMax"],0),%noValue," Kmh",0); + + %line = "Intercept Speed:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[2,"name","interceptSpeedMax"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[2,"data","interceptSpeedMax"],0),%noValue," Kmh",0); schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); %lineCountTeam2++; - - %line = "Intercepted Flags MA:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[2,"name","maInterceptedFlagTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[2,"data","maInterceptedFlagTG"],0),%noValue,"",-1); + + %line = "Intercepted Flags MA:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[2,"name","maInterceptedFlagTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[2,"data","maInterceptedFlagTG"],0),%noValue,"",-1); schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); %lineCountTeam2++; - - %line = "Offensive Kills:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[2,"name","OffKillsTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[2,"data","OffKillsTG"],0),%noValue,"",-1); + + %line = "Offensive Kills:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[2,"name","OffKillsTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[2,"data","OffKillsTG"],0),%noValue,"",-1); schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); %lineCountTeam2++; - - %line = "Defensive Kills:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[2,"name","DefKillsTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[2,"data","DefKillsTG"],0),%noValue,"",-1); + + %line = "Defensive Kills:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[2,"name","DefKillsTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[2,"data","DefKillsTG"],0),%noValue,"",-1); schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); %lineCountTeam2++; - - %line = "Kill Assist:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[2,"name","assistTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[2,"data","assistTG"],0),%noValue,"",-1); + + %line = "Kill Assist:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[2,"name","assistTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[2,"data","assistTG"],0),%noValue,"",-1); schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); %lineCountTeam2++; - - %line = "Distance Moved:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[2,"name","distMovTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[2,"data","distMovTG"],0),%noValue," Km",0); + + %line = "Distance Moved:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[2,"name","distMovTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[2,"data","distMovTG"],0),%noValue," Km",0); schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); %lineCountTeam2++; - - %line = "Highest Avg Speed:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[2,"name","avgSpeedAvg"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[2,"data","avgSpeedAvg"],0),%noValue," Kmh",0); + + %line = "Highest Avg Speed:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[2,"name","avgSpeedAvg"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[2,"data","avgSpeedAvg"],0),%noValue," Kmh",0); schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); %lineCountTeam2++; - - %line = "Highest Top Speed:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[2,"name","maxSpeedMax"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[2,"data","maxSpeedMax"],0),%noValue," Kmh",0); + + %line = "Highest Top Speed:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[2,"name","maxSpeedMax"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[2,"data","maxSpeedMax"],0),%noValue," Kmh",0); schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); %lineCountTeam2++; - - %line = "Concuss Hits:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[2,"name","concussHitTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[2,"data","concussHitTG"],0),%noValue,"",0); + + %line = "Concuss Hits:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[2,"name","concussHitTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[2,"data","concussHitTG"],0),%noValue,"",0); schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); %lineCountTeam2++; - - %line = "Weapon Combos:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[2,"name","comboCountTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[2,"data","comboCountTG"],0),%noValue,"",-1); + + %line = "Weapon Combos:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[2,"name","comboCountTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[2,"data","comboCountTG"],0),%noValue,"",-1); schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); %lineCountTeam2++; - - %line = "First Kill:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[2,"name","firstKillTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[2,"data","firstKillTG"],0),%noValue,"",-1); + + %line = "First Kill:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[2,"name","firstKillTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[2,"data","firstKillTG"],0),%noValue,"",-1); schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); %lineCountTeam2++; - - %line = "Last Kill:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[2,"name","lastKillTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[2,"data","lastKillTG"],0),%noValue,"",-1); + + %line = "Last Kill:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[2,"name","lastKillTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[2,"data","lastKillTG"],0),%noValue,"",-1); schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); %lineCountTeam2++; - - %line = "Best KDR:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[2,"name","kdrAvg"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[2,"data","kdrAvg"],0),%noValue,"",-1); + + %line = "Best KDR:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[2,"name","kdrAvg"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[2,"data","kdrAvg"],0),%noValue,"",-1); schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); %lineCountTeam2++; - - %line = "Shots Fired:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[2,"name","shotsFiredTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[2,"data","shotsFiredTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); - %lineCountTeam2++; - - %line = "Total Damage:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[2,"name","totalWepDmgTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[2,"data","totalWepDmgTG"],0),%noValue,"",0); + + %line = "Shots Fired:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[2,"name","shotsFiredTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[2,"data","shotsFiredTG"],0),%noValue,"",-1); schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); %lineCountTeam2++; - - %line = "Kill Streak:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[2,"name","killStreakMax"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[2,"data","killStreakMax"],0),%noValue,"",-1); + + %line = "Total Damage:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[2,"name","totalWepDmgTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[2,"data","totalWepDmgTG"],0),%noValue,"",0); schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); %lineCountTeam2++; - - %line = "Mine + Disc Kills:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[2,"name","minePlusDiscKillTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[2,"data","minePlusDiscKillTG"],0),%noValue,"",-1); + + %line = "Kill Streak:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[2,"name","killStreakMax"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[2,"data","killStreakMax"],0),%noValue,"",-1); schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); %lineCountTeam2++; - - %line = "Rear Shocklance:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[2,"name","shockRearShotTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[2,"data","shockRearShotTG"],0),%noValue,"",-1); + + %line = "Mine + Disc Kills:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[2,"name","minePlusDiscKillTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[2,"data","minePlusDiscKillTG"],0),%noValue,"",-1); schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); %lineCountTeam2++; - + + %line = "Rear Shocklance:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[2,"name","shockRearShotTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[2,"data","shockRearShotTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); + %lineCountTeam2++; + %wepLineCount = %vehLineCount = 24; - - + + %killOffSet = 50; %killValue = 150; %midAirs =185; @@ -18587,149 +18592,149 @@ function renderLCTFMapTextTM(%id){ %damageValue = 420; %dist = 455; %distValue = 555; - %line = "Weapons"; + %line = "Weapons"; schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft, 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 500); - %line = "Kills"; + %line = "Kills"; schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %killOffSet , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 500); - %line = ""; + %line = ""; schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %killValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 500); - %line = "MidAirs"; + %line = "MidAirs"; schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %midAirs , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 500); - %line = ""; + %line = ""; schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %midAirValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 500); - %line = "MA Distance"; + %line = "MA Distance"; schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %damage , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 500); - %line = ""; + %line = ""; schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %damageValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 500); - %line = "Damage"; + %line = "Damage"; schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %dist , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 500); - %line = ""; + %line = ""; schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %distValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 500); %wepLineCount++; - - - %line = "Blaster"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft, 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[0,"name","blasterKillsTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %killOffSet , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %line = hasValueC(getField($pugMapData[0,"data","blasterKillsTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %killValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %line = hasValueC(getField($pugMapData[0,"name","blasterMATG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %midAirs , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %line = hasValueC(getField($pugMapData[0,"data","blasterMATG"],0),0,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %midAirValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %line = hasValueC(getField($pugMapData[0,"name","blasterMAHitDistMax"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %damage , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %line = hasValueC(getField($pugMapData[0,"data","blasterMAHitDistMax"],0),0,"",0); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %damageValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %line = hasValueC(getField($pugMapData[0,"name","blasterDmgTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %dist , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %line = hasValueC(getField($pugMapData[0,"data","blasterDmgTG"],0),0,"",1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %distValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %wepLineCount++; - - %line = "Plasma"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft, 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[0,"name","plasmaKillsTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %killOffSet , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %line = hasValueC(getField($pugMapData[0,"data","plasmaKillsTG"],0),0,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %killValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %line = hasValueC(getField($pugMapData[0,"name","plasmaMATG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %midAirs , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %line = hasValueC(getField($pugMapData[0,"data","plasmaMATG"],0),0,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %midAirValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %line = hasValueC(getField($pugMapData[0,"name","plasmaMAHitDistMax"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %damage , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %line = hasValueC(getField($pugMapData[0,"data","plasmaMAHitDistMax"],0),0,"",0); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %damageValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %line = hasValueC(getField($pugMapData[0,"name","plasmaDmgTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %dist , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %line = hasValueC(getField($pugMapData[0,"data","plasmaDmgTG"],0),0,"",1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %distValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %wepLineCount++; - - %line = "Chaingun"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft, 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[0,"name","cgKillsTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %killOffSet , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %line = hasValueC(getField($pugMapData[0,"data","cgKillsTG"],0),0,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %killValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %line = hasValueC(getField($pugMapData[0,"name","cgMATG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %midAirs , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %line = hasValueC(getField($pugMapData[0,"data","cgMATG"],0),0,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %midAirValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %line = hasValueC(getField($pugMapData[0,"name","cgMAHitDistMax"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %damage , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %line = hasValueC(getField($pugMapData[0,"data","cgMAHitDistMax"],0),0,"",0); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %damageValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %line = hasValueC(getField($pugMapData[0,"name","cgDmgTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %dist , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %line = hasValueC(getField($pugMapData[0,"data","cgDmgTG"],0),0,"",1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %distValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %wepLineCount++; - - %line = "Spinfusor"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft, 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[0,"name","discKillsTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %killOffSet , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %line = hasValueC(getField($pugMapData[0,"data","discKillsTG"],0),0,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %killValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %line = hasValueC(getField($pugMapData[0,"name","discMATG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %midAirs , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %line = hasValueC(getField($pugMapData[0,"data","discMATG"],0),0,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %midAirValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %line = hasValueC(getField($pugMapData[0,"name","discMAHitDistMax"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %damage , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %line = hasValueC(getField($pugMapData[0,"data","discMAHitDistMax"],0),0,"",0); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %damageValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %line = hasValueC(getField($pugMapData[0,"name","discDmgTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %dist , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %line = hasValueC(getField($pugMapData[0,"data","discDmgTG"],0),0,"",1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %distValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %wepLineCount++; - - %line = "Grenade"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft, 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[0,"name","grenadeKillsTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %killOffSet , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %line = hasValueC(getField($pugMapData[0,"data","grenadeKillsTG"],0),0,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %killValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %line = hasValueC(getField($pugMapData[0,"name","grenadeMATG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %midAirs , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %line = hasValueC(getField($pugMapData[0,"data","grenadeMATG"],0),0,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %midAirValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %line = hasValueC(getField($pugMapData[0,"name","grenadeMAHitDistMax"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %damage , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %line = hasValueC(getField($pugMapData[0,"data","grenadeMAHitDistMax"],0),0,"",0); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %damageValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %line = hasValueC(getField($pugMapData[0,"name","grenadeDmgTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %dist , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %line = hasValueC(getField($pugMapData[0,"data","grenadeDmgTG"],0),0,"",1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %distValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %wepLineCount++; - %line = "Shock"; + + %line = "Blaster"; schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft, 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[0,"name","shockKillsTG"],0),%noValue,"",-1); + %line = hasValueC(getField($pugMapData[0,"name","blasterKillsTG"],0),%noValue,"",-1); schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %killOffSet , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %line = hasValueC(getField($pugMapData[0,"data","shockKillsTG"],0),0,"",-1); + %line = hasValueC(getField($pugMapData[0,"data","blasterKillsTG"],0),%noValue,"",-1); schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %killValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %line = hasValueC(getField($pugMapData[0,"name","shockMATG"],0),%noValue,"",-1); + %line = hasValueC(getField($pugMapData[0,"name","blasterMATG"],0),%noValue,"",-1); schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %midAirs , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %line = hasValueC(getField($pugMapData[0,"data","shockMATG"],0),0,"",-1); + %line = hasValueC(getField($pugMapData[0,"data","blasterMATG"],0),0,"",-1); schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %midAirValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %line = hasValueC(getField($pugMapData[0,"name","shockMAHitDistMax"],0),%noValue,"",-1); + %line = hasValueC(getField($pugMapData[0,"name","blasterMAHitDistMax"],0),%noValue,"",-1); schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %damage , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %line = hasValueC(getField($pugMapData[0,"data","shockMAHitDistMax"],0),0,"",1); + %line = hasValueC(getField($pugMapData[0,"data","blasterMAHitDistMax"],0),0,"",0); schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %damageValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %line = hasValueC(getField($pugMapData[0,"name","shockDmgTG"],0),%noValue,"",-1); + %line = hasValueC(getField($pugMapData[0,"name","blasterDmgTG"],0),%noValue,"",-1); schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %dist , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %line = hasValueC(getField($pugMapData[0,"data","shockDmgTG"],0),0,"",1); + %line = hasValueC(getField($pugMapData[0,"data","blasterDmgTG"],0),0,"",1); schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %distValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %wepLineCount++; %wepLineCount++; - + %line = "Plasma"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft, 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[0,"name","plasmaKillsTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %killOffSet , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); + %line = hasValueC(getField($pugMapData[0,"data","plasmaKillsTG"],0),0,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %killValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); + %line = hasValueC(getField($pugMapData[0,"name","plasmaMATG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %midAirs , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); + %line = hasValueC(getField($pugMapData[0,"data","plasmaMATG"],0),0,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %midAirValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); + %line = hasValueC(getField($pugMapData[0,"name","plasmaMAHitDistMax"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %damage , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); + %line = hasValueC(getField($pugMapData[0,"data","plasmaMAHitDistMax"],0),0,"",0); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %damageValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); + %line = hasValueC(getField($pugMapData[0,"name","plasmaDmgTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %dist , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); + %line = hasValueC(getField($pugMapData[0,"data","plasmaDmgTG"],0),0,"",1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %distValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); + %wepLineCount++; + + %line = "Chaingun"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft, 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[0,"name","cgKillsTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %killOffSet , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); + %line = hasValueC(getField($pugMapData[0,"data","cgKillsTG"],0),0,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %killValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); + %line = hasValueC(getField($pugMapData[0,"name","cgMATG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %midAirs , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); + %line = hasValueC(getField($pugMapData[0,"data","cgMATG"],0),0,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %midAirValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); + %line = hasValueC(getField($pugMapData[0,"name","cgMAHitDistMax"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %damage , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); + %line = hasValueC(getField($pugMapData[0,"data","cgMAHitDistMax"],0),0,"",0); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %damageValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); + %line = hasValueC(getField($pugMapData[0,"name","cgDmgTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %dist , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); + %line = hasValueC(getField($pugMapData[0,"data","cgDmgTG"],0),0,"",1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %distValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); + %wepLineCount++; + + %line = "Spinfusor"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft, 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[0,"name","discKillsTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %killOffSet , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); + %line = hasValueC(getField($pugMapData[0,"data","discKillsTG"],0),0,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %killValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); + %line = hasValueC(getField($pugMapData[0,"name","discMATG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %midAirs , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); + %line = hasValueC(getField($pugMapData[0,"data","discMATG"],0),0,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %midAirValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); + %line = hasValueC(getField($pugMapData[0,"name","discMAHitDistMax"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %damage , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); + %line = hasValueC(getField($pugMapData[0,"data","discMAHitDistMax"],0),0,"",0); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %damageValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); + %line = hasValueC(getField($pugMapData[0,"name","discDmgTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %dist , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); + %line = hasValueC(getField($pugMapData[0,"data","discDmgTG"],0),0,"",1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %distValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); + %wepLineCount++; + + %line = "Grenade"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft, 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[0,"name","grenadeKillsTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %killOffSet , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); + %line = hasValueC(getField($pugMapData[0,"data","grenadeKillsTG"],0),0,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %killValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); + %line = hasValueC(getField($pugMapData[0,"name","grenadeMATG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %midAirs , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); + %line = hasValueC(getField($pugMapData[0,"data","grenadeMATG"],0),0,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %midAirValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); + %line = hasValueC(getField($pugMapData[0,"name","grenadeMAHitDistMax"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %damage , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); + %line = hasValueC(getField($pugMapData[0,"data","grenadeMAHitDistMax"],0),0,"",0); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %damageValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); + %line = hasValueC(getField($pugMapData[0,"name","grenadeDmgTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %dist , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); + %line = hasValueC(getField($pugMapData[0,"data","grenadeDmgTG"],0),0,"",1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %distValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); + %wepLineCount++; + + %line = "Shock"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft, 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[0,"name","shockKillsTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %killOffSet , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); + %line = hasValueC(getField($pugMapData[0,"data","shockKillsTG"],0),0,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %killValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); + %line = hasValueC(getField($pugMapData[0,"name","shockMATG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %midAirs , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); + %line = hasValueC(getField($pugMapData[0,"data","shockMATG"],0),0,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %midAirValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); + %line = hasValueC(getField($pugMapData[0,"name","shockMAHitDistMax"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %damage , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); + %line = hasValueC(getField($pugMapData[0,"data","shockMAHitDistMax"],0),0,"",1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %damageValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); + %line = hasValueC(getField($pugMapData[0,"name","shockDmgTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %dist , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); + %line = hasValueC(getField($pugMapData[0,"data","shockDmgTG"],0),0,"",1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %distValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); + %wepLineCount++; + %wepLineCount++; + + if(%id $= "") return; %img = new fileObject(); @@ -18743,7 +18748,7 @@ function renderLCTFMapTextTM(%id){ %img.yc = 0; %img.py = 0; %img.pct = 0; - schedule(%callTime * %callCount++, 0, "pugImgCycle2",%img); + schedule(%callTime * %callCount++, 0, "pugImgCycle2",%img); } function renderCTFMapTextTM(%id){ @@ -18751,33 +18756,33 @@ function renderCTFMapTextTM(%id){ deleteVariables("$textColor*"); %sizeX = 1280+20; %sizeY = 1115; - + %callTime = 8; %spaceing = 20; %justLeft = 355; %justLeft2 = 55; - %header = getField($pugMapInfo,0) SPC "CTF"; + %header = getField($pugMapInfo,0) SPC "CTF"; %header = stripChars(%header, "!\"#$%&'()*+,./:;<=>?@[\\]^'{|}~\t\n\r1234567890"); %header = strreplace(%header,"-", " "); %header = strreplace(%header,"_", " "); - + %hsize = getTextLengthInPixels(%header, "T2", 32);//30 - schedule(%callTime * %callCount++,0,"addGLText",%header, mFloor(%sizeX / 2) - mFloor(%hsize / 2), 55, "11 239 231", "T2", 32, 1000);//30 - + schedule(%callTime * %callCount++,0,"addGLText",%header, mFloor(%sizeX / 2) - mFloor(%hsize / 2), 55, "11 239 231", "T2", 32, 1000);//30 + %date = getField($pugMapInfo,3); %hsize = getTextLengthInPixels(%date, "RC", 12); schedule(%callTime * %callCount++,0,"addGLText",%date, mFloor(%sizeX / 2) - mFloor(%hsize / 2), 85, "11 239 231", "RC", 12, 500); - - %line = "Storm"; + + %line = "Storm"; schedule(%callTime * %callCount++,0,"addGLText",%line, %justLeft, 100, "11 239 231", "RC", 30, 500); - %line = getWord(getField($pugMapInfo,4),0); - schedule(%callTime * %callCount++,0,"addGLText",%line, %justLeft+100, 100, "11 239 231", "RC", 30, 500); - %line = "Inferno"; + %line = getWord(getField($pugMapInfo,4),0); + schedule(%callTime * %callCount++,0,"addGLText",%line, %justLeft+100, 100, "11 239 231", "RC", 30, 500); + %line = "Inferno"; schedule(%callTime * %callCount++,0,"addGLText",%line, %justLeft+300, 100, "11 239 231", "RC", 30, 500); - %line = getWord(getField($pugMapInfo,4),1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %justLeft+400, 100, "11 239 231", "RC", 30, 500); - + %line = getWord(getField($pugMapInfo,4),1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %justLeft+400, 100, "11 239 231", "RC", 30, 500); + schedule(%callTime * %callCount++,0,"addGLText","Player", %justLeft, 130, "11 239 231", "RC", 15, 500); schedule(%callTime * %callCount++,0,"addGLText","Score", %justLeft+130, 130, "11 239 231", "RC", 15, 500); schedule(%callTime * %callCount++,0,"addGLText","Off", %justLeft+170, 130, "11 239 231", "RC", 15, 500); @@ -18788,545 +18793,545 @@ function renderCTFMapTextTM(%id){ schedule(%callTime * %callCount++,0,"addGLText","Off", %justLeft+470, 130, "11 239 231", "RC", 15, 500); schedule(%callTime * %callCount++,0,"addGLText","Def", %justLeft+510, 130, "11 239 231", "RC", 15, 500); schedule(%callTime * %callCount++,0,"addGLText","Kills", %justLeft+550, 130, "11 239 231", "RC", 15, 500); - + %team1Size = getFieldCount($pugMapName[1]); %team2Size = getFieldCount($pugMapName[2]); - %teamsize = (%team1Size >%team2Size) ? %team1Size :%team2Size; + %teamsize = (%team1Size >%team2Size) ? %team1Size :%team2Size; %teamsize = %teamsize <= 32 ? %teamsize : 32; for(%i=0; %i < %teamsize; %i++){ if(%i < %team1Size && %i < %team2Size){ - %line = %i+1 @ "." @ getField($pugMapName[1],%i); + %line = %i+1 @ "." @ getField($pugMapName[1],%i); schedule(%callTime * %callCount++,0,"addGLText",%line, %justLeft, 150 + (%i*20), "11 239 231", "RC", 15, 130); %line = getField($pugMapScore[1],%i); schedule(%callTime * %callCount++,0,"addGLText",%line, %justLeft+130, 150 + (%i*20), "11 239 231", "RC", 15, 500); %line = getField($pugMapOff[1],%i); schedule(%callTime * %callCount++,0,"addGLText",%line, %justLeft+170, 150 + (%i*20), "11 239 231", "RC", 15, 500); - %line = getField($pugMapDef[1],%i); + %line = getField($pugMapDef[1],%i); schedule(%callTime * %callCount++,0,"addGLText",%line, %justLeft+210, 150 + (%i*20), "11 239 231", "RC", 15, 500); - %line = getField($pugMapKills[1],%i); + %line = getField($pugMapKills[1],%i); schedule(%callTime * %callCount++,0,"addGLText",%line, %justLeft+250, 150 + (%i*20), "11 239 231", "RC", 15, 500); - %line = %i+1 @ "." @ getField($pugMapName[2],%i); - schedule(%callTime * %callCount++,0,"addGLText",%line, %justLeft+300, 150 + (%i*20), "11 239 231", "RC", 15, 130); - %line = getField($pugMapScore[2],%i); - schedule(%callTime * %callCount++,0,"addGLText",%line, %justLeft+430, 150 + (%i*20), "11 239 231", "RC", 15, 500); - %line = getField($pugMapOff[2],%i); - schedule(%callTime * %callCount++,0,"addGLText",%line, %justLeft+470, 150 + (%i*20), "11 239 231", "RC", 15, 500); - %line = getField($pugMapDef[2],%i); - schedule(%callTime * %callCount++,0,"addGLText",%line, %justLeft+510, 150 + (%i*20), "11 239 231", "RC", 15, 500); - %line = getField($pugMapKills[2],%i); - schedule(%callTime * %callCount++,0,"addGLText",%line, %justLeft+550, 150 + (%i*20), "11 239 231", "RC", 15, 500); - } - else if(%i < %team1Size && %i >= %team2Size){ - %line = %i+1 @ "." @ getField($pugMapName[1],%i); - schedule(%callTime * %callCount++,0,"addGLText",%line, %justLeft, 150 + (%i*20), "11 239 231", "RC", 15, 130); - %line = getField($pugMapScore[1],%i); - schedule(%callTime * %callCount++,0,"addGLText",%line, %justLeft+130, 150 + (%i*20), "11 239 231", "RC", 15, 500); - %line = getField($pugMapOff[1],%i); - schedule(%callTime * %callCount++,0,"addGLText",%line, %justLeft+170, 150 + (%i*20), "11 239 231", "RC", 15, 500); - %line = getField($pugMapDef[1],%i); - schedule(%callTime * %callCount++,0,"addGLText",%line, %justLeft+210, 150 + (%i*20), "11 239 231", "RC", 15, 500); - %line = getField($pugMapKills[1],%i); - schedule(%callTime * %callCount++,0,"addGLText",%line, %justLeft+250, 150 + (%i*20), "11 239 231", "RC", 15, 500); - } - else if(%i >= %team1Size && %i < %team2Size){ - %line = %i+1 @ "." @ getField($pugMapName[2],%i); + %line = %i+1 @ "." @ getField($pugMapName[2],%i); schedule(%callTime * %callCount++,0,"addGLText",%line, %justLeft+300, 150 + (%i*20), "11 239 231", "RC", 15, 130); %line = getField($pugMapScore[2],%i); schedule(%callTime * %callCount++,0,"addGLText",%line, %justLeft+430, 150 + (%i*20), "11 239 231", "RC", 15, 500); %line = getField($pugMapOff[2],%i); schedule(%callTime * %callCount++,0,"addGLText",%line, %justLeft+470, 150 + (%i*20), "11 239 231", "RC", 15, 500); - %line = getField($pugMapDef[2],%i); + %line = getField($pugMapDef[2],%i); schedule(%callTime * %callCount++,0,"addGLText",%line, %justLeft+510, 150 + (%i*20), "11 239 231", "RC", 15, 500); - %line = getField($pugMapKills[2],%i); + %line = getField($pugMapKills[2],%i); schedule(%callTime * %callCount++,0,"addGLText",%line, %justLeft+550, 150 + (%i*20), "11 239 231", "RC", 15, 500); } - } - - - //%line = getTaggedString($teamName[1]) SPC "Team"; - //schedule(%callTime * %callCount++,0,"addGLText",%line, %justLeft2, 100, "11 239 231", "RC", 30, 500); - + else if(%i < %team1Size && %i >= %team2Size){ + %line = %i+1 @ "." @ getField($pugMapName[1],%i); + schedule(%callTime * %callCount++,0,"addGLText",%line, %justLeft, 150 + (%i*20), "11 239 231", "RC", 15, 130); + %line = getField($pugMapScore[1],%i); + schedule(%callTime * %callCount++,0,"addGLText",%line, %justLeft+130, 150 + (%i*20), "11 239 231", "RC", 15, 500); + %line = getField($pugMapOff[1],%i); + schedule(%callTime * %callCount++,0,"addGLText",%line, %justLeft+170, 150 + (%i*20), "11 239 231", "RC", 15, 500); + %line = getField($pugMapDef[1],%i); + schedule(%callTime * %callCount++,0,"addGLText",%line, %justLeft+210, 150 + (%i*20), "11 239 231", "RC", 15, 500); + %line = getField($pugMapKills[1],%i); + schedule(%callTime * %callCount++,0,"addGLText",%line, %justLeft+250, 150 + (%i*20), "11 239 231", "RC", 15, 500); + } + else if(%i >= %team1Size && %i < %team2Size){ + %line = %i+1 @ "." @ getField($pugMapName[2],%i); + schedule(%callTime * %callCount++,0,"addGLText",%line, %justLeft+300, 150 + (%i*20), "11 239 231", "RC", 15, 130); + %line = getField($pugMapScore[2],%i); + schedule(%callTime * %callCount++,0,"addGLText",%line, %justLeft+430, 150 + (%i*20), "11 239 231", "RC", 15, 500); + %line = getField($pugMapOff[2],%i); + schedule(%callTime * %callCount++,0,"addGLText",%line, %justLeft+470, 150 + (%i*20), "11 239 231", "RC", 15, 500); + %line = getField($pugMapDef[2],%i); + schedule(%callTime * %callCount++,0,"addGLText",%line, %justLeft+510, 150 + (%i*20), "11 239 231", "RC", 15, 500); + %line = getField($pugMapKills[2],%i); + schedule(%callTime * %callCount++,0,"addGLText",%line, %justLeft+550, 150 + (%i*20), "11 239 231", "RC", 15, 500); + } + } + + + //%line = getTaggedString($teamName[1]) SPC "Team"; + //schedule(%callTime * %callCount++,0,"addGLText",%line, %justLeft2, 100, "11 239 231", "RC", 30, 500); + %noValue = "NA"; %nameOffset = 120; %dataOffset = 130; %lineCount = 0; - %lineCountTeam2 = 0; + %lineCountTeam2 = 0; %justLeftTeam2 = 955; //%textln = getTextPosPixels(%line, 0, 0, "RC", 15); - %line = "Flag Grabs:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[1,"name","flagGrabsTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[1,"data","flagGrabsTG"],0),%noValue,"",-1); + %line = "Flag Grabs:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[1,"name","flagGrabsTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[1,"data","flagGrabsTG"],0),%noValue,"",-1); schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); %lineCount++; - - %line = "Flag Caps:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[1,"name","flagCapsTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[1,"data","flagCapsTG"],0),%noValue,"",-1); + + %line = "Flag Caps:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[1,"name","flagCapsTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[1,"data","flagCapsTG"],0),%noValue,"",-1); schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); %lineCount++; - - %line = "Flag Grab Speed:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[1,"name","grabSpeedMax"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[1,"data","grabSpeedMax"],0),%noValue," Kmh",1); + + %line = "Flag Grab Speed:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[1,"name","grabSpeedMax"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[1,"data","grabSpeedMax"],0),%noValue," Kmh",1); schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); %lineCount++; - - %line = "Flag Catch:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[1,"name","flagCatchTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[1,"data","flagCatchTG"],0),%noValue,"",2); + + %line = "Flag Catch:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[1,"name","flagCatchTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[1,"data","flagCatchTG"],0),%noValue,"",2); schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); %lineCount++; - - %line = "Carrier Kills:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[1,"name","carrierKillsTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[1,"data","carrierKillsTG"],0),%noValue,"",-1); + + %line = "Carrier Kills:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[1,"name","carrierKillsTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[1,"data","carrierKillsTG"],0),%noValue,"",-1); schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); %lineCount++; - - %line = "Flag Defends:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[1,"name","flagDefendsTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[1,"data","flagDefendsTG"],0),%noValue,"",-1); + + %line = "Flag Defends:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[1,"name","flagDefendsTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[1,"data","flagDefendsTG"],0),%noValue,"",-1); schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); %lineCount++; - - %line = "Escort Assists:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[1,"name","escortAssistsTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[1,"data","escortAssistsTG"],0),%noValue,"",-1); + + %line = "Escort Assists:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[1,"name","escortAssistsTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[1,"data","escortAssistsTG"],0),%noValue,"",-1); schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); %lineCount++; - - %line = "Flags Thrown:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[1,"name","flagTossTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[1,"data","flagTossTG"],0),%noValue,"",-1); + + %line = "Flags Thrown:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[1,"name","flagTossTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[1,"data","flagTossTG"],0),%noValue,"",-1); schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); %lineCount++; - - %line = "Flag Returns:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[1,"name","flagReturnsTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[1,"data","flagReturnsTG"],0),%noValue,"",-1); + + %line = "Flag Returns:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[1,"name","flagReturnsTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[1,"data","flagReturnsTG"],0),%noValue,"",-1); schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); %lineCount++; - - %line = "Flag Concuss:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[1,"name","concussFlagTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[1,"data","concussFlagTG"],0),%noValue,"",-1); + + %line = "Flag Concuss:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[1,"name","concussFlagTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[1,"data","concussFlagTG"],0),%noValue,"",-1); schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); %lineCount++; - - %line = "Offensive Kills:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[1,"name","OffKillsTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[1,"data","OffKillsTG"],0),%noValue,"",-1); + + %line = "Offensive Kills:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[1,"name","OffKillsTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[1,"data","OffKillsTG"],0),%noValue,"",-1); schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); %lineCount++; - - %line = "Defensive Kills:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[1,"name","DefKillsTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[1,"data","DefKillsTG"],0),%noValue,"",-1); + + %line = "Defensive Kills:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[1,"name","DefKillsTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[1,"data","DefKillsTG"],0),%noValue,"",-1); schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); %lineCount++; - - %line = "Repairs:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[1,"name","repairsTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[1,"data","repairsTG"],0),%noValue,"",-1); + + %line = "Repairs:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[1,"name","repairsTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[1,"data","repairsTG"],0),%noValue,"",-1); schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); %lineCount++; - - %line = "Destruction:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); + + %line = "Destruction:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); %line = hasValueC(getField($pugMapData[1,"name","destructionTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[1,"data","destructionTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); - %lineCount++; - - %line = "Gens Destroyed:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[1,"name","genDestroysTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[1,"data","genDestroysTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); - %lineCount++; - - %line = "Gens Repairs"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[1,"name","genSolRepairsTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[1,"data","genSolRepairsTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); - %lineCount++; - - %line = "Indoor Turret Kills:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[1,"name","indoorDepTurretKillsTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[1,"data","indoorDepTurretKillsTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[1,"data","destructionTG"],0),%noValue,"",-1); schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); %lineCount++; - - %line = "Outdoor Turret Kills:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[1,"name","outdoorDepTurretKillsTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[1,"data","outdoorDepTurretKillsTG"],0),%noValue,"",-1); + + %line = "Gens Destroyed:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[1,"name","genDestroysTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[1,"data","genDestroysTG"],0),%noValue,"",-1); schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); %lineCount++; - - %line = "Deploy Invy Use:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[1,"name","depInvyUseTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[1,"data","depInvyUseTG"],0),%noValue,"",-1); + + %line = "Gens Repairs"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[1,"name","genSolRepairsTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[1,"data","genSolRepairsTG"],0),%noValue,"",-1); schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); %lineCount++; - - %line = "Inventorys Deployed:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[1,"name","InventoryDepTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[1,"data","InventoryDepTG"],0),%noValue,"",-1); + + %line = "Indoor Turret Kills:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[1,"name","indoorDepTurretKillsTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[1,"data","indoorDepTurretKillsTG"],0),%noValue,"",-1); schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); %lineCount++; - - %line = "Kill Assist:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[1,"name","assistTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[1,"data","assistTG"],0),%noValue,"",-1); + + %line = "Outdoor Turret Kills:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[1,"name","outdoorDepTurretKillsTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[1,"data","outdoorDepTurretKillsTG"],0),%noValue,"",-1); schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); %lineCount++; - - %line = "Distance Moved:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[1,"name","distMovTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[1,"data","distMovTG"],0),%noValue," Km",0); + + %line = "Deploy Invy Use:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[1,"name","depInvyUseTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[1,"data","depInvyUseTG"],0),%noValue,"",-1); schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); %lineCount++; - - - %line = "Highest Avg Speed:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[1,"name","avgSpeedAvg"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[1,"data","avgSpeedAvg"],0),%noValue," Kmh",0); + + %line = "Inventorys Deployed:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[1,"name","InventoryDepTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[1,"data","InventoryDepTG"],0),%noValue,"",-1); schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); %lineCount++; - - %line = "Highest Top Speed:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[1,"name","maxSpeedMax"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[1,"data","maxSpeedMax"],0),%noValue," Kmh",0); + + %line = "Kill Assist:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[1,"name","assistTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[1,"data","assistTG"],0),%noValue,"",-1); schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); %lineCount++; - - %line = "Sensors Deployed:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[1,"name","SensorsDepTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[1,"data","SensorsDepTG"],0),%noValue,"",-1); + + %line = "Distance Moved:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[1,"name","distMovTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[1,"data","distMovTG"],0),%noValue," Km",0); schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); %lineCount++; - - %line = "Shield Block Damage:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[1,"name","shieldPackDmgTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[1,"data","shieldPackDmgTG"],0),%noValue,"",2); + + + %line = "Highest Avg Speed:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[1,"name","avgSpeedAvg"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[1,"data","avgSpeedAvg"],0),%noValue," Kmh",0); schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); %lineCount++; - - %line = "Stealth Kills:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[1,"name","cloakerKillsTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[1,"data","cloakerKillsTG"],0),%noValue,"",-1); + + %line = "Highest Top Speed:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[1,"name","maxSpeedMax"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[1,"data","maxSpeedMax"],0),%noValue," Kmh",0); schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); %lineCount++; - - %line = "Cloakers Killed:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[1,"name","cloakersKilledTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[1,"data","cloakersKilledTG"],0),%noValue,"",-1); + + %line = "Sensors Deployed:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[1,"name","SensorsDepTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[1,"data","SensorsDepTG"],0),%noValue,"",-1); schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); %lineCount++; - - %line = "Sensor Jammer:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[1,"name","jammerTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[1,"data","jammerTG"],0),%noValue,"",-1); + + %line = "Shield Block Damage:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[1,"name","shieldPackDmgTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[1,"data","shieldPackDmgTG"],0),%noValue,"",2); schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); - - - - - - - %line = "Flag Grabs:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[2,"name","flagGrabsTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[2,"data","flagGrabsTG"],0),%noValue,"",-1); + %lineCount++; + + %line = "Stealth Kills:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[1,"name","cloakerKillsTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[1,"data","cloakerKillsTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); + %lineCount++; + + %line = "Cloakers Killed:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[1,"name","cloakersKilledTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[1,"data","cloakersKilledTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); + %lineCount++; + + %line = "Sensor Jammer:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[1,"name","jammerTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[1,"data","jammerTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCount*20), "11 239 231", "RC", 15, 500); + + + + + + + %line = "Flag Grabs:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[2,"name","flagGrabsTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[2,"data","flagGrabsTG"],0),%noValue,"",-1); schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); %lineCountTeam2++; - - %line = "Flag Caps:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[2,"name","flagCapsTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[2,"data","flagCapsTG"],0),%noValue,"",-1); + + %line = "Flag Caps:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[2,"name","flagCapsTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[2,"data","flagCapsTG"],0),%noValue,"",-1); schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); %lineCountTeam2++; - - %line = "Flag Grab Speed:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[2,"name","grabSpeedMax"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[2,"data","grabSpeedMax"],0),%noValue," Kmh",1); + + %line = "Flag Grab Speed:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[2,"name","grabSpeedMax"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[2,"data","grabSpeedMax"],0),%noValue," Kmh",1); schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); %lineCountTeam2++; - - %line = "Flag Catch:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[2,"name","flagCatchTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[2,"data","flagCatchTG"],0),%noValue,"",1); + + %line = "Flag Catch:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[2,"name","flagCatchTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[2,"data","flagCatchTG"],0),%noValue,"",1); schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); %lineCountTeam2++; - - %line = "Carrier Kills:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[2,"name","carrierKillsTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[2,"data","carrierKillsTG"],0),%noValue,"",-1); + + %line = "Carrier Kills:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[2,"name","carrierKillsTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[2,"data","carrierKillsTG"],0),%noValue,"",-1); schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); %lineCountTeam2++; - - %line = "Flag Defends:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[2,"name","flagDefendsTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[2,"data","flagDefendsTG"],0),%noValue,"",-1); + + %line = "Flag Defends:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[2,"name","flagDefendsTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[2,"data","flagDefendsTG"],0),%noValue,"",-1); schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); %lineCountTeam2++; - - %line = "Escort Assists:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[2,"name","escortAssists"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[2,"data","escortAssists"],0),%noValue,"",-1); + + %line = "Escort Assists:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[2,"name","escortAssists"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[2,"data","escortAssists"],0),%noValue,"",-1); schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); %lineCountTeam2++; - - %line = "Flags Thrown:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[2,"name","flagTossTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[2,"data","flagTossTG"],0),%noValue,"",-1); + + %line = "Flags Thrown:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[2,"name","flagTossTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[2,"data","flagTossTG"],0),%noValue,"",-1); schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); %lineCountTeam2++; - - %line = "Flag Returns:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[2,"name","flagReturnsTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[2,"data","flagReturnsTG"],0),%noValue,"",-1); + + %line = "Flag Returns:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[2,"name","flagReturnsTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[2,"data","flagReturnsTG"],0),%noValue,"",-1); schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); %lineCountTeam2++; - - %line = "Flag Concuss:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[2,"name","concussFlagTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[2,"data","concussFlagTG"],0),%noValue,"",-1); + + %line = "Flag Concuss:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[2,"name","concussFlagTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[2,"data","concussFlagTG"],0),%noValue,"",-1); schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); %lineCountTeam2++; - - %line = "Offensive Kills:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[2,"name","OffKillsTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[2,"data","OffKillsTG"],0),%noValue,"",-1); + + %line = "Offensive Kills:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[2,"name","OffKillsTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[2,"data","OffKillsTG"],0),%noValue,"",-1); schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); %lineCountTeam2++; - - %line = "Defensive Kills:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[2,"name","DefKillsTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[2,"data","DefKillsTG"],0),%noValue,"",-1); + + %line = "Defensive Kills:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[2,"name","DefKillsTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[2,"data","DefKillsTG"],0),%noValue,"",-1); schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); %lineCountTeam2++; - - %line = "Repairs:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[2,"name","repairsTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[2,"data","repairsTG"],0),%noValue,"",-1); + + %line = "Repairs:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[2,"name","repairsTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[2,"data","repairsTG"],0),%noValue,"",-1); schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); %lineCountTeam2++; - - - %line = "Destruction:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[2,"name","destructionTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[2,"data","destructionTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); - %lineCountTeam2++; - - %line = "Gens Destroyed:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[2,"name","genDestroysTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[2,"data","genDestroysTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); - %lineCountTeam2++; - - %line = "Gens Repairs:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[2,"name","genSolRepairsTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[2,"data","genSolRepairsTG"],0),%noValue,"",-1); + + + %line = "Destruction:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[2,"name","destructionTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[2,"data","destructionTG"],0),%noValue,"",-1); schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); %lineCountTeam2++; - - %line = "Indoor Turret Kills:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[2,"name","indoorDepTurretKillsTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[2,"data","indoorDepTurretKillsTG"],0),%noValue,"",-1); + + %line = "Gens Destroyed:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[2,"name","genDestroysTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[2,"data","genDestroysTG"],0),%noValue,"",-1); schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); %lineCountTeam2++; - - %line = "Outdoor Turret Kills:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[2,"name","outdoorDepTurretKillsTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[2,"data","outdoorDepTurretKillsTG"],0),%noValue,"",-1); + + %line = "Gens Repairs:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[2,"name","genSolRepairsTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[2,"data","genSolRepairsTG"],0),%noValue,"",-1); schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); %lineCountTeam2++; - - %line = "Deploy Invy Use:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[2,"name","depInvyUseTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[2,"data","depInvyUseTG"],0),%noValue,"",-1); + + %line = "Indoor Turret Kills:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[2,"name","indoorDepTurretKillsTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[2,"data","indoorDepTurretKillsTG"],0),%noValue,"",-1); schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); %lineCountTeam2++; - - %line = "Inventorys Deployed:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[2,"name","InventoryDepTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[2,"data","InventoryDepTG"],0),%noValue,"",-1); + + %line = "Outdoor Turret Kills:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[2,"name","outdoorDepTurretKillsTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[2,"data","outdoorDepTurretKillsTG"],0),%noValue,"",-1); schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); %lineCountTeam2++; - - %line = "Kill Assist:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[2,"name","assistTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[2,"data","assistTG"],0),%noValue,"",-1); + + %line = "Deploy Invy Use:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[2,"name","depInvyUseTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[2,"data","depInvyUseTG"],0),%noValue,"",-1); schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); %lineCountTeam2++; - - %line = "Distance Moved:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[2,"name","distMovTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[2,"data","distMovTG"],0),%noValue," Km",0); + + %line = "Inventorys Deployed:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[2,"name","InventoryDepTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[2,"data","InventoryDepTG"],0),%noValue,"",-1); schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); %lineCountTeam2++; - - - %line = "Highest Avg Speed:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[2,"name","avgSpeedAvg"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[2,"data","avgSpeedAvg"],0),%noValue," Kmh",0); + + %line = "Kill Assist:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[2,"name","assistTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[2,"data","assistTG"],0),%noValue,"",-1); schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); %lineCountTeam2++; - - %line = "Highest Top Speed:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[2,"name","maxSpeedMax"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[2,"data","maxSpeedMax"],0),%noValue," Kmh",0); + + %line = "Distance Moved:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[2,"name","distMovTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[2,"data","distMovTG"],0),%noValue," Km",0); schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); %lineCountTeam2++; - - %line = "Sensors Deployed:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[2,"name","SensorsDepTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[2,"data","SensorsDepTG"],0),%noValue,"",-1); + + + %line = "Highest Avg Speed:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[2,"name","avgSpeedAvg"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[2,"data","avgSpeedAvg"],0),%noValue," Kmh",0); schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); %lineCountTeam2++; - - %line = "Shield Block Damage:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[2,"name","shieldPackDmgTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[2,"data","shieldPackDmgTG"],0),%noValue,"",2); + + %line = "Highest Top Speed:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[2,"name","maxSpeedMax"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[2,"data","maxSpeedMax"],0),%noValue," Kmh",0); schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); %lineCountTeam2++; - - %line = "Stealth Kills:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[2,"name","cloakerKillsTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[2,"data","cloakerKillsTG"],0),%noValue,"",-1); + + %line = "Sensors Deployed:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[2,"name","SensorsDepTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[2,"data","SensorsDepTG"],0),%noValue,"",-1); schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); %lineCountTeam2++; - - %line = "Cloakers Killed:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[2,"name","cloakersKilledTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[2,"data","cloakersKilledTG"],0),%noValue,"",-1); + + %line = "Shield Block Damage:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[2,"name","shieldPackDmgTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[2,"data","shieldPackDmgTG"],0),%noValue,"",2); schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); %lineCountTeam2++; - - %line = "Sensor Jammer:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[2,"name","jammerTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[2,"data","jammerTG"],0),%noValue,"",-1); + + %line = "Stealth Kills:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[2,"name","cloakerKillsTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[2,"data","cloakerKillsTG"],0),%noValue,"",-1); schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); - - - - - + %lineCountTeam2++; + + %line = "Cloakers Killed:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[2,"name","cloakersKilledTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[2,"data","cloakersKilledTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); + %lineCountTeam2++; + + %line = "Sensor Jammer:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeftTeam2, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[2,"name","jammerTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[2,"data","jammerTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%lineCountTeam2*20), "11 239 231", "RC", 15, 500); + + + + + %lineCount++; %lineCount++; %lineCount++; @@ -19341,310 +19346,310 @@ function renderCTFMapTextTM(%id){ %damageValue = 420; %dist = 455; %distValue = 555; - %line = "Weapons"; + %line = "Weapons"; schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 500); - %line = "Kills"; + %line = "Kills"; schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %killOffSet , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 500); - %line = ""; + %line = ""; schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %killValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 500); - %line = "MidAirs"; + %line = "MidAirs"; schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %midAirs , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 500); - %line = ""; + %line = ""; schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %midAirValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 500); - %line = "MA Distance"; + %line = "MA Distance"; schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %damage , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 500); - %line = ""; + %line = ""; schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %damageValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 500); - %line = "Damage"; + %line = "Damage"; schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %dist , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 500); - %line = ""; + %line = ""; schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %distValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 500); %wepLineCount++; - - - %line = "Blaster"; + + + %line = "Blaster"; schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[0,"name","blasterKillsTG"],0),%noValue,"",-1); + %line = hasValueC(getField($pugMapData[0,"name","blasterKillsTG"],0),%noValue,"",-1); schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %killOffSet , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %line = hasValueC(getField($pugMapData[0,"data","blasterKillsTG"],0),%noValue,"",-1); + %line = hasValueC(getField($pugMapData[0,"data","blasterKillsTG"],0),%noValue,"",-1); schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %killValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %line = hasValueC(getField($pugMapData[0,"name","blasterMATG"],0),%noValue,"",-1); + %line = hasValueC(getField($pugMapData[0,"name","blasterMATG"],0),%noValue,"",-1); schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %midAirs , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %line = hasValueC(getField($pugMapData[0,"data","blasterMATG"],0),0,"",-1); + %line = hasValueC(getField($pugMapData[0,"data","blasterMATG"],0),0,"",-1); schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %midAirValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %line = hasValueC(getField($pugMapData[0,"name","blasterMAHitDistMax"],0),%noValue,"",-1); + %line = hasValueC(getField($pugMapData[0,"name","blasterMAHitDistMax"],0),%noValue,"",-1); schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %damage , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %line = hasValueC(getField($pugMapData[0,"data","blasterMAHitDistMax"],0),0,"",0); + %line = hasValueC(getField($pugMapData[0,"data","blasterMAHitDistMax"],0),0,"",0); schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %damageValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %line = hasValueC(getField($pugMapData[0,"name","blasterDmgTG"],0),%noValue,"",-1); + %line = hasValueC(getField($pugMapData[0,"name","blasterDmgTG"],0),%noValue,"",-1); schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %dist , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %line = hasValueC(getField($pugMapData[0,"data","blasterDmgTG"],0),0,"",1); + %line = hasValueC(getField($pugMapData[0,"data","blasterDmgTG"],0),0,"",1); schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %distValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); %wepLineCount++; - - %line = "Plasma"; + + %line = "Plasma"; schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[0,"name","plasmaKillsTG"],0),%noValue,"",-1); + %line = hasValueC(getField($pugMapData[0,"name","plasmaKillsTG"],0),%noValue,"",-1); schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %killOffSet , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %line = hasValueC(getField($pugMapData[0,"data","plasmaKillsTG"],0),0,"",-1); + %line = hasValueC(getField($pugMapData[0,"data","plasmaKillsTG"],0),0,"",-1); schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %killValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %line = hasValueC(getField($pugMapData[0,"name","plasmaMATG"],0),%noValue,"",-1); + %line = hasValueC(getField($pugMapData[0,"name","plasmaMATG"],0),%noValue,"",-1); schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %midAirs , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %line = hasValueC(getField($pugMapData[0,"data","plasmaMATG"],0),0,"",-1); + %line = hasValueC(getField($pugMapData[0,"data","plasmaMATG"],0),0,"",-1); schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %midAirValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %line = hasValueC(getField($pugMapData[0,"name","plasmaMAHitDistMax"],0),%noValue,"",-1); + %line = hasValueC(getField($pugMapData[0,"name","plasmaMAHitDistMax"],0),%noValue,"",-1); schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %damage , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %line = hasValueC(getField($pugMapData[0,"data","plasmaMAHitDistMax"],0),0,"",0); + %line = hasValueC(getField($pugMapData[0,"data","plasmaMAHitDistMax"],0),0,"",0); schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %damageValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %line = hasValueC(getField($pugMapData[0,"name","plasmaDmgTG"],0),%noValue,"",-1); + %line = hasValueC(getField($pugMapData[0,"name","plasmaDmgTG"],0),%noValue,"",-1); schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %dist , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %line = hasValueC(getField($pugMapData[0,"data","plasmaDmgTG"],0),0,"",1); + %line = hasValueC(getField($pugMapData[0,"data","plasmaDmgTG"],0),0,"",1); schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %distValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); %wepLineCount++; - - %line = "Chaingun"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[0,"name","cgKillsTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %killOffSet , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %line = hasValueC(getField($pugMapData[0,"data","cgKillsTG"],0),0,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %killValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %line = hasValueC(getField($pugMapData[0,"name","cgMATG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %midAirs , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %line = hasValueC(getField($pugMapData[0,"data","cgMATG"],0),0,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %midAirValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %line = hasValueC(getField($pugMapData[0,"name","cgMAHitDistMax"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %damage , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %line = hasValueC(getField($pugMapData[0,"data","cgMAHitDistMax"],0),0,"",0); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %damageValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %line = hasValueC(getField($pugMapData[0,"name","cgDmgTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %dist , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %line = hasValueC(getField($pugMapData[0,"data","cgDmgTG"],0),0,"",1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %distValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %wepLineCount++; - - %line = "Spinfusor"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[0,"name","discKillsTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %killOffSet , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %line = hasValueC(getField($pugMapData[0,"data","discKillsTG"],0),0,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %killValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %line = hasValueC(getField($pugMapData[0,"name","discMATG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %midAirs , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %line = hasValueC(getField($pugMapData[0,"data","discMATG"],0),0,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %midAirValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %line = hasValueC(getField($pugMapData[0,"name","discMAHitDistMax"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %damage , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %line = hasValueC(getField($pugMapData[0,"data","discMAHitDistMax"],0),0,"",0); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %damageValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %line = hasValueC(getField($pugMapData[0,"name","discDmgTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %dist , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %line = hasValueC(getField($pugMapData[0,"data","discDmgTG"],0),0,"",1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %distValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %wepLineCount++; - - %line = "Grenade"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[0,"name","grenadeKillsTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %killOffSet , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %line = hasValueC(getField($pugMapData[0,"data","grenadeKillsTG"],0),0,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %killValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %line = hasValueC(getField($pugMapData[0,"name","grenadeMATG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %midAirs , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %line = hasValueC(getField($pugMapData[0,"data","grenadeMATG"],0),0,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %midAirValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %line = hasValueC(getField($pugMapData[0,"name","grenadeMAHitDistMax"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %damage , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %line = hasValueC(getField($pugMapData[0,"data","grenadeMAHitDistMax"],0),0,"",0); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %damageValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %line = hasValueC(getField($pugMapData[0,"name","grenadeDmgTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %dist , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %line = hasValueC(getField($pugMapData[0,"data","grenadeDmgTG"],0),0,"",1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %distValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %wepLineCount++; - - %line = "Laser"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[0,"name","laserKillsTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %killOffSet , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %line = hasValueC(getField($pugMapData[0,"data","laserKillsTG"],0),0,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %killValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %line = hasValueC(getField($pugMapData[0,"name","laserMATG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %midAirs , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %line = hasValueC(getField($pugMapData[0,"data","laserMATG"],0),0,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %midAirValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %line = hasValueC(getField($pugMapData[0,"name","laserMAHitDistMax"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %damage , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %line = hasValueC(getField($pugMapData[0,"data","laserMAHitDistMax"],0),0,"",0); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %damageValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %line = hasValueC(getField($pugMapData[0,"name","laserDmgTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %dist , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %line = hasValueC(getField($pugMapData[0,"data","laserDmgTG"],0),0,"",1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %distValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %wepLineCount++; - %line = "Mortar"; + %line = "Chaingun"; schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[0,"name","mortarKillsTG"],0),%noValue,"",-1); + %line = hasValueC(getField($pugMapData[0,"name","cgKillsTG"],0),%noValue,"",-1); schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %killOffSet , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %line = hasValueC(getField($pugMapData[0,"data","mortarKillsTG"],0),0,"",-1); + %line = hasValueC(getField($pugMapData[0,"data","cgKillsTG"],0),0,"",-1); schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %killValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %line = hasValueC(getField($pugMapData[0,"name","mortarMATG"],0),%noValue,"",-1); + %line = hasValueC(getField($pugMapData[0,"name","cgMATG"],0),%noValue,"",-1); schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %midAirs , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %line = hasValueC(getField($pugMapData[0,"data","mortarMATG"],0),0,"",-1); + %line = hasValueC(getField($pugMapData[0,"data","cgMATG"],0),0,"",-1); schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %midAirValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %line = hasValueC(getField($pugMapData[0,"name","mortarMAHitDistMax"],0),%noValue,"",-1); + %line = hasValueC(getField($pugMapData[0,"name","cgMAHitDistMax"],0),%noValue,"",-1); schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %damage , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %line = hasValueC(getField($pugMapData[0,"data","mortarMAHitDistMax"],0),0,"",0); + %line = hasValueC(getField($pugMapData[0,"data","cgMAHitDistMax"],0),0,"",0); schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %damageValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %line = hasValueC(getField($pugMapData[0,"name","mortarDmgTG"],0),%noValue,"",-1); + %line = hasValueC(getField($pugMapData[0,"name","cgDmgTG"],0),%noValue,"",-1); schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %dist , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %line = hasValueC(getField($pugMapData[0,"data","mortarDmgTG"],0),0,"",1); + %line = hasValueC(getField($pugMapData[0,"data","cgDmgTG"],0),0,"",1); schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %distValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %wepLineCount++; - - %line = "Missile"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[0,"name","missileKillsTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %killOffSet , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %line = hasValueC(getField($pugMapData[0,"data","missileKillsTG"],0),0,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %killValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %line = hasValueC(getField($pugMapData[0,"name","missileMATG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %midAirs , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %line = hasValueC(getField($pugMapData[0,"data","missileMATG"],0),0,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %midAirValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %line = hasValueC(getField($pugMapData[0,"name","missileMAHitDistMax"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %damage , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %line = hasValueC(getField($pugMapData[0,"data","missileMAHitDistMax"],0),0,"",0); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %damageValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %line = hasValueC(getField($pugMapData[0,"name","missileDmgTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %dist , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %line = hasValueC(getField($pugMapData[0,"data","missileDmgTG"],0),0,"",1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %distValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %wepLineCount++; - - - %line = "Shock"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[0,"name","shockKillsTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %killOffSet , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %line = hasValueC(getField($pugMapData[0,"data","shockKillsTG"],0),0,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %killValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %line = hasValueC(getField($pugMapData[0,"name","shockMATG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %midAirs , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %line = hasValueC(getField($pugMapData[0,"data","shockMATG"],0),0,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %midAirValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %line = hasValueC(getField($pugMapData[0,"name","shockMAHitDistMax"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %damage , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %line = hasValueC(getField($pugMapData[0,"data","shockMAHitDistMax"],0),0,"",1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %damageValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %line = hasValueC(getField($pugMapData[0,"name","shockDmgTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %dist , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %line = hasValueC(getField($pugMapData[0,"data","shockDmgTG"],0),0,"",1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %distValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); - %wepLineCount++; %wepLineCount++; - + + %line = "Spinfusor"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[0,"name","discKillsTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %killOffSet , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); + %line = hasValueC(getField($pugMapData[0,"data","discKillsTG"],0),0,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %killValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); + %line = hasValueC(getField($pugMapData[0,"name","discMATG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %midAirs , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); + %line = hasValueC(getField($pugMapData[0,"data","discMATG"],0),0,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %midAirValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); + %line = hasValueC(getField($pugMapData[0,"name","discMAHitDistMax"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %damage , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); + %line = hasValueC(getField($pugMapData[0,"data","discMAHitDistMax"],0),0,"",0); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %damageValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); + %line = hasValueC(getField($pugMapData[0,"name","discDmgTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %dist , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); + %line = hasValueC(getField($pugMapData[0,"data","discDmgTG"],0),0,"",1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %distValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); + %wepLineCount++; + + %line = "Grenade"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[0,"name","grenadeKillsTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %killOffSet , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); + %line = hasValueC(getField($pugMapData[0,"data","grenadeKillsTG"],0),0,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %killValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); + %line = hasValueC(getField($pugMapData[0,"name","grenadeMATG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %midAirs , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); + %line = hasValueC(getField($pugMapData[0,"data","grenadeMATG"],0),0,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %midAirValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); + %line = hasValueC(getField($pugMapData[0,"name","grenadeMAHitDistMax"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %damage , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); + %line = hasValueC(getField($pugMapData[0,"data","grenadeMAHitDistMax"],0),0,"",0); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %damageValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); + %line = hasValueC(getField($pugMapData[0,"name","grenadeDmgTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %dist , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); + %line = hasValueC(getField($pugMapData[0,"data","grenadeDmgTG"],0),0,"",1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %distValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); + %wepLineCount++; + + %line = "Laser"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[0,"name","laserKillsTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %killOffSet , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); + %line = hasValueC(getField($pugMapData[0,"data","laserKillsTG"],0),0,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %killValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); + %line = hasValueC(getField($pugMapData[0,"name","laserMATG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %midAirs , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); + %line = hasValueC(getField($pugMapData[0,"data","laserMATG"],0),0,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %midAirValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); + %line = hasValueC(getField($pugMapData[0,"name","laserMAHitDistMax"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %damage , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); + %line = hasValueC(getField($pugMapData[0,"data","laserMAHitDistMax"],0),0,"",0); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %damageValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); + %line = hasValueC(getField($pugMapData[0,"name","laserDmgTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %dist , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); + %line = hasValueC(getField($pugMapData[0,"data","laserDmgTG"],0),0,"",1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %distValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); + %wepLineCount++; + + %line = "Mortar"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[0,"name","mortarKillsTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %killOffSet , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); + %line = hasValueC(getField($pugMapData[0,"data","mortarKillsTG"],0),0,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %killValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); + %line = hasValueC(getField($pugMapData[0,"name","mortarMATG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %midAirs , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); + %line = hasValueC(getField($pugMapData[0,"data","mortarMATG"],0),0,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %midAirValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); + %line = hasValueC(getField($pugMapData[0,"name","mortarMAHitDistMax"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %damage , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); + %line = hasValueC(getField($pugMapData[0,"data","mortarMAHitDistMax"],0),0,"",0); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %damageValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); + %line = hasValueC(getField($pugMapData[0,"name","mortarDmgTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %dist , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); + %line = hasValueC(getField($pugMapData[0,"data","mortarDmgTG"],0),0,"",1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %distValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); + %wepLineCount++; + + %line = "Missile"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[0,"name","missileKillsTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %killOffSet , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); + %line = hasValueC(getField($pugMapData[0,"data","missileKillsTG"],0),0,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %killValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); + %line = hasValueC(getField($pugMapData[0,"name","missileMATG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %midAirs , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); + %line = hasValueC(getField($pugMapData[0,"data","missileMATG"],0),0,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %midAirValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); + %line = hasValueC(getField($pugMapData[0,"name","missileMAHitDistMax"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %damage , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); + %line = hasValueC(getField($pugMapData[0,"data","missileMAHitDistMax"],0),0,"",0); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %damageValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); + %line = hasValueC(getField($pugMapData[0,"name","missileDmgTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %dist , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); + %line = hasValueC(getField($pugMapData[0,"data","missileDmgTG"],0),0,"",1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %distValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); + %wepLineCount++; + + + %line = "Shock"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[0,"name","shockKillsTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %killOffSet , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); + %line = hasValueC(getField($pugMapData[0,"data","shockKillsTG"],0),0,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %killValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); + %line = hasValueC(getField($pugMapData[0,"name","shockMATG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %midAirs , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); + %line = hasValueC(getField($pugMapData[0,"data","shockMATG"],0),0,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %midAirValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); + %line = hasValueC(getField($pugMapData[0,"name","shockMAHitDistMax"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %damage , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); + %line = hasValueC(getField($pugMapData[0,"data","shockMAHitDistMax"],0),0,"",1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %damageValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); + %line = hasValueC(getField($pugMapData[0,"name","shockDmgTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %dist , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); + %line = hasValueC(getField($pugMapData[0,"data","shockDmgTG"],0),0,"",1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v + %distValue , 150 + (%wepLineCount*20), "11 239 231", "RC", 15, 100); + %wepLineCount++; + %wepLineCount++; + %justLeft3 = %justLeft2 + 320; - %nameAdjust = -15; - - %line = "Hand Grenade:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 140 + (%wepLineCount*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[0,"name","hGrenadeKillsTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset+%nameAdjust, 140 + (%wepLineCount*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[0,"data","hGrenadeKillsTG"],0),0,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 140 + (%wepLineCount*20), "11 239 231", "RC", 15, 500); - - %line = "Concuss Hits:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft3, 140 + (%wepLineCount*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[0,"name","concussHitTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset+%nameAdjust, 140 + (%wepLineCount*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[0,"data","concussHitTG"],0),0,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 140 + (%wepLineCount*20), "11 239 231", "RC", 15, 500); - - %wepLineCount++; - - %line = "Mine:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 140 + (%wepLineCount*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[0,"name","concussHitTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset+%nameAdjust, 140 + (%wepLineCount*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[0,"data","concussHitTG"],0),0,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 140 + (%wepLineCount*20), "11 239 231", "RC", 15, 500); - - %line = "Mine + Disc:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft3, 140 + (%wepLineCount*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[0,"name","minePlusDiscTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset+%nameAdjust, 140 + (%wepLineCount*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[0,"data","minePlusDiscTG"],0),0,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 140 + (%wepLineCount*20), "11 239 231", "RC", 15, 500); - %wepLineCount++; - - %line = "Satchel Charge:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 140 + (%wepLineCount*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[0,"name","satchelKillsTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset+%nameAdjust, 140 + (%wepLineCount*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[0,"data","satchelKillsTG"],0),0,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 140 + (%wepLineCount*20), "11 239 231", "RC", 15, 500); - - %line = "Sniper Head Shots:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft3, 140 + (%wepLineCount*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[0,"name","laserHeadShotTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset+%nameAdjust, 140 + (%wepLineCount*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[0,"data","laserHeadShotTG"],0),0,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 140 + (%wepLineCount*20), "11 239 231", "RC", 15, 500); - %wepLineCount++; - - %line = "ELF Usage:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 140 + (%wepLineCount*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[0,"name","elfShotsFiredTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset+%nameAdjust, 140 + (%wepLineCount*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[0,"data","elfShotsFiredTG"],0),0,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 140 + (%wepLineCount*20), "11 239 231", "RC", 15, 500); - - - %line = "Shock Rear Hits:"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft3, 140 + (%wepLineCount*20), "11 239 231", "RC", 15, 500); - %line = hasValueC(getField($pugMapData[0,"name","shockRearShotTG"],0),%noValue,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset+%nameAdjust, 140 + (%wepLineCount*20), "11 239 231", "RC", 15, 130); - %line = hasValueC(getField($pugMapData[0,"data","shockRearShotTG"],0),0,"",-1); - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 140 + (%wepLineCount*20), "11 239 231", "RC", 15, 500); - %wepLineCount++; - - + %nameAdjust = -15; + + %line = "Hand Grenade:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 140 + (%wepLineCount*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[0,"name","hGrenadeKillsTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset+%nameAdjust, 140 + (%wepLineCount*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[0,"data","hGrenadeKillsTG"],0),0,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 140 + (%wepLineCount*20), "11 239 231", "RC", 15, 500); + + %line = "Concuss Hits:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft3, 140 + (%wepLineCount*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[0,"name","concussHitTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset+%nameAdjust, 140 + (%wepLineCount*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[0,"data","concussHitTG"],0),0,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 140 + (%wepLineCount*20), "11 239 231", "RC", 15, 500); + + %wepLineCount++; + + %line = "Mine:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 140 + (%wepLineCount*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[0,"name","concussHitTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset+%nameAdjust, 140 + (%wepLineCount*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[0,"data","concussHitTG"],0),0,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 140 + (%wepLineCount*20), "11 239 231", "RC", 15, 500); + + %line = "Mine + Disc:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft3, 140 + (%wepLineCount*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[0,"name","minePlusDiscTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset+%nameAdjust, 140 + (%wepLineCount*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[0,"data","minePlusDiscTG"],0),0,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 140 + (%wepLineCount*20), "11 239 231", "RC", 15, 500); + %wepLineCount++; + + %line = "Satchel Charge:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 140 + (%wepLineCount*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[0,"name","satchelKillsTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset+%nameAdjust, 140 + (%wepLineCount*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[0,"data","satchelKillsTG"],0),0,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 140 + (%wepLineCount*20), "11 239 231", "RC", 15, 500); + + %line = "Sniper Head Shots:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft3, 140 + (%wepLineCount*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[0,"name","laserHeadShotTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset+%nameAdjust, 140 + (%wepLineCount*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[0,"data","laserHeadShotTG"],0),0,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 140 + (%wepLineCount*20), "11 239 231", "RC", 15, 500); + %wepLineCount++; + + %line = "ELF Usage:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft2, 140 + (%wepLineCount*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[0,"name","elfShotsFiredTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset+%nameAdjust, 140 + (%wepLineCount*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[0,"data","elfShotsFiredTG"],0),0,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 140 + (%wepLineCount*20), "11 239 231", "RC", 15, 500); + + + %line = "Shock Rear Hits:"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft3, 140 + (%wepLineCount*20), "11 239 231", "RC", 15, 500); + %line = hasValueC(getField($pugMapData[0,"name","shockRearShotTG"],0),%noValue,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset+%nameAdjust, 140 + (%wepLineCount*20), "11 239 231", "RC", 15, 130); + %line = hasValueC(getField($pugMapData[0,"data","shockRearShotTG"],0),0,"",-1); + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 140 + (%wepLineCount*20), "11 239 231", "RC", 15, 500); + %wepLineCount++; + + + - %justLeft5 = 650; %justLeft6 = 650+320; - %nameAdjust = 0; - %nameAdjust2 = -15; - + %nameAdjust = 0; + %nameAdjust2 = -15; + %vc = 0; for(%a = 0; %a < $imgStatListCount && %vc < 28; %a++){ %var = $imgStatList[%a]; %name = hasValueC(getField($pugMapData[0,"name",%var],0),0,"",-1); %value = hasValueC(getField($pugMapData[0,"data",%var],0),0,"",1); - - if(%value){ + + if(%value){ if((%vc % 2) == 0){ - %line = getField($statsName[%var], 0) @ ":"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft5, 150 + (%vehLineCount*20), "11 239 231", "RC", 15, 500); - %line = %name; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset+%nameAdjust, 150 + (%vehLineCount*20), "11 239 231", "RC", 15, 130); - %line = %value; + %line = getField($statsName[%var], 0) @ ":"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft5, 150 + (%vehLineCount*20), "11 239 231", "RC", 15, 500); + %line = %name; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset+%nameAdjust, 150 + (%vehLineCount*20), "11 239 231", "RC", 15, 130); + %line = %value; schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%vehLineCount*20), "11 239 231", "RC", 15, 500); } else{ - %line = getField($statsName[%var], 0) @ ":"; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft6, 150 + (%vehLineCount*20), "11 239 231", "RC", 15, 500); - %line = %name; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset+%nameAdjust2, 150 + (%vehLineCount*20), "11 239 231", "RC", 15, 130); - %line = %value; - schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%vehLineCount*20), "11 239 231", "RC", 15, 500); + %line = getField($statsName[%var], 0) @ ":"; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v = %justLeft6, 150 + (%vehLineCount*20), "11 239 231", "RC", 15, 500); + %line = %name; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %nameOffset+%nameAdjust2, 150 + (%vehLineCount*20), "11 239 231", "RC", 15, 130); + %line = %value; + schedule(%callTime * %callCount++,0,"addGLText",%line, %v += %dataOffset, 150 + (%vehLineCount*20), "11 239 231", "RC", 15, 500); %vehLineCount++; } %vc++; } } - + if(%id $= "") return; %img = new fileObject(); @@ -19658,39 +19663,39 @@ function renderCTFMapTextTM(%id){ %img.yc = 0; %img.py = 0; %img.pct = 0; - schedule(%callTime * %callCount++, 0, "pugImgCycle",%img); -} + schedule(%callTime * %callCount++, 0, "pugImgCycle",%img); +} function pugImgCycle(%img){ %pct = mFloor((%img.yc / %img.y) * 100); if(%pct != %img.pct){ if($dtStats::debugEchos){error("pugImgCycle Saving Stats image" SPC %pct @ "%");} %img.pct = %pct; } - + %y = %img.yc; for (%x = 0; %x < %img.x; %x++) { %color = "20 45 45"; - if(%x >= 48 && %x <= 1235+20 && %y >= 47 && %y <= %img.y -20){ + if(%x >= 48 && %x <= 1235+20 && %y >= 47 && %y <= %img.y -20){ if(%x >= %img.x/2 && %y < 780) %color = "33 86 96"; - else if(%x <= %img.x/2 && %y < 780) + else if(%x <= %img.x/2 && %y < 780) %color = "29 74 82"; - else + else %color = "21 55 61"; } - + if(isInsideBorderO(%img, %x-1, %y-5, 26, 21, 15)){ - %color = "0 118 118"; + %color = "0 118 118"; %color = lerpColor("20 45 45", %color, (%img.yc / %img.y)*1.5); } if(isInsideBorderO(%img, %x-1, %y-5, 42, 37, 4)){ - %color = "0 150 160"; + %color = "0 150 160"; %color = lerpColor(%color, "20 45 45", (%img.yc / %img.y) * 0.25); } %fd = $textColor[%x,%y]; if(getWord(%fd,0) > 0){ - %opacity = 1 - (getWord(%fd,0) / 255); + %opacity = 1 - (getWord(%fd,0) / 255); %r = mFloor((1 - %opacity) * getWord(%fd,1) + %opacity * getWord(%color,0)); %g = mFloor((1 - %opacity) * getWord(%fd,2) + %opacity * getWord(%color,1)); %b = mFloor((1 - %opacity) * getWord(%fd,3) + %opacity * getWord(%color,2)); @@ -19698,17 +19703,17 @@ function pugImgCycle(%img){ } else{ %img.writeLine(%color); - } + } } %img.yc++; - if(%img.yc < %img.y) + if(%img.yc < %img.y) schedule(16,0,"pugImgCycle",%img); else{ %img.close(); - %img.delete(); + %img.delete(); deleteVariables("$textColor*"); compileGameImage($idPugIndex++); - } + } } function pugImgCycle2(%img){ %pct = mFloor((%img.yc / %img.y) * 100); @@ -19716,34 +19721,34 @@ function pugImgCycle2(%img){ if($dtStats::debugEchos){error("pugImgCycle Saving Stats image" SPC %pct @ "%");} %img.pct = %pct; } - + %y = %img.yc; for (%x = 0; %x < %img.x; %x++) { %color = "20 45 45"; - if(%x >= 48 && %x <= 1235+20 && %y >= 47 && %y <= %img.y -20){ + if(%x >= 48 && %x <= 1235+20 && %y >= 47 && %y <= %img.y -20){ if(%x >= %img.x/2 && %y < 780) %color = "33 86 96"; - else if(%x <= %img.x/2 && %y < 780) + else if(%x <= %img.x/2 && %y < 780) %color = "29 74 82"; - else + else %color = "21 55 61"; } - + if(isInsideBorderO(%img, %x-1, %y-5, 26, 21, 15)){ - %color = "0 118 118"; + %color = "0 118 118"; %color = lerpColor("20 45 45", %color, (%img.yc / %img.y)*1.5); } if(isInsideBorderO(%img, %x-1, %y-5, 42, 37, 4)){ - %color = "0 150 160"; + %color = "0 150 160"; %color = lerpColor(%color, "20 45 45", (%img.yc / %img.y) * 0.25); } if(%x > 355 && %y > 633 && %x < 950 && %y < 764){ - + } %fd = $textColor[%x,%y]; if(getWord(%fd,0) > 0){ - %opacity = 1 - (getWord(%fd,0) / 255); + %opacity = 1 - (getWord(%fd,0) / 255); %r = mFloor((1 - %opacity) * getWord(%fd,1) + %opacity * getWord(%color,0)); %g = mFloor((1 - %opacity) * getWord(%fd,2) + %opacity * getWord(%color,1)); %b = mFloor((1 - %opacity) * getWord(%fd,3) + %opacity * getWord(%color,2)); @@ -19751,17 +19756,17 @@ function pugImgCycle2(%img){ } else{ %img.writeLine(%color); - } + } } %img.yc++; - if(%img.yc < %img.y) + if(%img.yc < %img.y) schedule(16,0,"pugImgCycle",%img); else{ %img.close(); - %img.delete(); + %img.delete(); deleteVariables("$textColor*"); compileGameImage($idPugIndex++); - } + } } //////////////////////////////////////////////////////////////////////////////// @@ -19770,11 +19775,11 @@ function dtBuildMissionList(%reset){ ML.delete(); } if(isFile("serverStats/mapRot.cs") && !%reset){ - exec("serverStats/mapRot.cs"); + exec("serverStats/mapRot.cs"); RootGroup.add(ML); } if(!isObject(ML)){ - new simGroup(ML); + new simGroup(ML); RootGroup.add(ML); ML.curMapList = 0; } @@ -19783,14 +19788,14 @@ function dtBuildMissionList(%reset){ RootGroup.add(%fobject); for( %file = findFirstFile( %search ); %file !$= ""; %file = findNextFile( %search ) ){ %fileName = fileBase( %file ); // get the name - %name = cleanMapName(%fileName); - if(!isObject(%name)){ + %name = cleanMapName(%fileName); + if(!isObject(%name)){ if ( !%fobject.openForRead( %file ) ) - continue; + continue; %mObj = new scriptObject(%name){ file = %fileName; - name = %name; - }; + name = %name; + }; %typeList = "None"; while ( !%fobject.isEOF() ){ @@ -19804,14 +19809,14 @@ function dtBuildMissionList(%reset){ } } %fobject.close(); - + // Don't include single player missions: if ( strstr( %typeList, "SinglePlayer" ) != -1 || (strstr( %typeList, "TR2" ) != -1 && !$Host::ClassicLoadTR2Gametype)){ %mObj.delete(); continue; } - - + + %mObj.typeList = %typeList; for( %word = 0; ( %misType = strlwr(getWord( %typeList, %word )) ) !$= ""; %word++ ){ @@ -19822,7 +19827,7 @@ function dtBuildMissionList(%reset){ ML.TypeCount++; ML.TypeName[%i] = %misType; ML.TypeIndex[%misType] = %i; - } + } %mObj.typeList[%misType] = 1; //%mObj.typeList = (%i == 0) ? ML.TypeIndex[%misType] : (%mObj.typeList SPC ML.TypeIndex[%misType]); // enable 0 voteOption 1 min 2 max 3 prio 4 week 5 weekBitAsk 6 monthRes 7 monthBitMask 8 eventMap 9 hour 10 min 11 month 12 day 13 year 14 eventSwitch 15 eventTime 16 unsued 17 @@ -19834,24 +19839,24 @@ function dtBuildMissionList(%reset){ } } %fobject.delete(); - + $dtFixedMapCycle = 0; for ( %i = 0; %i < ML.TypeCount; %i++ ){ $dtFixedMapCount[ ML.TypeName[%i]] = 0; } if(isFile("serverStats/fixMapRot.cs") && !%reset){ - exec("serverStats/fixMapRot.cs"); - } - + exec("serverStats/fixMapRot.cs"); + } + for ( %i = 0; %i < ML.getCount(); %i++ ){// cleanup %mapObj = ML.getObject(%i); if(!isFile("missions/"@ %mapObj.file @".mis")){ - %mapObj.delete(); + %mapObj.delete(); %i--; } } - + if(!isEventPending($saveML)){ $saveML = ML.schedule(2000,"save", "serverStats/mapRot.cs" , 0); ML.schedule(1000,"save", "serverStats/mapRotBackup.cs" , 0); @@ -19860,20 +19865,20 @@ function dtBuildMissionList(%reset){ function saveMapRot(){ if(!isEventPending($saveML)) - $saveML = ML.schedule(1000,"save", "serverStats/mapRot.cs" , 0); + $saveML = ML.schedule(1000,"save", "serverStats/mapRot.cs" , 0); if(!isEventPending($saveMR)) $saveMR = schedule(2000, 0, "export", "$dtFixedMap*", "serverStats/fixMapRot.cs", false ); } function eventGameStart(%time){ Game.gameOver(); - CycleMissions(); + CycleMissions(); } function mapEventCheck(){ - //if(%event && getField(%ms,0)){//eventMap 9 hour 10 min 11 month 12 day 13 year 14; + //if(%event && getField(%ms,0)){//eventMap 9 hour 10 min 11 month 12 day 13 year 14; //$dtEventMap[$dtEventMapCount] = (%event == 3) TAB %mapObj.file TAB %gameType TAB getFields(%ms,10,14); - //$dtEventMapCount++; + //$dtEventMapCount++; //} %time = formattimestring("H\tn\td\tm\tyy"); for(%i = 0; %i < $dtEventMapCount; %i++){ @@ -19888,14 +19893,14 @@ function mapEventCheck(){ deleteVariables("$HostMission*"); deleteVariables("$HostType*"); if(getField(%fields,0)){// next map - messageAll('MsgEventMap', '\c2 The next map will be %1 do to a scheduled event, map voteing has been diabled~wfx/misc/hunters_horde.wav',%mapObj.name); + messageAll('MsgEventMap', '\c2 The next map will be %1 do to a scheduled event, map voteing has been diabled~wfx/misc/hunters_horde.wav',%mapObj.name); $dtEventMap = %mapObj TAB %mapType TAB getField(%fields,1); $dtEventMapOldTime = $Host::TimeLimit; $dtEventMapOldType = $CurrentMissionType; } - else{// force change + else{// force change %min = 5; - messageAll('MsgEventMap', '\c2 Do to a sheduled event, the sever will force change to %1 in %2 min, map voteing has been diabled~wfx/misc/hunters_horde.wav',%mapObj.name,%min); + messageAll('MsgEventMap', '\c2 Do to a sheduled event, the sever will force change to %1 in %2 min, map voteing has been diabled~wfx/misc/hunters_horde.wav',%mapObj.name,%min); schedule(60000*%min, 0, "eventGameStart",getField(%fields,1)); %ms = $Host::TimeLimit * 60 * 1000; $missionStartTime = getSimTime() - (%ms - (60000*%min)); @@ -19916,7 +19921,7 @@ function pushMissionList(){ deleteVariables("$HostType*"); deleteVariables("$dtEventMap*"); $dtEventMapCount = 0; - if(ML.curMapList == 3){// Fixed rotation list + if(ML.curMapList == 3){// Fixed rotation list for(%x = 0; %x < ML.TypeCount; %x++){ %gameType = ML.TypeName[%x]; for(%i = 0; %i < $dtFixedMapCount[strlwr(%gameType)]; %i++){ @@ -19974,12 +19979,12 @@ function pushMissionList(){ if(isFile("missions/"@ %mapObj.file @".mis")){ for( %w = 0; ( %gameType = getWord( %mapObj.typeList, %w ) ) !$= ""; %w++ ){ %ms = %mapObj.typeOptions[strlwr(%gameType), ML.curMapList]; - - if(getField(%ms,9) && getField(%ms,0)){//eventMap 9 hour 10 min 11 month 12 day 13 year 14; + + if(getField(%ms,9) && getField(%ms,0)){//eventMap 9 hour 10 min 11 month 12 day 13 year 14; $dtEventMap[$dtEventMapCount] = getField(%ms,15) TAB getField(%ms,16) TAB %mapObj TAB %gameType TAB getFields(%ms,10,14); - $dtEventMapCount++; + $dtEventMapCount++; } - + if(getField(%ms,0) && getField(%ms,1) != 2){ %found = false; for (%mis = 0; %mis < $HostMissionCount; %mis++){ @@ -20031,33 +20036,33 @@ function pushMissionList(){ package dtMapRotation{ function loadMission( %missionName, %missionType, %firstMission ){ parent::loadMission( %missionName, %missionType, %firstMission ); - + %cName = cleanMapName(%missionName); if(ML.curMapList != 3){ $dtMapPlayed[$CurrentMissionType,%cName] = 1; if(ML.saveMapPlayed && !isEventPending($saveMapRot)){ $saveMapRot = schedule(15000, 0, "export", "$dtMapPlayed*", "serverStats/mapPlayRot.cs", false ); } - } + } else if(ML.curMapList == 3){ if(!$dtMissionCycle){//map did not cycle lets update are pointer; %mapCount = $dtFixedMapCount[strlwr(%missionType)]; for(%i = 0; %i < %mapCount; %i++){ - %mn = getField($dtFixedMapList[%i, strlwr(%missionType)],0); + %mn = getField($dtFixedMapList[%i, strlwr(%missionType)],0); if(%mn $= %missionName){ $dtFixedMapCycle = (%i + 1) % %mapCount; error("TEST" SPC %missionName); if(!isEventPending($saveMR)){ $saveMR = schedule(15000, 0, "export", "$dtFixedMap*", "serverStats/fixMapRot.cs", false ); - } + } break; } } - } + } } $dtMissionCycle = 0; } - + function CycleMissions(){ $dtMissionCycle = 1; if(!ML.enable){ @@ -20078,7 +20083,7 @@ package dtMapRotation{ $Host::TimeLimit = $dtEventMapOldTime; $CurrentMissionType = $dtEventMapOldType; $lastMapEvent = 0; - buildMissionList();// rebuild vote list + buildMissionList();// rebuild vote list } if(Game.scheduleVote !$= "") // a vote is still running, stop it stopCurrentVote(); @@ -20099,10 +20104,10 @@ package dtMapRotation{ pushMissionList(); } else{ - parent::buildMissionList(); + parent::buildMissionList(); } } - + }; if (!isActivePackage(dtMapRotation)){ @@ -20124,32 +20129,32 @@ function dtNextMission(%gameType){ } return getField(%missionName,0); } - + %gindex = ML.TypeIndex[%gameType]; %plrCount = ClientGroup.getCount(); %mapListA = 0; %mapListB = 0; %mapListF = 0; - %prioA = 0; - %prioB = 0; + %prioA = 0; + %prioB = 0; %wIndex["Sun"] = 0;%wIndex["Mon"] = 1;%wIndex["Tue"] = 2;%wIndex["Wed"] = 3;%wIndex["Thu"] = 5;%wIndex["Fri"] = 5;%wIndex["Sat"] = 6; for ( %i = 0; %i < ML.getCount(); %i++ ){ %mapObj = ML.getObject(%i); - // enable 0 voteonly 1 min 2 max 3 prio 4 week 5 weekBitMask 6 monthRes 7 monthBitMask 8 eventMap 9 hour 10 min 11 month 12 day 13 year 14; + // enable 0 voteonly 1 min 2 max 3 prio 4 week 5 weekBitMask 6 monthRes 7 monthBitMask 8 eventMap 9 hour 10 min 11 month 12 day 13 year 14; %options = %mapObj.typeOptions[%gameType,ML.curMapList]; %cName = cleanMapName(%mapObj.file); if(getField(%options,0) && getField(%options,1) != 1){ // enable and voteonly check if(!$dtMapPlayed[%gameType,%cName]){ - if(%plrCount >= getField(%options,2) && %plrCount <= getField(%options,3) || (%plrCount > 64 && getField(%options,2) > 32)){// min max player + if(%plrCount >= getField(%options,2) && %plrCount <= getField(%options,3) || (%plrCount > 64 && getField(%options,2) > 32)){// min max player if(getField(%options,5)){// week limits - %dindex = %wIndex[formattimestring("D")]; + %dindex = %wIndex[formattimestring("D")]; if(getSubStr(getField(%options,6),%dindex,1) == 1){ %prio += getField(%options,4); %mapList[%mapListA] = %mapObj; %mapListA++; } - } + } else if(getField(%options,7)){ // month limits if(getSubStr(getField(%options,8),formattimestring("m")-1,1) == 1){ %prioA += getField(%options,4); @@ -20163,15 +20168,15 @@ function dtNextMission(%gameType){ %mapListA++; } } - else{// does not fit are min max condition + else{// does not fit are min max condition if(getField(%options,5)){ - %dindex = %wIndex[formattimestring("D")]; + %dindex = %wIndex[formattimestring("D")]; if(getSubStr(getField(%options,6),%dindex,1) == 1){ %prioB += getField(%options,4); %outlier[%mapListB] = %mapObj; %mapListB++; } - } + } else if(getField(%options,7)){ if(getSubStr(getField(%options,8),formattimestring("m")-1,1) == 1){ %prioB += getField(%options,4); @@ -20193,7 +20198,7 @@ function dtNextMission(%gameType){ } } } - + if(%mapListA){ // min max list %randomNum = getRandom() * %prioA; %weight = 0; @@ -20204,9 +20209,9 @@ function dtNextMission(%gameType){ return %mapObj.file; } } - return %mapList[getRandom(0, %mapListA-1)].file; + return %mapList[getRandom(0, %mapListA-1)].file; } - if(%mapListB){// Fail safe list + if(%mapListB){// Fail safe list deleteVariables("$dtMapPlayed*"); %random = getRandom() * %prioB; %weight = 0; @@ -20219,7 +20224,7 @@ function dtNextMission(%gameType){ } return %outlier[getRandom(0, %mapListB-1)].file; } - if(%mapListF){// Fail safe list + if(%mapListF){// Fail safe list error("Ran out of valid maps using fail safe list, add more maps for the system to pick from"); deleteVariables("$dtMapPlayed*"); return %failSafe[getRandom(0, %mapListF-1)].file; @@ -20266,9 +20271,9 @@ function mapCyleTest(){ if(ML.curMapList != 3){ $dtMapPlayed[$CurrentMissionType,%cName] = 1; error(%cName); - } + } else{ - error("Mode 0" SPC %cName); + error("Mode 0" SPC %cName); } } @@ -20552,17 +20557,17 @@ function mapCyleTest(){ // Added a check to prevent stats building during tournament mode or games with more than 6 players. // Big stats generation outputs a ppm image file of the monthly stats. CTF/LCTF only // Removed stats that are unused, uninteresting, or confusing. -// Server Admin Panel rework. -// Added Custom map rotatons -// Convert TTL type stats to TG,for tournament stats +// Server Admin Panel rework. +// Added Custom map rotatons +// Convert TTL type stats to TG,for tournament stats // Added custom two team debrief as well as a evo style extended stats // Reworked enable disable, only disables stats saving and stats access, do to systems relying on systems // // 10.1 - 10.2 - 10.3 -// Ban system changes +// Ban system changes // Fix bad loop in ban system // Misc arena things -// Added LCTF Naming +// Added LCTF Naming // serverPrefs Support //////////////////////////////////////////////////////////////////////////////// ////////////////////////////////Storage///////////////////////////////////////// From a8af353b4982b2eb43c59a369759eb6b4f6f9adb Mon Sep 17 00:00:00 2001 From: ChocoTaco Date: Sat, 26 Apr 2025 19:13:28 -0400 Subject: [PATCH 10/48] Added OneMine --- Classic/scripts/serverDefaults.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/Classic/scripts/serverDefaults.cs b/Classic/scripts/serverDefaults.cs index d53daf3..f52d72c 100755 --- a/Classic/scripts/serverDefaults.cs +++ b/Classic/scripts/serverDefaults.cs @@ -133,6 +133,7 @@ $Host::PUGPassword = "pickup"; //PUG password, Auto or enable/disable thru $Host::PUGpasswordAlwaysOn = 0; //If you want the pug password Always on $Host::DMSLOnlyMode = 0; //Shocklance Only Mode for Deathmatch $Host::LCTFProMode = 0; //Pro mode for LCTF +$Host::LCTFOneMine = 0; //Limit mine inventory to one if enabled $Host::LoadingScreenUseDebrief = 1; //Enable Debrief Style Loading screen; Gives you more lines and MOTD $Host::LoadScreenColor1 = "05edad"; //Loading Screen color; First Column $Host::LoadScreenColor2 = "29DEE7"; //Loading Screen color; Second Column From db2fd7647037b75fe6d122d6142faa6134fee3a7 Mon Sep 17 00:00:00 2001 From: ChocoTaco Date: Sat, 26 Apr 2025 19:17:36 -0400 Subject: [PATCH 11/48] Prefs changes --- Classic/prefs/serverPrefs.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Classic/prefs/serverPrefs.cs b/Classic/prefs/serverPrefs.cs index 445e9c0..d3a0a4c 100644 --- a/Classic/prefs/serverPrefs.cs +++ b/Classic/prefs/serverPrefs.cs @@ -56,7 +56,7 @@ $Host::ClassicLoadVRamChanges = 0; $Host::ClassicLogEchoEnabled = 0; $Host::ClassicMaxVotes = 3; $Host::ClassicMaxTelepads = 3; -$Host::ClassicMOTD = "Discord PUB\nServer Hosted/Provided by Branzone/Ravin\nGet Mappacks at https://playt2.com/"; +$Host::ClassicMOTD = "Tribes 2 Test\nServer brought to you via Commuity Effort\nCelebrating 20 Years of Tribes2!"; $Host::ClassicMOTDLines = 3; $Host::ClassicMOTDTime = 6; $Host::ClassicNoNullVoiceSpam = 0; @@ -126,9 +126,9 @@ $Host::LoadScreenLine2_Msg = "LakRabbit, Capture the Flag, DeathMatch, (Light On $Host::LoadScreenLine3 = "Get Mappacks:"; $Host::LoadScreenLine3_Msg = "playt2.com/mappacks"; $Host::LoadScreenLine4 = "Server Location:"; -$Host::LoadScreenLine4_Msg = "Iowa"; +$Host::LoadScreenLine4_Msg = "Somewhere"; $Host::LoadScreenLine5 = "Server Hosted:"; -$Host::LoadScreenLine5_Msg = "Google Compute Engine"; +$Host::LoadScreenLine5_Msg = "Internet"; $Host::LoadScreenLine6 = "Server Github:"; $Host::LoadScreenLine6_Msg = "https://github.com/ChocoTaco1/TacoServer"; $Host::LoadScreenMOTD1 = "Celebrating 20 Years of Tribes2!"; From 48dddeb526279210b6f234eef6a769011071bba1 Mon Sep 17 00:00:00 2001 From: ChocoTaco Date: Sat, 26 Apr 2025 19:29:09 -0400 Subject: [PATCH 12/48] Prefs changes (OneMine) --- Classic/prefs/serverPrefs.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/Classic/prefs/serverPrefs.cs b/Classic/prefs/serverPrefs.cs index d3a0a4c..4374ddd 100644 --- a/Classic/prefs/serverPrefs.cs +++ b/Classic/prefs/serverPrefs.cs @@ -115,6 +115,7 @@ $Host::LakRabbitShowFlagIcon = 1; $Host::LakRabbitShowFlagTask = 0; $Host::LakRabbitUnlimitedDJ = 1; $Host::LCTFProMode = 0; +$Host::LCTFOneMine = 0; $Host::LoadingScreenUseDebrief = 1; $Host::LoadScreenColor1 = "05edad"; $Host::LoadScreenColor2 = "29DEE7"; From 5f323ddb27dfeaef149d183e830ea4ad5e1c2ad7 Mon Sep 17 00:00:00 2001 From: ChocoTaco Date: Mon, 28 Apr 2025 12:40:12 -0400 Subject: [PATCH 13/48] On by default --- Classic/scripts/autoexec/MemPatches.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Classic/scripts/autoexec/MemPatches.cs b/Classic/scripts/autoexec/MemPatches.cs index ea21e3f..ff9b7eb 100644 --- a/Classic/scripts/autoexec/MemPatches.cs +++ b/Classic/scripts/autoexec/MemPatches.cs @@ -51,9 +51,9 @@ function serverCmd(%client) //Disable UE box on crash //Used if a clean crash is desired -//memPatch("7dc7fc","90"); +memPatch("7dc7fc","90"); //Loops Crash patch (Prevent the Uncaught Exception dialog from appearing) -//memPatch("006ff376", "909090909090"); +memPatch("006ff376", "909090909090"); //Show Linux Icon in server list //memPatch("5C9628","80CB05"); From bac741baf676f2fd37db5d6b8f4038b9b8a513ed Mon Sep 17 00:00:00 2001 From: ChocoTaco Date: Sat, 3 May 2025 01:42:22 -0400 Subject: [PATCH 14/48] LCTF Things --- Classic/scripts/LCTFGame.cs | 91 +++++++++---------- .../scripts/autoexec/MissionTypeOptions.cs | 7 +- 2 files changed, 50 insertions(+), 48 deletions(-) diff --git a/Classic/scripts/LCTFGame.cs b/Classic/scripts/LCTFGame.cs index 3d25335..075786a 100644 --- a/Classic/scripts/LCTFGame.cs +++ b/Classic/scripts/LCTFGame.cs @@ -132,7 +132,7 @@ function LCTFGame::initGameVars(%game) %game.SCORE_PER_REPAIR_DEP_TUR = 3; %game.SCORE_PER_REPAIR_DEP_INV = 2; - %game.FLAG_RETURN_DELAY = 45 * 1000; + %game.FLAG_RETURN_DELAY = 25 * 1000; %game.TIME_CONSIDERED_FLAGCARRIER_THREAT = 3 * 1000; %game.RADIUS_GEN_DEFENSE = 20; @@ -2521,61 +2521,58 @@ function Player::maxInventory(%this, %data){ function LCTFGame::LCTFOneMine(%game, %admin, %arg1, %arg2, %arg3, %arg4) { - if( $countdownStarted && $MatchStarted ) - { - if(%admin) - { - killeveryone(); + if(%admin) + { + killeveryone(); - if($Host::LCTFOneMine) - { - messageAll('MsgAdminForce', '\c2The Admin has disabled One Mine Inventory.'); + if($Host::LCTFOneMine) + { + messageAll('MsgAdminForce', '\c2The Admin has disabled One Mine Inventory.'); + + if (isActivePackage(LCTFOneMine)) + deactivatePackage(LCTFOneMine); + + $Host::LCTFOneMine = false; + } + else + { + messageAll('MsgAdminForce', '\c2The Admin has enabled One Mine Inventory.'); + + if (!isActivePackage(LCTFOneMine)) + activatePackage(LCTFOneMine); + + $Host::LCTFOneMine = true; + } + } + else + { + %totalVotes = %game.totalVotesFor + %game.totalVotesAgainst; + if(%totalVotes > 0 && (%game.totalVotesFor / ClientGroup.getCount()) > ($Host::VotePasspercent / 100)) + { + killeveryone(); + + if($Host::LCTFOneMine) + { + messageAll('MsgVotePassed', '\c2One Mine Inventory Disabled.'); if (isActivePackage(LCTFOneMine)) deactivatePackage(LCTFOneMine); - $Host::LCTFOneMine = false; - } - else - { - messageAll('MsgAdminForce', '\c2The Admin has enabled One Mine Inventory.'); + $Host::LCTFOneMine = false; + } + else + { + messageAll('MsgVotePassed', '\c2One Mine Inventory Enabled.'); if (!isActivePackage(LCTFOneMine)) activatePackage(LCTFOneMine); - $Host::LCTFOneMine = true; - } - } - else - { - %totalVotes = %game.totalVotesFor + %game.totalVotesAgainst; - if(%totalVotes > 0 && (%game.totalVotesFor / ClientGroup.getCount()) > ($Host::VotePasspercent / 100)) - { - killeveryone(); - - if($Host::LCTFOneMine) - { - messageAll('MsgVotePassed', '\c2One Mine Inventory Disabled.'); - - if (isActivePackage(LCTFOneMine)) - deactivatePackage(LCTFOneMine); - - $Host::LCTFOneMine = false; - } - else - { - messageAll('MsgVotePassed', '\c2One Mine Inventory Enabled.'); - - if (!isActivePackage(LCTFOneMine)) - activatePackage(LCTFOneMine); - - $Host::LCTFOneMine = true; - } - } - else - messageAll('MsgVoteFailed', '\c2Mode change did not pass: %1 percent.', mFloor(%game.totalVotesFor/ClientGroup.getCount() * 100)); - } - } + $Host::LCTFOneMine = true; + } + } + else + messageAll('MsgVoteFailed', '\c2Mode change did not pass: %1 percent.', mFloor(%game.totalVotesFor/ClientGroup.getCount() * 100)); + } } // For voting to work properly - evo admin.ovl diff --git a/Classic/scripts/autoexec/MissionTypeOptions.cs b/Classic/scripts/autoexec/MissionTypeOptions.cs index fcf176d..4cc0454 100644 --- a/Classic/scripts/autoexec/MissionTypeOptions.cs +++ b/Classic/scripts/autoexec/MissionTypeOptions.cs @@ -44,7 +44,12 @@ function loadMissionStage2() //Tournament Mode specifics if($Host::TournamentMode) - $Host::TimeLimit = 30; //TimeLimit Always 30 minutes in Tourney Mode + { + if(!$CurrentMissionType $= "LCTF") + $Host::TimeLimit = 30; //TimeLimit Always 30 minutes in Tourney Mode + else //LCTF 20 Minutes + $Host::TimeLimit = 20; //TimeLimit Always 20 minutes in LCTF Tourney Mode + } else { //Disable if active From 62c0dffc0dc927435e61c364818679c3ead371d4 Mon Sep 17 00:00:00 2001 From: ChocoTaco Date: Sun, 4 May 2025 12:56:48 -0400 Subject: [PATCH 15/48] Update flagTunnelingFix.cs Removed Spaces --- Classic/scripts/autoexec/flagTunnelingFix.cs | 168 +++++++++---------- 1 file changed, 84 insertions(+), 84 deletions(-) diff --git a/Classic/scripts/autoexec/flagTunnelingFix.cs b/Classic/scripts/autoexec/flagTunnelingFix.cs index e8fa9ec..6d669f6 100644 --- a/Classic/scripts/autoexec/flagTunnelingFix.cs +++ b/Classic/scripts/autoexec/flagTunnelingFix.cs @@ -1,39 +1,39 @@ -//Fixes for collision tunneling and other issues, note only tested in classic +//Fixes for collision tunneling and other issues, note only tested in classic //Script By:DarkTiger //v3.7 - removed bypass code //v3.6 - lctf and SCtFGame //v3.5 - tweaks -//v3.4 - switch over to using SAT/OBB for hitbox detection accuracy, also heavy optimizations becuase of this change +//v3.4 - switch over to using SAT/OBB for hitbox detection accuracy, also heavy optimizations becuase of this change //v3.3 - fixed ceiling deadstoping,fixed wall and ceiling tunneling $antiObjTunnel //V3.2 - script refactor, removed flag sim in favor of just an offset on toss - -$ftEnable = 1;//disables all + +$ftEnable = 1;//disables all $limitFlagCalls = 1; // prevents frame perfect events witch can cause bad outcomes $antiCeiling = 1; // note this is auto enabled with $boxStuckFix as it needs to check for this $antiObjTunnel = 0;//prevents terrain and interior tunneling more thigns can be added see first part of DefaultGame::flagColTest $antiFlagImpluse = 1000;//time out period to prevent explosions from effecting flags on drop/toss -$boxStuckFix = 1;// enables flag offset, spawns the flag outside of the player to keep it from getting stuck -$flagOffset = 1;// how far to offset the flag 1m seems like it works 90% of the time +$boxStuckFix = 1;// enables flag offset, spawns the flag outside of the player to keep it from getting stuck +$flagOffset = 1;// how far to offset the flag 1m seems like it works 90% of the time // adds initial update to setVelocity and setTransform to updates its parameters across clients -//enable $flagResetTime with setting it to 5000 if you disable a mempatch - -//expermental flag static fix +//enable $flagResetTime with setting it to 5000 if you disable a mempatch + +//expermental flag static fix //memPatch("60456c","11000018");//transform memPatch("6040ff","01"); //setVelocity -$flagResetTime = 0;// 1000-5000 if you want this feature enabled, resets flag to stand in case of desync should not be needed +$flagResetTime = 0;// 1000-5000 if you want this feature enabled, resets flag to stand in case of desync should not be needed -//best to leave these values alone unless you understand what the code is doing -$flagSimTime = 64;//note a higher the time, the larger the sweep scans will be -$flagCheckRadius = 50; +//best to leave these values alone unless you understand what the code is doing +$flagSimTime = 64;//note a higher the time, the larger the sweep scans will be +$flagCheckRadius = 50; $playerSizeBox = "1.2 1.2 2.3"; $flagBoxSize = "0.796666 0.139717 2.46029"; //0 = old AABB method uses fixed box size makes the player bit narrow //1 = new OBB method uses perfect box intersection -//2 = AABB method but uses boundbox can make the player larger then it is given there direction -//3 = AABB fixed sizes uses $playerSizeBox and $flagBoxSize to do the box checking +//2 = AABB method but uses boundbox can make the player larger then it is given there direction +//3 = AABB fixed sizes uses $playerSizeBox and $flagBoxSize to do the box checking $boxCollision = 1;// off is the old AABB method aka the old method package flagFix{ @@ -41,28 +41,28 @@ package flagFix{ parent::throwObject(%this,%obj); %data = %obj.getDatablock(); if($ftEnable && %data.getName() $= "Flag"){ - %tpos = %obj.getTransform(); - %fpos = getWords(%tpos,0, 2); + %tpos = %obj.getTransform(); + %fpos = getWords(%tpos,0, 2); %obj.dtLastPos = %fpos; %vel = %obj.getVelocity(); %posOffset = VectorAdd(%fpos, VectorScale(VectorNormalize(%vel), 2)); - + if($antiCeiling){//flag height 2.46029 - //0.1 offset any fp errors with the flag position being at ground level, 2.4 offset flag height offset + some extra + //0.1 offset any fp errors with the flag position being at ground level, 2.4 offset flag height offset + some extra %upRay = containerRayCast(vectorAdd(%fpos,"0 0 0.1"), vectorAdd(%fpos,"0 0 2.5"), $TypeMasks::InteriorObjectType | $TypeMasks::StaticTSObjectType | $TypeMasks::ForceFieldObjectType, %obj); if(%upRay){ %obj.setTransform(vectorSub(%this.getPosition(),"0 0" SPC 0.3) SPC getWords(%this.getTransform(),3,6)); %obj.setVelocity(getWords(%vel,0,1) SPC 0); - } - } + } + } if($boxStuckFix && !%upRay){ %wallMask = $TypeMasks::TerrainObjectType | $TypeMasks::InteriorObjectType | $TypeMasks::StaticObjectType | $TypeMasks::ForceFieldObjectType | $TypeMasks::VehicleObjectType; %wallRay = containerRayCast(%fpos, %posOffset, %wallMask, %obj); - + %fwoPos = VectorAdd(%fpos, VectorScale(VectorNormalize(%vel), $flagOffset)); - + %upRay = containerRayCast(vectorAdd(%fwoPos,"0 0 0.1"), vectorAdd(%fwoPos,"0 0 2.5"), $TypeMasks::InteriorObjectType | $TypeMasks::StaticTSObjectType | $TypeMasks::ForceFieldObjectType, %obj); - + if(!%wallRay){// make sure we dont end up in a wall if(!%upRay){ %obj.setTransform(%fwoPos SPC getWords(%this.getTransform(),3,6)); @@ -71,7 +71,7 @@ package flagFix{ } } } - } + } function CTFGame::startMatch(%game){ parent::startMatch(%game); @@ -90,7 +90,7 @@ package flagFix{ %game.atHomeFlagLoop(); } } - + function SCtFGame::startMatch(%game){ parent::startMatch(%game); if(!isEventPending(Game.flagLoop)){ @@ -99,7 +99,7 @@ package flagFix{ %game.atHomeFlagLoop(); } } - + function PracticeCTFGame::startMatch(%game){ parent::startMatch(%game); if(!isEventPending(Game.flagLoop)){ @@ -113,77 +113,77 @@ package flagFix{ function CTFGame::playerTouchFlag(%game, %player, %flag){ if(%flag.lastFlagCallms > 0 && $limitFlagCalls){ %timeDif = getSimTime() - %flag.lastFlagCallms; - if(%timeDif < 32){ - return; + if(%timeDif < 32){ + return; } } %flag.lastFlagCallms = getSimTime(); parent::playerTouchFlag(%game, %player, %flag); } - + function LCTFGame::playerTouchFlag(%game, %player, %flag){ if(%flag.lastFlagCallms > 0 && $limitFlagCalls){ %timeDif = getSimTime() - %flag.lastFlagCallms; if(%timeDif < 32){ - return; + return; } } %flag.lastFlagCallms = getSimTime(); parent::playerTouchFlag(%game, %player, %flag); } - + function SCtFGame::playerTouchFlag(%game, %player, %flag){ if(%flag.lastFlagCallms > 0 && $limitFlagCalls){ %timeDif = getSimTime() - %flag.lastFlagCallms; if(%timeDif < 32){ - return; + return; } } %flag.lastFlagCallms = getSimTime(); parent::playerTouchFlag(%game, %player, %flag); } - + function PracticeCTFGame::playerTouchFlag(%game, %player, %flag){ if(%flag.lastFlagCallms > 0 && $limitFlagCalls){ %timeDif = getSimTime() - %flag.lastFlagCallms; if(%timeDif < 32){ - return; + return; } } %flag.lastFlagCallms = getSimTime(); parent::playerTouchFlag(%game, %player, %flag); } - + function CTFGame::playerDroppedFlag(%game, %player){ %flag = %player.holdingFlag; %flag.lastDropTime = getSimTime(); parent::playerDroppedFlag(%game, %player); } - + function LCTFGame::playerDroppedFlag(%game, %player){ %flag = %player.holdingFlag; %flag.lastDropTime = getSimTime(); parent::playerDroppedFlag(%game, %player); } - + function SCtFGame::playerDroppedFlag(%game, %player){ %flag = %player.holdingFlag; %flag.lastDropTime = getSimTime(); parent::playerDroppedFlag(%game, %player); } - + function PracticeCTFGame::playerDroppedFlag(%game, %player){ %flag = %player.holdingFlag; %flag.lastDropTime = getSimTime(); parent::playerDroppedFlag(%game, %player); } - + function Flag::shouldApplyImpulse(%data, %obj){ - %val = parent::shouldApplyImpulse(%data, %obj); + %val = parent::shouldApplyImpulse(%data, %obj); if(%val && $antiFlagImpluse > 0 && %obj.lastDropTime > 0){ %time = getSimTime() - %obj.lastDropTime; if(%time < $antiFlagImpluse){ - %val = 0; + %val = 0; } } return %val; @@ -195,11 +195,11 @@ function vectorMul(%a,%b){ %x = getWords(%a,0) * getWords(%b,0); %y = getWords(%a,1) * getWords(%b,1); %z = getWords(%a,2) * getWords(%b,2); - return %x SPC %y SPC %z; + return %x SPC %y SPC %z; } function generateBoxData(){ - + %playerSize = $playerSizeBox; //"1.2 1.2 2.3"; %halfSize = vectorMul(%playerSize, "0.5 0.5 0"); $plrBoxMin = %minA = VectorSub("0 0 0", %halfSize); @@ -222,12 +222,12 @@ function generateBoxData(){ %box[5] = "1 0 1"; %box[6] = "0 1 1"; %box[7] = "1 1 1"; - + for(%i = 0; %i < 8; %i++){ $playerBoxData[%i] = vectorAdd(%minA, vectorMul(%vSubA, %box[%i])); $flagBoxData[%i] = vectorAdd(%minB, vectorMul(%vSubB, %box[%i])); } - + }generateBoxData(); function vectorLerp(%point1, %point2, %t) { @@ -237,7 +237,7 @@ function vectorLerp(%point1, %point2, %t) { function boxIntersectAABB(%plr, %flg, %lerpPos){ if($boxCollision == 2){ %fpos = %flg.getPosition(); - + %a = vectorAdd($plrBoxMin, %lerpPos) SPC vectorAdd($plrBoxMax, %lerpPos); %b = vectorAdd($flagBoxMin, %fpos) SPC vectorAdd($flagBoxMax, %fpos); } @@ -246,7 +246,7 @@ function boxIntersectAABB(%plr, %flg, %lerpPos){ %a = vectorAdd(getWords(%plrMinMax,0,2), %lerpPos) SPC vectorAdd(getWords(%plrMinMax,3,5), %lerpPos); %b = %flg.getWorldBox(); } - + return (getWord(%a, 0) <= getWord(%b, 3) && getWord(%a, 3) >= getWord(%b, 0)) && (getWord(%a, 1) <= getWord(%b, 4) && getWord(%a, 4) >= getWord(%b, 1)) && (getWord(%a, 2)<= getWord(%b, 5) && getWord(%a, 5) >= getWord(%b, 2)); @@ -259,7 +259,7 @@ function DefaultGame::flagColTest(%game, %flag, %rsTeam, %ext){ if(!%flag.isHome && $antiObjTunnel){ %fOffset =vectorAdd(%flagPos,"0 0 0.1"); %dist = vectorDist(%flag.dtLastPos, %fOffset); - if(%dist > 2.5){//2.5 is the rough flag height + if(%dist > 2.5){//2.5 is the rough flag height %wallMask = $TypeMasks::TerrainObjectType | $TypeMasks::InteriorObjectType; %terRay = containerRayCast(%flag.dtLastPos, %fOffset, %wallMask, %flag); if(%terRay){ @@ -288,7 +288,7 @@ function DefaultGame::flagColTest(%game, %flag, %rsTeam, %ext){ %lerpPos = vectorLerp(%playerPos, %player.oldPos, %i/(%sweepCount-1));//back sweep //%point = MatrixMulPoint(%lerpPos SPC %rot, "-0.6 -0.6 0"); //schedule(1000+(%i*128), 0, "drawBoxItemC", %point, %rot, "1.2 1.2 2.3", 15000); - if($boxCollision == 1 && boxIntersect(%player, %flag, %lerpPos)){ + if($boxCollision == 1 && boxIntersect(%player, %flag, %lerpPos)){ // %point = MatrixMulPoint(%flagPos SPC %rot,"-0.398 -0.069 0"); // schedule(1000+(%i*128), 0, "drawBoxItemC", %point, %rot, "0.796666 0.139717 4", 15000); %flag.getDataBlock().onCollision(%flag, %player); @@ -306,7 +306,7 @@ function DefaultGame::flagColTest(%game, %flag, %rsTeam, %ext){ %player.lastSim = getSimTime(); } //error("scan count" SPC %scanCount SPC %scanPlrCount); -} +} function DefaultGame::atHomeFlagLoop(%game){ if(isObject($TeamFlag[1]) && isObject($TeamFlag[2])){ @@ -321,36 +321,36 @@ function DefaultGame::atHomeFlagLoop(%game){ %game.flagResetTime = 0; } %game.flagResetTime += $flagSimTime; - } - + } + if($TeamFlag[1].isHome && $TeamFlag[2].isHome){//11 - %game.flagColTest($TeamFlag[1],1,0);// only look at the other team - %game.flagColTest($TeamFlag[2],1,0);// only look at the other team + %game.flagColTest($TeamFlag[1],1,0);// only look at the other team + %game.flagColTest($TeamFlag[2],1,0);// only look at the other team } else if(!$TeamFlag[1].isHome && $TeamFlag[2].isHome){//01 if(isObject($TeamFlag[1].carrier)){// flag has been dropped - %game.flagColTest($TeamFlag[2],1, $TeamFlag[1].carrier); //scan for other team expect for are carrier + %game.flagColTest($TeamFlag[2],1, $TeamFlag[1].carrier); //scan for other team expect for are carrier } else{ - %game.flagColTest($TeamFlag[1],0,0);// scan for everyone can touch it - %game.flagColTest($TeamFlag[2],1,0);// team 2 flag is still at home so only scan for the other team + %game.flagColTest($TeamFlag[1],0,0);// scan for everyone can touch it + %game.flagColTest($TeamFlag[2],1,0);// team 2 flag is still at home so only scan for the other team } } else if($TeamFlag[1].isHome && !$TeamFlag[2].isHome){//10 if(isObject($TeamFlag[2].carrier)){// flag has been dropped - %game.flagColTest($TeamFlag[1],1, $TeamFlag[2].carrier); //scan for other team expect for are carrier + %game.flagColTest($TeamFlag[1],1, $TeamFlag[2].carrier); //scan for other team expect for are carrier } else{ - %game.flagColTest($TeamFlag[1],1,0);// team 1 flag is still at home so only scan for the other team - %game.flagColTest($TeamFlag[2],0,0);// scan for everyone can touch it + %game.flagColTest($TeamFlag[1],1,0);// team 1 flag is still at home so only scan for the other team + %game.flagColTest($TeamFlag[2],0,0);// scan for everyone can touch it } } else if(!$TeamFlag[1].isHome && !$TeamFlag[2].isHome){//00 if(!isObject($TeamFlag[1].carrier)){// flag has been dropped - %game.flagColTest($TeamFlag[1],0,0);// scan for everyone can touch it + %game.flagColTest($TeamFlag[1],0,0);// scan for everyone can touch it } if(!isObject($TeamFlag[2].carrier)){// flag has been dropped - %game.flagColTest($TeamFlag[2],0,0);// scan for everyone can touch it + %game.flagColTest($TeamFlag[2],0,0);// scan for everyone can touch it } } } @@ -362,80 +362,80 @@ function DefaultGame::atHomeFlagLoop(%game){ function boxIntersect(%objA, %objB, %scanPos) { // Retrieve the 8 corners of the box for both objects - %matrixA = %objA.getTransform(); - if(getWordCount(%scanPos)){// need to check a postion other then default + %matrixA = %objA.getTransform(); + if(getWordCount(%scanPos)){// need to check a postion other then default %matrixA = %scanPos SPC getWords(%matrixA,3,6); } - %matrixB = %objB.getTransform(); + %matrixB = %objB.getTransform(); + - %cornerA[0] = MatrixMulPoint(%matrixA, "-0.6 -0.6 0"); %cornerA[1] = MatrixMulPoint(%matrixA, "0.6 -0.6 0"); %cornerA[2] = MatrixMulPoint(%matrixA, "-0.6 0.6 0"); %cornerA[3] = MatrixMulPoint(%matrixA, "0.6 0.6 0"); - + %cornerA[4] = MatrixMulPoint(%matrixA, "-0.6 -0.6 2.3"); %cornerA[5] = MatrixMulPoint(%matrixA, "0.6 -0.6 2.3"); %cornerA[6] = MatrixMulPoint(%matrixA, "-0.6 0.6 2.3"); - %cornerA[7] = MatrixMulPoint(%matrixA, "0.6 0.6 2.3"); - - + %cornerA[7] = MatrixMulPoint(%matrixA, "0.6 0.6 2.3"); + + %cornerB[0] = MatrixMulPoint(%matrixB, "-0.398333 -0.0698583 -0.1"); %cornerB[1] = MatrixMulPoint(%matrixB, "0.398333 -0.0698583 -0.1"); %cornerB[2] = MatrixMulPoint(%matrixB, "-0.398333 0.0698587 -0.1"); %cornerB[3] = MatrixMulPoint(%matrixB, "0.398333 0.0698587 -0.1"); - + %cornerB[4] = MatrixMulPoint(%matrixB, "-0.398333 -0.0698583 2.46029"); %cornerB[5] = MatrixMulPoint(%matrixB, "0.398333 -0.0698583 2.46029"); %cornerB[6] = MatrixMulPoint(%matrixB, "-0.398333 0.0698587 2.46029"); - %cornerB[7] = MatrixMulPoint(%matrixB, "0.398333 0.0698587 2.46029"); - + %cornerB[7] = MatrixMulPoint(%matrixB, "0.398333 0.0698587 2.46029"); + // Define the axes to test (these are the edges of both boxes) %ax[0] = vectorNormalize(vectorSub(%cornerA[1], %cornerA[0]));//X cross forward and up %ax[1] = vectorNormalize(vectorSub(%cornerA[2], %cornerA[0]));//Y forward vector %ax[2] = "0 0 1"; - + %ax[3] = vectorNormalize(vectorSub(%cornerB[1], %cornerB[0]));//X cross forward and up %ax[4] = vectorNormalize(vectorSub(%cornerB[2], %cornerB[0])); //Y forward vector %ax[5] = "0 0 1"; - + // For each axis for (%i = 0; %i < 6; %i++) { %axis = %ax[%i]; - + // Project each corner of box A onto the axis %minProjA = vectorDot(%cornerA[0], %axis); %maxProjA = %minProjA; - + for (%j = 1; %j < 8; %j++) { %projA = vectorDot(%cornerA[%j], %axis); - + %minProjA = (%projA < %minProjA) ? %projA : %minProjA; %maxProjA = (%projA > %maxProjA) ? %projA : %maxProjA; } - + // Project each corner of box B onto the axis %minProjB = vectorDot(%cornerB[0], %axis); %maxProjB = %minProjB; - + for (%j = 1; %j < 8; %j++) { %projB = vectorDot(%cornerB[%j], %axis); %minProjB = (%projB < %minProjB) ? %projB : %minProjB; %maxProjB = (%projB > %maxProjB) ? %projB : %maxProjB; } - + // Check for overlap if (%maxProjA < %minProjB || %maxProjB < %minProjA) { return false; // No overlap on this axis, boxes do not intersect } } - + return true; // Overlap on all axes, boxes intersect } function testFlagSpeed(%speed){ - %player = LocalClientConnection.player; + %player = LocalClientConnection.player; %fvec = %player.getForwardVector(); %vel = vectorScale(%fvec,%speed); %player.setVelocity(%vel); From 982207a2df2b1577fb691599c50403abb3529a3c Mon Sep 17 00:00:00 2001 From: ChocoTaco Date: Sun, 4 May 2025 13:00:33 -0400 Subject: [PATCH 16/48] Update MapRotation.cs --- Classic/prefs/MapRotation.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Classic/prefs/MapRotation.cs b/Classic/prefs/MapRotation.cs index fa47405..0e847ad 100644 --- a/Classic/prefs/MapRotation.cs +++ b/Classic/prefs/MapRotation.cs @@ -387,10 +387,10 @@ addRotationMap("SignalDX", "CTF",1,0,8,24); //In Rotation ///////////////////////////////////////////////////////////////////// -addRotationMap("VaubanLak", "Lakrabbit",1,0,8,-1); +addRotationMap("VaubanLak", "Lakrabbit",1,1,8,-1); addRotationMap("MiniSunDried", "Lakrabbit",1,1,-1,12); addRotationMap("Sundance", "Lakrabbit",1,1,-1,-1); -addRotationMap("TWL_BeachBlitzLak", "Lakrabbit",1,0,-1,-1); +addRotationMap("TWL_BeachBlitzLak", "Lakrabbit",1,1,-1,-1); addRotationMap("DesertofDeathLak", "Lakrabbit",1,1,-1,-1); addRotationMap("Raindance_nefLak", "Lakrabbit",1,1,-1,-1); addRotationMap("SunDriedLak", "Lakrabbit",1,1,-1,-1); @@ -402,11 +402,11 @@ addRotationMap("BoxLak", "Lakrabbit",1,1,-1,10); addRotationMap("TitaniaLak", "Lakrabbit",1,0,8,-1); addRotationMap("TibbawLak", "Lakrabbit",1,1,-1,-1); addRotationMap("InfernusLak", "Lakrabbit",1,1,-1,-1); -addRotationMap("S8_GeothermalLak", "Lakrabbit",1,1,-1,-1); +addRotationMap("S8_GeothermalLak", "Lakrabbit",1,0,-1,-1); addRotationMap("CankerLak", "Lakrabbit",1,1,-1,-1); addRotationMap("DustRunLak", "Lakrabbit",1,1,-1,-1); addRotationMap("CrossfiredLak", "Lakrabbit",1,1,-1,-1); -addRotationMap("CloakofLak", "Lakrabbit",1,1,-1,-1); +addRotationMap("CloakofLak", "Lakrabbit",1,0,-1,-1); addRotationMap("SpectreLak", "Lakrabbit",1,1,-1,-1); //Voteable, But not in rotation From fe1689b730ed984e6d4608eb0e6dab45dfa7a9f0 Mon Sep 17 00:00:00 2001 From: ChocoTaco Date: Mon, 5 May 2025 12:45:09 -0400 Subject: [PATCH 17/48] Update MissionTypeOptions.cs --- Classic/scripts/autoexec/MissionTypeOptions.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Classic/scripts/autoexec/MissionTypeOptions.cs b/Classic/scripts/autoexec/MissionTypeOptions.cs index 4cc0454..c76b69a 100644 --- a/Classic/scripts/autoexec/MissionTypeOptions.cs +++ b/Classic/scripts/autoexec/MissionTypeOptions.cs @@ -45,10 +45,10 @@ function loadMissionStage2() //Tournament Mode specifics if($Host::TournamentMode) { - if(!$CurrentMissionType $= "LCTF") + if($CurrentMissionType $= "LCTF") //TimeLimit Always 20 minutes in LCTF Tourney Mode + $Host::TimeLimit = 20; + else $Host::TimeLimit = 30; //TimeLimit Always 30 minutes in Tourney Mode - else //LCTF 20 Minutes - $Host::TimeLimit = 20; //TimeLimit Always 20 minutes in LCTF Tourney Mode } else { From ff7e73530c2976bdd2c55ec5663cbfb9ac8e801f Mon Sep 17 00:00:00 2001 From: ChocoTaco Date: Mon, 5 May 2025 12:45:22 -0400 Subject: [PATCH 18/48] Old method by default --- Classic/scripts/autoexec/flagTunnelingFix.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Classic/scripts/autoexec/flagTunnelingFix.cs b/Classic/scripts/autoexec/flagTunnelingFix.cs index 6d669f6..e901d8e 100644 --- a/Classic/scripts/autoexec/flagTunnelingFix.cs +++ b/Classic/scripts/autoexec/flagTunnelingFix.cs @@ -34,7 +34,7 @@ $flagBoxSize = "0.796666 0.139717 2.46029"; //1 = new OBB method uses perfect box intersection //2 = AABB method but uses boundbox can make the player larger then it is given there direction //3 = AABB fixed sizes uses $playerSizeBox and $flagBoxSize to do the box checking -$boxCollision = 1;// off is the old AABB method aka the old method +$boxCollision = 0; // off is the old AABB method aka the old method package flagFix{ function ShapeBase::throwObject(%this,%obj){ From 50bc00229b8380c15d049ba3b1e50cdc5e7ef627 Mon Sep 17 00:00:00 2001 From: ChocoTaco Date: Wed, 7 May 2025 16:19:20 -0400 Subject: [PATCH 19/48] Added RunenmachtLT --- Classic/prefs/MapRotation.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Classic/prefs/MapRotation.cs b/Classic/prefs/MapRotation.cs index 0e847ad..83cd9cd 100644 --- a/Classic/prefs/MapRotation.cs +++ b/Classic/prefs/MapRotation.cs @@ -475,7 +475,7 @@ addRotationMap("Blink", "LCTF",1,0,-1,-1); addRotationMap("HillSideLT", "LCTF",1,1,-1,10); addRotationMap("IcePick", "LCTF",1,1,-1,16); addRotationMap("OsIrisLT", "LCTF",1,0,-1,-1); -addRotationMap("GrassyKnoll", "LCTF",1,1,-1,-1); +addRotationMap("GrassyKnollLT", "LCTF",1,1,-1,-1); addRotationMap("TWL2_MuddySwamp", "LCTF",1,0,8,-1); addRotationMap("SandyRunLT", "LCTF",1,0,-1,12); addRotationMap("Sentry", "LCTF",1,1,-1,-1); @@ -533,6 +533,7 @@ addRotationMap("FrozenForgeLT", "LCTF",1,1,-1,20); addRotationMap("TWL2_CelerityLT", "LCTF",1,1,-1,20); addRotationMap("El_FinLT", "LCTF",1,1,-1,14); addRotationMap("CapriLT", "LCTF",1,1,-1,14); +addRotationMap("RunenmachtLT", "LCTF",1,1,-1,14); // _____ _ _ _ _ From 16bdd87af12926f2b951ba21ce1f3e01f6c31515 Mon Sep 17 00:00:00 2001 From: ChocoTaco Date: Wed, 7 May 2025 16:19:40 -0400 Subject: [PATCH 20/48] Flag Tunneling v3.8 --- Classic/scripts/autoexec/flagTunnelingFix.cs | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/Classic/scripts/autoexec/flagTunnelingFix.cs b/Classic/scripts/autoexec/flagTunnelingFix.cs index e901d8e..a7a6e35 100644 --- a/Classic/scripts/autoexec/flagTunnelingFix.cs +++ b/Classic/scripts/autoexec/flagTunnelingFix.cs @@ -1,5 +1,6 @@ //Fixes for collision tunneling and other issues, note only tested in classic //Script By:DarkTiger +//v3.8 - removed sweep optimization/ bug fix in old method //v3.7 - removed bypass code //v3.6 - lctf and SCtFGame //v3.5 - tweaks @@ -32,9 +33,6 @@ $flagBoxSize = "0.796666 0.139717 2.46029"; //0 = old AABB method uses fixed box size makes the player bit narrow //1 = new OBB method uses perfect box intersection -//2 = AABB method but uses boundbox can make the player larger then it is given there direction -//3 = AABB fixed sizes uses $playerSizeBox and $flagBoxSize to do the box checking -$boxCollision = 0; // off is the old AABB method aka the old method package flagFix{ function ShapeBase::throwObject(%this,%obj){ @@ -282,7 +280,7 @@ function DefaultGame::flagColTest(%game, %flag, %rsTeam, %ext){ //%fdot = vectorDot(vectorNormalize(%player.getVelocity()),vectorNormalize(VectorSub(%flagPos, %playerPos))); // %tickDist = vectorLen(%player.getVelocity()) * ($flagSimTime/1000); %sweepCount = mFloor(vectorDist(%playerPos, %player.oldPos) + 1.5); - if((getSimTime() - %player.lastSim) <= 128 && %flagDist-2 < %sweepCount){//make sure are last position is valid + if((getSimTime() - %player.lastSim) <= 128){//make sure are last position is valid //schedule(1000,0,"drawBeamItem", %player.oldPos,%playerPos,15000); for(%i = 0; %i < %sweepCount; %i++){// sweep behind us to see if we should have hit something %lerpPos = vectorLerp(%playerPos, %player.oldPos, %i/(%sweepCount-1));//back sweep @@ -294,7 +292,7 @@ function DefaultGame::flagColTest(%game, %flag, %rsTeam, %ext){ %flag.getDataBlock().onCollision(%flag, %player); break; } - else if($boxCollision > 1 && boxIntersectAABB(%player, %flag, %lerpPos)){ + else if(!$boxCollision && boxIntersectAABB(%player, %flag, %lerpPos)){ %flag.getDataBlock().onCollision(%flag, %player); break; } @@ -439,4 +437,4 @@ function testFlagSpeed(%speed){ %fvec = %player.getForwardVector(); %vel = vectorScale(%fvec,%speed); %player.setVelocity(%vel); -} +} \ No newline at end of file From d736c3a8ff6ff213bbcdeb76217e9fed7310cd38 Mon Sep 17 00:00:00 2001 From: ChocoTaco Date: Wed, 7 May 2025 20:30:56 -0400 Subject: [PATCH 21/48] Add LCTF --- Classic/scripts/autoexec/ObserveFlag.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Classic/scripts/autoexec/ObserveFlag.cs b/Classic/scripts/autoexec/ObserveFlag.cs index 9d53409..9f9d353 100644 --- a/Classic/scripts/autoexec/ObserveFlag.cs +++ b/Classic/scripts/autoexec/ObserveFlag.cs @@ -142,7 +142,7 @@ if (!isActivePackage(PizzaThings)) function serverCmdObserveFirstFlag(%client) { - if(Game.class !$= CTFGame && Game.class !$= SCtFGame) + if(Game.class !$= CTFGame && Game.class !$= SCtFGame && Game.class !$= LCTFGame ) return; // client must be an observer @@ -160,7 +160,7 @@ function serverCmdObserveFirstFlag(%client) function serverCmdObserveSecondFlag(%client) { - if(Game.class !$= CTFGame && Game.class !$= SCtFGame) + if(Game.class !$= CTFGame && Game.class !$= SCtFGame && Game.class !$= LCTFGame ) return; // client must be an observer @@ -184,7 +184,7 @@ function observeFlag(%client, %target, %type, %flagTeam) if(!isObject(%client) || !isObject(%target) || !isObject(%client.camera)) return; - if(Game.class !$= CTFGame && Game.class !$= SCtFGame) + if(Game.class !$= CTFGame && Game.class !$= SCtFGame && Game.class !$= LCTFGame ) return; if(%client.team > 0) From d21c5060c575d465abda7e2dcca7f31bfc42ee1c Mon Sep 17 00:00:00 2001 From: ChocoTaco Date: Wed, 14 May 2025 14:42:52 -0400 Subject: [PATCH 22/48] Oops --- Classic/scripts/autoexec/z_dtStats.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/Classic/scripts/autoexec/z_dtStats.cs b/Classic/scripts/autoexec/z_dtStats.cs index 5757627..448a3b0 100644 --- a/Classic/scripts/autoexec/z_dtStats.cs +++ b/Classic/scripts/autoexec/z_dtStats.cs @@ -13383,7 +13383,6 @@ function dtPingStats(){ %cl.dtStats.stat["idleTime"] += ($dtStats::prefTestTime/1000)/60; if(!%cl.isAIControlled()){ %ping = %cl.getPing(); - %cl.lastPing = %ping; %cl.pingTotal += %ping; %cl.pingCount++; %cl.dtStats.stat["pingAvg"] = %cl.pingTotal / %cl.pingCount; From 37f30b8654754b85f1a6fbfaaf69ac0d5bc9d24e Mon Sep 17 00:00:00 2001 From: ChocoTaco Date: Wed, 14 May 2025 14:43:42 -0400 Subject: [PATCH 23/48] Full sweep --- Classic/scripts/autoexec/flagTunnelingFix.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Classic/scripts/autoexec/flagTunnelingFix.cs b/Classic/scripts/autoexec/flagTunnelingFix.cs index a7a6e35..3761a01 100644 --- a/Classic/scripts/autoexec/flagTunnelingFix.cs +++ b/Classic/scripts/autoexec/flagTunnelingFix.cs @@ -279,7 +279,7 @@ function DefaultGame::flagColTest(%game, %flag, %rsTeam, %ext){ if(%player.lastSim > 0 && (%player.getState() !$= "Dead")){// only check at speed //%fdot = vectorDot(vectorNormalize(%player.getVelocity()),vectorNormalize(VectorSub(%flagPos, %playerPos))); // %tickDist = vectorLen(%player.getVelocity()) * ($flagSimTime/1000); - %sweepCount = mFloor(vectorDist(%playerPos, %player.oldPos) + 1.5); + %sweepCount = mFloor(vectorDist(%playerPos, %player.oldPos) + 2); if((getSimTime() - %player.lastSim) <= 128){//make sure are last position is valid //schedule(1000,0,"drawBeamItem", %player.oldPos,%playerPos,15000); for(%i = 0; %i < %sweepCount; %i++){// sweep behind us to see if we should have hit something From 8297f5e5b660bb8886668a77a397e79c6d1fab77 Mon Sep 17 00:00:00 2001 From: ChocoTaco Date: Wed, 14 May 2025 14:48:00 -0400 Subject: [PATCH 24/48] Added OuterWildsLT --- Classic/prefs/MapRotation.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Classic/prefs/MapRotation.cs b/Classic/prefs/MapRotation.cs index 83cd9cd..3bb80e2 100644 --- a/Classic/prefs/MapRotation.cs +++ b/Classic/prefs/MapRotation.cs @@ -525,7 +525,7 @@ addRotationMap("Bridgepoint", "LCTF",1,1,-1,14); addRotationMap("NarcolepsyLT", "LCTF",1,1,-1,14); addRotationMap("WhiteDwarfDeluxeLT", "LCTF",1,0,-1,14); addRotationMap("ClusterUnFuct", "LCTF",1,1,8,-1); -addRotationMap("OuterWilds", "LCTF",1,1,-1,12); +addRotationMap("OuterWildsLT", "LCTF",1,1,-1,12); addRotationMap("Drafts", "LCTF",1,1,-1,12); addRotationMap("DermCrossingDeluxeLT", "LCTF",1,1,-1,-1); addRotationMap("SuperiorWaterworks", "LCTF",1,0,-1,12); From fae87aa449dcaaab13681929b39fe76101d6f1f4 Mon Sep 17 00:00:00 2001 From: ChocoTaco Date: Wed, 14 May 2025 14:50:46 -0400 Subject: [PATCH 25/48] LCTF Things --- Classic/scripts/LCTFGame.cs | 111 ++++++++++++++++++++++++++++++++++-- 1 file changed, 105 insertions(+), 6 deletions(-) diff --git a/Classic/scripts/LCTFGame.cs b/Classic/scripts/LCTFGame.cs index 075786a..c9754c3 100644 --- a/Classic/scripts/LCTFGame.cs +++ b/Classic/scripts/LCTFGame.cs @@ -23,6 +23,15 @@ exec("scripts/aiLCTF.cs"); //exec the prefs //exec("prefs/LCTFPrefs.cs"); +//Time for auto overtime sudden-death mode +$LCTF::Overtime = 5; //5 Minutes, 0 to disable +//Damage scales for Chaingun and Grenade Launcher +//1 = 100%, 0.85 = 85%, 0 = OFF, etc +$LCTF::CGDamageScale = "0"; +$LCTF::GLDamageScale = "0"; +//Ban Mines +$LCTF::BanMines = 0; + function setArmorDefaults(%armor) { switch$ ( %armor ) @@ -57,7 +66,7 @@ function setArmorDefaults(%armor) $InvBanList[LCTF, "Mortar"] = 1; $InvBanList[LCTF, "SniperRifle"] = 1; // Misc - $InvBanList[LCTF, "Mine"] = 0; + $InvBanList[LCTF, "Mine"] = $LCTF::BanMines; $InvBanList[LCTF, "ConcussionGrenade"] = 0; $InvBanList[LCTF, "CameraGrenade"] = 1; $InvBanList[LCTF, "FlareGrenade"] = 1; @@ -368,7 +377,22 @@ package LCTFGame //Take out anything vehicle related function Armor::damageObject(%data, %targetObject, %sourceObject, %position, %amount, %damageType, %momVec, %mineSC) { - //error("Armor::damageObject( "@%data@", "@%targetObject@", "@%sourceObject@", "@%position@", "@%amount@", "@%damageType@", "@%momVec@" )"); + //CG and GL Damage Scales + if($LCTF::CGDamageScale){ + if(Game.class $= "LCTFGame" && %damageType $= $DamageType::Bullet){ + %amount *= $LCTF::CGDamageScale; + } + } + if($LCTF::GLDamageScale){ + if(isObject($LCTFLastExploded)){ + %name = $LCTFLastExploded.getName();// find what what exploded last + if(Game.class $= "LCTFGame" && %name $= "BasicGrenade"){// BasicGrenade is the nade launcher + %amount *= $LCTF::GLDamageScale; + } + } + } + + //error("Armor::damageObject( "@%data@", "@%targetObject@", "@%sourceObject@", "@%position@", "@%amount@", "@%damageType@", "@%momVec@" )"); if(%targetObject.invincible || %targetObject.getState() $= "Dead") return; @@ -474,6 +498,12 @@ package LCTFGame playPain( %targetObject ); } } + + //Needed for Grenade Launcher type detection + function ProjectileData::onExplode(%data, %proj, %pos, %mod){ + $LCTFLastExploded = %data;// record what exploded + parent::onExplode(%data, %proj, %pos, %mod); + } }; ///////////////////////////////////////////////////////////////////////////////////////// @@ -672,8 +702,8 @@ function LCTFGame::playerTouchFlag(%game, %player, %flag) if ((%flag.carrier $= "") && (%player.getState() !$= "Dead")) { // z0dd - ZOD, 5/07/04. Cancel the lava return. - if(isEventPending(%obj.lavaEnterThread)) - cancel(%obj.lavaEnterThread); + if(isEventPending(%flag.lavaEnterThread)) + cancel(%flag.lavaEnterThread); //flag isn't held and has been touched by a live player if (%client.team == %flag.team) @@ -683,6 +713,12 @@ function LCTFGame::playerTouchFlag(%game, %player, %flag) } // toggle visibility of the flag setTargetRenderMask(%flag.waypoint.getTarget(), %flag.isHome ? 0 : 1); + + if( %player > 0 ) + { + %player.setInvincibleMode(0 ,0.00); + %player.setInvincible( false ); // fire your weapon and your invincibility goes away. + } } function LCTFGame::playerTouchOwnFlag(%game, %player, %flag) @@ -1511,14 +1547,77 @@ function LCTFGame::resetDontScoreTimer(%game, %team) $dontScoreTimer[%team] = false; } +function LCTFGame::checkTimeLimit(%game, %forced) +{ + // Don't add extra checks: + if ( %forced ) + cancel( %game.timeCheck ); + + // if there is no time limit, check back in a minute to see if it's been set + if(($Host::TimeLimit $= "") || $Host::TimeLimit == 0) + { + %game.timeCheck = %game.schedule(20000, "checkTimeLimit"); + return; + } + + %curTimeLeftMS = ($Host::TimeLimit * 60 * 1000) + $missionStartTime - getSimTime(); + + if (%curTimeLeftMS <= 0) + { + %teamOneCaps = mFloor($TeamScore[1] / %game.SCORE_PER_TEAM_FLAG_CAP); + %teamTwoCaps = mFloor($TeamScore[2] / %game.SCORE_PER_TEAM_FLAG_CAP); + if(%teamOneCaps == %teamTwoCaps && $LCTF::Overtime && $Host::TournamentMode){ //Setting exists + if(!%game.overtime){ + %game.overtime = 1; + if($LCTF::Overtime > 1){ %s = "s"; } + messageAll('MsgOvertime', '\c2Sudden-Death Overtime Initiated: %1 Minute%2 Remaining~wfx/powered/turret_heavy_activate.wav', $LCTF::Overtime, %s); + echo("Sudden-Death Overtime Initiated"); + UpdateClientTimes($LCTF::Overtime * 60 * 1000); + EndCountdown($LCTF::Overtime * 60 * 1000); + %game.timeCheck = %game.schedule($LCTF::Overtime * 60 * 1000, "timeLimitReached"); + } + } + else{ + if(%game.scheduleVote !$= ""){ + if(!%game.voteOT){ + messageAll('MsgOvertime', '\c2Vote Overtime Initiated.~wfx/powered/turret_heavy_activate.wav'); + %game.voteOT = 1; + } + } + else{ + %game.timeLimitReached(); + } + } + } + else + { + if(%curTimeLeftMS >= 20000) + %game.timeCheck = %game.schedule(20000, "checkTimeLimit"); + else + %game.timeCheck = %game.schedule(%curTimeLeftMS + 1, "checkTimeLimit"); + + //now synchronize everyone's clock + messageAll('MsgSystemClock', "", $Host::TimeLimit, %curTimeLeftMS); + } +} + function LCTFGame::checkScoreLimit(%game, %team) { %scoreLimit = MissionGroup.CTF_scoreLimit * %game.SCORE_PER_TEAM_FLAG_CAP; // default of 5 if scoreLimit not defined if(%scoreLimit $= "") %scoreLimit = 5 * %game.SCORE_PER_TEAM_FLAG_CAP; - if($TeamScore[%team] >= %scoreLimit) - %game.scoreLimitReached(); + if(%game.overtime){ + %teamOneCaps = mFloor($TeamScore[1] / %game.SCORE_PER_TEAM_FLAG_CAP); + %teamTwoCaps = mFloor($TeamScore[2] / %game.SCORE_PER_TEAM_FLAG_CAP); + if(%teamOneCaps != %teamTwoCaps){ + %game.scoreLimitReached(); + } + } + else{ + if($TeamScore[%team] >= %scoreLimit) + %game.scoreLimitReached(); + } } function LCTFGame::awardScoreFlagReturn(%game, %cl, %perc) From d1131f76b347b94c3613a58019d9a5e051ebdaf5 Mon Sep 17 00:00:00 2001 From: ChocoTaco Date: Wed, 14 May 2025 14:51:15 -0400 Subject: [PATCH 26/48] Numerous fixes --- Classic/scripts/autoexec/VoteMenu.cs | 45 ++++++++++++---------------- 1 file changed, 19 insertions(+), 26 deletions(-) diff --git a/Classic/scripts/autoexec/VoteMenu.cs b/Classic/scripts/autoexec/VoteMenu.cs index f8beadb..27bc536 100644 --- a/Classic/scripts/autoexec/VoteMenu.cs +++ b/Classic/scripts/autoexec/VoteMenu.cs @@ -486,19 +486,8 @@ function serverCmdStartNewVote(%client, %typeName, %arg1, %arg2, %arg3, %arg4, % } else //is an admin { - if($Host::TournamentMode) //Admins still have the option to set the time to 30 minutes in Tourney Mode - { - if(%arg1 !$= "30") //30 minutes only - { - messageClient(%client, "", "\c2Invalid time selection."); - return; - } - } - else - { - messageClient(%client, "", "\c2Invalid time selection."); - return; - } + messageClient(%client, "", "\c2Invalid time selection."); + return; } } @@ -834,21 +823,21 @@ function serverCmdStartNewVote(%client, %typeName, %arg1, %arg2, %arg3, %arg4, % // LakRabbit Stuff case "VoteDuelMode": - if(!$CurrentMissionType $= "LakRabbit") + if($CurrentMissionType !$= "LakRabbit") return; if(!%isAdmin || (%isAdmin && %client.ForceVote)) %msg = %client.nameBase @ " initiated a vote to " @ (Game.duelMode == 0 ? "enable" : "disable") @ " duel mode."; case "VoteSplashDamage": - if(!$CurrentMissionType $= "LakRabbit") + if($CurrentMissionType !$= "LakRabbit") return; if(!%isAdmin || (%isAdmin && %client.ForceVote)) %msg = %client.nameBase @ " initiated a vote to " @ (Game.noSplashDamage == 1 ? "enable" : "disable") @ " splash damage."; case "VotePro": - if(!$CurrentMissionType $= "LakRabbit") + if($CurrentMissionType !$= "LakRabbit") return; if(!%isAdmin || (%isAdmin && %client.ForceVote)) @@ -856,7 +845,7 @@ function serverCmdStartNewVote(%client, %typeName, %arg1, %arg2, %arg3, %arg4, % //Deathmatch Stuff case "DMSLOnlyMode": - if(!$CurrentMissionType $= "DM") + if($CurrentMissionType !$= "DM") return; if(!%isAdmin || (%isAdmin && %client.ForceVote)) @@ -864,18 +853,21 @@ function serverCmdStartNewVote(%client, %typeName, %arg1, %arg2, %arg3, %arg4, % //LCTF Stuff case "LCTFProMode": - if(!$CurrentMissionType $= "LCTF") + if($CurrentMissionType !$= "LCTF") return; if(!%isAdmin || (%isAdmin && %client.ForceVote)) %msg = %client.nameBase @ " initiated a vote to " @ (Game.LCTFProMode == 0 ? "enable" : "disable") @ " pro mode."; case "LCTFOneMine": - if(!$CurrentMissionType $= "LCTF") - return; + if($CurrentMissionType !$= "LCTF") + return; - if(!%isAdmin || (%isAdmin && %client.ForceVote)) - %msg = %client.nameBase @ " initiated a vote to " @ (Game.LCTFOneMine == 0 ? "enable" : "disable") @ " one mine mode."; + if($InvBanList[LCTF, "Mine"]) + messageClient(%client, "", "\c2Mines are disabled at this time."); + + if(!%isAdmin || (%isAdmin && %client.ForceVote)) + %msg = %client.nameBase @ " initiated a vote to " @ (Game.LCTFOneMine == 0 ? "enable" : "disable") @ " one mine mode."; case "showServerRules": if (($Host::ServerRules[1] !$= "") && (!%client.CantView)) @@ -1220,7 +1212,8 @@ function DefaultGame::voteChangeTimeLimit( %game, %admin, %newLimit ) { messageAll( 'MsgAdminForce', '\c2The Admin %2 changed the mission time limit to %1 minutes.', %display, %admin.name ); $Host::TimeLimit = %newLimit; - adminLog(%admin, " has changed the mission time limit to " @ %display @ " minutes."); + adminLog(%admin, " has changed the mission time limit to " @ %display @ " minutes."); + $TimeLimitChanged = 1; } else { @@ -1230,9 +1223,9 @@ function DefaultGame::voteChangeTimeLimit( %game, %admin, %newLimit ) { messageAll('MsgVotePassed', '\c2The mission time limit was set to %1 minutes by vote.', %display); $Host::TimeLimit = %newLimit; - // VoteOvertime - ResetVOTimeChanged(%game); - // Reset the voted time limit when changing mission + // VoteOvertime + ResetVOTimeChanged(%game); + // Reset the voted time limit when changing mission $TimeLimitChanged = 1; //Log Vote % From 3a1a6beaf63c297d1b0502807f99bf4e992d7811 Mon Sep 17 00:00:00 2001 From: ChocoTaco Date: Wed, 14 May 2025 14:51:26 -0400 Subject: [PATCH 27/48] Added Overtime --- Classic/scripts/CTFGame.cs | 73 +++++++++++++++++++++++++++++++++++--- 1 file changed, 69 insertions(+), 4 deletions(-) diff --git a/Classic/scripts/CTFGame.cs b/Classic/scripts/CTFGame.cs index 95373d2..e26cda5 100755 --- a/Classic/scripts/CTFGame.cs +++ b/Classic/scripts/CTFGame.cs @@ -9,6 +9,8 @@ //exec the AI scripts exec("scripts/aiCTF.cs"); +//Time for auto overtime sudden-death mode +$CTF::Overtime = 5; //5 Minutes, 0 to disable //-- tracking --- function CTFGame::initGameVars(%game) @@ -376,8 +378,8 @@ function CTFGame::playerTouchFlag(%game, %player, %flag) if ((%flag.carrier $= "") && (%player.getState() !$= "Dead")) { // z0dd - ZOD, 5/07/04. Cancel the lava return. - if(isEventPending(%obj.lavaEnterThread)) - cancel(%obj.lavaEnterThread); + if(isEventPending(%flag.lavaEnterThread)) + cancel(%flag.lavaEnterThread); //flag isn't held and has been touched by a live player if (%client.team == %flag.team) @@ -1245,14 +1247,77 @@ function CTFGame::resetDontScoreTimer(%game, %team) $dontScoreTimer[%team] = false; } +function CTFGame::checkTimeLimit(%game, %forced) +{ + // Don't add extra checks: + if ( %forced ) + cancel( %game.timeCheck ); + + // if there is no time limit, check back in a minute to see if it's been set + if(($Host::TimeLimit $= "") || $Host::TimeLimit == 0) + { + %game.timeCheck = %game.schedule(20000, "checkTimeLimit"); + return; + } + + %curTimeLeftMS = ($Host::TimeLimit * 60 * 1000) + $missionStartTime - getSimTime(); + + if (%curTimeLeftMS <= 0) + { + %teamOneCaps = mFloor($TeamScore[1] / %game.SCORE_PER_TEAM_FLAG_CAP); + %teamTwoCaps = mFloor($TeamScore[2] / %game.SCORE_PER_TEAM_FLAG_CAP); + if(%teamOneCaps == %teamTwoCaps && $CTF::Overtime && $Host::TournamentMode){ //Setting exists + if(!%game.overtime){ + %game.overtime = 1; + if($CTF::Overtime > 1){ %s = "s"; } + messageAll('MsgOvertime', '\c2Sudden-Death Overtime Initiated: %1 Minute%2 Remaining~wfx/powered/turret_heavy_activate.wav', $CTF::Overtime, %s); + echo("Sudden-Death Overtime Initiated"); + UpdateClientTimes($CTF::Overtime * 60 * 1000); + EndCountdown($CTF::Overtime * 60 * 1000); + %game.timeCheck = %game.schedule($CTF::Overtime * 60 * 1000, "timeLimitReached"); + } + } + else{ + if(%game.scheduleVote !$= ""){ + if(!%game.voteOT){ + messageAll('MsgOvertime', '\c2Vote Overtime Initiated.~wfx/powered/turret_heavy_activate.wav'); + %game.voteOT = 1; + } + } + else{ + %game.timeLimitReached(); + } + } + } + else + { + if(%curTimeLeftMS >= 20000) + %game.timeCheck = %game.schedule(20000, "checkTimeLimit"); + else + %game.timeCheck = %game.schedule(%curTimeLeftMS + 1, "checkTimeLimit"); + + //now synchronize everyone's clock + messageAll('MsgSystemClock', "", $Host::TimeLimit, %curTimeLeftMS); + } +} + function CTFGame::checkScoreLimit(%game, %team) { %scoreLimit = MissionGroup.CTF_scoreLimit * %game.SCORE_PER_TEAM_FLAG_CAP; // default of 5 if scoreLimit not defined if(%scoreLimit $= "") %scoreLimit = 5 * %game.SCORE_PER_TEAM_FLAG_CAP; - if($TeamScore[%team] >= %scoreLimit) - %game.scoreLimitReached(); + if(%game.overtime){ + %teamOneCaps = mFloor($TeamScore[1] / %game.SCORE_PER_TEAM_FLAG_CAP); + %teamTwoCaps = mFloor($TeamScore[2] / %game.SCORE_PER_TEAM_FLAG_CAP); + if(%teamOneCaps != %teamTwoCaps){ + %game.scoreLimitReached(); + } + } + else{ + if($TeamScore[%team] >= %scoreLimit) + %game.scoreLimitReached(); + } } function CTFGame::awardScoreFlagReturn(%game, %cl, %perc) From 9ba847500eb75fa66b1d87ac202cc87384717f8e Mon Sep 17 00:00:00 2001 From: ChocoTaco Date: Wed, 14 May 2025 14:51:48 -0400 Subject: [PATCH 28/48] Fixed lava bug --- Classic/scripts/SCtFGame.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Classic/scripts/SCtFGame.cs b/Classic/scripts/SCtFGame.cs index 4a3a74e..00e6b85 100644 --- a/Classic/scripts/SCtFGame.cs +++ b/Classic/scripts/SCtFGame.cs @@ -427,8 +427,8 @@ function SCtFGame::playerTouchFlag(%game, %player, %flag) if ((%flag.carrier $= "") && (%player.getState() !$= "Dead")) { // z0dd - ZOD, 5/07/04. Cancel the lava return. - if(isEventPending(%obj.lavaEnterThread)) - cancel(%obj.lavaEnterThread); + if(isEventPending(%flag.lavaEnterThread)) + cancel(%flag.lavaEnterThread); //flag isn't held and has been touched by a live player if (%client.team == %flag.team) From a8af516f52d47e373aeff6a77c9971dfc49733b5 Mon Sep 17 00:00:00 2001 From: ChocoTaco Date: Sat, 17 May 2025 13:41:52 -0400 Subject: [PATCH 29/48] Rework --- Classic/scripts/autoexec/flagTunnelingFix.cs | 112 +++++++------------ 1 file changed, 43 insertions(+), 69 deletions(-) diff --git a/Classic/scripts/autoexec/flagTunnelingFix.cs b/Classic/scripts/autoexec/flagTunnelingFix.cs index 3761a01..3012bdb 100644 --- a/Classic/scripts/autoexec/flagTunnelingFix.cs +++ b/Classic/scripts/autoexec/flagTunnelingFix.cs @@ -1,5 +1,6 @@ //Fixes for collision tunneling and other issues, note only tested in classic //Script By:DarkTiger +//v4.3 - logic rework remove any skips in the checks //v3.8 - removed sweep optimization/ bug fix in old method //v3.7 - removed bypass code //v3.6 - lctf and SCtFGame @@ -31,6 +32,7 @@ $flagCheckRadius = 50; $playerSizeBox = "1.2 1.2 2.3"; $flagBoxSize = "0.796666 0.139717 2.46029"; +$boxCollision = 0; //0 = old AABB method uses fixed box size makes the player bit narrow //1 = new OBB method uses perfect box intersection @@ -189,43 +191,16 @@ package flagFix{ }; activatePackage(flagFix); -function vectorMul(%a,%b){ - %x = getWords(%a,0) * getWords(%b,0); - %y = getWords(%a,1) * getWords(%b,1); - %z = getWords(%a,2) * getWords(%b,2); - return %x SPC %y SPC %z; -} - function generateBoxData(){ + %halfSize = vectorScale($playerSizeBox, 0.5); + $plrBoxMin = getWords(VectorSub("0 0 0", %halfSize),0,1) SPC 0; + $plrBoxMax = getWords(%halfSize,0,1) SPC getWord($playerSizeBox,2); + $plrBox = $plrBoxMin SPC $plrBoxMax; - %playerSize = $playerSizeBox; //"1.2 1.2 2.3"; - %halfSize = vectorMul(%playerSize, "0.5 0.5 0"); - $plrBoxMin = %minA = VectorSub("0 0 0", %halfSize); - $plrBoxMax = %maxA = getWords(%halfSize,0,1) SPC getWord(%playerSize,2); - $plrBox = %minA SPC %maxA; - %vSubA = vectorSub(%maxA, %minA); - - %flagSize = $flagBoxSize; - %halfSize = vectorMul(%flagSize, "0.5 0.5 0"); - $flagBoxMin = %minB = VectorSub("0 0 -0.1", %halfSize); - $flagBoxMax = %maxB = getWords(%halfSize,0,1) SPC getWord(%flagSize,2); - $flagBox = %minB SPC %maxB; - %vSubB = vectorSub(%maxB, %minB); - - %box[0] = "0 0 0"; - %box[1] = "1 0 0"; - %box[2] = "0 1 0"; - %box[3] = "1 1 0"; - %box[4] = "0 0 1"; - %box[5] = "1 0 1"; - %box[6] = "0 1 1"; - %box[7] = "1 1 1"; - - for(%i = 0; %i < 8; %i++){ - $playerBoxData[%i] = vectorAdd(%minA, vectorMul(%vSubA, %box[%i])); - $flagBoxData[%i] = vectorAdd(%minB, vectorMul(%vSubB, %box[%i])); - } - + %halfSize = vectorScale($flagBoxSize, 0.5); + $flagBoxMin = getWords(VectorSub("0 0 0", %halfSize),0,1) SPC 0; + $flagBoxMax = getWords(%halfSize,0,1) SPC getWord($flagBoxSize,2); + $flagBox = $flagBoxMin SPC $flagBoxMax; }generateBoxData(); function vectorLerp(%point1, %point2, %t) { @@ -233,7 +208,8 @@ function vectorLerp(%point1, %point2, %t) { } function boxIntersectAABB(%plr, %flg, %lerpPos){ - if($boxCollision == 2){ + %testMode = 0; + if(%testMode == 1){ %fpos = %flg.getPosition(); %a = vectorAdd($plrBoxMin, %lerpPos) SPC vectorAdd($plrBoxMax, %lerpPos); @@ -250,7 +226,7 @@ function boxIntersectAABB(%plr, %flg, %lerpPos){ (getWord(%a, 2)<= getWord(%b, 5) && getWord(%a, 5) >= getWord(%b, 2)); } -function DefaultGame::flagColTest(%game, %flag, %rsTeam, %ext){ +function DefaultGame::flagColTest(%game, %flag, %rsTeam,%fc){ //////////////////////////////////////////////////////////////////////////////// //obj tunneling check %flagPos = %flag.getPosition(); @@ -273,37 +249,32 @@ function DefaultGame::flagColTest(%game, %flag, %rsTeam, %ext){ InitContainerRadiusSearch( %flagPos, $flagCheckRadius, $TypeMasks::PlayerObjectType); while((%player = containerSearchNext()) != 0){ %playerPos = %player.getPosition(); - //%rot = getWords(%player.getTransform(),3,6); - if((%rsTeam && %flag.team != %player.team) || !%rsTeam || %player == %ext){ - %flagDist = vectorDist(%flagPos, %playerPos); - if(%player.lastSim > 0 && (%player.getState() !$= "Dead")){// only check at speed - //%fdot = vectorDot(vectorNormalize(%player.getVelocity()),vectorNormalize(VectorSub(%flagPos, %playerPos))); - // %tickDist = vectorLen(%player.getVelocity()) * ($flagSimTime/1000); - %sweepCount = mFloor(vectorDist(%playerPos, %player.oldPos) + 2); - if((getSimTime() - %player.lastSim) <= 128){//make sure are last position is valid - //schedule(1000,0,"drawBeamItem", %player.oldPos,%playerPos,15000); - for(%i = 0; %i < %sweepCount; %i++){// sweep behind us to see if we should have hit something - %lerpPos = vectorLerp(%playerPos, %player.oldPos, %i/(%sweepCount-1));//back sweep - //%point = MatrixMulPoint(%lerpPos SPC %rot, "-0.6 -0.6 0"); - //schedule(1000+(%i*128), 0, "drawBoxItemC", %point, %rot, "1.2 1.2 2.3", 15000); - if($boxCollision == 1 && boxIntersect(%player, %flag, %lerpPos)){ - // %point = MatrixMulPoint(%flagPos SPC %rot,"-0.398 -0.069 0"); - // schedule(1000+(%i*128), 0, "drawBoxItemC", %point, %rot, "0.796666 0.139717 4", 15000); - %flag.getDataBlock().onCollision(%flag, %player); - break; - } - else if(!$boxCollision && boxIntersectAABB(%player, %flag, %lerpPos)){ - %flag.getDataBlock().onCollision(%flag, %player); - break; - } - } + //%toPlayer = vectorNormalize(vectorSub(%flagPos,%playerPos)); + //%moveDir = vectorNormalize(%player.getVelocity()); + //%d = vectorDot( %toPlayer, %moveDir ); + if(((%flag.team != %player.team) || !%rsTeam || %fc == %player) && %player.getState() !$= "Dead"){ + //%futurePos = vectorAdd(%playerPos, vectorScale(%player.getVelocity(), $flagSimTime / 1000)); + if(%player.lastSim[%flag] $= "" || (getSimTime() - %player.lastSim[%flag]) >= 128){ + %lastPos = vectorSub(%playerPos, vectorScale(%player.getVelocity(), $flagSimTime / 1000)); + %player.oldPos[%flag] = %lastPos;// old data so lets do it velocity based + } + %sweepCount = mFloor(vectorDist(%playerPos, %player.oldPos[%flag]) + 1);// min of 2 + for(%i = 0; %i < %sweepCount; %i++){// sweep behind us to see if we should have hit something + %lerpPos = vectorLerp(%playerPos, %player.oldPos[%flag], %i/(%sweepCount-1));//back sweep + if($boxCollision == 1 && boxIntersect(%player, %flag, %lerpPos)){ + %flag.getDataBlock().onCollision(%flag, %player); + break; + } + else if(!$boxCollision && boxIntersectAABB(%player, %flag, %lerpPos)){ + %flag.getDataBlock().onCollision(%flag, %player); + //error("hit" SPC %player.count++); + break; } } } - %player.oldPos = %playerPos; - %player.lastSim = getSimTime(); + %player.oldPos[%flag] = %playerPos; + %player.lastSim[%flag] = getSimTime(); } - //error("scan count" SPC %scanCount SPC %scanPlrCount); } function DefaultGame::atHomeFlagLoop(%game){ @@ -321,13 +292,16 @@ function DefaultGame::atHomeFlagLoop(%game){ %game.flagResetTime += $flagSimTime; } + //%game.flagColTest($TeamFlag[1]); + //%game.flagColTest($TeamFlag[2]); + if($TeamFlag[1].isHome && $TeamFlag[2].isHome){//11 %game.flagColTest($TeamFlag[1],1,0);// only look at the other team %game.flagColTest($TeamFlag[2],1,0);// only look at the other team } else if(!$TeamFlag[1].isHome && $TeamFlag[2].isHome){//01 if(isObject($TeamFlag[1].carrier)){// flag has been dropped - %game.flagColTest($TeamFlag[2],1, $TeamFlag[1].carrier); //scan for other team expect for are carrier + %game.flagColTest($TeamFlag[2],1,$TeamFlag[1].carrier); //scan for other team expect for are carrier } else{ %game.flagColTest($TeamFlag[1],0,0);// scan for everyone can touch it @@ -336,7 +310,7 @@ function DefaultGame::atHomeFlagLoop(%game){ } else if($TeamFlag[1].isHome && !$TeamFlag[2].isHome){//10 if(isObject($TeamFlag[2].carrier)){// flag has been dropped - %game.flagColTest($TeamFlag[1],1, $TeamFlag[2].carrier); //scan for other team expect for are carrier + %game.flagColTest($TeamFlag[1],1,$TeamFlag[2].carrier); //scan for other team expect for are carrier } else{ %game.flagColTest($TeamFlag[1],1,0);// team 1 flag is still at home so only scan for the other team @@ -345,10 +319,10 @@ function DefaultGame::atHomeFlagLoop(%game){ } else if(!$TeamFlag[1].isHome && !$TeamFlag[2].isHome){//00 if(!isObject($TeamFlag[1].carrier)){// flag has been dropped - %game.flagColTest($TeamFlag[1],0,0);// scan for everyone can touch it + %game.flagColTest($TeamFlag[1],0);// scan for everyone can touch it } if(!isObject($TeamFlag[2].carrier)){// flag has been dropped - %game.flagColTest($TeamFlag[2],0,0);// scan for everyone can touch it + %game.flagColTest($TeamFlag[2],0);// scan for everyone can touch it } } } @@ -437,4 +411,4 @@ function testFlagSpeed(%speed){ %fvec = %player.getForwardVector(); %vel = vectorScale(%fvec,%speed); %player.setVelocity(%vel); -} \ No newline at end of file +} From 1e6ad89251d4376b254254780f7d3baf2bbdb787 Mon Sep 17 00:00:00 2001 From: ChocoTaco Date: Wed, 18 Jun 2025 17:22:29 -0400 Subject: [PATCH 30/48] Create spawnDir.cs --- Classic/scripts/autoexec/spawnDir.cs | 107 +++++++++++++++++++++++++++ 1 file changed, 107 insertions(+) create mode 100644 Classic/scripts/autoexec/spawnDir.cs diff --git a/Classic/scripts/autoexec/spawnDir.cs b/Classic/scripts/autoexec/spawnDir.cs new file mode 100644 index 0000000..2f3b0cd --- /dev/null +++ b/Classic/scripts/autoexec/spawnDir.cs @@ -0,0 +1,107 @@ +// points players in the diretion of the enemy flag home position when outdoors +// Script By: DarkTiger +// version 1.0 + +function CTFGame::pickTeamSpawn(%game, %team) { + return %game.pickTeamSpawnRot(%team); +} +function LCTFGame::pickTeamSpawn(%game, %team) { + return %game.pickTeamSpawnRot(%team); +} +function SCtFGame::pickTeamSpawn(%game, %team) { + return %game.pickTeamSpawnRot(%team); +} + +function DefaultGame::pickTeamSpawnRot(%game, %team){ +// early exit if no nav graph + if (!navGraphExists()) + { + echo("No navigation graph is present. Build one."); + return -1; + } + + for (%attempt = 0; %attempt < 20; %attempt++) + { + // finds a random spawn sphere + // selects inside/outside on this random sphere + // if the navgraph exists, then uses it to grab a random node as spawn + // location/rotation + %sphere = %game.selectSpawnSphere(%team); + if (%sphere == -1) + { + echo("No spawn spheres found for team " @ %team); + return -1; + } + + %zone = %game.selectSpawnZone(%sphere); + %useIndoor = %zone; + %useOutdoor = !%zone; + if (%zone) + %area = "indoor"; + else + %area = "outdoor"; + + %radius = %sphere.radius; + %sphereTrans = %sphere.getTransform(); + %sphereCtr = getWord(%sphereTrans, 0) @ " " @ getWord(%sphereTrans, 1) @ " " @ getWord(%sphereTrans, 2); //don't need full transform here, just x, y, z + //echo("Selected Sphere is " @ %sphereCtr @ " with a radius of " @ %radius @ " meters. Selecting from " @ %area @ " zone."); + + %avoidThese = $TypeMasks::VehicleObjectType | $TypeMasks::MoveableObjectType | + $TypeMasks::PlayerObjectType | $TypeMasks::TurretObjectType; + + for (%tries = 0; %tries < 10; %tries++) + { + %nodeIndex = navGraph.randNode(%sphereCtr, %radius, %useIndoor, %useOutdoor); + if (%nodeIndex >= 0) + { + %loc = navGraph.randNodeLoc(%nodeIndex); + %adjUp = VectorAdd(%loc, "0 0 1.0"); // don't go much below + + if (ContainerBoxEmpty( %avoidThese, %adjUp, 2.0)) + break; + } + } + + if (%nodeIndex >= 0) + { + %loc = navGraph.randNodeLoc(%nodeIndex); + if (%zone)//spawn indoors + { + %fpos = getWords($TeamFlag[%team == 1 ? 2 : 1].originalPosition,0,2); + %flos = containerRayCast(vectorAdd(%loc,"0 0 1"), vectorAdd(%fpos, "0 0 1"), $TypeMasks::InteriorObjectType | $TypeMasks::StaticTSObjectType | $TypeMasks::ForceFieldObjectType); + if(%flos){// do we have anything inbetween us and the flag if not face it + if(vectorDist(%loc, getWords(%flos,1,3)) < 25){ + //error("indoor" SPC %loc); + %trns = %loc @ " 0 0 1 0"; + %spawnLoc = whereToLook(%trns); + return %spawnLoc; + } + } + //error("outdoor" SPC %loc); + %rot = %game.selectSpawnDir(%loc, %team, %zone); + %spawnLoc = %loc @ %rot; + return %spawnLoc; + } + //error("outdoor" SPC %loc); + %rot = %game.selectSpawnDir(%loc, %team, %zone); + %spawnLoc = %loc @ %rot; + return %spawnLoc; + } + } +} + +//face flag when spawn +function DefaultGame::selectSpawnDir(%game, %loc, %team, %zone){ + %team = %team == 1 ? 2 : 1; + %fpos = getWords($TeamFlag[%team].originalPosition,0,2); + //this used only when spawn loc is not on an interior. This points spawning player to the ctr of spawnshpere + %fpos = setWord(%fpos, 2, 0); + %loc = setWord(%loc, 2, 0); + + if(VectorDist(%loc, %fpos) == 0) + return " 0 0 1 0 "; + + %vec = VectorNormalize(VectorSub(%fpos, %loc)); + %angle = mAcos(getWord(%vec, 1)); + return (%loc < %fpos) ? (" 0 0 1 " @ %angle) : (" 0 0 1 " @ -%angle);// this works some how +} From 9aea8e23a6c52e5193d3f39d14d6aaffc1e47b27 Mon Sep 17 00:00:00 2001 From: ChocoTaco Date: Mon, 23 Jun 2025 15:38:00 -0400 Subject: [PATCH 31/48] Overtime Bug --- Classic/scripts/CTFGame.cs | 20 +++++++++++--------- Classic/scripts/LCTFGame.cs | 20 +++++++++++--------- 2 files changed, 22 insertions(+), 18 deletions(-) diff --git a/Classic/scripts/CTFGame.cs b/Classic/scripts/CTFGame.cs index e26cda5..5677f3c 100755 --- a/Classic/scripts/CTFGame.cs +++ b/Classic/scripts/CTFGame.cs @@ -1266,8 +1266,9 @@ function CTFGame::checkTimeLimit(%game, %forced) { %teamOneCaps = mFloor($TeamScore[1] / %game.SCORE_PER_TEAM_FLAG_CAP); %teamTwoCaps = mFloor($TeamScore[2] / %game.SCORE_PER_TEAM_FLAG_CAP); - if(%teamOneCaps == %teamTwoCaps && $CTF::Overtime && $Host::TournamentMode){ //Setting exists - if(!%game.overtime){ + if(%teamOneCaps == %teamTwoCaps && $CTF::Overtime && (($TeamRank[1, count] + $TeamRank[2, count]) > 6)){ + if(!%game.overtime) + { %game.overtime = 1; if($CTF::Overtime > 1){ %s = "s"; } messageAll('MsgOvertime', '\c2Sudden-Death Overtime Initiated: %1 Minute%2 Remaining~wfx/powered/turret_heavy_activate.wav', $CTF::Overtime, %s); @@ -1277,14 +1278,15 @@ function CTFGame::checkTimeLimit(%game, %forced) %game.timeCheck = %game.schedule($CTF::Overtime * 60 * 1000, "timeLimitReached"); } } - else{ - if(%game.scheduleVote !$= ""){ - if(!%game.voteOT){ - messageAll('MsgOvertime', '\c2Vote Overtime Initiated.~wfx/powered/turret_heavy_activate.wav'); - %game.voteOT = 1; - } + else + { + if(%game.scheduleVote !$= "" && !%game.voteOT) + { + messageAll('MsgOvertime', '\c2Vote Overtime Initiated.~wfx/powered/turret_heavy_activate.wav'); + %game.voteOT = 1; } - else{ + else + { %game.timeLimitReached(); } } diff --git a/Classic/scripts/LCTFGame.cs b/Classic/scripts/LCTFGame.cs index c9754c3..e856790 100644 --- a/Classic/scripts/LCTFGame.cs +++ b/Classic/scripts/LCTFGame.cs @@ -1566,8 +1566,9 @@ function LCTFGame::checkTimeLimit(%game, %forced) { %teamOneCaps = mFloor($TeamScore[1] / %game.SCORE_PER_TEAM_FLAG_CAP); %teamTwoCaps = mFloor($TeamScore[2] / %game.SCORE_PER_TEAM_FLAG_CAP); - if(%teamOneCaps == %teamTwoCaps && $LCTF::Overtime && $Host::TournamentMode){ //Setting exists - if(!%game.overtime){ + if(%teamOneCaps == %teamTwoCaps && $LCTF::Overtime && (($TeamRank[1, count] + $TeamRank[2, count]) > 6)){ + if(!%game.overtime) + { %game.overtime = 1; if($LCTF::Overtime > 1){ %s = "s"; } messageAll('MsgOvertime', '\c2Sudden-Death Overtime Initiated: %1 Minute%2 Remaining~wfx/powered/turret_heavy_activate.wav', $LCTF::Overtime, %s); @@ -1577,14 +1578,15 @@ function LCTFGame::checkTimeLimit(%game, %forced) %game.timeCheck = %game.schedule($LCTF::Overtime * 60 * 1000, "timeLimitReached"); } } - else{ - if(%game.scheduleVote !$= ""){ - if(!%game.voteOT){ - messageAll('MsgOvertime', '\c2Vote Overtime Initiated.~wfx/powered/turret_heavy_activate.wav'); - %game.voteOT = 1; - } + else + { + if(%game.scheduleVote !$= "" && !%game.voteOT) + { + messageAll('MsgOvertime', '\c2Vote Overtime Initiated.~wfx/powered/turret_heavy_activate.wav'); + %game.voteOT = 1; } - else{ + else + { %game.timeLimitReached(); } } From 7fe6bb3b98e039924a1c2237c56fb1556d868fda Mon Sep 17 00:00:00 2001 From: ChocoTaco Date: Fri, 27 Jun 2025 13:45:38 -0400 Subject: [PATCH 32/48] Wrong message --- Classic/scripts/autoexec/VoteMenu.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Classic/scripts/autoexec/VoteMenu.cs b/Classic/scripts/autoexec/VoteMenu.cs index 27bc536..f0f72bc 100644 --- a/Classic/scripts/autoexec/VoteMenu.cs +++ b/Classic/scripts/autoexec/VoteMenu.cs @@ -867,7 +867,7 @@ function serverCmdStartNewVote(%client, %typeName, %arg1, %arg2, %arg3, %arg4, % messageClient(%client, "", "\c2Mines are disabled at this time."); if(!%isAdmin || (%isAdmin && %client.ForceVote)) - %msg = %client.nameBase @ " initiated a vote to " @ (Game.LCTFOneMine == 0 ? "enable" : "disable") @ " one mine mode."; + %msg = %client.nameBase @ " initiated a vote to " @ (Game.LCTFOneMine == 1 ? "enable" : "disable") @ " one mine mode."; case "showServerRules": if (($Host::ServerRules[1] !$= "") && (!%client.CantView)) From 7cd1cb8815e19990ab5a0cf632aedc82726333ed Mon Sep 17 00:00:00 2001 From: ChocoTaco1 Date: Mon, 18 Aug 2025 16:15:26 -0400 Subject: [PATCH 33/48] LoadingScreen Safeguards Shorter time Added check --- Classic/scripts/autoexec/zDebriefLoadingScreen.cs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Classic/scripts/autoexec/zDebriefLoadingScreen.cs b/Classic/scripts/autoexec/zDebriefLoadingScreen.cs index b43ec39..f3396fd 100755 --- a/Classic/scripts/autoexec/zDebriefLoadingScreen.cs +++ b/Classic/scripts/autoexec/zDebriefLoadingScreen.cs @@ -51,7 +51,7 @@ // First Screen loading time (Map Screen) // If this is set too low the second screen wont show at all -$dtLoadingScreen::FirstScreen = 5500; +$dtLoadingScreen::FirstScreen = 3000; // Second Screen Delay $dtLoadingScreen::Delay = 0; @@ -149,6 +149,10 @@ if (!isActivePackage(LoadScreenPackage) && $Host::LoadingScreenUseDebrief) // Just make our own function ALTsendModInfoToClient(%client) { + if(%client.isReady){ + return; + } + // Wont allow Debrief on consecutive map loads if(%client.loaded) { From 90620a1c6c5900f5136688a45f9945a2f3af1a57 Mon Sep 17 00:00:00 2001 From: ChocoTaco1 Date: Mon, 18 Aug 2025 17:56:46 -0400 Subject: [PATCH 34/48] Removed some things --- Classic/scripts/autoexec/MemPatches.cs | 85 +++++++++++++------------- 1 file changed, 42 insertions(+), 43 deletions(-) diff --git a/Classic/scripts/autoexec/MemPatches.cs b/Classic/scripts/autoexec/MemPatches.cs index ff9b7eb..bfd3888 100644 --- a/Classic/scripts/autoexec/MemPatches.cs +++ b/Classic/scripts/autoexec/MemPatches.cs @@ -4,59 +4,58 @@ //From Krash memPatch("756076","6169"); -// Thanks Turkeh -// TraversalRoot Console spam fix -function suppressTraversalRootPatch() -{ - if($tvpatched) - return; +//// Thanks Turkeh +//// TraversalRoot Console spam fix +//function suppressTraversalRootPatch() +//{ + //if($tvpatched) + //return; - warn("Patching traversal root error..."); - memPatch("56AD8A", "90909090909090909090909090909090909090909090"); - memPatch("56D114", "90909090909090909090909090909090909090909090"); - $tvpatched = 1; -} + //warn("Patching traversal root error..."); + //memPatch("56AD8A", "90909090909090909090909090909090909090909090"); + //memPatch("56D114", "90909090909090909090909090909090909090909090"); + //$tvpatched = 1; +//} -if (!$CmdArmor::Patched) -{ - $CmdArmor::Patched = true; - //memPatch("6FC746", "66B8000090906683FE017408ACAA84C075FA89D05F5EC3"); - memPatch("6FC746", "83FE017408ACAA84C075FA89D05F5EC3"); - //Removed register size override (cmp si, 1 -> cmp esi, 1) and got rid of - //weird NASM garbage code at the beginning. Had a mov ax, 0 which did nothing - //and wasn't necessary anyways because of xor eax, eax in the original. It also - //generated several NOPs after that for no reason. -} +//if (!$CmdArmor::Patched) +//{ + //$CmdArmor::Patched = true; + ////memPatch("6FC746", "66B8000090906683FE017408ACAA84C075FA89D05F5EC3"); + //memPatch("6FC746", "83FE017408ACAA84C075FA89D05F5EC3"); + ////Removed register size override (cmp si, 1 -> cmp esi, 1) and got rid of + ////weird NASM garbage code at the beginning. Had a mov ax, 0 which did nothing + ////and wasn't necessary anyways because of xor eax, eax in the original. It also + ////generated several NOPs after that for no reason. +//} -function serverCmd(%client) -{ - // Stick your own administrative action code here - messageAll('msgAll',"\c3" @ %client.namebase SPC "is attempting to crash the server!"); +//function serverCmd(%client) +//{ + //// Stick your own administrative action code here + //messageAll('msgAll',"\c3" @ %client.namebase SPC "is attempting to crash the server!"); - messageClient(%client, 'onClientBanned', ""); - messageAllExcept( %client, -1, 'MsgClientDrop', "", %client.name, %client ); + //messageClient(%client, 'onClientBanned', ""); + //messageAllExcept( %client, -1, 'MsgClientDrop', "", %client.name, %client ); - // kill and delete this client - if( isObject(%client.player) ) - %client.player.scriptKill(0); + //// kill and delete this client + //if( isObject(%client.player) ) + //%client.player.scriptKill(0); - if ( isObject( %client ) ) - { - %client.setDisconnectReason("You have been banned for attempting to crash the server."); - %client.schedule(700, "delete"); - } + //if ( isObject( %client ) ) + //{ + //%client.setDisconnectReason("You have been banned for attempting to crash the server."); + //%client.schedule(700, "delete"); + //} - BanList::add(%client.guid, %client.getAddress(), $Host::BanTime); -} + //BanList::add(%client.guid, %client.getAddress(), $Host::BanTime); +//} -//Disable UE box on crash +//Disable UE box on crash (Tribesnext Preview Unpatched Only) //Used if a clean crash is desired -memPatch("7dc7fc","90"); +//memPatch("7dc7fc","90"); //Loops Crash patch (Prevent the Uncaught Exception dialog from appearing) -memPatch("006ff376", "909090909090"); +//memPatch("006ff376", "909090909090"); //Show Linux Icon in server list //memPatch("5C9628","80CB05"); - -//Bahke MPB stability fix -//memPatch("614120","9090"); \ No newline at end of file +//Show no Linux Icon +//memPatch("5C9628","80CB01"); From d5a0cad2a253c519c451c0ac140a9e29968e6c21 Mon Sep 17 00:00:00 2001 From: ChocoTaco1 Date: Mon, 18 Aug 2025 18:00:24 -0400 Subject: [PATCH 35/48] Update 10.59 --- Classic/scripts/autoexec/z_dtStats.cs | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/Classic/scripts/autoexec/z_dtStats.cs b/Classic/scripts/autoexec/z_dtStats.cs index 448a3b0..f6a03cf 100644 --- a/Classic/scripts/autoexec/z_dtStats.cs +++ b/Classic/scripts/autoexec/z_dtStats.cs @@ -1,4 +1,5 @@ + ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // Stats system for classic and base // Script BY: DarkTiger @@ -15,7 +16,7 @@ // Note See bottom of file for full log ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// //-----------Settings----------- -$dtStats::version = 10.58; +$dtStats::version = 10.59; //disable stats system $dtStats::Enable = $Host::dtStatsEnable $= "" ? ($Host::dtStatsEnable = 1) : $Host::dtStatsEnable; if(!$dtStats::Enable){ return;}// so it disables with a restart @@ -1862,6 +1863,8 @@ $statsName["discKillGroundTG"] = "Ground Disc Kills" TAB "Total"; $statsName["WLRAvg"] = "Win Loss Ratio" TAB "Average"; $statsName["roundsWonTG"] = "Rounds Won" TAB "Total"; $statsName["hatTricksTG"] = "Hat Tricks" TAB "Total"; +$statsName["OffKillsTG"] = "Offensive Kills" TAB "Total"; +$statsName["DefKillsTG"] = "Defensive Kills" TAB "Total"; $panelCount = 0; $upperWepPanel[$panelCount, "CTFGame"] = "discMAHitDistMax"; $upperWepPanel[$panelCount++, "CTFGame"] = "plasmaMAHitDistMax";$upperWepPanel[$panelCount++, "CTFGame"] = "blasterMAHitDistMax"; @@ -16456,7 +16459,7 @@ function genBigStats(%game, %lType, %mon, %year){ %year = 2024; } %callCount = 0; - %callTime = 16; + %callTime = 32; deleteVariables("$textColor*"); %mainXSize =1860; %mainySize = 1115; @@ -16688,7 +16691,7 @@ function genMapStatsImg(%game,%count){ return; } %callCount = 0; - %callTime = 16; + %callTime = 32; deleteVariables("$textColor*"); %mainXSize =1860; %mainySize = 1115; @@ -16955,12 +16958,12 @@ function imgCycle3(%img, %count){ } %img.yc++; if(%img.yc < %img.y) - schedule(32,0,"imgCycle3",%img); + schedule(32,0,"imgCycle3",%img, %count); else{ %img.close(); %img.delete(); deleteVariables("$textColor*"); - error("Stats Image Done"); + error("Stats Image Done" SPC %count); genBigMapStats(%count++); } } @@ -17202,7 +17205,7 @@ function renderArenaMapTextTM(%id){ %sizeX = 1280+20; %sizeY = 810; - %callTime = 8; + %callTime = 32; %spaceing = 20; %justLeft = 355; %justLeft2 = 55; @@ -17979,7 +17982,7 @@ function renderLCTFMapTextTM(%id){ %sizeX = 1280+20; %sizeY = 810; - %callTime = 8; + %callTime = 32; %spaceing = 20; %justLeft = 355; %justLeft2 = 55; @@ -18756,7 +18759,7 @@ function renderCTFMapTextTM(%id){ %sizeX = 1280+20; %sizeY = 1115; - %callTime = 8; + %callTime = 32; %spaceing = 20; %justLeft = 355; %justLeft2 = 55; @@ -19804,6 +19807,12 @@ function dtBuildMissionList(%reset){ } else if ( getSubStr( %line, 0, 18 ) $= "// MissionTypes = " ){ %typeList = getSubStr( %line, 18, 1000 ); + if(strstr(%typeList,"CTF") != -1 && strstr(%typeList,"LCTF") == -1){ + %typeList = %typeList SPC "LCTF"; + } + if(strstr(%typeList,"CTF") != -1 && strstr(%typeList,"SCtF") == -1){ + %typeList = %typeList SPC "SCtF"; + } break; } } From e96039866f74e6fd16e2b65f3be29af98772d4f7 Mon Sep 17 00:00:00 2001 From: ChocoTaco1 Date: Sat, 27 Sep 2025 17:49:57 -0400 Subject: [PATCH 36/48] Comp Reversions --- Classic/scripts/CTFGame.cs | 2 +- Classic/scripts/autoexec/TacoOverrides.cs | 11 --- Classic/scripts/defaultGame.cs | 4 +- Classic/scripts/packs/cloakingpack.cs | 2 +- Classic/scripts/packs/sensorjammerpack.cs | 47 ++++++----- Classic/scripts/player.cs | 12 +-- Classic/scripts/vehicles/vehicle_tank.cs | 2 +- Classic/scripts/weapons/flashGrenade.cs | 2 +- Classic/scripts/weapons/missileLauncher.cs | 83 +++++++++---------- Classic/scripts/weapons/mortar.cs | 95 +++++++++++----------- README.md | 25 +++--- 11 files changed, 135 insertions(+), 150 deletions(-) diff --git a/Classic/scripts/CTFGame.cs b/Classic/scripts/CTFGame.cs index 5677f3c..bf65472 100755 --- a/Classic/scripts/CTFGame.cs +++ b/Classic/scripts/CTFGame.cs @@ -2019,7 +2019,7 @@ function CTFGame::awardScoreKill(%game, %killerID) function checkVehicleCamping( %team ) { %position = $flagPos[%team]; - %radius = 15; + %radius = 5; InitContainerRadiusSearch(%position, %radius, $TypeMasks::VehicleObjectType ); while ((%vehicle = containerSearchNext()) != 0) diff --git a/Classic/scripts/autoexec/TacoOverrides.cs b/Classic/scripts/autoexec/TacoOverrides.cs index 640ee4b..0e8fb6e 100644 --- a/Classic/scripts/autoexec/TacoOverrides.cs +++ b/Classic/scripts/autoexec/TacoOverrides.cs @@ -323,17 +323,6 @@ function serverCmdScopeCommanderMap(%client, %scope) %client.player.ccActive = %scope; } -//Mortar Throw Reload Fix -// function ShapeBase::throwWeapon(%this) -// { -// if((%this.getMountedImage($WeaponSlot).getName() $= "MortarImage" || %this.getMountedImage($WeaponSlot).getName() $= "MissileLauncherImage" || %this.getMountedImage($WeaponSlot).getName() $= "ShockLanceImage") && -// (%this.getImageState($WeaponSlot) $= "Reload" || %this.getImageState($WeaponSlot) $= "Fire")){ -// return; -// } - -// parent::throwWeapon(%this); -// } - // Added object check function VehicleData::damageObject(%data, %targetObject, %sourceObject, %position, %amount, %damageType, %momVec, %theClient, %proj) diff --git a/Classic/scripts/defaultGame.cs b/Classic/scripts/defaultGame.cs index 46f4386..64609f6 100644 --- a/Classic/scripts/defaultGame.cs +++ b/Classic/scripts/defaultGame.cs @@ -459,9 +459,9 @@ function DefaultGame::createPlayer(%game, %client, %spawnLoc, %respawn) if(%respawn) { %player.setInvincible(true); - %player.setCloaked(true); // z0dd - ZOD, 8/6/02. Don't spawn players cloaked //was // + //%player.setCloaked(true); // z0dd - ZOD, 8/6/02. Don't spawn players cloaked %player.setInvincibleMode($InvincibleTime,0.02); - %player.respawnCloakThread = %player.schedule($InvincibleTime * 50, "setRespawnCloakOff"); // z0dd - ZOD, 8/6/02. Don't spawn players cloaked //was 1000 + //%player.respawnCloakThread = %player.schedule($InvincibleTime * 50, "setRespawnCloakOff"); // z0dd - ZOD, 8/6/02. Don't spawn players cloaked //was 1000 %player.schedule($InvincibleTime * 1000, "setInvincible", false); } diff --git a/Classic/scripts/packs/cloakingpack.cs b/Classic/scripts/packs/cloakingpack.cs index b21ae1c..5ed4048 100755 --- a/Classic/scripts/packs/cloakingpack.cs +++ b/Classic/scripts/packs/cloakingpack.cs @@ -34,7 +34,7 @@ datablock AudioDescription(CloakLooping3d) is3D = true; minDistance= 10.0; - MaxDistance= 55.0; //Was 50 + MaxDistance= 50.0; type = $EffectAudioType; environmentLevel = 1.0; }; diff --git a/Classic/scripts/packs/sensorjammerpack.cs b/Classic/scripts/packs/sensorjammerpack.cs index b7085ef..2ac0e64 100644 --- a/Classic/scripts/packs/sensorjammerpack.cs +++ b/Classic/scripts/packs/sensorjammerpack.cs @@ -64,7 +64,7 @@ datablock ItemData(SensorJammerPack) }; -datablock SensorData(JammerSensorObjectPassive) //v2 was commented out... +datablock SensorData(JammerSensorObjectPassive) { // same detection info as 'PlayerObject' sensorData detects = true; @@ -76,7 +76,7 @@ datablock SensorData(JammerSensorObjectPassive) //v2 was commented out... detectFOVPercent = 1.3; useObjectFOV = true; - detectscloaked = 1; //v2 + //detectscloaked = 1; //v2 jams = true; jamsOnlyGroup = true; @@ -96,52 +96,55 @@ datablock SensorData(JammerSensorObjectActive) detectFOVPercent = 1.3; useObjectFOV = true; - detectscloaked = 1; //v2 + //detectscloaked = 1; //v2 jams = true; jamsOnlyGroup = true; jamsUsingLOS = true; - jamRadius = 45; //was 30 + jamRadius = 30; }; function SensorJammerPackImage::onMount(%data, %obj, %slot) { - setTargetSensorData(%obj.client.target, JammerSensorObjectPassive); //v2 - %obj.setImageTrigger(%slot, false); - commandToClient( %obj.client, 'setSenJamIconOff' ); - %obj.setJammerFX(false); + setTargetSensorData(%obj.client.target, JammerSensorObjectPassive); } -function deactivateJammer(%data, %obj, %slot) +function SensorJammerPackImage::onUnmount(%data, %obj, %slot) { - SensorJammerPackImage::onDeactivate(%data, %obj, %slot); -} - -function SensorJammerPackImage::onUnmount(%data, %obj, %slot) //v2 -{ - %obj.setImageTrigger(%slot, false); setTargetSensorData(%obj.client.target, PlayerSensor); + %obj.setImageTrigger(%slot, false); } function SensorJammerPackImage::onActivate(%data, %obj, %slot) { messageClient(%obj.client, 'MsgSensorJammerPackOn', '\c2Sensor jammer pack on.'); setTargetSensorData(%obj.client.target, JammerSensorObjectActive); + // z0dd - ZOD, 9/29/02. Removed T2 demo code from here commandToClient( %obj.client, 'setSenJamIconOn' ); + %obj.setJammerFX( true ); } function SensorJammerPackImage::onDeactivate(%data, %obj, %slot) { messageClient(%obj.client, 'MsgSensorJammerPackOff', '\c2Sensor jammer pack off.'); - setTargetSensorData(%obj.client.target, PlayerSensor); //v2 H bug fix %obj.setImageTrigger(%slot, false); - setTargetSensorData(%obj.client.target, JammerSensorObjectPassive); //v2 was PlayerSensor + + // ---------------------------------------------------------------------- + // z0dd - ZOD, 4/25/02. This function is actually getting called AFTER + // ::onUnmount. We must check to see what the players current sensor data + // is, then if it is NOT PlayerSensor, set to passive jam, bug fix. + if(getTargetSensorData(%obj.client.target).getName() !$= "PlayerSensor") + setTargetSensorData(%obj.client.target, JammerSensorObjectPassive); + // ---------------------------------------------------------------------- + + // z0dd - ZOD, 9/29/02. Removed T2 demo code from here commandToClient( %obj.client, 'setSenJamIconOff' ); + %obj.setJammerFX( false ); } - -function SensorJammerPack::onPickup(%this, %obj, %shape, %amount) -{ -//Nope -} +// z0dd - ZOD, 5/18/03. Removed functions, created parent. Streamline. +//function SensorJammerPack::onPickup(%this, %obj, %shape, %amount) +//{ + // created to prevent console errors +//} diff --git a/Classic/scripts/player.cs b/Classic/scripts/player.cs index 5139f30..d9558c1 100755 --- a/Classic/scripts/player.cs +++ b/Classic/scripts/player.cs @@ -1085,8 +1085,8 @@ datablock ParticleData(LightPuff) textureName = "particleTest"; colors[0] = "0.46 0.36 0.26 0.4"; colors[1] = "0.46 0.46 0.36 0.0"; - sizes[0] = 0.8; //was 0.4 - sizes[1] = 1.4; //was 1.0 + sizes[0] = 0.4; + sizes[1] = 1.0; }; datablock ParticleEmitterData(LightPuffEmitter) @@ -1123,9 +1123,9 @@ datablock ParticleData(LiftoffDust) colors[0] = "0.46 0.36 0.26 0.0"; colors[1] = "0.46 0.46 0.36 0.4"; colors[2] = "0.46 0.46 0.36 0.0"; - sizes[0] = 0.6; //was 0.2 - sizes[1] = 1.0; //was 0.6 - sizes[2] = 1.4; //was 1.0 + sizes[0] = 0.2; + sizes[1] = 0.6; + sizes[2] = 1.0; times[0] = 0.0; times[1] = 0.5; times[2] = 1.0; @@ -1765,7 +1765,7 @@ datablock PlayerData(HeavyMaleHumanArmor) : HeavyPlayerDamageProfile //Value changed halfway between base and classic. //Classic is 54, Base is 75 //Shield breaks right at two mine-disc - energyPerDamagePoint = 60.0; // shield energy required to block one point of damage + energyPerDamagePoint = 54.0; // shield energy required to block one point of damage rechargeRate = 0.256; jetForce = 29.58 * 180; diff --git a/Classic/scripts/vehicles/vehicle_tank.cs b/Classic/scripts/vehicles/vehicle_tank.cs index 6cac286..55432e7 100755 --- a/Classic/scripts/vehicles/vehicle_tank.cs +++ b/Classic/scripts/vehicles/vehicle_tank.cs @@ -235,7 +235,7 @@ datablock HoverVehicleData(AssaultVehicle) : TankDamageProfile isShielded = true; rechargeRate = 1.0; - energyPerDamagePoint = 142; //was 135 + energyPerDamagePoint = 135; maxEnergy = 400; minJetEnergy = 15; jetEnergyDrain = 2.0; diff --git a/Classic/scripts/weapons/flashGrenade.cs b/Classic/scripts/weapons/flashGrenade.cs index 7bb3eda..7241668 100755 --- a/Classic/scripts/weapons/flashGrenade.cs +++ b/Classic/scripts/weapons/flashGrenade.cs @@ -37,7 +37,7 @@ datablock ItemData(FlashGrenadeThrown) radiusDamageType = $DamageType::Grenade; kickBackStrength = 1000; computeCRC = true; - maxWhiteout = 0.78; // z0dd - ZOD, 9/8/02. Was 1.2 //Reduced. Was 0.9 Choco + maxWhiteout = 0.9; // z0dd - ZOD, 9/8/02. Was 1.2 }; datablock ItemData(FlashGrenade) diff --git a/Classic/scripts/weapons/missileLauncher.cs b/Classic/scripts/weapons/missileLauncher.cs index abaec08..65063fe 100644 --- a/Classic/scripts/weapons/missileLauncher.cs +++ b/Classic/scripts/weapons/missileLauncher.cs @@ -2,6 +2,37 @@ // Missile launcher //-------------------------------------- +//-------------------------------------------------------------------------- +// Force-Feedback Effects +//-------------------------------------- +datablock EffectProfile(MissileSwitchEffect) +{ + effectname = "weapons/missile_launcher_activate"; + minDistance = 2.5; + maxDistance = 2.5; +}; + +datablock EffectProfile(MissileFireEffect) +{ + effectname = "weapons/missile_fire"; + minDistance = 2.5; + maxDistance = 5.0; +}; + +datablock EffectProfile(MissileDryFireEffect) +{ + effectname = "weapons/missile_launcher_dryfire"; + minDistance = 2.5; + maxDistance = 2.5; +}; + +datablock EffectProfile(MissileExplosionEffect) +{ + effectname = "explosions/explosion.xpl23"; + minDistance = 10; + maxDistance = 30; +}; + //-------------------------------------------------------------------------- // Sounds //-------------------------------------- @@ -10,6 +41,7 @@ datablock AudioProfile(MissileSwitchSound) filename = "fx/weapons/missile_launcher_activate.wav"; description = AudioClosest3d; preload = true; + effect = MissileSwitchEffect; }; datablock AudioProfile(MissileFireSound) @@ -17,6 +49,7 @@ datablock AudioProfile(MissileFireSound) filename = "fx/weapons/missile_fire.WAV"; description = AudioDefault3d; preload = true; + effect = MissileFireEffect; }; datablock AudioProfile(MissileProjectileSound) @@ -45,6 +78,7 @@ datablock AudioProfile(MissileExplosionSound) filename = "fx/explosions/explosion.xpl23.wav"; description = AudioBIGExplosion3d; preload = true; + effect = MissileExplosionEffect; }; datablock AudioProfile(MissileDryFireSound) @@ -52,6 +86,7 @@ datablock AudioProfile(MissileDryFireSound) filename = "fx/weapons/missile_launcher_dryfire.wav"; description = AudioClose3d; preload = true; + effect = MissileDryFireEffect; }; @@ -727,9 +762,9 @@ datablock ShapeBaseImageData(MissileLauncherImage) stateSequence[0] = "Activate"; stateSound[0] = MissileSwitchSound; - stateName[1] = "ActivateReady"; - stateTransitionOnAmmo[1] = "Ready"; - stateTransitionOnNoAmmo[1] = "FirstLoad"; + stateName[1] = "ActivateReady"; + stateTransitionOnLoaded[1] = "Ready"; + stateTransitionOnNoAmmo[1] = "NoAmmo"; stateName[2] = "Ready"; stateTransitionOnNoAmmo[2] = "NoAmmo"; @@ -792,9 +827,6 @@ datablock ShapeBaseImageData(MissileLauncherImage) stateSequence[10] = "Fire"; stateScript[10] = "onDumbFire"; stateSound[10] = MissileFireSound; - - stateName[11] = "FirstLoad"; - stateTransitionOnAmmo[11] = "Ready"; }; function MissileLauncherImage::onDumbFire(%data,%obj,%slot) @@ -815,42 +847,3 @@ function MissileLauncherImage::onDumbFire(%data,%obj,%slot) %obj.decInventory(%data.ammo, 1); return %p; } -function MissileLauncherImage::onUnmount(%this,%obj,%slot){ - parent::onUnmount(%this,%obj,%slot); - if(isEventPending(%obj.reloadDelaySch)) - cancel(%obj.reloadDelaySch); -} -function MissileLauncherImage::onMount(%this,%obj,%slot){ - - if(%obj.getClassName() !$= "Player") - return; - - if (%this.armthread $= "") - %obj.setArmThread(look); - else - %obj.setArmThread(%this.armThread); - - if(%obj.getMountedImage($WeaponSlot).ammo !$= ""){ - if (%obj.getInventory(%this.ammo)){ - - %fireAndReloadTime = mFloor((%this.stateTimeoutValue[4] + %this.stateTimeoutValue[3]) * 1000); - - if(%obj.lfireTime[%this.getName()] && (getSimTime() - %obj.lfireTime[%this.getName()]) < %fireAndReloadTime){ - if(isEventPending(%obj.reloadDelaySch)){ - cancel(%obj.reloadDelaySch); - } - %time = mFloor(%fireAndReloadTime - (getSimTime() - %obj.lfireTime[%this.getName()])); - %obj.reloadDelaySch = schedule(%time, 0, "ammoStateDelay", %obj, %slot, true); - } - else{ - %obj.setImageAmmo(%slot,true); - } - } - } - - %obj.client.setWeaponsHudActive(%this.item); - if(%obj.getMountedImage($WeaponSlot).ammo !$= "") - %obj.client.setAmmoHudCount(%obj.getInventory(%this.ammo)); - else - %obj.client.setAmmoHudCount(-1); -} \ No newline at end of file diff --git a/Classic/scripts/weapons/mortar.cs b/Classic/scripts/weapons/mortar.cs index 876ee09..4d33872 100644 --- a/Classic/scripts/weapons/mortar.cs +++ b/Classic/scripts/weapons/mortar.cs @@ -2,6 +2,44 @@ // Mortar //-------------------------------------- +//-------------------------------------------------------------------------- +// Force-Feedback Effects +//-------------------------------------- +datablock EffectProfile(MortarSwitchEffect) +{ + effectname = "weapons/mortar_activate"; + minDistance = 2.5; + maxDistance = 2.5; +}; + +datablock EffectProfile(MortarFireEffect) +{ + effectname = "weapons/mortar_fire"; + minDistance = 2.5; + maxDistance = 5.0; +}; + +datablock EffectProfile(MortarReloadEffect) +{ + effectname = "weapons/mortar_reload"; + minDistance = 2.5; + maxDistance = 2.5; +}; + +datablock EffectProfile(MortarDryFireEffect) +{ + effectname = "weapons/mortar_dryfire"; + minDistance = 2.5; + maxDistance = 2.5; +}; + +datablock EffectProfile(MortarExplosionEffect) +{ + effectname = "explosions/explosion.xpl03"; + minDistance = 30; + maxDistance = 65; +}; + //-------------------------------------------------------------------------- // Sounds //-------------------------------------- @@ -10,6 +48,7 @@ datablock AudioProfile(MortarSwitchSound) filename = "fx/weapons/mortar_activate.wav"; description = AudioClosest3d; preload = true; + effect = MortarSwitchEffect; }; datablock AudioProfile(MortarReloadSound) @@ -17,6 +56,7 @@ datablock AudioProfile(MortarReloadSound) filename = "fx/weapons/mortar_reload.wav"; description = AudioClosest3d; preload = true; + effect = MortarReloadEffect; }; datablock AudioProfile(MortarIdleSound) @@ -25,6 +65,7 @@ datablock AudioProfile(MortarIdleSound) filename = "fx/weapons/plasma_rifle_idle.wav"; description = ClosestLooping3d; preload = true; + effect = PlasmaIdleEffect; }; datablock AudioProfile(MortarFireSound) @@ -32,6 +73,7 @@ datablock AudioProfile(MortarFireSound) filename = "fx/weapons/mortar_fire.wav"; description = AudioDefault3d; preload = true; + effect = MortarFireEffect; }; datablock AudioProfile(MortarProjectileSound) @@ -46,6 +88,7 @@ datablock AudioProfile(MortarExplosionSound) filename = "fx/weapons/mortar_explode.wav"; description = AudioBIGExplosion3d; preload = true; + effect = MortarExplosionEffect; }; datablock AudioProfile(UnderwaterMortarExplosionSound) @@ -53,6 +96,7 @@ datablock AudioProfile(UnderwaterMortarExplosionSound) filename = "fx/weapons/mortar_explode_UW.wav"; description = AudioBIGExplosion3d; preload = true; + effect = MortarExplosionEffect; }; datablock AudioProfile(MortarDryFireSound) @@ -60,6 +104,7 @@ datablock AudioProfile(MortarDryFireSound) filename = "fx/weapons/mortar_dryfire.wav"; description = AudioClose3d; preload = true; + effect = MortarDryFireEffect; }; //---------------------------------------------------------------------------- @@ -740,8 +785,8 @@ datablock ShapeBaseImageData(MortarImage) stateSound[0] = MortarSwitchSound; stateName[1] = "ActivateReady"; - stateTransitionOnAmmo[1] = "Ready"; - stateTransitionOnNoAmmo[1] = "FirstLoad"; + stateTransitionOnLoaded[1] = "Ready"; + stateTransitionOnNoAmmo[1] = "NoAmmo"; stateName[2] = "Ready"; stateTransitionOnNoAmmo[2] = "NoAmmo"; @@ -775,50 +820,4 @@ datablock ShapeBaseImageData(MortarImage) stateSound[6] = MortarDryFireSound; stateTimeoutValue[6] = 1.5; stateTransitionOnTimeout[6] = "NoAmmo"; - - stateName[7] = "FirstLoad"; - stateTransitionOnAmmo[7] = "Ready"; }; - -function MortarImage::onUnmount(%this,%obj,%slot){ - parent::onUnmount(%this,%obj,%slot); - if(isEventPending(%obj.reloadDelaySch)) - cancel(%obj.reloadDelaySch); -} -function MortarImage::onMount(%this,%obj,%slot){ - - if(%obj.getClassName() !$= "Player") - return; - - if (%this.armthread $= "") - %obj.setArmThread(look); - else - %obj.setArmThread(%this.armThread); - - if(%obj.getMountedImage($WeaponSlot).ammo !$= ""){ - if (%obj.getInventory(%this.ammo)){ - %fireAndReloadTime = mFloor((%this.stateTimeoutValue[4] + %this.stateTimeoutValue[3]) * 1000); - if(%obj.lfireTime[%this.getName()] && (getSimTime() - %obj.lfireTime[%this.getName()]) < %fireAndReloadTime){ - if(isEventPending(%obj.reloadDelaySch)){ - cancel(%obj.reloadDelaySch); - } - %time = mFloor(%fireAndReloadTime - (getSimTime() - %obj.lfireTime[%this.getName()])); - %obj.reloadDelaySch = schedule(%time, 0, "ammoStateDelay", %obj, %slot, true); - } - else{ - %obj.setImageAmmo(%slot,true); - } - } - } - - %obj.client.setWeaponsHudActive(%this.item); - if(%obj.getMountedImage($WeaponSlot).ammo !$= "") - %obj.client.setAmmoHudCount(%obj.getInventory(%this.ammo)); - else - %obj.client.setAmmoHudCount(-1); -} - -function ammoStateDelay(%obj, %slot, %state){ - if(isObject(%obj) && %obj.getState() !$= "Dead") - %obj.setImageAmmo(%slot, %state); -} \ No newline at end of file diff --git a/README.md b/README.md index 568c238..1a83266 100644 --- a/README.md +++ b/README.md @@ -45,19 +45,20 @@ Discord: [Tribes 2 Discord](https://playt2.com/discord) --- ### Important Gameplay Changes over stock classic - - OG blaster buffed for Heavy Armors - - No Vehicle Zone around flag is bigger 5 >> 15 - - Heavy Shield Nerfed (54 to block 1 DMG, is now 60) + - OG blaster buffed against Heavy Armors (Not Tournament Mode Only) - Max FOV 120 >> 138 (For Wide Screens) - - Item respawn time can be changed (default 30) - - Cloak Sound 50m >> 55m - - Bigger ground dust puffs (For cloak) 0.4 larger - - Sensor Jammer jam radius is buffed to jam cloaks 30 >> 45 - - Sensor Jammer can passively see cloaker's triangle - - Mortor reload rework (Player can throw, but must wait until reload time has passed) - - Tank Shield Nerf (135 to block 1 DMG, is now 142) - - Whiteout grenades are less seizurely (Due to spamming) 0.9 >> 0.78 - - All water viscosity follows a global preset + - Item respawn time can be changed (Optional) + - All water viscosity follows a global preset (3) + - No Vehicle Zone around flag is bigger 5 >> 15 + - Heavy Shield Nerfed (54 to block 1 DMG, is now 60) + - Cloak Sound 50m >> 55m + - Bigger ground dust puffs (For cloak) 0.4 larger + - Sensor Jammer jam radius is buffed to jam cloaks 30 >> 45 + - Sensor Jammer can passively see cloaker's triangle + - Mortor reload rework (Player can throw, but must wait until reload time has passed) + - Tank Shield Nerf (135 to block 1 DMG, is now 142) + - Whiteout grenades are less seizurely (Due to spamming) 0.9 >> 0.78 + - Spawn fade-in effect --- From 8af6ce887cddcf7b63ea0888f7bf8f2dacf95e27 Mon Sep 17 00:00:00 2001 From: ChocoTaco1 Date: Sat, 27 Sep 2025 17:57:13 -0400 Subject: [PATCH 37/48] Update 10.60 --- Classic/scripts/autoexec/z_dtStats.cs | 113 +++++++++----------------- 1 file changed, 38 insertions(+), 75 deletions(-) diff --git a/Classic/scripts/autoexec/z_dtStats.cs b/Classic/scripts/autoexec/z_dtStats.cs index f6a03cf..a7e97cd 100644 --- a/Classic/scripts/autoexec/z_dtStats.cs +++ b/Classic/scripts/autoexec/z_dtStats.cs @@ -16,7 +16,7 @@ // Note See bottom of file for full log ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// //-----------Settings----------- -$dtStats::version = 10.59; +$dtStats::version = 10.60; //disable stats system $dtStats::Enable = $Host::dtStatsEnable $= "" ? ($Host::dtStatsEnable = 1) : $Host::dtStatsEnable; if(!$dtStats::Enable){ return;}// so it disables with a restart @@ -13981,8 +13981,10 @@ package dtBanSys{ //Reapply the gag function GameConnection::onConnect( %client, %name, %raceGender, %skin, %voice, %voicePitch ){ + if (banList_checkClient(%client, getField(%client.t2csri_authInfo, 3))){ + return 0; + } parent::onConnect( %client, %name, %raceGender, %skin, %voice, %voicePitch ); - %client.isGagged = ($chatGagged[getClientCleanIP(%client)] || $chatGagged[%client.guid]); //restore status } @@ -13991,7 +13993,8 @@ package dtBanSys{ %time = (%time $= "") ? 100000 : %time; %name = getClientBanName(%guid, %ipAddress); %bareIP = getCleanIP(%ipAddress); - if(!isObject($dtBanTemp::GUID[%guid]) && !isObject($dtBanTemp::GUID[%bareIP])){ + //error("GUID" SPC %guid SPC "IP" SPC %bareIP); + if(!isObject($dtBanTemp::GUID[%guid]) && !isObject($dtBanTemp::IP[%bareIP])){ if(!isObject(dtBanList)){ new simGroup(dtBanList); RootGroup.add(dtBanList); @@ -14001,64 +14004,20 @@ package dtBanSys{ name = %name; guid = %guid; ip = %bareip; - banDateTime = dtMarkDate(); + banDateTime = dtMarkDate(); banLengthMin = %time; }; dtBanList.add(%banObj); - if(!%bareIP) + if(%bareIP !$= "0") $dtBanTemp::IP[%bareIP] = %banObj; if(%guid){ $dtBanTemp::GUID[%guid] = %banObj; rmvWhiteListGuid(%guid); } } - if(isObject($dtBanTemp::GUID[%guid]) && !isObject($dtBanTemp::GUID[%bareIP])){ - %obj = $dtBanTemp::GUID[%guid]; - %obj.ip = %bareIP; - } - else if(isObject($dtBanTemp::GUID[%bareIP]) && !isObject($dtBanTemp::GUID[%guid])){ - %obj = $dtBanTemp::GUID[%bareIP]; - %obj.guid = %guid; - } - saveBanList(); } - function banList_checkIP(%client){ - %ip = getClientCleanIP(%client); - %obj = $dtBanTemp::IP[%ip]; - if(isObject(%obj) && %obj.banDateTime > 0){ - %delta = getTimeDelta(%obj.banDateTime); - if (%delta < %obj.banLengthMin){ - pushFailJoin(%obj.name, %obj.gui, 0, "Kick/Ban" SPC %obj.banDateTime - %delta SPC "Minutes Left", 1); - return 1; - } - else{ - unbanUserObj(%obj); - } - } - return 0; - } - - // from tribes next did not want to override this but need to pass %client id into ban check to avoid wierd issues - function serverCmdt2csri_challengeResponse(%client, %serverChallenge){ - if (%client.doneAuthenticating) - return; - - if (%client.t2csri_serverChallenge $= %serverChallenge){ - // check to see if the client is GUID banned, now that we verified their certificate - if (banList_checkClientGUID(%client, getField(%client.t2csri_authInfo, 3))){ - return; - } - - // client checks out... continue loading sequence - %client.onConnect(%client.tname, %client.trgen, %client.tskin, %client.tvoic, %client.tvopi); - } - else{ - %client.setDisconnectReason("Invalid server challenge. Check your account key for corruption."); - %client.delete(); - } - } }; function dtIsAdmin(%client,%guid){ @@ -14082,10 +14041,12 @@ function dtIsAdmin(%client,%guid){ return false; } - - -function banList_checkClientGUID(%client, %guid){// only one we care about in whitelist mode - %obj = $dtBanTemp::GUID[%guid]; +function banList_checkClient(%client, %guid){// only one we care about in whitelist mode + //error("banlist check" SPC "client" SPC %client SPC "Guid" SPC %guid); + %objA = $dtBanTemp::GUID[%guid]; + %ip = getClientCleanIP(%client); + %objB = $dtBanTemp::IP[%ip]; + %obj = (isObject(%objA) == 1) ? %objA : %objB; if (isObject(%obj) && %obj.banDateTime > 0){ %delta = getTimeDelta(%obj.banDateTime); if (%delta < %obj.banLengthMin){ @@ -14099,30 +14060,31 @@ function banList_checkClientGUID(%client, %guid){// only one we care about in wh unbanUserObj(%obj); } } + if(isObject(%objA)){ + %realName = getField(%client.t2csri_authInfo, 0 ); + if(%realName !$= "") + %name = trim(%realName); + else + %name = trim(stripChars( detag( getTaggedString( %fc.name ) ), "\cp\co\c6\c7\c8\c9\c0" )); - %realName = getField(%client.t2csri_authInfo, 0 ); - if(%realName !$= "") - %name = trim(%realName); - else - %name = trim(stripChars( detag( getTaggedString( %fc.name ) ), "\cp\co\c6\c7\c8\c9\c0" )); + %safe = ( dtIsAdmin(%client,%guid) || isObject($dtWhtList::WhiteList[%guid])); + if(!%safe){ + pushFailJoin(%name, %guid, 0, "Not Whitelisted", 0); + if($dtServerVars::WhiteListMode){ + %client.setDisconnectReason("Server is locked, please message admin or wait for approval"); + %client.delete(); + return 1; + } + } - %safe = ( dtIsAdmin(%client,%guid) || isObject($dtWhtList::WhiteList[%guid])); - if(!%safe){ - pushFailJoin(%name, %guid, 0, "Not Whitelisted", 0); - if($dtServerVars::WhiteListMode){ - %client.setDisconnectReason("Server is locked, please message admin or wait for approval"); + // this is here in case of banned ip is a whitelisted account + if($dtServerVars::IPBanListMode && $dtIPList[%ip] && !isObject($dtWhtList::WhiteList[%guid])){ + pushFailJoin(%name, %client.guid, %ip, "IP Ban List", 2); + %client.setDisconnectReason("You are not allowed to play on this server."); %client.delete(); return 1; } } - - %ip = getClientCleanIP(%client);// this is here in case of banned ip is a whitelisted account - if($dtServerVars::IPBanListMode && $dtIPList[%ip] && !isObject($dtWhtList::WhiteList[%guid])){ - pushFailJoin(%name, %client.guid, %ip, "IP Ban List", 2); - %client.setDisconnectReason("You are not allowed to play on this server."); - %client.delete(); - return 1; - } return 0; } @@ -20571,16 +20533,17 @@ function mapCyleTest(){ // Added custom two team debrief as well as a evo style extended stats // Reworked enable disable, only disables stats saving and stats access, do to systems relying on systems // -// 10.1 - 10.2 - 10.3 +// 10.1 - 10.2 - 10.3 - 10.6 // Ban system changes // Fix bad loop in ban system // Misc arena things // Added LCTF Naming // serverPrefs Support -//////////////////////////////////////////////////////////////////////////////// -////////////////////////////////Storage///////////////////////////////////////// -//////////////////////////////////////////////////////////////////////////////// +// bansystem rework doto new tribes next changes + +//////////////////////////////////////////////////////////////////////////////// +//////////////////////////////////////////////////////////////////////////////// function testVarsRandomAll(%max){ %game = Game.class; for(%q = 0; %q < $statsVars::count[%game]; %q++){ From b5ed76eb54f48a431c2c1fd9bc93a89fda26da45 Mon Sep 17 00:00:00 2001 From: ChocoTaco1 Date: Sat, 27 Sep 2025 18:06:42 -0400 Subject: [PATCH 38/48] Fix Readme logo --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 1a83266..a7e3d5f 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -![Tribes 2](https://media.discordapp.net/attachments/1160685717303861413/1160685718176280666/68747470733a2f2f63646e2e646973636f72646170702e636f6d2f6174746163686d656e74732f3532313739373031323031343735393937302f3637383436303530353539373134393231342f5461636f5365727665722e706e67.png?ex=671814cf&is=6716c34f&hm=7d071d3b2e221ad89b80de48f91e4ed17d548573c16ed512f3a03efaa719b605&) +![Tribes 2](https://playt2.com/images/avatar300.png) # TacoServer ## A Tribes 2 server with competitive features that is also open-source. From e1f42951afa3af8e13321f1bfe8cbb2c360f1a9c Mon Sep 17 00:00:00 2001 From: ChocoTaco1 Date: Mon, 27 Oct 2025 14:06:01 -0400 Subject: [PATCH 39/48] Reenable Zodd's rapid fire fix Forgot this existed, whoops Use classic code --- Classic/scripts/projectiles.cs | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/Classic/scripts/projectiles.cs b/Classic/scripts/projectiles.cs index 1ba0fd7..3e30715 100644 --- a/Classic/scripts/projectiles.cs +++ b/Classic/scripts/projectiles.cs @@ -62,21 +62,20 @@ function ShapeBaseImageData::onFire(%data, %obj, %slot) { // --------------------------------------------------------------------------- // z0dd - ZOD, 9/3/02. Anti rapid fire mortar/missile fix. - // if (%obj.cantFire !$= "") - // { - // return 0; - // } + if (%obj.cantFire !$= "") + { + return 0; + } - // %wpnName = %data.getName(); - // if((%wpnName $= "MortarImage") || (%wpnName $= "MissileLauncherImage")) - // { - // %obj.cantFire = 1; - // %preventTime = %data.stateTimeoutValue[4]; - // //%preventTime = (%data.stateTimeoutValue[4] + %data.stateTimeoutValue[3]) - 0.032; - // %obj.reloadSchedule = schedule(%preventTime * 1000, %obj, resetFire, %obj); - // } + %wpnName = %data.getName(); + if((%wpnName $= "MortarImage") || (%wpnName $= "MissileLauncherImage")) + { + %obj.cantFire = 1; + %preventTime = %data.stateTimeoutValue[4]; + %obj.reloadSchedule = schedule(%preventTime * 1000, %obj, resetFire, %obj); + } // --------------------------------------------------------------------------- - %obj.lfireTime[%data.getName()] = getSimTime(); + //%obj.lfireTime[%data.getName()] = getSimTime(); %data.lightStart = getSimTime(); From 3e858b564963516a903477d9826b4e0470125195 Mon Sep 17 00:00:00 2001 From: ChocoTaco1 Date: Tue, 28 Oct 2025 14:42:20 -0400 Subject: [PATCH 40/48] General updates --- Classic/prefs/MapRotation.cs | 623 ------------------------------ Classic/prefs/mapRotation.cs | 507 ++++++++++++++++++++++++ Classic/prefs/serverPrefs.cs | 16 +- Classic/scripts/serverDefaults.cs | 20 +- 4 files changed, 525 insertions(+), 641 deletions(-) delete mode 100644 Classic/prefs/MapRotation.cs create mode 100644 Classic/prefs/mapRotation.cs diff --git a/Classic/prefs/MapRotation.cs b/Classic/prefs/MapRotation.cs deleted file mode 100644 index 3bb80e2..0000000 --- a/Classic/prefs/MapRotation.cs +++ /dev/null @@ -1,623 +0,0 @@ -// __ __ _____ _ _ _ -// | \/ | | __ \ | | | | (_) -// | \ / | __ _ _ __ | |__) |___ | |_ __ _| |_ _ ___ _ __ -// | |\/| |/ _` | '_ \ | _ // _ \| __/ _` | __| |/ _ \| '_ \ -// | | | | (_| | |_) | | | \ \ (_) | || (_| | |_| | (_) | | | | -// |_| |_|\__,_| .__/ |_| \_\___/ \__\__,_|\__|_|\___/|_| |_| -// | | -// |_| -// -// Use of this file -// To add a new map follow this rules: -// 1. Find the file name, ending in .mis (ie BeggarsRun.mis) -// 2. Add a line with this syntact: addRotationMap(filename, gametype, %voteable, %cycle, %min. %max); -// -//addRotationMap("MAP_NAME","MAP_MODE",VOTEABLE,IN-ROTATION,MINIMUM_PLAYERS,MAXIMUM_PLAYERS); -// -// Example: addRotationMap("BeggarsRun","CTF",1,1,-1,64); -// Beggar's Run will be in the mapRotation. It's in the cycle and can be voted. The map has no minimum player count requirement, and a 64 player max. -// -// Example: addRotationMap("BeggarsRun","CTF",1,0,10,20); -// Beggar's Run will be in the mapRotation. It's not in the cycle, but can be voted. The map has a minimum player count requirement of 10, and 20 players is the maximum to be picked. -// -// Example: addRotationMap("BeggarsRun","CTF",0,0,18,-1); -// Beggar's Run won't be in the mapRotation. It's not in the cycle and can't be voted. The map has a minimum player count requirement of 18, and has no maximum for players. -// -// -//addRotationMap("Casern_Cavite","Bounty",1,1,0,64); -//addRotationMap("Sirocco","CnH",1,1,0,64); -//addRotationMap("aabaaGH","CTF",1,0,0,64); -//addRotationMap("AcidRain","DnD",1,1,0,64); -//addRotationMap("AgentsOfFortune","Hunters",1,1,0,64); -//addRotationMap("SunDriedLak1","LakRabbit",1,1,0,64); -//addRotationMap("Arrakis","Rabbit",1,1,0,64); -//addRotationMap("VulcansHammer","Siege",1,1,0,64); -//addRotationMap("AgentsOfFortune","TeamHunters",1,1,0,64); -// - - -// _____ _______ ______ -// / ____|__ __| ____| -// | | | | | |__ -// | | | | | __| -// | |____ | | | | -// \_____| |_| |_| -///////////////////////////////////////////////////////////////////// - -//Small Maps -///////////////////////////////////////////////////////////////////// - -//addRotationMap("SmallCrossing", "CTF",1,1,-1,16); //Using DMP Version -addRotationMap("TWL2_CanyonCrusadeDeluxe", "CTF",1,1,-1,24); -addRotationMap("RoundTheMountain", "CTF",1,1,-1,18); -addRotationMap("oasisintensity", "CTF",1,1,-1,10); -addRotationMap("Minotaur", "CTF",1,0,-1,18); -addRotationMap("SmallMelee", "CTF",1,0,-1,12); -addRotationMap("Machineeggs", "CTF",1,1,-1,10); -addRotationMap("Mac_FlagArena", "CTF",1,0,-1,14); -addRotationMap("SmallTimeCTF", "CTF",1,0,-1,14); -addRotationMap("TWL2_Hildebrand", "CTF",1,1,-1,18); -addRotationMap("ArenaDome", "CTF",1,0,-1,12); -addRotationMap("Firestorm", "CTF",1,0,-1,12); -addRotationMap("Bulwark", "CTF",1,1,-1,12); -addRotationMap("Blink", "CTF",1,0,-1,10); -addRotationMap("Discord", "CTF",1,1,6,16); -addRotationMap("TWL2_MidnightMayhemDeluxe", "CTF",1,0,8,12); -addRotationMap("Sentry", "CTF",1,1,-1,14); -addRotationMap("TWL2_Skylight", "CTF",1,1,-1,10); -addRotationMap("Exhumed", "CTF",1,0,-1,12); -addRotationMap("FrozenHope", "CTF",1,1,8,12); -addRotationMap("ClusterUnFuct", "CTF",1,0,8,12); -//addRotationMap("Raspian", "CTF",1,0,8,12); -addRotationMap("Zilch", "CTF",1,1,6,12); -addRotationMap("SuperHappyBouncyFunTime", "CTF",1,0,-1,12); -addRotationMap("SuperiorWaterworks", "CTF",1,0,-1,12); -//addRotationMap("TWL2_FrozenHope", "CTF",1,0,8,20); -//addRotationMap("Island", "CTF",1,1,-1,12); -//addRotationMap("TitForTat", "CTF",1,1,-1,12); -//addRotationMap("Cinerarium", "CTF",1,0,-1,12); //Using DMP Version -//addRotationMap("StarFallCTF", "CTF",1,0,6,12); //Using DMP Version -//addRotationMap("TWL_OsIris", "CTF",1,0,8,18); -//addRotationMap("FrostPipe", "CTF",1,0,-1,12); - -//Medium Maps -///////////////////////////////////////////////////////////////////// - -addRotationMap("HighOctane", "CTF",1,0,10,24); -addRotationMap("S5_Mordacity", "CTF",1,1,10,24); -addRotationMap("S5_Damnation", "CTF",1,1,12,20); -addRotationMap("TWL2_JaggedClaw", "CTF",1,1,14,28); -addRotationMap("S5_Massive", "CTF",1,1,12,32); -addRotationMap("TWL_Stonehenge", "CTF",1,1,8,20); -addRotationMap("TWL_Feign", "CTF",1,1,10,28); -addRotationMap("TheFray", "CTF",1,0,10,20); -//addRotationMap("DangerousCrossing_nef", "CTF",1,1,8,20); -addRotationMap("TWL_DangerousCrossing", "CTF",1,0,10,28); -addRotationMap("TWL2_Ocular", "CTF",1,1,20,-1); -addRotationMap("Dire", "CTF",1,0,10,16); -addRotationMap("berlard", "CTF",1,1,12,24); -addRotationMap("S8_Opus", "CTF",1,1,12,24); -addRotationMap("TWL_BeggarsRun", "CTF",1,0,18,24); -addRotationMap("Headstone", "CTF",1,1,8,24); -addRotationMap("Signal", "CTF",1,0,8,24); -addRotationMap("S5_Woodymyrk", "CTF",1,1,10,32); -addRotationMap("TenebrousCTF", "CTF",1,0,8,12); -addRotationMap("Prismatic", "CTF",1,0,16,32); -addRotationMap("TWL_WilderZone", "CTF",1,1,12,32); -addRotationMap("S5_Mimicry", "CTF",1,0,12,32); -addRotationMap("TWL_Snowblind", "CTF",1,1,20,-1); -addRotationMap("ShortFall", "CTF",1,0,18,28); -addRotationMap("IceRidge_nef", "CTF",1,0,12,32); -//addRotationMap("Disjointed", "CTF",1,0,8,20); -addRotationMap("TWL2_MuddySwamp", "CTF",1,0,10,24); -addRotationMap("HighAnxiety", "CTF",1,1,-1,12); -addRotationMap("S5_Centaur", "CTF",1,1,-1,12); -addRotationMap("S8_Cardiac", "CTF",1,1,18,-1); -addRotationMap("CirclesEdge", "CTF",1,0,10,24); -addRotationMap("S5_Icedance", "CTF",1,1,10,28); -addRotationMap("Surreal", "CTF",1,0,24,-1); -addRotationMap("TWL2_Drifts", "CTF",1,0,14,24); -//addRotationMap("TWL2_Drorck", "CTF",1,0,12,24); -addRotationMap("S5_HawkingHeat", "CTF",1,0,16,28); -addRotationMap("TWL2_Celerity", "CTF",1,1,12,32); -addRotationMap("Draco", "CTF",1,0,8,24); -//addRotationMap("Pariah", "CTF",1,0,8,24); //Using DMP Version -//addRotationMap("Mirage", "CTF",1,0,8,20); -addRotationMap("Norty", "CTF",1,1,18,32); - -//Voteable but Not in Rotation -///////////////////////////////////////////////////////////////////// - -addRotationMap("TWL2_IceDagger", "CTF",1,1,10,20); -addRotationMap("TWL_Titan", "CTF",1,0,16,32); -addRotationMap("Burstside", "CTF",1,0,10,20); -addRotationMap("Infernus", "CTF",1,0,18,26); -addRotationMap("Confusco", "CTF",1,0,10,20); -//addRotationMap("Snowcone", "CTF",1,0,10,20); -addRotationMap("S5_Drache", "CTF",1,0,16,28); -//addRotationMap("JadeValley", "CTF",1,0,10,20); -addRotationMap("S5_Sherman", "CTF",1,1,24,-1); -addRotationMap("S5_Silenus", "CTF",1,0,8,20); -addRotationMap("S5_Reynard", "CTF",1,0,10,20); -//addRotationMap("Coppersky", "CTF",1,0,8,20); -//addRotationMap("TWL2_Crevice", "CTF",1,0,10,20); -addRotationMap("TWL_SubZero", "CTF",1,0,16,32); -addRotationMap("Fallout", "CTF",1,1,16,24); -//addRotationMap("TheClocktower", "CTF",1,0,10,20); -//addRotationMap("SoylentGreen", "CTF",1,0,10,20); -//addRotationMap("Ramparts", "CTF",1,0,10,20); -//addRotationMap("Blastside_nef", "CTF",1,0,10,24); -//addRotationMap("NatureMagic", "CTF",1,0,10,20); -//addRotationMap("TWL_Damnation", "CTF",1,0,10,20); -addRotationMap("TWL_DeadlyBirdsSong", "CTF",1,0,24,32); -addRotationMap("Vauban", "CTF",1,0,18,-1); -addRotationMap("TWL_Pandemonium", "CTF",1,0,16,24); -addRotationMap("TWL_WhiteDwarf", "CTF",1,0,18,24); -//addRotationMap("Cinereous", "CTF",1,0,12,20); - -//Vehicle Maps -///////////////////////////////////////////////////////////////////// - -addRotationMap("Logans_Run", "CTF",1,1,14,28); -addRotationMap("Rollercoaster_nef", "CTF",1,1,8,-1); -addRotationMap("HostileLoch", "CTF",1,1,8,12); -addRotationMap("TWL_BeachBlitz", "CTF",1,1,18,28); -addRotationMap("TWL2_Magnum", "CTF",1,1,12,-1); -//addRotationMap("MoonDance", "CTF",1,0,12,28); //Using DMP Version -addRotationMap("Raindance_nef", "CTF",1,1,12,28); -addRotationMap("TWL_Magmatic", "CTF",1,0,14,28); -addRotationMap("TWL2_FrozenGlory", "CTF",1,1,12,24); -addRotationMap("LandingParty", "CTF",1,0,16,20); -addRotationMap("TWL_Crossfire", "CTF",1,1,18,28); -//addRotationMap("TitanV", "CTF",1,0,12,28); -//addRotationMap("Rollercoaster_nef_FZ", "CTF",1,1,8,28); -//addRotationMap("The_Calm", "CTF",1,0,12,24); -addRotationMap("TWL2_Dissention", "CTF",1,0,16,32); - -//Vehicle Maps: Voteable, But Not in Rotation -///////////////////////////////////////////////////////////////////// - -addRotationMap("SubZeroV", "CTF",1,0,12,24); -addRotationMap("S8_Geothermal", "CTF",1,0,12,24); -addRotationMap("Lakefront", "CTF",1,0,16,24); -addRotationMap("ShockRidge", "CTF",1,0,12,24); -addRotationMap("TWL2_BlueMoon", "CTF",1,1,18,32); -addRotationMap("TWL_Katabatic", "CTF",1,0,16,32); -addRotationMap("SandOcean", "CTF",1,0,12,28); -addRotationMap("ks_braistv", "CTF",1,0,12,24); -addRotationMap("Nightdance", "CTF",1,0,16,24); -addRotationMap("TWL_Abaddon", "CTF",1,0,16,24); -//addRotationMap("StarIce", "CTF",1,0,12,24); -//addRotationMap("FilteredDust", "CTF",1,0,12,24); -//addRotationMap("Choke", "CTF",1,0,12,24); -addRotationMap("TWL_Chokepoint", "CTF",1,0,12,24); -//addRotationMap("TWL_Starfallen", "CTF",1,0,12,24); -//addRotationMap("ConstructionYard", "CTF",1,0,12,24); -//addRotationMap("AcidRain", "CTF",1,0,12,24); -addRotationMap("Agorazscium", "CTF",1,0,12,24); - -//BIG Vehicle Maps -///////////////////////////////////////////////////////////////////// - -addRotationMap("Circleofstones", "CTF",1,1,16,-1); -addRotationMap("Ruined", "CTF",1,0,24,-1); -//addRotationMap("FullCircle", "CTF",1,0,18,30); -//addRotationMap("Surro", "CTF",1,0,18,24); -addRotationMap("TWL2_RoughLand", "CTF",1,0,16,-1); -addRotationMap("HarvestDance", "CTF",1,1,24,-1); -//addRotationMap("WindyGap", "CTF",1,0,24,-1); -addRotationMap("Fenix", "CTF",1,1,26,-1); -addRotationMap("Hillside", "CTF",1,0,28,-1); -addRotationMap("TWL_Slapdash", "CTF",1,0,24,-1); -addRotationMap("BerylBasin", "CTF",1,1,20,-1); -//addRotationMap("TWL_Frozen", "CTF",1,0,20,-1); -addRotationMap("TWL_Harvester", "CTF",1,1,24,-1); -addRotationMap("TWL2_Bleed", "CTF",1,0,24,-1); -addRotationMap("DeathBirdsFly1", "CTF",1,1,24,-1); -//addRotationMap("Scarabrae_nef", "CTF",1,0,28,-1); -addRotationMap("aabaa", "CTF",1,1,28,-1); -addRotationMap("TWL_Reversion", "CTF",1,1,28,-1); -addRotationMap("Horde", "CTF",1,0,24,-1); -addRotationMap("CloakofNightV", "CTF",1,0,24,-1); -//addRotationMap("TWL2_Ruined", "CTF",1,1,18,-1); -//addRotationMap("Glade", "CTF",1,1,28,-1); -//addRotationMap("Pantheon", "CTF",1,0,20,-1); -//addRotationMap("Archipelago", "CTF",1,0,20,-1); -//addRotationMap("Sangre_de_Grado", "CTF",1,0,20,-1); - -//DMP Mappack -///////////////////////////////////////////////////////////////////// -addRotationMap("DMP_Agroleon", "CTF",1,1,18,28); -addRotationMap("DMP_Astro", "CTF",1,0,16,26); -addRotationMap("DMP_BastardForge", "CTF",1,1,8,28); -addRotationMap("DMP_BitterGorge", "CTF",1,0,24,-1); -addRotationMap("DMP_Bunkered", "CTF",1,0,6,14); -addRotationMap("DMP_Cinerarium", "CTF",1,1,-1,20); -addRotationMap("DMP_DermCity", "CTF",1,0,-1,-1); -addRotationMap("DMP_Embers", "CTF",1,0,-1,14); -addRotationMap("DMP_EmeraldSpit", "CTF",1,0,10,20); -addRotationMap("DMP_FaceCrossing", "CTF",1,0,10,20); -addRotationMap("DMP_Hoth", "CTF",1,1,26,-1); -addRotationMap("DMP_IceGiant", "CTF",1,0,20,32); -addRotationMap("DMP_IsleDeBatalla", "CTF",1,0,10,20); -addRotationMap("DMP_LavaGods", "CTF",1,0,10,20); -addRotationMap("DMP_Magellan", "CTF",1,1,10,28); -addRotationMap("DMP_MoonDance", "CTF",1,1,12,32); -addRotationMap("DMP_Pantheon", "CTF",1,0,16,24); -addRotationMap("DMP_Paranoia", "CTF",1,0,6,10); -addRotationMap("DMP_Pariah", "CTF",1,1,8,24); -addRotationMap("DMP_PipeDream", "CTF",1,0,8,16); -addRotationMap("DMP_RavineV", "CTF",1,0,12,28); -addRotationMap("DMP_ScorchedEarth", "CTF",1,0,24,-1); -addRotationMap("DMP_SimpleFlagArena", "CTF",1,0,-1,12); -addRotationMap("DMP_SpinCycle", "CTF",1,1,-1,16); -addRotationMap("DMP_StarFall", "CTF",1,0,-1,16); -addRotationMap("DMP_Tyre", "CTF",1,1,16,-1); -addRotationMap("DMP_Wasteland", "CTF",1,0,10,20); - -addRotationMap("SC_Normal", "CTF",1,0,-1,16); -//addRotationMap("SC_Badlands", "CTF",1,0,-1,16); -//addRotationMap("SC_Desert", "CTF",1,0,-1,16); -//addRotationMap("SC_Lush", "CTF",1,0,-1,16); -addRotationMap("SC_Ice", "CTF",1,1,-1,16); -addRotationMap("SC_Night", "CTF",1,0,-1,16); -//addRotationMap("DX_Badlands", "CTF",1,0,10,20); -//addRotationMap("DX_Desert", "CTF",1,0,10,20); -addRotationMap("DX_Ice", "CTF",1,1,10,28); -//addRotationMap("HO_Badlands", "CTF",1,1,8,24); -//addRotationMap("HO_Desert", "CTF",1,0,8,24); -addRotationMap("HO_Ice", "CTF",1,1,8,28); -addRotationMap("HO_Lush", "CTF",1,0,8,24); -addRotationMap("Attrition", "CTF",1,0,-1,10); -//addRotationMap("Chasmaclysmic", "CTF",1,1,-1,-1); -//addRotationMap("DBS_Smoothed", "CTF",1,0,-1,-1); -addRotationMap("PuliVeivari", "CTF",1,0,-1,-1); -addRotationMap("PlanetX", "CTF",1,0,-1,-1); -//addRotationMap("Ravine", "CTF",1,1,-1,-1); -addRotationMap("Stripmine", "CTF",1,0,-1,-1); - -//Not In Rotation - Not Voteable -///////////////////////////////////////////////////////////////////// - -//addRotationMap("Sandstorm", "CTF",1,0,-1,-1); -//addRotationMap("Starfallen", "CTF",1,0,-1,-1); -//addRotationMap("Stonehenge_nef", "CTF",1,0,-1,-1); -addRotationMap("Extractor", "CTF",1,0,16,-1); -//addRotationMap("AstersDescent", "CTF",1,0,-1,-1); -//addRotationMap("Azoth", "CTF",1,0,-1,-1); -//addRotationMap("BattleGrove", "CTF",1,0,-1,-1); -//addRotationMap("Durango", "CTF",1,0,-1,-1); -//addRotationMap("DustLust", "CTF",1,0,-1,-1); -//addRotationMap("IceGulch", "CTF",1,0,-1,-1); -//addRotationMap("MountainMist", "CTF",1,0,-1,-1); -//addRotationMap("Peak", "CTF",1,0,-1,-1); -//addRotationMap("Pendulum", "CTF",1,0,-1,-1); -//addRotationMap("S5_Misadventure", "CTF",1,0,-1,-1); -//addRotationMap("S8_CentralDogma", "CTF",1,0,-1,-1); -//addRotationMap("S8_Mountking", "CTF",1,0,-1,-1); -//addRotationMap("S8_Zilch", "CTF",1,0,-1,-1); -//addRotationMap("TWL2_CloakOfNight", "CTF",1,0,-1,-1); -//addRotationMap("TWL_BaNsHee", "CTF",1,0,-1,-1); -//addRotationMap("TWL_Boss", "CTF",1,0,-1,-1); -//addRotationMap("TWL_NoShelter", "CTF",1,0,-1,-1); -//addRotationMap("TWL_Clusterfuct", "CTF",1,0,-1,-1); -addRotationMap("TWL_Curtilage", "CTF",1,0,-1,-1); -//addRotationMap("TWL_Deserted", "CTF",1,0,-1,-1); -//addRotationMap("TWL_Frostclaw", "CTF",1,0,-1,-1); -//addRotationMap("TWL_Neve", "CTF",1,0,-1,-1); -//addRotationMap("TWL_Ramparts", "CTF",1,0,-1,-1); -//addRotationMap("TWL_Sandstorm", "CTF",1,0,-1,-1); -//addRotationMap("TWL_WoodyMyrk", "CTF",1,0,-1,-1); -//addRotationMap("OctoberRust", "CTF",1,0,-1,-1); -//addRotationMap("DevilsElbow", "CTF",1,0,-1,-1); -//addRotationMap("CloudCity", "CTF",1,0,-1,-1); -//addRotationMap("Damnation", "CTF",1,0,-1,-1); -//addRotationMap("DeathBirdsFly", "CTF",1,0,-1,-1); -//addRotationMap("Desiccator", "CTF",1,0,-1,-1); -//addRotationMap("DustToDust", "CTF",1,0,-1,-1); -//addRotationMap("Katabatic", "CTF",1,0,-1,-1); -//addRotationMap("Quagmire", "CTF",1,0,-1,-1); -//addRotationMap("Recalescence", "CTF",1,0,-1,-1); -//addRotationMap("Reversion", "CTF",1,0,-1,-1); -//addRotationMap("RiverDance", "CTF",1,0,-1,-1); -//addRotationMap("Sanctuary", "CTF",1,0,-1,-1); -//addRotationMap("ThinIce", "CTF",1,0,-1,-1); -//addRotationMap("Tombstone", "CTF",1,0,-1,-1); -//addRotationMap("Broadside_nef", "CTF",1,0,-1,-1); -//addRotationMap("Camelland", "CTF",1,0,-1,-1); -//addRotationMap("HighTrepidation", "CTF",1,0,-1,-1); -//addRotationMap("SmallDesertofDeath", "CTF",1,0,-1,-1); -//addRotationMap("BasinFury", "CTF",1,0,-1,-1); -//addRotationMap("Cadaver", "CTF",1,0,-1,-1); -//addRotationMap("EivoItoxico", "CTF",1,0,-1,-1); -//addRotationMap("Einfach", "CTF",1,0,-1,-1); -//addRotationMap("PicnicTable", "CTF",1,0,-1,-1); -//addRotationMap("Hostility", "CTF",1,0,-1,-1); -//addRotationMap("HighWire", "CTF",1,0,-1,-1); -//addRotationMap("CloudBurst", "CTF",1,0,-1,-1); -//addRotationMap("CloseCombat", "CTF",1,0,-1,-1); -//addRotationMap("DesertofDeath_nef", "CTF",1,0,-1,-1); -//addRotationMap("Gorgon", "CTF",1,0,-1,-1); -//addRotationMap("Magmatic", "CTF",1,0,-1,-1); -//addRotationMap("Sub-zero", "CTF",1,0,-1,-1); - - -// Custom -///////////////////////////////////////////////////////////////////// - -addRotationMap("CoconutFury", "CTF",1,0,-1,-1); -addRotationMap("CinderCone", "CTF",1,0,-1,-1); -addRotationMap("Sector1", "CTF",1,0,-1,-1); -//addRotationMap("Slamnation", "CTF",0,0,-1,-1); -//addRotationMap("MountaintopMayhem", "CTF",0,0,-1,-1); - -addRotationMap("ChasmClash", "CTF",1,0,-1,14); -//addRotationMap("FrostBite", "CTF",1,0,-1,-1); -//addRotationMap("Lapiths", "CTF",1,0,-1,-1); -addRotationMap("GreenLawn", "CTF",1,1,12,32); -addRotationMap("OuterWilds", "CTF",1,1,-1,12); -addRotationMap("Jettisoned", "CTF",1,0,-1,10); -addRotationMap("Moonwalk", "CTF",1,1,12,-1); -addRotationMap("Drafts", "CTF",1,1,-1,12); -//addRotationMap("IslaHermano", "CTF",1,0,-1,-1); -addRotationMap("DermCrossingDeluxe", "CTF",1,0,-1,-1); -addRotationMap("DaftGulch", "CTF",1,1,16,24); -addRotationMap("Triad", "CTF",1,0,12,20); -addRotationMap("Vaubania", "CTF",1,0,-1,12); -addRotationMap("VanDamnedCTF", "CTF",1,1,-1,14); -addRotationMap("HillKingCTF", "CTF",1,1,-1,18); -addRotationMap("Bonespur", "CTF",1,1,-1,14); -addRotationMap("Bridgepoint", "CTF",1,0,-1,18); -addRotationMap("Narcolepsy", "CTF",1,1,-1,20); -addRotationMap("WhiteDwarfDeluxe", "CTF",1,0,-1,14); -addRotationMap("SmallSpit", "CTF",1,1,-1,20); -addRotationMap("MisadventureV2", "CTF",1,1,12,28); -addRotationMap("El_Fin", "CTF",1,1,-1,14); -addRotationMap("HogansRun24", "CTF",1,0,-1,14); -addRotationMap("SignalDX", "CTF",1,0,8,24); - -// _ _ _ _ _ _ -// | | | | | | | | (_) | -// | | __ _| | ___ __ __ _| |__ | |__ _| |_ -// | | / _` | |/ / '__/ _` | '_ \| '_ \| | __| -// | |___| (_| | <| | | (_| | |_) | |_) | | |_ -// |______\__,_|_|\_\_| \__,_|_.__/|_.__/|_|\__| -///////////////////////////////////////////////////////////////////// - -//In Rotation -///////////////////////////////////////////////////////////////////// - -addRotationMap("VaubanLak", "Lakrabbit",1,1,8,-1); -addRotationMap("MiniSunDried", "Lakrabbit",1,1,-1,12); -addRotationMap("Sundance", "Lakrabbit",1,1,-1,-1); -addRotationMap("TWL_BeachBlitzLak", "Lakrabbit",1,1,-1,-1); -addRotationMap("DesertofDeathLak", "Lakrabbit",1,1,-1,-1); -addRotationMap("Raindance_nefLak", "Lakrabbit",1,1,-1,-1); -addRotationMap("SunDriedLak", "Lakrabbit",1,1,-1,-1); -addRotationMap("SkinnyDipLak", "Lakrabbit",1,0,-1,-1); -addRotationMap("SaddiesHill", "Lakrabbit",1,0,-1,-1); -addRotationMap("HavenLak", "Lakrabbit",1,0,-1,-1); -addRotationMap("LushLak", "Lakrabbit",1,1,8,-1); -addRotationMap("BoxLak", "Lakrabbit",1,1,-1,10); -addRotationMap("TitaniaLak", "Lakrabbit",1,0,8,-1); -addRotationMap("TibbawLak", "Lakrabbit",1,1,-1,-1); -addRotationMap("InfernusLak", "Lakrabbit",1,1,-1,-1); -addRotationMap("S8_GeothermalLak", "Lakrabbit",1,0,-1,-1); -addRotationMap("CankerLak", "Lakrabbit",1,1,-1,-1); -addRotationMap("DustRunLak", "Lakrabbit",1,1,-1,-1); -addRotationMap("CrossfiredLak", "Lakrabbit",1,1,-1,-1); -addRotationMap("CloakofLak", "Lakrabbit",1,0,-1,-1); -addRotationMap("SpectreLak", "Lakrabbit",1,1,-1,-1); - -//Voteable, But not in rotation -///////////////////////////////////////////////////////////////////// - -addRotationMap("TreasureIslandLak", "Lakrabbit",1,1,-1,-1); -addRotationMap("Sulfide", "Lakrabbit",1,0,-1,-1); -addRotationMap("FrozenFuryLak", "Lakrabbit",1,0,-1,-1); -addRotationMap("Arrakis", "Lakrabbit",1,0,-1,-1); -addRotationMap("EquinoxLak", "Lakrabbit",1,0,-1,-1); -addRotationMap("PhasmaDustLak", "Lakrabbit",1,0,-1,12); -addRotationMap("GodsRiftLak", "Lakrabbit",1,0,-1,-1); -addRotationMap("SolsDescentLak", "Lakrabbit",1,0,-1,-1); -addRotationMap("Crater71Lak", "Lakrabbit",1,0,6,-1); - -//Not Voteable, Not in rotation -///////////////////////////////////////////////////////////////////// - -//addRotationMap("EscaladeLak", "Lakrabbit",1,0,-1,-1); -//addRotationMap("MagmaticLak", "Lakrabbit",1,0,-1,-1); -//addRotationMap("HillsOfSorrow", "Lakrabbit",1,0,-1,-1); -//addRotationMap("TWL2_MuddySwampLak", "Lakrabbit",1,0,-1,-1); -//addRotationMap("SandStormLak", "Lakrabbit",1,0,-1,-1); -//addRotationMap("BeggarsRunLak", "Lakrabbit",1,0,-1,-1); -//addRotationMap("DamnnationLak", "Lakrabbit",1,0,-1,-1); - - -// _ _____ _______ ______ -// | | / ____|__ __| ____| -// | | | | | | | |__ -// | | | | | | | __| -// | |___| |____ | | | | -// |______\_____| |_| |_| -///////////////////////////////////////////////////////////////////// - -//In Rotation -///////////////////////////////////////////////////////////////////// -addRotationMap("DangerousCrossingLT", "LCTF",1,0,-1,-1); -addRotationMap("SmallCrossingLT", "LCTF",1,0,-1,12); -addRotationMap("DireLT", "LCTF",1,0,-1,-1); -addRotationMap("RoundTheMountainLT", "LCTF",1,1,-1,-1); -addRotationMap("CirclesEdgeLT", "LCTF",1,1,-1,-1); -addRotationMap("TenebrousCTF", "LCTF",1,0,-1,-1); -addRotationMap("TheFray", "LCTF",1,0,-1,-1); -addRotationMap("SignalLT", "LCTF",1,0,-1,-1); -addRotationMap("S5_DamnationLT", "LCTF",1,0,8,-1); -addRotationMap("S5_Icedance", "LCTF",1,1,-1,-1); -addRotationMap("S5_Mordacity", "LCTF",1,1,10,-1); -addRotationMap("S5_SilenusLT", "LCTF",1,0,-1,-1); -addRotationMap("TWL2_CanyonCrusadeDeluxeLT", "LCTF",1,1,-1,-1); -addRotationMap("TWL2_HildebrandLT", "LCTF",1,1,-1,-1); -addRotationMap("TWL2_SkylightLT", "LCTF",1,1,-1,-1); -addRotationMap("TWL_FeignLT", "LCTF",1,0,-1,-1); -addRotationMap("TWL_RollercoasterLT", "LCTF",1,0,-1,-1); -addRotationMap("TWL_StonehengeLT", "LCTF",1,1,-1,-1); -addRotationMap("TWL_WilderZoneLT", "LCTF",1,0,-1,-1); -addRotationMap("oasisintensity", "LCTF",1,1,-1,10); -addRotationMap("berlard", "LCTF",1,1,-1,-1); -addRotationMap("RaindanceLT", "LCTF",1,0,-1,-1); -addRotationMap("SmallTimeLT", "LCTF",1,0,-1,-1); -addRotationMap("ArenaDome", "LCTF",1,1,-1,10); -addRotationMap("Bulwark", "LCTF",1,1,-1,-1); -addRotationMap("Discord", "LCTF",1,1,-1,-1); -addRotationMap("S5_MassiveLT", "LCTF",1,0,-1,-1); -addRotationMap("Blink", "LCTF",1,0,-1,-1); -addRotationMap("HillSideLT", "LCTF",1,1,-1,10); -addRotationMap("IcePick", "LCTF",1,1,-1,16); -addRotationMap("OsIrisLT", "LCTF",1,0,-1,-1); -addRotationMap("GrassyKnollLT", "LCTF",1,1,-1,-1); -addRotationMap("TWL2_MuddySwamp", "LCTF",1,0,8,-1); -addRotationMap("SandyRunLT", "LCTF",1,0,-1,12); -addRotationMap("Sentry", "LCTF",1,1,-1,-1); -addRotationMap("DMP_Cinerarium", "LCTF",1,1,-1,14); -addRotationMap("Exhumed", "LCTF",1,1,-1,-1); -addRotationMap("S8_ZilchLT", "LCTF",1,1,-1,-1); -addRotationMap("TWL_BeachBlitzLT", "LCTF",1,0,-1,-1); -addRotationMap("FrozenHopeLT", "LCTF",1,1,-1,-1); -//addRotationMap("Confusco", "LCTF",1,0,6,-1); -addRotationMap("TWL2_JaggedClawLT", "LCTF",1,1,-1,-1); - -//Voteable, But not in rotation -///////////////////////////////////////////////////////////////////// - -addRotationMap("BeggarsRunLT", "LCTF",1,0,-1,-1); -addRotationMap("S5_WoodymyrkLT", "LCTF",1,0,-1,-1); -addRotationMap("S8_Opus", "LCTF",1,0,-1,-1); -addRotationMap("TWL_DangerousCrossing", "LCTF",1,0,-1,-1); - -//DMP Mappack -///////////////////////////////////////////////////////////////////// -addRotationMap("AttritionLT", "LCTF",1,1,-1,-1); -addRotationMap("RushLT", "LCTF",1,1,-1,-1); -addRotationMap("HillKingLT", "LCTF",1,1,-1,-1); -addRotationMap("DMP_BastardForgeLT", "LCTF",1,1,-1,-1); -addRotationMap("VanDamnedLT", "LCTF",1,1,-1,-1); -addRotationMap("DMP_Paranoia", "LCTF",1,0,-1,-1); -addRotationMap("DMP_SpincycleLT", "LCTF",1,1,-1,-1); -addRotationMap("Ravine", "LCTF",1,1,-1,-1); -// addRotationMap("DX_Badlands", "LCTF",1,0,-1,-1); -// addRotationMap("DX_Desert", "LCTF",1,0,-1,-1); -addRotationMap("DX_Ice", "LCTF",1,1,-1,-1); -addRotationMap("PipeDreamLT", "LCTF",1,0,-1,-1); -addRotationMap("DMP_LavaGods", "LCTF",1,0,10,20); -addRotationMap("DMP_StarFallLT", "LCTF",1,1,-1,-1); -addRotationMap("DMP_BunkeredLT", "LCTF",1,1,-1,12); -addRotationMap("DMP_PariahLT", "LCTF",1,1,-1,-1); - -//Not Voteable, Not in rotation -///////////////////////////////////////////////////////////////////// - -//addRotationMap("SurrealLT", "LCTF",1,0,-1,-1); -addRotationMap("DuelersDelight", "LCTF",1,0,-1,12); -addRotationMap("SmallSpit", "LCTF",1,1,-1,14); -addRotationMap("BonespurLT", "LCTF",1,1,-1,14); -addRotationMap("Bridgepoint", "LCTF",1,1,-1,14); -addRotationMap("NarcolepsyLT", "LCTF",1,1,-1,14); -addRotationMap("WhiteDwarfDeluxeLT", "LCTF",1,0,-1,14); -addRotationMap("ClusterUnFuct", "LCTF",1,1,8,-1); -addRotationMap("OuterWildsLT", "LCTF",1,1,-1,12); -addRotationMap("Drafts", "LCTF",1,1,-1,12); -addRotationMap("DermCrossingDeluxeLT", "LCTF",1,1,-1,-1); -addRotationMap("SuperiorWaterworks", "LCTF",1,0,-1,12); -addRotationMap("FrozenForgeLT", "LCTF",1,1,-1,20); -addRotationMap("TWL2_CelerityLT", "LCTF",1,1,-1,20); -addRotationMap("El_FinLT", "LCTF",1,1,-1,14); -addRotationMap("CapriLT", "LCTF",1,1,-1,14); -addRotationMap("RunenmachtLT", "LCTF",1,1,-1,14); - - -// _____ _ _ _ _ -// | __ \ | | | | | | | | -// | | | | ___ __ _| |_| |__ _ __ ___ __ _| |_ ___| |__ -// | | | |/ _ \/ _` | __| '_ \| '_ ` _ \ / _` | __/ __| '_ \ -// | |__| | __/ (_| | |_| | | | | | | | | (_| | || (__| | | | -// |_____/ \___|\__,_|\__|_| |_|_| |_| |_|\__,_|\__\___|_| |_| -///////////////////////////////////////////////////////////////////// - -addRotationMap("RaspDM", "DM",1,1,8,-1); -addRotationMap("EntombedDM", "DM",1,1,-1,-1); -addRotationMap("IceDomeDM", "DM",1,1,-1,-1); -addRotationMap("HoofToeDM", "DM",1,1,6,-1); -addRotationMap("ArenaDomeDM", "DM",1,1,-1,-1); -addRotationMap("VulcansWrathDM", "DM",1,1,-1,-1); -addRotationMap("RampartsDM", "DM",1,1,-1,-1); -addRotationMap("ShrineDM", "DM",1,1,-1,12); -addRotationMap("LiveBaitDM", "DM",1,1,-1,-1); -addRotationMap("FourSquareDM", "DM",1,1,-1,10); -addRotationMap("BrigDM", "DM",1,1,-1,8); -addRotationMap("PitsDM", "DM",1,1,-1,10); -addRotationMap("RingofFireDM", "DM",1,1,-1,10); -addRotationMap("GorgonDM", "DM",1,1,-1,10); - - -// _____ _ -// | __ \ | | -// | | | |_ _ ___| | -// | | | | | | |/ _ \ | -// | |__| | |_| | __/ | -// |_____/ \__,_|\___|_| -///////////////////////////////////////////////////////////////////// - -//addRotationMap("AgentsOfFortune", "Duel",1,1,-1,-1); -//addRotationMap("Casern_Cavite", "Duel",1,1,-1,-1); -//addRotationMap("Equinox", "Duel",1,1,-1,-1); -//addRotationMap("Escalade", "Duel",1,1,-1,-1); -//addRotationMap("Fracas", "Duel",1,1,-1,-1); -//addRotationMap("Invictus", "Duel",1,1,-1,-1); -//addRotationMap("MyrkWood", "Duel",1,1,-1,-1); -//addRotationMap("Oasis", "Duel",1,1,-1,-1); -//addRotationMap("Pyroclasm", "Duel",1,1,-1,-1); -//addRotationMap("Rasp", "Duel",1,1,-1,-1); -//addRotationMap("SunDried", "Duel",1,1,-1,-1); -//addRotationMap("Talus", "Duel",1,1,-1,-1); -//addRotationMap("Underhill", "Duel",1,1,-1,-1); -//addRotationMap("Whiteout", "Duel",1,1,-1,-1); -//addRotationMap("Tombstone", "Duel",1,1,-1,-1); -//addRotationMap("VaubanLak", "Duel",1,1,-1,-1); -//addRotationMap("DesertofDeathLak", "Duel",1,1,-1,-1); - - - -// _____ _ -// / ____(_) -// | (___ _ ___ __ _ ___ -// \___ \| |/ _ \/ _` |/ _ \ -// ____) | | __/ (_| | __/ -// |_____/|_|\___|\__, |\___| -// __/ | -// |___/ -///////////////////////////////////////////////////////////////////// - -//addRotationMap("Alcatraz", "Siege",1,1,-1,-1); -//addRotationMap("BridgeTooFar", "Siege",1,1,-1,-1); -//addRotationMap("Caldera", "Siege",1,1,-1,-1); -//addRotationMap("Gauntlet", "Siege",1,1,-1,-1); -//addRotationMap("IceBound", "Siege",1,1,-1,-1); -//addRotationMap("Isleofman", "Siege",1,1,-1,-1); -//addRotationMap("Masada", "Siege",1,1,-1,-1); -//addRotationMap("Respite", "Siege",1,1,-1,-1); -//addRotationMap("Trident", "Siege",1,1,-1,-1); -//addRotationMap("UltimaThule", "Siege",1,1,-1,-1); - - - -// _ _ _ -// | | | | | | -// | |__| |_ _ _ __ | |_ ___ _ __ ___ -// | __ | | | | '_ \| __/ _ \ '__/ __| -// | | | | |_| | | | | || __/ | \__ \ -// |_| |_|\__,_|_| |_|\__\___|_| |___/ -///////////////////////////////////////////////////////////////////// - -//addRotationMap("MiniSunDried","Hunters",1,1,-1,-1); -//addRotationMap("DustToDust","Hunters",1,1,-1,-1); diff --git a/Classic/prefs/mapRotation.cs b/Classic/prefs/mapRotation.cs new file mode 100644 index 0000000..dc64408 --- /dev/null +++ b/Classic/prefs/mapRotation.cs @@ -0,0 +1,507 @@ +//To use this file add a new map with the following rules: +//1. Find the file name, ending in .mis (ie BeggarsRun.mis) +//2. Add a line with this syntact: addRotationMap(filename, gametype, %voteable, %cycle, %min. %max); +//Example: addRotationMap("MAP_NAME","MAP_MODE",VOTEABLE,IN-ROTATION,MINIMUM_PLAYERS,MAXIMUM_PLAYERS); +//------------------------------------------------------------------------------- +addRotationMap("SC_Normal","CTF",true,false,-1,16); +//addRotationMap("SC_Badlands","CTF",true,false,-1,16); +//addRotationMap("SC_Desert","CTF",true,false,-1,16); +//addRotationMap("SC_Lush","CTF",true,false,-1,16); +addRotationMap("SC_Ice","CTF",true,true,-1,16); +addRotationMap("SC_Night","CTF",true,false,-1,16); +addRotationMap("TWL_DangerousCrossing","CTF",true,false,-1,20); +//addRotationMap("DX_Badlands","CTF",true,false,-1,20); +//addRotationMap("DX_Desert","CTF",true,false,-1,20); +addRotationMap("DX_Ice","CTF",true,true,-1,20); +addRotationMap("HighOctane","CTF",true,false,10,24); +//addRotationMap("HO_Badlands","CTF",true,true,10,24); +//addRotationMap("HO_Desert","CTF",true,false,10,24); +addRotationMap("HO_Ice","CTF",true,true,10,24); +addRotationMap("HO_Lush","CTF",true,false,10,24); +addRotationMap("TWL2_CanyonCrusadeDeluxe","CTF",true,true,-1,-1); +addRotationMap("TWL2_Skylight","CTF",true,false,-1,12); +addRotationMap("TWL2_Hildebrand","CTF",true,true,-1,18); +addRotationMap("RoundTheMountain","CTF",true,true,-1,14); +addRotationMap("oasisintensity","CTF",true,true,-1,12); +addRotationMap("Machineeggs","CTF",true,true,-1,10); +addRotationMap("Mac_FlagArena","CTF",true,false,-1,10); +addRotationMap("SmallTimeCTF","CTF",true,true,-1,12); +addRotationMap("ArenaDome","CTF",true,true,-1,10); +addRotationMap("Bulwark","CTF",true,true,-1,12); +addRotationMap("Discord","CTF",true,true,-1,16); +addRotationMap("Sentry","CTF",true,true,-1,12); +addRotationMap("FrozenHope","CTF",true,true,8,12); +addRotationMap("ClusterUnFuct","CTF",true,true,8,12); +addRotationMap("Zilch","CTF",true,true,6,12); +addRotationMap("SuperHappyBouncyFunTime","CTF",true,false,-1,12); +addRotationMap("SuperiorWaterworks","CTF",true,true,-1,10); +//addRotationMap("TWL2_FrozenHope","CTF",true,false,-1,12); +//addRotationMap("Island","CTF",true,true,-1,12); +//addRotationMap("TitForTat","CTF",true,true,-1,12); +//addRotationMap("TWL_OsIris","CTF",true,false,8,18); +//addRotationMap("FrostPipe","CTF",true,false,-1,12); +//addRotationMap("Raspian","CTF",true,false,8,12); +//addRotationMap("Exhumed","CTF",true,false,-1,12); +//addRotationMap("Blink","CTF",true,false,-1,10); +//addRotationMap("Firestorm","CTF",true,false,-1,12); +//addRotationMap("SmallMelee","CTF",true,false,-1,12); +//addRotationMap("Attrition","CTF",true,true,-1,10); +//addRotationMap("Coppersky","CTF",true,false,8,20); +//addRotationMap("S5_Silenus","CTF",true,false,8,20); +//------------------------------------------------------------------------------- +addRotationMap("TWL_Stonehenge","CTF",true,false,8,-1); +addRotationMap("TWL_Feign","CTF",true,true,8,32); +addRotationMap("TWL_Snowblind","CTF",true,false,14,-1); +addRotationMap("TWL_BeggarsRun","CTF",true,true,14,-1); +addRotationMap("TWL_WilderZone","CTF",true,false,12,-1); +addRotationMap("TWL_Titan","CTF",true,false,14,-1); +addRotationMap("TWL_SubZero","CTF",true,true,14,-1); +addRotationMap("TWL_DeadlyBirdsSong","CTF",true,false,14,-1); +addRotationMap("TWL_Pandemonium","CTF",true,false,14,-1); +addRotationMap("TWL2_MidnightMayhemDeluxe","CTF",true,true,12,-1); +addRotationMap("TWL2_JaggedClaw","CTF",true,true,12,-1); +addRotationMap("TWL2_Ocular","CTF",true,true,14,-1); +addRotationMap("TWL2_Drifts","CTF",true,false,14,-1); +addRotationMap("TWL2_Celerity","CTF",true,true,12,-1); +addRotationMap("Minotaur","CTF",true,false,12,-1); +addRotationMap("S5_Centaur","CTF",true,false,-1,12); +addRotationMap("S5_Mordacity","CTF",true,true,10,32); +addRotationMap("S5_Damnation","CTF",true,false,12,-1); +addRotationMap("S5_Massive","CTF",true,true,12,-1); +addRotationMap("S5_Mimicry","CTF",true,true,12,-1); +addRotationMap("S5_Icedance","CTF",true,true,10,-1); +addRotationMap("S5_Woodymyrk","CTF",true,true,10,-1); +addRotationMap("S8_Cardiac","CTF",true,true,14,-1); +addRotationMap("TheFray","CTF",true,false,10,32); +addRotationMap("berlard","CTF",true,true,12,32); +addRotationMap("Headstone","CTF",true,true,12,32); +addRotationMap("Signal","CTF",true,false,12,32); +addRotationMap("TenebrousCTF","CTF",true,false,10,24); +addRotationMap("Prismatic","CTF",true,false,12,32); +addRotationMap("IceRidge_nef","CTF",true,true,12,-1); +addRotationMap("CirclesEdge","CTF",true,false,12,-1); +addRotationMap("Surreal","CTF",true,false,20,-1); +addRotationMap("Norty","CTF",true,true,14,-1); +addRotationMap("Confusco","CTF",true,false,14,32); +addRotationMap("Vauban","CTF",true,false,14,-1); +//addRotationMap("TWL2_MuddySwamp","CTF",true,false,12,32); +//addRotationMap("TWL2_Drorck","CTF",true,false,12,32); +//addRotationMap("TWL2_Crevice","CTF",true,false,12,32); +//addRotationMap("TWL2_IceDagger","CTF",true,false,12,32); +//addRotationMap("S5_HawkingHeat","CTF",true,false,12,32); +//addRotationMap("S5_Drache","CTF",true,true,12,32); +//addRotationMap("S5_Sherman","CTF",true,false,20,-1); +//addRotationMap("S5_Reynard","CTF",true,false,14,32); +//addRotationMap("S8_Opus","CTF",true,false,10,32); +//addRotationMap("ShortFall","CTF",true,false,12,32); +//addRotationMap("Disjointed","CTF",true,false,12,32); +//addRotationMap("HighAnxiety","CTF",true,false,-1,12); +//addRotationMap("Dire","CTF",true,false,10,32); +//addRotationMap("Draco","CTF",true,false,12,32); +//addRotationMap("Mirage","CTF",true,false,12,32); +//addRotationMap("TWL_WhiteDwarf","CTF",true,false,14,-1); +//addRotationMap("Cinereous","CTF",true,false,14,-1); +//addRotationMap("Fallout","CTF",true,false,14,32); +//addRotationMap("TheClocktower","CTF",true,false,10,20); +//addRotationMap("SoylentGreen","CTF",true,false,10,20); +//addRotationMap("Ramparts","CTF",true,false,14,-1); +//addRotationMap("Blastside_nef","CTF",true,false,14,-1); +//addRotationMap("NatureMagic","CTF",true,false,14,-1); +//addRotationMap("TWL_Damnation","CTF",true,false,12,32); +//addRotationMap("Snowcone","CTF",true,false,12,32); +//addRotationMap("JadeValley","CTF",true,false,12,32); +//addRotationMap("Burstside","CTF",true,false,12,32); +//addRotationMap("Infernus","CTF",true,false,14,-1); +//------------------------------------------------------------------------------- +addRotationMap("TWL_Katabatic","CTF",true,false,14,-1); +addRotationMap("TWL_Crossfire","CTF",true,true,14,-1); +addRotationMap("TWL_BeachBlitz","CTF",true,true,12,-1); +addRotationMap("TWL_Magmatic","CTF",true,false,14,-1); +addRotationMap("TWL_Harvester","CTF",true,true,20,-1); +addRotationMap("TWL2_BlueMoon","CTF",true,true,14,-1); +addRotationMap("TWL2_Bleed","CTF",true,false,20,-1); +addRotationMap("TWL2_Dissention","CTF",true,false,14,-1); +addRotationMap("TWL2_Magnum","CTF",true,true,12,-1); +addRotationMap("TWL2_FrozenGlory","CTF",true,true,12,-1); +addRotationMap("Logans_Run","CTF",true,false,12,32); +addRotationMap("Rollercoaster_nef","CTF",true,true,10,-1); +addRotationMap("HostileLoch","CTF",true,false,14,32); +addRotationMap("Raindance_nef","CTF",true,true,12,-1); +addRotationMap("LandingParty","CTF",true,false,12,20); +addRotationMap("ShockRidge","CTF",true,false,12,-1); +addRotationMap("Nightdance","CTF",true,false,14,32); +addRotationMap("TWL_Abaddon","CTF",true,false,20,-1); +addRotationMap("Agorazscium","CTF",true,false,12,32); +addRotationMap("Circleofstones","CTF",true,true,14,-1); +addRotationMap("Ruined","CTF",true,false,14,-1); +addRotationMap("Fenix","CTF",true,false,20,-1); +addRotationMap("Hillside","CTF",true,false,24,-1); +addRotationMap("TWL_Slapdash","CTF",true,false,24,-1); +addRotationMap("BerylBasin","CTF",true,false,14,-1); +addRotationMap("DeathBirdsFly1","CTF",true,false,24,-1); +addRotationMap("aabaa","CTF",true,false,28,-1); +addRotationMap("CloakofNightV","CTF",true,false,24,-1); +addRotationMap("Sangre_de_Grado","CTF",true,false,20,-1); +addRotationMap("FullCircle","CTF",true,false,14,-1); +//addRotationMap("Lakefront","CTF",true,false,14,-1); +//addRotationMap("S8_Geothermal","CTF",true,false,12,32); +//addRotationMap("TWL_Frozen","CTF",true,false,20,-1); +//addRotationMap("TWL_Chokepoint","CTF",true,false,12,24); +//addRotationMap("TWL_Starfallen","CTF",true,false,12,24); +//addRotationMap("TWL_Reversion","CTF",true,false,28,-1); +//addRotationMap("TWL2_RoughLand","CTF",true,false,16,-1); +//addRotationMap("TWL2_Ruined","CTF",true,true,18,-1); +//addRotationMap("SandOcean","CTF",true,false,16,24); +//addRotationMap("ks_braistv","CTF",true,true,12,24); +//addRotationMap("Horde","CTF",true,false,24,-1); +//addRotationMap("Glade","CTF",true,true,28,-1); +//addRotationMap("Pantheon","CTF",true,false,20,-1); +//addRotationMap("Archipelago","CTF",true,false,20,-1); +//addRotationMap("TitanV","CTF",true,false,12,28); +//addRotationMap("The_Calm","CTF",true,false,12,24); +//addRotationMap("Surro","CTF",true,false,18,24); +//addRotationMap("HarvestDance","CTF",true,false,24,-1); +//addRotationMap("WindyGap","CTF",true,false,24,-1); +addRotationMap("Scarabrae_nef","CTF",true,false,28,-1); +//addRotationMap("StarIce","CTF",true,false,12,24); +//addRotationMap("FilteredDust","CTF",true,false,12,24); +//addRotationMap("Choke","CTF",true,false,12,24); +//addRotationMap("ConstructionYard","CTF",true,false,12,24); +//addRotationMap("AcidRain","CTF",true,false,12,24); +//addRotationMap("SubZeroV","CTF",true,true,12,24); +//------------------------------------------------------------------------------- +//addRotationMap("DMP_Agroleon","CTF",true,true,18,28); +//addRotationMap("DMP_Astro","CTF",true,false,16,26); +addRotationMap("DMP_BastardForge","CTF",true,true,12,32); +addRotationMap("DMP_BitterGorge","CTF",true,false,24,-1); +//addRotationMap("DMP_Bunkered","CTF",true,true,6,14); +addRotationMap("DMP_Cinerarium","CTF",true,true,-1,14); +//addRotationMap("DMP_DermCity","CTF",true,false,-1,-1); +//addRotationMap("DMP_Embers","CTF",true,false,-1,14); +//addRotationMap("DMP_EmeraldSpit","CTF",true,false,10,20); +//addRotationMap("DMP_FaceCrossing","CTF",true,false,10,20); +addRotationMap("DMP_Hoth","CTF",true,false,24,-1); +//addRotationMap("DMP_IceGiant","CTF",true,false,20,32); +//addRotationMap("DMP_IsleDeBatalla","CTF",true,false,10,20); +//addRotationMap("DMP_LavaGods","CTF",true,false,10,20); +addRotationMap("DMP_Magellan","CTF",true,false,12,32); +addRotationMap("DMP_MoonDance","CTF",true,true,12,-1); +//addRotationMap("DMP_Pantheon","CTF",true,false,16,24); +addRotationMap("DMP_Paranoia","CTF",true,false,-1,16); +addRotationMap("DMP_Pariah","CTF",true,true,8,32); +addRotationMap("DMP_PipeDream","CTF",true,false,8,24); +addRotationMap("DMP_RavineV","CTF",true,false,12,32); +//addRotationMap("DMP_ScorchedEarth","CTF",true,false,24,-1); +addRotationMap("DMP_SimpleFlagArena","CTF",true,true,-1,14); +addRotationMap("DMP_SpinCycle","CTF",true,true,-1,12); +addRotationMap("DMP_StarFall","CTF",true,true,-1,14); +addRotationMap("DMP_Tyre","CTF",true,true,14,-1); +//addRotationMap("DMP_Wasteland","CTF",true,false,12,32); +//addRotationMap("Chasmaclysmic","CTF",true,true,-1,-1); +//addRotationMap("DBS_Smoothed","CTF",true,false,-1,-1); +//addRotationMap("PuliVeivari","CTF",true,false,-1,-1); +//addRotationMap("PlanetX","CTF",true,false,-1,-1); +//addRotationMap("Ravine","CTF",true,true,-1,-1); +//addRotationMap("Stripmine","CTF",true,false,-1,-1); +//------------------------------------------------------------------------------- +//addRotationMap("S5_Misadventure","CTF",true,false,-1,-1); +//addRotationMap("S8_CentralDogma","CTF",true,false,-1,-1); +//addRotationMap("S8_Mountking","CTF",true,false,-1,-1); +//addRotationMap("S8_Zilch","CTF",true,false,-1,-1); +//addRotationMap("TWL2_CloakOfNight","CTF",true,false,-1,-1); +//addRotationMap("TWL_BaNsHee","CTF",true,false,-1,-1); +//addRotationMap("TWL_Boss","CTF",true,false,-1,-1); +//addRotationMap("TWL_NoShelter","CTF",true,false,-1,-1); +//addRotationMap("TWL_Clusterfuct","CTF",true,false,-1,-1); +//addRotationMap("TWL_Curtilage","CTF",true,false,-1,-1); +//addRotationMap("TWL_Deserted","CTF",true,false,-1,-1); +//addRotationMap("TWL_Frostclaw","CTF",true,false,-1,-1); +//addRotationMap("TWL_Neve","CTF",true,false,-1,-1); +//addRotationMap("TWL_Ramparts","CTF",true,false,-1,-1); +//addRotationMap("TWL_Sandstorm","CTF",true,false,-1,-1); +//addRotationMap("TWL_WoodyMyrk","CTF",true,false,-1,-1); +//addRotationMap("Sandstorm","CTF",true,false,-1,-1); +//addRotationMap("Starfallen","CTF",true,false,-1,-1); +//addRotationMap("Stonehenge_nef","CTF",true,false,-1,-1); +//addRotationMap("Extractor","CTF",true,false,16,-1); +//addRotationMap("AstersDescent","CTF",true,false,-1,-1); +//addRotationMap("Azoth","CTF",true,false,-1,-1); +//addRotationMap("BattleGrove","CTF",true,false,-1,-1); +//addRotationMap("Durango","CTF",true,false,-1,-1); +//addRotationMap("DustLust","CTF",true,false,-1,-1); +//addRotationMap("IceGulch","CTF",true,false,-1,-1); +//addRotationMap("MountainMist","CTF",true,false,-1,-1); +//addRotationMap("Peak","CTF",true,false,-1,-1); +//addRotationMap("Pendulum","CTF",true,false,-1,-1); +//addRotationMap("OctoberRust","CTF",true,false,-1,-1); +//addRotationMap("DevilsElbow","CTF",true,false,-1,-1); +//addRotationMap("CloudCity","CTF",true,false,-1,-1); +//addRotationMap("Damnation","CTF",true,false,-1,-1); +//addRotationMap("DeathBirdsFly","CTF",true,false,-1,-1); +//addRotationMap("Desiccator","CTF",true,false,-1,-1); +//addRotationMap("DustToDust","CTF",true,false,-1,-1); +//addRotationMap("Katabatic","CTF",true,false,-1,-1); +//addRotationMap("Quagmire","CTF",true,false,-1,-1); +//addRotationMap("Recalescence","CTF",true,false,-1,-1); +//addRotationMap("Reversion","CTF",true,false,-1,-1); +//addRotationMap("RiverDance","CTF",true,false,-1,-1); +//addRotationMap("Sanctuary","CTF",true,false,-1,-1); +//addRotationMap("ThinIce","CTF",true,false,-1,-1); +//addRotationMap("Tombstone","CTF",true,false,-1,-1); +//addRotationMap("Broadside_nef","CTF",true,false,-1,-1); +//addRotationMap("Camelland","CTF",true,false,-1,-1); +//addRotationMap("HighTrepidation","CTF",true,false,-1,-1); +//addRotationMap("SmallDesertofDeath","CTF",true,false,-1,-1); +//addRotationMap("BasinFury","CTF",true,false,-1,-1); +//addRotationMap("Cadaver","CTF",true,false,-1,-1); +//addRotationMap("EivoItoxico","CTF",true,false,-1,-1); +//addRotationMap("Einfach","CTF",true,false,-1,-1); +//addRotationMap("PicnicTable","CTF",true,false,-1,-1); +//addRotationMap("Hostility","CTF",true,false,-1,-1); +//addRotationMap("HighWire","CTF",true,false,-1,-1); +//addRotationMap("CloudBurst","CTF",true,false,-1,-1); +//addRotationMap("CloseCombat","CTF",true,false,-1,-1); +//addRotationMap("DesertofDeath_nef","CTF",true,false,-1,-1); +//addRotationMap("Gorgon","CTF",true,false,-1,-1); +//addRotationMap("Magmatic","CTF",true,false,-1,-1); +//------------------------------------------------------------------------------- +addRotationMap("SmallSpit","CTF",true,true,-1,12); +addRotationMap("MisadventureV2","CTF",true,false,12,32); +addRotationMap("El_Fin","CTF",true,true,-1,14); +addRotationMap("HogansRun24","CTF",true,false,14,-1); +addRotationMap("VanDamnedCTF","CTF",true,true,-1,12); +addRotationMap("HillKingCTF","CTF",true,true,-1,12); +addRotationMap("DaftGulch","CTF",true,false,12,32); +addRotationMap("Triad","CTF",true,false,12,32); +addRotationMap("Moonwalk","CTF",true,true,12,-1); +addRotationMap("GreenLawn","CTF",true,true,12,-1); +addRotationMap("OuterWilds","CTF",true,true,-1,14); +addRotationMap("CoconutFury","CTF",true,false,-1,32); +addRotationMap("TWL2_FrozenGlory_Thawed","CTF",true,false,12,-1); +addRotationMap("Sector1","CTF",true,false,-1,-1); +//addRotationMap("CinderCone","CTF",true,false,-1,-1); +//addRotationMap("Slamnation","CTF",false,false,-1,-1); +//addRotationMap("MountaintopMayhem","CTF",false,false,-1,-1); +//addRotationMap("ChasmClash","CTF",true,false,-1,14); +//addRotationMap("FrostBite","CTF",true,false,-1,-1); +//addRotationMap("Lapiths","CTF",true,false,-1,-1); +//addRotationMap("Jettisoned","CTF",true,false,-1,-1); +//addRotationMap("Drafts","CTF",true,true,-1,12); +//addRotationMap("IslaHermano","CTF",true,false,-1,-1); +//addRotationMap("DermCrossingDeluxe","CTF",true,false,-1,-1); +//addRotationMap("Vaubania","CTF",true,true,-1,12); +//addRotationMap("Bonespur","CTF",true,true,-1,14); +//addRotationMap("Bridgepoint","CTF",true,false,-1,18); +//addRotationMap("Narcolepsy","CTF",true,false,-1,20); +//addRotationMap("WhiteDwarfDeluxe","CTF",true,true,-1,14); +//addRotationMap("SignalDX","CTF",true,false,8,24); +//------------------------------------------------------------------------------- +//------------------------------------------------------------------------------- +//------------------------------------------------------------------------------- +//------------------------------------------------------------------------------- +addRotationMap("VaubanLak","Lakrabbit",true,false,8,-1); +addRotationMap("MiniSunDried","Lakrabbit",true,true,-1,12); +addRotationMap("Sundance","Lakrabbit",true,true,-1,-1); +addRotationMap("TWL_BeachBlitzLak","Lakrabbit",true,true,-1,-1); +addRotationMap("DesertofDeathLak","Lakrabbit",true,true,-1,-1); +addRotationMap("Raindance_nefLak","Lakrabbit",true,true,-1,-1); +addRotationMap("SunDriedLak","Lakrabbit",true,true,-1,-1); +addRotationMap("SkinnyDipLak","Lakrabbit",true,false,-1,-1); +addRotationMap("SaddiesHill","Lakrabbit",true,false,-1,-1); +addRotationMap("HavenLak","Lakrabbit",true,false,-1,-1); +addRotationMap("LushLak","Lakrabbit",true,false,8,-1); +addRotationMap("BoxLak","Lakrabbit",true,true,-1,10); +addRotationMap("TitaniaLak","Lakrabbit",true,false,8,-1); +addRotationMap("TibbawLak","Lakrabbit",true,true,-1,-1); +addRotationMap("InfernusLak","Lakrabbit",true,true,-1,-1); +addRotationMap("S8_GeothermalLak","Lakrabbit",true,false,-1,-1); +addRotationMap("CankerLak","Lakrabbit",true,true,-1,-1); +addRotationMap("DustRunLak","Lakrabbit",true,true,-1,-1); +addRotationMap("CrossfiredLak","Lakrabbit",true,true,-1,-1); +addRotationMap("CloakofLak","Lakrabbit",true,false,-1,-1); +addRotationMap("SpectreLak","Lakrabbit",true,false,-1,-1); +addRotationMap("TreasureIslandLak","Lakrabbit",true,true,-1,-1); +addRotationMap("Sulfide","Lakrabbit",true,false,-1,-1); +addRotationMap("FrozenFuryLak","Lakrabbit",true,false,-1,-1); +addRotationMap("Arrakis","Lakrabbit",true,false,-1,-1); +addRotationMap("EquinoxLak","Lakrabbit",true,false,-1,-1); +addRotationMap("PhasmaDustLak","Lakrabbit",true,true,-1,12); +addRotationMap("GodsRiftLak","Lakrabbit",true,false,-1,-1); +addRotationMap("SolsDescentLak","Lakrabbit",true,true,-1,-1); +addRotationMap("Crater71Lak","Lakrabbit",true,false,6,-1); +//------------------------------------------------------------------------------- +addRotationMap("darrellw-Starlight","Lakrabbit",true,false,-1,-1); +addRotationMap("Hybrid-SunChips","Lakrabbit",true,false,-1,-1); +addRotationMap("Hybrid-TealMagic","Lakrabbit",true,false,-1,-1); +addRotationMap("Tacocat-AshnDust","Lakrabbit",true,false,-1,-1); +addRotationMap("Tacocat-Breaker","Lakrabbit",true,true,-1,-1); +addRotationMap("Tacocat-DantesHill","Lakrabbit",true,true,-1,-1); +addRotationMap("Tacocat-DeepCool","Lakrabbit",true,false,-1,-1); +addRotationMap("Tacocat-EmeraldRun","Lakrabbit",true,true,-1,-1); +addRotationMap("Tacocat-FairField","Lakrabbit",true,true,-1,-1); +addRotationMap("Tacocat-FireBrand","Lakrabbit",true,true,-1,-1); +addRotationMap("Tacocat-FroastyLak","Lakrabbit",true,false,-1,-1); +addRotationMap("Tacocat-IronGiant","Lakrabbit",true,false,-1,-1); +addRotationMap("Tacocat-Jagged","Lakrabbit",true,true,-1,-1); +addRotationMap("Tacocat-LucidCold","Lakrabbit",true,true,-1,-1); +addRotationMap("Tacocat-MiddlePassage","Lakrabbit",true,true,-1,-1); +addRotationMap("Tacocat-Mirage","Lakrabbit",true,true,-1,-1); +addRotationMap("Tacocat-Muave","Lakrabbit",true,true,-1,-1); +addRotationMap("Tacocat-Silencio","Lakrabbit",true,true,-1,-1); +addRotationMap("Tacocat-SnowCrevice","Lakrabbit",true,true,-1,-1); +addRotationMap("Tacocat-Spire","Lakrabbit",true,true,-1,-1); +addRotationMap("Tacocat-TheStill","Lakrabbit",true,true,-1,-1); +addRotationMap("Tacocat-Toxica","Lakrabbit",true,true,-1,-1); +addRotationMap("Tacocat-WhiteCap","Lakrabbit",true,true,-1,-1); +addRotationMap("Tacocat-Moonscape","Lakrabbit",true,true,-1,-1); +addRotationMap("Tacocat-Temporal","Lakrabbit",true,false,-1,-1); +addRotationMap("Tacocat-Vein","Lakrabbit",true,false,-1,-1); +addRotationMap("DarkTiger-LakIce","Lakrabbit",true,true,-1,-1); +addRotationMap("Tacocat-BigSky","Lakrabbit",true,false,-1,-1); +addRotationMap("Tacocat-Thawed","Lakrabbit",true,true,-1,-1); +addRotationMap("Tacocat-Circular","Lakrabbit",true,true,-1,-1); +addRotationMap("Tacocat-RollingGreen","Lakrabbit",true,true,-1,-1); +addRotationMap("Tacocat-Hellmire","Lakrabbit",true,true,-1,-1); +addRotationMap("Tacocat-HighLaktane","Lakrabbit",true,false,-1,-1); +addRotationMap("Tacocat-Hillview","Lakrabbit",true,true,-1,-1); +addRotationMap("Tacocat-IceCap","Lakrabbit",true,false,-1,-1); +addRotationMap("Tacocat-Yerba","Lakrabbit",true,true,-1,-1); +addRotationMap("Tacocat-ColdFoot","Lakrabbit",true,true,-1,-1); +addRotationMap("Tacocat-Dunes","Lakrabbit",true,true,-1,-1); +addRotationMap("Tacocat-Rusted","Lakrabbit",true,true,-1,-1); +addRotationMap("Tacocat-FrostRun","Lakrabbit",true,true,-1,-1); +addRotationMap("Tacocat-Zambre","Lakrabbit",true,false,-1,-1); +addRotationMap("Tacocat-SoylentJade","Lakrabbit",true,true,-1,-1); +//addRotationMap("EscaladeLak","Lakrabbit",true,false,-1,-1); +//addRotationMap("MagmaticLak","Lakrabbit",true,false,-1,-1); +//addRotationMap("HillsOfSorrow","Lakrabbit",true,false,-1,-1); +//addRotationMap("TWL2_MuddySwampLak","Lakrabbit",true,false,-1,-1); +//addRotationMap("SandStormLak","Lakrabbit",true,false,-1,-1); +//addRotationMap("BeggarsRunLak","Lakrabbit",true,false,-1,-1); +//addRotationMap("DamnnationLak","Lakrabbit",true,false,-1,-1); +//------------------------------------------------------------------------------- +//------------------------------------------------------------------------------- +//------------------------------------------------------------------------------- +//------------------------------------------------------------------------------- +addRotationMap("DangerousCrossingLT","LCTF",true,false,-1,-1); +addRotationMap("DX_Ice","LCTF",true,true,-1,-1); +//addRotationMap("DX_Badlands","LCTF",true,false,-1,-1); +//addRotationMap("DX_Desert","LCTF",true,false,-1,-1); +addRotationMap("SmallCrossingLT","LCTF",true,false,-1,-1); +addRotationMap("DireLT","LCTF",true,false,-1,-1); +addRotationMap("RoundTheMountainLT","LCTF",true,true,-1,-1); +addRotationMap("TWL_FeignLT","LCTF",true,false,-1,-1); +addRotationMap("TWL_RollercoasterLT","LCTF",true,false,10,-1); +addRotationMap("TWL_StonehengeLT","LCTF",true,true,-1,-1); +addRotationMap("TWL_WilderZoneLT","LCTF",true,false,-1,-1); +addRotationMap("TWL_BeachBlitzLT","LCTF",true,true,-1,-1); +addRotationMap("TWL2_CanyonCrusadeDeluxeLT","LCTF",true,true,-1,-1); +addRotationMap("TWL2_HildebrandLT","LCTF",true,true,-1,-1); +addRotationMap("TWL2_SkylightLT","LCTF",true,false,-1,-1); +addRotationMap("TWL2_JaggedClawLT","LCTF",true,false,-1,-1); +addRotationMap("S5_MassiveLT","LCTF",true,false,-1,-1); +addRotationMap("S5_DamnationLT","LCTF",true,false,8,-1); +addRotationMap("S5_Icedance","LCTF",true,true,10,-1); +addRotationMap("S5_Mordacity","LCTF",true,true,10,-1); +addRotationMap("S8_ZilchLT","LCTF",true,true,-1,-1); +addRotationMap("CirclesEdgeLT","LCTF",true,true,10,-1); +addRotationMap("TenebrousCTF","LCTF",true,false,-1,-1); +addRotationMap("oasisintensity","LCTF",true,true,-1,10); +addRotationMap("berlard","LCTF",true,true,-1,-1); +addRotationMap("RaindanceLT","LCTF",true,false,-1,-1); +addRotationMap("SmallTimeLT","LCTF",true,false,-1,-1); +addRotationMap("ArenaDome","LCTF",true,true,-1,10); +addRotationMap("Bulwark","LCTF",true,true,-1,-1); +addRotationMap("Discord","LCTF",true,true,-1,-1); +addRotationMap("HillSideLT","LCTF",true,true,-1,-1); +addRotationMap("IcePick","LCTF",true,true,-1,16); +addRotationMap("OsIrisLT","LCTF",true,true,-1,-1); +addRotationMap("GrassyKnollLT","LCTF",true,true,-1,-1); +addRotationMap("SandyRunLT","LCTF",true,false,-1,12); +addRotationMap("Sentry","LCTF",true,true,-1,-1); +addRotationMap("Exhumed","LCTF",true,false,-1,-1); +addRotationMap("FrozenHopeLT","LCTF",true,true,-1,-1); +//addRotationMap("TheFray","LCTF",true,false,-1,-1); +//addRotationMap("SignalLT","LCTF",true,false,-1,-1); +//------------------------------------------------------------------------------- +addRotationMap("HillKingLT","LCTF",true,true,-1,-1); +addRotationMap("DMP_BastardForgeLT","LCTF",true,true,10,-1); +addRotationMap("DMP_Paranoia","LCTF",true,false,-1,-1); +addRotationMap("DMP_SpincycleLT","LCTF",true,true,-1,-1); +addRotationMap("DMP_Cinerarium","LCTF",true,true,-1,-1); +addRotationMap("DMP_StarFallLT","LCTF",true,true,-1,-1); +addRotationMap("DMP_BunkeredLT","LCTF",true,true,-1,-1); +addRotationMap("DMP_PariahLT","LCTF",true,true,-1,-1); +addRotationMap("DMP_SimpleFlagArena","LCTF",true,true,-1,-1); +addRotationMap("VanDamnedLT","LCTF",true,true,-1,-1); +addRotationMap("Ravine","LCTF",true,true,10,-1); +addRotationMap("PipeDreamLT","LCTF",true,true,-1,-1); +//addRotationMap("DMP_LavaGods","LCTF",true,false,10,20); +//addRotationMap("AttritionLT","LCTF",true,true,-1,-1); +//addRotationMap("RushLT","LCTF",true,false,-1,-1); +//------------------------------------------------------------------------------- +addRotationMap("SmallSpit","LCTF",true,true,10,-1); +addRotationMap("ClusterUnFuct","LCTF",true,true,10,-1); +addRotationMap("OuterWildsLT","LCTF",true,true,-1,-1); +addRotationMap("SuperiorWaterworks","LCTF",true,true,-1,-1); +addRotationMap("FrozenForgeLT","LCTF",true,true,-1,-1); +addRotationMap("El_FinLT","LCTF",true,true,-1,-1); +addRotationMap("CapriLT","LCTF",true,true,-1,-1); +addRotationMap("RunenmachtLT","LCTF",true,true,-1,-1); +addRotationMap("Machineeggs","LCTF",true,true,-1,-1); +addRotationMap("Mac_FlagArena","LCTF",true,false,-1,-1); +addRotationMap("SuperHappyBouncyFuntime","LCTF",true,false,-1,-1); +addRotationMap("NarcolepsyLT","LCTF",true,false,10,-1); +//addRotationMap("BonespurLT","LCTF",true,true,-1,14); +//addRotationMap("DuelersDelight","LCTF",true,false,-1,12); +//addRotationMap("TWL2_CelerityLT","LCTF",true,true,-1,20); +//addRotationMap("Drafts","LCTF",true,true,-1,12); +//addRotationMap("DermCrossingDeluxeLT","LCTF",true,true,-1,-1); +//addRotationMap("Bridgepoint","LCTF",true,true,-1,14); +//addRotationMap("WhiteDwarfDeluxeLT","LCTF",true,false,-1,14); +//addRotationMap("SurrealLT","LCTF",true,false,-1,-1); +//addRotationMap("Confusco","LCTF",true,false,6,-1); +//addRotationMap("TWL2_MuddySwamp","LCTF",true,false,8,-1); +//addRotationMap("Blink","LCTF",true,false,-1,-1); +//addRotationMap("S8_Opus","LCTF",true,false,-1,-1); +//addRotationMap("BeggarsRunLT","LCTF",true,false,-1,-1); +//addRotationMap("S5_WoodymyrkLT","LCTF",true,false,-1,-1); +//addRotationMap("S5_SilenusLT","LCTF",true,false,-1,-1); +//------------------------------------------------------------------------------- +//------------------------------------------------------------------------------- +//------------------------------------------------------------------------------- +//------------------------------------------------------------------------------- +addRotationMap("RaspDM","DM",true,true,8,-1); +addRotationMap("EntombedDM","DM",true,true,-1,-1); +addRotationMap("IceDomeDM","DM",true,true,-1,-1); +addRotationMap("HoofToeDM","DM",true,true,6,-1); +addRotationMap("ArenaDomeDM","DM",true,true,-1,-1); +addRotationMap("VulcansWrathDM","DM",true,true,-1,-1); +addRotationMap("RampartsDM","DM",true,true,-1,-1); +addRotationMap("ShrineDM","DM",true,true,-1,12); +addRotationMap("LiveBaitDM","DM",true,true,-1,-1); +addRotationMap("FourSquareDM","DM",true,true,-1,10); +addRotationMap("BrigDM","DM",true,true,-1,8); +addRotationMap("PitsDM","DM",true,true,-1,10); +addRotationMap("RingofFireDM","DM",true,true,-1,10); +addRotationMap("GorgonDM","DM",true,true,-1,10); +//------------------------------------------------------------------------------- +//------------------------------------------------------------------------------- +//------------------------------------------------------------------------------- +//------------------------------------------------------------------------------- +//addRotationMap("Alcatraz","Siege",true,true,-1,-1); +//addRotationMap("Caldera","Siege",true,true,-1,-1); +//addRotationMap("Gauntlet","Siege",true,true,-1,-1); +//addRotationMap("IceBound","Siege",true,true,-1,-1); +//addRotationMap("Masada","Siege",true,true,-1,-1); +//addRotationMap("Respite","Siege",true,true,-1,-1); +//addRotationMap("UltimaThule","Siege",true,true,-1,-1); +//addRotationMap("BridgeTooFar","Siege",true,true,-1,-1); +//addRotationMap("IsleOfMan","Siege",true,true,-1,-1); +//addRotationMap("Trident","Siege",true,true,-1,-1); +//------------------------------------------------------------------------------- +//------------------------------------------------------------------------------- +//------------------------------------------------------------------------------- +//------------------------------------------------------------------------------- +//addRotationMap("MiniSunDried","Hunters",true,true,-1,-1); +//addRotationMap("DustToDust","Hunters",true,true,-1,-1); diff --git a/Classic/prefs/serverPrefs.cs b/Classic/prefs/serverPrefs.cs index 4374ddd..218f6da 100644 --- a/Classic/prefs/serverPrefs.cs +++ b/Classic/prefs/serverPrefs.cs @@ -56,7 +56,7 @@ $Host::ClassicLoadVRamChanges = 0; $Host::ClassicLogEchoEnabled = 0; $Host::ClassicMaxVotes = 3; $Host::ClassicMaxTelepads = 3; -$Host::ClassicMOTD = "Tribes 2 Test\nServer brought to you via Commuity Effort\nCelebrating 20 Years of Tribes2!"; +$Host::ClassicMOTD = "Tribes 2 Test\nServer brought to you via Commuity Effort\nCelebrating 25 Years of Tribes2!"; $Host::ClassicMOTDLines = 3; $Host::ClassicMOTDTime = 6; $Host::ClassicNoNullVoiceSpam = 0; @@ -123,7 +123,7 @@ $Host::LoadScreenColor3 = "33CCCC"; $Host::LoadScreenLine1 = "Join Discord:"; $Host::LoadScreenLine1_Msg = "playt2.com/discord"; $Host::LoadScreenLine2 = "Game Modes:"; -$Host::LoadScreenLine2_Msg = "LakRabbit, Capture the Flag, DeathMatch, (Light Only) Capture the Flag"; +$Host::LoadScreenLine2_Msg = "Lak, CTF, DeathMatch, LCTF"; $Host::LoadScreenLine3 = "Get Mappacks:"; $Host::LoadScreenLine3_Msg = "playt2.com/mappacks"; $Host::LoadScreenLine4 = "Server Location:"; @@ -132,7 +132,7 @@ $Host::LoadScreenLine5 = "Server Hosted:"; $Host::LoadScreenLine5_Msg = "Internet"; $Host::LoadScreenLine6 = "Server Github:"; $Host::LoadScreenLine6_Msg = "https://github.com/ChocoTaco1/TacoServer"; -$Host::LoadScreenMOTD1 = "Celebrating 20 Years of Tribes2!"; +$Host::LoadScreenMOTD1 = "Celebrating 25 Years of Tribes2!"; $Host::LoadScreenMOTD2 = "Come play Arena on Wednesday Nights!"; $Host::LoadScreenMOTD3 = "Lak crowd early evenings after work during the week."; $Host::LoadScreenMOTD4 = "Big CTF games Fridays, Saturdays, and Sundays!"; @@ -160,10 +160,10 @@ $Host::PUGautoPassword = 0; $Host::PUGPassword = "pickup"; $Host::PUGpasswordAlwaysOn = 0; $Host::PureServer = 0; -$Host::ServerRules1 = "\c2if\c4(\c3%client.attitude \c4$= \c5\"fun\" \c4&& \c3%client.Llama_Grabs \c4< \c51\c4) {"; -$Host::ServerRules2 = " \c1keepTeamsBalanced\c4(\c2%client\c4); \c1dontSwitch2WinningTeam(\c2%client\c4); }"; -$Host::ServerRules3 = "\c2else if\c4(\c3%client.attitude \c4$= \c5\"too_serious\"\c4) {"; -$Host::ServerRules4 = " \c1try2HaveFun\c4(\c2%client, %attitude\c4); \c1thisIsPubServer\c4(\c2%client, %attitude\c4); }"; +$Host::ServerRules1 = "1. Don\'t Llama Grab. (Grab flag slowly)"; +$Host::ServerRules2 = "2. Don\'t sit on teams and AFK. Move to observer."; +$Host::ServerRules3 = "3. Don\'t Excessively teamkill or teamkill on purpose."; +$Host::ServerRules4 = "4. Don\'t spam chat with inappropriate topics. Play the game."; $Host::ShowEndingPlayerScores = 1; $Host::ShowIngamePlayerScores = 1; $Host::Siege::Halftime = 20000; @@ -191,7 +191,7 @@ $Host::TN::echo = 1; $Host::TournamentMode = 0; $Host::useCustomSkins = 1; $Host::VoteCooldown = 120; -$Host::VoteDelayTime = 120; +$Host::VoteDelayTime = 60; $Host::VotePassPercent = 60; $Host::VoteSpread = 20; $Host::VoteTime = "45"; diff --git a/Classic/scripts/serverDefaults.cs b/Classic/scripts/serverDefaults.cs index f52d72c..d51f88b 100755 --- a/Classic/scripts/serverDefaults.cs +++ b/Classic/scripts/serverDefaults.cs @@ -141,16 +141,16 @@ $Host::LoadScreenColor3 = "33CCCC"; //Loading Screen color; Accents $Host::LoadScreenLine1 = "Join Discord:"; //Loading screen Line 1 Topic $Host::LoadScreenLine1_Msg = "playt2.com/discord"; //Loading Screen Line 1 Message $Host::LoadScreenLine2 = "Game Modes:"; //Loading screen Line 2 Topic -$Host::LoadScreenLine2_Msg = "LakRabbit, Capture the Flag, DeathMatch, (Light Only) Capture the Flag"; //Loading Screen Line 2 Message +$Host::LoadScreenLine2_Msg = "Lak, CTF, DeathMatch, LCTF"; //Loading Screen Line 2 Message $Host::LoadScreenLine3 = "Get Mappacks:"; //Loading screen Line 3 Topic $Host::LoadScreenLine3_Msg = "playt2.com/mappacks"; //Loading Screen Line 3 Message $Host::LoadScreenLine4 = "Server Location:"; //Loading screen Line 4 Topic -$Host::LoadScreenLine4_Msg = "Iowa"; //Loading Screen Line 4 Message +$Host::LoadScreenLine4_Msg = "Somewhere"; //Loading Screen Line 4 Message $Host::LoadScreenLine5 = "Server Hosted:"; //Loading screen Line 5 Topic (Debrief LoadScreen Only) -$Host::LoadScreenLine5_Msg = "Google Compute Engine"; //Loading Screen Line 5 Message (Debrief LoadScreen Only) +$Host::LoadScreenLine5_Msg = "Internet"; //Loading Screen Line 5 Message (Debrief LoadScreen Only) $Host::LoadScreenLine6 = "Server Github:"; //Loading screen Line 6 Topic (Debrief LoadScreen Only) $Host::LoadScreenLine6_Msg = "https://github.com/ChocoTaco1/TacoServer"; //Loading Screen Line 6 Message (Debrief LoadScreen Only) -$Host::LoadScreenMOTD1 = "Celebrating 20 Years of Tribes2!"; //MOTD or Events Line 1 Message (Debrief LoadScreen Only) +$Host::LoadScreenMOTD1 = "Celebrating 25 Years of Tribes2!"; //MOTD or Events Line 1 Message (Debrief LoadScreen Only) $Host::LoadScreenMOTD2 = "Come play Arena on Wednesday Nights!"; //MOTD or Events Line 2 Message (Debrief LoadScreen Only) $Host::LoadScreenMOTD3 = "Lak crowd early evenings after work during the week."; //MOTD or Events Line 3 Message (Debrief LoadScreen Only) $Host::LoadScreenMOTD4 = "Big CTF games Fridays, Saturdays, and Sundays!"; //MOTD or Events Line 4 Message (Debrief LoadScreen Only) @@ -160,7 +160,7 @@ $Host::ClassicChatLog = 1; $Host::ClassicChatLogPath = "logs/Chat/"; $Host::ClassicConnectLog = 1; $Host::ClassicConnLogPath = "logs/Connect/log.txt"; -$Host::ClassicMOTD = "Discord PUB\nServer brought to you by Ravin and Choco\nCelebrating 20 Years of Tribes2!"; +$Host::ClassicMOTD = "Tribes 2 Test\nServer brought to you via Commuity Effort\nCelebrating 25 Years of Tribes2!"; $Host::ClassicMOTDLines = 3; $Host::ClassicMOTDTime = 6; $Host::ClassicRotationCustom = 1; @@ -171,10 +171,10 @@ $Host::ClassicSuppressTraversalRootError = 1; //Suppress console spam e $Host::ClassicMaxVotes = 5; //Max a player can vote per mission $Host::ClassicVoteLog = 1; //Log Votes $Host::ClassicVoteLogPath = "logs/Vote/Vote.log"; //Vote Log location -$Host::ServerRules1 = "\c2if\c4(\c3%client.attitude \c4$= \c5\"fun\" \c4&& \c3%client.Llama_Grabs \c4< \c51\c4) {"; -$Host::ServerRules2 = " \c1keepTeamsBalanced\c4(\c2%client\c4); \c1dontSwitch2WinningTeam(\c2%client\c4); }"; -$Host::ServerRules3 = "\c2else if\c4(\c3%client.attitude \c4$= \c5\"too_serious\"\c4) {"; -$Host::ServerRules4 = " \c1try2HaveFun\c4(\c2%client, %attitude\c4); \c1thisIsPubServer\c4(\c2%client, %attitude\c4); }"; +$Host::ServerRules1 = "1. Don\'t Llama Grab. (Grab flag slowly)"; +$Host::ServerRules2 = "2. Don\'t sit on teams and AFK. Move to observer."; +$Host::ServerRules3 = "3. Don\'t Excessively teamkill or teamkill on purpose."; +$Host::ServerRules4 = "4. Don\'t spam chat with inappropriate topics. Play the game."; $Host::AnimateWithTransitions = 1; //????????????? T1 engine var may or may not help timescale ????????????? $Host::AllowAdmin2Admin = 0; $Host::AllowAdminBan = 0; @@ -201,7 +201,7 @@ $Host::KickObserverStartOnJoin = 0; //Start KickObserver Timer as so $Host::KickObserverTimeout = 1200; //How long player can stay in observer before being booted (1200 is 20 mins) //$Host::ClassicBanlist = "prefs/banlist.cs"; $Host::VoteCooldown = 120; //Time cooldown that dosnt allow a player to vote again after theyve initiated a vote (120 is 2 mins) -$Host::VoteDelayTime = 120; //Delay the ability to vote (For everyone) at the beginning of the match (120 is 2 minutes) +$Host::VoteDelayTime = 60; //Delay the ability to vote (For everyone) at the beginning of the match (120 is 2 minutes) $Host::ClassicTeamKillLog = 1; //Enable/Disable Teamkill Logging $Host::ClassicTeamKillLogPath = "logs/TeamKills/teamkills.log"; //TeamKill Log Path $Host::ClassicDailyHardRestart = 0; //Enable/Disable Daily Hard Restart From 3bd45778321eab461e6704eece9d43025b5739d3 Mon Sep 17 00:00:00 2001 From: ChocoTaco1 Date: Wed, 29 Oct 2025 15:31:04 -0400 Subject: [PATCH 41/48] Vote Overtime Redo --- Classic/scripts/CTFGame.cs | 37 ++++++--- Classic/scripts/LCTFGame.cs | 37 ++++++--- Classic/scripts/LakRabbitGame.cs | 39 ++++++++++ Classic/scripts/autoexec/VoteMenu.cs | 10 +-- Classic/scripts/autoexec/VoteOverTime.cs | 99 ------------------------ 5 files changed, 95 insertions(+), 127 deletions(-) delete mode 100644 Classic/scripts/autoexec/VoteOverTime.cs diff --git a/Classic/scripts/CTFGame.cs b/Classic/scripts/CTFGame.cs index bf65472..d75e4ba 100755 --- a/Classic/scripts/CTFGame.cs +++ b/Classic/scripts/CTFGame.cs @@ -1266,7 +1266,13 @@ function CTFGame::checkTimeLimit(%game, %forced) { %teamOneCaps = mFloor($TeamScore[1] / %game.SCORE_PER_TEAM_FLAG_CAP); %teamTwoCaps = mFloor($TeamScore[2] / %game.SCORE_PER_TEAM_FLAG_CAP); - if(%teamOneCaps == %teamTwoCaps && $CTF::Overtime && (($TeamRank[1, count] + $TeamRank[2, count]) > 6)){ + if(%game.scheduleVote !$= "" && !%game.voteOT && !$Host::TournamentMode) + { + messageAll('MsgOvertime', '\c2Vote Overtime Initiated.~wfx/powered/turret_heavy_activate.wav'); + %game.voteOT = 1; + } + else if(%teamOneCaps == %teamTwoCaps && $CTF::Overtime && (($TeamRank[1, count] + $TeamRank[2, count]) > 6)) + { if(!%game.overtime) { %game.overtime = 1; @@ -1276,19 +1282,30 @@ function CTFGame::checkTimeLimit(%game, %forced) UpdateClientTimes($CTF::Overtime * 60 * 1000); EndCountdown($CTF::Overtime * 60 * 1000); %game.timeCheck = %game.schedule($CTF::Overtime * 60 * 1000, "timeLimitReached"); + + //Cancel vote if any + if(%game.scheduleVote !$= "") + { + messageAll('closeVoteHud', ""); + cancel(Game.scheduleVote); + Game.scheduleVote = ""; + Game.kickClient = ""; + clearVotes(); + + //Stop vote chimes + for(%i = 0; %i < $Host::EnableVoteSoundReminders; %i++) + { + if(isEventPending(Game.voteReminder[%i])) + cancel(Game.voteReminder[%i]); + Game.voteReminder[%i] = ""; + } + messageAll('MsgOvertime', "\c2Vote has been cancelled due to Sudden-Death Overtime."); + } } } else { - if(%game.scheduleVote !$= "" && !%game.voteOT) - { - messageAll('MsgOvertime', '\c2Vote Overtime Initiated.~wfx/powered/turret_heavy_activate.wav'); - %game.voteOT = 1; - } - else - { - %game.timeLimitReached(); - } + %game.timeLimitReached(); } } else diff --git a/Classic/scripts/LCTFGame.cs b/Classic/scripts/LCTFGame.cs index e856790..9de5730 100644 --- a/Classic/scripts/LCTFGame.cs +++ b/Classic/scripts/LCTFGame.cs @@ -1566,7 +1566,13 @@ function LCTFGame::checkTimeLimit(%game, %forced) { %teamOneCaps = mFloor($TeamScore[1] / %game.SCORE_PER_TEAM_FLAG_CAP); %teamTwoCaps = mFloor($TeamScore[2] / %game.SCORE_PER_TEAM_FLAG_CAP); - if(%teamOneCaps == %teamTwoCaps && $LCTF::Overtime && (($TeamRank[1, count] + $TeamRank[2, count]) > 6)){ + if(%game.scheduleVote !$= "" && !%game.voteOT && !$Host::TournamentMode) + { + messageAll('MsgOvertime', '\c2Vote Overtime Initiated.~wfx/powered/turret_heavy_activate.wav'); + %game.voteOT = 1; + } + else if(%teamOneCaps == %teamTwoCaps && $LCTF::Overtime && (($TeamRank[1, count] + $TeamRank[2, count]) > 6)) + { if(!%game.overtime) { %game.overtime = 1; @@ -1576,19 +1582,30 @@ function LCTFGame::checkTimeLimit(%game, %forced) UpdateClientTimes($LCTF::Overtime * 60 * 1000); EndCountdown($LCTF::Overtime * 60 * 1000); %game.timeCheck = %game.schedule($LCTF::Overtime * 60 * 1000, "timeLimitReached"); + + //Cancel vote if any + if(%game.scheduleVote !$= "") + { + messageAll('closeVoteHud', ""); + cancel(Game.scheduleVote); + Game.scheduleVote = ""; + Game.kickClient = ""; + clearVotes(); + + //Stop vote chimes + for(%i = 0; %i < $Host::EnableVoteSoundReminders; %i++) + { + if(isEventPending(Game.voteReminder[%i])) + cancel(Game.voteReminder[%i]); + Game.voteReminder[%i] = ""; + } + messageAll('MsgOvertime', "\c2Vote has been cancelled due to Sudden-Death Overtime."); + } } } else { - if(%game.scheduleVote !$= "" && !%game.voteOT) - { - messageAll('MsgOvertime', '\c2Vote Overtime Initiated.~wfx/powered/turret_heavy_activate.wav'); - %game.voteOT = 1; - } - else - { - %game.timeLimitReached(); - } + %game.timeLimitReached(); } } else diff --git a/Classic/scripts/LakRabbitGame.cs b/Classic/scripts/LakRabbitGame.cs index e7cfe1d..d9cba89 100644 --- a/Classic/scripts/LakRabbitGame.cs +++ b/Classic/scripts/LakRabbitGame.cs @@ -2017,6 +2017,45 @@ function LakRabbitGame::resetFlag(%game, %flag) cancel(%game.updateFlagThread[%flag]); // z0dd - ZOD, 8/4/02. Cancel this flag's thread to KineticPoet's flag updater } +function LakRabbitGame::checkTimeLimit(%game, %forced) +{ + // Don't add extra checks: + if ( %forced ) + cancel( %game.timeCheck ); + + // if there is no time limit, check back in a minute to see if it's been set + if(($Host::TimeLimit $= "") || $Host::TimeLimit == 0) + { + %game.timeCheck = %game.schedule(20000, "checkTimeLimit"); + return; + } + + %curTimeLeftMS = ($Host::TimeLimit * 60 * 1000) + $missionStartTime - getSimTime(); + + if (%curTimeLeftMS <= 0) + { + if(%game.scheduleVote !$= "" && !%game.voteOT && !$Host::TournamentMode) + { + messageAll('MsgOvertime', '\c2Vote Overtime Initiated.~wfx/powered/turret_heavy_activate.wav'); + %game.voteOT = 1; + } + else + { + %game.timeLimitReached(); + } + } + else + { + if(%curTimeLeftMS >= 20000) + %game.timeCheck = %game.schedule(20000, "checkTimeLimit"); + else + %game.timeCheck = %game.schedule(%curTimeLeftMS + 1, "checkTimeLimit"); + + //now synchronize everyone's clock + messageAll('MsgSystemClock', "", $Host::TimeLimit, %curTimeLeftMS); + } +} + // ----- These functions are native to Rabbit function LakRabbitGame::timeLimitReached(%game) diff --git a/Classic/scripts/autoexec/VoteMenu.cs b/Classic/scripts/autoexec/VoteMenu.cs index f0f72bc..e6c37af 100644 --- a/Classic/scripts/autoexec/VoteMenu.cs +++ b/Classic/scripts/autoexec/VoteMenu.cs @@ -502,8 +502,6 @@ function serverCmdStartNewVote(%client, %typeName, %arg1, %arg2, %arg3, %arg4, % { if(%arg1 $= "999") %time = "unlimited"; else %time = %arg1; %msg = %client.nameBase @ " initiated a vote to change the time limit to " @ %time SPC "minutes."; - // VoteOvertime - StartVOTimeVote(%game); $CMHasVoted[%client.guid]++; } @@ -583,7 +581,8 @@ function serverCmdStartNewVote(%client, %typeName, %arg1, %arg2, %arg3, %arg4, % case "stopRunningVote": if(%client.isSuperAdmin || (%client.isAdmin && $Host::AllowAdminStopVote)) { - if($VOStatus $="InProgress") //Dont allow a stop vote after time has expired, then no new time is set - VoteOverTime + %curTimeLeftMS = ($Host::TimeLimit * 60 * 1000) + $missionStartTime - getSimTime(); + if(%curTimeLeftMS <= 0) //Dont allow a stop vote after time has expired, then no new time is set - VoteOverTime { messageClient(%client, "", "\c2Can't stop time vote after time has expired."); return; @@ -1223,8 +1222,6 @@ function DefaultGame::voteChangeTimeLimit( %game, %admin, %newLimit ) { messageAll('MsgVotePassed', '\c2The mission time limit was set to %1 minutes by vote.', %display); $Host::TimeLimit = %newLimit; - // VoteOvertime - ResetVOTimeChanged(%game); // Reset the voted time limit when changing mission $TimeLimitChanged = 1; @@ -1243,9 +1240,6 @@ function DefaultGame::voteChangeTimeLimit( %game, %admin, %newLimit ) votePercentLog(%newLimit, %typeName, %key, %game.totalVotesFor, %game.totalVotesAgainst, %totalVotes, %game.totalVotesNone); //Show Vote % messageAll('', '\c1Vote %6: \c0Yea: %1 Nay: %2 Abstain: %7 Total: %3 [%4%5]', %game.totalVotesFor, %game.totalVotesAgainst, %totalVotes, mfloor((%game.totalVotesFor/(ClientGroup.getCount() - %game.totalVotesNone)) * 100), "%", %key, %game.totalVotesNone); - - // VoteOvertime - ResetVOall(%game); } } diff --git a/Classic/scripts/autoexec/VoteOverTime.cs b/Classic/scripts/autoexec/VoteOverTime.cs deleted file mode 100644 index 70eb648..0000000 --- a/Classic/scripts/autoexec/VoteOverTime.cs +++ /dev/null @@ -1,99 +0,0 @@ -// Vote OverTime Script -// -// Dont allow the match to end if a time vote is pending -// Or if the timelimit has changed -// -// Changes were also made in how time votes are handled in scripts/autoexec/VoteMenu.cs -// DefaultGame::voteChangeMission, DefaultGame::voteChangeTimeLimit, serverCmdStartNewVote -// -// The VoteChangeTimeLimit functions in evo dictate VOStatus conditions - -$VOStatus = "Normal"; - -package VoteOverTime -{ - -function DefaultGame::checkTimeLimit(%game, %forced) -{ - // Don't add extra checks: - if ( %forced ) - cancel( %game.timeCheck ); - - // if there is no time limit, check back in a minute to see if it's been set - if(($Host::TimeLimit $= "") || $Host::TimeLimit == 0) - { - %game.timeCheck = %game.schedule(20000, "checkTimeLimit"); - return; - } - - %curTimeLeftMS = ($Host::TimeLimit * 60 * 1000) + $missionStartTime - getSimTime(); - - if (%curTimeLeftMS <= 0) - { - //Vote Overtime - //Check if Time Vote is starting or active or if the timelimit has changed. - //If the timelimit has changed, don't end the game. - switch$($VOStatus) - { - case Starting: - if($missionRunning) - { - messageAll('', '\c2Vote Overtime Initiated.~wfx/powered/turret_heavy_activate.wav', %display); - $VOStatus = "InProgress"; - } - case InProgress: - //Do Nothing - case TimeChanged: - //Do Nothing - case Normal: - // time's up, put down your pencils - %game.timeLimitReached(); - } - } - else - { - if(%curTimeLeftMS >= 20000) - %game.timeCheck = %game.schedule(20000, "checkTimeLimit"); - else - %game.timeCheck = %game.schedule(%curTimeLeftMS + 1, "checkTimeLimit"); - - //now synchronize everyone's clock - messageAll('MsgSystemClock', "", $Host::TimeLimit, %curTimeLeftMS); - } -} - -function DefaultGame::gameOver(%game) -{ - Parent::gameOver(%game); - - //Reset everything to do with Vote Overtime - ResetVOall(%game); -} - -}; - -// Various Flags for the different situations -// Starting a TimeVote - Sets flags so the game wont end during this vote -function StartVOTimeVote(%game) -{ - if(!$Host::TournamentMode) - $VOStatus = "Starting"; -} - -// Tribes wont change the time after its reached zero and you cant change it again afterwards until a gameover/map change. -// But this serves its purpose for extending the game whether it works (technically) or not. -function ResetVOTimeChanged(%game) -{ - $VOStatus = "TimeChanged"; -} - -// Reset everything. So everything functions normally after a map change. -function ResetVOall(%game) -{ - $VOStatus = "Normal"; -} - - -// Prevent package from being activated if it is already -if (!isActivePackage(VoteOverTime)) - activatePackage(VoteOverTime); From 14caa5aca580d3afefc9641472e2ae42b7cfae32 Mon Sep 17 00:00:00 2001 From: ChocoTaco1 Date: Sun, 2 Nov 2025 20:45:05 -0500 Subject: [PATCH 42/48] Removed --- Classic/prefs/mapRotation.cs | 42 ---------------------------- Classic/prefs/serverPrefs.cs | 1 - Classic/scripts/autoexec/VoteMenu.cs | 12 ++++---- 3 files changed, 6 insertions(+), 49 deletions(-) diff --git a/Classic/prefs/mapRotation.cs b/Classic/prefs/mapRotation.cs index dc64408..7906e8b 100644 --- a/Classic/prefs/mapRotation.cs +++ b/Classic/prefs/mapRotation.cs @@ -330,48 +330,6 @@ addRotationMap("GodsRiftLak","Lakrabbit",true,false,-1,-1); addRotationMap("SolsDescentLak","Lakrabbit",true,true,-1,-1); addRotationMap("Crater71Lak","Lakrabbit",true,false,6,-1); //------------------------------------------------------------------------------- -addRotationMap("darrellw-Starlight","Lakrabbit",true,false,-1,-1); -addRotationMap("Hybrid-SunChips","Lakrabbit",true,false,-1,-1); -addRotationMap("Hybrid-TealMagic","Lakrabbit",true,false,-1,-1); -addRotationMap("Tacocat-AshnDust","Lakrabbit",true,false,-1,-1); -addRotationMap("Tacocat-Breaker","Lakrabbit",true,true,-1,-1); -addRotationMap("Tacocat-DantesHill","Lakrabbit",true,true,-1,-1); -addRotationMap("Tacocat-DeepCool","Lakrabbit",true,false,-1,-1); -addRotationMap("Tacocat-EmeraldRun","Lakrabbit",true,true,-1,-1); -addRotationMap("Tacocat-FairField","Lakrabbit",true,true,-1,-1); -addRotationMap("Tacocat-FireBrand","Lakrabbit",true,true,-1,-1); -addRotationMap("Tacocat-FroastyLak","Lakrabbit",true,false,-1,-1); -addRotationMap("Tacocat-IronGiant","Lakrabbit",true,false,-1,-1); -addRotationMap("Tacocat-Jagged","Lakrabbit",true,true,-1,-1); -addRotationMap("Tacocat-LucidCold","Lakrabbit",true,true,-1,-1); -addRotationMap("Tacocat-MiddlePassage","Lakrabbit",true,true,-1,-1); -addRotationMap("Tacocat-Mirage","Lakrabbit",true,true,-1,-1); -addRotationMap("Tacocat-Muave","Lakrabbit",true,true,-1,-1); -addRotationMap("Tacocat-Silencio","Lakrabbit",true,true,-1,-1); -addRotationMap("Tacocat-SnowCrevice","Lakrabbit",true,true,-1,-1); -addRotationMap("Tacocat-Spire","Lakrabbit",true,true,-1,-1); -addRotationMap("Tacocat-TheStill","Lakrabbit",true,true,-1,-1); -addRotationMap("Tacocat-Toxica","Lakrabbit",true,true,-1,-1); -addRotationMap("Tacocat-WhiteCap","Lakrabbit",true,true,-1,-1); -addRotationMap("Tacocat-Moonscape","Lakrabbit",true,true,-1,-1); -addRotationMap("Tacocat-Temporal","Lakrabbit",true,false,-1,-1); -addRotationMap("Tacocat-Vein","Lakrabbit",true,false,-1,-1); -addRotationMap("DarkTiger-LakIce","Lakrabbit",true,true,-1,-1); -addRotationMap("Tacocat-BigSky","Lakrabbit",true,false,-1,-1); -addRotationMap("Tacocat-Thawed","Lakrabbit",true,true,-1,-1); -addRotationMap("Tacocat-Circular","Lakrabbit",true,true,-1,-1); -addRotationMap("Tacocat-RollingGreen","Lakrabbit",true,true,-1,-1); -addRotationMap("Tacocat-Hellmire","Lakrabbit",true,true,-1,-1); -addRotationMap("Tacocat-HighLaktane","Lakrabbit",true,false,-1,-1); -addRotationMap("Tacocat-Hillview","Lakrabbit",true,true,-1,-1); -addRotationMap("Tacocat-IceCap","Lakrabbit",true,false,-1,-1); -addRotationMap("Tacocat-Yerba","Lakrabbit",true,true,-1,-1); -addRotationMap("Tacocat-ColdFoot","Lakrabbit",true,true,-1,-1); -addRotationMap("Tacocat-Dunes","Lakrabbit",true,true,-1,-1); -addRotationMap("Tacocat-Rusted","Lakrabbit",true,true,-1,-1); -addRotationMap("Tacocat-FrostRun","Lakrabbit",true,true,-1,-1); -addRotationMap("Tacocat-Zambre","Lakrabbit",true,false,-1,-1); -addRotationMap("Tacocat-SoylentJade","Lakrabbit",true,true,-1,-1); //addRotationMap("EscaladeLak","Lakrabbit",true,false,-1,-1); //addRotationMap("MagmaticLak","Lakrabbit",true,false,-1,-1); //addRotationMap("HillsOfSorrow","Lakrabbit",true,false,-1,-1); diff --git a/Classic/prefs/serverPrefs.cs b/Classic/prefs/serverPrefs.cs index 218f6da..a20e0a7 100644 --- a/Classic/prefs/serverPrefs.cs +++ b/Classic/prefs/serverPrefs.cs @@ -5,7 +5,6 @@ $Host::AllowAdminKick = 1; $Host::AllowAdminPassVote = 1; $Host::allowAdminPlayerVotes = "0"; $Host::AllowAdminStopVote = 1; -$Host::AllowAdminStopVotes = 1; $Host::AllowAdminVotes = 1; $Host::AllowMapScript = "True"; $Host::AllowPlayerVoteChangeMission = 1; diff --git a/Classic/scripts/autoexec/VoteMenu.cs b/Classic/scripts/autoexec/VoteMenu.cs index e6c37af..8c6f300 100644 --- a/Classic/scripts/autoexec/VoteMenu.cs +++ b/Classic/scripts/autoexec/VoteMenu.cs @@ -581,12 +581,12 @@ function serverCmdStartNewVote(%client, %typeName, %arg1, %arg2, %arg3, %arg4, % case "stopRunningVote": if(%client.isSuperAdmin || (%client.isAdmin && $Host::AllowAdminStopVote)) { - %curTimeLeftMS = ($Host::TimeLimit * 60 * 1000) + $missionStartTime - getSimTime(); - if(%curTimeLeftMS <= 0) //Dont allow a stop vote after time has expired, then no new time is set - VoteOverTime - { - messageClient(%client, "", "\c2Can't stop time vote after time has expired."); - return; - } + // %curTimeLeftMS = ($Host::TimeLimit * 60 * 1000) + $missionStartTime - getSimTime(); + // if(%curTimeLeftMS <= 0) //Dont allow a stop vote after time has expired, then no new time is set - VoteOverTime + // { + // messageClient(%client, "", "\c2Can't stop vote after time has expired."); + // return; + // } stopCurrentVote(%client); adminLog(%client, " stopped the vote in progress."); From d24df745abf305bffb12fa1edf3a60abd867ba26 Mon Sep 17 00:00:00 2001 From: ChocoTaco1 Date: Mon, 3 Nov 2025 16:19:53 -0500 Subject: [PATCH 43/48] Added Overtime Reset --- Classic/scripts/CTFGame.cs | 3 +++ Classic/scripts/LCTFGame.cs | 3 +++ 2 files changed, 6 insertions(+) diff --git a/Classic/scripts/CTFGame.cs b/Classic/scripts/CTFGame.cs index d75e4ba..3d5ebe0 100755 --- a/Classic/scripts/CTFGame.cs +++ b/Classic/scripts/CTFGame.cs @@ -952,6 +952,9 @@ function CTFGame::gameOver(%game) } for(%j = 1; %j <= %game.numTeams; %j++) $TeamScore[%j] = 0; + + %game.voteOT = 0; + %game.overtime = 0; } function CTFGame::onClientDamaged(%game, %clVictim, %clAttacker, %damageType, %implement, %damageLoc) diff --git a/Classic/scripts/LCTFGame.cs b/Classic/scripts/LCTFGame.cs index 9de5730..b0dcd2b 100644 --- a/Classic/scripts/LCTFGame.cs +++ b/Classic/scripts/LCTFGame.cs @@ -689,6 +689,9 @@ function LCTFGame::gameOver(%game) if (isActivePackage(LCTFOneMine)) deactivatePackage(LCTFOneMine); + + %game.voteOT = 0; + %game.overtime = 0; } From 6075098d7902ba321cbb205cbbe4ca4b8bf6c022 Mon Sep 17 00:00:00 2001 From: ChocoTaco1 Date: Mon, 3 Nov 2025 16:28:06 -0500 Subject: [PATCH 44/48] Added TR2 Bonus, Overtime Reset, rabbitSplash Added TR2 Bonus, Overtime Reset, rabbitSplash --- Classic/scripts/LakRabbitGame.cs | 210 +++++++++++++++++-------------- 1 file changed, 113 insertions(+), 97 deletions(-) diff --git a/Classic/scripts/LakRabbitGame.cs b/Classic/scripts/LakRabbitGame.cs index d9cba89..0dea6d2 100644 --- a/Classic/scripts/LakRabbitGame.cs +++ b/Classic/scripts/LakRabbitGame.cs @@ -166,6 +166,23 @@ // 1 - Players get 999 or unlimited DiscJumps // +datablock ItemData(LakFakeFlag2) : flag +{ + lightColor = "0.1 0.1 0.9 1.0"; + className = LakFakeFlag; + lightTime = "100"; + lightRadius = "5"; +}; + +datablock ItemData(LakFakeFlag4) : LakFakeFlag2 +{ + lightColor = "0.9 0.9 0.1 1.0"; +}; + +datablock ItemData(LakFakeFlag8) : LakFakeFlag2 +{ + lightColor = "0.1 0.9 0.1 1.0"; +}; package LakRabbitGame { @@ -417,7 +434,12 @@ function Armor::damageObject(%data, %targetObject, %sourceObject, %position, %am // no splash damage vote if(Game.noSplashDamage && %percentDam < 98 && $lastObjExplode && !$lastObjExplode.isHandNade && %damageType != $DamageType::Mine) - %amount = 0.0; + { + if(!%targetObject.holdingFlag) + %amount = 0.0; + else if(((getSimTime() - %targetObject.client.rabbitSplash) < 15000)) //Turn on splash for rabbit after not making a shot for an alotted time + %amount = 0.0; + } switch$(%damageType) { @@ -435,6 +457,10 @@ function Armor::damageObject(%data, %targetObject, %sourceObject, %position, %am %sound = %defaultSound; } + %tgPos = %targetObject.getPosition(); + %terrHeight = getTerrainHeight(getWords(%tgPos,0,1)); + %playerHeight = mAbs(getWord(%tgPos,2) - %terrHeight); + // special knockback if you hit too close, max 15% chance (point blank).. 5% at 30meters, 1% chance for any MA // Slap based on a Disc headshot @@ -483,6 +509,42 @@ function Armor::damageObject(%data, %targetObject, %sourceObject, %position, %am messageAll('msgSlapmessage','\c0%1 is taking a short tour around the map.', %targetObject.client.name ); } } + else if(%ma && getRandom(1,35) <= %chance && %playerHeight >= 100 && %targetObject.holdingFlag) + { + + Game.playerDroppedFlag(%targetObject); + + %position = %targetObject.getPosition(); + %count = 40; + %ttl = 60000; + %player = %targetObject; + if( %position $= "" ) + { + error("No position passed!"); + return 0; + } + if( %count <= 0 ) + { + error("Number of flags to spew must be greater than 0!"); + return 0; + } + + %flagArr[0] = LakFakeFlag8; + %flagArr[1] = LakFakeFlag2; + %flagArr[2] = LakFakeFlag4; + + while( %count > 0 ) + { + %index = mFloor(getRandom() * 3); + // throwDummyFlag(location, Datablock); + LakRabbitGame::throwDummyFlag(%position, %flagArr[%index], %player, %ttl); + %count--; + } + + %targetObject.blowup(); + %targetObject.scriptKill($DamageType::Explosion); + %sound = '~wfx/misc/MA1.wav'; + } %weapon = "Disc"; case $DamageType::Grenade: if($lastObjExplode.isHandNade) //Hand grenades @@ -746,10 +808,15 @@ function Armor::damageObject(%data, %targetObject, %sourceObject, %position, %am } // borlak -- make a sound when you hit someone - if(%sound $= "" && %sourceObject.client.team != %targetObject.client.team) - messageClient(%sourceObject.client,'MsgHitSound','~wfx/misc/diagnostic_beep.wav'); - else if(%sound !$= "") + // if(%sound $= "" && %sourceObject.client.team != %targetObject.client.team) + // messageClient(%sourceObject.client,'MsgHitSound','~wfx/misc/diagnostic_beep.wav'); + // else if(%sound !$= ""){ + if(%sound !$= ""){ messageAll('msgSpecialHitSound', %sound); + if(%sourceObject.holdingFlag){ + %sourceObject.client.rabbitSplash = getSimTime(); + } + } // borlak -- rabbit should be able to kill heavies/mediums fast(er) in duel mode if(%targetObject.client.armor $= "Heavy" || %targetObject.client.armor $= "Medium") @@ -1905,6 +1972,7 @@ function LakRabbitGame::playerTouchFlag(%game, %player, %flag) cancel(%game.updateFlagThread[%flag]); // z0dd - ZOD, 8/4/02. Cancel this flag's thread to KineticPoet's flag updater %player.freeDJ = 0; %flag.bounced = 0; + %player.client.rabbitSplash = getSimTime(); %player.client.startTime = getSimTime(); %player.holdingFlag = %flag; @@ -2131,6 +2199,9 @@ function LakRabbitGame::gameOver(%game) // borlak -- delete variables deleteVariables("$LakFired*"); deleteVariables("$LakDamaged*"); + + %game.voteOT = 0; + %game.overtime = 0; } function LakRabbitGame::resetScore(%game, %client) @@ -2656,96 +2727,41 @@ function LakRabbitGame::applyConcussion(%game, %player) %game.dropFlag( %player ); } -//--------------------------------Footnotes--------------------------------------- -// -// -//To make vote options work in evo admin mod, demonstration only below -// -//function serverCmdStartNewVote(%client, %typeName, %arg1, %arg2, %arg3, %arg4, %playerVote) -//{ -// parent::serverCmdStartNewVote(%client, %typeName, %arg1, %arg2, %arg3, %arg4, %playerVote); -// -// // sonic9k 11/6/2003 - Added support for LakRabbit DuelMode option -// // -// case "VoteDuelMode": -// if( %isAdmin && !%client.ForceVote ) -// { -// adminStartNewVote(%client, %typename, %arg1, %arg2, %arg3, %arg4); -// adminLog(%client, " has toggled " @ %arg1 @ " (" @ %arg2 @ ")"); -// } -// else -// { -// if(Game.scheduleVote !$= "") -// { -// messageClient(%client, 'voteAlreadyRunning', '\c2A vote is already in progress.'); -// return; -// } -// %actionMsg = ($Host::LakRabbitDuelMode ? "disable Duel mode" : "enable Duel mode"); -// for(%idx = 0; %idx < ClientGroup.getCount(); %idx++) -// { -// %cl = ClientGroup.getObject(%idx); -// if(!%cl.isAIControlled()) -// { -// messageClient(%cl, 'VoteStarted', '\c2%1 initiated a vote to %2.', %client.name, %actionMsg); -// %clientsVoting++; -// } -// } -// playerStartNewVote(%client, %typename, %arg1, %arg2, %arg3, %arg4, %clientsVoting); -// } -// // -// // sonic9k 11/6/2003 - Added support for LakRabbit SplashDamage option -// // -// case "VoteSplashDamage": -// if( %isAdmin && !%client.ForceVote ) -// { -// adminStartNewVote(%client, %typename, %arg1, %arg2, %arg3, %arg4); -// adminLog(%client, " has toggled " @ %arg1 @ " (" @ %arg2 @ ")"); -// } -// else -// { -// if(Game.scheduleVote !$= "") -// { -// messageClient(%client, 'voteAlreadyRunning', '\c2A vote is already in progress.'); -// return; -// } -// %actionMsg = ($Host::LakRabbitNoSplashDamage ? "enable SplashDamage" : "disable SplashDamage"); -// for(%idx = 0; %idx < ClientGroup.getCount(); %idx++) -// { -// %cl = ClientGroup.getObject(%idx); -// if(!%cl.isAIControlled()) -// { -// messageClient(%cl, 'VoteStarted', '\c2%1 initiated a vote to %2.', %client.name, %actionMsg); -// %clientsVoting++; -// } -// } -// playerStartNewVote(%client, %typename, %arg1, %arg2, %arg3, %arg4, %clientsVoting); -// } -// // -// // chocotaco 8/7/2018 - Added support for LakRabbit Pro option -// // -// case "VotePro": -// if( %isAdmin && !%client.ForceVote ) -// { -// adminStartNewVote(%client, %typename, %arg1, %arg2, %arg3, %arg4); -// adminLog(%client, " has toggled " @ %arg1 @ " (" @ %arg2 @ ")"); -// } -// else -// { -// if(Game.scheduleVote !$= "") -// { -// messageClient(%client, 'voteAlreadyRunning', '\c2A vote is already in progress.'); -// return; -// } -// %actionMsg = ($Host::LakRabbitPubPro ? "disable Pro mode" : "enable Pro mode"); -// for(%idx = 0; %idx < ClientGroup.getCount(); %idx++) -// { -// %cl = ClientGroup.getObject(%idx); -// if(!%cl.isAIControlled()) -// { -// messageClient(%cl, 'VoteStarted', '\c2%1 initiated a vote to %2.', %client.name, %actionMsg); -// %clientsVoting++; -// } -// } -// playerStartNewVote(%client, %typename, %arg1, %arg2, %arg3, %arg4, %clientsVoting); -// } -//} +function LakRabbitGame::throwDummyFlag(%position, %datablock, %player, %ttl) +{ + %client = %player.client; + + // create a flag and throw it + %droppedflag = new Item() { + position = %position; + rotation = "0 0 1 " @ (getRandom() * 360); + scale = "1 1 1"; + dataBlock = %datablock; + collideable = "0"; + static = "0"; + rotate = "1"; + team = "0"; + isFake = 1; + }; + MissionCleanup.add(%droppedflag); + + %vec = (-1.0 + getRandom() * 2.0) SPC (-1.0 + getRandom() * 2.0) SPC getRandom(); + %vec = VectorScale(%vec, getrandom(250,1000) + (getRandom() * 300)); + + // Add player's velocity + if (%player !$= "") + { + %droppedflag.setCollisionTimeout(%player); + %vec = vectorAdd(%vec, %player.getVelocity()); + } + + %droppedflag.applyImpulse(%pos, %vec); + + %droppedFlag.die = schedule(getrandom(1500,3500), 0, "removeLakFakeFlag", %droppedflag); +} + +function removeLakFakeFlag(%flag) +{ + %flag.startFade(600, 0, true); + %flag.schedule(601, "delete"); +} From 97c9bf7270374ba190dfa9caba5f2f42eedcdad6 Mon Sep 17 00:00:00 2001 From: ChocoTaco1 Date: Sun, 23 Nov 2025 13:14:18 -0500 Subject: [PATCH 45/48] Update LakRabbitGame.cs --- Classic/scripts/LakRabbitGame.cs | 174 +++++++++++++++++-------------- 1 file changed, 93 insertions(+), 81 deletions(-) diff --git a/Classic/scripts/LakRabbitGame.cs b/Classic/scripts/LakRabbitGame.cs index 0dea6d2..f5cdf80 100644 --- a/Classic/scripts/LakRabbitGame.cs +++ b/Classic/scripts/LakRabbitGame.cs @@ -457,94 +457,106 @@ function Armor::damageObject(%data, %targetObject, %sourceObject, %position, %am %sound = %defaultSound; } - %tgPos = %targetObject.getPosition(); - %terrHeight = getTerrainHeight(getWords(%tgPos,0,1)); - %playerHeight = mAbs(getWord(%tgPos,2) - %terrHeight); + if(%targetObject.holdingFlag) + { + %tgPos = %targetObject.getPosition(); + %terrHeight = getTerrainHeight(getWords(%tgPos,0,1)); + %playerHeight = mAbs(getWord(%tgPos,2) - %terrHeight); + } - // special knockback if you hit too close, max 15% chance (point blank).. 5% at 30meters, 1% chance for any MA + if(%targetObject.holdingFlag && %playerHeight >= 100) + { + // tr2 style flag drop.. it does kill the rabbit - // Slap based on a Disc headshot - //%chance = mFloor(25 - %distance/3); - //if(%ma && getRandom(1,50) <= %chance && %targetObject.client.headshot) + %chance = mFloor(20 - %distance/%playerHeight); + if(%chance <= 0) %chance = 1; + if(%ma && getRandom(1,100) <= %chance) + { + Game.playerDroppedFlag(%targetObject); - //Normal Slap - %chance = mFloor(15 - %distance/3); - if(%chance <= 0) %chance = 1; - - if(%ma && getRandom(1,100) <= %chance) + %position = %targetObject.getPosition(); + %count = 40; + %ttl = 60000; + %player = %targetObject; + if( %position $= "" ) { - if(%targetObject.holdingFlag) - { - Game.playerDroppedFlag(%targetObject); - //Added so cloak is turned off when slapped. - %targetObject.setCloaked(false); - %targetObject.freeDJ = 1; - } - if(%sourceObject.holdingFlag && Game.duelMode) - { - duelBonus(%sourceObject.client); - $LakDamaged[%targetObject.client] = 0; - } - - // lower damage and make invincible to ground damage to make it a little more fun - %amount = 0.01; - %targetObject.setKnockback(true); - %targetObject.schedule(15000, "setKnockback", false); - - %p = %targetObject.getWorldBoxCenter(); - %muzzleVec = %sourceObject.getMuzzleVector(0); - %impulseVec = VectorScale(%muzzleVec, 25000); - %targetObject.applyImpulse(%p, %impulseVec); - %sound = '~wfx/misc/slapshot.wav'; - - %slapmsg = getRandom(1,3); - switch$(%slapmsg) - { - case 1: - messageAll('msgSlapmessage','\c0%1 wonders what the five fingers said to the face.', %targetObject.client.name ); - case 2: - messageAll('msgSlapmessage','\c0%1 gets slapped the heck out!', %targetObject.client.name ); - case 3: - messageAll('msgSlapmessage','\c0%1 is taking a short tour around the map.', %targetObject.client.name ); - } + error("No position passed!"); + return 0; } - else if(%ma && getRandom(1,35) <= %chance && %playerHeight >= 100 && %targetObject.holdingFlag) + if( %count <= 0 ) { - - Game.playerDroppedFlag(%targetObject); - - %position = %targetObject.getPosition(); - %count = 40; - %ttl = 60000; - %player = %targetObject; - if( %position $= "" ) - { - error("No position passed!"); - return 0; - } - if( %count <= 0 ) - { - error("Number of flags to spew must be greater than 0!"); - return 0; - } - - %flagArr[0] = LakFakeFlag8; - %flagArr[1] = LakFakeFlag2; - %flagArr[2] = LakFakeFlag4; - - while( %count > 0 ) - { - %index = mFloor(getRandom() * 3); - // throwDummyFlag(location, Datablock); - LakRabbitGame::throwDummyFlag(%position, %flagArr[%index], %player, %ttl); - %count--; - } - - %targetObject.blowup(); - %targetObject.scriptKill($DamageType::Explosion); - %sound = '~wfx/misc/MA1.wav'; + error("Number of flags to spew must be greater than 0!"); + return 0; } + + %flagArr[0] = LakFakeFlag8; + %flagArr[1] = LakFakeFlag2; + %flagArr[2] = LakFakeFlag4; + + while( %count > 0 ) + { + %index = mFloor(getRandom() * 3); + // throwDummyFlag(location, Datablock); + LakRabbitGame::throwDummyFlag(%position, %flagArr[%index], %player, %ttl); + %count--; + } + + %targetObject.blowup(); + %targetObject.scriptKill($DamageType::Explosion); + %sound = '~wfx/misc/MA1.wav'; + } + } + else + { + // special knockback if you hit too close, max 15% chance (point blank).. 5% at 30meters, 1% chance for any MA + + // Slap based on a Disc headshot + //%chance = mFloor(25 - %distance/3); + //if(%ma && getRandom(1,50) <= %chance && %targetObject.client.headshot) + + //Normal Slap + %chance = mFloor(15 - %distance/3); + if(%chance <= 0) %chance = 1; + + if(%ma && getRandom(1,100) <= %chance) + { + if(%targetObject.holdingFlag) + { + Game.playerDroppedFlag(%targetObject); + //Added so cloak is turned off when slapped. + %targetObject.setCloaked(false); + %targetObject.freeDJ = 1; + } + if(%sourceObject.holdingFlag && Game.duelMode) + { + duelBonus(%sourceObject.client); + $LakDamaged[%targetObject.client] = 0; + } + + // lower damage and make invincible to ground damage to make it a little more fun + %amount = 0.01; + %targetObject.setKnockback(true); + %targetObject.schedule(15000, "setKnockback", false); + + %p = %targetObject.getWorldBoxCenter(); + %muzzleVec = %sourceObject.getMuzzleVector(0); + %impulseVec = VectorScale(%muzzleVec, 25000); + %targetObject.applyImpulse(%p, %impulseVec); + %sound = '~wfx/misc/slapshot.wav'; + + %slapmsg = getRandom(1,3); + switch$(%slapmsg) + { + case 1: + messageAll('msgSlapmessage','\c0%1 wonders what the five fingers said to the face.', %targetObject.client.name ); + case 2: + messageAll('msgSlapmessage','\c0%1 gets slapped the heck out!', %targetObject.client.name ); + case 3: + messageAll('msgSlapmessage','\c0%1 is taking a short tour around the map.', %targetObject.client.name ); + } + } + } %weapon = "Disc"; case $DamageType::Grenade: if($lastObjExplode.isHandNade) //Hand grenades @@ -2757,7 +2769,7 @@ function LakRabbitGame::throwDummyFlag(%position, %datablock, %player, %ttl) %droppedflag.applyImpulse(%pos, %vec); - %droppedFlag.die = schedule(getrandom(1500,3500), 0, "removeLakFakeFlag", %droppedflag); + %droppedFlag.die = schedule(getrandom(1500,5500), 0, "removeLakFakeFlag", %droppedflag); } function removeLakFakeFlag(%flag) From e99b0131834fd818da39fbce6ae21ecb201615b1 Mon Sep 17 00:00:00 2001 From: ChocoTaco1 Date: Fri, 5 Dec 2025 16:48:41 -0500 Subject: [PATCH 46/48] Update TacoOverrides.cs Treat all vehicles the same --- Classic/scripts/autoexec/TacoOverrides.cs | 30 ++++++----------------- 1 file changed, 7 insertions(+), 23 deletions(-) diff --git a/Classic/scripts/autoexec/TacoOverrides.cs b/Classic/scripts/autoexec/TacoOverrides.cs index 0e8fb6e..d5840ef 100644 --- a/Classic/scripts/autoexec/TacoOverrides.cs +++ b/Classic/scripts/autoexec/TacoOverrides.cs @@ -57,7 +57,7 @@ function VehicleData::onDestroyed(%data, %obj, %prevState) %zVel = (getRandom() * 100.0) + 50.0; %flingVel = %xVel @ " " @ %yVel @ " " @ %zVel; %flingee.applyImpulse(%flingee.getTransform(), %flingVel); - echo("got player..." @ %flingee.getClassName()); + //echo("got player..." @ %flingee.getClassName()); %flingee.damage(0, %obj.getPosition(), 0.4, $DamageType::Crash); } } @@ -70,29 +70,13 @@ function VehicleData::onDestroyed(%data, %obj, %prevState) %data.deleteAllMounted(%obj); // ----------------------------------------------------------------------------------------- // z0dd - ZOD - Czar, 6/24/02. Move this vehicle out of the way so nothing collides with it. - if(%data.getName() $="AssaultVehicle") - { - // %obj.setFrozenState(true); - %obj.schedule(500, "delete"); //was 2000 - //%data.schedule(500, 'onAvoidCollisions', %obj); + %obj.setFrozenState(true); + %obj.schedule(2000, "delete"); //was 500 + %data.schedule(500, 'onAvoidCollisions', %obj); - //Transfer the vehicle far away - %obj.schedule(128, "setPosition", vectorAdd(%obj.getPosition(), "40 -27 10000")); //Lowered: was 500 - } - else if(%data.getName() $="BomberFlyer" || %data.getName() $="MobileBaseVehicle") - { - // %obj.setFrozenState(true); - %obj.schedule(2000, "delete"); //was 2000 - //%data.schedule(500, 'onAvoidCollisions', %obj); + //Transfer the vehicle far away + %obj.schedule(128, "setPosition", vectorAdd(%obj.getPosition(), "40 -27 10000")); //Lowered: was 500 - //Transfer the vehicle far away - %obj.schedule(128, "setPosition", vectorAdd(%obj.getPosition(), "40 -27 10000")); //Lowered: was 500 - } - else - { - %obj.setFrozenState(true); - %obj.schedule(500, "delete"); //was 500 - } // ----------------------------------------------------------------------------------------- } @@ -422,4 +406,4 @@ if (!isActivePackage(TacoOverrides)) // %z = getWord(%impulseVec, 2) / %data.mass; // %vel = %x SPC %y SPC %z; // %this.setVelocity(vectorAdd(%this.getVelocity(), %vel)); -// } \ No newline at end of file +// } From 47e19322791fd973808cc650852080fd208d5226 Mon Sep 17 00:00:00 2001 From: ChocoTaco1 Date: Mon, 15 Dec 2025 12:43:12 -0500 Subject: [PATCH 47/48] TotalTeamPlayerCount fix Improper team count for lakrabbit which effects things like setnextmission votes --- Classic/scripts/autoexec/TeamManagement.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Classic/scripts/autoexec/TeamManagement.cs b/Classic/scripts/autoexec/TeamManagement.cs index 8785f05..5862199 100644 --- a/Classic/scripts/autoexec/TeamManagement.cs +++ b/Classic/scripts/autoexec/TeamManagement.cs @@ -42,7 +42,7 @@ function GetTeamCounts(%game) if($countdownStarted && $MatchStarted) { //Variables - $TotalTeamPlayerCount = $TeamRank[1, count] + $TeamRank[2, count]; + $TotalTeamPlayerCount = (Game.class $= "LakRabbitGame") ? $TeamRank[0, count] : ($TeamRank[1, count] + $TeamRank[2, count]); $AllPlayerCount = $HostGamePlayerCount; //Observers From 74ed8c8cdee8a798833fcf2ad5d6786ecb7a335b Mon Sep 17 00:00:00 2001 From: ChocoTaco1 Date: Mon, 5 Jan 2026 15:57:01 -0500 Subject: [PATCH 48/48] Added LCTF --- Classic/scripts/inventory.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Classic/scripts/inventory.cs b/Classic/scripts/inventory.cs index 1093efd..5dbac31 100644 --- a/Classic/scripts/inventory.cs +++ b/Classic/scripts/inventory.cs @@ -445,7 +445,7 @@ function ShapeBase::throwObject(%this,%obj) { %obj.static = false; // z0dd - ZOD - SquirrelOfDeath, 10/02/02. Hack for flag collision bug. - if(Game.Class $= CTFGame || Game.Class $= PracticeCTFGame || Game.Class $= SCtFGame) + if(Game.Class $= CTFGame || Game.Class $= PracticeCTFGame || Game.Class $= SCtFGame || Game.Class $= LCTFGame) %obj.searchSchedule = Game.schedule(10, "startFlagCollisionSearch", %obj); } //------------------------------------------------------------------