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/Quests/Core/BaseQuester.cs
View file

@ -21,8 +21,8 @@ namespace Server.Engines.Quests
{
Mobile from = Owner.From;
if ( from.CheckAlive() && from is PlayerMobile && m_Quester.CanTalkTo( (PlayerMobile)from ) )
m_Quester.OnTalk( (PlayerMobile)from, true );
if ( from.CheckAlive() && from is PlayerMobile mobile && m_Quester.CanTalkTo( mobile ) )
m_Quester.OnTalk( mobile, true );
}
}
@ -82,19 +82,17 @@ namespace Server.Engines.Quests
{
base.AddCustomContextEntries( from, list );
if ( from.Alive && from is PlayerMobile && TalkNumber > 0 && CanTalkTo( (PlayerMobile)from ) )
if ( from.Alive && from is PlayerMobile mobile && TalkNumber > 0 && CanTalkTo( mobile ) )
list.Add( new TalkEntry( this ) );
}
public override void OnMovement( Mobile m, Point3D oldLocation )
{
if ( m.Alive && m is PlayerMobile )
if ( m.Alive && m is PlayerMobile pm )
{
PlayerMobile pm = (PlayerMobile)m;
int range = GetAutoTalkRange( pm );
if ( m.Alive && range >= 0 && InRange( m, range ) && !InRange( oldLocation, range ) && CanTalkTo( pm ) )
if ( pm.Alive && range >= 0 && InRange( m, range ) && !InRange( oldLocation, range ) && CanTalkTo( pm ) )
OnTalk( pm, false );
}
}

10
Scripts/Engines/Quests/Core/Items/DynamicTeleporter.cs
View file

@ -24,9 +24,7 @@ namespace Server.Engines.Quests
public override bool OnMoveOver( Mobile m )
{
PlayerMobile pm = m as PlayerMobile;
if ( pm != null )
if ( m is PlayerMobile pm )
{
Point3D loc = Point3D.Zero;
Map map = null;
@ -40,10 +38,8 @@ namespace Server.Engines.Quests
return false;
}
else
{
pm.SendLocalizedMessage( this.NotWorkingMessage );
}
pm.SendLocalizedMessage( this.NotWorkingMessage );
}
return base.OnMoveOver( m );

11
Scripts/Engines/Quests/Core/Items/QuestItem.cs
View file

@ -90,18 +90,15 @@ namespace Server.Engines.Quests
return false;
}
}
else
{
return ret;
}
return ret;
}
public override DeathMoveResult OnParentDeath( Mobile parent )
{
if ( parent is PlayerMobile && !CanDrop( (PlayerMobile)parent ) )
if ( parent is PlayerMobile mobile && !CanDrop( mobile ) )
return DeathMoveResult.MoveToBackpack;
else
return base.OnParentDeath( parent );
return base.OnParentDeath( parent );
}
public override void Serialize( GenericWriter writer )

26
Scripts/Engines/Quests/Core/QuestSystem.cs
View file

@ -403,9 +403,7 @@ namespace Server.Engines.Quests
{
inRestartPeriod = false;
PlayerMobile pm = check as PlayerMobile;
if ( pm == null )
if ( !(check is PlayerMobile pm) )
return false;
if ( pm.HasGump( typeof( QuestOfferGump ) ) )
@ -656,31 +654,19 @@ namespace Server.Engines.Quests
public static ArrayList BuildList( object obj )
{
ArrayList list = new ArrayList();
list.Add( obj );
return list;
return new ArrayList { obj };
}
public void AddHtmlObject( int x, int y, int width, int height, object message, int color, bool back, bool scroll )
{
if ( message is string )
{
string html = (string)message;
AddHtml( x, y, width, height, Color( html, C16232( color ) ), back, scroll );
}
else if ( message is int )
{
int html = (int)message;
if ( message is int html )
AddHtmlLocalized( x, y, width, height, html, C16216( color ), back, scroll );
}
else
AddHtml( x, y, width, height, Color( message.ToString(), C16232( color ) ), back, scroll );
}
public BaseQuestGump( int x, int y ) : base( x, y )
{
}
}
}
}

6
Scripts/Engines/Quests/Core/Regions/CancelQuestRegion.cs
View file

@ -28,9 +28,7 @@ namespace Server.Engines.Quests
if ( m_Quest == null )
return true;
PlayerMobile player = m as PlayerMobile;
if ( player != null && player.Quest != null && player.Quest.GetType() == m_Quest )
if ( m is PlayerMobile player && player.Quest != null && player.Quest.GetType() == m_Quest )
{
if ( !player.HasGump( typeof( QuestCancelGump ) ) )
player.Quest.BeginCancelQuest();
@ -41,4 +39,4 @@ namespace Server.Engines.Quests
return true;
}
}
}
}

6
Scripts/Engines/Quests/Core/Regions/QuestCompleteObjectiveRegion.cs
View file

@ -28,9 +28,7 @@ namespace Server.Engines.Quests
if ( m_Quest != null && m_Objective != null )
{
PlayerMobile player = m as PlayerMobile;
if ( player != null && player.Quest != null && player.Quest.GetType() == m_Quest )
if ( m is PlayerMobile player && player.Quest != null && player.Quest.GetType() == m_Quest )
{
QuestObjective obj = player.Quest.FindObjective( m_Objective );
@ -40,4 +38,4 @@ namespace Server.Engines.Quests
}
}
}
}
}

23
Scripts/Engines/Quests/Core/Regions/QuestNoEntryRegion.cs
View file

@ -36,32 +36,23 @@ namespace Server.Engines.Quests
if ( m.AccessLevel > AccessLevel.Player )
return true;
if ( m is BaseCreature )
{
BaseCreature bc = m as BaseCreature;
if ( !bc.Controlled && !bc.Summoned )
return true;
}
if ( m is BaseCreature bc && !bc.Controlled && !bc.Summoned )
return true;
if ( m_Quest == null )
return true;
PlayerMobile player = m as PlayerMobile;
if ( player != null && player.Quest != null && player.Quest.GetType() == m_Quest
if ( m is PlayerMobile player && player.Quest != null && player.Quest.GetType() == m_Quest
&& ( m_MinObjective == null || player.Quest.FindObjective( m_MinObjective ) != null )
&& ( m_MaxObjective == null || player.Quest.FindObjective( m_MaxObjective ) == null ) )
{
return true;
}
else
{
if ( m_Message != 0 )
m.SendLocalizedMessage( m_Message );
return false;
}
if ( m_Message != 0 )
m.SendLocalizedMessage( m_Message );
return false;
}
}
}

6
Scripts/Engines/Quests/Core/Regions/QuestOfferRegion.cs
View file

@ -24,9 +24,7 @@ namespace Server.Engines.Quests
if ( m_Quest == null )
return;
PlayerMobile player = m as PlayerMobile;
if ( player != null && player.Quest == null && QuestSystem.CanOfferQuest( m, m_Quest ) )
if ( m is PlayerMobile player && player.Quest == null && QuestSystem.CanOfferQuest( m, m_Quest ) )
{
try
{
@ -40,4 +38,4 @@ namespace Server.Engines.Quests
}
}
}
}
}