5 Commits

Author SHA1 Message Date
s
fdbf57a6d6 chore: release v1.0.8
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-07-02 17:14:16 +02:00
s
4f7aab646b feat: son Minecraft lvl-up réel pour alertes de drop + diverses améliorations UI
- Remplace le son synthétique Web Audio par le vrai levelup.ogg Minecraft (extrait du CDN Mojang)
- Ajout d'un écran de détail par session dans l'historique (mobs + items avec bars + rates)
- Tooltip interactif sur les graphes en direct et historique (valeur au survol)
- Alertes de drop : suggestions d'items depuis la session et les stats
- Timers : suggestions de mobs depuis session et historique
- Hover highlight sur les lignes du tableau sessions
- Drop board et modal mob : affiche xp/kill et cols/kill quand disponible
- lib/dropstats.js : merge preserve totalExp et totalCols

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-07-02 17:14:01 +02:00
s
35481fe7d7 fix: update Linux via spawn comme Windows (plus app.relaunch)
app.relaunch() ne fonctionne pas avec les AppImages — il tente de relancer
le binaire Electron interne au lieu du fichier .AppImage. On utilise maintenant
spawn + detach + app.quit() comme sur Windows. selfInstallLinux() gère la copie
vers ~/.local/bin/ au premier démarrage du nouvel AppImage.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-06-30 12:45:37 +02:00
s
26b70d29c4 feat: écran Timers — compte à rebours automatique au kill de mob
- Nouvel onglet "Timers" dans le hub
- Ajout de timers mob + durée (ex: 5:00 ou 90s)
- Détection automatique : chaque kill du mob configuré démarre/reset le timer
- Affichage des comptes à rebours avec barre de progression colorée (vert → orange → rouge)
- Configs persistées en localStorage

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-06-30 12:36:26 +02:00
s
c94cdf679a fix: auto-install AppImage dans ~/.local/bin au premier lancement Linux
Au démarrage, si l'AppImage ne tourne pas depuis ~/.local/bin/farm-tracker.AppImage,
elle s'y copie automatiquement — plus besoin d'installation manuelle.
Les mises à jour suivantes y atterrissent toujours (fix update Linux).

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-06-30 12:27:04 +02:00
6 changed files with 511 additions and 24 deletions

3
.gitignore vendored
View File

@@ -22,5 +22,8 @@ Thumbs.db
.vscode/ .vscode/
.idea/ .idea/
# Token local (jamais commité)
.gitea-token
# Claude Code # Claude Code
.claude/ .claude/

View File

@@ -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)) {

27
main.js
View File

@@ -153,16 +153,9 @@ async function downloadAndInstall(downloadUrl, version) {
sendUpdateProgress(100, 'installing'); sendUpdateProgress(100, 'installing');
if (process.platform === 'linux') { if (process.platform === 'linux') {
fs.chmodSync(tmpPath, 0o755); fs.chmodSync(tmpPath, 0o755);
const stablePath = path.join(require('os').homedir(), '.local', 'bin', 'farm-tracker.AppImage'); const { spawn } = require('child_process');
const target = fs.existsSync(stablePath) ? stablePath : process.env.APPIMAGE; spawn(tmpPath, [], { detached: true, stdio: 'ignore' }).unref();
if (target) { app.quit();
fs.copyFileSync(tmpPath, target);
fs.unlinkSync(tmpPath);
app.relaunch({ execPath: target });
} else {
app.relaunch({ execPath: tmpPath });
}
app.exit(0);
} else if (process.platform === 'win32') { } else if (process.platform === 'win32') {
const { spawn } = require('child_process'); const { spawn } = require('child_process');
spawn(tmpPath, ['/S'], { detached: true, stdio: 'ignore' }).unref(); spawn(tmpPath, ['/S'], { detached: true, stdio: 'ignore' }).unref();
@@ -251,7 +244,21 @@ function createWindow() {
mainWindow.loadFile(path.join(__dirname, 'renderer', 'index.html')); mainWindow.loadFile(path.join(__dirname, 'renderer', 'index.html'));
} }
function selfInstallLinux() {
if (process.platform !== 'linux' || !app.isPackaged) return;
const appImagePath = process.env.APPIMAGE;
if (!appImagePath) return;
const stablePath = path.join(require('os').homedir(), '.local', 'bin', 'farm-tracker.AppImage');
if (appImagePath === stablePath) return;
try {
fs.mkdirSync(path.dirname(stablePath), { recursive: true });
fs.copyFileSync(appImagePath, stablePath);
fs.chmodSync(stablePath, 0o755);
} catch (_) {}
}
app.whenReady().then(() => { app.whenReady().then(() => {
selfInstallLinux();
createWindow(); createWindow();
setTimeout(() => checkForUpdates(false), 5000); setTimeout(() => checkForUpdates(false), 5000);
}); });

View File

@@ -1,6 +1,6 @@
{ {
"name": "farm-tracker", "name": "farm-tracker",
"version": "1.0.3", "version": "1.0.8",
"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": {

View File

@@ -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 ---------- */
@@ -299,6 +300,35 @@
font-family:var(--font-mono);font-size:11px;margin-bottom:5px;} font-family:var(--font-mono);font-size:11px;margin-bottom:5px;}
.live-chart-header .chart-label{color:var(--text-dim);} .live-chart-header .chart-label{color:var(--text-dim);}
.live-chart-header .chart-val{font-size:12px;font-weight:600;} .live-chart-header .chart-val{font-size:12px;font-weight:600;}
/* ---------- Timers ---------- */
.timer-add-row{display:flex;gap:8px;align-items:center;flex-wrap:wrap;margin-bottom:4px;}
.timer-add-row input{background:var(--bg-panel-2);border:1px solid var(--border);color:var(--text);
font-family:var(--font-body);font-size:13px;padding:7px 10px;min-width:0;}
.timer-add-row input:focus{outline:2px solid var(--gold);outline-offset:0;}
.timer-add-row input::placeholder{color:var(--text-dim);}
.timer-config-list{display:flex;flex-direction:column;gap:6px;margin-top:12px;}
.timer-config-row{display:flex;align-items:center;gap:10px;padding:8px 10px;
background:var(--bg-panel-2);border:1px solid var(--border);}
.timer-config-mob{flex:1;font-size:13px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;}
.timer-config-dur{font-family:var(--font-mono);font-size:12px;color:var(--text-dim);white-space:nowrap;}
.timer-active-grid{display:grid;grid-template-columns:repeat(auto-fill,minmax(190px,1fr));gap:10px;margin-top:12px;}
.timer-card{background:var(--bg-panel-2);border:2px solid var(--border);padding:14px 16px;}
.timer-card.timer-ok{border-color:var(--moss);}
.timer-card.timer-warn{border-color:var(--paused);}
.timer-card.timer-done{border-color:var(--boss);background:rgba(224,85,107,.07);}
.timer-card-mob{font-size:13px;font-weight:600;margin-bottom:8px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;}
.timer-card-countdown{font-family:var(--font-mono);font-size:32px;font-weight:700;line-height:1;letter-spacing:.04em;}
.timer-card-countdown.timer-ok{color:var(--moss);}
.timer-card-countdown.timer-warn{color:var(--paused);}
.timer-card-countdown.timer-done{color:var(--boss);}
.timer-card-sub{font-size:11px;color:var(--text-dim);margin-top:5px;}
.timer-card-bar{height:3px;background:var(--border);margin-top:10px;overflow:hidden;}
.timer-card-bar-fill{height:100%;transition:width .9s linear;}
.timer-empty-msg{color:var(--text-dim);font-size:13px;padding:20px 0;}
#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>
@@ -356,6 +386,12 @@
<span class="app-tile-desc">Statistiques des sessions passées et évolution du farm au fil du temps.</span> <span class="app-tile-desc">Statistiques des sessions passées et évolution du farm au fil du temps.</span>
<span class="app-tile-status" id="tileHistoryStatus">&nbsp;0 session</span> <span class="app-tile-status" id="tileHistoryStatus">&nbsp;0 session</span>
</button> </button>
<button class="app-tile" id="tileTimers">
<span class="app-tile-icon"></span>
<span class="app-tile-title">Timers</span>
<span class="app-tile-desc">Compte à rebours automatique au kill — idéal pour les respawns de boss.</span>
<span class="app-tile-status" id="tileTimersStatus">&nbsp;0 timer</span>
</button>
</div> </div>
</section> </section>
@@ -608,6 +644,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>
@@ -621,6 +698,46 @@
</section> </section>
<!-- ============ ÉCRAN 5 : Timers ============ -->
<section class="app-screen" id="appTimers" hidden>
<div class="panel" style="margin-bottom:14px;">
<div class="panel-head-row">
<h2>Ajouter un timer</h2>
</div>
<div class="timer-add-row">
<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;">
<button class="btn-ghost" id="timerAddBtn">Ajouter</button>
</div>
<div id="timerConfigList" class="timer-config-list"></div>
</div>
<div class="panel">
<div class="panel-head-row">
<h2>Comptes à rebours actifs</h2>
<div class="spacer"></div>
<span style="font-family:var(--font-mono);font-size:10px;color:var(--text-dim);">se déclenchent automatiquement au kill</span>
</div>
<div id="timerActiveGrid" class="timer-active-grid"></div>
</div>
<div class="panel">
<div class="panel-head-row">
<h2>Alertes de drop <span class="muted">— son au drop d'un item</span></h2>
</div>
<div class="timer-add-row">
<input type="text" id="alertItemInput" placeholder="Nom de l'item (ex: Diamond)" style="flex:2;" list="alertItemSuggestions" autocomplete="off">
<datalist id="alertItemSuggestions"></datalist>
<button class="btn-ghost" id="alertAddBtn">Ajouter</button>
</div>
<p style="font-size:11.5px;color:var(--text-dim);margin:8px 0 4px;">Un ping discret est joué à chaque fois que cet item drop.</p>
<div id="alertConfigList" class="timer-config-list"></div>
</div>
</section>
</div> </div>
<!-- Modal 1 : confirmation sync --> <!-- Modal 1 : confirmation sync -->
@@ -673,6 +790,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>
@@ -741,6 +860,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)
// ====================================================================== // ======================================================================
@@ -750,7 +891,9 @@
hub: $('hubScreen'), hub: $('hubScreen'),
farmTracker: $('appFarmTracker'), farmTracker: $('appFarmTracker'),
dropBoard: $('appDropBoard'), dropBoard: $('appDropBoard'),
history: $('appHistory') history: $('appHistory'),
timers: $('appTimers'),
sessionDetail: $('appSessionDetail')
}; };
const homeBtn = $('homeBtn'); const homeBtn = $('homeBtn');
const changeFolderBtn = $('changeFolderBtn'); const changeFolderBtn = $('changeFolderBtn');
@@ -786,6 +929,7 @@
$('tileFarmTracker').addEventListener('click', () => showScreen('farmTracker')); $('tileFarmTracker').addEventListener('click', () => showScreen('farmTracker'));
$('tileDropBoard').addEventListener('click', () => { showScreen('dropBoard'); renderDropBoard(); }); $('tileDropBoard').addEventListener('click', () => { showScreen('dropBoard'); renderDropBoard(); });
$('tileHistory').addEventListener('click', () => { showScreen('history'); renderHistoryScreen(); }); $('tileHistory').addEventListener('click', () => { showScreen('history'); renderHistoryScreen(); });
$('tileTimers').addEventListener('click', () => { showScreen('timers'); renderTimerScreen(); });
const globalState = { logPath: null, serverUrl: '', clientId: '' }; const globalState = { logPath: null, serverUrl: '', clientId: '' };
let sessionHistory = { type: 'farm-tracker-session-history', version: 1, sessions: [] }; let sessionHistory = { type: 'farm-tracker-session-history', version: 1, sessions: [] };
@@ -835,7 +979,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};
} }
@@ -846,7 +990,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;
} }
@@ -1218,10 +1362,13 @@
state.mobCounts.set(mobPlain, (state.mobCounts.get(mobPlain) || 0) + 1); state.mobCounts.set(mobPlain, (state.mobCounts.get(mobPlain) || 0) + 1);
state.expTotal += exp; state.expTotal += exp;
state.killCols += col; state.killCols += col;
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 = [];
@@ -1242,6 +1389,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)){ playAlertPing(); 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});
@@ -1309,7 +1462,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;
@@ -1325,12 +1478,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()); }
@@ -1350,9 +1510,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';
@@ -1591,6 +1751,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;
@@ -1733,9 +1906,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');
@@ -1813,8 +1989,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">'
@@ -1823,6 +2000,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);
@@ -1896,6 +2074,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>'+
@@ -1906,11 +2087,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;
@@ -1919,6 +2172,228 @@
renderHistoryScreen(); renderHistoryScreen();
}); });
// ======================================================================
// TIMERS
// ======================================================================
let timerConfigs = JSON.parse(localStorage.getItem('timerConfigs') || '[]');
let alertConfigs = JSON.parse(localStorage.getItem('alertConfigs') || '[]');
function saveAlertConfigs(){
localStorage.setItem('alertConfigs', JSON.stringify(alertConfigs));
}
let _alertAudio = null;
function playAlertPing(){
try {
if (!_alertAudio) _alertAudio = new Audio('levelup.ogg');
_alertAudio.currentTime = 0;
_alertAudio.play().catch(e => console.warn('Alert ping failed', e));
} catch(e){ console.warn('Alert ping failed', e); }
}
// activeTimers : Map<configId, { endsAt: number, durationSec: number, mobName: string }>
const activeTimers = new Map();
let timerClockId = null;
function saveTimerConfigs(){
localStorage.setItem('timerConfigs', JSON.stringify(timerConfigs));
updateTimerTileStatus();
}
function parseDuration(str){
str = str.trim();
if (str.includes(':')) {
const parts = str.split(':');
const m = parseInt(parts[0], 10) || 0;
const s = parseInt(parts[1], 10) || 0;
return m * 60 + s;
}
return parseInt(str, 10) || 0;
}
function fmtCountdown(sec){
if (sec <= 0) return 'PRÊT';
const m = Math.floor(sec / 60), s = sec % 60;
return String(m).padStart(2,'0') + ':' + String(s).padStart(2,'0');
}
function updateTimerTileStatus(){
const el = $('tileTimersStatus');
if (el) el.textContent = '● ' + timerConfigs.length + ' timer' + (timerConfigs.length !== 1 ? 's' : '');
}
function triggerTimer(mobPlain){
for (const cfg of timerConfigs){
if (cfg.mobName.toLowerCase() === mobPlain.toLowerCase()){
const endsAt = Date.now() + cfg.durationSec * 1000;
activeTimers.set(cfg.id, { endsAt, durationSec: cfg.durationSec, mobName: cfg.mobName });
renderTimerActiveGrid();
}
}
}
function startTimerClock(){
if (timerClockId) return;
timerClockId = setInterval(() => {
if (activeTimers.size > 0) renderTimerActiveGrid();
}, 1000);
}
function renderTimerActiveGrid(){
const grid = $('timerActiveGrid');
if (!grid) return;
if (activeTimers.size === 0){
grid.innerHTML = '<p class="timer-empty-msg">Aucun timer actif — tue un mob configuré pour démarrer un compte à rebours.</p>';
return;
}
const now = Date.now();
let html = '';
for (const [id, timer] of activeTimers){
const remaining = Math.max(0, Math.ceil((timer.endsAt - now) / 1000));
const pct = Math.max(0, remaining / timer.durationSec * 100);
const cls = remaining <= 0 ? 'timer-done' : pct < 25 ? 'timer-warn' : 'timer-ok';
const barColor = remaining <= 0 ? 'var(--boss)' : pct < 25 ? 'var(--paused)' : 'var(--moss)';
html +=
'<div class="timer-card '+cls+'" data-timer-id="'+escHtml(id)+'">' +
'<div class="timer-card-mob">'+escHtml(timer.mobName)+'</div>' +
'<div class="timer-card-countdown '+cls+'">'+fmtCountdown(remaining)+'</div>' +
'<div class="timer-card-sub">'+(remaining<=0?'Respawn disponible !':'reste '+fmtCountdown(remaining))+'</div>'+
'<div class="timer-card-bar"><div class="timer-card-bar-fill" style="width:'+pct.toFixed(1)+'%;background:'+barColor+';"></div></div>'+
'</div>';
}
grid.innerHTML = html;
}
function renderTimerConfigList(){
const list = $('timerConfigList');
if (!list) return;
if (!timerConfigs.length){ list.innerHTML = ''; return; }
list.innerHTML = timerConfigs.map(cfg => {
const m = Math.floor(cfg.durationSec/60), s = cfg.durationSec%60;
const durStr = m > 0 ? m+'min'+(s>0?' '+s+'s':'') : s+'s';
return '<div class="timer-config-row">' +
'<span class="timer-config-mob">'+escHtml(cfg.mobName)+'</span>' +
'<span class="timer-config-dur">'+escHtml(durStr)+'</span>' +
'<button class="btn-ghost small danger" data-del-timer="'+escHtml(cfg.id)+'">✕</button>' +
'</div>';
}).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(){
renderTimerConfigList();
renderTimerActiveGrid();
populateTimerMobSuggestions();
renderAlertConfigList();
populateAlertItemSuggestions();
startTimerClock();
}
$('timerAddBtn').addEventListener('click', () => {
const mobName = $('timerMobInput').value.trim();
const durationSec = parseDuration($('timerDurInput').value);
if (!mobName || durationSec <= 0) return;
timerConfigs.push({ id: generateUUID(), mobName, durationSec });
saveTimerConfigs();
$('timerMobInput').value = '';
$('timerDurInput').value = '';
renderTimerConfigList();
populateTimerMobSuggestions();
});
$('timerMobInput').addEventListener('keydown', e => { if (e.key === 'Enter') $('timerAddBtn').click(); });
$('timerDurInput').addEventListener('keydown', e => { if (e.key === 'Enter') $('timerAddBtn').click(); });
$('timerConfigList').addEventListener('click', e => {
const id = e.target.dataset.delTimer;
if (!id) return;
timerConfigs = timerConfigs.filter(c => c.id !== id);
activeTimers.delete(id);
saveTimerConfigs();
renderTimerConfigList();
renderTimerActiveGrid();
populateTimerMobSuggestions();
});
function renderAlertConfigList(){
const list = $('alertConfigList');
if (!list) return;
if (!alertConfigs.length){ list.innerHTML = ''; return; }
list.innerHTML = alertConfigs.map(cfg =>
'<div class="timer-config-row">'+
'<span class="timer-config-mob">'+escHtml(cfg.itemName)+'</span>'+
'<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('');
}
$('alertAddBtn').addEventListener('click', () => {
const itemName = $('alertItemInput').value.trim();
if (!itemName) return;
alertConfigs.push({ id: generateUUID(), itemName, nameLower: itemName.toLowerCase() });
saveAlertConfigs();
$('alertItemInput').value = '';
renderAlertConfigList();
populateAlertItemSuggestions();
});
$('alertItemInput').addEventListener('keydown', e => { if (e.key === 'Enter') $('alertAddBtn').click(); });
$('alertConfigList').addEventListener('click', e => {
const id = e.target.dataset.delAlert;
if (!id) return;
alertConfigs = alertConfigs.filter(c => c.id !== id);
saveAlertConfigs();
renderAlertConfigList();
populateAlertItemSuggestions();
});
updateTimerTileStatus();
startTimerClock();
async function initFarmTracker(logPath, resetCounters){ async function initFarmTracker(logPath, resetCounters){
if (!ft) ft = createFarmTracker(); if (!ft) ft = createFarmTracker();
await ft.start(logPath, resetCounters); await ft.start(logPath, resetCounters);

BIN
renderer/levelup.ogg Normal file

Binary file not shown.