Merge pull request #2232 from DuckySoLucky/fixDoogensOrSmthIdk

fix: dungeons error
SkyCryptWebsite · Apr 18, 2024 · ec959b6 · ec959b6
2 parents 008aa1f + 0544a20
commit ec959b6
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 13 deletions.
diff --git a/src/helper.js b/src/helper.js
@@ -664,6 +664,10 @@ export function generateGemLore(type, tier, rarity) {
   const lore = [];
   const stats = [];
 
+  if (!GEMSTONES[type.toUpperCase()]) {
+    return "§c§oMISSING GEMSTONE DATA§r";
+  }
+
   // Gem color
   const color = `§${GEMSTONES[type.toUpperCase()].color}`;
 

diff --git a/views/sections/stats/dungeons.ejs b/views/sections/stats/dungeons.ejs
@@ -19,22 +19,20 @@ function formatDungeonStat(stat, type) {
   <a class="stat-anchor" id="Dungeons"></a>
   <h2 class="stat-header">Dungeons</h2>
   <div class="stat-content">
-    <% if (calculated.dungeons.catacombs.visited === false) { %>
+    <% if (!calculated.dungeons.catacombs?.visited) { %>
       <p class="stat-raw-values">
         <%= calculated.display_name %> hasn't entered a dungeon yet.
       </p>
     <% } else { %>
-      <% if (calculated.dungeons.catacombs.visited) { %>
-        <div class="skill-bars">
-          <skill-component skill="catacombs" type="dungeon" icon="<%= skillItems.catacombs %>"></skill-component>
-
-          <skill-component skill="healer" type="dungeon_class" icon="<%= skillItems.healer %>"></skill-component>
-          <skill-component skill="mage" type="dungeon_class" icon="<%= skillItems.mage %>"></skill-component>
-          <skill-component skill="berserk" type="dungeon_class" icon="<%= skillItems.berserk %>"></skill-component>
-          <skill-component skill="archer" type="dungeon_class" icon="<%= skillItems.archer %>"></skill-component>
-          <skill-component skill="tank" type="dungeon_class" icon="<%= skillItems.tank %>"></skill-component>
-        </div>
-      <% } %>
+      <div class="skill-bars">
+        <skill-component skill="catacombs" type="dungeon" icon="<%= skillItems.catacombs %>"></skill-component>
+
+        <skill-component skill="healer" type="dungeon_class" icon="<%= skillItems.healer %>"></skill-component>
+        <skill-component skill="mage" type="dungeon_class" icon="<%= skillItems.mage %>"></skill-component>
+        <skill-component skill="berserk" type="dungeon_class" icon="<%= skillItems.berserk %>"></skill-component>
+        <skill-component skill="archer" type="dungeon_class" icon="<%= skillItems.archer %>"></skill-component>
+        <skill-component skill="tank" type="dungeon_class" icon="<%= skillItems.tank %>"></skill-component>
+      </div>
 
       <p class="stat-raw-values" style="margin: 20px 0;">
         <!-- Selected Class-->
@@ -156,7 +154,7 @@ function formatDungeonStat(stat, type) {
       <% if (calculated.dungeons.master_catacombs !== undefined) { %>
         <p class="stat-sub-header">Master Catacombs</p>
 
-        <% if (calculated.dungeons.master_catacombs.visited === false) { %>
+        <% if (!calculated.dungeons.master_catacombs?.visited) { %>
           <p class="stat-raw-values"><%= calculated.display_name %> hasn't completed any Master Catacombs floor yet.</p>
         <% } else { %>
           <div class="floor-containers narrow-info-container-wrapper">