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

More cast conversion fixes

Browse source
This commit is contained in:
Kamron Batman 2018-09-06 18:07:42 -07:00
parent 3f45bd57b9
commit aba9452161
46 changed files with 359 additions and 506 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Scripts/Items/Resources/Blacksmithing/Ore.cs
View file

@ -166,7 +166,7 @@ namespace Server.Items
private bool IsForge( object obj )
{
if ( Core.ML && obj is Mobile && ((Mobile)obj).IsDeadBondedPet )
if ( Core.ML && obj is Mobile mobile && mobile.IsDeadBondedPet )
return false;
if ( obj.GetType().IsDefined( typeof( ForgeAttribute ), false ) )
@ -174,10 +174,10 @@ namespace Server.Items
int itemID = 0;
if ( obj is Item )
itemID = ((Item)obj).ItemID;
else if ( obj is StaticTarget )
itemID = ((StaticTarget)obj).ItemID;
if ( obj is Item item )
itemID = item.ItemID;
else if ( obj is StaticTarget target )
itemID = target.ItemID;
return ( itemID == 4017 || (itemID >= 6522 && itemID <= 6569) );
}
@ -194,21 +194,19 @@ namespace Server.Items
}
#region Combine Ore
if ( targeted is BaseOre )
if ( targeted is BaseOre ore )
{
BaseOre ore = (BaseOre)targeted;
if ( !ore.Movable )
{
return;
}
else if ( m_Ore == ore )
if ( m_Ore == ore )
{
from.SendLocalizedMessage( 501972 ); // Select another pile or ore with which to combine this.
from.Target = new InternalTarget( ore );
return;
}
else if ( ore.Resource != m_Ore.Resource )
if ( ore.Resource != m_Ore.Resource )
{
from.SendLocalizedMessage( 501979 ); // You cannot combine ores of different metals.
return;
@ -259,7 +257,7 @@ namespace Server.Items
from.SendLocalizedMessage( 1062844 ); // There is too much ore to combine.
return;
}
else if ( ore.RootParent is Mobile && ( plusWeight + ((Mobile)ore.RootParent).Backpack.TotalWeight ) > ((Mobile)ore.RootParent).Backpack.MaxWeight )
if ( ore.RootParent is Mobile mobile && ( plusWeight + mobile.Backpack.TotalWeight ) > mobile.Backpack.MaxWeight )
{
from.SendLocalizedMessage( 501978 ); // The weight is too great to combine in a container.
return;

12
Scripts/Items/Resources/Tailor/Cotton.cs
View file

@ -59,7 +59,7 @@ namespace Server.Items
}
}
public static void OnSpun( ISpinningWheel wheel, Mobile from, int hue )
public virtual void OnSpun( ISpinningWheel wheel, Mobile from, int hue )
{
Item item = new SpoolOfThread( 6 );
item.Hue = hue;
@ -84,13 +84,11 @@ namespace Server.Items
ISpinningWheel wheel = targeted as ISpinningWheel;
if ( wheel == null && targeted is AddonComponent )
wheel = ((AddonComponent)targeted).Addon as ISpinningWheel;
if ( wheel == null && targeted is AddonComponent component )
wheel = component.Addon as ISpinningWheel;
if ( wheel is Item )
{
Item item = (Item)wheel;
if ( !m_Cotton.IsChildOf( from.Backpack ) )
{
from.SendLocalizedMessage( 1042001 ); // That must be in your pack for you to use it.
@ -102,7 +100,7 @@ namespace Server.Items
else
{
m_Cotton.Consume();
wheel.BeginSpin( new SpinCallback( Cotton.OnSpun ), from, m_Cotton.Hue );
wheel.BeginSpin( m_Cotton.OnSpun, from, m_Cotton.Hue );
}
}
else
@ -112,4 +110,4 @@ namespace Server.Items
}
}
}
}
}

12
Scripts/Items/Resources/Tailor/Flax.cs
View file

@ -49,7 +49,7 @@ namespace Server.Items
}
}
public static void OnSpun( ISpinningWheel wheel, Mobile from, int hue )
public virtual void OnSpun( ISpinningWheel wheel, Mobile from, int hue )
{
Item item = new SpoolOfThread( 6 );
item.Hue = hue;
@ -74,13 +74,11 @@ namespace Server.Items
ISpinningWheel wheel = targeted as ISpinningWheel;
if ( wheel == null && targeted is AddonComponent )
wheel = ((AddonComponent)targeted).Addon as ISpinningWheel;
if ( wheel == null && targeted is AddonComponent component )
wheel = component.Addon as ISpinningWheel;
if ( wheel is Item )
{
Item item = (Item)wheel;
if ( !m_Flax.IsChildOf( from.Backpack ) )
{
from.SendLocalizedMessage( 1042001 ); // That must be in your pack for you to use it.
@ -92,7 +90,7 @@ namespace Server.Items
else
{
m_Flax.Consume();
wheel.BeginSpin( new SpinCallback( Flax.OnSpun ), from, m_Flax.Hue );
wheel.BeginSpin( m_Flax.OnSpun, from, m_Flax.Hue );
}
}
else
@ -102,4 +100,4 @@ namespace Server.Items
}
}
}
}
}

19
Scripts/Items/Resources/Tailor/Wool.cs
View file

@ -59,7 +59,7 @@ namespace Server.Items
}
}
public static void OnSpun( ISpinningWheel wheel, Mobile from, int hue )
public virtual void OnSpun( ISpinningWheel wheel, Mobile from, int hue )
{
Item item = new DarkYarn( 3 );
item.Hue = hue;
@ -84,13 +84,11 @@ namespace Server.Items
ISpinningWheel wheel = targeted as ISpinningWheel;
if ( wheel == null && targeted is AddonComponent )
wheel = ((AddonComponent)targeted).Addon as ISpinningWheel;
if ( wheel == null && targeted is AddonComponent component )
wheel = component.Addon as ISpinningWheel;
if ( wheel is Item )
{
Item item = (Item)wheel;
if ( !m_Wool.IsChildOf( from.Backpack ) )
{
from.SendLocalizedMessage( 1042001 ); // That must be in your pack for you to use it.
@ -102,8 +100,7 @@ namespace Server.Items
else
{
m_Wool.Consume();
if ( m_Wool is TaintedWool ) wheel.BeginSpin( new SpinCallback( TaintedWool.OnSpun ), from, m_Wool.Hue );
else wheel.BeginSpin( new SpinCallback( Wool.OnSpun ), from, m_Wool.Hue );
wheel.BeginSpin( m_Wool.OnSpun, from, m_Wool.Hue );
}
}
else
@ -119,7 +116,7 @@ namespace Server.Items
public TaintedWool() : this( 1 )
{
}
[Constructible]
public TaintedWool( int amount ) : base( 0x101F )
{
@ -145,8 +142,8 @@ namespace Server.Items
int version = reader.ReadInt();
}
new public static void OnSpun( ISpinningWheel wheel, Mobile from, int hue )
public override void OnSpun( ISpinningWheel wheel, Mobile from, int hue )
{
Item item = new DarkYarn( 1 );
item.Hue = hue;
@ -155,4 +152,4 @@ namespace Server.Items
from.SendLocalizedMessage( 1010574 ); // You put a ball of yarn in your backpack.
}
}
}
}

10
Scripts/Items/Resources/Tailor/YarnsAndThreads.cs
View file

@ -74,8 +74,8 @@ namespace Server.Items
ILoom loom = targeted as ILoom;
if ( loom == null && targeted is AddonComponent )
loom = ((AddonComponent)targeted).Addon as ILoom;
if ( loom == null && targeted is AddonComponent component )
loom = component.Addon as ILoom;
if ( loom != null )
{
@ -87,8 +87,8 @@ namespace Server.Items
{
m_Material.Consume();
if ( targeted is Item )
((Item)targeted).SendLocalizedMessageTo( from, 1010001 + loom.Phase++ );
if ( targeted is Item item )
item.SendLocalizedMessageTo( from, 1010001 + loom.Phase++ );
}
else
{
@ -232,4 +232,4 @@ namespace Server.Items
int version = reader.ReadInt();
}
}
}
}