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

175
Scripts/Items/Traps/FireColumnTrap.cs
View file

@ -1,111 +1,114 @@
using System;
using Server.Spells;
namespace Server.Items
{
public class FireColumnTrap : BaseTrap
{
[Constructible]
public FireColumnTrap() : base( 0x1B71 )
{
m_MinDamage = 10;
m_MaxDamage = 40;
public class FireColumnTrap : BaseTrap
{
private int m_MaxDamage;
m_WarningFlame = true;
}
private int m_MinDamage;
public override bool PassivelyTriggered => true;
public override TimeSpan PassiveTriggerDelay => TimeSpan.FromSeconds( 2.0 );
public override int PassiveTriggerRange => 3;
public override TimeSpan ResetDelay => TimeSpan.FromSeconds( 0.5 );
private bool m_WarningFlame;
private int m_MinDamage;
[Constructible]
public FireColumnTrap() : base(0x1B71)
{
m_MinDamage = 10;
m_MaxDamage = 40;
[CommandProperty( AccessLevel.GameMaster )]
public virtual int MinDamage
{
get => m_MinDamage;
set => m_MinDamage = value;
}
m_WarningFlame = true;
}
private int m_MaxDamage;
public FireColumnTrap(Serial serial) : base(serial)
{
}
[CommandProperty( AccessLevel.GameMaster )]
public virtual int MaxDamage
{
get => m_MaxDamage;
set => m_MaxDamage = value;
}
public override bool PassivelyTriggered => true;
public override TimeSpan PassiveTriggerDelay => TimeSpan.FromSeconds(2.0);
public override int PassiveTriggerRange => 3;
public override TimeSpan ResetDelay => TimeSpan.FromSeconds(0.5);
private bool m_WarningFlame;
[CommandProperty(AccessLevel.GameMaster)]
public virtual int MinDamage
{
get => m_MinDamage;
set => m_MinDamage = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public virtual bool WarningFlame
{
get => m_WarningFlame;
set => m_WarningFlame = value;
}
[CommandProperty(AccessLevel.GameMaster)]
public virtual int MaxDamage
{
get => m_MaxDamage;
set => m_MaxDamage = value;
}
public override void OnTrigger( Mobile from )
{
if ( from.AccessLevel > AccessLevel.Player )
return;
[CommandProperty(AccessLevel.GameMaster)]
public virtual bool WarningFlame
{
get => m_WarningFlame;
set => m_WarningFlame = value;
}
if ( WarningFlame )
DoEffect();
public override void OnTrigger(Mobile from)
{
if (from.AccessLevel > AccessLevel.Player)
return;
if ( from.Alive && CheckRange( from.Location, 0 ) )
{
Spells.SpellHelper.Damage( TimeSpan.FromSeconds( 0.5 ), from, from, Utility.RandomMinMax( MinDamage, MaxDamage ), 0, 100, 0, 0, 0 );
if (WarningFlame)
DoEffect();
if ( !WarningFlame )
DoEffect();
}
}
if (from.Alive && CheckRange(from.Location, 0))
{
SpellHelper.Damage(TimeSpan.FromSeconds(0.5), from, from, Utility.RandomMinMax(MinDamage, MaxDamage), 0, 100,
0, 0, 0);
private void DoEffect()
{
Effects.SendLocationParticles( EffectItem.Create( Location, Map, EffectItem.DefaultDuration ), 0x3709, 10, 30, 5052 );
Effects.PlaySound( Location, Map, 0x225 );
}
if (!WarningFlame)
DoEffect();
}
}
public FireColumnTrap( Serial serial ) : base( serial )
{
}
private void DoEffect()
{
Effects.SendLocationParticles(EffectItem.Create(Location, Map, EffectItem.DefaultDuration), 0x3709, 10, 30,
5052);
Effects.PlaySound(Location, Map, 0x225);
}
public override void Serialize( GenericWriter writer )
{
base.Serialize( writer );
public override void Serialize(GenericWriter writer)
{
base.Serialize(writer);
writer.Write( (int) 1 ); // version
writer.Write(1); // version
writer.Write( m_WarningFlame );
writer.Write( m_MinDamage );
writer.Write( m_MaxDamage );
}
writer.Write(m_WarningFlame);
writer.Write(m_MinDamage);
writer.Write(m_MaxDamage);
}
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();
switch ( version )
{
case 1:
{
m_WarningFlame = reader.ReadBool();
m_MinDamage = reader.ReadInt();
m_MaxDamage = reader.ReadInt();
break;
}
}
switch (version)
{
case 1:
{
m_WarningFlame = reader.ReadBool();
m_MinDamage = reader.ReadInt();
m_MaxDamage = reader.ReadInt();
break;
}
}
if ( version == 0 )
{
m_WarningFlame = true;
m_MinDamage = 10;
m_MaxDamage = 40;
}
}
}
}
if (version == 0)
{
m_WarningFlame = true;
m_MinDamage = 10;
m_MaxDamage = 40;
}
}
}
}