Tribes2/TacoServer
1
0
Fork 0
mirror of https://github.com/ChocoTaco1/TacoServer.git synced 2026-03-21 20:40:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Watch Only Mode

Browse source
This commit is contained in:
ChocoTaco 2023-04-16 16:12:36 -04:00
parent 9e87ca02a0
commit 0127da46b4
4 changed files with 36 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Classic/scripts/defaultGame.cs Executable file → Normal file
View file

@ -1162,7 +1162,7 @@ function DefaultGame::forceObserver( %game, %client, %reason )
%scheduleAutoKick = true;
}
if(%scheduleAutoKick && !%client.isAdmin && !$Host::TournamentMode && $Host::KickObserverTimeout)
if(%scheduleAutoKick && !%client.isAdmin && !%client.isWatchOnly && !$Host::TournamentMode && $Host::KickObserverTimeout)
{
if(isEventPending(%client.okschedule))
cancel(%client.okschedule);
@ -1204,11 +1204,21 @@ function DefaultGame::forceObserver( %game, %client, %reason )
}
function serverCmdWatchOnly(%client, %pass){
if($Host::ObserverOnlyPass $= ""){
$Host::ObserverOnlyPass = "ImaWatcher";// set a default one if not defined
}
if(%pass $= $Host::ObserverOnlyPass){
%client.isWatchOnly = 1;
}
}
// cmdAutoKickObserver(%client)
// Info: Will kick the player if he/she is still in observer.
function cmdAutoKickObserver(%client, %key) // Edit GG
{
if (($Host::TournamentMode) || (!$MissionRunning) || (%client.isAdmin) || (%client.team != 0) || (!%client.okkey) || (%client.okkey != %key))
if (($Host::TournamentMode) || (!$MissionRunning) || (%client.isWatchOnly) || (%client.isAdmin) || (%client.team != 0) || (!%client.okkey) || (%client.okkey != %key))
return;
if(isEventPending(%client.okschedule))
@ -1826,9 +1836,9 @@ function DefaultGame::clientMissionDropReady(%game, %client)
for(%i = 1; %i <= 13; %i++)
$stats::weapon_damage[%client, %i] = "";
if(%client.team $=0 && $Host::KickObserverStartOnJoin) //Observer only
if(%client.team $= 0 && $Host::KickObserverStartOnJoin) //Observer only
{
if(!%client.isAdmin && !$Host::TournamentMode && $Host::KickObserverTimeout)
if(!%client.isAdmin && !%client.isWatchOnly && !$Host::TournamentMode && $Host::KickObserverTimeout)
{
if(isEventPending(%client.okschedule))
cancel(%client.okschedule);
@ -3423,7 +3433,7 @@ function DefaultGame::processGameLink(%game, %client, %arg1, %arg2, %arg3, %arg4
serverCmdObserveClient(%client, %targetClient);
displayObserverHud(%client, %targetClient);
if (%targetClient != %prevObsClient)
if (%targetClient != %prevObsClient && !%client.isWatchOnly)
{
messageClient(%targetClient, 'Observer', '\c1%1 is now observing you.', %client.name);
messageClient(%prevObsClient, 'ObserverEnd', '\c1%1 is no longer observing you.', %client.name);