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

40
Scripts/Items/Suits/AdminRobe.cs
View file

@ -1,28 +1,28 @@
namespace Server.Items
{
public class AdminRobe : BaseSuit
{
[Constructible]
public AdminRobe() : base( AccessLevel.Administrator, 0x0, 0x204F ) // Blank hue
{
}
public class AdminRobe : BaseSuit
{
[Constructible]
public AdminRobe() : base(AccessLevel.Administrator, 0x0, 0x204F) // Blank hue
{
}
public AdminRobe( Serial serial ) : base( serial )
{
}
public AdminRobe(Serial serial) : base(serial)
{
}
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();
}
}
}

134
Scripts/Items/Suits/BaseSuit.cs
View file

@ -1,86 +1,86 @@
namespace Server.Items
{
public abstract class BaseSuit : Item
{
[CommandProperty( AccessLevel.Administrator )]
public AccessLevel AccessLevel { get; set; }
public abstract class BaseSuit : Item
{
public BaseSuit(AccessLevel level, int hue, int itemID) : base(itemID)
{
Hue = hue;
Weight = 1.0;
Movable = false;
LootType = LootType.Newbied;
Layer = Layer.OuterTorso;
public BaseSuit( AccessLevel level, int hue, int itemID ) : base( itemID )
{
Hue = hue;
Weight = 1.0;
Movable = false;
LootType = LootType.Newbied;
Layer = Layer.OuterTorso;
AccessLevel = level;
}
AccessLevel = level;
}
public BaseSuit(Serial serial) : base(serial)
{
}
public BaseSuit( Serial serial ) : base( serial )
{
}
[CommandProperty(AccessLevel.Administrator)]
public AccessLevel AccessLevel{ get; set; }
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
writer.Write( (int) AccessLevel );
}
writer.Write((int)AccessLevel);
}
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 0:
{
AccessLevel = (AccessLevel)reader.ReadInt();
break;
}
}
}
switch (version)
{
case 0:
{
AccessLevel = (AccessLevel)reader.ReadInt();
break;
}
}
}
public bool Validate()
{
object root = RootParent;
public bool Validate()
{
object root = RootParent;
if ( root is Mobile mobile && mobile.AccessLevel < AccessLevel )
{
Delete();
return false;
}
if (root is Mobile mobile && mobile.AccessLevel < AccessLevel)
{
Delete();
return false;
}
return true;
}
return true;
}
public override void OnSingleClick( Mobile from )
{
if ( Validate() )
base.OnSingleClick( from );
}
public override void OnSingleClick(Mobile from)
{
if (Validate())
base.OnSingleClick(from);
}
public override void OnDoubleClick( Mobile from )
{
if ( Validate() )
base.OnDoubleClick( from );
}
public override void OnDoubleClick(Mobile from)
{
if (Validate())
base.OnDoubleClick(from);
}
public override bool VerifyMove( Mobile from )
{
return ( from.AccessLevel >= AccessLevel );
}
public override bool VerifyMove(Mobile from)
{
return from.AccessLevel >= AccessLevel;
}
public override bool OnEquip( Mobile from )
{
if ( from.AccessLevel < AccessLevel )
from.SendMessage( "You may not wear this." );
public override bool OnEquip(Mobile from)
{
if (from.AccessLevel < AccessLevel)
from.SendMessage("You may not wear this.");
return ( from.AccessLevel >= AccessLevel );
}
}
}
return from.AccessLevel >= AccessLevel;
}
}
}

40
Scripts/Items/Suits/CounselorRobe.cs
View file

@ -1,28 +1,28 @@
namespace Server.Items
{
public class CounselorRobe : BaseSuit
{
[Constructible]
public CounselorRobe() : base( AccessLevel.Counselor, 0x3, 0x204F )
{
}
public class CounselorRobe : BaseSuit
{
[Constructible]
public CounselorRobe() : base(AccessLevel.Counselor, 0x3, 0x204F)
{
}
public CounselorRobe( Serial serial ) : base( serial )
{
}
public CounselorRobe(Serial serial) : base(serial)
{
}
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();
}
}
}

40
Scripts/Items/Suits/DeathShroud.cs
View file

@ -1,28 +1,28 @@
namespace Server.Items
{
public class DeathShroud : BaseSuit
{
[Constructible]
public DeathShroud() : base( AccessLevel.GameMaster, 0x0, 0x204E )
{
}
public class DeathShroud : BaseSuit
{
[Constructible]
public DeathShroud() : base(AccessLevel.GameMaster, 0x0, 0x204E)
{
}
public DeathShroud( Serial serial ) : base( serial )
{
}
public DeathShroud(Serial serial) : base(serial)
{
}
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();
}
}
}

40
Scripts/Items/Suits/DupreSuit.cs
View file

@ -1,28 +1,28 @@
namespace Server.Items
{
public class DupreSuit : BaseSuit
{
[Constructible]
public DupreSuit() : base( AccessLevel.GameMaster, 0x0, 0x2050 )
{
}
public class DupreSuit : BaseSuit
{
[Constructible]
public DupreSuit() : base(AccessLevel.GameMaster, 0x0, 0x2050)
{
}
public DupreSuit( Serial serial ) : base( serial )
{
}
public DupreSuit(Serial serial) : base(serial)
{
}
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();
}
}
}

40
Scripts/Items/Suits/GMRobe.cs
View file

@ -1,28 +1,28 @@
namespace Server.Items
{
public class GMRobe : BaseSuit
{
[Constructible]
public GMRobe() : base( AccessLevel.GameMaster, 0x26, 0x204F )
{
}
public class GMRobe : BaseSuit
{
[Constructible]
public GMRobe() : base(AccessLevel.GameMaster, 0x26, 0x204F)
{
}
public GMRobe( Serial serial ) : base( serial )
{
}
public GMRobe(Serial serial) : base(serial)
{
}
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();
}
}
}

40
Scripts/Items/Suits/LordBlackthorneSuit.cs
View file

@ -1,28 +1,28 @@
namespace Server.Items
{
public class LordBlackthorneSuit : BaseSuit
{
[Constructible]
public LordBlackthorneSuit() : base( AccessLevel.GameMaster, 0x0, 0x2043 )
{
}
public class LordBlackthorneSuit : BaseSuit
{
[Constructible]
public LordBlackthorneSuit() : base(AccessLevel.GameMaster, 0x0, 0x2043)
{
}
public LordBlackthorneSuit( Serial serial ) : base( serial )
{
}
public LordBlackthorneSuit(Serial serial) : base(serial)
{
}
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();
}
}
}

40
Scripts/Items/Suits/LordBritishSuit.cs
View file

@ -1,28 +1,28 @@
namespace Server.Items
{
public class LordBritishSuit : BaseSuit
{
[Constructible]
public LordBritishSuit() : base( AccessLevel.GameMaster, 0x0, 0x2042 )
{
}
public class LordBritishSuit : BaseSuit
{
[Constructible]
public LordBritishSuit() : base(AccessLevel.GameMaster, 0x0, 0x2042)
{
}
public LordBritishSuit( Serial serial ) : base( serial )
{
}
public LordBritishSuit(Serial serial) : base(serial)
{
}
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();
}
}
}

40
Scripts/Items/Suits/SeerRobe.cs
View file

@ -1,28 +1,28 @@
namespace Server.Items
{
public class SeerRobe : BaseSuit
{
[Constructible]
public SeerRobe() : base( AccessLevel.Seer, 0x1D3, 0x204F )
{
}
public class SeerRobe : BaseSuit
{
[Constructible]
public SeerRobe() : base(AccessLevel.Seer, 0x1D3, 0x204F)
{
}
public SeerRobe( Serial serial ) : base( serial )
{
}
public SeerRobe(Serial serial) : base(serial)
{
}
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();
}
}
}