⚠️ ${data.error}
`; + return; + } + + const minutesLeft = Math.floor(data.next_cycle_in_seconds / 60); + const secondsLeft = data.next_cycle_in_seconds % 60; + + /* Ressourcen-Zeilen */ + const resourceRows = data.available + .map((r) => { + const icon = resourceIcon(r.resource); + const label = resourceLabel(r.resource); + const ready = data.ready; + return ` +Abgebaut
+⚠️ Fehler beim Laden der Mineninfo.
`; + } +} + +/* ───────────────────────────────────────── + Abholen-Klick +───────────────────────────────────────── */ +document.addEventListener("click", async (e) => { + const btn = e.target.closest("#mine-collect-btn"); + if (!btn || btn.disabled) return; + + const buildingId = btn.dataset.building; + + btn.disabled = true; + btn.textContent = "⏳ Wird abgeholt..."; + + try { + const res = await fetch(`/api/mine/${buildingId}/collect`, { method: "POST" }); + if (!res.ok) throw new Error("API Fehler"); + const data = await res.json(); + + if (data.error) { + showNotification( + data.ready_in_display + ? `Die Mine ist noch nicht bereit.\nBereit in: ${data.ready_in_display}` + : data.error, + "Mine", + "⛏️" + ); + await renderMineStatus(buildingId); + return; + } + + /* Erfolg – was wurde abgeholt? */ + const lines = data.collected + .map((c) => `${resourceIcon(c.resource)} ${resourceLabel(c.resource)}: +${c.amount}`) + .join("\n"); + + showNotification( + `Erfolgreich abgeholt!\n\n${lines}`, + "Mine", + "⛏️" + ); + + await renderMineStatus(buildingId); + + } catch (err) { + console.error("Abholen Fehler:", err); + showNotification( + "Fehler beim Abholen. Bitte erneut versuchen.", + "Fehler", + "⚠️" + ); + await renderMineStatus(buildingId); + } +}); + +/* ───────────────────────────────────────── + Countdown-Timer (live) +───────────────────────────────────────── */ +let countdownInterval = null; + +function startCountdown(buildingId) { + if (countdownInterval) clearInterval(countdownInterval); + + countdownInterval = setInterval(() => { + const el = document.getElementById("mine-countdown"); + if (!el) { + clearInterval(countdownInterval); + return; + } + + let secs = parseInt(el.dataset.seconds, 10) - 1; + if (secs < 0) secs = 0; + el.dataset.seconds = secs; + + const m = Math.floor(secs / 60); + const s = secs % 60; + el.textContent = `${m}m ${s}s`; + + /* Zyklus abgeschlossen → UI neu laden */ + if (secs === 0) { + clearInterval(countdownInterval); + renderMineStatus(buildingId); + } + }, 1000); +} + +/* ───────────────────────────────────────── + Hilfsfunktionen +───────────────────────────────────────── */ +function resourceIcon(resource) { + const map = { + gold: "🪙", + copper: "🟤", + silver: "⚪", + iron: "⚙️", + stone: "🪨", + wood: "🪵", + }; + return map[resource] ?? "📦"; +} + +function resourceLabel(resource) { + const map = { + gold: "Gold", + copper: "Kupfer", + silver: "Silber", + iron: "Eisen", + stone: "Stein", + wood: "Holz", + }; + return map[resource] ?? resource; +} diff --git a/public/js/map-ui.js b/public/js/map-ui.js index c9ecdb7..b01ed06 100644 --- a/public/js/map-ui.js +++ b/public/js/map-ui.js @@ -1,5 +1,6 @@ import { loadWohnhaus } from "./buildings/wohnhaus.js"; import { loadSchwarzmarkt } from "./buildings/schwarzmarkt.js"; +import { loadMine } from "./buildings/mine.js"; const popup = document.getElementById("building-popup"); const title = document.getElementById("popup-title"); const tooltip = document.getElementById("map-tooltip"); @@ -9,6 +10,7 @@ const tooltipCache = {}; const buildingModules = { 11: loadWohnhaus, 12: loadSchwarzmarkt, + 10: loadMine, }; /* ================================ diff --git a/routes/mine_route.js b/routes/mine_route.js new file mode 100644 index 0000000..1d24c33 --- /dev/null +++ b/routes/mine_route.js @@ -0,0 +1,163 @@ +const express = require("express"); +const router = express.Router(); +const db = require("../database/database"); +const auth = require("../middleware/auth"); + +/* ───────────────────────────────────────── + GET /api/mine/:buildingId/status + Liefert Level, verfügbare Ressourcen + und Countdown bis zum nächsten Zyklus +───────────────────────────────────────── */ +router.get("/:buildingId/status", auth, async (req, res) => { + const userId = req.session.user.id; + const buildingId = req.params.buildingId; + + try { + const [rows] = await db.query( + ` + SELECT + ub.id AS user_building_id, + ub.level, + bp.resource, + bp.amount, + bp.cycle_seconds, + COALESCE(bct.last_collected, NOW()) AS last_collected + FROM user_buildings ub + JOIN building_production bp + ON bp.building_id = ub.building_id + AND bp.level = ub.level + LEFT JOIN building_collect_timer bct + ON bct.user_building_id = ub.id + WHERE ub.user_id = ? + AND ub.building_id = ? + `, + [userId, buildingId] + ); + + if (!rows.length) { + return res.status(404).json({ error: "Gebäude nicht gefunden" }); + } + + const { cycle_seconds, last_collected, level } = rows[0]; + + const elapsed = Math.floor( + (Date.now() - new Date(last_collected).getTime()) / 1000 + ); + const cycles = Math.floor(elapsed / cycle_seconds); + const nextIn = cycle_seconds - (elapsed % cycle_seconds); + + const available = rows.map((r) => ({ + resource: r.resource, + amount: r.amount * cycles, + })); + + res.json({ + level, + cycles, + ready: cycles > 0, + available, + last_collected, + next_cycle_in_seconds: nextIn, + }); + } catch (err) { + console.error(err); + res.status(500).json({ error: "DB Fehler" }); + } +}); + +/* ───────────────────────────────────────── + POST /api/mine/:buildingId/collect + Schreibt Ressourcen gut, setzt Timer +───────────────────────────────────────── */ +router.post("/:buildingId/collect", auth, async (req, res) => { + const userId = req.session.user.id; + const buildingId = req.params.buildingId; + + try { + const [rows] = await db.query( + ` + SELECT + ub.id AS user_building_id, + ub.level, + bp.resource, + bp.amount, + bp.cycle_seconds, + COALESCE(bct.last_collected, NOW()) AS last_collected + FROM user_buildings ub + JOIN building_production bp + ON bp.building_id = ub.building_id + AND bp.level = ub.level + LEFT JOIN building_collect_timer bct + ON bct.user_building_id = ub.id + WHERE ub.user_id = ? + AND ub.building_id = ? + `, + [userId, buildingId] + ); + + if (!rows.length) { + return res.status(404).json({ error: "Gebäude nicht gefunden" }); + } + + const { user_building_id, cycle_seconds, last_collected } = rows[0]; + + const elapsed = Math.floor( + (Date.now() - new Date(last_collected).getTime()) / 1000 + ); + const cycles = Math.floor(elapsed / cycle_seconds); + + if (cycles < 1) { + const waitSeconds = cycle_seconds - elapsed; + const minutes = Math.floor(waitSeconds / 60); + const seconds = waitSeconds % 60; + return res.json({ + error: "Noch nichts bereit", + ready_in_seconds: waitSeconds, + ready_in_display: `${minutes}m ${seconds}s`, + }); + } + + // Ressourcen gutschreiben + for (const row of rows) { + const toAdd = row.amount * cycles; + await db.query( + ` + INSERT INTO account_currency (account_id, \`${row.resource}\`) + VALUES (?, ?) + ON DUPLICATE KEY UPDATE \`${row.resource}\` = \`${row.resource}\` + ? + `, + [userId, toAdd, toAdd] + ); + } + + // Timer vorsetzen — Rest-Sekunden bleiben erhalten, kein Verlust + const newLastCollected = new Date( + new Date(last_collected).getTime() + cycles * cycle_seconds * 1000 + ); + + await db.query( + ` + INSERT INTO building_collect_timer (user_building_id, last_collected) + VALUES (?, ?) + ON DUPLICATE KEY UPDATE last_collected = ? + `, + [user_building_id, newLastCollected, newLastCollected] + ); + + const collected = rows.map((r) => ({ + resource: r.resource, + amount: r.amount * cycles, + })); + + res.json({ + success: true, + cycles, + collected, + }); + } catch (err) { + console.error(err); + res.status(500).json({ error: "DB Fehler" }); + } +}); + +module.exports = router; diff --git a/views/launcher.ejs b/views/launcher.ejs index 6ce4010..c06db3c 100644 --- a/views/launcher.ejs +++ b/views/launcher.ejs @@ -12,6 +12,7 @@ +