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

Merge branch 'NoEvo'

Browse source
This commit is contained in:
ChocoTaco1 2020-09-15 15:20:07 -04:00
parent 510b7759d4 c5c020c614
commit 81f78fb075
4 changed files with 45 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Classic/scripts/autoexec/GetTeamCounts.cs
View file

@ -47,6 +47,7 @@ function GetTeamCounts(%game)
//Variables
$TotalTeamPlayerCount = $TeamRank[1, count] + $TeamRank[2, count];
$AllPlayerCount = $HostGamePlayerCount;
$Observers = $HostGamePlayerCount - ($TeamRank[1, count] + $TeamRank[2, count]);
//echo("$PlayerCount[0] " @ $HostGamePlayerCount - ($TeamRank[1, count] + $TeamRank[2, count]));
//echo("$PlayerCount[1] " @ $TeamRank[1, count]);

2
Classic/scripts/autoexec/TKwarn.cs
View file

@ -15,7 +15,7 @@ function DefaultGame::testTeamKill(%game, %victimID, %killerID)
return true;
// Ignore this map
if($CurrentMission $= "Mac_FlagArena")
if($CurrentMission $= "Mac_FlagArena" || $CurrentMission $= "Machineeggs")
return true;
// warn the player

28
Classic/scripts/autoexec/TacoOverrides.cs
View file

@ -171,7 +171,33 @@ function DefaultGame::missionLoadDone(%game)
%obj = MissionGroup.getObject(%i);
if(%obj.getClassName() $= "WaterBlock")
%obj.viscosity = $globalviscosity;
}
}
}
// Temp Fix for Asset nameTag Strings
function GameBaseData::onAdd(%data, %obj)
{
if(%data.targetTypeTag !$= "")
{
// use the name given to the object in the mission file
if(%obj.nameTag !$= "" && strpos(%obj.nameTag,"\x01") == -1)
{
%obj.nameTag = addTaggedString(%obj.nameTag);
%nameTag = %obj.nameTag;
}
else if(%data.targetNameTag !$= "")
%nameTag = %data.targetNameTag;
else
{
if(%obj.name !$= "")
%nameTag = %obj.nameTag = addTaggedString(%obj.name);
else
%nameTag = %obj.nameTag = addTaggedString("Base"); // fail safe so it shows up on cc
}
%obj.target = createTarget(%obj, %nameTag, "", "", %data.targetTypeTag, 0, 0);
}
else
%obj.target = -1;
}
};

36
Classic/scripts/player.cs
View file

@ -2800,27 +2800,23 @@ function Armor::damageObject(%data, %targetObject, %sourceObject, %position, %am
%flash = 0.75;
// Teratos: Originally from Eolk? Mine+Disc tracking/death message support.
// client.mineDisc = [true|false]
// client.mineDiscCheck [0-None|1-Disc Damage|2-Mine Damage]
// Teratos: Don't understand why "%client = %targetClient;" -- possibly to avoid carrying .minediscCheck field?
// Teratos: A little more redundant code and less readable for a few less comparisons.
// No Schedules by DarkTiger
%targetClient.mineDisc = false;
if(%damageType == $DamageType::Disc) {
%client = %targetClient; // Oops
if(%client.minediscCheck == 0) { // No Mine or Disc damage recently
%client.minediscCheck = 1;
schedule(300, 0, "resetMineDiscCheck", %client);
} else if(%client.minediscCheck == 2) { // Recent Mine damage
%client.mineDisc = true;
}
} else if (%damageType == $DamageType::Mine) {
%client = %targetClient; // Oops
if(%client.minediscCheck == 0) { // No Mine or Disc damage recently
%client.minediscCheck = 2;
schedule(300, 0, "resetMineDiscCheck", %client);
} else if(%client.minediscCheck == 1) { // Recent Disc damage
%client.mineDisc = true;
}
switch$(%damageType)
{
case $DamageType::Disc:
if(%targetClient.mdc == 1 && (getSimTime() - %targetClient.mdcTime1) < 256)
%targetClient.mineDisc = true;
%targetClient.mdc = 2;
%targetClient.mdcTime2 = getSimTime();
case $DamageType::Mine:
if(%targetClient.mdc == 2 && (getSimTime() - %targetClient.mdcTime2) < 256)
%targetClient.mineDisc = true;
%targetClient.mdc = 1;
%targetClient.mdcTime1 = getSimTime();
}
// -- End Mine+Disc insert.