diff --git a/crafter.html b/crafter.html index c94a69d..a2e8de4 100644 --- a/crafter.html +++ b/crafter.html @@ -16,21 +16,25 @@
- - + + +
WynnBuilder
- + - -
WynnCrafter
- + + +
WynnCrafter
+ + + + +
WynnAtlas
+
- -

- Forum thread (instructions/help) -

+
diff --git a/crafter.js b/crafter.js index cd428ce..39ae573 100644 --- a/crafter.js +++ b/crafter.js @@ -16,7 +16,6 @@ const BUILD_VERSION = "6.9.9"; /* TODO: - Make it craft Make material tier do something Double powders Integrate to normal builder @@ -27,8 +26,11 @@ let ingFields = ["fDefPct", "wDefPct", "aDefPct", "tDefPct", "eDefPct", "hprPct" let player_craft; function setTitle() { - document.getElementById("header").textContent = "WynnBuilder version "+BUILD_VERSION+" (ingredient db version "+ING_DB_VERSION+")"; + document.getElementById("header").textContent = "WynnCrafter version "+BUILD_VERSION+" (ingredient db version "+ING_DB_VERSION+")"; document.getElementById("header").classList.add("funnynumber"); + let disclaimer = document.createElement("p"); + disclaimer.textContent = "THIS CRAFTER IS INCOMPLETE. The effect of material tiers on crated items is not accurate yet. If you know how the math behind it works, please contact ferricles on forums, discord, or ingame."; + document.getElementById("header").append(disclaimer); } setTitle(); @@ -261,4 +263,4 @@ function resetFields() { calculateCraft(); } -load_ing_init(init); \ No newline at end of file +load_ing_init(init); diff --git a/display.js b/display.js index 28e999d..c2d1908 100644 --- a/display.js +++ b/display.js @@ -2,7 +2,19 @@ let nonRolledIDs = ["name", "displayName", "tier", "set", "slots", "type", "mate let rolledIDs = ["hprPct", "mr", "sdPct", "mdPct", "ls", "ms", "xpb", "lb", "ref", "thorns", "expd", "spd", "atkTier", "poison", "hpBonus", "spRegen", "eSteal", "hprRaw", "sdRaw", "mdRaw", "fDamPct", "wDamPct", "aDamPct", "tDamPct", "eDamPct", "fDefPct", "wDefPct", "aDefPct", "tDefPct", "eDefPct", "spPct1", "spRaw1", "spPct2", "spRaw2", "spPct3", "spRaw3", "spPct4", "spRaw4", "rainbowRaw", "sprint", "sprintReg", "jh", "lq", "gXp", "gSpd"]; let damageClasses = ["Neutral","Earth","Thunder","Water","Fire","Air"]; let reversedIDs = [ "spPct1", "spRaw1", "spPct2", "spRaw2", "spPct3", "spRaw3", "spPct4", "spRaw4" ]; - +let colorMap = new Map( + [ + ["Normal", "#fff"], + ["Unique", "#ff5"], + ["Rare","#f5f"], + ["Legendary","#5ff"], + ["Fabled","#f55"], + ["Mythic","#a0a"], + ["Crafted","#0aa"], + ["Custom","#0aa"], + ["Set","#5f5"] + ] +); function expandItem(item, powders){ let minRolls = new Map(); @@ -546,13 +558,23 @@ function displayExpandedItem(item, parent_id){ if (item.get("tier") !== " ") { p_elem.classList.add(item.get("tier")); } - if (["potion", "scroll", "food"].includes(item.get("type"))){ //must have access to craft.js + if (["potion", "scroll", "food"].includes(item.get("type"))){ let b = document.createElement("b"); b.textContent = "[" + item.get("charges") + "/" + item.get("charges") + "]"; b.classList.add("spaceleft"); p_elem.appendChild(b); } - + p_elem.append(document.createElement("br")); + let img = document.createElement("img"); + img.src = "/media/items/generic-" + item.get("type") + ".png"; + img.alt = item.get("type"); + img.style = " z=index: 1;max-width: 64px; max-height: 64px; position: relative; top: 50%; transform: translateY(-50%);"; + let bckgrd = document.createElement("p"); + bckgrd.style = "width: 96px; height: 96px; border-radius: 50%;background-image: radial-gradient(closest-side, " + colorMap.get(item.get("tier")) + " 20%," + "#121516 80%); margin-left: auto; margin-right: auto;" + bckgrd.classList.add("center"); + bckgrd.classList.add("itemp"); + active_elem.appendChild(bckgrd); + bckgrd.appendChild(img); /*let validTypes = ["helmet", "chestplate", "leggings", "boots", "relik", "wand", "bow", "spear", "dagger", "ring", "bracelet", "necklace"]; if (item.has("type") && validTypes.includes(item.get("type"))) { p = document.createElement("p"); diff --git a/index.html b/index.html index db3a283..954d6bb 100644 --- a/index.html +++ b/index.html @@ -20,15 +20,20 @@
- +
WynnBuilder
- + - - -
WynnCrafter
- + + +
WynnCrafter
+ + + + +
WynnAtlas
+
diff --git a/items-narrow.css b/items-narrow.css new file mode 100644 index 0000000..b50a0b1 --- /dev/null +++ b/items-narrow.css @@ -0,0 +1,21 @@ +.items { + grid-column: 1; + padding: 0%; + display: grid; + grid-template-columns: repeat(auto-fill, 1fr); + width: 100%; + gap: 5px; +} + +.itemsearch { + padding: 0%; + display: grid; + grid-template-columns: 1fr; + width: 100%; + gap: 5px; + grid-template-rows: masonry; +} + +.search { + grid-column: 1; +} diff --git a/items-wide.css b/items-wide.css new file mode 100644 index 0000000..04449fa --- /dev/null +++ b/items-wide.css @@ -0,0 +1,24 @@ +.items { + grid-column: 2; + padding: 0%; + display: grid; + grid-template-columns: repeat(auto-fit, minmax(250px, 1fr)); + width: 100%; + gap: 5px; + grid-template-rows: masonry; +} + +.itemsearch { + padding: 0%; + display: grid; + grid-template-columns: 1fr 4fr; + width: 100%; + gap: 5px; +} + +.search { + grid-column: 1; + position: sticky; + margin-bottom: auto; + top: 10px; +} diff --git a/items.html b/items.html index f5f128b..2130d8e 100644 --- a/items.html +++ b/items.html @@ -1,35 +1,79 @@ + + + + + Wynn Clientside - -
- Made by: hppeng and ferricles -
-
- Additional credits +
+
+
+ + + +
WynnBuilder
+ + + + +
WynnCrafter
+ + + + +
WynnAtlas
+ +
+
+
+ +
+
+
+ +
+


-
-
-
-
-
item
+
+
+ +

Basic Dumb JSON search

+

Query types:

+

name, type, category, stat

+ +
+ +

hello

+
+
+ diff --git a/items.js b/items.js index 2973536..d6b48d1 100644 --- a/items.js +++ b/items.js @@ -1,11 +1,45 @@ +function applyQuery(items, query) { + return items.filter(query.filter, query).sort(query.compare); +} + +function displayItems(items_copy) { + let items_parent = document.getElementById("main"); + for (let i in items_copy) { + let item = items_copy[i]; + let box = document.createElement("div"); + box.classList.add("box"); + box.id = "item"+i; + items_parent.appendChild(box); + displayExpandedItem(expandItem(item, []), box.id); + } +} + +function doItemSearch() { + window.scrollTo(0, 0); + let input_json = document.getElementById("query-json").value; + let input = JSON.parse(input_json); + let items_copy = items.slice(); + document.getElementById("main").textContent = ""; + for (const _query of input) { + const query = queryTypeMap.get(_query.queryType)(_query.value); + items_copy = applyQuery(items_copy, query); + } + document.getElementById("summary").textContent = items_copy.length + " results." + displayItems(items_copy); +} + function init() { + return; let items_copy = items.slice(); - let query = new NameQuery("Bob's"); - items_copy = items_copy.filter(query.filter, query).sort(query.compare); - let item = items_copy[0]; - console.log(item); - displayExpandedItem(expandItem(item, []), "test"); + //let query = new NameQuery("Bob's"); + let query1 = new IdQuery("sdRaw"); + items_copy = applyQuery(items_copy, query1); + + let query2 = new TypeQuery("helmet"); + items_copy = applyQuery(items_copy, query2); + + displayItems(items_copy); } load_init(init); diff --git a/load.js b/load.js index 1a65771..c60237b 100644 --- a/load.js +++ b/load.js @@ -64,7 +64,7 @@ function clean_item(item) { async function load(init_func) { let getUrl = window.location; - let baseUrl = getUrl.protocol + "//" + getUrl.host + "/" + getUrl.pathname.split('/')[1]; + let baseUrl = getUrl.protocol + "//" + getUrl.host + "/";// + getUrl.pathname.split('/')[1]; let url = baseUrl + "/compress.json"; let result = await (await fetch(url)).json(); items = result.items; diff --git a/media/icons/atlas64.png b/media/icons/atlas64.png new file mode 100755 index 0000000..5e5d552 Binary files /dev/null and b/media/icons/atlas64.png differ diff --git a/media/icons/searcher.png b/media/icons/searcher.png index a42a2c2..00f4a92 100644 Binary files a/media/icons/searcher.png and b/media/icons/searcher.png differ diff --git a/media/items/generic-bow.png b/media/items/generic-bow.png index 2975c47..1313b1d 100644 Binary files a/media/items/generic-bow.png and b/media/items/generic-bow.png differ diff --git a/media/items/generic-bracelet.png b/media/items/generic-bracelet.png index be796d1..abd99b7 100644 Binary files a/media/items/generic-bracelet.png and b/media/items/generic-bracelet.png differ diff --git a/media/items/generic-chestplate.png b/media/items/generic-chestplate.png index c95c000..0f90a4c 100644 Binary files a/media/items/generic-chestplate.png and b/media/items/generic-chestplate.png differ diff --git a/media/items/generic-dagger.png b/media/items/generic-dagger.png index 2975c47..f90e830 100644 Binary files a/media/items/generic-dagger.png and b/media/items/generic-dagger.png differ diff --git a/media/items/generic-necklace.png b/media/items/generic-necklace.png index 5e4988e..e1cedda 100644 Binary files a/media/items/generic-necklace.png and b/media/items/generic-necklace.png differ diff --git a/media/items/generic-relik.png b/media/items/generic-relik.png index 2975c47..0593e15 100644 Binary files a/media/items/generic-relik.png and b/media/items/generic-relik.png differ diff --git a/media/items/generic-ring.png b/media/items/generic-ring.png index 4c49a79..ef0fa52 100644 Binary files a/media/items/generic-ring.png and b/media/items/generic-ring.png differ diff --git a/media/items/generic-spear.png b/media/items/generic-spear.png index 2975c47..96299d6 100644 Binary files a/media/items/generic-spear.png and b/media/items/generic-spear.png differ diff --git a/media/items/generic-wand.png b/media/items/generic-wand.png index 2975c47..2aa60f5 100644 Binary files a/media/items/generic-wand.png and b/media/items/generic-wand.png differ diff --git a/query.js b/query.js index c0d974c..2f6f4fe 100644 --- a/query.js +++ b/query.js @@ -1,21 +1,57 @@ +let queryTypeMap = new Map(); -/** - * @description A query into the item - * @module ItemNotFound - */ class NameQuery { - constructor(string) { - this.queryString = string; - } + constructor(string) { this.queryString = string.toLowerCase(); } filter(item) { if (item.remapID === undefined) { - return (item.displayName.includes(this.queryString)); + return (item.displayName.toLowerCase().includes(this.queryString)); } return false; } - compare(a, b) { - return a < b; + compare(a, b) { return a < b; } +} +queryTypeMap.set("name", function(s) { return new NameQuery(s); } ); + +class TypeQuery { + constructor(type) { this.type = type; } + + filter(item) { + if (item.remapID === undefined) { + return (item.type === this.type); + } + return false; + } + + compare(a, b) { return a < b; } +} +queryTypeMap.set("type", function(s) { return new TypeQuery(s); } ); + +class CategoryQuery { + constructor(category) { this.category = category; } + + filter(item) { + if (item.remapID === undefined) { + return (item.category === this.category); + } + return false; + } + + compare(a, b) { return a < b; } +} +queryTypeMap.set("category", function(s) { return new CategoryQuery(s); } ); + +class IdQuery { + constructor(id) { + this.id = id; + this.compare = function(a, b) { + return b[id] - a[id]; + }; + } + + filter(item) { + return (this.id in item) && (item[this.id]); } } +queryTypeMap.set("stat", function(s) { return new IdQuery(s); } ); diff --git a/translations.txt b/translations.txt new file mode 100644 index 0000000..82f4912 --- /dev/null +++ b/translations.txt @@ -0,0 +1,88 @@ +Mapping from API name to shortened names + +"name": "name", +"displayName": "displayName", +"tier": "tier", +"set": "set", +"sockets": "slots", +"type": "type", +"dropType": "drop", +"quest": "quest", +"restrictions": "restrict", +"damage": "nDam", +"fireDamage": "fDam", +"waterDamage": "wDam", +"airDamage": "aDam", +"thunderDamage": "tDam", +"earthDamage": "eDam", +"attackSpeed": "atkSpd", +"health": "hp", +"fireDefense": "fDef", +"waterDefense": "wDef", +"airDefense": "aDef", +"thunderDefense": "tDef", +"earthDefense": "eDef", +"level": "lvl", +"classRequirement": "classReq", +"strength": "strReq", +"dexterity": "dexReq", +"intelligence": "intReq", +"agility": "agiReq", +"defense": "defReq", +"healthRegen": "hprPct", +"manaRegen": "mr", +"spellDamage": "sdPct", +"damageBonus": "mdPct", +"lifeSteal": "ls", +"manaSteal": "ms", +"xpBonus": "xpb", +"lootBonus": "lb", +"reflection": "ref", +"strengthPoints": "str", +"dexterityPoints": "dex", +"intelligencePoints": "int", +"agilityPoints": "agi", +"defensePoints": "def", +"thorns": "thorns", +"exploding": "expd", +"speed": "spd", +"attackSpeedBonus": "atkTier", +"poison": "poison", +"healthBonus": "hpBonus", +"soulPoints": "spRegen", +"emeraldStealing": "eSteal", +"healthRegenRaw": "hprRaw", +"spellDamageRaw": "sdRaw", +"damageBonusRaw": "mdRaw", +"bonusFireDamage": "fDamPct", +"bonusWaterDamage": "wDamPct", +"bonusAirDamage": "aDamPct", +"bonusThunderDamage": "tDamPct", +"bonusEarthDamage": "eDamPct", +"bonusFireDefense": "fDefPct", +"bonusWaterDefense": "wDefPct", +"bonusAirDefense": "aDefPct", +"bonusThunderDefense": "tDefPct", +"bonusEarthDefense": "eDefPct", +"accessoryType": "type", +"identified": "fixID", +"skin": "skin", +"category": "category", + +"spellCostPct1": "spPct1", +"spellCostRaw1": "spRaw1", +"spellCostPct2": "spPct2", +"spellCostRaw2": "spRaw2", +"spellCostPct3": "spPct3", +"spellCostRaw3": "spRaw3", +"spellCostPct4": "spPct4", +"spellCostRaw4": "spRaw4", + +"rainbowSpellDamageRaw": "rainbowRaw", +"sprint": "sprint", +"sprintRegen": "sprintReg", +"jumpHeight": "jh", +"lootQuality": "lq", + +"gatherXpBonus": "gXp", +"gatherSpeed": "gSpd", diff --git a/updated.json b/updated.json index 9b19c46..e938bc2 100644 --- a/updated.json +++ b/updated.json @@ -257086,7 +257086,7 @@ "tier": "Fabled", "type": "spear", "name": "Rhythm of Seasons", - "displayName": "Rhythm of Seasons", + "displayName": "Rhythm of the Seasons", "set": null, "quest": null, "classReq": null, diff --git a/wide.css b/wide.css index a96d397..0c826a0 100644 --- a/wide.css +++ b/wide.css @@ -15,7 +15,7 @@ } .sticky-box { position: sticky; - top: 0; + top: 10px; } .summary { padding: 2% 2% 0%;