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

Fixes more casting and other formatting issues.

Browse source
This commit is contained in:
Kamron Batman 2018-08-19 10:14:40 +08:00
parent 03dd5f1926
commit 61937d9c97
67 changed files with 325 additions and 570 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Scripts/Engines/MLQuests/Objectives/BaseObjective.cs
View file

@ -185,8 +185,8 @@ namespace Server.Engines.MLQuests.Objectives
{
bool completed = reader.ReadBool();
if ( objInstance is EscortObjectiveInstance )
( (EscortObjectiveInstance)objInstance ).HasCompleted = completed;
if ( objInstance is EscortObjectiveInstance instance )
instance.HasCompleted = completed;
break;
}
@ -194,8 +194,8 @@ namespace Server.Engines.MLQuests.Objectives
{
int slain = reader.ReadInt();
if ( objInstance is KillObjectiveInstance )
( (KillObjectiveInstance)objInstance ).Slain = slain;
if ( objInstance is KillObjectiveInstance instance )
instance.Slain = slain;
break;
}
@ -203,8 +203,8 @@ namespace Server.Engines.MLQuests.Objectives
{
bool completed = reader.ReadBool();
if ( objInstance is DeliverObjectiveInstance )
( (DeliverObjectiveInstance)objInstance ).HasCompleted = completed;
if ( objInstance is DeliverObjectiveInstance instance )
instance.HasCompleted = completed;
break;
}

4
Scripts/Engines/MLQuests/Objectives/DeliverObjective.cs
View file

@ -76,9 +76,7 @@ namespace Server.Engines.MLQuests.Objectives
for ( int i = 0; i < m_Amount; ++i )
{
Item item = Activator.CreateInstance( m_Delivery ) as Item;
if ( item == null )
if ( !(Activator.CreateInstance( m_Delivery ) is Item item) )
continue;
delivery.Add( item );

7
Scripts/Engines/MLQuests/Objectives/EscortObjective.cs
View file

@ -31,7 +31,7 @@ namespace Server.Engines.MLQuests.Objectives
public override bool CanOffer( IQuestGiver quester, PlayerMobile pm, bool message )
{
if ( ( quester is BaseCreature && ( (BaseCreature)quester ).Controlled ) || ( quester is BaseEscortable && ( (BaseEscortable)quester ).IsBeingDeleted ) )
if ( ( quester is BaseCreature creature && creature.Controlled ) || ( quester is BaseEscortable escortable && escortable.IsBeingDeleted ) )
return false;
MLQuestContext context = MLQuestSystem.GetContext( pm );
@ -145,7 +145,7 @@ namespace Server.Engines.MLQuests.Objectives
if ( pm.Young || m_Escort.Region.IsPartOf( "Haven Island" ) )
Titles.AwardFame( pm, 10, true );
else
VirtueHelper.AwardVirtue( pm, VirtueName.Compassion, ( m_Escort is BaseEscortable && ( (BaseEscortable)m_Escort ).IsPrisoner ) ? 400 : 200 );
VirtueHelper.AwardVirtue( pm, VirtueName.Compassion, ( m_Escort is BaseEscortable escortable && escortable.IsPrisoner ) ? 400 : 200 );
EndFollow( m_Escort );
StopTimer();
@ -203,8 +203,7 @@ namespace Server.Engines.MLQuests.Objectives
quester.SetControlMaster( null );
if ( quester is BaseEscortable )
( (BaseEscortable)quester ).BeginDelete();
(quester as BaseEscortable)?.BeginDelete();
}
public override void OnQuestAccepted()