Skip to content

Commit

Permalink
Merge branch 'master' into feature/mage-p3
Browse files Browse the repository at this point in the history
  • Loading branch information
@1337LutZ
1337LutZ committed Sep 24, 2024
2 parents c6b4a00 + 9102be2 commit a2296ea
Show file tree
Hide file tree
Showing 269 changed files with 32,918 additions and 14,015 deletions.
Binary file modified assets/database/db.bin
View file
Binary file not shown.
1,118 changes: 561 additions & 557 deletions assets/database/db.json
View file

Large diffs are not rendered by default.

Binary file modified assets/database/leftover_db.bin
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion assets/database/leftover_db.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28484,7 +28484,7 @@
{"id":211817,"name":"Ring of Ghoulish Glee","icon":"inv_misc_bag_28_halloween","type":11,"stats":[0,45,68,0,0,39,48,0,0,0,0,0,134,134,0,0,0,0,0,0,0,0,0,0,0,0,0],"socketBonus":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"ilvl":232,"quality":4,"unique":true,"expansion":1,"sources":[{"drop":{"difficulty":1,"npcId":23682,"zoneId":796}}],"factionRestriction":2},
{"id":211844,"name":"The Horseman's Seal","icon":"inv_misc_bag_28_halloween","type":11,"stats":[0,0,50,51,0,39,0,48,0,0,0,0,0,0,78,0,0,0,0,0,0,0,0,0,0,0,0],"socketBonus":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"ilvl":232,"quality":4,"unique":true,"expansion":1,"sources":[{"drop":{"difficulty":1,"npcId":23682,"zoneId":796}}]},
{"id":211847,"name":"Wicked Witch's Band","icon":"inv_misc_bag_28_halloween","type":11,"stats":[0,0,50,51,0,0,45,0,0,0,0,0,0,0,78,0,0,0,0,0,0,0,0,0,0,0,0],"socketBonus":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"ilvl":232,"quality":4,"unique":true,"expansion":1,"sources":[{"drop":{"difficulty":1,"npcId":23682,"zoneId":796}}]},
{"id":211850,"name":"The Horseman's Horrific Helm","icon":"inv_helmet_21","type":1,"armorType":4,"stats":[120,0,137,0,0,50,63,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1925,0,0,0,0],"gemSockets":[1,4],"socketBonus":[8,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"ilvl":232,"quality":4,"expansion":1,"sources":[{"drop":{"difficulty":1,"npcId":23682,"zoneId":796}}]},
{"id":211850,"name":"The Horseman's Horrific Helm","icon":"inv_helmet_21","type":1,"armorType":4,"stats":[120,0,137,0,0,50,63,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1948,0,0,0,0],"gemSockets":[1,4],"socketBonus":[8,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"ilvl":232,"quality":4,"expansion":1,"sources":[{"drop":{"difficulty":1,"npcId":23682,"zoneId":796}}]},
{"id":211851,"name":"The Horseman's Baleful Blade","icon":"inv_sword_07","type":13,"weaponType":9,"handType":1,"stats":[0,35,52,0,0,34,0,0,34,0,0,0,102,102,0,0,0,0,0,0,0,0,0,0,0,0,0],"socketBonus":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"weaponDamageMin":338,"weaponDamageMax":628,"weaponSpeed":2.7,"ilvl":232,"quality":4,"unique":true,"sources":[{"drop":{"difficulty":1,"npcId":23682,"zoneId":796}}]},
{"id":224375,"name":"Twilight's Hammer Regalia Belt","icon":"inv_belt_armor_twilightcultist_b_01","type":8,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,77,0,0,0,0],"socketBonus":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"ilvl":1,"quality":4},
{"id":224376,"name":"Twilight's Hammer Regalia Boots","icon":"inv_boot_armor_twilightcultist_b_01","type":10,"stats":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,94,0,0,0,0],"socketBonus":[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],"ilvl":1,"quality":4},
Expand Down
20 changes: 20 additions & 0 deletions assets/db_inputs/atlasloot_db.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11258,6 +11258,7 @@
{"id":55849,"sources":[{"drop":{"difficulty":1,"zoneId":5035,"otherName":"Asaad, Caliph of Zephyrs"}}]},
{"id":55850,"sources":[{"drop":{"difficulty":1,"zoneId":5035,"otherName":"Asaad, Caliph of Zephyrs"}}]},
{"id":55851,"sources":[{"drop":{"difficulty":1,"zoneId":5035,"otherName":"Asaad, Caliph of Zephyrs"}}]},
{"id":55852,"sources":[{"drop":{"difficulty":1,"zoneId":5035,"otherName":"Asaad, Caliph of Zephyrs"}}]},
{"id":55853,"sources":[{"drop":{"difficulty":1,"zoneId":5035,"otherName":"Asaad, Caliph of Zephyrs"}}]},
{"id":55854,"sources":[{"drop":{"difficulty":1,"zoneId":5035,"otherName":"Trash Mobs"}}]},
{"id":55855,"sources":[{"drop":{"difficulty":1,"zoneId":5035,"otherName":"Trash Mobs"}}]},
Expand Down Expand Up @@ -11446,6 +11447,7 @@
{"id":56369,"sources":[{"drop":{"difficulty":2,"zoneId":5035,"otherName":"Asaad, Caliph of Zephyrs"}}]},
{"id":56370,"sources":[{"drop":{"difficulty":2,"zoneId":5035,"otherName":"Asaad, Caliph of Zephyrs"}}]},
{"id":56371,"sources":[{"drop":{"difficulty":2,"zoneId":5035,"otherName":"Asaad, Caliph of Zephyrs"}}]},
{"id":56372,"sources":[{"drop":{"difficulty":2,"zoneId":5035,"otherName":"Asaad, Caliph of Zephyrs"}}]},
{"id":56373,"sources":[{"drop":{"difficulty":2,"zoneId":5035,"otherName":"Asaad, Caliph of Zephyrs"}}]},
{"id":56374,"sources":[{"drop":{"difficulty":2,"zoneId":5035,"otherName":"Asaad, Caliph of Zephyrs"}}]},
{"id":56375,"sources":[{"drop":{"difficulty":2,"zoneId":5035,"otherName":"Asaad, Caliph of Zephyrs"}}]},
Expand Down Expand Up @@ -12531,6 +12533,24 @@
{"id":72014,"sources":[{"drop":{"difficulty":5,"zoneId":5892,"otherName":"Patterns"}}]},
{"id":72015,"sources":[{"drop":{"difficulty":5,"zoneId":5892,"otherName":"Patterns"}}]},
{"id":72016,"sources":[{"drop":{"difficulty":5,"zoneId":5892,"otherName":"Patterns"}}]},
{"id":72798,"sources":[{"drop":{"difficulty":2,"zoneId":5789,"otherName":"Echo of Baine","category":"Shared"}},{"drop":{"difficulty":2,"zoneId":5789,"otherName":"Echo of Jaina","category":"Shared"}},{"drop":{"difficulty":2,"zoneId":5789,"otherName":"Echo of Tyrande","category":"Shared"}},{"drop":{"difficulty":2,"zoneId":5789,"otherName":"Echo of Sylvanas","category":"Shared"}}]},
{"id":72799,"sources":[{"drop":{"difficulty":2,"zoneId":5789,"otherName":"Echo of Baine","category":"Shared"}},{"drop":{"difficulty":2,"zoneId":5789,"otherName":"Echo of Jaina","category":"Shared"}},{"drop":{"difficulty":2,"zoneId":5789,"otherName":"Echo of Tyrande","category":"Shared"}},{"drop":{"difficulty":2,"zoneId":5789,"otherName":"Echo of Sylvanas","category":"Shared"}}]},
{"id":72800,"sources":[{"drop":{"difficulty":2,"zoneId":5789,"otherName":"Echo of Baine","category":"Shared"}},{"drop":{"difficulty":2,"zoneId":5789,"otherName":"Echo of Jaina","category":"Shared"}},{"drop":{"difficulty":2,"zoneId":5789,"otherName":"Echo of Tyrande","category":"Shared"}},{"drop":{"difficulty":2,"zoneId":5789,"otherName":"Echo of Sylvanas","category":"Shared"}}]},
{"id":72801,"sources":[{"drop":{"difficulty":2,"zoneId":5789,"otherName":"Echo of Baine","category":"Shared"}},{"drop":{"difficulty":2,"zoneId":5789,"otherName":"Echo of Jaina","category":"Shared"}},{"drop":{"difficulty":2,"zoneId":5789,"otherName":"Echo of Tyrande","category":"Shared"}},{"drop":{"difficulty":2,"zoneId":5789,"otherName":"Echo of Sylvanas","category":"Shared"}}]},
{"id":72802,"sources":[{"drop":{"difficulty":2,"zoneId":5789,"otherName":"Echo of Baine","category":"Shared"}},{"drop":{"difficulty":2,"zoneId":5789,"otherName":"Echo of Jaina","category":"Shared"}},{"drop":{"difficulty":2,"zoneId":5789,"otherName":"Echo of Tyrande","category":"Shared"}},{"drop":{"difficulty":2,"zoneId":5789,"otherName":"Echo of Sylvanas","category":"Shared"}}]},
{"id":72803,"sources":[{"drop":{"difficulty":2,"zoneId":5789,"otherName":"Echo of Baine","category":"Shared"}},{"drop":{"difficulty":2,"zoneId":5789,"otherName":"Echo of Jaina","category":"Shared"}},{"drop":{"difficulty":2,"zoneId":5789,"otherName":"Echo of Tyrande","category":"Shared"}},{"drop":{"difficulty":2,"zoneId":5789,"otherName":"Echo of Sylvanas","category":"Shared"}}]},
{"id":72804,"sources":[{"drop":{"difficulty":2,"zoneId":5789,"otherName":"Echo of Baine","category":"Shared"}},{"drop":{"difficulty":2,"zoneId":5789,"otherName":"Echo of Jaina","category":"Shared"}},{"drop":{"difficulty":2,"zoneId":5789,"otherName":"Echo of Tyrande","category":"Shared"}},{"drop":{"difficulty":2,"zoneId":5789,"otherName":"Echo of Sylvanas","category":"Shared"}}]},
{"id":72805,"sources":[{"drop":{"difficulty":2,"zoneId":5789,"otherName":"Echo of Baine","category":"Shared"}},{"drop":{"difficulty":2,"zoneId":5789,"otherName":"Echo of Jaina","category":"Shared"}},{"drop":{"difficulty":2,"zoneId":5789,"otherName":"Echo of Tyrande","category":"Shared"}},{"drop":{"difficulty":2,"zoneId":5789,"otherName":"Echo of Sylvanas","category":"Shared"}}]},
{"id":72806,"sources":[{"drop":{"difficulty":2,"zoneId":5789,"otherName":"Echo of Baine","category":"Shared"}},{"drop":{"difficulty":2,"zoneId":5789,"otherName":"Echo of Jaina","category":"Shared"}},{"drop":{"difficulty":2,"zoneId":5789,"otherName":"Echo of Tyrande","category":"Shared"}},{"drop":{"difficulty":2,"zoneId":5789,"otherName":"Echo of Sylvanas","category":"Shared"}}]},
{"id":72807,"sources":[{"drop":{"difficulty":2,"zoneId":5789,"otherName":"Echo of Baine","category":"Shared"}},{"drop":{"difficulty":2,"zoneId":5789,"otherName":"Echo of Jaina","category":"Shared"}},{"drop":{"difficulty":2,"zoneId":5789,"otherName":"Echo of Tyrande","category":"Shared"}},{"drop":{"difficulty":2,"zoneId":5789,"otherName":"Echo of Sylvanas","category":"Shared"}}]},
{"id":72808,"sources":[{"drop":{"difficulty":2,"zoneId":5789,"otherName":"Echo of Baine","category":"Echo of Jaina"}},{"drop":{"difficulty":2,"zoneId":5789,"otherName":"Echo of Jaina","category":"Echo of Jaina"}},{"drop":{"difficulty":2,"zoneId":5789,"otherName":"Echo of Tyrande","category":"Echo of Jaina"}},{"drop":{"difficulty":2,"zoneId":5789,"otherName":"Echo of Sylvanas","category":"Echo of Jaina"}}]},
{"id":72809,"sources":[{"drop":{"difficulty":2,"zoneId":5789,"otherName":"Echo of Baine","category":"Echo of Jaina"}},{"drop":{"difficulty":2,"zoneId":5789,"otherName":"Echo of Jaina","category":"Echo of Jaina"}},{"drop":{"difficulty":2,"zoneId":5789,"otherName":"Echo of Tyrande","category":"Echo of Jaina"}},{"drop":{"difficulty":2,"zoneId":5789,"otherName":"Echo of Sylvanas","category":"Echo of Jaina"}}]},
{"id":72810,"sources":[{"drop":{"difficulty":2,"zoneId":5789,"otherName":"Echo of Baine","category":"Echo of Sylvanas"}},{"drop":{"difficulty":2,"zoneId":5789,"otherName":"Echo of Jaina","category":"Echo of Sylvanas"}},{"drop":{"difficulty":2,"zoneId":5789,"otherName":"Echo of Tyrande","category":"Echo of Sylvanas"}},{"drop":{"difficulty":2,"zoneId":5789,"otherName":"Echo of Sylvanas","category":"Echo of Sylvanas"}}]},
{"id":72811,"sources":[{"drop":{"difficulty":2,"zoneId":5789,"otherName":"Echo of Baine","category":"Echo of Sylvanas"}},{"drop":{"difficulty":2,"zoneId":5789,"otherName":"Echo of Jaina","category":"Echo of Sylvanas"}},{"drop":{"difficulty":2,"zoneId":5789,"otherName":"Echo of Tyrande","category":"Echo of Sylvanas"}},{"drop":{"difficulty":2,"zoneId":5789,"otherName":"Echo of Sylvanas","category":"Echo of Sylvanas"}}]},
{"id":72812,"sources":[{"drop":{"difficulty":2,"zoneId":5789,"otherName":"Echo of Baine","category":"Echo of Tyrande"}},{"drop":{"difficulty":2,"zoneId":5789,"otherName":"Echo of Jaina","category":"Echo of Tyrande"}},{"drop":{"difficulty":2,"zoneId":5789,"otherName":"Echo of Tyrande","category":"Echo of Tyrande"}},{"drop":{"difficulty":2,"zoneId":5789,"otherName":"Echo of Sylvanas","category":"Echo of Tyrande"}}]},
{"id":72813,"sources":[{"drop":{"difficulty":2,"zoneId":5789,"otherName":"Echo of Baine","category":"Echo of Tyrande"}},{"drop":{"difficulty":2,"zoneId":5789,"otherName":"Echo of Jaina","category":"Echo of Tyrande"}},{"drop":{"difficulty":2,"zoneId":5789,"otherName":"Echo of Tyrande","category":"Echo of Tyrande"}},{"drop":{"difficulty":2,"zoneId":5789,"otherName":"Echo of Sylvanas","category":"Echo of Tyrande"}}]},
{"id":72814,"sources":[{"drop":{"difficulty":2,"zoneId":5789,"otherName":"Echo of Baine","category":"Echo of Baine"}},{"drop":{"difficulty":2,"zoneId":5789,"otherName":"Echo of Jaina","category":"Echo of Baine"}},{"drop":{"difficulty":2,"zoneId":5789,"otherName":"Echo of Tyrande","category":"Echo of Baine"}},{"drop":{"difficulty":2,"zoneId":5789,"otherName":"Echo of Sylvanas","category":"Echo of Baine"}}]},
{"id":72815,"sources":[{"drop":{"difficulty":2,"zoneId":5789,"otherName":"Echo of Baine","category":"Echo of Baine"}},{"drop":{"difficulty":2,"zoneId":5789,"otherName":"Echo of Jaina","category":"Echo of Baine"}},{"drop":{"difficulty":2,"zoneId":5789,"otherName":"Echo of Tyrande","category":"Echo of Baine"}},{"drop":{"difficulty":2,"zoneId":5789,"otherName":"Echo of Sylvanas","category":"Echo of Baine"}}]},
{"id":72816,"sources":[{"drop":{"difficulty":2,"zoneId":5789,"otherName":"Murozond"}}]},
{"id":72817,"sources":[{"drop":{"difficulty":2,"zoneId":5789,"otherName":"Murozond"}}]},
{"id":72818,"sources":[{"drop":{"difficulty":2,"zoneId":5789,"otherName":"Murozond"}}]},
Expand Down
Loading

0 comments on commit a2296ea

Please sign in to comment.