Fixes code according to modern code style. Fixes a few expression bugs.

This commit is contained in:
Kamron Batman 2018-09-15 09:58:51 -07:00
parent 89eea25e5f
commit 970fd563b2
3324 changed files with 441118 additions and 433755 deletions

View file

@ -1,130 +1,130 @@
using System;
using Server.Network;
using Server.Mobiles;
using Server.Gumps;
using Server.Mobiles;
using Server.Network;
namespace Server.Items
{
[FlippableAttribute( 0xA57, 0xA58, 0xA59 )]
public class Bedroll : Item
{
[Constructible]
public Bedroll() : base( 0xA57 )
{
Weight = 5.0;
}
[Flippable(0xA57, 0xA58, 0xA59)]
public class Bedroll : Item
{
[Constructible]
public Bedroll() : base(0xA57)
{
Weight = 5.0;
}
public Bedroll( Serial serial ) : base( serial )
{
}
public Bedroll(Serial serial) : base(serial)
{
}
public override void OnDoubleClick( Mobile from )
{
if ( Parent != null || !VerifyMove( from ) )
return;
public override void OnDoubleClick(Mobile from)
{
if (Parent != null || !VerifyMove(from))
return;
if ( !from.InRange( this, 2 ) )
{
from.LocalOverheadMessage( MessageType.Regular, 0x3B2, 1019045 ); // I can't reach that.
return;
}
if (!from.InRange(this, 2))
{
from.LocalOverheadMessage(MessageType.Regular, 0x3B2, 1019045); // I can't reach that.
return;
}
if ( ItemID == 0xA57 ) // rolled
{
Direction dir = PlayerMobile.GetDirection4( from.Location, Location );
if (ItemID == 0xA57) // rolled
{
Direction dir = PlayerMobile.GetDirection4(from.Location, Location);
if ( dir == Direction.North || dir == Direction.South )
ItemID = 0xA55;
else
ItemID = 0xA56;
}
else // unrolled
{
ItemID = 0xA57;
if (dir == Direction.North || dir == Direction.South)
ItemID = 0xA55;
else
ItemID = 0xA56;
}
else // unrolled
{
ItemID = 0xA57;
if ( !from.HasGump( typeof( LogoutGump ) ) )
{
CampfireEntry entry = Campfire.GetEntry( from );
if (!from.HasGump(typeof(LogoutGump)))
{
CampfireEntry entry = Campfire.GetEntry(from);
if ( entry != null && entry.Safe )
from.SendGump( new LogoutGump( entry, this ) );
}
}
}
if (entry != null && entry.Safe)
from.SendGump(new LogoutGump(entry, this));
}
}
}
private class LogoutGump : Gump
{
private Timer m_CloseTimer;
public override void Serialize(GenericWriter writer)
{
base.Serialize(writer);
private CampfireEntry m_Entry;
private Bedroll m_Bedroll;
writer.WriteEncodedInt(0); // version
}
public LogoutGump( CampfireEntry entry, Bedroll bedroll ) : base( 100, 0 )
{
m_Entry = entry;
m_Bedroll = bedroll;
public override void Deserialize(GenericReader reader)
{
base.Deserialize(reader);
m_CloseTimer = Timer.DelayCall( TimeSpan.FromSeconds( 10.0 ), CloseGump );
int version = reader.ReadEncodedInt();
}
AddBackground( 0, 0, 400, 350, 0xA28 );
private class LogoutGump : Gump
{
private Bedroll m_Bedroll;
private Timer m_CloseTimer;
AddHtmlLocalized( 100, 20, 200, 35, 1011015, false, false ); // <center>Logging out via camping</center>
private CampfireEntry m_Entry;
/* Using a bedroll in the safety of a camp will log you out of the game safely.
* If this is what you wish to do choose CONTINUE and you will be logged out.
* Otherwise, select the CANCEL button to avoid logging out at this time.
* The camp will remain secure for 10 seconds at which time this window will close
* and you not be logged out.
*/
AddHtmlLocalized( 50, 55, 300, 140, 1011016, true, true );
public LogoutGump(CampfireEntry entry, Bedroll bedroll) : base(100, 0)
{
m_Entry = entry;
m_Bedroll = bedroll;
AddButton( 45, 298, 0xFA5, 0xFA7, 1, GumpButtonType.Reply, 0 );
AddHtmlLocalized( 80, 300, 110, 35, 1011011, false, false ); // CONTINUE
m_CloseTimer = Timer.DelayCall(TimeSpan.FromSeconds(10.0), CloseGump);
AddButton( 200, 298, 0xFA5, 0xFA7, 0, GumpButtonType.Reply, 0 );
AddHtmlLocalized( 235, 300, 110, 35, 1011012, false, false ); // CANCEL
}
AddBackground(0, 0, 400, 350, 0xA28);
public override void OnResponse( NetState sender, RelayInfo info )
{
PlayerMobile pm = m_Entry.Player;
AddHtmlLocalized(100, 20, 200, 35, 1011015, false, false); // <center>Logging out via camping</center>
m_CloseTimer.Stop();
/* Using a bedroll in the safety of a camp will log you out of the game safely.
* If this is what you wish to do choose CONTINUE and you will be logged out.
* Otherwise, select the CANCEL button to avoid logging out at this time.
* The camp will remain secure for 10 seconds at which time this window will close
* and you not be logged out.
*/
AddHtmlLocalized(50, 55, 300, 140, 1011016, true, true);
if ( Campfire.GetEntry( pm ) != m_Entry )
return;
AddButton(45, 298, 0xFA5, 0xFA7, 1, GumpButtonType.Reply, 0);
AddHtmlLocalized(80, 300, 110, 35, 1011011, false, false); // CONTINUE
if ( info.ButtonID == 1 && m_Entry.Safe && m_Bedroll.Parent == null && m_Bedroll.IsAccessibleTo( pm )
&& m_Bedroll.VerifyMove( pm ) && m_Bedroll.Map == pm.Map && pm.InRange( m_Bedroll, 2 ) )
{
pm.PlaceInBackpack( m_Bedroll );
AddButton(200, 298, 0xFA5, 0xFA7, 0, GumpButtonType.Reply, 0);
AddHtmlLocalized(235, 300, 110, 35, 1011012, false, false); // CANCEL
}
pm.BedrollLogout = true;
sender.Dispose();
}
public override void OnResponse(NetState sender, RelayInfo info)
{
PlayerMobile pm = m_Entry.Player;
Campfire.RemoveEntry( m_Entry );
}
m_CloseTimer.Stop();
private void CloseGump()
{
Campfire.RemoveEntry( m_Entry );
m_Entry.Player.CloseGump( typeof( LogoutGump ) );
}
}
if (Campfire.GetEntry(pm) != m_Entry)
return;
public override void Serialize( GenericWriter writer )
{
base.Serialize( writer );
if (info.ButtonID == 1 && m_Entry.Safe && m_Bedroll.Parent == null && m_Bedroll.IsAccessibleTo(pm)
&& m_Bedroll.VerifyMove(pm) && m_Bedroll.Map == pm.Map && pm.InRange(m_Bedroll, 2))
{
pm.PlaceInBackpack(m_Bedroll);
writer.WriteEncodedInt( 0 ); // version
}
pm.BedrollLogout = true;
sender.Dispose();
}
public override void Deserialize( GenericReader reader )
{
base.Deserialize( reader );
Campfire.RemoveEntry(m_Entry);
}
int version = reader.ReadEncodedInt();
}
}
private void CloseGump()
{
Campfire.RemoveEntry(m_Entry);
m_Entry.Player.CloseGump(typeof(LogoutGump));
}
}
}
}