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/Construction/Signs/BaseSign.cs
View file

@ -1,28 +1,28 @@
namespace Server.Items
{
public abstract class BaseSign : Item
{
public BaseSign( int dispID ) : base( dispID )
{
Movable = false;
}
public abstract class BaseSign : Item
{
public BaseSign(int dispID) : base(dispID)
{
Movable = false;
}
public BaseSign( Serial serial ) : base( serial )
{
}
public BaseSign(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) 1 );
}
writer.Write(1);
}
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();
}
}
}

89
Scripts/Items/Construction/Signs/LocalizedSign.cs
View file

@ -1,54 +1,61 @@
namespace Server.Items
{
public class LocalizedSign : Sign
{
private int m_LabelNumber;
public class LocalizedSign : Sign
{
private int m_LabelNumber;
public override int LabelNumber => m_LabelNumber;
[Constructible]
public LocalizedSign(SignType type, SignFacing facing, int labelNumber) : base(0xB95 + 2 * (int)type + (int)facing)
{
m_LabelNumber = labelNumber;
}
[CommandProperty( AccessLevel.GameMaster )]
public int Number{ get => m_LabelNumber;
set{ m_LabelNumber = value; InvalidateProperties(); } }
[Constructible]
public LocalizedSign(int itemID, int labelNumber) : base(itemID)
{
m_LabelNumber = labelNumber;
}
[Constructible]
public LocalizedSign( SignType type, SignFacing facing, int labelNumber ) : base( ( 0xB95 + (2 * (int)type) ) + (int)facing )
{
m_LabelNumber = labelNumber;
}
public LocalizedSign(Serial serial) : base(serial)
{
}
[Constructible]
public LocalizedSign( int itemID, int labelNumber ) : base( itemID )
{
m_LabelNumber = labelNumber;
}
public override int LabelNumber => m_LabelNumber;
public LocalizedSign( Serial serial ) : base( serial )
{
}
[CommandProperty(AccessLevel.GameMaster)]
public int Number
{
get => m_LabelNumber;
set
{
m_LabelNumber = value;
InvalidateProperties();
}
}
public override void Serialize( GenericWriter writer )
{
base.Serialize( writer );
public override void Serialize(GenericWriter writer)
{
base.Serialize(writer);
writer.Write( (int) 0 );
writer.Write(0);
writer.Write( m_LabelNumber );
}
writer.Write(m_LabelNumber);
}
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:
{
m_LabelNumber = reader.ReadInt();
break;
}
}
}
}
}
switch (version)
{
case 0:
{
m_LabelNumber = reader.ReadInt();
break;
}
}
}
}
}

186
Scripts/Items/Construction/Signs/Sign.cs
View file

@ -1,104 +1,104 @@
namespace Server.Items
{
public enum SignFacing
{
North,
West
}
public enum SignFacing
{
North,
West
}
public enum SignType
{
Library,
DarkWoodenPost,
LightWoodenPost,
MetalPostC,
MetalPostB,
MetalPostA,
MetalPost,
Bakery,
Tailor,
Tinker,
Butcher,
Healer,
Mage,
Woodworker,
Customs,
Inn,
Shipwright,
Stables,
BarberShop,
Bard,
Fletcher,
Armourer,
Jeweler,
Tavern,
ReagentShop,
Blacksmith,
Painter,
Provisioner,
Bowyer,
WoodenSign,
BrassSign,
ArmamentsGuild,
ArmourersGuild,
BlacksmithsGuild,
WeaponsGuild,
BardicGuild,
BartersGuild,
ProvisionersGuild,
TradersGuild,
CooksGuild,
HealersGuild,
MagesGuild,
SorcerersGuild,
IllusionistGuild,
MinersGuild,
ArchersGuild,
SeamensGuild,
FishermensGuild,
SailorsGuild,
ShipwrightsGuild,
TailorsGuild,
ThievesGuild,
RoguesGuild,
AssassinsGuild,
TinkersGuild,
WarriorsGuild,
CavalryGuild,
FightersGuild,
MerchantsGuild,
Bank,
Theatre
}
public enum SignType
{
Library,
DarkWoodenPost,
LightWoodenPost,
MetalPostC,
MetalPostB,
MetalPostA,
MetalPost,
Bakery,
Tailor,
Tinker,
Butcher,
Healer,
Mage,
Woodworker,
Customs,
Inn,
Shipwright,
Stables,
BarberShop,
Bard,
Fletcher,
Armourer,
Jeweler,
Tavern,
ReagentShop,
Blacksmith,
Painter,
Provisioner,
Bowyer,
WoodenSign,
BrassSign,
ArmamentsGuild,
ArmourersGuild,
BlacksmithsGuild,
WeaponsGuild,
BardicGuild,
BartersGuild,
ProvisionersGuild,
TradersGuild,
CooksGuild,
HealersGuild,
MagesGuild,
SorcerersGuild,
IllusionistGuild,
MinersGuild,
ArchersGuild,
SeamensGuild,
FishermensGuild,
SailorsGuild,
ShipwrightsGuild,
TailorsGuild,
ThievesGuild,
RoguesGuild,
AssassinsGuild,
TinkersGuild,
WarriorsGuild,
CavalryGuild,
FightersGuild,
MerchantsGuild,
Bank,
Theatre
}
public class Sign : BaseSign
{
[Constructible]
public Sign( SignType type, SignFacing facing ) : base( ( 0xB95 + (2 * (int)type) ) + (int)facing )
{
}
public class Sign : BaseSign
{
[Constructible]
public Sign(SignType type, SignFacing facing) : base(0xB95 + 2 * (int)type + (int)facing)
{
}
[Constructible]
public Sign( int itemID ) : base( itemID )
{
}
[Constructible]
public Sign(int itemID) : base(itemID)
{
}
public Sign( Serial serial ) : base( serial )
{
}
public Sign(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 );
}
writer.Write(0);
}
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();
}
}
}

106
Scripts/Items/Construction/Signs/SubtextSign.cs
View file

@ -1,69 +1,71 @@
using System;
namespace Server.Items
{
public class SubtextSign : Sign
{
private string m_Subtext;
public class SubtextSign : Sign
{
private string m_Subtext;
[CommandProperty( AccessLevel.GameMaster )]
public string Subtext
{
get => m_Subtext;
set { m_Subtext = value; InvalidateProperties(); }
}
[Constructible]
public SubtextSign(SignType type, SignFacing facing, string subtext)
: base(type, facing)
{
m_Subtext = subtext;
}
[Constructible]
public SubtextSign( SignType type, SignFacing facing, string subtext )
: base( type, facing )
{
m_Subtext = subtext;
}
[Constructible]
public SubtextSign(int itemID, string subtext)
: base(itemID)
{
m_Subtext = subtext;
}
[Constructible]
public SubtextSign( int itemID, string subtext )
: base( itemID )
{
m_Subtext = subtext;
}
public SubtextSign(Serial serial)
: base(serial)
{
}
public override void OnSingleClick( Mobile from )
{
base.OnSingleClick( from );
[CommandProperty(AccessLevel.GameMaster)]
public string Subtext
{
get => m_Subtext;
set
{
m_Subtext = value;
InvalidateProperties();
}
}
if ( !string.IsNullOrEmpty( m_Subtext ) )
LabelTo( from, m_Subtext );
}
public override void OnSingleClick(Mobile from)
{
base.OnSingleClick(from);
public override void AddNameProperties( ObjectPropertyList list )
{
base.AddNameProperties( list );
if (!string.IsNullOrEmpty(m_Subtext))
LabelTo(from, m_Subtext);
}
if ( !string.IsNullOrEmpty( m_Subtext ) )
list.Add( m_Subtext );
}
public override void AddNameProperties(ObjectPropertyList list)
{
base.AddNameProperties(list);
public SubtextSign( Serial serial )
: base( serial )
{
}
if (!string.IsNullOrEmpty(m_Subtext))
list.Add(m_Subtext);
}
public override void Serialize( GenericWriter writer )
{
base.Serialize( writer );
public override void Serialize(GenericWriter writer)
{
base.Serialize(writer);
writer.Write( (int) 0 );
writer.Write(0);
writer.Write( m_Subtext );
}
writer.Write(m_Subtext);
}
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();
m_Subtext = reader.ReadString();
}
}
m_Subtext = reader.ReadString();
}
}
}