warrentyexpired/ModernUO
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixes code according to modern code style. Fixes a few expression bugs.

Browse source
This commit is contained in:
Kamron Batman 2018-09-15 09:58:51 -07:00
parent 89eea25e5f
commit 970fd563b2
3324 changed files with 441118 additions and 433755 deletions
Download patch file Download diff file Expand all files Collapse all files

243
Scripts/Items/Traps/SpikeTrap.cs
View file

@ -1,149 +1,156 @@
using System;
using Server.Network;
using Server.Spells;
namespace Server.Items
{
public enum SpikeTrapType
{
WestWall,
NorthWall,
WestFloor,
NorthFloor
}
public enum SpikeTrapType
{
WestWall,
NorthWall,
WestFloor,
NorthFloor
}
public class SpikeTrap : BaseTrap
{
[CommandProperty( AccessLevel.GameMaster )]
public SpikeTrapType Type
{
get
{
switch ( ItemID )
{
case 4360: case 4361: case 4366: return SpikeTrapType.WestWall;
case 4379: case 4380: case 4385: return SpikeTrapType.NorthWall;
case 4506: case 4507: case 4511: return SpikeTrapType.WestFloor;
case 4512: case 4513: case 4517: return SpikeTrapType.NorthFloor;
}
public class SpikeTrap : BaseTrap
{
[Constructible]
public SpikeTrap() : this(SpikeTrapType.WestFloor)
{
}
return SpikeTrapType.WestWall;
}
set
{
bool extended = Extended;
[Constructible]
public SpikeTrap(SpikeTrapType type) : base(GetBaseID(type))
{
}
ItemID = ( extended ? GetExtendedID( value ) : GetBaseID( value ) );
}
}
public SpikeTrap(Serial serial) : base(serial)
{
}
public bool Extended
{
get => ( ItemID == GetExtendedID( Type ) );
set
{
if ( value )
ItemID = GetExtendedID( Type );
else
ItemID = GetBaseID( Type );
}
}
[CommandProperty(AccessLevel.GameMaster)]
public SpikeTrapType Type
{
get
{
switch (ItemID)
{
case 4360:
case 4361:
case 4366: return SpikeTrapType.WestWall;
case 4379:
case 4380:
case 4385: return SpikeTrapType.NorthWall;
case 4506:
case 4507:
case 4511: return SpikeTrapType.WestFloor;
case 4512:
case 4513:
case 4517: return SpikeTrapType.NorthFloor;
}
public static int GetBaseID( SpikeTrapType type )
{
switch ( type )
{
case SpikeTrapType.WestWall: return 4360;
case SpikeTrapType.NorthWall: return 4379;
case SpikeTrapType.WestFloor: return 4506;
case SpikeTrapType.NorthFloor: return 4512;
}
return SpikeTrapType.WestWall;
}
set
{
bool extended = Extended;
return 0;
}
ItemID = extended ? GetExtendedID(value) : GetBaseID(value);
}
}
public static int GetExtendedID( SpikeTrapType type )
{
return GetBaseID( type ) + GetExtendedOffset( type );
}
public bool Extended
{
get => ItemID == GetExtendedID(Type);
set
{
if (value)
ItemID = GetExtendedID(Type);
else
ItemID = GetBaseID(Type);
}
}
public static int GetExtendedOffset( SpikeTrapType type )
{
switch ( type )
{
case SpikeTrapType.WestWall: return 6;
case SpikeTrapType.NorthWall: return 6;
public override bool PassivelyTriggered => false;
public override TimeSpan PassiveTriggerDelay => TimeSpan.Zero;
public override int PassiveTriggerRange => 0;
public override TimeSpan ResetDelay => TimeSpan.FromSeconds(6.0);
case SpikeTrapType.WestFloor: return 5;
case SpikeTrapType.NorthFloor: return 5;
}
public static int GetBaseID(SpikeTrapType type)
{
switch (type)
{
case SpikeTrapType.WestWall: return 4360;
case SpikeTrapType.NorthWall: return 4379;
case SpikeTrapType.WestFloor: return 4506;
case SpikeTrapType.NorthFloor: return 4512;
}
return 0;
}
return 0;
}
[Constructible]
public SpikeTrap() : this( SpikeTrapType.WestFloor )
{
}
public static int GetExtendedID(SpikeTrapType type)
{
return GetBaseID(type) + GetExtendedOffset(type);
}
[Constructible]
public SpikeTrap( SpikeTrapType type ) : base( GetBaseID( type ) )
{
}
public static int GetExtendedOffset(SpikeTrapType type)
{
switch (type)
{
case SpikeTrapType.WestWall: return 6;
case SpikeTrapType.NorthWall: return 6;
public override bool PassivelyTriggered => false;
public override TimeSpan PassiveTriggerDelay => TimeSpan.Zero;
public override int PassiveTriggerRange => 0;
public override TimeSpan ResetDelay => TimeSpan.FromSeconds( 6.0 );
case SpikeTrapType.WestFloor: return 5;
case SpikeTrapType.NorthFloor: return 5;
}
public override void OnTrigger( Mobile from )
{
if ( !from.Alive || from.AccessLevel > AccessLevel.Player )
return;
return 0;
}
Effects.SendLocationEffect( Location, Map, GetBaseID( Type ) + 1, 18, 3, GetEffectHue(), 0 );
Effects.PlaySound( Location, Map, 0x22C );
public override void OnTrigger(Mobile from)
{
if (!from.Alive || from.AccessLevel > AccessLevel.Player)
return;
foreach ( Mobile mob in GetMobilesInRange( 0 ) )
{
if ( mob.Alive && !mob.IsDeadBondedPet )
Spells.SpellHelper.Damage( TimeSpan.FromTicks( 1 ), mob, mob, Utility.RandomMinMax( 1, 6 ) * 6 );
}
Effects.SendLocationEffect(Location, Map, GetBaseID(Type) + 1, 18, 3, GetEffectHue(), 0);
Effects.PlaySound(Location, Map, 0x22C);
Timer.DelayCall( TimeSpan.FromSeconds( 1.0 ), OnSpikeExtended );
foreach (Mobile mob in GetMobilesInRange(0))
if (mob.Alive && !mob.IsDeadBondedPet)
SpellHelper.Damage(TimeSpan.FromTicks(1), mob, mob, Utility.RandomMinMax(1, 6) * 6);
from.LocalOverheadMessage( MessageType.Regular, 0x22, 500852 ); // You stepped onto a spike trap!
}
Timer.DelayCall(TimeSpan.FromSeconds(1.0), OnSpikeExtended);
public virtual void OnSpikeExtended()
{
Extended = true;
Timer.DelayCall( TimeSpan.FromSeconds( 5.0 ), OnSpikeRetracted );
}
from.LocalOverheadMessage(MessageType.Regular, 0x22, 500852); // You stepped onto a spike trap!
}
public virtual void OnSpikeRetracted()
{
Extended = false;
Effects.SendLocationEffect( Location, Map, GetExtendedID( Type ) - 1, 6, 3, GetEffectHue(), 0 );
}
public virtual void OnSpikeExtended()
{
Extended = true;
Timer.DelayCall(TimeSpan.FromSeconds(5.0), OnSpikeRetracted);
}
public SpikeTrap( Serial serial ) : base( serial )
{
}
public virtual void OnSpikeRetracted()
{
Extended = false;
Effects.SendLocationEffect(Location, Map, GetExtendedID(Type) - 1, 6, 3, GetEffectHue(), 0);
}
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();
Extended = false;
}
}
}
Extended = false;
}
}
}