Merge branch 'SkyCryptWebsite:development' into power

SkyCryptWebsite · Jul 11, 2023 · 7c98a24 · 7c98a24
2 parents 13eac5d + a5ce8f6
commit 7c98a24
Show file tree

Hide file tree

Showing 14 changed files with 645 additions and 45 deletions.
diff --git a/common/constants/enchantments.js b/common/constants/enchantments.js
@@ -66,7 +66,9 @@ export const MAX_ENCHANTS = new Set([
   "Prosecute VI",
   "Protection VII",
   "Punch II",
+  "Quantum V",
   "Rainbow I",
+  "Reflection V",
   "Rejuvenate V",
   "Replenish I",
   "Respiration III",
@@ -89,6 +91,7 @@ export const MAX_ENCHANTS = new Set([
   "Thunderbolt VI",
   "Thunderlord VII",
   "Titan Killer VII",
+  "Transylvanian V",
   "Triple-Strike V",
   "True Protection I",
   "Turbo-Cacti V",

diff --git a/common/constants/stats.js b/common/constants/stats.js
@@ -237,6 +237,33 @@ export const STATS_DATA = {
     suffix: "",
     color: "3",
   },
+  mana_regen: {
+    name: "Mana Regen",
+    nameLore: "Mana Regen",
+    nameShort: "Mana Regen",
+    nameTiny: "MPR",
+    symbol: "🗲",
+    suffix: "",
+    color: "b",
+  },
+  rift_time: {
+    name: "Rift Time",
+    nameLore: "Rift Time",
+    nameShort: "Rift Time",
+    nameTiny: "RT",
+    symbol: "ф",
+    suffix: "",
+    color: "a",
+  },
+  undead: {
+    name: "Undead",
+    nameLore: "Undead",
+    nameShort: "Undead",
+    nameTiny: "U",
+    symbol: "༕",
+    suffix: "",
+    color: "2",
+  },
 };
 
 const symbols = {

diff --git a/package.json b/package.json
@@ -80,7 +80,7 @@
     "sharp": "^0.30.7",
     "sitemap": "^7.1.1",
     "skinview3d": "^2.2.1",
-    "skyhelper-networth": "^1.12.10",
+    "skyhelper-networth": "^1.14.1",
     "tippy.js": "^6.3.7",
     "twemoji": "^14.0.2",
     "upng-js": "^2.1.0",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/public/resources/scss/stats.scss b/public/resources/scss/stats.scss
@@ -2008,12 +2008,14 @@ inventory-view {
 .collections,
 .minions,
 .stat-farming-crops,
-.sea-creatures {
+.sea-creatures,
+.trophy-fish {
   display: flex;
   flex-wrap: wrap;
   gap: 8px;
 
-  &.sea-creatures {
+  &.sea-creatures,
+  &.trophy-fish {
     gap: 15px;
   }
 }
@@ -2065,6 +2067,63 @@ inventory-view {
   font-size: 14px;
 }
 
+.trophy-fish-data {
+  font-size: 16px;
+  font-weight: 450;
+
+  .trophy-fish-info {
+    margin-bottom: 2px;
+
+    .trophy-fish-amount {
+      color: rgba(var(--text-rgb), 0.7);
+      font-weight: 500;
+    }
+  }
+
+  .trophy-fish-count {
+    display: grid;
+    grid-template-columns: repeat(2, auto 1fr);
+    gap: 0px 4px;
+    height: 44px;
+
+    text-align: left;
+    align-items: center;
+  }
+
+  .count-value {
+    height: 22px;
+
+    svg {
+      width: 20px;
+      height: 22px;
+    }
+  }
+
+  .count-format {
+    height: 12px;
+    width: 12px;
+    border-radius: 50%;
+  }
+
+  .bronze-count {
+    background-color: #a85c03;
+  }
+
+  .gold-count {
+    background-color: #feb801;
+  }
+
+  .silver-count {
+    background-color: #b4b4b5;
+    margin-left: 10px;
+  }
+
+  .diamond-count {
+    background-color: #68ecff;
+    margin-left: 10px;
+  }
+}
+
 .narrow-info-header {
   position: absolute;
   top: 0;
@@ -2381,7 +2440,8 @@ inventory-view {
   .collections,
   .minions,
   .stat-farming-crops,
-  .sea-creatures {
+  .sea-creatures,
+  .trophy-fish {
     flex-wrap: nowrap;
     overflow-x: auto;
     margin-left: calc(-1 * var(--padding));
@@ -2391,7 +2451,8 @@ inventory-view {
       contain-intrinsic-size: 200px 64px;
     }
 
-    &.sea-creatures {
+    &.sea-creatures,
+    &.trophy-fish {
       @supports (contain-intrinsic-size: 140px 230px) {
         contain-intrinsic-size: 140px 230px;
       }

diff --git a/src/constants.js b/src/constants.js
@@ -18,5 +18,6 @@ export * from "./constants/random-emoji.js";
 export * from "./constants/skills.js";
 export * from "./constants/skins-animations.js";
 export * from "./constants/tags.js";
+export * from "./constants/trophy-fish.js";
 export * from "./constants/accessories.js";
 export * from "./constants/powers.js";
diff --git a/src/constants/accessories.js b/src/constants/accessories.js
@@ -74,7 +74,6 @@ const accessoryUpgrades = [
   ["KUUDRA_FOLLOWER_ARTIFACT", "KUUDRA_FOLLOWER_RELIC"],
   ["AGARIMOO_TALISMAN", "AGARIMOO_RING", "AGARIMOO_ARTIFACT"],
   ["BLOOD_DONOR_TALISMAN", "BLOOD_DONOR_RING", "BLOOD_DONOR_ARTIFACT"],
-  ["CRUX_TALISMAN_1", "CRUX_TALISMAN_2", "CRUX_TALISMAN_3", "CRUX_TALISMAN_4", "CRUX_TALISMAN_5", "CRUX_TALISMAN_6"],
   ["LUSH_TALISMAN", "LUSH_RING", "LUSH_ARTIFACT"],
 ];
 
@@ -96,6 +95,17 @@ const ignoredAccessories = [
   "HOCUS_POCUS_CIPHER",
   "TINY_DANCER",
   "MINIATURIZED_TUBULATOR",
+  "PUNCHCARD_ARTIFACT",
+  "HARMONIOUS_SURGERY_TOOLKIT",
+  "CRUX_TALISMAN_1",
+  "CRUX_TALISMAN_2",
+  "CRUX_TALISMAN_3",
+  "CRUX_TALISMAN_4",
+  "CRUX_TALISMAN_5",
+  "CRUX_TALISMAN_6",
+  "WARDING_TRINKET",
+  "RING_OF_BROKEN_LOVE",
+  "GARLIC_FLAVORED_GUMMY_BEAR",
 ];
 
 export const accessoryAliases = {

diff --git a/src/constants/misc.js b/src/constants/misc.js
@@ -163,6 +163,7 @@ export const AREA_NAMES = {
   winter: "Jerry's Workshop",
   instanced: "Kuudra's End",
   garden: "The Garden",
+  rift: "Rift",
 };
 
 export const COLOR_NAMES = {