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

Updates

Browse source 
Take out jet trigger logging for air time temp (until another way is found)
Fix on line 3220 (Observer console error)
This commit is contained in:
ChocoTaco 2020-03-06 02:45:30 -05:00
parent 3104fcca00
commit df8f869c2d
1 changed files with 84 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

164
Classic/scripts/autoexec/zDarkTigerStats.cs
View file

@ -1309,66 +1309,67 @@ package dtStatsGame{
parent::damageObject(%data, %targetObject, %sourceObject, %position, %amount, %damageType, %momVec, %mineSC); parent::damageObject(%data, %targetObject, %sourceObject, %position, %amount, %damageType, %momVec, %mineSC);
} }
//0 Fire 1 ??? 2 jump 3 jet 4 gernade 5 mine //0 Fire 1 ??? 2 jump 3 jet 4 gernade 5 mine
function Armor::onTrigger(%data, %player, %triggerNum, %val){ // function Armor::onTrigger(%data, %player, %triggerNum, %val){
parent::onTrigger(%data, %player, %triggerNum, %val); // parent::onTrigger(%data, %player, %triggerNum, %val);
// return;
//echo(%triggerNum SPC %val); //echo(%triggerNum SPC %val);
if($dtStats::Enable){ // if($dtStats::Enable){
if(isObject(%player) && !%player.getObjectMount()){ // if(isObject(%player) && !%player.getObjectMount()){
if(%val){// cuts the amount of tiggers by half // if(%val){// cuts the amount of tiggers by half
%client = %player.client; // %client = %player.client;
%speed = mFloor(vectorLen(%player.getVelocity()) * 3.6); // %speed = mFloor(vectorLen(%player.getVelocity()) * 3.6);
if(%client.maxSpeed < %speed){%client.maxSpeed = %speed;} // if(%client.maxSpeed < %speed){%client.maxSpeed = %speed;}
%client.avgTSpeed += %speed; %client.avgSpeedCount++; // %client.avgTSpeed += %speed; %client.avgSpeedCount++;
%client.avgSpeed = %client.avgTSpeed/%client.avgSpeedCount; // %client.avgSpeed = %client.avgTSpeed/%client.avgSpeedCount;
if(%client.avgSpeedCount >= 500){%client.avgSpeedCount=%client.avgTSpeed=0;} // if(%client.avgSpeedCount >= 500){%client.avgSpeedCount=%client.avgTSpeed=0;}
//dist moved // dist moved
%xypos = getWords(%player.getPosition(),0,1) SPC 0; // %xypos = getWords(%player.getPosition(),0,1) SPC 0;
if(%client.lp !$= ""){%client.distMov = mFloor(%client.distMov + vectorDist(%client.lp,%xypos));} // if(%client.lp !$= ""){%client.distMov = mFloor(%client.distMov + vectorDist(%client.lp,%xypos));}
%client.lp = %xypos; // %client.lp = %xypos;
} // }
if (%triggerNum == 3){ //jet triggers // if (%triggerNum == 3){ //jet triggers
if(%val){ // if(%val){
if(isEventPending(%player.jetTimeTest)){ // if(isEventPending(%player.jetTimeTest)){
cancel(%player.jetTimeTest); // cancel(%player.jetTimeTest);
} // }
%client.jetTrigCount++; // %client.jetTrigCount++;
if(%client.ground){ // if(%client.ground){
if(%client.gt > 0){ // if(%client.gt > 0){
%client.groundTime += ((getSimTime() - %client.gt)/1000)/60; // %client.groundTime += ((getSimTime() - %client.gt)/1000)/60;
} // }
%client.at = getSimTime(); // %client.at = getSimTime();
} // }
%client.ground = 0; // %client.ground = 0;
} // }
else{ // else{
if(!isEventPending(%player.jetTimeTest)){ // if(!isEventPending(%player.jetTimeTest)){
%mask = $TypeMasks::StaticShapeObjectType | $TypeMasks::InteriorObjectType | $TypeMasks::TerrainObjectType; // %mask = $TypeMasks::StaticShapeObjectType | $TypeMasks::InteriorObjectType | $TypeMasks::TerrainObjectType;
%rayStart = %player.getWorldBoxCenter(); // %rayStart = %player.getWorldBoxCenter();
%rayEnd = VectorAdd(%rayStart,"0 0" SPC (10000 * -1)); // %rayEnd = VectorAdd(%rayStart,"0 0" SPC (10000 * -1));
%raycast = ContainerRayCast(%rayStart, %rayEnd, %mask, %player); // %raycast = ContainerRayCast(%rayStart, %rayEnd, %mask, %player);
%groundPos = getWords(%raycast, 1, 3); // %groundPos = getWords(%raycast, 1, 3);
%dis = vectorDist(%player.getPosition(),%groundPos); // %dis = vectorDist(%player.getPosition(),%groundPos);
%zv = getWord(%player.getVelocity(),2); // %zv = getWord(%player.getVelocity(),2);
//%player.testDis = %player.getPosition(); // %player.testDis = %player.getPosition();
//%a = getVecAngle(%player.getForwardVector(),vectorNormalize(%player.getVelocity()),%zv); // %a = getVecAngle(%player.getForwardVector(),vectorNormalize(%player.getVelocity()),%zv);
//%hv = vectorLen(%player.getVelocity()); // %hv = vectorLen(%player.getVelocity());
//%range = %hv * mCos(%a * 3.14159/180) * (%hv * mSin(%a * 3.14159/180) + mSqrt(mPow((%hv * mSin(%a * 3.14159/180)),2) + 2 * mAbs(getGravity()) * %dis)) / mAbs(getGravity()); // %range = %hv * mCos(%a * 3.14159/180) * (%hv * mSin(%a * 3.14159/180) + mSqrt(mPow((%hv * mSin(%a * 3.14159/180)),2) + 2 * mAbs(getGravity()) * %dis)) / mAbs(getGravity());
%time = (((%zv + mSqrt(mPow((%zv),2) + 2 * mAbs(getGravity()) * %dis)) / mAbs(getGravity()))* 1000); // not perfect but close enough with out getting too crazy and facy // %time = (((%zv + mSqrt(mPow((%zv),2) + 2 * mAbs(getGravity()) * %dis)) / mAbs(getGravity()))* 1000); // not perfect but close enough with out getting too crazy and facy
// error(%dis SPC %time SPC %range); // error(%dis SPC %time SPC %range);
%player.jetTimeTest = schedule(%time,0,"chkGrounded",%player); // %player.jetTimeTest = schedule(%time,0,"chkGrounded",%player);
} // }
} // }
} // }
} // }
else{ // else{
%client.lp = ""; // %client.lp = "";
%client.gt = %client.at = 0; // %client.gt = %client.at = 0;
} // }
} // }
} //}
function StaticShapeData::damageObject(%data, %targetObject, %sourceObject, %position, %amount, %damageType){ function StaticShapeData::damageObject(%data, %targetObject, %sourceObject, %position, %amount, %damageType){
if($dtStats::Enable) if($dtStats::Enable)
clientDmgStats(%data,%position,%sourceObject,%targetObject, %damageType,%amount); clientDmgStats(%data,%position,%sourceObject,%targetObject, %damageType,%amount);
@ -1442,22 +1443,24 @@ if($dtStats::Enable){
// Game Type Commons // // Game Type Commons //
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
function dtGameLink(%game, %client, %arg1, %arg2, %arg3, %arg4, %arg5){ function dtGameLink(%game, %client, %arg1, %arg2, %arg3, %arg4, %arg5){
error(%game SPC %client SPC %arg1 SPC %arg2 SPC %arg3 SPC %arg4 SPC %arg5); if($dtStats::debugEchos){error(%game SPC %client SPC %arg1 SPC %arg2 SPC %arg3 SPC %arg4 SPC %arg5);}
%client.viewClient = getCNameToCID(%arg3); if(%arg1 $= "Stats"){
if(%arg1 $= "Stats" && %client.viewClient != 0){ %client.viewClient = getCNameToCID(%arg3);
%client.viewStats = 1;// lock out score hud from updateing untill they are done if( %client.viewClient != 0){
%client.viewMenu = %arg2; %client.viewStats = 1;// lock out score hud from updateing untill they are done
%client.GlArg4 = %arg4; %client.viewMenu = %arg2;
%client.GlArg5 = %arg5; %client.GlArg4 = %arg4;
if($dtStats::debugEchos){error("dtGameLink GUID = " SPC %client.guid SPC %arg1 SPC %arg2 SPC %arg3 SPC %arg4);} %client.GlArg5 = %arg5;
statsMenu(%client, %game.class); if($dtStats::debugEchos){error("dtGameLink GUID = " SPC %client.guid SPC %arg1 SPC %arg2 SPC %arg3 SPC %arg4);}
if(%arg2 !$= "Reset"){ statsMenu(%client, %game.class);
return; if(%arg2 !$= "Reset"){
} return;
else{ }
messageClient( %client, 'ClearHud', "", 'scoreScreen', 0 ); else{
%client.viewStats = 0; messageClient( %client, 'ClearHud', "", 'scoreScreen', 0 );
Game.updateScoreHud(%client, 'scoreScreen'); %client.viewStats = 0;
Game.updateScoreHud(%client, 'scoreScreen');
}
} }
} }
if(%game.class $= "DuelGame"){ if(%game.class $= "DuelGame"){
@ -3217,15 +3220,16 @@ function getDynamicField(%obj,%field){
} }
} }
function getCNameToCID(%name){ function getCNameToCID(%name){
if(%name !$= ""){
if(isObject(%name) && %name.getClassName() $= "GameConnection" || %name.getClassName() $= "AIConnection"){ if(isObject(%name) && %name.getClassName() $= "GameConnection" || %name.getClassName() $= "AIConnection"){
return %name; // not a name its a client so return it return %name; // not a name its a client so return it
} }
else{ else{
for (%i = 0; %i < ClientGroup.getCount(); %i++){ for (%i = 0; %i < ClientGroup.getCount(); %i++){
%client = ClientGroup.getObject(%i); %client = ClientGroup.getObject(%i);
if(getTaggedString(%client.name) $= %name){ if(getTaggedString(%client.name) $= %name){
return %client; return %client;
}
} }
} }
} }