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

Adjustments

Browse source
This commit is contained in:
ChocoTaco1 2021-04-08 10:26:42 -04:00
parent f592afd882
commit 00389c0d55
2 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Classic/scripts/autoexec/TacoOverrides.cs
View file

@ -152,14 +152,14 @@ function stationTrigger::onEnterTrigger(%data, %obj, %colObj)
} }
//OG Blaster Buff //OG Blaster Buff
// function Armor::damageObject(%data, %targetObject, %sourceObject, %position, %amount, %damageType, %momVec, %mineSC) function Armor::damageObject(%data, %targetObject, %sourceObject, %position, %amount, %damageType, %momVec, %mineSC)
// { {
//Takes 10 blaster shots to kill a heavy, 13 normal. //Takes 11 blaster shots to kill a heavy, 13 normal.
// if(%targetObject.client.armor $= "Heavy" && %damageType $= $DamageType::Blaster) if(%targetObject.client.armor $= "Heavy" && %damageType $= $DamageType::Blaster)
// %amount *= 1.3; %amount *= 1.15;
// Parent::damageObject(%data, %targetObject, %sourceObject, %position, %amount, %damageType, %momVec, %mineSC); Parent::damageObject(%data, %targetObject, %sourceObject, %position, %amount, %damageType, %momVec, %mineSC);
// } }
// Global water viscosity // Global water viscosity
function DefaultGame::missionLoadDone(%game) function DefaultGame::missionLoadDone(%game)
@ -295,7 +295,7 @@ function VehicleData::createPositionMarker(%data, %obj)
function ConcussionGrenadeThrown::onThrow(%this, %gren) function ConcussionGrenadeThrown::onThrow(%this, %gren)
{ {
AIGrenadeThrown(%gren); AIGrenadeThrown(%gren);
%gren.detThread = schedule(1500, %gren, "detonateGrenade", %gren); %gren.detThread = schedule(1800, %gren, "detonateGrenade", %gren);
} }
}; };

4
Classic/scripts/weapons/concussionGrenade.cs
View file

@ -161,7 +161,7 @@ datablock ExplosionData(ConcussionGrenadeExplosion)
camShakeFreq = "4.0 5.0 4.5"; camShakeFreq = "4.0 5.0 4.5";
camShakeAmp = "140.0 140.0 140.0"; camShakeAmp = "140.0 140.0 140.0";
camShakeDuration = 1.0; camShakeDuration = 1.0;
camShakeRadius = 18.0; //was 15 camShakeRadius = 16.5; //was 15
}; };
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
@ -176,7 +176,7 @@ datablock ItemData(ConcussionGrenadeThrown)
pickupRadius = 2; pickupRadius = 2;
maxDamage = 0.5; maxDamage = 0.5;
explosion = ConcussionGrenadeExplosion; explosion = ConcussionGrenadeExplosion;
damageRadius = 18.0; //was 15 damageRadius = 16.5; //was 15
radiusDamageType = $DamageType::Grenade; radiusDamageType = $DamageType::Grenade;
kickBackStrength = 3500; kickBackStrength = 3500;