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

Took out headshot slap

Browse source
This commit is contained in:
ChocoTaco 2019-01-14 13:15:29 -05:00
parent 4fbea3cd47
commit fa04540fd8
1 changed files with 32 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

53
Classic/scripts/LakRabbitGame.cs
View file

@ -16,6 +16,10 @@
// Thanks for helping me test! // Thanks for helping me test!
// maradona, pip, phantom jaguar, hilikus, the_ham, pip, wiggle, dragon, pancho villa, w/o, nectar and many others.. // maradona, pip, phantom jaguar, hilikus, the_ham, pip, wiggle, dragon, pancho villa, w/o, nectar and many others..
// //
// v3.33 January 2019
// Took out slap headshot.
// Added footnotes for voting references with evo admin mod.
//
// v3.32 December 2018 // v3.32 December 2018
// Fixed an issue with lak vote items in the Evo Admin Votemenu // Fixed an issue with lak vote items in the Evo Admin Votemenu
// Took out waypoint sound. // Took out waypoint sound.
@ -430,12 +434,17 @@ function Armor::damageObject(%data, %targetObject, %sourceObject, %position, %am
} }
// special knockback if you hit too close, max 15% chance (point blank).. 5% at 30meters, 1% chance for any MA // special knockback if you hit too close, max 15% chance (point blank).. 5% at 30meters, 1% chance for any MA
%chance = mFloor(25 - %distance/3);
if(%chance <= 0) %chance = 1;
//if(%ma && getRandom(1,100) <= %chance)
// Slap based on a Disc headshot // Slap based on a Disc headshot
if(%ma && getRandom(1,50) <= %chance && %targetObject.client.headshot) //%chance = mFloor(25 - %distance/3);
//if(%ma && getRandom(1,50) <= %chance && %targetObject.client.headshot)
//Normal Slap
%chance = mFloor(15 - %distance/3);
if(%chance <= 0) %chance = 1;
if(%ma && getRandom(1,100) <= %chance)
{ {
if(%targetObject.holdingFlag) if(%targetObject.holdingFlag)
{ {
@ -738,23 +747,25 @@ function Player::setKnockback(%this, %val)
%this.knockback = %val; %this.knockback = %val;
} }
//For headshot detection //For slap headshot detection
function ProjectileData::onCollision(%data, %projectile, %targetObject, %modifier, %position, %normal) //Took out
{ //
%damLoc = firstWord(%targetObject.getDamageLocation(%position)); //function ProjectileData::onCollision(%data, %projectile, %targetObject, %modifier, %position, %normal)
if(%damLoc $= "head") //{
{ // %damLoc = firstWord(%targetObject.getDamageLocation(%position));
%targetObject.getOwnerClient().headShot = 1; // if(%damLoc $= "head")
//%modifier = %data.rifleHeadMultiplier; // {
%targetObject.damage(%projectile.sourceObject, %position, %data.directDamage * %modifier, %data.directDamageType); // %targetObject.getOwnerClient().headShot = 1;
} // //%modifier = %data.rifleHeadMultiplier;
else // %targetObject.damage(%projectile.sourceObject, %position, %data.directDamage * %modifier, %data.directDamageType);
{ // }
//%modifier = 1; // else
%targetObject.getOwnerClient().headShot = 0; // {
%targetObject.damage(%projectile.sourceObject, %position, %data.directDamage * %modifier, %data.directDamageType); // //%modifier = 1;
} // %targetObject.getOwnerClient().headShot = 0;
} // %targetObject.damage(%projectile.sourceObject, %position, %data.directDamage * %modifier, %data.directDamageType);
// }
//}
}; };