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

Fixed issue with secured dye tubs in houses

Browse source 
http://www.uodemise.com/forum/showthread.php?t=147193

Smith/Tailor PS should not be cursed
http://www.uodemise.com/forum/showthread.php?t=148415

Large crafting system overhaul
http://www.uodemise.com/forum/showthread.php?t=119342
This commit is contained in:
xavier 2010-10-02 15:25:30 +00:00
parent f90c09ef55
commit 4df455f33c
132 changed files with 4914 additions and 1012 deletions
Download patch file Download diff file Expand all files Collapse all files

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

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

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

@ -0,0 +1,33 @@
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,13 +3,18 @@ using System;
namespace Server.Items
{
[Furniture]
[Flipable(0xF65, 0xF67, 0xF69)]
public class Easle : Item
[Flipable( false, 0xF65, 0xF67, 0xF69 )]
public class Easle : BaseCraftableItem
{
[Constructable]
public Easle() : base(0xF65)
public Easle() : base( 0xF65 )
{
Weight = 25.0;
}
[Constructable]
public Easle( int itemID ) : base( itemID )
{
Weight = 24.0;
}
public Easle(Serial serial) : base(serial)
@ -27,10 +32,44 @@ namespace Server.Items
{
base.Deserialize(reader);
int version = reader.ReadInt();
int version = ( InheritsItem ? OldVersion : reader.ReadInt() ); //Required for BaseCraftableItem insertion
if ( Weight == 10.0 )
Weight = 25.0;
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();
}
}
}

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

@ -3,11 +3,18 @@ using System;
namespace Server.Items
{
[Furniture]
[Flipable(0xEBB, 0xEBC)]
public class TallMusicStand : Item
[Flipable( false, 0xEBB, 0xEBC )]
public class TallMusicStand : BaseCraftableItem
{
public override bool DisplaysResource{ get{ return false; } }
[Constructable]
public TallMusicStand() : base(0xEBB)
public TallMusicStand() : this( 0xEBB )
{
}
[Constructable]
public TallMusicStand( int itemID ) : base( itemID )
{
Weight = 10.0;
}
@ -27,7 +34,7 @@ namespace Server.Items
{
base.Deserialize(reader);
int version = reader.ReadInt();
int version = ( InheritsItem ? OldVersion : reader.ReadInt() ); //Required for BaseCraftableItem insertion
if ( Weight == 8.0 )
Weight = 10.0;
@ -35,11 +42,18 @@ namespace Server.Items
}
[Furniture]
[Flipable(0xEB6,0xEB8)]
public class ShortMusicStand : Item
[Flipable( false, 0xEB6,0xEB8 )]
public class ShortMusicStand : BaseCraftableItem
{
public override bool DisplaysResource{ get{ return false; } }
[Constructable]
public ShortMusicStand() : base(0xEB6)
public ShortMusicStand() : this( 0xEB6 )
{
}
[Constructable]
public ShortMusicStand( int itemID ) : base( itemID )
{
Weight = 10.0;
}
@ -59,7 +73,7 @@ namespace Server.Items
{
base.Deserialize(reader);
int version = reader.ReadInt();
int version = ( InheritsItem ? OldVersion : reader.ReadInt() ); //Required for BaseCraftableItem insertion
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 : Item
public class BambooScreen : BaseCraftableItem
{
[Constructable]
public BambooScreen() : base(0x24D0)
public BambooScreen() : base( 0x24D1 )
{
Weight = 20.0;
Weight = 1.0;
}
public BambooScreen(Serial serial) : base(serial)
@ -27,19 +27,21 @@ namespace Server.Items
{
base.Deserialize(reader);
int version = reader.ReadInt();
int version = ( InheritsItem ? OldVersion : reader.ReadInt() ); //Required for BaseCraftableItem insertion
if ( Weight == 20.0 )
Weight = 1.0;
}
}
[Furniture]
[Flipable( 0x24CB, 0x24CC, 0x24CD, 0x24CE, 0x24CF )]
public class ShojiScreen : Item
public class ShojiScreen : BaseCraftableItem
{
[Constructable]
public ShojiScreen() : base(0x24CB)
public ShojiScreen() : base( 0x24CB )
{
Weight = 20.0;
Weight = 1.0;
}
public ShojiScreen(Serial serial) : base(serial)
@ -57,8 +59,10 @@ namespace Server.Items
{
base.Deserialize(reader);
int version = reader.ReadInt();
int version = ( InheritsItem ? OldVersion : reader.ReadInt() ); //Required for BaseCraftableItem insertion
if ( Weight == 20.0 )
Weight = 1.0;
}
}

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

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

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

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