Skip to content
This repository was archived by the owner on Aug 12, 2025. It is now read-only.

fix: fastest kill time displaying incorrectly when below 1s and tooltips displaying without there being anything to display #2289

Merged
Shiiyu merged 3 commits into from
Nov 1, 2024
+15 −11
Merged

fix: fastest kill time displaying incorrectly when below 1s and tooltips displaying without there being anything to display #2289

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bed86b7
Fixed "Most Damage" being present and `NaN` when player didnt do any …
averithefox Oct 14, 2024
8e9de74
fixed time below 1s displaying as full seconds instead split second (…
averithefox Oct 14, 2024
a995085
Merge branch 'SkyCryptWebsite:development' into end-island-stats-fixes
averithefox Oct 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 15 additions & 11 deletions views/sections/stats/misc/end_island.ejs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

<p class="stat-raw-values">
<!-- Most Damage -->
<% if (calculated.misc.dragons.most_damage !== undefined) { %>
<% if (calculated.misc.dragons.most_damage !== undefined && Object.keys(calculated.misc.dragons.most_damage).length) { %>
<% let tooltip = "";
for (const key in calculated.misc.dragons.most_damage) {
if (key === "best") {
Expand All @@ -19,34 +19,37 @@
tooltip += `<span class="stat-name">${helper.capitalizeFirstLetter(key)}: </span><span class="stat-value">${Math.floor(calculated.misc.dragons.most_damage[key]).toLocaleString()}</span><br>`;
} %>

<span data-tippy-content='<%= tooltip %>'>
<% if (tooltip) { %><span data-tippy-content='<%= tooltip %>'><% } else { %><span><% } %>
<span class="stat-name">Most Damage: </span>
<span class="stat-value"><%= Math.floor(calculated.misc.dragons.most_damage.best).toLocaleString() %></span>
</span>
<br>
<% } %>

<!-- Fastest Kill -->
<% if (calculated.misc.dragons.fastest_kill !== undefined) { %>
<% if (calculated.misc.dragons.fastest_kill !== undefined && Object.keys(calculated.misc.dragons.fastest_kill).length) { %>
<% tooltip = "";

const formatTime = (ms) => (ms < 1000 ? `0.${ms}` : moment.duration(ms, "milliseconds").format("m:ss.SSS")) + "s";

for (const key in calculated.misc.dragons.fastest_kill) {
if (key === "best") {
continue;
}

tooltip += `<span class="stat-name">${helper.capitalizeFirstLetter(key)}: </span><span class="stat-value">${moment.duration(calculated.misc.dragons.fastest_kill[key], "milliseconds").format("m:ss.SSS")}s</span><br>`;
tooltip += `<span class="stat-name">${helper.capitalizeFirstLetter(key)}: </span><span class="stat-value">${formatTime(calculated.misc.dragons.fastest_kill[key])}</span><br>`;
} %>

<span data-tippy-content='<%= tooltip %>'>
<% if (tooltip) { %><span data-tippy-content='<%= tooltip %>'><% } else { %><span><% } %>
<span class="stat-name">Fastest Kill: </span>
<span class="stat-value"><%= moment.duration(calculated.misc.dragons.fastest_kill.best, "milliseconds").format("m:ss.SSS") %>s</span>
<span class="stat-value"><%= formatTime(calculated.misc.dragons.fastest_kill.best) %></span>
</span>
<br>
<% } %>


<!-- Last Hits (Kills) -->
<% if (calculated.misc.dragons.kills !== undefined) { %>
<% if (calculated.misc.dragons.kills !== undefined && Object.keys(calculated.misc.dragons.kills).length) { %>
<% tooltip = "";
for (const key in calculated.misc.dragons.kills) {
if (key === "total") {
Expand All @@ -56,15 +59,15 @@
tooltip += `<span class="stat-name">${helper.capitalizeFirstLetter(key)}: </span><span class="stat-value">${calculated.misc.dragons.kills[key].toLocaleString()}</span><br>`;
} %>

<span data-tippy-content='<%= tooltip %>'>
<% if (tooltip) { %><span data-tippy-content='<%= tooltip %>'><% } else { %><span><% } %>
<span class="stat-name">Last Hits: </span>
<span class="stat-value"><%= calculated.misc.dragons.kills.total.toLocaleString() %></span>
</span>
<br>
<% } %>

<!-- Deaths -->
<% if (calculated.misc.dragons.deaths !== undefined) { %>
<% if (calculated.misc.dragons.deaths !== undefined && Object.keys(calculated.misc.dragons.deaths).length) { %>
<% tooltip = "";
for (const key in calculated.misc.dragons.deaths) {
if (key === "total") {
Expand All @@ -73,7 +76,8 @@

tooltip += `<span class="stat-name">${helper.capitalizeFirstLetter(key)}: </span><span class="stat-value">${calculated.misc.dragons.deaths[key].toLocaleString()}</span><br>`;
} %>
<span data-tippy-content='<%= tooltip %>'>

<% if (tooltip) { %><span data-tippy-content='<%= tooltip %>'><% } else { %><span><% } %>
<span class="stat-name">Deaths: </span>
<span class="stat-value"><%= calculated.misc.dragons.deaths.total.toLocaleString() %></span>
</span>
Expand All @@ -99,4 +103,4 @@
<span class="stat-value"><%= calculated.misc.endstone_protector.deaths.toLocaleString() %></span>
<br>
</p>
<% } %>
<% } %>