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

49
Scripts/Items/Misc/Blighted Grove/AbscessTail.cs
View file

@ -1,33 +1,32 @@
namespace Server.Items
{
public class AbscessTail : Item
{
public override int LabelNumber => 1074231; // Abscess' Tail
public class AbscessTail : Item
{
[Constructible]
public AbscessTail() : base(0x1A9D)
{
LootType = LootType.Blessed;
Hue = 0x51D; // TODO check
}
[Constructible]
public AbscessTail() : base( 0x1A9D )
{
LootType = LootType.Blessed;
Hue = 0x51D; // TODO check
}
public AbscessTail(Serial serial) : base(serial)
{
}
public AbscessTail( Serial serial ) : base( serial )
{
}
public override int LabelNumber => 1074231; // Abscess' Tail
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 );
int version = reader.ReadInt();
}
}
}
public override void Deserialize(GenericReader reader)
{
base.Deserialize(reader);
int version = reader.ReadInt();
}
}
}

49
Scripts/Items/Misc/Blighted Grove/CoilsFang.cs
View file

@ -1,33 +1,32 @@
namespace Server.Items
{
public class CoilsFang : Item
{
public override int LabelNumber => 1074229; // Coil's Fang
public class CoilsFang : Item
{
[Constructible]
public CoilsFang() : base(0x10E8)
{
LootType = LootType.Blessed;
Hue = 0x487;
}
[Constructible]
public CoilsFang() : base( 0x10E8 )
{
LootType = LootType.Blessed;
Hue = 0x487;
}
public CoilsFang(Serial serial) : base(serial)
{
}
public CoilsFang( Serial serial ) : base( serial )
{
}
public override int LabelNumber => 1074229; // Coil's Fang
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 );
int version = reader.ReadInt();
}
}
}
public override void Deserialize(GenericReader reader)
{
base.Deserialize(reader);
int version = reader.ReadInt();
}
}
}

47
Scripts/Items/Misc/Blighted Grove/EternallyCorruptTree.cs
View file

@ -1,32 +1,31 @@
namespace Server.Items
{
public class EternallyCorruptTree : Item
{
public override int LabelNumber => 1072093; // Eternally Corrupt Tree
public class EternallyCorruptTree : Item
{
[Constructible]
public EternallyCorruptTree() : base(0x20FA)
{
Hue = Utility.RandomMinMax(0x899, 0x8B0);
}
[Constructible]
public EternallyCorruptTree() : base( 0x20FA )
{
Hue = Utility.RandomMinMax( 0x899, 0x8B0 );
}
public EternallyCorruptTree(Serial serial) : base(serial)
{
}
public EternallyCorruptTree( Serial serial ) : base( serial )
{
}
public override int LabelNumber => 1072093; // Eternally Corrupt Tree
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 );
int version = reader.ReadInt();
}
}
}
public override void Deserialize(GenericReader reader)
{
base.Deserialize(reader);
int version = reader.ReadInt();
}
}
}

49
Scripts/Items/Misc/Blighted Grove/HydraScale.cs
View file

@ -1,33 +1,32 @@
namespace Server.Items
{
public class HydraScale : Item
{
public override int LabelNumber => 1074760; // A hydra scale.
public class HydraScale : Item
{
[Constructible]
public HydraScale() : base(0x26B4)
{
LootType = LootType.Blessed;
Hue = 0xC2; // TODO check
}
[Constructible]
public HydraScale() : base( 0x26B4 )
{
LootType = LootType.Blessed;
Hue = 0xC2; // TODO check
}
public HydraScale(Serial serial) : base(serial)
{
}
public HydraScale( Serial serial ) : base( serial )
{
}
public override int LabelNumber => 1074760; // A hydra scale.
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 );
int version = reader.ReadInt();
}
}
}
public override void Deserialize(GenericReader reader)
{
base.Deserialize(reader);
int version = reader.ReadInt();
}
}
}

74
Scripts/Items/Misc/Blighted Grove/MelisandesFermentedWine.cs
View file

@ -1,49 +1,47 @@
namespace Server.Items
{
public class MelisandesFermentedWine : GreaterExplosionPotion
{
public override int LabelNumber => 1072114; // Melisande's Fermented Wine
public class MelisandesFermentedWine : GreaterExplosionPotion
{
[Constructible]
public MelisandesFermentedWine()
{
Stackable = false;
ItemID = 0x99B;
Hue = Utility.RandomList(0xB, 0xF, 0x48D); // TODO update
}
[Constructible]
public MelisandesFermentedWine()
{
Stackable = false;
ItemID = 0x99B;
Hue = Utility.RandomList( 0xB, 0xF, 0x48D ); // TODO update
}
public MelisandesFermentedWine(Serial serial) : base(serial)
{
}
public MelisandesFermentedWine( Serial serial ) : base( serial )
{
}
public override int LabelNumber => 1072114; // Melisande's Fermented Wine
public override void Drink( Mobile from )
{
if ( MondainsLegacy.CheckML( from ) )
base.Drink( from );
}
public override void Drink(Mobile from)
{
if (MondainsLegacy.CheckML(from))
base.Drink(from);
}
public override void GetProperties( ObjectPropertyList list )
{
base.GetProperties( list );
public override void GetProperties(ObjectPropertyList list)
{
base.GetProperties(list);
list.Add( 1074502 ); // It looks explosive.
list.Add( 1075085 ); // Requirement: Mondain's Legacy
}
list.Add(1074502); // It looks explosive.
list.Add(1075085); // Requirement: Mondain's Legacy
}
public override void Serialize( GenericWriter writer )
{
base.Serialize( writer );
public override void Serialize(GenericWriter writer)
{
base.Serialize(writer);
writer.Write( (int) 0 ); // version
}
public override void Deserialize( GenericReader reader )
{
base.Deserialize( reader );
int version = reader.ReadInt();
}
}
}
writer.Write(0); // version
}
public override void Deserialize(GenericReader reader)
{
base.Deserialize(reader);
int version = reader.ReadInt();
}
}
}

145
Scripts/Items/Misc/Blighted Grove/MelisandesHairDye.cs
View file

@ -2,87 +2,94 @@ using Server.Gumps;
namespace Server.Items
{
public class MelisandesHairDye : Item
{
public override int LabelNumber => 1041088; // Hair Dye
public class MelisandesHairDye : Item
{
[Constructible]
public MelisandesHairDye() : base(0xEFF)
{
Hue = Utility.RandomMinMax(0x47E, 0x499);
}
[Constructible]
public MelisandesHairDye() : base( 0xEFF )
{
Hue = Utility.RandomMinMax( 0x47E, 0x499 );
}
public MelisandesHairDye(Serial serial) : base(serial)
{
}
public MelisandesHairDye( Serial serial ) : base( serial )
{
}
public override int LabelNumber => 1041088; // Hair Dye
public override void OnDoubleClick( Mobile from )
{
if ( IsChildOf( from.Backpack ) )
{
if ( MondainsLegacy.CheckML( from ) )
from.SendGump( new ConfirmGump( this ) );
}
else
from.SendLocalizedMessage( 1042001 ); // That must be in your pack for you to use it.
}
public override void OnDoubleClick(Mobile from)
{
if (IsChildOf(from.Backpack))
{
if (MondainsLegacy.CheckML(from))
from.SendGump(new ConfirmGump(this));
}
else
{
from.SendLocalizedMessage(1042001); // That must be in your pack for you to use it.
}
}
public override void GetProperties( ObjectPropertyList list )
{
base.GetProperties( list );
public override void GetProperties(ObjectPropertyList list)
{
base.GetProperties(list);
list.Add( 1075085 ); // Requirement: Mondain's Legacy
}
list.Add(1075085); // Requirement: Mondain's Legacy
}
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();
}
private class ConfirmGump : BaseConfirmGump
{
public override int TitleNumber => 1074395; // <div align=right>Use Permanent Hair Dye</div>
public override int LabelNumber => 1074396; // This special hair dye is made of a unique mixture of leaves, permanently changing one's hair color until another dye is used.
private class ConfirmGump : BaseConfirmGump
{
private Item m_Item;
private Item m_Item;
public ConfirmGump(Item item)
{
m_Item = item;
}
public ConfirmGump( Item item )
{
m_Item = item;
}
public override int TitleNumber => 1074395; // <div align=right>Use Permanent Hair Dye</div>
public override void Confirm( Mobile from )
{
if ( m_Item != null && !m_Item.Deleted && m_Item.IsChildOf( from.Backpack ) )
{
if ( from.HairItemID != 0 )
{
from.HairHue = m_Item.Hue;
from.PlaySound( 0x240 );
from.SendLocalizedMessage( 502622 ); // You dye your hair.
m_Item.Delete();
}
else
from.SendLocalizedMessage( 502623 ); // You have no hair to dye and you cannot use this.
}
else
from.SendLocalizedMessage( 1073461 ); // You don't have enough dye.
}
public override int LabelNumber =>
1074396; // This special hair dye is made of a unique mixture of leaves, permanently changing one's hair color until another dye is used.
public override void Refuse( Mobile from )
{
from.SendLocalizedMessage( 502620 ); // You decide not to dye your hair.
}
}
}
}
public override void Confirm(Mobile from)
{
if (m_Item != null && !m_Item.Deleted && m_Item.IsChildOf(from.Backpack))
{
if (from.HairItemID != 0)
{
from.HairHue = m_Item.Hue;
from.PlaySound(0x240);
from.SendLocalizedMessage(502622); // You dye your hair.
m_Item.Delete();
}
else
{
from.SendLocalizedMessage(502623); // You have no hair to dye and you cannot use this.
}
}
else
{
from.SendLocalizedMessage(1073461); // You don't have enough dye.
}
}
public override void Refuse(Mobile from)
{
from.SendLocalizedMessage(502620); // You decide not to dye your hair.
}
}
}
}

49
Scripts/Items/Misc/Blighted Grove/SalivasFeather.cs
View file

@ -1,33 +1,32 @@
namespace Server.Items
{
public class SalivasFeather : Item
{
public override int LabelNumber => 1074234; // Saliva's Feather
public class SalivasFeather : Item
{
[Constructible]
public SalivasFeather() : base(0x1020)
{
LootType = LootType.Blessed;
Hue = 0x5C;
}
[Constructible]
public SalivasFeather() : base( 0x1020 )
{
LootType = LootType.Blessed;
Hue = 0x5C;
}
public SalivasFeather(Serial serial) : base(serial)
{
}
public SalivasFeather( Serial serial ) : base( serial )
{
}
public override int LabelNumber => 1074234; // Saliva's Feather
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 );
int version = reader.ReadInt();
}
}
}
public override void Deserialize(GenericReader reader)
{
base.Deserialize(reader);
int version = reader.ReadInt();
}
}
}

47
Scripts/Items/Misc/Blighted Grove/SamplesOfCorruptedWater.cs
View file

@ -1,32 +1,31 @@
namespace Server.Items
{
public class SamplesOfCorruptedWater : Item
{
public override int LabelNumber => 1074999; // samples of corrupted water
public class SamplesOfCorruptedWater : Item
{
[Constructible]
public SamplesOfCorruptedWater() : base(0xEFE)
{
LootType = LootType.Blessed;
}
[Constructible]
public SamplesOfCorruptedWater() : base( 0xEFE )
{
LootType = LootType.Blessed;
}
public SamplesOfCorruptedWater(Serial serial) : base(serial)
{
}
public SamplesOfCorruptedWater( Serial serial ) : base( serial )
{
}
public override int LabelNumber => 1074999; // samples of corrupted water
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 );
int version = reader.ReadInt();
}
}
}
public override void Deserialize(GenericReader reader)
{
base.Deserialize(reader);
int version = reader.ReadInt();
}
}
}

49
Scripts/Items/Misc/Blighted Grove/TaintedSeeds.cs
View file

@ -1,33 +1,32 @@
namespace Server.Items
{
public class TaintedSeeds : Item
{
public override int LabelNumber => 1074233; // Tainted Seeds
public class TaintedSeeds : Item
{
[Constructible]
public TaintedSeeds() : base(0xDFA)
{
LootType = LootType.Blessed;
Hue = 0x48; // TODO check
}
[Constructible]
public TaintedSeeds() : base( 0xDFA )
{
LootType = LootType.Blessed;
Hue = 0x48; // TODO check
}
public TaintedSeeds(Serial serial) : base(serial)
{
}
public TaintedSeeds( Serial serial ) : base( serial )
{
}
public override int LabelNumber => 1074233; // Tainted Seeds
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 );
int version = reader.ReadInt();
}
}
}
public override void Deserialize(GenericReader reader)
{
base.Deserialize(reader);
int version = reader.ReadInt();
}
}
}

49
Scripts/Items/Misc/Blighted Grove/ThorvaldsMedallion.cs
View file

@ -1,33 +1,32 @@
namespace Server.Items
{
public class ThorvaldsMedallion : Item
{
public override int LabelNumber => 1074232; // Thorvald's Medallion
public class ThorvaldsMedallion : Item
{
[Constructible]
public ThorvaldsMedallion() : base(0x2AAA)
{
LootType = LootType.Blessed;
Hue = 0x47F; // TODO check
}
[Constructible]
public ThorvaldsMedallion() : base( 0x2AAA )
{
LootType = LootType.Blessed;
Hue = 0x47F; // TODO check
}
public ThorvaldsMedallion(Serial serial) : base(serial)
{
}
public ThorvaldsMedallion( Serial serial ) : base( serial )
{
}
public override int LabelNumber => 1074232; // Thorvald's Medallion
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 );
int version = reader.ReadInt();
}
}
}
public override void Deserialize(GenericReader reader)
{
base.Deserialize(reader);
int version = reader.ReadInt();
}
}
}

49
Scripts/Items/Misc/Blighted Grove/ThrashersTail.cs
View file

@ -1,33 +1,32 @@
namespace Server.Items
{
public class ThrashersTail : Item
{
public override int LabelNumber => 1074230; // Thrasher's Tail
public class ThrashersTail : Item
{
[Constructible]
public ThrashersTail() : base(0x1A9D)
{
LootType = LootType.Blessed;
Hue = 0x455;
}
[Constructible]
public ThrashersTail() : base( 0x1A9D )
{
LootType = LootType.Blessed;
Hue = 0x455;
}
public ThrashersTail(Serial serial) : base(serial)
{
}
public ThrashersTail( Serial serial ) : base( serial )
{
}
public override int LabelNumber => 1074230; // Thrasher's Tail
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 );
int version = reader.ReadInt();
}
}
}
public override void Deserialize(GenericReader reader)
{
base.Deserialize(reader);
int version = reader.ReadInt();
}
}
}