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,200 +1,201 @@
using System;
using Server.Network;
using Server.Spells;
namespace Server.Items
{
public abstract class BaseMagicFish : Item
{
public virtual int Bonus => 0;
public virtual StatType Type => StatType.Str;
public abstract class BaseMagicFish : Item
{
public BaseMagicFish(int hue) : base(0xDD6)
{
Hue = hue;
}
public override double DefaultWeight => 1.0;
public BaseMagicFish(Serial serial) : base(serial)
{
}
public BaseMagicFish( int hue ) : base( 0xDD6 )
{
Hue = hue;
}
public virtual int Bonus => 0;
public virtual StatType Type => StatType.Str;
public BaseMagicFish( Serial serial ) : base( serial )
{
}
public override double DefaultWeight => 1.0;
public virtual bool Apply( Mobile from )
{
bool applied = Spells.SpellHelper.AddStatOffset( from, Type, Bonus, TimeSpan.FromMinutes( 1.0 ) );
public virtual bool Apply(Mobile from)
{
bool applied = SpellHelper.AddStatOffset(from, Type, Bonus, TimeSpan.FromMinutes(1.0));
if ( !applied )
from.SendLocalizedMessage( 502173 ); // You are already under a similar effect.
if (!applied)
from.SendLocalizedMessage(502173); // You are already under a similar effect.
return applied;
}
return applied;
}
public override void OnDoubleClick( Mobile from )
{
if ( !IsChildOf( from.Backpack ) )
{
from.SendLocalizedMessage( 1042001 ); // That must be in your pack for you to use it.
}
else if ( Apply( from ) )
{
from.FixedEffect( 0x375A, 10, 15 );
from.PlaySound( 0x1E7 );
from.LocalOverheadMessage( MessageType.Regular, 0x3B2, 501774 ); // You swallow the fish whole!
Delete();
}
}
public override void OnDoubleClick(Mobile from)
{
if (!IsChildOf(from.Backpack))
{
from.SendLocalizedMessage(1042001); // That must be in your pack for you to use it.
}
else if (Apply(from))
{
from.FixedEffect(0x375A, 10, 15);
from.PlaySound(0x1E7);
from.LocalOverheadMessage(MessageType.Regular, 0x3B2, 501774); // You swallow the fish whole!
Delete();
}
}
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 PrizedFish : BaseMagicFish
{
public override int Bonus => 5;
public override StatType Type => StatType.Int;
public class PrizedFish : BaseMagicFish
{
[Constructible]
public PrizedFish() : base(51)
{
}
public override int LabelNumber => 1041073; // prized fish
public PrizedFish(Serial serial) : base(serial)
{
}
[Constructible]
public PrizedFish() : base( 51 )
{
}
public override int Bonus => 5;
public override StatType Type => StatType.Int;
public PrizedFish( Serial serial ) : base( serial )
{
}
public override int LabelNumber => 1041073; // prized fish
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();
if ( Hue == 151 )
Hue = 51;
}
}
if (Hue == 151)
Hue = 51;
}
}
public class WondrousFish : BaseMagicFish
{
public override int Bonus => 5;
public override StatType Type => StatType.Dex;
public class WondrousFish : BaseMagicFish
{
[Constructible]
public WondrousFish() : base(86)
{
}
public override int LabelNumber => 1041074; // wondrous fish
public WondrousFish(Serial serial) : base(serial)
{
}
[Constructible]
public WondrousFish() : base( 86 )
{
}
public override int Bonus => 5;
public override StatType Type => StatType.Dex;
public WondrousFish( Serial serial ) : base( serial )
{
}
public override int LabelNumber => 1041074; // wondrous fish
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();
if ( Hue == 286 )
Hue = 86;
}
}
if (Hue == 286)
Hue = 86;
}
}
public class TrulyRareFish : BaseMagicFish
{
public override int Bonus => 5;
public override StatType Type => StatType.Str;
public class TrulyRareFish : BaseMagicFish
{
[Constructible]
public TrulyRareFish() : base(76)
{
}
public override int LabelNumber => 1041075; // truly rare fish
public TrulyRareFish(Serial serial) : base(serial)
{
}
[Constructible]
public TrulyRareFish() : base( 76 )
{
}
public override int Bonus => 5;
public override StatType Type => StatType.Str;
public TrulyRareFish( Serial serial ) : base( serial )
{
}
public override int LabelNumber => 1041075; // truly rare fish
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();
if ( Hue == 376 )
Hue = 76;
}
}
if (Hue == 376)
Hue = 76;
}
}
public class PeculiarFish : BaseMagicFish
{
public override int LabelNumber => 1041076; // highly peculiar fish
public class PeculiarFish : BaseMagicFish
{
[Constructible]
public PeculiarFish() : base(66)
{
}
[Constructible]
public PeculiarFish() : base( 66 )
{
}
public PeculiarFish(Serial serial) : base(serial)
{
}
public PeculiarFish( Serial serial ) : base( serial )
{
}
public override int LabelNumber => 1041076; // highly peculiar fish
public override bool Apply( Mobile from )
{
from.Stam += 10;
return true;
}
public override bool Apply(Mobile from)
{
from.Stam += 10;
return true;
}
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();
if ( Hue == 266 )
Hue = 66;
}
}
}
if (Hue == 266)
Hue = 66;
}
}
}