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

Updated Scripts and added projectile collisions

Browse source 
Added a new projectile collision detection feature.  It requires
projectiles to be added to CollideGroup.  Also added a new
ClientCommandGroup that clients should be added to after they have
finished ghosting.  Currently setMPS effects everything in MoveGroup.
setMPS now uses X, Y, and Z as arguments instead of X only.
This commit is contained in:
Calvin Balke 2015-01-30 13:36:27 -08:00
parent 4830623b7a
commit d0936c3c07
8 changed files with 206 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Patches/autoexec.cs
View file

@ -3,7 +3,7 @@ memPatch("A3A100","5052BA00000000B8200000005150526800000000E8C7D6B4FF5A585981C20
memPatch("A3A200","5052BA00000000B8200000005150526800000000E8C7D5B4FF5A585981C20100000039C27CE65A58E9FC8AB8FF");
memPatch("5C2D22","E9D97447009090");
memPatch("5C2D85","E9767347009090");
memPatch("43D72E","7E");
//memPatch("43D72E","7E");
memPatch("0058665C","9090909090909090");
memPatch("00586682","90909090909090909090");
memPatch("005866AB","90909090909090909090");

2
Patches/clientautoexec.cs
View file

@ -3,7 +3,7 @@ memPatch("A3A100","5052BA00000000B8200000005150526800000000E8C7D6B4FF5A585981C20
memPatch("A3A200","5052BA00000000B8200000005150526800000000E8C7D5B4FF5A585981C20100000039C27CE65A58E9FC8AB8FF");
memPatch("5C2D22","E9D97447009090");
memPatch("5C2D85","E9767347009090");
memPatch("43D72E","7E");
//memPatch("43D72E","7E");
memPatch("0058665C","9090909090909090");
memPatch("00586682","90909090909090909090");
memPatch("005866AB","90909090909090909090");

133
Patches/servertest.cs
View file

@ -4,7 +4,7 @@
loadMod("TSExtension");
$movesim = new SimSet(MoveEffectSet);
function onMoveRoutine(%obj, %offset, %center, %radius){
@ -21,11 +21,138 @@ function onMoveRoutine(%obj, %offset, %center, %radius){
$moveoffset=%offset;
}
$collidegroup = new SimSet(CollideGroup);
function DiscImage::onFire(%data, %obj, %slot)
{
if(%obj.fireTimeoutDisc) //-nite-
return;
// %data.lightStart = getSimTime();
// if( %obj.station $= "" && %obj.isCloaked() )
// {
// if( %obj.respawnCloakThread !$= "" )
// {
// Cancel(%obj.respawnCloakThread);
// %obj.setCloaked( false );
// %obj.respawnCloakThread = "";
// }
// else
// {
// if( %obj.getEnergyLevel() > 20 )
// {
// %obj.setCloaked( false );
// %obj.reCloak = %obj.schedule( 500, "setCloaked", true );
// }
// }
// }
%vehicle = 0;
%weapon = %obj.getMountedImage(0).item;
if(%obj.client.mode[%weapon] == 0)
{
%projectile = "DiscProjectile";
%mode = "LinearProjectile";
%obj.fireTimeoutDisc = 1000; //should be the same as 1.25 -Nite-
%enUse = 0;
%ammoUse = 1;
} //1250
else if(%obj.client.mode[%weapon] == 1)
{
%projectile = "TurboDisc";
%mode = "LinearProjectile";
%obj.fireTimeoutDisc = 1250; //should be the same as .25 -Nite-
%enUse = 7;
%ammoUse = 1;
} //230
else if(%obj.client.mode[%weapon] == 2)
{
%projectile = "PowerDiscProjectile";
%mode = "LinearProjectile";
%enUse = 15;
%ammoUse = 2;
%obj.fireTimeoutDisc = 1500; //should be same as 2.25 -Nite-
} //2250
if(%obj.powerRecirculator)
%enUse *= 0.75;
if(%ammoUse > %obj.getInventory(%data.ammo) || %enUse > %obj.getEnergyLevel())
{
schedule(%obj.fireTimeoutDisc, 0, "DiscFireTimeoutClear", %obj);
return;
}
%p = new(%mode)()
{
dataBlock = %projectile;
initialDirection = %obj.getMuzzleVector(%slot);
initialPosition = %obj.getMuzzlePoint(%slot);
sourceObject = %obj;
sourceSlot = %slot;
vehicleObject = %vehicle;
};
CollideGroup.add(%p);
%useEnergyObj = %obj.getObjectMount();
if(!%useEnergyObj)
%useEnergyObj = %obj;
%vehicle = %useEnergyObj.getType() & $TypeMasks::VehicleObjectType ? %useEnergyObj : 0;
// Vehicle Damage Modifier
if(%vehicle)
%p.vehicleMod = %vehicle.damageMod;
if(%obj.damageMod)
%p.damageMod = %obj.damageMod;
if (isObject(%obj.lastProjectile) && %obj.deleteLastProjectile)
%obj.lastProjectile.delete();
%obj.lastProjectile = %p;
%obj.deleteLastProjectile = %data.deleteLastProjectile;
MissionCleanup.add(%p);
// all this for emulating state stuff -Nite-
%obj.play3D(DiscFireSound);// play fire sounds -Nite-
if( %obj.getState() !$= "Dead" ) // +soph
%obj.setActionThread("light_recoil"); //Play anim recoil -Nite-
schedule(500, %obj.play3D(DiscReloadSound),%obj);//play reload sound 500ms after we fire -Nite-
schedule(%obj.fireTimeoutDisc, 0, "DiscFireTimeoutClear", %obj); //Use fire time out for each mode -Nite-
// serverCmdPlayAnim(%obj.client,"light_recoil"); //this worked too lol -Nite-
// AI hook
if(%obj.client)
%obj.client.projectile = %p;
%obj.decInventory(%data.ammo, %ammoUse);
%obj.useEnergy(%enUse);
if(%obj.client.mode[%weapon] == 1)
%obj.applyKick(-500);
if(%obj.client.mode[%weapon] == 2)
%obj.applyKick(-1000);
}
function ProjCollisionCallback(%proj1, %proj2) {
echo(%proj1 SPC "collided with" SPC %proj2);
%proj1.delete();
%proj2.delete();
}
function moveRoutineDone() {
for (%x=0;%x<(MoveEffectSet.getCount()); %x++) {
%obj=MoveEffectSet.getObject(%x);
%obj.setPosition(VectorAdd(%obj.position,$moveoffset));
if(%obj.getType() | $TypeMasks::PlayerObjectType) {
if (%obj.isjetting() || %obj.isjumping() ) {
echo ("Artificial Gravity Disengaged for" SPC %obj);
} else {
%obj.setPosition(VectorAdd(%obj.position,$moveoffset));
}
}
}
MoveEffectSet.clear();
@ -34,4 +161,4 @@ function moveRoutineDone() {
memPatch("5BBBDC",getServPAddr()); //Hooks the serverProcess function
$mg = new SimSet(MoveGroup);
MoveGroup.add(Team1); //Adds the Team1 base to the movement group
setMPS(-10,0.0,0.0); // Moves the base 0.5 meters per second on the X axis.
setMPS(0.0,0.0,0.0); // Moves the base 0.5 meters per second on the X axis.