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,480 +1,486 @@
using System;
using System.Collections.Generic;
using Server.ContextMenus;
using Server.Engines.Craft;
using Server.Gumps;
using Server.Network;
using Server.Mobiles;
using Server.Multis;
using Server.Engines.Craft;
using Server.ContextMenus;
using Server.Network;
namespace Server.Items
{
public class Runebook : Item, ISecurable, ICraftable
{
public static readonly TimeSpan UseDelay = TimeSpan.FromSeconds( 7.0 );
private BookQuality m_Quality;
[CommandProperty( AccessLevel.GameMaster )]
public BookQuality Quality
{
get => m_Quality;
set{ m_Quality = value; InvalidateProperties(); }
}
private string m_Description;
private int m_DefaultIndex;
private Mobile m_Crafter;
[CommandProperty( AccessLevel.GameMaster )]
public DateTime NextUse { get; set; }
[CommandProperty( AccessLevel.GameMaster )]
public Mobile Crafter
{
get => m_Crafter;
set{ m_Crafter = value; InvalidateProperties(); }
}
public class Runebook : Item, ISecurable, ICraftable
{
public static readonly TimeSpan UseDelay = TimeSpan.FromSeconds(7.0);
private Mobile m_Crafter;
private int m_DefaultIndex;
private string m_Description;
private BookQuality m_Quality;
[Constructible]
public Runebook(int maxCharges) : base(Core.AOS ? 0x22C5 : 0xEFA)
{
Weight = Core.SE ? 1.0 : 3.0;
LootType = LootType.Blessed;
Hue = 0x461;
Layer = Core.AOS ? Layer.Invalid : Layer.OneHanded;
Entries = new List<RunebookEntry>();
MaxCharges = maxCharges;
m_DefaultIndex = -1;
Level = SecureLevel.CoOwners;
}
[Constructible]
public Runebook() : this(Core.SE ? 12 : 6)
{
}
public Runebook(Serial serial) : base(serial)
{
}
[CommandProperty(AccessLevel.GameMaster)]
public BookQuality Quality
{
get => m_Quality;
set
{
m_Quality = value;
InvalidateProperties();
}
}
[CommandProperty(AccessLevel.GameMaster)]
public DateTime NextUse{ get; set; }
[CommandProperty( AccessLevel.GameMaster )]
public SecureLevel Level { get; set; }
[CommandProperty(AccessLevel.GameMaster)]
public Mobile Crafter
{
get => m_Crafter;
set
{
m_Crafter = value;
InvalidateProperties();
}
}
[CommandProperty( AccessLevel.GameMaster )]
public string Description
{
get => m_Description;
set
{
m_Description = value;
InvalidateProperties();
}
}
[CommandProperty(AccessLevel.GameMaster)]
public string Description
{
get => m_Description;
set
{
m_Description = value;
InvalidateProperties();
}
}
[CommandProperty( AccessLevel.GameMaster )]
public int CurCharges { get; set; }
[CommandProperty(AccessLevel.GameMaster)]
public int CurCharges{ get; set; }
[CommandProperty( AccessLevel.GameMaster )]
public int MaxCharges { get; set; }
[CommandProperty(AccessLevel.GameMaster)]
public int MaxCharges{ get; set; }
public List<Mobile> Openers { get; set; } = new List<Mobile>();
public List<Mobile> Openers{ get; set; } = new List<Mobile>();
public override int LabelNumber => 1041267; // runebook
public override int LabelNumber => 1041267; // runebook
[Constructible]
public Runebook( int maxCharges ) : base( Core.AOS ? 0x22C5 : 0xEFA )
{
Weight = (Core.SE ? 1.0 : 3.0);
LootType = LootType.Blessed;
Hue = 0x461;
Layer = (Core.AOS ? Layer.Invalid : Layer.OneHanded);
Entries = new List<RunebookEntry>();
MaxCharges = maxCharges;
m_DefaultIndex = -1;
Level = SecureLevel.CoOwners;
}
[Constructible]
public Runebook() : this( Core.SE ? 12 : 6 )
{
}
public List<RunebookEntry> Entries { get; private set; }
public RunebookEntry Default
{
get
{
if ( m_DefaultIndex >= 0 && m_DefaultIndex < Entries.Count )
return Entries[m_DefaultIndex];
return null;
}
set
{
if ( value == null )
m_DefaultIndex = -1;
else
m_DefaultIndex = Entries.IndexOf( value );
}
}
public Runebook( Serial serial ) : base( serial )
{
}
public override bool AllowEquippedCast( Mobile from )
{
return true;
}
public override void GetContextMenuEntries( Mobile from, List<ContextMenuEntry> list )
{
base.GetContextMenuEntries( from, list );
SetSecureLevelEntry.AddTo( from, this, list );
}
public override void Serialize( GenericWriter writer )
{
base.Serialize( writer );
writer.Write( (int) 3 );
writer.Write( (byte) m_Quality );
writer.Write( m_Crafter );
writer.Write( (int) Level );
writer.Write( Entries.Count );
for ( int i = 0; i < Entries.Count; ++i )
Entries[i].Serialize( writer );
writer.Write( m_Description );
writer.Write( CurCharges );
writer.Write( MaxCharges );
writer.Write( m_DefaultIndex );
}
public override void Deserialize( GenericReader reader )
{
base.Deserialize( reader );
public List<RunebookEntry> Entries{ get; private set; }
LootType = LootType.Blessed;
public RunebookEntry Default
{
get
{
if (m_DefaultIndex >= 0 && m_DefaultIndex < Entries.Count)
return Entries[m_DefaultIndex];
return null;
}
set
{
if (value == null)
m_DefaultIndex = -1;
else
m_DefaultIndex = Entries.IndexOf(value);
}
}
public override bool DisplayLootType => Core.AOS;
#region ICraftable Members
public int OnCraft(int quality, bool makersMark, Mobile from, CraftSystem craftSystem, Type typeRes, BaseTool tool,
CraftItem craftItem, int resHue)
{
int charges = 5 + quality + (int)(from.Skills[SkillName.Inscribe].Value / 30);
if (charges > 10)
charges = 10;
MaxCharges = Core.SE ? charges * 2 : charges;
if (makersMark)
Crafter = from;
m_Quality = (BookQuality)(quality - 1);
return quality;
}
#endregion
[CommandProperty(AccessLevel.GameMaster)]
public SecureLevel Level{ get; set; }
public override bool AllowEquippedCast(Mobile from)
{
return true;
}
public override void GetContextMenuEntries(Mobile from, List<ContextMenuEntry> list)
{
base.GetContextMenuEntries(from, list);
SetSecureLevelEntry.AddTo(from, this, list);
}
public override void Serialize(GenericWriter writer)
{
base.Serialize(writer);
writer.Write(3);
if ( Core.SE && Weight == 3.0 )
Weight = 1.0;
writer.Write((byte)m_Quality);
writer.Write(m_Crafter);
int version = reader.ReadInt();
writer.Write((int)Level);
writer.Write(Entries.Count);
switch ( version )
{
case 3:
{
m_Quality = (BookQuality) reader.ReadByte();
goto case 2;
}
case 2:
{
m_Crafter = reader.ReadMobile();
goto case 1;
}
case 1:
{
Level = (SecureLevel)reader.ReadInt();
goto case 0;
}
case 0:
{
int count = reader.ReadInt();
Entries = new List<RunebookEntry>( count );
for ( int i = 0; i < count; ++i )
Entries.Add( new RunebookEntry( reader ) );
m_Description = reader.ReadString();
CurCharges = reader.ReadInt();
MaxCharges = reader.ReadInt();
m_DefaultIndex = reader.ReadInt();
break;
}
}
}
public void DropRune( Mobile from, RunebookEntry e, int index )
{
if ( m_DefaultIndex > index )
m_DefaultIndex -= 1;
else if ( m_DefaultIndex == index )
m_DefaultIndex = -1;
Entries.RemoveAt( index );
RecallRune rune = new RecallRune();
rune.Target = e.Location;
rune.TargetMap = e.Map;
rune.Description = e.Description;
rune.House = e.House;
rune.Marked = true;
from.AddToBackpack( rune );
from.SendLocalizedMessage( 502421 ); // You have removed the rune.
}
public bool IsOpen( Mobile toCheck )
{
NetState ns = toCheck.NetState;
if (ns == null)
return false;
foreach ( Gump gump in ns.Gumps )
{
if ( gump is RunebookGump bookGump && bookGump.Book == this )
{
return true;
}
}
return false;
}
public override bool DisplayLootType => Core.AOS;
public override void GetProperties( ObjectPropertyList list )
{
base.GetProperties( list );
if ( m_Quality == BookQuality.Exceptional )
list.Add( 1063341 ); // exceptional
if ( m_Crafter != null )
list.Add( 1050043, m_Crafter.Name ); // crafted by ~1_NAME~
if ( !string.IsNullOrEmpty(m_Description) )
list.Add( m_Description );
}
public override bool OnDragLift( Mobile from )
{
if ( from.HasGump( typeof( RunebookGump ) ) )
{
from.SendLocalizedMessage( 500169 ); // You cannot pick that up.
return false;
}
foreach ( Mobile m in Openers )
if ( IsOpen( m ) )
m.CloseGump( typeof( RunebookGump ) );
Openers.Clear();
return true;
}
public override void OnSingleClick( Mobile from )
{
if ( m_Description != null && m_Description.Length > 0 )
LabelTo( from, m_Description );
base.OnSingleClick( from );
if ( m_Crafter != null )
LabelTo( from, 1050043, m_Crafter.Name );
}
public override void OnDoubleClick( Mobile from )
{
if ( from.InRange( GetWorldLocation(), (Core.ML ? 3 : 1) ) && CheckAccess( from ) )
{
if ( RootParent is BaseCreature )
{
from.SendLocalizedMessage( 502402 ); // That is inaccessible.
return;
}
if ( DateTime.UtcNow < NextUse )
{
from.SendLocalizedMessage( 502406 ); // This book needs time to recharge.
return;
}
from.CloseGump( typeof( RunebookGump ) );
from.SendGump( new RunebookGump( from, this ) );
Openers.Add( from );
}
}
public virtual void OnTravel()
{
if ( !Core.SA )
NextUse = DateTime.UtcNow + UseDelay;
}
public override void OnAfterDuped( Item newItem )
{
if ( !(newItem is Runebook book) )
return;
book.Entries = new List<RunebookEntry>();
for ( int i = 0; i < Entries.Count; i++ )
{
RunebookEntry entry = Entries[i];
book.Entries.Add( new RunebookEntry( entry.Location, entry.Map, entry.Description, entry.House ) );
}
}
public bool CheckAccess( Mobile m )
{
if ( !IsLockedDown || m.AccessLevel >= AccessLevel.GameMaster )
return true;
BaseHouse house = BaseHouse.FindHouseAt( this );
if ( house != null && house.IsAosRules && (house.Public ? house.IsBanned( m ) : !house.HasAccess( m )) )
return false;
return ( house != null && house.HasSecureAccess( m, Level ) );
}
public override bool OnDragDrop( Mobile from, Item dropped )
{
if ( dropped is RecallRune rune )
{
if ( IsLockedDown && from.AccessLevel < AccessLevel.GameMaster )
{
from.SendLocalizedMessage( 502413, null, 0x35 ); // That cannot be done while the book is locked down.
}
else if ( IsOpen( from ) )
{
from.SendLocalizedMessage( 1005571 ); // You cannot place objects in the book while viewing the contents.
}
else if ( Entries.Count < 16 )
{
if ( rune.Marked && rune.TargetMap != null )
{
Entries.Add( new RunebookEntry( rune.Target, rune.TargetMap, rune.Description, rune.House ) );
rune.Delete();
from.Send( new PlaySound( 0x42, GetWorldLocation() ) );
string desc = rune.Description;
if ( desc == null || (desc = desc.Trim()).Length == 0 )
desc = "(indescript)";
from.SendMessage( desc );
return true;
}
from.SendLocalizedMessage( 502409 ); // This rune does not have a marked location.
}
else
{
from.SendLocalizedMessage( 502401 ); // This runebook is full.
}
}
else if ( dropped is RecallScroll )
{
if ( CurCharges < MaxCharges )
{
from.Send( new PlaySound( 0x249, GetWorldLocation() ) );
int amount = dropped.Amount;
if ( amount > (MaxCharges - CurCharges) )
{
dropped.Consume( MaxCharges - CurCharges );
CurCharges = MaxCharges;
}
else
{
CurCharges += amount;
dropped.Delete();
return true;
}
}
else
{
from.SendLocalizedMessage( 502410 ); // This book already has the maximum amount of charges.
}
}
return false;
}
#region ICraftable Members
public int OnCraft( int quality, bool makersMark, Mobile from, CraftSystem craftSystem, Type typeRes, BaseTool tool, CraftItem craftItem, int resHue )
{
int charges = 5 + quality + (int)(from.Skills[SkillName.Inscribe].Value / 30);
if ( charges > 10 )
charges = 10;
MaxCharges = (Core.SE ? charges * 2 : charges);
if ( makersMark )
Crafter = from;
m_Quality = (BookQuality) ( quality - 1 );
return quality;
}
#endregion
}
public class RunebookEntry
{
public Point3D Location { get; }
public Map Map { get; }
public string Description { get; }
public BaseHouse House { get; }
public RunebookEntry( Point3D loc, Map map, string desc, BaseHouse house )
{
Location = loc;
Map = map;
Description = desc;
House = house;
}
public RunebookEntry( GenericReader reader )
{
int version = reader.ReadByte();
switch ( version )
{
case 1:
{
House = reader.ReadItem() as BaseHouse;
goto case 0;
}
case 0:
{
Location = reader.ReadPoint3D();
Map = reader.ReadMap();
Description = reader.ReadString();
break;
}
}
}
public void Serialize( GenericWriter writer )
{
if ( House != null && !House.Deleted )
{
writer.Write( (byte) 1 ); // version
writer.Write( House );
}
else
{
writer.Write( (byte) 0 ); // version
}
writer.Write( Location );
writer.Write( Map );
writer.Write( Description );
}
}
}
for (int i = 0; i < Entries.Count; ++i)
Entries[i].Serialize(writer);
writer.Write(m_Description);
writer.Write(CurCharges);
writer.Write(MaxCharges);
writer.Write(m_DefaultIndex);
}
public override void Deserialize(GenericReader reader)
{
base.Deserialize(reader);
LootType = LootType.Blessed;
if (Core.SE && Weight == 3.0)
Weight = 1.0;
int version = reader.ReadInt();
switch (version)
{
case 3:
{
m_Quality = (BookQuality)reader.ReadByte();
goto case 2;
}
case 2:
{
m_Crafter = reader.ReadMobile();
goto case 1;
}
case 1:
{
Level = (SecureLevel)reader.ReadInt();
goto case 0;
}
case 0:
{
int count = reader.ReadInt();
Entries = new List<RunebookEntry>(count);
for (int i = 0; i < count; ++i)
Entries.Add(new RunebookEntry(reader));
m_Description = reader.ReadString();
CurCharges = reader.ReadInt();
MaxCharges = reader.ReadInt();
m_DefaultIndex = reader.ReadInt();
break;
}
}
}
public void DropRune(Mobile from, RunebookEntry e, int index)
{
if (m_DefaultIndex > index)
m_DefaultIndex -= 1;
else if (m_DefaultIndex == index)
m_DefaultIndex = -1;
Entries.RemoveAt(index);
RecallRune rune = new RecallRune();
rune.Target = e.Location;
rune.TargetMap = e.Map;
rune.Description = e.Description;
rune.House = e.House;
rune.Marked = true;
from.AddToBackpack(rune);
from.SendLocalizedMessage(502421); // You have removed the rune.
}
public bool IsOpen(Mobile toCheck)
{
NetState ns = toCheck.NetState;
if (ns == null)
return false;
foreach (Gump gump in ns.Gumps)
if (gump is RunebookGump bookGump && bookGump.Book == this)
return true;
return false;
}
public override void GetProperties(ObjectPropertyList list)
{
base.GetProperties(list);
if (m_Quality == BookQuality.Exceptional)
list.Add(1063341); // exceptional
if (m_Crafter != null)
list.Add(1050043, m_Crafter.Name); // crafted by ~1_NAME~
if (!string.IsNullOrEmpty(m_Description))
list.Add(m_Description);
}
public override bool OnDragLift(Mobile from)
{
if (from.HasGump(typeof(RunebookGump)))
{
from.SendLocalizedMessage(500169); // You cannot pick that up.
return false;
}
foreach (Mobile m in Openers)
if (IsOpen(m))
m.CloseGump(typeof(RunebookGump));
Openers.Clear();
return true;
}
public override void OnSingleClick(Mobile from)
{
if (m_Description != null && m_Description.Length > 0)
LabelTo(from, m_Description);
base.OnSingleClick(from);
if (m_Crafter != null)
LabelTo(from, 1050043, m_Crafter.Name);
}
public override void OnDoubleClick(Mobile from)
{
if (from.InRange(GetWorldLocation(), Core.ML ? 3 : 1) && CheckAccess(from))
{
if (RootParent is BaseCreature)
{
from.SendLocalizedMessage(502402); // That is inaccessible.
return;
}
if (DateTime.UtcNow < NextUse)
{
from.SendLocalizedMessage(502406); // This book needs time to recharge.
return;
}
from.CloseGump(typeof(RunebookGump));
from.SendGump(new RunebookGump(from, this));
Openers.Add(from);
}
}
public virtual void OnTravel()
{
if (!Core.SA)
NextUse = DateTime.UtcNow + UseDelay;
}
public override void OnAfterDuped(Item newItem)
{
if (!(newItem is Runebook book))
return;
book.Entries = new List<RunebookEntry>();
for (int i = 0; i < Entries.Count; i++)
{
RunebookEntry entry = Entries[i];
book.Entries.Add(new RunebookEntry(entry.Location, entry.Map, entry.Description, entry.House));
}
}
public bool CheckAccess(Mobile m)
{
if (!IsLockedDown || m.AccessLevel >= AccessLevel.GameMaster)
return true;
BaseHouse house = BaseHouse.FindHouseAt(this);
if (house != null && house.IsAosRules && (house.Public ? house.IsBanned(m) : !house.HasAccess(m)))
return false;
return house != null && house.HasSecureAccess(m, Level);
}
public override bool OnDragDrop(Mobile from, Item dropped)
{
if (dropped is RecallRune rune)
{
if (IsLockedDown && from.AccessLevel < AccessLevel.GameMaster)
{
from.SendLocalizedMessage(502413, null, 0x35); // That cannot be done while the book is locked down.
}
else if (IsOpen(from))
{
from.SendLocalizedMessage(1005571); // You cannot place objects in the book while viewing the contents.
}
else if (Entries.Count < 16)
{
if (rune.Marked && rune.TargetMap != null)
{
Entries.Add(new RunebookEntry(rune.Target, rune.TargetMap, rune.Description, rune.House));
rune.Delete();
from.Send(new PlaySound(0x42, GetWorldLocation()));
string desc = rune.Description;
if (desc == null || (desc = desc.Trim()).Length == 0)
desc = "(indescript)";
from.SendMessage(desc);
return true;
}
from.SendLocalizedMessage(502409); // This rune does not have a marked location.
}
else
{
from.SendLocalizedMessage(502401); // This runebook is full.
}
}
else if (dropped is RecallScroll)
{
if (CurCharges < MaxCharges)
{
from.Send(new PlaySound(0x249, GetWorldLocation()));
int amount = dropped.Amount;
if (amount > MaxCharges - CurCharges)
{
dropped.Consume(MaxCharges - CurCharges);
CurCharges = MaxCharges;
}
else
{
CurCharges += amount;
dropped.Delete();
return true;
}
}
else
{
from.SendLocalizedMessage(502410); // This book already has the maximum amount of charges.
}
}
return false;
}
}
public class RunebookEntry
{
public RunebookEntry(Point3D loc, Map map, string desc, BaseHouse house)
{
Location = loc;
Map = map;
Description = desc;
House = house;
}
public RunebookEntry(GenericReader reader)
{
int version = reader.ReadByte();
switch (version)
{
case 1:
{
House = reader.ReadItem() as BaseHouse;
goto case 0;
}
case 0:
{
Location = reader.ReadPoint3D();
Map = reader.ReadMap();
Description = reader.ReadString();
break;
}
}
}
public Point3D Location{ get; }
public Map Map{ get; }
public string Description{ get; }
public BaseHouse House{ get; }
public void Serialize(GenericWriter writer)
{
if (House != null && !House.Deleted)
{
writer.Write((byte)1); // version
writer.Write(House);
}
else
{
writer.Write((byte)0); // version
}
writer.Write(Location);
writer.Write(Map);
writer.Write(Description);
}
}
}