Tribes2/TacoServer
1
0
Fork 0
mirror of https://github.com/ChocoTaco1/TacoServer.git synced 2026-01-20 00:24:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert Concs

Browse source 
Normal fuse
Normal chance
This commit is contained in:
ChocoTaco 2023-01-14 16:21:23 -05:00
parent d95993eeb3
commit e16976a56e
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -292,11 +292,11 @@ function VehicleData::createPositionMarker(%data, %obj)
} }
//Conc Throw (Almost Normal Grenades) 1500 Normal //Conc Throw (Almost Normal Grenades) 1500 Normal
function ConcussionGrenadeThrown::onThrow(%this, %gren) // function ConcussionGrenadeThrown::onThrow(%this, %gren)
{ // {
AIGrenadeThrown(%gren); // AIGrenadeThrown(%gren);
%gren.detThread = schedule(1800, %gren, "detonateGrenade", %gren); // Was 2000 // %gren.detThread = schedule(1800, %gren, "detonateGrenade", %gren); // Was 2000
} // }
//Attack LOS Sky Fix //Attack LOS Sky Fix
function serverCmdSendTaskToClient(%client, %targetClient, %fromCmdMap) function serverCmdSendTaskToClient(%client, %targetClient, %fromCmdMap)
@ -379,7 +379,7 @@ function VehicleData::damageObject(%data, %targetObject, %sourceObject, %positio
%targetObject.lastDamagedBy = %sourceObject; %targetObject.lastDamagedBy = %sourceObject;
%targetObject.lastDamageType = %damageType; %targetObject.lastDamageType = %damageType;
} }
else else
%targetObject.lastDamagedBy = 0; %targetObject.lastDamagedBy = 0;
// ---------------------------------------------------------------------------------- // ----------------------------------------------------------------------------------
@ -407,10 +407,10 @@ function VehicleData::damageObject(%data, %targetObject, %sourceObject, %positio
%damageScale = %data.damageScale[%damageType]; %damageScale = %data.damageScale[%damageType];
if(%damageScale !$= "") if(%damageScale !$= "")
%amount *= %damageScale; %amount *= %damageScale;
if(%amount != 0) if(%amount != 0)
%targetObject.applyDamage(%amount); %targetObject.applyDamage(%amount);
if(%targetObject.getDamageState() $= "Destroyed" ) if(%targetObject.getDamageState() $= "Destroyed" )
{ {
if( %momVec !$= "") if( %momVec !$= "")

4
Classic/scripts/player.cs
View file

@ -2891,8 +2891,8 @@ function Armor::applyConcussion( %this, %dist, %radius, %sourceObject, %targetOb
} }
else else
{ {
%flagChance = 0.75; %flagChance = 0.70;
%itemChance = 0.75; %itemChance = 0.70;
} }
%probabilityFlag = %flagChance * %percentage; %probabilityFlag = %flagChance * %percentage;