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,287 +1,292 @@
|
|||
using System;
|
||||
using Server.Factions;
|
||||
using Server.Gumps;
|
||||
using Server.Mobiles;
|
||||
using Server.Network;
|
||||
using Server.Gumps;
|
||||
|
||||
namespace Server.Menus.Questions
|
||||
{
|
||||
public class StuckMenuEntry
|
||||
{
|
||||
public int Name { get; }
|
||||
public class StuckMenuEntry
|
||||
{
|
||||
public StuckMenuEntry(int name, Point3D[] locations)
|
||||
{
|
||||
Name = name;
|
||||
Locations = locations;
|
||||
}
|
||||
|
||||
public Point3D[] Locations { get; }
|
||||
public int Name{ get; }
|
||||
|
||||
public StuckMenuEntry( int name, Point3D[] locations )
|
||||
{
|
||||
Name = name;
|
||||
Locations = locations;
|
||||
}
|
||||
}
|
||||
public Point3D[] Locations{ get; }
|
||||
}
|
||||
|
||||
public class StuckMenu : Gump
|
||||
{
|
||||
private static StuckMenuEntry[] m_Entries = {
|
||||
// Britain
|
||||
new StuckMenuEntry( 1011028, new[]
|
||||
{
|
||||
new Point3D( 1522, 1757, 28 ),
|
||||
new Point3D( 1519, 1619, 10 ),
|
||||
new Point3D( 1457, 1538, 30 ),
|
||||
new Point3D( 1607, 1568, 20 ),
|
||||
new Point3D( 1643, 1680, 18 )
|
||||
} ),
|
||||
public class StuckMenu : Gump
|
||||
{
|
||||
private static StuckMenuEntry[] m_Entries =
|
||||
{
|
||||
// Britain
|
||||
new StuckMenuEntry(1011028, new[]
|
||||
{
|
||||
new Point3D(1522, 1757, 28),
|
||||
new Point3D(1519, 1619, 10),
|
||||
new Point3D(1457, 1538, 30),
|
||||
new Point3D(1607, 1568, 20),
|
||||
new Point3D(1643, 1680, 18)
|
||||
}),
|
||||
|
||||
// Trinsic
|
||||
new StuckMenuEntry( 1011029, new[]
|
||||
{
|
||||
new Point3D( 2005, 2754, 30 ),
|
||||
new Point3D( 1993, 2827, 0 ),
|
||||
new Point3D( 2044, 2883, 0 ),
|
||||
new Point3D( 1876, 2859, 20 ),
|
||||
new Point3D( 1865, 2687, 0 )
|
||||
} ),
|
||||
// Trinsic
|
||||
new StuckMenuEntry(1011029, new[]
|
||||
{
|
||||
new Point3D(2005, 2754, 30),
|
||||
new Point3D(1993, 2827, 0),
|
||||
new Point3D(2044, 2883, 0),
|
||||
new Point3D(1876, 2859, 20),
|
||||
new Point3D(1865, 2687, 0)
|
||||
}),
|
||||
|
||||
// Vesper
|
||||
new StuckMenuEntry( 1011030, new[]
|
||||
{
|
||||
new Point3D( 2973, 891, 0 ),
|
||||
new Point3D( 3003, 776, 0 ),
|
||||
new Point3D( 2910, 727, 0 ),
|
||||
new Point3D( 2865, 804, 0 ),
|
||||
new Point3D( 2832, 927, 0 )
|
||||
} ),
|
||||
// Vesper
|
||||
new StuckMenuEntry(1011030, new[]
|
||||
{
|
||||
new Point3D(2973, 891, 0),
|
||||
new Point3D(3003, 776, 0),
|
||||
new Point3D(2910, 727, 0),
|
||||
new Point3D(2865, 804, 0),
|
||||
new Point3D(2832, 927, 0)
|
||||
}),
|
||||
|
||||
// Minoc
|
||||
new StuckMenuEntry( 1011031, new[]
|
||||
{
|
||||
new Point3D( 2498, 392, 0 ),
|
||||
new Point3D( 2433, 541, 0 ),
|
||||
new Point3D( 2445, 501, 15 ),
|
||||
new Point3D( 2501, 469, 15 ),
|
||||
new Point3D( 2444, 420, 15 )
|
||||
} ),
|
||||
// Minoc
|
||||
new StuckMenuEntry(1011031, new[]
|
||||
{
|
||||
new Point3D(2498, 392, 0),
|
||||
new Point3D(2433, 541, 0),
|
||||
new Point3D(2445, 501, 15),
|
||||
new Point3D(2501, 469, 15),
|
||||
new Point3D(2444, 420, 15)
|
||||
}),
|
||||
|
||||
// Yew
|
||||
new StuckMenuEntry( 1011032, new[]
|
||||
{
|
||||
new Point3D( 490, 1166, 0 ),
|
||||
new Point3D( 652, 1098, 0 ),
|
||||
new Point3D( 650, 1013, 0 ),
|
||||
new Point3D( 536, 979, 0 ),
|
||||
new Point3D( 464, 970, 0 )
|
||||
} ),
|
||||
// Yew
|
||||
new StuckMenuEntry(1011032, new[]
|
||||
{
|
||||
new Point3D(490, 1166, 0),
|
||||
new Point3D(652, 1098, 0),
|
||||
new Point3D(650, 1013, 0),
|
||||
new Point3D(536, 979, 0),
|
||||
new Point3D(464, 970, 0)
|
||||
}),
|
||||
|
||||
// Cove
|
||||
new StuckMenuEntry( 1011033, new[]
|
||||
{
|
||||
new Point3D( 2230, 1159, 0 ),
|
||||
new Point3D( 2218, 1203, 0 ),
|
||||
new Point3D( 2247, 1194, 0 ),
|
||||
new Point3D( 2236, 1224, 0 ),
|
||||
new Point3D( 2273, 1231, 0 )
|
||||
} )
|
||||
};
|
||||
// Cove
|
||||
new StuckMenuEntry(1011033, new[]
|
||||
{
|
||||
new Point3D(2230, 1159, 0),
|
||||
new Point3D(2218, 1203, 0),
|
||||
new Point3D(2247, 1194, 0),
|
||||
new Point3D(2236, 1224, 0),
|
||||
new Point3D(2273, 1231, 0)
|
||||
})
|
||||
};
|
||||
|
||||
private static StuckMenuEntry[] m_T2AEntries = {
|
||||
// Papua
|
||||
new StuckMenuEntry( 1011057, new[]
|
||||
{
|
||||
new Point3D( 5720, 3109, -1 ),
|
||||
new Point3D( 5677, 3176, -3 ),
|
||||
new Point3D( 5678, 3227, 0 ),
|
||||
new Point3D( 5769, 3206, -2 ),
|
||||
new Point3D( 5777, 3270, -1 )
|
||||
} ),
|
||||
private static StuckMenuEntry[] m_T2AEntries =
|
||||
{
|
||||
// Papua
|
||||
new StuckMenuEntry(1011057, new[]
|
||||
{
|
||||
new Point3D(5720, 3109, -1),
|
||||
new Point3D(5677, 3176, -3),
|
||||
new Point3D(5678, 3227, 0),
|
||||
new Point3D(5769, 3206, -2),
|
||||
new Point3D(5777, 3270, -1)
|
||||
}),
|
||||
|
||||
// Delucia
|
||||
new StuckMenuEntry( 1011058, new[]
|
||||
{
|
||||
new Point3D( 5216, 4033, 37 ),
|
||||
new Point3D( 5262, 4049, 37 ),
|
||||
new Point3D( 5284, 4006, 37 ),
|
||||
new Point3D( 5189, 3971, 39 ),
|
||||
new Point3D( 5243, 3960, 37 )
|
||||
} )
|
||||
};
|
||||
// Delucia
|
||||
new StuckMenuEntry(1011058, new[]
|
||||
{
|
||||
new Point3D(5216, 4033, 37),
|
||||
new Point3D(5262, 4049, 37),
|
||||
new Point3D(5284, 4006, 37),
|
||||
new Point3D(5189, 3971, 39),
|
||||
new Point3D(5243, 3960, 37)
|
||||
})
|
||||
};
|
||||
|
||||
private static bool IsInSecondAgeArea( Mobile m )
|
||||
{
|
||||
if ( m.Map != Map.Trammel && m.Map != Map.Felucca )
|
||||
return false;
|
||||
private bool m_MarkUse;
|
||||
|
||||
if ( m.X >= 5120 && m.Y >= 2304 )
|
||||
return true;
|
||||
private Mobile m_Mobile, m_Sender;
|
||||
|
||||
if ( m.Region.IsPartOf( "Terathan Keep" ) )
|
||||
return true;
|
||||
private Timer m_Timer;
|
||||
|
||||
return false;
|
||||
}
|
||||
public StuckMenu(Mobile beholder, Mobile beheld, bool markUse) : base(150, 50)
|
||||
{
|
||||
m_Sender = beholder;
|
||||
m_Mobile = beheld;
|
||||
m_MarkUse = markUse;
|
||||
|
||||
private Mobile m_Mobile, m_Sender;
|
||||
private bool m_MarkUse;
|
||||
Closable = false;
|
||||
Dragable = false;
|
||||
Disposable = false;
|
||||
|
||||
private Timer m_Timer;
|
||||
AddBackground(0, 0, 270, 320, 2600);
|
||||
|
||||
public StuckMenu( Mobile beholder, Mobile beheld, bool markUse ) : base( 150, 50 )
|
||||
{
|
||||
m_Sender = beholder;
|
||||
m_Mobile = beheld;
|
||||
m_MarkUse = markUse;
|
||||
AddHtmlLocalized(50, 20, 250, 35, 1011027, false, false); // Chose a town:
|
||||
|
||||
Closable = false;
|
||||
Dragable = false;
|
||||
Disposable = false;
|
||||
StuckMenuEntry[] entries = IsInSecondAgeArea(beheld) ? m_T2AEntries : m_Entries;
|
||||
|
||||
AddBackground( 0, 0, 270, 320, 2600 );
|
||||
for (int i = 0; i < entries.Length; i++)
|
||||
{
|
||||
StuckMenuEntry entry = entries[i];
|
||||
|
||||
AddHtmlLocalized( 50, 20, 250, 35, 1011027, false, false ); // Chose a town:
|
||||
AddButton(50, 55 + 35 * i, 208, 209, i + 1, GumpButtonType.Reply, 0);
|
||||
AddHtmlLocalized(75, 55 + 35 * i, 335, 40, entry.Name, false, false);
|
||||
}
|
||||
|
||||
StuckMenuEntry[] entries = IsInSecondAgeArea( beheld ) ? m_T2AEntries : m_Entries;
|
||||
AddButton(55, 263, 4005, 4007, 0, GumpButtonType.Reply, 0);
|
||||
AddHtmlLocalized(90, 265, 200, 35, 1011012, false, false); // CANCEL
|
||||
}
|
||||
|
||||
for ( int i = 0; i < entries.Length; i++ )
|
||||
{
|
||||
StuckMenuEntry entry = entries[i];
|
||||
private static bool IsInSecondAgeArea(Mobile m)
|
||||
{
|
||||
if (m.Map != Map.Trammel && m.Map != Map.Felucca)
|
||||
return false;
|
||||
|
||||
AddButton( 50, 55 + 35 * i, 208, 209, i + 1, GumpButtonType.Reply, 0 );
|
||||
AddHtmlLocalized( 75, 55 + 35 * i, 335, 40, entry.Name, false, false );
|
||||
}
|
||||
if (m.X >= 5120 && m.Y >= 2304)
|
||||
return true;
|
||||
|
||||
AddButton( 55, 263, 4005, 4007, 0, GumpButtonType.Reply, 0 );
|
||||
AddHtmlLocalized( 90, 265, 200, 35, 1011012, false, false ); // CANCEL
|
||||
}
|
||||
if (m.Region.IsPartOf("Terathan Keep"))
|
||||
return true;
|
||||
|
||||
public void BeginClose()
|
||||
{
|
||||
StopClose();
|
||||
return false;
|
||||
}
|
||||
|
||||
m_Timer = new CloseTimer( m_Mobile );
|
||||
m_Timer.Start();
|
||||
public void BeginClose()
|
||||
{
|
||||
StopClose();
|
||||
|
||||
m_Mobile.Frozen = true;
|
||||
}
|
||||
m_Timer = new CloseTimer(m_Mobile);
|
||||
m_Timer.Start();
|
||||
|
||||
public void StopClose()
|
||||
{
|
||||
m_Timer?.Stop();
|
||||
m_Mobile.Frozen = true;
|
||||
}
|
||||
|
||||
m_Mobile.Frozen = false;
|
||||
}
|
||||
public void StopClose()
|
||||
{
|
||||
m_Timer?.Stop();
|
||||
|
||||
public override void OnResponse( NetState state, RelayInfo info )
|
||||
{
|
||||
StopClose();
|
||||
m_Mobile.Frozen = false;
|
||||
}
|
||||
|
||||
if ( Factions.Sigil.ExistsOn( m_Mobile ) )
|
||||
{
|
||||
m_Mobile.SendLocalizedMessage( 1061632 ); // You can't do that while carrying the sigil.
|
||||
}
|
||||
else if ( info.ButtonID == 0 )
|
||||
{
|
||||
if ( m_Mobile == m_Sender )
|
||||
m_Mobile.SendLocalizedMessage( 1010588 ); // You choose not to go to any city.
|
||||
}
|
||||
else
|
||||
{
|
||||
int index = info.ButtonID - 1;
|
||||
StuckMenuEntry[] entries = IsInSecondAgeArea( m_Mobile ) ? m_T2AEntries : m_Entries;
|
||||
public override void OnResponse(NetState state, RelayInfo info)
|
||||
{
|
||||
StopClose();
|
||||
|
||||
if ( index >= 0 && index < entries.Length )
|
||||
Teleport( entries[index] );
|
||||
}
|
||||
}
|
||||
if (Sigil.ExistsOn(m_Mobile))
|
||||
{
|
||||
m_Mobile.SendLocalizedMessage(1061632); // You can't do that while carrying the sigil.
|
||||
}
|
||||
else if (info.ButtonID == 0)
|
||||
{
|
||||
if (m_Mobile == m_Sender)
|
||||
m_Mobile.SendLocalizedMessage(1010588); // You choose not to go to any city.
|
||||
}
|
||||
else
|
||||
{
|
||||
int index = info.ButtonID - 1;
|
||||
StuckMenuEntry[] entries = IsInSecondAgeArea(m_Mobile) ? m_T2AEntries : m_Entries;
|
||||
|
||||
private void Teleport( StuckMenuEntry entry )
|
||||
{
|
||||
if ( m_MarkUse )
|
||||
{
|
||||
m_Mobile.SendLocalizedMessage( 1010589 ); // You will be teleported within the next two minutes.
|
||||
if (index >= 0 && index < entries.Length)
|
||||
Teleport(entries[index]);
|
||||
}
|
||||
}
|
||||
|
||||
new TeleportTimer( m_Mobile, entry, TimeSpan.FromSeconds( 10.0 + (Utility.RandomDouble() * 110.0) ) ).Start();
|
||||
private void Teleport(StuckMenuEntry entry)
|
||||
{
|
||||
if (m_MarkUse)
|
||||
{
|
||||
m_Mobile.SendLocalizedMessage(1010589); // You will be teleported within the next two minutes.
|
||||
|
||||
if (m_Mobile is PlayerMobile mobile)
|
||||
mobile.UsedStuckMenu();
|
||||
}
|
||||
else
|
||||
{
|
||||
new TeleportTimer( m_Mobile, entry, TimeSpan.Zero ).Start();
|
||||
}
|
||||
}
|
||||
new TeleportTimer(m_Mobile, entry, TimeSpan.FromSeconds(10.0 + Utility.RandomDouble() * 110.0)).Start();
|
||||
|
||||
private class CloseTimer : Timer
|
||||
{
|
||||
private Mobile m_Mobile;
|
||||
private DateTime m_End;
|
||||
if (m_Mobile is PlayerMobile mobile)
|
||||
mobile.UsedStuckMenu();
|
||||
}
|
||||
else
|
||||
{
|
||||
new TeleportTimer(m_Mobile, entry, TimeSpan.Zero).Start();
|
||||
}
|
||||
}
|
||||
|
||||
public CloseTimer( Mobile m ) : base( TimeSpan.Zero, TimeSpan.FromSeconds( 1.0 ) )
|
||||
{
|
||||
m_Mobile = m;
|
||||
m_End = DateTime.UtcNow + TimeSpan.FromMinutes( 3.0 );
|
||||
}
|
||||
private class CloseTimer : Timer
|
||||
{
|
||||
private DateTime m_End;
|
||||
private Mobile m_Mobile;
|
||||
|
||||
protected override void OnTick()
|
||||
{
|
||||
if ( m_Mobile.NetState == null || DateTime.UtcNow > m_End )
|
||||
{
|
||||
m_Mobile.Frozen = false;
|
||||
m_Mobile.CloseGump( typeof( StuckMenu ) );
|
||||
public CloseTimer(Mobile m) : base(TimeSpan.Zero, TimeSpan.FromSeconds(1.0))
|
||||
{
|
||||
m_Mobile = m;
|
||||
m_End = DateTime.UtcNow + TimeSpan.FromMinutes(3.0);
|
||||
}
|
||||
|
||||
Stop();
|
||||
}
|
||||
else
|
||||
{
|
||||
m_Mobile.Frozen = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
protected override void OnTick()
|
||||
{
|
||||
if (m_Mobile.NetState == null || DateTime.UtcNow > m_End)
|
||||
{
|
||||
m_Mobile.Frozen = false;
|
||||
m_Mobile.CloseGump(typeof(StuckMenu));
|
||||
|
||||
private class TeleportTimer : Timer
|
||||
{
|
||||
private Mobile m_Mobile;
|
||||
private StuckMenuEntry m_Destination;
|
||||
private DateTime m_End;
|
||||
Stop();
|
||||
}
|
||||
else
|
||||
{
|
||||
m_Mobile.Frozen = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public TeleportTimer( Mobile mobile, StuckMenuEntry destination, TimeSpan delay ) : base( TimeSpan.Zero, TimeSpan.FromSeconds( 1.0 ) )
|
||||
{
|
||||
Priority = TimerPriority.TwoFiftyMS;
|
||||
private class TeleportTimer : Timer
|
||||
{
|
||||
private StuckMenuEntry m_Destination;
|
||||
private DateTime m_End;
|
||||
private Mobile m_Mobile;
|
||||
|
||||
m_Mobile = mobile;
|
||||
m_Destination = destination;
|
||||
m_End = DateTime.UtcNow + delay;
|
||||
}
|
||||
public TeleportTimer(Mobile mobile, StuckMenuEntry destination, TimeSpan delay) : base(TimeSpan.Zero,
|
||||
TimeSpan.FromSeconds(1.0))
|
||||
{
|
||||
Priority = TimerPriority.TwoFiftyMS;
|
||||
|
||||
protected override void OnTick()
|
||||
{
|
||||
if ( DateTime.UtcNow < m_End )
|
||||
{
|
||||
m_Mobile.Frozen = true;
|
||||
}
|
||||
else
|
||||
{
|
||||
m_Mobile.Frozen = false;
|
||||
Stop();
|
||||
m_Mobile = mobile;
|
||||
m_Destination = destination;
|
||||
m_End = DateTime.UtcNow + delay;
|
||||
}
|
||||
|
||||
if ( Factions.Sigil.ExistsOn( m_Mobile ) )
|
||||
{
|
||||
m_Mobile.SendLocalizedMessage( 1061632 ); // You can't do that while carrying the sigil.
|
||||
return;
|
||||
}
|
||||
protected override void OnTick()
|
||||
{
|
||||
if (DateTime.UtcNow < m_End)
|
||||
{
|
||||
m_Mobile.Frozen = true;
|
||||
}
|
||||
else
|
||||
{
|
||||
m_Mobile.Frozen = false;
|
||||
Stop();
|
||||
|
||||
int idx = Utility.Random( m_Destination.Locations.Length );
|
||||
Point3D dest = m_Destination.Locations[idx];
|
||||
if (Sigil.ExistsOn(m_Mobile))
|
||||
{
|
||||
m_Mobile.SendLocalizedMessage(1061632); // You can't do that while carrying the sigil.
|
||||
return;
|
||||
}
|
||||
|
||||
Map destMap;
|
||||
if ( m_Mobile.Map == Map.Trammel )
|
||||
destMap = Map.Trammel;
|
||||
else if ( m_Mobile.Map == Map.Felucca )
|
||||
destMap = Map.Felucca;
|
||||
else
|
||||
destMap = m_Mobile.Kills >= 5 ? Map.Felucca : Map.Trammel;
|
||||
int idx = Utility.Random(m_Destination.Locations.Length);
|
||||
Point3D dest = m_Destination.Locations[idx];
|
||||
|
||||
BaseCreature.TeleportPets( m_Mobile, dest, destMap );
|
||||
m_Mobile.MoveToWorld( dest, destMap );
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Map destMap;
|
||||
if (m_Mobile.Map == Map.Trammel)
|
||||
destMap = Map.Trammel;
|
||||
else if (m_Mobile.Map == Map.Felucca)
|
||||
destMap = Map.Felucca;
|
||||
else
|
||||
destMap = m_Mobile.Kills >= 5 ? Map.Felucca : Map.Trammel;
|
||||
|
||||
BaseCreature.TeleportPets(m_Mobile, dest, destMap);
|
||||
m_Mobile.MoveToWorld(dest, destMap);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue