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

89
Scripts/Items/Skill Items/Specialized/GlassblowingBook.cs
View file

@ -2,56 +2,57 @@ using Server.Mobiles;
namespace Server.Items
{
public class GlassblowingBook : Item
{
public override string DefaultName => "Crafting Glass With Glassblowing";
public class GlassblowingBook : Item
{
[Constructible]
public GlassblowingBook() : base(0xFF4)
{
Weight = 1.0;
}
[Constructible]
public GlassblowingBook() : base( 0xFF4 )
{
Weight = 1.0;
}
public GlassblowingBook(Serial serial) : base(serial)
{
}
public GlassblowingBook( Serial serial ) : base( serial )
{
}
public override string DefaultName => "Crafting Glass With Glassblowing";
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 override void OnDoubleClick( Mobile from )
{
PlayerMobile pm = from as PlayerMobile;
public override void OnDoubleClick(Mobile from)
{
PlayerMobile pm = from as PlayerMobile;
if ( !IsChildOf( from.Backpack ) )
{
from.SendLocalizedMessage( 1042001 ); // That must be in your pack for you to use it.
}
else if ( pm == null || from.Skills[SkillName.Alchemy].Base < 100.0 )
{
pm.SendMessage( "Only a Grandmaster Alchemist can learn from this book." );
}
else if ( pm.Glassblowing )
{
pm.SendMessage( "You have already learned this information." );
}
else
{
pm.Glassblowing = true;
pm.SendMessage( "You have learned to make items from glass. You will need to find miners to mine find sand for you to make these items." );
Delete();
}
}
}
if (!IsChildOf(from.Backpack))
{
from.SendLocalizedMessage(1042001); // That must be in your pack for you to use it.
}
else if (pm == null || from.Skills[SkillName.Alchemy].Base < 100.0)
{
pm.SendMessage("Only a Grandmaster Alchemist can learn from this book.");
}
else if (pm.Glassblowing)
{
pm.SendMessage("You have already learned this information.");
}
else
{
pm.Glassblowing = true;
pm.SendMessage(
"You have learned to make items from glass. You will need to find miners to mine find sand for you to make these items.");
Delete();
}
}
}
}

89
Scripts/Items/Skill Items/Specialized/MasonryBook.cs
View file

@ -2,56 +2,57 @@ using Server.Mobiles;
namespace Server.Items
{
public class MasonryBook : Item
{
public override string DefaultName => "Making Valuables With Stonecrafting";
public class MasonryBook : Item
{
[Constructible]
public MasonryBook() : base(0xFBE)
{
Weight = 1.0;
}
[Constructible]
public MasonryBook() : base( 0xFBE )
{
Weight = 1.0;
}
public MasonryBook(Serial serial) : base(serial)
{
}
public MasonryBook( Serial serial ) : base( serial )
{
}
public override string DefaultName => "Making Valuables With Stonecrafting";
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 override void OnDoubleClick( Mobile from )
{
PlayerMobile pm = from as PlayerMobile;
public override void OnDoubleClick(Mobile from)
{
PlayerMobile pm = from as PlayerMobile;
if ( !IsChildOf( from.Backpack ) )
{
from.SendLocalizedMessage( 1042001 ); // That must be in your pack for you to use it.
}
else if ( pm == null || from.Skills[SkillName.Carpentry].Base < 100.0 )
{
pm.SendMessage( "Only a Grandmaster Carpenter can learn from this book." );
}
else if ( pm.Masonry )
{
pm.SendMessage( "You have already learned this information." );
}
else
{
pm.Masonry = true;
pm.SendMessage( "You have learned to make items from stone. You will need miners to gather stones for you to make these items." );
Delete();
}
}
}
if (!IsChildOf(from.Backpack))
{
from.SendLocalizedMessage(1042001); // That must be in your pack for you to use it.
}
else if (pm == null || from.Skills[SkillName.Carpentry].Base < 100.0)
{
pm.SendMessage("Only a Grandmaster Carpenter can learn from this book.");
}
else if (pm.Masonry)
{
pm.SendMessage("You have already learned this information.");
}
else
{
pm.Masonry = true;
pm.SendMessage(
"You have learned to make items from stone. You will need miners to gather stones for you to make these items.");
Delete();
}
}
}
}

67
Scripts/Items/Skill Items/Specialized/Sand.cs
View file

@ -1,44 +1,43 @@
namespace Server.Items
{
[FlippableAttribute( 0x11EA, 0x11EB )]
public class Sand : Item, ICommodity
{
int ICommodity.DescriptionNumber => LabelNumber;
bool ICommodity.IsDeedable => true;
[Flippable(0x11EA, 0x11EB)]
public class Sand : Item, ICommodity
{
[Constructible]
public Sand() : this(1)
{
}
public override int LabelNumber => 1044626; // sand
[Constructible]
public Sand(int amount) : base(0x11EA)
{
Stackable = Core.ML;
Weight = 1.0;
}
[Constructible]
public Sand() : this( 1 )
{
}
public Sand(Serial serial) : base(serial)
{
}
[Constructible]
public Sand( int amount ) : base( 0x11EA )
{
Stackable = Core.ML;
Weight = 1.0;
}
public override int LabelNumber => 1044626; // sand
int ICommodity.DescriptionNumber => LabelNumber;
bool ICommodity.IsDeedable => true;
public Sand( Serial serial ) : base( serial )
{
}
public override void Serialize(GenericWriter writer)
{
base.Serialize(writer);
public override void Serialize( GenericWriter writer )
{
base.Serialize( writer );
writer.Write(1); // version
}
writer.Write( (int) 1 ); // 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 ( version == 0 && Name == "sand" )
Name = null;
}
}
}
if (version == 0 && Name == "sand")
Name = null;
}
}
}

89
Scripts/Items/Skill Items/Specialized/SandMiningBook.cs
View file

@ -2,56 +2,57 @@ using Server.Mobiles;
namespace Server.Items
{
public class SandMiningBook : Item
{
public override string DefaultName => "Find Glass-Quality Sand";
public class SandMiningBook : Item
{
[Constructible]
public SandMiningBook() : base(0xFF4)
{
Weight = 1.0;
}
[Constructible]
public SandMiningBook() : base( 0xFF4 )
{
Weight = 1.0;
}
public SandMiningBook(Serial serial) : base(serial)
{
}
public SandMiningBook( Serial serial ) : base( serial )
{
}
public override string DefaultName => "Find Glass-Quality Sand";
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 override void OnDoubleClick( Mobile from )
{
PlayerMobile pm = from as PlayerMobile;
public override void OnDoubleClick(Mobile from)
{
PlayerMobile pm = from as PlayerMobile;
if ( !IsChildOf( from.Backpack ) )
{
from.SendLocalizedMessage( 1042001 ); // That must be in your pack for you to use it.
}
else if ( pm == null || from.Skills[SkillName.Mining].Base < 100.0 )
{
pm.SendMessage( "Only a Grandmaster Miner can learn from this book." );
}
else if ( pm.SandMining )
{
pm.SendMessage( "You have already learned this information." );
}
else
{
pm.SandMining = true;
pm.SendMessage( "You have learned how to mine fine sand. Target sand areas when mining to look for fine sand." );
Delete();
}
}
}
if (!IsChildOf(from.Backpack))
{
from.SendLocalizedMessage(1042001); // That must be in your pack for you to use it.
}
else if (pm == null || from.Skills[SkillName.Mining].Base < 100.0)
{
pm.SendMessage("Only a Grandmaster Miner can learn from this book.");
}
else if (pm.SandMining)
{
pm.SendMessage("You have already learned this information.");
}
else
{
pm.SandMining = true;
pm.SendMessage(
"You have learned how to mine fine sand. Target sand areas when mining to look for fine sand.");
Delete();
}
}
}
}

88
Scripts/Items/Skill Items/Specialized/StoneMiningBook.cs
View file

@ -2,56 +2,56 @@ using Server.Mobiles;
namespace Server.Items
{
public class StoneMiningBook : Item
{
public override string DefaultName => "Mining For Quality Stone";
public class StoneMiningBook : Item
{
[Constructible]
public StoneMiningBook() : base(0xFBE)
{
Weight = 1.0;
}
[Constructible]
public StoneMiningBook() : base( 0xFBE )
{
Weight = 1.0;
}
public StoneMiningBook(Serial serial) : base(serial)
{
}
public StoneMiningBook( Serial serial ) : base( serial )
{
}
public override string DefaultName => "Mining For Quality Stone";
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 override void OnDoubleClick( Mobile from )
{
PlayerMobile pm = from as PlayerMobile;
public override void OnDoubleClick(Mobile from)
{
PlayerMobile pm = from as PlayerMobile;
if ( !IsChildOf( from.Backpack ) )
{
from.SendLocalizedMessage( 1042001 ); // That must be in your pack for you to use it.
}
else if ( pm == null || from.Skills[SkillName.Mining].Base < 100.0 )
{
from.SendMessage( "Only a Grandmaster Miner can learn from this book." );
}
else if ( pm.StoneMining )
{
pm.SendMessage( "You have already learned this knowledge." );
}
else
{
pm.StoneMining = true;
pm.SendMessage( "You have learned to mine for stones. Target mountains when mining to find stones." );
Delete();
}
}
}
if (!IsChildOf(from.Backpack))
{
from.SendLocalizedMessage(1042001); // That must be in your pack for you to use it.
}
else if (pm == null || from.Skills[SkillName.Mining].Base < 100.0)
{
from.SendMessage("Only a Grandmaster Miner can learn from this book.");
}
else if (pm.StoneMining)
{
pm.SendMessage("You have already learned this knowledge.");
}
else
{
pm.StoneMining = true;
pm.SendMessage("You have learned to mine for stones. Target mountains when mining to find stones.");
Delete();
}
}
}
}