warrentyexpired/ModernUO
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixes casting checks

Browse source
This commit is contained in:
Kamron Batman 2018-08-19 01:38:55 +08:00
parent 7ea00fbf4f
commit 03dd5f1926
431 changed files with 5616 additions and 6250 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Scripts/Mobiles/Vendors/GenericBuy.cs
View file

@ -310,7 +310,7 @@ namespace Server.Mobiles
object Obj_Disp = GetDisplayEntity();
if( Core.ML && Obj_Disp is Item && !( Obj_Disp as Item ).Stackable )
if ( Core.ML && Obj_Disp is Item && !( Obj_Disp as Item ).Stackable )
{
m_MaxAmount = Math.Min( 20, m_MaxAmount );
}

2
Scripts/Mobiles/Vendors/NPC/Blacksmith.cs
View file

@ -122,7 +122,7 @@ namespace Server.Mobiles
public override void OnSuccessfulBulkOrderReceive( Mobile from )
{
if( Core.SE && from is PlayerMobile )
if ( Core.SE && from is PlayerMobile )
((PlayerMobile)from).NextSmithBulkOrder = TimeSpan.Zero;
}
#endregion

2
Scripts/Mobiles/Vendors/NPC/Tailor.cs
View file

@ -73,7 +73,7 @@ namespace Server.Mobiles
public override void OnSuccessfulBulkOrderReceive( Mobile from )
{
if( Core.SE && from is PlayerMobile )
if ( Core.SE && from is PlayerMobile )
((PlayerMobile)from).NextTailorBulkOrder = TimeSpan.Zero;
}
#endregion

6
Scripts/Mobiles/Vendors/NPC/Weaponsmith.cs
View file

@ -24,7 +24,7 @@ namespace Server.Mobiles
public override void InitSBInfo()
{
m_SBInfos.Add( new SBWeaponSmith() );
if ( IsTokunoVendor )
m_SBInfos.Add( new SBSEWeapons() );
}
@ -91,7 +91,7 @@ namespace Server.Mobiles
public override void OnSuccessfulBulkOrderReceive( Mobile from )
{
if( Core.SE && from is PlayerMobile )
if ( Core.SE && from is PlayerMobile )
((PlayerMobile)from).NextSmithBulkOrder = TimeSpan.Zero;
}
#endregion
@ -114,4 +114,4 @@ namespace Server.Mobiles
int version = reader.ReadInt();
}
}
}
}

2
Scripts/Mobiles/Vendors/NPC/Weaver.cs
View file

@ -73,7 +73,7 @@ namespace Server.Mobiles
public override void OnSuccessfulBulkOrderReceive( Mobile from )
{
if( Core.SE && from is PlayerMobile )
if ( Core.SE && from is PlayerMobile )
((PlayerMobile)from).NextTailorBulkOrder = TimeSpan.Zero;
}
#endregion

4
Scripts/Mobiles/Vendors/PlayerBarkeeper.cs
View file

@ -28,7 +28,7 @@ namespace Server.Mobiles
public override void OnResponse( Mobile from, string text )
{
if( text.Length > 130 )
if ( text.Length > 130 )
text = text.Substring( 0, 130 );
m_Barkeeper.EndChangeRumor( from, m_RumorIndex, text );
@ -53,7 +53,7 @@ namespace Server.Mobiles
public override void OnResponse( Mobile from, string text )
{
if( text.Length > 130 )
if ( text.Length > 130 )
text = text.Substring( 0, 130 );
m_Barkeeper.EndChangeKeyword( from, m_RumorIndex, text );

2
Scripts/Mobiles/Vendors/SBInfo/SBAnimalTrainer.cs
View file

@ -27,7 +27,7 @@ namespace Server.Mobiles
Add( new AnimalBuyInfo( 1, typeof( PackLlama ), 565, 10, 292, 0 ) );
Add( new AnimalBuyInfo( 1, typeof( Rabbit ), 106, 10, 205, 0 ) );
if( !Core.AOS )
if ( !Core.AOS )
{
Add( new AnimalBuyInfo( 1, typeof( Eagle ), 402, 10, 5, 0 ) );
Add( new AnimalBuyInfo( 1, typeof( BrownBear ), 855, 10, 167, 0 ) );

4
Scripts/Mobiles/Vendors/SBInfo/SBBlacksmith.cs
View file

@ -110,7 +110,7 @@ namespace Server.Mobiles
Add( new GenericBuyInfo( typeof( WarHammer ), 25, 20, 0x1439, 0 ) );
Add( new GenericBuyInfo( typeof( WarMace ), 31, 20, 0x1407, 0 ) );
if( Core.AOS )
if ( Core.AOS )
{
Add( new GenericBuyInfo( typeof( Scepter ), 39, 20, 0x26BC, 0 ) );
Add( new GenericBuyInfo( typeof( BladedStaff ), 40, 20, 0x26BD, 0 ) );
@ -191,7 +191,7 @@ namespace Server.Mobiles
Add( typeof( Bow ), 17 );
Add( typeof( Crossbow ), 23 );
if( Core.AOS )
if ( Core.AOS )
{
Add( typeof( CompositeBow ), 25 );
Add( typeof( RepeatingCrossbow ), 28 );

6
Scripts/Mobiles/Vendors/SBInfo/SBProvisioner.cs
View file

@ -22,7 +22,7 @@ namespace Server.Mobiles
public InternalBuyInfo()
{
#region Salvage Bag
if( Core.ML )
if ( Core.ML )
Add( new GenericBuyInfo( "1079931", typeof( SalvageBag ), 1255, 20, 0xE76, Utility.RandomBlueHue() ) );
#endregion
Add( new GenericBuyInfo( "1060834", typeof( Engines.Plants.PlantBowl ), 2, 20, 0x15FD, 0 ) );
@ -101,7 +101,7 @@ namespace Server.Mobiles
Add( new GenericBuyInfo( typeof( LargeBagBall ), 3, 20, 0x2257, 0 ) );
}
if( !Guild.NewGuildSystem )
if ( !Guild.NewGuildSystem )
Add( new GenericBuyInfo( "1041055", typeof( GuildDeed ), 12450, 20, 0x14F0, 0 ) );
}
}
@ -166,7 +166,7 @@ namespace Server.Mobiles
Add( typeof( GoldEarrings ), 13 );
Add( typeof( SilverEarrings ), 10 );
if( !Guild.NewGuildSystem )
if ( !Guild.NewGuildSystem )
Add( typeof( GuildDeed ), 6225 );
}
}

4
Scripts/Mobiles/Vendors/SBInfo/SBWeaponSmith.cs
View file

@ -33,7 +33,7 @@ namespace Server.Mobiles
Add( new GenericBuyInfo( typeof( WarHammer ), 25, 20, 0x1439, 0 ) );
Add( new GenericBuyInfo( typeof( WarMace ), 31, 20, 0x1407, 0 ) );
if( Core.AOS )
if ( Core.AOS )
{
Add( new GenericBuyInfo( typeof( Scepter ), 39, 20, 0x26BC, 0 ) );
Add( new GenericBuyInfo( typeof( BladedStaff ), 40, 20, 0x26BD, 0 ) );
@ -138,7 +138,7 @@ namespace Server.Mobiles
Add( typeof( Bow ), 17 );
Add( typeof( Crossbow ), 23 );
if( Core.AOS )
if ( Core.AOS )
{
Add( typeof( CompositeBow ), 25 );
Add( typeof( RepeatingCrossbow ), 28 );

4
Scripts/Mobiles/Vendors/SBInfo/Weapons/SBRangedWeapon.cs
View file

@ -22,7 +22,7 @@ namespace Server.Mobiles
{
Add( new GenericBuyInfo( typeof( Crossbow ), 55, 20, 0xF50, 0 ) );
Add( new GenericBuyInfo( typeof( HeavyCrossbow ), 55, 20, 0x13FD, 0 ) );
if( Core.AOS )
if ( Core.AOS )
{
Add( new GenericBuyInfo( typeof( RepeatingCrossbow ), 46, 20, 0x26C3, 0 ) );
Add( new GenericBuyInfo( typeof( CompositeBow ), 45, 20, 0x26C2, 0 ) );
@ -48,7 +48,7 @@ namespace Server.Mobiles
Add( typeof( Bow ), 17 );
Add( typeof( Crossbow ), 25 );
if( Core.AOS )
if ( Core.AOS )
{
Add( typeof( CompositeBow ), 23 );
Add( typeof( RepeatingCrossbow ), 22 );