Roster leader label
diff --git a/src/components/frontend/blocks/AppSidebar.tsx b/src/components/frontend/blocks/AppSidebar.tsx
index 960c978..3302953 100644
--- a/src/components/frontend/blocks/AppSidebar.tsx
+++ b/src/components/frontend/blocks/AppSidebar.tsx
@@ -195,6 +195,7 @@ export function AppSidebar({
mutedTypes: preferences?.notifications?.mutedTypes ?? [],
showCallsign: preferences?.display?.showCallsign ?? false,
showVersionOverlay: preferences?.display?.showVersionOverlay ?? true,
+ showBackgroundTexture: preferences?.display?.showBackgroundTexture ?? true,
leadOrActual: preferences?.display?.leadOrActual ?? "lead",
discordEnabled: preferences?.discord?.enabled ?? false,
discordMutedTypes: preferences?.discord?.mutedTypes ?? [],
diff --git a/src/components/frontend/eod/EodArena.tsx b/src/components/frontend/eod/EodArena.tsx
index ea39db9..6c67de2 100644
--- a/src/components/frontend/eod/EodArena.tsx
+++ b/src/components/frontend/eod/EodArena.tsx
@@ -1,8 +1,9 @@
"use client";
-import { useCallback, useState } from "react";
+import { useCallback, useEffect, useState } from "react";
import type { EodDifficulty, EodStats } from "@/app/(frontend)/eod/actions";
import { useRealtimePresence } from "@/hooks/useRealtimePresence";
+import { useSidebar } from "@/components/ui/sidebar";
import { EodLeaderboard } from "./EodLeaderboard";
import { MinesweeperBoard } from "./MinesweeperBoard";
@@ -16,11 +17,25 @@ export function EodArena({
const [refreshKey, setRefreshKey] = useState(0);
const [playing, setPlaying] = useState(false);
const [selectedDifficulty, setSelectedDifficulty] = useState
("training");
+ const { isMobile, setOpen, setOpenMobile } = useSidebar();
const activeTeams = useRealtimePresence("eod", playing, true);
const onPhaseChange = useCallback((phase: "ready" | "playing" | "over") => {
setPlaying(phase === "playing");
}, []);
+ useEffect(() => {
+ const landscapeQuery = window.matchMedia("(orientation: landscape)");
+ const hideSidebarForLandscapeGame = () => {
+ if (!playing || !landscapeQuery.matches) return;
+ if (isMobile) setOpenMobile(false);
+ else setOpen(false);
+ };
+
+ hideSidebarForLandscapeGame();
+ landscapeQuery.addEventListener("change", hideSidebarForLandscapeGame);
+ return () => landscapeQuery.removeEventListener("change", hideSidebarForLandscapeGame);
+ }, [isMobile, playing, setOpen, setOpenMobile]);
+
return (
> = {
8: "text-gray-400",
};
+function getMobileConfig(config: GameConfig, landscape: boolean): GameConfig {
+ if (landscape) return config;
+
+ const rows = Math.max(1, Math.ceil((config.rows * config.cols) / MOBILE_COLUMN_COUNT));
+ const cells = rows * MOBILE_COLUMN_COUNT;
+ return {
+ ...config,
+ rows,
+ cols: MOBILE_COLUMN_COUNT,
+ mines: Math.min(config.mines, cells - CUSTOM_MAX_SAFE_MINES_BUFFER),
+ };
+}
+
function emptyBoard(size: number): Board {
return Array.from({ length: size }, () => ({
mine: false,
@@ -202,12 +215,17 @@ export function MinesweeperBoard({
const [stats, setStats] = useState(serverStats);
const [lastRun, setLastRun] = useState(null);
const [submitting, setSubmitting] = useState(false);
+ const [isMobile, setIsMobile] = useState(false);
+ const [isLandscape, setIsLandscape] = useState(false);
+ const [isNarrow, setIsNarrow] = useState(false);
const generatedRef = useRef(false);
+ const previousViewportRef = useRef(null);
const submittingRef = useRef(false);
const statsRef = useRef(serverStats);
const longPressRef = useRef(false);
const longPressTimerRef = useRef(null);
- const config: GameConfig = difficulty === "custom" ? customConfig : DIFFICULTIES[difficulty];
+ const baseConfig: GameConfig = difficulty === "custom" ? customConfig : DIFFICULTIES[difficulty];
+ const config = isMobile ? getMobileConfig(baseConfig, isLandscape) : baseConfig;
const customUnlocked =
stats.bestTrainingTime > 0 && stats.bestPerimeterTime > 0 && stats.bestSupplyRoadTime > 0;
const isLargeCustomGame =
@@ -226,6 +244,27 @@ export function MinesweeperBoard({
onPhaseChange("ready");
}, [onPhaseChange]);
+ useEffect(() => {
+ const mobileQuery = window.matchMedia("(max-width: 639px)");
+ const landscapeQuery = window.matchMedia("(orientation: landscape)");
+ const narrowQuery = window.matchMedia("(max-width: 1023px)");
+ const updateViewport = () => {
+ setIsMobile(mobileQuery.matches);
+ setIsLandscape(landscapeQuery.matches);
+ setIsNarrow(narrowQuery.matches);
+ };
+
+ updateViewport();
+ mobileQuery.addEventListener("change", updateViewport);
+ landscapeQuery.addEventListener("change", updateViewport);
+ narrowQuery.addEventListener("change", updateViewport);
+ return () => {
+ mobileQuery.removeEventListener("change", updateViewport);
+ landscapeQuery.removeEventListener("change", updateViewport);
+ narrowQuery.removeEventListener("change", updateViewport);
+ };
+ }, []);
+
useEffect(() => {
if (phase !== "playing") return;
const timer = window.setInterval(() => {
@@ -244,7 +283,11 @@ export function MinesweeperBoard({
(nextDifficulty: GameMode = difficulty) => {
if (submittingRef.current) return;
if (expiredRef.current) return;
- const nextConfig = nextDifficulty === "custom" ? customConfig : DIFFICULTIES[nextDifficulty];
+ const selectedConfig =
+ nextDifficulty === "custom" ? customConfig : DIFFICULTIES[nextDifficulty];
+ const nextConfig = isMobile
+ ? getMobileConfig(selectedConfig, isLandscape)
+ : selectedConfig;
setDifficulty(nextDifficulty);
if (nextDifficulty !== "custom") onDifficultyChange(nextDifficulty);
setBoard(emptyBoard(nextConfig.rows * nextConfig.cols));
@@ -253,9 +296,20 @@ export function MinesweeperBoard({
setLastRun(null);
setPhaseSafe("ready");
},
- [customConfig, difficulty, expiredRef, onDifficultyChange, setPhaseSafe],
+ [customConfig, difficulty, expiredRef, isLandscape, isMobile, onDifficultyChange, setPhaseSafe],
);
+ useEffect(() => {
+ const viewportKey = `${isMobile}-${isLandscape}`;
+ if (previousViewportRef.current === null) {
+ previousViewportRef.current = viewportKey;
+ return;
+ }
+ if (previousViewportRef.current === viewportKey) return;
+ previousViewportRef.current = viewportKey;
+ reset();
+ }, [isLandscape, isMobile, reset]);
+
useEffect(() => {
const handleKeyDown = (event: KeyboardEvent) => {
if (
@@ -443,15 +497,23 @@ export function MinesweeperBoard({
const renderGrid = (modal = false) => (
@@ -469,7 +531,7 @@ export function MinesweeperBoard({
aria-colindex={col + 1}
disabled={phase === "over" || expired || cell.revealed}
className={cn(
- "flex size-7 items-center justify-center rounded-sm border text-xs font-bold transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring",
+ "flex size-[var(--cell-size)] items-center justify-center rounded-sm border text-xs font-bold transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring",
cell.revealed &&
!cell.mine &&
(highContrast
@@ -772,10 +834,20 @@ export function MinesweeperBoard({
{!isLargeCustomGame && (
-
+
@@ -793,7 +865,7 @@ export function MinesweeperBoard({
aria-colindex={col + 1}
disabled={phase === "over" || expired || cell.revealed}
className={cn(
- "flex size-7 items-center justify-center rounded-sm border text-xs font-bold transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring",
+ "flex size-[var(--cell-size)] items-center justify-center rounded-sm border text-xs font-bold transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring",
cell.revealed &&
!cell.mine &&
(highContrast
diff --git a/src/components/frontend/locker/LockerCharacterPanel.tsx b/src/components/frontend/locker/LockerCharacterPanel.tsx
new file mode 100644
index 0000000..ac1d5d1
--- /dev/null
+++ b/src/components/frontend/locker/LockerCharacterPanel.tsx
@@ -0,0 +1,134 @@
+"use client";
+
+import { useState } from "react";
+import { useRouter } from "next/navigation";
+import type { Loadout } from "@/payload-types";
+import { Button } from "@/components/ui/button";
+import {
+ Select,
+ SelectContent,
+ SelectItem,
+ SelectTrigger,
+ SelectValue,
+} from "@/components/ui/select";
+import { setLoadoutSlot, equipLoadout } from "@/app/(frontend)/locker/actions";
+import {
+ getLoadoutSlot,
+ getWardrobeSlot,
+ type LoadoutSlots,
+ type LockerGridItem,
+} from "@/lib/locker";
+import { Wardrobe } from "./Wardrobe";
+import { WardrobeSlotPicker } from "./WardrobeSlotPicker";
+import { cn } from "@/lib/utils";
+
+interface LockerCharacterPanelProps {
+ loadouts: Loadout[];
+ items: LockerGridItem[];
+}
+
+export function LockerCharacterPanel({ loadouts, items }: LockerCharacterPanelProps) {
+ const router = useRouter();
+ const equippedLoadout = loadouts.find((loadout) => loadout.equipped) ?? null;
+ const [pickerSlot, setPickerSlot] = useState
(null);
+ const [busy, setBusy] = useState(false);
+ const slots = (equippedLoadout?.slots ?? {}) as LoadoutSlots;
+ const pickerLayout = pickerSlot ? getWardrobeSlot(pickerSlot) : null;
+ const pickerConfig = pickerSlot ? getLoadoutSlot(pickerSlot) : null;
+
+ async function changeLoadout(id: string) {
+ setBusy(true);
+ const result = await equipLoadout(Number(id));
+ setBusy(false);
+ if (result.success) router.refresh();
+ }
+
+ async function pickSlot(assetId: number | null) {
+ if (!equippedLoadout || !pickerSlot) return { success: false, error: "No loadout equipped." };
+ setBusy(true);
+ const result = await setLoadoutSlot(equippedLoadout.id, pickerSlot, assetId);
+ setBusy(false);
+ if (result.success) {
+ setPickerSlot(null);
+ router.refresh();
+ }
+ return result;
+ }
+
+ return (
+
+
+
+
+ CHARACTER
+
+
EQUIPMENT STATUS
+
+
+
+
+
+
+
+
+
+
+
+ Click a slot to equip
+
+
+
+ {pickerLayout && pickerConfig && (
+ {
+ if (!open) setPickerSlot(null);
+ }}
+ slot={pickerConfig}
+ items={items}
+ currentValue={slots[pickerSlot as keyof LoadoutSlots] ?? null}
+ busy={busy}
+ onPick={pickSlot}
+ />
+ )}
+
+ );
+}
diff --git a/src/components/frontend/locker/LockerGrid.tsx b/src/components/frontend/locker/LockerGrid.tsx
index 0a1310a..cbc87b6 100644
--- a/src/components/frontend/locker/LockerGrid.tsx
+++ b/src/components/frontend/locker/LockerGrid.tsx
@@ -36,7 +36,6 @@ import type { Asset } from "@/payload-types";
import {
ATTACHMENT_CATEGORIES,
findLockerMergeTarget,
- getAssetTypeColor,
getLockerGridOccupancy,
getLockerItemFootprint,
isAttachmentCompatible,
@@ -118,7 +117,6 @@ export function LockerItemFace({
equipment?: LockerItemEquipment;
}) {
const fp = getLockerItemFootprint(asset, rotated ?? false);
- const bgColor = getAssetTypeColor(asset.assetType);
const thumb = assetThumbnailUrl(asset);
const displayName = equipment?.customName?.trim() || asset.name;
const hasCustomName = !!equipment?.customName?.trim();
@@ -131,48 +129,54 @@ export function LockerItemFace({
width: fp.width * cellSize - 2,
height: fp.height * cellSize - 2,
}}
- className="relative rounded-md overflow-hidden flex flex-col items-center justify-center gap-0.5 select-none"
+ className="relative flex select-none flex-col items-center justify-center overflow-hidden rounded-sm bg-card/60"
>
-
+ {/* Subtle selection glow */}
{(hasSkin || attachmentCount > 0 || hasCustomName) && (
-
+
+ )}
+ {(hasSkin || attachmentCount > 0 || hasCustomName) && (
+
{hasCustomName && (
-
+
)}
{hasSkin && (
-
+
)}
{attachmentCount > 0 && (
- {attachmentCount}
+
+ {attachmentCount}
+
)}
)}
-
+
{thumb ? (
-
+
) : (
-
- {getAssetIcon(asset.assetType, "size-5")}
-
+
{getAssetIcon(asset.assetType, "size-4")}
)}
-
+
{displayName}
{quantity > 1 && (
-
+
{quantity.toLocaleString()}
)}
@@ -196,6 +200,7 @@ function DraggableLockerItem({
}) {
const didDrag = useRef(false);
const fp = getLockerItemFootprint(item.asset, item.rotated);
+ const displayName = item.equipment?.customName?.trim() || item.asset.name;
const { attributes, listeners, setNodeRef, transform, isDragging } = useDraggable({
id: `grid-item-${item.id}`,
@@ -217,6 +222,15 @@ function DraggableLockerItem({
[item, onSelect],
);
+ const handleKeyDown = useCallback(
+ (e: React.KeyboardEvent) => {
+ if (e.key !== "Enter" && e.key !== " ") return;
+ e.preventDefault();
+ onSelect(item);
+ },
+ [item, onSelect],
+ );
+
const style: React.CSSProperties = {
position: "absolute",
left: item.gridX * cellSize,
@@ -234,15 +248,17 @@ function DraggableLockerItem({
ref={setNodeRef}
style={style}
className={cn(
- "group rounded-md border cursor-grab active:cursor-grabbing select-none overflow-hidden",
- "transition-shadow duration-150",
- selected && "ring-2 ring-primary",
- !selected && "hover:ring-1 hover:ring-primary/50",
- highlight && "locker-search-highlight",
+ "group cursor-grab select-none overflow-hidden rounded-sm border border-border/60 bg-card/80 active:cursor-grabbing",
+ "transition-all duration-200 hover:border-border/90 hover:bg-card focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 focus-visible:ring-offset-background motion-reduce:transition-none",
+ selected && "ring-2 ring-primary ring-offset-2 ring-offset-background",
+ !selected && "hover:ring-1 hover:ring-primary/40",
+ highlight && "locker-search-highlight motion-reduce:animate-none",
)}
{...listeners}
{...attributes}
onClick={handleClick}
+ onKeyDown={handleKeyDown}
+ aria-label={`${displayName}, quantity ${item.quantity.toLocaleString()}`}
suppressHydrationWarning
>
-
-
+
+ {/* Tactical grid frame */}
+
-
-
- {occupancy.used} / {occupancy.total} cells used
-
-
- {gridWidth} x {gridHeight}
+ {/* Tactical metadata strip */}
+
+
+
+
+ USAGE
+
+ :
+
+ {occupancy.used} / {occupancy.total}
+
+
+
+
+ GRID
+
+ :
+
+ {gridWidth}×{gridHeight}
+
+
+
+
+ SELECT to inspect · DRAG to move · R to rotate
{dragError}
}
+ {dragError && (
+
+ {dragError}
+
+ )}
+ {/* Tactical drag overlay */}
{activeItem && (
-
+
)}
diff --git a/src/components/frontend/locker/LockerGridToolbar.tsx b/src/components/frontend/locker/LockerGridToolbar.tsx
index bc159b8..81380d7 100644
--- a/src/components/frontend/locker/LockerGridToolbar.tsx
+++ b/src/components/frontend/locker/LockerGridToolbar.tsx
@@ -19,6 +19,7 @@ import {
lockerIsRotatable,
lockerIsStackable,
} from "@/lib/locker";
+import { getAssetIcon } from "./LockerGrid";
interface LockerGridToolbarProps {
gridWidth: number;
@@ -60,72 +61,144 @@ export function LockerGridToolbar({
: false;
return (
-
-
-
-
+
+
+
+
+ TOOLS
+
+
ARRANGE // INSPECT
+
+
-
+
+
VIEW
+
{selectedItem && asset && (
-
-
-
{displayName}
-
- {selectedItem.quantity.toLocaleString()}× · {getAssetTypeLabel(asset.assetType)}
- {hasCustomName && asset && displayName !== asset.name && ` · as "${asset.name}"`}
- {fp && ` · ${fp.width}x${fp.height}`}
- {selectedItem.rotated && " · rotated"}
+
+
+
+ {getAssetIcon(asset.assetType)}
+
+
+
{displayName}
+
+ {getAssetTypeLabel(asset.assetType)} · {selectedItem.quantity.toLocaleString()}×
+
-
+
+
+
+
- FOOTPRINT
+ -
+ {fp ? `${fp.width}×${fp.height}` : "—"}
+
+
+
+
- STATE
+ - {selectedItem.rotated ? "ROTATED" : "READY"}
+
+ {hasCustomName && displayName !== asset.name && (
+
+
- CATALOG
+ - {asset.name}
+
+ )}
+
+
+
{asset?.assetType === "weapon" && (
)}
{lockerIsRotatable(asset) && (
-
)}
+
+ {!selectedItem && (
+
+
NO SELECTION
+
+ Select a stored item to inspect its footprint and actions.
+
+
+ )}
+
+
+
+ R
+ to rotate
+
+
+ USAGE
+ :
+
+ {occupancy.used} / {occupancy.total}
+
+
+
);
}
diff --git a/src/components/frontend/locker/LockerView.tsx b/src/components/frontend/locker/LockerView.tsx
index f479ed7..a09a488 100644
--- a/src/components/frontend/locker/LockerView.tsx
+++ b/src/components/frontend/locker/LockerView.tsx
@@ -26,6 +26,7 @@ import {
} from "@/app/(frontend)/locker/actions";
import { usePageCommands } from "@/components/command-palette/CommandPaletteContext";
import { LayoutGridIcon } from "lucide-react";
+import { LockerCharacterPanel } from "./LockerCharacterPanel";
interface LockerViewProps {
locker: LockerStorage;
@@ -47,7 +48,7 @@ export function LockerView({
userName,
}: LockerViewProps) {
const router = useRouter();
- const [tab, setTab] = useState("wardrobe");
+ const [tab, setTab] = useState("inventory");
const [viewMode, setViewMode] = useState<"grid" | "list">("grid");
const [selectedId, setSelectedId] = useState
(null);
const [customizeId, setCustomizeId] = useState(null);
@@ -195,17 +196,26 @@ export function LockerView({
);
return (
-
-
-
- Wardrobe
- Inventory
- Loadouts
+
+
+
+ WARDROBE
+ INVENTORY
+ LOADOUTS
-
+
+
+ {items.length.toLocaleString()} ITEMS · {gridWidth}×{gridHeight} GRID
+
+
+
-
setCustomizeId(selectedItem?.id ?? null)}
- />
- {isManager && }
+
+
+
+
+ STASH // PERSONAL STORAGE
+
+
+ DRAG TO REPOSITION · SELECT TO INSPECT · R TO ROTATE
+
+
+ {isManager && (
+
+ )}
-
-
- Empty Locker
-
-
-
- {isManager
- ? "Your locker is empty. Add items to get started."
- : "Your locker is empty. Reach out to logistics to have equipment issued."}
-
-
-
- ) : viewMode === "grid" ? (
- setSelectedId(item?.id ?? null)}
- selectedItem={selectedItem}
- highlightId={highlightId}
- onAttachItem={handleAttachItem}
- />
- ) : (
- -
-
-
- {items.map((entry, index) => (
-
-
- {index < items.length - 1 &&
}
-
- ))}
-
- )}
+
+
-
+
+
+ {items.length === 0 ? (
+
-
+
+ LOCKER EMPTY
+
+
+
+ {isManager
+ ? "Your locker is empty. Add items to get started."
+ : "Your locker is empty. Reach out to logistics to have equipment issued."}
+
+
+
+ ) : viewMode === "grid" ? (
+
setSelectedId(item?.id ?? null)}
+ selectedItem={selectedItem}
+ highlightId={highlightId}
+ onAttachItem={handleAttachItem}
+ />
+ ) : (
+ -
+
+
+ {items.map((entry, index) => (
+
+
+ {index < items.length - 1 && (
+
+ )}
+
+ ))}
+
+ )}
+
+
+
+
+
+ {layout.label}
+ {displayName ?? "Empty"}
+
+
+
+ );
+}
+
export function Wardrobe({
loadout,
items,
onSlotClick,
}: {
- loadout: Loadout;
- items: LockerGridItem[];
- onSlotClick: (slotName: string) => void;
+ readonly loadout: Loadout;
+ readonly items: LockerGridItem[];
+ readonly onSlotClick: (slotName: string) => void;
}) {
const slots = (loadout.slots ?? {}) as LoadoutSlots;
+ const filledCount = WARDROBE_SLOT_LAYOUT.filter((layout) => slots[layout.name] != null).length;
- const filled = useMemo(() => {
- const set = new Set();
- for (const layout of WARDROBE_SLOT_LAYOUT) {
- const value = slots[layout.name];
- if (value != null) set.add(layout.zone);
- }
- return set;
- }, [slots]);
+ const renderSlot = (layout: (typeof WARDROBE_SLOT_LAYOUT)[number]) => {
+ const asset = resolveSlotAsset(slots[layout.name], items);
+ return (
+
+ );
+ };
return (
-
-
-
+
+
+
+
+
+ EQUIPMENT MATRIX
+
+
+ SELECT A SLOT TO CONFIGURE YOUR LOADOUT
+
+
+
+
+ {filledCount}/{WARDROBE_SLOT_LAYOUT.length}
+
+
READY
+
+
- {WARDROBE_SLOT_LAYOUT.map((layout) => {
- const value = slots[layout.name];
- const asset = resolveSlotAsset(value, items);
- return (
-
-
-
-
-
-
-
{layout.label}
-
{asset ? asset.name : "Empty"}
+
+ {WARDROBE_REGION_SLOTS.map((region) => (
+
+
+
+
+ {region.label}
+
+
+ {region.description}
+
-
-
- );
- })}
+
+ {region.slots.length} SLOT{region.slots.length === 1 ? "" : "S"}
+
+
+ {region.slots.filter((layout) => layout.name === "primary").map(renderSlot)}
+
+
+ PRIMARY ATTACHMENTS
+
+
+ {region.slots
+ .filter((layout) => ["optic", "muzzle", "bipod"].includes(layout.name))
+ .map(renderSlot)}
+
+
+ {region.slots.filter((layout) => layout.name === "launcher").map(renderSlot)}
+
+ {region.slots.map(renderSlot)}
+
+ )}
+
+ ))}
+
);
diff --git a/src/components/frontend/locker/WardrobePanel.tsx b/src/components/frontend/locker/WardrobePanel.tsx
index b41a937..eaaa96c 100644
--- a/src/components/frontend/locker/WardrobePanel.tsx
+++ b/src/components/frontend/locker/WardrobePanel.tsx
@@ -82,7 +82,7 @@ export function WardrobePanel({ userName, loadouts, equippedLoadout, items }: Wa
: [];
return (
-
+
-
Character
@@ -93,9 +93,9 @@ export function WardrobePanel({ userName, loadouts, equippedLoadout, items }: Wa
items={items}
onSlotClick={(name) => setPickerSlot(name)}
/>
-
+
{equippedLoadout
- ? "Click a highlighted point to equip gear from your locker."
+ ? "Select a slot block to equip gear from your locker."
: "Equip a loadout to start dressing your character."}
diff --git a/src/migrations/20260828_011500_add_background_texture_preference.ts b/src/migrations/20260828_011500_add_background_texture_preference.ts
new file mode 100644
index 0000000..3bd1c32
--- /dev/null
+++ b/src/migrations/20260828_011500_add_background_texture_preference.ts
@@ -0,0 +1,15 @@
+import { MigrateDownArgs, MigrateUpArgs, sql } from "@payloadcms/db-postgres";
+
+export async function up({ db }: MigrateUpArgs): Promise {
+ await db.execute(sql`
+ ALTER TABLE "users"
+ ADD COLUMN "preferences_display_show_background_texture" boolean DEFAULT true;
+ `);
+}
+
+export async function down({ db }: MigrateDownArgs): Promise {
+ await db.execute(sql`
+ ALTER TABLE "users"
+ DROP COLUMN "preferences_display_show_background_texture";
+ `);
+}
diff --git a/src/migrations/index.ts b/src/migrations/index.ts
index eb1c6d2..d5a9887 100644
--- a/src/migrations/index.ts
+++ b/src/migrations/index.ts
@@ -1,9 +1,10 @@
-import * as migration_20260820_004157 from './20260820_004157';
-import * as migration_20260825_220000 from './20260825_220000';
-import * as migration_20260826_050000_repair_shims_auxiliary_tables from './20260826_050000_repair_shims_auxiliary_tables';
-import * as migration_20260826_060000_add_game_servers_event_target from './20260826_060000_add_game_servers_event_target';
-import * as migration_20260827_005757 from './20260827_005757';
-import * as migration_20260827_022334_add_eod_minesweeper_best_flags from './20260827_022334_add_eod_minesweeper_best_flags';
+import * as migration_20260820_004157 from "./20260820_004157";
+import * as migration_20260825_220000 from "./20260825_220000";
+import * as migration_20260826_050000_repair_shims_auxiliary_tables from "./20260826_050000_repair_shims_auxiliary_tables";
+import * as migration_20260826_060000_add_game_servers_event_target from "./20260826_060000_add_game_servers_event_target";
+import * as migration_20260827_005757 from "./20260827_005757";
+import * as migration_20260827_022334_add_eod_minesweeper_best_flags from "./20260827_022334_add_eod_minesweeper_best_flags";
+import * as migration_20260828_011500_add_background_texture_preference from "./20260828_011500_add_background_texture_preference";
import * as migration_20260827_213857_add_evaluations_collection from './20260827_213857_add_evaluations_collection';
import * as migration_20260827_233224_add_mission_completed_at from './20260827_233224_add_mission_completed_at';
import * as migration_20260828_041615_add_campaign_mode from './20260828_041615_add_campaign_mode';
@@ -13,32 +14,32 @@ export const migrations = [
{
up: migration_20260820_004157.up,
down: migration_20260820_004157.down,
- name: '20260820_004157',
+ name: "20260820_004157",
},
{
up: migration_20260825_220000.up,
down: migration_20260825_220000.down,
- name: '20260825_220000',
+ name: "20260825_220000",
},
{
up: migration_20260826_050000_repair_shims_auxiliary_tables.up,
down: migration_20260826_050000_repair_shims_auxiliary_tables.down,
- name: '20260826_050000_repair_shims_auxiliary_tables',
+ name: "20260826_050000_repair_shims_auxiliary_tables",
},
{
up: migration_20260826_060000_add_game_servers_event_target.up,
down: migration_20260826_060000_add_game_servers_event_target.down,
- name: '20260826_060000_add_game_servers_event_target',
+ name: "20260826_060000_add_game_servers_event_target",
},
{
up: migration_20260827_005757.up,
down: migration_20260827_005757.down,
- name: '20260827_005757',
+ name: "20260827_005757",
},
{
up: migration_20260827_022334_add_eod_minesweeper_best_flags.up,
down: migration_20260827_022334_add_eod_minesweeper_best_flags.down,
- name: '20260827_022334_add_eod_minesweeper_best_flags',
+ name: "20260827_022334_add_eod_minesweeper_best_flags",
},
{
up: migration_20260827_213857_add_evaluations_collection.up,
@@ -50,6 +51,11 @@ export const migrations = [
down: migration_20260827_233224_add_mission_completed_at.down,
name: '20260827_233224_add_mission_completed_at',
},
+ {
+ up: migration_20260828_011500_add_background_texture_preference.up,
+ down: migration_20260828_011500_add_background_texture_preference.down,
+ name: "20260828_011500_add_background_texture_preference",
+ },
{
up: migration_20260828_041615_add_campaign_mode.up,
down: migration_20260828_041615_add_campaign_mode.down,
diff --git a/src/payload-types.ts b/src/payload-types.ts
index 90914ec..3f965be 100644
--- a/src/payload-types.ts
+++ b/src/payload-types.ts
@@ -1181,6 +1181,7 @@ export interface User {
leadOrActual?: ('lead' | 'actual') | null;
showVersionOverlay?: boolean | null;
xpDisplayMini?: boolean | null;
+ showBackgroundTexture?: boolean | null;
};
discord?: {
enabled?: boolean | null;
@@ -3409,6 +3410,7 @@ export interface UsersSelect {
leadOrActual?: T;
showVersionOverlay?: T;
xpDisplayMini?: T;
+ showBackgroundTexture?: T;
};
discord?:
| T
diff --git a/src/tools/import/extractArmaIcons.ts b/src/tools/import/extractArmaIcons.ts
new file mode 100644
index 0000000..039d190
--- /dev/null
+++ b/src/tools/import/extractArmaIcons.ts
@@ -0,0 +1,240 @@
+#!/usr/bin/env bun
+/**
+ * Extract Arma inventory .paa icons referenced by an export catalog out of the
+ * game's packed PBOs into a --paa-root tree shaped like the reference paths,
+ * so importArmaLibrary.ts's resolvePaaPath() can find them for PAA->PNG.
+ *
+ * Resolution is ref-driven: the second path segment names the PBO (vanilla
+ * refs look like "\a3\weapons_f\Rifles\MX\data\UI\gear_mx_cqc_M_CA.paa"), so we
+ * locate that PBO by basename and inspect it on demand (cached), then map the
+ * ref to a file inside it. A fabricated/unresolvable ref reports MISS rather
+ * than failing the run.
+ *
+ * CLI:
+ * --catalog export catalog JSON (array of records with "picture")
+ * --icons icon_map JSON (map of classname -> .paa ref) [optional]
+ * --game Arma 3 install root (contains /Addons/*.pbo)
+ * [--mod ]... extra mod roots to search for .pbo files
+ * --paa-root where extracted .paa files are written (mirrors refs)
+ * [--out-dir ] write a machine-readable report here (optional)
+ * [--hemtt ] hemtt binary (default: resolve from PATH)
+ */
+import { spawnSync } from "child_process";
+import { existsSync, mkdirSync, readFileSync } from "fs";
+import { dirname, join } from "path";
+
+interface CliOpts {
+ catalog?: string[];
+ icons?: string[];
+ game?: string[];
+ mod?: string[];
+ "paa-root"?: string[];
+ "out-dir"?: string[];
+ hemtt?: string[];
+}
+
+function parseCli(argv: string[]): CliOpts {
+ const opts: CliOpts = {};
+ for (let i = 0; i < argv.length; i++) {
+ const a = argv[i];
+ if (a.startsWith("--") && i + 1 < argv.length && !argv[i + 1].startsWith("--")) {
+ const key = a.slice(2) as keyof CliOpts;
+ (opts[key] ??= []).push(argv[++i]);
+ }
+ }
+ return opts;
+}
+
+function resolveHemtt(explicit?: string): string {
+ if (explicit && existsSync(explicit)) return explicit;
+ const probe = spawnSync("which", ["hemtt"], { encoding: "utf8" });
+ if (probe.status === 0 && probe.stdout.trim()) return probe.stdout.trim();
+ throw new Error("hemtt not found; pass --hemtt ");
+}
+
+interface PboInfo {
+ pboPath: string;
+ prefix: string;
+ /** lowercase file path -> exact original-case path as stored in the PBO */
+ files: Map;
+}
+
+function discoverPbos(game: string, mods: string[]): string[] {
+ const dirs = [join(game, "Addons")];
+ for (const m of mods) {
+ const cand = join(m, "addons");
+ if (existsSync(cand)) dirs.push(cand);
+ }
+ const out: string[] = [];
+ for (const d of dirs) {
+ if (!existsSync(d)) continue;
+ for (const f of readFileSync("/dev/null").length ? [] : []) void f;
+ const entries = spawnSync("ls", [d], { encoding: "utf8" });
+ for (const line of (entries.stdout ?? "").split("\n")) {
+ const n = line.trim();
+ if (n.toLowerCase().endsWith(".pbo")) out.push(join(d, n));
+ }
+ }
+ return out;
+}
+
+function pbosByName(pbos: string[]): Map {
+ const byName = new Map();
+ for (const p of pbos) {
+ const base = p.split(/[\\/]/).pop()!.replace(/\.pbo$/i, "").toLowerCase();
+ if (!byName.has(base)) byName.set(base, p);
+ }
+ return byName;
+}
+
+function inspectPbo(hemtt: string, pboPath: string): { prefix: string; files: string[] } | undefined {
+ const r = spawnSync(
+ hemtt,
+ ["utils", "pbo", "inspect", "--format", "json", pboPath],
+ { encoding: "utf8", maxBuffer: 256 * 1024 * 1024 },
+ );
+ if (r.status !== 0 || !r.stdout) return undefined;
+ let data: { files?: { name?: string }[]; header?: { properties?: Record } };
+ try {
+ data = JSON.parse(r.stdout);
+ } catch {
+ return undefined;
+ }
+ const files = (data.files ?? []).map((f) => f.name ?? "").filter(Boolean);
+ const props = data.header?.properties ?? {};
+ const prefix = (props.prefix ?? "").trim().toLowerCase().replace(/\\/g, "/");
+ return { prefix, files };
+}
+
+function ensurePbo(
+ hemtt: string,
+ pboPath: string,
+ cache: Map,
+): PboInfo | undefined {
+ if (cache.has(pboPath)) return cache.get(pboPath);
+ const info = inspectPbo(hemtt, pboPath);
+ if (!info || !info.prefix) return undefined;
+ const files = new Map();
+ for (const f of info.files) files.set(f.toLowerCase(), f);
+ const pbo: PboInfo = { pboPath, prefix: info.prefix, files };
+ cache.set(pboPath, pbo);
+ return pbo;
+}
+
+function normalizeRef(src: string): string {
+ return src.replace(/\\/g, "/").replace(/^\/+/, "").toLowerCase();
+}
+
+function resolveRef(
+ norm: string,
+ pbos: string[],
+ byName: Map,
+ inspected: Map,
+ hemtt: string,
+): { pbo: PboInfo; relFile: string } | undefined {
+ const seg = norm.split("/").filter(Boolean);
+ const pboName = seg[1]?.toLowerCase();
+ if (pboName && byName.has(pboName)) {
+ const pbo = ensurePbo(hemtt, byName.get(pboName)!, inspected);
+ if (pbo) {
+ const prefixSlash = pbo.prefix + "/";
+ if (norm.startsWith(prefixSlash)) {
+ const relLower = norm.slice(pbo.prefix.length + 1).replace(/\//g, "\\");
+ const exact = pbo.files.get(relLower);
+ if (exact) return { pbo, relFile: exact };
+ }
+ }
+ }
+ let best: { prefix: string; pbo: PboInfo } | undefined;
+ for (const pbo of inspected.values()) {
+ const prefixSlash = pbo.prefix + "/";
+ if (norm.startsWith(prefixSlash) && (!best || pbo.prefix.length > best.prefix.length)) {
+ best = { prefix: pbo.prefix, pbo };
+ }
+ }
+ if (!best) return undefined;
+ const relLower = norm.slice(best.prefix.length + 1).replace(/\//g, "\\");
+ const exact = best.pbo.files.get(relLower);
+ return exact ? { pbo: best.pbo, relFile: exact } : undefined;
+}
+
+async function main() {
+ const opts = parseCli(process.argv.slice(2));
+ const hemtt = resolveHemtt(opts.hemtt?.[0]);
+ const game = opts.game?.[0];
+ if (!game || !existsSync(game)) throw new Error("--game is required and must exist");
+ if (!opts["paa-root"]?.[0]) throw new Error("--paa-root is required");
+ const paaRoot = opts["paa-root"][0];
+ const catalogPath = opts.catalog?.[0];
+ if (!catalogPath || !existsSync(catalogPath)) throw new Error("--catalog is required");
+
+ const pbos = discoverPbos(game, opts.mod ?? []);
+ console.log(`Discovered ${pbos.length} PBOs across ${1 + (opts.mod?.length ?? 0)} roots.`);
+ const byName = pbosByName(pbos);
+ const inspected = new Map();
+
+ interface Ref { src: string; origin: string; }
+ const refs = new Map();
+ const push = (src: string, origin: string) => {
+ const norm = normalizeRef(src);
+ if (!norm || !norm.endsWith(".paa")) return;
+ if (!refs.has(norm)) refs.set(norm, { src: src.replace(/\\/g, "/").replace(/^\/+/, ""), origin });
+ };
+
+ const catalog = JSON.parse(readFileSync(catalogPath, "utf8"));
+ for (const rec of Array.isArray(catalog) ? catalog : [catalog]) {
+ if (typeof rec?.picture === "string") push(rec.picture, "catalog");
+ }
+ const iconsPath = opts.icons?.[0];
+ if (iconsPath && existsSync(iconsPath)) {
+ const icons = JSON.parse(readFileSync(iconsPath, "utf8"));
+ for (const v of Object.values(icons)) push(String(v), "icon_map");
+ }
+
+ console.log(`${refs.size} unique .paa refs to extract.\n`);
+ const report: string[] = [];
+ let ok = 0, missing = 0, extractErr = 0;
+ for (const ref of refs.values()) {
+ const norm = normalizeRef(ref.src);
+ const dest = join(paaRoot, ...ref.src.split("/"));
+ if (existsSync(dest)) {
+ console.log(` CACHE ${ref.origin}\t${ref.src}`);
+ ok++;
+ continue;
+ }
+ const res = resolveRef(norm, pbos, byName, inspected, hemtt);
+ if (!res) {
+ console.log(` MISS ${ref.origin}\t${ref.src} (not in any indexed PBO)`);
+ report.push(`MISS\t${ref.origin}\t${ref.src}`);
+ missing++;
+ continue;
+ }
+ mkdirSync(dirname(dest), { recursive: true });
+ const r = spawnSync(
+ hemtt,
+ ["utils", "pbo", "extract", res.pbo.pboPath, res.relFile, dest],
+ { encoding: "utf8" },
+ );
+ if (r.status === 0 && existsSync(dest)) {
+ console.log(` EXTRACTED ${ref.origin}\t${ref.src}`);
+ report.push(`EXTRACTED\t${ref.origin}\t${ref.src}`);
+ ok++;
+ } else {
+ console.log(` ERR ${ref.origin}\t${ref.src} (extract failed)`);
+ report.push(`ERR\t${ref.origin}\t${ref.src}`);
+ extractErr++;
+ }
+ }
+ console.log(`\nDone: ${ok} available, ${missing} missing, ${extractErr} extract errors.`);
+ const outDir = opts["out-dir"]?.[0];
+ if (outDir) {
+ mkdirSync(outDir, { recursive: true });
+ const { writeFileSync } = await import("fs");
+ writeFileSync(join(outDir, "paa_report.txt"), report.join("\n") + "\n");
+ }
+}
+
+main().catch((e) => {
+ console.error(e);
+ process.exit(1);
+});
diff --git a/src/tools/import/importArmaLibrary.ts b/src/tools/import/importArmaLibrary.ts
new file mode 100644
index 0000000..7c19019
--- /dev/null
+++ b/src/tools/import/importArmaLibrary.ts
@@ -0,0 +1,249 @@
+#!/usr/bin/env bun
+/**
+ * Import an Arma inventory export into the Polaris Task Force Payload CMS.
+ *
+ * Consumes a catalog JSON produced by the in-game ptf_export addon (records
+ * carrying classname, display name, type, description, picture) plus an
+ * optional icon_map, and upserts rows into the `assets` / `vehicles`
+ * collections. Thumbnails are materialized from .paa inventory icons found
+ * under --paa-root (see extractArmaIcons.ts) and converted to PNG uploads via
+ * `hemtt utils paa convert`; vehicle 3D-rendered screenshots can be supplied
+ * via --screenshots (matched by classname).
+ *
+ * CLI:
+ * --catalog export catalog JSON (required)
+ * [--icons ] icon_map JSON (classname -> .paa ref)
+ * [--paa-root ] root mirroring ref paths where .paa thumbnails live
+ * [--screenshots ] PNG/WebP per-classname 3D-rendered previews
+ * [--out ] write converted thumbnails + a report here
+ * [--hemtt ] hemtt binary (default: resolve from PATH)
+ * [--approve] apply to the DB (default: proposal only)
+ * [--dry-run] plan + print, never touch the DB or filesystem
+ * [--limit ] import at most n records
+ */
+import { spawnSync } from "child_process";
+import { existsSync, mkdirSync, readFileSync } from "fs";
+import { dirname, join } from "path";
+
+interface CliOpts {
+ catalog?: string[];
+ icons?: string[];
+ "paa-root"?: string[];
+ screenshots?: string[];
+ out?: string[];
+ hemtt?: string[];
+ approve?: boolean;
+ "dry-run"?: boolean;
+ limit?: string[];
+}
+function parseCli(argv: string[]): CliOpts {
+ const opts: CliOpts = {};
+ for (let i = 0; i < argv.length; i++) {
+ const a = argv[i];
+ if (a === "--approve") { opts.approve = true; continue; }
+ if (a === "--dry-run") { opts["dry-run"] = true; continue; }
+ if (a.startsWith("--") && i + 1 < argv.length && !argv[i + 1].startsWith("--")) {
+ const key = a.slice(2) as keyof CliOpts;
+ (opts[key] ??= []).push(argv[++i]);
+ }
+ }
+ return opts;
+}
+function resolveHemtt(explicit?: string): string {
+ if (explicit && existsSync(explicit)) return explicit;
+ const probe = spawnSync("which", ["hemtt"], { encoding: "utf8" });
+ if (probe.status === 0 && probe.stdout.trim()) return probe.stdout.trim();
+ throw new Error("hemtt not found; pass --hemtt ");
+}
+
+const KNOWN_ASSET_TYPES = new Set([
+ "weapon", "magazine", "ammo", "backpack", "vest", "helmet", "uniform",
+ "item", "attachment", "optics", "muzzle", "grip", "rail", "explosive",
+ "grenade", "medical", "tool",
+]);
+function classifyAssetType(clazz: string, type: string): string {
+ const t = (type || "").toLowerCase();
+ if (KNOWN_ASSET_TYPES.has(t)) return t;
+ const c = clazz.toLowerCase();
+ if (c.includes("mag") || c.startsWith("30rnd") || c.startsWith("20rnd")) return "magazine";
+ if (/^(arifle|smg|hgun|srifle|lm|mmg|rifle|launch)/.test(c)) return "weapon";
+ if (/^(30|40|45|9|7|5|6|12|mag_|rhs_mag)/.test(c)) return "magazine";
+ return "item";
+}
+
+function isVehicle(clazz: string, type: string): boolean {
+ if (type && /vehicle|car|tank|uav|ship|heli|truck/.test(type.toLowerCase())) return true;
+ const c = clazz.toLowerCase();
+ return /^(b_|o_|i_|c_)(mr|tru|car|heli|tank|uav|boat|apc|lt|soldier)/.test(c) &&
+ !/backpack|vest|helmet/.test(c);
+}
+
+function lookupIcon(icons: Record, clazz: string): string {
+ if (icons && typeof icons === "object") {
+ for (const [k, v] of Object.entries(icons)) {
+ if (k.toLowerCase() === clazz.toLowerCase() && typeof v === "string") return v;
+ }
+ }
+ return "";
+}
+
+function resolvePaaPath(ref: string, paaRoot: string): string {
+ if (!ref) return "";
+ const clean = ref.replace(/^[\\/]+/, "").replace(/\\/g, "/");
+ const cand = join(paaRoot, clean);
+ return existsSync(cand) ? cand : "";
+}
+
+function convertPaaToPng(hemtt: string, paaPath: string, outDir: string): string | undefined {
+ const base = basename(paaPath).replace(/\.paa$/i, "") + ".png";
+ const dest = join(outDir, base);
+ if (existsSync(dest)) return dest;
+ mkdirSync(outDir, { recursive: true });
+ const r = spawnSync(hemtt, ["utils", "paa", "convert", paaPath, dest], { encoding: "utf8" });
+ return r.status === 0 && existsSync(dest) ? dest : undefined;
+}
+function basename(p: string): string {
+ const seg = p.split(/[\\/]/);
+ return seg[seg.length - 1];
+}
+
+interface ImportPlan {
+ kind: "asset" | "vehicle";
+ clazz: string;
+ displayName: string;
+ description: string;
+ assetType: string;
+ pictureRef: string;
+ paaPath: string;
+ pngPath: string;
+ screenshotPath: string;
+}
+
+function planImport(
+ rec: Record,
+ lookups: { icons: Record; paaRoot: string; screenshots: string; outDir: string; hemtt: string },
+): ImportPlan | undefined {
+ const clazz = String(rec.classname ?? rec.class ?? "").trim();
+ const type = String(rec.type ?? rec.category ?? "").trim();
+ if (!clazz) return undefined;
+ const vehicle = isVehicle(clazz, type);
+ const assetType = vehicle ? "vehicle" : classifyAssetType(clazz, type);
+ const displayName = String(rec.displayName ?? rec.name ?? clazz).trim() || clazz;
+ const description = String(rec.description ?? "").trim();
+ const pictureRef = String(rec.picture ?? "").trim();
+ const iconRef = lookups.icons ? lookupIcon(lookups.icons, clazz) : "";
+ const ref = iconRef || pictureRef;
+ const paaPath = ref ? resolvePaaPath(ref, lookups.paaRoot) : "";
+ const pngPath = paaPath
+ ? convertPaaToPng(lookups.hemtt, paaPath, join(lookups.outDir))
+ : "";
+ const screenshotPath = lookups.screenshots
+ ? (["png", "webp", "jpg"].map((e) => join(lookups.screenshots, clazz + "." + e)).find(existsSync) ?? "")
+ : "";
+ return { kind: vehicle ? "vehicle" : "asset", clazz, displayName, description, assetType, pictureRef: ref, paaPath, pngPath, screenshotPath };
+}
+
+async function resolveFuelConfig(payload: { find: (args: any) => Promise<{ docs: any[] }> }): Promise<{ id: number }> {
+ const r = await payload.find({ collection: "resources", limit: 50, where: { name: { equals: "Fuel" } } });
+ const fuel = r.docs.find((d: any) => String(d.name).toLowerCase() === "fuel");
+ if (!fuel) throw new Error("No resource named 'Fuel' found — cannot set vehicle fuel fields");
+ return { id: fuel.id };
+}
+
+async function writeEntry(
+ payload: { create: (args: { collection: string; data: any }) => Promise; update: (args: { collection: string; id: number; data: any }) => Promise },
+ plan: ImportPlan,
+ opts: { outDir: string },
+ fuelId: number,
+): Promise {
+ const common = {
+ class_name: plan.clazz,
+ display_name: plan.displayName,
+ description: plan.description || null,
+ };
+ const mediaId = plan.pngPath || plan.screenshotPath ? await uploadMedia(payload, plan.pngPath || plan.screenshotPath).catch(() => undefined) : undefined;
+
+ if (plan.kind === "vehicle") {
+ return payload.create({
+ collection: "vehicles",
+ data: {
+ ...common,
+ vehicleName: plan.displayName,
+ ...(mediaId ? { vehicle_metadata_thumbnail: mediaId } : {}),
+ fuel: { fuelType: fuelId, fuelCapacity: 100, fuelConsumptionRate: 1 },
+ },
+ }).then((d: any) => `vehicle:${d.id}`);
+ }
+ return payload.create({
+ collection: "assets",
+ data: {
+ ...common,
+ assetType: plan.assetType,
+ ...(plan.pngPath ? { "Asset Metadata": { mod: "Arma 3", thumbnail: mediaId, gameDescription: plan.description || null } } : {}),
+ },
+ }).then((d: any) => `asset:${d.id}`);
+}
+
+async function uploadMedia(payload: { create: (args: { collection: string; data: any; file: any }) => Promise }, filePath: string): Promise {
+ const { readFileSync } = await import("fs");
+ const fileName = basename(filePath);
+ const buffer = readFileSync(filePath);
+ const res = await payload.create({
+ collection: "media",
+ data: { alt: fileName, filename: fileName },
+ file: { data: buffer, mimetype: "image/png", name: fileName, size: buffer.length },
+ });
+ return Number(res.id);
+}
+
+async function main() {
+ const opts = parseCli(process.argv.slice(2));
+ const hemtt = resolveHemtt(opts.hemtt?.[0]);
+ const catalogPath = opts.catalog?.[0];
+ if (!catalogPath || !existsSync(catalogPath)) throw new Error("--catalog is required and must exist");
+ const dryRun = !!opts["dry-run"];
+ const approve = !!opts.approve || dryRun;
+ const outDir = opts.out?.[0] ?? dirname(catalogPath);
+ const paaRoot = opts["paa-root"]?.[0] ?? "";
+ const screenshots = opts.screenshots?.[0] ?? "";
+ if (!dryRun && !approve) throw new Error("--approve or --dry-run required to run without a real write");
+
+ const catalog = JSON.parse(readFileSync(catalogPath, "utf8"));
+ const records = Array.isArray(catalog) ? catalog : [catalog];
+ let icons: Record = {};
+ if (opts.icons?.[0] && existsSync(opts.icons[0])) {
+ icons = JSON.parse(readFileSync(opts.icons[0], "utf8"));
+ }
+ const limit = opts.limit ? parseInt(opts.limit[0], 10) : records.length;
+ const lookups = { icons, paaRoot, screenshots, outDir, hemtt };
+
+ console.log(`Import plan (dry-run=${dryRun}, approve=${approve}):`);
+ const plans: ImportPlan[] = [];
+ for (const rec of records.slice(0, limit)) {
+ const plan = planImport(rec, lookups);
+ if (!plan) { console.log(` SKIP ${String((rec as any).classname ?? "")} (not an importable record)`); continue; }
+ plans.push(plan);
+ const img = plan.pngPath ? "[img: item-png]" : plan.screenshotPath ? "[img: screenshot]" : "[no img]";
+ console.log(` -> ${plan.kind}\t${plan.clazz}\t${plan.displayName}\t${img}`);
+ }
+
+ if (dryRun) { console.log(`\nDry run: ${plans.length} would import, 0 applied.`); return; }
+
+ const { getPayload } = await import("@payload-config");
+ const payload = await getPayload({ config: (await import("@payload-config")).default });
+ const fuel = await resolveFuelConfig(payload);
+ let ok = 0, err = 0;
+ for (const plan of plans) {
+ try {
+ const id = await writeEntry(payload, plan, { outDir }, fuel.id);
+ console.log(`Applied ${id}`);
+ ok++;
+ } catch (e) {
+ console.error(`ERR ${plan.clazz}: ${(e as Error).message}`);
+ err++;
+ }
+ }
+ console.log(`Done: ${ok} ok, ${err} errors.`);
+}
+
+main().catch((e) => { console.error(e); process.exit(1); });
diff --git a/tests/int/preferences-form.int.spec.ts b/tests/int/preferences-form.int.spec.ts
index 360a60a..643ceac 100644
--- a/tests/int/preferences-form.int.spec.ts
+++ b/tests/int/preferences-form.int.spec.ts
@@ -37,6 +37,7 @@ describe("PreferencesForm", () => {
mutedTypes: ["market:offer"],
showCallsign: false,
showVersionOverlay: true,
+ showBackgroundTexture: true,
leadOrActual: "lead",
discordEnabled: false,
discordMutedTypes: [],
@@ -62,6 +63,7 @@ describe("PreferencesForm", () => {
mutedTypes: ["market:offer"],
showCallsign: true,
showVersionOverlay: true,
+ showBackgroundTexture: true,
leadOrActual: "actual",
discordEnabled: true,
discordMutedTypes: ["market:offer"],