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

Merge branch 'Dev' into Stable

Browse source
This commit is contained in:
ChocoTaco 2025-05-04 13:00:42 -04:00
commit fe6120fb0a
4 changed files with 138 additions and 136 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Classic/prefs/MapRotation.cs
View file

@ -387,10 +387,10 @@ addRotationMap("SignalDX", "CTF",1,0,8,24);
//In Rotation //In Rotation
///////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////
addRotationMap("VaubanLak", "Lakrabbit",1,0,8,-1); addRotationMap("VaubanLak", "Lakrabbit",1,1,8,-1);
addRotationMap("MiniSunDried", "Lakrabbit",1,1,-1,12); addRotationMap("MiniSunDried", "Lakrabbit",1,1,-1,12);
addRotationMap("Sundance", "Lakrabbit",1,1,-1,-1); 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("DesertofDeathLak", "Lakrabbit",1,1,-1,-1);
addRotationMap("Raindance_nefLak", "Lakrabbit",1,1,-1,-1); addRotationMap("Raindance_nefLak", "Lakrabbit",1,1,-1,-1);
addRotationMap("SunDriedLak", "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("TitaniaLak", "Lakrabbit",1,0,8,-1);
addRotationMap("TibbawLak", "Lakrabbit",1,1,-1,-1); addRotationMap("TibbawLak", "Lakrabbit",1,1,-1,-1);
addRotationMap("InfernusLak", "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("CankerLak", "Lakrabbit",1,1,-1,-1);
addRotationMap("DustRunLak", "Lakrabbit",1,1,-1,-1); addRotationMap("DustRunLak", "Lakrabbit",1,1,-1,-1);
addRotationMap("CrossfiredLak", "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); addRotationMap("SpectreLak", "Lakrabbit",1,1,-1,-1);
//Voteable, But not in rotation //Voteable, But not in rotation

91
Classic/scripts/LCTFGame.cs
View file

@ -132,7 +132,7 @@ function LCTFGame::initGameVars(%game)
%game.SCORE_PER_REPAIR_DEP_TUR = 3; %game.SCORE_PER_REPAIR_DEP_TUR = 3;
%game.SCORE_PER_REPAIR_DEP_INV = 2; %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.TIME_CONSIDERED_FLAGCARRIER_THREAT = 3 * 1000;
%game.RADIUS_GEN_DEFENSE = 20; %game.RADIUS_GEN_DEFENSE = 20;
@ -2521,61 +2521,58 @@ function Player::maxInventory(%this, %data){
function LCTFGame::LCTFOneMine(%game, %admin, %arg1, %arg2, %arg3, %arg4) function LCTFGame::LCTFOneMine(%game, %admin, %arg1, %arg2, %arg3, %arg4)
{ {
if( $countdownStarted && $MatchStarted ) if(%admin)
{ {
if(%admin) killeveryone();
{
killeveryone();
if($Host::LCTFOneMine) if($Host::LCTFOneMine)
{ {
messageAll('MsgAdminForce', '\c2The Admin has disabled One Mine Inventory.'); 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)) if (isActivePackage(LCTFOneMine))
deactivatePackage(LCTFOneMine); deactivatePackage(LCTFOneMine);
$Host::LCTFOneMine = false; $Host::LCTFOneMine = false;
} }
else else
{ {
messageAll('MsgAdminForce', '\c2The Admin has enabled One Mine Inventory.'); messageAll('MsgVotePassed', '\c2One Mine Inventory Enabled.');
if (!isActivePackage(LCTFOneMine)) if (!isActivePackage(LCTFOneMine))
activatePackage(LCTFOneMine); activatePackage(LCTFOneMine);
$Host::LCTFOneMine = true; $Host::LCTFOneMine = true;
} }
} }
else else
{ messageAll('MsgVoteFailed', '\c2Mode change did not pass: %1 percent.', mFloor(%game.totalVotesFor/ClientGroup.getCount() * 100));
%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 // For voting to work properly - evo admin.ovl

7
Classic/scripts/autoexec/MissionTypeOptions.cs
View file

@ -44,7 +44,12 @@ function loadMissionStage2()
//Tournament Mode specifics //Tournament Mode specifics
if($Host::TournamentMode) 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 else
{ {
//Disable if active //Disable if active