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

17
Projects/Scripts/Skills/AnimalTaming.cs
View file

@ -34,18 +34,13 @@ namespace Server.SkillHandlers
return TimeSpan.FromHours(6.0);
}
public static bool CheckMastery(Mobile tamer, BaseCreature creature)
{
return SummonFamiliarSpell.Table.TryGetValue(tamer, out BaseCreature bc) && bc is DarkWolfFamiliar familiar &&
!familiar.Deleted && (creature is DireWolf || creature is GreyWolf || creature is TimberWolf ||
creature is WhiteWolf ||
creature is BakeKitsune);
}
public static bool CheckMastery(Mobile tamer, BaseCreature creature) =>
SummonFamiliarSpell.Table.TryGetValue(tamer, out BaseCreature bc) && bc is DarkWolfFamiliar familiar &&
!familiar.Deleted && (creature is DireWolf || creature is GreyWolf || creature is TimberWolf ||
creature is WhiteWolf ||
creature is BakeKitsune);
public static bool MustBeSubdued(BaseCreature bc)
{
return bc.Owners.Count <= 0 && bc.SubdueBeforeTame && bc.Hits > bc.HitsMax / 10;
}
public static bool MustBeSubdued(BaseCreature bc) => bc.Owners.Count <= 0 && bc.SubdueBeforeTame && bc.Hits > bc.HitsMax / 10;
public static void ScaleStats(BaseCreature bc, double scalar)
{

5
Projects/Scripts/Skills/ArmsLore.cs
View file

@ -25,10 +25,7 @@ namespace Server.SkillHandlers
[PlayerVendorTarget]
private class InternalTarget : Target
{
public InternalTarget() : base(2, false, TargetFlags.None)
{
AllowNonlocal = true;
}
public InternalTarget() : base(2, false, TargetFlags.None) => AllowNonlocal = true;
protected override void OnTarget(Mobile from, object targeted)
{

4
Projects/Scripts/Skills/Discordance.cs
View file

@ -144,10 +144,8 @@ namespace Server.SkillHandlers
private BaseInstrument m_Instrument;
public DiscordanceTarget(Mobile from, BaseInstrument inst) : base(
BaseInstrument.GetBardRange(from, SkillName.Discordance), false, TargetFlags.None)
{
BaseInstrument.GetBardRange(from, SkillName.Discordance), false, TargetFlags.None) =>
m_Instrument = inst;
}
protected override void OnTarget(Mobile from, object target)
{

5
Projects/Scripts/Skills/Inscribe.cs
View file

@ -108,10 +108,7 @@ namespace Server.SkillHandlers
{
private BaseBook m_BookSrc;
public InternalTargetDst(BaseBook bookSrc) : base(3, false, TargetFlags.None)
{
m_BookSrc = bookSrc;
}
public InternalTargetDst(BaseBook bookSrc) : base(3, false, TargetFlags.None) => m_BookSrc = bookSrc;
protected override void OnTarget(Mobile from, object targeted)
{

5
Projects/Scripts/Skills/ItemIdentification.cs
View file

@ -22,10 +22,7 @@ namespace Server.Items
[PlayerVendorTarget]
private class InternalTarget : Target
{
public InternalTarget() : base(8, false, TargetFlags.None)
{
AllowNonlocal = true;
}
public InternalTarget() : base(8, false, TargetFlags.None) => AllowNonlocal = true;
protected override void OnTarget(Mobile from, object o)
{

4
Projects/Scripts/Skills/Peacemaking.cs
View file

@ -36,10 +36,8 @@ namespace Server.SkillHandlers
private bool m_SetSkillTime = true;
public InternalTarget(Mobile from, BaseInstrument instrument) : base(
BaseInstrument.GetBardRange(from, SkillName.Peacemaking), false, TargetFlags.None)
{
BaseInstrument.GetBardRange(from, SkillName.Peacemaking), false, TargetFlags.None) =>
m_Instrument = instrument;
}
protected override void OnTargetFinish(Mobile from)
{

5
Projects/Scripts/Skills/Poisoning.cs
View file

@ -45,10 +45,7 @@ namespace Server.SkillHandlers
{
private BasePoisonPotion m_Potion;
public InternalTarget(BasePoisonPotion potion) : base(2, false, TargetFlags.None)
{
m_Potion = potion;
}
public InternalTarget(BasePoisonPotion potion) : base(2, false, TargetFlags.None) => m_Potion = potion;
protected override void OnTarget(Mobile from, object targeted)
{

4
Projects/Scripts/Skills/Provocation.cs
View file

@ -33,10 +33,8 @@ namespace Server.SkillHandlers
private BaseInstrument m_Instrument;
public InternalFirstTarget(Mobile from, BaseInstrument instrument) : base(
BaseInstrument.GetBardRange(from, SkillName.Provocation), false, TargetFlags.None)
{
BaseInstrument.GetBardRange(from, SkillName.Provocation), false, TargetFlags.None) =>
m_Instrument = instrument;
}
protected override void OnTarget(Mobile from, object targeted)
{

15
Projects/Scripts/Skills/SpiritSpeak.cs
View file

@ -90,10 +90,7 @@ namespace Server.SkillHandlers
public override bool CheckNextSpellTime => false;
public override int GetMana()
{
return 0;
}
public override int GetMana() => 0;
public override void OnCasterHurt()
{
@ -101,15 +98,9 @@ namespace Server.SkillHandlers
Disturb(DisturbType.Hurt, false, true);
}
public override bool ConsumeReagents()
{
return true;
}
public override bool ConsumeReagents() => true;
public override bool CheckFizzle()
{
return true;
}
public override bool CheckFizzle() => true;
public override void OnDisturb(DisturbType type, bool message)
{

10
Projects/Scripts/Skills/Stealing.cs
View file

@ -23,15 +23,9 @@ namespace Server.SkillHandlers
SkillInfo.Table[33].Callback = OnUse;
}
public static bool IsInGuild(Mobile m)
{
return m is PlayerMobile mobile && mobile.NpcGuild == NpcGuild.ThievesGuild;
}
public static bool IsInGuild(Mobile m) => m is PlayerMobile mobile && mobile.NpcGuild == NpcGuild.ThievesGuild;
public static bool IsInnocentTo(Mobile from, Mobile to)
{
return Notoriety.Compute(from, to) == Notoriety.Innocent;
}
public static bool IsInnocentTo(Mobile from, Mobile to) => Notoriety.Compute(from, to) == Notoriety.Innocent;
public static bool IsEmptyHanded(Mobile from)
{

5
Projects/Scripts/Skills/TasteID.cs
View file

@ -24,10 +24,7 @@ namespace Server.SkillHandlers
[PlayerVendorTarget]
private class InternalTarget : Target
{
public InternalTarget() : base(2, false, TargetFlags.None)
{
AllowNonlocal = true;
}
public InternalTarget() : base(2, false, TargetFlags.None) => AllowNonlocal = true;
protected override void OnTarget(Mobile from, object targeted)
{

25
Projects/Scripts/Skills/Tracking.cs
View file

@ -255,25 +255,13 @@ namespace Server.SkillHandlers
return chance > Utility.Random(100);
}
private static bool IsAnimal(Mobile m)
{
return !m.Player && m.Body.IsAnimal;
}
private static bool IsAnimal(Mobile m) => !m.Player && m.Body.IsAnimal;
private static bool IsMonster(Mobile m)
{
return !m.Player && m.Body.IsMonster;
}
private static bool IsMonster(Mobile m) => !m.Player && m.Body.IsMonster;
private static bool IsHumanNPC(Mobile m)
{
return !m.Player && m.Body.IsHuman;
}
private static bool IsHumanNPC(Mobile m) => !m.Player && m.Body.IsHuman;
private static bool IsPlayer(Mobile m)
{
return m.Player;
}
private static bool IsPlayer(Mobile m) => m.Player;
public override void OnResponse(NetState state, RelayInfo info)
{
@ -294,10 +282,7 @@ namespace Server.SkillHandlers
{
private Mobile m_From;
public InternalSorter(Mobile from)
{
m_From = from;
}
public InternalSorter(Mobile from) => m_From = from;
public int Compare(Mobile x, Mobile y)
{