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

Formatting FIxes (#58)

Browse source
This commit is contained in:
Kamron Batman 2019-10-04 23:08:13 -07:00 • committed by GitHub
parent 57fb9fb525
commit 096d39609e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1318 changed files with 11633 additions and 22129 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Projects/Scripts/Engines/Quests/Dark Tides/Conversations.cs
View file

@ -127,10 +127,7 @@ namespace Server.Engines.Quests.Necro
{
private bool m_FromMardoth;
public LostCallingScrollConversation(bool fromMardoth)
{
m_FromMardoth = fromMardoth;
}
public LostCallingScrollConversation(bool fromMardoth) => m_FromMardoth = fromMardoth;
// Serialization
public LostCallingScrollConversation()

5
Projects/Scripts/Engines/Quests/Dark Tides/Items/CrystalCaveBarrier.cs
View file

@ -5,10 +5,7 @@ namespace Server.Engines.Quests.Necro
public class CrystalCaveBarrier : Item
{
[Constructible]
public CrystalCaveBarrier() : base(0x3967)
{
Movable = false;
}
public CrystalCaveBarrier() : base(0x3967) => Movable = false;
public CrystalCaveBarrier(Serial serial) : base(serial)
{

5
Projects/Scripts/Engines/Quests/Dark Tides/Items/DarkTidesHorn.cs
View file

@ -15,10 +15,7 @@ namespace Server.Engines.Quests.Necro
{
}
public override bool ValidateUse(Mobile from)
{
return from is PlayerMobile pm && pm.Quest is DarkTidesQuest;
}
public override bool ValidateUse(Mobile from) => from is PlayerMobile pm && pm.Quest is DarkTidesQuest;
public override void Serialize(GenericWriter writer)
{

10
Projects/Scripts/Engines/Quests/Dark Tides/Items/KronusScroll.cs
View file

@ -23,15 +23,7 @@ namespace Server.Engines.Quests.Necro
public override int LabelNumber => 1060149; // Calling of Kronus
public override bool CanDrop(PlayerMobile player)
{
return !(player.Quest is DarkTidesQuest);
/*return !( qs.IsObjectiveInProgress( typeof( FindCallingScrollObjective ) )
|| qs.IsObjectiveInProgress( typeof( FindMardothAboutKronusObjective ) )
|| qs.IsObjectiveInProgress( typeof( FindWellOfTearsObjective ) )
|| qs.IsObjectiveInProgress( typeof( UseCallingScrollObjective ) ) );*/
}
public override bool CanDrop(PlayerMobile player) => !(player.Quest is DarkTidesQuest);
public override void OnDoubleClick(Mobile from)
{

12
Projects/Scripts/Engines/Quests/Dark Tides/Items/ScrollOfAbraxus.cs
View file

@ -6,10 +6,7 @@ namespace Server.Engines.Quests.Necro
public class ScrollOfAbraxus : QuestItem
{
[Constructible]
public ScrollOfAbraxus() : base(0x227B)
{
Weight = 1.0;
}
public ScrollOfAbraxus() : base(0x227B) => Weight = 1.0;
public ScrollOfAbraxus(Serial serial) : base(serial)
{
@ -17,12 +14,7 @@ namespace Server.Engines.Quests.Necro
public override int LabelNumber => 1028827; // Scroll of Abraxus
public override bool CanDrop(PlayerMobile player)
{
return !(player.Quest is DarkTidesQuest);
//return !( qs.IsObjectiveInProgress( typeof( RetrieveAbraxusScrollObjective ) ) || qs.IsObjectiveInProgress( typeof( ReadAbraxusScrollObjective ) ) );
}
public override bool CanDrop(PlayerMobile player) => !(player.Quest is DarkTidesQuest);
public override void OnAdded(IEntity parent)
{

5
Projects/Scripts/Engines/Quests/Dark Tides/Mobiles/Horus.cs
View file

@ -44,10 +44,7 @@ namespace Server.Engines.Quests.Necro
Utility.AssignRandomFacialHair(this, false);
}
public override int GetAutoTalkRange(PlayerMobile m)
{
return 3;
}
public override int GetAutoTalkRange(PlayerMobile m) => 3;
public override bool CanTalkTo(PlayerMobile to)
{

5
Projects/Scripts/Engines/Quests/Dark Tides/Mobiles/Maabus.cs
View file

@ -19,10 +19,7 @@ namespace Server.Engines.Quests.Necro
Body = 0x94;
}
public override bool CanTalkTo(PlayerMobile to)
{
return false;
}
public override bool CanTalkTo(PlayerMobile to) => false;
public override void OnTalk(PlayerMobile player, bool contextMenu)
{

5
Projects/Scripts/Engines/Quests/Dark Tides/Mobiles/Mardoth.cs
View file

@ -80,10 +80,7 @@ namespace Server.Engines.Quests.Necro
AddItem(gorget);
}
public override int GetAutoTalkRange(PlayerMobile m)
{
return 3;
}
public override int GetAutoTalkRange(PlayerMobile m) => 3;
public override bool CanTalkTo(PlayerMobile to)
{

15
Projects/Scripts/Engines/Quests/Dark Tides/Objectives.cs
View file

@ -190,15 +190,9 @@ namespace Server.Engines.Quests.Necro
public override object Message => 1060119;
public override bool IgnoreYoungProtection(Mobile from)
{
return !m_SkitteringHoppersDisposed && from is SkitteringHopper;
}
public override bool IgnoreYoungProtection(Mobile from) => !m_SkitteringHoppersDisposed && from is SkitteringHopper;
public override bool GetKillEvent(BaseCreature creature, Container corpse)
{
return !m_SkitteringHoppersDisposed;
}
public override bool GetKillEvent(BaseCreature creature, Container corpse) => !m_SkitteringHoppersDisposed;
public override void OnKill(BaseCreature creature, Container corpse)
{
@ -307,10 +301,7 @@ namespace Server.Engines.Quests.Necro
{
private bool m_Victory;
public FindMardothEndObjective(bool victory)
{
m_Victory = victory;
}
public FindMardothEndObjective(bool victory) => m_Victory = victory;
// Serialization
public FindMardothEndObjective()