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,252 +1,262 @@
|
|||
using Server.Engines.Craft;
|
||||
|
||||
namespace Server.Items
|
||||
{
|
||||
[Engines.Craft.Anvil]
|
||||
public class AnvilComponent : AddonComponent
|
||||
{
|
||||
[Constructible]
|
||||
public AnvilComponent( int itemID ) : base( itemID )
|
||||
{
|
||||
}
|
||||
[Anvil]
|
||||
public class AnvilComponent : AddonComponent
|
||||
{
|
||||
[Constructible]
|
||||
public AnvilComponent(int itemID) : base(itemID)
|
||||
{
|
||||
}
|
||||
|
||||
public AnvilComponent( Serial serial ) : base( serial )
|
||||
{
|
||||
}
|
||||
public AnvilComponent(Serial serial) : base(serial)
|
||||
{
|
||||
}
|
||||
|
||||
public override void Serialize( GenericWriter writer )
|
||||
{
|
||||
base.Serialize( writer );
|
||||
public override void Serialize(GenericWriter writer)
|
||||
{
|
||||
base.Serialize(writer);
|
||||
|
||||
writer.Write( (int) 0 ); // version
|
||||
}
|
||||
writer.Write(0); // version
|
||||
}
|
||||
|
||||
public override void Deserialize( GenericReader reader )
|
||||
{
|
||||
base.Deserialize( reader );
|
||||
public override void Deserialize(GenericReader reader)
|
||||
{
|
||||
base.Deserialize(reader);
|
||||
|
||||
int version = reader.ReadInt();
|
||||
}
|
||||
}
|
||||
int version = reader.ReadInt();
|
||||
}
|
||||
}
|
||||
|
||||
[Engines.Craft.Forge]
|
||||
public class ForgeComponent : AddonComponent
|
||||
{
|
||||
[Constructible]
|
||||
public ForgeComponent( int itemID ) : base( itemID )
|
||||
{
|
||||
}
|
||||
[Forge]
|
||||
public class ForgeComponent : AddonComponent
|
||||
{
|
||||
[Constructible]
|
||||
public ForgeComponent(int itemID) : base(itemID)
|
||||
{
|
||||
}
|
||||
|
||||
public ForgeComponent( Serial serial ) : base( serial )
|
||||
{
|
||||
}
|
||||
public ForgeComponent(Serial serial) : base(serial)
|
||||
{
|
||||
}
|
||||
|
||||
public override void Serialize( GenericWriter writer )
|
||||
{
|
||||
base.Serialize( writer );
|
||||
public override void Serialize(GenericWriter writer)
|
||||
{
|
||||
base.Serialize(writer);
|
||||
|
||||
writer.Write( (int) 0 ); // version
|
||||
}
|
||||
writer.Write(0); // version
|
||||
}
|
||||
|
||||
public override void Deserialize( GenericReader reader )
|
||||
{
|
||||
base.Deserialize( reader );
|
||||
public override void Deserialize(GenericReader reader)
|
||||
{
|
||||
base.Deserialize(reader);
|
||||
|
||||
int version = reader.ReadInt();
|
||||
}
|
||||
}
|
||||
int version = reader.ReadInt();
|
||||
}
|
||||
}
|
||||
|
||||
public class LocalizedAddonComponent : AddonComponent
|
||||
{
|
||||
private int m_LabelNumber;
|
||||
public class LocalizedAddonComponent : AddonComponent
|
||||
{
|
||||
private int m_LabelNumber;
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public int Number
|
||||
{
|
||||
get => m_LabelNumber;
|
||||
set{ m_LabelNumber = value; InvalidateProperties(); }
|
||||
}
|
||||
[Constructible]
|
||||
public LocalizedAddonComponent(int itemID, int labelNumber) : base(itemID)
|
||||
{
|
||||
m_LabelNumber = labelNumber;
|
||||
}
|
||||
|
||||
public override int LabelNumber => m_LabelNumber;
|
||||
public LocalizedAddonComponent(Serial serial) : base(serial)
|
||||
{
|
||||
}
|
||||
|
||||
[Constructible]
|
||||
public LocalizedAddonComponent( int itemID, int labelNumber ) : base( itemID )
|
||||
{
|
||||
m_LabelNumber = labelNumber;
|
||||
}
|
||||
[CommandProperty(AccessLevel.GameMaster)]
|
||||
public int Number
|
||||
{
|
||||
get => m_LabelNumber;
|
||||
set
|
||||
{
|
||||
m_LabelNumber = value;
|
||||
InvalidateProperties();
|
||||
}
|
||||
}
|
||||
|
||||
public LocalizedAddonComponent( Serial serial ) : base( serial )
|
||||
{
|
||||
}
|
||||
public override int LabelNumber => m_LabelNumber;
|
||||
|
||||
public override void Serialize( GenericWriter writer )
|
||||
{
|
||||
base.Serialize( writer );
|
||||
public override void Serialize(GenericWriter writer)
|
||||
{
|
||||
base.Serialize(writer);
|
||||
|
||||
writer.Write( (int) 0 ); // version
|
||||
writer.Write(0); // version
|
||||
|
||||
writer.Write( (int) m_LabelNumber );
|
||||
}
|
||||
writer.Write(m_LabelNumber);
|
||||
}
|
||||
|
||||
public override void Deserialize( GenericReader reader )
|
||||
{
|
||||
base.Deserialize( reader );
|
||||
public override void Deserialize(GenericReader reader)
|
||||
{
|
||||
base.Deserialize(reader);
|
||||
|
||||
int version = reader.ReadInt();
|
||||
int version = reader.ReadInt();
|
||||
|
||||
switch ( version )
|
||||
{
|
||||
case 0:
|
||||
{
|
||||
m_LabelNumber = reader.ReadInt();
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
switch (version)
|
||||
{
|
||||
case 0:
|
||||
{
|
||||
m_LabelNumber = reader.ReadInt();
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public class AddonComponent : Item, IChopable
|
||||
{
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public BaseAddon Addon { get; set; }
|
||||
public class AddonComponent : Item, IChopable
|
||||
{
|
||||
private static LightEntry[] m_Entries =
|
||||
{
|
||||
new LightEntry(LightType.WestSmall, 1122, 1123, 1124, 1141, 1142, 1143, 1144, 1145, 1146, 2347, 2359, 2360, 2361,
|
||||
2362, 2363, 2364, 2387, 2388, 2389, 2390, 2391, 2392),
|
||||
new LightEntry(LightType.NorthSmall, 1131, 1133, 1134, 1147, 1148, 1149, 1150, 1151, 1152, 2352, 2373, 2374,
|
||||
2375, 2376, 2377, 2378, 2401, 2402, 2403, 2404, 2405, 2406),
|
||||
new LightEntry(LightType.Circle300, 6526, 6538, 6571),
|
||||
new LightEntry(LightType.Circle150, 5703, 6587)
|
||||
};
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public Point3D Offset { get; set; }
|
||||
[Constructible]
|
||||
public AddonComponent(int itemID) : base(itemID)
|
||||
{
|
||||
Movable = false;
|
||||
ApplyLightTo(this);
|
||||
}
|
||||
|
||||
[Hue, CommandProperty( AccessLevel.GameMaster )]
|
||||
public override int Hue
|
||||
{
|
||||
get => base.Hue;
|
||||
set
|
||||
{
|
||||
base.Hue = value;
|
||||
public AddonComponent(Serial serial) : base(serial)
|
||||
{
|
||||
}
|
||||
|
||||
if ( Addon != null && Addon.ShareHue )
|
||||
Addon.Hue = value;
|
||||
}
|
||||
}
|
||||
[CommandProperty(AccessLevel.GameMaster)]
|
||||
public BaseAddon Addon{ get; set; }
|
||||
|
||||
public virtual bool NeedsWall => false;
|
||||
public virtual Point3D WallPosition => Point3D.Zero;
|
||||
[CommandProperty(AccessLevel.GameMaster)]
|
||||
public Point3D Offset{ get; set; }
|
||||
|
||||
[Constructible]
|
||||
public AddonComponent( int itemID ) : base( itemID )
|
||||
{
|
||||
Movable = false;
|
||||
ApplyLightTo( this );
|
||||
}
|
||||
[Hue]
|
||||
[CommandProperty(AccessLevel.GameMaster)]
|
||||
public override int Hue
|
||||
{
|
||||
get => base.Hue;
|
||||
set
|
||||
{
|
||||
base.Hue = value;
|
||||
|
||||
public AddonComponent( Serial serial ) : base( serial )
|
||||
{
|
||||
}
|
||||
if (Addon != null && Addon.ShareHue)
|
||||
Addon.Hue = value;
|
||||
}
|
||||
}
|
||||
|
||||
public override void OnDoubleClick( Mobile from )
|
||||
{
|
||||
Addon?.OnComponentUsed( this, from );
|
||||
}
|
||||
public virtual bool NeedsWall => false;
|
||||
public virtual Point3D WallPosition => Point3D.Zero;
|
||||
|
||||
public void OnChop( Mobile from )
|
||||
{
|
||||
if ( Addon != null && from.InRange( GetWorldLocation(), 3 ) )
|
||||
Addon.OnChop( from );
|
||||
else
|
||||
from.SendLocalizedMessage( 500446 ); // That is too far away.
|
||||
}
|
||||
public void OnChop(Mobile from)
|
||||
{
|
||||
if (Addon != null && from.InRange(GetWorldLocation(), 3))
|
||||
Addon.OnChop(from);
|
||||
else
|
||||
from.SendLocalizedMessage(500446); // That is too far away.
|
||||
}
|
||||
|
||||
public override void OnLocationChange( Point3D old )
|
||||
{
|
||||
if ( Addon != null )
|
||||
Addon.Location = new Point3D( X - Offset.X, Y - Offset.Y, Z - Offset.Z );
|
||||
}
|
||||
public override void OnDoubleClick(Mobile from)
|
||||
{
|
||||
Addon?.OnComponentUsed(this, from);
|
||||
}
|
||||
|
||||
public override void OnMapChange()
|
||||
{
|
||||
if ( Addon != null )
|
||||
Addon.Map = Map;
|
||||
}
|
||||
public override void OnLocationChange(Point3D old)
|
||||
{
|
||||
if (Addon != null)
|
||||
Addon.Location = new Point3D(X - Offset.X, Y - Offset.Y, Z - Offset.Z);
|
||||
}
|
||||
|
||||
public override void OnAfterDelete()
|
||||
{
|
||||
base.OnAfterDelete();
|
||||
public override void OnMapChange()
|
||||
{
|
||||
if (Addon != null)
|
||||
Addon.Map = Map;
|
||||
}
|
||||
|
||||
Addon?.Delete();
|
||||
}
|
||||
public override void OnAfterDelete()
|
||||
{
|
||||
base.OnAfterDelete();
|
||||
|
||||
public override void Serialize( GenericWriter writer )
|
||||
{
|
||||
base.Serialize( writer );
|
||||
Addon?.Delete();
|
||||
}
|
||||
|
||||
writer.Write( (int) 1 ); // version
|
||||
public override void Serialize(GenericWriter writer)
|
||||
{
|
||||
base.Serialize(writer);
|
||||
|
||||
writer.Write( Addon );
|
||||
writer.Write( Offset );
|
||||
}
|
||||
writer.Write(1); // version
|
||||
|
||||
public override void Deserialize( GenericReader reader )
|
||||
{
|
||||
base.Deserialize( reader );
|
||||
writer.Write(Addon);
|
||||
writer.Write(Offset);
|
||||
}
|
||||
|
||||
int version = reader.ReadInt();
|
||||
public override void Deserialize(GenericReader reader)
|
||||
{
|
||||
base.Deserialize(reader);
|
||||
|
||||
switch ( version )
|
||||
{
|
||||
case 1:
|
||||
case 0:
|
||||
{
|
||||
Addon = reader.ReadItem() as BaseAddon;
|
||||
Offset = reader.ReadPoint3D();
|
||||
int version = reader.ReadInt();
|
||||
|
||||
Addon?.OnComponentLoaded( this );
|
||||
switch (version)
|
||||
{
|
||||
case 1:
|
||||
case 0:
|
||||
{
|
||||
Addon = reader.ReadItem() as BaseAddon;
|
||||
Offset = reader.ReadPoint3D();
|
||||
|
||||
ApplyLightTo( this );
|
||||
Addon?.OnComponentLoaded(this);
|
||||
|
||||
break;
|
||||
}
|
||||
}
|
||||
ApplyLightTo(this);
|
||||
|
||||
if ( version < 1 && Weight == 0 )
|
||||
Weight = -1;
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
public static void ApplyLightTo( Item item )
|
||||
{
|
||||
if ( (item.ItemData.Flags & TileFlag.LightSource) == 0 )
|
||||
return; // not a light source
|
||||
if (version < 1 && Weight == 0)
|
||||
Weight = -1;
|
||||
}
|
||||
|
||||
int itemID = item.ItemID;
|
||||
public static void ApplyLightTo(Item item)
|
||||
{
|
||||
if ((item.ItemData.Flags & TileFlag.LightSource) == 0)
|
||||
return; // not a light source
|
||||
|
||||
for ( int i = 0; i < m_Entries.Length; ++i )
|
||||
{
|
||||
LightEntry entry = m_Entries[i];
|
||||
int[] toMatch = entry.m_ItemIDs;
|
||||
bool contains = false;
|
||||
int itemID = item.ItemID;
|
||||
|
||||
for ( int j = 0; !contains && j < toMatch.Length; ++j )
|
||||
contains = ( itemID == toMatch[j] );
|
||||
for (int i = 0; i < m_Entries.Length; ++i)
|
||||
{
|
||||
LightEntry entry = m_Entries[i];
|
||||
int[] toMatch = entry.m_ItemIDs;
|
||||
bool contains = false;
|
||||
|
||||
if ( contains )
|
||||
{
|
||||
item.Light = entry.m_Light;
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
for (int j = 0; !contains && j < toMatch.Length; ++j)
|
||||
contains = itemID == toMatch[j];
|
||||
|
||||
private static LightEntry[] m_Entries = {
|
||||
new LightEntry( LightType.WestSmall, 1122, 1123, 1124, 1141, 1142, 1143, 1144, 1145, 1146, 2347, 2359, 2360, 2361, 2362, 2363, 2364, 2387, 2388, 2389, 2390, 2391, 2392 ),
|
||||
new LightEntry( LightType.NorthSmall, 1131, 1133, 1134, 1147, 1148, 1149, 1150, 1151, 1152, 2352, 2373, 2374, 2375, 2376, 2377, 2378, 2401, 2402, 2403, 2404, 2405, 2406 ),
|
||||
new LightEntry( LightType.Circle300, 6526, 6538, 6571 ),
|
||||
new LightEntry( LightType.Circle150, 5703, 6587 )
|
||||
};
|
||||
if (contains)
|
||||
{
|
||||
item.Light = entry.m_Light;
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private class LightEntry
|
||||
{
|
||||
public LightType m_Light;
|
||||
public int[] m_ItemIDs;
|
||||
private class LightEntry
|
||||
{
|
||||
public int[] m_ItemIDs;
|
||||
public LightType m_Light;
|
||||
|
||||
public LightEntry( LightType light, params int[] itemIDs )
|
||||
{
|
||||
m_Light = light;
|
||||
m_ItemIDs = itemIDs;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
public LightEntry(LightType light, params int[] itemIDs)
|
||||
{
|
||||
m_Light = light;
|
||||
m_ItemIDs = itemIDs;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue