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

16
Projects/Scripts/Spells/Spellweaving/ArcaneCircle.cs
View file

@ -65,10 +65,7 @@ namespace Server.Spells.Spellweaving
FinishSequence();
}
private static bool IsSanctuary(Point3D p, Map m)
{
return (m == Map.Trammel || m == Map.Felucca) && p.X == 6267 && p.Y == 131;
}
private static bool IsSanctuary(Point3D p, Map m) => (m == Map.Trammel || m == Map.Felucca) && p.X == 6267 && p.Y == 131;
private static bool IsValidLocation(Point3D location, Map map)
{
@ -102,13 +99,10 @@ namespace Server.Spells.Spellweaving
return found;
}
public static bool IsValidTile(int itemID)
{
//Per OSI, Center tile only
return itemID == 0xFEA || itemID == 0x1216 || itemID == 0x307F || itemID == 0x1D10 || itemID == 0x1D0F ||
itemID == 0x1D1F ||
itemID == 0x1D12; // Pentagram center, Abbatoir center, Arcane Circle Center, Bloody Pentagram has 4 tiles at center
}
public static bool IsValidTile(int itemID) =>
itemID == 0xFEA || itemID == 0x1216 || itemID == 0x307F || itemID == 0x1D10 || itemID == 0x1D0F ||
itemID == 0x1D1F ||
itemID == 0x1D12;
private List<Mobile> GetArcanists()
{

15
Projects/Scripts/Spells/Spellweaving/ArcanistSpell.cs
View file

@ -30,15 +30,9 @@ namespace Server.Spells.Spellweaving
return focus?.Deleted != false ? 0 : focus.StrengthBonus;
}
public static ArcaneFocus FindArcaneFocus(Mobile from)
{
return from.Holding as ArcaneFocus ?? from.Backpack?.FindItemByType<ArcaneFocus>();
}
public static ArcaneFocus FindArcaneFocus(Mobile from) => from.Holding as ArcaneFocus ?? from.Backpack?.FindItemByType<ArcaneFocus>();
public static bool CheckExpansion(Mobile from)
{
return !(from is PlayerMobile) || from.NetState?.SupportsExpansion(Expansion.ML) == true;
}
public static bool CheckExpansion(Mobile from) => !(from is PlayerMobile) || from.NetState?.SupportsExpansion(Expansion.ML) == true;
public override bool CheckCast()
{
@ -91,10 +85,7 @@ namespace Server.Spells.Spellweaving
max = RequiredSkill + 37.5;
}
public override int GetMana()
{
return RequiredMana;
}
public override int GetMana() => RequiredMana;
public override void DoFizzle()
{

9
Projects/Scripts/Spells/Spellweaving/AttuneWeapon.cs
View file

@ -84,10 +84,7 @@ namespace Server.Spells.Spellweaving
StopAbsorbing(defender, true);
}
public static bool IsAbsorbing(Mobile m)
{
return m_Table.ContainsKey(m);
}
public static bool IsAbsorbing(Mobile m) => m_Table.ContainsKey(m);
public static void StopAbsorbing(Mobile m, bool message)
{
@ -100,10 +97,8 @@ namespace Server.Spells.Spellweaving
private Mobile m_Mobile;
public ExpireTimer(Mobile m, TimeSpan delay)
: base(delay)
{
: base(delay) =>
m_Mobile = m;
}
protected override void OnTick()
{

20
Projects/Scripts/Spells/Spellweaving/EssenceOfWind.cs
View file

@ -61,20 +61,11 @@ namespace Server.Spells.Spellweaving
FinishSequence();
}
public static int GetFCMalus(Mobile m)
{
return m_Table.TryGetValue(m, out EssenceOfWindInfo info) ? info.FCMalus : 0;
}
public static int GetFCMalus(Mobile m) => m_Table.TryGetValue(m, out EssenceOfWindInfo info) ? info.FCMalus : 0;
public static int GetSSIMalus(Mobile m)
{
return m_Table.TryGetValue(m, out EssenceOfWindInfo info) ? info.SSIMalus : 0;
}
public static int GetSSIMalus(Mobile m) => m_Table.TryGetValue(m, out EssenceOfWindInfo info) ? info.SSIMalus : 0;
public static bool IsDebuffed(Mobile m)
{
return m_Table.ContainsKey(m);
}
public static bool IsDebuffed(Mobile m) => m_Table.ContainsKey(m);
public static void StopDebuffing(Mobile m, bool message)
{
@ -107,10 +98,7 @@ namespace Server.Spells.Spellweaving
{
private Mobile m_Mobile;
public ExpireTimer(Mobile m, TimeSpan delay) : base(delay)
{
m_Mobile = m;
}
public ExpireTimer(Mobile m, TimeSpan delay) : base(delay) => m_Mobile = m;
protected override void OnTick()
{

4
Projects/Scripts/Spells/Spellweaving/GiftOfRenewal.cs
View file

@ -120,10 +120,8 @@ namespace Server.Spells.Spellweaving
private GiftOfRenewalInfo m_GiftInfo;
public InternalTimer(GiftOfRenewalInfo info)
: base(TimeSpan.FromSeconds(2.0), TimeSpan.FromSeconds(2.0))
{
: base(TimeSpan.FromSeconds(2.0), TimeSpan.FromSeconds(2.0)) =>
m_GiftInfo = info;
}
protected override void OnTick()
{

10
Projects/Scripts/Spells/Spellweaving/ImmolatingWeapon.cs
View file

@ -63,15 +63,9 @@ namespace Server.Spells.Spellweaving
FinishSequence();
}
public static bool IsImmolating(BaseWeapon weapon)
{
return m_WeaponDamageTable.ContainsKey(weapon);
}
public static bool IsImmolating(BaseWeapon weapon) => m_WeaponDamageTable.ContainsKey(weapon);
public static int GetImmolatingDamage(BaseWeapon weapon)
{
return m_WeaponDamageTable.TryGetValue(weapon, out ImmolatingWeaponEntry entry) ? entry.m_Damage : 0;
}
public static int GetImmolatingDamage(BaseWeapon weapon) => m_WeaponDamageTable.TryGetValue(weapon, out ImmolatingWeaponEntry entry) ? entry.m_Damage : 0;
public static void DoEffect(BaseWeapon weapon, Mobile target)
{

4
Projects/Scripts/Spells/Spellweaving/NatureFury.cs
View file

@ -75,10 +75,8 @@ namespace Server.Spells.Spellweaving
private NatureFury m_NatureFury;
public InternalTimer(NatureFury nf)
: base(TimeSpan.FromSeconds(5.0), TimeSpan.FromSeconds(5.0))
{
: base(TimeSpan.FromSeconds(5.0), TimeSpan.FromSeconds(5.0)) =>
m_NatureFury = nf;
}
protected override void OnTick()
{

5
Projects/Scripts/Spells/Spellweaving/Thunderstorm.cs
View file

@ -75,10 +75,7 @@ namespace Server.Spells.Spellweaving
FinishSequence();
}
public static int GetCastRecoveryMalus(Mobile m)
{
return m_Table.ContainsKey(m) ? 6 : 0;
}
public static int GetCastRecoveryMalus(Mobile m) => m_Table.ContainsKey(m) ? 6 : 0;
public static void DoExpire(Mobile m)
{