Some more trailing whitespace removal and minor ML code cleanup.

This commit is contained in:
eos 2012-01-07 04:39:54 +00:00
parent f4a7e8e283
commit 45bd3dba38
113 changed files with 365 additions and 410 deletions

View file

@ -6,7 +6,7 @@ namespace Server.Items
public class AbscessTail : Item
{
public override int LabelNumber{ get{ return 1074231; } } // Abscess' Tail
[Constructable]
public AbscessTail() : base( 0x1A9D )
{
@ -21,14 +21,14 @@ namespace Server.Items
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();
}
}

View file

@ -6,7 +6,7 @@ namespace Server.Items
public class CoilsFang : Item
{
public override int LabelNumber{ get{ return 1074229; } } // Coil's Fang
[Constructable]
public CoilsFang() : base( 0x10E8 )
{
@ -21,14 +21,14 @@ namespace Server.Items
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();
}
}

View file

@ -6,7 +6,7 @@ namespace Server.Items
public class EternallyCorruptTree : Item
{
public override int LabelNumber{ get{ return 1072093; } } // Eternally Corrupt Tree
[Constructable]
public EternallyCorruptTree() : base( 0x20FA )
{
@ -20,14 +20,14 @@ namespace Server.Items
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();
}
}

View file

@ -6,7 +6,7 @@ namespace Server.Items
public class HydraScale : Item
{
public override int LabelNumber{ get{ return 1074760; } } // A hydra scale.
[Constructable]
public HydraScale() : base( 0x26B4 )
{
@ -21,14 +21,14 @@ namespace Server.Items
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();
}
}

View file

@ -6,36 +6,29 @@ namespace Server.Items
public class MelisandesFermentedWine : GreaterExplosionPotion
{
public override int LabelNumber{ get{ return 1072114; } } // Melisande's Fermented Wine
private static int[] m_Hues = new int[]
{
0xB, 0xF, 0x48D // TODO update
};
[Constructable]
public MelisandesFermentedWine() : base()
public MelisandesFermentedWine()
{
Stackable = false;
ItemID = 0x99B;
Hue = Utility.RandomList( m_Hues );
Hue = Utility.RandomList( 0xB, 0xF, 0x48D ); // TODO update
}
public MelisandesFermentedWine( Serial serial ) : base( serial )
{
}
public override void Drink( Mobile from )
{
if ( from.NetState.SupportsExpansion( Expansion.ML ) )
if ( MondainsLegacy.CheckML( from ) )
base.Drink( from );
else
from.SendLocalizedMessage( 1072791 ); // You must upgrade to Mondain's Legacy in order to use that item.
}
public override void GetProperties( ObjectPropertyList list )
{
base.GetProperties( list );
list.Add( 1074502 ); // It looks explosive.
list.Add( 1075085 ); // Requirement: Mondain's Legacy
}
@ -43,14 +36,14 @@ namespace Server.Items
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();
}
}

View file

@ -7,7 +7,7 @@ namespace Server.Items
public class MelisandesHairDye : Item
{
public override int LabelNumber{ get{ return 1041088; } } // Hair Dye
[Constructable]
public MelisandesHairDye() : base( 0xEFF )
{
@ -17,56 +17,54 @@ namespace Server.Items
public MelisandesHairDye( Serial serial ) : base( serial )
{
}
public override void OnDoubleClick( Mobile from )
{
if ( IsChildOf( from.Backpack ) )
{
if ( from.NetState.SupportsExpansion( Expansion.ML ) )
if ( MondainsLegacy.CheckML( from ) )
from.SendGump( new ConfirmGump( this ) );
else
from.SendLocalizedMessage( 1072791 ); // You must upgrade to Mondain's Legacy in order to use that item.
}
else
from.SendLocalizedMessage( 1042001 ); // That must be in your pack for you to use it.
}
public override void GetProperties( ObjectPropertyList list )
{
base.GetProperties( list );
list.Add( 1075085 ); // Requirement: Mondain's Legacy
}
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();
}
private class ConfirmGump : BaseConfirmGump
{
public override int TitleNumber{ get{ return 1074395; } } // <div align=right>Use Permanent Hair Dye</div>
public override int LabelNumber{ get{ return 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 Item m_Item;
public ConfirmGump( Item item ) : base()
{
m_Item = item;
}
public override void Confirm( Mobile from )
{
if ( m_Item != null && !m_Item.Deleted )
{
if ( m_Item != null && !m_Item.Deleted && m_Item.IsChildOf( from.Backpack ) )
{
if ( from.HairItemID != 0 )
{
@ -81,7 +79,7 @@ namespace Server.Items
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.

View file

@ -6,7 +6,7 @@ namespace Server.Items
public class SalivasFeather : Item
{
public override int LabelNumber{ get{ return 1074234; } } // Saliva's Feather
[Constructable]
public SalivasFeather() : base( 0x1020 )
{
@ -21,14 +21,14 @@ namespace Server.Items
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();
}
}

View file

@ -6,7 +6,7 @@ namespace Server.Items
public class SamplesOfCorruptedWater : Item
{
public override int LabelNumber{ get{ return 1074999; } } // samples of corrupted water
[Constructable]
public SamplesOfCorruptedWater() : base( 0xEFE )
{
@ -20,14 +20,14 @@ namespace Server.Items
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();
}
}

View file

@ -6,7 +6,7 @@ namespace Server.Items
public class TaintedSeeds : Item
{
public override int LabelNumber{ get{ return 1074233; } } // Tainted Seeds
[Constructable]
public TaintedSeeds() : base( 0xDFA )
{
@ -21,14 +21,14 @@ namespace Server.Items
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();
}
}

View file

@ -6,7 +6,7 @@ namespace Server.Items
public class ThorvaldsMedallion : Item
{
public override int LabelNumber{ get{ return 1074232; } } // Thorvald's Medallion
[Constructable]
public ThorvaldsMedallion() : base( 0x2AAA )
{
@ -21,14 +21,14 @@ namespace Server.Items
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();
}
}

View file

@ -6,7 +6,7 @@ namespace Server.Items
public class ThrashersTail : Item
{
public override int LabelNumber{ get{ return 1074230; } } // Thrasher's Tail
[Constructable]
public ThrashersTail() : base( 0x1A9D )
{
@ -21,14 +21,14 @@ namespace Server.Items
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();
}
}