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

Upgrades code style - First batch (#22)

Browse source
This commit is contained in:
Kamron Batman 2018-08-14 06:16:50 +08:00 • committed by GitHub
parent 8ee42c8ea2
commit 632e8b4757
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1834 changed files with 10245 additions and 10437 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Scripts/Engines/Quests/Uzeraan Turmoil/Conversations.cs
View file

@ -210,7 +210,7 @@ namespace Server.Engines.Quests.Haven
new QuestItemInfo( 1023676, 0xE68 ) // glowing rune
};
public override QuestItemInfo[] Info{ get{ return m_Info; } }
public override QuestItemInfo[] Info => m_Info;
public UzeraanFirstTaskConversation()
{
@ -300,7 +300,7 @@ namespace Server.Engines.Quests.Haven
new QuestItemInfo( 1048032, 0xE76 ) // a bag
};
public override QuestItemInfo[] Info{ get{ return m_Info; } }
public override QuestItemInfo[] Info => m_Info;
public UzeraanReportConversation()
{
@ -376,7 +376,7 @@ namespace Server.Engines.Quests.Haven
new QuestItemInfo( 1023637, 0xE34 ) // scroll
};
public override QuestItemInfo[] Info{ get{ return m_Info; } }
public override QuestItemInfo[] Info => m_Info;
public SchmendrickConversation()
{
@ -438,7 +438,7 @@ namespace Server.Engines.Quests.Haven
new QuestItemInfo( 1049117, 0xFC4 ) // Horn of Retreat
};
public override QuestItemInfo[] Info{ get{ return m_Info; } }
public override QuestItemInfo[] Info => m_Info;
public UzeraanScrollOfPowerConversation()
{
@ -546,7 +546,7 @@ namespace Server.Engines.Quests.Haven
new QuestItemInfo( 1022581, 0xA22 ), // lantern
};
public override QuestItemInfo[] Info{ get{ return m_Info; } }
public override QuestItemInfo[] Info => m_Info;
public UzeraanFertileDirtConversation()
{

6
Scripts/Engines/Quests/Uzeraan Turmoil/Items/Cannon.cs
View file

@ -19,7 +19,7 @@ namespace Server.Engines.Quests.Haven
private MilitiaCanoneer m_Canoneer;
[CommandProperty( AccessLevel.GameMaster )]
public CannonDirection CannonDirection { get { return m_CannonDirection; } }
public CannonDirection CannonDirection => m_CannonDirection;
[CommandProperty( AccessLevel.GameMaster )]
public MilitiaCanoneer Canoneer { get { return m_Canoneer; } set { m_Canoneer = value; } }
@ -95,7 +95,7 @@ namespace Server.Engines.Quests.Haven
target.Damage( 9999, from );
}
public override bool HandlesOnMovement { get { return m_Canoneer != null && !m_Canoneer.Deleted && m_Canoneer.Active; } }
public override bool HandlesOnMovement => m_Canoneer != null && !m_Canoneer.Deleted && m_Canoneer.Active;
public override void OnMovement( Mobile m, Point3D oldLocation )
{
@ -178,4 +178,4 @@ namespace Server.Engines.Quests.Haven
int version = reader.ReadInt();
}
}
}
}

4
Scripts/Engines/Quests/Uzeraan Turmoil/Items/SchmendrickScrollOfPower.cs
View file

@ -7,7 +7,7 @@ namespace Server.Engines.Quests.Haven
{
public class SchmendrickScrollOfPower : QuestItem
{
public override int LabelNumber { get { return 1049118; } } // a scroll with ancient markings
public override int LabelNumber => 1049118; // a scroll with ancient markings
public SchmendrickScrollOfPower() : base( 0xE34 )
{
@ -43,4 +43,4 @@ namespace Server.Engines.Quests.Haven
int version = reader.ReadInt();
}
}
}
}

6
Scripts/Engines/Quests/Uzeraan Turmoil/Mobiles/Dryad.cs
View file

@ -12,7 +12,7 @@ namespace Server.Engines.Quests.Haven
{
public override bool IsActiveVendor => true;
public override bool DisallowAllMoves => false;
public override bool ClickTitle{ get { return true; } }
public override bool ClickTitle => true;
public override bool CanTeach => true;
public override string DefaultName => "Anwin Brenna";
@ -168,8 +168,8 @@ namespace Server.Engines.Quests.Haven
{
}
public override IShopSellInfo SellInfo { get { return m_SellInfo; } }
public override List<GenericBuyInfo> BuyInfo { get { return m_BuyInfo; } }
public override IShopSellInfo SellInfo => m_SellInfo;
public override List<GenericBuyInfo> BuyInfo => m_BuyInfo;
public class InternalBuyInfo : List<GenericBuyInfo>
{

24
Scripts/Engines/Quests/Uzeraan Turmoil/Objectives.cs
View file

@ -38,7 +38,7 @@ namespace Server.Engines.Quests.Haven
{
/* Go to the shrine inside of Uzeraan's Mansion, near the front doors and
* <a href = "?ForceTopic109">tithe</a> at least 500 gold.<BR><BR>
*
*
* Return to Uzeraan when you are done.
*/
return 1060386;
@ -103,7 +103,7 @@ namespace Server.Engines.Quests.Haven
{
private KillHordeMinionsStep m_Step;
public KillHordeMinionsStep Step { get { return m_Step; } }
public KillHordeMinionsStep Step => m_Step;
public override object Message
{
@ -114,7 +114,7 @@ namespace Server.Engines.Quests.Haven
case KillHordeMinionsStep.First:
/* Find the mountain pass beyond the house which lies at the
* end of the runic road.<BR><BR>
*
*
* Assist the city Militia by slaying <I>Horde Minions</I>
*/
return 1049089;
@ -267,7 +267,7 @@ namespace Server.Engines.Quests.Haven
{
/* It's no use... The <I>Horde Minions</I> are too many.
* They are appearing out of nowhere.<BR><BR>
*
*
* Return to Uzeraan and report your findings.
*/
return 1049091;
@ -292,7 +292,7 @@ namespace Server.Engines.Quests.Haven
{
/* Prepare for battle and step onto the teleporter,
* located against the wall in the main hall of Uzeraan's mansion.<BR><BR>
*
*
* Find Schmendrick within the mines.
*/
return 1049120;
@ -348,7 +348,7 @@ namespace Server.Engines.Quests.Haven
get
{
/* You have obtained the scroll of power! Find your way out of the cave.<BR><BR>
*
*
* Hand the scroll to Uzeraan (drag and drop) once you arrive in his mansion.
*/
return 1049324;
@ -373,7 +373,7 @@ namespace Server.Engines.Quests.Haven
{
/* Find the Dryad in the woods of Haven and get a patch
* of fertile dirt from her.<BR><BR>
*
*
* Use Uzeraan's teleporter to get there if necessary.
*/
return 1049358;
@ -397,7 +397,7 @@ namespace Server.Engines.Quests.Haven
get
{
/* You have acquired the <I>Fertile Dirt</I>!<BR><BR>
*
*
* Return to the mansion (<a href = "?ForceTopic13">North-East</a>
* of the Dryad's Grove) and hand it to Uzeraan.
*/
@ -422,7 +422,7 @@ namespace Server.Engines.Quests.Haven
get
{
/* Bring back a vial of blood.<BR><BR>
*
*
* Follow the road leading north from the mansion and walk into the hut
* to find the chest that contains the vial
*/
@ -486,7 +486,7 @@ namespace Server.Engines.Quests.Haven
get
{
/* You have the vial of blood!<BR><BR>
*
*
* Return to Uzeraan's mansion and hand him the vial.
*/
return 1049332;
@ -528,7 +528,7 @@ namespace Server.Engines.Quests.Haven
else
{
/* Use Uzeraan's teleporter to get to the Haunted graveyard.<BR><BR>
*
*
* Slay the undead until you find a <I>Daemon Bone</I>.
*/
return 1049362;
@ -635,4 +635,4 @@ namespace Server.Engines.Quests.Haven
System.AddConversation( new BankerConversation() );
}
}
}
}

4
Scripts/Engines/Quests/Uzeraan Turmoil/UzeraanTurmoilQuest.cs
View file

@ -44,7 +44,7 @@ namespace Server.Engines.Quests.Haven
typeof( Haven.FewReagentsConversation )
};
public override Type[] TypeReferenceTable{ get{ return m_TypeReferenceTable; } }
public override Type[] TypeReferenceTable => m_TypeReferenceTable;
public override object Name
{
@ -82,7 +82,7 @@ namespace Server.Engines.Quests.Haven
}
}
public override TimeSpan RestartDelay{ get{ return TimeSpan.MaxValue; } }
public override TimeSpan RestartDelay => TimeSpan.MaxValue;
public override bool IsTutorial => true;
public override int Picture