mirror of
https://github.com/ChocoTaco1/TacoServer.git
synced 2026-03-09 14:40:27 +00:00
Updates
This commit is contained in:
parent
43dc1a7d81
commit
6d1805d2e9
1 changed files with 18 additions and 14 deletions
|
|
@ -212,7 +212,7 @@ function Flag::objectiveInit(%data, %flag)
|
|||
// -------------------------------------------------------------------------------------------
|
||||
}
|
||||
|
||||
// AI consoel spam
|
||||
// AI console spam
|
||||
function AIThrowObject(%object)
|
||||
{
|
||||
return;
|
||||
|
|
@ -313,7 +313,7 @@ function Armor::damageObject(%data, %targetObject, %sourceObject, %position, %am
|
|||
if(%targetObject.invincible || %targetObject.getState() $= "Dead")
|
||||
return;
|
||||
|
||||
if(%damageType == $DamageType::SatchelCharge && $InvBanList[LakRabbit, "SatchelCharge"])
|
||||
if(%damageType == $DamageType::SatchelCharge && $InvBanList[LakRabbit, "SatchelCharge"] $= 1)
|
||||
return;
|
||||
|
||||
//rabbit can't DJ in duel mode
|
||||
|
|
@ -345,10 +345,13 @@ function Armor::damageObject(%data, %targetObject, %sourceObject, %position, %am
|
|||
&& %sourceObject.getDataBlock().getClassName() $= "PlayerData"
|
||||
&& %targetObject.client == %sourceObject.client)
|
||||
{
|
||||
if(%damageType == $DamageType::Disc && %sourceObject.freeDJ)
|
||||
if(%sourceObject.holdingFlag $= "") //Not holding a flag (NonRabbit)
|
||||
{
|
||||
%amount = 0;
|
||||
%sourceObject.freeDJ--;
|
||||
if(%damageType == $DamageType::Disc && (%sourceObject.freeDJ || $Host::LakRabbitUnlimitedDJ))
|
||||
{
|
||||
%amount = 0;
|
||||
%sourceObject.freeDJ--;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -629,7 +632,7 @@ function Armor::damageObject(%data, %targetObject, %sourceObject, %position, %am
|
|||
}
|
||||
%weapon = "Plasma";
|
||||
case $DamageType::Laser:
|
||||
if($InvBanList[LakRabbit, "SniperRifle"]) //banned
|
||||
if($InvBanList[LakRabbit, "SniperRifle"] $= 1) //banned
|
||||
return;
|
||||
|
||||
if(%energy > 0.5 || %players > 7)
|
||||
|
|
@ -669,8 +672,11 @@ function Armor::damageObject(%data, %targetObject, %sourceObject, %position, %am
|
|||
case $DamageType::Missile:
|
||||
// doesn't matter if it's MA
|
||||
%ma = 0;
|
||||
if((getSimTime() - $LakRabbit::MissileHeistTime > 10000) || !$LakRabbit::MissileHeistTime)
|
||||
return;
|
||||
if($InvBanList[LakRabbit, "MissileLauncher"] $= 1)
|
||||
{
|
||||
if((getSimTime() - $LakRabbit::MissileHeistTime > 10000) || !$LakRabbit::MissileHeistTime)
|
||||
return;
|
||||
}
|
||||
%weapon = "Missile";
|
||||
}
|
||||
}
|
||||
|
|
@ -817,7 +823,8 @@ function Armor::damageObject(%data, %targetObject, %sourceObject, %position, %am
|
|||
// should this guy be blown apart?
|
||||
if( %damageType == $DamageType::Explosion ||
|
||||
%damageType == $DamageType::Mortar ||
|
||||
%damageType == $DamageType::Missile )
|
||||
%damageType == $DamageType::Missile ||
|
||||
%damageType == $DamageType::SatchelCharge )
|
||||
{
|
||||
if( %previousDamage >= 0.35 ) // only if <= 35 percent damage remaining
|
||||
{
|
||||
|
|
@ -975,7 +982,7 @@ $InvBanList[LakRabbit, "Plasma"] = 0;
|
|||
$InvBanList[LakRabbit, "Blaster"] = 0;
|
||||
$InvBanList[LakRabbit, "EnergyPack"] = 0;
|
||||
$InvBanList[LakRabbit, "Mine"] = 0;
|
||||
$InvBanList[LakRabbit, "TargetingLaser"] = 0;
|
||||
$InvBanList[LakRabbit, "TargetingLaser"] = 1;
|
||||
|
||||
|
||||
// borlak functions
|
||||
|
|
@ -1543,10 +1550,7 @@ function LakRabbitGame::playerSpawned(%game, %player)
|
|||
%player.schedule(250,"selectWeaponSlot", 0);
|
||||
%player.setEnergyLevel(%player.getDatablock().maxEnergy);
|
||||
|
||||
if($Host::LakRabbitUnlimitedDJ == 1)
|
||||
%player.freeDJ = 999; // free diskjump
|
||||
else
|
||||
%player.freeDJ = 1; // free diskjump
|
||||
%player.freeDJ = 1; // free diskjump
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue