diff --git a/Scripts/Context Menus/TeachEntry.cs b/Scripts/Context Menus/TeachEntry.cs index d5138aff4..fcf6826cb 100644 --- a/Scripts/Context Menus/TeachEntry.cs +++ b/Scripts/Context Menus/TeachEntry.cs @@ -9,7 +9,7 @@ namespace Server.ContextMenus private BaseCreature m_Mobile; private Mobile m_From; - public TeachEntry( SkillName skill, BaseCreature m, Mobile from, bool enabled ) : base( 6000 + (int)skill, 4 ) + public TeachEntry( SkillName skill, BaseCreature m, Mobile from, bool enabled ) : base( 6000 + (int)skill ) { m_Skill = skill; m_Mobile = m; diff --git a/Scripts/Items/Skill Items/Harvest Tools/GargoylesPickaxe.cs b/Scripts/Items/Skill Items/Harvest Tools/GargoylesPickaxe.cs index fa99a331e..5db42efd8 100644 --- a/Scripts/Items/Skill Items/Harvest Tools/GargoylesPickaxe.cs +++ b/Scripts/Items/Skill Items/Harvest Tools/GargoylesPickaxe.cs @@ -16,24 +16,27 @@ namespace Server.Items public override int AosMinDamage{ get{ return 13; } } public override int AosMaxDamage{ get{ return 15; } } public override int AosSpeed{ get{ return 35; } } + public override float MlSpeed{ get{ return 3.00f; } } public override int OldStrengthReq{ get{ return 25; } } public override int OldMinDamage{ get{ return 1; } } public override int OldMaxDamage{ get{ return 15; } } public override int OldSpeed{ get{ return 35; } } + + public override int InitMinHits{ get{ return 31; } } + public override int InitMaxHits{ get{ return 60; } } public override WeaponAnimation DefAnimation{ get{ return WeaponAnimation.Slash1H; } } [Constructable] - public GargoylesPickaxe() : this( 100 ) + public GargoylesPickaxe() : this( Utility.RandomMinMax( 101, 125 )) { } [Constructable] - public GargoylesPickaxe( int uses ) : base( 0xE86 ) + public GargoylesPickaxe( int uses ) : base( 0xE85 + Utility.Random( 2 )) { Weight = 11.0; - Hue = 0x973; UsesRemaining = uses; ShowUsesRemaining = true; } @@ -54,6 +57,9 @@ namespace Server.Items base.Deserialize( reader ); int version = reader.ReadInt(); + + if ( Hue == 0x973 ) + Hue = 0x0; } } } \ No newline at end of file diff --git a/Scripts/Items/Skill Items/Harvest Tools/SturdyPickaxe.cs b/Scripts/Items/Skill Items/Harvest Tools/SturdyPickaxe.cs index ad8ab1265..5d8d8bb27 100644 --- a/Scripts/Items/Skill Items/Harvest Tools/SturdyPickaxe.cs +++ b/Scripts/Items/Skill Items/Harvest Tools/SturdyPickaxe.cs @@ -16,6 +16,7 @@ namespace Server.Items public override int AosMinDamage{ get{ return 13; } } public override int AosMaxDamage{ get{ return 15; } } public override int AosSpeed{ get{ return 35; } } + public override float MlSpeed{ get{ return 3.00f; } } public override int OldStrengthReq{ get{ return 25; } } public override int OldMinDamage{ get{ return 1; } } diff --git a/Scripts/Misc/LootPack.cs b/Scripts/Misc/LootPack.cs index 169b66c9c..b719b1646 100644 --- a/Scripts/Misc/LootPack.cs +++ b/Scripts/Misc/LootPack.cs @@ -468,13 +468,13 @@ namespace Server #endregion #region Generic accessors - public static LootPack Poor{ get{ return Core.AOS ? AosPoor : OldPoor; } } - public static LootPack Meager{ get{ return Core.AOS ? AosMeager : OldMeager; } } - public static LootPack Average{ get{ return Core.AOS ? AosAverage : OldAverage; } } - public static LootPack Rich{ get{ return Core.AOS ? AosRich : OldRich; } } - public static LootPack FilthyRich{ get{ return Core.AOS ? AosFilthyRich : OldFilthyRich; } } - public static LootPack UltraRich{ get{ return Core.AOS ? AosUltraRich : OldUltraRich; } } - public static LootPack SuperBoss{ get{ return Core.AOS ? AosSuperBoss : OldSuperBoss; } } + public static LootPack Poor{ get{ return Core.SE ? SePoor : Core.AOS ? AosPoor : OldPoor; } } + public static LootPack Meager{ get{ return Core.SE ? SeMeager : Core.AOS ? AosMeager : OldMeager; } } + public static LootPack Average{ get{ return Core.SE ? SeAverage : Core.AOS ? AosAverage : OldAverage; } } + public static LootPack Rich{ get{ return Core.SE ? SeRich : Core.AOS ? AosRich : OldRich; } } + public static LootPack FilthyRich{ get{ return Core.SE ? SeFilthyRich : Core.AOS ? AosFilthyRich : OldFilthyRich; } } + public static LootPack UltraRich{ get{ return Core.SE ? SeUltraRich : Core.AOS ? AosUltraRich : OldUltraRich; } } + public static LootPack SuperBoss{ get{ return Core.SE ? SeSuperBoss : Core.AOS ? AosSuperBoss : OldSuperBoss; } } #endregion public static readonly LootPack LowScrolls = new LootPack( new LootPackEntry[] diff --git a/Scripts/Mobiles/Vendors/BaseVendor.cs b/Scripts/Mobiles/Vendors/BaseVendor.cs index b09902d96..67f07aa0b 100644 --- a/Scripts/Mobiles/Vendors/BaseVendor.cs +++ b/Scripts/Mobiles/Vendors/BaseVendor.cs @@ -103,7 +103,7 @@ namespace Server.Mobiles private BaseVendor m_Vendor; public BulkOrderInfoEntry( Mobile from, BaseVendor vendor ) - : base( 6152, 6 ) + : base( 6152 ) { m_From = from; m_Vendor = vendor; @@ -1404,14 +1404,14 @@ namespace Server.Mobiles { if ( from.Alive && IsActiveVendor ) { + if ( SupportsBulkOrders( from ) ) + list.Add( new BulkOrderInfoEntry( from, this ) ); + if ( IsActiveSeller ) list.Add( new VendorBuyEntry( from, this ) ); if ( IsActiveBuyer ) list.Add( new VendorSellEntry( from, this ) ); - - if ( SupportsBulkOrders( from ) ) - list.Add( new BulkOrderInfoEntry( from, this ) ); } base.AddCustomContextEntries( from, list ); diff --git a/Scripts/Multis/Boats/TillerMan.cs b/Scripts/Multis/Boats/TillerMan.cs index d45f9f75d..0166ef5dc 100644 --- a/Scripts/Multis/Boats/TillerMan.cs +++ b/Scripts/Multis/Boats/TillerMan.cs @@ -26,7 +26,7 @@ namespace Server.Items case Direction.South: ItemID = 0x3E4B; break; case Direction.North: ItemID = 0x3E4E; break; case Direction.West: ItemID = 0x3E50; break; - case Direction.East: ItemID = 0x3E53; break; + case Direction.East: ItemID = 0x3E55; break; } }