mirror of
https://github.com/ChocoTaco1/TacoServer.git
synced 2026-01-20 00:24:49 +00:00
Merge branch 'NoEvo'
This commit is contained in:
commit
3712385aec
|
|
@ -45,7 +45,7 @@
|
|||
//Small Maps
|
||||
/////////////////////////////////////////////////////////////////////
|
||||
|
||||
//addRotationMap("SmallCrossing", "CTF",1,1,-1,16); //Using Small Crossing: DMP Version
|
||||
//addRotationMap("SmallCrossing", "CTF",1,1,-1,16); //Using DMP Version
|
||||
addRotationMap("TWL2_CanyonCrusadeDeluxe", "CTF",1,1,-1,18);
|
||||
addRotationMap("RoundTheMountain", "CTF",1,1,-1,18);
|
||||
addRotationMap("oasisintensity", "CTF",1,1,-1,12);
|
||||
|
|
@ -74,8 +74,8 @@ addRotationMap("FrozenHope", "CTF",1,1,8,12);
|
|||
addRotationMap("ClusterUnFuct", "CTF",1,1,8,12);
|
||||
addRotationMap("Raspian", "CTF",1,0,8,12);
|
||||
addRotationMap("Zilch", "CTF",1,1,8,12);
|
||||
addRotationMap("Cinerarium", "CTF",1,0,-1,12);
|
||||
addRotationMap("StarFallCTF", "CTF",1,0,6,12);
|
||||
//addRotationMap("Cinerarium", "CTF",1,0,-1,12); //Using DMP Version
|
||||
//addRotationMap("StarFallCTF", "CTF",1,0,6,12); //Using DMP Version
|
||||
|
||||
//Medium Maps
|
||||
/////////////////////////////////////////////////////////////////////
|
||||
|
|
|
|||
|
|
@ -69,6 +69,8 @@ $Host::ClassicRotationFile = "prefs/mapRotation.cs";
|
|||
$Host::ClassicStatsType = 2;
|
||||
$Host::ClassicSuperAdminPassword = "changeme";
|
||||
$Host::ClassicSuppressTraversalRootError = 1;
|
||||
$Host::ClassicTeamKillLog = 1;
|
||||
$Host::ClassicTeamKillLogPath = "logs/TeamKills/teamkills.log";
|
||||
$Host::ClassicTelnet = 1;
|
||||
$Host::ClassicTelnetListenPass = "changeme";
|
||||
$Host::ClassicTelnetPassword = "changeme";
|
||||
|
|
@ -118,7 +120,7 @@ $Host::LoadScreenColor3 = "33CCCC";
|
|||
$Host::LoadScreenLine1 = "Join Discord:";
|
||||
$Host::LoadScreenLine1_Msg = "<a:playt2.com/discord>playt2.com/discord</a>";
|
||||
$Host::LoadScreenLine2 = "Game Modes:";
|
||||
$Host::LoadScreenLine2_Msg = "LakRabbit, Capture the Flag, DeathMatch, (Light Only) Capture the Flag, Siege";
|
||||
$Host::LoadScreenLine2_Msg = "LakRabbit, Capture the Flag, DeathMatch, (Light Only) Capture the Flag";
|
||||
$Host::LoadScreenLine3 = "Get Mappacks:";
|
||||
$Host::LoadScreenLine3_Msg = "<a:playt2.com/mappacks>playt2.com/mappacks</a>";
|
||||
$Host::LoadScreenLine4 = "Server Provided by:";
|
||||
|
|
|
|||
18
Classic/scripts/admin.cs
Normal file → Executable file
18
Classic/scripts/admin.cs
Normal file → Executable file
|
|
@ -477,7 +477,7 @@ function serverCmdGetAntiTurtleTimeList( %client, %key )
|
|||
|
||||
function serverCmdTogglePlayerGag(%client, %who)
|
||||
{
|
||||
if(%client.isSuperAdmin)
|
||||
if(%client.isAdmin || %client.isSuperAdmin)
|
||||
{
|
||||
if(!%who.isGagged && !%who.isSuperAdmin)
|
||||
{
|
||||
|
|
@ -485,7 +485,7 @@ function serverCmdTogglePlayerGag(%client, %who)
|
|||
messageClient(%client, 'MsgAdmin', 'You have Gagged %1.', %who.name);
|
||||
messageAllExcept(%who, -1, 'MsgAdminForce', '%1 has been Gagged by %2 for talking too much crap.', %who.name, %client.name);
|
||||
messageClient(%who, 'MsgAdminAction', 'You have Been Gagged by %1, quit talking trash and play.', %client.name);
|
||||
logEcho(%client.nameBase @ " gagged " @ %target.nameBase, 1);
|
||||
adminLog(%client, " gagged " @ %who.nameBase);
|
||||
}
|
||||
else if (%who.isGagged)
|
||||
{
|
||||
|
|
@ -493,11 +493,11 @@ function serverCmdTogglePlayerGag(%client, %who)
|
|||
messageClient(%client, 'MsgAdmin', 'You have UnGagged %1.', %who.name);
|
||||
messageAllExcept(%who, -1, 'MsgAdminAction', '%1 has been UnGagged by %2.', %who.name, %client.name);
|
||||
messageClient(%who, 'MsgAdminAction', 'You have Been UnGagged by %1, quit talking trash and play.', %client.name);
|
||||
logEcho(%client.nameBase @ " ungagged " @ %who.nameBase, 1);
|
||||
adminLog(%client, " ungagged " @ %who.nameBase);
|
||||
}
|
||||
}
|
||||
else
|
||||
messageClient(%client, 'MsgError', '\c2Only Super Admins can use this command.');
|
||||
// else
|
||||
// messageClient(%client, 'MsgError', '\c2Only Super Admins can use this command.');
|
||||
}
|
||||
|
||||
function serverCmdTogglePlayerFreeze(%client, %who)
|
||||
|
|
@ -523,7 +523,7 @@ function serverCmdTogglePlayerFreeze(%client, %who)
|
|||
messageClient(%client, 'MsgAdmin', 'You have Frozen %1.', %who.name);
|
||||
messageAllExcept(%who, -1, 'MsgAdminForce', '%1 has been Frozen by %2 for being a Llama.', %who.name, %client.name);
|
||||
messageClient(%who, 'MsgAdminAction', 'You have Been Frozen by %1, Think about what you have been doing.', %client.name);
|
||||
logEcho(%client.nameBase @ " froze " @ %who.nameBase, 1);
|
||||
adminLog(%client, " froze " @ %who.nameBase);
|
||||
}
|
||||
else if (%who.isFroze)
|
||||
{
|
||||
|
|
@ -533,7 +533,7 @@ function serverCmdTogglePlayerFreeze(%client, %who)
|
|||
messageClient(%client, 'MsgAdmin', 'You have de-iced %1.', %who.name);
|
||||
messageAllExcept(%who, -1, 'MsgAdminForce', '%1 has been Un Frozen by %2.', %who.name, %client.name);
|
||||
messageClient(%who, 'MsgAdminAction', 'You have Been de-Iced by %1, now behave.', %client.name);
|
||||
logEcho(%client.nameBase @ " unfroze " @ %who.nameBase, 1);
|
||||
adminLog(%client, " unfroze " @ %who.nameBase);
|
||||
}
|
||||
}
|
||||
else
|
||||
|
|
@ -557,7 +557,7 @@ function serverCmdBootToTheRear(%client, %who)
|
|||
%obj.applyImpulse(%obj.position, VectorScale(%vec, %obj.getDataBlock().mass*20));
|
||||
messageAllExcept(%who, -1, 'MsgAdminForce', '%1 has been given a boot to the rear by %2.', %who.name, %client.name);
|
||||
messageClient(%who, 'MsgAdminAction', 'You have Been given a boot to the ass by %1, now behave.', %client.name);
|
||||
logEcho(%client.nameBase @ " gave " @ %who.nameBase @ " a boot to the rear", 1);
|
||||
adminLog(%client, " gave " @ %who.nameBase @ " a boot to the rear");
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
@ -583,7 +583,7 @@ function serverCmdExplodePlayer(%client, %who)
|
|||
%who.player.scriptKill(0);
|
||||
messageAllExcept(%who, -1, 'MsgAdminForce', '%1 found some explosives in his pants planted by %2.', %who.name, %client.name);
|
||||
messageClient(%who, 'MsgAdminAction', 'You have Been dissasembled for inspection by the Super Admin %1, now behave.', %client.name);
|
||||
logEcho(%client.nameBase @ " exploded " @ %who.nameBase, 1);
|
||||
adminLog(%client, " exploded " @ %who.nameBase);
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
|
|||
18
Classic/scripts/autoexec/EnableLogs.cs
Normal file → Executable file
18
Classic/scripts/autoexec/EnableLogs.cs
Normal file → Executable file
|
|
@ -153,4 +153,22 @@ function ClassicChatLog(%client, %id, %team, %msg)
|
|||
$ClassicChatLog = stripChars($ClassicChatLog, "\c0\c1\c2\c3\c4\c5\c6\c7\c8\c9\x10\x11\co\cp");
|
||||
%path = $Host::ClassicChatLogPath @ formatTimeString("/yy/mm-MM/dd.log");
|
||||
export("$ClassicChatLog", %path, true);
|
||||
}
|
||||
|
||||
// Log Teamkills
|
||||
function teamkillLog(%victimID, %killerID)
|
||||
{
|
||||
if(!$Host::ClassicTeamKillLog)
|
||||
return;
|
||||
|
||||
//echo("TK Log");
|
||||
|
||||
//Note: %killerID.teamkills + 1 as this is added later
|
||||
$teamkillLog = "#P[" @ $HostGamePlayerCount @ "]" SPC formatTimeString("M-d") SPC formatTimeString("[hh:nn:a]") SPC %killerID.nameBase @ " (" @ getField(%authInfo, 0) @ "," SPC %killerID.guid @ ") teamkilled" SPC %victimID.nameBase SPC "and has" SPC (%killerID.teamkills + 1) SPC "tks. CM[" @ $CurrentMission @ "]";
|
||||
$teamkillLog = stripChars($teamkillLog, "\c0\c1\c2\c3\c4\c5\c6\c7\c8\c9\x10\x11\co\cp");
|
||||
|
||||
%logpath = $Host::ClassicTeamKillLogPath;
|
||||
export("$teamkillLog", %logpath, true);
|
||||
logEcho($teamkillLog);
|
||||
echo($teamkillLog);
|
||||
}
|
||||
13
Classic/scripts/autoexec/TKwarn.cs
Normal file → Executable file
13
Classic/scripts/autoexec/TKwarn.cs
Normal file → Executable file
|
|
@ -3,15 +3,22 @@
|
|||
package TKwarn
|
||||
{
|
||||
|
||||
|
||||
// From Evo
|
||||
function DefaultGame::testTeamKill(%game, %victimID, %killerID)
|
||||
{
|
||||
{
|
||||
%tk = Parent::testTeamKill(%game, %victimID, %killerID);
|
||||
if(!%tk)
|
||||
return false; // is not a tk
|
||||
|
||||
// No Bots
|
||||
if(%killerID.isAIcontrolled() || %victimID.isAIcontrolled())
|
||||
return true;
|
||||
|
||||
// Log TeamKill
|
||||
teamkillLog(%victimID, %killerID);
|
||||
|
||||
if($Host::TournamentMode || %killerID.isAdmin || %killerID.isAIcontrolled() || %victimID.isAIcontrolled())
|
||||
// No Admins
|
||||
if(%killerID.isAdmin)
|
||||
return true;
|
||||
|
||||
// Ignore this map
|
||||
|
|
|
|||
|
|
@ -57,6 +57,8 @@ function DefaultGame::sendGameVoteMenu(%game, %client, %key)
|
|||
{
|
||||
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, '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)
|
||||
{
|
||||
|
|
@ -66,8 +68,6 @@ function DefaultGame::sendGameVoteMenu(%game, %client, %key)
|
|||
messageClient(%client, 'MsgVoteItem', "", %key, 'VoteTeamDamage', 'enable team damage', 'Vote to Enable Team Damage');
|
||||
}
|
||||
|
||||
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' );
|
||||
messageClient(%client, 'MsgVoteItem',"", %key, 'ForceVote', 'Cancel Force Vote', "Cancel 'Vote To...'");
|
||||
return; // Display no further vote options
|
||||
}
|
||||
|
|
@ -137,6 +137,8 @@ function DefaultGame::sendGameVoteMenu(%game, %client, %key)
|
|||
messageClient(%client, 'MsgVoteItem', "", %key, 'VoteTournamentMode', 'Change server to Tournament.', 'Vote Tournament Mode');
|
||||
if($Host::AllowPlayerVoteTimeLimit)
|
||||
messageClient(%client, 'MsgVoteItem', "", %key, 'VoteChangeTimeLimit', 'change the time limit', 'Vote to Change the Time Limit');
|
||||
if($Host::AllowPlayerVoteSkipMission)
|
||||
messageClient(%client, 'MsgVoteItem', "", %key, 'VoteSkipMission', 'skip the mission to', 'Vote to Skip Mission' );
|
||||
|
||||
if(%multipleTeams && $Host::AllowPlayerVoteTeamDamage)
|
||||
{
|
||||
|
|
@ -145,18 +147,15 @@ function DefaultGame::sendGameVoteMenu(%game, %client, %key)
|
|||
else
|
||||
messageClient(%client, 'MsgVoteItem', "", %key, 'VoteTeamDamage', 'enable team damage', 'Vote to Enable Team Damage');
|
||||
}
|
||||
|
||||
if($Host::AllowPlayerVoteSkipMission)
|
||||
messageClient(%client, 'MsgVoteItem', "", %key, 'VoteSkipMission', 'skip the mission to', 'Vote to Skip Mission' );
|
||||
}
|
||||
else
|
||||
{
|
||||
if(!$MatchStarted && !$CountdownStarted)
|
||||
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, 'VoteFFAMode', 'Change server to Free For All.', 'Vote Free For All Mode');
|
||||
messageClient(%client, 'MsgVoteItem', "", %key, 'VoteChangeTimeLimit', 'change the time limit', 'Vote to Change the Time Limit');
|
||||
messageClient(%client, 'MsgVoteItem', "", %key, 'VoteChangeMission', 'change the mission to', 'Vote to Change the Mission');
|
||||
messageClient(%client, 'MsgVoteItem', "", %key, 'VoteFFAMode', 'Change server to Free For All.', 'Vote Free For All Mode');
|
||||
messageClient(%client, 'MsgVoteItem', "", %key, 'VoteChangeTimeLimit', 'change the time limit', 'Vote to Change the Time Limit');
|
||||
|
||||
if(%multipleTeams)
|
||||
{
|
||||
|
|
@ -176,6 +175,14 @@ function DefaultGame::sendGameVoteMenu(%game, %client, %key)
|
|||
messageClient(%client, 'MsgVoteItem', "", %key, 'VoteSkipMission', 'skip the mission to', 'Skip the Mission' );
|
||||
messageClient(%client, 'MsgVoteItem', "", %key, 'VoteChangeTimeLimit', 'change the time limit', 'Change the Time Limit');
|
||||
|
||||
if(%multipleTeams)
|
||||
{
|
||||
if($teamDamage)
|
||||
messageClient(%client, 'MsgVoteItem', "", %key, 'VoteTeamDamage', 'disable team damage', 'Disable Team Damage');
|
||||
else
|
||||
messageClient(%client, 'MsgVoteItem', "", %key, 'VoteTeamDamage', 'enable team damage', 'Enable Team Damage');
|
||||
}
|
||||
|
||||
if( $Host::AllowAdminVotes )
|
||||
messageClient(%client, 'MsgVoteItem', "", %key, 'ForceVote', 'Vote to ...', 'Vote to ...');
|
||||
}
|
||||
|
|
@ -186,9 +193,9 @@ function DefaultGame::sendGameVoteMenu(%game, %client, %key)
|
|||
if(!$MatchStarted && $CountdownStarted)
|
||||
messageClient(%client, 'MsgVoteItem', "", %key, 'cancelMatchStart', 'Cancel Match Start', 'Cancel Match Start');
|
||||
|
||||
messageClient(%client, 'MsgVoteItem', "", %key, 'VoteChangeMission', 'change the mission to', 'Change the Mission');
|
||||
messageClient(%client, 'MsgVoteItem', "", %key, 'VoteFFAMode', 'Change server to Free For All.', 'Free For All Mode');
|
||||
messageClient(%client, 'MsgVoteItem', "", %key, 'VoteChangeTimeLimit', 'change the time limit', 'Change the Time Limit');
|
||||
messageClient(%client, 'MsgVoteItem', "", %key, 'VoteChangeMission', 'change the mission to', 'Change the Mission');
|
||||
messageClient(%client, 'MsgVoteItem', "", %key, 'VoteFFAMode', 'Change server to Free For All.', 'Free For All Mode');
|
||||
messageClient(%client, 'MsgVoteItem', "", %key, 'VoteChangeTimeLimit', 'change the time limit', 'Change the Time Limit');
|
||||
|
||||
if($Host::Password !$= "")
|
||||
messageClient(%client, 'MsgVoteItem', "", %key, 'TogglePUGpassword', 'Disable PUG Password', 'Disable PUG Password');
|
||||
|
|
@ -199,21 +206,24 @@ function DefaultGame::sendGameVoteMenu(%game, %client, %key)
|
|||
messageClient(%client, 'MsgVoteItem', "", %key, 'ToggleLockedTeams', 'Disable Locked Teams', 'Disable Locked Teams');
|
||||
else
|
||||
messageClient(%client, 'MsgVoteItem', "", %key, 'ToggleLockedTeams', 'Enable Locked Teams', 'Enable Locked Teams');
|
||||
}
|
||||
|
||||
if(%multipleTeams)
|
||||
{
|
||||
if($teamDamage)
|
||||
messageClient(%client, 'MsgVoteItem', "", %key, 'VoteTeamDamage', 'disable team damage', 'Disable Team Damage');
|
||||
else
|
||||
messageClient(%client, 'MsgVoteItem', "", %key, 'VoteTeamDamage', 'enable team damage', 'Enable Team Damage');
|
||||
if(%multipleTeams)
|
||||
{
|
||||
if($teamDamage)
|
||||
messageClient(%client, 'MsgVoteItem', "", %key, 'VoteTeamDamage', 'disable team damage', 'Disable Team Damage');
|
||||
else
|
||||
messageClient(%client, 'MsgVoteItem', "", %key, 'VoteTeamDamage', 'enable team damage', 'Enable Team Damage');
|
||||
}
|
||||
}
|
||||
|
||||
//Toggle Tournament Net Client
|
||||
if(%client.isAdmin && $Host::EnableNetTourneyClient)
|
||||
messageClient( %client, 'MsgVoteItem', "", %key, 'ToggleTourneyNetClient', 'Disable Tournament Net Client', "Disable Tournament Net Client" );
|
||||
else if(%client.isAdmin)
|
||||
messageClient( %client, 'MsgVoteItem', "", %key, 'ToggleTourneyNetClient', 'Enable Tournament Net Client', "Enable Tournament Net Client" );
|
||||
if(%client.isSuperAdmin)
|
||||
{
|
||||
if($Host::EnableNetTourneyClient)
|
||||
messageClient( %client, 'MsgVoteItem', "", %key, 'ToggleTourneyNetClient', 'Disable Tournament Net Client', "Disable Tournament Net Client" );
|
||||
else
|
||||
messageClient( %client, 'MsgVoteItem', "", %key, 'ToggleTourneyNetClient', 'Enable Tournament Net Client', "Enable Tournament Net Client" );
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
|
@ -1223,16 +1233,16 @@ function DefaultGame::sendGamePlayerPopupMenu( %game, %client, %targetClient, %k
|
|||
|
||||
messageClient( %client, 'MsgPlayerPopupItem', "", %key, "SendMessage", "", 'Send Private Message', 15 );
|
||||
|
||||
if ( %targetClient.isGagged )
|
||||
messageClient( %client, 'MsgPlayerPopupItem', "", %key, "UnGagPlayer", "", 'UnGag Player', 17);
|
||||
else
|
||||
messageClient( %client, 'MsgPlayerPopupItem', "", %key, "GagPlayer", "", 'Gag Player', 17);
|
||||
|
||||
if( %client.isSuperAdmin )
|
||||
{
|
||||
messageClient( %client, 'MsgPlayerPopupItem', "", %key, "PrintClientInfo", "", 'Client Info', 16 ); // z0dd - ZOD - MeBad, 7/13/03. Send client information.
|
||||
messageClient( %client, 'MsgPlayerPopupItem', "", %key, "BanPlayer", "", 'Ban', 4 );
|
||||
|
||||
if ( %targetClient.isGagged )
|
||||
messageClient( %client, 'MsgPlayerPopupItem', "", %key, "UnGagPlayer", "", 'UnGag Player', 17);
|
||||
else
|
||||
messageClient( %client, 'MsgPlayerPopupItem', "", %key, "GagPlayer", "", 'Gag Player', 17);
|
||||
|
||||
if ( %targetClient.isFroze )
|
||||
messageClient( %client, 'MsgPlayerPopupItem', "", %key, "ThawPlayer", "", 'Thaw Player', 18);
|
||||
else
|
||||
|
|
@ -1241,11 +1251,10 @@ function DefaultGame::sendGamePlayerPopupMenu( %game, %client, %targetClient, %k
|
|||
messageClient( %client, 'MsgPlayerPopupItem', "", %key, "BootPlayer", "", 'Boot to the Rear', 19);
|
||||
messageClient( %client, 'MsgPlayerPopupItem', "", %key, "ExplodePlayer", "", 'Explode Player', 20);
|
||||
}
|
||||
if ( !%isTargetObserver )
|
||||
{
|
||||
messageClient( %client, 'MsgPlayerPopupItem', "", %key, "ToObserver", "", 'Force observer', 5 );
|
||||
}
|
||||
}
|
||||
|
||||
if ( !%isTargetObserver )
|
||||
messageClient( %client, 'MsgPlayerPopupItem', "", %key, "ToObserver", "", 'Force observer', 5 );
|
||||
}
|
||||
if ( %isTargetSelf || %outrankTarget )
|
||||
{
|
||||
|
|
@ -1256,24 +1265,28 @@ function DefaultGame::sendGamePlayerPopupMenu( %game, %client, %targetClient, %k
|
|||
{
|
||||
if ( %isTargetObserver )
|
||||
{
|
||||
%action = %isTargetSelf ? "Join " : "Change to ";
|
||||
%str1 = %action @ getTaggedString( %game.getTeamName(1) );
|
||||
%str2 = %action @ getTaggedString( %game.getTeamName(2) );
|
||||
%action = %isTargetSelf ? "Join " : "Change to ";
|
||||
%str1 = %action @ getTaggedString( %game.getTeamName(1) );
|
||||
%str2 = %action @ getTaggedString( %game.getTeamName(2) );
|
||||
|
||||
messageClient( %client, 'MsgPlayerPopupItem', "", %key, "ChangeTeam", "", %str1, 6 );
|
||||
messageClient( %client, 'MsgPlayerPopupItem', "", %key, "ChangeTeam", "", %str2, 7 );
|
||||
messageClient( %client, 'MsgPlayerPopupItem', "", %key, "ChangeTeam", "", %str1, 6 );
|
||||
messageClient( %client, 'MsgPlayerPopupItem', "", %key, "ChangeTeam", "", %str2, 7 );
|
||||
}
|
||||
else if( %isSuperAdmin || ($Host::AllowAdminSwitchTeams && %isAdmin) )
|
||||
{
|
||||
%changeTo = %targetClient.team == 1 ? 2 : 1;
|
||||
%str = "Switch to " @ getTaggedString( %game.getTeamName(%changeTo) );
|
||||
%caseId = 5 + %changeTo;
|
||||
%changeTo = %targetClient.team == 1 ? 2 : 1;
|
||||
%str = "Switch to " @ getTaggedString( %game.getTeamName(%changeTo) );
|
||||
%caseId = 5 + %changeTo;
|
||||
|
||||
messageClient( %client, 'MsgPlayerPopupItem', "", %key, "ChangeTeam", "", %str, %caseId );
|
||||
|
||||
// z0dd - ZOD, 7/11/03. Allow Super admins to force themselves to obs.
|
||||
messageClient( %client, 'MsgPlayerPopupItem', "", %key, "ToObserver", "", 'Force observer', 5 );
|
||||
messageClient( %client, 'MsgPlayerPopupItem', "", %key, "ChangeTeam", "", %str, %caseId );
|
||||
}
|
||||
|
||||
// z0dd - ZOD, 7/11/03. Allow Super admins to force themselves to obs.
|
||||
if( %isSuperAdmin )
|
||||
{
|
||||
if(%isTargetSelf && !%isTargetObserver)
|
||||
messageClient( %client, 'MsgPlayerPopupItem', "", %key, "ToObserver", "", 'Force observer', 5 );
|
||||
}
|
||||
}
|
||||
else if ( %isTargetObserver )
|
||||
{
|
||||
|
|
@ -1487,7 +1500,7 @@ function serverCmdClientJoinGame(%client)
|
|||
{
|
||||
if($LockedTeams)
|
||||
{
|
||||
messageClient( %client, '', "Teams are locked. Ask the admin to set your team." );
|
||||
messageClient( %client, '', "Teams are locked. Ask an admin to set your team." );
|
||||
return;
|
||||
}
|
||||
Parent::serverCmdClientJoinGame(%client);
|
||||
|
|
@ -1500,7 +1513,7 @@ function serverCmdClientPickedTeam(%client, %option)
|
|||
{
|
||||
if($Host::TournamentMode && %client.team !$= 0) //Added
|
||||
{
|
||||
messageClient( %client, '', "Teams are locked. Ask the admin to set your team." );
|
||||
messageClient( %client, '', "Teams are locked. Ask an admin to set your team." );
|
||||
serverCmdClientMakeObserver( %client );
|
||||
}
|
||||
return;
|
||||
|
|
@ -1511,7 +1524,7 @@ function serverCmdClientTeamChange(%client, %option)
|
|||
{
|
||||
if($LockedTeams)
|
||||
{
|
||||
messageClient( %client, '', "Teams are locked. Ask the admin to set your team." );
|
||||
messageClient( %client, '', "Teams are locked. Ask an admin to set your team." );
|
||||
return;
|
||||
}
|
||||
Parent::serverCmdClientTeamChange(%client, %option);
|
||||
|
|
|
|||
|
|
@ -84,7 +84,7 @@ $Host::ShowIngamePlayerScores = 1;
|
|||
|
||||
//debug stuff
|
||||
$dtStats::enableRefresh = 0;
|
||||
$dtStats::debugEchos = 1;// echos function calls
|
||||
$dtStats::debugEchos = 0;// echos function calls
|
||||
|
||||
//$dtStats::returnToMenuTimer = (303*1000);
|
||||
//$pref::NoClearConsole = 1;
|
||||
|
|
|
|||
|
|
@ -2579,7 +2579,7 @@ function serverCmdStripAdmin(%client, %admin)
|
|||
%admin.isAdmin = 0;
|
||||
%admin.isSuperAdmin = 0;
|
||||
messageClient(%admin, 'MsgStripAdminPlayer', 'You have stripped yourself of admin privledges.');
|
||||
logEcho(%client.nameBase @ " stripped admin from " @ %admin.nameBase, 1);
|
||||
adminLog(%client, " stripped admin from " @ %admin.nameBase);
|
||||
return;
|
||||
}
|
||||
else if(%client.isSuperAdmin)
|
||||
|
|
@ -2588,7 +2588,7 @@ function serverCmdStripAdmin(%client, %admin)
|
|||
messageClient(%admin, 'MsgStripAdminPlayer', 'You are being stripped of your admin privledges by %1.', %client.name);
|
||||
%admin.isAdmin = 0;
|
||||
%admin.isSuperAdmin = 0;
|
||||
logEcho(%client.nameBase @ " stripped admin from " @ %admin.nameBase, 1);
|
||||
adminLog(%client, " stripped admin from " @ %admin.nameBase);
|
||||
}
|
||||
else
|
||||
messageClient(%client, 'MsgError', '\c2Only Super Admins can use this command.');
|
||||
|
|
@ -2602,7 +2602,7 @@ function serverCmdWarnPlayer(%client, %target)
|
|||
messageAllExcept(%target, -1, 'MsgAdminForce', '%1 has been warned for inappropriate conduct by %2.', %target.name, %client.name);
|
||||
messageClient(%target, 'MsgAdminForce', 'You are recieving this warning for inappropriate conduct by %1. Behave or you will be kicked..~wfx/misc/lightning_impact.wav', %client.name);
|
||||
centerprint(%target, "You are recieving this warning for inappropriate conduct.\nBehave or you will be kicked.", 10, 2);
|
||||
logEcho(%client.nameBase @ " sent warning to " @ %target.nameBase);
|
||||
adminLog(%client, " sent warning to " @ %target.nameBase);
|
||||
}
|
||||
else
|
||||
messageClient(%client, 'MsgError', '\c2Only Admins can use this command.');
|
||||
|
|
|
|||
|
|
@ -203,6 +203,8 @@ $Host::KickObserverTimeout = 1200; //How long player can stay in obs
|
|||
$Host::dtBanlist = "prefs/dtBanlist.cs"; //Alternate Ban System
|
||||
$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::ClassicTeamKillLog = 1; //Enable/Disable Teamkill Logging
|
||||
$Host::ClassicTeamKillLogPath = "logs/TeamKills/teamkills.log"; //TeamKill Log Path
|
||||
|
||||
//LakRabbit
|
||||
$Host::LakRabbitUnlimitedDJ = 1; //Unlimited disc-jumps if enabled
|
||||
|
|
|
|||
Loading…
Reference in a new issue