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

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