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

Reverted

Browse source 
(No "faster" version)
Misunderstanding about how the while loop functions.
Not all objs were applying proper damage.
This commit is contained in:
ChocoTaco 2021-11-23 11:57:08 -05:00
parent ed155c861a
commit f5f729f79b
1 changed files with 34 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
Classic/scripts/projectiles.cs
View file

@ -642,10 +642,8 @@ function ELFProjectile::checkELFStatus(%this, %data, %target, %targeter)
} }
} }
//Reworked to be a little faster
function RadiusExplosion(%explosionSource, %position, %radius, %damage, %impulse, %sourceObject, %damageType) function RadiusExplosion(%explosionSource, %position, %radius, %damage, %impulse, %sourceObject, %damageType)
{ {
InitContainerRadiusSearch(%position, %radius, $TypeMasks::PlayerObjectType | InitContainerRadiusSearch(%position, %radius, $TypeMasks::PlayerObjectType |
$TypeMasks::VehicleObjectType | $TypeMasks::VehicleObjectType |
$TypeMasks::StaticShapeObjectType | $TypeMasks::StaticShapeObjectType |
@ -656,10 +654,13 @@ function RadiusExplosion(%explosionSource, %position, %radius, %damage, %impulse
while ((%targetObject = containerSearchNext()) != 0) while ((%targetObject = containerSearchNext()) != 0)
{ {
%dist = containerSearchCurrRadDamageDist(); %dist = containerSearchCurrRadDamageDist();
if (%dist > %radius) if (%dist > %radius)
continue; continue;
if(%targetObject.isMounted()) // z0dd - ZOD, 5/18/03. Changed to stop Force Field console spam
// if (%targetObject.isMounted())
if (!(%targetObject.getType() & $TypeMasks::ForceFieldObjectType) && %targetObject.isMounted())
{ {
%mount = %targetObject.getObjectMount(); %mount = %targetObject.getObjectMount();
%found = -1; %found = -1;
@ -679,17 +680,32 @@ function RadiusExplosion(%explosionSource, %position, %radius, %damage, %impulse
} }
} }
} }
if(isObject(%targetObject)) %targets[%numTargets] = %targetObject;
%targetDists[%numTargets] = %dist;
%numTargets++;
}
for (%i = 0; %i < %numTargets; %i++)
{
%targetObject = %targets[%i];
%dist = %targetDists[%i];
if(isObject(%targetObject)) // z0dd - ZOD, 5/18/03 Console spam fix.
{ {
%coverage = calcExplosionCoverage(%position, %targetObject, ($TypeMasks::InteriorObjectType | %coverage = calcExplosionCoverage(%position, %targetObject,
$TypeMasks::TerrainObjectType | ($TypeMasks::InteriorObjectType |
$TypeMasks::ForceFieldObjectType | $TypeMasks::TerrainObjectType |
$TypeMasks::VehicleObjectType)); $TypeMasks::ForceFieldObjectType |
$TypeMasks::VehicleObjectType));
if (%coverage == 0) if (%coverage == 0)
continue; continue;
%amount = (1.0 - ((%dist / %radius) * 0.88)) * %coverage * %damage; //if ( $splashTest )
%amount = (1.0 - ((%dist / %radius) * 0.88)) * %coverage * %damage;
//else
//%amount = (1.0 - (%dist / %radius)) * %coverage * %damage;
//error( "damage: " @ %amount @ " at distance: " @ %dist @ " radius: " @ %radius @ " maxDamage: " @ %damage );
%data = %targetObject.getDataBlock(); %data = %targetObject.getDataBlock();
%className = %data.className; %className = %data.className;
@ -710,7 +726,7 @@ function RadiusExplosion(%explosionSource, %position, %radius, %damage, %impulse
} }
else if (%damageType == $DamageType::Mortar) else if (%damageType == $DamageType::Mortar)
{ {
%impulse = 5750; %impulse = 5750;
} }
} }
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
@ -718,7 +734,7 @@ function RadiusExplosion(%explosionSource, %position, %radius, %damage, %impulse
%impulseVec = VectorScale(%momVec, %impulse * (1.0 - (%dist / %radius))); %impulseVec = VectorScale(%momVec, %impulse * (1.0 - (%dist / %radius)));
%doImpulse = true; %doImpulse = true;
} }
else if( %className $= "FlyingVehicleData" || %className $= "HoverVehicleData" ) // Removed WheeledVehicleData. z0dd - ZOD, 4/24/02. Do not allow impulse applied to MPB, conc MPB bug fix. else if( %className $= FlyingVehicleData || %className $= HoverVehicleData ) // Removed WheeledVehicleData. z0dd - ZOD, 4/24/02. Do not allow impulse applied to MPB, conc MPB bug fix.
{ {
%p = %targetObject.getWorldBoxCenter(); %p = %targetObject.getWorldBoxCenter();
%momVec = VectorSub(%p, %position); %momVec = VectorSub(%p, %position);
@ -742,13 +758,14 @@ function RadiusExplosion(%explosionSource, %position, %radius, %damage, %impulse
if(%amount > 0) if(%amount > 0)
%data.damageObject(%targetObject, %sourceObject, %position, %amount, %damageType, %momVec, %explosionSource.theClient, %explosionSource); %data.damageObject(%targetObject, %sourceObject, %position, %amount, %damageType, %momVec, %explosionSource.theClient, %explosionSource);
else if( %explosionSource.getDataBlock().getName() $= "ConcussionGrenadeThrown" && %data.getClassName() $= "PlayerData" ) else if( %explosionSource.getDataBlock().getName() $= "ConcussionGrenadeThrown" && %data.getClassName() $= "PlayerData" )
{ {
%data.applyConcussion( %dist, %radius, %sourceObject, %targetObject ); %data.applyConcussion( %dist, %radius, %sourceObject, %targetObject );
if(!$teamDamage && %sourceObject != %targetObject && %sourceObject.client.team == %targetObject.client.team)
{ if(!$teamDamage && %sourceObject != %targetObject && %sourceObject.client.team == %targetObject.client.team)
messageClient(%targetObject.client, 'msgTeamConcussionGrenade', '\c1You were hit by %1\'s concussion grenade.', getTaggedString(%sourceObject.client.name)); {
} messageClient(%targetObject.client, 'msgTeamConcussionGrenade', '\c1You were hit by %1\'s concussion grenade.', getTaggedString(%sourceObject.client.name));
} }
}
//------------------------------------------------------------------------------- //-------------------------------------------------------------------------------
// z0dd - ZOD, 4/16/02. Tone done the how much bomber & HPC flip out when damaged // z0dd - ZOD, 4/16/02. Tone done the how much bomber & HPC flip out when damaged
if( %doImpulse ) if( %doImpulse )