Compare commits
5 Commits
v1.0.7
...
4ce8b41a4c
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
4ce8b41a4c | ||
|
|
0562b326c8 | ||
|
|
857a8477d7 | ||
|
|
fdbf57a6d6 | ||
|
|
4f7aab646b |
3
.gitignore
vendored
3
.gitignore
vendored
@@ -22,5 +22,8 @@ Thumbs.db
|
|||||||
.vscode/
|
.vscode/
|
||||||
.idea/
|
.idea/
|
||||||
|
|
||||||
|
# Token local (jamais commité)
|
||||||
|
.gitea-token
|
||||||
|
|
||||||
# Claude Code
|
# Claude Code
|
||||||
.claude/
|
.claude/
|
||||||
|
|||||||
@@ -21,12 +21,14 @@ function mergeDropStatsInto(target, source) {
|
|||||||
|
|
||||||
for (const [mobName, mobData] of Object.entries(sourceMobs)) {
|
for (const [mobName, mobData] of Object.entries(sourceMobs)) {
|
||||||
if (!mobName) continue;
|
if (!mobName) continue;
|
||||||
if (!target.mobs[mobName]) target.mobs[mobName] = { kills: 0, items: {} };
|
if (!target.mobs[mobName]) target.mobs[mobName] = { kills: 0, totalExp: 0, totalCols: 0, items: {} };
|
||||||
const t = target.mobs[mobName];
|
const t = target.mobs[mobName];
|
||||||
|
|
||||||
const kills = Number(mobData.kills) || 0;
|
const kills = Number(mobData.kills) || 0;
|
||||||
t.kills += kills;
|
t.kills += kills;
|
||||||
addedKills += kills;
|
addedKills += kills;
|
||||||
|
t.totalExp = (t.totalExp || 0) + (Number(mobData.totalExp) || 0);
|
||||||
|
t.totalCols = (t.totalCols || 0) + (Number(mobData.totalCols) || 0);
|
||||||
|
|
||||||
const items = mobData.items || {};
|
const items = mobData.items || {};
|
||||||
for (const [key, item] of Object.entries(items)) {
|
for (const [key, item] of Object.entries(items)) {
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "farm-tracker",
|
"name": "farm-tracker",
|
||||||
"version": "1.0.7",
|
"version": "1.0.9",
|
||||||
"description": "Suivi de loot Minecraft en direct, avec sauvegarde automatique des stats et des chances de drop.",
|
"description": "Suivi de loot Minecraft en direct, avec sauvegarde automatique des stats et des chances de drop.",
|
||||||
"main": "main.js",
|
"main": "main.js",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
|
|||||||
@@ -290,6 +290,7 @@
|
|||||||
.sessions-table td.hl{font-family:var(--font-mono);color:var(--text);}
|
.sessions-table td.hl{font-family:var(--font-mono);color:var(--text);}
|
||||||
.sessions-table td.dim{font-size:12px;color:var(--text-dim);}
|
.sessions-table td.dim{font-size:12px;color:var(--text-dim);}
|
||||||
.hist-empty{padding:40px 0;text-align:center;color:var(--text-dim);font-size:14px;line-height:1.8;}
|
.hist-empty{padding:40px 0;text-align:center;color:var(--text-dim);font-size:14px;line-height:1.8;}
|
||||||
|
.sessions-table tbody tr:hover td{background:rgba(255,255,255,.03);}
|
||||||
@media(max-width:760px){.charts-2col{grid-template-columns:1fr;}}
|
@media(max-width:760px){.charts-2col{grid-template-columns:1fr;}}
|
||||||
|
|
||||||
/* ---------- Graphes en direct ---------- */
|
/* ---------- Graphes en direct ---------- */
|
||||||
@@ -325,6 +326,31 @@
|
|||||||
.timer-card-bar{height:3px;background:var(--border);margin-top:10px;overflow:hidden;}
|
.timer-card-bar{height:3px;background:var(--border);margin-top:10px;overflow:hidden;}
|
||||||
.timer-card-bar-fill{height:100%;transition:width .9s linear;}
|
.timer-card-bar-fill{height:100%;transition:width .9s linear;}
|
||||||
.timer-empty-msg{color:var(--text-dim);font-size:13px;padding:20px 0;}
|
.timer-empty-msg{color:var(--text-dim);font-size:13px;padding:20px 0;}
|
||||||
|
|
||||||
|
/* --- Volume slider --- */
|
||||||
|
input[type=range]{-webkit-appearance:none;height:3px;background:var(--border);outline:none;cursor:pointer;flex:1;}
|
||||||
|
input[type=range]::-webkit-slider-thumb{-webkit-appearance:none;width:11px;height:11px;background:var(--moss);cursor:pointer;}
|
||||||
|
input[type=range]::-moz-range-thumb{width:11px;height:11px;background:var(--moss);cursor:pointer;border:none;}
|
||||||
|
|
||||||
|
/* --- Alert config rows --- */
|
||||||
|
.alert-cfg-row{display:flex;align-items:center;gap:8px;padding:7px 0;border-bottom:1px solid var(--border);}
|
||||||
|
.alert-cfg-row:last-child{border-bottom:none;}
|
||||||
|
.alert-cfg-name{flex:1;font-size:12px;font-weight:600;min-width:0;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;}
|
||||||
|
.alert-cfg-sound{font-size:11px;background:var(--bg);border:1px solid var(--border);color:var(--text);
|
||||||
|
padding:2px 5px;cursor:pointer;max-width:140px;}
|
||||||
|
|
||||||
|
/* --- Sound library --- */
|
||||||
|
.sound-lib-grid{display:grid;grid-template-columns:repeat(auto-fill,minmax(190px,1fr));gap:8px;margin-top:10px;}
|
||||||
|
.sound-card{background:var(--bg);border:1px solid var(--border);padding:10px 12px;
|
||||||
|
display:flex;flex-direction:column;gap:5px;}
|
||||||
|
.sound-card-name{font-size:12px;font-weight:600;}
|
||||||
|
.sound-card-desc{font-size:11px;color:var(--text-dim);}
|
||||||
|
.sound-card-actions{display:flex;gap:6px;align-items:center;margin-top:2px;}
|
||||||
|
.sound-card-status{font-size:10px;font-family:var(--font-mono);color:var(--moss);margin-left:auto;}
|
||||||
|
|
||||||
|
#chartTip{position:fixed;z-index:1001;background:var(--bg-panel);border:1px solid var(--border);
|
||||||
|
padding:4px 10px;font-family:var(--font-mono);font-size:11px;color:var(--text);
|
||||||
|
pointer-events:none;display:none;white-space:nowrap;box-shadow:0 2px 8px rgba(0,0,0,.5);}
|
||||||
</style>
|
</style>
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
@@ -640,6 +666,47 @@
|
|||||||
|
|
||||||
</section>
|
</section>
|
||||||
|
|
||||||
|
<!-- ============ ÉCRAN 6 : Détail session ============ -->
|
||||||
|
<section class="app-screen" id="appSessionDetail" hidden>
|
||||||
|
<div style="display:flex;align-items:center;gap:12px;margin-bottom:4px;">
|
||||||
|
<button class="btn-ghost small" id="sessionDetailBackBtn">← Historique</button>
|
||||||
|
<span id="sessionDetailTitle" style="font-size:13px;color:var(--text-dim);"></span>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="hero" id="sessionDetailHero">
|
||||||
|
<div class="hero-stat">
|
||||||
|
<p class="eyebrow">Durée</p>
|
||||||
|
<p class="hero-number" id="sdDur">—</p>
|
||||||
|
</div>
|
||||||
|
<div class="hero-stat">
|
||||||
|
<p class="eyebrow">Kills</p>
|
||||||
|
<p class="hero-number" id="sdKills">—</p>
|
||||||
|
<p class="hero-sub" id="sdKillsRate">—</p>
|
||||||
|
</div>
|
||||||
|
<div class="hero-stat">
|
||||||
|
<p class="eyebrow">Exp</p>
|
||||||
|
<p class="hero-number" id="sdExp">—</p>
|
||||||
|
<p class="hero-sub" id="sdExpRate">—</p>
|
||||||
|
</div>
|
||||||
|
<div class="hero-stat">
|
||||||
|
<p class="eyebrow">Kamas</p>
|
||||||
|
<p class="hero-number" id="sdKamas">—</p>
|
||||||
|
<p class="hero-sub" id="sdCols">—</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="charts-2col" id="sessionDetailPanels">
|
||||||
|
<div class="panel">
|
||||||
|
<h2>Mobs tués</h2>
|
||||||
|
<div id="sdMobList" class="bars" style="max-height:none;"></div>
|
||||||
|
</div>
|
||||||
|
<div class="panel">
|
||||||
|
<h2>Top items lootés</h2>
|
||||||
|
<div id="sdItemList" class="bars" style="max-height:none;"></div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</section>
|
||||||
|
|
||||||
<!-- ============ ÉCRAN 4 : Drop Board ============ -->
|
<!-- ============ ÉCRAN 4 : Drop Board ============ -->
|
||||||
<section class="app-screen" id="appDropBoard" hidden>
|
<section class="app-screen" id="appDropBoard" hidden>
|
||||||
|
|
||||||
@@ -661,7 +728,8 @@
|
|||||||
<h2>Ajouter un timer</h2>
|
<h2>Ajouter un timer</h2>
|
||||||
</div>
|
</div>
|
||||||
<div class="timer-add-row">
|
<div class="timer-add-row">
|
||||||
<input type="text" id="timerMobInput" placeholder="Nom du mob (ex: Skeleton)" style="flex:2;">
|
<input type="text" id="timerMobInput" placeholder="Nom du mob (ex: Skeleton)" style="flex:2;" list="timerMobSuggestions" autocomplete="off">
|
||||||
|
<datalist id="timerMobSuggestions"></datalist>
|
||||||
<input type="text" id="timerDurInput" placeholder="Durée (ex: 5:00 ou 90)" style="flex:1;max-width:130px;">
|
<input type="text" id="timerDurInput" placeholder="Durée (ex: 5:00 ou 90)" style="flex:1;max-width:130px;">
|
||||||
<button class="btn-ghost" id="timerAddBtn">Ajouter</button>
|
<button class="btn-ghost" id="timerAddBtn">Ajouter</button>
|
||||||
</div>
|
</div>
|
||||||
@@ -677,6 +745,38 @@
|
|||||||
<div id="timerActiveGrid" class="timer-active-grid"></div>
|
<div id="timerActiveGrid" class="timer-active-grid"></div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<div class="panel">
|
||||||
|
<div class="panel-head-row">
|
||||||
|
<h2>Alertes de drop</h2>
|
||||||
|
</div>
|
||||||
|
<div class="timer-add-row" style="flex-wrap:wrap;gap:6px;">
|
||||||
|
<input type="text" id="alertItemInput" placeholder="Nom de l'item (ex: Diamond)" style="flex:2;min-width:140px;" list="alertItemSuggestions" autocomplete="off">
|
||||||
|
<datalist id="alertItemSuggestions"></datalist>
|
||||||
|
<select id="alertSoundSelect" class="alert-cfg-sound"></select>
|
||||||
|
<div style="display:flex;align-items:center;gap:5px;">
|
||||||
|
<span style="font-size:10px;color:var(--text-dim);">Vol</span>
|
||||||
|
<input type="range" id="alertVolumeInput" min="0" max="100" step="1" value="10" style="width:64px;">
|
||||||
|
<span id="alertVolumeVal" style="font-size:10px;font-family:var(--font-mono);color:var(--text-dim);min-width:26px;">10%</span>
|
||||||
|
</div>
|
||||||
|
<button class="btn-ghost" id="alertAddBtn">Ajouter</button>
|
||||||
|
</div>
|
||||||
|
<p style="font-size:11.5px;color:var(--text-dim);margin:6px 0 4px;">Chaque alerte a son propre son et volume.</p>
|
||||||
|
<div id="alertConfigList"></div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="panel">
|
||||||
|
<div class="panel-head-row" id="soundLibToggle" style="cursor:pointer;user-select:none;">
|
||||||
|
<h2>Bibliothèque de sons Minecraft</h2>
|
||||||
|
<span id="soundLibArrow" style="margin-left:auto;font-size:11px;color:var(--text-dim);">▶ ouvrir</span>
|
||||||
|
</div>
|
||||||
|
<div id="soundLibContent" hidden>
|
||||||
|
<p style="font-size:11.5px;color:var(--text-dim);margin:0 0 8px;">
|
||||||
|
Sons téléchargés depuis le CDN officiel Mojang. Clic ▶ pour prévisualiser, ⬇ pour télécharger.
|
||||||
|
</p>
|
||||||
|
<div class="sound-lib-grid" id="soundLibGrid"></div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
</section>
|
</section>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
@@ -731,6 +831,8 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<div id="chartTip"></div>
|
||||||
|
|
||||||
<!-- Menu contextuel "qui drop cet item ?" -->
|
<!-- Menu contextuel "qui drop cet item ?" -->
|
||||||
<div class="item-ctx-menu" id="itemCtxMenu">
|
<div class="item-ctx-menu" id="itemCtxMenu">
|
||||||
<div class="item-ctx-title">Qui drop cet item ?</div>
|
<div class="item-ctx-title">Qui drop cet item ?</div>
|
||||||
@@ -799,6 +901,28 @@
|
|||||||
|
|
||||||
const $ = (id) => document.getElementById(id);
|
const $ = (id) => document.getElementById(id);
|
||||||
|
|
||||||
|
// ---------- Tooltip pour les graphes ----------
|
||||||
|
const chartTip = $('chartTip');
|
||||||
|
function showChartTip(text, cx, cy){
|
||||||
|
chartTip.textContent = text;
|
||||||
|
chartTip.style.display = 'block';
|
||||||
|
chartTip.style.left = Math.min(cx + 14, window.innerWidth - 170) + 'px';
|
||||||
|
chartTip.style.top = Math.min(cy - 30, window.innerHeight - 44) + 'px';
|
||||||
|
}
|
||||||
|
function hideChartTip(){ chartTip.style.display = 'none'; }
|
||||||
|
function attachChartTip(svg){
|
||||||
|
if (!svg) return;
|
||||||
|
svg.addEventListener('mouseover', e => { if (e.target.dataset.tip) showChartTip(e.target.dataset.tip, e.clientX, e.clientY); });
|
||||||
|
svg.addEventListener('mouseout', e => { if (e.target.dataset.tip) hideChartTip(); });
|
||||||
|
svg.addEventListener('mousemove', e => {
|
||||||
|
if (e.target.dataset.tip){
|
||||||
|
chartTip.style.left = Math.min(e.clientX + 14, window.innerWidth - 170) + 'px';
|
||||||
|
chartTip.style.top = Math.min(e.clientY - 30, window.innerHeight - 44) + 'px';
|
||||||
|
}
|
||||||
|
});
|
||||||
|
svg.addEventListener('mouseleave', hideChartTip);
|
||||||
|
}
|
||||||
|
|
||||||
// ======================================================================
|
// ======================================================================
|
||||||
// SHELL : navigation entre écrans (dossier -> accueil -> outils)
|
// SHELL : navigation entre écrans (dossier -> accueil -> outils)
|
||||||
// ======================================================================
|
// ======================================================================
|
||||||
@@ -809,7 +933,8 @@
|
|||||||
farmTracker: $('appFarmTracker'),
|
farmTracker: $('appFarmTracker'),
|
||||||
dropBoard: $('appDropBoard'),
|
dropBoard: $('appDropBoard'),
|
||||||
history: $('appHistory'),
|
history: $('appHistory'),
|
||||||
timers: $('appTimers')
|
timers: $('appTimers'),
|
||||||
|
sessionDetail: $('appSessionDetail')
|
||||||
};
|
};
|
||||||
const homeBtn = $('homeBtn');
|
const homeBtn = $('homeBtn');
|
||||||
const changeFolderBtn = $('changeFolderBtn');
|
const changeFolderBtn = $('changeFolderBtn');
|
||||||
@@ -895,7 +1020,7 @@
|
|||||||
for (const [key, it] of entry.items.entries()){
|
for (const [key, it] of entry.items.entries()){
|
||||||
items[key] = {name: mcPlain(it.rawName) || it.name || '', rawName: it.rawName, occurrences: it.occurrences, totalQty: it.totalQty};
|
items[key] = {name: mcPlain(it.rawName) || it.name || '', rawName: it.rawName, occurrences: it.occurrences, totalQty: it.totalQty};
|
||||||
}
|
}
|
||||||
mobs[mobName] = {kills: entry.kills, items};
|
mobs[mobName] = {kills: entry.kills, totalExp: entry.totalExp || 0, totalCols: entry.totalCols || 0, items};
|
||||||
}
|
}
|
||||||
return {type: 'farm-tracker-dropstats', version: 1, updatedAt: new Date().toISOString(), mobs};
|
return {type: 'farm-tracker-dropstats', version: 1, updatedAt: new Date().toISOString(), mobs};
|
||||||
}
|
}
|
||||||
@@ -906,7 +1031,7 @@
|
|||||||
for (const [key, it] of Object.entries(mobData.items || {})){
|
for (const [key, it] of Object.entries(mobData.items || {})){
|
||||||
items.set(key, {rawName: it.rawName || it.name || '', occurrences: it.occurrences || 0, totalQty: it.totalQty || 0});
|
items.set(key, {rawName: it.rawName || it.name || '', occurrences: it.occurrences || 0, totalQty: it.totalQty || 0});
|
||||||
}
|
}
|
||||||
map.set(mobName, {kills: mobData.kills || 0, items});
|
map.set(mobName, {kills: mobData.kills || 0, totalExp: mobData.totalExp || 0, totalCols: mobData.totalCols || 0, items});
|
||||||
}
|
}
|
||||||
return map;
|
return map;
|
||||||
}
|
}
|
||||||
@@ -1280,9 +1405,11 @@
|
|||||||
state.killCols += col;
|
state.killCols += col;
|
||||||
triggerTimer(mobPlain);
|
triggerTimer(mobPlain);
|
||||||
|
|
||||||
if (!state.dropStats.has(mobPlain)) state.dropStats.set(mobPlain, {kills: 0, items: new Map()});
|
if (!state.dropStats.has(mobPlain)) state.dropStats.set(mobPlain, {kills: 0, totalExp: 0, totalCols: 0, items: new Map()});
|
||||||
const dropEntry = state.dropStats.get(mobPlain);
|
const dropEntry = state.dropStats.get(mobPlain);
|
||||||
dropEntry.kills += 1;
|
dropEntry.kills += 1;
|
||||||
|
dropEntry.totalExp = (dropEntry.totalExp || 0) + exp;
|
||||||
|
dropEntry.totalCols = (dropEntry.totalCols || 0) + col;
|
||||||
|
|
||||||
const items = Array.isArray(data.items) ? data.items : [];
|
const items = Array.isArray(data.items) ? data.items : [];
|
||||||
const feedItems = [];
|
const feedItems = [];
|
||||||
@@ -1303,6 +1430,12 @@
|
|||||||
dropEntry.items.set(key, dropItem);
|
dropEntry.items.set(key, dropItem);
|
||||||
|
|
||||||
feedItems.push({rawName: it.name || '', qty: amt, key});
|
feedItems.push({rawName: it.name || '', qty: amt, key});
|
||||||
|
if (alertConfigs.length){
|
||||||
|
const pn = mcPlain(it.name || '').toLowerCase();
|
||||||
|
for (const alert of alertConfigs){
|
||||||
|
if (pn && alert.nameLower && pn.includes(alert.nameLower)){ playAlert(alert); break; }
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
state.feedEntries.unshift({time: Date.now(), mobRaw, mobPlain, exp, col, items: feedItems});
|
state.feedEntries.unshift({time: Date.now(), mobRaw, mobPlain, exp, col, items: feedItems});
|
||||||
@@ -1370,7 +1503,7 @@
|
|||||||
if (state.timelineTimer){ clearInterval(state.timelineTimer); state.timelineTimer = null; }
|
if (state.timelineTimer){ clearInterval(state.timelineTimer); state.timelineTimer = null; }
|
||||||
}
|
}
|
||||||
|
|
||||||
function drawLiveChart(container, rates, colorHex){
|
function drawLiveChart(container, rates, colorHex, unit){
|
||||||
if (rates.length < 2){
|
if (rates.length < 2){
|
||||||
container.innerHTML = '<p class="chart-empty" style="font-size:11px;padding:6px 0;">En attente…</p>';
|
container.innerHTML = '<p class="chart-empty" style="font-size:11px;padding:6px 0;">En attente…</p>';
|
||||||
return;
|
return;
|
||||||
@@ -1386,12 +1519,19 @@
|
|||||||
const y=(padT+plotH*(1-pct)).toFixed(1);
|
const y=(padT+plotH*(1-pct)).toFixed(1);
|
||||||
return '<line x1="'+padL+'" y1="'+y+'" x2="'+(W-padR)+'" y2="'+y+'" stroke="#26301F" stroke-width="1"/>';
|
return '<line x1="'+padL+'" y1="'+y+'" x2="'+(W-padR)+'" y2="'+y+'" stroke="#26301F" stroke-width="1"/>';
|
||||||
}).join('');
|
}).join('');
|
||||||
|
const dots=xs.map((x,i)=>{
|
||||||
|
const label=fmt(rates[i],1)+(unit?' '+unit:'');
|
||||||
|
return '<circle cx="'+x.toFixed(1)+'" cy="'+ys[i].toFixed(1)+'" r="2" fill="'+colorHex+'" opacity="0.8"/>'
|
||||||
|
+'<circle cx="'+x.toFixed(1)+'" cy="'+ys[i].toFixed(1)+'" r="12" fill="transparent" data-tip="'+escAttr(label)+'"/>';
|
||||||
|
}).join('');
|
||||||
container.innerHTML=
|
container.innerHTML=
|
||||||
'<svg viewBox="0 0 '+W+' '+H+'" width="100%" height="'+H+'" xmlns="http://www.w3.org/2000/svg">'
|
'<svg viewBox="0 0 '+W+' '+H+'" width="100%" height="'+H+'" xmlns="http://www.w3.org/2000/svg">'
|
||||||
+grid
|
+grid
|
||||||
+'<path d="'+areaPath+'" fill="'+colorHex+'" fill-opacity="0.13"/>'
|
+'<path d="'+areaPath+'" fill="'+colorHex+'" fill-opacity="0.13"/>'
|
||||||
+'<path d="'+linePath+'" stroke="'+colorHex+'" fill="none" stroke-width="1.5" stroke-linejoin="round" stroke-linecap="round"/>'
|
+'<path d="'+linePath+'" stroke="'+colorHex+'" fill="none" stroke-width="1.5" stroke-linejoin="round" stroke-linecap="round"/>'
|
||||||
|
+dots
|
||||||
+'</svg>';
|
+'</svg>';
|
||||||
|
attachChartTip(container.querySelector('svg'));
|
||||||
}
|
}
|
||||||
|
|
||||||
function fmtHHMM(ts){ const d=new Date(ts); return pad(d.getHours())+':'+pad(d.getMinutes()); }
|
function fmtHHMM(ts){ const d=new Date(ts); return pad(d.getHours())+':'+pad(d.getMinutes()); }
|
||||||
@@ -1411,9 +1551,9 @@
|
|||||||
colRates.push((snap[i].cols-snap[i-1].cols)/dt);
|
colRates.push((snap[i].cols-snap[i-1].cols)/dt);
|
||||||
}
|
}
|
||||||
|
|
||||||
drawLiveChart($('liveChartKills'), killRates, '#6B8F5C');
|
drawLiveChart($('liveChartKills'), killRates, '#6B8F5C', 'kills/min');
|
||||||
drawLiveChart($('liveChartExp'), expRates, '#F2C94C');
|
drawLiveChart($('liveChartExp'), expRates, '#F2C94C', 'xp/min');
|
||||||
drawLiveChart($('liveChartCols'), colRates, '#C97B4A');
|
drawLiveChart($('liveChartCols'), colRates, '#C97B4A', 'cols/min');
|
||||||
|
|
||||||
const last = arr => arr.length ? arr[arr.length-1] : 0;
|
const last = arr => arr.length ? arr[arr.length-1] : 0;
|
||||||
$('liveChartKillsVal').textContent = fmt(last(killRates),1)+'/min';
|
$('liveChartKillsVal').textContent = fmt(last(killRates),1)+'/min';
|
||||||
@@ -1652,6 +1792,19 @@
|
|||||||
body.innerHTML = '<p class="feed-empty">Pas encore de drop enregistré pour ce mob.</p>';
|
body.innerHTML = '<p class="feed-empty">Pas encore de drop enregistré pour ce mob.</p>';
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
const totalExp = entry.totalExp || 0;
|
||||||
|
const totalCols = entry.totalCols || 0;
|
||||||
|
const statDiv = document.createElement('div');
|
||||||
|
statDiv.style.cssText = 'font-family:var(--font-mono);font-size:11px;color:var(--text-dim);margin-bottom:10px;padding-bottom:8px;border-bottom:1px solid var(--border);display:flex;gap:18px;flex-wrap:wrap;';
|
||||||
|
if (totalExp > 0){
|
||||||
|
statDiv.innerHTML += '<span><span style="color:var(--gold)">XP</span> ~'+fmt(totalExp/kills,1)+' / kill · '+fmt(Math.round(totalExp))+' total</span>';
|
||||||
|
} else {
|
||||||
|
statDiv.innerHTML += '<span><span style="color:var(--gold)">XP</span> <span style="opacity:.5">— non disponible</span></span>';
|
||||||
|
}
|
||||||
|
if (totalCols > 0){
|
||||||
|
statDiv.innerHTML += '<span><span style="color:var(--copper)">Cols</span> ~'+fmt(totalCols/kills,2)+' / kill · '+fmt(Math.round(totalCols))+' total</span>';
|
||||||
|
}
|
||||||
|
body.appendChild(statDiv);
|
||||||
const itemEntries = Array.from(entry.items.entries()).sort((a,b) => (b[1].occurrences/kills) - (a[1].occurrences/kills));
|
const itemEntries = Array.from(entry.items.entries()).sort((a,b) => (b[1].occurrences/kills) - (a[1].occurrences/kills));
|
||||||
for (const [key, it] of itemEntries){
|
for (const [key, it] of itemEntries){
|
||||||
const pct = kills > 0 ? (it.occurrences/kills*100) : 0;
|
const pct = kills > 0 ? (it.occurrences/kills*100) : 0;
|
||||||
@@ -1794,9 +1947,12 @@
|
|||||||
|
|
||||||
const header = document.createElement('div');
|
const header = document.createElement('div');
|
||||||
header.className = 'drop-board-mob-header';
|
header.className = 'drop-board-mob-header';
|
||||||
|
const xpPerKill = entry.kills > 0 && (entry.totalExp || 0) > 0 ? fmt((entry.totalExp||0)/entry.kills,1)+' xp/kill' : null;
|
||||||
|
const colPerKill = entry.kills > 0 && (entry.totalCols || 0) > 0 ? fmt((entry.totalCols||0)/entry.kills,2)+' col/kill' : null;
|
||||||
|
const xpColParts = [xpPerKill, colPerKill].filter(Boolean).join(' · ');
|
||||||
header.innerHTML =
|
header.innerHTML =
|
||||||
'<span class="drop-board-mob-name">'+escHtml(mobName)+'</span>'+
|
'<span class="drop-board-mob-name">'+escHtml(mobName)+'</span>'+
|
||||||
'<span class="drop-board-mob-kills">'+fmt(entry.kills)+' kills</span>';
|
'<span class="drop-board-mob-kills">'+fmt(entry.kills)+' kills'+(xpColParts ? ' · '+xpColParts : '')+'</span>';
|
||||||
section.appendChild(header);
|
section.appendChild(header);
|
||||||
|
|
||||||
const cardsGrid = document.createElement('div');
|
const cardsGrid = document.createElement('div');
|
||||||
@@ -1874,8 +2030,9 @@
|
|||||||
const d=new Date(sessions[i].startedAt);
|
const d=new Date(sessions[i].startedAt);
|
||||||
const dateStr=d.toLocaleDateString('fr-FR',{day:'2-digit',month:'2-digit'});
|
const dateStr=d.toLocaleDateString('fr-FR',{day:'2-digit',month:'2-digit'});
|
||||||
const valStr=labelFn?labelFn(val):Math.round(val).toLocaleString('fr-FR');
|
const valStr=labelFn?labelFn(val):Math.round(val).toLocaleString('fr-FR');
|
||||||
const title=escHtml('Session '+(i+1)+' ('+dateStr+') : '+valStr);
|
const tip=escAttr('Session '+(i+1)+' ('+dateStr+') : '+valStr);
|
||||||
return '<circle cx="'+x.toFixed(1)+'" cy="'+ys[i].toFixed(1)+'" r="'+r+'" fill="'+colorHex+'" stroke="#0B0F0C" stroke-width="1.5"><title>'+title+'</title></circle>';
|
return '<circle cx="'+x.toFixed(1)+'" cy="'+ys[i].toFixed(1)+'" r="'+r+'" fill="'+colorHex+'" stroke="#0B0F0C" stroke-width="1.5"/>'
|
||||||
|
+'<circle cx="'+x.toFixed(1)+'" cy="'+ys[i].toFixed(1)+'" r="10" fill="transparent" data-tip="'+tip+'"/>';
|
||||||
}).join('');
|
}).join('');
|
||||||
container.innerHTML=
|
container.innerHTML=
|
||||||
'<svg viewBox="0 0 '+W+' '+H+'" width="100%" height="'+H+'" xmlns="http://www.w3.org/2000/svg">'
|
'<svg viewBox="0 0 '+W+' '+H+'" width="100%" height="'+H+'" xmlns="http://www.w3.org/2000/svg">'
|
||||||
@@ -1884,6 +2041,7 @@
|
|||||||
+'<path d="'+linePath+'" stroke="'+colorHex+'" fill="none" stroke-width="2" stroke-linejoin="round" stroke-linecap="round"/>'
|
+'<path d="'+linePath+'" stroke="'+colorHex+'" fill="none" stroke-width="2" stroke-linejoin="round" stroke-linecap="round"/>'
|
||||||
+dots
|
+dots
|
||||||
+'</svg>';
|
+'</svg>';
|
||||||
|
attachChartTip(container.querySelector('svg'));
|
||||||
if (labelContainer&&sessions.length>=2){
|
if (labelContainer&&sessions.length>=2){
|
||||||
const d1=new Date(sessions[0].startedAt);
|
const d1=new Date(sessions[0].startedAt);
|
||||||
const d2=new Date(sessions[sessions.length-1].startedAt);
|
const d2=new Date(sessions[sessions.length-1].startedAt);
|
||||||
@@ -1957,6 +2115,9 @@
|
|||||||
const colsPerMin=minElapsed>0?Math.round((s.killCols||0)/minElapsed*10)/10:0;
|
const colsPerMin=minElapsed>0?Math.round((s.killCols||0)/minElapsed*10)/10:0;
|
||||||
const topItemName=s.topItems&&s.topItems.length?s.topItems[0].name+' ×'+s.topItems[0].qty:'—';
|
const topItemName=s.topItems&&s.topItems.length?s.topItems[0].name+' ×'+s.topItems[0].qty:'—';
|
||||||
const tr=document.createElement('tr');
|
const tr=document.createElement('tr');
|
||||||
|
tr.style.cursor='pointer';
|
||||||
|
tr.title='Clic pour voir le détail';
|
||||||
|
tr.dataset.sessionId=s.id;
|
||||||
tr.innerHTML=
|
tr.innerHTML=
|
||||||
'<td>'+escHtml(dateStr)+'</td>'+
|
'<td>'+escHtml(dateStr)+'</td>'+
|
||||||
'<td class="r mono">'+escHtml(durStr)+'</td>'+
|
'<td class="r mono">'+escHtml(durStr)+'</td>'+
|
||||||
@@ -1967,11 +2128,83 @@
|
|||||||
'<td class="r mono">'+(s.sellTotal?fmtShort(Math.round(s.sellTotal)):'—')+'</td>'+
|
'<td class="r mono">'+(s.sellTotal?fmtShort(Math.round(s.sellTotal)):'—')+'</td>'+
|
||||||
'<td class="r mono">'+fmt(colsPerMin,1)+'/min</td>'+
|
'<td class="r mono">'+fmt(colsPerMin,1)+'/min</td>'+
|
||||||
'<td class="dim">'+escHtml(s.topMob||'—')+'</td>'+
|
'<td class="dim">'+escHtml(s.topMob||'—')+'</td>'+
|
||||||
'<td class="dim" title="'+escHtml(topItemName)+'">'+escHtml(topItemName.length>22?topItemName.slice(0,20)+'…':topItemName)+'</td>';
|
'<td class="dim" title="'+escHtml(topItemName)+'">'+escHtml(topItemName.length>22?topItemName.slice(0,20)+'…':topItemName)+'</td>'+
|
||||||
|
'<td style="color:var(--text-dim);font-size:11px;padding-left:8px;">→</td>';
|
||||||
tbody.appendChild(tr);
|
tbody.appendChild(tr);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function renderSessionDetail(s){
|
||||||
|
const d = new Date(s.startedAt);
|
||||||
|
const dateStr = d.toLocaleDateString('fr-FR',{weekday:'long',day:'2-digit',month:'long',year:'numeric'})
|
||||||
|
+ ' à ' + d.toLocaleTimeString('fr-FR',{hour:'2-digit',minute:'2-digit'});
|
||||||
|
$('sessionDetailTitle').textContent = dateStr;
|
||||||
|
|
||||||
|
const minElapsed = s.durationMs / 60000;
|
||||||
|
const dH = Math.floor(s.durationMs/3600000), dM = Math.floor((s.durationMs%3600000)/60000), dS = Math.floor((s.durationMs%60000)/1000);
|
||||||
|
$('sdDur').textContent = dH > 0 ? dH+'h'+String(dM).padStart(2,'0')+'m' : dM+'min '+String(dS).padStart(2,'0')+'s';
|
||||||
|
$('sdKills').textContent = fmt(s.totalKills);
|
||||||
|
$('sdKillsRate').textContent = minElapsed > 0 ? fmt(s.totalKills/minElapsed,1)+' kills/min' : '—';
|
||||||
|
$('sdExp').textContent = fmtShort(s.totalExp||0);
|
||||||
|
$('sdExpRate').textContent = minElapsed > 0 ? fmtShort(Math.round((s.totalExp||0)/minElapsed))+'/min' : '—';
|
||||||
|
$('sdKamas').textContent = s.sellTotal ? fmtShort(Math.round(s.sellTotal)) : '—';
|
||||||
|
$('sdCols').textContent = minElapsed > 0 ? fmt((s.killCols||0)/minElapsed,1)+' cols/min' : '—';
|
||||||
|
|
||||||
|
// Mobs
|
||||||
|
const mobEl = $('sdMobList');
|
||||||
|
const mobEntries = Object.entries(s.mobCounts||{}).sort((a,b)=>b[1]-a[1]);
|
||||||
|
if (!mobEntries.length){
|
||||||
|
mobEl.innerHTML = '<p style="color:var(--text-dim);font-size:13px;">Aucun mob enregistré.</p>';
|
||||||
|
} else {
|
||||||
|
const maxCount = mobEntries[0][1];
|
||||||
|
const colors = ['#9B5DE5','#5DB7E5','#F2C94C','#E05563','#5DE5A0','#E5955D'];
|
||||||
|
mobEl.innerHTML = mobEntries.map(([name, count], i) => {
|
||||||
|
const pct = (count / maxCount * 100).toFixed(1);
|
||||||
|
const color = colors[i % colors.length];
|
||||||
|
const perMin = minElapsed > 0 ? (count/minElapsed).toFixed(1) : '—';
|
||||||
|
return '<div class="bar-row">' +
|
||||||
|
'<div class="bar-label"><span>'+escHtml(name)+'</span>' +
|
||||||
|
'<span class="bar-count">'+fmt(count)+' <span style="color:var(--text-dim);font-size:11px;">('+perMin+'/min)</span></span></div>' +
|
||||||
|
'<div class="bar-track"><div class="bar-fill" style="width:'+pct+'%;background:'+color+'"></div></div>' +
|
||||||
|
'</div>';
|
||||||
|
}).join('');
|
||||||
|
}
|
||||||
|
|
||||||
|
// Items
|
||||||
|
const itemEl = $('sdItemList');
|
||||||
|
const items = s.topItems||[];
|
||||||
|
if (!items.length){
|
||||||
|
itemEl.innerHTML = '<p style="color:var(--text-dim);font-size:13px;">Aucun item enregistré.</p>';
|
||||||
|
} else {
|
||||||
|
const maxQty = items[0].qty;
|
||||||
|
const colors = ['#F2C94C','#9B5DE5','#5DB7E5','#E05563','#5DE5A0'];
|
||||||
|
itemEl.innerHTML = items.map(({name, qty}, i) => {
|
||||||
|
const pct = (qty / maxQty * 100).toFixed(1);
|
||||||
|
const color = colors[i % colors.length];
|
||||||
|
const perMin = minElapsed > 0 ? (qty/minElapsed).toFixed(2) : '—';
|
||||||
|
return '<div class="bar-row">' +
|
||||||
|
'<div class="bar-label"><span>'+escHtml(name)+'</span>' +
|
||||||
|
'<span class="bar-count">×'+fmt(qty)+' <span style="color:var(--text-dim);font-size:11px;">('+perMin+'/min)</span></span></div>' +
|
||||||
|
'<div class="bar-track"><div class="bar-fill" style="width:'+pct+'%;background:'+color+'"></div></div>' +
|
||||||
|
'</div>';
|
||||||
|
}).join('');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
$('sessionDetailBackBtn').addEventListener('click', () => {
|
||||||
|
showScreen('history');
|
||||||
|
renderHistoryScreen();
|
||||||
|
});
|
||||||
|
|
||||||
|
$('histSessionsBody').addEventListener('click', e => {
|
||||||
|
const tr = e.target.closest('tr[data-session-id]');
|
||||||
|
if (!tr) return;
|
||||||
|
const session = sessionHistory.sessions.find(s => s.id === tr.dataset.sessionId);
|
||||||
|
if (!session) return;
|
||||||
|
renderSessionDetail(session);
|
||||||
|
showScreen('sessionDetail');
|
||||||
|
});
|
||||||
|
|
||||||
$('clearHistoryBtn').addEventListener('click', async () => {
|
$('clearHistoryBtn').addEventListener('click', async () => {
|
||||||
if (!sessionHistory.sessions.length) return;
|
if (!sessionHistory.sessions.length) return;
|
||||||
if (!window.confirm('Effacer tout l\'historique des sessions ? Cette action est irréversible.')) return;
|
if (!window.confirm('Effacer tout l\'historique des sessions ? Cette action est irréversible.')) return;
|
||||||
@@ -1985,6 +2218,127 @@
|
|||||||
// ======================================================================
|
// ======================================================================
|
||||||
|
|
||||||
let timerConfigs = JSON.parse(localStorage.getItem('timerConfigs') || '[]');
|
let timerConfigs = JSON.parse(localStorage.getItem('timerConfigs') || '[]');
|
||||||
|
// ---- Sound catalog ----
|
||||||
|
const SOUND_CATALOG = [
|
||||||
|
{ id:'levelup', label:'Level Up XP', desc:'Montée de niveau', hash:'19034765ba8ba5389b35804ab213537ab5cf706f' },
|
||||||
|
{ id:'orb', label:'XP Orb', desc:'Ramassage d\'orbe XP', hash:'8a04a60d5c28fc60df472a877ca57f37eabc78d7' },
|
||||||
|
{ id:'pop', label:'Item Pop', desc:'Ramassage d\'item', hash:'d6ae1c04d0a7376a33d1df12e1b8057cfbab6bc2' },
|
||||||
|
{ id:'pling', label:'Pling', desc:'Note de bloc Pling', hash:'774ae41e86f0b62a5cc961d1bc2e3d0aef9d229c' },
|
||||||
|
{ id:'bell', label:'Bell', desc:'Note de bloc Bell', hash:'a1e833dec61595dc79d0c672fcd7838579ca4b14' },
|
||||||
|
{ id:'toast', label:'Toast Avancement', desc:'Notification avancement', hash:'506f2fdb1b7530df66134aa04c71e66513df0c93' },
|
||||||
|
{ id:'challenge', label:'Défi Terminé', desc:'Challenge complété', hash:'bd01dff39a7bd1e0e7f6847f7aee981f157e4f94' },
|
||||||
|
{ id:'chestopen', label:'Coffre', desc:'Ouverture de coffre', hash:'186d5d9481d59cc99bc4be1b5fbb98d0ef877b8e' },
|
||||||
|
{ id:'hit', label:'Hit', desc:'Coup réussi', hash:'57f50076e7b91b12595a17cf0d38303f979f862b' },
|
||||||
|
{ id:'click', label:'Click', desc:'Clic de bouton', hash:'3455ca942556c7d5eac7dd5e458e7fb3bad564c9' },
|
||||||
|
];
|
||||||
|
|
||||||
|
// ---- IndexedDB cache pour sons téléchargés ----
|
||||||
|
let _soundDb = null;
|
||||||
|
|
||||||
|
function openSoundDb(){
|
||||||
|
if (_soundDb) return Promise.resolve(_soundDb);
|
||||||
|
return new Promise((res, rej) => {
|
||||||
|
const req = indexedDB.open('FarmTrackerSounds', 1);
|
||||||
|
req.onupgradeneeded = e => e.target.result.createObjectStore('sounds', { keyPath: 'id' });
|
||||||
|
req.onsuccess = e => { _soundDb = e.target.result; res(_soundDb); };
|
||||||
|
req.onerror = e => rej(e.target.error);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
async function isSoundCached(soundId){
|
||||||
|
try {
|
||||||
|
const db = await openSoundDb();
|
||||||
|
return new Promise(res => {
|
||||||
|
const req = db.transaction('sounds','readonly').objectStore('sounds').get(soundId);
|
||||||
|
req.onsuccess = () => res(!!req.result);
|
||||||
|
req.onerror = () => res(false);
|
||||||
|
});
|
||||||
|
} catch { return false; }
|
||||||
|
}
|
||||||
|
|
||||||
|
async function getSoundBytes(soundId){
|
||||||
|
const db = await openSoundDb();
|
||||||
|
return new Promise((res, rej) => {
|
||||||
|
const req = db.transaction('sounds','readonly').objectStore('sounds').get(soundId);
|
||||||
|
req.onsuccess = () => res(req.result ? req.result.buffer : null);
|
||||||
|
req.onerror = () => rej(req.error);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
async function saveSoundBytes(soundId, buffer){
|
||||||
|
const db = await openSoundDb();
|
||||||
|
return new Promise((res, rej) => {
|
||||||
|
const tx = db.transaction('sounds','readwrite');
|
||||||
|
tx.objectStore('sounds').put({ id: soundId, buffer });
|
||||||
|
tx.oncomplete = res;
|
||||||
|
tx.onerror = () => rej(tx.error);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
async function downloadSound(soundId, onProgress){
|
||||||
|
const entry = SOUND_CATALOG.find(s => s.id === soundId);
|
||||||
|
if (!entry) throw new Error('Unknown sound: ' + soundId);
|
||||||
|
const prefix = entry.hash.slice(0, 2);
|
||||||
|
const url = `https://resources.download.minecraft.net/${prefix}/${entry.hash}`;
|
||||||
|
const resp = await fetch(url);
|
||||||
|
if (!resp.ok) throw new Error('HTTP ' + resp.status);
|
||||||
|
const buffer = await resp.arrayBuffer();
|
||||||
|
await saveSoundBytes(soundId, buffer);
|
||||||
|
_audioBufferCache.delete(soundId);
|
||||||
|
return buffer;
|
||||||
|
}
|
||||||
|
|
||||||
|
// ---- Web Audio playback ----
|
||||||
|
const _audioBufferCache = new Map();
|
||||||
|
let _audioCtx = null;
|
||||||
|
|
||||||
|
function getAudioCtx(){
|
||||||
|
if (!_audioCtx) _audioCtx = new (window.AudioContext || window.webkitAudioContext)();
|
||||||
|
return _audioCtx;
|
||||||
|
}
|
||||||
|
|
||||||
|
async function _getDecodedBuffer(soundId){
|
||||||
|
if (_audioBufferCache.has(soundId)) return _audioBufferCache.get(soundId);
|
||||||
|
let bytes = await getSoundBytes(soundId);
|
||||||
|
if (!bytes && soundId === 'levelup'){
|
||||||
|
// fallback : fichier bundlé dans renderer/
|
||||||
|
const r = await fetch('levelup.ogg');
|
||||||
|
bytes = await r.arrayBuffer();
|
||||||
|
await saveSoundBytes('levelup', bytes);
|
||||||
|
}
|
||||||
|
if (!bytes) return null;
|
||||||
|
const ctx = getAudioCtx();
|
||||||
|
const decoded = await ctx.decodeAudioData(bytes.slice(0));
|
||||||
|
_audioBufferCache.set(soundId, decoded);
|
||||||
|
return decoded;
|
||||||
|
}
|
||||||
|
|
||||||
|
async function playAlert(cfg){
|
||||||
|
try {
|
||||||
|
const soundId = cfg ? (cfg.soundId || 'levelup') : 'levelup';
|
||||||
|
const vol = Math.max(0, Math.min(1, ((cfg && cfg.volume != null) ? cfg.volume : 10) / 100));
|
||||||
|
const buf = await _getDecodedBuffer(soundId);
|
||||||
|
if (!buf){ console.warn('Sound not cached:', soundId); return; }
|
||||||
|
const ctx = getAudioCtx();
|
||||||
|
const src = ctx.createBufferSource();
|
||||||
|
const gain = ctx.createGain();
|
||||||
|
src.buffer = buf;
|
||||||
|
src.connect(gain);
|
||||||
|
gain.connect(ctx.destination);
|
||||||
|
gain.gain.value = vol;
|
||||||
|
src.start();
|
||||||
|
} catch(e){ console.warn('playAlert failed', e); }
|
||||||
|
}
|
||||||
|
|
||||||
|
// migration : ajoute soundId et volume si absents
|
||||||
|
let alertConfigs = JSON.parse(localStorage.getItem('alertConfigs') || '[]').map(c => ({
|
||||||
|
soundId: 'levelup', volume: 10, ...c
|
||||||
|
}));
|
||||||
|
|
||||||
|
function saveAlertConfigs(){
|
||||||
|
localStorage.setItem('alertConfigs', JSON.stringify(alertConfigs));
|
||||||
|
}
|
||||||
|
|
||||||
// activeTimers : Map<configId, { endsAt: number, durationSec: number, mobName: string }>
|
// activeTimers : Map<configId, { endsAt: number, durationSec: number, mobName: string }>
|
||||||
const activeTimers = new Map();
|
const activeTimers = new Map();
|
||||||
let timerClockId = null;
|
let timerClockId = null;
|
||||||
@@ -2073,9 +2427,34 @@
|
|||||||
}).join('');
|
}).join('');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function populateTimerMobSuggestions(){
|
||||||
|
const dl = $('timerMobSuggestions');
|
||||||
|
if (!dl) return;
|
||||||
|
const seen = new Set();
|
||||||
|
// mobs de la session courante
|
||||||
|
if (ft && ft.state && ft.state.mobCounts){
|
||||||
|
for (const name of ft.state.mobCounts.keys()) seen.add(name);
|
||||||
|
}
|
||||||
|
// mobs de l'historique
|
||||||
|
for (const sess of sessionHistory.sessions){
|
||||||
|
if (sess.mobCounts) for (const name of Object.keys(sess.mobCounts)) seen.add(name);
|
||||||
|
}
|
||||||
|
// exclure ceux déjà configurés
|
||||||
|
const configured = new Set(timerConfigs.map(c => c.mobName.toLowerCase()));
|
||||||
|
dl.innerHTML = Array.from(seen)
|
||||||
|
.filter(n => !configured.has(n.toLowerCase()))
|
||||||
|
.sort((a,b) => a.localeCompare(b))
|
||||||
|
.map(n => '<option value="'+escHtml(n)+'"></option>')
|
||||||
|
.join('');
|
||||||
|
}
|
||||||
|
|
||||||
function renderTimerScreen(){
|
function renderTimerScreen(){
|
||||||
renderTimerConfigList();
|
renderTimerConfigList();
|
||||||
renderTimerActiveGrid();
|
renderTimerActiveGrid();
|
||||||
|
populateTimerMobSuggestions();
|
||||||
|
renderAlertConfigList();
|
||||||
|
populateAlertItemSuggestions();
|
||||||
|
populateAddSoundSelect();
|
||||||
startTimerClock();
|
startTimerClock();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -2088,6 +2467,7 @@
|
|||||||
$('timerMobInput').value = '';
|
$('timerMobInput').value = '';
|
||||||
$('timerDurInput').value = '';
|
$('timerDurInput').value = '';
|
||||||
renderTimerConfigList();
|
renderTimerConfigList();
|
||||||
|
populateTimerMobSuggestions();
|
||||||
});
|
});
|
||||||
|
|
||||||
$('timerMobInput').addEventListener('keydown', e => { if (e.key === 'Enter') $('timerAddBtn').click(); });
|
$('timerMobInput').addEventListener('keydown', e => { if (e.key === 'Enter') $('timerAddBtn').click(); });
|
||||||
@@ -2101,6 +2481,196 @@
|
|||||||
saveTimerConfigs();
|
saveTimerConfigs();
|
||||||
renderTimerConfigList();
|
renderTimerConfigList();
|
||||||
renderTimerActiveGrid();
|
renderTimerActiveGrid();
|
||||||
|
populateTimerMobSuggestions();
|
||||||
|
});
|
||||||
|
|
||||||
|
// ---- Alert config list ----
|
||||||
|
function buildSoundOptions(selectedId){
|
||||||
|
return SOUND_CATALOG.map(s =>
|
||||||
|
'<option value="'+escHtml(s.id)+'"'+(s.id === selectedId ? ' selected' : '')+'>'+escHtml(s.label)+'</option>'
|
||||||
|
).join('');
|
||||||
|
}
|
||||||
|
|
||||||
|
async function renderAlertConfigList(){
|
||||||
|
const list = $('alertConfigList');
|
||||||
|
if (!list) return;
|
||||||
|
if (!alertConfigs.length){ list.innerHTML = ''; return; }
|
||||||
|
const cachedIds = new Set();
|
||||||
|
for (const s of SOUND_CATALOG){
|
||||||
|
if (await isSoundCached(s.id)) cachedIds.add(s.id);
|
||||||
|
}
|
||||||
|
list.innerHTML = alertConfigs.map(cfg => {
|
||||||
|
const sid = cfg.soundId || 'levelup';
|
||||||
|
const opts = SOUND_CATALOG.map(s => {
|
||||||
|
const notCached = !cachedIds.has(s.id) && s.id !== 'levelup';
|
||||||
|
const label = s.label + (notCached ? ' (⬇)' : '');
|
||||||
|
return '<option value="'+escHtml(s.id)+'"'+(s.id === sid ? ' selected' : '')+'>'+escHtml(label)+'</option>';
|
||||||
|
}).join('');
|
||||||
|
const vol = cfg.volume != null ? cfg.volume : 10;
|
||||||
|
return '<div class="alert-cfg-row">'+
|
||||||
|
'<span class="alert-cfg-name">'+escHtml(cfg.itemName)+'</span>'+
|
||||||
|
'<select class="alert-cfg-sound" data-alert-sound="'+escHtml(cfg.id)+'">'+opts+'</select>'+
|
||||||
|
'<input type="range" min="0" max="100" step="1" value="'+vol+'" data-alert-vol="'+escHtml(cfg.id)+'" style="width:64px;" title="Volume: '+vol+'%">'+
|
||||||
|
'<span data-alert-vol-label="'+escHtml(cfg.id)+'" style="font-size:10px;font-family:var(--font-mono);color:var(--text-dim);min-width:26px;">'+vol+'%</span>'+
|
||||||
|
'<button class="btn-ghost small" data-preview-alert="'+escHtml(cfg.id)+'" title="Prévisualiser">▶</button>'+
|
||||||
|
'<button class="btn-ghost small danger" data-del-alert="'+escHtml(cfg.id)+'">✕</button>'+
|
||||||
|
'</div>';
|
||||||
|
}).join('');
|
||||||
|
}
|
||||||
|
|
||||||
|
function populateAlertItemSuggestions(){
|
||||||
|
const dl = $('alertItemSuggestions');
|
||||||
|
if (!dl) return;
|
||||||
|
const seen = new Set();
|
||||||
|
if (ft && ft.state && ft.state.itemCounts){
|
||||||
|
for (const it of ft.state.itemCounts.values()){
|
||||||
|
const n = mcPlain(it.rawName); if (n) seen.add(n);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (ft && ft.state && ft.state.dropStats){
|
||||||
|
for (const [, entry] of ft.state.dropStats){
|
||||||
|
for (const [, it] of entry.items){ const n = mcPlain(it.rawName); if (n) seen.add(n); }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
const configured = new Set(alertConfigs.map(c => c.itemName.toLowerCase()));
|
||||||
|
dl.innerHTML = Array.from(seen)
|
||||||
|
.filter(n => !configured.has(n.toLowerCase()))
|
||||||
|
.sort((a,b) => a.localeCompare(b))
|
||||||
|
.map(n => '<option value="'+escHtml(n)+'"></option>')
|
||||||
|
.join('');
|
||||||
|
}
|
||||||
|
|
||||||
|
function populateAddSoundSelect(){
|
||||||
|
const sel = $('alertSoundSelect');
|
||||||
|
if (!sel) return;
|
||||||
|
sel.innerHTML = buildSoundOptions('levelup');
|
||||||
|
}
|
||||||
|
|
||||||
|
// slider volume dans le formulaire d'ajout
|
||||||
|
$('alertVolumeInput').addEventListener('input', () => {
|
||||||
|
$('alertVolumeVal').textContent = $('alertVolumeInput').value + '%';
|
||||||
|
});
|
||||||
|
|
||||||
|
$('alertAddBtn').addEventListener('click', () => {
|
||||||
|
const itemName = $('alertItemInput').value.trim();
|
||||||
|
if (!itemName) return;
|
||||||
|
const soundId = $('alertSoundSelect').value || 'levelup';
|
||||||
|
const volume = parseInt($('alertVolumeInput').value, 10);
|
||||||
|
alertConfigs.push({ id: generateUUID(), itemName, nameLower: itemName.toLowerCase(), soundId, volume });
|
||||||
|
saveAlertConfigs();
|
||||||
|
$('alertItemInput').value = '';
|
||||||
|
renderAlertConfigList();
|
||||||
|
populateAlertItemSuggestions();
|
||||||
|
if (soundId !== 'levelup') isSoundCached(soundId).then(ok => { if (!ok) downloadSound(soundId).catch(()=>{}); });
|
||||||
|
});
|
||||||
|
|
||||||
|
$('alertItemInput').addEventListener('keydown', e => { if (e.key === 'Enter') $('alertAddBtn').click(); });
|
||||||
|
|
||||||
|
$('alertConfigList').addEventListener('click', async e => {
|
||||||
|
const delId = e.target.dataset.delAlert;
|
||||||
|
if (delId){
|
||||||
|
alertConfigs = alertConfigs.filter(c => c.id !== delId);
|
||||||
|
saveAlertConfigs();
|
||||||
|
await renderAlertConfigList();
|
||||||
|
populateAlertItemSuggestions();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
const prevId = e.target.dataset.previewAlert;
|
||||||
|
if (prevId){
|
||||||
|
const cfg = alertConfigs.find(c => c.id === prevId);
|
||||||
|
if (cfg){
|
||||||
|
const soundId = cfg.soundId || 'levelup';
|
||||||
|
const cached = await isSoundCached(soundId) || soundId === 'levelup';
|
||||||
|
if (!cached){
|
||||||
|
e.target.textContent = '⬇';
|
||||||
|
await downloadSound(soundId).catch(err => console.warn('Download failed', err));
|
||||||
|
await renderAlertConfigList();
|
||||||
|
renderSoundLibrary();
|
||||||
|
}
|
||||||
|
playAlert(cfg);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
$('alertConfigList').addEventListener('change', e => {
|
||||||
|
const soundId = e.target.dataset.alertSound;
|
||||||
|
if (soundId){
|
||||||
|
const cfg = alertConfigs.find(c => c.id === soundId);
|
||||||
|
if (!cfg) return;
|
||||||
|
cfg.soundId = e.target.value;
|
||||||
|
saveAlertConfigs();
|
||||||
|
if (cfg.soundId !== 'levelup') isSoundCached(cfg.soundId).then(ok => { if (!ok) downloadSound(cfg.soundId).catch(()=>{}); });
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
$('alertConfigList').addEventListener('input', e => {
|
||||||
|
const id = e.target.dataset.alertVol;
|
||||||
|
if (!id) return;
|
||||||
|
const cfg = alertConfigs.find(c => c.id === id);
|
||||||
|
if (!cfg) return;
|
||||||
|
cfg.volume = parseInt(e.target.value, 10);
|
||||||
|
saveAlertConfigs();
|
||||||
|
const label = document.querySelector('[data-alert-vol-label="'+id+'"]');
|
||||||
|
if (label) label.textContent = cfg.volume + '%';
|
||||||
|
});
|
||||||
|
|
||||||
|
// ---- Sound library ----
|
||||||
|
$('soundLibToggle').addEventListener('click', () => {
|
||||||
|
const content = $('soundLibContent');
|
||||||
|
const arrow = $('soundLibArrow');
|
||||||
|
const open = content.hidden;
|
||||||
|
content.hidden = !open;
|
||||||
|
arrow.textContent = open ? '▼ fermer' : '▶ ouvrir';
|
||||||
|
if (open) renderSoundLibrary();
|
||||||
|
});
|
||||||
|
|
||||||
|
async function renderSoundLibrary(){
|
||||||
|
const grid = $('soundLibGrid');
|
||||||
|
if (!grid) return;
|
||||||
|
const cards = await Promise.all(SOUND_CATALOG.map(async s => {
|
||||||
|
const cached = await isSoundCached(s.id) || s.id === 'levelup';
|
||||||
|
return '<div class="sound-card" data-sound-id="'+escHtml(s.id)+'">'+
|
||||||
|
'<span class="sound-card-name">'+escHtml(s.label)+'</span>'+
|
||||||
|
'<span class="sound-card-desc">'+escHtml(s.desc)+'</span>'+
|
||||||
|
'<div class="sound-card-actions">'+
|
||||||
|
'<button class="btn-ghost small" data-preview-sound="'+escHtml(s.id)+'" title="Prévisualiser">▶ Preview</button>'+
|
||||||
|
(cached
|
||||||
|
? '<span class="sound-card-status">✓ Téléchargé</span>'
|
||||||
|
: '<button class="btn-ghost small" data-dl-sound="'+escHtml(s.id)+'">⬇ Télécharger</button>')+
|
||||||
|
'</div>'+
|
||||||
|
'</div>';
|
||||||
|
}));
|
||||||
|
grid.innerHTML = cards.join('');
|
||||||
|
}
|
||||||
|
|
||||||
|
$('soundLibGrid').addEventListener('click', async e => {
|
||||||
|
const dlId = e.target.dataset.dlSound;
|
||||||
|
if (dlId){
|
||||||
|
e.target.textContent = '…';
|
||||||
|
e.target.disabled = true;
|
||||||
|
try {
|
||||||
|
await downloadSound(dlId);
|
||||||
|
await renderSoundLibrary();
|
||||||
|
await renderAlertConfigList();
|
||||||
|
populateAddSoundSelect();
|
||||||
|
} catch(err){
|
||||||
|
e.target.textContent = '✗ Erreur';
|
||||||
|
console.warn('Sound download failed', err);
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
const prevId = e.target.dataset.previewSound;
|
||||||
|
if (prevId){
|
||||||
|
const cached = await isSoundCached(prevId) || prevId === 'levelup';
|
||||||
|
if (!cached){
|
||||||
|
e.target.textContent = '⬇…';
|
||||||
|
await downloadSound(prevId).catch(err => console.warn('dl failed', err));
|
||||||
|
await renderSoundLibrary();
|
||||||
|
await renderAlertConfigList();
|
||||||
|
}
|
||||||
|
playAlert({ soundId: prevId });
|
||||||
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
updateTimerTileStatus();
|
updateTimerTileStatus();
|
||||||
|
|||||||
BIN
renderer/levelup.ogg
Normal file
BIN
renderer/levelup.ogg
Normal file
Binary file not shown.
Reference in New Issue
Block a user