From 9d04685c9cc2c8d64072294da52e2a6253f4140b Mon Sep 17 00:00:00 2001 From: DuckySoLucky Date: Sun, 21 Apr 2024 19:38:34 +0200 Subject: [PATCH] feat: add new forge items --- src/constants/forge.js | 37 ++++++++++++++++++++++++++ src/stats/mining.js | 4 ++- views/sections/stats/skills/mining.ejs | 2 +- 3 files changed, 41 insertions(+), 2 deletions(-) diff --git a/src/constants/forge.js b/src/constants/forge.js index 5684fc94b8..4fb11fcce4 100644 --- a/src/constants/forge.js +++ b/src/constants/forge.js @@ -67,6 +67,43 @@ export const FORGE_TIMES = { FORGE_TRAVEL_SCROLL: 5 * 60, CRYSTAL_HOLLOWS_TRAVEL_SCROLL: 10 * 60, DIAMONITE: 6 * 60, + + REFINED_TUNGSTEN: 6 * 60, + REFINED_UMBER: 6 * 60, + TUNGSTEN_PLATE: 0.5, + UMBER_PLATE: 0.5, + GLACITE_AMALGAMATION: 4 * 60, + PERFECT_ONYX_GEM: 20 * 60, + PERFECT_CITRINE_GEM: 20 * 60, + PERFECT_AQUAMARINE_GEM: 20 * 60, + PERFECT_PERIDOT_GEM: 20 * 60, + PERFECT_PLATE: 30 * 60, + MINING_3_TRAVEL_SCROLL: 5 * 60, + BEJEWELED_COLLAR: 2 * 60, + CHISEL: 0.5, + TUNGSTEN_KEY: 30 * 60, + UMBER_KEY: 30 * 60, + FRIGID_HUSK: 10 * 60, + BASE_CAMP_TRAVEL_SCROLL: 10 * 60, + LVL_1_LEGENDARY_AMMONITE: 12 * 24 * 60, + LVL_1_LEGENDARY_MOLE: 3 * 24 * 60, + SECRET_RAILROAD_PASS: 0.5, + LVL_1_LEGENDARY_TYRANNOSAURUS: 7 * 24 * 60, + LVL_1_LEGENDARY_SPINOSAURUS: 7 * 24 * 60, + LVL_1_LEGENDARY_GOBLIN: 7 * 24 * 60, + LVL_1_LEGENDARY_ANKYLOSAURUS: 7 * 24 * 60, + LVL_1_LEGENDARY_PENGUIN: 7 * 24 * 60, + LVL_1_LEGENDARY_MAMMOTH: 7 * 24 * 60, + DWARVEN_HANDWARMERS: 4 * 60, + REINFORCED_CHISEL: 12 * 60, + DWARVEN_METAL: 24 * 60, + PORTABLE_CAMPFIRE: 30 * 60, + TUNGSTEN_KEYCHAIN: 6 * 60, + GLACITE_CHISEL: 18 * 60, + PERFECT_CHISEL: 24 * 60, + DIVAN_PENDANT: 7 * 24 * 60, + POWER_RELIC: 8 * 60, + SKELETON_KEY: 30 * 60 * 1000, }; export const QUICK_FORGE_MULTIPLIER = { diff --git a/src/stats/mining.js b/src/stats/mining.js index d9b2a16e3c..611022ff1d 100644 --- a/src/stats/mining.js +++ b/src/stats/mining.js @@ -95,6 +95,8 @@ async function getForge(userProfile) { timeFinishedText: "", }; + const dbObject = constants.ITEMS.get(item.id); + if (item.id in constants.FORGE_TIMES) { let forgeTime = constants.FORGE_TIMES[item.id] * 60 * 1000; const quickForge = userProfile.mining_core?.nodes?.forge_time; @@ -102,13 +104,13 @@ async function getForge(userProfile) { forgeTime *= constants.QUICK_FORGE_MULTIPLIER[quickForge]; } - const dbObject = constants.ITEMS.get(item.id); forgeItem.name = item.id == "PET" ? "[Lvl 1] Ammonite" : dbObject ? dbObject.name : item.id; const timeFinished = item.startTime + forgeTime; forgeItem.timeFinished = timeFinished; forgeItem.timeFinishedText = moment(timeFinished).fromNow(); } else { + forgeItem.name = dbObject?.name ?? helper.titleCase(item.id); forgeItem.id = `UNKNOWN-${item.id}`; } diff --git a/views/sections/stats/skills/mining.ejs b/views/sections/stats/skills/mining.ejs index edc3d18486..4048e90bc0 100644 --- a/views/sections/stats/skills/mining.ejs +++ b/views/sections/stats/skills/mining.ejs @@ -238,7 +238,7 @@ function itemIcon(item, classes) { %> <%= process.name %> - <%= process.timeFinished < Date.now() ? "ended" : `ending ${process.timeFinishedText}`%> <% } else { %> - Unknown item + <%= process.name %>