From 429a38af75c94f682fd80224ae272fd7453fbec2 Mon Sep 17 00:00:00 2001 From: ChocoTaco Date: Sat, 16 Mar 2019 15:19:20 -0400 Subject: [PATCH] Smurf Name bug fix --- Classic/scripts/autoexec/zDarkTigerStats.cs | 226 ++++++++++---------- 1 file changed, 114 insertions(+), 112 deletions(-) diff --git a/Classic/scripts/autoexec/zDarkTigerStats.cs b/Classic/scripts/autoexec/zDarkTigerStats.cs index 9d8d863..14cc40e 100644 --- a/Classic/scripts/autoexec/zDarkTigerStats.cs +++ b/Classic/scripts/autoexec/zDarkTigerStats.cs @@ -22,11 +22,11 @@ $dtStats::fullGames["CTFGame"] = 1; //if they are here for 75% of the game, count it as a full game, this percentage is calc from time and score limit $dtStats::fgPercentage["CTFGame"] = 25; //0 score based, 1 time based, 2 the closer one to finishing the game, 3 mix avg -$dtStats::fgPercentageType["CTFGame"] = 2; +$dtStats::fgPercentageType["CTFGame"] = 0; $dtStats::fullGames["LakRabbitGame"] = 1; $dtStats::fgPercentage["LakRabbitGame"] = 25; -$dtStats::fgPercentageType["LakRabbitGame"] = 2; +$dtStats::fgPercentageType["LakRabbitGame"] = 0; $dtStats::returnToMenuTimer = (30*1000)*1;// 1 min after not making an action reset //Set to 1 when your makeing changes to the menu so you can see them update live note the refresh rate is like 2-4 secs @@ -499,11 +499,11 @@ package dtStats{ serverCmdObserveClient(%client, %targetClient); displayObserverHud(%client, %targetClient); - //if (%targetClient != %prevObsClient) - //{ - //messageClient(%targetClient, 'Observer', '\c1%1 is now observing you.', %client.name); - //messageClient(%prevObsClient, 'ObserverEnd', '\c1%1 is no longer observing you.', %client.name); - //} + if (%targetClient != %prevObsClient) + { + messageClient(%targetClient, 'Observer', '\c1%1 is now observing you.', %client.name); + messageClient(%prevObsClient, 'ObserverEnd', '\c1%1 is no longer observing you.', %client.name); + } } } @@ -862,11 +862,11 @@ package dtStats{ serverCmdObserveClient(%client, %targetClient); displayObserverHud(%client, %targetClient); - //if (%targetClient != %prevObsClient) - //{ - //messageClient(%targetClient, 'Observer', '\c1%1 is now observing you.', %client.name); - //messageClient(%prevObsClient, 'ObserverEnd', '\c1%1 is no longer observing you.', %client.name); - //} + if (%targetClient != %prevObsClient) + { + messageClient(%targetClient, 'Observer', '\c1%1 is now observing you.', %client.name); + messageClient(%prevObsClient, 'ObserverEnd', '\c1%1 is no longer observing you.', %client.name); + } } } function LakRabbitGame::updateScoreHud(%game, %client, %tag){ @@ -991,34 +991,34 @@ package dtStats{ if(%client.isAdmin || %client.isSuperAdmin || !$dtStats::viewSelf){ if(%col1Client.name !$= "" && %col2Client.name !$= "") messageClient( %client, 'SetLineHud', "", %tag, %index, '%7\t+ %1%2%3%8+ %4%5%6', - %col1Client.nameBase, %col1ClientScore, %col1ClientTime, %col2Client.nameBase, %col2ClientScore, %col2ClientTime, %col1Style, %col2Style); + %col1Client.name, %col1ClientScore, %col1ClientTime, %col2Client.name, %col2ClientScore, %col2ClientTime, %col1Style, %col2Style); else if(%col1Client.name !$= "" && %col2Client.name $= "") messageClient( %client, 'SetLineHud', "", %tag, %index, '%7\t+ %1%2%3%8%4%5%6', - %col1Client.nameBase, %col1ClientScore, %col1ClientTime, %col2Client.nameBase, %col2ClientScore, %col2ClientTime, %col1Style, %col2Style); + %col1Client.name, %col1ClientScore, %col1ClientTime, %col2Client.name, %col2ClientScore, %col2ClientTime, %col1Style, %col2Style); else if(%col1Client.name $= "" && %col2Client.name !$= "") messageClient( %client, 'SetLineHud', "", %tag, %index, '%7\t%1%2%3%8+ %4%5%6', - %col1Client.nameBase, %col1ClientScore, %col1ClientTime, %col2Client.nameBase, %col2ClientScore, %col2ClientTime, %col1Style, %col2Style); + %col1Client.name, %col1ClientScore, %col1ClientTime, %col2Client.name, %col2ClientScore, %col2ClientTime, %col1Style, %col2Style); else messageClient( %client, 'SetLineHud', "", %tag, %index, '%7\t%1%2%3%8%4%5%6', - %col1Client.nameBase, %col1ClientScore, %col1ClientTime, %col2Client.nameBase, %col2ClientScore, %col2ClientTime, %col1Style, %col2Style); + %col1Client.name, %col1ClientScore, %col1ClientTime, %col2Client.name, %col2ClientScore, %col2ClientTime, %col1Style, %col2Style); } else{ if(%col1Client.name $= %client.name && %col2Client.name !$= "")//+ messageClient( %client, 'SetLineHud', "", %tag, %index, '%7\t+ %1%2%3%8 %4%5%6', - %col1Client.nameBase, %col1ClientScore, %col1ClientTime, %col2Client.nameBase, %col2ClientScore, %col2ClientTime, %col1Style, %col2Style); + %col1Client.name, %col1ClientScore, %col1ClientTime, %col2Client.name, %col2ClientScore, %col2ClientTime, %col1Style, %col2Style); else if(%col1Client.name !$= "" && %col2Client.name $= %client.name)//+ messageClient( %client, 'SetLineHud', "", %tag, %index, '%7\t %1%2%3%8+ %4%5%6', - %col1Client.nameBase, %col1ClientScore, %col1ClientTime, %col2Client.nameBase, %col2ClientScore, %col2ClientTime, %col1Style, %col2Style); + %col1Client.name, %col1ClientScore, %col1ClientTime, %col2Client.name, %col2ClientScore, %col2ClientTime, %col1Style, %col2Style); else if(%col1Client.name $= %client.name && %col2Client.name $= "") messageClient( %client, 'SetLineHud', "", %tag, %index, '%7\t+ %1%2%3%8%4%5%6', - %col1Client.nameBase, %col1ClientScore, %col1ClientTime, %col2Client.nameBase, %col2ClientScore, %col2ClientTime, %col1Style, %col2Style); + %col1Client.name, %col1ClientScore, %col1ClientTime, %col2Client.name, %col2ClientScore, %col2ClientTime, %col1Style, %col2Style); else if(%col1Client.name $= "" && %col2Client.name $= %client.name) messageClient( %client, 'SetLineHud', "", %tag, %index, '%7\t%1%2%3%8+ %4%5%6', - %col1Client.nameBase, %col1ClientScore, %col1ClientTime, %col2Client.nameBase, %col2ClientScore, %col2ClientTime, %col1Style, %col2Style); + %col1Client.name, %col1ClientScore, %col1ClientTime, %col2Client.name, %col2ClientScore, %col2ClientTime, %col1Style, %col2Style); else messageClient( %client, 'SetLineHud', "", %tag, %index, '%7\t%1%2%3%8%4%5%6', - %col1Client.nameBase, %col1ClientScore, %col1ClientTime, %col2Client.nameBase, %col2ClientScore, %col2ClientTime, %col1Style, %col2Style); + %col1Client.name, %col1ClientScore, %col1ClientTime, %col2Client.name, %col2ClientScore, %col2ClientTime, %col1Style, %col2Style); } } @@ -1026,18 +1026,18 @@ package dtStats{ if(%client.isAdmin || %client.isSuperAdmin || !$dtStats::viewSelf){ if(%col1Client.name !$= "") messageClient( %client, 'SetLineHud', "", %tag, %index, '%4\t+ %1%2%3', - %col1Client.nameBase, %col1ClientScore, %col1ClientTime, %col1Style); + %col1Client.name, %col1ClientScore, %col1ClientTime, %col1Style); else messageClient( %client, 'SetLineHud', "", %tag, %index, '%4\t%1%2%3', - %col1Client.nameBase, %col1ClientScore, %col1ClientTime, %col1Style ); + %col1Client.name, %col1ClientScore, %col1ClientTime, %col1Style ); } else{ if(%col1Client.name $= %client.name) messageClient( %client, 'SetLineHud', "", %tag, %index, '%4\t+ %1%2%3', - %col1Client.nameBase, %col1ClientScore, %col1ClientTime, %col1Style); + %col1Client.name, %col1ClientScore, %col1ClientTime, %col1Style); else messageClient( %client, 'SetLineHud', "", %tag, %index, '%4\t%1%2%3', - %col1Client.nameBase, %col1ClientScore, %col1ClientTime, %col1Style ); + %col1Client.name, %col1ClientScore, %col1ClientTime, %col1Style ); } } } @@ -1052,23 +1052,23 @@ package dtStats{ { if(%col1Client.name !$= "" && %col2Client.name !$= "") messageClient( %client, 'SetLineHud', "", %tag, %index, '%7\t+ %1%2%3+ %4%5%6', - %col1Client.nameBase, %col1ClientScore, %col1ClientTime, - %col2Client.nameBase, %col2ClientScore, %col2ClientTime, + %col1Client.name, %col1ClientScore, %col1ClientTime, + %col2Client.name, %col2ClientScore, %col2ClientTime, %col1Style, %col1Client, %col2Client ); else if(%col1Client.name !$= "" && %col2Client.name $= "") messageClient( %client, 'SetLineHud', "", %tag, %index, '%7\t+ %1%2%3%4%5%6', - %col1Client.nameBase, %col1ClientScore, %col1ClientTime, - %col2Client.nameBase, %col2ClientScore, %col2ClientTime, + %col1Client.name, %col1ClientScore, %col1ClientTime, + %col2Client.name, %col2ClientScore, %col2ClientTime, %col1Style, %col1Client, %col2Client ); else if(%col1Client.name $= "" && %col2Client.name !$= "") messageClient( %client, 'SetLineHud', "", %tag, %index, '%7\t%1%2%3+ %4%5%6', - %col1Client.nameBase, %col1ClientScore, %col1ClientTime, - %col2Client.nameBase, %col2ClientScore, %col2ClientTime, + %col1Client.name, %col1ClientScore, %col1ClientTime, + %col2Client.name, %col2ClientScore, %col2ClientTime, %col1Style, %col1Client, %col2Client ); else messageClient( %client, 'SetLineHud', "", %tag, %index, '%7\t%1%2%3%4%5%6', - %col1Client.nameBase, %col1ClientScore, %col1ClientTime, - %col2Client.nameBase, %col2ClientScore, %col2ClientTime, + %col1Client.name, %col1ClientScore, %col1ClientTime, + %col2Client.name, %col2ClientScore, %col2ClientTime, %col1Style, %col1Client, %col2Client ); } @@ -1076,46 +1076,46 @@ package dtStats{ { if(%col1Client.name !$= "" && %col2Client.name !$= "") messageClient( %client, 'SetLineHud', "", %tag, %index, '%7\t+ %1%2%3+ %4%5%6', - %col1Client.nameBase, %col1ClientScore, %col1ClientTime, - %col2Client.nameBase, %col2ClientScore, %col2ClientTime, + %col1Client.name, %col1ClientScore, %col1ClientTime, + %col2Client.name, %col2ClientScore, %col2ClientTime, %col1Style, %col1Client, %col2Client ); else if(%col1Client.name !$= "" && %col2Client.name $= "") messageClient( %client, 'SetLineHud', "", %tag, %index, '%7\t+ %1%2%3%4%5%6', - %col1Client.nameBase, %col1ClientScore, %col1ClientTime, - %col2Client.nameBase, %col2ClientScore, %col2ClientTime, + %col1Client.name, %col1ClientScore, %col1ClientTime, + %col2Client.name, %col2ClientScore, %col2ClientTime, %col1Style, %col1Client, %col2Client ); else if(%col1Client.name $= "" && %col2Client.name !$= "") messageClient( %client, 'SetLineHud', "", %tag, %index, '%7\t%1%2%3+ %4%5%6', - %col1Client.nameBase, %col1ClientScore, %col1ClientTime, - %col2Client.nameBase, %col2ClientScore, %col2ClientTime, + %col1Client.name, %col1ClientScore, %col1ClientTime, + %col2Client.name, %col2ClientScore, %col2ClientTime, %col1Style, %col1Client, %col2Client ); else messageClient( %client, 'SetLineHud', "", %tag, %index, '%7\t%1%2%3%4%5%6', - %col1Client.nameBase, %col1ClientScore, %col1ClientTime, - %col2Client.nameBase, %col2ClientScore, %col2ClientTime, + %col1Client.name, %col1ClientScore, %col1ClientTime, + %col2Client.name, %col2ClientScore, %col2ClientTime, %col1Style, %col1Client, %col2Client ); } else { if(%col1Client.name !$= "" && %col2Client.name !$= "") messageClient( %client, 'SetLineHud', "", %tag, %index, '%7\t+ %1%2%3+ %4%5%6', - %col1Client.nameBase, %col1ClientScore, %col1ClientTime, - %col2Client.nameBase, %col2ClientScore, %col2ClientTime, + %col1Client.name, %col1ClientScore, %col1ClientTime, + %col2Client.name, %col2ClientScore, %col2ClientTime, %col1Style, %col1Client, %col2Client ); else if(%col1Client.name !$= "" && %col2Client.name $= "") messageClient( %client, 'SetLineHud', "", %tag, %index, '%7\t+ %1%2%3%4%5%6', - %col1Client.nameBase, %col1ClientScore, %col1ClientTime, - %col2Client.nameBase, %col2ClientScore, %col2ClientTime, + %col1Client.name, %col1ClientScore, %col1ClientTime, + %col2Client.name, %col2ClientScore, %col2ClientTime, %col1Style, %col1Client, %col2Client ); else if(%col1Client.name $= "" && %col2Client.name !$= "") messageClient( %client, 'SetLineHud', "", %tag, %index, '%7\t%1%2%3+ %4%5%6', - %col1Client.nameBase, %col1ClientScore, %col1ClientTime, - %col2Client.nameBase, %col2ClientScore, %col2ClientTime, + %col1Client.name, %col1ClientScore, %col1ClientTime, + %col2Client.name, %col2ClientScore, %col2ClientTime, %col1Style, %col1Client, %col2Client ); else messageClient( %client, 'SetLineHud', "", %tag, %index, '%7\t%1%2%3%4%5%6', - %col1Client.nameBase, %col1ClientScore, %col1ClientTime, - %col2Client.nameBase, %col2ClientScore, %col2ClientTime, + %col1Client.name, %col1ClientScore, %col1ClientTime, + %col2Client.name, %col2ClientScore, %col2ClientTime, %col1Style, %col1Client, %col2Client ); } } @@ -1124,28 +1124,28 @@ package dtStats{ { if(%col1Client.name $= %client.name && %col2Client.name !$= "") messageClient( %client, 'SetLineHud', "", %tag, %index, '%7\t+ %1%2%3 %4%5%6', - %col1Client.nameBase, %col1ClientScore, %col1ClientTime, - %col2Client.nameBase, %col2ClientScore, %col2ClientTime, + %col1Client.name, %col1ClientScore, %col1ClientTime, + %col2Client.name, %col2ClientScore, %col2ClientTime, %col1Style, %col1Client, %col2Client ); else if(%col1Client.name !$= "" && %col2Client.name $= %client.name) messageClient( %client, 'SetLineHud', "", %tag, %index, '%7\t %1%2%3+ %4%5%6', - %col1Client.nameBase, %col1ClientScore, %col1ClientTime, - %col2Client.nameBase, %col2ClientScore, %col2ClientTime, + %col1Client.name, %col1ClientScore, %col1ClientTime, + %col2Client.name, %col2ClientScore, %col2ClientTime, %col1Style, %col1Client, %col2Client ); else if(%col1Client.name $= %client.name && %col2Client.name $= "") messageClient( %client, 'SetLineHud', "", %tag, %index, '%7\t+ %1%2%3%4%5%6', - %col1Client.nameBase, %col1ClientScore, %col1ClientTime, - %col2Client.nameBase, %col2ClientScore, %col2ClientTime, + %col1Client.name, %col1ClientScore, %col1ClientTime, + %col2Client.name, %col2ClientScore, %col2ClientTime, %col1Style, %col1Client, %col2Client ); else if(%col1Client.name $= "" && %col2Client.name $= %client.name) messageClient( %client, 'SetLineHud', "", %tag, %index, '%7\t%1%2%3+ %4%5%6', - %col1Client.nameBase, %col1ClientScore, %col1ClientTime, - %col2Client.nameBase, %col2ClientScore, %col2ClientTime, + %col1Client.name, %col1ClientScore, %col1ClientTime, + %col2Client.name, %col2ClientScore, %col2ClientTime, %col1Style, %col1Client, %col2Client ); else messageClient( %client, 'SetLineHud', "", %tag, %index, '%7\t%1%2%3%4%5%6', - %col1Client.nameBase, %col1ClientScore, %col1ClientTime, - %col2Client.nameBase, %col2ClientScore, %col2ClientTime, + %col1Client.name, %col1ClientScore, %col1ClientTime, + %col2Client.name, %col2ClientScore, %col2ClientTime, %col1Style, %col1Client, %col2Client ); } @@ -1153,56 +1153,56 @@ package dtStats{ { if(%col1Client.name $= %client.name && %col2Client.name !$= "") messageClient( %client, 'SetLineHud', "", %tag, %index, '%7\t+ %1%2%3 %4%5%6', - %col1Client.nameBase, %col1ClientScore, %col1ClientTime, - %col2Client.nameBase, %col2ClientScore, %col2ClientTime, + %col1Client.name, %col1ClientScore, %col1ClientTime, + %col2Client.name, %col2ClientScore, %col2ClientTime, %col1Style, %col1Client, %col2Client ); else if(%col1Client.name !$= "" && %col2Client.name $= %client.name) messageClient( %client, 'SetLineHud', "", %tag, %index, '%7\t %1%2%3+ %4%5%6', - %col1Client.nameBase, %col1ClientScore, %col1ClientTime, - %col2Client.nameBase, %col2ClientScore, %col2ClientTime, + %col1Client.name, %col1ClientScore, %col1ClientTime, + %col2Client.name, %col2ClientScore, %col2ClientTime, %col1Style, %col1Client, %col2Client ); else if(%col1Client.name $= %client.name && %col2Client.name $= "") messageClient( %client, 'SetLineHud', "", %tag, %index, '%7\t+ %1%2%3%4%5%6', - %col1Client.nameBase, %col1ClientScore, %col1ClientTime, - %col2Client.nameBase, %col2ClientScore, %col2ClientTime, + %col1Client.name, %col1ClientScore, %col1ClientTime, + %col2Client.name, %col2ClientScore, %col2ClientTime, %col1Style, %col1Client, %col2Client ); else if(%col1Client.name $= "" && %col2Client.name $= %client.name) messageClient( %client, 'SetLineHud', "", %tag, %index, '%7\t%1%2%3+ %4%5%6', - %col1Client.nameBase, %col1ClientScore, %col1ClientTime, - %col2Client.nameBase, %col2ClientScore, %col2ClientTime, + %col1Client.name, %col1ClientScore, %col1ClientTime, + %col2Client.name, %col2ClientScore, %col2ClientTime, %col1Style, %col1Client, %col2Client ); else messageClient( %client, 'SetLineHud', "", %tag, %index, '%7\t%1%2%3%4%5%6', - %col1Client.nameBase, %col1ClientScore, %col1ClientTime, - %col2Client.nameBase, %col2ClientScore, %col2ClientTime, + %col1Client.name, %col1ClientScore, %col1ClientTime, + %col2Client.name, %col2ClientScore, %col2ClientTime, %col1Style, %col1Client, %col2Client ); } else { if(%col1Client.name $= %client.name && %col2Client.name !$= "")//+ messageClient( %client, 'SetLineHud', "", %tag, %index, '%7\t+ %1%2%3 %4%5%6', - %col1Client.nameBase, %col1ClientScore, %col1ClientTime, - %col2Client.nameBase, %col2ClientScore, %col2ClientTime, + %col1Client.name, %col1ClientScore, %col1ClientTime, + %col2Client.name, %col2ClientScore, %col2ClientTime, %col1Style, %col1Client, %col2Client ); else if(%col1Client.name !$= "" && %col2Client.name $= %client.name)//+ messageClient( %client, 'SetLineHud', "", %tag, %index, '%7\t %1%2%3+ %4%5%6', - %col1Client.nameBase, %col1ClientScore, %col1ClientTime, - %col2Client.nameBase, %col2ClientScore, %col2ClientTime, + %col1Client.name, %col1ClientScore, %col1ClientTime, + %col2Client.name, %col2ClientScore, %col2ClientTime, %col1Style, %col1Client, %col2Client ); else if(%col1Client.name $= %client.name && %col2Client.name $= "") messageClient( %client, 'SetLineHud', "", %tag, %index, '%7\t+ %1%2%3%4%5%6', - %col1Client.nameBase, %col1ClientScore, %col1ClientTime, - %col2Client.nameBase, %col2ClientScore, %col2ClientTime, + %col1Client.name, %col1ClientScore, %col1ClientTime, + %col2Client.name, %col2ClientScore, %col2ClientTime, %col1Style, %col1Client, %col2Client ); else if(%col1Client.name $= "" && %col2Client.name $= %client.name) messageClient( %client, 'SetLineHud', "", %tag, %index, '%7\t%1%2%3+ %4%5%6', - %col1Client.nameBase, %col1ClientScore, %col1ClientTime, - %col2Client.nameBase, %col2ClientScore, %col2ClientTime, + %col1Client.name, %col1ClientScore, %col1ClientTime, + %col2Client.name, %col2ClientScore, %col2ClientTime, %col1Style, %col1Client, %col2Client ); else messageClient( %client, 'SetLineHud', "", %tag, %index, '%7\t%1%2%3%4%5%6', - %col1Client.nameBase, %col1ClientScore, %col1ClientTime, - %col2Client.nameBase, %col2ClientScore, %col2ClientTime, + %col1Client.name, %col1ClientScore, %col1ClientTime, + %col2Client.name, %col2ClientScore, %col2ClientTime, %col1Style, %col1Client, %col2Client ); } @@ -1212,21 +1212,21 @@ package dtStats{ if(%client.isAdmin || %client.isSuperAdmin || !$dtStats::viewSelf){ if(%col1Client.name !$= ""){ messageClient( %client, 'SetLineHud', "", %tag, %index, '%4\t+ %1%2%3', - %col1Client.nameBase, %col1ClientScore, %col1ClientTime, %col1Style, %col1Client ); + %col1Client.name, %col1ClientScore, %col1ClientTime, %col1Style, %col1Client ); } else{ messageClient( %client, 'SetLineHud', "", %tag, %index, '%4\t%1%2%3', - %col1Client.nameBase, %col1ClientScore, %col1ClientTime, %col1Style, %col1Client ); + %col1Client.name, %col1ClientScore, %col1ClientTime, %col1Style, %col1Client ); } } else{ if(%col1Client.name $= %client.name){ messageClient( %client, 'SetLineHud', "", %tag, %index, '%4\t+ %1%2%3', - %col1Client.nameBase, %col1ClientScore, %col1ClientTime, %col1Style, %col1Client ); + %col1Client.name, %col1ClientScore, %col1ClientTime, %col1Style, %col1Client ); } else{ messageClient( %client, 'SetLineHud', "", %tag, %index, '%4\t%1%2%3', - %col1Client.nameBase, %col1ClientScore, %col1ClientTime, %col1Style, %col1Client ); + %col1Client.name, %col1ClientScore, %col1ClientTime, %col1Style, %col1Client ); } } } @@ -1242,7 +1242,7 @@ package dtStats{ %observerCount++; } - if (%observerCount > 0) + if (%observerCount > 0) { messageClient( %client, 'SetLineHud', "", %tag, %index, ""); %index++; @@ -1257,16 +1257,16 @@ package dtStats{ %obsTime = getSimTime() - %cl.observerStartTime; %obsTimeStr = %game.formatTime(%obsTime, false);//+ if(%client.isAdmin || %client.isSuperAdmin || !$dtStats::viewSelf){ - messageClient( %client, 'SetLineHud', "", %tag, %index, '\t+ %1%2', - %cl.name, %obsTimeStr,%cl.nameBase ); + messageClient( %client, 'SetLineHud', "", %tag, %index, '\t+ %1%2', + %cl.name, %obsTimeStr); } else if(%client.name $= %cl.name){ - messageClient( %client, 'SetLineHud', "", %tag, %index, '\t+ %1%2', - %cl.name, %obsTimeStr,%cl.nameBase ); + messageClient( %client, 'SetLineHud', "", %tag, %index, '\t+ %1%2', + %cl.name, %obsTimeStr); } else{ messageClient( %client, 'SetLineHud', "", %tag, %index, '\t %1%2', - %cl.name, %obsTimeStr,%cl.nameBase ); + %cl.name, %obsTimeStr); } %index++; @@ -1498,7 +1498,7 @@ function dtStatsMissionDropReady(%game, %client){ // called when client has fini //error(%dtStats.guid SPC %client.guid); %client.dtStats = %dtStats; %dtStats.client = %client; - %dtStats.name = %client.nameBase; + %dtStats.name = %client.name; %dtStats.clientLeft = 0; %dtStats.markForDelete = 0; %foundOld =1; @@ -1513,7 +1513,7 @@ function dtStatsMissionDropReady(%game, %client){ // called when client has fini %client.dtStats = %dtStats; %dtStats.client =%client; %dtStats.guid = %client.guid; - %dtStats.name =%client.nameBase; + %dtStats.name =%client.name; %dtStats.clientLeft = 0; %dtStats.markForDelete = 0; %dtStats.lastGame[%game.class] = 0; @@ -1737,18 +1737,20 @@ function getFieldValue(%obj,%field){ } } function getCNameToCID(%name){ + if(isObject(%name) && %name.getClassName() $= "GameConnection"){ - return %name; + return %name; // not a name its a client so return it } else{ for (%i = 0; %i < ClientGroup.getCount(); %i++){ %client = ClientGroup.getObject(%i); - if(%client.nameBase $= %name){ + if(getTaggedString(%client.name) $= %name){ return %client; } } } } + //////////////////////////////////////////////////////////////////////////////// //Load Save Management //////////////////////////////////////////////////////////////////////////////// @@ -2471,7 +2473,7 @@ function statsMenu(%client,%game){ switch$(%menu) { case "View": - messageClient( %client, 'SetScoreHudHeader', "", "" @ %vClient.namebase@ "'s Stats"); + messageClient( %client, 'SetScoreHudHeader', "", "" @ getTaggedString(%vClient.name) @ "'s Stats"); messageClient( %client, 'SetScoreHudSubheader', "", " Back"); //messageClient( %client, 'SetLineHud', "", %tag, %index++, " Main Options Menu"); if(%game $= "CTFGame"){ @@ -2587,7 +2589,7 @@ function statsMenu(%client,%game){ //%line = ' View ELF Projector Stats'; //messageClient( %client, 'SetLineHud', "", %tag, %index++, %line,%vClient); case "LAKH": - messageClient( %client, 'SetScoreHudHeader', "", "" @ %vClient.namebase @ "'s Lak History"); + messageClient( %client, 'SetScoreHudHeader', "", "" @ getTaggedString(%vClient.name) @ "'s Lak History"); messageClient( %client, 'SetScoreHudSubheader', "", ' Back - Return To Score Screen',%vClient); messageClient( %client, 'SetLineHud', "", %tag, %index++, "Game history is set to" SPC $dtStats::MaxNumOfGames SPC "games."); messageClient( %client, 'SetLineHud', "", %tag, %index++, "The oldest game will be overwritten."); @@ -2623,7 +2625,7 @@ function statsMenu(%client,%game){ } } case "Lak": - messageClient( %client, 'SetScoreHudHeader', "", "" @ %vClient.namebase @ "'s Match Stats"); + messageClient( %client, 'SetScoreHudHeader', "", "" @ getTaggedString(%vClient.name) @ "'s Match Stats"); messageClient( %client, 'SetScoreHudSubheader', "", ' Back - Return To Score Screen',%vClient); %header = " StatsTotalsTotals Avg"; messageClient( %client, 'SetLineHud', "", %tag, %index++, %header); @@ -2667,19 +2669,19 @@ function statsMenu(%client,%game){ messageClient( %client, 'SetLineHud', "", %tag, %index++, %line,%vClient,mCeil(getGameRunAvg(%vClient,"totalShocks",%game)),getGameTotal(%vClient,"totalShocks",%game),mCeil(getGameTotalAvg(%vClient,"totalShocks",%game))); case "CTFA": - messageClient( %client, 'SetScoreHudHeader', "", "" @ %vClient.namebase @ "'s Kills/Deaths"); + messageClient( %client, 'SetScoreHudHeader', "", "" @ getTaggedString(%vClient.name) @ "'s Kills/Deaths"); messageClient( %client, 'SetScoreHudSubheader', "", ' Back - Return To Score Screen',%vClient); %a1 = getGameTotal(%vClient,"cgKills",%game); %b2 = getGameTotal(%vClient,"cgDeaths",%game); %c3 = getGameTotal(%vClient,"discKills",%game); %d4 = getGameTotal(%vClient,"discDeaths",%game); %e5 = getGameTotal(%vClient,"grenadeKills",%game); %f6 = getGameTotal(%vClient,"grenadeDeaths",%game); - %line = ' Chaingun: %1k/%2dSpinfusor: %3k/%4dGrenade Launcher: %5k/%6d'; + %line = ' Chaingun: %1 k / %2 dSpinfusor: %3 k / %4 dGrenade Launcher: %5 k / %6 d'; messageClient( %client, 'SetLineHud', "", %tag, %index++, %line,%a1,%b2,%c3,%d4,%e5,%f6); %a1 = getGameTotal(%vClient,"laserKills",%game); %b2 = getGameTotal(%vClient,"laserDeaths",%game); %c3 = getGameTotal(%vClient,"mortarKills",%game); %d4 = getGameTotal(%vClient,"mortarDeaths",%game); %e5 = getGameTotal(%vClient,"shockLanceKills",%game); %f6 = getGameTotal(%vClient,"shockLanceDeaths",%game); - %line = ' Laser Rifle: %1k/%2dFusion Mortar: %3k/%4dShocklance: %5k/%6d'; + %line = ' Laser Rifle: %1 k / %2 dFusion Mortar: %3 k / %4 dShocklance: %5 k / %6 d'; messageClient( %client, 'SetLineHud', "", %tag, %index++, %line,%a1,%b2,%c3,%d4,%e5,%f6); %a1 = getGameTotal(%vClient,"plasmaKills",%game); %b2 = getGameTotal(%vClient,"plasmaDeaths",%game); %c3 = getGameTotal(%vClient,"blasterKills",%game); %d4 = getGameTotal(%vClient,"blasterDeaths",%game); %e5 = getGameTotal(%vClient,"elfKills",%game); %f6 = getGameTotal(%vClient,"elfDeaths",%game); - %line = ' Plasma Rifle: %1k/%2dBlaster: %3k/%4dELF Projector: %5k/%6d'; + %line = ' Plasma Rifle: %1 k / %2 dBlaster: %3 k / %4 dELF Projector: %5 k / %6 d'; messageClient( %client, 'SetLineHud', "", %tag, %index++, %line,%a1,%b2,%c3,%d4,%e5,%f6); //messageClient( %client, 'SetLineHud', "", %tag, %index++, " -----------------------------------------------------------------------------------------------------------------"); @@ -2688,49 +2690,49 @@ function statsMenu(%client,%game){ %a1 = getGameTotal(%vClient,"mineKills",%game); %b2 = getGameTotal(%vClient,"mineDeaths",%game); %c3 = getGameTotal(%vClient,"explosionKills",%game); %d4 = getGameTotal(%vClient,"explosionDeaths",%game); %e5 = getGameTotal(%vClient,"impactKills",%game); %f6 = getGameTotal(%vClient,"impactDeaths",%game); - %line = ' Mines: %1k/%2dExplosion: %3k/%4dImpact: %5k/%6d'; + %line = ' Mines: %1 k / %2 dExplosion: %3 k / %4 dImpact: %5 k / %6 d'; messageClient( %client, 'SetLineHud', "", %tag, %index++, %line,%a1,%b2,%c3,%d4,%e5,%f6); %a1 = getGameTotal(%vClient,"groundKills"); %b2 = getGameTotal(%vClient,"groundDeaths"); %c3 = getGameTotal(%vClient,"turretKills"); %d4 = getGameTotal(%vClient,"turretDeaths",%game); %e5 = getGameTotal(%vClient,"plasmaTurretKills",%game); %f6 = getGameTotal(%vClient,"plasmaTurretDeaths",%game); - %line = ' Ground: %1k/%2dTurret: %3k/%4dPlasma Turret: %5k/%6d'; + %line = ' Ground: %1 k / %2 dTurret: %3 k / %4 dPlasma Turret: %5 k / %6 d'; messageClient( %client, 'SetLineHud', "", %tag, %index++, %line,%a1,%b2,%c3,%d4,%e5,%f6); %a1 = getGameTotal(%vClient,"aaTurretKills"); %b2 = getGameTotal(%vClient,"aaTurretDeaths"); %c3 = getGameTotal(%vClient,"elfTurretKills"); %d4 = getGameTotal(%vClient,"elfTurretDeaths",%game); %e5 = getGameTotal(%vClient,"mortarTurretKills",%game); %f6 = getGameTotal(%vClient,"mortarTurretDeaths",%game); - %line = ' AA Turret: %1k/%2dELF Turret: %3k/%4dMortar Turret: %5k/%6d'; + %line = ' AA Turret: %1 k / %2 dELF Turret: %3 k / %4 dMortar Turret: %5 k / %6 d'; messageClient( %client, 'SetLineHud', "", %tag, %index++, %line,%a1,%b2,%c3,%d4,%e5,%f6); %a1 = getGameTotal(%vClient,"missileTurretKills",%game); %b2 = getGameTotal(%vClient,"missileTurretDeaths",%game); %c3 = getGameTotal(%vClient,"indoorDepTurretKills",%game); %d4 = getGameTotal(%vClient,"indoorDepTurretDeaths",%game); %e5 = getGameTotal(%vClient,"outdoorDepTurretKills",%game); %f6 = getGameTotal(%vClient,"outdoorDepTurretDeaths",%game); - %line = ' Missile Turret: %1k/%2dSpider Camp Turret: %3k/%4dLand Spike Turret: %5k/%6d'; + %line = ' Missile Turret: %1 k / %2 dSpider Camp Turret: %3 k / %4 dLand Spike Turret: %5 k / %6 d'; messageClient( %client, 'SetLineHud', "", %tag, %index++, %line,%a1,%b2,%c3,%d4,%e5,%f6); %a1 = getGameTotal(%vClient,"sentryTurretKills",%game); %b2 = getGameTotal(%vClient,"sentryTurretDeaths",%game); %c3 = getGameTotal(%vClient,"outOfBoundKills",%game); %d4 = getGameTotal(%vClient,"outOfBoundDeaths",%game); %e5 = getGameTotal(%vClient,"lavaKills",%game); %f6 = getGameTotal(%vClient,"lavaDeaths",%game); - %line = ' Sentry Turret: %1k/%2dOut Of Bounds: %3k/%4dLava: %5k/%6d'; + %line = ' Sentry Turret: %1 k / %2 dOut Of Bounds: %3 k / %4 dLava: %5 k / %6 d'; messageClient( %client, 'SetLineHud', "", %tag, %index++, %line,%a1,%b2,%c3,%d4,%e5,%f6); %a1 = getGameTotal(%vClient,"shrikeBlasterKills",%game); %b2 = getGameTotal(%vClient,"shrikeBlasterDeaths",%game); %c3 = getGameTotal(%vClient,"bellyTurretKills",%game); %d4 = getGameTotal(%vClient,"bellyTurretDeaths",%game); %e5 = getGameTotal(%vClient,"bomberBombsKills",%game); %f6 = getGameTotal(%vClient,"bomberBombsDeaths",%game); - %line = ' Shrike Blaster: %1k/%2dBomber Turret: %3k/%4dBomber Bombs: %5k/%6d'; + %line = ' Shrike Blaster: %1 k / %2 dBomber Turret: %3 k / %4 dBomber Bombs: %5 k / %6 d'; messageClient( %client, 'SetLineHud', "", %tag, %index++, %line,%a1,%b2,%c3,%d4,%e5,%f6); %a1 = getGameTotal(%vClient,"tankChaingunKills",%game); %b2 = getGameTotal(%vClient,"tankChaingunDeaths",%game); %c3 = getGameTotal(%vClient,"tankMortarKills",%game); %d4 = getGameTotal(%vClient,"tankMortarDeaths",%game); %e5 = getGameTotal(%vClient,"mpbMissileKills",%game); %f6 = getGameTotal(%vClient,"mpbMissileDeaths",%game); - %line = ' Tank Chaingun: %1k/%2dTank Mortar: %3k/%4dMPB Missile: %5k/%6d'; + %line = ' Tank Chaingun: %1 k / %2 dTank Mortar: %3 k / %4 dMPB Missile: %5 k / %6 d'; messageClient( %client, 'SetLineHud', "", %tag, %index++, %line,%a1,%b2,%c3,%d4,%e5,%f6); %a1 = getGameTotal(%vClient,"satchelChargeKills",%game); %b2 = getGameTotal(%vClient,"satchelChargeDeaths",%game); %c3 = getGameTotal(%vClient,"lightningKills",%game); %d4 = getGameTotal(%vClient,"lightningDeaths",%game); %e5 = getGameTotal(%vClient,"vehicleSpawnKills",%game); %f6 = getGameTotal(%vClient,"vehicleSpawnDeaths",%game); - %line = ' Satchel Charge: %1k/%2dLightning: %3k/%4dVehicle Spawn: %5k/%6d'; + %line = ' Satchel Charge: %1 k / %2 dLightning: %3 k / %4 dVehicle Spawn: %5 k / %6 d'; messageClient( %client, 'SetLineHud', "", %tag, %index++, %line,%a1,%b2,%c3,%d4,%e5,%f6); %a1 = getGameTotal(%vClient,"forceFieldPowerUpKills",%game); %b2 = getGameTotal(%vClient,"forceFieldPowerUpDeaths",%game); %c3 = getGameTotal(%vClient,"crashKills",%game); %d4 = getGameTotal(%vClient,"crashDeaths",%game); %e5 = getGameTotal(%vClient,"waterKills",%game); %f6 = getGameTotal(%vClient,"waterDeaths",%game); - %line = ' Forcefield Power: %1k/%2dCrash: %3k/%4dWater: %5k/%6d'; + %line = ' Forcefield Power: %1 k / %2 dCrash: %3 k / %4 dWater: %5 k / %6 d'; messageClient( %client, 'SetLineHud', "", %tag, %index++, %line,%a1,%b2,%c3,%d4,%e5,%f6); %a1 = getGameTotal(%vClient,"nexusCampingKills",%game); %b2 = getGameTotal(%vClient,"nexusCampingDeaths",%game); %c3 = getGameTotal(%vClient,"unknownKill",%game); %d4 = getGameTotal(%vClient,"unknownDeaths",%game); %e5 = 0; %f6 = 0; - %line = ' Nexus Camping: %1k/%2dUnknown??: %3k/%4d'; + %line = ' Nexus Camping: %1 k / %2 dUnknown??: %3 k / %4 d'; messageClient( %client, 'SetLineHud', "", %tag, %index++, %line,%a1,%b2,%c3,%d4,%e5,%f6); case "CTF": - messageClient( %client, 'SetScoreHudHeader', "", "" @ %vClient.namebase @ "'s Match Stats"); + messageClient( %client, 'SetScoreHudHeader', "", "" @ getTaggedString(%vClient.name) @ "'s Match Stats"); messageClient( %client, 'SetScoreHudSubheader', "", ' Back - Return To Score Screen',%vClient); %header = " StatsTotalsTotals Avg"; messageClient( %client, 'SetLineHud', "", %tag, %index++, %header); @@ -2793,7 +2795,7 @@ function statsMenu(%client,%game){ messageClient( %client, 'SetLineHud', "", %tag, %index++, %line,%vClient); case "CTFH":// Past Games - messageClient( %client, 'SetScoreHudHeader', "", "" @ %vClient.namebase @ "'s CTF History"); + messageClient( %client, 'SetScoreHudHeader', "", "" @ getTaggedString(%vClient.name) @ "'s CTF History"); messageClient( %client, 'SetScoreHudSubheader', "", ' Back - Return To Score Screen',%vClient); messageClient( %client, 'SetLineHud', "", %tag, %index++, "Game history is set to" SPC $dtStats::MaxNumOfGames SPC "games."); messageClient( %client, 'SetLineHud', "", %tag, %index++, "The oldest game will be overwritten.");