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

Modernization Fixes & Updates to Default Values (#3)

Browse source
This commit is contained in:
Kamron Batman 2018-10-28 00:33:16 -07:00 • committed by GitHub
parent 445eddff68
commit dcf64091b1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
768 changed files with 10507 additions and 14196 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1376,11 +1376,9 @@ namespace Server.Multis
{
Point2D dest = MapItem.Pins[NextNavPoint];
int x, y;
MapItem.ConvertToWorld(dest.X, dest.Y, out x, out y);
MapItem.ConvertToWorld(dest.X, dest.Y, out int x, out int y);
int maxSpeed;
dir = GetMovementFor(x, y, out maxSpeed);
dir = GetMovementFor(x, y, out int maxSpeed);
if (maxSpeed == 0)
{

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

@ -103,7 +103,7 @@ namespace Server.Multis
return;
}
if (from.Region.IsPartOf(typeof(HouseRegion)) || BaseBoat.FindBoatAt(from, from.Map) != null)
if (from.Region.IsPartOf<HouseRegion>() || BaseBoat.FindBoatAt(from, from.Map) != null)
{
from.SendLocalizedMessage(1010568, null,
0x25); // You may not place a ship while on another ship or inside a house.
@ -162,9 +162,9 @@ namespace Server.Multis
Region region = Region.Find(p, from.Map);
if (region.IsPartOf(typeof(DungeonRegion)))
if (region.IsPartOf<DungeonRegion>())
from.SendLocalizedMessage(502488); // You can not place a ship inside a dungeon.
else if (region.IsPartOf(typeof(HouseRegion)) || region.IsPartOf(typeof(ChampionSpawnRegion)))
else if (region.IsPartOf<HouseRegion>() || region.IsPartOf<ChampionSpawnRegion>())
from.SendLocalizedMessage(1042549); // A boat may not be placed in this area.
else
m_Deed.OnPlacement(from, p);

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

@ -181,9 +181,9 @@ namespace Server.Multis
Region region = Region.Find(p, from.Map);
if (region.IsPartOf(typeof(DungeonRegion)))
if (region.IsPartOf<DungeonRegion>())
from.SendLocalizedMessage(502488); // You can not place a ship inside a dungeon.
else if (region.IsPartOf(typeof(HouseRegion)) || region.IsPartOf(typeof(ChampionSpawnRegion)))
else if (region.IsPartOf<HouseRegion>() || region.IsPartOf<ChampionSpawnRegion>())
from.SendLocalizedMessage(1042549); // A boat may not be placed in this area.
else
m_Model.OnPlacement(from, p);

2
Scripts/Multis/Boats/ConfirmDryDockGump.cs
View file

@ -13,7 +13,7 @@ namespace Server.Multis
m_From = from;
m_Boat = boat;
m_From.CloseGump(typeof(ConfirmDryDockGump));
m_From.CloseGump<ConfirmDryDockGump>();
AddPage(0);

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

@ -191,7 +191,7 @@ namespace Server.Items
z = from.Z + j;
if (map.CanFit(x, y, z, 16, false, false) && !SpellHelper.CheckMulti(new Point3D(x, y, z), map) &&
!Region.Find(new Point3D(x, y, z), map).IsPartOf(typeof(StrongholdRegion)))
!Region.Find(new Point3D(x, y, z), map).IsPartOf<StrongholdRegion>())
{
if (i == 1 && j >= -2 && j <= 2)
return true;
@ -204,7 +204,7 @@ namespace Server.Items
z = map.GetAverageZ(x, y);
if (map.CanFit(x, y, z, 16, false, false) && !SpellHelper.CheckMulti(new Point3D(x, y, z), map) &&
!Region.Find(new Point3D(x, y, z), map).IsPartOf(typeof(StrongholdRegion)))
!Region.Find(new Point3D(x, y, z), map).IsPartOf<StrongholdRegion>())
{
if (i == 1)
return true;