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

29
Projects/Scripts/Engines/Quests/Uzeraan Turmoil/Mobiles/MilitiaFighter.cs
View file

@ -33,28 +33,15 @@ namespace Server.Engines.Quests.Haven
AddItem(new LeatherGloves());
AddItem(new LeatherGorget());
Item weapon;
switch (Utility.Random(6))
var weapon = Utility.Random(6) switch
{
case 0:
weapon = new Broadsword();
break;
case 1:
weapon = new Cutlass();
break;
case 2:
weapon = new Katana();
break;
case 3:
weapon = new Longsword();
break;
case 4:
weapon = new Scimitar();
break;
default:
weapon = new VikingSword();
break;
}
0 => (Item)new Broadsword(),
1 => new Cutlass(),
2 => new Katana(),
3 => new Longsword(),
4 => new Scimitar(),
_ => new VikingSword()
};
weapon.Movable = false;
AddItem(weapon);

2
Projects/Scripts/Engines/Quests/Uzeraan Turmoil/Mobiles/Schmendrick.cs
View file

@ -112,7 +112,7 @@ namespace Server.Engines.Quests.Haven
if (m is PlayerMobile && !m.Frozen && !m.Alive && InRange(m, 4) && !InRange(oldLocation, 4) && InLOS(m))
{
if (m.Map == null || !m.Map.CanFit(m.Location, 16, false, false))
if (m.Map?.CanFit(m.Location, 16, false, false) != true)
{
m.SendLocalizedMessage(502391); // Thou can not be resurrected there!
}

31
Projects/Scripts/Engines/Quests/Uzeraan Turmoil/Mobiles/Uzeraan.cs
View file

@ -305,28 +305,15 @@ namespace Server.Engines.Quests.Haven
}
else
{
BaseWeapon weapon;
switch (Utility.Random(6))
var weapon = Utility.Random(6) switch
{
case 0:
weapon = new Broadsword();
break;
case 1:
weapon = new Cutlass();
break;
case 2:
weapon = new Katana();
break;
case 3:
weapon = new Longsword();
break;
case 4:
weapon = new Scimitar();
break;
default:
weapon = new VikingSword();
break;
}
0 => (BaseWeapon)new Broadsword(),
1 => new Cutlass(),
2 => new Katana(),
3 => new Longsword(),
4 => new Scimitar(),
_ => new VikingSword()
};
if (Core.AOS)
{
@ -392,7 +379,7 @@ namespace Server.Engines.Quests.Haven
if (m is PlayerMobile && !m.Frozen && !m.Alive && InRange(m, 4) && !InRange(oldLocation, 4) && InLOS(m))
{
if (m.Map == null || !m.Map.CanFit(m.Location, 16, false, false))
if (m.Map?.CanFit(m.Location, 16, false, false) != true)
{
m.SendLocalizedMessage(502391); // Thou can not be resurrected there!
}