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

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

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

217
Scripts/Items/Games/BaseBoard.cs
View file

@ -1,154 +1,149 @@
using System;
using System.Collections.Generic;
using Server.Multis;
using Server.Network;
using Server.ContextMenus;
using Server.Gumps;
using Server.Multis;
using Server.Network;
namespace Server.Items
{
public abstract class BaseBoard : Container, ISecurable
{
[CommandProperty( AccessLevel.GameMaster )]
public SecureLevel Level { get; set; }
public abstract class BaseBoard : Container, ISecurable
{
public BaseBoard(int itemID) : base(itemID)
{
CreatePieces();
public BaseBoard( int itemID ) : base( itemID )
{
CreatePieces();
Weight = 5.0;
}
Weight = 5.0;
}
public BaseBoard(Serial serial) : base(serial)
{
}
public abstract void CreatePieces();
public override bool DisplaysContent => false; // Do not display (x items, y stones)
public void Reset()
{
for ( int i = Items.Count - 1; i >= 0; --i )
{
if ( i < Items.Count )
Items[i].Delete();
}
public override bool IsDecoContainer => false;
CreatePieces();
}
public override TimeSpan DecayTime => TimeSpan.FromDays(1.0);
public void CreatePiece( BasePiece piece, int x, int y )
{
AddItem( piece );
piece.Location = new Point3D( x, y, 0 );
}
[CommandProperty(AccessLevel.GameMaster)]
public SecureLevel Level{ get; set; }
public override bool DisplaysContent => false; // Do not display (x items, y stones)
public abstract void CreatePieces();
public override bool IsDecoContainer => false;
public void Reset()
{
for (int i = Items.Count - 1; i >= 0; --i)
if (i < Items.Count)
Items[i].Delete();
public BaseBoard( Serial serial ) : base( serial )
{
}
CreatePieces();
}
public override void Serialize( GenericWriter writer )
{
base.Serialize( writer );
writer.Write( (int) 1 ); // version
public void CreatePiece(BasePiece piece, int x, int y)
{
AddItem(piece);
piece.Location = new Point3D(x, y, 0);
}
writer.Write( (int)Level );
}
public override void Serialize(GenericWriter writer)
{
base.Serialize(writer);
writer.Write(1); // version
public override void Deserialize( GenericReader reader )
{
base.Deserialize( reader );
int version = reader.ReadInt();
writer.Write((int)Level);
}
if ( version == 1 )
Level = (SecureLevel)reader.ReadInt();
public override void Deserialize(GenericReader reader)
{
base.Deserialize(reader);
int version = reader.ReadInt();
if ( Weight == 1.0 )
Weight = 5.0;
}
if (version == 1)
Level = (SecureLevel)reader.ReadInt();
public override TimeSpan DecayTime => TimeSpan.FromDays( 1.0 );
if (Weight == 1.0)
Weight = 5.0;
}
public override bool OnDragDrop( Mobile from, Item dropped )
{
return ( dropped is BasePiece piece && piece.Board == this && base.OnDragDrop( from, dropped ) );
}
public override bool OnDragDrop(Mobile from, Item dropped)
{
return dropped is BasePiece piece && piece.Board == this && base.OnDragDrop(from, dropped);
}
public override bool OnDragDropInto( Mobile from, Item dropped, Point3D point )
{
if ( dropped is BasePiece piece && piece.Board == this && base.OnDragDropInto( from, dropped, point ) )
{
Packet p = new PlaySound( 0x127, GetWorldLocation() );
public override bool OnDragDropInto(Mobile from, Item dropped, Point3D point)
{
if (dropped is BasePiece piece && piece.Board == this && base.OnDragDropInto(from, dropped, point))
{
Packet p = new PlaySound(0x127, GetWorldLocation());
p.Acquire();
p.Acquire();
if ( RootParent == from )
{
from.Send( p );
}
else
{
foreach ( NetState state in GetClientsInRange( 2 ) )
state.Send( p );
}
if (RootParent == from)
from.Send(p);
else
foreach (NetState state in GetClientsInRange(2))
state.Send(p);
p.Release();
p.Release();
return true;
}
return true;
}
return false;
}
return false;
}
public override void GetContextMenuEntries( Mobile from, List<ContextMenuEntry> list )
{
base.GetContextMenuEntries( from, list );
public override void GetContextMenuEntries(Mobile from, List<ContextMenuEntry> list)
{
base.GetContextMenuEntries(from, list);
if ( ValidateDefault( from, this ) )
list.Add( new DefaultEntry( from, this ) );
if (ValidateDefault(from, this))
list.Add(new DefaultEntry(from, this));
SetSecureLevelEntry.AddTo( from, this, list );
}
SetSecureLevelEntry.AddTo(from, this, list);
}
public static bool ValidateDefault( Mobile from, BaseBoard board )
{
if ( from.AccessLevel >= AccessLevel.GameMaster )
return true;
public static bool ValidateDefault(Mobile from, BaseBoard board)
{
if (from.AccessLevel >= AccessLevel.GameMaster)
return true;
if ( !from.Alive )
return false;
if (!from.Alive)
return false;
if ( board.IsChildOf( from.Backpack ) )
return true;
if (board.IsChildOf(from.Backpack))
return true;
object root = board.RootParent;
object root = board.RootParent;
if ( root is Mobile && root != from )
return false;
if (root is Mobile && root != from)
return false;
if ( board.Deleted || board.Map != from.Map || !from.InRange( board.GetWorldLocation(), 1 ) )
return false;
if (board.Deleted || board.Map != from.Map || !from.InRange(board.GetWorldLocation(), 1))
return false;
BaseHouse house = BaseHouse.FindHouseAt( board );
BaseHouse house = BaseHouse.FindHouseAt(board);
return ( house != null && house.IsOwner( from ) );
}
return house != null && house.IsOwner(from);
}
public class DefaultEntry : ContextMenuEntry
{
private Mobile m_From;
private BaseBoard m_Board;
public class DefaultEntry : ContextMenuEntry
{
private BaseBoard m_Board;
private Mobile m_From;
public DefaultEntry( Mobile from, BaseBoard board ) : base( 6162, from.AccessLevel >= AccessLevel.GameMaster ? -1 : 1 )
{
m_From = from;
m_Board = board;
}
public DefaultEntry(Mobile from, BaseBoard board) : base(6162,
from.AccessLevel >= AccessLevel.GameMaster ? -1 : 1)
{
m_From = from;
m_Board = board;
}
public override void OnClick()
{
if ( ValidateDefault( m_From, m_Board ) )
m_Board.Reset();
}
}
}
}
public override void OnClick()
{
if (ValidateDefault(m_From, m_Board))
m_Board.Reset();
}
}
}
}