Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions data/dfndata/house/house_addons_ml.dfn
Original file line number Diff line number Diff line change
Expand Up @@ -346,6 +346,19 @@ HOUSE_ITEM=1058
HOUSE_ITEM=1059
}

// House Addon - Jolly Holiday Tree
[HOUSE 360]
{
ID=0x14F0
SPACEX=1
SPACEY=1
CHARX=0
CHARY=0
CHARZ=0
HOUSE_DEED=jollyholidaytreedeed
HOUSE_ITEM=1090
}

[HOUSE ITEM 1000]
{ alchemist table part 1 (east)
ITEM=0x3077
Expand Down Expand Up @@ -825,4 +838,12 @@ ITEM=0x3056
X=0
Y=1
Z=0
}

[HOUSE ITEM 1090]
{ jolly holiday tree
ITEM=0xA4D0
X=0
Y=0
Z=0
}
2 changes: 2 additions & 0 deletions data/dfndata/items/ItemMenu.bulk.dfn
Original file line number Diff line number Diff line change
Expand Up @@ -10577,6 +10577,8 @@ ADDITEM=0x2788
ADDITEM=0x2789
0x278d=platemail haidate
ADDITEM=0x278d
0xa3ea=jack o lantern helm
ADDITEM=0xa3ea
<=Previous Menu
ITEMMENU=92
}
Expand Down
13 changes: 13 additions & 0 deletions data/dfndata/items/gear/armor/base_armor.dfn
Original file line number Diff line number Diff line change
Expand Up @@ -2142,4 +2142,17 @@ get=base_shield
name=gargish wooden shield
id=0x4200
origin=sa
}

// jack o lantern helm - Base item with shared DFN tags
[base_jackolantern_helm]
{
get=base_item
name=jack o lantern helm
id=0xa3ea
decay=1
good=15
layer=0x06
restock=15
dir=1
}
12 changes: 12 additions & 0 deletions data/dfndata/items/gear/armor/base_armor_aos.dfn
Original file line number Diff line number Diff line change
Expand Up @@ -1999,3 +1999,15 @@ str=20
value=54 27
weight=600
}

// jack o' lantern helm - AoS stats
[0xa3ea_aos]
{
get=base_jackolantern_helm
def=12
elementresist=14 4 10 8
hp=255 255
str=10
value=250 125
weight=300
}
11 changes: 11 additions & 0 deletions data/dfndata/items/gear/armor/base_armor_lbr.dfn
Original file line number Diff line number Diff line change
Expand Up @@ -1911,3 +1911,14 @@ str=5
value=62 31
weight=500
}

// jack o' lantern helm - LBR stats (default)
[0xa3ea_lbr]
{
get=base_jackolantern_helm
def=6
hp=46 58
str=5
value=250 125
weight=300
}
23 changes: 23 additions & 0 deletions data/dfndata/items/gear/armor/metal_armor/iron_armor.dfn
Original file line number Diff line number Diff line change
Expand Up @@ -1509,4 +1509,27 @@ sectionid=0x2b70
[gemmedcirclet]
{
get=0x2b70
}

// jack o lantern helm
[0xa3ea]
{
getuo=0xa3ea_lbr
gett2a=0xa3ea_lbr
getuor=0xa3ea_lbr
gettd=0xa3ea_lbr
getlbr=0xa3ea_lbr
getaos=0xa3ea_aos
getse=0xa3ea_aos
getml=0xa3ea_aos
getsa=0xa3ea_aos
geths=0xa3ea_aos
gettol=0xa3ea_aos
sectionid=0xa3ea
}

// jack o lantern helm - Alias
[jackolantern_helm]
{
get=0xa3ea
}
114 changes: 114 additions & 0 deletions data/dfndata/items/misc/christmas.dfn
Original file line number Diff line number Diff line change
Expand Up @@ -225,6 +225,42 @@ id=0x232C
get=0x232D 0x232C
}

[wreathdeed2]
{
get=base_item
name=a holiday wreath deed
id=0x14F0
script=5608
decay=1
custominttag=addondeed 2
}

[0xA12E]
{
get=base_item
name=a wreath
id=0xA12E
movable=1
dyeable=1
decay=1
weight=100
newbie
script=5609
custominttag=HolidayAddon 2
}

[0xA12F]
{
get=0xA12E
id=0xA12F
}

[wreathaddon2]
{
get=0xA12E 0xA12F
sectionID=wreathaddon2
}

[0x2328]
{
get=base_item
Expand Down Expand Up @@ -877,4 +913,82 @@ id=0xB1CA
{//small
get=0xB1C9
id=0xB1CB
}

[0xA130]
{
get=base_item
name=Candlelit Holiday Sign
id=0xA130
restock=10
movable=1
decay=1
good=7
weight=1000
script=5610
}

[0xA134]
{
get=0xA130
id=0xA134
}

[candlelitholidaysign]
{
get=0xA130
id=0xA130 0xA134
}

[0xA4B2]
{
get=base_item
name=Dove Cage
id=0xA4B2
restock=10
movable=1
decay=1
good=7
dyeable=1
weight=1000
script=5611
}

[0xA4B1]
{
get=0xA4B2
id=0xA4B1
}

[dovecage]
{
get=0xA4B2
id=0xA4B2 0xA4B1
}

[jollyholidaytreedeed]
{
name=Jolly Holiday Tree Deed
id=0x14F0
morex=360
decay=1
}

[0xA4D0]
{
get=base_item
name=Jolly Holiday Tree
id=0xA4D0
restock=10
movable=2
decay=0
dyeable=1
good=7
script=5612
}

[jollyholidaytree]
{
get=0xA4D0
id=0xA4D0
}
118 changes: 118 additions & 0 deletions data/dfndata/items/misc/halloween.dfn
Original file line number Diff line number Diff line change
Expand Up @@ -858,4 +858,122 @@ id=0x1F14
type=61
spawnobjlist=151
amount=1
}

//2025 halloween
[pumpkinwartyraw]
{
get=base_item
name=pumpkin warty raw
id=0xB255
weight=1800
decay=1
origin=hs
VALUE=5000 2500
RESTOCK=10
sectionid=pumpkinwartyraw
}

[pumpkinwartyserpent]
{
get=base_item
name=serpent
id=0xb258
weight=1600
decay=1
origin=hs
VALUE=5000 2500
RESTOCK=10
sectionid=pumpkinwartyserpent
}

[pumpkinwartyraven]
{
get=base_item
name=raven
id=0xb25c
weight=1600
decay=1
origin=hs
VALUE=5000 2500
RESTOCK=10
sectionid=pumpkinwartyraven
}

[pumpkinwhiteraw]
{
get=base_item
name=pumpkin white raw
id=0xb256
weight=1800
decay=1
origin=hs
VALUE=5000 2500
RESTOCK=10
sectionid=pumpkinwhiteraw
}

[pumpkinwhitevoidcat]
{
get=base_item
name=void cat
id=0xb260
weight=1600
decay=1
origin=hs
VALUE=5000 2500
RESTOCK=10
sectionid=pumpkinwhitevoidcat
}

[pumpkinwhitetsillyface]
{
get=base_item
name=silly face
id=0xb264
weight=1600
decay=1
origin=hs
VALUE=5000 2500
RESTOCK=10
sectionid=pumpkinwhitetsillyface
}

[pumpkinstripedraw]
{
get=base_item
name=pumpkin striped raw
id=0xb257
weight=1800
decay=1
origin=hs
VALUE=5000 2500
RESTOCK=10
sectionid=pumpkinstripedraw
}

[pumpkinstrippedvictor]
{
get=base_item
name=victor blackthorn insignia
id=0xb268
weight=1600
decay=1
origin=hs
VALUE=5000 2500
RESTOCK=10
sectionid=pumpkinstrippedvictor
}

[pumpkinstrippedhappyface]
{
get=base_item
name=happy face
id=0xb26C
weight=1600
decay=1
origin=hs
VALUE=5000 2500
RESTOCK=10
sectionid=pumpkinstrippedhappyface
}
Loading