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
|
|
@ -4,239 +4,239 @@ using Server.Spells.Seventh;
|
|||
|
||||
namespace Server.Gumps
|
||||
{
|
||||
public class PolymorphEntry
|
||||
{
|
||||
public static readonly PolymorphEntry Chicken = new PolymorphEntry( 8401, 0xD0, 1015236, 15, 10 );
|
||||
public static readonly PolymorphEntry Dog = new PolymorphEntry( 8405, 0xD9, 1015237, 17, 10 );
|
||||
public static readonly PolymorphEntry Wolf = new PolymorphEntry( 8426, 0xE1, 1015238, 18, 10 );
|
||||
public static readonly PolymorphEntry Panther = new PolymorphEntry( 8473, 0xD6, 1015239, 20, 14 );
|
||||
public static readonly PolymorphEntry Gorilla = new PolymorphEntry( 8437, 0x1D, 1015240, 23, 10 );
|
||||
public static readonly PolymorphEntry BlackBear = new PolymorphEntry( 8399, 0xD3, 1015241, 22, 10 );
|
||||
public static readonly PolymorphEntry GrizzlyBear = new PolymorphEntry( 8411, 0xD4, 1015242, 22, 12 );
|
||||
public static readonly PolymorphEntry PolarBear = new PolymorphEntry( 8417, 0xD5, 1015243, 26, 10 );
|
||||
public static readonly PolymorphEntry HumanMale = new PolymorphEntry( 8397, 0x190, 1015244, 29, 8 );
|
||||
public static readonly PolymorphEntry HumanFemale = new PolymorphEntry( 8398, 0x191, 1015254, 29, 10 );
|
||||
public static readonly PolymorphEntry Slime = new PolymorphEntry( 8424, 0x33, 1015246, 5, 10 );
|
||||
public static readonly PolymorphEntry Orc = new PolymorphEntry( 8416, 0x11, 1015247, 29, 10 );
|
||||
public static readonly PolymorphEntry LizardMan = new PolymorphEntry( 8414, 0x21, 1015248, 26, 10 );
|
||||
public static readonly PolymorphEntry Gargoyle = new PolymorphEntry( 8409, 0x04, 1015249, 22, 10 );
|
||||
public static readonly PolymorphEntry Ogre = new PolymorphEntry( 8415, 0x01, 1015250, 24, 9 );
|
||||
public static readonly PolymorphEntry Troll = new PolymorphEntry( 8425, 0x36, 1015251, 25, 9 );
|
||||
public static readonly PolymorphEntry Ettin = new PolymorphEntry( 8408, 0x02, 1015252, 25, 8 );
|
||||
public static readonly PolymorphEntry Daemon = new PolymorphEntry( 8403, 0x09, 1015253, 25, 8 );
|
||||
public class PolymorphEntry
|
||||
{
|
||||
public static readonly PolymorphEntry Chicken = new PolymorphEntry(8401, 0xD0, 1015236, 15, 10);
|
||||
public static readonly PolymorphEntry Dog = new PolymorphEntry(8405, 0xD9, 1015237, 17, 10);
|
||||
public static readonly PolymorphEntry Wolf = new PolymorphEntry(8426, 0xE1, 1015238, 18, 10);
|
||||
public static readonly PolymorphEntry Panther = new PolymorphEntry(8473, 0xD6, 1015239, 20, 14);
|
||||
public static readonly PolymorphEntry Gorilla = new PolymorphEntry(8437, 0x1D, 1015240, 23, 10);
|
||||
public static readonly PolymorphEntry BlackBear = new PolymorphEntry(8399, 0xD3, 1015241, 22, 10);
|
||||
public static readonly PolymorphEntry GrizzlyBear = new PolymorphEntry(8411, 0xD4, 1015242, 22, 12);
|
||||
public static readonly PolymorphEntry PolarBear = new PolymorphEntry(8417, 0xD5, 1015243, 26, 10);
|
||||
public static readonly PolymorphEntry HumanMale = new PolymorphEntry(8397, 0x190, 1015244, 29, 8);
|
||||
public static readonly PolymorphEntry HumanFemale = new PolymorphEntry(8398, 0x191, 1015254, 29, 10);
|
||||
public static readonly PolymorphEntry Slime = new PolymorphEntry(8424, 0x33, 1015246, 5, 10);
|
||||
public static readonly PolymorphEntry Orc = new PolymorphEntry(8416, 0x11, 1015247, 29, 10);
|
||||
public static readonly PolymorphEntry LizardMan = new PolymorphEntry(8414, 0x21, 1015248, 26, 10);
|
||||
public static readonly PolymorphEntry Gargoyle = new PolymorphEntry(8409, 0x04, 1015249, 22, 10);
|
||||
public static readonly PolymorphEntry Ogre = new PolymorphEntry(8415, 0x01, 1015250, 24, 9);
|
||||
public static readonly PolymorphEntry Troll = new PolymorphEntry(8425, 0x36, 1015251, 25, 9);
|
||||
public static readonly PolymorphEntry Ettin = new PolymorphEntry(8408, 0x02, 1015252, 25, 8);
|
||||
public static readonly PolymorphEntry Daemon = new PolymorphEntry(8403, 0x09, 1015253, 25, 8);
|
||||
|
||||
|
||||
private PolymorphEntry( int Art, int Body, int LocNum, int X, int Y )
|
||||
{
|
||||
ArtID = Art;
|
||||
BodyID = Body;
|
||||
LocNumber = LocNum;
|
||||
this.X = X;
|
||||
this.Y = Y;
|
||||
}
|
||||
private PolymorphEntry(int Art, int Body, int LocNum, int X, int Y)
|
||||
{
|
||||
ArtID = Art;
|
||||
BodyID = Body;
|
||||
LocNumber = LocNum;
|
||||
this.X = X;
|
||||
this.Y = Y;
|
||||
}
|
||||
|
||||
public int ArtID { get; }
|
||||
public int ArtID{ get; }
|
||||
|
||||
public int BodyID { get; }
|
||||
public int BodyID{ get; }
|
||||
|
||||
public int LocNumber { get; }
|
||||
public int LocNumber{ get; }
|
||||
|
||||
public int X { get; }
|
||||
public int X{ get; }
|
||||
|
||||
public int Y { get; }
|
||||
}
|
||||
public int Y{ get; }
|
||||
}
|
||||
|
||||
|
||||
public class PolymorphGump : Gump
|
||||
{
|
||||
private class PolymorphCategory
|
||||
{
|
||||
public PolymorphCategory( int num, params PolymorphEntry[] entries )
|
||||
{
|
||||
LocNumber = num;
|
||||
Entries = entries;
|
||||
}
|
||||
public class PolymorphGump : Gump
|
||||
{
|
||||
private static PolymorphCategory[] Categories =
|
||||
{
|
||||
new PolymorphCategory(1015235, // Animals
|
||||
PolymorphEntry.Chicken,
|
||||
PolymorphEntry.Dog,
|
||||
PolymorphEntry.Wolf,
|
||||
PolymorphEntry.Panther,
|
||||
PolymorphEntry.Gorilla,
|
||||
PolymorphEntry.BlackBear,
|
||||
PolymorphEntry.GrizzlyBear,
|
||||
PolymorphEntry.PolarBear,
|
||||
PolymorphEntry.HumanMale),
|
||||
|
||||
public PolymorphEntry[] Entries { get; }
|
||||
|
||||
public int LocNumber { get; }
|
||||
}
|
||||
|
||||
private static PolymorphCategory[] Categories = {
|
||||
new PolymorphCategory( 1015235, // Animals
|
||||
PolymorphEntry.Chicken,
|
||||
PolymorphEntry.Dog,
|
||||
PolymorphEntry.Wolf,
|
||||
PolymorphEntry.Panther,
|
||||
PolymorphEntry.Gorilla,
|
||||
PolymorphEntry.BlackBear,
|
||||
PolymorphEntry.GrizzlyBear,
|
||||
PolymorphEntry.PolarBear,
|
||||
PolymorphEntry.HumanMale ),
|
||||
|
||||
new PolymorphCategory( 1015245, // Monsters
|
||||
PolymorphEntry.Slime,
|
||||
PolymorphEntry.Orc,
|
||||
PolymorphEntry.LizardMan,
|
||||
PolymorphEntry.Gargoyle,
|
||||
PolymorphEntry.Ogre,
|
||||
PolymorphEntry.Troll,
|
||||
PolymorphEntry.Ettin,
|
||||
PolymorphEntry.Daemon,
|
||||
PolymorphEntry.HumanFemale )
|
||||
};
|
||||
new PolymorphCategory(1015245, // Monsters
|
||||
PolymorphEntry.Slime,
|
||||
PolymorphEntry.Orc,
|
||||
PolymorphEntry.LizardMan,
|
||||
PolymorphEntry.Gargoyle,
|
||||
PolymorphEntry.Ogre,
|
||||
PolymorphEntry.Troll,
|
||||
PolymorphEntry.Ettin,
|
||||
PolymorphEntry.Daemon,
|
||||
PolymorphEntry.HumanFemale)
|
||||
};
|
||||
|
||||
|
||||
private Mobile m_Caster;
|
||||
private Item m_Scroll;
|
||||
private Mobile m_Caster;
|
||||
private Item m_Scroll;
|
||||
|
||||
public PolymorphGump( Mobile caster, Item scroll ) : base( 50, 50 )
|
||||
{
|
||||
m_Caster = caster;
|
||||
m_Scroll = scroll;
|
||||
public PolymorphGump(Mobile caster, Item scroll) : base(50, 50)
|
||||
{
|
||||
m_Caster = caster;
|
||||
m_Scroll = scroll;
|
||||
|
||||
int x,y;
|
||||
AddPage( 0 );
|
||||
AddBackground( 0, 0, 585, 393, 5054 );
|
||||
AddBackground( 195, 36, 387, 275, 3000 );
|
||||
AddHtmlLocalized( 0, 0, 510, 18, 1015234, false, false ); // <center>Polymorph Selection Menu</center>
|
||||
AddHtmlLocalized( 60, 355, 150, 18, 1011036, false, false ); // OKAY
|
||||
AddButton( 25, 355, 4005, 4007, 1, GumpButtonType.Reply, 1 );
|
||||
AddHtmlLocalized( 320, 355, 150, 18, 1011012, false, false ); // CANCEL
|
||||
AddButton( 285, 355, 4005, 4007, 0, GumpButtonType.Reply, 2 );
|
||||
int x, y;
|
||||
AddPage(0);
|
||||
AddBackground(0, 0, 585, 393, 5054);
|
||||
AddBackground(195, 36, 387, 275, 3000);
|
||||
AddHtmlLocalized(0, 0, 510, 18, 1015234, false, false); // <center>Polymorph Selection Menu</center>
|
||||
AddHtmlLocalized(60, 355, 150, 18, 1011036, false, false); // OKAY
|
||||
AddButton(25, 355, 4005, 4007, 1, GumpButtonType.Reply, 1);
|
||||
AddHtmlLocalized(320, 355, 150, 18, 1011012, false, false); // CANCEL
|
||||
AddButton(285, 355, 4005, 4007, 0, GumpButtonType.Reply, 2);
|
||||
|
||||
y = 35;
|
||||
for ( int i=0;i<Categories.Length;i++ )
|
||||
{
|
||||
PolymorphCategory cat = (PolymorphCategory)Categories[i];
|
||||
AddHtmlLocalized( 5, y, 150, 25, cat.LocNumber, true, false );
|
||||
AddButton( 155, y, 4005, 4007, 0, GumpButtonType.Page, i+1 );
|
||||
y += 25;
|
||||
}
|
||||
y = 35;
|
||||
for (int i = 0; i < Categories.Length; i++)
|
||||
{
|
||||
PolymorphCategory cat = Categories[i];
|
||||
AddHtmlLocalized(5, y, 150, 25, cat.LocNumber, true, false);
|
||||
AddButton(155, y, 4005, 4007, 0, GumpButtonType.Page, i + 1);
|
||||
y += 25;
|
||||
}
|
||||
|
||||
for ( int i=0;i<Categories.Length;i++ )
|
||||
{
|
||||
PolymorphCategory cat = (PolymorphCategory)Categories[i];
|
||||
AddPage( i+1 );
|
||||
for (int i = 0; i < Categories.Length; i++)
|
||||
{
|
||||
PolymorphCategory cat = Categories[i];
|
||||
AddPage(i + 1);
|
||||
|
||||
for ( int c=0;c<cat.Entries.Length;c++ )
|
||||
{
|
||||
PolymorphEntry entry = (PolymorphEntry)cat.Entries[c];
|
||||
x = 198 + (c%3)*129;
|
||||
y = 38 + (c/3)*67;
|
||||
for (int c = 0; c < cat.Entries.Length; c++)
|
||||
{
|
||||
PolymorphEntry entry = cat.Entries[c];
|
||||
x = 198 + c % 3 * 129;
|
||||
y = 38 + c / 3 * 67;
|
||||
|
||||
AddHtmlLocalized( x, y, 100, 18, entry.LocNumber, false, false );
|
||||
AddItem( x+20, y+25, entry.ArtID );
|
||||
AddRadio( x, y+20, 210, 211, false, (c<<8) + i );
|
||||
}
|
||||
}
|
||||
}
|
||||
AddHtmlLocalized(x, y, 100, 18, entry.LocNumber, false, false);
|
||||
AddItem(x + 20, y + 25, entry.ArtID);
|
||||
AddRadio(x, y + 20, 210, 211, false, (c << 8) + i);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public override void OnResponse( NetState state, RelayInfo info )
|
||||
{
|
||||
if ( info.ButtonID == 1 && info.Switches.Length > 0 )
|
||||
{
|
||||
int cnum = info.Switches[0];
|
||||
int cat = cnum%256;
|
||||
int ent = cnum>>8;
|
||||
public override void OnResponse(NetState state, RelayInfo info)
|
||||
{
|
||||
if (info.ButtonID == 1 && info.Switches.Length > 0)
|
||||
{
|
||||
int cnum = info.Switches[0];
|
||||
int cat = cnum % 256;
|
||||
int ent = cnum >> 8;
|
||||
|
||||
if ( cat >= 0 && cat < Categories.Length )
|
||||
{
|
||||
if ( ent >= 0 && ent < Categories[cat].Entries.Length )
|
||||
{
|
||||
Spell spell = new PolymorphSpell( m_Caster, m_Scroll, Categories[cat].Entries[ent].BodyID );
|
||||
spell.Cast();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
if (cat >= 0 && cat < Categories.Length)
|
||||
if (ent >= 0 && ent < Categories[cat].Entries.Length)
|
||||
{
|
||||
Spell spell = new PolymorphSpell(m_Caster, m_Scroll, Categories[cat].Entries[ent].BodyID);
|
||||
spell.Cast();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public class NewPolymorphGump : Gump
|
||||
{
|
||||
private static readonly PolymorphEntry[] m_Entries = {
|
||||
PolymorphEntry.Chicken,
|
||||
PolymorphEntry.Dog,
|
||||
PolymorphEntry.Wolf,
|
||||
PolymorphEntry.Panther,
|
||||
PolymorphEntry.Gorilla,
|
||||
PolymorphEntry.BlackBear,
|
||||
PolymorphEntry.GrizzlyBear,
|
||||
PolymorphEntry.PolarBear,
|
||||
PolymorphEntry.HumanMale,
|
||||
PolymorphEntry.HumanFemale,
|
||||
PolymorphEntry.Slime,
|
||||
PolymorphEntry.Orc,
|
||||
PolymorphEntry.LizardMan,
|
||||
PolymorphEntry.Gargoyle,
|
||||
PolymorphEntry.Ogre,
|
||||
PolymorphEntry.Troll,
|
||||
PolymorphEntry.Ettin,
|
||||
PolymorphEntry.Daemon
|
||||
};
|
||||
private class PolymorphCategory
|
||||
{
|
||||
public PolymorphCategory(int num, params PolymorphEntry[] entries)
|
||||
{
|
||||
LocNumber = num;
|
||||
Entries = entries;
|
||||
}
|
||||
|
||||
private Mobile m_Caster;
|
||||
private Item m_Scroll;
|
||||
public PolymorphEntry[] Entries{ get; }
|
||||
|
||||
public NewPolymorphGump( Mobile caster, Item scroll ) : base( 0, 0 )
|
||||
{
|
||||
m_Caster = caster;
|
||||
m_Scroll = scroll;
|
||||
public int LocNumber{ get; }
|
||||
}
|
||||
}
|
||||
|
||||
AddPage( 0 );
|
||||
public class NewPolymorphGump : Gump
|
||||
{
|
||||
private static readonly PolymorphEntry[] m_Entries =
|
||||
{
|
||||
PolymorphEntry.Chicken,
|
||||
PolymorphEntry.Dog,
|
||||
PolymorphEntry.Wolf,
|
||||
PolymorphEntry.Panther,
|
||||
PolymorphEntry.Gorilla,
|
||||
PolymorphEntry.BlackBear,
|
||||
PolymorphEntry.GrizzlyBear,
|
||||
PolymorphEntry.PolarBear,
|
||||
PolymorphEntry.HumanMale,
|
||||
PolymorphEntry.HumanFemale,
|
||||
PolymorphEntry.Slime,
|
||||
PolymorphEntry.Orc,
|
||||
PolymorphEntry.LizardMan,
|
||||
PolymorphEntry.Gargoyle,
|
||||
PolymorphEntry.Ogre,
|
||||
PolymorphEntry.Troll,
|
||||
PolymorphEntry.Ettin,
|
||||
PolymorphEntry.Daemon
|
||||
};
|
||||
|
||||
AddBackground( 0, 0, 520, 404, 0x13BE );
|
||||
AddImageTiled( 10, 10, 500, 20, 0xA40 );
|
||||
AddImageTiled( 10, 40, 500, 324, 0xA40 );
|
||||
AddImageTiled( 10, 374, 500, 20, 0xA40 );
|
||||
AddAlphaRegion( 10, 10, 500, 384 );
|
||||
private Mobile m_Caster;
|
||||
private Item m_Scroll;
|
||||
|
||||
AddHtmlLocalized( 14, 12, 500, 20, 1015234, 0x7FFF, false, false ); // <center>Polymorph Selection Menu</center>
|
||||
public NewPolymorphGump(Mobile caster, Item scroll) : base(0, 0)
|
||||
{
|
||||
m_Caster = caster;
|
||||
m_Scroll = scroll;
|
||||
|
||||
AddButton( 10, 374, 0xFB1, 0xFB2, 0, GumpButtonType.Reply, 0 );
|
||||
AddHtmlLocalized( 45, 376, 450, 20, 1060051, 0x7FFF, false, false ); // CANCEL
|
||||
AddPage(0);
|
||||
|
||||
for ( int i = 0; i < m_Entries.Length; i++ )
|
||||
{
|
||||
PolymorphEntry entry = m_Entries[i];
|
||||
AddBackground(0, 0, 520, 404, 0x13BE);
|
||||
AddImageTiled(10, 10, 500, 20, 0xA40);
|
||||
AddImageTiled(10, 40, 500, 324, 0xA40);
|
||||
AddImageTiled(10, 374, 500, 20, 0xA40);
|
||||
AddAlphaRegion(10, 10, 500, 384);
|
||||
|
||||
int page = i / 10 + 1;
|
||||
int pos = i % 10;
|
||||
AddHtmlLocalized(14, 12, 500, 20, 1015234, 0x7FFF, false, false); // <center>Polymorph Selection Menu</center>
|
||||
|
||||
if ( pos == 0 )
|
||||
{
|
||||
if ( page > 1 )
|
||||
{
|
||||
AddButton( 400, 374, 0xFA5, 0xFA7, 0, GumpButtonType.Page, page );
|
||||
AddHtmlLocalized( 440, 376, 60, 20, 1043353, 0x7FFF, false, false ); // Next
|
||||
}
|
||||
AddButton(10, 374, 0xFB1, 0xFB2, 0, GumpButtonType.Reply, 0);
|
||||
AddHtmlLocalized(45, 376, 450, 20, 1060051, 0x7FFF, false, false); // CANCEL
|
||||
|
||||
AddPage( page );
|
||||
for (int i = 0; i < m_Entries.Length; i++)
|
||||
{
|
||||
PolymorphEntry entry = m_Entries[i];
|
||||
|
||||
if ( page > 1 )
|
||||
{
|
||||
AddButton( 300, 374, 0xFAE, 0xFB0, 0, GumpButtonType.Page, 1 );
|
||||
AddHtmlLocalized( 340, 376, 60, 20, 1011393, 0x7FFF, false, false ); // Back
|
||||
}
|
||||
}
|
||||
int page = i / 10 + 1;
|
||||
int pos = i % 10;
|
||||
|
||||
int x = ( pos % 2 == 0 ) ? 14 : 264;
|
||||
int y = ( pos / 2 ) * 64 + 44;
|
||||
if (pos == 0)
|
||||
{
|
||||
if (page > 1)
|
||||
{
|
||||
AddButton(400, 374, 0xFA5, 0xFA7, 0, GumpButtonType.Page, page);
|
||||
AddHtmlLocalized(440, 376, 60, 20, 1043353, 0x7FFF, false, false); // Next
|
||||
}
|
||||
|
||||
AddImageTiledButton( x, y, 0x918, 0x919, i + 1, GumpButtonType.Reply, 0, entry.ArtID, 0x0, entry.X, entry.Y );
|
||||
AddHtmlLocalized( x + 84, y, 250, 60, entry.LocNumber, 0x7FFF, false, false );
|
||||
}
|
||||
}
|
||||
AddPage(page);
|
||||
|
||||
public override void OnResponse( NetState sender, RelayInfo info )
|
||||
{
|
||||
int idx = info.ButtonID - 1;
|
||||
if (page > 1)
|
||||
{
|
||||
AddButton(300, 374, 0xFAE, 0xFB0, 0, GumpButtonType.Page, 1);
|
||||
AddHtmlLocalized(340, 376, 60, 20, 1011393, 0x7FFF, false, false); // Back
|
||||
}
|
||||
}
|
||||
|
||||
if ( idx < 0 || idx >= m_Entries.Length )
|
||||
return;
|
||||
int x = pos % 2 == 0 ? 14 : 264;
|
||||
int y = pos / 2 * 64 + 44;
|
||||
|
||||
Spell spell = new PolymorphSpell( m_Caster, m_Scroll, m_Entries[idx].BodyID );
|
||||
spell.Cast();
|
||||
}
|
||||
}
|
||||
}
|
||||
AddImageTiledButton(x, y, 0x918, 0x919, i + 1, GumpButtonType.Reply, 0, entry.ArtID, 0x0, entry.X, entry.Y);
|
||||
AddHtmlLocalized(x + 84, y, 250, 60, entry.LocNumber, 0x7FFF, false, false);
|
||||
}
|
||||
}
|
||||
|
||||
public override void OnResponse(NetState sender, RelayInfo info)
|
||||
{
|
||||
int idx = info.ButtonID - 1;
|
||||
|
||||
if (idx < 0 || idx >= m_Entries.Length)
|
||||
return;
|
||||
|
||||
Spell spell = new PolymorphSpell(m_Caster, m_Scroll, m_Entries[idx].BodyID);
|
||||
spell.Cast();
|
||||
}
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue