Tribes2/T2-CPP
1
0
Fork 0
mirror of https://github.com/Ragora/T2-CPP.git synced 2026-07-16 03:54:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added Projectile collision shockwaves

Browse source 
Also fixed typemask for moving objects.
This commit is contained in:
Calvin Balke 2015-02-01 14:24:10 -08:00
parent ebe6649da7
commit 529104d9f2
4 changed files with 29 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Patches/servertest.cs
View file

@ -23,20 +23,28 @@ function onMoveRoutine(%obj, %offset, %center, %radius){
}
$collidegroup = new SimSet(CollideGroup);
$ccd = new SimSet(ClientCommandGroup);
function ProjCollisionCallback(%proj1, %proj2) {
echo(%proj1 SPC "collided with" SPC %proj2);
if (isObject(%proj1) {
if (isObject(%proj2) {
if (%proj1.sourceObject != %proj2.sourceObject) {
//echo(%proj1 SPC "collided with" SPC %proj2);
if (isObject(%proj1)) {
if (isObject(%proj2)) {
//if (%proj1.sourceObject != %proj2.sourceObject) {
if (CollideGroup.isMember(%proj2)) {
if (CollideGroup.isMember(%proj1)) {
CollideGroup.remove(%proj1);
CollideGroup.remove(%proj2);
echo("Radius Explosion");
RadiusExplosion(%proj1,%proj1.position,400,0,1000,%proj1.sourceObject,$DamageType::Default);
RadiusExplosion(%proj2,%proj2.position,400,0,1000,%proj2.sourceObject,$DamageType::Default);
%proj1.delete();
%proj2.delete();
}
}
}
//}
}
}
}
@ -45,7 +53,7 @@ function moveRoutineDone() {
%obj=MoveEffectSet.getObject(%x);
if(%obj.getType() | $TypeMasks::PlayerObjectType) {
if (%obj.isjetting() || %obj.isjumping() ) {
echo ("Artificial Gravity Disengaged for" SPC %obj);
//echo ("Artificial Gravity Disengaged for" SPC %obj);
} else {
%obj.setPosition(VectorAdd(%obj.position,$moveoffset));
}