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

54
Scripts/Engines/Harvest/Core/HarvestTarget.cs
View file

@ -24,53 +24,45 @@ namespace Server.Engines.Harvest
protected override void OnTarget( Mobile from, object targeted )
{
if ( m_System is Mining && targeted is StaticTarget )
if ( m_System is Mining && targeted is StaticTarget target )
{
int itemID = ((StaticTarget)targeted).ItemID;
int itemID = target.ItemID;
// grave
if ( itemID == 0xED3 || itemID == 0xEDF || itemID == 0xEE0 || itemID == 0xEE1 || itemID == 0xEE2 || itemID == 0xEE8 )
{
PlayerMobile player = from as PlayerMobile;
if ( player != null )
if ( from is PlayerMobile player )
{
QuestSystem qs = player.Quest;
if ( qs is WitchApprenticeQuest )
if ( qs is WitchApprenticeQuest && qs.FindObjective( typeof( FindIngredientObjective ) ) is FindIngredientObjective obj && !obj.Completed && obj.Ingredient == Ingredient.Bones )
{
FindIngredientObjective obj = qs.FindObjective( typeof( FindIngredientObjective ) ) as FindIngredientObjective;
player.SendLocalizedMessage( 1055037 ); // You finish your grim work, finding some of the specific bones listed in the Hag's recipe.
obj.Complete();
if ( obj != null && !obj.Completed && obj.Ingredient == Ingredient.Bones )
{
player.SendLocalizedMessage( 1055037 ); // You finish your grim work, finding some of the specific bones listed in the Hag's recipe.
obj.Complete();
return;
}
return;
}
}
}
}
if ( m_System is Lumberjacking && targeted is IChopable )
((IChopable)targeted).OnChop( from );
else if ( m_System is Lumberjacking && targeted is IAxe && m_Tool is BaseAxe )
if ( m_System is Lumberjacking && targeted is IChopable chopable )
chopable.OnChop( from );
else if ( m_System is Lumberjacking && targeted is IAxe obj && m_Tool is BaseAxe axe )
{
IAxe obj = (IAxe)targeted;
Item item = (Item)targeted;
Item item = (Item)obj;
if ( !item.IsChildOf( from.Backpack ) )
from.SendLocalizedMessage( 1062334 ); // This item must be in your backpack to be used.
else if ( obj.Axe( from, (BaseAxe)m_Tool ) )
else if ( obj.Axe( from, axe ) )
from.PlaySound( 0x13E );
}
else if ( m_System is Lumberjacking && targeted is ICarvable )
((ICarvable)targeted).Carve( from, (Item)m_Tool );
else if ( m_System is Lumberjacking && targeted is ICarvable carvable )
carvable.Carve( from, m_Tool );
else if ( m_System is Lumberjacking && FurnitureAttribute.Check( targeted as Item ) )
DestroyFurniture( from, (Item)targeted );
else if ( m_System is Mining && targeted is TreasureMap )
((TreasureMap)targeted).OnBeginDig( from );
else if ( m_System is Mining && targeted is TreasureMap map )
map.OnBeginDig( from );
else
m_System.StartHarvesting( from, m_Tool, targeted );
}
@ -82,7 +74,7 @@ namespace Server.Engines.Harvest
from.SendLocalizedMessage( 500446 ); // That is too far away.
return;
}
else if ( !item.IsChildOf( from.Backpack ) && !item.Movable )
if ( !item.IsChildOf( from.Backpack ) && !item.Movable )
{
from.SendLocalizedMessage( 500462 ); // You can't destroy that while it is here.
return;
@ -91,12 +83,12 @@ namespace Server.Engines.Harvest
from.SendLocalizedMessage( 500461 ); // You destroy the item.
Effects.PlaySound( item.GetWorldLocation(), item.Map, 0x3B3 );
if ( item is Container )
if ( item is Container container )
{
if ( item is TrappableContainer )
(item as TrappableContainer).ExecuteTrap( from );
if ( container is TrappableContainer trappableContainer )
trappableContainer.ExecuteTrap( from );
((Container)item).Destroy();
container.Destroy();
}
else
{
@ -104,4 +96,4 @@ namespace Server.Engines.Harvest
}
}
}
}
}