cay/dok
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rtjhrt

Browse Source
This commit is contained in:
cay 2026-04-07 14:52:07 +01:00
parent 1ad2b2a25b
commit f68ff01825
2 changed files with 163 additions and 199 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
public/js/buildings/arena.js
View File

@ -1,4 +1,5 @@
export async function loadArena() { export async function loadArena(options = {}) {
const { dailyOnly = false, onMatchComplete = null } = options;
const ui = document.querySelector(".building-ui"); const ui = document.querySelector(".building-ui");
ui.innerHTML = ` ui.innerHTML = `
@ -15,6 +16,7 @@ export async function loadArena() {
<div class="arena-mode-desc">Einzelkampf – Beweis deine Stärke im Duell</div> <div class="arena-mode-desc">Einzelkampf – Beweis deine Stärke im Duell</div>
</div> </div>
${!dailyOnly ? `
<div class="arena-mode-card" data-mode="2v2"> <div class="arena-mode-card" data-mode="2v2">
<div class="arena-mode-icon">⚔️</div> <div class="arena-mode-icon">⚔️</div>
<div class="arena-mode-label">2v2</div> <div class="arena-mode-label">2v2</div>
@ -26,6 +28,7 @@ export async function loadArena() {
<div class="arena-mode-label">4v4</div> <div class="arena-mode-label">4v4</div>
<div class="arena-mode-desc">Schlachtruf – Führe deine Truppe zum Sieg</div> <div class="arena-mode-desc">Schlachtruf – Führe deine Truppe zum Sieg</div>
</div> </div>
` : ''}
</div> </div>
@ -36,7 +39,7 @@ export async function loadArena() {
`; `;
injectArenaStyles(); injectArenaStyles();
initArenaModes(); initArenaModes({ onMatchComplete });
} }
/* ── Styles ────────────────────────────────────────────────────────────────── */ /* ── Styles ────────────────────────────────────────────────────────────────── */
@ -225,13 +228,13 @@ function getSocket() {
} }
/* ── Klick-Handler initialisieren ─────────────────────────────────────────── */ /* ── Klick-Handler initialisieren ─────────────────────────────────────────── */
function initArenaModes() { function initArenaModes({ onMatchComplete = null } = {}) {
document.querySelectorAll(".arena-mode-card").forEach((card) => { document.querySelectorAll(".arena-mode-card").forEach((card) => {
card.addEventListener("click", () => { card.addEventListener("click", () => {
const mode = card.dataset.mode; const mode = card.dataset.mode;
if (mode === "1v1") { if (mode === "1v1") {
handle1v1Click(card); handle1v1Click(card, onMatchComplete);
} else { } else {
console.log("Arena Modus gewählt:", mode); console.log("Arena Modus gewählt:", mode);
// Platzhalter für 2v2 / 4v4 // Platzhalter für 2v2 / 4v4
@ -241,7 +244,7 @@ function initArenaModes() {
} }
/* ── 1v1: Hauptlogik ───────────────────────────────────────────────────────── */ /* ── 1v1: Hauptlogik ───────────────────────────────────────────────────────── */
async function handle1v1Click(card) { async function handle1v1Click(card, onMatchComplete = null) {
const socket = getSocket(); const socket = getSocket();
if (!socket) { if (!socket) {
showArenaError("Keine Verbindung zum Server. Bitte Seite neu laden."); showArenaError("Keine Verbindung zum Server. Bitte Seite neu laden.");
@ -287,6 +290,9 @@ async function handle1v1Click(card) {
setCardSearching(card, false); setCardSearching(card, false);
hideQueueStatus(); hideQueueStatus();
// Daily als erledigt markieren
if (typeof onMatchComplete === "function") onMatchComplete();
showMatchFoundOverlay(me.name, data.opponent.name, () => { showMatchFoundOverlay(me.name, data.opponent.name, () => {
openArenaPopup( openArenaPopup(
`/arena/1v1?match=${encodeURIComponent(data.matchId)}&slot=${encodeURIComponent(data.mySlot)}`, `/arena/1v1?match=${encodeURIComponent(data.matchId)}&slot=${encodeURIComponent(data.mySlot)}`,

150
public/js/quickmenu/events.js
View File

@ -20,22 +20,19 @@ function rarityImgs(rarity, size = 13) {
} }
function cardHTML(card, isFront = true) { function cardHTML(card, isFront = true) {
if (!isFront) if (!isFront) return `<img class="booster-slot-img" src="/images/items/rueckseite.png" alt="?" draggable="false">`;
return `<img class="booster-slot-img" src="/images/items/rueckseite.png" alt="?" draggable="false">`;
// image zuerst, dann icon als Fallback // image zuerst, dann icon als Fallback
const imgFile = card?.image || card?.icon || null; const imgFile = card?.image || card?.icon || null;
const img = imgFile const img = imgFile ? `/images/cards/${imgFile}` : "/images/items/rueckseite.png";
? `/images/cards/${imgFile}`
: "/images/items/rueckseite.png";
return ` return `
<img class="booster-slot-img" src="${img}" alt="${card?.name || ""}" draggable="false" <img class="booster-slot-img" src="${img}" alt="${card?.name || ''}" draggable="false"
onerror="this.src='/images/items/rueckseite.png'"> onerror="this.src='/images/items/rueckseite.png'">
${card?.attack != null ? `<span class="bs-stat-atk">${card.attack}</span>` : ""} ${card?.attack != null ? `<span class="bs-stat-atk">${card.attack}</span>` : ""}
${card?.defends != null ? `<span class="bs-stat-def">${card.defends}</span>` : ""} ${card?.defends != null ? `<span class="bs-stat-def">${card.defends}</span>` : ""}
${card?.cooldown != null ? `<span class="bs-stat-cd">${card.cooldown}</span>` : ""} ${card?.cooldown!= null ? `<span class="bs-stat-cd">${card.cooldown}</span>` : ""}
${card?.rarity ? `<div class="bs-rarity">${rarityImgs(card.rarity, 11)}</div>` : ""} ${card?.rarity ? `<div class="bs-rarity">${rarityImgs(card.rarity, 11)}</div>` : ""}
<div class="bs-card-name">${card?.name || ""}</div> <div class="bs-card-name">${card?.name || ''}</div>
`; `;
} }
@ -54,28 +51,11 @@ export async function loadEvents() {
} }
const events = [ const events = [
{ { id: 1, img: "/images/items/runenhaufen.png", label: "Booster Öffnen", type: "booster" },
id: 1, { id: 2, img: "/images/items/runenhaufen.png", label: "1v1 Duell", type: "arena" },
img: "/images/items/runenhaufen.png", { id: 3, img: "/images/items/runenhaufen.png", label: "Textzeile 3" },
label: "Booster Öffnen", { id: 4, img: "/images/items/holz.png", label: "Holz Spenden", type: "wood", woodCost: 100 },
type: "booster", { id: 5, img: "/images/items/gold.png", label: "Gold Spenden", type: "gold", goldCost: 100 },
},
{ id: 2, img: "/images/items/1v1.png", label: "1v1" },
{ id: 3, img: "/images/items/2v2.png", label: "2v2" },
{
id: 4,
img: "/images/items/holz.png",
label: "Holz Spenden",
type: "wood",
woodCost: 100,
},
{
id: 5,
img: "/images/items/goldmuenze.png",
label: "Gold Spenden",
type: "gold",
goldCost: 100,
},
]; ];
// Täglichen Status + Holz-Bestand parallel laden // Täglichen Status + Holz-Bestand parallel laden
@ -99,30 +79,24 @@ export async function loadEvents() {
body.innerHTML = ` body.innerHTML = `
<div class="events-grid" id="events-grid"> <div class="events-grid" id="events-grid">
${events ${events.map(ev => {
.map((ev) => {
const done = completedToday.includes(ev.id); const done = completedToday.includes(ev.id);
const locked = const locked = !done && (
!done && (ev.woodCost && playerWood < ev.woodCost) ||
((ev.woodCost && playerWood < ev.woodCost) || (ev.goldCost && playerGold < ev.goldCost)
(ev.goldCost && playerGold < ev.goldCost)); );
const costLabel = ev.woodCost const costLabel = ev.woodCost ? `🪵 ${ev.woodCost} Holz` : ev.goldCost ? `🪙 ${ev.goldCost} Gold` : '';
? `🪵 ${ev.woodCost} Holz` const cls = done ? ' event-done' : locked ? ' event-locked' : '';
: ev.goldCost
? `🪙 ${ev.goldCost} Gold`
: "";
const cls = done ? " event-done" : locked ? " event-locked" : "";
return ` return `
<div class="event-card${cls}" data-event-id="${ev.id}" data-type="${ev.type || ""}" data-done="${done}" data-locked="${locked}"> <div class="event-card${cls}" data-event-id="${ev.id}" data-type="${ev.type || ''}" data-done="${done}" data-locked="${locked}">
<div class="event-card-img-wrap"> <div class="event-card-img-wrap">
<img src="${ev.img}" alt="${ev.label}" draggable="false"> <img src="${ev.img}" alt="${ev.label}" draggable="false">
${done ? `<div class="event-done-overlay"></div>` : ""} ${done ? `<div class="event-done-overlay"></div>` : ''}
${locked ? `<div class="event-locked-overlay"><span>${costLabel}<br>benötigt</span></div>` : ""} ${locked ? `<div class="event-locked-overlay"><span>${costLabel}<br>benötigt</span></div>` : ''}
</div> </div>
<span class="event-card-label">${ev.label}</span> <span class="event-card-label">${ev.label}</span>
</div>`; </div>`;
}) }).join("")}
.join("")}
</div> </div>
<!-- Booster UI --> <!-- Booster UI -->
@ -134,15 +108,12 @@ export async function loadEvents() {
<span class="booster-stapel-hint" id="booster-hint">Klicken zum Öffnen</span> <span class="booster-stapel-hint" id="booster-hint">Klicken zum Öffnen</span>
</div> </div>
<div class="booster-slots" id="booster-slots"> <div class="booster-slots" id="booster-slots">
${Array.from( ${Array.from({length: 5}, (_, i) => `
{ length: 5 },
(_, i) => `
<div class="booster-slot" id="booster-slot-${i}"> <div class="booster-slot" id="booster-slot-${i}">
<div class="booster-slot-inner"> <div class="booster-slot-inner">
<img class="booster-slot-img" src="/images/items/rueckseite.png" alt="?" draggable="false"> <img class="booster-slot-img" src="/images/items/rueckseite.png" alt="?" draggable="false">
</div> </div>
</div>`, </div>`).join("")}
).join("")}
</div> </div>
</div> </div>
</div> </div>
@ -174,7 +145,7 @@ export async function loadEvents() {
<div class="booster-stage"> <div class="booster-stage">
<div class="booster-left"> <div class="booster-left">
<div class="wood-btn-wrap"> <div class="wood-btn-wrap">
<img id="gold-btn" src="/images/items/goldmuenze.png" alt="Gold Spenden" draggable="false" class="booster-stapel-img"> <img id="gold-btn" src="/images/items/gold.png" alt="Gold Spenden" draggable="false" class="booster-stapel-img">
<div class="gold-stamp" id="gold-stamp">Bitte Spenden</div> <div class="gold-stamp" id="gold-stamp">Bitte Spenden</div>
</div> </div>
<span class="booster-stapel-hint" id="gold-hint">100 Gold spenden</span> <span class="booster-stapel-hint" id="gold-hint">100 Gold spenden</span>
@ -210,7 +181,7 @@ export async function loadEvents() {
const eventsGrid = body.querySelector("#events-grid"); const eventsGrid = body.querySelector("#events-grid");
/* ── Event-Karten ── */ /* ── Event-Karten ── */
body.querySelectorAll(".event-card").forEach((card) => { body.querySelectorAll(".event-card").forEach(card => {
card.addEventListener("click", () => { card.addEventListener("click", () => {
if (card.dataset.done === "true") return; if (card.dataset.done === "true") return;
if (card.dataset.locked === "true") return; if (card.dataset.locked === "true") return;
@ -221,6 +192,16 @@ export async function loadEvents() {
resetBooster(); resetBooster();
return; return;
} }
if (card.dataset.type === "arena") {
// Arena-Popup öffnen – nur 1v1, Daily-Callback mitgeben
import("/js/quickmenu/arena.js").then(mod => {
mod.loadArena({
dailyOnly: true,
onMatchComplete: () => markDailyComplete(2),
});
});
return;
}
if (card.dataset.type === "gold") { if (card.dataset.type === "gold") {
eventsGrid.style.display = "none"; eventsGrid.style.display = "none";
goldUi.style.display = "flex"; goldUi.style.display = "flex";
@ -234,7 +215,7 @@ export async function loadEvents() {
return; return;
} }
const id = Number(card.dataset.eventId); const id = Number(card.dataset.eventId);
const ev = events.find((e) => e.id === id); const ev = events.find(e => e.id === id);
if (!ev) return; if (!ev) return;
edpImg.src = ev.img; edpImg.src = ev.img;
edpImg.alt = ev.label; edpImg.alt = ev.label;
@ -253,24 +234,16 @@ export async function loadEvents() {
body: JSON.stringify({ eventId }), body: JSON.stringify({ eventId }),
}); });
// Karte visuell als erledigt markieren // Karte visuell als erledigt markieren
const card = body.querySelector( const card = body.querySelector(`.event-card[data-event-id="${eventId}"]`);
`.event-card[data-event-id="${eventId}"]`,
);
if (card) { if (card) {
card.dataset.done = "true"; card.dataset.done = "true";
card.classList.add("event-done"); card.classList.add("event-done");
const wrap = card.querySelector(".event-card-img-wrap"); const wrap = card.querySelector(".event-card-img-wrap");
if (wrap && !wrap.querySelector(".event-done-overlay")) { if (wrap && !wrap.querySelector(".event-done-overlay")) {
wrap.insertAdjacentHTML( wrap.insertAdjacentHTML("beforeend", `<div class="event-done-overlay">✓</div>`);
"beforeend",
`<div class="event-done-overlay">✓</div>`,
);
} }
if (!card.querySelector(".event-done-label")) { if (!card.querySelector(".event-done-label")) {
card.insertAdjacentHTML( card.insertAdjacentHTML("beforeend", `<span class="event-done-label">Bereits erledigt</span>`);
"beforeend",
`<span class="event-done-label">Bereits erledigt</span>`,
);
} }
} }
} catch (e) { } catch (e) {
@ -278,12 +251,8 @@ export async function loadEvents() {
} }
} }
body body.querySelector("#edp-close-btn").addEventListener("click", () => overlay.classList.remove("active"));
.querySelector("#edp-close-btn") overlay.addEventListener("click", e => { if (e.target === overlay) overlay.classList.remove("active"); });
.addEventListener("click", () => overlay.classList.remove("active"));
overlay.addEventListener("click", (e) => {
if (e.target === overlay) overlay.classList.remove("active");
});
body.querySelector("#booster-back-btn").addEventListener("click", () => { body.querySelector("#booster-back-btn").addEventListener("click", () => {
if (isSpinning) return; if (isSpinning) return;
@ -327,7 +296,7 @@ export async function loadEvents() {
let slotLocked = {}; // { index: true } → verhindert Überschreiben nach reveal let slotLocked = {}; // { index: true } → verhindert Überschreiben nach reveal
function clearAllIntervals() { function clearAllIntervals() {
Object.values(spinIntervals).forEach((id) => clearInterval(id)); Object.values(spinIntervals).forEach(id => clearInterval(id));
spinIntervals = {}; spinIntervals = {};
slotLocked = {}; slotLocked = {};
} }
@ -349,13 +318,9 @@ export async function loadEvents() {
allRevealed = false; allRevealed = false;
for (let i = 0; i < 5; i++) { for (let i = 0; i < 5; i++) {
const inner = body.querySelector( const inner = body.querySelector(`#booster-slot-${i} .booster-slot-inner`);
`#booster-slot-${i} .booster-slot-inner`,
);
inner.innerHTML = `<img class="booster-slot-img" src="/images/items/rueckseite.png" alt="?" draggable="false">`; inner.innerHTML = `<img class="booster-slot-img" src="/images/items/rueckseite.png" alt="?" draggable="false">`;
body body.querySelector(`#booster-slot-${i}`).classList.remove("revealed", "spinning");
.querySelector(`#booster-slot-${i}`)
.classList.remove("revealed", "spinning");
} }
const stapel = body.querySelector("#booster-stapel"); const stapel = body.querySelector("#booster-stapel");
@ -444,15 +409,13 @@ export async function loadEvents() {
setTimeout(() => revealSlot(i, drawnCards[i]), (i + 1) * 5000); setTimeout(() => revealSlot(i, drawnCards[i]), (i + 1) * 5000);
} }
setTimeout( setTimeout(async () => {
async () => { body.querySelector("#booster-hint").textContent = "Karten werden gespeichert...";
body.querySelector("#booster-hint").textContent =
"Karten werden gespeichert...";
isSpinning = false; isSpinning = false;
// Karten in user_cards speichern // Karten in user_cards speichern
try { try {
const cardIds = drawnCards.map((c) => c.id); const cardIds = drawnCards.map(c => c.id);
const saveRes = await fetch("/api/booster/save", { const saveRes = await fetch("/api/booster/save", {
method: "POST", method: "POST",
headers: { "Content-Type": "application/json" }, headers: { "Content-Type": "application/json" },
@ -467,14 +430,11 @@ export async function loadEvents() {
await markDailyComplete(1); await markDailyComplete(1);
allRevealed = true; allRevealed = true;
body.querySelector("#booster-hint").textContent = body.querySelector("#booster-hint").textContent = "Alle Karten erhalten! ✓";
"Alle Karten erhalten! ✓";
const backBtn = body.querySelector("#booster-back-btn"); const backBtn = body.querySelector("#booster-back-btn");
backBtn.style.opacity = "1"; backBtn.style.opacity = "1";
backBtn.style.cursor = "pointer"; backBtn.style.cursor = "pointer";
}, }, 5 * 5000 + 500);
5 * 5000 + 500,
);
}); });
preloadCards(); preloadCards();
@ -494,7 +454,7 @@ export async function loadEvents() {
const res = await fetch("/api/booster/cards"); const res = await fetch("/api/booster/cards");
if (!res.ok) throw new Error(res.status); if (!res.ok) throw new Error(res.status);
const all = await res.json(); const all = await res.json();
rarity3Cards = all.filter((c) => parseInt(c.rarity) === 3); rarity3Cards = all.filter(c => parseInt(c.rarity) === 3);
// Fallback: wenn keine rarity-3 vorhanden alle nehmen // Fallback: wenn keine rarity-3 vorhanden alle nehmen
if (!rarity3Cards.length) rarity3Cards = all; if (!rarity3Cards.length) rarity3Cards = all;
} catch (e) { } catch (e) {
@ -503,7 +463,7 @@ export async function loadEvents() {
} }
function clearWoodIntervals() { function clearWoodIntervals() {
Object.values(woodIntervals).forEach((id) => clearInterval(id)); Object.values(woodIntervals).forEach(id => clearInterval(id));
woodIntervals = {}; woodIntervals = {};
woodLocked = {}; woodLocked = {};
} }
@ -553,8 +513,7 @@ export async function loadEvents() {
slot.classList.add("revealed"); slot.classList.add("revealed");
inner.innerHTML = cardHTML(card, true); inner.innerHTML = cardHTML(card, true);
setTimeout(() => { setTimeout(() => {
if (slot.classList.contains("revealed")) if (slot.classList.contains("revealed")) inner.innerHTML = cardHTML(card, true);
inner.innerHTML = cardHTML(card, true);
}, 100); }, 100);
} }
@ -628,7 +587,7 @@ export async function loadEvents() {
let goldLocked = {}; let goldLocked = {};
function clearGoldIntervals() { function clearGoldIntervals() {
Object.values(goldIntervals).forEach((id) => clearInterval(id)); Object.values(goldIntervals).forEach(id => clearInterval(id));
goldIntervals = {}; goldIntervals = {};
goldLocked = {}; goldLocked = {};
} }
@ -678,8 +637,7 @@ export async function loadEvents() {
slot.classList.add("revealed"); slot.classList.add("revealed");
inner.innerHTML = cardHTML(card, true); inner.innerHTML = cardHTML(card, true);
setTimeout(() => { setTimeout(() => {
if (slot.classList.contains("revealed")) if (slot.classList.contains("revealed")) inner.innerHTML = cardHTML(card, true);
inner.innerHTML = cardHTML(card, true);
}, 100); }, 100);
} }