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

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

@ -346,10 +346,7 @@ namespace Server.Engines.Quests.Haven
{
private bool m_FromUzeraan;
public LostScrollOfPowerConversation(bool fromUzeraan)
{
m_FromUzeraan = fromUzeraan;
}
public LostScrollOfPowerConversation(bool fromUzeraan) => m_FromUzeraan = fromUzeraan;
public LostScrollOfPowerConversation()
{
@ -395,10 +392,7 @@ namespace Server.Engines.Quests.Haven
{
private bool m_FromUzeraan;
public LostFertileDirtConversation(bool fromUzeraan)
{
m_FromUzeraan = fromUzeraan;
}
public LostFertileDirtConversation(bool fromUzeraan) => m_FromUzeraan = fromUzeraan;
public LostFertileDirtConversation()
{

5
Projects/Scripts/Engines/Quests/Uzeraan Turmoil/Items/DaemonBloodChest.cs
View file

@ -6,10 +6,7 @@ namespace Server.Engines.Quests.Haven
public class DaemonBloodChest : MetalChest
{
[Constructible]
public DaemonBloodChest()
{
Movable = false;
}
public DaemonBloodChest() => Movable = false;
public DaemonBloodChest(Serial serial) : base(serial)
{

12
Projects/Scripts/Engines/Quests/Uzeraan Turmoil/Items/QuestDaemonBlood.cs
View file

@ -5,21 +5,13 @@ namespace Server.Engines.Quests.Haven
public class QuestDaemonBlood : QuestItem
{
[Constructible]
public QuestDaemonBlood() : base(0xF7D)
{
Weight = 1.0;
}
public QuestDaemonBlood() : base(0xF7D) => Weight = 1.0;
public QuestDaemonBlood(Serial serial) : base(serial)
{
}
public override bool CanDrop(PlayerMobile player)
{
return !(player.Quest is UzeraanTurmoilQuest);
/*return !qs.IsObjectiveInProgress( typeof( ReturnDaemonBloodObjective ) );*/
}
public override bool CanDrop(PlayerMobile player) => !(player.Quest is UzeraanTurmoilQuest);
public override void Serialize(GenericWriter writer)
{

12
Projects/Scripts/Engines/Quests/Uzeraan Turmoil/Items/QuestDaemonBone.cs
View file

@ -5,21 +5,13 @@ namespace Server.Engines.Quests.Haven
public class QuestDaemonBone : QuestItem
{
[Constructible]
public QuestDaemonBone() : base(0xF80)
{
Weight = 1.0;
}
public QuestDaemonBone() : base(0xF80) => Weight = 1.0;
public QuestDaemonBone(Serial serial) : base(serial)
{
}
public override bool CanDrop(PlayerMobile player)
{
return !(player.Quest is UzeraanTurmoilQuest);
//return !qs.IsObjectiveInProgress( typeof( ReturnDaemonBoneObjective ) );
}
public override bool CanDrop(PlayerMobile player) => !(player.Quest is UzeraanTurmoilQuest);
public override void Serialize(GenericWriter writer)
{

12
Projects/Scripts/Engines/Quests/Uzeraan Turmoil/Items/QuestFertileDirt.cs
View file

@ -5,21 +5,13 @@ namespace Server.Engines.Quests.Haven
public class QuestFertileDirt : QuestItem
{
[Constructible]
public QuestFertileDirt() : base(0xF81)
{
Weight = 1.0;
}
public QuestFertileDirt() : base(0xF81) => Weight = 1.0;
public QuestFertileDirt(Serial serial) : base(serial)
{
}
public override bool CanDrop(PlayerMobile player)
{
return !(player.Quest is UzeraanTurmoilQuest);
//return !qs.IsObjectiveInProgress( typeof( ReturnFertileDirtObjective ) );
}
public override bool CanDrop(PlayerMobile player) => !(player.Quest is UzeraanTurmoilQuest);
public override void Serialize(GenericWriter writer)
{

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

@ -16,11 +16,9 @@ namespace Server.Engines.Quests.Haven
public override int LabelNumber => 1049118; // a scroll with ancient markings
public override bool CanDrop(PlayerMobile player)
{
return !(player.Quest is UzeraanTurmoilQuest qs &&
qs.IsObjectiveInProgress(typeof(ReturnScrollOfPowerObjective)));
}
public override bool CanDrop(PlayerMobile player) =>
!(player.Quest is UzeraanTurmoilQuest qs &&
qs.IsObjectiveInProgress(typeof(ReturnScrollOfPowerObjective)));
public override void Serialize(GenericWriter writer)
{

5
Projects/Scripts/Engines/Quests/Uzeraan Turmoil/Items/UzeraanTurmoilHorn.cs
View file

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

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

@ -56,15 +56,9 @@ namespace Server.Engines.Quests.Haven
m_SBInfos.Add(new SBDryad());
}
public override int GetAutoTalkRange(PlayerMobile pm)
{
return 4;
}
public override int GetAutoTalkRange(PlayerMobile pm) => 4;
public override bool CanTalkTo(PlayerMobile to)
{
return to.Quest is UzeraanTurmoilQuest qs && qs.FindObjective<FindDryadObjective>() != null;
}
public override bool CanTalkTo(PlayerMobile to) => to.Quest is UzeraanTurmoilQuest qs && qs.FindObjective<FindDryadObjective>() != null;
public override void OnTalk(PlayerMobile player, bool contextMenu)
{

10
Projects/Scripts/Engines/Quests/Uzeraan Turmoil/Mobiles/MansionGuard.cs
View file

@ -40,15 +40,9 @@ namespace Server.Engines.Quests.Haven
AddItem(weapon);
}
public override int GetAutoTalkRange(PlayerMobile pm)
{
return 3;
}
public override int GetAutoTalkRange(PlayerMobile pm) => 3;
public override bool CanTalkTo(PlayerMobile to)
{
return to.Quest == null && QuestSystem.CanOfferQuest(to, typeof(UzeraanTurmoilQuest));
}
public override bool CanTalkTo(PlayerMobile to) => to.Quest == null && QuestSystem.CanOfferQuest(to, typeof(UzeraanTurmoilQuest));
public override void OnTalk(PlayerMobile player, bool contextMenu)
{

10
Projects/Scripts/Engines/Quests/Uzeraan Turmoil/Mobiles/MilitiaCanoneer.cs
View file

@ -6,10 +6,7 @@ namespace Server.Engines.Quests.Haven
public class MilitiaCanoneer : BaseQuester
{
[Constructible]
public MilitiaCanoneer() : base("the Militia Canoneer")
{
Active = true;
}
public MilitiaCanoneer() : base("the Militia Canoneer") => Active = true;
public MilitiaCanoneer(Serial serial) : base(serial)
{
@ -45,10 +42,7 @@ namespace Server.Engines.Quests.Haven
torch.Ignite();
}
public override bool CanTalkTo(PlayerMobile to)
{
return false;
}
public override bool CanTalkTo(PlayerMobile to) => false;
public override void OnTalk(PlayerMobile player, bool contextMenu)
{

10
Projects/Scripts/Engines/Quests/Uzeraan Turmoil/Mobiles/Schmendrick.cs
View file

@ -48,15 +48,9 @@ namespace Server.Engines.Quests.Haven
AddItem(pack);
}
public override int GetAutoTalkRange(PlayerMobile pm)
{
return 7;
}
public override int GetAutoTalkRange(PlayerMobile pm) => 7;
public override bool CanTalkTo(PlayerMobile to)
{
return to.Quest is UzeraanTurmoilQuest qs && qs.FindObjective<FindSchmendrickObjective>() != null;
}
public override bool CanTalkTo(PlayerMobile to) => to.Quest is UzeraanTurmoilQuest qs && qs.FindObjective<FindSchmendrickObjective>() != null;
public override void OnTalk(PlayerMobile player, bool contextMenu)
{

10
Projects/Scripts/Engines/Quests/Uzeraan Turmoil/Mobiles/Uzeraan.cs
View file

@ -44,15 +44,9 @@ namespace Server.Engines.Quests.Haven
AddItem(staff);
}
public override int GetAutoTalkRange(PlayerMobile pm)
{
return 3;
}
public override int GetAutoTalkRange(PlayerMobile pm) => 3;
public override bool CanTalkTo(PlayerMobile to)
{
return to.Quest is UzeraanTurmoilQuest;
}
public override bool CanTalkTo(PlayerMobile to) => to.Quest is UzeraanTurmoilQuest;
public override void OnTalk(PlayerMobile player, bool contextMenu)
{

10
Projects/Scripts/Engines/Quests/Uzeraan Turmoil/Objectives.cs
View file

@ -21,10 +21,7 @@ namespace Server.Engines.Quests.Haven
{
private int m_OldTithingPoints;
public TitheGoldObjective()
{
m_OldTithingPoints = -1;
}
public TitheGoldObjective() => m_OldTithingPoints = -1;
public override object Message => 1060386;
@ -71,10 +68,7 @@ namespace Server.Engines.Quests.Haven
{
}
public KillHordeMinionsObjective(KillHordeMinionsStep step)
{
Step = step;
}
public KillHordeMinionsObjective(KillHordeMinionsStep step) => Step = step;
public KillHordeMinionsStep Step{ get; private set; }