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

Explosion rework

Browse source 
Rework to prevent explosions from happening inside geometry
This commit is contained in:
ChocoTaco 2021-10-13 16:02:36 -04:00
parent a296d5b33e
commit ac7dc9f0cb
1 changed files with 57 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

59
Classic/scripts/projectiles.cs
View file

@ -634,6 +634,8 @@ function ELFProjectile::checkELFStatus(%this, %data, %target, %targeter)
} }
} }
//Rework to prevent explosions from happening inside geometry
$expMode = 1;
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 |
@ -672,31 +674,57 @@ function RadiusExplosion(%explosionSource, %position, %radius, %damage, %impulse
} }
} }
} }
%targets[%numTargets] = %targetObject; if(isObject(%targetObject))
%targetDists[%numTargets] = %dist; {
%numTargets++; %covMode = $expMode;
// calcExplosionCoverage done inversely to remove edge cases of were explosions can clip into meshes
switch(%covMode){ //miscf stackable //0 1 0 161.574
case 1:
%coverage = 1; // test for any blocking objects
%ray = ContainerRayCast(%targetObject.getWorldBoxCenter(), %position, ($TypeMasks::InteriorObjectType |
$TypeMasks::StaticObjectType |
$TypeMasks::TerrainObjectType |
$TypeMasks::ForceFieldObjectType |
$TypeMasks::VehicleObjectType), %targetObject);
if(%ray){
%hitObj = getWord(%ray,0);
if(%hitObj.getType() & $TypeMasks::StaticObjectType){//miscf and stackable is offton used as walls and decore best to block damage
if(strPos(%hitObj.shapeName, "miscf") != -1 || strPos(%hitObj.shapeName, "stackable") != -1){
%coverage = 0;
}
}
if(%coverage){//up and over test but ignore staticshapes as they not ment to block explosions
%upray = ContainerRayCast(%position, vectorAdd(%position, "0 0 1"), ($TypeMasks::InteriorObjectType |
$TypeMasks::TerrainObjectType |
$TypeMasks::ForceFieldObjectType |
$TypeMasks::VehicleObjectType), %targetObject);
if(!%upray){
%rayto = ContainerRayCast( %targetObject.getWorldBoxCenter(), vectorAdd(%position, "0 0 1"), ($TypeMasks::InteriorObjectType |
$TypeMasks::TerrainObjectType |
$TypeMasks::ForceFieldObjectType |
$TypeMasks::VehicleObjectType), %targetObject);
%coverage = !(%rayto);
}
else{
%coverage = 0;
} }
for (%i = 0; %i < %numTargets; %i++) }
{ }
%targetObject = %targets[%i]; // default function
%dist = %targetDists[%i]; default:
if(isObject(%targetObject)) // z0dd - ZOD, 5/18/03 Console spam fix.
{
%coverage = calcExplosionCoverage(%position, %targetObject, %coverage = calcExplosionCoverage(%position, %targetObject,
($TypeMasks::InteriorObjectType | ($TypeMasks::InteriorObjectType |
$TypeMasks::TerrainObjectType | $TypeMasks::TerrainObjectType |
$TypeMasks::ForceFieldObjectType | $TypeMasks::ForceFieldObjectType |
$TypeMasks::VehicleObjectType)); $TypeMasks::VehicleObjectType));
}
if (%coverage == 0) if (%coverage == 0)
continue; continue;
//if ( $splashTest )
%amount = (1.0 - ((%dist / %radius) * 0.88)) * %coverage * %damage; %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;
@ -726,7 +754,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);
@ -752,7 +780,6 @@ function RadiusExplosion(%explosionSource, %position, %radius, %damage, %impulse
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));