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,308 +1,315 @@
using Server.Multis;
using Server.Gumps;
using Server.Network;
using Server.Engines.VeteranRewards;
using Server.Gumps;
using Server.Multis;
using Server.Network;
namespace Server.Items
{
public enum MonsterStatuetteType
{
Crocodile,
Daemon,
Dragon,
EarthElemental,
Ettin,
Gargoyle,
Gorilla,
Lich,
Lizardman,
Ogre,
Orc,
Ratman,
Skeleton,
Troll,
Cow,
Zombie,
Llama,
Ophidian,
Reaper,
Mongbat,
Gazer,
FireElemental,
Wolf,
PhillipsWoodenSteed,
Seahorse,
Harrower,
Efreet,
Slime,
PlagueBeast,
RedDeath,
Spider,
OphidianArchMage,
OphidianWarrior,
OphidianKnight,
OphidianMage,
DreadHorn,
Minotaur,
BlackCat,
HalloweenGhoul,
Santa
}
public enum MonsterStatuetteType
{
Crocodile,
Daemon,
Dragon,
EarthElemental,
Ettin,
Gargoyle,
Gorilla,
Lich,
Lizardman,
Ogre,
Orc,
Ratman,
Skeleton,
Troll,
Cow,
Zombie,
Llama,
Ophidian,
Reaper,
Mongbat,
Gazer,
FireElemental,
Wolf,
PhillipsWoodenSteed,
Seahorse,
Harrower,
Efreet,
Slime,
PlagueBeast,
RedDeath,
Spider,
OphidianArchMage,
OphidianWarrior,
OphidianKnight,
OphidianMage,
DreadHorn,
Minotaur,
BlackCat,
HalloweenGhoul,
Santa
}
public class MonsterStatuetteInfo
{
public int LabelNumber { get; }
public class MonsterStatuetteInfo
{
private static MonsterStatuetteInfo[] m_Table =
{
/* Crocodile */ new MonsterStatuetteInfo(1041249, 0x20DA, 660),
/* Daemon */ new MonsterStatuetteInfo(1041250, 0x20D3, 357),
/* Dragon */ new MonsterStatuetteInfo(1041251, 0x20D6, 362),
/* EarthElemental */ new MonsterStatuetteInfo(1041252, 0x20D7, 268),
/* Ettin */ new MonsterStatuetteInfo(1041253, 0x20D8, 367),
/* Gargoyle */ new MonsterStatuetteInfo(1041254, 0x20D9, 372),
/* Gorilla */ new MonsterStatuetteInfo(1041255, 0x20F5, 158),
/* Lich */ new MonsterStatuetteInfo(1041256, 0x20F8, 1001),
/* Lizardman */ new MonsterStatuetteInfo(1041257, 0x20DE, 417),
/* Ogre */ new MonsterStatuetteInfo(1041258, 0x20DF, 427),
/* Orc */ new MonsterStatuetteInfo(1041259, 0x20E0, 1114),
/* Ratman */ new MonsterStatuetteInfo(1041260, 0x20E3, 437),
/* Skeleton */ new MonsterStatuetteInfo(1041261, 0x20E7, 1165),
/* Troll */ new MonsterStatuetteInfo(1041262, 0x20E9, 461),
/* Cow */ new MonsterStatuetteInfo(1041263, 0x2103, 120),
/* Zombie */ new MonsterStatuetteInfo(1041264, 0x20EC, 471),
/* Llama */ new MonsterStatuetteInfo(1041265, 0x20F6, 1011),
/* Ophidian */ new MonsterStatuetteInfo(1049742, 0x2133, 634),
/* Reaper */ new MonsterStatuetteInfo(1049743, 0x20FA, 442),
/* Mongbat */ new MonsterStatuetteInfo(1049744, 0x20F9, 422),
/* Gazer */ new MonsterStatuetteInfo(1049768, 0x20F4, 377),
/* FireElemental */ new MonsterStatuetteInfo(1049769, 0x20F3, 838),
/* Wolf */ new MonsterStatuetteInfo(1049770, 0x2122, 229),
/* Phillip's Steed */ new MonsterStatuetteInfo(1063488, 0x3FFE, 168),
/* Seahorse */ new MonsterStatuetteInfo(1070819, 0x25BA, 138),
/* Harrower */ new MonsterStatuetteInfo(1080520, 0x25BB, new[] { 0x289, 0x28A, 0x28B }),
/* Efreet */ new MonsterStatuetteInfo(1080521, 0x2590, 0x300),
/* Slime */ new MonsterStatuetteInfo(1015246, 0x20E8, 456),
/* PlagueBeast */ new MonsterStatuetteInfo(1029747, 0x2613, 0x1BF),
/* RedDeath */ new MonsterStatuetteInfo(1094932, 0x2617, new int[] { }),
/* Spider */ new MonsterStatuetteInfo(1029668, 0x25C4, 1170),
/* OphidianArchMage */ new MonsterStatuetteInfo(1029641, 0x25A9, 639),
/* OphidianWarrior */ new MonsterStatuetteInfo(1029645, 0x25AD, 634),
/* OphidianKnight */ new MonsterStatuetteInfo(1029642, 0x25aa, 634),
/* OphidianMage */ new MonsterStatuetteInfo(1029643, 0x25ab, 639),
/* DreadHorn */ new MonsterStatuetteInfo(1031651, 0x2D83, 0xA8),
/* Minotaur */ new MonsterStatuetteInfo(1031657, 0x2D89, 0x596),
/* Black Cat */ new MonsterStatuetteInfo(1096928, 0x4688, 0x69),
/* HalloweenGhoul */ new MonsterStatuetteInfo(1076782, 0x2109, 0x482),
/* Santa */ new MonsterStatuetteInfo(1097968, 0x4A98, 0x669)
};
public int ItemID { get; }
public MonsterStatuetteInfo(int labelNumber, int itemID, int baseSoundID)
{
LabelNumber = labelNumber;
ItemID = itemID;
Sounds = new[] { baseSoundID, baseSoundID + 1, baseSoundID + 2, baseSoundID + 3, baseSoundID + 4 };
}
public int[] Sounds { get; }
public MonsterStatuetteInfo(int labelNumber, int itemID, int[] sounds)
{
LabelNumber = labelNumber;
ItemID = itemID;
Sounds = sounds;
}
public MonsterStatuetteInfo( int labelNumber, int itemID, int baseSoundID )
{
LabelNumber = labelNumber;
ItemID = itemID;
Sounds = new[]{ baseSoundID, baseSoundID + 1, baseSoundID + 2, baseSoundID + 3, baseSoundID + 4 };
}
public int LabelNumber{ get; }
public MonsterStatuetteInfo( int labelNumber, int itemID, int[] sounds )
{
LabelNumber = labelNumber;
ItemID = itemID;
Sounds = sounds;
}
public int ItemID{ get; }
private static MonsterStatuetteInfo[] m_Table = {
/* Crocodile */ new MonsterStatuetteInfo( 1041249, 0x20DA, 660 ),
/* Daemon */ new MonsterStatuetteInfo( 1041250, 0x20D3, 357 ),
/* Dragon */ new MonsterStatuetteInfo( 1041251, 0x20D6, 362 ),
/* EarthElemental */ new MonsterStatuetteInfo( 1041252, 0x20D7, 268 ),
/* Ettin */ new MonsterStatuetteInfo( 1041253, 0x20D8, 367 ),
/* Gargoyle */ new MonsterStatuetteInfo( 1041254, 0x20D9, 372 ),
/* Gorilla */ new MonsterStatuetteInfo( 1041255, 0x20F5, 158 ),
/* Lich */ new MonsterStatuetteInfo( 1041256, 0x20F8, 1001 ),
/* Lizardman */ new MonsterStatuetteInfo( 1041257, 0x20DE, 417 ),
/* Ogre */ new MonsterStatuetteInfo( 1041258, 0x20DF, 427 ),
/* Orc */ new MonsterStatuetteInfo( 1041259, 0x20E0, 1114 ),
/* Ratman */ new MonsterStatuetteInfo( 1041260, 0x20E3, 437 ),
/* Skeleton */ new MonsterStatuetteInfo( 1041261, 0x20E7, 1165 ),
/* Troll */ new MonsterStatuetteInfo( 1041262, 0x20E9, 461 ),
/* Cow */ new MonsterStatuetteInfo( 1041263, 0x2103, 120 ),
/* Zombie */ new MonsterStatuetteInfo( 1041264, 0x20EC, 471 ),
/* Llama */ new MonsterStatuetteInfo( 1041265, 0x20F6, 1011 ),
/* Ophidian */ new MonsterStatuetteInfo( 1049742, 0x2133, 634 ),
/* Reaper */ new MonsterStatuetteInfo( 1049743, 0x20FA, 442 ),
/* Mongbat */ new MonsterStatuetteInfo( 1049744, 0x20F9, 422 ),
/* Gazer */ new MonsterStatuetteInfo( 1049768, 0x20F4, 377 ),
/* FireElemental */ new MonsterStatuetteInfo( 1049769, 0x20F3, 838 ),
/* Wolf */ new MonsterStatuetteInfo( 1049770, 0x2122, 229 ),
/* Phillip's Steed */ new MonsterStatuetteInfo( 1063488, 0x3FFE, 168 ),
/* Seahorse */ new MonsterStatuetteInfo( 1070819, 0x25BA, 138 ),
/* Harrower */ new MonsterStatuetteInfo( 1080520, 0x25BB, new[] { 0x289, 0x28A, 0x28B } ),
/* Efreet */ new MonsterStatuetteInfo( 1080521, 0x2590, 0x300 ),
/* Slime */ new MonsterStatuetteInfo( 1015246, 0x20E8, 456 ),
/* PlagueBeast */ new MonsterStatuetteInfo( 1029747, 0x2613, 0x1BF ),
/* RedDeath */ new MonsterStatuetteInfo( 1094932, 0x2617, new int[] { } ),
/* Spider */ new MonsterStatuetteInfo( 1029668, 0x25C4, 1170 ),
/* OphidianArchMage */ new MonsterStatuetteInfo( 1029641, 0x25A9, 639 ),
/* OphidianWarrior */ new MonsterStatuetteInfo( 1029645, 0x25AD, 634 ),
/* OphidianKnight */ new MonsterStatuetteInfo( 1029642, 0x25aa, 634 ),
/* OphidianMage */ new MonsterStatuetteInfo( 1029643, 0x25ab, 639 ),
/* DreadHorn */ new MonsterStatuetteInfo( 1031651, 0x2D83, 0xA8 ),
/* Minotaur */ new MonsterStatuetteInfo( 1031657, 0x2D89, 0x596 ),
/* Black Cat */ new MonsterStatuetteInfo( 1096928, 0x4688, 0x69 ),
/* HalloweenGhoul */ new MonsterStatuetteInfo( 1076782, 0x2109, 0x482 ),
/* Santa */ new MonsterStatuetteInfo( 1097968, 0x4A98, 0x669 )
};
public int[] Sounds{ get; }
public static MonsterStatuetteInfo GetInfo( MonsterStatuetteType type )
{
int v = (int)type;
public static MonsterStatuetteInfo GetInfo(MonsterStatuetteType type)
{
int v = (int)type;
if ( v < 0 || v >= m_Table.Length )
v = 0;
if (v < 0 || v >= m_Table.Length)
v = 0;
return m_Table[v];
}
}
return m_Table[v];
}
}
public class MonsterStatuette : Item, IRewardItem
{
private MonsterStatuetteType m_Type;
private bool m_TurnedOn;
public class MonsterStatuette : Item, IRewardItem
{
private bool m_TurnedOn;
private MonsterStatuetteType m_Type;
[CommandProperty( AccessLevel.GameMaster )]
public bool IsRewardItem { get; set; }
[Constructible]
public MonsterStatuette() : this(MonsterStatuetteType.Crocodile)
{
}
[CommandProperty( AccessLevel.GameMaster )]
public bool TurnedOn
{
get => m_TurnedOn;
set{ m_TurnedOn = value; InvalidateProperties(); }
}
[Constructible]
public MonsterStatuette(MonsterStatuetteType type) : base(MonsterStatuetteInfo.GetInfo(type).ItemID)
{
LootType = LootType.Blessed;
[CommandProperty( AccessLevel.GameMaster )]
public MonsterStatuetteType Type
{
get => m_Type;
set
{
m_Type = value;
ItemID = MonsterStatuetteInfo.GetInfo( m_Type ).ItemID;
m_Type = type;
if ( m_Type == MonsterStatuetteType.Slime )
Hue = Utility.RandomSlimeHue();
else if ( m_Type == MonsterStatuetteType.RedDeath )
Hue = 0x21;
else if ( m_Type == MonsterStatuetteType.HalloweenGhoul )
Hue = 0xF4;
else
Hue = 0;
if (m_Type == MonsterStatuetteType.Slime)
Hue = Utility.RandomSlimeHue();
else if (m_Type == MonsterStatuetteType.RedDeath)
Hue = 0x21;
else if (m_Type == MonsterStatuetteType.HalloweenGhoul)
Hue = 0xF4;
}
InvalidateProperties();
}
}
public MonsterStatuette(Serial serial) : base(serial)
{
}
public override int LabelNumber => MonsterStatuetteInfo.GetInfo( m_Type ).LabelNumber;
[CommandProperty(AccessLevel.GameMaster)]
public bool TurnedOn
{
get => m_TurnedOn;
set
{
m_TurnedOn = value;
InvalidateProperties();
}
}
public override double DefaultWeight => 1.0;
[CommandProperty(AccessLevel.GameMaster)]
public MonsterStatuetteType Type
{
get => m_Type;
set
{
m_Type = value;
ItemID = MonsterStatuetteInfo.GetInfo(m_Type).ItemID;
[Constructible]
public MonsterStatuette() : this( MonsterStatuetteType.Crocodile )
{
}
if (m_Type == MonsterStatuetteType.Slime)
Hue = Utility.RandomSlimeHue();
else if (m_Type == MonsterStatuetteType.RedDeath)
Hue = 0x21;
else if (m_Type == MonsterStatuetteType.HalloweenGhoul)
Hue = 0xF4;
else
Hue = 0;
[Constructible]
public MonsterStatuette( MonsterStatuetteType type ) : base( MonsterStatuetteInfo.GetInfo( type ).ItemID )
{
LootType = LootType.Blessed;
InvalidateProperties();
}
}
m_Type = type;
public override int LabelNumber => MonsterStatuetteInfo.GetInfo(m_Type).LabelNumber;
if ( m_Type == MonsterStatuetteType.Slime )
Hue = Utility.RandomSlimeHue();
else if ( m_Type == MonsterStatuetteType.RedDeath )
Hue = 0x21;
else if ( m_Type == MonsterStatuetteType.HalloweenGhoul )
Hue = 0xF4;
}
public override double DefaultWeight => 1.0;
public override bool HandlesOnMovement => m_TurnedOn && IsLockedDown;
public override bool HandlesOnMovement => m_TurnedOn && IsLockedDown;
public override void OnMovement( Mobile m, Point3D oldLocation )
{
if ( m_TurnedOn && IsLockedDown && (!m.Hidden || m.AccessLevel == AccessLevel.Player) && Utility.InRange( m.Location, Location, 2 ) && !Utility.InRange( oldLocation, Location, 2 ) )
{
int[] sounds = MonsterStatuetteInfo.GetInfo( m_Type ).Sounds;
[CommandProperty(AccessLevel.GameMaster)]
public bool IsRewardItem{ get; set; }
if ( sounds.Length > 0 )
Effects.PlaySound( Location, Map, sounds[Utility.Random( sounds.Length )] );
}
public override void OnMovement(Mobile m, Point3D oldLocation)
{
if (m_TurnedOn && IsLockedDown && (!m.Hidden || m.AccessLevel == AccessLevel.Player) &&
Utility.InRange(m.Location, Location, 2) && !Utility.InRange(oldLocation, Location, 2))
{
int[] sounds = MonsterStatuetteInfo.GetInfo(m_Type).Sounds;
base.OnMovement( m, oldLocation );
}
if (sounds.Length > 0)
Effects.PlaySound(Location, Map, sounds[Utility.Random(sounds.Length)]);
}
public MonsterStatuette( Serial serial ) : base( serial )
{
}
base.OnMovement(m, oldLocation);
}
public override void GetProperties( ObjectPropertyList list )
{
base.GetProperties( list );
public override void GetProperties(ObjectPropertyList list)
{
base.GetProperties(list);
if ( Core.ML && IsRewardItem )
list.Add( RewardSystem.GetRewardYearLabel( this, new object[]{ m_Type } ) ); // X Year Veteran Reward
if (Core.ML && IsRewardItem)
list.Add(RewardSystem.GetRewardYearLabel(this, new object[] { m_Type })); // X Year Veteran Reward
if ( m_TurnedOn )
list.Add( 502695 ); // turned on
else
list.Add( 502696 ); // turned off
}
if (m_TurnedOn)
list.Add(502695); // turned on
else
list.Add(502696); // turned off
}
public bool IsOwner( Mobile mob )
{
BaseHouse house = BaseHouse.FindHouseAt( this );
public bool IsOwner(Mobile mob)
{
BaseHouse house = BaseHouse.FindHouseAt(this);
return ( house != null && house.IsOwner( mob ) );
}
return house != null && house.IsOwner(mob);
}
public override void OnDoubleClick( Mobile from )
{
if ( IsOwner( from ) )
{
OnOffGump onOffGump = new OnOffGump( this );
from.SendGump( onOffGump );
}
else
{
from.SendLocalizedMessage( 502691 ); // You must be the owner to use this.
}
}
public override void OnDoubleClick(Mobile from)
{
if (IsOwner(from))
{
OnOffGump onOffGump = new OnOffGump(this);
from.SendGump(onOffGump);
}
else
{
from.SendLocalizedMessage(502691); // You must be the owner to use this.
}
}
private class OnOffGump : Gump
{
private MonsterStatuette m_Statuette;
public override void Serialize(GenericWriter writer)
{
base.Serialize(writer);
public OnOffGump( MonsterStatuette statuette ) : base( 150, 200 )
{
m_Statuette = statuette;
writer.Write(0); // version
AddBackground( 0, 0, 300, 150, 0xA28 );
writer.WriteEncodedInt((int)m_Type);
writer.Write(m_TurnedOn);
writer.Write(IsRewardItem);
}
AddHtmlLocalized( 45, 20, 300, 35, statuette.TurnedOn ? 1011035 : 1011034, false, false ); // [De]Activate this item
public override void Deserialize(GenericReader reader)
{
base.Deserialize(reader);
AddButton( 40, 53, 0xFA5, 0xFA7, 1, GumpButtonType.Reply, 0 );
AddHtmlLocalized( 80, 55, 65, 35, 1011036, false, false ); // OKAY
int version = reader.ReadInt();
AddButton( 150, 53, 0xFA5, 0xFA7, 0, GumpButtonType.Reply, 0 );
AddHtmlLocalized( 190, 55, 100, 35, 1011012, false, false ); // CANCEL
}
switch (version)
{
case 0:
{
m_Type = (MonsterStatuetteType)reader.ReadEncodedInt();
m_TurnedOn = reader.ReadBool();
IsRewardItem = reader.ReadBool();
break;
}
}
}
public override void OnResponse( NetState sender, RelayInfo info )
{
Mobile from = sender.Mobile;
private class OnOffGump : Gump
{
private MonsterStatuette m_Statuette;
if ( info.ButtonID == 1 )
{
bool newValue = !m_Statuette.TurnedOn;
m_Statuette.TurnedOn = newValue;
public OnOffGump(MonsterStatuette statuette) : base(150, 200)
{
m_Statuette = statuette;
if ( newValue && !m_Statuette.IsLockedDown )
from.SendLocalizedMessage( 502693 ); // Remember, this only works when locked down.
}
else
{
from.SendLocalizedMessage( 502694 ); // Cancelled action.
}
}
}
AddBackground(0, 0, 300, 150, 0xA28);
public override void Serialize( GenericWriter writer )
{
base.Serialize( writer );
AddHtmlLocalized(45, 20, 300, 35, statuette.TurnedOn ? 1011035 : 1011034, false,
false); // [De]Activate this item
writer.Write( (int) 0 ); // version
AddButton(40, 53, 0xFA5, 0xFA7, 1, GumpButtonType.Reply, 0);
AddHtmlLocalized(80, 55, 65, 35, 1011036, false, false); // OKAY
writer.WriteEncodedInt( (int) m_Type );
writer.Write( (bool) m_TurnedOn );
writer.Write( (bool) IsRewardItem );
}
AddButton(150, 53, 0xFA5, 0xFA7, 0, GumpButtonType.Reply, 0);
AddHtmlLocalized(190, 55, 100, 35, 1011012, false, false); // CANCEL
}
public override void Deserialize( GenericReader reader )
{
base.Deserialize( reader );
public override void OnResponse(NetState sender, RelayInfo info)
{
Mobile from = sender.Mobile;
int version = reader.ReadInt();
if (info.ButtonID == 1)
{
bool newValue = !m_Statuette.TurnedOn;
m_Statuette.TurnedOn = newValue;
switch ( version )
{
case 0:
{
m_Type = (MonsterStatuetteType)reader.ReadEncodedInt();
m_TurnedOn = reader.ReadBool();
IsRewardItem = reader.ReadBool();
break;
}
}
}
}
}
if (newValue && !m_Statuette.IsLockedDown)
from.SendLocalizedMessage(502693); // Remember, this only works when locked down.
}
else
{
from.SendLocalizedMessage(502694); // Cancelled action.
}
}
}
}
}