endernon/wynnbuilder-forked-for-changes
1
0
Fork 0
forked from morphNon/wynnbuilder-idk
Code Pull requests Activity

Merge pull request #184 from hppeng-wynn/crafter_durability_fix

Browse source 
Fix crafted accessory durability display
This commit is contained in:
hppeng-wynn 2022-08-02 06:48:24 -07:00 committed by GitHub
commit d999b29125
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 42 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

86
js/display.js
View file

@ -393,33 +393,32 @@ function displayExpandedItem(item, parent_id){
}
}
//Show powder specials ;-;
let nonConsumables = ["relik", "wand", "bow", "spear", "dagger", "chestplate", "helmet", "leggings", "boots"];//, "ring", "bracelet", "necklace"];
if(nonConsumables.includes(item.get("type"))) {
let powder_special = document.createElement("div");
powder_special.classList.add("col");
let powder_specials_check = ["relik", "wand", "bow", "spear", "dagger", "chestplate", "helmet", "leggings", "boots"];
if(powder_specials_check.includes(item.get("type"))) {
let powder_special = make_elem("div", ['col']);
let powders = item.get("powders");
let element = "";
let power = 0;
let element;
let power_index;
for (let i = 0; i < powders.length; i++) {
let firstPowderType = skp_elements[Math.floor(powders[i]/6)];
if (element !== "") break;
else if (powders[i]%6 > 2) { //t4+
const firstPowderType = skp_elements[Math.floor(powders[i]/6)];
const powder1_power = powders[i] % 6;
if (powder1_power > 2) { //t4+
for (let j = i+1; j < powders.length; j++) {
let currentPowderType = skp_elements[Math.floor(powders[j]/6)]
if (powders[j] % 6 > 2 && firstPowderType === currentPowderType) {
const currentPowderType = skp_elements[Math.floor(powders[j]/6)]
const powder2_power = powders[j] % 6;
if (powder2_power > 2 && firstPowderType === currentPowderType) {
element = currentPowderType;
power = Math.round(((powders[i] % 6 + powders[j] % 6 + 2) / 2 - 4) * 2);
power_index = powder1_power + powder2_power - 6;
break;
}
}
}
}
if (element !== "") {//powder special is "[e,t,w,f,a]+[0,1,2,3,4]"
let powderSpecial = powderSpecialStats[ skp_elements.indexOf(element)];
let specialSuffixes = new Map([ ["Duration", " sec"], ["Radius", " blocks"], ["Chains", ""], ["Damage", "%"], ["Damage Boost", "%"], ["Knockback", " blocks"] ]);
let specialTitle = document.createElement("span");
let specialEffects = document.createElement("span");
addClasses(specialTitle, [damageClasses[skp_elements.indexOf(element) + 1]]);
if (element) {//powder special is "[e,t,w,f,a]+[0,1,2,3,4]"
const powderSpecial = powderSpecialStats[skp_elements.indexOf(element)];
const specialSuffixes = new Map([ ["Duration", " sec"], ["Radius", " blocks"], ["Chains", ""], ["Damage", "%"], ["Damage Boost", "%"], ["Knockback", " blocks"] ]);
const specialTitle = make_elem("span", [damageClasses[skp_elements.indexOf(element) + 1]]);
const specialEffects = document.createElement("span");
let effects;
if (item.get("category") === "weapon") {//weapon
effects = powderSpecial["weaponSpecialEffects"];
@ -430,9 +429,9 @@ function displayExpandedItem(item, parent_id){
}
for (const [key,value] of effects.entries()) {
if (key !== "Description") {
let effect = document.createElement("p");
effect.classList.add("m-0");
effect.textContent = key + ": " + value[power] + specialSuffixes.get(key);
let effect = make_elem("p", ["m-0"], {
textContent: key + ": " + value[power_index] + specialSuffixes.get(key)
});
if(key === "Damage"){
effect.textContent += elementIcons[skp_elements.indexOf(element)];
}
@ -444,16 +443,15 @@ function displayExpandedItem(item, parent_id){
specialTitle.textContent += "[ " + effects.get("Description") + " ]";
}
}
powder_special.appendChild(specialTitle);
powder_special.appendChild(specialEffects);
powder_special.append(specialTitle, specialEffects);
parent_div.appendChild(powder_special);
}
}
let nonConsumables = ["relik", "wand", "bow", "spear", "dagger", "chestplate", "helmet", "leggings", "boots", "ring", "bracelet", "necklace"];
if(item.get("tier") && item.get("tier") === "Crafted") {
let dura_elem = document.createElement("div");
dura_elem.classList.add("col");
let dura = [];
let dura_elem = make_elem("div", ["col"]);
let dura;
let suffix = "";
if(nonConsumables.includes(item.get("type"))) {
dura = item.get("durability");
@ -462,9 +460,9 @@ function displayExpandedItem(item, parent_id){
dura = item.get("duration");
dura_elem.textContent = "Duration: "
suffix = " sec."
let charges = document.createElement("b");
charges.textContent = "Charges: " + item.get("charges");
parent_div.appendChild(charges);
parent_div.appendChild(make_elem('b', [], {
textContent: "Charges: " + item.get("charges")
}));
}
if (typeof(dura) === "string") {
@ -477,9 +475,7 @@ function displayExpandedItem(item, parent_id){
}
//Show item tier
if (item.get("tier") && item.get("tier") !== " ") {
let item_desc_elem = document.createElement("div");
item_desc_elem.classList.add("col");
item_desc_elem.classList.add(item.get("tier"));
let item_desc_elem = make_elem("div", ["col", item.get("tier")]);
if (tome_types.includes(item.get("type"))) {
tome_type_map = new Map([["weaponTome", "Weapon Tome"],["armorTome", "Armor Tome"],["guildTome", "Guild Tome"]]);
item_desc_elem.textContent = item.get("tier")+" "+tome_type_map.get(item.get("type"));
@ -491,20 +487,19 @@ function displayExpandedItem(item, parent_id){
//Show item hash if applicable
if (item.get("crafted") || item.get("custom")) {
let item_desc_elem = document.createElement("p");
item_desc_elem.classList.add('itemp');
item_desc_elem.style.maxWidth = "100%";
item_desc_elem.style.wordWrap = "break-word";
item_desc_elem.style.wordBreak = "break-word";
item_desc_elem.textContent = item.get("hash");
parent_div.append(item_desc_elem);
parent_div.append(make_elem('p', ['itemp'], {
style: {
maxWidth: '100%',
wordWrap: 'break-word',
wordBreak: 'break-word'
},
textContent: item.get('hash')
}));
}
if (item.get("category") === "weapon") {
let total_damages = item.get("basedps");
let base_dps_elem = document.createElement("p");
base_dps_elem.classList.add("left");
base_dps_elem.classList.add("itemp");
let base_dps_elem = make_elem("p", ["left", "itemp"]);
if (item.get("tier") === "Crafted") {
let base_dps_min = total_damages[0];
let base_dps_max = total_damages[1];
@ -514,8 +509,7 @@ function displayExpandedItem(item, parent_id){
else {
base_dps_elem.textContent = "Base DPS: "+(total_damages);
}
parent_div.appendChild(document.createElement("p"));
parent_div.appendChild(base_dps_elem);
parent_div.append(make_elem("p"), base_dps_elem);
}
}
@ -1273,8 +1267,8 @@ function displayPowderSpecials(parent_elem, powderSpecials, stats, weapon, overa
//iterate through the special and display its effects.
let powder_special = make_elem("p", ["pt-3"]);
let specialSuffixes = new Map([ ["Duration", " sec"], ["Radius", " blocks"], ["Chains", ""], ["Damage", "%"], ["Damage Boost", "%"], ["Knockback", " blocks"] ]);
let specialTitle = document.createElement("p");
let specialEffects = document.createElement("p");
let specialTitle = make_elem("p");
let specialEffects = make_elem("p");
specialTitle.classList.add(damageClasses[powderSpecialStats.indexOf(special[0]) + 1]);
let effects = special[0]["weaponSpecialEffects"];
let power = special[1];

10
js/utils.js
View file

@ -604,16 +604,6 @@ function matchType(object, target) {
return object;
}
/**
* Add multiple classes to a html element
*/
function addClasses(elem, classes) {
for (let _class of classes) {
elem.classList.add(_class);
}
return elem;
}
/** A utility function that reloads the page forcefully.
*
*/