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

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/Ambitious Solen Queen/AmbitiousQueenQuest.cs
View file

@ -22,10 +22,7 @@ namespace Server.Engines.Quests.Ambitious
typeof(GetRewardObjective)
};
public AmbitiousQueenQuest(PlayerMobile from, bool redSolen) : base(from)
{
RedSolen = redSolen;
}
public AmbitiousQueenQuest(PlayerMobile from, bool redSolen) : base(from) => RedSolen = redSolen;
// Serialization
public AmbitiousQueenQuest()

5
Projects/Scripts/Engines/Quests/Ambitious Solen Queen/Conversations.cs
View file

@ -77,10 +77,7 @@ namespace Server.Engines.Quests.Ambitious
m_Gold = gold;
}
public FullBackpackConversation()
{
m_Logged = true;
}
public FullBackpackConversation() => m_Logged = true;
public override object Message => 1054077;

5
Projects/Scripts/Engines/Quests/Ambitious Solen Queen/Mobiles/AmbitiousSolenQueen.cs
View file

@ -27,10 +27,7 @@ namespace Server.Engines.Quests.Ambitious
SpeechHue = 0;
}
public override int GetIdleSound()
{
return 0x10D;
}
public override int GetIdleSound() => 0x10D;
public override void OnTalk(PlayerMobile player, bool contextMenu)
{

10
Projects/Scripts/Engines/Quests/Collector/Conversations.cs
View file

@ -243,15 +243,9 @@ namespace Server.Engines.Quests.Collector
{
private bool m_Logged;
public FullEndConversation(bool logged)
{
m_Logged = logged;
}
public FullEndConversation(bool logged) => m_Logged = logged;
public FullEndConversation()
{
m_Logged = true;
}
public FullEndConversation() => m_Logged = true;
public override object Message => 1055135;

8
Projects/Scripts/Engines/Quests/Collector/Items/EnchantedPaints.cs
View file

@ -17,13 +17,7 @@ namespace Server.Engines.Quests.Collector
{
}
public override bool CanDrop(PlayerMobile player)
{
return !(player.Quest is CollectorQuest);
/*return !( qs.IsObjectiveInProgress( typeof( CaptureImagesObjective ) )
|| qs.IsObjectiveInProgress( typeof( ReturnImagesObjective ) ) );*/
}
public override bool CanDrop(PlayerMobile player) => !(player.Quest is CollectorQuest);
public override void OnDoubleClick(Mobile from)
{

10
Projects/Scripts/Engines/Quests/Collector/Items/Obsidian.cs
View file

@ -199,10 +199,7 @@ namespace Server.Engines.Quests.Collector
{
private Obsidian m_Obsidian;
public DisassembleEntry(Obsidian obsidian) : base(6142)
{
m_Obsidian = obsidian;
}
public DisassembleEntry(Obsidian obsidian) : base(6142) => m_Obsidian = obsidian;
public override void OnClick()
{
@ -222,10 +219,7 @@ namespace Server.Engines.Quests.Collector
{
private Obsidian m_Obsidian;
public InternalTarget(Obsidian obsidian) : base(-1, false, TargetFlags.None)
{
m_Obsidian = obsidian;
}
public InternalTarget(Obsidian obsidian) : base(-1, false, TargetFlags.None) => m_Obsidian = obsidian;
protected override void OnTarget(Mobile from, object targeted)
{

5
Projects/Scripts/Engines/Quests/Collector/Objectives.cs
View file

@ -59,10 +59,7 @@ namespace Server.Engines.Quests.Collector
private DateTime m_Begin;
public SitOnTheStoolObjective()
{
m_Begin = DateTime.MaxValue;
}
public SitOnTheStoolObjective() => m_Begin = DateTime.MaxValue;
public override object Message => 1055093;

20
Projects/Scripts/Engines/Quests/Core/BaseQuester.cs
View file

@ -9,10 +9,7 @@ namespace Server.Engines.Quests
{
private BaseQuester m_Quester;
public TalkEntry(BaseQuester quester) : base(quester.TalkNumber)
{
m_Quester = quester;
}
public TalkEntry(BaseQuester quester) : base(quester.TalkNumber) => m_Quester = quester;
public override void OnClick()
{
@ -52,20 +49,11 @@ namespace Server.Engines.Quests
public abstract void OnTalk(PlayerMobile player, bool contextMenu);
public virtual bool CanTalkTo(PlayerMobile to)
{
return true;
}
public virtual bool CanTalkTo(PlayerMobile to) => true;
public virtual int GetAutoTalkRange(PlayerMobile m)
{
return -1;
}
public virtual int GetAutoTalkRange(PlayerMobile m) => -1;
public override bool CanBeDamaged()
{
return false;
}
public override bool CanBeDamaged() => false;
protected Item SetHue(Item item, int hue)
{

5
Projects/Scripts/Engines/Quests/Core/Items/EnchantedSextant.cs
View file

@ -68,10 +68,7 @@ namespace Server.Items
};
[Constructible]
public EnchantedSextant() : base(0x1058)
{
Weight = 2.0;
}
public EnchantedSextant() : base(0x1058) => Weight = 2.0;
public EnchantedSextant(Serial serial) : base(serial)
{

5
Projects/Scripts/Engines/Quests/Core/Items/HornOfRetreat.cs
View file

@ -41,10 +41,7 @@ namespace Server.Engines.Quests
public override int LabelNumber => 1049117; // Horn of Retreat
public virtual bool ValidateUse(Mobile from)
{
return true;
}
public virtual bool ValidateUse(Mobile from) => true;
public override void GetProperties(ObjectPropertyList list)
{

5
Projects/Scripts/Engines/Quests/Core/QuestCallbackEntry.cs
View file

@ -10,10 +10,7 @@ namespace Server.Engines.Quests
{
}
public QuestCallbackEntry(int number, int range, QuestCallback callback) : base(number, range)
{
m_Callback = callback;
}
public QuestCallbackEntry(int number, int range, QuestCallback callback) : base(number, range) => m_Callback = callback;
public override void OnClick()
{

15
Projects/Scripts/Engines/Quests/Core/QuestObjective.cs
View file

@ -107,10 +107,7 @@ namespace Server.Engines.Quests
{
}
public virtual bool GetTimerEvent()
{
return !Completed;
}
public virtual bool GetTimerEvent() => !Completed;
public virtual void CheckProgress()
{
@ -120,19 +117,13 @@ namespace Server.Engines.Quests
{
}
public virtual bool GetKillEvent(BaseCreature creature, Container corpse)
{
return !Completed;
}
public virtual bool GetKillEvent(BaseCreature creature, Container corpse) => !Completed;
public virtual void OnKill(BaseCreature creature, Container corpse)
{
}
public virtual bool IgnoreYoungProtection(Mobile from)
{
return false;
}
public virtual bool IgnoreYoungProtection(Mobile from) => false;
}
public class QuestLogUpdatedGump : BaseQuestGump

15
Projects/Scripts/Engines/Quests/Core/QuestSystem.cs
View file

@ -393,10 +393,7 @@ namespace Server.Engines.Quests
From.SendLocalizedMessage(1049018); // You have declined the Quest.
}
public static bool CanOfferQuest(Mobile check, Type questType)
{
return CanOfferQuest(check, questType, out _);
}
public static bool CanOfferQuest(Mobile check, Type questType) => CanOfferQuest(check, questType, out _);
public static bool CanOfferQuest(Mobile check, Type questType, out bool inRestartPeriod)
{
@ -635,10 +632,7 @@ namespace Server.Engines.Quests
return (r << 16) | (g << 8) | (b << 0);
}
public static int C16216(int c16)
{
return c16 & 0x7FFF;
}
public static int C16216(int c16) => c16 & 0x7FFF;
public static int C32216(int c32)
{
@ -651,10 +645,7 @@ namespace Server.Engines.Quests
return (r << 10) | (g << 5) | (b << 0);
}
public static string Color(string text, int color)
{
return $"<BASEFONT COLOR=#{color:X6}>{text}</BASEFONT>";
}
public static string Color(string text, int color) => $"<BASEFONT COLOR=#{color:X6}>{text}</BASEFONT>";
public void AddHtmlObject(int x, int y, int width, int height, object message, int color, bool back, bool scroll)
{

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()

14
Projects/Scripts/Engines/Quests/Emino's Undertaking/Items/EminosKatana.cs
View file

@ -5,10 +5,7 @@ namespace Server.Engines.Quests.Ninja
public class EminosKatana : QuestItem
{
[Constructible]
public EminosKatana() : base(0x13FF)
{
Weight = 1.0;
}
public EminosKatana() : base(0x13FF) => Weight = 1.0;
public EminosKatana(Serial serial) : base(serial)
{
@ -16,14 +13,7 @@ namespace Server.Engines.Quests.Ninja
public override int LabelNumber => 1063214; // Daimyo Emino's Katana
public override bool CanDrop(PlayerMobile player)
{
return !(player.Quest is EminosUndertakingQuest);
/*return !qs.IsObjectiveInProgress( typeof( ReturnSwordObjective ) )
&& !qs.IsObjectiveInProgress( typeof( SlayHenchmenObjective ) )
&& !qs.IsObjectiveInProgress( typeof( GiveEminoSwordObjective ) );*/
}
public override bool CanDrop(PlayerMobile player) => !(player.Quest is EminosUndertakingQuest);
public override void Serialize(GenericWriter writer)
{

10
Projects/Scripts/Engines/Quests/Emino's Undertaking/Items/EminosKatanaChest.cs
View file

@ -87,15 +87,9 @@ namespace Server.Engines.Quests.Ninja
base.OnDoubleClick(from);
}
public override bool CheckHold(Mobile m, Item item, bool message, bool checkItems, int plusItems, int plusWeight)
{
return false;
}
public override bool CheckHold(Mobile m, Item item, bool message, bool checkItems, int plusItems, int plusWeight) => false;
public override bool CheckItemUse(Mobile from, Item item)
{
return item == this;
}
public override bool CheckItemUse(Mobile from, Item item) => item == this;
public override bool CheckLift(Mobile from, Item item, ref LRReason reject)
{

7
Projects/Scripts/Engines/Quests/Emino's Undertaking/Items/NoteForZoel.cs
View file

@ -17,12 +17,7 @@ namespace Server.Engines.Quests.Ninja
public override int LabelNumber => 1063186; // A Note for Zoel
public override bool CanDrop(PlayerMobile player)
{
return !(player.Quest is EminosUndertakingQuest);
//return !qs.IsObjectiveInProgress( typeof( GiveZoelNoteObjective ) );
}
public override bool CanDrop(PlayerMobile player) => !(player.Quest is EminosUndertakingQuest);
public override void Serialize(GenericWriter writer)
{

5
Projects/Scripts/Engines/Quests/Emino's Undertaking/Mobiles/Emino.cs
View file

@ -47,10 +47,7 @@ namespace Server.Engines.Quests.Ninja
AddItem(nunchaku);
}
public override int GetAutoTalkRange(PlayerMobile pm)
{
return 2;
}
public override int GetAutoTalkRange(PlayerMobile pm) => 2;
public override void OnTalk(PlayerMobile player, bool contextMenu)
{

10
Projects/Scripts/Engines/Quests/Emino's Undertaking/Mobiles/HiddenFigure.cs
View file

@ -13,10 +13,7 @@ namespace Server.Engines.Quests.Ninja
};
[Constructible]
public HiddenFigure()
{
Message = Utility.RandomList(Messages);
}
public HiddenFigure() => Message = Utility.RandomList(Messages);
public HiddenFigure(Serial serial) : base(serial)
{
@ -61,10 +58,7 @@ namespace Server.Engines.Quests.Ninja
AddItem(new Sandals(GetShoeHue()));
}
public override int GetAutoTalkRange(PlayerMobile pm)
{
return 3;
}
public override int GetAutoTalkRange(PlayerMobile pm) => 3;
public override void OnTalk(PlayerMobile player, bool contextMenu)
{

10
Projects/Scripts/Engines/Quests/Emino's Undertaking/Mobiles/Zoel.cs
View file

@ -46,15 +46,9 @@ namespace Server.Engines.Quests.Ninja
AddItem(tekagi);
}
public override int GetAutoTalkRange(PlayerMobile pm)
{
return 2;
}
public override int GetAutoTalkRange(PlayerMobile pm) => 2;
public override bool CanTalkTo(PlayerMobile to)
{
return to.Quest is EminosUndertakingQuest;
}
public override bool CanTalkTo(PlayerMobile to) => to.Quest is EminosUndertakingQuest;
public override void OnTalk(PlayerMobile player, bool contextMenu)
{

25
Projects/Scripts/Engines/Quests/Haochi's Trials/Conversations.cs
View file

@ -41,10 +41,7 @@ namespace Server.Engines.Quests.Samurai
{
private bool m_CursedSoul;
public GainKarmaConversation(bool cursedSoul)
{
m_CursedSoul = cursedSoul;
}
public GainKarmaConversation(bool cursedSoul) => m_CursedSoul = cursedSoul;
public GainKarmaConversation()
{
@ -82,10 +79,7 @@ namespace Server.Engines.Quests.Samurai
{
private bool m_CursedSoul;
public SecondTrialIntroConversation(bool cursedSoul)
{
m_CursedSoul = cursedSoul;
}
public SecondTrialIntroConversation(bool cursedSoul) => m_CursedSoul = cursedSoul;
public SecondTrialIntroConversation()
{
@ -143,10 +137,7 @@ namespace Server.Engines.Quests.Samurai
{
private bool m_Dragon;
public ThirdTrialIntroConversation(bool dragon)
{
m_Dragon = dragon;
}
public ThirdTrialIntroConversation(bool dragon) => m_Dragon = dragon;
public ThirdTrialIntroConversation()
{
@ -230,10 +221,7 @@ namespace Server.Engines.Quests.Samurai
{
private bool m_KilledCat;
public FifthTrialIntroConversation(bool killedCat)
{
m_KilledCat = killedCat;
}
public FifthTrialIntroConversation(bool killedCat) => m_KilledCat = killedCat;
public FifthTrialIntroConversation()
{
@ -305,10 +293,7 @@ namespace Server.Engines.Quests.Samurai
{
private bool m_StolenTreasure;
public SixthTrialIntroConversation(bool stolenTreasure)
{
m_StolenTreasure = stolenTreasure;
}
public SixthTrialIntroConversation(bool stolenTreasure) => m_StolenTreasure = stolenTreasure;
public SixthTrialIntroConversation()
{

12
Projects/Scripts/Engines/Quests/Haochi's Trials/Items/HaochisKatana.cs
View file

@ -5,10 +5,7 @@ namespace Server.Engines.Quests.Samurai
public class HaochisKatana : QuestItem
{
[Constructible]
public HaochisKatana() : base(0x13FF)
{
Weight = 1.0;
}
public HaochisKatana() : base(0x13FF) => Weight = 1.0;
public HaochisKatana(Serial serial) : base(serial)
{
@ -16,12 +13,7 @@ namespace Server.Engines.Quests.Samurai
public override int LabelNumber => 1063165; // Daimyo Haochi's Katana
public override bool CanDrop(PlayerMobile player)
{
return !(player.Quest is HaochisTrialsQuest);
//return !qs.IsObjectiveInProgress( typeof( FifthTrialReturnObjective ) );
}
public override bool CanDrop(PlayerMobile player) => !(player.Quest is HaochisTrialsQuest);
public override void Serialize(GenericWriter writer)
{

10
Projects/Scripts/Engines/Quests/Haochi's Trials/Items/HaochisTreasureChest.cs
View file

@ -41,15 +41,9 @@ namespace Server.Engines.Quests.Samurai
}
}
public override bool CheckHold(Mobile m, Item item, bool message, bool checkItems, int plusItems, int plusWeight)
{
return false;
}
public override bool CheckHold(Mobile m, Item item, bool message, bool checkItems, int plusItems, int plusWeight) => false;
public override bool CheckItemUse(Mobile from, Item item)
{
return item == this;
}
public override bool CheckItemUse(Mobile from, Item item) => item == this;
public override bool CheckLift(Mobile from, Item item, ref LRReason reject)
{

25
Projects/Scripts/Engines/Quests/Haochi's Trials/Mobiles/FierceDragon.cs
View file

@ -40,30 +40,15 @@ namespace Server.Engines.Quests.Samurai
public override string DefaultName => "a fierce dragon";
public override int GetIdleSound()
{
return 0x2C4;
}
public override int GetIdleSound() => 0x2C4;
public override int GetAttackSound()
{
return 0x2C0;
}
public override int GetAttackSound() => 0x2C0;
public override int GetDeathSound()
{
return 0x2C1;
}
public override int GetDeathSound() => 0x2C1;
public override int GetAngerSound()
{
return 0x2C4;
}
public override int GetAngerSound() => 0x2C4;
public override int GetHurtSound()
{
return 0x2C3;
}
public override int GetHurtSound() => 0x2C3;
public override void AggressiveAction(Mobile aggressor, bool criminal)
{

5
Projects/Scripts/Engines/Quests/Haochi's Trials/Mobiles/Haochi.cs
View file

@ -43,10 +43,7 @@ namespace Server.Engines.Quests.Samurai
AddItem(new PlateHiroSode());
}
public override int GetAutoTalkRange(PlayerMobile pm)
{
return 2;
}
public override int GetAutoTalkRange(PlayerMobile pm) => 2;
public override void OnTalk(PlayerMobile player, bool contextMenu)
{

5
Projects/Scripts/Engines/Quests/Haochi's Trials/Mobiles/InjuredWolf.cs
View file

@ -37,10 +37,7 @@ namespace Server.Engines.Quests.Samurai
public override string CorpseName => "an injured wolf corpse";
public override string DefaultName => "an injured wolf";
public override int GetIdleSound()
{
return 0xE9;
}
public override int GetIdleSound() => 0xE9;
public override void Serialize(GenericWriter writer)
{

15
Projects/Scripts/Engines/Quests/Haochi's Trials/Objectives.cs
View file

@ -85,10 +85,7 @@ namespace Server.Engines.Quests.Samurai
{
private bool m_CursedSoul;
public FirstTrialReturnObjective(bool cursedSoul)
{
m_CursedSoul = cursedSoul;
}
public FirstTrialReturnObjective(bool cursedSoul) => m_CursedSoul = cursedSoul;
public FirstTrialReturnObjective()
{
@ -133,10 +130,7 @@ namespace Server.Engines.Quests.Samurai
public class SecondTrialReturnObjective : QuestObjective
{
public SecondTrialReturnObjective(bool dragon)
{
Dragon = dragon;
}
public SecondTrialReturnObjective(bool dragon) => Dragon = dragon;
public SecondTrialReturnObjective()
{
@ -228,10 +222,7 @@ namespace Server.Engines.Quests.Samurai
public class FourthTrialReturnObjective : QuestObjective
{
public FourthTrialReturnObjective(bool killedCat)
{
KilledCat = killedCat;
}
public FourthTrialReturnObjective(bool killedCat) => KilledCat = killedCat;
public FourthTrialReturnObjective()
{

20
Projects/Scripts/Engines/Quests/Solen Matriarch/Conversations.cs
View file

@ -4,10 +4,7 @@ namespace Server.Engines.Quests.Matriarch
{
private bool m_Friend;
public DontOfferConversation(bool friend)
{
m_Friend = friend;
}
public DontOfferConversation(bool friend) => m_Friend = friend;
public DontOfferConversation()
{
@ -86,10 +83,7 @@ namespace Server.Engines.Quests.Matriarch
{
private bool m_Friend;
public ProcessFungiConversation(bool friend)
{
m_Friend = friend;
}
public ProcessFungiConversation(bool friend) => m_Friend = friend;
public ProcessFungiConversation()
{
@ -150,15 +144,9 @@ namespace Server.Engines.Quests.Matriarch
{
private bool m_Logged;
public FullBackpackConversation(bool logged)
{
m_Logged = logged;
}
public FullBackpackConversation(bool logged) => m_Logged = logged;
public FullBackpackConversation()
{
m_Logged = true;
}
public FullBackpackConversation() => m_Logged = true;
public override object Message => 1054102;

5
Projects/Scripts/Engines/Quests/Solen Matriarch/Mobiles/SolenMatriarch.cs
View file

@ -27,10 +27,7 @@ namespace Server.Engines.Quests.Matriarch
public override string DefaultName => "the solen matriarch";
public override bool DisallowAllMoves => false;
public override int GetIdleSound()
{
return 0x10D;
}
public override int GetIdleSound() => 0x10D;
public override bool CanTalkTo(PlayerMobile to)
{

5
Projects/Scripts/Engines/Quests/Solen Matriarch/SolenMatriarchQuest.cs
View file

@ -25,10 +25,7 @@ namespace Server.Engines.Quests.Matriarch
typeof(GetRewardObjective)
};
public SolenMatriarchQuest(PlayerMobile from, bool redSolen) : base(from)
{
RedSolen = redSolen;
}
public SolenMatriarchQuest(PlayerMobile from, bool redSolen) : base(from) => RedSolen = redSolen;
// Serialization
public SolenMatriarchQuest()

5
Projects/Scripts/Engines/Quests/Study of the Solen Hive/Objectives.cs
View file

@ -18,10 +18,7 @@ namespace Server.Engines.Quests.Naturalist
public bool StudiedSpecialNest{ get; private set; }
public override bool GetTimerEvent()
{
return true;
}
public override bool GetTimerEvent() => true;
public override void CheckProgress()
{

5
Projects/Scripts/Engines/Quests/Study of the Solen Hive/StudyOfSolenQuest.cs
View file

@ -17,10 +17,7 @@ namespace Server.Engines.Quests.Naturalist
typeof(FullBackpackConversation)
};
public StudyOfSolenQuest(PlayerMobile from, Naturalist naturalist) : base(from)
{
Naturalist = naturalist;
}
public StudyOfSolenQuest(PlayerMobile from, Naturalist naturalist) : base(from) => Naturalist = naturalist;
// Serialization
public StudyOfSolenQuest()

5
Projects/Scripts/Engines/Quests/Terrible Hatchlings/Objectives.cs
View file

@ -78,10 +78,7 @@ namespace Server.Engines.Quests.Zento
public class ThirdKillObjective : QuestObjective
{
public ThirdKillObjective(int startingProgress)
{
CurProgress = startingProgress;
}
public ThirdKillObjective(int startingProgress) => CurProgress = startingProgress;
public ThirdKillObjective()
{

5
Projects/Scripts/Engines/Quests/The Summoning/Items/ChylothStaff.cs
View file

@ -5,10 +5,7 @@ namespace Server.Engines.Quests.Doom
public class ChylothStaff : BlackStaff
{
[Constructible]
public ChylothStaff()
{
Hue = 0x482;
}
public ChylothStaff() => Hue = 0x482;
public ChylothStaff(Serial serial) : base(serial)
{

5
Projects/Scripts/Engines/Quests/The Summoning/Mobiles/Chyloth.cs
View file

@ -203,10 +203,7 @@ namespace Server.Engines.Quests.Doom
return base.OnDragDrop(from, dropped);
}
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/The Summoning/Mobiles/Victoria.cs
View file

@ -113,10 +113,7 @@ namespace Server.Engines.Quests.Doom
return base.OnDragDrop(from, dropped);
}
public override bool CanTalkTo(PlayerMobile to)
{
return to.Quest == null && QuestSystem.CanOfferQuest(to, typeof(TheSummoningQuest));
}
public override bool CanTalkTo(PlayerMobile to) => to.Quest == null && QuestSystem.CanOfferQuest(to, typeof(TheSummoningQuest));
public override void OnTalk(PlayerMobile player, bool contextMenu)
{

5
Projects/Scripts/Engines/Quests/The Summoning/Objectives.cs
View file

@ -72,10 +72,7 @@ namespace Server.Engines.Quests.Doom
{
private BoneDemon m_Daemon;
public VanquishDaemonObjective(BoneDemon daemon)
{
m_Daemon = daemon;
}
public VanquishDaemonObjective(BoneDemon daemon) => m_Daemon = daemon;
// Serialization
public VanquishDaemonObjective()

5
Projects/Scripts/Engines/Quests/The Summoning/TheSummoningQuest.cs
View file

@ -14,10 +14,7 @@ namespace Server.Engines.Quests.Doom
typeof(VanquishDaemonObjective)
};
public TheSummoningQuest(Victoria victoria, PlayerMobile from) : base(from)
{
Victoria = victoria;
}
public TheSummoningQuest(Victoria victoria, PlayerMobile from) : base(from) => Victoria = victoria;
public TheSummoningQuest()
{

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; }

10
Projects/Scripts/Engines/Quests/Witch Apprentice/Conversations.cs
View file

@ -55,10 +55,7 @@ namespace Server.Engines.Quests.Hag
{
private Point3D m_ImpLocation;
public ImpDeathConversation(Point3D impLocation)
{
m_ImpLocation = impLocation;
}
public ImpDeathConversation(Point3D impLocation) => m_ImpLocation = impLocation;
public ImpDeathConversation()
{
@ -213,10 +210,7 @@ namespace Server.Engines.Quests.Hag
{
private bool m_FirstMet;
public BlackheartPirateConversation(bool firstMet)
{
m_FirstMet = firstMet;
}
public BlackheartPirateConversation(bool firstMet) => m_FirstMet = firstMet;
public BlackheartPirateConversation()
{

5
Projects/Scripts/Engines/Quests/Witch Apprentice/Items/Cauldron.cs
View file

@ -3,10 +3,7 @@ namespace Server.Items
public class Cauldron : Item
{
[Constructible]
public Cauldron() : base(0x9ED)
{
Weight = 1.0;
}
public Cauldron() : base(0x9ED) => Weight = 1.0;
public Cauldron(Serial serial) : base(serial)
{

5
Projects/Scripts/Engines/Quests/Witch Apprentice/Items/HagApprenticeCorpse.cs
View file

@ -35,10 +35,7 @@ namespace Server.Engines.Quests.Hag
return apprentice;
}
private static List<Item> GetEquipment()
{
return new List<Item>();
}
private static List<Item> GetEquipment() => new List<Item>();
public override void AddNameProperty(ObjectPropertyList list)
{

5
Projects/Scripts/Engines/Quests/Witch Apprentice/Items/MagicFlute.cs
View file

@ -5,10 +5,7 @@ namespace Server.Engines.Quests.Hag
public class MagicFlute : Item
{
[Constructible]
public MagicFlute() : base(0x1421)
{
Hue = 0x8AB;
}
public MagicFlute() : base(0x1421) => Hue = 0x8AB;
public MagicFlute(Serial serial) : base(serial)
{

5
Projects/Scripts/Engines/Quests/Witch Apprentice/Items/MoonfireBrew.cs
View file

@ -3,10 +3,7 @@ namespace Server.Engines.Quests.Hag
public class MoonfireBrew : Item
{
[Constructible]
public MoonfireBrew() : base(0xF04)
{
Weight = 1.0;
}
public MoonfireBrew() : base(0xF04) => Weight = 1.0;
public MoonfireBrew(Serial serial) : base(serial)
{

5
Projects/Scripts/Engines/Quests/Witch Apprentice/Mobiles/Zeefzorpul.cs
View file

@ -19,10 +19,7 @@ namespace Server.Engines.Quests.Hag
Body = 0x4A;
}
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/Witch Apprentice/Objectives.cs
View file

@ -189,10 +189,7 @@ namespace Server.Engines.Quests.Hag
public class FindZeefzorpulObjective : QuestObjective
{
public FindZeefzorpulObjective(Point3D impLocation)
{
ImpLocation = impLocation;
}
public FindZeefzorpulObjective(Point3D impLocation) => ImpLocation = impLocation;
public FindZeefzorpulObjective()
{