Tribes2/TacoServer
1
0
Fork 0
mirror of https://github.com/ChocoTaco1/TacoServer.git synced 2026-07-13 07:04:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Moved flaggrabs++ variable

Browse source
This commit is contained in:
ChocoTaco 2019-03-11 16:36:44 -04:00
parent 679ac81551
commit 53202d8ef8
2 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Classic/scripts/CTFGame.cs
View file

@ -1095,7 +1095,7 @@ function CTFGame::awardScoreFlagCap(%game, %cl, %flag)
$TeamScore[%cl.team] += %game.SCORE_PER_TEAM_FLAG_CAP; $TeamScore[%cl.team] += %game.SCORE_PER_TEAM_FLAG_CAP;
messageAll('MsgTeamScoreIs', "", %cl.team, $TeamScore[%cl.team]); messageAll('MsgTeamScoreIs', "", %cl.team, $TeamScore[%cl.team]);
%flag.grabber.flagGrabs++; //%flag.grabber.flagGrabs++; //moved to awardScoreFlagTouch
if (%game.SCORE_PER_TEAM_FLAG_CAP > 0) if (%game.SCORE_PER_TEAM_FLAG_CAP > 0)
{ {
@ -1139,6 +1139,7 @@ function CTFGame::awardScoreFlagCap(%game, %cl, %flag)
function CTFGame::awardScoreFlagTouch(%game, %cl, %flag) function CTFGame::awardScoreFlagTouch(%game, %cl, %flag)
{ {
%flag.grabber = %cl; %flag.grabber = %cl;
%flag.grabber.flagGrabs++; //moved from awardScoreFlagCap to correctly count flaggrabs
%team = %cl.team; %team = %cl.team;
if( $DontScoreTimer[%team] ) if( $DontScoreTimer[%team] )
return; return;

17
Classic/scripts/SCtFGame.cs
View file

@ -1178,7 +1178,7 @@ function SCtFGame::awardScoreFlagCap(%game, %cl, %flag)
$TeamScore[%cl.team] += %game.SCORE_PER_TEAM_FLAG_CAP; $TeamScore[%cl.team] += %game.SCORE_PER_TEAM_FLAG_CAP;
messageAll('MsgTeamScoreIs', "", %cl.team, $TeamScore[%cl.team]); messageAll('MsgTeamScoreIs', "", %cl.team, $TeamScore[%cl.team]);
%flag.grabber.flagGrabs++; //%flag.grabber.flagGrabs++; //moved to awardScoreFlagTouch
if (%game.SCORE_PER_TEAM_FLAG_CAP > 0) if (%game.SCORE_PER_TEAM_FLAG_CAP > 0)
{ {
@ -1214,6 +1214,7 @@ function SCtFGame::awardScoreFlagTouch(%game, %cl, %flag)
{ {
%flag.grabber = %cl; %flag.grabber = %cl;
%flag.grabber.flagGrabs++; //moved from awardScoreFlagCap to correctly count flaggrabs
%team = %cl.team; %team = %cl.team;
if( $DontScoreTimer[%team] ) if( $DontScoreTimer[%team] )
return; return;
@ -2151,7 +2152,7 @@ function SCtFGame::SCtFProMode(%game, %admin, %arg1, %arg2, %arg3, %arg4)
{ {
killeveryone(); killeveryone();
if(%game.SCtFProMode) if($Host::SCtFProMode)
{ {
messageAll('MsgAdminForce', '\c2The Admin has disabled Pro Mode.'); messageAll('MsgAdminForce', '\c2The Admin has disabled Pro Mode.');
@ -2159,7 +2160,7 @@ function SCtFGame::SCtFProMode(%game, %admin, %arg1, %arg2, %arg3, %arg4)
$InvBanList[SCtF, "ShockLance"] = 0; $InvBanList[SCtF, "ShockLance"] = 0;
$InvBanList[SCtF, "Plasma"] = 0; $InvBanList[SCtF, "Plasma"] = 0;
%game.SCtFProMode = false; $Host::SCtFProMode = false;
} }
else else
{ {
@ -2169,7 +2170,7 @@ function SCtFGame::SCtFProMode(%game, %admin, %arg1, %arg2, %arg3, %arg4)
$InvBanList[SCtF, "ShockLance"] = 1; $InvBanList[SCtF, "ShockLance"] = 1;
$InvBanList[SCtF, "Plasma"] = 1; $InvBanList[SCtF, "Plasma"] = 1;
%game.SCtFProMode = true; $Host::SCtFProMode = true;
} }
} }
else else
@ -2179,7 +2180,7 @@ function SCtFGame::SCtFProMode(%game, %admin, %arg1, %arg2, %arg3, %arg4)
{ {
killeveryone(); killeveryone();
if(%game.SCtFProMode) if($Host::SCtFProMode)
{ {
messageAll('MsgVotePassed', '\c2Pro Mode Disabled.'); messageAll('MsgVotePassed', '\c2Pro Mode Disabled.');
@ -2187,7 +2188,7 @@ function SCtFGame::SCtFProMode(%game, %admin, %arg1, %arg2, %arg3, %arg4)
$InvBanList[SCtF, "ShockLance"] = 0; $InvBanList[SCtF, "ShockLance"] = 0;
$InvBanList[SCtF, "Plasma"] = 0; $InvBanList[SCtF, "Plasma"] = 0;
%game.SCtFProMode = false; $Host::SCtFProMode = false;
} }
else else
{ {
@ -2197,14 +2198,12 @@ function SCtFGame::SCtFProMode(%game, %admin, %arg1, %arg2, %arg3, %arg4)
$InvBanList[SCtF, "ShockLance"] = 1; $InvBanList[SCtF, "ShockLance"] = 1;
$InvBanList[SCtF, "Plasma"] = 1; $InvBanList[SCtF, "Plasma"] = 1;
%game.SCtFProMode = true; $Host::SCtFProMode = true;
} }
} }
else else
messageAll('MsgVoteFailed', '\c2Mode change did not pass: %1 percent.', mFloor(%game.totalVotesFor/ClientGroup.getCount() * 100)); messageAll('MsgVoteFailed', '\c2Mode change did not pass: %1 percent.', mFloor(%game.totalVotesFor/ClientGroup.getCount() * 100));
} }
$Host::SCtFProMode = %game.SCtFProMode;
} }
} }
// For voting to work properly - evo admin.ovl // For voting to work properly - evo admin.ovl