188 build - Delay Penalty починин

This commit is contained in:
2026-10-02 16:01:16 +03:00
parent 5a0b1e1ce8
commit 74249d7fa2
3 changed files with 44 additions and 15 deletions

View File

@@ -5541,7 +5541,6 @@ function startCustomTooltips() {
// Overlay OUT operates on a layer. Do not remove an unrelated title that
// has since replaced this penalty Input on that layer.
const current = state.vmixOverlayRuntime.get(overlay);
if (hockeyTeamStateOverlayLayerWanted(overlay)) return;
if (current && runtimeOverlayInputRefs(current).size && !runtimeOverlayMatchesInput(current, input)) return;
const functionName = `OverlayInput${overlay}Out`;
if (!outCommands.some((command) => command.Function === functionName)) {
@@ -5572,7 +5571,6 @@ function startCustomTooltips() {
const eventKey = penaltyMirrorKey(entry.component, entry.event);
const sourceSide = String(entry.side || entry.event?.side || entry.event?.player?.side || side);
const overlay = ["1", "2", "3", "4", "5", "6", "7", "8"].includes(String(target.overlay || "")) ? String(target.overlay) : "2";
const reservedForTeamState = hockeyTeamStateOverlayLayerWanted(overlay);
const assignmentChanged = !previous
|| previous.eventKey !== eventKey
|| String(previous.input || "") !== String(target.input)
@@ -5586,7 +5584,7 @@ function startCustomTooltips() {
state.vmixPenaltyMirrors.delete(eventKey);
state.vmixPenaltyTargetAssignments.set(assignmentKey, {
eventKey, input: target.input, selectedName: target.selected_name, overlay, sourceSide, targetSide: side,
mode: "countdown", running: Boolean(entry.event.running), visible: scoreboardLive && !reservedForTeamState,
mode: "countdown", running: Boolean(entry.event.running), visible: scoreboardLive,
});
const explicitEdit = editedEventKey === eventKey;
const reseed = assignmentChanged || explicitEdit || (force && !editedEventKey && !preservePausedCountdown);
@@ -5618,20 +5616,14 @@ function startCustomTooltips() {
}
}
if (scoreboardLive && !reservedForTeamState) {
const current = state.vmixOverlayRuntime.get(overlay);
const targetWasVisible = !forceOverlay && (current && runtimeOverlayInputRefs(current).size
? runtimeOverlayMatchesInput(current, target.input)
: previous?.visible === true && Boolean(previous?.input) && String(previous.input) === String(target.input)
&& String(previous.overlay || overlay) === overlay);
if (scoreboardLive) {
const targetWasVisible = !forceOverlay && previous?.visible === true && Boolean(previous?.input)
&& String(previous.input) === String(target.input)
&& String(previous.overlay || overlay) === overlay;
if (!targetWasVisible) {
if (previous?.input && (String(previous.input) !== String(target.input) || String(previous.overlay || overlay) !== overlay)) {
const previousOverlay = ["1", "2", "3", "4", "5", "6", "7", "8"].includes(String(previous.overlay || "")) ? String(previous.overlay) : overlay;
const previousCurrent = state.vmixOverlayRuntime.get(previousOverlay);
if (!hockeyTeamStateOverlayLayerWanted(previousOverlay) && (!previousCurrent || !runtimeOverlayInputRefs(previousCurrent).size
|| runtimeOverlayMatchesInput(previousCurrent, previous.input))) {
outCommands.push({ Function: `OverlayInput${previousOverlay}Out`, Input: previous.input });
}
outCommands.push({ Function: `OverlayInput${previousOverlay}Out`, Input: previous.input });
}
inCommands.push({ Function: `OverlayInput${overlay}In`, Input: target.input });
}