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

Formatting #2 (#59)

Browse source
This commit is contained in:
Kamron Batman 2019-10-05 00:37:03 -07:00 • committed by GitHub
parent 096d39609e
commit 8e9221bb5a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
400 changed files with 3688 additions and 5969 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Projects/Scripts/Mobiles/Monsters/AOS/DemonKnight.cs
View file

@ -198,13 +198,13 @@ namespace Server.Mobiles
public override WeaponAbility GetWeaponAbility()
{
switch (Utility.Random(3))
return Utility.Random(3) switch
{
default:
case 0: return WeaponAbility.DoubleStrike;
case 1: return WeaponAbility.WhirlwindAttack;
case 2: return WeaponAbility.CrushingBlow;
}
0 => WeaponAbility.DoubleStrike,
1 => WeaponAbility.WhirlwindAttack,
2 => WeaponAbility.CrushingBlow,
_ => WeaponAbility.DoubleStrike
};
}
public override void OnDeath(Container c)

22
Projects/Scripts/Mobiles/Monsters/Ants/AntLion.cs
View file

@ -43,23 +43,13 @@ namespace Server.Mobiles
if (Core.ML && Utility.RandomDouble() < .33)
PackItem(Seed.RandomPeculiarSeed(2));
Item orepile = null; /* no trust, no love :( */
switch (Utility.Random(4))
var orepile = Utility.Random(4) switch
{
case 0:
orepile = new DullCopperOre();
break;
case 1:
orepile = new ShadowIronOre();
break;
case 2:
orepile = new CopperOre();
break;
default:
orepile = new BronzeOre();
break;
}
0 => (Item)new DullCopperOre(),
1 => new ShadowIronOre(),
2 => new CopperOre(),
_ => new BronzeOre()
};
orepile.Amount = Utility.RandomMinMax(1, 10);
orepile.ItemID = 0x19B9;

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

@ -40,44 +40,24 @@ namespace Server.Mobiles
Fame = 5000;
Karma = -5000;
CraftResource res = CraftResource.None;
switch (Utility.Random(6))
var res = Utility.Random(6) switch
{
case 0:
res = CraftResource.BlackScales;
break;
case 1:
res = CraftResource.RedScales;
break;
case 2:
res = CraftResource.BlueScales;
break;
case 3:
res = CraftResource.YellowScales;
break;
case 4:
res = CraftResource.GreenScales;
break;
case 5:
res = CraftResource.WhiteScales;
break;
}
0 => CraftResource.BlackScales,
1 => CraftResource.RedScales,
2 => CraftResource.BlueScales,
3 => CraftResource.YellowScales,
4 => CraftResource.GreenScales,
5 => CraftResource.WhiteScales,
_ => CraftResource.None
};
BaseWeapon melee = null;
switch (Utility.Random(3))
var melee = Utility.Random(3) switch
{
case 0:
melee = new Kryss();
break;
case 1:
melee = new Broadsword();
break;
case 2:
melee = new Katana();
break;
}
0 => (BaseWeapon)new Kryss(),
1 => new Broadsword(),
2 => new Katana(),
_ => null
};
melee.Movable = false;
AddItem(melee);

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

@ -41,44 +41,25 @@ namespace Server.Mobiles
Karma = -8000;
CraftResource res = CraftResource.None;
;
switch (Utility.Random(6))
res = Utility.Random(6) switch
{
case 0:
res = CraftResource.BlackScales;
break;
case 1:
res = CraftResource.RedScales;
break;
case 2:
res = CraftResource.BlueScales;
break;
case 3:
res = CraftResource.YellowScales;
break;
case 4:
res = CraftResource.GreenScales;
break;
case 5:
res = CraftResource.WhiteScales;
break;
}
0 => CraftResource.BlackScales,
1 => CraftResource.RedScales,
2 => CraftResource.BlueScales,
3 => CraftResource.YellowScales,
4 => CraftResource.GreenScales,
5 => CraftResource.WhiteScales,
_ => res
};
BaseWeapon melee = null;
switch (Utility.Random(3))
var melee = Utility.Random(3) switch
{
case 0:
melee = new Kryss();
break;
case 1:
melee = new Broadsword();
break;
case 2:
melee = new Katana();
break;
}
0 => (BaseWeapon)new Kryss(),
1 => new Broadsword(),
2 => new Katana(),
_ => null
};
melee.Movable = false;
AddItem(melee);
@ -139,36 +120,19 @@ namespace Server.Mobiles
break;
}
switch (Utility.Random(9))
res = Utility.Random(9) switch
{
case 0:
res = CraftResource.DullCopper;
break;
case 1:
res = CraftResource.ShadowIron;
break;
case 2:
res = CraftResource.Copper;
break;
case 3:
res = CraftResource.Bronze;
break;
case 4:
res = CraftResource.Gold;
break;
case 5:
res = CraftResource.Agapite;
break;
case 6:
res = CraftResource.Verite;
break;
case 7:
res = CraftResource.Valorite;
break;
case 8:
res = CraftResource.Iron;
break;
}
0 => CraftResource.DullCopper,
1 => CraftResource.ShadowIron,
2 => CraftResource.Copper,
3 => CraftResource.Bronze,
4 => CraftResource.Gold,
5 => CraftResource.Agapite,
6 => CraftResource.Verite,
7 => CraftResource.Valorite,
8 => CraftResource.Iron,
_ => res
};
SwampDragon mt = new SwampDragon();
mt.HasBarding = true;
@ -240,4 +204,4 @@ namespace Server.Mobiles
int version = reader.ReadInt();
}
}
}
}

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

@ -108,25 +108,14 @@ namespace Server.Mobiles
if (!combatant.Map.CanSpawnMobile(loc))
continue;
BaseCreature rabid;
switch (i)
var rabid = i switch
{
case 0:
rabid = new EnragedRabbit(this);
break;
case 1:
rabid = new EnragedHind(this);
break;
case 2:
rabid = new EnragedHart(this);
break;
case 3:
rabid = new EnragedBlackBear(this);
break;
default:
rabid = new EnragedEagle(this);
break;
}
0 => (BaseCreature)new EnragedRabbit(this),
1 => new EnragedHind(this),
2 => new EnragedHart(this),
3 => new EnragedBlackBear(this),
_ => new EnragedEagle(this)
};
rabid.FocusMob = combatant;
rabid.MoveToWorld(loc, combatant.Map);

4
Projects/Scripts/Mobiles/Monsters/Misc/Magic/EtherealWarrior.cs
View file

@ -72,7 +72,7 @@ namespace Server.Mobiles
{
m_NextResurrect = DateTime.UtcNow + ResurrectDelay;
if (!from.Criminal && from.Kills < 5 && from.Karma > 0)
if (from.Map != null && from.Map.CanFit(from.Location, 16, false, false))
if (from.Map?.CanFit(from.Location, 16, false, false) == true)
{
Direction = GetDirectionTo(from);
from.PlaySound(0x1F2);
@ -123,4 +123,4 @@ namespace Server.Mobiles
int version = reader.ReadInt();
}
}
}
}

2
Projects/Scripts/Mobiles/Monsters/SE/Kappa.cs
View file

@ -134,7 +134,7 @@ namespace Server.Mobiles
int amt = 0;
Mobile target = this;
int rand = Utility.Random(1, 100);
if (willKill) amt = ((rand % 5) >> 2) + 3;
if (willKill) amt = (rand % 5 >> 2) + 3;
if (Hits < 100 && rand < 21)
{
target = rand % 2 < 1 ? this : from;

2
Projects/Scripts/Mobiles/Monsters/SE/Yamandon.cs
View file

@ -108,7 +108,7 @@ namespace Server.Mobiles
target = m;
}
if (target == null || !target.InRange(this, 18))
if (target?.InRange(this, 18) != true)
target = attacker;
Animate(10, 4, 1, true, false, 0);