Fixes code according to modern code style. Fixes a few expression bugs.
This commit is contained in:
Kamron Batman
parent
89eea25e5f
commit
970fd563b2
3324 changed files with 441118 additions and 433755 deletions
|
|
@ -1,179 +1,178 @@
|
|||
namespace Server.Misc
|
||||
{
|
||||
public class Strandedness
|
||||
{
|
||||
private static Point2D[] m_Felucca = {
|
||||
new Point2D( 2528, 3568 ), new Point2D( 2376, 3400 ), new Point2D( 2528, 3896 ),
|
||||
new Point2D( 2168, 3904 ), new Point2D( 1136, 3416 ), new Point2D( 1432, 3648 ),
|
||||
new Point2D( 1416, 4000 ), new Point2D( 4512, 3936 ), new Point2D( 4440, 3120 ),
|
||||
new Point2D( 4192, 3672 ), new Point2D( 4720, 3472 ), new Point2D( 3744, 2768 ),
|
||||
new Point2D( 3480, 2432 ), new Point2D( 3560, 2136 ), new Point2D( 3792, 2112 ),
|
||||
new Point2D( 2800, 2296 ), new Point2D( 2736, 2016 ), new Point2D( 4576, 1456 ),
|
||||
new Point2D( 4680, 1152 ), new Point2D( 4304, 1104 ), new Point2D( 4496, 984 ),
|
||||
new Point2D( 4248, 696 ), new Point2D( 4040, 616 ), new Point2D( 3896, 248 ),
|
||||
new Point2D( 4176, 384 ), new Point2D( 3672, 1104 ), new Point2D( 3520, 1152 ),
|
||||
new Point2D( 3720, 1360 ), new Point2D( 2184, 2152 ), new Point2D( 1952, 2088 ),
|
||||
new Point2D( 2056, 1936 ), new Point2D( 1720, 1992 ), new Point2D( 472, 2064 ),
|
||||
new Point2D( 656, 2096 ), new Point2D( 3008, 3592 ), new Point2D( 2784, 3472 ),
|
||||
new Point2D( 5456, 2400 ), new Point2D( 5976, 2424 ), new Point2D( 5328, 3112 ),
|
||||
new Point2D( 5792, 3152 ), new Point2D( 2120, 3616 ), new Point2D( 2136, 3128 ),
|
||||
new Point2D( 1632, 3528 ), new Point2D( 1328, 3160 ), new Point2D( 1072, 3136 ),
|
||||
new Point2D( 1128, 2976 ), new Point2D( 960, 2576 ), new Point2D( 752, 1832 ),
|
||||
new Point2D( 184, 1488 ), new Point2D( 592, 1440 ), new Point2D( 368, 1216 ),
|
||||
new Point2D( 232, 752 ), new Point2D( 696, 744 ), new Point2D( 304, 1000 ),
|
||||
new Point2D( 840, 376 ), new Point2D( 1192, 624 ), new Point2D( 1200, 192 ),
|
||||
new Point2D( 1512, 240 ), new Point2D( 1336, 456 ), new Point2D( 1536, 648 ),
|
||||
new Point2D( 1104, 952 ), new Point2D( 1864, 264 ), new Point2D( 2136, 200 ),
|
||||
new Point2D( 2160, 528 ), new Point2D( 1904, 512 ), new Point2D( 2240, 784 ),
|
||||
new Point2D( 2536, 776 ), new Point2D( 2488, 216 ), new Point2D( 2336, 72 ),
|
||||
new Point2D( 2648, 288 ), new Point2D( 2680, 576 ), new Point2D( 2896, 88 ),
|
||||
new Point2D( 2840, 344 ), new Point2D( 3136, 72 ), new Point2D( 2968, 520 ),
|
||||
new Point2D( 3192, 328 ), new Point2D( 3448, 208 ), new Point2D( 3432, 608 ),
|
||||
new Point2D( 3184, 752 ), new Point2D( 2800, 704 ), new Point2D( 2768, 1016 ),
|
||||
new Point2D( 2448, 1232 ), new Point2D( 2272, 920 ), new Point2D( 2072, 1080 ),
|
||||
new Point2D( 2048, 1264 ), new Point2D( 1808, 1528 ), new Point2D( 1496, 1880 ),
|
||||
new Point2D( 1656, 2168 ), new Point2D( 2096, 2320 ), new Point2D( 1816, 2528 ),
|
||||
new Point2D( 1840, 2640 ), new Point2D( 1928, 2952 ), new Point2D( 2120, 2712 )
|
||||
};
|
||||
public class Strandedness
|
||||
{
|
||||
private static Point2D[] m_Felucca =
|
||||
{
|
||||
new Point2D(2528, 3568), new Point2D(2376, 3400), new Point2D(2528, 3896),
|
||||
new Point2D(2168, 3904), new Point2D(1136, 3416), new Point2D(1432, 3648),
|
||||
new Point2D(1416, 4000), new Point2D(4512, 3936), new Point2D(4440, 3120),
|
||||
new Point2D(4192, 3672), new Point2D(4720, 3472), new Point2D(3744, 2768),
|
||||
new Point2D(3480, 2432), new Point2D(3560, 2136), new Point2D(3792, 2112),
|
||||
new Point2D(2800, 2296), new Point2D(2736, 2016), new Point2D(4576, 1456),
|
||||
new Point2D(4680, 1152), new Point2D(4304, 1104), new Point2D(4496, 984),
|
||||
new Point2D(4248, 696), new Point2D(4040, 616), new Point2D(3896, 248),
|
||||
new Point2D(4176, 384), new Point2D(3672, 1104), new Point2D(3520, 1152),
|
||||
new Point2D(3720, 1360), new Point2D(2184, 2152), new Point2D(1952, 2088),
|
||||
new Point2D(2056, 1936), new Point2D(1720, 1992), new Point2D(472, 2064),
|
||||
new Point2D(656, 2096), new Point2D(3008, 3592), new Point2D(2784, 3472),
|
||||
new Point2D(5456, 2400), new Point2D(5976, 2424), new Point2D(5328, 3112),
|
||||
new Point2D(5792, 3152), new Point2D(2120, 3616), new Point2D(2136, 3128),
|
||||
new Point2D(1632, 3528), new Point2D(1328, 3160), new Point2D(1072, 3136),
|
||||
new Point2D(1128, 2976), new Point2D(960, 2576), new Point2D(752, 1832),
|
||||
new Point2D(184, 1488), new Point2D(592, 1440), new Point2D(368, 1216),
|
||||
new Point2D(232, 752), new Point2D(696, 744), new Point2D(304, 1000),
|
||||
new Point2D(840, 376), new Point2D(1192, 624), new Point2D(1200, 192),
|
||||
new Point2D(1512, 240), new Point2D(1336, 456), new Point2D(1536, 648),
|
||||
new Point2D(1104, 952), new Point2D(1864, 264), new Point2D(2136, 200),
|
||||
new Point2D(2160, 528), new Point2D(1904, 512), new Point2D(2240, 784),
|
||||
new Point2D(2536, 776), new Point2D(2488, 216), new Point2D(2336, 72),
|
||||
new Point2D(2648, 288), new Point2D(2680, 576), new Point2D(2896, 88),
|
||||
new Point2D(2840, 344), new Point2D(3136, 72), new Point2D(2968, 520),
|
||||
new Point2D(3192, 328), new Point2D(3448, 208), new Point2D(3432, 608),
|
||||
new Point2D(3184, 752), new Point2D(2800, 704), new Point2D(2768, 1016),
|
||||
new Point2D(2448, 1232), new Point2D(2272, 920), new Point2D(2072, 1080),
|
||||
new Point2D(2048, 1264), new Point2D(1808, 1528), new Point2D(1496, 1880),
|
||||
new Point2D(1656, 2168), new Point2D(2096, 2320), new Point2D(1816, 2528),
|
||||
new Point2D(1840, 2640), new Point2D(1928, 2952), new Point2D(2120, 2712)
|
||||
};
|
||||
|
||||
private static Point2D[] m_Trammel = m_Felucca;
|
||||
private static Point2D[] m_Trammel = m_Felucca;
|
||||
|
||||
private static Point2D[] m_Ilshenar = {
|
||||
new Point2D( 1252, 1180 ), new Point2D( 1562, 1090 ), new Point2D( 1444, 1016 ),
|
||||
new Point2D( 1324, 968 ), new Point2D( 1418, 806 ), new Point2D( 1722, 874 ),
|
||||
new Point2D( 1456, 684 ), new Point2D( 1036, 866 ), new Point2D( 612, 476 ),
|
||||
new Point2D( 1476, 372 ), new Point2D( 762, 472 ), new Point2D( 812, 1162 ),
|
||||
new Point2D( 1422, 1144 ), new Point2D( 1254, 1066 ), new Point2D( 1598, 870 ),
|
||||
new Point2D( 1358, 866 ), new Point2D( 510, 302 ), new Point2D( 510, 392 )
|
||||
};
|
||||
private static Point2D[] m_Ilshenar =
|
||||
{
|
||||
new Point2D(1252, 1180), new Point2D(1562, 1090), new Point2D(1444, 1016),
|
||||
new Point2D(1324, 968), new Point2D(1418, 806), new Point2D(1722, 874),
|
||||
new Point2D(1456, 684), new Point2D(1036, 866), new Point2D(612, 476),
|
||||
new Point2D(1476, 372), new Point2D(762, 472), new Point2D(812, 1162),
|
||||
new Point2D(1422, 1144), new Point2D(1254, 1066), new Point2D(1598, 870),
|
||||
new Point2D(1358, 866), new Point2D(510, 302), new Point2D(510, 392)
|
||||
};
|
||||
|
||||
private static Point2D[] m_Tokuno = {
|
||||
//Makoto-Jima
|
||||
new Point2D( 837, 1351 ), new Point2D( 941, 1241 ), new Point2D( 959, 1185 ),
|
||||
new Point2D( 923, 1091 ), new Point2D( 904, 983 ), new Point2D( 845, 944 ),
|
||||
new Point2D( 829, 896 ), new Point2D( 794, 852 ), new Point2D( 766, 821 ),
|
||||
new Point2D( 695, 814 ), new Point2D( 576, 835 ), new Point2D( 518, 840 ),
|
||||
new Point2D( 519, 902 ), new Point2D( 502, 950 ), new Point2D( 503, 1045 ),
|
||||
new Point2D( 547, 1131 ), new Point2D( 518, 1204 ), new Point2D( 506, 1243 ),
|
||||
new Point2D( 526, 1271 ), new Point2D( 562, 1295 ), new Point2D( 616, 1335 ),
|
||||
new Point2D( 789, 1347 ), new Point2D( 712, 1359 ),
|
||||
private static Point2D[] m_Tokuno =
|
||||
{
|
||||
//Makoto-Jima
|
||||
new Point2D(837, 1351), new Point2D(941, 1241), new Point2D(959, 1185),
|
||||
new Point2D(923, 1091), new Point2D(904, 983), new Point2D(845, 944),
|
||||
new Point2D(829, 896), new Point2D(794, 852), new Point2D(766, 821),
|
||||
new Point2D(695, 814), new Point2D(576, 835), new Point2D(518, 840),
|
||||
new Point2D(519, 902), new Point2D(502, 950), new Point2D(503, 1045),
|
||||
new Point2D(547, 1131), new Point2D(518, 1204), new Point2D(506, 1243),
|
||||
new Point2D(526, 1271), new Point2D(562, 1295), new Point2D(616, 1335),
|
||||
new Point2D(789, 1347), new Point2D(712, 1359),
|
||||
|
||||
//Homare-Jima
|
||||
new Point2D( 202, 498 ), new Point2D( 116, 600 ), new Point2D( 107, 699 ),
|
||||
new Point2D( 162, 799 ), new Point2D( 158, 889 ), new Point2D( 169, 989 ),
|
||||
new Point2D( 194, 1101 ), new Point2D( 250, 1163 ), new Point2D( 295, 1176 ),
|
||||
new Point2D( 280, 1194 ), new Point2D( 286, 1102 ), new Point2D( 250, 1000 ),
|
||||
new Point2D( 260, 906 ), new Point2D( 360, 838 ), new Point2D( 389, 763 ),
|
||||
new Point2D( 415, 662 ), new Point2D( 500, 597 ), new Point2D( 570, 572 ),
|
||||
new Point2D( 631, 577 ), new Point2D( 692, 500 ), new Point2D( 723, 445 ),
|
||||
new Point2D( 672, 379 ), new Point2D( 626, 332 ), new Point2D( 494, 291 ),
|
||||
new Point2D( 371, 336 ), new Point2D( 324, 334 ), new Point2D( 270, 362 ),
|
||||
//Homare-Jima
|
||||
new Point2D(202, 498), new Point2D(116, 600), new Point2D(107, 699),
|
||||
new Point2D(162, 799), new Point2D(158, 889), new Point2D(169, 989),
|
||||
new Point2D(194, 1101), new Point2D(250, 1163), new Point2D(295, 1176),
|
||||
new Point2D(280, 1194), new Point2D(286, 1102), new Point2D(250, 1000),
|
||||
new Point2D(260, 906), new Point2D(360, 838), new Point2D(389, 763),
|
||||
new Point2D(415, 662), new Point2D(500, 597), new Point2D(570, 572),
|
||||
new Point2D(631, 577), new Point2D(692, 500), new Point2D(723, 445),
|
||||
new Point2D(672, 379), new Point2D(626, 332), new Point2D(494, 291),
|
||||
new Point2D(371, 336), new Point2D(324, 334), new Point2D(270, 362),
|
||||
|
||||
//Isamu-Jima
|
||||
new Point2D( 1240, 1076 ), new Point2D( 1189, 1115 ), new Point2D( 1046, 1039 ),
|
||||
new Point2D( 1025, 885 ), new Point2D( 907, 809 ), new Point2D( 840, 506 ),
|
||||
new Point2D( 799, 396 ), new Point2D( 720, 258 ), new Point2D( 744, 158 ),
|
||||
new Point2D( 904, 37 ), new Point2D( 974, 91 ), new Point2D( 1020, 187 ),
|
||||
new Point2D( 1035, 288 ), new Point2D( 1104, 395 ), new Point2D( 1215, 462 ),
|
||||
new Point2D( 1275, 488 ), new Point2D( 1348, 611 ), new Point2D( 1363, 739 ),
|
||||
new Point2D( 1364, 765 ), new Point2D( 1364, 876 ), new Point2D( 1300, 936 ),
|
||||
new Point2D( 1240, 1003 )
|
||||
//Isamu-Jima
|
||||
new Point2D(1240, 1076), new Point2D(1189, 1115), new Point2D(1046, 1039),
|
||||
new Point2D(1025, 885), new Point2D(907, 809), new Point2D(840, 506),
|
||||
new Point2D(799, 396), new Point2D(720, 258), new Point2D(744, 158),
|
||||
new Point2D(904, 37), new Point2D(974, 91), new Point2D(1020, 187),
|
||||
new Point2D(1035, 288), new Point2D(1104, 395), new Point2D(1215, 462),
|
||||
new Point2D(1275, 488), new Point2D(1348, 611), new Point2D(1363, 739),
|
||||
new Point2D(1364, 765), new Point2D(1364, 876), new Point2D(1300, 936),
|
||||
new Point2D(1240, 1003)
|
||||
};
|
||||
|
||||
public static void Initialize()
|
||||
{
|
||||
EventSink.Login += EventSink_Login;
|
||||
}
|
||||
|
||||
};
|
||||
private static bool IsStranded(Mobile from)
|
||||
{
|
||||
Map map = from.Map;
|
||||
|
||||
public static void Initialize()
|
||||
{
|
||||
EventSink.Login += EventSink_Login;
|
||||
}
|
||||
if (map == null)
|
||||
return false;
|
||||
|
||||
private static bool IsStranded( Mobile from )
|
||||
{
|
||||
Map map = from.Map;
|
||||
object surface = map.GetTopSurface(from.Location);
|
||||
|
||||
if ( map == null )
|
||||
return false;
|
||||
if (surface is LandTile)
|
||||
{
|
||||
int id = ((LandTile)surface).ID;
|
||||
|
||||
object surface = map.GetTopSurface( from.Location );
|
||||
return id >= 168 && id <= 171
|
||||
|| id >= 310 && id <= 311;
|
||||
}
|
||||
|
||||
if ( surface is LandTile ) {
|
||||
int id = ((LandTile)surface).ID;
|
||||
if (surface is StaticTile)
|
||||
{
|
||||
int id = ((StaticTile)surface).ID;
|
||||
|
||||
return (id >= 168 && id <= 171)
|
||||
|| (id >= 310 && id <= 311);
|
||||
}
|
||||
return id >= 0x1796 && id <= 0x17B2;
|
||||
}
|
||||
|
||||
if ( surface is StaticTile ) {
|
||||
int id = ((StaticTile)surface).ID;
|
||||
return false;
|
||||
}
|
||||
|
||||
return (id >= 0x1796 && id <= 0x17B2);
|
||||
}
|
||||
public static void EventSink_Login(LoginEventArgs e)
|
||||
{
|
||||
Mobile from = e.Mobile;
|
||||
|
||||
return false;
|
||||
}
|
||||
if (!IsStranded(from))
|
||||
return;
|
||||
|
||||
public static void EventSink_Login( LoginEventArgs e )
|
||||
{
|
||||
Mobile from = e.Mobile;
|
||||
Map map = from.Map;
|
||||
|
||||
if ( !IsStranded( from ) )
|
||||
return;
|
||||
Point2D[] list;
|
||||
|
||||
Map map = from.Map;
|
||||
if (map == Map.Felucca)
|
||||
list = m_Felucca;
|
||||
else if (map == Map.Trammel)
|
||||
list = m_Trammel;
|
||||
else if (map == Map.Ilshenar)
|
||||
list = m_Ilshenar;
|
||||
else if (map == Map.Tokuno)
|
||||
list = m_Tokuno;
|
||||
else
|
||||
return;
|
||||
|
||||
Point2D[] list;
|
||||
Point2D p = Point2D.Zero;
|
||||
double pdist = double.MaxValue;
|
||||
|
||||
if ( map == Map.Felucca )
|
||||
list = m_Felucca;
|
||||
else if ( map == Map.Trammel )
|
||||
list = m_Trammel;
|
||||
else if ( map == Map.Ilshenar )
|
||||
list = m_Ilshenar;
|
||||
else if ( map == Map.Tokuno )
|
||||
list = m_Tokuno;
|
||||
else
|
||||
return;
|
||||
for (int i = 0; i < list.Length; ++i)
|
||||
{
|
||||
double dist = from.GetDistanceToSqrt(list[i]);
|
||||
|
||||
Point2D p = Point2D.Zero;
|
||||
double pdist = double.MaxValue;
|
||||
if (dist < pdist)
|
||||
{
|
||||
p = list[i];
|
||||
pdist = dist;
|
||||
}
|
||||
}
|
||||
|
||||
for ( int i = 0; i < list.Length; ++i )
|
||||
{
|
||||
double dist = from.GetDistanceToSqrt( list[i] );
|
||||
int x = p.X, y = p.Y;
|
||||
int z;
|
||||
bool canFit = false;
|
||||
|
||||
if ( dist < pdist )
|
||||
{
|
||||
p = list[i];
|
||||
pdist = dist;
|
||||
}
|
||||
}
|
||||
z = map.GetAverageZ(x, y);
|
||||
canFit = map.CanSpawnMobile(x, y, z);
|
||||
|
||||
int x = p.X, y = p.Y;
|
||||
int z;
|
||||
bool canFit = false;
|
||||
for (int i = 1; !canFit && i <= 40; i += 2)
|
||||
for (int xo = -1; !canFit && xo <= 1; ++xo)
|
||||
for (int yo = -1; !canFit && yo <= 1; ++yo)
|
||||
{
|
||||
if (xo == 0 && yo == 0)
|
||||
continue;
|
||||
|
||||
z = map.GetAverageZ( x, y );
|
||||
canFit = map.CanSpawnMobile( x, y, z );
|
||||
x = p.X + xo * i;
|
||||
y = p.Y + yo * i;
|
||||
z = map.GetAverageZ(x, y);
|
||||
canFit = map.CanSpawnMobile(x, y, z);
|
||||
}
|
||||
|
||||
for ( int i = 1; !canFit && i <= 40; i += 2 )
|
||||
{
|
||||
for ( int xo = -1; !canFit && xo <= 1; ++xo )
|
||||
{
|
||||
for ( int yo = -1; !canFit && yo <= 1; ++yo )
|
||||
{
|
||||
if ( xo == 0 && yo == 0 )
|
||||
continue;
|
||||
|
||||
x = p.X + (xo * i);
|
||||
y = p.Y + (yo * i);
|
||||
z = map.GetAverageZ( x, y );
|
||||
canFit = map.CanSpawnMobile( x, y, z );
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if ( canFit )
|
||||
from.Location = new Point3D( x, y, z );
|
||||
}
|
||||
}
|
||||
}
|
||||
if (canFit)
|
||||
from.Location = new Point3D(x, y, z);
|
||||
}
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue