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

Revert "Merge remote-tracking branch 'origin/NoEvo' into NoEvo"

Browse source 
This reverts commit 1ed4b1a2ab.
This commit is contained in:
ChocoTaco1 2021-04-13 12:22:09 -04:00
parent 1ed4b1a2ab
commit b99fae619e
5 changed files with 99 additions and 367 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -27,7 +27,7 @@ function serverCmdEndThrowCount(%client, %data)
%throwScale = %throwStrength / 2;
%client.player.throwStrength = %throwScale;
%client.player.throwStart = 2; //was 0
%client.player.throwStart = 5; //was 0
}
//Tank UE code by Keen
@ -154,9 +154,9 @@ function stationTrigger::onEnterTrigger(%data, %obj, %colObj)
//OG Blaster Buff
function Armor::damageObject(%data, %targetObject, %sourceObject, %position, %amount, %damageType, %momVec, %mineSC)
{
//Takes 11 blaster shots to kill a heavy, 13 normal.
//Takes 10 blaster shots to kill a heavy, 13 normal.
if(%targetObject.client.armor $= "Heavy" && %damageType $= $DamageType::Blaster)
%amount *= 1.15;
%amount *= 1.3;
Parent::damageObject(%data, %targetObject, %sourceObject, %position, %amount, %damageType, %momVec, %mineSC);
}
@ -291,13 +291,6 @@ function VehicleData::createPositionMarker(%data, %obj)
return %marker;
}
//Conc Throw (Almost Normal Grenades) 1500 Normal
function ConcussionGrenadeThrown::onThrow(%this, %gren)
{
AIGrenadeThrown(%gren);
%gren.detThread = schedule(1800, %gren, "detonateGrenade", %gren); // Was 2000
}
};
// Prevent package from being activated if it is already