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

fix: Fixes ML containers and addons (#804)

Browse source 
* Fixes some ML addons so they are containers
* Adds some missing ML artifacts
* Fixes carpentry gump crafting entries
This commit is contained in:
Kamron Batman 2021-09-26 18:54:33 -07:00 • committed by GitHub
parent b4ab052241
commit 2253a2332c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
61 changed files with 678 additions and 630 deletions
Download patch file Download diff file Expand all files Collapse all files

52
Projects/UOContent/Items/Containers/Container.cs
View file

@ -578,7 +578,8 @@ namespace Server.Items
}
}
[Furniture, Flippable(0x9AA, 0xE7D)]
[Furniture]
[Flippable(0x9AA, 0xE7D)]
public class WoodenBox : LockableContainer
{
[Constructible]
@ -603,7 +604,8 @@ namespace Server.Items
}
}
[Furniture, Flippable(0x9A9, 0xE7E)]
[Furniture]
[Flippable(0x9A9, 0xE7E)]
public class SmallCrate : LockableContainer
{
[Constructible]
@ -633,7 +635,8 @@ namespace Server.Items
}
}
[Furniture, Flippable(0xE3F, 0xE3E)]
[Furniture]
[Flippable(0xE3F, 0xE3E)]
public class MediumCrate : LockableContainer
{
[Constructible]
@ -663,7 +666,8 @@ namespace Server.Items
}
}
[Furniture, Flippable(0xE3D, 0xE3C)]
[Furniture]
[Flippable(0xE3D, 0xE3C)]
public class LargeCrate : LockableContainer
{
[Constructible]
@ -789,7 +793,8 @@ namespace Server.Items
}
}
[Furniture, Flippable(0xe43, 0xe42)]
[Furniture]
[Flippable(0xe43, 0xe42)]
public class WoodenChest : LockableContainer
{
[Constructible]
@ -819,7 +824,8 @@ namespace Server.Items
}
}
[Furniture, Flippable(0x280B, 0x280C)]
[Furniture]
[Flippable(0x280B, 0x280C)]
public class PlainWoodenChest : LockableContainer
{
[Constructible]
@ -851,7 +857,8 @@ namespace Server.Items
}
}
[Furniture, Flippable(0x280D, 0x280E)]
[Furniture]
[Flippable(0x280D, 0x280E)]
public class OrnateWoodenChest : LockableContainer
{
[Constructible]
@ -883,7 +890,8 @@ namespace Server.Items
}
}
[Furniture, Flippable(0x280F, 0x2810)]
[Furniture]
[Flippable(0x280F, 0x2810)]
public class GildedWoodenChest : LockableContainer
{
[Constructible]
@ -915,7 +923,8 @@ namespace Server.Items
}
}
[Furniture, Flippable(0x2811, 0x2812)]
[Furniture]
[Flippable(0x2811, 0x2812)]
public class WoodenFootLocker : LockableContainer
{
[Constructible]
@ -950,7 +959,8 @@ namespace Server.Items
}
}
[Furniture, Flippable(0x2813, 0x2814)]
[Furniture]
[Flippable(0x2813, 0x2814)]
public class FinishedWoodenChest : LockableContainer
{
[Constructible]
@ -981,4 +991,26 @@ namespace Server.Items
}
}
}
[Furniture]
[Serializable(0)]
[Flippable(0x2DF1, 0x2DF2)]
public partial class RarewoodChest : LockableContainer
{
[Constructible]
public RarewoodChest() : base(0x2DF1)
{
}
}
[Furniture]
[Serializable(0)]
[Flippable(0x2DF3, 0x2DF4)]
public partial class DecorativeBox : LockableContainer
{
[Constructible]
public DecorativeBox() : base(0x2DF4)
{
}
}
}

58
Projects/UOContent/Items/Containers/FurnitureContainer.cs
View file

@ -3,7 +3,8 @@ using System.Collections.Generic;
namespace Server.Items
{
[Furniture, Flippable(0x2815, 0x2816)]
[Furniture]
[Flippable(0x2815, 0x2816)]
public class TallCabinet : BaseContainer
{
[Constructible]
@ -26,7 +27,8 @@ namespace Server.Items
}
}
[Furniture, Flippable(0x2817, 0x2818)]
[Furniture]
[Flippable(0x2817, 0x2818)]
public class ShortCabinet : BaseContainer
{
[Constructible]
@ -49,7 +51,8 @@ namespace Server.Items
}
}
[Furniture, Flippable(0x2857, 0x2858)]
[Furniture]
[Flippable(0x2857, 0x2858)]
public class RedArmoire : BaseContainer
{
[Constructible]
@ -72,7 +75,8 @@ namespace Server.Items
}
}
[Furniture, Flippable(0x285D, 0x285E)]
[Furniture]
[Flippable(0x285D, 0x285E)]
public class CherryArmoire : BaseContainer
{
[Constructible]
@ -95,7 +99,8 @@ namespace Server.Items
}
}
[Furniture, Flippable(0x285B, 0x285C)]
[Furniture]
[Flippable(0x285B, 0x285C)]
public class MapleArmoire : BaseContainer
{
[Constructible]
@ -118,7 +123,8 @@ namespace Server.Items
}
}
[Furniture, Flippable(0x2859, 0x285A)]
[Furniture]
[Flippable(0x2859, 0x285A)]
public class ElegantArmoire : BaseContainer
{
[Constructible]
@ -141,7 +147,30 @@ namespace Server.Items
}
}
[Furniture, Flippable(0xa97, 0xa99, 0xa98, 0xa9a, 0xa9b, 0xa9c)]
[Furniture]
[Serializable(0)]
[Flippable(0x2D07, 0x2D08)]
public partial class FancyElvenArmoire : BaseContainer
{
[Constructible]
public FancyElvenArmoire() : base(0x2D07) => Weight = 1.0;
public override int DefaultGumpID => 0x4E;
public override int DefaultDropSound => 0x42;
}
[Furniture]
[Serializable(0)]
[Flippable(0x2D05, 0x2D06)]
public partial class SimpleElvenArmoire : BaseContainer
{
[Constructible]
public SimpleElvenArmoire() : base(0x2D05) => Weight = 1.0;
public override int DefaultGumpID => 0x4F;
public override int DefaultDropSound => 0x42;
}
[Furniture]
[Flippable(0xa97, 0xa99, 0xa98, 0xa9a, 0xa9b, 0xa9c)]
public class FullBookcase : BaseContainer
{
[Constructible]
@ -164,7 +193,8 @@ namespace Server.Items
}
}
[Furniture, Flippable(0xa9d, 0xa9e)]
[Furniture]
[Flippable(0xa9d, 0xa9e)]
public class EmptyBookcase : BaseContainer
{
[Constructible]
@ -195,7 +225,8 @@ namespace Server.Items
}
}
[Furniture, Flippable(0xa2c, 0xa34)]
[Furniture]
[Flippable(0xa2c, 0xa34)]
public class Drawer : BaseContainer
{
[Constructible]
@ -218,7 +249,8 @@ namespace Server.Items
}
}
[Furniture, Flippable(0xa30, 0xa38)]
[Furniture]
[Flippable(0xa30, 0xa38)]
public class FancyDrawer : BaseContainer
{
[Constructible]
@ -241,7 +273,8 @@ namespace Server.Items
}
}
[Furniture, Flippable(0xa4f, 0xa53)]
[Furniture]
[Flippable(0xa4f, 0xa53)]
public class Armoire : BaseContainer
{
[Constructible]
@ -274,7 +307,8 @@ namespace Server.Items
}
}
[Furniture, Flippable(0xa4d, 0xa51)]
[Furniture]
[Flippable(0xa4d, 0xa51)]
public class FancyArmoire : BaseContainer
{
[Constructible]