diff --git a/src/stats/items.js b/src/stats/items.js index 0ce7430886..6f49aa6c2d 100644 --- a/src/stats/items.js +++ b/src/stats/items.js @@ -70,7 +70,7 @@ export async function getItems( } }); - let [ + const [ armor, equipment, inventory, diff --git a/views/sections/stats/basic_stats.ejs b/views/sections/stats/basic_stats.ejs index 823874f116..281fe9d440 100644 --- a/views/sections/stats/basic_stats.ejs +++ b/views/sections/stats/basic_stats.ejs @@ -9,7 +9,7 @@
<% if (calculated.user_data?.current_area?.current_area !== undefined) { %> -
+
<%= calculated.user_data.current_area_updated ? 'Current' : 'Last' %> Area: <%= calculated.user_data.current_area.current_area %>
@@ -22,9 +22,9 @@ Joined: <%= calculated.user_data.first_join.text %> -
- <% } %> - +
+ <% } %> + <% if ('purse' in calculated.currencies && calculated.currencies.purse > 0) { %>
@@ -32,8 +32,8 @@ <%= helper.formatNumber(calculated.currencies.purse, true) %> Coin<%= Math.floor(calculated.currencies.purse) == 1 ? '': 's' %>
- <% } %> - + <% } %> + <% if ('bank' in calculated.currencies && calculated.currencies.bank > 0) { %>
@@ -106,7 +106,7 @@ weight.total -= weight.skill; weight.skill = 0; } - + if (weight.total === 0) { continue; } %> @@ -138,7 +138,7 @@
<% } %> - <% } %> + <% } %> <% if (calculated.networth.noInventory === false) { %> @@ -240,4 +240,4 @@ <% } %> - \ No newline at end of file + \ No newline at end of file diff --git a/views/sections/stats/bestiary.ejs b/views/sections/stats/bestiary.ejs index 512ce2e481..997db95375 100644 --- a/views/sections/stats/bestiary.ejs +++ b/views/sections/stats/bestiary.ejs @@ -3,17 +3,17 @@

Bestiary

- <% max = calculated.bestiary.milestone === calculated.bestiary.maxMilestone ? 'golden-text' : ''; %> + <% max = calculated.bestiary.milestone === calculated.bestiary.maxMilestone ? 'golden-text' : ''; %> Bestiary Level: <%= calculated.bestiary.milestone / 10 %> / <%= calculated.bestiary.maxMilestone / 10 %>
- <% max = calculated.bestiary.familiesUnlocked === calculated.bestiary.totalFamilies ? 'golden-text' : ''; %> + <% max = calculated.bestiary.familiesUnlocked === calculated.bestiary.totalFamilies ? 'golden-text' : ''; %> Families Unlocked: <%= calculated.bestiary.familiesUnlocked %> / <%= calculated.bestiary.totalFamilies %>
- <% max = calculated.bestiary.familiesMaxed === calculated.bestiary.totalFamilies ? 'golden-text' : ''; %> + <% max = calculated.bestiary.familiesMaxed === calculated.bestiary.totalFamilies ? 'golden-text' : ''; %> Families Completed: <%= calculated.bestiary.familiesMaxed %> / <%= calculated.bestiary.totalFamilies %>
@@ -37,7 +37,7 @@

- +
<% max = family.tier >= family.maxTier ? 'max-stat' : ''; %>
<%= family.name %> <%= family.tier %>
diff --git a/views/sections/stats/bingo.ejs b/views/sections/stats/bingo.ejs index 53cc9b8fc3..c2db0ae13d 100644 --- a/views/sections/stats/bingo.ejs +++ b/views/sections/stats/bingo.ejs @@ -2,7 +2,7 @@

Bingo

-

+

<% if (calculated.bingo.profiles !== undefined) { %> Bingo Profiles: diff --git a/views/sections/stats/collections.ejs b/views/sections/stats/collections.ejs index 781fc1cf62..78fab56fd2 100644 --- a/views/sections/stats/collections.ejs +++ b/views/sections/stats/collections.ejs @@ -2,11 +2,11 @@

Collections

- + <% max = calculated.collections.maxedCollections === calculated.collections.totalCollections ? 'golden-text' : ''; %> Maxed Collections: <%= calculated.collections.maxedCollections %> / <%= calculated.collections.totalCollections %> - + <% for (const [category, categoryData] of Object.entries(calculated.collections)) { %> <% if (categoryData.collections === undefined || categoryData.collections.length === 0) { continue; @@ -23,11 +23,11 @@ (<%= categoryData.maxTiers %> / <%= categoryData.totalTiers %> max) <% } %>
-
- <% for (const collection of categoryData.collections) { +
+ <% for (const collection of categoryData.collections) { let amountsTooltip = ""; - if (collection.amounts !== undefined) { + if (collection.amounts !== undefined) { amountsTooltip = collection.amounts.map(amount => `${amount.username}: ${amount.amount.toLocaleString()}`).join('
') + `

Total: ${collection.totalAmount.toLocaleString()}`; } else if (collection.rewards !== undefined) { amountsTooltip = `Rewards:`; diff --git a/views/sections/stats/crimson_isle.ejs b/views/sections/stats/crimson_isle.ejs index 92f910fc7b..5b32f99d0b 100644 --- a/views/sections/stats/crimson_isle.ejs +++ b/views/sections/stats/crimson_isle.ejs @@ -1,4 +1,4 @@ -<% +<% function getDojoRank(points) { if (points >= 1000) return 'S' @@ -23,13 +23,13 @@ function getDojoRank(points) { Selected Faction: <%= calculated.crimson_isle.factions.selected_faction %>
- + <% max = calculated.crimson_isle.factions.mages_reputation >= 12000 ? 'golden-text' : '' %> Mage Reputation: <%= calculated.crimson_isle.factions.mages_reputation.toLocaleString() %>
- + <% max = calculated.crimson_isle.factions.barbarians_reputation >= 12000 ? 'golden-text' : '' %> Barbarian Reputation: @@ -67,7 +67,7 @@ function getDojoRank(points) { <% if (calculated.crimson_isle.dojo?.total_points) { %>

Dojo Completions

- + <% max = calculated.crimson_isle.dojo.total_points >= 7000 ? 'golden-text' : '' %> Total Points: diff --git a/views/sections/stats/items/accessories.ejs b/views/sections/stats/items/accessories.ejs index bb64844bbf..899a0d2385 100644 --- a/views/sections/stats/items/accessories.ejs +++ b/views/sections/stats/items/accessories.ejs @@ -1,4 +1,4 @@ -<% +<% function formatEnrichment(string) { let enrichment = string.split('_').join(' ').trim() @@ -30,7 +30,7 @@ function getEnrichments(accessories) { if (filteredAccessories.length === 0) { return; } - + const enrichmentCounts = {}; filteredAccessories.map((accessory) => { if (constants.SPECIAL_ACCESSORIES[helper.getId(accessory)]?.allowsEnrichment === false) return; @@ -45,11 +45,11 @@ function getEnrichments(accessories) { "> <%= amount %>× <%= formatEnrichment(enrichment) %> - + <% if (enrichment !== Object.keys(enrichmentCounts).pop()) { %> // - <% } - } + <% } + } } function itemIcon(item, classes) { %> @@ -110,7 +110,7 @@ function itemIcon(item, classes) { %> <% if (calculated.accessories.magical_power.abiphone) { %> Abicase = +<%= calculated.accessories.magical_power.abiphone %> MP
<% } %> - + <% if (calculated.accessories.magical_power.rift_prism) { %> Rift Prism: = +<%= calculated.accessories.magical_power.rift_prism %> MP
<% } %> @@ -127,7 +127,7 @@ function itemIcon(item, classes) { %>

- + <% if (items.accessories.accessories.find(a => !a.isInactive) != undefined) { %>
@@ -168,7 +168,7 @@ function itemIcon(item, classes) { %> <% if (calculated.accessories.missing.length > 0 || calculated.accessories.upgrades.length > 0) { - if (inactiveAccessories.length > 0) { %> + if (inactiveAccessories.length > 0) { %>
<% } %> @@ -177,7 +177,7 @@ function itemIcon(item, classes) { %> <% if (calculated.accessories.missing.length > 0) { %>

Missing Accessories

- + <% for (const [index, accessory] of calculated.accessories.missing.entries()) { %>
@@ -188,7 +188,7 @@ function itemIcon(item, classes) { %> <% if (calculated.accessories.upgrades.length > 0) { %>

Missing Accessory Upgrades

- + <% for (const [index, accessory] of calculated.accessories.upgrades.entries()) { %>
diff --git a/views/sections/stats/items/inventory.ejs b/views/sections/stats/items/inventory.ejs index b3d988d2f0..361e346940 100644 --- a/views/sections/stats/items/inventory.ejs +++ b/views/sections/stats/items/inventory.ejs @@ -77,7 +77,7 @@
Quiver
<% } %> - + <% if (items.museum && items.museum.length > 0) { %>
-
- <% for (const minion of categoryData.minions) { +
+ <% for (const minion of categoryData.minions) { let amountsTooltip = ""; for (let i = 1; i <= minion.maxTier; i++) { amountsTooltip += `
${helper.romanize(i)}
` diff --git a/views/sections/stats/misc.ejs b/views/sections/stats/misc.ejs index b948eb47d3..209439c885 100644 --- a/views/sections/stats/misc.ejs +++ b/views/sections/stats/misc.ejs @@ -4,7 +4,7 @@

Miscellaneous

- <% if (calculated.dungeons?.essence !== undefined) { %> + <% if (calculated.dungeons?.essence !== undefined) { %> <%- include('./misc/essence.ejs', {}); %> <% } %> diff --git a/views/sections/stats/misc/auctions.ejs b/views/sections/stats/misc/auctions.ejs index 35e4d11732..a7dbe87d6e 100644 --- a/views/sections/stats/misc/auctions.ejs +++ b/views/sections/stats/misc/auctions.ejs @@ -4,13 +4,13 @@
- + Auctions sold

- <% if (calculated.misc.auctions.fees !== undefined) { %> + <% if (calculated.misc.auctions.fees !== undefined) { %> Fees: <%= calculated.misc.auctions.fees.toLocaleString() %>
@@ -38,7 +38,7 @@
`; } - + const itemsSold = Object.values(calculated.misc.auctions.total_sold).reduce((a, b) => a + b, 0); %> @@ -54,7 +54,7 @@

- + Auctions bought
@@ -67,7 +67,7 @@ <% } %> - <% if (calculated.misc.auctions.highest_bid !== undefined) { %> + <% if (calculated.misc.auctions.highest_bid !== undefined) { %> Highest Bid: <%= calculated.misc.auctions.highest_bid.toLocaleString() %>
@@ -94,7 +94,7 @@ if (rarity === "total") { continue; } - + tooltip += ` ${helper.capitalizeFirstLetter(rarity)}: ${amount.toLocaleString()} diff --git a/views/sections/stats/misc/end_island.ejs b/views/sections/stats/misc/end_island.ejs index 24956e6275..74b3042f11 100644 --- a/views/sections/stats/misc/end_island.ejs +++ b/views/sections/stats/misc/end_island.ejs @@ -15,7 +15,7 @@ if (key === "best") { continue; } - + tooltip += `${helper.capitalizeFirstLetter(key)}: ${Math.floor(calculated.misc.dragons.most_damage[key]).toLocaleString()}
`; } %> @@ -27,13 +27,13 @@ <% } %> - <% if (calculated.misc.dragons.fastest_kill !== undefined) { %> + <% if (calculated.misc.dragons.fastest_kill !== undefined) { %> <% tooltip = ""; for (const key in calculated.misc.dragons.fastest_kill) { if (key === "best") { continue; } - + tooltip += `${helper.capitalizeFirstLetter(key)}: ${moment.duration(calculated.misc.dragons.fastest_kill[key], "milliseconds").format("m:ss.SSS")}s
`; } %> @@ -43,16 +43,16 @@
<% } %> - - + + - <% if (calculated.misc.dragons.kills !== undefined) { %> + <% if (calculated.misc.dragons.kills !== undefined) { %> <% tooltip = ""; for (const key in calculated.misc.dragons.kills) { if (key === "total") { continue; } - + tooltip += `${helper.capitalizeFirstLetter(key)}: ${calculated.misc.dragons.kills[key].toLocaleString()}
`; } %> @@ -62,7 +62,7 @@
<% } %> - + <% if (calculated.misc.dragons.deaths !== undefined) { %> <% tooltip = ""; @@ -70,7 +70,7 @@ if (key === "total") { continue; } - + tooltip += `${helper.capitalizeFirstLetter(key)}: ${calculated.misc.dragons.deaths[key].toLocaleString()}
`; } %> @@ -86,7 +86,7 @@
- + Endstone Protector
diff --git a/views/sections/stats/misc/kills_deaths.ejs b/views/sections/stats/misc/kills_deaths.ejs index 6cd069d85a..242f3f0d03 100644 --- a/views/sections/stats/misc/kills_deaths.ejs +++ b/views/sections/stats/misc/kills_deaths.ejs @@ -24,7 +24,7 @@
Kills
<% let rows = Math.min(calculated.kills.total, 10); - for (let i = 0; i < rows; i++) { + for (let i = 0; i < rows; i++) { const kill = calculated.kills.kills[i]; if (kill !== undefined) { %> @@ -49,7 +49,7 @@
Deaths
<% rows = Math.min(calculated.deaths.total, 10); - for (let i = 0; i < rows; i++) { + for (let i = 0; i < rows; i++) { const death = calculated.deaths.deaths[i]; if (death !== undefined) { %> @@ -64,7 +64,7 @@ <% if (calculated.deaths.deaths.length > 10) { %> - <% } %> + <% } %>
<% } %> diff --git a/views/sections/stats/misc/milestones.ejs b/views/sections/stats/misc/milestones.ejs index 25622c898a..a142d52dca 100644 --- a/views/sections/stats/misc/milestones.ejs +++ b/views/sections/stats/misc/milestones.ejs @@ -3,7 +3,7 @@
- + Pet milestones
diff --git a/views/sections/stats/misc/mythological_event.ejs b/views/sections/stats/misc/mythological_event.ejs index 214fa55a5d..4a33579938 100644 --- a/views/sections/stats/misc/mythological_event.ejs +++ b/views/sections/stats/misc/mythological_event.ejs @@ -3,10 +3,10 @@
- + Mythological Event
- +

<% if (calculated.misc.mythological_event.kills !== undefined) { %> @@ -15,7 +15,7 @@
<% } %> - <% + <% const burrow_naming = { burrows_chains_complete: "Chains Completed", burrows_dug_treasure: "Dug Treasure", @@ -27,13 +27,13 @@ continue; } - + let tooltip = ""; for (const rarity in calculated.misc.mythological_event[key]) { if (rarity === "null" || rarity === "total") { continue; } - + tooltip += `${helper.capitalizeFirstLetter(rarity)}: ${calculated.misc.mythological_event[key][rarity].toLocaleString()}
`; } %> diff --git a/views/sections/stats/misc/potion_effects.ejs b/views/sections/stats/misc/potion_effects.ejs index b101623035..d893deebb4 100644 --- a/views/sections/stats/misc/potion_effects.ejs +++ b/views/sections/stats/misc/potion_effects.ejs @@ -1,4 +1,4 @@ -<% if ('effects' in calculated.misc) { +<% if ('effects' in calculated.misc) { if (Object.keys(calculated.misc.effects).some((key) => Object.keys(calculated.misc.effects[key]).length > 0)) { %>

@@ -20,12 +20,12 @@ const potionData = constants.POTION_EFFECTS[potion.effect]; if (potionData === undefined) { %> <% } continue; - - + + effects_tooltips[key].push(` ${potionData.name ?? helper.titleCase(potion.effect.replace("_", " "))}
@@ -40,7 +40,7 @@ } } } %> - +

<% if (calculated.misc.effects.active.length > 0) { %> diff --git a/views/sections/stats/misc/profile_upgrades.ejs b/views/sections/stats/misc/profile_upgrades.ejs index e3cd5d0ad7..88e95afdc2 100644 --- a/views/sections/stats/misc/profile_upgrades.ejs +++ b/views/sections/stats/misc/profile_upgrades.ejs @@ -3,7 +3,7 @@

- + Profile upgrades
diff --git a/views/sections/stats/misc/races.ejs b/views/sections/stats/misc/races.ejs index 7a135ff642..11c421fa9b 100644 --- a/views/sections/stats/misc/races.ejs +++ b/views/sections/stats/misc/races.ejs @@ -1,4 +1,4 @@ -<% +<% const raceOrder = ["crystal_core", "giant_mushroom", "precursor_ruins", "other"] @@ -24,8 +24,8 @@ const raceOrder = ["crystal_core", "giant_mushroom", "precursor_ruins", "other"] <%= race.name %>: <%= race.time %>
- - <% const otherPets = calculated.pets.pets.filter(pet => !uniquePets.includes(pet)); - if (otherPets.length > 0) { %> + if (otherPets.length > 0) { %>
-
+
<% for (const [index, pet] of otherPets.entries()) { - if (pet.active === true) { + if (pet.active === true) { continue; } %>
- + <% if (rarityOrder.indexOf(pet.rarity) <= 4) { %>
<% } %> diff --git a/views/sections/stats/rift.ejs b/views/sections/stats/rift.ejs index bc5264b2a4..521482a3d3 100644 --- a/views/sections/stats/rift.ejs +++ b/views/sections/stats/rift.ejs @@ -61,7 +61,7 @@ <%= calculated.rift.timecharms.obtained_timecharms %>

- +
<% for (const timecharm of calculated.rift.timecharms.timecharms) { %>
@@ -81,7 +81,7 @@
- <% } %> + <% } %>
\ No newline at end of file diff --git a/views/sections/stats/skills.ejs b/views/sections/stats/skills.ejs index aa4236b6ac..5051c727f2 100644 --- a/views/sections/stats/skills.ejs +++ b/views/sections/stats/skills.ejs @@ -11,7 +11,7 @@ <% if (calculated.farming !== undefined) { %> <%- include('./skills/farming.ejs', { getRarityUpgradeClass, rarityOrder }) %> <% } %> - + <% if (calculated.fishing !== undefined) { %> <%- include('./skills/fishing.ejs', {}) %> diff --git a/views/sections/stats/skills/enchanting.ejs b/views/sections/stats/skills/enchanting.ejs index eda7ed12e2..6386759561 100644 --- a/views/sections/stats/skills/enchanting.ejs +++ b/views/sections/stats/skills/enchanting.ejs @@ -51,7 +51,7 @@ if (info == 'name' || info == 'icon') { continue; } %> - + <%= helper.titleCase(info.replace('_', ' ')) %>: <%= tier_data[info] %>
diff --git a/views/sections/stats/skills/farming.ejs b/views/sections/stats/skills/farming.ejs index 6e113bf8c1..310c6c3daf 100644 --- a/views/sections/stats/skills/farming.ejs +++ b/views/sections/stats/skills/farming.ejs @@ -1,4 +1,4 @@ -<% +<% const badgeOrder = ["diamond", "platinum", "gold", "silver", "bronze"]; @@ -36,7 +36,7 @@ function itemIcon(item, classes) { %> if (crop.weight === 0) { continue; } %> - + <%= crop.name %>: <%= parseFloat(crop.weight.toFixed(2)).toLocaleString() %>
<% } %> @@ -56,13 +56,13 @@ function itemIcon(item, classes) { %> <% } %> - <% if (calculated.farming.pelts !== undefined) { %> + <% if (calculated.farming.pelts !== undefined) { %> Pelts: <%= calculated.farming.pelts.toLocaleString() %>
<% } %> - <% + <% const farming = calculated.farming; if (farming.talked && farming.contests.attended_contests > 0) { %> @@ -128,8 +128,8 @@ function itemIcon(item, classes) { %> Active Tool: None

<% } %> - -
+ +
<% for (const item of items.farming_tools.tools) { %>
<% if (rarityOrder.indexOf(item.rarity) <= 4) { %> @@ -141,7 +141,7 @@ function itemIcon(item, classes) { %> <% } %>
<% } %> - + <% if (farming.talked) { %> <% if (Object.keys(calculated.farming.crops).length > 0) { %> @@ -176,7 +176,7 @@ function itemIcon(item, classes) { %> Personal Best: <%= helper.formatNumber(crop.personal_best, true) %>
- + Contests: <%= crop.contests.toLocaleString() %>
diff --git a/views/sections/stats/skills/fishing.ejs b/views/sections/stats/skills/fishing.ejs index 5c632936a8..ff24a24e9c 100644 --- a/views/sections/stats/skills/fishing.ejs +++ b/views/sections/stats/skills/fishing.ejs @@ -1,8 +1,8 @@ -<% +<% const trophyFishOrder = ["bronze", "silver", "gold", "diamond"]; -const seaCreatures = [ +const seaCreatures = [ "pond_squid", "plhlegblast", "sea_walker", @@ -49,7 +49,7 @@ const seaCreatures = [ "yeti", "grim_reaper", "thunder", - "lord_jawbus", + "lord_jawbus", "agarimoo" ]; @@ -100,7 +100,7 @@ function itemIcon(item, classes) { %> Large treasures fished: <%= calculated.fishing.treasure_large.toLocaleString() %>
- + Sea Creatures killed: <%= totalSeaCreatureKills.toLocaleString() %> @@ -118,7 +118,7 @@ function itemIcon(item, classes) { %> <% } %> - <% if (calculated.fishing.trophy_fish !== undefined) { %> + <% if (calculated.fishing.trophy_fish !== undefined) { %> Trophy Fish fished: <%= calculated.fishing.trophy_fish.toLocaleString() %>
@@ -177,7 +177,7 @@ function itemIcon(item, classes) { %>
<% } %> - + <% if (calculated?.crimson_isle?.trophy_fish !== undefined && calculated?.crimson_isle?.trophy_fish?.total_caught > 0) { %>
diff --git a/views/sections/stats/skills/mining.ejs b/views/sections/stats/skills/mining.ejs index 4048e90bc0..f1f91a1ae4 100644 --- a/views/sections/stats/skills/mining.ejs +++ b/views/sections/stats/skills/mining.ejs @@ -1,4 +1,4 @@ -<% +<% function formatNucleusCrystal(crystal, state) { if (!state) { @@ -112,7 +112,7 @@ function itemIcon(item, classes) { %>
- <% const delivered_parts = mining.core.crystal_nucleus?.precursor?.parts_delivered || []; + <% const delivered_parts = mining.core.crystal_nucleus?.precursor?.parts_delivered || []; const precursor_parts = {}; for (const [partId, partName] of Object.entries(constants.PRECURSOR_PARTS)) { diff --git a/views/sections/stats/slayer.ejs b/views/sections/stats/slayer.ejs index a8e79b8a02..8dc2544e77 100644 --- a/views/sections/stats/slayer.ejs +++ b/views/sections/stats/slayer.ejs @@ -1,4 +1,4 @@ -<% +<% const slayerOrder = ["zombie", "spider", "wolf", "enderman", "vampire", "blaze"]; function formatSlayerCoinsSpent(coins) { @@ -18,7 +18,7 @@ function formatSlayerCoinsSpent(coins) { <% const slayerNames = Object.keys(calculated.slayer.slayers).sort((a, b) => slayerOrder.indexOf(a) - slayerOrder.indexOf(b)); for (const slayerName of slayerNames) { - const slayer = calculated.slayer.slayers[slayerName]; + const slayer = calculated.slayer.slayers[slayerName]; if (slayer.level.currentLevel === 0) { continue; } %> @@ -66,7 +66,7 @@ function formatSlayerCoinsSpent(coins) { <% if (slayer.level.unclaimed === true) { %>
unclaimed slayer rewards!
<% } %> - + <% const max = slayer.level.currentLevel == slayer.level.maxLevel ? 'golden-text' : '' %> <%= slayerName %> level <%= slayer.level.currentLevel %> @@ -76,8 +76,8 @@ function formatSlayerCoinsSpent(coins) {
<%= slayer.level.xp.toLocaleString() %> - <% if (slayer.level.xpForNext != 0) { %> - / <%= slayer.level.xpForNext.toLocaleString() %> + <% if (slayer.level.xpForNext != 0) { %> + / <%= slayer.level.xpForNext.toLocaleString() %> <% } %> XP
@@ -85,7 +85,7 @@ function formatSlayerCoinsSpent(coins) { <% } %>
- <% const maxSlayerLevel = Object.values(calculated.slayer.slayers).reduce((a, b) => Math.max(a, b.level.currentLevel), 0); + <% const maxSlayerLevel = Object.values(calculated.slayer.slayers).reduce((a, b) => Math.max(a, b.level.currentLevel), 0); if (maxSlayerLevel > 0) { %>
<% } %>