Merge pull request UOX3DevTeam#225 from DragonSlayer62/Christmas-Items

Christmas Items
DragonSlayer62 · Nov 17, 2023 · de9f082 · de9f082
2 parents 6d28898 + 23ddae5
commit de9f082
Show file tree

Hide file tree

Showing 29 changed files with 2,031 additions and 30 deletions.
diff --git a/data/dfndata/house/house.dfn b/data/dfndata/house/house.dfn
@@ -700,6 +700,45 @@ MAXTRASHCONTAINERS=1
 SCRIPT=15000
 }
 
+// Christmas tree
+[HOUSE 39]
+{
+NAME=a tree for the holidays
+ID=0x0CD6
+CHARX=0
+CHARY=0
+CHARZ=0
+HOUSE_ITEM=343
+HOUSE_ITEM=344
+HOUSE_ITEM=345
+HOUSE_ITEM=346
+HOUSE_ITEM=347
+HOUSE_ITEM=348
+HOUSE_ITEM=349
+HOUSE_ITEM=350
+HOUSE_ITEM=351
+HOUSE_ITEM=352
+HOUSE_ITEM=353
+HOUSE_ITEM=354
+HOUSE_ITEM=355
+HOUSE_ITEM=356
+HOUSE_ITEM=357
+HOUSE_ITEM=358
+HOUSE_ITEM=359
+HOUSE_ITEM=360
+HOUSE_ITEM=361
+HOUSE_ITEM=362
+HOUSE_ITEM=363
+HOUSE_ITEM=364
+HOUSE_ITEM=365
+HOUSE_ITEM=366
+HOUSE_ITEM=367
+HOUSE_ITEM=368
+HOUSE_ITEM=369
+HOUSE_ITEM=370
+HOUSE_ITEM=371
+}
+
 // House Addon - brown bear rug (east)
 [HOUSE 40]
 {
@@ -2279,6 +2318,230 @@ Y=-5
 Z=29
 }
 
+[HOUSE ITEM 344]
+{ christmas tree ornament
+ITEM=treeornament1
+X=0
+Y=1
+Z=12
+}
+
+[HOUSE ITEM 345]
+{ christmas tree ornament
+ITEM=treeornament4
+X=0
+Y=1
+Z=13
+}
+
+[HOUSE ITEM 346]
+{ christmas tree ornament
+ITEM=treeornament3
+X=0
+Y=1
+Z=18
+}
+
+[HOUSE ITEM 347]
+{ christmas tree ornament
+ITEM=treeornament6
+X=0
+Y=1
+Z=19
+}
+
+[HOUSE ITEM 348]
+{ christmas tree ornament
+ITEM=treeornament27
+X=0
+Y=1
+Z=25
+}
+
+[HOUSE ITEM 349]
+{ christmas tree ornament
+ITEM=treeornament24
+X=0
+Y=1
+Z=29
+}
+
+[HOUSE ITEM 350]
+{ christmas tree ornament
+ITEM=treeornament25
+X=0
+Y=1
+Z=37
+}
+
+[HOUSE ITEM 351]
+{ christmas tree ornament
+ITEM=treeornament2
+X=1
+Y=0
+Z=13
+}
+
+[HOUSE ITEM 352]
+{ christmas tree ornament
+ITEM=treeornament21
+X=1
+Y=0
+Z=14
+}
+
+[HOUSE ITEM 353]
+{ christmas tree ornament
+ITEM=treeornament5
+X=1
+Y=0
+Z=16
+}
+
+[HOUSE ITEM 354]
+{ christmas tree ornament
+ITEM=treeornament15
+X=1
+Y=0
+Z=17
+}
+
+[HOUSE ITEM 355]
+{ christmas tree ornament
+ITEM=treeornament16
+X=1
+Y=0
+Z=22
+}
+
+[HOUSE ITEM 356]
+{ christmas tree ornament
+ITEM=treeornament22
+X=0
+Y=1
+Z=7
+}
+
+[HOUSE ITEM 357]
+{ christmas tree ornament
+ITEM=treeornament7
+X=0
+Y=1
+Z=7
+}
+
+[HOUSE ITEM 358]
+{ christmas tree ornament
+ITEM=treeornament17
+X=0
+Y=0
+Z=34
+}
+
+[HOUSE ITEM 359]
+{ christmas tree ornament
+ITEM=treeornament18
+X=0
+Y=0
+Z=33
+}
+
+[HOUSE ITEM 360]
+{ christmas tree ornament
+ITEM=treeornament24
+X=0
+Y=0
+Z=32
+}
+
+[HOUSE ITEM 361]
+{ christmas tree ornament
+ITEM=treeornament13
+X=0
+Y=0
+Z=30
+}
+
+[HOUSE ITEM 362]
+{ christmas tree ornament
+ITEM=treeornament26
+X=0
+Y=0
+Z=28
+}
+
+[HOUSE ITEM 363]
+{ christmas tree ornament
+ITEM=treeornament20
+X=0
+Y=0
+Z=21
+}
+
+[HOUSE ITEM 364]
+{ christmas tree ornament
+ITEM=treeornament10
+X=0
+Y=0
+Z=20
+}
+
+[HOUSE ITEM 365]
+{ christmas tree ornament
+ITEM=treeornament23
+X=0
+Y=0
+Z=20
+}
+
+[HOUSE ITEM 366]
+{ christmas tree ornament
+ITEM=treeornament14
+X=0
+Y=0
+Z=20
+}
+
+[HOUSE ITEM 367]
+{ christmas tree ornament
+ITEM=treeornament8
+X=0
+Y=0
+Z=19
+}
+
+[HOUSE ITEM 368]
+{ christmas tree ornament
+ITEM=treeornament11
+X=0
+Y=0
+Z=15
+}
+
+[HOUSE ITEM 369]
+{ christmas tree ornament
+ITEM=treeornament9
+X=0
+Y=0
+Z=9
+}
+
+[HOUSE ITEM 370]
+{ christmas tree ornament
+ITEM=treeornament12
+X=0
+Y=0
+Z=2
+}
+
+[HOUSE ITEM 371]
+{ christmas tree needles
+ITEM=treeneedles
+X=0
+Y=0
+Z=0
+}
+
 [HOUSE ITEM 386]
 { brown bear rug east 1/9
 ITEM=brownbearrug9