merge development into production

common/constants/stats.js

@@ -245,15 +245,6 @@ export const STATS_DATA = {
     suffix: "",
     color: "a",
   },
-  undead: {
-    name: "Undead",
-    nameLore: "Undead",
-    nameShort: "Undead",
-    nameTiny: "U",
-    symbol: "༕",
-    suffix: "",
-    color: "2",
-  },
   alchemy_wisdom: {
     name: "Alchemy Wisdom",
     nameLore: "Alchemy Wisdom",
@@ -360,6 +351,13 @@ export const STATS_DATA = {
     nameTiny: "BPC",
     symbol: "ൠ",
   },
+  swing_range: {
+    name: "Swing Range",
+    nameLore: "Swing Range",
+    nameShort: "Swing Range",
+    nameTiny: "SR",
+    symbol: "Ⓢ",
+  },
 };
 
 export const HIDDEN_STATS = [
@@ -380,6 +378,8 @@ const symbols = {
   soulflow: "⸎",
   dungeon_upgrade: "⚚",
   dye: "✿",
+  undead: "༕",
+  arachnal: "Ж",
 };
 for (const stat in STATS_DATA) {
   symbols[stat] = STATS_DATA[stat].symbol;

includes/footer.ejs

@@ -1,4 +1,4 @@
-<script src="https://twemoji.maxcdn.com/v/latest/twemoji.min.js" crossorigin="anonymous"></script>
+<script src="https://cdn.jsdelivr.net/npm/@twemoji/api@latest/dist/twemoji.min.js" crossorigin="anonymous"></script>
 
 <script>
   window.addEventListener('load', (event) => {

includes/header.ejs

@@ -53,6 +53,7 @@
           <ul>
             <li>Resource Pack: <a rel="noreferrer" href="https://www.planetminecraft.com/texture_pack/16x132-dandelion-cute-and-swirly/" target="_blank">Dandelion</a> by <span class="name">Steelfeathers</span></li>
             <li>Shaders: <a rel="noreferrer" href="https://sildurs-shaders.github.io/" target="_blank">Sildur's Vibrant Shaders</a> by <span class="name">Sildur</span></li>
+            <li>April Fools 2024: <a rel="noreferrer" href="https://wall.alphacoders.com/big.php?i=684569" target="_blank">Wallpaper</a> by <span class="name">Tinkerbell</span></li>
           </ul>
         </li>
         <li>Libraries:

public/resources/scss/shared.scss

@@ -115,6 +115,25 @@
     --§f: #929292;
   }
 
+  .april-fools-2024 {
+    --§0: #ff1493;
+    --§1: #ff4500;
+    --§2: #ff00b3;
+    --§3: #ff2f7f;
+    --§4: #4c0b1d;
+    --§5: #e87da7;
+    --§6: #d95c8f;
+    --§7: #fd3995;
+    --§8: #c556b3;
+    --§9: #f5b0c7;
+    --§a: #f9d5e1;
+    --§b: #8f1f47;
+    --§c: #4c0b1d;
+    --§d: #b93e6d;
+    --§e: #ff69b4;
+    --§f: #fcf0f5;
+  }
+
   &:not(.light),
   &:not(.light) .nice-colors-auto,
   .nice-colors-light {

public/resources/themes/april-fools-2024.json

@@ -0,0 +1,20 @@
+{
+  "name": "April Fools 2024 Theme",
+  "author": "DuckySoLucky",
+  "schema": 2,
+  "images": {
+    "bg": "/resources/img/themes/april-fools-2024/bg.webp"
+  },
+  "backgrounds": {
+    "skillbar": { "type": "stripes", "angle": "45deg", "colors": ["#fc46aa", "#F699CD"], "width": 10 },
+    "maxedbar": { "type": "stripes", "angle": "45deg", "colors": ["#fa86c4", "#F25278"], "width": 10 }
+  },
+  "colors": {
+    "logo": "#fc46aa",
+    "link": "#fc46aa",
+    "icon": "#fc46aa",
+    "hover": "#fc46aa",
+    "maxed": "#d95c8f",
+    "gold": "#e87da7"
+  }
+}

public/resources/ts/elements/theme-list.ts

@@ -12,6 +12,7 @@ const themeURLs = [
   "draconic",
   "burning-cinnabar",
   "candycane",
+  "april-fools-2024",
 ].map((name) => `/resources/themes/${name}.json`);
 
 themeURLs.push(...JSON.parse(localStorage.getItem("customThemeUrls") ?? "[]"));

public/resources/ts/stats-defer.ts

@@ -6,6 +6,7 @@ import { renderLore } from "../../../common/formatting.js";
 
 import { getPlayerStats } from "./calculate-player-stats";
 import { RARITY_COLORS } from "../../../common/constants.js";
+import { owoifyMessage } from "../../../src/constants/themes/april-fools-2024/index.js";
 
 import("./elements/inventory-view");
 import("./elements/guild-button");
@@ -242,6 +243,8 @@ function fillLore(element: HTMLElement) {
     return;
   }
 
+  const owofiyLore = localStorage.getItem("currentThemeUrl") === "/resources/themes/april-fools-2024.json";
+
   const itemNameString = ((item as Item).tag?.display?.Name ?? item.display_name ?? "???") as string;
   const colorCode = itemNameString.match(/^§([0-9a-fklmnor])/i);
   if (colorCode && colorCode[1]) {
@@ -261,6 +264,10 @@ function fillLore(element: HTMLElement) {
     itemNameContent.innerHTML = `[Lvl ${(item as Pet).level.level}] ${item.display_name}`;
   }
 
+  if (owofiyLore === true) {
+    itemNameContent.innerHTML = owoifyMessage(itemNameContent.innerHTML);
+  }
+
   if (item.texture_path) {
     itemIcon.style.backgroundImage = 'url("' + item.texture_path + '")';
     itemIcon.className = "stats-piece-icon item-icon custom-icon";
@@ -280,9 +287,11 @@ function fillLore(element: HTMLElement) {
   if ("lore" in item) {
     itemLore.innerHTML = item.lore;
   } else if ("tag" in item && Array.isArray(item.tag.display?.Lore)) {
-    itemLore.innerHTML = item.tag.display.Lore.map(
-      (line: string) => '<span class="lore-row">' + renderLore(line) + "</span>",
-    ).join("");
+    itemLore.innerHTML = item.tag.display.Lore.map((line: string) => {
+      const newLine = owofiyLore ? owoifyMessage(line) : line;
+
+      return '<span class="lore-row">' + renderLore(newLine) + "</span>";
+    }).join("");
   } else {
     itemLore.innerHTML = "";
   }
@@ -921,3 +930,40 @@ export function formatNumber(number: number, floor: boolean, rounding = 10): str
     element.appendChild(node);
   });
 }
+
+const currentTheme = localStorage.getItem("currentThemeUrl");
+if (currentTheme === "/resources/themes/april-fools-2024.json") {
+  document.querySelectorAll("*").forEach((element) => {
+    // return lore text color to default color (so it's not pink)
+    if (element.classList.contains("item-lore")) {
+      element.classList.add("nice-colors-light");
+      return;
+    }
+
+    element.classList.add("april-fools-2024");
+
+    const owoifyElements = [
+      "stat-name",
+      "stat-value",
+      "stat-sub-header",
+      "narrow-info-name",
+      "stat-header",
+      "inventory-tab-name",
+      "category-name",
+      "nav-item",
+      "text-stats-for",
+      "pet-name",
+      "pet-level",
+      "skill-name",
+      "kill-entity",
+      "tier-name",
+      "skill-name",
+      "rank-name",
+      "player-name",
+      "profile-name",
+    ];
+    if (owoifyElements.some((owoifyElement) => element.classList.contains(owoifyElement))) {
+      element.innerHTML = owoifyMessage(element.innerHTML);
+    }
+  });
+}

public/resources/ts/themes.ts

@@ -196,7 +196,9 @@ function processTheme(theme: Theme): ProcessedTheme {
   return processedTheme;
 }
 
+const REFRESH_THEMES = ["/resources/themes/april-fools-2024.json"];
 export async function loadTheme(themeUrl: string): Promise<void> {
+  const oldThemeUrl = localStorage.getItem("currentThemeUrl") ?? "";
   const theme = await getTheme(themeUrl);
 
   const processedTheme = processTheme(theme);
@@ -209,6 +211,12 @@ export async function loadTheme(themeUrl: string): Promise<void> {
 
   localStorage.setItem("currentThemeUrl", themeUrl);
   localStorage.setItem("processedTheme", JSON.stringify(processedTheme));
+
+  if (themeUrl !== oldThemeUrl) {
+    if (REFRESH_THEMES.includes(themeUrl) || REFRESH_THEMES.includes(oldThemeUrl)) {
+      location.reload();
+    }
+  }
 }
 
 window.addEventListener("storage", (event) => {

src/app.js

@@ -29,7 +29,6 @@ import * as constants from "./constants.js";
 import * as custom_resources from "./custom-resources.js";
 import { SitemapStream, streamToPromise } from "sitemap";
 import { createGzip } from "zlib";
-import twemoji from "twemoji";
 import cookieParser from "cookie-parser";
 
 import * as apiRoute from "./routes/api.js";
@@ -219,8 +218,6 @@ async function getFavoritesFormUUIDs(uuids) {
 async function getExtra(page = null, favoriteUUIDs = [], cacheOnly) {
   const output = {};
 
-  output.twemoji = twemoji;
-
   output.packs = custom_resources.getPacks();
 
   output.isFoolsDay = isFoolsDay;