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

261
Scripts/Items/Traps/StoneFaceTrap.cs
View file

@ -1,161 +1,166 @@
using System;
using Server.Spells;
namespace Server.Items
{
public enum StoneFaceTrapType
{
NorthWestWall,
NorthWall,
WestWall
}
public enum StoneFaceTrapType
{
NorthWestWall,
NorthWall,
WestWall
}
public class StoneFaceTrap : BaseTrap
{
[CommandProperty( AccessLevel.GameMaster )]
public StoneFaceTrapType Type
{
get
{
switch ( ItemID )
{
case 0x10F5: case 0x10F6: case 0x10F7: return StoneFaceTrapType.NorthWestWall;
case 0x10FC: case 0x10FD: case 0x10FE: return StoneFaceTrapType.NorthWall;
case 0x110F: case 0x1110: case 0x1111: return StoneFaceTrapType.WestWall;
}
public class StoneFaceTrap : BaseTrap
{
[Constructible]
public StoneFaceTrap() : base(0x10FC)
{
Light = LightType.Circle225;
}
return StoneFaceTrapType.NorthWestWall;
}
set
{
bool breathing = Breathing;
public StoneFaceTrap(Serial serial) : base(serial)
{
}
ItemID = ( breathing ? GetFireID( value ) : GetBaseID( value ) );
}
}
[CommandProperty(AccessLevel.GameMaster)]
public StoneFaceTrapType Type
{
get
{
switch (ItemID)
{
case 0x10F5:
case 0x10F6:
case 0x10F7: return StoneFaceTrapType.NorthWestWall;
case 0x10FC:
case 0x10FD:
case 0x10FE: return StoneFaceTrapType.NorthWall;
case 0x110F:
case 0x1110:
case 0x1111: return StoneFaceTrapType.WestWall;
}
public bool Breathing
{
get => ( ItemID == GetFireID( Type ) );
set
{
if ( value )
ItemID = GetFireID( Type );
else
ItemID = GetBaseID( Type );
}
}
return StoneFaceTrapType.NorthWestWall;
}
set
{
bool breathing = Breathing;
public static int GetBaseID( StoneFaceTrapType type )
{
switch ( type )
{
case StoneFaceTrapType.NorthWestWall: return 0x10F5;
case StoneFaceTrapType.NorthWall: return 0x10FC;
case StoneFaceTrapType.WestWall: return 0x110F;
}
ItemID = breathing ? GetFireID(value) : GetBaseID(value);
}
}
return 0;
}
public bool Breathing
{
get => ItemID == GetFireID(Type);
set
{
if (value)
ItemID = GetFireID(Type);
else
ItemID = GetBaseID(Type);
}
}
public static int GetFireID( StoneFaceTrapType type )
{
switch ( type )
{
case StoneFaceTrapType.NorthWestWall: return 0x10F7;
case StoneFaceTrapType.NorthWall: return 0x10FE;
case StoneFaceTrapType.WestWall: return 0x1111;
}
public override bool PassivelyTriggered => true;
public override TimeSpan PassiveTriggerDelay => TimeSpan.Zero;
public override int PassiveTriggerRange => 2;
public override TimeSpan ResetDelay => TimeSpan.Zero;
return 0;
}
public static int GetBaseID(StoneFaceTrapType type)
{
switch (type)
{
case StoneFaceTrapType.NorthWestWall: return 0x10F5;
case StoneFaceTrapType.NorthWall: return 0x10FC;
case StoneFaceTrapType.WestWall: return 0x110F;
}
[Constructible]
public StoneFaceTrap() : base( 0x10FC )
{
Light = LightType.Circle225;
}
return 0;
}
public override bool PassivelyTriggered => true;
public override TimeSpan PassiveTriggerDelay => TimeSpan.Zero;
public override int PassiveTriggerRange => 2;
public override TimeSpan ResetDelay => TimeSpan.Zero;
public static int GetFireID(StoneFaceTrapType type)
{
switch (type)
{
case StoneFaceTrapType.NorthWestWall: return 0x10F7;
case StoneFaceTrapType.NorthWall: return 0x10FE;
case StoneFaceTrapType.WestWall: return 0x1111;
}
public override void OnTrigger( Mobile from )
{
if ( !from.Alive || from.AccessLevel > AccessLevel.Player )
return;
return 0;
}
Effects.PlaySound( Location, Map, 0x359 );
public override void OnTrigger(Mobile from)
{
if (!from.Alive || from.AccessLevel > AccessLevel.Player)
return;
Breathing = true;
Effects.PlaySound(Location, Map, 0x359);
Timer.DelayCall( TimeSpan.FromSeconds( 2.0 ), FinishBreath );
Timer.DelayCall( TimeSpan.FromSeconds( 1.0 ), TriggerDamage );
}
Breathing = true;
public virtual void FinishBreath()
{
Breathing = false;
}
Timer.DelayCall(TimeSpan.FromSeconds(2.0), FinishBreath);
Timer.DelayCall(TimeSpan.FromSeconds(1.0), TriggerDamage);
}
public virtual void TriggerDamage()
{
foreach ( Mobile mob in GetMobilesInRange( 1 ) )
{
if ( mob.Alive && !mob.IsDeadBondedPet && mob.AccessLevel == AccessLevel.Player )
Spells.SpellHelper.Damage( TimeSpan.FromTicks( 1 ), mob, mob, Utility.Dice( 3, 15, 0 ) );
}
}
public virtual void FinishBreath()
{
Breathing = false;
}
public StoneFaceTrap( Serial serial ) : base( serial )
{
}
public virtual void TriggerDamage()
{
foreach (Mobile mob in GetMobilesInRange(1))
if (mob.Alive && !mob.IsDeadBondedPet && mob.AccessLevel == AccessLevel.Player)
SpellHelper.Damage(TimeSpan.FromTicks(1), mob, mob, Utility.Dice(3, 15, 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();
Breathing = false;
}
}
Breathing = false;
}
}
public class StoneFaceTrapNoDamage : StoneFaceTrap
{
[Constructible]
public StoneFaceTrapNoDamage()
{
}
public class StoneFaceTrapNoDamage : StoneFaceTrap
{
[Constructible]
public StoneFaceTrapNoDamage()
{
}
public StoneFaceTrapNoDamage( Serial serial ) : base( serial )
{
}
public StoneFaceTrapNoDamage(Serial serial) : base(serial)
{
}
public override void TriggerDamage()
{
// nothing..
}
public override void TriggerDamage()
{
// nothing..
}
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();
}
}
}