Fixes code according to modern code style. Fixes a few expression bugs.
This commit is contained in:
parent
89eea25e5f
commit
970fd563b2
3324 changed files with 441118 additions and 433755 deletions
|
|
@ -1,60 +1,61 @@
|
|||
using System;
|
||||
using Server.Regions;
|
||||
using Server.Spells;
|
||||
|
||||
namespace Server.Items
|
||||
{
|
||||
public class MushroomTrap : BaseTrap
|
||||
{
|
||||
[Constructible]
|
||||
public MushroomTrap() : base( 0x1125 )
|
||||
{
|
||||
}
|
||||
public class MushroomTrap : BaseTrap
|
||||
{
|
||||
[Constructible]
|
||||
public MushroomTrap() : base(0x1125)
|
||||
{
|
||||
}
|
||||
|
||||
public override bool PassivelyTriggered => true;
|
||||
public override TimeSpan PassiveTriggerDelay => TimeSpan.Zero;
|
||||
public override int PassiveTriggerRange => 2;
|
||||
public override TimeSpan ResetDelay => TimeSpan.Zero;
|
||||
public MushroomTrap(Serial serial) : base(serial)
|
||||
{
|
||||
}
|
||||
|
||||
public override void OnTrigger( Mobile from )
|
||||
{
|
||||
if ( !from.Alive || ItemID != 0x1125 || from.AccessLevel > AccessLevel.Player )
|
||||
return;
|
||||
public override bool PassivelyTriggered => true;
|
||||
public override TimeSpan PassiveTriggerDelay => TimeSpan.Zero;
|
||||
public override int PassiveTriggerRange => 2;
|
||||
public override TimeSpan ResetDelay => TimeSpan.Zero;
|
||||
|
||||
ItemID = 0x1126;
|
||||
Effects.PlaySound( Location, Map, 0x306 );
|
||||
public override void OnTrigger(Mobile from)
|
||||
{
|
||||
if (!from.Alive || ItemID != 0x1125 || from.AccessLevel > AccessLevel.Player)
|
||||
return;
|
||||
|
||||
Spells.SpellHelper.Damage( TimeSpan.FromSeconds( 0.5 ), from, from, Utility.Dice( 2, 4, 0 ) );
|
||||
ItemID = 0x1126;
|
||||
Effects.PlaySound(Location, Map, 0x306);
|
||||
|
||||
Timer.DelayCall( TimeSpan.FromSeconds( 2.0 ), OnMushroomReset );
|
||||
}
|
||||
SpellHelper.Damage(TimeSpan.FromSeconds(0.5), from, from, Utility.Dice(2, 4, 0));
|
||||
|
||||
public virtual void OnMushroomReset()
|
||||
{
|
||||
if ( Region.Find( Location, Map ).IsPartOf( typeof( DungeonRegion ) ) )
|
||||
ItemID = 0x1125; // reset
|
||||
else
|
||||
Delete();
|
||||
}
|
||||
Timer.DelayCall(TimeSpan.FromSeconds(2.0), OnMushroomReset);
|
||||
}
|
||||
|
||||
public MushroomTrap( Serial serial ) : base( serial )
|
||||
{
|
||||
}
|
||||
public virtual void OnMushroomReset()
|
||||
{
|
||||
if (Region.Find(Location, Map).IsPartOf(typeof(DungeonRegion)))
|
||||
ItemID = 0x1125; // reset
|
||||
else
|
||||
Delete();
|
||||
}
|
||||
|
||||
public override void Serialize( GenericWriter writer )
|
||||
{
|
||||
base.Serialize( writer );
|
||||
public override void Serialize(GenericWriter writer)
|
||||
{
|
||||
base.Serialize(writer);
|
||||
|
||||
writer.Write( (int) 0 ); // version
|
||||
}
|
||||
writer.Write(0); // version
|
||||
}
|
||||
|
||||
public override void Deserialize( GenericReader reader )
|
||||
{
|
||||
base.Deserialize( reader );
|
||||
public override void Deserialize(GenericReader reader)
|
||||
{
|
||||
base.Deserialize(reader);
|
||||
|
||||
int version = reader.ReadInt();
|
||||
int version = reader.ReadInt();
|
||||
|
||||
if ( ItemID == 0x1126 )
|
||||
OnMushroomReset();
|
||||
}
|
||||
}
|
||||
}
|
||||
if (ItemID == 0x1126)
|
||||
OnMushroomReset();
|
||||
}
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue