Merge branch 'dev'

This commit is contained in:
hppeng 2021-12-18 11:57:14 -08:00
commit ce65a9cc6d
3 changed files with 54 additions and 1 deletions

View file

@ -24618,6 +24618,7 @@
}, },
{ {
"name": "Gale's Force", "name": "Gale's Force",
"set": "Air Hive",
"tier": "Legendary", "tier": "Legendary",
"type": "bow", "type": "bow",
"category": "weapon", "category": "weapon",
@ -26054,6 +26055,7 @@
"tier": "Legendary", "tier": "Legendary",
"type": "leggings", "type": "leggings",
"quest": "The Qira Hive", "quest": "The Qira Hive",
"set": "Master Hive",
"category": "armor", "category": "armor",
"slots": 2, "slots": 2,
"drop": "never", "drop": "never",
@ -26083,6 +26085,7 @@
}, },
{ {
"name": "Ambertoise Shell", "name": "Ambertoise Shell",
"set": "Earth Hive",
"tier": "Rare", "tier": "Rare",
"type": "helmet", "type": "helmet",
"category": "armor", "category": "armor",
@ -26115,6 +26118,7 @@
"tier": "Legendary", "tier": "Legendary",
"type": "chestplate", "type": "chestplate",
"quest": "The Qira Hive", "quest": "The Qira Hive",
"set": "Master Hive",
"category": "armor", "category": "armor",
"slots": 2, "slots": 2,
"drop": "never", "drop": "never",
@ -26144,6 +26148,7 @@
}, },
{ {
"name": "Beetle Aegis", "name": "Beetle Aegis",
"set": "Earth Hive",
"tier": "Rare", "tier": "Rare",
"type": "chestplate", "type": "chestplate",
"category": "armor", "category": "armor",
@ -26172,6 +26177,7 @@
}, },
{ {
"name": "Bottled Thunderstorm", "name": "Bottled Thunderstorm",
"set": "Thunder Hive",
"tier": "Rare", "tier": "Rare",
"category": "accessory", "category": "accessory",
"drop": "never", "drop": "never",
@ -26193,6 +26199,7 @@
"tier": "Legendary", "tier": "Legendary",
"type": "helmet", "type": "helmet",
"quest": "The Qira Hive", "quest": "The Qira Hive",
"set": "Master Hive",
"category": "armor", "category": "armor",
"slots": 2, "slots": 2,
"drop": "never", "drop": "never",
@ -26222,6 +26229,7 @@
}, },
{ {
"name": "Breezehands", "name": "Breezehands",
"set": "Air Hive",
"tier": "Rare", "tier": "Rare",
"category": "accessory", "category": "accessory",
"drop": "never", "drop": "never",
@ -26240,6 +26248,7 @@
"tier": "Legendary", "tier": "Legendary",
"type": "leggings", "type": "leggings",
"quest": "The Qira Hive", "quest": "The Qira Hive",
"set": "Master Hive",
"poison": 2250, "poison": 2250,
"category": "armor", "category": "armor",
"slots": 2, "slots": 2,
@ -26294,6 +26303,7 @@
}, },
{ {
"name": "Cinderchain", "name": "Cinderchain",
"set": "Fire Hive",
"tier": "Rare", "tier": "Rare",
"type": "leggings", "type": "leggings",
"category": "armor", "category": "armor",
@ -26323,6 +26333,7 @@
}, },
{ {
"name": "Clockwork", "name": "Clockwork",
"set": "Fire Hive",
"tier": "Rare", "tier": "Rare",
"thorns": 20, "thorns": 20,
"category": "accessory", "category": "accessory",
@ -26344,6 +26355,7 @@
}, },
{ {
"name": "Coral Ring", "name": "Coral Ring",
"set": "Water Hive",
"tier": "Rare", "tier": "Rare",
"poison": -365, "poison": -365,
"category": "accessory", "category": "accessory",
@ -26363,6 +26375,7 @@
"name": "Contrast", "name": "Contrast",
"tier": "Legendary", "tier": "Legendary",
"quest": "The Qira Hive", "quest": "The Qira Hive",
"set": "Master Hive",
"poison": 750, "poison": 750,
"category": "accessory", "category": "accessory",
"drop": "never", "drop": "never",
@ -26379,6 +26392,7 @@
}, },
{ {
"name": "Dupliblaze", "name": "Dupliblaze",
"set": "Fire Hive",
"tier": "Rare", "tier": "Rare",
"category": "accessory", "category": "accessory",
"drop": "never", "drop": "never",
@ -26402,6 +26416,7 @@
"tier": "Legendary", "tier": "Legendary",
"type": "leggings", "type": "leggings",
"quest": "The Qira Hive", "quest": "The Qira Hive",
"set": "Master Hive",
"category": "armor", "category": "armor",
"slots": 2, "slots": 2,
"drop": "never", "drop": "never",
@ -26431,6 +26446,7 @@
}, },
{ {
"name": "Elder Oak Roots", "name": "Elder Oak Roots",
"set": "Earth Hive",
"tier": "Rare", "tier": "Rare",
"type": "leggings", "type": "leggings",
"category": "armor", "category": "armor",
@ -26459,6 +26475,7 @@
"tier": "Legendary", "tier": "Legendary",
"type": "chestplate", "type": "chestplate",
"quest": "The Qira Hive", "quest": "The Qira Hive",
"set": "Master Hive",
"category": "armor", "category": "armor",
"slots": 2, "slots": 2,
"drop": "never", "drop": "never",
@ -26488,6 +26505,7 @@
}, },
{ {
"name": "Flashstep", "name": "Flashstep",
"set": "Air Hive",
"tier": "Rare", "tier": "Rare",
"type": "boots", "type": "boots",
"category": "armor", "category": "armor",
@ -26510,6 +26528,7 @@
"tier": "Legendary", "tier": "Legendary",
"type": "boots", "type": "boots",
"quest": "The Qira Hive", "quest": "The Qira Hive",
"set": "Master Hive",
"category": "armor", "category": "armor",
"slots": 2, "slots": 2,
"drop": "never", "drop": "never",
@ -26539,6 +26558,7 @@
}, },
{ {
"name": "Golemlus Core", "name": "Golemlus Core",
"set": "Earth Hive",
"tier": "Rare", "tier": "Rare",
"category": "accessory", "category": "accessory",
"drop": "never", "drop": "never",
@ -26589,6 +26609,7 @@
"tier": "Legendary", "tier": "Legendary",
"type": "boots", "type": "boots",
"quest": "The Qira Hive", "quest": "The Qira Hive",
"set": "Master Hive",
"category": "armor", "category": "armor",
"slots": 2, "slots": 2,
"drop": "never", "drop": "never",
@ -26618,6 +26639,7 @@
}, },
{ {
"name": "Humbark Moccasins", "name": "Humbark Moccasins",
"set": "Earth Hive",
"tier": "Rare", "tier": "Rare",
"type": "boots", "type": "boots",
"category": "armor", "category": "armor",
@ -26645,6 +26667,7 @@
"tier": "Legendary", "tier": "Legendary",
"type": "dagger", "type": "dagger",
"quest": "The Qira Hive", "quest": "The Qira Hive",
"set": "Master Hive",
"category": "weapon", "category": "weapon",
"slots": 5, "slots": 5,
"drop": "never", "drop": "never",
@ -26672,6 +26695,7 @@
"tier": "Legendary", "tier": "Legendary",
"type": "bow", "type": "bow",
"quest": "The Qira Hive", "quest": "The Qira Hive",
"set": "Master Hive",
"category": "weapon", "category": "weapon",
"slots": 5, "slots": 5,
"drop": "never", "drop": "never",
@ -26699,6 +26723,7 @@
"tier": "Legendary", "tier": "Legendary",
"type": "relik", "type": "relik",
"quest": "The Qira Hive", "quest": "The Qira Hive",
"set": "Master Hive",
"category": "weapon", "category": "weapon",
"slots": 5, "slots": 5,
"drop": "never", "drop": "never",
@ -26723,6 +26748,7 @@
}, },
{ {
"name": "Insulated Plate Mail", "name": "Insulated Plate Mail",
"set": "Thunder Hive",
"tier": "Rare", "tier": "Rare",
"type": "chestplate", "type": "chestplate",
"category": "armor", "category": "armor",
@ -26756,6 +26782,7 @@
"tier": "Legendary", "tier": "Legendary",
"type": "spear", "type": "spear",
"quest": "The Qira Hive", "quest": "The Qira Hive",
"set": "Master Hive",
"category": "weapon", "category": "weapon",
"slots": 5, "slots": 5,
"drop": "never", "drop": "never",
@ -26783,6 +26810,7 @@
"tier": "Legendary", "tier": "Legendary",
"type": "wand", "type": "wand",
"quest": "The Qira Hive", "quest": "The Qira Hive",
"set": "Master Hive",
"category": "weapon", "category": "weapon",
"slots": 5, "slots": 5,
"drop": "never", "drop": "never",
@ -26807,6 +26835,7 @@
}, },
{ {
"name": "Lightning Flash", "name": "Lightning Flash",
"set": "Thunder Hive",
"tier": "Rare", "tier": "Rare",
"category": "accessory", "category": "accessory",
"drop": "never", "drop": "never",
@ -26825,6 +26854,7 @@
"name": "Intensity", "name": "Intensity",
"tier": "Legendary", "tier": "Legendary",
"quest": "The Qira Hive", "quest": "The Qira Hive",
"set": "Master Hive",
"category": "accessory", "category": "accessory",
"drop": "never", "drop": "never",
"restrict": "Untradable", "restrict": "Untradable",
@ -26842,6 +26872,7 @@
}, },
{ {
"name": "Mantlewalkers", "name": "Mantlewalkers",
"set": "Fire Hive",
"tier": "Rare", "tier": "Rare",
"type": "boots", "type": "boots",
"thorns": 25, "thorns": 25,
@ -26866,6 +26897,7 @@
}, },
{ {
"name": "Moon Pool Circlet", "name": "Moon Pool Circlet",
"set": "Water Hive",
"tier": "Rare", "tier": "Rare",
"category": "accessory", "category": "accessory",
"drop": "never", "drop": "never",
@ -26885,6 +26917,7 @@
"tier": "Legendary", "tier": "Legendary",
"type": "helmet", "type": "helmet",
"quest": "The Qira Hive", "quest": "The Qira Hive",
"set": "Master Hive",
"category": "armor", "category": "armor",
"slots": 2, "slots": 2,
"drop": "never", "drop": "never",
@ -26914,6 +26947,7 @@
}, },
{ {
"name": "Pride of the Aerie", "name": "Pride of the Aerie",
"set": "Air Hive",
"tier": "Rare", "tier": "Rare",
"type": "helmet", "type": "helmet",
"category": "armor", "category": "armor",
@ -26941,6 +26975,7 @@
"name": "Prowess", "name": "Prowess",
"tier": "Legendary", "tier": "Legendary",
"quest": "The Qira Hive", "quest": "The Qira Hive",
"set": "Master Hive",
"category": "accessory", "category": "accessory",
"drop": "never", "drop": "never",
"restrict": "Untradable", "restrict": "Untradable",
@ -26957,6 +26992,7 @@
}, },
{ {
"name": "Silt of the Seafloor", "name": "Silt of the Seafloor",
"set": "Water Hive",
"tier": "Rare", "tier": "Rare",
"type": "boots", "type": "boots",
"thorns": 35, "thorns": 35,
@ -26986,6 +27022,7 @@
}, },
{ {
"name": "Soulflare", "name": "Soulflare",
"set": "Fire Hive",
"tier": "Rare", "tier": "Rare",
"type": "chestplate", "type": "chestplate",
"category": "armor", "category": "armor",
@ -27012,6 +27049,7 @@
}, },
{ {
"name": "Sparkling Visor", "name": "Sparkling Visor",
"set": "Thunder Hive",
"tier": "Rare", "tier": "Rare",
"type": "helmet", "type": "helmet",
"category": "armor", "category": "armor",
@ -27034,6 +27072,7 @@
}, },
{ {
"name": "Sparkweaver", "name": "Sparkweaver",
"set": "Fire Hive",
"tier": "Rare", "tier": "Rare",
"type": "helmet", "type": "helmet",
"category": "armor", "category": "armor",
@ -27056,6 +27095,7 @@
}, },
{ {
"name": "Stillwater Blue", "name": "Stillwater Blue",
"set": "Water Hive",
"tier": "Rare", "tier": "Rare",
"type": "chestplate", "type": "chestplate",
"category": "armor", "category": "armor",
@ -27080,6 +27120,7 @@
{ {
"name": "Static-charged Leggings", "name": "Static-charged Leggings",
"displayName": "Static-Charged Leggings", "displayName": "Static-Charged Leggings",
"set": "Thunder Hive",
"tier": "Rare", "tier": "Rare",
"type": "leggings", "type": "leggings",
"thorns": 40, "thorns": 40,
@ -27103,6 +27144,7 @@
}, },
{ {
"name": "Subur Clip", "name": "Subur Clip",
"set": "Earth Hive",
"tier": "Rare", "tier": "Rare",
"thorns": 20, "thorns": 20,
"category": "accessory", "category": "accessory",
@ -27121,6 +27163,7 @@
}, },
{ {
"name": "Trench Scourer", "name": "Trench Scourer",
"set": "Water Hive",
"tier": "Rare", "tier": "Rare",
"type": "leggings", "type": "leggings",
"category": "armor", "category": "armor",
@ -27144,6 +27187,7 @@
}, },
{ {
"name": "Thunderous Step", "name": "Thunderous Step",
"set": "Thunder Hive",
"tier": "Rare", "tier": "Rare",
"type": "boots", "type": "boots",
"category": "armor", "category": "armor",
@ -27170,6 +27214,7 @@
"tier": "Legendary", "tier": "Legendary",
"type": "chestplate", "type": "chestplate",
"quest": "The Qira Hive", "quest": "The Qira Hive",
"set": "Master Hive",
"category": "armor", "category": "armor",
"slots": 2, "slots": 2,
"drop": "never", "drop": "never",
@ -27199,6 +27244,7 @@
}, },
{ {
"name": "Vortex Bracer", "name": "Vortex Bracer",
"set": "Air Hive",
"tier": "Rare", "tier": "Rare",
"category": "accessory", "category": "accessory",
"drop": "never", "drop": "never",
@ -27218,6 +27264,7 @@
}, },
{ {
"name": "Whitecap Crown", "name": "Whitecap Crown",
"set": "Water Hive",
"tier": "Rare", "tier": "Rare",
"type": "helmet", "type": "helmet",
"category": "armor", "category": "armor",
@ -27239,6 +27286,7 @@
}, },
{ {
"name": "Turbine Greaves", "name": "Turbine Greaves",
"set": "Air Hive",
"tier": "Rare", "tier": "Rare",
"type": "leggings", "type": "leggings",
"category": "armor", "category": "armor",
@ -40575,6 +40623,7 @@
}, },
{ {
"name": "Ornate Shadow Cloud", "name": "Ornate Shadow Cloud",
"set": "Ornate Shadow",
"tier": "Fabled", "tier": "Fabled",
"type": "boots", "type": "boots",
"category": "armor", "category": "armor",
@ -40596,6 +40645,7 @@
}, },
{ {
"name": "Ornate Shadow Cowl", "name": "Ornate Shadow Cowl",
"set": "Ornate Shadow",
"tier": "Fabled", "tier": "Fabled",
"type": "helmet", "type": "helmet",
"category": "armor", "category": "armor",
@ -40617,6 +40667,7 @@
}, },
{ {
"name": "Ornate Shadow Cover", "name": "Ornate Shadow Cover",
"set": "Ornate Shadow",
"tier": "Fabled", "tier": "Fabled",
"type": "leggings", "type": "leggings",
"category": "armor", "category": "armor",
@ -40638,6 +40689,7 @@
}, },
{ {
"name": "Ornate Shadow Garb", "name": "Ornate Shadow Garb",
"set": "Ornate Shadow",
"tier": "Fabled", "tier": "Fabled",
"type": "chestplate", "type": "chestplate",
"category": "armor", "category": "armor",

File diff suppressed because one or more lines are too long

View file

@ -828,6 +828,7 @@ function calculateBuildStats() {
const bonus = sets[setName].bonuses[count-1]; const bonus = sets[setName].bonuses[count-1];
// console.log(setName); // console.log(setName);
if (bonus["illegal"]) { if (bonus["illegal"]) {
console.log("mmmm");
let setWarning = document.createElement("p"); let setWarning = document.createElement("p");
setWarning.classList.add("itemp"); setWarning.classList.add("itemp");
setWarning.classList.add("warning"); setWarning.classList.add("warning");