diff --git a/Scripts/Items/Misc/Bedlam/GlobOfMonstreousInterredGrizzle.cs b/Scripts/Items/Misc/Bedlam/GlobOfMonstreousInterredGrizzle.cs index b81975702..249246f9c 100644 --- a/Scripts/Items/Misc/Bedlam/GlobOfMonstreousInterredGrizzle.cs +++ b/Scripts/Items/Misc/Bedlam/GlobOfMonstreousInterredGrizzle.cs @@ -6,7 +6,7 @@ namespace Server.Items public class GlobOfMonstreousInterredGrizzle : Item { public override int LabelNumber{ get{ return 1072117; } } // Glob of Monsterous Interred Grizzle - + [Constructable] public GlobOfMonstreousInterredGrizzle() : base( 0x2F3 ) { @@ -19,14 +19,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(); } } diff --git a/Scripts/Items/Misc/Bedlam/GrizzledSkullCollection.cs b/Scripts/Items/Misc/Bedlam/GrizzledSkullCollection.cs index fd83cdea5..4fc49b903 100644 --- a/Scripts/Items/Misc/Bedlam/GrizzledSkullCollection.cs +++ b/Scripts/Items/Misc/Bedlam/GrizzledSkullCollection.cs @@ -6,7 +6,7 @@ namespace Server.Items public class GrizzledSkullCollection : Item { public override int LabelNumber{ get{ return 1072116; } } // Grizzled Skull collection - + [Constructable] public GrizzledSkullCollection() : base( 0x21FC ) { @@ -19,14 +19,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(); } } diff --git a/Scripts/Items/Misc/Bedlam/MonsterousInterredGrizzleMaggots.cs b/Scripts/Items/Misc/Bedlam/MonsterousInterredGrizzleMaggots.cs index f5922e8d5..c4d80e6c8 100644 --- a/Scripts/Items/Misc/Bedlam/MonsterousInterredGrizzleMaggots.cs +++ b/Scripts/Items/Misc/Bedlam/MonsterousInterredGrizzleMaggots.cs @@ -6,7 +6,7 @@ namespace Server.Items public class MonsterousInterredGrizzleMaggots : Item { public override int LabelNumber{ get{ return 1075090; } } // Monsterous Interred Grizzle Maggots - + [Constructable] public MonsterousInterredGrizzleMaggots() : base( 0x2633 ) { @@ -19,14 +19,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(); } } diff --git a/Scripts/Items/Misc/Bedlam/ResolvesBridle.cs b/Scripts/Items/Misc/Bedlam/ResolvesBridle.cs index 98cc041bd..178961655 100644 --- a/Scripts/Items/Misc/Bedlam/ResolvesBridle.cs +++ b/Scripts/Items/Misc/Bedlam/ResolvesBridle.cs @@ -6,7 +6,7 @@ namespace Server.Items public class ResolvesBridle : Item { public override int LabelNumber{ get{ return 1074761; } } // Resolve's Bridle - + [Constructable] public ResolvesBridle() : base( 0x1374 ) { @@ -19,14 +19,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(); } } diff --git a/Scripts/Items/Misc/Bedlam/TombstoneOfTheDamned.cs b/Scripts/Items/Misc/Bedlam/TombstoneOfTheDamned.cs index e1cd09e0f..7608dceef 100644 --- a/Scripts/Items/Misc/Bedlam/TombstoneOfTheDamned.cs +++ b/Scripts/Items/Misc/Bedlam/TombstoneOfTheDamned.cs @@ -6,7 +6,7 @@ namespace Server.Items public class TombstoneOfTheDamned : Item { public override int LabelNumber{ get{ return 1072123; } } // Tombstone of the Damned - + [Constructable] public TombstoneOfTheDamned() : base( Utility.RandomMinMax( 0xED7, 0xEDE ) ) { @@ -19,14 +19,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(); } } diff --git a/Scripts/Items/Misc/Blighted Grove/AbscessTail.cs b/Scripts/Items/Misc/Blighted Grove/AbscessTail.cs index 4e0463349..d7546caca 100644 --- a/Scripts/Items/Misc/Blighted Grove/AbscessTail.cs +++ b/Scripts/Items/Misc/Blighted Grove/AbscessTail.cs @@ -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(); } } diff --git a/Scripts/Items/Misc/Blighted Grove/CoilsFang.cs b/Scripts/Items/Misc/Blighted Grove/CoilsFang.cs index 0525efd49..d875ecf51 100644 --- a/Scripts/Items/Misc/Blighted Grove/CoilsFang.cs +++ b/Scripts/Items/Misc/Blighted Grove/CoilsFang.cs @@ -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(); } } diff --git a/Scripts/Items/Misc/Blighted Grove/EternallyCorruptTree.cs b/Scripts/Items/Misc/Blighted Grove/EternallyCorruptTree.cs index 2e210b404..d5449cf39 100644 --- a/Scripts/Items/Misc/Blighted Grove/EternallyCorruptTree.cs +++ b/Scripts/Items/Misc/Blighted Grove/EternallyCorruptTree.cs @@ -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(); } } diff --git a/Scripts/Items/Misc/Blighted Grove/HydraScale.cs b/Scripts/Items/Misc/Blighted Grove/HydraScale.cs index 53598338a..334a40fc8 100644 --- a/Scripts/Items/Misc/Blighted Grove/HydraScale.cs +++ b/Scripts/Items/Misc/Blighted Grove/HydraScale.cs @@ -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(); } } diff --git a/Scripts/Items/Misc/Blighted Grove/MelisandesFermentedWine.cs b/Scripts/Items/Misc/Blighted Grove/MelisandesFermentedWine.cs index 6ae6adc9d..936c300fa 100644 --- a/Scripts/Items/Misc/Blighted Grove/MelisandesFermentedWine.cs +++ b/Scripts/Items/Misc/Blighted Grove/MelisandesFermentedWine.cs @@ -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(); } } diff --git a/Scripts/Items/Misc/Blighted Grove/MelisandesHairDye.cs b/Scripts/Items/Misc/Blighted Grove/MelisandesHairDye.cs index 539642d43..f8a9b8c05 100644 --- a/Scripts/Items/Misc/Blighted Grove/MelisandesHairDye.cs +++ b/Scripts/Items/Misc/Blighted Grove/MelisandesHairDye.cs @@ -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; } } //
Use Permanent Hair Dye
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. diff --git a/Scripts/Items/Misc/Blighted Grove/SalivasFeather.cs b/Scripts/Items/Misc/Blighted Grove/SalivasFeather.cs index 5798dd5d4..90a2adcd3 100644 --- a/Scripts/Items/Misc/Blighted Grove/SalivasFeather.cs +++ b/Scripts/Items/Misc/Blighted Grove/SalivasFeather.cs @@ -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(); } } diff --git a/Scripts/Items/Misc/Blighted Grove/SamplesOfCorruptedWater.cs b/Scripts/Items/Misc/Blighted Grove/SamplesOfCorruptedWater.cs index 0a97f6cc7..bea2b4121 100644 --- a/Scripts/Items/Misc/Blighted Grove/SamplesOfCorruptedWater.cs +++ b/Scripts/Items/Misc/Blighted Grove/SamplesOfCorruptedWater.cs @@ -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(); } } diff --git a/Scripts/Items/Misc/Blighted Grove/TaintedSeeds.cs b/Scripts/Items/Misc/Blighted Grove/TaintedSeeds.cs index b15231edc..6bedbece0 100644 --- a/Scripts/Items/Misc/Blighted Grove/TaintedSeeds.cs +++ b/Scripts/Items/Misc/Blighted Grove/TaintedSeeds.cs @@ -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(); } } diff --git a/Scripts/Items/Misc/Blighted Grove/ThorvaldsMedallion.cs b/Scripts/Items/Misc/Blighted Grove/ThorvaldsMedallion.cs index 79b3980cc..3eed96e4c 100644 --- a/Scripts/Items/Misc/Blighted Grove/ThorvaldsMedallion.cs +++ b/Scripts/Items/Misc/Blighted Grove/ThorvaldsMedallion.cs @@ -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(); } } diff --git a/Scripts/Items/Misc/Blighted Grove/ThrashersTail.cs b/Scripts/Items/Misc/Blighted Grove/ThrashersTail.cs index 4dee2e11a..fac159495 100644 --- a/Scripts/Items/Misc/Blighted Grove/ThrashersTail.cs +++ b/Scripts/Items/Misc/Blighted Grove/ThrashersTail.cs @@ -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(); } } diff --git a/Scripts/Items/Misc/HoveringWisp.cs b/Scripts/Items/Misc/HoveringWisp.cs index 00697ed71..57b6a4c6e 100644 --- a/Scripts/Items/Misc/HoveringWisp.cs +++ b/Scripts/Items/Misc/HoveringWisp.cs @@ -4,9 +4,9 @@ using Server; namespace Server.Items { public class HoveringWisp : Item - { + { public override int LabelNumber{ get{ return 1072881; } } // hovering wisp - + [Constructable] public HoveringWisp() : base( 0x2100 ) { @@ -19,14 +19,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(); } } diff --git a/Scripts/Items/Misc/Labyrinth/MinotaurArtifact.cs b/Scripts/Items/Misc/Labyrinth/MinotaurArtifact.cs index 19f6a3d03..a1083bbae 100644 --- a/Scripts/Items/Misc/Labyrinth/MinotaurArtifact.cs +++ b/Scripts/Items/Misc/Labyrinth/MinotaurArtifact.cs @@ -6,31 +6,29 @@ namespace Server.Items public class MinotaurArtifact : Item { public override int LabelNumber{ get{ return 1074826; } } // Minotaur Artifact - + public override double DefaultWeight{ get{ return 5.0; } } + [Constructable] public MinotaurArtifact() : base( Utility.RandomList( 0xB46, 0xB48, 0x9ED ) ) { - switch ( ItemID ) - { - case 0x9ED: Weight = 30; break; - default: Weight = 5; break; - } - + if ( ItemID == 0x9ED ) + Weight = 30; + LootType = LootType.Blessed; Hue = 0x100; } - + public MinotaurArtifact( Serial serial ) : base( serial ) { } - + public override void Serialize( GenericWriter writer ) { base.Serialize( writer ); writer.Write( (int) 0 ); // version } - + public override void Deserialize( GenericReader reader ) { base.Deserialize( reader ); diff --git a/Scripts/Items/Misc/Painted Caves/GrobusFur.cs b/Scripts/Items/Misc/Painted Caves/GrobusFur.cs index ca4cddbc7..88c174ea6 100644 --- a/Scripts/Items/Misc/Painted Caves/GrobusFur.cs +++ b/Scripts/Items/Misc/Painted Caves/GrobusFur.cs @@ -5,7 +5,7 @@ namespace Server.Items public class GrobusFur : Item { public override int LabelNumber{ get{ return 1074676; } } // Grobu's Fur - + [Constructable] public GrobusFur() : base( 0x11F4 ) { @@ -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(); } } diff --git a/Scripts/Items/Misc/Painted Caves/PrimitiveFetish.cs b/Scripts/Items/Misc/Painted Caves/PrimitiveFetish.cs index 0b8a6f113..f9b6f36b5 100644 --- a/Scripts/Items/Misc/Painted Caves/PrimitiveFetish.cs +++ b/Scripts/Items/Misc/Painted Caves/PrimitiveFetish.cs @@ -5,7 +5,7 @@ namespace Server.Items public class PrimitiveFetish : Item { public override int LabelNumber{ get{ return 1074675; } } // Primitive Fetish - + [Constructable] public PrimitiveFetish() : base( 0x23F ) { @@ -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(); } } diff --git a/Scripts/Items/Misc/Palace of Paroxysmus/AcidProofRope.cs b/Scripts/Items/Misc/Palace of Paroxysmus/AcidProofRope.cs index 7448ac34a..12f8144e9 100644 --- a/Scripts/Items/Misc/Palace of Paroxysmus/AcidProofRope.cs +++ b/Scripts/Items/Misc/Palace of Paroxysmus/AcidProofRope.cs @@ -4,9 +4,9 @@ using Server; namespace Server.Items { public class AcidProofRope : Item - { + { public override int LabelNumber{ get{ return 1074886; } } // Acid Proof Rope - + [Constructable] public AcidProofRope() : base( 0x20D ) { @@ -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(); } } diff --git a/Scripts/Items/Misc/Palace of Paroxysmus/ParoxysmusCorrodedStein.cs b/Scripts/Items/Misc/Palace of Paroxysmus/ParoxysmusCorrodedStein.cs index eda78167b..ed35fde6e 100644 --- a/Scripts/Items/Misc/Palace of Paroxysmus/ParoxysmusCorrodedStein.cs +++ b/Scripts/Items/Misc/Palace of Paroxysmus/ParoxysmusCorrodedStein.cs @@ -4,9 +4,9 @@ using Server; namespace Server.Items { public class ParoxysmusCorrodedStein : Item - { + { public override int LabelNumber{ get{ return 1072083; } } // Paroxysmus' Corroded Stein - + [Constructable] public ParoxysmusCorrodedStein() : base( 0x9D6 ) { @@ -19,14 +19,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(); } } diff --git a/Scripts/Items/Misc/Palace of Paroxysmus/ParoxysmusDinner.cs b/Scripts/Items/Misc/Palace of Paroxysmus/ParoxysmusDinner.cs index f99f1ca5b..22b7a8637 100644 --- a/Scripts/Items/Misc/Palace of Paroxysmus/ParoxysmusDinner.cs +++ b/Scripts/Items/Misc/Palace of Paroxysmus/ParoxysmusDinner.cs @@ -4,9 +4,9 @@ using Server; namespace Server.Items { public class ParoxysmusDinner : Item - { + { public override int LabelNumber{ get{ return 1072086; } } // Paroxysmus' Dinner - + [Constructable] public ParoxysmusDinner() : base( 0x1E95 ) { @@ -19,14 +19,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(); } } diff --git a/Scripts/Items/Misc/Palace of Paroxysmus/StringOfPartsOfParoxysmusVictims.cs b/Scripts/Items/Misc/Palace of Paroxysmus/StringOfPartsOfParoxysmusVictims.cs index 85e65cea3..c8b69f307 100644 --- a/Scripts/Items/Misc/Palace of Paroxysmus/StringOfPartsOfParoxysmusVictims.cs +++ b/Scripts/Items/Misc/Palace of Paroxysmus/StringOfPartsOfParoxysmusVictims.cs @@ -4,9 +4,9 @@ using Server; namespace Server.Items { public class StringOfPartsOfParoxysmusVictims : Item - { + { public override int LabelNumber{ get{ return 1072082; } } // String of Parts of Paroxysmus' Victims - + [Constructable] public StringOfPartsOfParoxysmusVictims() : base( 0xFD2 ) { @@ -19,14 +19,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(); } } diff --git a/Scripts/Items/Misc/Palace of Paroxysmus/SweatOfParoxysmus.cs b/Scripts/Items/Misc/Palace of Paroxysmus/SweatOfParoxysmus.cs index e801985ac..9cc1a30fd 100644 --- a/Scripts/Items/Misc/Palace of Paroxysmus/SweatOfParoxysmus.cs +++ b/Scripts/Items/Misc/Palace of Paroxysmus/SweatOfParoxysmus.cs @@ -4,9 +4,9 @@ using Server; namespace Server.Items { public class SweatOfParoxysmus : Item - { + { public override int LabelNumber{ get{ return 1072081; } } // Sweat of Paroxysmus - + [Constructable] public SweatOfParoxysmus() : base( 0xF01 ) { @@ -19,14 +19,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(); } } diff --git a/Scripts/Items/Misc/Prism of Light/CrystallineFragments.cs b/Scripts/Items/Misc/Prism of Light/CrystallineFragments.cs index 292da1066..d5595ec4c 100644 --- a/Scripts/Items/Misc/Prism of Light/CrystallineFragments.cs +++ b/Scripts/Items/Misc/Prism of Light/CrystallineFragments.cs @@ -6,7 +6,7 @@ namespace Server.Items public class CrystallineFragments : Item { public override int LabelNumber{ get{ return 1073160; } } // Crystalline Fragments - + [Constructable] public CrystallineFragments() : base( 0x223B ) { @@ -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(); } } diff --git a/Scripts/Items/Misc/Prism of Light/IcyHeart.cs b/Scripts/Items/Misc/Prism of Light/IcyHeart.cs index a34d5f8cc..5e8b2dcbb 100644 --- a/Scripts/Items/Misc/Prism of Light/IcyHeart.cs +++ b/Scripts/Items/Misc/Prism of Light/IcyHeart.cs @@ -4,9 +4,9 @@ using Server; namespace Server.Items { public class IcyHeart : Item - { + { public override int LabelNumber{ get{ return 1073162; } } // Icy Heart - + [Constructable] public IcyHeart() : base( 0x24B ) { @@ -19,14 +19,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(); } } diff --git a/Scripts/Items/Misc/Prism of Light/LuckyDagger.cs b/Scripts/Items/Misc/Prism of Light/LuckyDagger.cs index f52f273e6..80bafbf04 100644 --- a/Scripts/Items/Misc/Prism of Light/LuckyDagger.cs +++ b/Scripts/Items/Misc/Prism of Light/LuckyDagger.cs @@ -4,7 +4,7 @@ using Server; namespace Server.Items { public class LuckyDagger : Item - { + { [Constructable] public LuckyDagger() : base( 0xF52 ) { @@ -18,14 +18,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(); } } diff --git a/Scripts/Items/Misc/Prism of Light/ProtectorsEssence.cs b/Scripts/Items/Misc/Prism of Light/ProtectorsEssence.cs index 66fc810cd..ad01b1699 100644 --- a/Scripts/Items/Misc/Prism of Light/ProtectorsEssence.cs +++ b/Scripts/Items/Misc/Prism of Light/ProtectorsEssence.cs @@ -6,7 +6,7 @@ namespace Server.Items public class ProtectorsEssence : Item { public override int LabelNumber{ get{ return 1073159; } } // Protector's Essence - + [Constructable] public ProtectorsEssence() : base( 0x23F ) { @@ -19,14 +19,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(); } } diff --git a/Scripts/Items/Misc/Prism of Light/ShimmeringCrystal.cs b/Scripts/Items/Misc/Prism of Light/ShimmeringCrystal.cs index badac6e4b..0784f3822 100644 --- a/Scripts/Items/Misc/Prism of Light/ShimmeringCrystal.cs +++ b/Scripts/Items/Misc/Prism of Light/ShimmeringCrystal.cs @@ -7,15 +7,15 @@ namespace Server.Items { public override int LabelNumber{ get{ return 1075095; } } // Shimmering Crystals public override bool ForceShowProperties{ get{ return true; } } - - private static int[] m_ItemIDs = new int[] + + private static readonly int[] m_ItemIDs = new int[] { - 0x2206, 0x2207, 0x2208, 0x2209, 0x220A, 0x220B, 0x220C, 0x220D, 0x220E, - 0x2210, 0x2211, 0x2212, 0x2213, 0x2214, 0x2215, 0x2216, 0x2217, 0x2218, - 0x221A, 0x221B, 0x221C, 0x221D, 0x221E, 0x221F, 0x2220, 0x2221, 0x2222, + 0x2206, 0x2207, 0x2208, 0x2209, 0x220A, 0x220B, 0x220C, 0x220D, 0x220E, + 0x2210, 0x2211, 0x2212, 0x2213, 0x2214, 0x2215, 0x2216, 0x2217, 0x2218, + 0x221A, 0x221B, 0x221C, 0x221D, 0x221E, 0x221F, 0x2220, 0x2221, 0x2222, 0x2224, 0x2225, 0x2226, 0x2227, 0x2228, 0x2229, 0x222A, 0x222B, 0x222C }; - + [Constructable] public ShimmeringCrystals() : base( Utility.RandomList( m_ItemIDs ) ) { @@ -28,14 +28,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(); } } diff --git a/Scripts/Items/Misc/The Citadel/DragonFlameSectBadge.cs b/Scripts/Items/Misc/The Citadel/DragonFlameSectBadge.cs index c4009dc44..4869bfdf6 100644 --- a/Scripts/Items/Misc/The Citadel/DragonFlameSectBadge.cs +++ b/Scripts/Items/Misc/The Citadel/DragonFlameSectBadge.cs @@ -4,9 +4,9 @@ using Server; namespace Server.Items { public class DragonFlameSectBadge : Item - { + { public override int LabelNumber{ get{ return 1073141; } } // A Dragon Flame Sect Badge - + [Constructable] public DragonFlameSectBadge() : base( 0x23E ) { @@ -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(); } } diff --git a/Scripts/Items/Misc/The Citadel/OrdersFromMinax.cs b/Scripts/Items/Misc/The Citadel/OrdersFromMinax.cs index 9cbfe98f9..f7953be09 100644 --- a/Scripts/Items/Misc/The Citadel/OrdersFromMinax.cs +++ b/Scripts/Items/Misc/The Citadel/OrdersFromMinax.cs @@ -4,9 +4,9 @@ using Server; namespace Server.Items { public class OrdersFromMinax : Item - { + { public override int LabelNumber{ get{ return 1074639; } } // Orders from Minax - + [Constructable] public OrdersFromMinax() : base( 0x2279 ) { @@ -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(); } } diff --git a/Scripts/Items/Misc/The Citadel/SerpentFangSectBadge.cs b/Scripts/Items/Misc/The Citadel/SerpentFangSectBadge.cs index 8f7f7a784..802b5e870 100644 --- a/Scripts/Items/Misc/The Citadel/SerpentFangSectBadge.cs +++ b/Scripts/Items/Misc/The Citadel/SerpentFangSectBadge.cs @@ -4,9 +4,9 @@ using Server; namespace Server.Items { public class SerpentFangSectBadge : Item - { + { public override int LabelNumber{ get{ return 1073139; } } // A Serpent Fang Sect Badge - + [Constructable] public SerpentFangSectBadge() : base( 0x23C ) { @@ -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(); } } diff --git a/Scripts/Items/Misc/The Citadel/TigerClawSectBadge.cs b/Scripts/Items/Misc/The Citadel/TigerClawSectBadge.cs index f6550e509..34397f6eb 100644 --- a/Scripts/Items/Misc/The Citadel/TigerClawSectBadge.cs +++ b/Scripts/Items/Misc/The Citadel/TigerClawSectBadge.cs @@ -4,9 +4,9 @@ using Server; namespace Server.Items { public class TigerClawSectBadge : Item - { + { public override int LabelNumber{ get{ return 1073140; } } // A Tiger Claw Sect Badge - + [Constructable] public TigerClawSectBadge() : base( 0x23D ) { @@ -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(); } } diff --git a/Scripts/Items/Misc/The Citadel/TravestysCollectionOfShells.cs b/Scripts/Items/Misc/The Citadel/TravestysCollectionOfShells.cs index 0b15393f6..f17460db2 100644 --- a/Scripts/Items/Misc/The Citadel/TravestysCollectionOfShells.cs +++ b/Scripts/Items/Misc/The Citadel/TravestysCollectionOfShells.cs @@ -4,9 +4,9 @@ using Server; namespace Server.Items { public class TravestysCollectionOfShells : Item - { + { public override int LabelNumber{ get{ return 1072090; } } // Travesty's Collection of Shells - + [Constructable] public TravestysCollectionOfShells() : base( 0xFD3 ) { @@ -19,14 +19,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(); } } diff --git a/Scripts/Items/Misc/The Citadel/TravestysFineTeakwoodTray.cs b/Scripts/Items/Misc/The Citadel/TravestysFineTeakwoodTray.cs index b18609ac9..98a1907ee 100644 --- a/Scripts/Items/Misc/The Citadel/TravestysFineTeakwoodTray.cs +++ b/Scripts/Items/Misc/The Citadel/TravestysFineTeakwoodTray.cs @@ -4,9 +4,9 @@ using Server; namespace Server.Items { public class TravestysFineTeakwoodTray : Item - { + { public override int LabelNumber{ get{ return 1075094; } } // Travesty's Fine Teakwood Tray - + [Constructable] public TravestysFineTeakwoodTray() : base( Utility.Random( 0x991, 2 ) ) { @@ -19,14 +19,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(); } } diff --git a/Scripts/Items/Misc/The Citadel/TravestysSushiPreparations.cs b/Scripts/Items/Misc/The Citadel/TravestysSushiPreparations.cs index 52ce7e3e9..5d4ab4888 100644 --- a/Scripts/Items/Misc/The Citadel/TravestysSushiPreparations.cs +++ b/Scripts/Items/Misc/The Citadel/TravestysSushiPreparations.cs @@ -4,9 +4,9 @@ using Server; namespace Server.Items { public class TravestysSushiPreparations : Item - { + { public override int LabelNumber{ get{ return 1075093; } } // Travesty's Sushi Preparations - + [Constructable] public TravestysSushiPreparations() : base( Utility.Random( 0x1E15, 2 ) ) { @@ -19,14 +19,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(); } } diff --git a/Scripts/Items/Misc/Twisted Weald/HornOfTheDreadhorn.cs b/Scripts/Items/Misc/Twisted Weald/HornOfTheDreadhorn.cs index a9f6b295d..efcfed4da 100644 --- a/Scripts/Items/Misc/Twisted Weald/HornOfTheDreadhorn.cs +++ b/Scripts/Items/Misc/Twisted Weald/HornOfTheDreadhorn.cs @@ -6,7 +6,7 @@ namespace Server.Items public class HornOfTheDreadhorn : Item { public override int LabelNumber{ get{ return 1072089; } } // Horn of the Dread - + [Constructable] public HornOfTheDreadhorn() : base( 0x315C ) { @@ -19,14 +19,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(); } } diff --git a/Scripts/Items/Misc/Twisted Weald/MangledHeadOfDreadhorn.cs b/Scripts/Items/Misc/Twisted Weald/MangledHeadOfDreadhorn.cs index 28ee69f76..649b25c19 100644 --- a/Scripts/Items/Misc/Twisted Weald/MangledHeadOfDreadhorn.cs +++ b/Scripts/Items/Misc/Twisted Weald/MangledHeadOfDreadhorn.cs @@ -6,7 +6,7 @@ namespace Server.Items public class MangledHeadOfDreadhorn : Item { public override int LabelNumber{ get{ return 1072088; } } // The Mangled Head of Dread Horn - + [Constructable] public MangledHeadOfDreadhorn() : base( 0x3156 ) { @@ -19,14 +19,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(); } } diff --git a/Scripts/Items/Misc/Twisted Weald/TaintedMushroom.cs b/Scripts/Items/Misc/Twisted Weald/TaintedMushroom.cs index cbf95ec9c..04ad18541 100644 --- a/Scripts/Items/Misc/Twisted Weald/TaintedMushroom.cs +++ b/Scripts/Items/Misc/Twisted Weald/TaintedMushroom.cs @@ -3,18 +3,13 @@ using System; namespace Server.Items { public class TaintedMushroom : Item - { + { public override int LabelNumber{ get{ return 1075088; } } // Dread Horn Tainted Mushroom public override bool ForceShowProperties{ get{ return true; } } - - private static int[] m_ItemIDs = new int[] - { - 0x222E, 0x222F, 0x2230, 0x2231 - }; - + [Constructable] - public TaintedMushroom() : base( Utility.RandomList( m_ItemIDs ) ) - { + public TaintedMushroom() : base( Utility.RandomMinMax( 0x222E, 0x2231 ) ) + { } public TaintedMushroom( Serial serial ) : base( serial ) @@ -24,14 +19,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(); } } diff --git a/Scripts/Items/New Haven Quest Rewards/AmeliasToolbox.cs b/Scripts/Items/New Haven Quest Rewards/AmeliasToolbox.cs index 53821ae24..c13da7690 100644 --- a/Scripts/Items/New Haven Quest Rewards/AmeliasToolbox.cs +++ b/Scripts/Items/New Haven Quest Rewards/AmeliasToolbox.cs @@ -1,6 +1,5 @@ using System; -using Server; -using Server.Mobiles; +using Server; namespace Server.Items { diff --git a/Scripts/Items/New Haven Quest Rewards/ArmsOfArmstrong.cs b/Scripts/Items/New Haven Quest Rewards/ArmsOfArmstrong.cs index c33a1fd71..d39b0ebec 100644 --- a/Scripts/Items/New Haven Quest Rewards/ArmsOfArmstrong.cs +++ b/Scripts/Items/New Haven Quest Rewards/ArmsOfArmstrong.cs @@ -1,6 +1,5 @@ -using System; -using Server; -using Server.Mobiles; +using System; +using Server; namespace Server.Items { @@ -15,7 +14,7 @@ namespace Server.Items public override int BaseEnergyResistance{ get{ return 5; } } [Constructable] - public ArmsOfArmstrong() : base() + public ArmsOfArmstrong() { LootType = LootType.Blessed; diff --git a/Scripts/Items/New Haven Quest Rewards/BagOfNecromancerReagents.cs b/Scripts/Items/New Haven Quest Rewards/BagOfNecromancerReagents.cs index 5436b1d23..1657e8eec 100644 --- a/Scripts/Items/New Haven Quest Rewards/BagOfNecromancerReagents.cs +++ b/Scripts/Items/New Haven Quest Rewards/BagOfNecromancerReagents.cs @@ -1,42 +1,41 @@ -using System; -using Server; -using Server.Mobiles; +using System; +using Server; -namespace Server.Items -{ - public class BagOfNecromancerReagents : Bag - { - [Constructable] - public BagOfNecromancerReagents() : this( 100 ) - { - } - - [Constructable] - public BagOfNecromancerReagents( int amount ) : base() - { +namespace Server.Items +{ + public class BagOfNecromancerReagents : Bag + { + [Constructable] + public BagOfNecromancerReagents() : this( 50 ) + { + } + + [Constructable] + public BagOfNecromancerReagents( int amount ) + { DropItem( new BatWing ( amount ) ); DropItem( new GraveDust ( amount ) ); DropItem( new DaemonBlood( amount ) ); DropItem( new NoxCrystal ( amount ) ); DropItem( new PigIron ( amount ) ); - } + } - public BagOfNecromancerReagents( Serial serial ) : base( serial ) - { - } + public BagOfNecromancerReagents( Serial serial ) : base( serial ) + { + } - public override void Serialize( GenericWriter writer ) - { - base.Serialize( writer ); + public override void Serialize( GenericWriter writer ) + { + base.Serialize( writer ); writer.WriteEncodedInt( 0 ); // version - } + } - public override void Deserialize( GenericReader reader ) - { - base.Deserialize( reader ); + public override void Deserialize( GenericReader reader ) + { + base.Deserialize( reader ); int version = reader.ReadEncodedInt(); - } - } -} + } + } +} diff --git a/Scripts/Items/New Haven Quest Rewards/BagOfSmokeBombs.cs b/Scripts/Items/New Haven Quest Rewards/BagOfSmokeBombs.cs index bcbf9c8ce..46e2d5bf0 100644 --- a/Scripts/Items/New Haven Quest Rewards/BagOfSmokeBombs.cs +++ b/Scripts/Items/New Haven Quest Rewards/BagOfSmokeBombs.cs @@ -1,39 +1,38 @@ -using System; -using Server; -using Server.Mobiles; +using System; +using Server; -namespace Server.Items -{ - public class BagOfSmokeBombs : Bag - { - [Constructable] - public BagOfSmokeBombs() : this( 20 ) - { - } - - [Constructable] - public BagOfSmokeBombs( int amount ) : base() - { - for ( int a = amount; amount > 0; amount -- ) +namespace Server.Items +{ + public class BagOfSmokeBombs : Bag + { + [Constructable] + public BagOfSmokeBombs() : this( 20 ) + { + } + + [Constructable] + public BagOfSmokeBombs( int amount ) + { + for ( int i = 0; i < amount; ++i ) DropItem( new SmokeBomb() ); - } + } - public BagOfSmokeBombs( Serial serial ) : base( serial ) - { - } + public BagOfSmokeBombs( Serial serial ) : base( serial ) + { + } - public override void Serialize( GenericWriter writer ) - { - base.Serialize( writer ); + public override void Serialize( GenericWriter writer ) + { + base.Serialize( writer ); writer.WriteEncodedInt( 0 ); // version - } + } - public override void Deserialize( GenericReader reader ) - { - base.Deserialize( reader ); + public override void Deserialize( GenericReader reader ) + { + base.Deserialize( reader ); int version = reader.ReadEncodedInt(); - } - } -} + } + } +} diff --git a/Scripts/Items/New Haven Quest Rewards/BraceletOfResilience.cs b/Scripts/Items/New Haven Quest Rewards/BraceletOfResilience.cs index c12d1df3d..b0e5bab4c 100644 --- a/Scripts/Items/New Haven Quest Rewards/BraceletOfResilience.cs +++ b/Scripts/Items/New Haven Quest Rewards/BraceletOfResilience.cs @@ -1,6 +1,5 @@ -using System; -using Server; -using Server.Mobiles; +using System; +using Server; namespace Server.Items { diff --git a/Scripts/Items/New Haven Quest Rewards/BulwarkLeggings.cs b/Scripts/Items/New Haven Quest Rewards/BulwarkLeggings.cs index a3bd4e41d..3c80a0fd8 100644 --- a/Scripts/Items/New Haven Quest Rewards/BulwarkLeggings.cs +++ b/Scripts/Items/New Haven Quest Rewards/BulwarkLeggings.cs @@ -1,6 +1,5 @@ -using System; -using Server; -using Server.Mobiles; +using System; +using Server; namespace Server.Items { @@ -15,7 +14,7 @@ namespace Server.Items public override int BaseEnergyResistance{ get{ return 3; } } [Constructable] - public BulwarkLeggings() : base() + public BulwarkLeggings() { LootType = LootType.Blessed; @@ -26,7 +25,7 @@ namespace Server.Items public BulwarkLeggings( Serial serial ) : base( serial ) { } - + public override void Serialize( GenericWriter writer ) { base.Serialize( writer ); diff --git a/Scripts/Items/New Haven Quest Rewards/ChurchillsWarMace.cs b/Scripts/Items/New Haven Quest Rewards/ChurchillsWarMace.cs index 0b3333412..71382428a 100644 --- a/Scripts/Items/New Haven Quest Rewards/ChurchillsWarMace.cs +++ b/Scripts/Items/New Haven Quest Rewards/ChurchillsWarMace.cs @@ -1,6 +1,5 @@ -using System; -using Server; -using Server.Mobiles; +using System; +using Server; namespace Server.Items { @@ -9,7 +8,7 @@ namespace Server.Items public override int LabelNumber{ get{ return 1078062; } } // Churchill's War Mace [Constructable] - public ChurchillsWarMace() : base() + public ChurchillsWarMace() { LootType = LootType.Blessed; diff --git a/Scripts/Items/New Haven Quest Rewards/ClaspOfConcentration.cs b/Scripts/Items/New Haven Quest Rewards/ClaspOfConcentration.cs index ff4e50221..83a0a416c 100644 --- a/Scripts/Items/New Haven Quest Rewards/ClaspOfConcentration.cs +++ b/Scripts/Items/New Haven Quest Rewards/ClaspOfConcentration.cs @@ -1,6 +1,5 @@ -using System; -using Server; -using Server.Mobiles; +using System; +using Server; namespace Server.Items { diff --git a/Scripts/Items/New Haven Quest Rewards/CompleteNecromancerSpellbook.cs b/Scripts/Items/New Haven Quest Rewards/CompleteNecromancerSpellbook.cs deleted file mode 100644 index 7e1b180cb..000000000 --- a/Scripts/Items/New Haven Quest Rewards/CompleteNecromancerSpellbook.cs +++ /dev/null @@ -1,32 +0,0 @@ -using System; -using Server; -using Server.Mobiles; - -namespace Server.Items -{ - public class CompleteNecromancerSpellbook : NecromancerSpellbook - { - [Constructable] - public CompleteNecromancerSpellbook() : base( (ulong) 0x1FFFF ) - { - } - - public CompleteNecromancerSpellbook( Serial serial ) : base( serial ) - { - } - - public override void Serialize( GenericWriter writer ) - { - base.Serialize( writer ); - - writer.WriteEncodedInt( 0 ); // version - } - - public override void Deserialize( GenericReader reader ) - { - base.Deserialize( reader ); - - int version = reader.ReadEncodedInt(); - } - } -} diff --git a/Scripts/Items/New Haven Quest Rewards/EmberStaff.cs b/Scripts/Items/New Haven Quest Rewards/EmberStaff.cs index 155285bbe..e1688f65c 100644 --- a/Scripts/Items/New Haven Quest Rewards/EmberStaff.cs +++ b/Scripts/Items/New Haven Quest Rewards/EmberStaff.cs @@ -1,6 +1,5 @@ -using System; -using Server; -using Server.Mobiles; +using System; +using Server; namespace Server.Items { diff --git a/Scripts/Items/New Haven Quest Rewards/EscutcheonDeAriadne.cs b/Scripts/Items/New Haven Quest Rewards/EscutcheonDeAriadne.cs index f50875187..560732549 100644 --- a/Scripts/Items/New Haven Quest Rewards/EscutcheonDeAriadne.cs +++ b/Scripts/Items/New Haven Quest Rewards/EscutcheonDeAriadne.cs @@ -1,6 +1,5 @@ -using System; -using Server; -using Server.Mobiles; +using System; +using Server; namespace Server.Items { @@ -10,11 +9,11 @@ namespace Server.Items public override int BasePhysicalResistance{ get{ return 5; } } public override int BaseEnergyResistance{ get{ return 1; } } - + public override int AosStrReq{ get{ return 14; } } [Constructable] - public EscutcheonDeAriadne() : base() + public EscutcheonDeAriadne() { LootType = LootType.Blessed; Hue = 0x8A5; @@ -24,7 +23,7 @@ namespace Server.Items Attributes.DefendChance = 5; } - public EscutcheonDeAriadne( Serial serial ) : base(serial) + public EscutcheonDeAriadne( Serial serial ) : base( serial ) { } diff --git a/Scripts/Items/New Haven Quest Rewards/GlovesOfSafeguarding.cs b/Scripts/Items/New Haven Quest Rewards/GlovesOfSafeguarding.cs index d534d12b6..c290c4c03 100644 --- a/Scripts/Items/New Haven Quest Rewards/GlovesOfSafeguarding.cs +++ b/Scripts/Items/New Haven Quest Rewards/GlovesOfSafeguarding.cs @@ -1,6 +1,5 @@ -using System; -using Server; -using Server.Mobiles; +using System; +using Server; namespace Server.Items { diff --git a/Scripts/Items/New Haven Quest Rewards/HallowedSpellbook.cs b/Scripts/Items/New Haven Quest Rewards/HallowedSpellbook.cs index a5a13df97..8c8edf5f2 100644 --- a/Scripts/Items/New Haven Quest Rewards/HallowedSpellbook.cs +++ b/Scripts/Items/New Haven Quest Rewards/HallowedSpellbook.cs @@ -1,6 +1,5 @@ -using System; -using Server; -using Server.Mobiles; +using System; +using Server; namespace Server.Items { @@ -9,10 +8,9 @@ namespace Server.Items public override int LabelNumber { get { return 1077620; } } // Hallowed Spellbook [Constructable] - public HallowedSpellbook() : base() + public HallowedSpellbook() : base( 0x3FFFFFFFF ) { LootType = LootType.Blessed; - Content = 0x3FFFFFFFF; Slayer = SlayerName.Silver; } diff --git a/Scripts/Items/New Haven Quest Rewards/HealersTouch.cs b/Scripts/Items/New Haven Quest Rewards/HealersTouch.cs index 50fea58fe..0ead8bac6 100644 --- a/Scripts/Items/New Haven Quest Rewards/HealersTouch.cs +++ b/Scripts/Items/New Haven Quest Rewards/HealersTouch.cs @@ -1,6 +1,5 @@ -using System; -using Server; -using Server.Mobiles; +using System; +using Server; namespace Server.Items { diff --git a/Scripts/Items/New Haven Quest Rewards/Heartseeker.cs b/Scripts/Items/New Haven Quest Rewards/Heartseeker.cs index 67ddc5094..8e6135775 100644 --- a/Scripts/Items/New Haven Quest Rewards/Heartseeker.cs +++ b/Scripts/Items/New Haven Quest Rewards/Heartseeker.cs @@ -1,6 +1,5 @@ -using System; -using Server; -using Server.Mobiles; +using System; +using Server; namespace Server.Items { @@ -9,7 +8,7 @@ namespace Server.Items public override int LabelNumber{ get{ return 1078210; } } // Heartseeker [Constructable] - public Heartseeker() : base() + public Heartseeker() { LootType = LootType.Blessed; diff --git a/Scripts/Items/New Haven Quest Rewards/JocklesQuicksword.cs b/Scripts/Items/New Haven Quest Rewards/JocklesQuicksword.cs index e06212a81..7562bca4a 100644 --- a/Scripts/Items/New Haven Quest Rewards/JocklesQuicksword.cs +++ b/Scripts/Items/New Haven Quest Rewards/JocklesQuicksword.cs @@ -1,6 +1,5 @@ -using System; -using Server; -using Server.Mobiles; +using System; +using Server; namespace Server.Items { @@ -9,7 +8,7 @@ namespace Server.Items public override int LabelNumber{ get{ return 1077666; } } // Jockles' Quicksword [Constructable] - public JocklesQuicksword() : base() + public JocklesQuicksword() { LootType = LootType.Blessed; diff --git a/Scripts/Items/New Haven Quest Rewards/PhilosophersHat.cs b/Scripts/Items/New Haven Quest Rewards/PhilosophersHat.cs index 2ccd2572b..2b64d718b 100644 --- a/Scripts/Items/New Haven Quest Rewards/PhilosophersHat.cs +++ b/Scripts/Items/New Haven Quest Rewards/PhilosophersHat.cs @@ -1,6 +1,5 @@ -using System; -using Server; -using Server.Mobiles; +using System; +using Server; namespace Server.Items { @@ -15,7 +14,7 @@ namespace Server.Items public override int BaseEnergyResistance{ get{ return 5; } } [Constructable] - public PhilosophersHat() : base() + public PhilosophersHat() { LootType = LootType.Blessed; @@ -26,7 +25,7 @@ namespace Server.Items public PhilosophersHat( Serial serial ) : base( serial ) { } - + public override void Serialize( GenericWriter writer ) { base.Serialize( writer ); diff --git a/Scripts/Items/New Haven Quest Rewards/RecarosRiposte.cs b/Scripts/Items/New Haven Quest Rewards/RecarosRiposte.cs index 13ce5d524..e66d2852e 100644 --- a/Scripts/Items/New Haven Quest Rewards/RecarosRiposte.cs +++ b/Scripts/Items/New Haven Quest Rewards/RecarosRiposte.cs @@ -1,6 +1,5 @@ -using System; -using Server; -using Server.Mobiles; +using System; +using Server; namespace Server.Items { diff --git a/Scripts/Items/New Haven Quest Rewards/RingOfTheSavant.cs b/Scripts/Items/New Haven Quest Rewards/RingOfTheSavant.cs index e5f071bde..79aefe0e0 100644 --- a/Scripts/Items/New Haven Quest Rewards/RingOfTheSavant.cs +++ b/Scripts/Items/New Haven Quest Rewards/RingOfTheSavant.cs @@ -1,6 +1,5 @@ -using System; -using Server; -using Server.Mobiles; +using System; +using Server; namespace Server.Items { @@ -9,7 +8,7 @@ namespace Server.Items public override int LabelNumber{ get{ return 1077608; } } // Ring of the Savant [Constructable] - public RingOfTheSavant() : base() + public RingOfTheSavant() { LootType = LootType.Blessed; diff --git a/Scripts/Items/New Haven Quest Rewards/SilverSerpentBlade.cs b/Scripts/Items/New Haven Quest Rewards/SilverSerpentBlade.cs index 76cbcd476..3bc45a8a1 100644 --- a/Scripts/Items/New Haven Quest Rewards/SilverSerpentBlade.cs +++ b/Scripts/Items/New Haven Quest Rewards/SilverSerpentBlade.cs @@ -1,6 +1,5 @@ -using System; -using Server; -using Server.Mobiles; +using System; +using Server; namespace Server.Items { @@ -9,7 +8,7 @@ namespace Server.Items public override int LabelNumber{ get{ return 1078163; } } // Silver Serpent Blade [Constructable] - public SilverSerpentBlade() : base() + public SilverSerpentBlade() { LootType = LootType.Blessed; diff --git a/Scripts/Items/New Haven Quest Rewards/TheDragonsTail.cs b/Scripts/Items/New Haven Quest Rewards/TheDragonsTail.cs index 3c1a6a9d8..4811e62fe 100644 --- a/Scripts/Items/New Haven Quest Rewards/TheDragonsTail.cs +++ b/Scripts/Items/New Haven Quest Rewards/TheDragonsTail.cs @@ -1,6 +1,5 @@ -using System; -using Server; -using Server.Mobiles; +using System; +using Server; namespace Server.Items { @@ -12,7 +11,7 @@ namespace Server.Items public override int InitMaxHits{ get{ return 80; } } [Constructable] - public TheDragonsTail() : base() + public TheDragonsTail() { LootType = LootType.Blessed; diff --git a/Scripts/Items/New Haven Quest Rewards/TunicOfGuarding.cs b/Scripts/Items/New Haven Quest Rewards/TunicOfGuarding.cs index 080b93d54..990b6bda5 100644 --- a/Scripts/Items/New Haven Quest Rewards/TunicOfGuarding.cs +++ b/Scripts/Items/New Haven Quest Rewards/TunicOfGuarding.cs @@ -1,6 +1,5 @@ -using System; -using Server; -using Server.Mobiles; +using System; +using Server; namespace Server.Items { @@ -15,7 +14,7 @@ namespace Server.Items public override int BaseEnergyResistance{ get{ return 5; } } [Constructable] - public TunicOfGuarding() : base() + public TunicOfGuarding() { LootType = LootType.Blessed; diff --git a/Scripts/Items/New Haven Quest Rewards/TwilightJacket.cs b/Scripts/Items/New Haven Quest Rewards/TwilightJacket.cs index ec4db4c43..fd4d6246f 100644 --- a/Scripts/Items/New Haven Quest Rewards/TwilightJacket.cs +++ b/Scripts/Items/New Haven Quest Rewards/TwilightJacket.cs @@ -1,6 +1,5 @@ -using System; -using Server; -using Server.Mobiles; +using System; +using Server; namespace Server.Items { @@ -15,7 +14,7 @@ namespace Server.Items public override int BaseEnergyResistance{ get{ return 3; } } [Constructable] - public TwilightJacket() : base() + public TwilightJacket() { LootType = LootType.Blessed; diff --git a/Scripts/Items/New Haven Quest Rewards/WalkersLeggings.cs b/Scripts/Items/New Haven Quest Rewards/WalkersLeggings.cs index d7f93177d..a078ce886 100644 --- a/Scripts/Items/New Haven Quest Rewards/WalkersLeggings.cs +++ b/Scripts/Items/New Haven Quest Rewards/WalkersLeggings.cs @@ -1,6 +1,5 @@ -using System; -using Server; -using Server.Mobiles; +using System; +using Server; namespace Server.Items { @@ -15,7 +14,7 @@ namespace Server.Items public override int BaseEnergyResistance{ get{ return 3; } } [Constructable] - public WalkersLeggings() : base() + public WalkersLeggings() { LootType = LootType.Blessed; } diff --git a/Scripts/Items/Weapons/Axes/GuardianAxe.cs b/Scripts/Items/Weapons/Axes/GuardianAxe.cs index 83b81202e..1013f47a1 100644 --- a/Scripts/Items/Weapons/Axes/GuardianAxe.cs +++ b/Scripts/Items/Weapons/Axes/GuardianAxe.cs @@ -8,7 +8,7 @@ namespace Server.Items public override int LabelNumber{ get{ return 1073545; } } // guardian axe [Constructable] - public GuardianAxe() : base() + public GuardianAxe() { Attributes.BonusHits = 4; Attributes.RegenHits = 1; diff --git a/Scripts/Items/Weapons/Axes/HeavyOrnateAxe.cs b/Scripts/Items/Weapons/Axes/HeavyOrnateAxe.cs index 9903dbd13..007b77a85 100644 --- a/Scripts/Items/Weapons/Axes/HeavyOrnateAxe.cs +++ b/Scripts/Items/Weapons/Axes/HeavyOrnateAxe.cs @@ -8,7 +8,7 @@ namespace Server.Items public override int LabelNumber{ get{ return 1073548; } } // heavy ornate axe [Constructable] - public HeavyOrnateAxe() : base() + public HeavyOrnateAxe() { Attributes.WeaponDamage = 8; } diff --git a/Scripts/Items/Weapons/Axes/SingingAxe.cs b/Scripts/Items/Weapons/Axes/SingingAxe.cs index 045208b6e..09b18dcf6 100644 --- a/Scripts/Items/Weapons/Axes/SingingAxe.cs +++ b/Scripts/Items/Weapons/Axes/SingingAxe.cs @@ -8,7 +8,7 @@ namespace Server.Items public override int LabelNumber{ get{ return 1073546; } } // singing axe [Constructable] - public SingingAxe() : base() + public SingingAxe() { SkillBonuses.SetValues( 0, SkillName.Musicianship, 5 ); } diff --git a/Scripts/Items/Weapons/Axes/ThunderingAxe.cs b/Scripts/Items/Weapons/Axes/ThunderingAxe.cs index 2cb11a7fc..938a57e28 100644 --- a/Scripts/Items/Weapons/Axes/ThunderingAxe.cs +++ b/Scripts/Items/Weapons/Axes/ThunderingAxe.cs @@ -8,7 +8,7 @@ namespace Server.Items public override int LabelNumber{ get{ return 1073547; } } // thundering axe [Constructable] - public ThunderingAxe() : base() + public ThunderingAxe() { WeaponAttributes.HitLightning = 10; } diff --git a/Scripts/Items/Weapons/Maces/EmeraldMace.cs b/Scripts/Items/Weapons/Maces/EmeraldMace.cs index b264ece72..fbd3611cf 100644 --- a/Scripts/Items/Weapons/Maces/EmeraldMace.cs +++ b/Scripts/Items/Weapons/Maces/EmeraldMace.cs @@ -8,7 +8,7 @@ namespace Server.Items public override int LabelNumber{ get{ return 1073530; } } // emerald mace [Constructable] - public EmeraldMace() : base() + public EmeraldMace() { WeaponAttributes.ResistPoisonBonus = 5; } diff --git a/Scripts/Items/Weapons/Maces/RubyMace.cs b/Scripts/Items/Weapons/Maces/RubyMace.cs index 8ad14e30b..659d8661a 100644 --- a/Scripts/Items/Weapons/Maces/RubyMace.cs +++ b/Scripts/Items/Weapons/Maces/RubyMace.cs @@ -8,7 +8,7 @@ namespace Server.Items public override int LabelNumber{ get{ return 1073529; } } // ruby mace [Constructable] - public RubyMace() : base() + public RubyMace() { Attributes.WeaponDamage = 5; } diff --git a/Scripts/Items/Weapons/Maces/SapphireMace.cs b/Scripts/Items/Weapons/Maces/SapphireMace.cs index bc6ef58ee..d956a955e 100644 --- a/Scripts/Items/Weapons/Maces/SapphireMace.cs +++ b/Scripts/Items/Weapons/Maces/SapphireMace.cs @@ -8,7 +8,7 @@ namespace Server.Items public override int LabelNumber{ get{ return 1073531; } } // sapphire mace [Constructable] - public SapphireMace() : base() + public SapphireMace() { WeaponAttributes.ResistEnergyBonus = 5; } diff --git a/Scripts/Items/Weapons/Maces/SilverEtchedMace.cs b/Scripts/Items/Weapons/Maces/SilverEtchedMace.cs index 65c6531b6..2fe80b9d9 100644 --- a/Scripts/Items/Weapons/Maces/SilverEtchedMace.cs +++ b/Scripts/Items/Weapons/Maces/SilverEtchedMace.cs @@ -8,7 +8,7 @@ namespace Server.Items public override int LabelNumber{ get{ return 1073532; } } // silver-etched mace [Constructable] - public SilverEtchedMace() : base() + public SilverEtchedMace() { Slayer = SlayerName.Exorcism; } diff --git a/Scripts/Items/Weapons/Ranged/AssassinsShortbow.cs b/Scripts/Items/Weapons/Ranged/AssassinsShortbow.cs index d0e3cc7b3..c39e7d1e9 100644 --- a/Scripts/Items/Weapons/Ranged/AssassinsShortbow.cs +++ b/Scripts/Items/Weapons/Ranged/AssassinsShortbow.cs @@ -8,7 +8,7 @@ namespace Server.Items public override int LabelNumber{ get{ return 1073512; } } // assassin's shortbow [Constructable] - public AssassinsShortbow() : base() + public AssassinsShortbow() { Attributes.AttackChance = 3; Attributes.WeaponDamage = 4; diff --git a/Scripts/Items/Weapons/Ranged/BarbedLongbow.cs b/Scripts/Items/Weapons/Ranged/BarbedLongbow.cs index 7aa93edc1..67fe090ca 100644 --- a/Scripts/Items/Weapons/Ranged/BarbedLongbow.cs +++ b/Scripts/Items/Weapons/Ranged/BarbedLongbow.cs @@ -8,7 +8,7 @@ namespace Server.Items public override int LabelNumber{ get{ return 1073505; } } // barbed longbow [Constructable] - public BarbedLongbow() : base() + public BarbedLongbow() { Attributes.ReflectPhysical = 12; } diff --git a/Scripts/Items/Weapons/Ranged/FrozenLongbow.cs b/Scripts/Items/Weapons/Ranged/FrozenLongbow.cs index 0fa826993..4209c10fd 100644 --- a/Scripts/Items/Weapons/Ranged/FrozenLongbow.cs +++ b/Scripts/Items/Weapons/Ranged/FrozenLongbow.cs @@ -8,7 +8,7 @@ namespace Server.Items public override int LabelNumber{ get{ return 1073507; } } // frozen longbow [Constructable] - public FrozenLongbow() : base() + public FrozenLongbow() { Attributes.WeaponSpeed = -5; Attributes.DefendChance = 10; diff --git a/Scripts/Items/Weapons/Ranged/LightweightShortbow.cs b/Scripts/Items/Weapons/Ranged/LightweightShortbow.cs index 663f640db..05ad77e69 100644 --- a/Scripts/Items/Weapons/Ranged/LightweightShortbow.cs +++ b/Scripts/Items/Weapons/Ranged/LightweightShortbow.cs @@ -8,7 +8,7 @@ namespace Server.Items public override int LabelNumber{ get{ return 1073510; } } // lightweight shortbow [Constructable] - public LightweightShortbow() : base() + public LightweightShortbow() { Balanced = true; } diff --git a/Scripts/Items/Weapons/Ranged/LongbowOfMight.cs b/Scripts/Items/Weapons/Ranged/LongbowOfMight.cs index 338ce772d..f7fba41f4 100644 --- a/Scripts/Items/Weapons/Ranged/LongbowOfMight.cs +++ b/Scripts/Items/Weapons/Ranged/LongbowOfMight.cs @@ -8,7 +8,7 @@ namespace Server.Items public override int LabelNumber{ get{ return 1073508; } } // longbow of might [Constructable] - public LongbowOfMight() : base() + public LongbowOfMight() { Attributes.WeaponDamage = 5; } diff --git a/Scripts/Items/Weapons/Ranged/MysticalShortbow.cs b/Scripts/Items/Weapons/Ranged/MysticalShortbow.cs index 24e52b68e..f73e5fb7d 100644 --- a/Scripts/Items/Weapons/Ranged/MysticalShortbow.cs +++ b/Scripts/Items/Weapons/Ranged/MysticalShortbow.cs @@ -8,7 +8,7 @@ namespace Server.Items public override int LabelNumber{ get{ return 1073511; } } // mystical shortbow [Constructable] - public MysticalShortbow() : base() + public MysticalShortbow() { Attributes.SpellChanneling = 1; Attributes.CastSpeed = -1; diff --git a/Scripts/Items/Weapons/Ranged/RangersShortbow.cs b/Scripts/Items/Weapons/Ranged/RangersShortbow.cs index b0f0f445d..578ee315d 100644 --- a/Scripts/Items/Weapons/Ranged/RangersShortbow.cs +++ b/Scripts/Items/Weapons/Ranged/RangersShortbow.cs @@ -8,7 +8,7 @@ namespace Server.Items public override int LabelNumber{ get{ return 1073509; } } // ranger's shortbow [Constructable] - public RangersShortbow() : base() + public RangersShortbow() { Attributes.WeaponSpeed = 5; } diff --git a/Scripts/Items/Weapons/Ranged/SlayerLongbow.cs b/Scripts/Items/Weapons/Ranged/SlayerLongbow.cs index fca655e51..a999b8c4b 100644 --- a/Scripts/Items/Weapons/Ranged/SlayerLongbow.cs +++ b/Scripts/Items/Weapons/Ranged/SlayerLongbow.cs @@ -6,9 +6,9 @@ namespace Server.Items public class SlayerLongbow : ElvenCompositeLongbow { public override int LabelNumber{ get{ return 1073506; } } // slayer longbow - + [Constructable] - public SlayerLongbow() : base() + public SlayerLongbow() { Slayer2 = (SlayerName) Utility.RandomMinMax( 1, 27 ); } diff --git a/Scripts/Items/Weapons/Swords/AdventurersMachete.cs b/Scripts/Items/Weapons/Swords/AdventurersMachete.cs index 64344b0b3..96204b56a 100644 --- a/Scripts/Items/Weapons/Swords/AdventurersMachete.cs +++ b/Scripts/Items/Weapons/Swords/AdventurersMachete.cs @@ -8,7 +8,7 @@ namespace Server.Items public override int LabelNumber{ get{ return 1073533; } } // adventurer's machete [Constructable] - public AdventurersMachete() : base() + public AdventurersMachete() { Attributes.Luck = 20; } diff --git a/Scripts/Items/Weapons/Swords/BoneMachete.cs b/Scripts/Items/Weapons/Swords/BoneMachete.cs index 8cb690d00..17255af3d 100644 --- a/Scripts/Items/Weapons/Swords/BoneMachete.cs +++ b/Scripts/Items/Weapons/Swords/BoneMachete.cs @@ -8,7 +8,7 @@ namespace Server.Items public override int LabelNumber{ get{ return 1020526; } } // bone machete [Constructable] - public BoneMachete() : base() + public BoneMachete() { // TODO attributes } diff --git a/Scripts/Items/Weapons/Swords/ChargedAssassinSpike.cs b/Scripts/Items/Weapons/Swords/ChargedAssassinSpike.cs index 3bb46a4e5..683c6765f 100644 --- a/Scripts/Items/Weapons/Swords/ChargedAssassinSpike.cs +++ b/Scripts/Items/Weapons/Swords/ChargedAssassinSpike.cs @@ -8,8 +8,8 @@ namespace Server.Items public override int LabelNumber{ get{ return 1073518; } } // charged assassin spike [Constructable] - public ChargedAssassinSpike() : base() - { + public ChargedAssassinSpike() + { WeaponAttributes.HitLightning = 10; } diff --git a/Scripts/Items/Weapons/Swords/CorruptedRuneBlade.cs b/Scripts/Items/Weapons/Swords/CorruptedRuneBlade.cs index 968a0c62a..31b8d8c53 100644 --- a/Scripts/Items/Weapons/Swords/CorruptedRuneBlade.cs +++ b/Scripts/Items/Weapons/Swords/CorruptedRuneBlade.cs @@ -8,8 +8,8 @@ namespace Server.Items public override int LabelNumber{ get{ return 1073540; } } // Corrupted Rune Blade [Constructable] - public CorruptedRuneBlade() : base() - { + public CorruptedRuneBlade() + { WeaponAttributes.ResistPhysicalBonus = -5; WeaponAttributes.ResistPoisonBonus = 12; } diff --git a/Scripts/Items/Weapons/Swords/DarkglowScimitar.cs b/Scripts/Items/Weapons/Swords/DarkglowScimitar.cs index dc4bc4497..9d583a5c7 100644 --- a/Scripts/Items/Weapons/Swords/DarkglowScimitar.cs +++ b/Scripts/Items/Weapons/Swords/DarkglowScimitar.cs @@ -8,7 +8,7 @@ namespace Server.Items public override int LabelNumber{ get{ return 1073542; } } // darkglow scimitar [Constructable] - public DarkglowScimitar() : base() + public DarkglowScimitar() { WeaponAttributes.HitDispel = 10; } diff --git a/Scripts/Items/Weapons/Swords/DiseasedMachete.cs b/Scripts/Items/Weapons/Swords/DiseasedMachete.cs index 7dbf16145..1773f241a 100644 --- a/Scripts/Items/Weapons/Swords/DiseasedMachete.cs +++ b/Scripts/Items/Weapons/Swords/DiseasedMachete.cs @@ -8,7 +8,7 @@ namespace Server.Items public override int LabelNumber{ get{ return 1073536; } } // Diseased Machete [Constructable] - public DiseasedMachete() : base() + public DiseasedMachete() { WeaponAttributes.HitPoisonArea = 25; } diff --git a/Scripts/Items/Weapons/Swords/FierySpellblade.cs b/Scripts/Items/Weapons/Swords/FierySpellblade.cs index 74c81d7ff..f9f8edd64 100644 --- a/Scripts/Items/Weapons/Swords/FierySpellblade.cs +++ b/Scripts/Items/Weapons/Swords/FierySpellblade.cs @@ -8,8 +8,8 @@ namespace Server.Items public override int LabelNumber{ get{ return 1073515; } } // fiery spellblade [Constructable] - public FierySpellblade() : base() - { + public FierySpellblade() + { WeaponAttributes.ResistFireBonus = 5; } diff --git a/Scripts/Items/Weapons/Swords/IcyScimitar.cs b/Scripts/Items/Weapons/Swords/IcyScimitar.cs index 4c72da7ea..8c368b59e 100644 --- a/Scripts/Items/Weapons/Swords/IcyScimitar.cs +++ b/Scripts/Items/Weapons/Swords/IcyScimitar.cs @@ -8,7 +8,7 @@ namespace Server.Items public override int LabelNumber{ get{ return 1073543; } } // icy scimitar [Constructable] - public IcyScimitar() : base() + public IcyScimitar() { WeaponAttributes.HitHarm = 15; } diff --git a/Scripts/Items/Weapons/Swords/IcySpellblade.cs b/Scripts/Items/Weapons/Swords/IcySpellblade.cs index ed9000a20..19842ce88 100644 --- a/Scripts/Items/Weapons/Swords/IcySpellblade.cs +++ b/Scripts/Items/Weapons/Swords/IcySpellblade.cs @@ -8,8 +8,8 @@ namespace Server.Items public override int LabelNumber{ get{ return 1073514; } } // icy spellblade [Constructable] - public IcySpellblade() : base() - { + public IcySpellblade() + { WeaponAttributes.ResistColdBonus = 5; } diff --git a/Scripts/Items/Weapons/Swords/KnightsWarCleaver.cs b/Scripts/Items/Weapons/Swords/KnightsWarCleaver.cs index c6f5794b9..db4fa886a 100644 --- a/Scripts/Items/Weapons/Swords/KnightsWarCleaver.cs +++ b/Scripts/Items/Weapons/Swords/KnightsWarCleaver.cs @@ -8,7 +8,7 @@ namespace Server.Items public override int LabelNumber{ get{ return 1073525; } } // knight's war cleaver [Constructable] - public KnightsWarCleaver() : base() + public KnightsWarCleaver() { Attributes.RegenHits = 3; } diff --git a/Scripts/Items/Weapons/Swords/LeafbladeOfEase.cs b/Scripts/Items/Weapons/Swords/LeafbladeOfEase.cs index a56aa9655..d24ebae5c 100644 --- a/Scripts/Items/Weapons/Swords/LeafbladeOfEase.cs +++ b/Scripts/Items/Weapons/Swords/LeafbladeOfEase.cs @@ -8,8 +8,8 @@ namespace Server.Items public override int LabelNumber{ get{ return 1073524; } } // leafblade of ease [Constructable] - public LeafbladeOfEase() : base() - { + public LeafbladeOfEase() + { WeaponAttributes.UseBestSkill = 1; } diff --git a/Scripts/Items/Weapons/Swords/Luckblade.cs b/Scripts/Items/Weapons/Swords/Luckblade.cs index eee0af7e9..57df78a62 100644 --- a/Scripts/Items/Weapons/Swords/Luckblade.cs +++ b/Scripts/Items/Weapons/Swords/Luckblade.cs @@ -8,7 +8,7 @@ namespace Server.Items public override int LabelNumber{ get{ return 1073522; } } // luckblade [Constructable] - public Luckblade() : base() + public Luckblade() { Attributes.Luck = 20; } diff --git a/Scripts/Items/Weapons/Swords/MacheteOfDefense.cs b/Scripts/Items/Weapons/Swords/MacheteOfDefense.cs index 744e059b5..185c0a4e2 100644 --- a/Scripts/Items/Weapons/Swords/MacheteOfDefense.cs +++ b/Scripts/Items/Weapons/Swords/MacheteOfDefense.cs @@ -8,7 +8,7 @@ namespace Server.Items public override int LabelNumber{ get{ return 1073535; } } // machete of defense [Constructable] - public MacheteOfDefense() : base() + public MacheteOfDefense() { Attributes.DefendChance = 5; } diff --git a/Scripts/Items/Weapons/Swords/MagekillerAssassinSpike.cs b/Scripts/Items/Weapons/Swords/MagekillerAssassinSpike.cs index 9a2be23cd..be0ddfc37 100644 --- a/Scripts/Items/Weapons/Swords/MagekillerAssassinSpike.cs +++ b/Scripts/Items/Weapons/Swords/MagekillerAssassinSpike.cs @@ -8,7 +8,7 @@ namespace Server.Items public override int LabelNumber{ get{ return 1073519; } } // magekiller assassin spike [Constructable] - public MagekillerAssassinSpike() : base() + public MagekillerAssassinSpike() { WeaponAttributes.HitLeechMana = 16; } diff --git a/Scripts/Items/Weapons/Swords/MagekillerLeafblade.cs b/Scripts/Items/Weapons/Swords/MagekillerLeafblade.cs index 0f205f811..fda4f8ae4 100644 --- a/Scripts/Items/Weapons/Swords/MagekillerLeafblade.cs +++ b/Scripts/Items/Weapons/Swords/MagekillerLeafblade.cs @@ -8,7 +8,7 @@ namespace Server.Items public override int LabelNumber{ get{ return 1073523; } } // maagekiller leafblade [Constructable] - public MagekillerLeafblade() : base() + public MagekillerLeafblade() { WeaponAttributes.HitLeechMana = 16; } diff --git a/Scripts/Items/Weapons/Swords/MagesRuneBlade.cs b/Scripts/Items/Weapons/Swords/MagesRuneBlade.cs index 9032d5abd..83b3ece1e 100644 --- a/Scripts/Items/Weapons/Swords/MagesRuneBlade.cs +++ b/Scripts/Items/Weapons/Swords/MagesRuneBlade.cs @@ -8,7 +8,7 @@ namespace Server.Items public override int LabelNumber{ get{ return 1073538; } } // mage's rune blade [Constructable] - public MagesRuneBlade() : base() + public MagesRuneBlade() { Attributes.CastSpeed = 1; } diff --git a/Scripts/Items/Weapons/Swords/OrcishMachete.cs b/Scripts/Items/Weapons/Swords/OrcishMachete.cs index 10a99b3be..8925bfde4 100644 --- a/Scripts/Items/Weapons/Swords/OrcishMachete.cs +++ b/Scripts/Items/Weapons/Swords/OrcishMachete.cs @@ -8,7 +8,7 @@ namespace Server.Items public override int LabelNumber{ get{ return 1073534; } } // Orcish Machete [Constructable] - public OrcishMachete() : base() + public OrcishMachete() { Attributes.BonusInt = -5; Attributes.WeaponDamage = 10; diff --git a/Scripts/Items/Weapons/Swords/RuneBladeOfKnowledge.cs b/Scripts/Items/Weapons/Swords/RuneBladeOfKnowledge.cs index b5ff76b23..a16ac028a 100644 --- a/Scripts/Items/Weapons/Swords/RuneBladeOfKnowledge.cs +++ b/Scripts/Items/Weapons/Swords/RuneBladeOfKnowledge.cs @@ -6,9 +6,9 @@ namespace Server.Items public class RuneBladeOfKnowledge : RuneBlade { public override int LabelNumber{ get{ return 1073539; } } // rune blade of knowledge - + [Constructable] - public RuneBladeOfKnowledge() : base() + public RuneBladeOfKnowledge() { Attributes.SpellDamage = 5; } diff --git a/Scripts/Items/Weapons/Swords/Runesabre.cs b/Scripts/Items/Weapons/Swords/Runesabre.cs index 624887830..4e3f527e4 100644 --- a/Scripts/Items/Weapons/Swords/Runesabre.cs +++ b/Scripts/Items/Weapons/Swords/Runesabre.cs @@ -8,7 +8,7 @@ namespace Server.Items public override int LabelNumber{ get{ return 1073537; } } // runesabre [Constructable] - public Runesabre() : base() + public Runesabre() { SkillBonuses.SetValues( 0, SkillName.MagicResist, 5.0 ); WeaponAttributes.MageWeapon = -29; diff --git a/Scripts/Items/Weapons/Swords/SerratedWarCleaver.cs b/Scripts/Items/Weapons/Swords/SerratedWarCleaver.cs index ede981533..2f88b4ba5 100644 --- a/Scripts/Items/Weapons/Swords/SerratedWarCleaver.cs +++ b/Scripts/Items/Weapons/Swords/SerratedWarCleaver.cs @@ -8,7 +8,7 @@ namespace Server.Items public override int LabelNumber{ get{ return 1073527; } } // serrated war cleaver [Constructable] - public SerratedWarCleaver() : base() + public SerratedWarCleaver() { Attributes.WeaponDamage = 7; } diff --git a/Scripts/Items/Weapons/Swords/SpellbladeOfDefense.cs b/Scripts/Items/Weapons/Swords/SpellbladeOfDefense.cs index 143bb28fd..27314d355 100644 --- a/Scripts/Items/Weapons/Swords/SpellbladeOfDefense.cs +++ b/Scripts/Items/Weapons/Swords/SpellbladeOfDefense.cs @@ -8,8 +8,8 @@ namespace Server.Items public override int LabelNumber{ get{ return 1073516; } } // spellblade of defense [Constructable] - public SpellbladeOfDefense() : base() - { + public SpellbladeOfDefense() + { Attributes.DefendChance = 5; } diff --git a/Scripts/Items/Weapons/Swords/TrueAssassinSpike.cs b/Scripts/Items/Weapons/Swords/TrueAssassinSpike.cs index d6fb2bbdc..46e116748 100644 --- a/Scripts/Items/Weapons/Swords/TrueAssassinSpike.cs +++ b/Scripts/Items/Weapons/Swords/TrueAssassinSpike.cs @@ -8,7 +8,7 @@ namespace Server.Items public override int LabelNumber{ get{ return 1073517; } } // true assassin spike [Constructable] - public TrueAssassinSpike() : base() + public TrueAssassinSpike() { Attributes.AttackChance = 4; Attributes.WeaponDamage = 4; diff --git a/Scripts/Items/Weapons/Swords/TrueLeafblade.cs b/Scripts/Items/Weapons/Swords/TrueLeafblade.cs index 998850e0a..ea619e9cb 100644 --- a/Scripts/Items/Weapons/Swords/TrueLeafblade.cs +++ b/Scripts/Items/Weapons/Swords/TrueLeafblade.cs @@ -8,7 +8,7 @@ namespace Server.Items public override int LabelNumber{ get{ return 1073521; } } // true leafblade [Constructable] - public TrueLeafblade() : base() + public TrueLeafblade() { WeaponAttributes.ResistPoisonBonus = 5; } diff --git a/Scripts/Items/Weapons/Swords/TrueRadiantScimitar.cs b/Scripts/Items/Weapons/Swords/TrueRadiantScimitar.cs index 1952bacd5..1bcadcbf0 100644 --- a/Scripts/Items/Weapons/Swords/TrueRadiantScimitar.cs +++ b/Scripts/Items/Weapons/Swords/TrueRadiantScimitar.cs @@ -8,7 +8,7 @@ namespace Server.Items public override int LabelNumber{ get{ return 1073541; } } // true radiant scimitar [Constructable] - public TrueRadiantScimitar() : base() + public TrueRadiantScimitar() { Attributes.NightSight = 1; } diff --git a/Scripts/Items/Weapons/Swords/TrueSpellblade.cs b/Scripts/Items/Weapons/Swords/TrueSpellblade.cs index ef895afb0..b6b77b1e4 100644 --- a/Scripts/Items/Weapons/Swords/TrueSpellblade.cs +++ b/Scripts/Items/Weapons/Swords/TrueSpellblade.cs @@ -8,8 +8,8 @@ namespace Server.Items public override int LabelNumber{ get{ return 1073513; } } // true spellblade [Constructable] - public TrueSpellblade() : base() - { + public TrueSpellblade() + { Attributes.SpellChanneling = 1; Attributes.CastSpeed = -1; } diff --git a/Scripts/Items/Weapons/Swords/TrueWarCleaver.cs b/Scripts/Items/Weapons/Swords/TrueWarCleaver.cs index 58304776a..a908a9995 100644 --- a/Scripts/Items/Weapons/Swords/TrueWarCleaver.cs +++ b/Scripts/Items/Weapons/Swords/TrueWarCleaver.cs @@ -8,7 +8,7 @@ namespace Server.Items public override int LabelNumber{ get{ return 1073528; } } // true war cleaver [Constructable] - public TrueWarCleaver() : base() + public TrueWarCleaver() { Attributes.WeaponDamage = 4; Attributes.RegenHits = 2; diff --git a/Scripts/Items/Weapons/Swords/TwinklingScimitar.cs b/Scripts/Items/Weapons/Swords/TwinklingScimitar.cs index 3c44512f0..19b4121b1 100644 --- a/Scripts/Items/Weapons/Swords/TwinklingScimitar.cs +++ b/Scripts/Items/Weapons/Swords/TwinklingScimitar.cs @@ -8,7 +8,7 @@ namespace Server.Items public override int LabelNumber{ get{ return 1073544; } } // twinkling scimitar [Constructable] - public TwinklingScimitar() : base() + public TwinklingScimitar() { Attributes.DefendChance = 6; } diff --git a/Scripts/Items/Weapons/Swords/WoundingAssassinSpike.cs b/Scripts/Items/Weapons/Swords/WoundingAssassinSpike.cs index e849f7a77..1e47a77ab 100644 --- a/Scripts/Items/Weapons/Swords/WoundingAssassinSpike.cs +++ b/Scripts/Items/Weapons/Swords/WoundingAssassinSpike.cs @@ -8,7 +8,7 @@ namespace Server.Items public override int LabelNumber{ get{ return 1073520; } } // wounding assassin spike [Constructable] - public WoundingAssassinSpike() : base() + public WoundingAssassinSpike() { WeaponAttributes.HitHarm = 15; } diff --git a/Scripts/Items/Weapons/Wooden/AncientWildStaff.cs b/Scripts/Items/Weapons/Wooden/AncientWildStaff.cs index d2b67bdd5..66405cacf 100644 --- a/Scripts/Items/Weapons/Wooden/AncientWildStaff.cs +++ b/Scripts/Items/Weapons/Wooden/AncientWildStaff.cs @@ -8,7 +8,7 @@ namespace Server.Items public override int LabelNumber{ get{ return 1073550; } } // ancient wild staff [Constructable] - public AncientWildStaff() : base() + public AncientWildStaff() { WeaponAttributes.ResistPoisonBonus = 5; } diff --git a/Scripts/Items/Weapons/Wooden/ArcanistsWildStaff.cs b/Scripts/Items/Weapons/Wooden/ArcanistsWildStaff.cs index d2dbae22f..b676cfdae 100644 --- a/Scripts/Items/Weapons/Wooden/ArcanistsWildStaff.cs +++ b/Scripts/Items/Weapons/Wooden/ArcanistsWildStaff.cs @@ -8,7 +8,7 @@ namespace Server.Items public override int LabelNumber{ get{ return 1073549; } } // arcanist's wild staff [Constructable] - public ArcanistsWildStaff() : base() + public ArcanistsWildStaff() { Attributes.BonusMana = 3; Attributes.WeaponDamage = 3; diff --git a/Scripts/Items/Weapons/Wooden/HardenedWildStaff.cs b/Scripts/Items/Weapons/Wooden/HardenedWildStaff.cs index 3615e6cdf..e813987b0 100644 --- a/Scripts/Items/Weapons/Wooden/HardenedWildStaff.cs +++ b/Scripts/Items/Weapons/Wooden/HardenedWildStaff.cs @@ -8,8 +8,8 @@ namespace Server.Items public override int LabelNumber{ get{ return 1073552; } } // hardened wild staff [Constructable] - public HardenedWildStaff() : base() - { + public HardenedWildStaff() + { Attributes.WeaponDamage = 5; } diff --git a/Scripts/Items/Weapons/Wooden/ThornedWildStaff.cs b/Scripts/Items/Weapons/Wooden/ThornedWildStaff.cs index 4f2b39c02..5c8b806c7 100644 --- a/Scripts/Items/Weapons/Wooden/ThornedWildStaff.cs +++ b/Scripts/Items/Weapons/Wooden/ThornedWildStaff.cs @@ -8,7 +8,7 @@ namespace Server.Items public override int LabelNumber{ get{ return 1073551; } } // thorned wild staff [Constructable] - public ThornedWildStaff() : base() + public ThornedWildStaff() { Attributes.ReflectPhysical = 12; } diff --git a/Scripts/Misc/MondainsLegacy.cs b/Scripts/Misc/MondainsLegacy.cs new file mode 100644 index 000000000..fecd5d8ce --- /dev/null +++ b/Scripts/Misc/MondainsLegacy.cs @@ -0,0 +1,27 @@ +using System; +using Server; + +namespace Server +{ + public static class MondainsLegacy + { + public static bool CheckML( Mobile from ) + { + return CheckML( from, true ); + } + + public static bool CheckML( Mobile from, bool message ) + { + if ( from == null || from.NetState == null ) + return false; + + if ( from.NetState.SupportsExpansion( Expansion.ML ) ) + return true; + + if ( message ) + from.SendLocalizedMessage( 1072791 ); // You must upgrade to Mondain's Legacy in order to use that item. + + return false; + } + } +} \ No newline at end of file