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

revert crafting updates of SVN538. Per Mark: changing baseclasses is a bad idea.

Browse source
This commit is contained in:
xavier 2010-10-10 15:37:22 +00:00
parent 7399519cf7
commit e86794c4e6
130 changed files with 1007 additions and 4906 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Scripts/Items/Construction/Misc/BarrelParts.cs
View file

@ -2,11 +2,8 @@ using System;
namespace Server.Items
{
public class BarrelLid : BaseCraftableItem
public class BarrelLid : Item
{
public override bool DisplaysResource{ get{ return false; } }
public override bool DisplaysMakersMark{ get{ return false; } }
[Constructable]
public BarrelLid() : base(0x1DB8)
{
@ -28,16 +25,13 @@ namespace Server.Items
{
base.Deserialize(reader);
int version = ( InheritsItem ? OldVersion : reader.ReadInt() ); //Required for BaseCraftableItem insertion
int version = reader.ReadInt();
}
}
[FlipableAttribute(0x1EB1, 0x1EB2, 0x1EB3, 0x1EB4)]
public class BarrelStaves : BaseCraftableItem
public class BarrelStaves : Item
{
public override bool DisplaysResource{ get{ return false; } }
public override bool DisplaysMakersMark{ get{ return false; } }
[Constructable]
public BarrelStaves() : base(0x1EB1)
{
@ -59,7 +53,7 @@ namespace Server.Items
{
base.Deserialize(reader);
int version = ( InheritsItem ? OldVersion : reader.ReadInt() ); //Required for BaseCraftableItem insertion
int version = reader.ReadInt();
}
}

33
Scripts/Items/Construction/Misc/BookStand.cs
View file

@ -1,33 +0,0 @@
using System;
namespace Server.Items
{
[Furniture]
[Flipable( false, 0x2DDD, 0x2DDE )]
public class ElvenBookStand : BaseCraftableItem
{
[Constructable]
public ElvenBookStand() : base( 0x2DDD )
{
Weight = 20.0;
}
public ElvenBookStand(Serial serial) : base(serial)
{
}
public override void Serialize(GenericWriter writer)
{
base.Serialize(writer);
writer.Write((int) 0);
}
public override void Deserialize(GenericReader reader)
{
base.Deserialize(reader);
int version = reader.ReadInt(); //Required for BaseCraftableItem insertion
}
}
}

53
Scripts/Items/Construction/Misc/Easle.cs
View file

@ -3,18 +3,13 @@ using System;
namespace Server.Items
{
[Furniture]
[Flipable( false, 0xF65, 0xF67, 0xF69 )]
public class Easle : BaseCraftableItem
[Flipable(0xF65, 0xF67, 0xF69)]
public class Easle : Item
{
[Constructable]
public Easle() : base( 0xF65 )
public Easle() : base(0xF65)
{
}
[Constructable]
public Easle( int itemID ) : base( itemID )
{
Weight = 24.0;
Weight = 25.0;
}
public Easle(Serial serial) : base(serial)
@ -28,48 +23,14 @@ namespace Server.Items
writer.Write((int) 0);
}
public override void Deserialize(GenericReader reader)
{
base.Deserialize(reader);
int version = ( InheritsItem ? OldVersion : reader.ReadInt() ); //Required for BaseCraftableItem insertion
if ( Weight == 10.0 || Weight == 25.0 )
Weight = 24.0;
}
}
[Furniture]
[Flipable( false, 0xF66, 0xF68, 0xF6A )]
public class EasleWithCanvas : BaseCraftableItem
{
[Constructable]
public EasleWithCanvas() : base( 0xF66 )
{
}
[Constructable]
public EasleWithCanvas( int itemID ) : base( itemID )
{
Weight = 24.0;
}
public EasleWithCanvas(Serial serial) : base(serial)
{
}
public override void Serialize(GenericWriter writer)
{
base.Serialize(writer);
writer.Write((int) 0);
}
public override void Deserialize(GenericReader reader)
{
base.Deserialize(reader);
int version = reader.ReadInt();
if ( Weight == 10.0 )
Weight = 25.0;
}
}
}

30
Scripts/Items/Construction/Misc/MusicStand.cs
View file

@ -3,18 +3,11 @@ using System;
namespace Server.Items
{
[Furniture]
[Flipable( false, 0xEBB, 0xEBC )]
public class TallMusicStand : BaseCraftableItem
[Flipable(0xEBB, 0xEBC)]
public class TallMusicStand : Item
{
public override bool DisplaysResource{ get{ return false; } }
[Constructable]
public TallMusicStand() : this( 0xEBB )
{
}
[Constructable]
public TallMusicStand( int itemID ) : base( itemID )
public TallMusicStand() : base(0xEBB)
{
Weight = 10.0;
}
@ -34,7 +27,7 @@ namespace Server.Items
{
base.Deserialize(reader);
int version = ( InheritsItem ? OldVersion : reader.ReadInt() ); //Required for BaseCraftableItem insertion
int version = reader.ReadInt();
if ( Weight == 8.0 )
Weight = 10.0;
@ -42,18 +35,11 @@ namespace Server.Items
}
[Furniture]
[Flipable( false, 0xEB6,0xEB8 )]
public class ShortMusicStand : BaseCraftableItem
[Flipable(0xEB6,0xEB8)]
public class ShortMusicStand : Item
{
public override bool DisplaysResource{ get{ return false; } }
[Constructable]
public ShortMusicStand() : this( 0xEB6 )
{
}
[Constructable]
public ShortMusicStand( int itemID ) : base( itemID )
public ShortMusicStand() : base(0xEB6)
{
Weight = 10.0;
}
@ -73,7 +59,7 @@ namespace Server.Items
{
base.Deserialize(reader);
int version = ( InheritsItem ? OldVersion : reader.ReadInt() ); //Required for BaseCraftableItem insertion
int version = reader.ReadInt();
if ( Weight == 6.0 )
Weight = 10.0;

24
Scripts/Items/Construction/Misc/Screens.cs
View file

@ -4,12 +4,12 @@ namespace Server.Items
{
[Furniture]
[Flipable( 0x24D0, 0x24D1, 0x24D2, 0x24D3, 0x24D4 )]
public class BambooScreen : BaseCraftableItem
public class BambooScreen : Item
{
[Constructable]
public BambooScreen() : base( 0x24D1 )
public BambooScreen() : base(0x24D0)
{
Weight = 1.0;
Weight = 20.0;
}
public BambooScreen(Serial serial) : base(serial)
@ -27,21 +27,19 @@ namespace Server.Items
{
base.Deserialize(reader);
int version = ( InheritsItem ? OldVersion : reader.ReadInt() ); //Required for BaseCraftableItem insertion
if ( Weight == 20.0 )
Weight = 1.0;
int version = reader.ReadInt();
}
}
[Furniture]
[Flipable( 0x24CB, 0x24CC, 0x24CD, 0x24CE, 0x24CF )]
public class ShojiScreen : BaseCraftableItem
public class ShojiScreen : Item
{
[Constructable]
public ShojiScreen() : base( 0x24CB )
public ShojiScreen() : base(0x24CB)
{
Weight = 1.0;
Weight = 20.0;
}
public ShojiScreen(Serial serial) : base(serial)
@ -59,10 +57,8 @@ namespace Server.Items
{
base.Deserialize(reader);
int version = ( InheritsItem ? OldVersion : reader.ReadInt() ); //Required for BaseCraftableItem insertion
if ( Weight == 20.0 )
Weight = 1.0;
int version = reader.ReadInt();
}
}

78
Scripts/Items/Construction/Misc/Statues.cs
View file

@ -2,10 +2,8 @@ using System;
namespace Server.Items
{
public class StatueSouth : BaseCraftableItem
{
public override CraftResource DefaultResource{ get{ return CraftResource.Iron; } }
public class StatueSouth : Item
{
[Constructable]
public StatueSouth() : base(0x139A)
{
@ -29,14 +27,12 @@ namespace Server.Items
{
base.Deserialize(reader);
int version = ( InheritsItem ? OldVersion : reader.ReadInt() ); //Required for BaseCraftableItem insertion
int version = reader.ReadInt();
}
}
public class StatueSouth2 : BaseCraftableItem
{
public override CraftResource DefaultResource{ get{ return CraftResource.Iron; } }
public class StatueSouth2 : Item
{
[Constructable]
public StatueSouth2() : base(0x1227)
{
@ -60,11 +56,11 @@ namespace Server.Items
{
base.Deserialize(reader);
int version = ( InheritsItem ? OldVersion : reader.ReadInt() ); //Required for BaseCraftableItem insertion
int version = reader.ReadInt();
}
}
public class StatueNorth : BaseCraftableItem
public class StatueNorth : Item
{
[Constructable]
public StatueNorth() : base(0x139B)
@ -89,11 +85,11 @@ namespace Server.Items
{
base.Deserialize(reader);
int version = ( InheritsItem ? OldVersion : reader.ReadInt() ); //Required for BaseCraftableItem insertion
int version = reader.ReadInt();
}
}
public class StatueWest : BaseCraftableItem
public class StatueWest : Item
{
[Constructable]
public StatueWest() : base(0x1226)
@ -118,11 +114,11 @@ namespace Server.Items
{
base.Deserialize(reader);
int version = ( InheritsItem ? OldVersion : reader.ReadInt() ); //Required for BaseCraftableItem insertion
int version = reader.ReadInt();
}
}
public class StatueEast : BaseCraftableItem
public class StatueEast : Item
{
[Constructable]
public StatueEast() : base(0x139C)
@ -147,14 +143,12 @@ namespace Server.Items
{
base.Deserialize(reader);
int version = ( InheritsItem ? OldVersion : reader.ReadInt() ); //Required for BaseCraftableItem insertion
int version = reader.ReadInt();
}
}
public class StatueEast2 : BaseCraftableItem
{
public override CraftResource DefaultResource{ get{ return CraftResource.Iron; } }
public class StatueEast2 : Item
{
[Constructable]
public StatueEast2() : base(0x1224)
{
@ -178,14 +172,12 @@ namespace Server.Items
{
base.Deserialize(reader);
int version = ( InheritsItem ? OldVersion : reader.ReadInt() ); //Required for BaseCraftableItem insertion
int version = reader.ReadInt();
}
}
public class StatueSouthEast : BaseCraftableItem
{
public override CraftResource DefaultResource{ get{ return CraftResource.Iron; } }
public class StatueSouthEast : Item
{
[Constructable]
public StatueSouthEast() : base(0x1225)
{
@ -209,14 +201,12 @@ namespace Server.Items
{
base.Deserialize(reader);
int version = ( InheritsItem ? OldVersion : reader.ReadInt() ); //Required for BaseCraftableItem insertion
int version = reader.ReadInt();
}
}
public class BustSouth : BaseCraftableItem
{
public override CraftResource DefaultResource{ get{ return CraftResource.Iron; } }
public class BustSouth : Item
{
[Constructable]
public BustSouth() : base(0x12CB)
{
@ -240,14 +230,12 @@ namespace Server.Items
{
base.Deserialize(reader);
int version = ( InheritsItem ? OldVersion : reader.ReadInt() ); //Required for BaseCraftableItem insertion
int version = reader.ReadInt();
}
}
public class BustEast : BaseCraftableItem
{
public override CraftResource DefaultResource{ get{ return CraftResource.Iron; } }
public class BustEast : Item
{
[Constructable]
public BustEast() : base(0x12CA)
{
@ -271,14 +259,12 @@ namespace Server.Items
{
base.Deserialize(reader);
int version = ( InheritsItem ? OldVersion : reader.ReadInt() ); //Required for BaseCraftableItem insertion
int version = reader.ReadInt();
}
}
public class StatuePegasus : BaseCraftableItem
public class StatuePegasus : Item
{
public override CraftResource DefaultResource{ get{ return CraftResource.Iron; } }
[Constructable]
public StatuePegasus() : base(0x139D)
{
@ -302,14 +288,12 @@ namespace Server.Items
{
base.Deserialize(reader);
int version = ( InheritsItem ? OldVersion : reader.ReadInt() ); //Required for BaseCraftableItem insertion
int version = reader.ReadInt();
}
}
public class StatuePegasus2 : BaseCraftableItem
public class StatuePegasus2 : Item
{
public override CraftResource DefaultResource{ get{ return CraftResource.Iron; } }
[Constructable]
public StatuePegasus2() : base(0x1228)
{
@ -333,14 +317,12 @@ namespace Server.Items
{
base.Deserialize(reader);
int version = ( InheritsItem ? OldVersion : reader.ReadInt() ); //Required for BaseCraftableItem insertion
int version = reader.ReadInt();
}
}
public class SmallTowerSculpture : BaseCraftableItem
public class SmallTowerSculpture : Item
{
public override CraftResource DefaultResource{ get{ return CraftResource.Iron; } }
[Constructable]
public SmallTowerSculpture() : base(0x241A)
{
@ -362,7 +344,7 @@ namespace Server.Items
{
base.Deserialize(reader);
int version = ( InheritsItem ? OldVersion : reader.ReadInt() ); //Required for BaseCraftableItem insertion
int version = reader.ReadInt();
}
}
}

18
Scripts/Items/Construction/Misc/Vase.cs
View file

@ -2,10 +2,8 @@ using System;
namespace Server.Items
{
public class Vase : BaseCraftableItem
public class Vase : Item
{
public override CraftResource DefaultResource{ get{ return CraftResource.Iron; } }
[Constructable]
public Vase() : base( 0xB46 )
{
@ -27,14 +25,12 @@ namespace Server.Items
{
base.Deserialize( reader );
int version = ( InheritsItem ? OldVersion : reader.ReadInt() ); //Required for BaseCraftableItem insertion
int version = reader.ReadInt();
}
}
public class LargeVase : BaseCraftableItem
public class LargeVase : Item
{
public override CraftResource DefaultResource{ get{ return CraftResource.Iron; } }
[Constructable]
public LargeVase() : base( 0xB45 )
{
@ -56,14 +52,12 @@ namespace Server.Items
{
base.Deserialize( reader );
int version = ( InheritsItem ? OldVersion : reader.ReadInt() ); //Required for BaseCraftableItem insertion
int version = reader.ReadInt();
}
}
public class SmallUrn : BaseCraftableItem
public class SmallUrn : Item
{
public override CraftResource DefaultResource{ get{ return CraftResource.Iron; } }
[Constructable]
public SmallUrn() : base( 0x241C )
{
@ -85,7 +79,7 @@ namespace Server.Items
{
base.Deserialize(reader);
int version = ( InheritsItem ? OldVersion : reader.ReadInt() ); //Required for BaseCraftableItem insertion
int version = reader.ReadInt();
}
}
}