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

Adds style cop (#109)

Browse source
This commit is contained in:
Kamron Batman 2020-04-26 00:16:02 -07:00 • committed by GitHub
parent 3e715bcb60
commit 556a17aba8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1725 changed files with 33831 additions and 38046 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Projects/Scripts/Mobiles/Monsters/LBR/Exodus/ExodusMinion.cs
View file

@ -56,7 +56,7 @@ namespace Server.Mobiles
}
public override string CorpseName => "a minion's corpse";
public bool FieldActive{ get; private set; }
public bool FieldActive { get; private set; }
public bool CanUseField // TODO: an OSI bug prevents to verify this
=> Hits >= HitsMax * 9 / 10;
@ -100,7 +100,7 @@ namespace Server.Mobiles
public override void OnDamagedBySpell(Mobile from)
{
if (from?.Alive == true && 0.4 > Utility.RandomDouble()) SendEBolt(from);
if (from?.Alive == true && Utility.RandomDouble() < 0.4) SendEBolt(from);
if (!FieldActive)
{
@ -129,7 +129,7 @@ namespace Server.Mobiles
attacker.SendAsciiMessage("Your weapon cannot penetrate the creature's magical barrier");
}
if (attacker?.Alive == true && attacker.Weapon is BaseRanged && 0.4 > Utility.RandomDouble())
if (attacker?.Alive == true && attacker.Weapon is BaseRanged && Utility.RandomDouble() < 0.4)
SendEBolt(attacker);
}

6
Projects/Scripts/Mobiles/Monsters/LBR/Exodus/ExodusOverseer.cs
View file

@ -47,7 +47,7 @@ namespace Server.Mobiles
}
public override string CorpseName => "an overseer's corpse";
public bool FieldActive{ get; private set; }
public bool FieldActive { get; private set; }
public bool CanUseField // TODO: an OSI bug prevents to verify this
=> Hits >= HitsMax * 9 / 10;
@ -90,7 +90,7 @@ namespace Server.Mobiles
public override void OnDamagedBySpell(Mobile from)
{
if (from?.Alive == true && 0.4 > Utility.RandomDouble()) SendEBolt(from);
if (from?.Alive == true && Utility.RandomDouble() < 0.4) SendEBolt(from);
if (!FieldActive)
{
@ -119,7 +119,7 @@ namespace Server.Mobiles
attacker.SendAsciiMessage("Your weapon cannot penetrate the creature's magical barrier");
}
if (attacker?.Alive == true && attacker.Weapon is BaseRanged && 0.4 > Utility.RandomDouble())
if (attacker?.Alive == true && attacker.Weapon is BaseRanged && Utility.RandomDouble() < 0.4)
SendEBolt(attacker);
}

12
Projects/Scripts/Mobiles/Monsters/LBR/Jukas/ChaosDragoon.cs
View file

@ -23,11 +23,11 @@ namespace Server.Mobiles
SetDamageType(ResistanceType.Cold, 25);
SetDamageType(ResistanceType.Energy, 25);
//SetResistance( ResistanceType.Physical, 25, 38 );
//SetResistance( ResistanceType.Fire, 25, 38 );
//SetResistance( ResistanceType.Cold, 25, 38 );
//SetResistance( ResistanceType.Poison, 25, 38 );
//SetResistance( ResistanceType.Energy, 25, 38 );
// SetResistance( ResistanceType.Physical, 25, 38 );
// SetResistance( ResistanceType.Fire, 25, 38 );
// SetResistance( ResistanceType.Cold, 25, 38 );
// SetResistance( ResistanceType.Poison, 25, 38 );
// SetResistance( ResistanceType.Energy, 25, 38 );
SetSkill(SkillName.Fencing, 77.6, 92.5);
SetSkill(SkillName.Healing, 60.3, 90.0);
@ -146,7 +146,7 @@ namespace Server.Mobiles
public override void GenerateLoot()
{
AddLoot(LootPack.Rich);
//AddLoot( LootPack.Gems );
// AddLoot( LootPack.Gems );
}
public override bool OnBeforeDeath()

1
Projects/Scripts/Mobiles/Monsters/LBR/Jukas/ChaosDragoonElite.cs
View file

@ -27,7 +27,6 @@ namespace Server.Mobiles
SetResistance(ResistanceType.Poison, 25, 35);
SetResistance(ResistanceType.Energy, 25, 35);*/
SetSkill(SkillName.Tactics, 80.1, 100.0);
SetSkill(SkillName.MagicResist, 100.1, 110.0);
SetSkill(SkillName.Anatomy, 80.1, 100.0);

2
Projects/Scripts/Mobiles/Monsters/LBR/Jukas/JukaLord.cs
View file

@ -74,7 +74,7 @@ namespace Server.Mobiles
public override void OnDamage(int amount, Mobile from, bool willKill)
{
if (!willKill && amount > 5 && from?.Player == true && 5 > Utility.Random(100))
if (!willKill && amount > 5 && from?.Player == true && Utility.Random(100) < 5)
{
string[] toSay =
{

32
Projects/Scripts/Mobiles/Monsters/LBR/Jukas/JukaWarrior.cs
View file

@ -73,29 +73,29 @@ namespace Server.Mobiles
{
base.OnGaveMeleeAttack(defender);
if (0.2 < Utility.RandomDouble())
if (Utility.RandomDouble() > 0.2)
return;
switch (Utility.Random(3))
{
case 0:
{
defender.SendLocalizedMessage(1004014); // You have been stunned!
defender.Freeze(TimeSpan.FromSeconds(4.0));
break;
}
{
defender.SendLocalizedMessage(1004014); // You have been stunned!
defender.Freeze(TimeSpan.FromSeconds(4.0));
break;
}
case 1:
{
defender.SendAsciiMessage("You have been hit by a paralyzing blow!");
defender.Freeze(TimeSpan.FromSeconds(3.0));
break;
}
{
defender.SendAsciiMessage("You have been hit by a paralyzing blow!");
defender.Freeze(TimeSpan.FromSeconds(3.0));
break;
}
case 2:
{
AOS.Damage(defender, this, Utility.Random(10, 5), 100, 0, 0, 0, 0);
defender.SendAsciiMessage("You have been hit by a critical strike!");
break;
}
{
AOS.Damage(defender, this, Utility.Random(10, 5), 100, 0, 0, 0, 0);
defender.SendAsciiMessage("You have been hit by a critical strike!");
break;
}
}
}

4
Projects/Scripts/Mobiles/Monsters/LBR/Meers/EnragedCreatures.cs
View file

@ -190,7 +190,6 @@ namespace Server.Mobiles
given "come" command, ie they wander towards their summoner,
but never actually "follow".
*/
else if (!Combat(this))
{
AIObject?.MoveTo(SummonMaster, false, 5);
@ -201,10 +200,9 @@ namespace Server.Mobiles
is a player or controlled/summoned, and the summoner is not already
engaged in combat.
*/
else if (!Combat(SummonMaster))
{
if (Combatant.Player || Combatant is BaseCreature bc && (bc.Controlled || bc.SummonMaster != null))
if (Combatant.Player || (Combatant is BaseCreature bc && (bc.Controlled || bc.SummonMaster != null)))
SummonMaster.Combatant = Combatant;
}
else

4
Projects/Scripts/Mobiles/Monsters/LBR/Meers/MeerCaptain.cs
View file

@ -133,7 +133,7 @@ namespace Server.Mobiles
if (!(m is MeerWarrior) || !IsFriend(m) || !CanBeBeneficial(m) || m.Hits >= m.HitsMax || m.Poisoned ||
MortalStrike.IsWounded(m))
continue;
DoBeneficial(m);
int toHeal = Utility.RandomMinMax(20, 30);
@ -145,7 +145,7 @@ namespace Server.Mobiles
m.FixedParticles(0x376A, 9, 32, 5030, EffectLayer.Waist);
m.PlaySound(0x202);
}
eable.Free();
}

2
Projects/Scripts/Mobiles/Monsters/LBR/Meers/MeerEternal.cs
View file

@ -179,7 +179,7 @@ namespace Server.Mobiles
case 3:
DoAreaLeech();
break;
// TODO: Resurrect ability
// TODO: Resurrect ability
}
}
}

4
Projects/Scripts/Mobiles/Monsters/LBR/Meers/MeerMage.cs
View file

@ -7,7 +7,7 @@ namespace Server.Mobiles
{
public class MeerMage : BaseCreature
{
private static Dictionary<Mobile, Timer> m_Table = new Dictionary<Mobile, Timer>();
private static readonly Dictionary<Mobile, Timer> m_Table = new Dictionary<Mobile, Timer>();
private DateTime m_NextAbilityTime;
@ -121,7 +121,7 @@ namespace Server.Mobiles
rabid.MoveToWorld(loc, combatant.Map);
}
Say(1071932); //Creatures of the forest, I call to thee! Aid me in the fight against all that is evil!
Say(1071932); // Creatures of the forest, I call to thee! Aid me in the fight against all that is evil!
}
else if (combatant.Player)
{