Merge branch 'develop' into minihouses-add-ons

UOX3DevTeam · Jan 28, 2025 · 9b36ad8 · 9b36ad8
2 parents 5ef75a2 + 5c57932
commit 9b36ad8
Show file tree

Hide file tree

Showing 87 changed files with 5,248 additions and 183 deletions.
diff --git a/data/dfndata/house/house_addons_ml.dfn b/data/dfndata/house/house_addons_ml.dfn
diff --git a/data/dfndata/items/ItemMenu.bulk.dfn b/data/dfndata/items/ItemMenu.bulk.dfn
@@ -9097,6 +9097,8 @@ ADDITEM=0x0e7c
 ADDITEM=0x0e40
 0x0e41=metal chest
 ADDITEM=0x0e41
+0x0e41=Puzzle Chest
+ADDITEM=puzzlechest
 <=Previous Menu
 ITEMMENU=3
 }
@@ -14254,6 +14256,61 @@ ADDITEM=mapmakerspen
 ITEMMENU=127
 }
 
+[ITEMMENU 260]
+{
+Houseaddon_ML_Deeds.dfn
+0x14F0=Elven Bed (East)
+ADDITEM=elvenbedeastdeed
+0x14F0=Elven Bed (South)
+ADDITEM=elvenbedsouthdeed
+0x14F0=Alchemist Table (East)
+ADDITEM=alchemisttabledeedeast
+0x14F0=Alchemist Table (South)
+ADDITEM=alchemisttablesouthdeed
+0x14F0=Elven Loveseat (East)
+ADDITEM=elvenloveseateastdeed
+0x14F0=Elven Loveseat (South)
+ADDITEM=elvenloveseatsouthdeed
+0x14F0=Elven Wash Basin (East)
+ADDITEM=elvenwashbasineastdeed
+0x14F0=Elven Wash Basin (South)
+ADDITEM=elvenwashbasinsouthdeed
+0x14F0=Fancy Couch (East)
+ADDITEM=fancycoucheastdeed
+0x14F0=Fancy Couch (North)
+ADDITEM=fancycouchnorthdeed
+0x14F0=Fancy Couch (South)
+ADDITEM=fancycouchsouthdeed
+0x14F0=Fancy Couch (West)
+ADDITEM=fancycouchwestdeed
+0x14F0=Hardwood Table (East)
+ADDITEM=hardwoodtableeastdeed
+0x14F0=Hardwood Table (South)
+ADDITEM=hardwoodtablesouthdeed
+0x14F0=Fancy Loveseat (East)
+ADDITEM=fancyloveseateastdeed
+0x14F0=Fancy Loveseat (North)
+ADDITEM=fancyloveseatnorthdeed
+0x14F0=Fancy Loveseat (South)
+ADDITEM=fancyloveseatsouthdeed
+0x14F0=Fancy Loveseat (West)
+ADDITEM=fancyloveseatwestdeed
+0x14F0=Ornate Table (East)
+ADDITEM=ornatetableeastdeed
+0x14F0=Ornate Table (South)
+ADDITEM=ornatetablesouthdeed
+0x14F0=Plush Loveseat (East)
+ADDITEM=plushloveseateastdeed
+0x14F0=Plush Loveseat (South)
+ADDITEM=plushloveseatsouthdeed
+0x14F0=Tall Elven Bed (East)
+ADDITEM=tallelvenbedeastdeed
+0x14F0=Tall Elven Bed (South)
+ADDITEM=tallelvenbedsouthdeed
+<=Previous Menu
+ITEMMENU=4
+}
+
 [ITEMMENU 261]
 {
 minihouseaddon_deeds.dfn

diff --git a/data/dfndata/items/ItemMenu.dfn b/data/dfndata/items/ItemMenu.dfn
@@ -303,6 +303,8 @@ ITEMMENU=68
 ITEMMENU=69
 <=Houseaddon Deeds
 ITEMMENU=71
+<=Houseaddon ML Deeds
+ITEMMENU=260
 <=Mini Houseaddon Deeds
 ITEMMENU=261
 <=Misc Deeds