`;
+ for (let i = 1; i <= max; i++) {
+ h += ``;
+ }
+ h += `
`;
+ return h;
+ };
+
+ // --- HTML GENERATORS ---
+
+ // GM HTML Generator
+ let gmHtml = "";
gms.forEach(gm => {
const img = gm.avatar || "icons/svg/mystery-man.svg";
- const name = gm.name; // GM just uses their user name usually
+ const name = gm.name;
- html += `
-
-
+ gmHtml += `
+
+
-
+
@@ -379,6 +542,9 @@ function renderPartyOverlay(container) {
`;
});
+ // Player HTML Generator
+ let playerHtml = "";
+
// 2. Render Players
// Check setting availability
let nameMode = "char-top";
@@ -407,14 +573,7 @@ function renderPartyOverlay(container) {
showCommunity = game.settings.get("dh-stream-overlay", "showCommunity");
} catch (e) { console.warn("DH OVERLAY: Settings not ready yet, using default"); }
- const renderPips = (val, max, type) => {
- let h = `
Game Master
`;
- for (let i = 1; i <= max; i++) {
- h += ``;
- }
- h += `
`;
- return h;
- };
+
players.forEach(user => {
const actor = user.character;
@@ -546,7 +705,7 @@ function renderPartyOverlay(container) {
const spotlightHtml = isSpotlightRequesting ?
`` : "";
- html += `
+ playerHtml += `
${spotlightHtml}
@@ -594,8 +753,45 @@ function renderPartyOverlay(container) {
});
- html += `
`;
- container.innerHTML = html;
+ // --- ASSEMBLY LOGIC ---
+ if (carouselEnabled) {
+ let finalHtml = "";
+ let carouselClass = `carousel-mode effect-${carouselEffect}`;
+
+ // GM Logic
+ if (carouselGMMode === "static") {
+ // Static grid for GM, Carousel for Players
+ // Wrap in a flex container
+ container.innerHTML = `
+
+ ${gms.length > 0 ? `
`;
+
+ } else if (carouselGMMode === "hidden") {
+ // Only Players in Carousel
+ container.innerHTML = `${gmHtml}
` : ""}
+ ${players.length > 0 ? `${playerHtml}
` : ""}
+ ${playerHtml}
`;
+ } else {
+ // "cycle" or default - Mixed
+ container.innerHTML = `${gmHtml}${playerHtml}
`;
+ }
+
+ } else {
+ // Standard Mode
+ container.innerHTML = `${gmHtml}${playerHtml}
`;
+ }
+
+ // Post-Render: Apply Carousel State immediately (if applicable)
+ if (carouselEnabled) {
+ // Find the carousel grid (could be the main one or secondary)
+ const grid = container.querySelector(".dh-party-grid.carousel-mode");
+ if (grid) {
+ updateCarouselClasses(grid);
+ if (!carouselTimer) startCarousel();
+ }
+ } else {
+ stopCarousel();
+ }
}
// =============================================================================
@@ -612,17 +808,27 @@ Hooks.once("ready", async () => {
});
// Fallback Init Trigger
-document.addEventListener("DOMContentLoaded", () => {
- if (window.location.pathname.includes("/stream")) {
- setTimeout(async () => {
- if (!overlayInitialized && document.body.classList.contains("stream")) {
- console.warn("DH Stream Overlay | Fallback Init Triggered");
+// Fallback Init Trigger
+if (window.location.pathname.includes("/stream")) {
+ const attemptInit = async (retries = 0) => {
+ if (overlayInitialized) return;
+
+ // If game is ready, or purely maximizing retries (10 seconds), force init
+ if (game.ready || retries > 20) {
+ if (!overlayInitialized) {
+ console.warn(`DH Stream Overlay | Fallback Init Triggered (Ready: ${game.ready}, Retries: ${retries})`);
overlayInitialized = true;
await initStreamOverlay();
}
- }, 1000);
- }
-});
+ } else {
+ // Check again in 500ms
+ setTimeout(() => attemptInit(retries + 1), 500);
+ }
+ };
+
+ // Start the fallback poll
+ setTimeout(() => attemptInit(), 1000);
+}
// Menu Button Hook
Hooks.on("renderDaggerheartMenu", (_app, html) => {
@@ -633,7 +839,10 @@ Hooks.on("renderDaggerheartMenu", (_app, html) => {
const button = document.createElement("button");
button.innerHTML = ` ${game.i18n.localize("DH_STREAM_OVERLAY.OpenStream")}`;
button.style.width = "100%";
- button.onclick = () => window.open("/stream", "streamOverlay", "width=1280,height=720,menubar=no,toolbar=no,status=no");
+ button.onclick = () => {
+ const path = window.location.pathname.replace(/\/game\/?$/, "/stream");
+ window.open(path, "streamOverlay", "width=1280,height=720,menubar=no,toolbar=no,status=no");
+ };
section.appendChild(button);
container.appendChild(section);
});
@@ -645,12 +854,20 @@ Hooks.on("renderDaggerheartMenu", (_app, html) => {
async function initStreamOverlay() {
console.log("DH Stream Overlay | Initializing Layout...");
+ // 0a. WAIT FOR SETTINGS
+ // Ensure "init" hook has run so settings are registered.
+ // If not, we wait a moment.
+ if (!game.settings.settings.has("dh-stream-overlay.autoExpandChat")) {
+ console.warn("DH Stream Overlay | Settings not yet registered, waiting for init...");
+ await new Promise(r => setTimeout(r, 500));
+ }
+
// 0. WAIT FOR GAME DATA
// The stream view might load faster than Foundry data.
let dataRetries = 0;
- while ((!game.users || !game.users.size) && dataRetries < 20) {
- console.log(`DH Stream Overlay | Waiting for game.users... (${dataRetries}/20)`);
- await new Promise(r => setTimeout(r, 500));
+ while ((!game.users || !game.users.size) && dataRetries < 10) {
+ console.log(`DH Stream Overlay | Waiting for game.users... (${dataRetries}/10)`);
+ await new Promise(r => setTimeout(r, 200));
dataRetries++;
}
@@ -697,10 +914,11 @@ async function initStreamOverlay() {
// Appending is safer for overlay z-index usually.
body.appendChild(wrapper);
+ // 3. Move Chat Log
// 3. Move Chat Log
const retryChat = async () => {
let attempts = 0;
- while (attempts < 50) { // Try for longer (approx 10s)
+ while (attempts < 20) { // Reduced retries to avoid long load times
// Try Standard DOM
let chatLog = document.getElementById("chat-log");
@@ -723,9 +941,22 @@ async function initStreamOverlay() {
// Force scroll to bottom
chatLog.scrollTop = chatLog.scrollHeight;
console.log("DH Stream Overlay | Chat Log Moved Successfully");
+
+ // --- FIX: EXISTING MESSAGES ---
+ // Manually strip inline styles from existing messages if auto-expand is OFF
+ const autoExpand = game.settings.get("dh-stream-overlay", "autoExpandChat");
+ if (!autoExpand) {
+ const $log = $(chatLog);
+ // Remove .expanded class first
+ $log.find(".dice-roll.expanded, .damage-section.expanded, .target-section.expanded").removeClass("expanded");
+
+ // Strip inline styles
+ $log.find(".dice-tooltip, .dice-formula, .daggerheart-target-list, .evaluation-selection").css("display", "");
+ $log.find(".dice-roll .dice-tooltip").css("display", ""); // Specificity check
+ }
return;
}
- await new Promise(r => setTimeout(r, 200));
+ await new Promise(r => setTimeout(r, 250));
attempts++;
}
console.warn("DH Stream Overlay | Chat Log NOT FOUND after retries");
@@ -749,9 +980,37 @@ async function initStreamOverlay() {
});
// Scroll chat to bottom on new message
- Hooks.on("renderChatMessageHTML", () => {
+ // Scroll chat to bottom on new message & Handle Auto-Expand Logic
+ Hooks.on("renderChatMessage", (message, html) => {
+ // Scroll
const log = document.getElementById("chat-log");
if (log) log.scrollTop = log.scrollHeight;
+
+ // Auto-Expand Logic (Override System Defaults if necessary)
+ // If Auto-Expand is DISABLED, we want to ensure tooltips don't have inline 'display: block'
+ // which the system might be adding by default.
+ try {
+ const autoExpand = game.settings.get("dh-stream-overlay", "autoExpandChat");
+ if (!autoExpand) {
+ // WRAPPED IN TIMEOUT to beat system race conditions
+ setTimeout(() => {
+ // 1. Remove .expanded class to force collapse state, allowing manual toggle primarily
+ html.find(".dice-roll.expanded, .damage-section.expanded, .target-section.expanded").removeClass("expanded");
+
+ // 2. Remove inline display styles that force expansion (failsafe)
+ html.find(".dice-tooltip, .dice-formula, .daggerheart-target-list, .evaluation-selection").css("display", "");
+
+ // Also legacy support for non-jquery if appropriate (but standard hook passes jQuery)
+ if (html instanceof HTMLElement) {
+ html.querySelectorAll(".expanded").forEach(el => el.classList.remove("expanded"));
+ const nodes = html.querySelectorAll(".dice-tooltip, .dice-formula, .daggerheart-target-list, .evaluation-selection");
+ nodes.forEach(n => n.style.display = "");
+ }
+ }, 10);
+ }
+ } catch (e) {
+ console.warn("DH Stream Overlay | Error in renderChatMessage hook", e);
+ }
});
// 6. Combat Tracker Handling
@@ -817,6 +1076,8 @@ async function initStreamOverlay() {
function injectStyles() {
const useGreen = game.settings.get("dh-stream-overlay", "useGreenScreen");
+ const autoExpand = game.settings.get("dh-stream-overlay", "autoExpandChat");
+ const hideActions = game.settings.get("dh-stream-overlay", "hideChatActions");
const bgColor = useGreen ? "#00ff00" : "rgba(0, 0, 0, 0)";
const style = document.createElement("style");
@@ -938,12 +1199,22 @@ function injectStyles() {
height: 100vh;
background: transparent !important; /* Fully transparent for Chroma Key */
/* border-right: 2px solid rgba(255, 255, 255, 0.1) !important; Optional separator */
- pointer-events: auto;
+ pointer-events: auto !important;
+ z-index: 10000 !important; /* Force on top of everything */
position: relative;
display: flex; flex-direction: column;
overflow: hidden;
}
+ /* GLOBAL INTERACTIVITY FORCE - ensuring chat is always clickable */
+ #stream-chat-container #chat-log,
+ #stream-chat-container .chat-message,
+ #stream-chat-container .message-content,
+ #stream-chat-container .dice-roll,
+ #stream-chat-container button {
+ pointer-events: auto !important;
+ }
+
#stream-right-col {
grid-column: 2;
height: 100vh;
@@ -1077,6 +1348,51 @@ function injectStyles() {
/* Hide standard timestamps to save space if needed, or style them */
.message-timestamp { color: #888; font-size: 0.8em; }
+ /* Auto-Expand Chat Logic */
+ ${autoExpand ? `
+ .chat-message .message-content,
+ .chat-message .dice-roll,
+ .chat-message .dice-result,
+ .chat-message .dice-tooltip,
+ .chat-message .dice-formula {
+ display: block !important;
+ visibility: visible !important;
+ height: auto !important;
+ opacity: 1 !important;
+ }
+
+ .dice-tooltip { display: block !important; }
+ ` : `
+ /* Force collapse default state (allow JS toggling) via HIGH SPECIFICITY */
+ #stream-chat-container .chat-message .dice-tooltip,
+ #stream-chat-container .chat-message .dice-formula,
+ #stream-chat-container .chat-message .daggerheart-target-list,
+ #stream-chat-container .chat-message .evaluation-selection,
+ #stream-chat-container .chat-message .dice-roll .dice-tooltip,
+ #stream-chat-container .chat-message .dice-result .dice-tooltip {
+ display: none !important;
+ }
+
+ /* Allow manual interaction if the .expanded class is present */
+ #stream-chat-container .chat-message .dice-roll.expanded .dice-tooltip,
+ #stream-chat-container .chat-message .dice-roll.expanded .dice-formula,
+ #stream-chat-container .chat-message .target-section.expanded .daggerheart-target-list,
+ #stream-chat-container .chat-message .damage-section.expanded .dice-formula,
+ #stream-chat-container .chat-message .dice-roll.expanded .dice-result .dice-tooltip {
+ display: block !important;
+ }
+
+ /* FORCE INTERACTIVITY removed from here to be global */
+ `}
+
+ ${hideActions ? `
+ .chat-message button,
+ .chat-message .chat-card-buttons,
+ .chat-message .card-buttons {
+ display: none !important;
+ }
+ ` : ''}
+
#stream-combat-container {
position: absolute;
top: 20px; right: 20px;
@@ -1091,14 +1407,16 @@ function injectStyles() {
padding: 5px;
}
+
/* Party Overlay Cards - GRID RESTORED */
.dh-party-grid {
display: grid;
grid-template-columns: repeat(auto-fit, minmax(520px, 1fr));
align-items: start; /* Prevents cards from stretching vertically to match tallest */
- gap: 15px;
+ gap: 40px;
width: 100%;
- padding-right: 10px;
+ padding: 20px;
+ padding-right: 30px;
}
.dh-party-card {
@@ -1260,7 +1578,120 @@ function injectStyles() {
color: #333;
}
`;
+
+
+ style.innerHTML += `
+ /* Vertical Layout */
+ .dh-party-grid.layout-vertical {
+ grid-template-columns: repeat(auto-fit, minmax(300px, 1fr));
+ align-items: start;
+ }
+
+ .dh-party-grid.layout-vertical .dh-party-card {
+ flex-direction: column;
+ min-height: 400px;
+ }
+
+ .dh-party-grid.layout-vertical .dh-card-img-wrapper {
+ width: 100%;
+ height: 250px;
+ border-right: none;
+ border-bottom: 1px solid rgba(255, 255, 255, 0.1);
+ }
+
+ .dh-party-grid.layout-vertical .dh-card-img {
+ object-position: top center;
+ }
+
+ .dh-party-grid.layout-vertical .dh-card-content {
+ padding: 15px;
+ gap: 10px;
+ }
+ `;
+
+ /* Carousel Mode */
+ style.innerHTML += `
+ /* Carousel Mode */
+ .dh-party-grid.carousel-mode {
+ display: grid !important;
+ grid-template-columns: 1fr !important;
+ grid-template-rows: 1fr;
+ justify-items: center;
+ align-items: center;
+ }
+
+ .dh-party-grid.carousel-mode .dh-party-card {
+ grid-area: 1 / 1 / -1 / -1; /* Stack on top of each other */
+ opacity: 0;
+ visibility: hidden;
+ /* TRANSITION FIX: Delay visibility hide so it fades out first */
+ transition: opacity 0.8s ease-in-out, transform 0.8s ease-in-out, visibility 0s linear 0.8s;
+ pointer-events: none;
+ width: 100%;
+ max-width: 600px; /* Constrain width in carousel */
+ min-height: 120px;
+ }
+
+ /* Active Slide */
+ .dh-party-grid.carousel-mode .dh-party-card.active-slide {
+ opacity: 1;
+ visibility: visible;
+ /* Show immediately */
+ transition: opacity 0.8s ease-in-out, transform 0.8s ease-in-out, visibility 0s linear;
+ pointer-events: auto;
+ z-index: 10;
+ transform: none;
+ }
+
+ /* Effects */
+
+ /* Fade (Default behavior above) */
+
+ /* Slide */
+ .dh-party-grid.carousel-mode.effect-slide .dh-party-card {
+ transform: translateX(50px);
+ }
+ .dh-party-grid.carousel-mode.effect-slide .dh-party-card.active-slide {
+ transform: translateX(0);
+ }
+
+ /* Zoom */
+ .dh-party-grid.carousel-mode.effect-zoom .dh-party-card {
+ transform: scale(0.9);
+ }
+ .dh-party-grid.carousel-mode.effect-zoom .dh-party-card.active-slide {
+ transform: scale(1);
+ }
+
+ `;
+
+ style.innerHTML += `
+ /* Width Constraint for Vertical Carousel */
+ .dh-party-grid.carousel-mode.layout-vertical .dh-party-card {
+ max-width: 350px !important;
+ }
+
+ /* Static GM Wrapper */
+ .dh-carousel-wrapper {
+ display: flex;
+ align-items: center;
+ width: 100%;
+ gap: 20px;
+ justify-content: center;
+ }
+
+ .dh-static-gm {
+ flex: 0 0 auto;
+ /* Matches vertical card layout styling */
+ width: 350px;
+ }
+
+ .dh-static-gm .dh-party-card {
+ height: 100%;
+ max-width: 350px;
+ }
+
+ `;
+
document.head.appendChild(style);
}
-
-