Skip to content
Merged
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
Binary file modified assets/database/db.bin
Binary file not shown.
8 changes: 6 additions & 2 deletions assets/database/db.json
Original file line number Diff line number Diff line change
Expand Up @@ -14931,8 +14931,12 @@
{"id":263013,"name":"Band of the Petrified Pumpkin","icon":"inv_misc_bag_28_halloween","type":11,"phase":1,"quality":4,"unique":true,"scalingOptions":{"-1":{"randPropPoints":953,"stats":{"0":501,"2":752,"6":354,"7":301},"ilvl":463},"0":{"randPropPoints":1214,"stats":{"0":639,"2":957,"6":450,"7":383},"ilvl":489}}},
{"id":263014,"name":"The Horseman's Horrific Hood","icon":"inv_helmet_21","type":1,"armorType":4,"gemSockets":[1,4],"socketBonus":[180,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"phase":1,"quality":4,"scalingOptions":{"-1":{"randPropPoints":1710,"stats":{"0":865,"2":1025,"5":366,"6":483,"17":4002},"ilvl":463},"0":{"randPropPoints":2179,"stats":{"0":1115,"2":1306,"5":479,"6":628,"17":4380},"ilvl":489}}},
{"id":263018,"name":"The Horseman's Sinister Slicer","icon":"inv_sword_07","type":13,"weaponType":9,"handType":2,"weaponSpeed":2.6,"phase":1,"quality":4,"scalingOptions":{"-1":{"randPropPoints":733,"weaponDamageMin":4434,"weaponDamageMax":8236,"stats":{"1":257,"2":723,"5":257,"8":257},"ilvl":463},"0":{"randPropPoints":934,"weaponDamageMin":5650,"weaponDamageMax":10494,"stats":{"1":311,"2":876,"5":311,"8":311},"ilvl":489}}},
{"id":268554,"name":"Miniature Winter Veil Tree","icon":"inv_knife_1h_common_b_01green","type":13,"weaponType":2,"handType":2,"weaponSpeed":1.8,"phase":1,"quality":4,"scalingOptions":{"-1":{"randPropPoints":733,"weaponDamageMin":3070,"weaponDamageMax":5702,"stats":{"1":384,"2":578,"5":257,"7":257},"ilvl":463},"0":{"randPropPoints":934,"weaponDamageMin":3911,"weaponDamageMax":7265,"stats":{"1":491,"2":737,"5":327,"7":327},"ilvl":489}}},
{"id":268556,"name":"Miniature Winter Veil Tree","icon":"inv_knife_1h_common_b_01green","type":13,"weaponType":2,"handType":2,"weaponSpeed":1.8,"phase":3,"quality":4,"scalingOptions":{"-1":{"randPropPoints":733,"weaponDamageMin":3070,"weaponDamageMax":5702,"stats":{"1":384,"2":578,"5":257,"7":257},"ilvl":463},"0":{"randPropPoints":1054,"weaponDamageMin":4415,"weaponDamageMax":8200,"stats":{"1":554,"2":831,"5":369,"7":369},"ilvl":502}}}
{"id":268556,"name":"Miniature Winter Veil Tree","icon":"inv_knife_1h_common_b_01green","type":13,"weaponType":2,"handType":2,"weaponSpeed":1.8,"phase":3,"quality":4,"scalingOptions":{"-1":{"randPropPoints":733,"weaponDamageMin":3070,"weaponDamageMax":5702,"stats":{"1":384,"2":578,"5":257,"7":257},"ilvl":463},"0":{"randPropPoints":1054,"weaponDamageMin":4415,"weaponDamageMax":8200,"stats":{"1":554,"2":831,"5":369,"7":369},"ilvl":502}}},
{"id":270884,"name":"Winking Eye of Love","icon":"inv_jewelry_necklace_27","type":2,"phase":3,"quality":4,"scalingOptions":{"-1":{"randPropPoints":953,"stats":{"2":752,"3":501,"4":326,"6":339},"ilvl":463},"0":{"randPropPoints":1370,"stats":{"2":1080,"3":721,"4":468,"6":487},"ilvl":502}}},
{"id":270886,"name":"Choker of the Pure Heart","icon":"inv_jewelry_necklace_45","type":2,"phase":3,"quality":4,"scalingOptions":{"-1":{"randPropPoints":953,"stats":{"0":501,"2":752,"5":344,"6":318},"ilvl":463},"0":{"randPropPoints":1370,"stats":{"0":721,"2":1080,"5":495,"6":457},"ilvl":502}}},
{"id":270890,"name":"Heartbreak Charm","icon":"inv_jewelry_necklace_23","type":2,"phase":3,"quality":4,"scalingOptions":{"-1":{"randPropPoints":953,"stats":{"2":752,"3":501,"6":326,"7":339},"ilvl":463},"0":{"randPropPoints":1370,"stats":{"2":1080,"3":721,"6":468,"7":487},"ilvl":502}}},
{"id":270892,"name":"Sweet Perfume Broach","icon":"inv_jewelry_necklace_30","type":2,"phase":3,"quality":4,"scalingOptions":{"-1":{"randPropPoints":953,"stats":{"1":501,"2":752,"6":301,"7":354},"ilvl":463},"0":{"randPropPoints":1370,"stats":{"1":721,"2":1080,"6":433,"7":508},"ilvl":502}}},
{"id":270894,"name":"Shard of Pirouetting Happiness","icon":"inv_jewelry_necklace_02","type":2,"phase":3,"quality":4,"scalingOptions":{"-1":{"randPropPoints":953,"stats":{"0":501,"2":752,"5":254,"9":381},"ilvl":463},"0":{"randPropPoints":1370,"stats":{"0":721,"2":1080,"5":365,"9":548},"ilvl":502}}}
],
"randomSuffixes":[
{"id":-488,"name":"of the Earthfall","stats":[0,0,0,0,0,0,3159,3159,0,0,0,0,0,0,0,0,0,0,0,0,0,0]},
Expand Down
Binary file modified assets/database/leftover_db.bin
Binary file not shown.
8 changes: 8 additions & 0 deletions tools/database/overrides.go
Original file line number Diff line number Diff line change
Expand Up @@ -756,6 +756,14 @@ var ItemDenyList = map[int32]struct{}{
88167: {}, // Band of the Petrified Pumpkin
88168: {}, // Seal of Ghoulish Glee
88169: {}, // The Horseman's Ring

// MOP - Love is in the Air - Old items
268554: {}, // Miniature Winter Veil Tree
270885: {}, // Winking Eye of Love
270889: {}, // Choker of the Pure Heart
270891: {}, // Heartbreak Charm
270893: {}, // Sweet Perfume Broach
270895: {}, // Shard of Pirouetting Happiness
}

// Item icons to include in the DB, so they don't need to be separately loaded in the UI.
Expand Down
2 changes: 1 addition & 1 deletion ui/core/components/inputs/consumables.ts
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ export function makeConsumableInput(
newConsumes.battleElixirId = 0;
}

if (options.consumesFieldName === 'battleElixirId' || options.consumesFieldName === 'guardianElixirId') {
if ((options.consumesFieldName === 'battleElixirId' || options.consumesFieldName === 'guardianElixirId') && newValue != 0) {
newConsumes.flaskId = 0;
}
player.setConsumes(eventID, newConsumes);
Expand Down