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

8
Projects/Scripts/Items/Skill Items/Magical/Potions/BasePotion.cs
View file

@ -254,10 +254,8 @@ namespace Server.Items
return AOS.Scale(v, 100 + EnhancePotions(m));
}
public override bool StackWith(Mobile from, Item dropped, bool playSound)
{
return dropped is BasePotion potion && potion.m_PotionEffect == m_PotionEffect &&
base.StackWith(from, potion, playSound);
}
public override bool StackWith(Mobile from, Item dropped, bool playSound) =>
dropped is BasePotion potion && potion.m_PotionEffect == m_PotionEffect &&
base.StackWith(from, potion, playSound);
}
}

15
Projects/Scripts/Items/Skill Items/Magical/Potions/Conflagration Potions/BaseConflagrationPotion.cs
View file

@ -9,10 +9,7 @@ namespace Server.Items
{
private List<Mobile> m_Users = new List<Mobile>();
public BaseConflagrationPotion(PotionEffect effect) : base(0xF06, effect)
{
Hue = 0x489;
}
public BaseConflagrationPotion(PotionEffect effect) : base(0xF06, effect) => Hue = 0x489;
public BaseConflagrationPotion(Serial serial) : base(serial)
{
@ -92,10 +89,7 @@ namespace Server.Items
private class ThrowTarget : Target
{
public ThrowTarget(BaseConflagrationPotion potion) : base(12, true, TargetFlags.None)
{
Potion = potion;
}
public ThrowTarget(BaseConflagrationPotion potion) : base(12, true, TargetFlags.None) => Potion = potion;
public BaseConflagrationPotion Potion{ get; }
@ -164,10 +158,7 @@ namespace Server.Items
m_Timer?.Stop();
}
public int GetDamage()
{
return Utility.RandomMinMax(m_MinDamage, m_MaxDamage);
}
public int GetDamage() => Utility.RandomMinMax(m_MinDamage, m_MaxDamage);
private void SetDamage(int min, int max)
{

10
Projects/Scripts/Items/Skill Items/Magical/Potions/Confusion Blast Potions/BaseConfusionBlastPotion.cs
View file

@ -11,10 +11,7 @@ namespace Server.Items
{
private List<Mobile> m_Users = new List<Mobile>();
public BaseConfusionBlastPotion(PotionEffect effect) : base(0xF06, effect)
{
Hue = 0x48D;
}
public BaseConfusionBlastPotion(PotionEffect effect) : base(0xF06, effect) => Hue = 0x48D;
public BaseConfusionBlastPotion(Serial serial) : base(serial)
{
@ -97,10 +94,7 @@ namespace Server.Items
private class ThrowTarget : Target
{
public ThrowTarget(BaseConfusionBlastPotion potion) : base(12, true, TargetFlags.None)
{
Potion = potion;
}
public ThrowTarget(BaseConfusionBlastPotion potion) : base(12, true, TargetFlags.None) => Potion = potion;
public BaseConfusionBlastPotion Potion{ get; }

5
Projects/Scripts/Items/Skill Items/Magical/Potions/DarkglowPotion.cs
View file

@ -3,10 +3,7 @@ namespace Server.Items
public class DarkglowPotion : BasePoisonPotion
{
[Constructible]
public DarkglowPotion() : base(PotionEffect.Darkglow)
{
Hue = 0x96;
}
public DarkglowPotion() : base(PotionEffect.Darkglow) => Hue = 0x96;
public DarkglowPotion(Serial serial) : base(serial)
{

5
Projects/Scripts/Items/Skill Items/Magical/Potions/Explosion Potions/BaseExplosionPotion.cs
View file

@ -221,10 +221,7 @@ namespace Server.Items
private class ThrowTarget : Target
{
public ThrowTarget(BaseExplosionPotion potion) : base(12, true, TargetFlags.None)
{
Potion = potion;
}
public ThrowTarget(BaseExplosionPotion potion) : base(12, true, TargetFlags.None) => Potion = potion;
public BaseExplosionPotion Potion{ get; }

10
Projects/Scripts/Items/Skill Items/Magical/Potions/InvisibilityPotion.cs
View file

@ -8,10 +8,7 @@ namespace Server.Items
private static Dictionary<Mobile, Timer> m_Table = new Dictionary<Mobile, Timer>();
[Constructible]
public InvisibilityPotion() : base(0xF0A, PotionEffect.Invisibility)
{
Hue = 0x48D;
}
public InvisibilityPotion() : base(0xF0A, PotionEffect.Invisibility) => Hue = 0x48D;
public InvisibilityPotion(Serial serial) : base(serial)
{
@ -60,10 +57,7 @@ namespace Server.Items
RemoveTimer(m);
}
public static bool HasTimer(Mobile m)
{
return m_Table.ContainsKey(m);
}
public static bool HasTimer(Mobile m) => m_Table.ContainsKey(m);
public static void RemoveTimer(Mobile m, bool interrupted = false)
{

5
Projects/Scripts/Items/Skill Items/Magical/Potions/ParasiticPotion.cs
View file

@ -3,10 +3,7 @@ namespace Server.Items
public class ParasiticPotion : BasePoisonPotion
{
[Constructible]
public ParasiticPotion() : base(PotionEffect.Parasitic)
{
Hue = 0x17C;
}
public ParasiticPotion() : base(PotionEffect.Parasitic) => Hue = 0x17C;
public ParasiticPotion(Serial serial) : base(serial)
{