warrentyexpired/ModernUO
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixes code according to modern code style. Fixes a few expression bugs.

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

48
Scripts/Holiday Stuff/Valentine/2010/Items/AnimatedHeartShapedBox.cs
View file

@ -1,31 +1,31 @@
namespace Server.Items
{
[FlippableAttribute( 0x49CC, 0x49D0 )]
public class AnimatedHeartShapedBox : HeartShapedBox
{
[Constructible]
public AnimatedHeartShapedBox()
{
ItemID = 0x49CC;
}
[Flippable(0x49CC, 0x49D0)]
public class AnimatedHeartShapedBox : HeartShapedBox
{
[Constructible]
public AnimatedHeartShapedBox()
{
ItemID = 0x49CC;
}
public AnimatedHeartShapedBox( Serial serial )
: base( serial )
{
}
public AnimatedHeartShapedBox(Serial serial)
: base(serial)
{
}
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();
}
}
}

468
Scripts/Holiday Stuff/Valentine/2011/Items/StValentinesBears.cs
View file

@ -4,284 +4,302 @@ using Server.Network;
namespace Server.Items
{
public abstract class StValentinesBear : Item
{
public override string DefaultName
{
get
{
if ( m_Owner != null )
return $"{m_Owner}'s St. Valentine Bear";
return "St. Valentine Bear";
}
}
public abstract class StValentinesBear : Item
{
private string m_Line1;
private string m_Line2;
private string m_Line3;
private string m_Owner;
private string m_Line1;
private string m_Line2;
private string m_Line3;
private string m_Owner;
[CommandProperty( AccessLevel.GameMaster )]
public string Owner
{
get => m_Owner;
set { m_Owner = value; InvalidateProperties(); }
}
public StValentinesBear(int itemid, string name)
: base(itemid)
{
m_Owner = name;
LootType = LootType.Blessed;
}
[CommandProperty( AccessLevel.GameMaster )]
public string Line1
{
get => m_Line1;
set { m_Line1 = value; InvalidateProperties(); }
}
public StValentinesBear(Serial serial)
: base(serial)
{
}
[CommandProperty( AccessLevel.GameMaster )]
public string Line2
{
get => m_Line2;
set { m_Line2 = value; InvalidateProperties(); }
}
public override string DefaultName
{
get
{
if (m_Owner != null)
return $"{m_Owner}'s St. Valentine Bear";
return "St. Valentine Bear";
}
}
[CommandProperty( AccessLevel.GameMaster )]
public string Line3
{
get => m_Line3;
set { m_Line3 = value; InvalidateProperties(); }
}
[CommandProperty(AccessLevel.GameMaster)]
public string Owner
{
get => m_Owner;
set
{
m_Owner = value;
InvalidateProperties();
}
}
[CommandProperty( AccessLevel.GameMaster )]
public DateTime EditLimit { get; set; }
[CommandProperty(AccessLevel.GameMaster)]
public string Line1
{
get => m_Line1;
set
{
m_Line1 = value;
InvalidateProperties();
}
}
public bool IsSigned => ( m_Line1 != null || m_Line2 != null || m_Line3 != null );
[CommandProperty(AccessLevel.GameMaster)]
public string Line2
{
get => m_Line2;
set
{
m_Line2 = value;
InvalidateProperties();
}
}
public bool CanSign => ( !IsSigned || DateTime.UtcNow <= EditLimit );
[CommandProperty(AccessLevel.GameMaster)]
public string Line3
{
get => m_Line3;
set
{
m_Line3 = value;
InvalidateProperties();
}
}
public StValentinesBear( int itemid, string name )
: base( itemid )
{
m_Owner = name;
LootType = LootType.Blessed;
}
[CommandProperty(AccessLevel.GameMaster)]
public DateTime EditLimit{ get; set; }
public override void AddNameProperty( ObjectPropertyList list )
{
if ( m_Owner != null )
list.Add( 1150295, m_Owner ); // ~1_NAME~'s St. Valentine Bear
else
list.Add( 1150294 ); // St. Valentine Bear
public bool IsSigned => m_Line1 != null || m_Line2 != null || m_Line3 != null;
AddLine( list, 1150301, m_Line1 ); // [ ~1_LINE0~ ]
AddLine( list, 1150302, m_Line2 ); // [ ~1_LINE1~ ]
AddLine( list, 1150303, m_Line3 ); // [ ~1_LINE2~ ]
}
public bool CanSign => !IsSigned || DateTime.UtcNow <= EditLimit;
private static void AddLine( ObjectPropertyList list, int cliloc, string line )
{
if ( line != null )
list.Add( cliloc, line );
}
public override void AddNameProperty(ObjectPropertyList list)
{
if (m_Owner != null)
list.Add(1150295, m_Owner); // ~1_NAME~'s St. Valentine Bear
else
list.Add(1150294); // St. Valentine Bear
public override void OnSingleClick( Mobile from )
{
base.OnSingleClick( from );
AddLine(list, 1150301, m_Line1); // [ ~1_LINE0~ ]
AddLine(list, 1150302, m_Line2); // [ ~1_LINE1~ ]
AddLine(list, 1150303, m_Line3); // [ ~1_LINE2~ ]
}
ShowLine( from, 1150301, m_Line1 ); // [ ~1_LINE0~ ]
ShowLine( from, 1150302, m_Line2 ); // [ ~1_LINE1~ ]
ShowLine( from, 1150303, m_Line3 ); // [ ~1_LINE2~ ]
}
private static void AddLine(ObjectPropertyList list, int cliloc, string line)
{
if (line != null)
list.Add(cliloc, line);
}
private void ShowLine( Mobile from, int cliloc, string line )
{
if ( line != null )
LabelTo( from, cliloc, line );
}
public override void OnSingleClick(Mobile from)
{
base.OnSingleClick(from);
public override void OnDoubleClick( Mobile from )
{
if ( !CupidsArrow.CheckSeason( from ) || !CanSign )
return;
ShowLine(from, 1150301, m_Line1); // [ ~1_LINE0~ ]
ShowLine(from, 1150302, m_Line2); // [ ~1_LINE1~ ]
ShowLine(from, 1150303, m_Line3); // [ ~1_LINE2~ ]
}
if ( !IsChildOf( from.Backpack ) )
{
from.SendLocalizedMessage( 1080063 ); // This must be in your backpack to use it.
return;
}
private void ShowLine(Mobile from, int cliloc, string line)
{
if (line != null)
LabelTo(from, cliloc, line);
}
from.SendGump( new InternalGump( this ) );
}
public override void OnDoubleClick(Mobile from)
{
if (!CupidsArrow.CheckSeason(from) || !CanSign)
return;
public StValentinesBear( Serial serial )
: base( serial )
{
}
if (!IsChildOf(from.Backpack))
{
from.SendLocalizedMessage(1080063); // This must be in your backpack to use it.
return;
}
public override void Serialize( GenericWriter writer )
{
base.Serialize( writer );
from.SendGump(new InternalGump(this));
}
writer.Write( (int)0 );
public override void Serialize(GenericWriter writer)
{
base.Serialize(writer);
writer.Write( m_Owner );
writer.Write( m_Line1 );
writer.Write( m_Line2 );
writer.Write( m_Line3 );
}
writer.Write(0);
public override void Deserialize( GenericReader reader )
{
base.Deserialize( reader );
writer.Write(m_Owner);
writer.Write(m_Line1);
writer.Write(m_Line2);
writer.Write(m_Line3);
}
int version = reader.ReadInt();
public override void Deserialize(GenericReader reader)
{
base.Deserialize(reader);
m_Owner = Utility.Intern( reader.ReadString() );
m_Line1 = Utility.Intern( reader.ReadString() );
m_Line2 = Utility.Intern( reader.ReadString() );
m_Line3 = Utility.Intern( reader.ReadString() );
}
int version = reader.ReadInt();
private class InternalGump : Gump
{
private StValentinesBear m_Bear;
m_Owner = Utility.Intern(reader.ReadString());
m_Line1 = Utility.Intern(reader.ReadString());
m_Line2 = Utility.Intern(reader.ReadString());
m_Line3 = Utility.Intern(reader.ReadString());
}
public InternalGump( StValentinesBear bear )
: base( 50, 50 )
{
m_Bear = bear;
private class InternalGump : Gump
{
private StValentinesBear m_Bear;
AddPage( 0 );
AddBackground( 0, 0, 420, 320, 9300 );
AddHtml( 10, 10, 400, 21, "<CENTER>St. Valentine Bear</CENTER>", false, false );
AddHtmlLocalized( 10, 40, 400, 75, 1150293, 0, false, false ); // Enter up to three lines of personalized greeting for your St. Valentine Bear. You many enter up to 25 characters per line. Once you enter text, you will only be able to correct mistakes for 10 minutes.
public InternalGump(StValentinesBear bear)
: base(50, 50)
{
m_Bear = bear;
AddHtmlLocalized( 10, 129, 400, 21, 1150296, 0, false, false ); // Line 1:
AddBackground( 10, 150, 400, 24, 9350 );
AddTextEntry( 15, 152, 390, 20, 0, 0, "", 25 );
AddPage(0);
AddBackground(0, 0, 420, 320, 9300);
AddHtml(10, 10, 400, 21, "<CENTER>St. Valentine Bear</CENTER>", false, false);
AddHtmlLocalized(10, 40, 400, 75, 1150293, 0, false,
false); // Enter up to three lines of personalized greeting for your St. Valentine Bear. You many enter up to 25 characters per line. Once you enter text, you will only be able to correct mistakes for 10 minutes.
AddHtmlLocalized( 10, 179, 400, 21, 1150297, 0, false, false ); // Line 2:
AddBackground( 10, 200, 400, 24, 9350 );
AddTextEntry( 15, 202, 390, 20, 0, 1, "", 25 );
AddHtmlLocalized(10, 129, 400, 21, 1150296, 0, false, false); // Line 1:
AddBackground(10, 150, 400, 24, 9350);
AddTextEntry(15, 152, 390, 20, 0, 0, "", 25);
AddHtmlLocalized( 10, 229, 400, 21, 1150298, 0, false, false ); // Line 3:
AddBackground( 10, 250, 400, 24, 9350 );
AddTextEntry( 15, 252, 390, 20, 0, 2, "", 25 );
AddHtmlLocalized(10, 179, 400, 21, 1150297, 0, false, false); // Line 2:
AddBackground(10, 200, 400, 24, 9350);
AddTextEntry(15, 202, 390, 20, 0, 1, "", 25);
AddButton( 15, 285, 242, 241, 0, GumpButtonType.Reply, 0 );
AddButton( 335, 285, 247, 248, 1, GumpButtonType.Reply, 0 );
}
AddHtmlLocalized(10, 229, 400, 21, 1150298, 0, false, false); // Line 3:
AddBackground(10, 250, 400, 24, 9350);
AddTextEntry(15, 252, 390, 20, 0, 2, "", 25);
public override void OnResponse( NetState sender, RelayInfo info )
{
Mobile from = sender.Mobile;
AddButton(15, 285, 242, 241, 0, GumpButtonType.Reply, 0);
AddButton(335, 285, 247, 248, 1, GumpButtonType.Reply, 0);
}
if ( m_Bear.Deleted || !m_Bear.IsChildOf( from.Backpack ) || !m_Bear.CanSign || info.ButtonID != 1 )
return;
public override void OnResponse(NetState sender, RelayInfo info)
{
Mobile from = sender.Mobile;
string line1 = GetLine( info, 0 );
string line2 = GetLine( info, 1 );
string line3 = GetLine( info, 2 );
if (m_Bear.Deleted || !m_Bear.IsChildOf(from.Backpack) || !m_Bear.CanSign || info.ButtonID != 1)
return;
if ( string.IsNullOrEmpty( line1 )
|| string.IsNullOrEmpty( line2 )
|| string.IsNullOrEmpty( line3 ) )
{
from.SendMessage( "Lines cannot be left blank." );
return;
}
string line1 = GetLine(info, 0);
string line2 = GetLine(info, 1);
string line3 = GetLine(info, 2);
if ( line1.Length > 25
|| line2.Length > 25
|| line3.Length > 25 )
{
from.SendMessage( "Lines may not exceed 25 characters." );
return;
}
if (string.IsNullOrEmpty(line1)
|| string.IsNullOrEmpty(line2)
|| string.IsNullOrEmpty(line3))
{
from.SendMessage("Lines cannot be left blank.");
return;
}
if ( !m_Bear.IsSigned )
m_Bear.EditLimit = DateTime.UtcNow + TimeSpan.FromMinutes( 10 );
if (line1.Length > 25
|| line2.Length > 25
|| line3.Length > 25)
{
from.SendMessage("Lines may not exceed 25 characters.");
return;
}
m_Bear.Line1 = Utility.FixHtml( line1 );
m_Bear.Line2 = Utility.FixHtml( line2 );
m_Bear.Line3 = Utility.FixHtml( line3 );
if (!m_Bear.IsSigned)
m_Bear.EditLimit = DateTime.UtcNow + TimeSpan.FromMinutes(10);
from.SendMessage( "You add the personalized greeting to your St. Valentine Bear." );
}
m_Bear.Line1 = Utility.FixHtml(line1);
m_Bear.Line2 = Utility.FixHtml(line2);
m_Bear.Line3 = Utility.FixHtml(line3);
private static string GetLine( RelayInfo info, int idx )
{
TextRelay tr = info.GetTextEntry( idx );
from.SendMessage("You add the personalized greeting to your St. Valentine Bear.");
}
return tr?.Text;
}
}
}
private static string GetLine(RelayInfo info, int idx)
{
TextRelay tr = info.GetTextEntry(idx);
[FlippableAttribute( 0x48E0, 0x48E1 )]
public class StValentinesPanda : StValentinesBear
{
[Constructible]
public StValentinesPanda()
: this( null )
{
}
return tr?.Text;
}
}
}
[Constructible]
public StValentinesPanda( string name )
: base( 0x48E0, name )
{
}
[Flippable(0x48E0, 0x48E1)]
public class StValentinesPanda : StValentinesBear
{
[Constructible]
public StValentinesPanda()
: this(null)
{
}
public StValentinesPanda( Serial serial )
: base( serial )
{
}
[Constructible]
public StValentinesPanda(string name)
: base(0x48E0, name)
{
}
public override void Serialize( GenericWriter writer )
{
base.Serialize( writer );
public StValentinesPanda(Serial serial)
: base(serial)
{
}
writer.Write( (int)0 );
}
public override void Serialize(GenericWriter writer)
{
base.Serialize(writer);
public override void Deserialize( GenericReader reader )
{
base.Deserialize( reader );
writer.Write(0);
}
int version = reader.ReadInt();
}
}
public override void Deserialize(GenericReader reader)
{
base.Deserialize(reader);
[FlippableAttribute( 0x48E2, 0x48E3 )]
public class StValentinesPolarBear : StValentinesBear
{
[Constructible]
public StValentinesPolarBear()
: this( null )
{
}
int version = reader.ReadInt();
}
}
[Constructible]
public StValentinesPolarBear( string name )
: base( 0x48E2, name )
{
}
[Flippable(0x48E2, 0x48E3)]
public class StValentinesPolarBear : StValentinesBear
{
[Constructible]
public StValentinesPolarBear()
: this(null)
{
}
public StValentinesPolarBear( Serial serial )
: base( serial )
{
}
[Constructible]
public StValentinesPolarBear(string name)
: base(0x48E2, name)
{
}
public override void Serialize( GenericWriter writer )
{
base.Serialize( writer );
public StValentinesPolarBear(Serial serial)
: base(serial)
{
}
writer.Write( (int)0 );
}
public override void Serialize(GenericWriter writer)
{
base.Serialize(writer);
public override void Deserialize( GenericReader reader )
{
base.Deserialize( reader );
writer.Write(0);
}
int version = reader.ReadInt();
}
}
}
public override void Deserialize(GenericReader reader)
{
base.Deserialize(reader);
int version = reader.ReadInt();
}
}
}

52
Scripts/Holiday Stuff/Valentine/2012/Items/CupidStatue.cs
View file

@ -1,34 +1,34 @@
namespace Server.Items
{
[FlippableAttribute( 0x4F7C, 0x4F7D )]
public class CupidStatue : Item
{
public override int LabelNumber => 1099220; // cupid statue
[Flippable(0x4F7C, 0x4F7D)]
public class CupidStatue : Item
{
[Constructible]
public CupidStatue()
: base(0x4F7D)
{
LootType = LootType.Blessed;
}
[Constructible]
public CupidStatue()
: base( 0x4F7D )
{
LootType = LootType.Blessed;
}
public CupidStatue(Serial serial)
: base(serial)
{
}
public CupidStatue( Serial serial )
: base( serial )
{
}
public override int LabelNumber => 1099220; // cupid statue
public override void Serialize( GenericWriter writer )
{
base.Serialize( writer );
public override void Serialize(GenericWriter writer)
{
base.Serialize(writer);
writer.Write( (int)0 );
}
writer.Write(0);
}
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();
}
}
}

80
Scripts/Holiday Stuff/Valentine/2012/Items/HeartShapedBox.cs
View file

@ -1,52 +1,52 @@
namespace Server.Items
{
[FlippableAttribute( 0x49CA, 0x49CB )]
public class HeartShapedBox : BaseContainer
{
public override int DefaultDropSound => m_DropSound;
[Flippable(0x49CA, 0x49CB)]
public class HeartShapedBox : BaseContainer
{
private static int m_DropSound;
[Constructible]
public HeartShapedBox()
: base( 0x49CA )
{
}
[Constructible]
public HeartShapedBox()
: base(0x49CA)
{
}
public override bool OnDragDropInto( Mobile from, Item item, Point3D p )
{
PrepareSound( from );
return base.OnDragDropInto( from, item, p );
}
public HeartShapedBox(Serial serial)
: base(serial)
{
}
public override bool OnDragDrop( Mobile from, Item dropped )
{
PrepareSound( from );
return base.OnDragDrop( from, dropped );
}
public override int DefaultDropSound => m_DropSound;
private static int m_DropSound;
public override bool OnDragDropInto(Mobile from, Item item, Point3D p)
{
PrepareSound(from);
return base.OnDragDropInto(from, item, p);
}
private static void PrepareSound( Mobile from )
{
m_DropSound = from.Female ? 0x430 : 0x320;
}
public override bool OnDragDrop(Mobile from, Item dropped)
{
PrepareSound(from);
return base.OnDragDrop(from, dropped);
}
public HeartShapedBox( Serial serial )
: base( serial )
{
}
private static void PrepareSound(Mobile from)
{
m_DropSound = from.Female ? 0x430 : 0x320;
}
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();
}
}
}