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

Fixes chaos damage bug with the spell system. Fixes various small other bugs. Fixes more merge cast type checks and uses default values.

Browse source
This commit is contained in:
Kamron Batman 2018-09-16 21:04:36 -07:00
parent 9542c79ea4
commit c155c82325
115 changed files with 644 additions and 1041 deletions
Download patch file Download diff file Expand all files Collapse all files

58
Scripts/Multis/Boats/BaseBoat.cs
View file

@ -231,9 +231,7 @@ namespace Server.Multis
for (int i = 0; i < sector.Multis.Count; i++)
{
BaseBoat boat = sector.Multis[i] as BaseBoat;
if (boat != null && boat.Contains(loc.X, loc.Y))
if (sector.Multis[i] is BaseBoat boat && boat.Contains(loc.X, loc.Y))
return boat;
}
@ -1521,19 +1519,15 @@ namespace Server.Multis
}
foreach (IEntity e in toMove)
if (e is Item)
if (e is Item item)
{
Item item = (Item)e;
item.NoMoveHS = true;
if (!(item is TillerMan || item is Hold || item is Plank))
item.Location = new Point3D(item.X + xOffset, item.Y + yOffset, item.Z);
}
else if (e is Mobile)
else if (e is Mobile m)
{
Mobile m = (Mobile)e;
m.NoMoveHS = true;
m.Location = new Point3D(m.X + xOffset, m.Y + yOffset, m.Z);
}
@ -1542,10 +1536,10 @@ namespace Server.Multis
Location = new Point3D(X + xOffset, Y + yOffset, Z);
foreach (IEntity e in toMove)
if (e is Item)
((Item)e).NoMoveHS = false;
else if (e is Mobile)
((Mobile)e).NoMoveHS = false;
if (e is Item item)
item.NoMoveHS = false;
else if (e is Mobile mobile)
mobile.NoMoveHS = false;
NoMoveHS = false;
}
@ -1567,16 +1561,12 @@ namespace Server.Multis
{
IEntity e = toMove[i];
if (e is Item)
if (e is Item item)
{
Item item = (Item)e;
item.Location = new Point3D(item.X + xOffset, item.Y + yOffset, item.Z + zOffset);
}
else if (e is Mobile)
else if (e is Mobile m)
{
Mobile m = (Mobile)e;
m.Location = new Point3D(m.X + xOffset, m.Y + yOffset, m.Z + zOffset);
}
}
@ -1595,23 +1585,19 @@ namespace Server.Multis
MultiComponentList mcl = Components;
foreach (object o in map.GetObjectsInBounds(new Rectangle2D(X + mcl.Min.X, Y + mcl.Min.Y, mcl.Width, mcl.Height))
foreach (IEntity o in map.GetObjectsInBounds(new Rectangle2D(X + mcl.Min.X, Y + mcl.Min.Y, mcl.Width, mcl.Height))
)
{
if (o == this || o is TillerMan || o is Hold || o is Plank)
continue;
if (o is Item)
if (o is Item item)
{
Item item = (Item)o;
if (Contains(item) && item.Visible && item.Z >= Z)
list.Add(item);
}
else if (o is Mobile)
else if (o is Mobile m)
{
Mobile m = (Mobile)o;
if (Contains(m))
list.Add(m);
}
@ -1679,16 +1665,12 @@ namespace Server.Multis
{
IEntity e = toMove[i];
if (e is Item)
if (e is Item item)
{
Item item = (Item)e;
item.Location = Rotate(item.Location, count);
}
else if (e is Mobile)
else if (e is Mobile m)
{
Mobile m = (Mobile)e;
m.Direction = (m.Direction - old + facing) & Direction.Mask;
m.Location = Rotate(m.Location, count);
}
@ -1894,10 +1876,8 @@ namespace Server.Multis
m_Stream.Write((byte)0xF3);
m_Stream.Write((short)0x1);
if (ent is BaseMulti)
if (ent is BaseMulti bm)
{
BaseMulti bm = (BaseMulti)ent;
m_Stream.Write((byte)0x02);
m_Stream.Write(bm.Serial);
// TODO: Mask no longer needed, merge with Item case?
@ -1915,10 +1895,8 @@ namespace Server.Multis
m_Stream.Write((short)bm.Hue);
m_Stream.Write((byte)bm.GetPacketFlags());
}
else if (ent is Mobile)
else if (ent is Mobile m)
{
Mobile m = (Mobile)ent;
m_Stream.Write((byte)0x01);
m_Stream.Write(m.Serial);
m_Stream.Write((short)m.Body);
@ -1935,10 +1913,8 @@ namespace Server.Multis
m_Stream.Write((short)m.Hue);
m_Stream.Write((byte)m.GetPacketFlags());
}
else if (ent is Item)
else if (ent is Item item)
{
Item item = (Item)ent;
m_Stream.Write((byte)0x00);
m_Stream.Write(item.Serial);
m_Stream.Write((ushort)(item.ItemID & 0xFFFF));

8
Scripts/Multis/Boats/BaseBoatDeed.cs
View file

@ -153,12 +153,10 @@ namespace Server.Multis
protected override void OnTarget(Mobile from, object o)
{
IPoint3D ip = o as IPoint3D;
if (ip != null)
if (o is IPoint3D ip)
{
if (ip is Item)
ip = ((Item)ip).GetWorldTop();
if (ip is Item item)
ip = item.GetWorldTop();
Point3D p = new Point3D(ip);

8
Scripts/Multis/Boats/BaseDockedBoat.cs
View file

@ -172,12 +172,10 @@ namespace Server.Multis
protected override void OnTarget(Mobile from, object o)
{
IPoint3D ip = o as IPoint3D;
if (ip != null)
if (o is IPoint3D ip)
{
if (ip is Item)
ip = ((Item)ip).GetWorldTop();
if (ip is Item item)
ip = item.GetWorldTop();
Point3D p = new Point3D(ip);

8
Scripts/Multis/Boats/Strandedness.cs
View file

@ -97,17 +97,17 @@ namespace Server.Misc
object surface = map.GetTopSurface(from.Location);
if (surface is LandTile)
if (surface is LandTile tile)
{
int id = ((LandTile)surface).ID;
int id = tile.ID;
return id >= 168 && id <= 171
|| id >= 310 && id <= 311;
}
if (surface is StaticTile)
if (surface is StaticTile staticTile)
{
int id = ((StaticTile)surface).ID;
int id = staticTile.ID;
return id >= 0x1796 && id <= 0x17B2;
}

4
Scripts/Multis/Boats/TillerMan.cs
View file

@ -79,8 +79,8 @@ namespace Server.Items
public override bool OnDragDrop(Mobile from, Item dropped)
{
if (dropped is MapItem && m_Boat != null && m_Boat.CanCommand(from) && m_Boat.Contains(from))
m_Boat.AssociateMap((MapItem)dropped);
if (dropped is MapItem item && m_Boat != null && m_Boat.CanCommand(from) && m_Boat.Contains(from))
m_Boat.AssociateMap(item);
return false;
}