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

23
Scripts/Engines/Help/HelpGump.cs
View file

@ -74,10 +74,7 @@ namespace Server.Engines.Help
private static bool IsYoung( Mobile m )
{
if ( m is PlayerMobile )
return ((PlayerMobile)m).Young;
return false;
return m is PlayerMobile mobile && mobile.Young;
}
public static bool CheckCombat( Mobile m )
@ -162,21 +159,21 @@ namespace Server.Engines.Help
* Use this option when another player is verbally harassing your character.
* Verbal harassment behaviors include but are not limited to, using bad language, threats etc..
* Before you submit a complaint be sure you understand what constitutes harassment
* <A HREF="http://uo.custhelp.com/cgi-bin/uo.cfg/php/enduser/std_adp.php?p_faqid=40">– what is verbal harassment? -</A>
* <A HREF="http://uo.custhelp.com/cgi-bin/uo.cfg/php/enduser/std_adp.php?p_faqid=40"><EFBFBD> what is verbal harassment? -</A>
* and that you have followed these steps:<BR>
* 1. You have asked the player to stop and they have continued.<BR>
* 2. You have tried to remove yourself from the situation.<BR>
* 3. You have done nothing to instigate or further encourage the harassment.<BR>
* 4. You have added the player to your ignore list.
* <A HREF="http://uo.custhelp.com/cgi-bin/uo.cfg/php/enduser/std_adp.php?p_faqid=138">- How do I ignore a player?</A><BR>
* 5. You have read and understand Origin’s definition of harassment.<BR>
* 5. You have read and understand Origin<EFBFBD>s definition of harassment.<BR>
* 6. Your account information is up to date. (Including a current email address)<BR>
* *If these steps have not been taken, GMs may be unable to take action against the offending player.<BR>
* **A chat log will be review by a GM to assess the validity of this complaint.
* Abuse of this system is a violation of the Rules of Conduct.<BR>
* EXPLOITING<BR>
* Use this option to report someone who may be exploiting or cheating.
* <A HREF="http://uo.custhelp.com/cgi-bin/uo.cfg/php/enduser/std_adp.php?p_faqid=41">– What constitutes an exploit?</a>
* <A HREF="http://uo.custhelp.com/cgi-bin/uo.cfg/php/enduser/std_adp.php?p_faqid=41"><EFBFBD> What constitutes an exploit?</a>
*/
AddButton( 80, 240, 5540, 5541, 8, GumpButtonType.Reply, 0 );
@ -186,14 +183,14 @@ namespace Server.Engines.Help
* Use this option when another player is harassing your character using game mechanics.
* Physical harassment includes but is not limited to luring, Kill Stealing, and any act that causes a players death in Trammel.
* Before you submit a complaint be sure you understand what constitutes harassment
* <A HREF="http://uo.custhelp.com/cgi-bin/uo.cfg/php/enduser/std_adp.php?p_faqid=59"> – what is physical harassment?</A>
* <A HREF="http://uo.custhelp.com/cgi-bin/uo.cfg/php/enduser/std_adp.php?p_faqid=59"> <EFBFBD> what is physical harassment?</A>
* and that you have followed these steps:<BR>
* 1. You have asked the player to stop and they have continued.<BR>
* 2. You have tried to remove yourself from the situation.<BR>
* 3. You have done nothing to instigate or further encourage the harassment.<BR>
* 4. You have added the player to your ignore list.
* <A HREF="http://uo.custhelp.com/cgi-bin/uo.cfg/php/enduser/std_adp.php?p_faqid=138"> - how do I ignore a player?</A><BR>
* 5. You have read and understand Origin’s definition of harassment.<BR>
* 5. You have read and understand Origin<EFBFBD>s definition of harassment.<BR>
* 6. Your account information is up to date. (Including a current email address)<BR>
* *If these steps have not been taken, GMs may be unable to take action against the offending player.<BR>
* **This issue will be reviewed by a GM to assess the validity of this complaint.
@ -239,13 +236,13 @@ namespace Server.Engines.Help
{
from.SendLocalizedMessage( 1061632 ); // You can't do that while carrying the sigil.
}
else if ( from is PlayerMobile && ((PlayerMobile)from).CanUseStuckMenu() && from.Region.CanUseStuckMenu( from ) && !CheckCombat( from ) && !from.Frozen && !from.Criminal && (Core.AOS || from.Kills < 5) )
else if ( from is PlayerMobile mobile && mobile.CanUseStuckMenu() && mobile.Region.CanUseStuckMenu( mobile ) && !CheckCombat( mobile ) && !mobile.Frozen && !mobile.Criminal && (Core.AOS || mobile.Kills < 5) )
{
StuckMenu menu = new StuckMenu( from, from, true );
StuckMenu menu = new StuckMenu( mobile, mobile, true );
menu.BeginClose();
from.SendGump( menu );
mobile.SendGump( menu );
}
else
{
@ -310,4 +307,4 @@ namespace Server.Engines.Help
from.SendGump( new PagePromptGump( from, type ) );
}
}
}
}

13
Scripts/Engines/Help/PageQueue.cs
View file

@ -149,8 +149,7 @@ namespace Server.Engines.Help
m_PageLocation = sender.Location;
m_PageMap = sender.Map;
PlayerMobile pm = sender as PlayerMobile;
if ( pm != null && pm.SpeechLog != null && Array.IndexOf( SpeechLogAttachment, type ) >= 0 )
if ( sender is PlayerMobile pm && pm.SpeechLog != null && Array.IndexOf( SpeechLogAttachment, type ) >= 0 )
m_SpeechLog = new List<SpeechLogEntry>( pm.SpeechLog );
m_Timer = new InternalTimer( this );
@ -183,7 +182,7 @@ namespace Server.Engines.Help
if ( m_Entry.Sender.NetState != null && index != -1 )
{
m_Entry.Sender.SendLocalizedMessage( 1008077, true, (index + 1).ToString() ); // Thank you for paging. Queue status :
m_Entry.Sender.SendLocalizedMessage( 1008077, true, (index + 1).ToString() ); // Thank you for paging. Queue status :
m_Entry.Sender.SendLocalizedMessage( 1008084 ); // You can reference our website at www.uo.com or contact us at support@uo.com. To cancel your page, please select the help button again and select cancel.
if ( m_Entry.Handler != null && m_Entry.Handler.NetState == null ) {
@ -214,9 +213,7 @@ namespace Server.Engines.Help
public static bool CheckAllowedToPage( Mobile from )
{
PlayerMobile pm = from as PlayerMobile;
if ( pm == null )
if ( !(from is PlayerMobile pm) )
return true;
if ( pm.DesignContext != null )
@ -224,7 +221,7 @@ namespace Server.Engines.Help
from.SendLocalizedMessage( 500182 ); // You cannot request help while customizing a house or transferring a character.
return false;
}
else if ( pm.PagingSquelched )
if ( pm.PagingSquelched )
{
from.SendMessage( "You cannot request help, sorry." );
return false;
@ -392,4 +389,4 @@ namespace Server.Engines.Help
Email.AsyncSend( mail );
}
}
}
}

6
Scripts/Engines/Help/SpeechLog.cs
View file

@ -43,9 +43,7 @@ namespace Server.Engines.Help
protected override void OnTarget( Mobile from, object targeted )
{
PlayerMobile pm = targeted as PlayerMobile;
if ( pm == null )
if ( !(targeted is PlayerMobile pm) )
{
from.SendMessage( "Speech logs aren't supported on that target." );
}
@ -145,4 +143,4 @@ namespace Server.Engines.Help
m_Created = DateTime.UtcNow;
}
}
}
}

16
Scripts/Engines/Help/StuckMenu.cs
View file

@ -133,8 +133,8 @@ namespace Server.Menus.Questions
m_Mobile = beheld;
m_MarkUse = markUse;
Closable = false;
Dragable = false;
Closable = false;
Dragable = false;
Disposable = false;
AddBackground( 0, 0, 270, 320, 2600 );
@ -198,14 +198,14 @@ namespace Server.Menus.Questions
private void Teleport( StuckMenuEntry entry )
{
if ( m_MarkUse )
if ( m_MarkUse )
{
m_Mobile.SendLocalizedMessage( 1010589 ); // You will be teleported within the next two minutes.
new TeleportTimer( m_Mobile, entry, TimeSpan.FromSeconds( 10.0 + (Utility.RandomDouble() * 110.0) ) ).Start();
if (m_Mobile is PlayerMobile)
((PlayerMobile)m_Mobile).UsedStuckMenu();
if (m_Mobile is PlayerMobile mobile)
mobile.UsedStuckMenu();
}
else
{
@ -237,8 +237,8 @@ namespace Server.Menus.Questions
{
m_Mobile.Frozen = true;
}
}
}
}
}
private class TeleportTimer : Timer
{
@ -289,4 +289,4 @@ namespace Server.Menus.Questions
}
}
}
}
}