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

Merge branch 'Dev' into Stable

Browse source
This commit is contained in:
ChocoTaco 2025-03-04 13:05:13 -05:00
parent bdbe492777 4103a1c8d2
commit 022c879ab7
4 changed files with 1527 additions and 961 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Classic/prefs/MapRotation.cs
View file

@ -479,7 +479,7 @@ addRotationMap("GrassyKnoll", "LCTF",1,1,-1,-1);
addRotationMap("TWL2_MuddySwamp", "LCTF",1,0,8,-1); addRotationMap("TWL2_MuddySwamp", "LCTF",1,0,8,-1);
addRotationMap("SandyRunLT", "LCTF",1,0,-1,12); addRotationMap("SandyRunLT", "LCTF",1,0,-1,12);
addRotationMap("Sentry", "LCTF",1,1,-1,-1); addRotationMap("Sentry", "LCTF",1,1,-1,-1);
addRotationMap("Cinerarium", "LCTF",1,1,-1,-1); addRotationMap("DMP_Cinerarium", "LCTF",1,1,-1,14);
addRotationMap("Exhumed", "LCTF",1,1,-1,-1); addRotationMap("Exhumed", "LCTF",1,1,-1,-1);
addRotationMap("S8_ZilchLT", "LCTF",1,1,-1,-1); addRotationMap("S8_ZilchLT", "LCTF",1,1,-1,-1);
addRotationMap("TWL_BeachBlitzLT", "LCTF",1,0,-1,-1); addRotationMap("TWL_BeachBlitzLT", "LCTF",1,0,-1,-1);
@ -503,7 +503,7 @@ addRotationMap("HillKingLT", "LCTF",1,1,-1,-1);
addRotationMap("DMP_BastardForgeLT", "LCTF",1,1,-1,-1); addRotationMap("DMP_BastardForgeLT", "LCTF",1,1,-1,-1);
addRotationMap("VanDamnedLT", "LCTF",1,1,-1,-1); addRotationMap("VanDamnedLT", "LCTF",1,1,-1,-1);
addRotationMap("DMP_Paranoia", "LCTF",1,0,-1,-1); addRotationMap("DMP_Paranoia", "LCTF",1,0,-1,-1);
addRotationMap("DMP_Spincycle", "LCTF",1,1,-1,-1); addRotationMap("DMP_SpincycleLT", "LCTF",1,1,-1,-1);
addRotationMap("Ravine", "LCTF",1,1,-1,-1); addRotationMap("Ravine", "LCTF",1,1,-1,-1);
// addRotationMap("DX_Badlands", "LCTF",1,0,-1,-1); // addRotationMap("DX_Badlands", "LCTF",1,0,-1,-1);
// addRotationMap("DX_Desert", "LCTF",1,0,-1,-1); // addRotationMap("DX_Desert", "LCTF",1,0,-1,-1);
@ -531,7 +531,7 @@ addRotationMap("DermCrossingDeluxeLT", "LCTF",1,1,-1,-1);
addRotationMap("SuperiorWaterworks", "LCTF",1,0,-1,12); 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_FinLT", "LCTF",1,1,-1,14);
addRotationMap("CapriLT", "LCTF",1,1,-1,14); addRotationMap("CapriLT", "LCTF",1,1,-1,14);

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

@ -52,6 +52,8 @@ function serverCmd(%client)
//Disable UE box on crash //Disable UE box on crash
//Used if a clean crash is desired //Used if a clean crash is desired
//memPatch("7dc7fc","90"); //memPatch("7dc7fc","90");
//Loops Crash patch (Prevent the Uncaught Exception dialog from appearing)
//memPatch("006ff376", "909090909090");
//Show Linux Icon in server list //Show Linux Icon in server list
//memPatch("5C9628","80CB05"); //memPatch("5C9628","80CB05");

271
Classic/scripts/autoexec/flagTunnelingFix.cs
View file

@ -1,73 +1,68 @@
//Fixes for collision tunneling and other issues, note only tested in classic //Fixes for collision tunneling and other issues, note only tested in classic
//Script By:DarkTiger //Script By:DarkTiger
//v3.4 switch over to using SAT/OBB for hitbox detection accuracy, also heavy optimizations becuase of this change //v3.7 - removed bypass code
//v3.6 - lctf and SCtFGame
//v3.5 - tweaks
//v3.4 - switch over to using SAT/OBB for hitbox detection accuracy, also heavy optimizations becuase of this change
//v3.3 - fixed ceiling deadstoping,fixed wall and ceiling tunneling $antiObjTunnel //v3.3 - fixed ceiling deadstoping,fixed wall and ceiling tunneling $antiObjTunnel
//V3.2 - script refactor, removed flag sim in favor of just an offset on toss //V3.2 - script refactor, removed flag sim in favor of just an offset on toss
$ftEnable = 1;//disables all $ftEnable = 1;//disables all
$limitFlagCalls = 1; // prevents frame perfect events witch can cause bad outcomes $limitFlagCalls = 1; // prevents frame perfect events witch can cause bad outcomes
$antiCeiling = 1; // note this is auto enabled with $boxStuckFix as it needs to check for this $antiCeiling = 1; // note this is auto enabled with $boxStuckFix as it needs to check for this
$antiObjTunnel = 0;//prevents terrain and interior tunneling more thigns can be added see first part of DefaultGame::flagColTest $antiObjTunnel = 0;//prevents terrain and interior tunneling more thigns can be added see first part of DefaultGame::flagColTest
$antiFlagImpluse = 1000;//time out period to prevent explosions from effecting flags on drop/toss $antiFlagImpluse = 1000;//time out period to prevent explosions from effecting flags on drop/toss
$boxStuckFix = 1;// enables flag offset, spawns the flag outside of the player to keep it from getting stuck $boxStuckFix = 1;// enables flag offset, spawns the flag outside of the player to keep it from getting stuck
$flagOffset = 1;// how far to offset the flag 1m seems like it works 90% of the time $flagOffset = 1;// how far to offset the flag 1m seems like it works 90% of the time
// adds initial update to setVelocity and setTransform to updates its parameters across clients // adds initial update to setVelocity and setTransform to updates its parameters across clients
//enable $flagResetTime with setting it to 5000 if you disable a mempatch //enable $flagResetTime with setting it to 5000 if you disable a mempatch
//expermental flag static fix //expermental flag static fix
//memPatch("60456c","11000018");//transform //memPatch("60456c","11000018");//transform
memPatch("6040ff","01"); //setVelocity memPatch("6040ff","01"); //setVelocity
$flagResetTime = 0;// 1000-5000 if you want this feature enabled, resets flag to stand in case of desync should not be needed $flagResetTime = 0;// 1000-5000 if you want this feature enabled, resets flag to stand in case of desync should not be needed
//best to leave these values alone unless you understand what the code is doing //best to leave these values alone unless you understand what the code is doing
$flagSimTime = 64;//note a higher the time, the larger the sweep scans will be $flagSimTime = 64;//note a higher the time, the larger the sweep scans will be
$flagCheckRadius = 50; $flagCheckRadius = 50;
$playerSizeBox = "1.2 1.2 2.3"; $playerSizeBox = "1.2 1.2 2.3";
$flagBoxSize = "0.796666 0.139717 2.46029"; $flagBoxSize = "0.796666 0.139717 2.46029";
//0 = old AABB method uses fixed box size makes the player bit narrow //0 = old AABB method uses fixed box size makes the player bit narrow
//1 = new OBB method uses perfect box intersection //1 = new OBB method uses perfect box intersection
//2 = AABB method but uses boundbox can make the player larger then it is given there direction //2 = AABB method but uses boundbox can make the player larger then it is given there direction
//3 = AABB fixed sizes uses $playerSizeBox and $flagBoxSize to do the box checking //3 = AABB fixed sizes uses $playerSizeBox and $flagBoxSize to do the box checking
$boxCollision = 1;// off is the old AABB method aka the old method $boxCollision = 1;// off is the old AABB method aka the old method
$flagColBypass = 0;//bypass all other collision methods other then this one
package flagFix{ package flagFix{
//because the fade is 2000ms we can compensate the delayed reset not to mess with client timers
function Flag::onCollision(%data,%obj,%col){
if(!$flagColBypass){
parent::onCollision(%data,%obj,%col);
}
}
function ShapeBase::throwObject(%this,%obj){ function ShapeBase::throwObject(%this,%obj){
parent::throwObject(%this,%obj); parent::throwObject(%this,%obj);
%data = %obj.getDatablock(); %data = %obj.getDatablock();
if($ftEnable && %data.getName() $= "Flag"){ if($ftEnable && %data.getName() $= "Flag"){
%tpos = %obj.getTransform(); %tpos = %obj.getTransform();
%fpos = getWords(%tpos,0, 2); %fpos = getWords(%tpos,0, 2);
%obj.dtLastPos = %fpos; %obj.dtLastPos = %fpos;
%vel = %obj.getVelocity(); %vel = %obj.getVelocity();
%posOffset = VectorAdd(%fpos, VectorScale(VectorNormalize(%vel), 2)); %posOffset = VectorAdd(%fpos, VectorScale(VectorNormalize(%vel), 2));
if($antiCeiling){//flag height 2.46029 if($antiCeiling){//flag height 2.46029
//0.1 offset any fp errors with the flag position being at ground level, 2.4 offset flag height offset + some extra //0.1 offset any fp errors with the flag position being at ground level, 2.4 offset flag height offset + some extra
%upRay = containerRayCast(vectorAdd(%fpos,"0 0 0.1"), vectorAdd(%fpos,"0 0 2.5"), $TypeMasks::InteriorObjectType | $TypeMasks::StaticTSObjectType | $TypeMasks::ForceFieldObjectType, %obj); %upRay = containerRayCast(vectorAdd(%fpos,"0 0 0.1"), vectorAdd(%fpos,"0 0 2.5"), $TypeMasks::InteriorObjectType | $TypeMasks::StaticTSObjectType | $TypeMasks::ForceFieldObjectType, %obj);
if(%upRay){ if(%upRay){
%obj.setTransform(vectorSub(%this.getPosition(),"0 0" SPC 0.3) SPC getWords(%this.getTransform(),3,6)); %obj.setTransform(vectorSub(%this.getPosition(),"0 0" SPC 0.3) SPC getWords(%this.getTransform(),3,6));
%obj.setVelocity(getWords(%vel,0,1) SPC 0); %obj.setVelocity(getWords(%vel,0,1) SPC 0);
} }
} }
if($boxStuckFix && !%upRay){ if($boxStuckFix && !%upRay){
%wallMask = $TypeMasks::TerrainObjectType | $TypeMasks::InteriorObjectType | $TypeMasks::StaticObjectType | $TypeMasks::ForceFieldObjectType | $TypeMasks::VehicleObjectType; %wallMask = $TypeMasks::TerrainObjectType | $TypeMasks::InteriorObjectType | $TypeMasks::StaticObjectType | $TypeMasks::ForceFieldObjectType | $TypeMasks::VehicleObjectType;
%wallRay = containerRayCast(%fpos, %posOffset, %wallMask, %obj); %wallRay = containerRayCast(%fpos, %posOffset, %wallMask, %obj);
%fwoPos = VectorAdd(%fpos, VectorScale(VectorNormalize(%vel), $flagOffset)); %fwoPos = VectorAdd(%fpos, VectorScale(VectorNormalize(%vel), $flagOffset));
%upRay = containerRayCast(vectorAdd(%fwoPos,"0 0 0.1"), vectorAdd(%fwoPos,"0 0 2.5"), $TypeMasks::InteriorObjectType | $TypeMasks::StaticTSObjectType | $TypeMasks::ForceFieldObjectType, %obj); %upRay = containerRayCast(vectorAdd(%fwoPos,"0 0 0.1"), vectorAdd(%fwoPos,"0 0 2.5"), $TypeMasks::InteriorObjectType | $TypeMasks::StaticTSObjectType | $TypeMasks::ForceFieldObjectType, %obj);
if(!%wallRay){// make sure we dont end up in a wall if(!%wallRay){// make sure we dont end up in a wall
if(!%upRay){ if(!%upRay){
%obj.setTransform(%fwoPos SPC getWords(%this.getTransform(),3,6)); %obj.setTransform(%fwoPos SPC getWords(%this.getTransform(),3,6));
@ -76,7 +71,7 @@ package flagFix{
} }
} }
} }
} }
function CTFGame::startMatch(%game){ function CTFGame::startMatch(%game){
parent::startMatch(%game); parent::startMatch(%game);
@ -87,6 +82,15 @@ package flagFix{
} }
} }
function LCTFGame::startMatch(%game){
parent::startMatch(%game);
if(!isEventPending(Game.flagLoop)){
$TeamFlag[1].resetTime = 0;
$TeamFlag[2].resetTime = 0;
%game.atHomeFlagLoop();
}
}
function SCtFGame::startMatch(%game){ function SCtFGame::startMatch(%game){
parent::startMatch(%game); parent::startMatch(%game);
if(!isEventPending(Game.flagLoop)){ if(!isEventPending(Game.flagLoop)){
@ -95,7 +99,7 @@ package flagFix{
%game.atHomeFlagLoop(); %game.atHomeFlagLoop();
} }
} }
function PracticeCTFGame::startMatch(%game){ function PracticeCTFGame::startMatch(%game){
parent::startMatch(%game); parent::startMatch(%game);
if(!isEventPending(Game.flagLoop)){ if(!isEventPending(Game.flagLoop)){
@ -109,60 +113,77 @@ package flagFix{
function CTFGame::playerTouchFlag(%game, %player, %flag){ function CTFGame::playerTouchFlag(%game, %player, %flag){
if(%flag.lastFlagCallms > 0 && $limitFlagCalls){ if(%flag.lastFlagCallms > 0 && $limitFlagCalls){
%timeDif = getSimTime() - %flag.lastFlagCallms; %timeDif = getSimTime() - %flag.lastFlagCallms;
if(%timeDif < 32){ if(%timeDif < 32){
return; return;
} }
} }
%flag.lastFlagCallms = getSimTime(); %flag.lastFlagCallms = getSimTime();
parent::playerTouchFlag(%game, %player, %flag); parent::playerTouchFlag(%game, %player, %flag);
} }
function LCTFGame::playerTouchFlag(%game, %player, %flag){
if(%flag.lastFlagCallms > 0 && $limitFlagCalls){
%timeDif = getSimTime() - %flag.lastFlagCallms;
if(%timeDif < 32){
return;
}
}
%flag.lastFlagCallms = getSimTime();
parent::playerTouchFlag(%game, %player, %flag);
}
function SCtFGame::playerTouchFlag(%game, %player, %flag){ function SCtFGame::playerTouchFlag(%game, %player, %flag){
if(%flag.lastFlagCallms > 0 && $limitFlagCalls){ if(%flag.lastFlagCallms > 0 && $limitFlagCalls){
%timeDif = getSimTime() - %flag.lastFlagCallms; %timeDif = getSimTime() - %flag.lastFlagCallms;
if(%timeDif < 32){ if(%timeDif < 32){
return; return;
} }
} }
%flag.lastFlagCallms = getSimTime(); %flag.lastFlagCallms = getSimTime();
parent::playerTouchFlag(%game, %player, %flag); parent::playerTouchFlag(%game, %player, %flag);
} }
function PracticeCTFGame::playerTouchFlag(%game, %player, %flag){ function PracticeCTFGame::playerTouchFlag(%game, %player, %flag){
if(%flag.lastFlagCallms > 0 && $limitFlagCalls){ if(%flag.lastFlagCallms > 0 && $limitFlagCalls){
%timeDif = getSimTime() - %flag.lastFlagCallms; %timeDif = getSimTime() - %flag.lastFlagCallms;
if(%timeDif < 32){ if(%timeDif < 32){
return; return;
} }
} }
%flag.lastFlagCallms = getSimTime(); %flag.lastFlagCallms = getSimTime();
parent::playerTouchFlag(%game, %player, %flag); parent::playerTouchFlag(%game, %player, %flag);
} }
function CTFGame::playerDroppedFlag(%game, %player){ function CTFGame::playerDroppedFlag(%game, %player){
%flag = %player.holdingFlag; %flag = %player.holdingFlag;
%flag.lastDropTime = getSimTime(); %flag.lastDropTime = getSimTime();
parent::playerDroppedFlag(%game, %player); parent::playerDroppedFlag(%game, %player);
} }
function LCTFGame::playerDroppedFlag(%game, %player){
%flag = %player.holdingFlag;
%flag.lastDropTime = getSimTime();
parent::playerDroppedFlag(%game, %player);
}
function SCtFGame::playerDroppedFlag(%game, %player){ function SCtFGame::playerDroppedFlag(%game, %player){
%flag = %player.holdingFlag; %flag = %player.holdingFlag;
%flag.lastDropTime = getSimTime(); %flag.lastDropTime = getSimTime();
parent::playerDroppedFlag(%game, %player); parent::playerDroppedFlag(%game, %player);
} }
function PracticeCTFGame::playerDroppedFlag(%game, %player){ function PracticeCTFGame::playerDroppedFlag(%game, %player){
%flag = %player.holdingFlag; %flag = %player.holdingFlag;
%flag.lastDropTime = getSimTime(); %flag.lastDropTime = getSimTime();
parent::playerDroppedFlag(%game, %player); parent::playerDroppedFlag(%game, %player);
} }
function Flag::shouldApplyImpulse(%data, %obj){ function Flag::shouldApplyImpulse(%data, %obj){
%val = parent::shouldApplyImpulse(%data, %obj); %val = parent::shouldApplyImpulse(%data, %obj);
if(%val && $antiFlagImpluse > 0 && %obj.lastDropTime > 0){ if(%val && $antiFlagImpluse > 0 && %obj.lastDropTime > 0){
%time = getSimTime() - %obj.lastDropTime; %time = getSimTime() - %obj.lastDropTime;
if(%time < $antiFlagImpluse){ if(%time < $antiFlagImpluse){
%val = 0; %val = 0;
} }
} }
return %val; return %val;
@ -170,47 +191,15 @@ package flagFix{
}; };
activatePackage(flagFix); activatePackage(flagFix);
function FlagCollision(%data,%obj,%col){
if($flagColBypass){
if (%col.getDataBlock().className $= Armor)
{
if (%col.isMounted())
return;
// z0dd - ZOD, 6/13/02. Touch the flag and your invincibility and cloaking goes away.
if(%col.station $= "" && %col.isCloaked())
{
if( %col.respawnCloakThread !$= "" )
{
Cancel(%col.respawnCloakThread);
%col.setCloaked( false );
%col.respawnCloakThread = "";
}
}
if( %col.client > 0 )
{
%col.setInvincibleMode(0, 0.00);
%col.setInvincible( false );
}
// a player hit the flag
Game.playerTouchFlag(%col, %obj);
}
}
else{
%data.onCollision(%flag, %player);
}
}
function vectorMul(%a,%b){ function vectorMul(%a,%b){
%x = getWords(%a,0) * getWords(%b,0); %x = getWords(%a,0) * getWords(%b,0);
%y = getWords(%a,1) * getWords(%b,1); %y = getWords(%a,1) * getWords(%b,1);
%z = getWords(%a,2) * getWords(%b,2); %z = getWords(%a,2) * getWords(%b,2);
return %x SPC %y SPC %z; return %x SPC %y SPC %z;
} }
function generateBoxData(){ function generateBoxData(){
%playerSize = $playerSizeBox; //"1.2 1.2 2.3"; %playerSize = $playerSizeBox; //"1.2 1.2 2.3";
%halfSize = vectorMul(%playerSize, "0.5 0.5 0"); %halfSize = vectorMul(%playerSize, "0.5 0.5 0");
$plrBoxMin = %minA = VectorSub("0 0 0", %halfSize); $plrBoxMin = %minA = VectorSub("0 0 0", %halfSize);
@ -233,12 +222,12 @@ function generateBoxData(){
%box[5] = "1 0 1"; %box[5] = "1 0 1";
%box[6] = "0 1 1"; %box[6] = "0 1 1";
%box[7] = "1 1 1"; %box[7] = "1 1 1";
for(%i = 0; %i < 8; %i++){ for(%i = 0; %i < 8; %i++){
$playerBoxData[%i] = vectorAdd(%minA, vectorMul(%vSubA, %box[%i])); $playerBoxData[%i] = vectorAdd(%minA, vectorMul(%vSubA, %box[%i]));
$flagBoxData[%i] = vectorAdd(%minB, vectorMul(%vSubB, %box[%i])); $flagBoxData[%i] = vectorAdd(%minB, vectorMul(%vSubB, %box[%i]));
} }
}generateBoxData(); }generateBoxData();
function vectorLerp(%point1, %point2, %t) { function vectorLerp(%point1, %point2, %t) {
@ -247,12 +236,8 @@ function vectorLerp(%point1, %point2, %t) {
function boxIntersectAABB(%plr, %flg, %lerpPos){ function boxIntersectAABB(%plr, %flg, %lerpPos){
if($boxCollision == 2){ if($boxCollision == 2){
%a = %plr.getWorldBox();
%b = %flg.getWorldBox();
}
else if($boxCollision == 3){
%fpos = %flg.getPosition(); %fpos = %flg.getPosition();
%a = vectorAdd($plrBoxMin, %lerpPos) SPC vectorAdd($plrBoxMax, %lerpPos); %a = vectorAdd($plrBoxMin, %lerpPos) SPC vectorAdd($plrBoxMax, %lerpPos);
%b = vectorAdd($flagBoxMin, %fpos) SPC vectorAdd($flagBoxMax, %fpos); %b = vectorAdd($flagBoxMin, %fpos) SPC vectorAdd($flagBoxMax, %fpos);
} }
@ -261,7 +246,7 @@ function boxIntersectAABB(%plr, %flg, %lerpPos){
%a = vectorAdd(getWords(%plrMinMax,0,2), %lerpPos) SPC vectorAdd(getWords(%plrMinMax,3,5), %lerpPos); %a = vectorAdd(getWords(%plrMinMax,0,2), %lerpPos) SPC vectorAdd(getWords(%plrMinMax,3,5), %lerpPos);
%b = %flg.getWorldBox(); %b = %flg.getWorldBox();
} }
return (getWord(%a, 0) <= getWord(%b, 3) && getWord(%a, 3) >= getWord(%b, 0)) && return (getWord(%a, 0) <= getWord(%b, 3) && getWord(%a, 3) >= getWord(%b, 0)) &&
(getWord(%a, 1) <= getWord(%b, 4) && getWord(%a, 4) >= getWord(%b, 1)) && (getWord(%a, 1) <= getWord(%b, 4) && getWord(%a, 4) >= getWord(%b, 1)) &&
(getWord(%a, 2)<= getWord(%b, 5) && getWord(%a, 5) >= getWord(%b, 2)); (getWord(%a, 2)<= getWord(%b, 5) && getWord(%a, 5) >= getWord(%b, 2));
@ -274,7 +259,7 @@ function DefaultGame::flagColTest(%game, %flag, %rsTeam, %ext){
if(!%flag.isHome && $antiObjTunnel){ if(!%flag.isHome && $antiObjTunnel){
%fOffset =vectorAdd(%flagPos,"0 0 0.1"); %fOffset =vectorAdd(%flagPos,"0 0 0.1");
%dist = vectorDist(%flag.dtLastPos, %fOffset); %dist = vectorDist(%flag.dtLastPos, %fOffset);
if(%dist > 2.5){//2.5 is the rough flag height if(%dist > 2.5){//2.5 is the rough flag height
%wallMask = $TypeMasks::TerrainObjectType | $TypeMasks::InteriorObjectType; %wallMask = $TypeMasks::TerrainObjectType | $TypeMasks::InteriorObjectType;
%terRay = containerRayCast(%flag.dtLastPos, %fOffset, %wallMask, %flag); %terRay = containerRayCast(%flag.dtLastPos, %fOffset, %wallMask, %flag);
if(%terRay){ if(%terRay){
@ -290,6 +275,7 @@ function DefaultGame::flagColTest(%game, %flag, %rsTeam, %ext){
InitContainerRadiusSearch( %flagPos, $flagCheckRadius, $TypeMasks::PlayerObjectType); InitContainerRadiusSearch( %flagPos, $flagCheckRadius, $TypeMasks::PlayerObjectType);
while((%player = containerSearchNext()) != 0){ while((%player = containerSearchNext()) != 0){
%playerPos = %player.getPosition(); %playerPos = %player.getPosition();
//%rot = getWords(%player.getTransform(),3,6);
if((%rsTeam && %flag.team != %player.team) || !%rsTeam || %player == %ext){ if((%rsTeam && %flag.team != %player.team) || !%rsTeam || %player == %ext){
%flagDist = vectorDist(%flagPos, %playerPos); %flagDist = vectorDist(%flagPos, %playerPos);
if(%player.lastSim > 0 && (%player.getState() !$= "Dead")){// only check at speed if(%player.lastSim > 0 && (%player.getState() !$= "Dead")){// only check at speed
@ -297,22 +283,20 @@ function DefaultGame::flagColTest(%game, %flag, %rsTeam, %ext){
// %tickDist = vectorLen(%player.getVelocity()) * ($flagSimTime/1000); // %tickDist = vectorLen(%player.getVelocity()) * ($flagSimTime/1000);
%sweepCount = mFloor(vectorDist(%playerPos, %player.oldPos) + 1.5); %sweepCount = mFloor(vectorDist(%playerPos, %player.oldPos) + 1.5);
if((getSimTime() - %player.lastSim) <= 128 && %flagDist-2 < %sweepCount){//make sure are last position is valid if((getSimTime() - %player.lastSim) <= 128 && %flagDist-2 < %sweepCount){//make sure are last position is valid
//error(%player SPC %flagDist SPC %sweepCount); //schedule(1000,0,"drawBeamItem", %player.oldPos,%playerPos,15000);
for(%i = 0; %i < %sweepCount; %i++){// sweep behind us to see if we should have hit something for(%i = 0; %i < %sweepCount; %i++){// sweep behind us to see if we should have hit something
%lerpPos = vectorLerp(%playerPos, %player.oldPos, %i/(%sweepCount-1));//back sweep %lerpPos = vectorLerp(%playerPos, %player.oldPos, %i/(%sweepCount-1));//back sweep
if($boxCollision == 1){ //%point = MatrixMulPoint(%lerpPos SPC %rot, "-0.6 -0.6 0");
if(boxIntersect(%player, %flag, %lerpPos)){ //schedule(1000+(%i*128), 0, "drawBoxItemC", %point, %rot, "1.2 1.2 2.3", 15000);
//error("flag hit"); if($boxCollision == 1 && boxIntersect(%player, %flag, %lerpPos)){
FlagCollision(%flag.getDataBlock(),%flag, %player); // %point = MatrixMulPoint(%flagPos SPC %rot,"-0.398 -0.069 0");
break; // schedule(1000+(%i*128), 0, "drawBoxItemC", %point, %rot, "0.796666 0.139717 4", 15000);
} %flag.getDataBlock().onCollision(%flag, %player);
break;
} }
else{ else if($boxCollision > 1 && boxIntersectAABB(%player, %flag, %lerpPos)){
if(boxIntersectAABB(%player, %flag, %lerpPos)){ %flag.getDataBlock().onCollision(%flag, %player);
//error("flag hit"); break;
FlagCollision(%flag.getDataBlock(),%flag, %player);
break;
}
} }
} }
} }
@ -322,7 +306,7 @@ function DefaultGame::flagColTest(%game, %flag, %rsTeam, %ext){
%player.lastSim = getSimTime(); %player.lastSim = getSimTime();
} }
//error("scan count" SPC %scanCount SPC %scanPlrCount); //error("scan count" SPC %scanCount SPC %scanPlrCount);
} }
function DefaultGame::atHomeFlagLoop(%game){ function DefaultGame::atHomeFlagLoop(%game){
if(isObject($TeamFlag[1]) && isObject($TeamFlag[2])){ if(isObject($TeamFlag[1]) && isObject($TeamFlag[2])){
@ -337,36 +321,36 @@ function DefaultGame::atHomeFlagLoop(%game){
%game.flagResetTime = 0; %game.flagResetTime = 0;
} }
%game.flagResetTime += $flagSimTime; %game.flagResetTime += $flagSimTime;
} }
if($TeamFlag[1].isHome && $TeamFlag[2].isHome){//11 if($TeamFlag[1].isHome && $TeamFlag[2].isHome){//11
%game.flagColTest($TeamFlag[1],1,0);// only look at the other team %game.flagColTest($TeamFlag[1],1,0);// only look at the other team
%game.flagColTest($TeamFlag[2],1,0);// only look at the other team %game.flagColTest($TeamFlag[2],1,0);// only look at the other team
} }
else if(!$TeamFlag[1].isHome && $TeamFlag[2].isHome){//01 else if(!$TeamFlag[1].isHome && $TeamFlag[2].isHome){//01
if(isObject($TeamFlag[1].carrier)){// flag has been dropped if(isObject($TeamFlag[1].carrier)){// flag has been dropped
%game.flagColTest($TeamFlag[2],1, $TeamFlag[1].carrier); //scan for other team expect for are carrier %game.flagColTest($TeamFlag[2],1, $TeamFlag[1].carrier); //scan for other team expect for are carrier
} }
else{ else{
%game.flagColTest($TeamFlag[1],0,0);// scan for everyone can touch it %game.flagColTest($TeamFlag[1],0,0);// scan for everyone can touch it
%game.flagColTest($TeamFlag[2],1,0);// team 2 flag is still at home so only scan for the other team %game.flagColTest($TeamFlag[2],1,0);// team 2 flag is still at home so only scan for the other team
} }
} }
else if($TeamFlag[1].isHome && !$TeamFlag[2].isHome){//10 else if($TeamFlag[1].isHome && !$TeamFlag[2].isHome){//10
if(isObject($TeamFlag[2].carrier)){// flag has been dropped if(isObject($TeamFlag[2].carrier)){// flag has been dropped
%game.flagColTest($TeamFlag[1],1, $TeamFlag[2].carrier); //scan for other team expect for are carrier %game.flagColTest($TeamFlag[1],1, $TeamFlag[2].carrier); //scan for other team expect for are carrier
} }
else{ else{
%game.flagColTest($TeamFlag[1],1,0);// team 1 flag is still at home so only scan for the other team %game.flagColTest($TeamFlag[1],1,0);// team 1 flag is still at home so only scan for the other team
%game.flagColTest($TeamFlag[2],0,0);// scan for everyone can touch it %game.flagColTest($TeamFlag[2],0,0);// scan for everyone can touch it
} }
} }
else if(!$TeamFlag[1].isHome && !$TeamFlag[2].isHome){//00 else if(!$TeamFlag[1].isHome && !$TeamFlag[2].isHome){//00
if(!isObject($TeamFlag[1].carrier)){// flag has been dropped if(!isObject($TeamFlag[1].carrier)){// flag has been dropped
%game.flagColTest($TeamFlag[1],0,0);// scan for everyone can touch it %game.flagColTest($TeamFlag[1],0,0);// scan for everyone can touch it
} }
if(!isObject($TeamFlag[2].carrier)){// flag has been dropped if(!isObject($TeamFlag[2].carrier)){// flag has been dropped
%game.flagColTest($TeamFlag[2],0,0);// scan for everyone can touch it %game.flagColTest($TeamFlag[2],0,0);// scan for everyone can touch it
} }
} }
} }
@ -378,94 +362,81 @@ function DefaultGame::atHomeFlagLoop(%game){
function boxIntersect(%objA, %objB, %scanPos) { function boxIntersect(%objA, %objB, %scanPos) {
// Retrieve the 8 corners of the box for both objects // Retrieve the 8 corners of the box for both objects
%matrixA = %objA.getTransform(); %matrixA = %objA.getTransform();
if(getWordCount(%scanPos)){// need to check a postion other then default if(getWordCount(%scanPos)){// need to check a postion other then default
%matrixA = %scanPos SPC getWords(%matrixA,3,6); %matrixA = %scanPos SPC getWords(%matrixA,3,6);
} }
%matrixB = %objB.getTransform(); %matrixB = %objB.getTransform();
%cornerA[0] = MatrixMulPoint(%matrixA, "-0.6 -0.6 0"); %cornerA[0] = MatrixMulPoint(%matrixA, "-0.6 -0.6 0");
%cornerA[1] = MatrixMulPoint(%matrixA, "0.6 -0.6 0"); %cornerA[1] = MatrixMulPoint(%matrixA, "0.6 -0.6 0");
%cornerA[2] = MatrixMulPoint(%matrixA, "-0.6 0.6 0"); %cornerA[2] = MatrixMulPoint(%matrixA, "-0.6 0.6 0");
%cornerA[3] = MatrixMulPoint(%matrixA, "0.6 0.6 0"); %cornerA[3] = MatrixMulPoint(%matrixA, "0.6 0.6 0");
%cornerA[4] = MatrixMulPoint(%matrixA, "-0.6 -0.6 2.3"); %cornerA[4] = MatrixMulPoint(%matrixA, "-0.6 -0.6 2.3");
%cornerA[5] = MatrixMulPoint(%matrixA, "0.6 -0.6 2.3"); %cornerA[5] = MatrixMulPoint(%matrixA, "0.6 -0.6 2.3");
%cornerA[6] = MatrixMulPoint(%matrixA, "-0.6 0.6 2.3"); %cornerA[6] = MatrixMulPoint(%matrixA, "-0.6 0.6 2.3");
%cornerA[7] = MatrixMulPoint(%matrixA, "0.6 0.6 2.3"); %cornerA[7] = MatrixMulPoint(%matrixA, "0.6 0.6 2.3");
%cornerB[0] = MatrixMulPoint(%matrixB, "-0.398333 -0.0698583 -0.1"); %cornerB[0] = MatrixMulPoint(%matrixB, "-0.398333 -0.0698583 -0.1");
%cornerB[1] = MatrixMulPoint(%matrixB, "0.398333 -0.0698583 -0.1"); %cornerB[1] = MatrixMulPoint(%matrixB, "0.398333 -0.0698583 -0.1");
%cornerB[2] = MatrixMulPoint(%matrixB, "-0.398333 0.0698587 -0.1"); %cornerB[2] = MatrixMulPoint(%matrixB, "-0.398333 0.0698587 -0.1");
%cornerB[3] = MatrixMulPoint(%matrixB, "0.398333 0.0698587 -0.1"); %cornerB[3] = MatrixMulPoint(%matrixB, "0.398333 0.0698587 -0.1");
%cornerB[4] = MatrixMulPoint(%matrixB, "-0.398333 -0.0698583 2.46029"); %cornerB[4] = MatrixMulPoint(%matrixB, "-0.398333 -0.0698583 2.46029");
%cornerB[5] = MatrixMulPoint(%matrixB, "0.398333 -0.0698583 2.46029"); %cornerB[5] = MatrixMulPoint(%matrixB, "0.398333 -0.0698583 2.46029");
%cornerB[6] = MatrixMulPoint(%matrixB, "-0.398333 0.0698587 2.46029"); %cornerB[6] = MatrixMulPoint(%matrixB, "-0.398333 0.0698587 2.46029");
%cornerB[7] = MatrixMulPoint(%matrixB, "0.398333 0.0698587 2.46029"); %cornerB[7] = MatrixMulPoint(%matrixB, "0.398333 0.0698587 2.46029");
// Define the axes to test (these are the edges of both boxes) // Define the axes to test (these are the edges of both boxes)
%ax[0] = vectorNormalize(vectorSub(%cornerA[1], %cornerA[0]));//X cross forward and up %ax[0] = vectorNormalize(vectorSub(%cornerA[1], %cornerA[0]));//X cross forward and up
%ax[1] = vectorNormalize(vectorSub(%cornerA[2], %cornerA[0]));//Y forward vector %ax[1] = vectorNormalize(vectorSub(%cornerA[2], %cornerA[0]));//Y forward vector
%ax[2] = "0 0 1"; %ax[2] = "0 0 1";
%ax[3] = vectorNormalize(vectorSub(%cornerB[1], %cornerB[0]));//X cross forward and up %ax[3] = vectorNormalize(vectorSub(%cornerB[1], %cornerB[0]));//X cross forward and up
%ax[4] = vectorNormalize(vectorSub(%cornerB[2], %cornerB[0])); //Y forward vector %ax[4] = vectorNormalize(vectorSub(%cornerB[2], %cornerB[0])); //Y forward vector
%ax[5] = "0 0 1"; %ax[5] = "0 0 1";
// For each axis // For each axis
for (%i = 0; %i < 6; %i++) { for (%i = 0; %i < 6; %i++) {
%axis = %ax[%i]; %axis = %ax[%i];
// Project each corner of box A onto the axis // Project each corner of box A onto the axis
%minProjA = vectorDot(%cornerA[0], %axis); %minProjA = vectorDot(%cornerA[0], %axis);
%maxProjA = %minProjA; %maxProjA = %minProjA;
for (%j = 1; %j < 8; %j++) { for (%j = 1; %j < 8; %j++) {
%projA = vectorDot(%cornerA[%j], %axis); %projA = vectorDot(%cornerA[%j], %axis);
%minProjA = (%projA < %minProjA) ? %projA : %minProjA; %minProjA = (%projA < %minProjA) ? %projA : %minProjA;
%maxProjA = (%projA > %maxProjA) ? %projA : %maxProjA; %maxProjA = (%projA > %maxProjA) ? %projA : %maxProjA;
} }
// Project each corner of box B onto the axis // Project each corner of box B onto the axis
%minProjB = vectorDot(%cornerB[0], %axis); %minProjB = vectorDot(%cornerB[0], %axis);
%maxProjB = %minProjB; %maxProjB = %minProjB;
for (%j = 1; %j < 8; %j++) { for (%j = 1; %j < 8; %j++) {
%projB = vectorDot(%cornerB[%j], %axis); %projB = vectorDot(%cornerB[%j], %axis);
%minProjB = (%projB < %minProjB) ? %projB : %minProjB; %minProjB = (%projB < %minProjB) ? %projB : %minProjB;
%maxProjB = (%projB > %maxProjB) ? %projB : %maxProjB; %maxProjB = (%projB > %maxProjB) ? %projB : %maxProjB;
} }
// Check for overlap // Check for overlap
if (%maxProjA < %minProjB || %maxProjB < %minProjA) { if (%maxProjA < %minProjB || %maxProjB < %minProjA) {
return false; // No overlap on this axis, boxes do not intersect return false; // No overlap on this axis, boxes do not intersect
} }
} }
return true; // Overlap on all axes, boxes intersect return true; // Overlap on all axes, boxes intersect
} }
function colFlagTest(){
%conObj = LocalClientConnection.player; //LocalClientConnection.getControlObject();
%flag1 = boxIntersect(%conObj,$TeamFlag[1]);
%flag2 = boxIntersect(%conObj,$TeamFlag[2]);
%flag1AABB = boxIntersectAABB(%conObj, $TeamFlag[1], %conObj.getPosition());
%flag2AABB = boxIntersectAABB(%conObj, $TeamFlag[2], %conObj.getPosition());
error("test" SPC "Flag 1" SPC %flag1 SPC "Flag 2" SPC %flag2);
error("test" SPC "Flag 1A" SPC %flag1AABB SPC "Flag 2A" SPC %flag2AABB);
bottomprint(%conObj.client, "FlagS" SPC %flag1 SPC "FlagI" SPC %flag2 SPC "FlagS AABB" SPC %flag1AABB SPC "FlagI AABB" SPC %flag2AABB, 5, 1);
}
function testFlagSpeed(%speed){ function testFlagSpeed(%speed){
%player = LocalClientConnection.player; %player = LocalClientConnection.player;
%fvec = %player.getForwardVector(); %fvec = %player.getForwardVector();
%vel = vectorScale(%fvec,%speed); %vel = vectorScale(%fvec,%speed);
%player.setVelocity(%vel); %player.setVelocity(%vel);
} }

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

File diff suppressed because it is too large Load diff