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,211 +1,214 @@
|
|||
using System;
|
||||
using Server.Network;
|
||||
using System.Collections.Generic;
|
||||
using Server.Network;
|
||||
|
||||
namespace Server.Items
|
||||
{
|
||||
public interface IFlourMill
|
||||
{
|
||||
int MaxFlour{ get; }
|
||||
int CurFlour{ get; set; }
|
||||
}
|
||||
public interface IFlourMill
|
||||
{
|
||||
int MaxFlour{ get; }
|
||||
int CurFlour{ get; set; }
|
||||
}
|
||||
|
||||
public enum FlourMillStage
|
||||
{
|
||||
Empty,
|
||||
Filled,
|
||||
Working
|
||||
}
|
||||
public enum FlourMillStage
|
||||
{
|
||||
Empty,
|
||||
Filled,
|
||||
Working
|
||||
}
|
||||
|
||||
public class FlourMillEastAddon : BaseAddon, IFlourMill
|
||||
{
|
||||
public override BaseAddonDeed Deed => new FlourMillEastDeed();
|
||||
public class FlourMillEastAddon : BaseAddon, IFlourMill
|
||||
{
|
||||
private static int[][] m_StageTable =
|
||||
{
|
||||
new[] { 0x1920, 0x1921, 0x1925 },
|
||||
new[] { 0x1922, 0x1923, 0x1926 },
|
||||
new[] { 0x1924, 0x1924, 0x1928 }
|
||||
};
|
||||
|
||||
private int m_Flour;
|
||||
private Timer m_Timer;
|
||||
private int m_Flour;
|
||||
private Timer m_Timer;
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public int MaxFlour => 2;
|
||||
[Constructible]
|
||||
public FlourMillEastAddon()
|
||||
{
|
||||
AddComponent(new AddonComponent(0x1920), -1, 0, 0);
|
||||
AddComponent(new AddonComponent(0x1922), 0, 0, 0);
|
||||
AddComponent(new AddonComponent(0x1924), 1, 0, 0);
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public int CurFlour
|
||||
{
|
||||
get => m_Flour;
|
||||
set{ m_Flour = Math.Max( 0, Math.Min( value, MaxFlour ) ); UpdateStage(); }
|
||||
}
|
||||
public FlourMillEastAddon(Serial serial) : base(serial)
|
||||
{
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public bool HasFlour => ( m_Flour > 0 );
|
||||
public override BaseAddonDeed Deed => new FlourMillEastDeed();
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public bool IsFull => ( m_Flour >= MaxFlour );
|
||||
[CommandProperty(AccessLevel.GameMaster)]
|
||||
public bool HasFlour => m_Flour > 0;
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public bool IsWorking => ( m_Timer != null );
|
||||
[CommandProperty(AccessLevel.GameMaster)]
|
||||
public bool IsFull => m_Flour >= MaxFlour;
|
||||
|
||||
public void StartWorking( Mobile from )
|
||||
{
|
||||
if ( IsWorking )
|
||||
return;
|
||||
[CommandProperty(AccessLevel.GameMaster)]
|
||||
public bool IsWorking => m_Timer != null;
|
||||
|
||||
m_Timer = Timer.DelayCall( TimeSpan.FromSeconds( 5.0 ), new TimerStateCallback( FinishWorking_Callback ), from );
|
||||
UpdateStage();
|
||||
}
|
||||
[CommandProperty(AccessLevel.GameMaster)]
|
||||
public int MaxFlour => 2;
|
||||
|
||||
private void FinishWorking_Callback( object state )
|
||||
{
|
||||
if ( m_Timer != null )
|
||||
{
|
||||
m_Timer.Stop();
|
||||
m_Timer = null;
|
||||
}
|
||||
[CommandProperty(AccessLevel.GameMaster)]
|
||||
public int CurFlour
|
||||
{
|
||||
get => m_Flour;
|
||||
set
|
||||
{
|
||||
m_Flour = Math.Max(0, Math.Min(value, MaxFlour));
|
||||
UpdateStage();
|
||||
}
|
||||
}
|
||||
|
||||
if ( state is Mobile from && !from.Deleted && !Deleted && IsFull )
|
||||
{
|
||||
SackFlour flour = new SackFlour();
|
||||
public void StartWorking(Mobile from)
|
||||
{
|
||||
if (IsWorking)
|
||||
return;
|
||||
|
||||
flour.ItemID = ( Utility.RandomBool() ? 4153 : 4165 );
|
||||
m_Timer = Timer.DelayCall(TimeSpan.FromSeconds(5.0), new TimerStateCallback(FinishWorking_Callback), from);
|
||||
UpdateStage();
|
||||
}
|
||||
|
||||
if ( from.PlaceInBackpack( flour ) )
|
||||
{
|
||||
m_Flour = 0;
|
||||
}
|
||||
else
|
||||
{
|
||||
flour.Delete();
|
||||
from.SendLocalizedMessage( 500998 ); // There is not enough room in your backpack! You stop grinding.
|
||||
}
|
||||
}
|
||||
private void FinishWorking_Callback(object state)
|
||||
{
|
||||
if (m_Timer != null)
|
||||
{
|
||||
m_Timer.Stop();
|
||||
m_Timer = null;
|
||||
}
|
||||
|
||||
UpdateStage();
|
||||
}
|
||||
if (state is Mobile from && !from.Deleted && !Deleted && IsFull)
|
||||
{
|
||||
SackFlour flour = new SackFlour();
|
||||
|
||||
private static int[][] m_StageTable = {
|
||||
new[]{ 0x1920, 0x1921, 0x1925 },
|
||||
new[]{ 0x1922, 0x1923, 0x1926 },
|
||||
new[]{ 0x1924, 0x1924, 0x1928 }
|
||||
};
|
||||
flour.ItemID = Utility.RandomBool() ? 4153 : 4165;
|
||||
|
||||
private int[] FindItemTable( int itemID )
|
||||
{
|
||||
for ( int i = 0; i < m_StageTable.Length; ++i )
|
||||
{
|
||||
int[] itemTable = m_StageTable[i];
|
||||
if (from.PlaceInBackpack(flour))
|
||||
{
|
||||
m_Flour = 0;
|
||||
}
|
||||
else
|
||||
{
|
||||
flour.Delete();
|
||||
from.SendLocalizedMessage(500998); // There is not enough room in your backpack! You stop grinding.
|
||||
}
|
||||
}
|
||||
|
||||
for ( int j = 0; j < itemTable.Length; ++j )
|
||||
{
|
||||
if ( itemTable[j] == itemID )
|
||||
return itemTable;
|
||||
}
|
||||
}
|
||||
UpdateStage();
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
private int[] FindItemTable(int itemID)
|
||||
{
|
||||
for (int i = 0; i < m_StageTable.Length; ++i)
|
||||
{
|
||||
int[] itemTable = m_StageTable[i];
|
||||
|
||||
public void UpdateStage()
|
||||
{
|
||||
if ( IsWorking )
|
||||
UpdateStage( FlourMillStage.Working );
|
||||
else if ( HasFlour )
|
||||
UpdateStage( FlourMillStage.Filled );
|
||||
else
|
||||
UpdateStage( FlourMillStage.Empty );
|
||||
}
|
||||
for (int j = 0; j < itemTable.Length; ++j)
|
||||
if (itemTable[j] == itemID)
|
||||
return itemTable;
|
||||
}
|
||||
|
||||
public void UpdateStage( FlourMillStage stage )
|
||||
{
|
||||
List<AddonComponent> components = Components;
|
||||
return null;
|
||||
}
|
||||
|
||||
int[][] stageTable = m_StageTable;
|
||||
public void UpdateStage()
|
||||
{
|
||||
if (IsWorking)
|
||||
UpdateStage(FlourMillStage.Working);
|
||||
else if (HasFlour)
|
||||
UpdateStage(FlourMillStage.Filled);
|
||||
else
|
||||
UpdateStage(FlourMillStage.Empty);
|
||||
}
|
||||
|
||||
for ( int i = 0; i < components.Count; ++i )
|
||||
{
|
||||
if ( !(components[i] is AddonComponent component) )
|
||||
continue;
|
||||
public void UpdateStage(FlourMillStage stage)
|
||||
{
|
||||
List<AddonComponent> components = Components;
|
||||
|
||||
int[] itemTable = FindItemTable( component.ItemID );
|
||||
int[][] stageTable = m_StageTable;
|
||||
|
||||
if ( itemTable != null )
|
||||
component.ItemID = itemTable[(int)stage];
|
||||
}
|
||||
}
|
||||
for (int i = 0; i < components.Count; ++i)
|
||||
{
|
||||
if (!(components[i] is AddonComponent component))
|
||||
continue;
|
||||
|
||||
public override void OnComponentUsed( AddonComponent c, Mobile from )
|
||||
{
|
||||
if ( !from.InRange( GetWorldLocation(), 4 ) || !from.InLOS( this ) )
|
||||
from.LocalOverheadMessage( MessageType.Regular, 0x3B2, 1019045 ); // I can't reach that.
|
||||
else if ( !IsFull )
|
||||
from.SendLocalizedMessage( 500997 ); // You need more wheat to make a sack of flour.
|
||||
else
|
||||
StartWorking( from );
|
||||
}
|
||||
int[] itemTable = FindItemTable(component.ItemID);
|
||||
|
||||
[Constructible]
|
||||
public FlourMillEastAddon()
|
||||
{
|
||||
AddComponent( new AddonComponent( 0x1920 ),-1, 0, 0 );
|
||||
AddComponent( new AddonComponent( 0x1922 ), 0, 0, 0 );
|
||||
AddComponent( new AddonComponent( 0x1924 ), 1, 0, 0 );
|
||||
}
|
||||
if (itemTable != null)
|
||||
component.ItemID = itemTable[(int)stage];
|
||||
}
|
||||
}
|
||||
|
||||
public FlourMillEastAddon( Serial serial ) : base( serial )
|
||||
{
|
||||
}
|
||||
public override void OnComponentUsed(AddonComponent c, Mobile from)
|
||||
{
|
||||
if (!from.InRange(GetWorldLocation(), 4) || !from.InLOS(this))
|
||||
from.LocalOverheadMessage(MessageType.Regular, 0x3B2, 1019045); // I can't reach that.
|
||||
else if (!IsFull)
|
||||
from.SendLocalizedMessage(500997); // You need more wheat to make a sack of flour.
|
||||
else
|
||||
StartWorking(from);
|
||||
}
|
||||
|
||||
public override void Serialize( GenericWriter writer )
|
||||
{
|
||||
base.Serialize( writer );
|
||||
public override void Serialize(GenericWriter writer)
|
||||
{
|
||||
base.Serialize(writer);
|
||||
|
||||
writer.Write( (int) 1 ); // version
|
||||
writer.Write(1); // version
|
||||
|
||||
writer.Write( (int) m_Flour );
|
||||
}
|
||||
writer.Write(m_Flour);
|
||||
}
|
||||
|
||||
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 1:
|
||||
{
|
||||
m_Flour = reader.ReadInt();
|
||||
break;
|
||||
}
|
||||
}
|
||||
switch (version)
|
||||
{
|
||||
case 1:
|
||||
{
|
||||
m_Flour = reader.ReadInt();
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
UpdateStage();
|
||||
}
|
||||
}
|
||||
UpdateStage();
|
||||
}
|
||||
}
|
||||
|
||||
public class FlourMillEastDeed : BaseAddonDeed
|
||||
{
|
||||
public override BaseAddon Addon => new FlourMillEastAddon();
|
||||
public override int LabelNumber => 1044347; // flour mill (east)
|
||||
public class FlourMillEastDeed : BaseAddonDeed
|
||||
{
|
||||
[Constructible]
|
||||
public FlourMillEastDeed()
|
||||
{
|
||||
}
|
||||
|
||||
[Constructible]
|
||||
public FlourMillEastDeed()
|
||||
{
|
||||
}
|
||||
public FlourMillEastDeed(Serial serial) : base(serial)
|
||||
{
|
||||
}
|
||||
|
||||
public FlourMillEastDeed( Serial serial ) : base( serial )
|
||||
{
|
||||
}
|
||||
public override BaseAddon Addon => new FlourMillEastAddon();
|
||||
public override int LabelNumber => 1044347; // flour mill (east)
|
||||
|
||||
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();
|
||||
}
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue