@@ -1085,6 +1104,10 @@
let fusionData = null;
let enchantsData = null;
let craftRecipesData = null;
+ let essenceRecipes = {};
+ let itemNames = {};
+ let slayerXp = {};
+ let dataManifest = null;
let productsData = {};
let shardPrices = {};
let bookPrices = {};
@@ -1108,7 +1131,8 @@
let activeMemberData = null;
let unlockedOnlyFilter = true;
- const BAZAAR_TAX = 0.01125;
+ let BAZAAR_TAX = 0.01125;
+ const DATA_STALE_HOURS = 48;
// Specific Skyblock Enchantment Exceptions
const EXPLICIT_LIMITS = {
@@ -1165,40 +1189,6 @@
"DEFAULT": 71680
};
- // Essence Shop Conversions
- const ESSENCE_RECIPES = {
- 'INFINITE_SPIRIT_LEAP': {
- name: 'Infinileap',
- category: 'wither',
- shop: 'Wither Essence Shop',
- materials: { 'ESSENCE_WITHER': 25000 }
- },
- 'INFINITE_SUPERBOOM_TNT': {
- name: 'Infinityboom TNT',
- category: 'undead',
- shop: 'Undead Essence Shop',
- materials: { 'ESSENCE_UNDEAD': 50000 }
- },
- 'ENCHANTMENT_EXPERIENCE_5': {
- name: 'Experience V Book',
- category: 'ice',
- shop: 'Ice Essence Shop',
- materials: { 'ESSENCE_ICE': 15000 }
- },
- 'PERFECTLY_CUT_DIAMOND': {
- name: 'Perfectly Cut Diamond',
- category: 'diamond',
- shop: 'Diamond Essence Shop',
- materials: { 'ESSENCE_DIAMOND': 1000, 'REFINED_DIAMOND': 2 }
- },
- 'WOODEN_BAIT': {
- name: 'Wooden Bait',
- category: 'forest',
- shop: 'Forest Essence Shop',
- materials: { 'ESSENCE_FOREST': 100 }
- }
- };
-
const cfg = {
inputMode: 'instabuy',
outputMode: 'instasell',
@@ -1307,9 +1297,7 @@
// Reset filter buttons
document.querySelectorAll('.ctrl-group .btn').forEach(btn => {
if (btn.textContent === 'All') btn.classList.add('active');
- else if (['Leg', 'Epic', 'Rare', 'Ultimate', 'Turbo', 'Regular', 'Uncommon', 'Wither', 'Undead', 'Ice', 'Diamond'].includes(btn.textContent)) {
- btn.classList.remove('active');
- }
+ else if (btn.closest('[id^="filter-group-"]')) btn.classList.remove('active');
});
const bannerIcon = document.getElementById('banner-icon');
@@ -1371,11 +1359,12 @@
const nc = craftRecipesData ? Object.keys(craftRecipesData).length : 1852;
const profStr = activeMemberData ? `Profile: ${getActiveProfileCuteName()}` : `Database: ${nc} Recipes`;
document.getElementById('stat-meta1').innerHTML = profStr;
- document.getElementById('stat-meta2').innerHTML = activeMemberData ? `Unlocks: Filter Active` : `Type: Items Folder JSONs`;
+ document.getElementById('stat-meta2').innerHTML = activeMemberData ? `Unlocks: Filter Active` : `Type: Synced Recipes`;
}
function updateEssenceStats() {
- document.getElementById('stat-meta1').innerHTML = `Shops: ${Object.keys(ESSENCE_RECIPES).length}`;
+ const shops = new Set(Object.values(essenceRecipes).map(r => r.shop));
+ document.getElementById('stat-meta1').innerHTML = `Shops: ${shops.size}`;
document.getElementById('stat-meta2').innerHTML = `Type: Essence Arbitrage`;
}
@@ -1385,21 +1374,37 @@
const userInput = document.getElementById('craft-username');
if (userInput && storedUser) userInput.value = storedUser;
+ const storedTax = localStorage.getItem('bazaar_tax_pct');
+ if (storedTax !== null) {
+ document.getElementById('tax-pct').value = storedTax;
+ BAZAAR_TAX = parseFloat(storedTax) / 100;
+ }
+
setStatus('Loading fusion-data.json, enchants.json, and craft-recipes.json...');
try {
- const [fResp, eResp, cResp] = await Promise.all([
+ const [fResp, eResp, cResp, gResp, mResp] = await Promise.all([
fetch('./fusion-data.json'),
fetch('./enchants.json'),
- fetch('./craft-recipes.json')
+ fetch('./craft-recipes.json'),
+ fetch('./game-data.json'),
+ fetch('./data-manifest.json')
]);
if (!fResp.ok) throw new Error('Could not load fusion-data.json');
fusionData = await fResp.json();
-
+
if (eResp.ok) enchantsData = await eResp.json();
if (cResp.ok) craftRecipesData = await cResp.json();
+ if (gResp.ok) {
+ const gameData = await gResp.json();
+ essenceRecipes = gameData.essenceRecipes;
+ itemNames = gameData.itemNames;
+ slayerXp = gameData.slayerXp;
+ }
+ if (mResp.ok) dataManifest = await mResp.json();
updateShardStats();
+ updateDataStatus();
applyPreset('insta');
setBatchQty(10);
@@ -1612,11 +1617,7 @@
}
function getSlayerLevelFromXp(type, xp) {
- const reqs = [0, 5, 15, 200, 1000, 5000, 20000, 100000, 400000, 1000000];
- for (let lvl = reqs.length - 1; lvl >= 1; lvl--) {
- if (xp >= reqs[lvl]) return lvl;
- }
- return 0;
+ return (slayerXp[type] || []).filter(needed => xp >= needed).length;
}
async function refreshPrices() {
@@ -1644,12 +1645,53 @@
renderCurrentModule();
setStatus(statusText());
updateTs();
+ updateDataStatus();
triggerStarPopupIfNeeded();
} catch (e) {
setStatus(`ERROR: Bazaar fetch failed (${esc(e.message)})`);
}
}
+ /* โโโ Data Freshness โโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโ */
+ function formatDataAge(ms) {
+ const hours = ms / 3600000;
+ if (hours < 1) return 'under 1h ago';
+ if (hours < 48) return `${Math.floor(hours)}h ago`;
+ return `${Math.floor(hours / 24)}d ago`;
+ }
+
+ // Recipes come from community projects, so say so when they might be behind the game.
+ function updateDataStatus() {
+ const warnings = [];
+ const label = document.getElementById('sb-data');
+
+ if (dataManifest?.syncedAt) {
+ const syncedAt = new Date(dataManifest.syncedAt);
+ const age = Date.now() - syncedAt.getTime();
+ label.textContent = `RECIPES SYNCED ${formatDataAge(age)}`;
+ label.title = `Synced ${syncedAt.toLocaleString()} for SkyBlock ${dataManifest.gameVersion}`;
+ if (age > DATA_STALE_HOURS * 3600000) {
+ warnings.push(`Recipe and fusion data last synced ${formatDataAge(age)}, so automatic updates may have stopped. Check recipes in-game before buying.`);
+ }
+ } else {
+ label.textContent = 'RECIPES SYNCED: UNKNOWN';
+ warnings.push("Couldn't check when recipe and fusion data last synced. Check recipes in-game before buying.");
+ }
+
+ if (fusionData) {
+ const known = new Set(Object.values(fusionData.shards).map(s => s.internal_id));
+ const unknown = Object.keys(productsData).filter(id => id.startsWith('SHARD_') && !known.has(id));
+ if (unknown.length) {
+ const names = unknown.map(id => cleanItemName(id.replace('SHARD_', ''))).join(', ');
+ warnings.push(`${unknown.length === 1 ? 'A shard' : `${unknown.length} shards`} on the Bazaar ${unknown.length === 1 ? 'has' : 'have'} no fusion data yet, so flips using ${unknown.length === 1 ? 'it are' : 'them are'} missing: ${names}.`);
+ }
+ }
+
+ const el = document.getElementById('data-warning');
+ el.innerHTML = warnings.map(w => `
[!] ${esc(w)}
`).join('');
+ el.style.display = warnings.length ? 'block' : 'none';
+ }
+
/* โโโ Price Builders โโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโ */
function parseOrderBook(prod) {
const qs = prod.quick_status || {};
@@ -2220,6 +2262,7 @@
}
function cleanItemName(productId) {
+ if (itemNames[productId]) return itemNames[productId];
const customNames = {
"BOOSTER_COOKIE": "Booster Cookie",
"RECOMBOBULATOR_3000": "Recombobulator 3000",
@@ -2964,7 +3007,7 @@
};
}
- /* โโโ Craft Flipper (Loaded directly from items/ folder recipes) โโ */
+ /* โโโ Craft Flipper (craft-recipes.json, see scripts/sync-data.mjs) โโ */
function computeCraftFlips() {
if (!Object.keys(productsData).length || !craftRecipesData) return;
const userTargetQty = Math.max(1, parseInt(cfg.batchQty, 10) || 1);
@@ -3099,13 +3142,21 @@
const isInstaBuy = (cfg.inputMode === 'instabuy');
const isInstaSell = (cfg.outputMode === 'instasell');
const out = [];
+ const categories = new Set();
- for (const [itemId, meta] of Object.entries(ESSENCE_RECIPES)) {
+ for (const [itemId, meta] of Object.entries(essenceRecipes)) {
const prod = productsData[itemId];
if (!prod) continue;
- const pOut = parseOrderBook(prod);
const mats = meta.materials;
+ // A material with no Bazaar price would count as free and fake the profit
+ if (!Object.keys(mats).every(m => productsData[m])) continue;
+ categories.add(meta.category);
+
+ const pOut = parseOrderBook(prod);
+ const outputPerPurchase = meta.count || 1;
+ const totalPurchases = Math.ceil(userTargetQty / outputPerPurchase);
+ const actualProducedUnits = totalPurchases * outputPerPurchase;
let totalMatCost = 0.0;
let maxExecutable = Infinity;
@@ -3113,10 +3164,8 @@
for (const [matId, qtyPerCraft] of Object.entries(mats)) {
const matProd = productsData[matId];
- if (!matProd) continue;
-
const pMat = parseOrderBook(matProd);
- const totalNeeded = qtyPerCraft * userTargetQty;
+ const totalNeeded = qtyPerCraft * totalPurchases;
let unitPrice = pMat.sell_offer_p;
if (isInstaBuy) {
@@ -3142,7 +3191,7 @@
let salePrice = pOut.sell_offer_p;
if (isInstaSell) {
- const sellRes = calculateWeightedInstaSell(pOut.sell_summary, userTargetQty);
+ const sellRes = calculateWeightedInstaSell(pOut.sell_summary, actualProducedUnits);
if (sellRes.filledQty > 0) salePrice = sellRes.avgPrice;
if (pOut.total_sell_avail < maxExecutable) maxExecutable = pOut.total_sell_avail;
} else {
@@ -3151,17 +3200,17 @@
if (maxExecutable === Infinity) maxExecutable = 999;
- const totalGrossRev = salePrice * userTargetQty;
+ const totalGrossRev = salePrice * actualProducedUnits;
const totalTax = totalGrossRev * BAZAAR_TAX;
const totalNetRev = totalGrossRev - totalTax;
const totalProfit = totalNetRev - totalMatCost;
if (totalProfit > 0) {
- const unitCost = totalMatCost / userTargetQty;
- const unitProfit = totalProfit / userTargetQty;
+ const unitCost = totalMatCost / actualProducedUnits;
+ const unitProfit = totalProfit / actualProducedUnits;
const roiPct = totalMatCost > 0 ? (totalProfit / totalMatCost * 100) : 0;
- const durations = calculateGenericDurations(matBreakdown, prod, userTargetQty);
+ const durations = calculateGenericDurations(matBreakdown, prod, actualProducedUnits);
// Max Total Time Filter
if (cfg.maxTotalTime !== null && durations.totalHours > cfg.maxTotalTime) {
@@ -3182,15 +3231,17 @@
salePrice,
unitProfit,
pct: roiPct,
- actualProducedUnits: userTargetQty,
+ actualProducedUnits,
maxExecutable,
- isOrderBookFullyAvailable: (maxExecutable >= userTargetQty),
+ isOrderBookFullyAvailable: (maxExecutable >= actualProducedUnits),
volume: pOut.volume,
durations
});
}
}
+ renderEssenceFilters(categories);
+
if (cfg.sortBy === 'percent') {
out.sort((a, b) => b.pct - a.pct);
} else if (cfg.sortBy === 'time') {
@@ -3203,6 +3254,19 @@
document.getElementById('sb-badge-essence').textContent = allEssenceResults.length;
}
+ // One button per essence type that currently has something sellable on the Bazaar
+ function renderEssenceFilters(categories) {
+ const group = document.getElementById('essence-filter-btns');
+ group.innerHTML = '';
+ for (const category of ['all', ...[...categories].sort()]) {
+ const btn = document.createElement('button');
+ btn.className = 'btn' + (activeFilterCategory === category ? ' active' : '');
+ btn.textContent = category === 'all' ? 'All' : category.split('_').map(w => w.charAt(0).toUpperCase() + w.slice(1)).join(' ');
+ btn.onclick = () => setFilterCategory(category, btn);
+ group.appendChild(btn);
+ }
+ }
+
/* โโโ Rendering Dispatcher โโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโโ */
function renderCurrentModule() {
if (currentModule === 'shards') renderShardResults();
@@ -3526,9 +3590,11 @@
let reqBadgeStr = '';
if (r.requirement) {
if (r.requirement.type === 'collection') {
- reqBadgeStr = ` | ๐ Req: ${r.requirement.collection_name} ${r.requirement.tier}`;
+ reqBadgeStr = ` | ๐ Req: ${esc(r.requirement.collection_name)} ${r.requirement.tier}`;
} else if (r.requirement.type === 'slayer') {
- reqBadgeStr = ` | โ๏ธ Req: ${r.requirement.name}`;
+ reqBadgeStr = ` | โ๏ธ Req: ${esc(r.requirement.name)}`;
+ } else {
+ reqBadgeStr = ` | ๐ Req: ${esc(r.requirement.name)}`;
}
}
@@ -3559,7 +3625,7 @@
- [VERIFIED RECIPE INGREDIENTS]:
+ [RECIPE INGREDIENTS]:
${matListStr}
@@ -3604,7 +3670,7 @@
#${rank}
- ${cat.toUpperCase()} ESSENCE
+ ${cat.replace(/_/g, ' ').toUpperCase()} ESSENCE
vol: ${fmt(r.volume)}/wk
@@ -3663,7 +3729,7 @@
}
function esc(s) {
- return String(s || '').replace(/&/g, '&').replace(//g, '>');
+ return String(s || '').replace(/&/g, '&').replace(//g, '>').replace(/"/g, '"').replace(/'/g, ''');
}
function setStatus(html) {
@@ -3743,6 +3809,14 @@
recompute();
}
+ function setBazaarTax(pct) {
+ const value = parseFloat(pct);
+ if (!(value >= 0 && value <= 100)) return;
+ BAZAAR_TAX = value / 100;
+ localStorage.setItem('bazaar_tax_pct', String(value));
+ recompute();
+ }
+
function setSortBy(sort) {
cfg.sortBy = sort;
['percent', 'profit', 'fusions', 'time'].forEach(k => {
diff --git a/scripts/publish-sync.sh b/scripts/publish-sync.sh
new file mode 100644
index 0000000..aadb2dc
--- /dev/null
+++ b/scripts/publish-sync.sh
@@ -0,0 +1,61 @@
+#!/usr/bin/env bash
+# Publishes what sync-data.mjs wrote. Run by .github/workflows/sync-data.yml.
+#
+# publish-sync.sh publish