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

Item respawn bugfix

Browse source 
Line 124
Removed extra spaces
This commit is contained in:
ChocoTaco 2022-04-03 15:33:47 -04:00
parent 57778142c6
commit 2ae5b4c489
1 changed files with 35 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

64
Classic/scripts/weapTurretCode.cs
View file

@ -8,7 +8,7 @@ function Ammo::onCollision(%data, %obj, %col)
{ {
%ammoName = %data.getName(); %ammoName = %data.getName();
%ammoStore = %col.inv[%ammoName]; %ammoStore = %col.inv[%ammoName];
// if player has ammo pack, increase max amount of ammo // if player has ammo pack, increase max amount of ammo
if(%col.getMountedImage($BackpackSlot) != 0) if(%col.getMountedImage($BackpackSlot) != 0)
{ {
@ -115,13 +115,19 @@ function HandInventory::onCollision(%data, %obj, %col)
if(%col.inv[%ammoName] < %aMax) if(%col.inv[%ammoName] < %aMax)
{ {
//------------------------------------------------------------------------------------------- //-------------------------------------------------------------------------------------------
// z0dd - ZOD, 4/17/02. Don't allow player to pickup full ammo if they tossed less than full. // z0dd - ZOD, 4/17/02. Don't allow player to pickup full ammo if they tossed less than full.
if( %obj.ammoStore $= "" ) if( %obj.ammoStore $= "" )
%obj.ammoStore = $AmmoIncrement[ %ammoName ]; %obj.ammoStore = $AmmoIncrement[ %ammoName ];
%col.incInventory(%ammoName, %obj.ammoStore); %col.incInventory(%ammoName, %obj.ammoStore);
//------------------------------------------------------------------------------------------- //-------------------------------------------------------------------------------------------
serverPlay3D(ItemPickupSound, %col.getTransform()); serverPlay3D(ItemPickupSound, %col.getTransform());
%obj.respawn();
//Item respawn fix
if (%obj.isStatic())
%obj.respawn();
else
%obj.delete();
if (%col.client > 0) if (%col.client > 0)
messageClient(%col.client, 'MsgItemPickup', '\c0You picked up %1.', %data.pickUpName); messageClient(%col.client, 'MsgItemPickup', '\c0You picked up %1.', %data.pickUpName);
} }
@ -141,7 +147,7 @@ function SentryTurret::onAdd(%data, %obj)
function TurretDeployedCamera::onAdd(%this, %obj) function TurretDeployedCamera::onAdd(%this, %obj)
{ {
Parent::onAdd(%this, %obj); Parent::onAdd(%this, %obj);
%obj.mountImage(DeployableCameraBarrel, 0, true); %obj.mountImage(DeployableCameraBarrel, 0, true);
%obj.setRechargeRate(%this.rechargeRate); %obj.setRechargeRate(%this.rechargeRate);
@ -267,7 +273,7 @@ function BomberTurret::onDamage(%data, %obj)
{ {
%newDamageVal = %obj.getDamageLevel(); %newDamageVal = %obj.getDamageLevel();
if(%obj.lastDamageVal !$= "") if(%obj.lastDamageVal !$= "")
if(isObject(%obj.getObjectMount()) && %obj.lastDamageVal > %newDamageVal) if(isObject(%obj.getObjectMount()) && %obj.lastDamageVal > %newDamageVal)
%obj.getObjectMount().setDamageLevel(%newDamageVal); %obj.getObjectMount().setDamageLevel(%newDamageVal);
%obj.lastDamageVal = %newDamageVal; %obj.lastDamageVal = %newDamageVal;
} }
@ -319,7 +325,7 @@ function BomberTurret::onTrigger(%data, %obj, %trigger, %state)
%obj.setImageTrigger(4, true); %obj.setImageTrigger(4, true);
else else
%obj.setImageTrigger(4, false); %obj.setImageTrigger(4, false);
} }
else else
{ {
%obj.setImageTrigger(2, false); %obj.setImageTrigger(2, false);
@ -330,7 +336,7 @@ function BomberTurret::onTrigger(%data, %obj, %trigger, %state)
{ {
%obj.setImageTrigger(6, false); %obj.setImageTrigger(6, false);
BomberTargetingImage::deconstruct(%obj.getMountedImage(6), %obj); BomberTargetingImage::deconstruct(%obj.getMountedImage(6), %obj);
} }
} }
case 2: case 2:
@ -447,7 +453,7 @@ function MobileTurretBase::onDamage(%data, %obj)
{ {
%newDamageVal = %obj.getDamageLevel(); %newDamageVal = %obj.getDamageLevel();
if(%obj.lastDamageVal !$= "") if(%obj.lastDamageVal !$= "")
if(isObject(%obj.getObjectMount()) && %obj.lastDamageVal > %newDamageVal) if(isObject(%obj.getObjectMount()) && %obj.lastDamageVal > %newDamageVal)
%obj.getObjectMount().setDamageLevel(%newDamageVal); %obj.getObjectMount().setDamageLevel(%newDamageVal);
%obj.lastDamageVal = %newDamageVal; %obj.lastDamageVal = %newDamageVal;
} }
@ -469,13 +475,13 @@ function AssaultPlasmaTurret::onDamage(%data, %obj)
{ {
%newDamageVal = %obj.getDamageLevel(); %newDamageVal = %obj.getDamageLevel();
if(%obj.lastDamageVal !$= "") if(%obj.lastDamageVal !$= "")
if(isObject(%obj.getObjectMount()) && %obj.lastDamageVal > %newDamageVal) if(isObject(%obj.getObjectMount()) && %obj.lastDamageVal > %newDamageVal)
%obj.getObjectMount().setDamageLevel(%newDamageVal); %obj.getObjectMount().setDamageLevel(%newDamageVal);
%obj.lastDamageVal = %newDamageVal; %obj.lastDamageVal = %newDamageVal;
} }
function AssaultPlasmaTurret::damageObject(%this, %targetObject, %sourceObject, %position, %amount, %damageType ,%vec, %client, %projectile) function AssaultPlasmaTurret::damageObject(%this, %targetObject, %sourceObject, %position, %amount, %damageType ,%vec, %client, %projectile)
{ {
//If vehicle turret is hit then apply damage to the vehicle //If vehicle turret is hit then apply damage to the vehicle
%vehicle = %targetObject.getObjectMount(); %vehicle = %targetObject.getObjectMount();
if(%vehicle) if(%vehicle)
@ -494,17 +500,17 @@ function AssaultPlasmaTurret::onTrigger(%data, %obj, %trigger, %state)
%obj.setImageTrigger(2, true); %obj.setImageTrigger(2, true);
else else
%obj.setImageTrigger(2, false); %obj.setImageTrigger(2, false);
} }
else else
{ {
%obj.setImageTrigger(2, false); %obj.setImageTrigger(2, false);
if(%state) if(%state)
%obj.setImageTrigger(4, true); %obj.setImageTrigger(4, true);
else else
%obj.setImageTrigger(4, false); %obj.setImageTrigger(4, false);
} }
case 2: case 2:
if(%state) if(%state)
{ {
%obj.getDataBlock().playerDismount(%obj); %obj.getDataBlock().playerDismount(%obj);
} }
@ -559,7 +565,7 @@ function CameraGrenadeThrown::onStickyCollision(%data, %obj)
cancel(%obj.velocCheck); cancel(%obj.velocCheck);
%pos = %obj.getLastStickyPos(); %pos = %obj.getLastStickyPos();
%norm = %obj.getLastStickyNormal(); %norm = %obj.getLastStickyNormal();
%intAngle = getTerrainAngle(%norm); // staticShape.cs %intAngle = getTerrainAngle(%norm); // staticShape.cs
%rotAxis = vectorNormalize(vectorCross(%norm, "0 0 1")); %rotAxis = vectorNormalize(vectorCross(%norm, "0 0 1"));
if (getWord(%norm, 2) == 1 || getWord(%norm, 2) == -1) if (getWord(%norm, 2) == 1 || getWord(%norm, 2) == -1)
@ -603,7 +609,7 @@ function activateCamera(%position, %rotation, %sourceObj, %team)
} }
%dCam = new Turret() %dCam = new Turret()
{ {
dataBlock = "TurretDeployedCamera"; dataBlock = "TurretDeployedCamera";
team = %team; team = %team;
needsNoPower = true; needsNoPower = true;
owner = %sourceObj.client; owner = %sourceObj.client;
@ -650,7 +656,7 @@ function FlareGrenade::onUse(%this, %obj)
// uncomment when explosion type can be set from script (dont want underwater explosion here) // uncomment when explosion type can be set from script (dont want underwater explosion here)
//function grenadeOnEnterLiquid(%data, %obj, %coverage, %type, %flash) //function grenadeOnEnterLiquid(%data, %obj, %coverage, %type, %flash)
//{ //{
// // 4: Lava // // 4: Lava
// // 5: Hot Lava // // 5: Hot Lava
// // 6: Crusty Lava // // 6: Crusty Lava
// if(%type >=4 && %type <= 6) // if(%type >=4 && %type <= 6)
@ -665,7 +671,7 @@ function FlareGrenade::onUse(%this, %obj)
// return(true); // return(true);
// } // }
// } // }
// //
// // flash grenades do not ignore quicksand // // flash grenades do not ignore quicksand
// if((%type == 7) && !%flash) // if((%type == 7) && !%flash)
// return(true); // return(true);
@ -701,7 +707,7 @@ function detonateGrenade(%obj)
{ {
%obj.setDamageState(Destroyed); %obj.setDamageState(Destroyed);
%data = %obj.getDataBlock(); %data = %obj.getDataBlock();
RadiusExplosion( %obj, %obj.getPosition(), %data.damageRadius, %data.indirectDamage, RadiusExplosion( %obj, %obj.getPosition(), %data.damageRadius, %data.indirectDamage,
%data.kickBackStrength, %obj.sourceObject, %data.radiusDamageType); %data.kickBackStrength, %obj.sourceObject, %data.radiusDamageType);
%obj.schedule(500,"delete"); %obj.schedule(500,"delete");
} }
@ -721,7 +727,7 @@ function detonateFlashGrenade(%hg)
{ {
%maxWhiteout = %hg.getDataBlock().maxWhiteout; %maxWhiteout = %hg.getDataBlock().maxWhiteout;
%thrower = %hg.sourceObject.client; %thrower = %hg.sourceObject.client;
%hg.setDamageState(Destroyed); %hg.setDamageState(Destroyed);
%hgt = %hg.getTransform(); %hgt = %hg.getTransform();
%plX = firstword(%hgt); %plX = firstword(%hgt);
%plY = getWord(%hgt, 1); %plY = getWord(%hgt, 1);
@ -769,23 +775,23 @@ function detonateFlashGrenade(%hg)
%dotFactor = ((1.0 - ((%difAcos - 45.0) / 15.0)) * 0.5) + 0.5; %dotFactor = ((1.0 - ((%difAcos - 45.0) / 15.0)) * 0.5) + 0.5;
%totalFactor = %dotFactor * %distFactor; %totalFactor = %dotFactor * %distFactor;
%prevWhiteOut = %damage.getWhiteOut(); %prevWhiteOut = %damage.getWhiteOut();
if(!%prevWhiteOut) if(!%prevWhiteOut)
if(!$teamDamage) if(!$teamDamage)
{ {
if(%damage.client != %thrower && %damage.client.team == %thrower.team) if(%damage.client != %thrower && %damage.client.team == %thrower.team)
messageClient(%damage.client, 'teamWhiteOut', '\c1You were hit by %1\'s whiteout grenade.', getTaggedString(%thrower.name)); messageClient(%damage.client, 'teamWhiteOut', '\c1You were hit by %1\'s whiteout grenade.', getTaggedString(%thrower.name));
} }
%whiteoutVal = %prevWhiteOut + %totalFactor; %whiteoutVal = %prevWhiteOut + %totalFactor;
if(%whiteoutVal > %maxWhiteout) if(%whiteoutVal > %maxWhiteout)
{ {
//error("whitout at max"); //error("whitout at max");
%whiteoutVal = %maxWhiteout; %whiteoutVal = %maxWhiteout;
} }
//bot cheat! don't blind the thrower - Lagg... 1-8-2004 //bot cheat! don't blind the thrower - Lagg... 1-8-2004
if (%damage.client == %thrower && %thrower.isAIControlled()) if (%damage.client == %thrower && %thrower.isAIControlled())
continue; continue;
@ -815,7 +821,7 @@ function deployMineCheck(%mineObj, %player)
{ {
if(%mineObj.depCount > %mineObj.getDatablock().maxDepCount) if(%mineObj.depCount > %mineObj.getDatablock().maxDepCount)
explodeMine(%mineObj, true); explodeMine(%mineObj, true);
// wait until the mine comes to rest // wait until the mine comes to rest
if(%mineObj.getVelocity() $= "0 0 0") if(%mineObj.getVelocity() $= "0 0 0")
{ {
@ -840,7 +846,7 @@ function deployMineCheck(%mineObj, %player)
%mineTeam = %mineObj.sourceObject.team; %mineTeam = %mineObj.sourceObject.team;
//$TeamDeployedCount[%mineTeam, MineDeployed]++; // z0dd - ZOD, 8/13/02, Moved the increment to MineDeployed::onThrow. Fixes mine count bug //$TeamDeployedCount[%mineTeam, MineDeployed]++; // z0dd - ZOD, 8/13/02, Moved the increment to MineDeployed::onThrow. Fixes mine count bug
if($TeamDeployedCount[%mineTeam, MineDeployed] > $TeamDeployableMax[MineDeployed]) if($TeamDeployedCount[%mineTeam, MineDeployed] > $TeamDeployableMax[MineDeployed])
{ {
messageClient( %player.client, '', 'Maximum allowable mines deployed.' ); messageClient( %player.client, '', 'Maximum allowable mines deployed.' );
schedule(100, %mineObj, "explodeMine", %mineObj, true); schedule(100, %mineObj, "explodeMine", %mineObj, true);
} }
@ -888,7 +894,7 @@ function mineCheckVicinity(%mine)
%detonateRange = %mine.getDatablock().proximity; %detonateRange = %mine.getDatablock().proximity;
%noExplode = 0; %noExplode = 0;
InitContainerRadiusSearch(%mineLoc, %detonateRange, %masks); InitContainerRadiusSearch(%mineLoc, %detonateRange, %masks);
while((%tgt = containerSearchNext()) != 0) while((%tgt = containerSearchNext()) != 0)
{ {
if(!$TeamDamage) if(!$TeamDamage)
{ {
@ -953,14 +959,14 @@ function MineDeployed::damageObject(%data, %targetObject, %sourceObject, %positi
return; return;
} }
// ----------------------------- // -----------------------------
if(%targetObject.boom) if(%targetObject.boom)
return; return;
%targetObject.damaged += %amount; %targetObject.damaged += %amount;
if(%targetObject.damaged >= %data.maxDamage) if(%targetObject.damaged >= %data.maxDamage)
{ {
%targetObject.setDamageState(Destroyed); %targetObject.setDamageState(Destroyed);
} }
} }