mirror of
https://github.com/ChocoTaco1/TacoServer.git
synced 2026-07-14 07:34:36 +00:00
Satchel Exception
This commit is contained in:
parent
aac90d5408
commit
e14cbd079e
1 changed files with 22 additions and 22 deletions
|
|
@ -313,6 +313,9 @@ function Armor::damageObject(%data, %targetObject, %sourceObject, %position, %am
|
||||||
if(%targetObject.invincible || %targetObject.getState() $= "Dead")
|
if(%targetObject.invincible || %targetObject.getState() $= "Dead")
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
if(%damageType == $DamageType::SatchelCharge && $InvBanList[LakRabbit, "SatchelCharge"])
|
||||||
|
return;
|
||||||
|
|
||||||
//rabbit can't DJ in duel mode
|
//rabbit can't DJ in duel mode
|
||||||
// if(Game.duelMode && %targetObject.holdingFlag && %targetObject == %sourceObject
|
// if(Game.duelMode && %targetObject.holdingFlag && %targetObject == %sourceObject
|
||||||
// && %damageType == $DamageType::Disc
|
// && %damageType == $DamageType::Disc
|
||||||
|
|
@ -342,7 +345,7 @@ function Armor::damageObject(%data, %targetObject, %sourceObject, %position, %am
|
||||||
&& %sourceObject.getDataBlock().getClassName() $= "PlayerData"
|
&& %sourceObject.getDataBlock().getClassName() $= "PlayerData"
|
||||||
&& %targetObject.client == %sourceObject.client)
|
&& %targetObject.client == %sourceObject.client)
|
||||||
{
|
{
|
||||||
if(%damageType == $DamageType::Disc && %sourceObject.freeDJ)
|
if(%damageType == $DamageType::Disc && (%sourceObject.freeDJ || $Host::LakRabbitUnlimitedDJ))
|
||||||
{
|
{
|
||||||
%amount = 0;
|
%amount = 0;
|
||||||
%sourceObject.freeDJ--;
|
%sourceObject.freeDJ--;
|
||||||
|
|
@ -626,7 +629,7 @@ function Armor::damageObject(%data, %targetObject, %sourceObject, %position, %am
|
||||||
}
|
}
|
||||||
%weapon = "Plasma";
|
%weapon = "Plasma";
|
||||||
case $DamageType::Laser:
|
case $DamageType::Laser:
|
||||||
if($InvBanList[LakRabbit, "SniperRifle"]) //banned
|
if($InvBanList[LakRabbit, "SniperRifle"]) //banned
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if(%energy > 0.5 || %players > 7)
|
if(%energy > 0.5 || %players > 7)
|
||||||
|
|
@ -666,7 +669,7 @@ function Armor::damageObject(%data, %targetObject, %sourceObject, %position, %am
|
||||||
case $DamageType::Missile:
|
case $DamageType::Missile:
|
||||||
// doesn't matter if it's MA
|
// doesn't matter if it's MA
|
||||||
%ma = 0;
|
%ma = 0;
|
||||||
if((getSimTime() - $LakRabbit::MissileHeistTime > 10000) || !$LakRabbit::MissileHeistTime)
|
if(((getSimTime() - $LakRabbit::MissileHeistTime > 10000) || !$LakRabbit::MissileHeistTime) && $InvBanList[LakRabbit, "MissileLauncher"])
|
||||||
return;
|
return;
|
||||||
%weapon = "Missile";
|
%weapon = "Missile";
|
||||||
}
|
}
|
||||||
|
|
@ -1525,25 +1528,22 @@ function LakRabbitGame::playerSpawned(%game, %player)
|
||||||
|
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
%player.clearInventory();
|
%player.clearInventory();
|
||||||
%player.setInventory(Disc,1);
|
%player.setInventory(Disc,1);
|
||||||
%player.setInventory(Blaster,1);
|
%player.setInventory(Blaster,1);
|
||||||
%player.setInventory(Plasma,1);
|
%player.setInventory(Plasma,1);
|
||||||
%player.setInventory(DiscAmmo,30);
|
%player.setInventory(DiscAmmo,30);
|
||||||
%player.setInventory(PlasmaAmmo,40);
|
%player.setInventory(PlasmaAmmo,40);
|
||||||
%player.setInventory(Mine,6);
|
%player.setInventory(Mine,6);
|
||||||
%player.setInventory(RepairKit,1);
|
%player.setInventory(RepairKit,1);
|
||||||
%player.setInventory(EnergyPack,1);
|
%player.setInventory(EnergyPack,1);
|
||||||
%player.use("Disc");
|
%player.use("Disc");
|
||||||
}
|
}
|
||||||
|
|
||||||
%player.schedule(250,"selectWeaponSlot", 0);
|
%player.schedule(250,"selectWeaponSlot", 0);
|
||||||
%player.setEnergyLevel(%player.getDatablock().maxEnergy);
|
%player.setEnergyLevel(%player.getDatablock().maxEnergy);
|
||||||
|
|
||||||
if($Host::LakRabbitUnlimitedDJ == 1)
|
%player.freeDJ = 1; // free diskjump
|
||||||
%player.freeDJ = 999; // free diskjump
|
|
||||||
else
|
|
||||||
%player.freeDJ = 1; // free diskjump
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue