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

Merge branch 'Dev' into Stable

Browse source
This commit is contained in:
ChocoTaco 2025-02-08 15:40:56 -05:00
commit bdbe492777
6 changed files with 4235 additions and 2673 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Classic/prefs/MapRotation.cs
View file

@ -373,6 +373,8 @@ addRotationMap("WhiteDwarfDeluxe", "CTF",1,0,-1,14);
addRotationMap("SmallSpit", "CTF",1,1,-1,20); addRotationMap("SmallSpit", "CTF",1,1,-1,20);
addRotationMap("MisadventureV2", "CTF",1,1,12,28); addRotationMap("MisadventureV2", "CTF",1,1,12,28);
addRotationMap("El_Fin", "CTF",1,1,-1,14); addRotationMap("El_Fin", "CTF",1,1,-1,14);
addRotationMap("HogansRun24", "CTF",1,0,-1,14);
addRotationMap("SignalDX", "CTF",1,0,8,24);
// _ _ _ _ _ _ // _ _ _ _ _ _
// | | | | | | | | (_) | // | | | | | | | | (_) |
@ -530,6 +532,7 @@ addRotationMap("SuperiorWaterworks", "LCTF",1,0,-1,12);
addRotationMap("FrozenForgeLT", "LCTF",1,1,-1,20); addRotationMap("FrozenForgeLT", "LCTF",1,1,-1,20);
addRotationMap("TWL2_CelerityLT", "LCTF",1,1,-1,20); addRotationMap("TWL2_CelerityLT", "LCTF",1,1,-1,20);
addRotationMap("El_Fin", "LCTF",1,1,-1,14); addRotationMap("El_Fin", "LCTF",1,1,-1,14);
addRotationMap("CapriLT", "LCTF",1,1,-1,14);
// _____ _ _ _ _ // _____ _ _ _ _

2
Classic/scripts/CTFGame.cs
View file

@ -528,7 +528,7 @@ function CTFGame::playerLostFlagTarget(%game, %player)
function CTFGame::updateFlagTransform(%game, %flag) function CTFGame::updateFlagTransform(%game, %flag)
{ {
%flag.setTransform(%flag.getTransform()); %flag.setTransform(%flag.getTransform());
%game.updateFlagThread[%flag] = %game.schedule(256, "updateFlagTransform", %flag); %game.updateFlagThread[%flag] = %game.schedule(100, "updateFlagTransform", %flag);
} }
//---------------------------------------------------------------------------------------- //----------------------------------------------------------------------------------------

14
Classic/scripts/LakRabbitGame.cs
View file

@ -1731,7 +1731,7 @@ function LakRabbitGame::onClientKilled(%game, %clVictim, %clKiller, %damageType,
function LakRabbitGame::updateFlagTransform(%game, %flag) function LakRabbitGame::updateFlagTransform(%game, %flag)
{ {
%flag.setTransform(%flag.getTransform()); %flag.setTransform(%flag.getTransform());
%game.updateFlagThread[%flag] = %game.schedule(256, "updateFlagTransform", %flag); %game.updateFlagThread[%flag] = %game.schedule(100, "updateFlagTransform", %flag);
} }
function LakRabbitGame::playerDroppedFlag(%game, %player) function LakRabbitGame::playerDroppedFlag(%game, %player)
@ -2188,8 +2188,16 @@ function plzBounceOffGrid(%obj, %bounceForce, %count)
%vec = VectorNormalize(%vec); %vec = VectorNormalize(%vec);
%vec = VectorScale(%vec, 25); %vec = VectorScale(%vec, 25);
} }
else if (%oldSpeed < 60) //Max speed a boost gets applied to a bounce: Added so runners cant abuse else if (%oldSpeed < 75) //Max speed a boost gets applied to a bounce: Added so runners cant abuse //was 60
%vec = VectorScale(%vec, 1.15); %vec = VectorScale(%vec, 0.95); //was 1.15
else if (%oldSpeed < 100) //Slow down runners
%vec = VectorScale(%vec, 0.85);
else if (%oldSpeed < 125) //Slow down runners
%vec = VectorScale(%vec, 0.75);
else if (%oldSpeed < 150) //Slow down runners
%vec = VectorScale(%vec, 0.65);
else if (%oldSpeed > 175) //Slow down runners
%vec = VectorScale(%vec, 0.55);
// apply the impulse to the object // apply the impulse to the object
//%obj.applyImpulse(%obj.getWorldBoxCenter(), %vec); //%obj.applyImpulse(%obj.getWorldBoxCenter(), %vec);

31
Classic/scripts/SCtFGame.cs
View file

@ -262,35 +262,6 @@ package SCtFGame
if(isEventPending(%obj.lavaEnterThread)) if(isEventPending(%obj.lavaEnterThread))
cancel(%obj.lavaEnterThread); cancel(%obj.lavaEnterThread);
} }
function ProjectileData::onCollision(%data, %projectile, %targetObject, %modifier, %position, %normal)
{
if(!isObject(%targetObject) && !isObject(%projectile.sourceObject))
return;
if(!(%targetObject.getType() & ($TypeMasks::StaticTSObjectType | $TypeMasks::InteriorObjectType |
$TypeMasks::TerrainObjectType | $TypeMasks::WaterObjectType)))
{
if(%projectile.sourceObject.team !$= %targetObject.team)
{
if(%targetObject.getDataBlock().getClassName() $= "PlayerData" && %data.getName() $= "DiscProjectile")
{
%mask = $TypeMasks::StaticShapeObjectType | $TypeMasks::InteriorObjectType | $TypeMasks::TerrainObjectType;
%start = %targetObject.getWorldBoxCenter();
%distance = mFloor(VectorDist(%start, %projectile.initialPosition));
%end = getWord(%start, 0) SPC getWord(%start, 1) SPC getWord(%start, 2) - 15;
%grounded = ContainerRayCast(%start, %end, %mask, 0);
if(!%grounded)
{
%projectile.sourceObject.client.scoreMidAir++;
messageClient(%projectile.sourceObject.client, 'MsgMidAir', '\c0You received a %1 point bonus for a successful mid air shot.', Game.SCORE_PER_MIDAIR, %data.radiusDamageType, %distance);
messageTeamExcept(%projectile.sourceObject.client, 'MsgMidAir', '\c5%1 hit a mid air shot.', %projectile.sourceObject.client.name, %data.radiusDamageType, %distance);
Game.recalcScore(%projectile.sourceObject.client);
}
}
}
Parent::onCollision(%data, %projectile, %targetObject, %modifier, %position, %normal);
}
}
}; };
///////////////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////////////
@ -606,7 +577,7 @@ function SCtFGame::playerLostFlagTarget(%game, %player)
function SCtFGame::updateFlagTransform(%game, %flag) function SCtFGame::updateFlagTransform(%game, %flag)
{ {
%flag.setTransform(%flag.getTransform()); %flag.setTransform(%flag.getTransform());
%game.updateFlagThread[%flag] = %game.schedule(256, "updateFlagTransform", %flag); %game.updateFlagThread[%flag] = %game.schedule(100, "updateFlagTransform", %flag);
} }
function SCtFGame::playerDroppedFlag(%game, %player) function SCtFGame::playerDroppedFlag(%game, %player)

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

@ -77,7 +77,7 @@ function VehicleData::onDestroyed(%data, %obj, %prevState)
//%data.schedule(500, 'onAvoidCollisions', %obj); //%data.schedule(500, 'onAvoidCollisions', %obj);
//Transfer the vehicle far away //Transfer the vehicle far away
%obj.schedule(1, "setPosition", vectorAdd(%obj.getPosition(), "40 -27 10000")); //Lowered: was 500 %obj.schedule(128, "setPosition", vectorAdd(%obj.getPosition(), "40 -27 10000")); //Lowered: was 500
} }
else if(%data.getName() $="BomberFlyer" || %data.getName() $="MobileBaseVehicle") else if(%data.getName() $="BomberFlyer" || %data.getName() $="MobileBaseVehicle")
{ {
@ -86,7 +86,7 @@ function VehicleData::onDestroyed(%data, %obj, %prevState)
//%data.schedule(500, 'onAvoidCollisions', %obj); //%data.schedule(500, 'onAvoidCollisions', %obj);
//Transfer the vehicle far away //Transfer the vehicle far away
%obj.schedule(100, "setPosition", vectorAdd(%obj.getPosition(), "40 -27 10000")); //Lowered: was 500 %obj.schedule(128, "setPosition", vectorAdd(%obj.getPosition(), "40 -27 10000")); //Lowered: was 500
} }
else else
{ {

6854
Classic/scripts/autoexec/z_dtStats.cs
View file

File diff suppressed because it is too large Load diff