mirror of
https://github.com/ChocoTaco1/TacoServer.git
synced 2026-01-19 16:14:44 +00:00
Added TR2 Bonus, Overtime Reset, rabbitSplash
Added TR2 Bonus, Overtime Reset, rabbitSplash
This commit is contained in:
parent
d24df745ab
commit
6075098d79
|
|
@ -166,6 +166,23 @@
|
||||||
// 1 - Players get 999 or unlimited DiscJumps
|
// 1 - Players get 999 or unlimited DiscJumps
|
||||||
//
|
//
|
||||||
|
|
||||||
|
datablock ItemData(LakFakeFlag2) : flag
|
||||||
|
{
|
||||||
|
lightColor = "0.1 0.1 0.9 1.0";
|
||||||
|
className = LakFakeFlag;
|
||||||
|
lightTime = "100";
|
||||||
|
lightRadius = "5";
|
||||||
|
};
|
||||||
|
|
||||||
|
datablock ItemData(LakFakeFlag4) : LakFakeFlag2
|
||||||
|
{
|
||||||
|
lightColor = "0.9 0.9 0.1 1.0";
|
||||||
|
};
|
||||||
|
|
||||||
|
datablock ItemData(LakFakeFlag8) : LakFakeFlag2
|
||||||
|
{
|
||||||
|
lightColor = "0.1 0.9 0.1 1.0";
|
||||||
|
};
|
||||||
|
|
||||||
package LakRabbitGame {
|
package LakRabbitGame {
|
||||||
|
|
||||||
|
|
@ -417,7 +434,12 @@ function Armor::damageObject(%data, %targetObject, %sourceObject, %position, %am
|
||||||
|
|
||||||
// no splash damage vote
|
// no splash damage vote
|
||||||
if(Game.noSplashDamage && %percentDam < 98 && $lastObjExplode && !$lastObjExplode.isHandNade && %damageType != $DamageType::Mine)
|
if(Game.noSplashDamage && %percentDam < 98 && $lastObjExplode && !$lastObjExplode.isHandNade && %damageType != $DamageType::Mine)
|
||||||
%amount = 0.0;
|
{
|
||||||
|
if(!%targetObject.holdingFlag)
|
||||||
|
%amount = 0.0;
|
||||||
|
else if(((getSimTime() - %targetObject.client.rabbitSplash) < 15000)) //Turn on splash for rabbit after not making a shot for an alotted time
|
||||||
|
%amount = 0.0;
|
||||||
|
}
|
||||||
|
|
||||||
switch$(%damageType)
|
switch$(%damageType)
|
||||||
{
|
{
|
||||||
|
|
@ -435,6 +457,10 @@ function Armor::damageObject(%data, %targetObject, %sourceObject, %position, %am
|
||||||
%sound = %defaultSound;
|
%sound = %defaultSound;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
%tgPos = %targetObject.getPosition();
|
||||||
|
%terrHeight = getTerrainHeight(getWords(%tgPos,0,1));
|
||||||
|
%playerHeight = mAbs(getWord(%tgPos,2) - %terrHeight);
|
||||||
|
|
||||||
// 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
|
||||||
|
|
||||||
// Slap based on a Disc headshot
|
// Slap based on a Disc headshot
|
||||||
|
|
@ -483,6 +509,42 @@ function Armor::damageObject(%data, %targetObject, %sourceObject, %position, %am
|
||||||
messageAll('msgSlapmessage','\c0%1 is taking a short tour around the map.', %targetObject.client.name );
|
messageAll('msgSlapmessage','\c0%1 is taking a short tour around the map.', %targetObject.client.name );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
else if(%ma && getRandom(1,35) <= %chance && %playerHeight >= 100 && %targetObject.holdingFlag)
|
||||||
|
{
|
||||||
|
|
||||||
|
Game.playerDroppedFlag(%targetObject);
|
||||||
|
|
||||||
|
%position = %targetObject.getPosition();
|
||||||
|
%count = 40;
|
||||||
|
%ttl = 60000;
|
||||||
|
%player = %targetObject;
|
||||||
|
if( %position $= "" )
|
||||||
|
{
|
||||||
|
error("No position passed!");
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
if( %count <= 0 )
|
||||||
|
{
|
||||||
|
error("Number of flags to spew must be greater than 0!");
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
%flagArr[0] = LakFakeFlag8;
|
||||||
|
%flagArr[1] = LakFakeFlag2;
|
||||||
|
%flagArr[2] = LakFakeFlag4;
|
||||||
|
|
||||||
|
while( %count > 0 )
|
||||||
|
{
|
||||||
|
%index = mFloor(getRandom() * 3);
|
||||||
|
// throwDummyFlag(location, Datablock);
|
||||||
|
LakRabbitGame::throwDummyFlag(%position, %flagArr[%index], %player, %ttl);
|
||||||
|
%count--;
|
||||||
|
}
|
||||||
|
|
||||||
|
%targetObject.blowup();
|
||||||
|
%targetObject.scriptKill($DamageType::Explosion);
|
||||||
|
%sound = '~wfx/misc/MA1.wav';
|
||||||
|
}
|
||||||
%weapon = "Disc";
|
%weapon = "Disc";
|
||||||
case $DamageType::Grenade:
|
case $DamageType::Grenade:
|
||||||
if($lastObjExplode.isHandNade) //Hand grenades
|
if($lastObjExplode.isHandNade) //Hand grenades
|
||||||
|
|
@ -746,10 +808,15 @@ function Armor::damageObject(%data, %targetObject, %sourceObject, %position, %am
|
||||||
}
|
}
|
||||||
|
|
||||||
// borlak -- make a sound when you hit someone
|
// borlak -- make a sound when you hit someone
|
||||||
if(%sound $= "" && %sourceObject.client.team != %targetObject.client.team)
|
// if(%sound $= "" && %sourceObject.client.team != %targetObject.client.team)
|
||||||
messageClient(%sourceObject.client,'MsgHitSound','~wfx/misc/diagnostic_beep.wav');
|
// messageClient(%sourceObject.client,'MsgHitSound','~wfx/misc/diagnostic_beep.wav');
|
||||||
else if(%sound !$= "")
|
// else if(%sound !$= ""){
|
||||||
|
if(%sound !$= ""){
|
||||||
messageAll('msgSpecialHitSound', %sound);
|
messageAll('msgSpecialHitSound', %sound);
|
||||||
|
if(%sourceObject.holdingFlag){
|
||||||
|
%sourceObject.client.rabbitSplash = getSimTime();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// borlak -- rabbit should be able to kill heavies/mediums fast(er) in duel mode
|
// borlak -- rabbit should be able to kill heavies/mediums fast(er) in duel mode
|
||||||
if(%targetObject.client.armor $= "Heavy" || %targetObject.client.armor $= "Medium")
|
if(%targetObject.client.armor $= "Heavy" || %targetObject.client.armor $= "Medium")
|
||||||
|
|
@ -1905,6 +1972,7 @@ function LakRabbitGame::playerTouchFlag(%game, %player, %flag)
|
||||||
cancel(%game.updateFlagThread[%flag]); // z0dd - ZOD, 8/4/02. Cancel this flag's thread to KineticPoet's flag updater
|
cancel(%game.updateFlagThread[%flag]); // z0dd - ZOD, 8/4/02. Cancel this flag's thread to KineticPoet's flag updater
|
||||||
%player.freeDJ = 0;
|
%player.freeDJ = 0;
|
||||||
%flag.bounced = 0;
|
%flag.bounced = 0;
|
||||||
|
%player.client.rabbitSplash = getSimTime();
|
||||||
|
|
||||||
%player.client.startTime = getSimTime();
|
%player.client.startTime = getSimTime();
|
||||||
%player.holdingFlag = %flag;
|
%player.holdingFlag = %flag;
|
||||||
|
|
@ -2131,6 +2199,9 @@ function LakRabbitGame::gameOver(%game)
|
||||||
// borlak -- delete variables
|
// borlak -- delete variables
|
||||||
deleteVariables("$LakFired*");
|
deleteVariables("$LakFired*");
|
||||||
deleteVariables("$LakDamaged*");
|
deleteVariables("$LakDamaged*");
|
||||||
|
|
||||||
|
%game.voteOT = 0;
|
||||||
|
%game.overtime = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
function LakRabbitGame::resetScore(%game, %client)
|
function LakRabbitGame::resetScore(%game, %client)
|
||||||
|
|
@ -2656,96 +2727,41 @@ function LakRabbitGame::applyConcussion(%game, %player)
|
||||||
%game.dropFlag( %player );
|
%game.dropFlag( %player );
|
||||||
}
|
}
|
||||||
|
|
||||||
//--------------------------------Footnotes---------------------------------------
|
function LakRabbitGame::throwDummyFlag(%position, %datablock, %player, %ttl)
|
||||||
//
|
{
|
||||||
//
|
%client = %player.client;
|
||||||
//To make vote options work in evo admin mod, demonstration only below
|
|
||||||
//
|
// create a flag and throw it
|
||||||
//function serverCmdStartNewVote(%client, %typeName, %arg1, %arg2, %arg3, %arg4, %playerVote)
|
%droppedflag = new Item() {
|
||||||
//{
|
position = %position;
|
||||||
// parent::serverCmdStartNewVote(%client, %typeName, %arg1, %arg2, %arg3, %arg4, %playerVote);
|
rotation = "0 0 1 " @ (getRandom() * 360);
|
||||||
//
|
scale = "1 1 1";
|
||||||
// // sonic9k 11/6/2003 - Added support for LakRabbit DuelMode option
|
dataBlock = %datablock;
|
||||||
// //
|
collideable = "0";
|
||||||
// case "VoteDuelMode":
|
static = "0";
|
||||||
// if( %isAdmin && !%client.ForceVote )
|
rotate = "1";
|
||||||
// {
|
team = "0";
|
||||||
// adminStartNewVote(%client, %typename, %arg1, %arg2, %arg3, %arg4);
|
isFake = 1;
|
||||||
// adminLog(%client, " has toggled " @ %arg1 @ " (" @ %arg2 @ ")");
|
};
|
||||||
// }
|
MissionCleanup.add(%droppedflag);
|
||||||
// else
|
|
||||||
// {
|
%vec = (-1.0 + getRandom() * 2.0) SPC (-1.0 + getRandom() * 2.0) SPC getRandom();
|
||||||
// if(Game.scheduleVote !$= "")
|
%vec = VectorScale(%vec, getrandom(250,1000) + (getRandom() * 300));
|
||||||
// {
|
|
||||||
// messageClient(%client, 'voteAlreadyRunning', '\c2A vote is already in progress.');
|
// Add player's velocity
|
||||||
// return;
|
if (%player !$= "")
|
||||||
// }
|
{
|
||||||
// %actionMsg = ($Host::LakRabbitDuelMode ? "disable Duel mode" : "enable Duel mode");
|
%droppedflag.setCollisionTimeout(%player);
|
||||||
// for(%idx = 0; %idx < ClientGroup.getCount(); %idx++)
|
%vec = vectorAdd(%vec, %player.getVelocity());
|
||||||
// {
|
}
|
||||||
// %cl = ClientGroup.getObject(%idx);
|
|
||||||
// if(!%cl.isAIControlled())
|
%droppedflag.applyImpulse(%pos, %vec);
|
||||||
// {
|
|
||||||
// messageClient(%cl, 'VoteStarted', '\c2%1 initiated a vote to %2.', %client.name, %actionMsg);
|
%droppedFlag.die = schedule(getrandom(1500,3500), 0, "removeLakFakeFlag", %droppedflag);
|
||||||
// %clientsVoting++;
|
}
|
||||||
// }
|
|
||||||
// }
|
function removeLakFakeFlag(%flag)
|
||||||
// playerStartNewVote(%client, %typename, %arg1, %arg2, %arg3, %arg4, %clientsVoting);
|
{
|
||||||
// }
|
%flag.startFade(600, 0, true);
|
||||||
// //
|
%flag.schedule(601, "delete");
|
||||||
// // sonic9k 11/6/2003 - Added support for LakRabbit SplashDamage option
|
}
|
||||||
// //
|
|
||||||
// case "VoteSplashDamage":
|
|
||||||
// if( %isAdmin && !%client.ForceVote )
|
|
||||||
// {
|
|
||||||
// adminStartNewVote(%client, %typename, %arg1, %arg2, %arg3, %arg4);
|
|
||||||
// adminLog(%client, " has toggled " @ %arg1 @ " (" @ %arg2 @ ")");
|
|
||||||
// }
|
|
||||||
// else
|
|
||||||
// {
|
|
||||||
// if(Game.scheduleVote !$= "")
|
|
||||||
// {
|
|
||||||
// messageClient(%client, 'voteAlreadyRunning', '\c2A vote is already in progress.');
|
|
||||||
// return;
|
|
||||||
// }
|
|
||||||
// %actionMsg = ($Host::LakRabbitNoSplashDamage ? "enable SplashDamage" : "disable SplashDamage");
|
|
||||||
// for(%idx = 0; %idx < ClientGroup.getCount(); %idx++)
|
|
||||||
// {
|
|
||||||
// %cl = ClientGroup.getObject(%idx);
|
|
||||||
// if(!%cl.isAIControlled())
|
|
||||||
// {
|
|
||||||
// messageClient(%cl, 'VoteStarted', '\c2%1 initiated a vote to %2.', %client.name, %actionMsg);
|
|
||||||
// %clientsVoting++;
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
// playerStartNewVote(%client, %typename, %arg1, %arg2, %arg3, %arg4, %clientsVoting);
|
|
||||||
// }
|
|
||||||
// //
|
|
||||||
// // chocotaco 8/7/2018 - Added support for LakRabbit Pro option
|
|
||||||
// //
|
|
||||||
// case "VotePro":
|
|
||||||
// if( %isAdmin && !%client.ForceVote )
|
|
||||||
// {
|
|
||||||
// adminStartNewVote(%client, %typename, %arg1, %arg2, %arg3, %arg4);
|
|
||||||
// adminLog(%client, " has toggled " @ %arg1 @ " (" @ %arg2 @ ")");
|
|
||||||
// }
|
|
||||||
// else
|
|
||||||
// {
|
|
||||||
// if(Game.scheduleVote !$= "")
|
|
||||||
// {
|
|
||||||
// messageClient(%client, 'voteAlreadyRunning', '\c2A vote is already in progress.');
|
|
||||||
// return;
|
|
||||||
// }
|
|
||||||
// %actionMsg = ($Host::LakRabbitPubPro ? "disable Pro mode" : "enable Pro mode");
|
|
||||||
// for(%idx = 0; %idx < ClientGroup.getCount(); %idx++)
|
|
||||||
// {
|
|
||||||
// %cl = ClientGroup.getObject(%idx);
|
|
||||||
// if(!%cl.isAIControlled())
|
|
||||||
// {
|
|
||||||
// messageClient(%cl, 'VoteStarted', '\c2%1 initiated a vote to %2.', %client.name, %actionMsg);
|
|
||||||
// %clientsVoting++;
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
// playerStartNewVote(%client, %typename, %arg1, %arg2, %arg3, %arg4, %clientsVoting);
|
|
||||||
// }
|
|
||||||
//}
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue