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
|
|
@ -2,214 +2,214 @@ using System;
|
|||
|
||||
namespace Server.Items
|
||||
{
|
||||
public class BaseTreasureChest : LockableContainer
|
||||
{
|
||||
private TreasureResetTimer m_ResetTimer;
|
||||
public class BaseTreasureChest : LockableContainer
|
||||
{
|
||||
public enum TreasureLevel
|
||||
{
|
||||
Level1,
|
||||
Level2,
|
||||
Level3,
|
||||
Level4,
|
||||
Level5,
|
||||
Level6
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public TreasureLevel Level { get; set; }
|
||||
private TreasureResetTimer m_ResetTimer;
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public short MaxSpawnTime { get; set; } = 60;
|
||||
public BaseTreasureChest(int itemID) : this(itemID, TreasureLevel.Level2)
|
||||
{
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public short MinSpawnTime { get; set; } = 10;
|
||||
public BaseTreasureChest(int itemID, TreasureLevel level) : base(itemID)
|
||||
{
|
||||
Level = level;
|
||||
Locked = true;
|
||||
Movable = false;
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public override bool Locked {
|
||||
get => base.Locked;
|
||||
set {
|
||||
if ( base.Locked != value ) {
|
||||
base.Locked = value;
|
||||
SetLockLevel();
|
||||
GenerateTreasure();
|
||||
}
|
||||
|
||||
if ( !value )
|
||||
StartResetTimer();
|
||||
}
|
||||
}
|
||||
}
|
||||
public BaseTreasureChest(Serial serial) : base(serial)
|
||||
{
|
||||
}
|
||||
|
||||
public override bool IsDecoContainer => false;
|
||||
[CommandProperty(AccessLevel.GameMaster)]
|
||||
public TreasureLevel Level{ get; set; }
|
||||
|
||||
public BaseTreasureChest( int itemID ) : this( itemID, TreasureLevel.Level2 )
|
||||
{
|
||||
}
|
||||
[CommandProperty(AccessLevel.GameMaster)]
|
||||
public short MaxSpawnTime{ get; set; } = 60;
|
||||
|
||||
public BaseTreasureChest( int itemID, TreasureLevel level ) : base( itemID )
|
||||
{
|
||||
Level = level;
|
||||
Locked = true;
|
||||
Movable = false;
|
||||
[CommandProperty(AccessLevel.GameMaster)]
|
||||
public short MinSpawnTime{ get; set; } = 10;
|
||||
|
||||
SetLockLevel();
|
||||
GenerateTreasure();
|
||||
}
|
||||
[CommandProperty(AccessLevel.GameMaster)]
|
||||
public override bool Locked
|
||||
{
|
||||
get => base.Locked;
|
||||
set
|
||||
{
|
||||
if (base.Locked != value)
|
||||
{
|
||||
base.Locked = value;
|
||||
|
||||
public BaseTreasureChest( Serial serial ) : base( serial )
|
||||
{
|
||||
}
|
||||
if (!value)
|
||||
StartResetTimer();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public override string DefaultName
|
||||
{
|
||||
get
|
||||
{
|
||||
if ( Locked )
|
||||
return "a locked treasure chest";
|
||||
public override bool IsDecoContainer => false;
|
||||
|
||||
return "a treasure chest";
|
||||
}
|
||||
}
|
||||
public override string DefaultName
|
||||
{
|
||||
get
|
||||
{
|
||||
if (Locked)
|
||||
return "a locked treasure chest";
|
||||
|
||||
public override void Serialize( GenericWriter writer )
|
||||
{
|
||||
base.Serialize( writer );
|
||||
return "a treasure chest";
|
||||
}
|
||||
}
|
||||
|
||||
writer.Write( (int) 0 );
|
||||
writer.Write( (byte) Level );
|
||||
writer.Write( MinSpawnTime );
|
||||
writer.Write( MaxSpawnTime );
|
||||
}
|
||||
public override void Serialize(GenericWriter writer)
|
||||
{
|
||||
base.Serialize(writer);
|
||||
|
||||
public override void Deserialize( GenericReader reader )
|
||||
{
|
||||
base.Deserialize( reader );
|
||||
writer.Write(0);
|
||||
writer.Write((byte)Level);
|
||||
writer.Write(MinSpawnTime);
|
||||
writer.Write(MaxSpawnTime);
|
||||
}
|
||||
|
||||
int version = reader.ReadInt();
|
||||
public override void Deserialize(GenericReader reader)
|
||||
{
|
||||
base.Deserialize(reader);
|
||||
|
||||
Level = (TreasureLevel)reader.ReadByte();
|
||||
MinSpawnTime = reader.ReadShort();
|
||||
MaxSpawnTime = reader.ReadShort();
|
||||
int version = reader.ReadInt();
|
||||
|
||||
if ( !Locked )
|
||||
StartResetTimer();
|
||||
}
|
||||
Level = (TreasureLevel)reader.ReadByte();
|
||||
MinSpawnTime = reader.ReadShort();
|
||||
MaxSpawnTime = reader.ReadShort();
|
||||
|
||||
protected virtual void SetLockLevel()
|
||||
{
|
||||
switch( Level )
|
||||
{
|
||||
case TreasureLevel.Level1:
|
||||
RequiredSkill = LockLevel = 5;
|
||||
break;
|
||||
if (!Locked)
|
||||
StartResetTimer();
|
||||
}
|
||||
|
||||
case TreasureLevel.Level2:
|
||||
RequiredSkill = LockLevel = 20;
|
||||
break;
|
||||
protected virtual void SetLockLevel()
|
||||
{
|
||||
switch (Level)
|
||||
{
|
||||
case TreasureLevel.Level1:
|
||||
RequiredSkill = LockLevel = 5;
|
||||
break;
|
||||
|
||||
case TreasureLevel.Level3:
|
||||
RequiredSkill = LockLevel = 50;
|
||||
break;
|
||||
case TreasureLevel.Level2:
|
||||
RequiredSkill = LockLevel = 20;
|
||||
break;
|
||||
|
||||
case TreasureLevel.Level4:
|
||||
RequiredSkill = LockLevel = 70;
|
||||
break;
|
||||
case TreasureLevel.Level3:
|
||||
RequiredSkill = LockLevel = 50;
|
||||
break;
|
||||
|
||||
case TreasureLevel.Level5:
|
||||
RequiredSkill = LockLevel = 90;
|
||||
break;
|
||||
case TreasureLevel.Level4:
|
||||
RequiredSkill = LockLevel = 70;
|
||||
break;
|
||||
|
||||
case TreasureLevel.Level6:
|
||||
RequiredSkill = LockLevel = 100;
|
||||
break;
|
||||
}
|
||||
}
|
||||
case TreasureLevel.Level5:
|
||||
RequiredSkill = LockLevel = 90;
|
||||
break;
|
||||
|
||||
private void StartResetTimer()
|
||||
{
|
||||
if ( m_ResetTimer == null )
|
||||
m_ResetTimer = new TreasureResetTimer( this );
|
||||
else
|
||||
m_ResetTimer.Delay = TimeSpan.FromMinutes( Utility.Random( MinSpawnTime, MaxSpawnTime ));
|
||||
case TreasureLevel.Level6:
|
||||
RequiredSkill = LockLevel = 100;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
m_ResetTimer.Start();
|
||||
}
|
||||
private void StartResetTimer()
|
||||
{
|
||||
if (m_ResetTimer == null)
|
||||
m_ResetTimer = new TreasureResetTimer(this);
|
||||
else
|
||||
m_ResetTimer.Delay = TimeSpan.FromMinutes(Utility.Random(MinSpawnTime, MaxSpawnTime));
|
||||
|
||||
protected virtual void GenerateTreasure()
|
||||
{
|
||||
int MinGold = 1;
|
||||
int MaxGold = 2;
|
||||
m_ResetTimer.Start();
|
||||
}
|
||||
|
||||
switch( Level )
|
||||
{
|
||||
case TreasureLevel.Level1:
|
||||
MinGold = 100;
|
||||
MaxGold = 300;
|
||||
break;
|
||||
protected virtual void GenerateTreasure()
|
||||
{
|
||||
int MinGold = 1;
|
||||
int MaxGold = 2;
|
||||
|
||||
case TreasureLevel.Level2:
|
||||
MinGold = 300;
|
||||
MaxGold = 600;
|
||||
break;
|
||||
switch (Level)
|
||||
{
|
||||
case TreasureLevel.Level1:
|
||||
MinGold = 100;
|
||||
MaxGold = 300;
|
||||
break;
|
||||
|
||||
case TreasureLevel.Level3:
|
||||
MinGold = 600;
|
||||
MaxGold = 900;
|
||||
break;
|
||||
case TreasureLevel.Level2:
|
||||
MinGold = 300;
|
||||
MaxGold = 600;
|
||||
break;
|
||||
|
||||
case TreasureLevel.Level4:
|
||||
MinGold = 900;
|
||||
MaxGold = 1200;
|
||||
break;
|
||||
case TreasureLevel.Level3:
|
||||
MinGold = 600;
|
||||
MaxGold = 900;
|
||||
break;
|
||||
|
||||
case TreasureLevel.Level5:
|
||||
MinGold = 1200;
|
||||
MaxGold = 5000;
|
||||
break;
|
||||
case TreasureLevel.Level4:
|
||||
MinGold = 900;
|
||||
MaxGold = 1200;
|
||||
break;
|
||||
|
||||
case TreasureLevel.Level6:
|
||||
MinGold = 5000;
|
||||
MaxGold = 9000;
|
||||
break;
|
||||
}
|
||||
case TreasureLevel.Level5:
|
||||
MinGold = 1200;
|
||||
MaxGold = 5000;
|
||||
break;
|
||||
|
||||
DropItem( new Gold( MinGold, MaxGold ) );
|
||||
}
|
||||
case TreasureLevel.Level6:
|
||||
MinGold = 5000;
|
||||
MaxGold = 9000;
|
||||
break;
|
||||
}
|
||||
|
||||
public void ClearContents()
|
||||
{
|
||||
for ( int i = Items.Count - 1; i >= 0; --i )
|
||||
{
|
||||
if ( i < Items.Count )
|
||||
Items[i].Delete();
|
||||
}
|
||||
}
|
||||
DropItem(new Gold(MinGold, MaxGold));
|
||||
}
|
||||
|
||||
public void Reset()
|
||||
{
|
||||
if ( m_ResetTimer != null )
|
||||
{
|
||||
if ( m_ResetTimer.Running )
|
||||
m_ResetTimer.Stop();
|
||||
}
|
||||
public void ClearContents()
|
||||
{
|
||||
for (int i = Items.Count - 1; i >= 0; --i)
|
||||
if (i < Items.Count)
|
||||
Items[i].Delete();
|
||||
}
|
||||
|
||||
Locked = true;
|
||||
ClearContents();
|
||||
GenerateTreasure();
|
||||
}
|
||||
public void Reset()
|
||||
{
|
||||
if (m_ResetTimer != null)
|
||||
if (m_ResetTimer.Running)
|
||||
m_ResetTimer.Stop();
|
||||
|
||||
public enum TreasureLevel
|
||||
{
|
||||
Level1,
|
||||
Level2,
|
||||
Level3,
|
||||
Level4,
|
||||
Level5,
|
||||
Level6,
|
||||
};
|
||||
Locked = true;
|
||||
ClearContents();
|
||||
GenerateTreasure();
|
||||
}
|
||||
|
||||
private class TreasureResetTimer : Timer
|
||||
{
|
||||
private BaseTreasureChest m_Chest;
|
||||
private class TreasureResetTimer : Timer
|
||||
{
|
||||
private BaseTreasureChest m_Chest;
|
||||
|
||||
public TreasureResetTimer( BaseTreasureChest chest ) : base ( TimeSpan.FromMinutes( Utility.Random( chest.MinSpawnTime, chest.MaxSpawnTime ) ) )
|
||||
{
|
||||
m_Chest = chest;
|
||||
Priority = TimerPriority.OneMinute;
|
||||
}
|
||||
public TreasureResetTimer(BaseTreasureChest chest) : base(
|
||||
TimeSpan.FromMinutes(Utility.Random(chest.MinSpawnTime, chest.MaxSpawnTime)))
|
||||
{
|
||||
m_Chest = chest;
|
||||
Priority = TimerPriority.OneMinute;
|
||||
}
|
||||
|
||||
protected override void OnTick()
|
||||
{
|
||||
m_Chest.Reset();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
protected override void OnTick()
|
||||
{
|
||||
m_Chest.Reset();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue