Compare commits
9 Commits
ai/issue-6
...
d779d939f9
| Author | SHA1 | Date | |
|---|---|---|---|
| d779d939f9 | |||
| eeaab7a910 | |||
| f9caff3100 | |||
|
|
0567096588 | ||
|
|
8418b5c254 | ||
|
|
09e9010729 | ||
| cdafd1f53a | |||
| 2e2fb97e5d | |||
|
|
d03cc1eb59 |
@@ -118,6 +118,7 @@ the JWT guard; CORS opened for it): `snapshot` (actors + world items, `fullSync`
|
|||||||
|
|
||||||
- **Identity** is `foundryActorId` / `foundryItemId` (unique per campaign, partial index); a Foundry document carrying the `dragonroll-foundry.actorId` / `.itemId` flag adopts the matching Dragonroll row.
|
- **Identity** is `foundryActorId` / `foundryItemId` (unique per campaign, partial index); a Foundry document carrying the `dragonroll-foundry.actorId` / `.itemId` flag adopts the matching Dragonroll row.
|
||||||
- **Items are deduplicated by name** — Foundry keeps the same gear once per carrier, so one `Item` per name; `foundryNames` keeps Foundry's names so a Dragonroll rename does not resurrect a duplicate. `services/item-foundry.js` returns `null` for non-gear types and those are skipped.
|
- **Items are deduplicated by name** — Foundry keeps the same gear once per carrier, so one `Item` per name; `foundryNames` keeps Foundry's names so a Dragonroll rename does not resurrect a duplicate. `services/item-foundry.js` returns `null` for non-gear types and those are skipped.
|
||||||
|
- **Item folders mirror the world's item directory** (`Folder.foundryFolderId`, target `item`): every push carries the whole tree and the world owns its names and nesting. `color` is the one field the campaign sets too, so it travels back with the folders `GET /foundry/sync/items` answers with (`{items, folders}`) and the module writes it onto the world's folder.
|
||||||
- **`fullSync` preserves Dragonroll edits** (only new rows are overwritten); live Foundry events overwrite. Only a full snapshot can prune.
|
- **`fullSync` preserves Dragonroll edits** (only new rows are overwritten); live Foundry events overwrite. Only a full snapshot can prune.
|
||||||
- **Autosync is a Foundry-side setting** (`autoSync`, on by default): off = no CRUD push, no periodic reconcile, no startup snapshot; the actor directory's *Dragonroll: Force Sync* still upserts the selection (`fullSync:false`).
|
- **Autosync is a Foundry-side setting** (`autoSync`, on by default): off = no CRUD push, no periodic reconcile, no startup snapshot; the actor directory's *Dragonroll: Force Sync* still upserts the selection (`fullSync:false`).
|
||||||
- `GET /api/foundry/*` (`routes/foundry.js`) is unrelated: a JWT-protected proxy over the read-only bridge.
|
- `GET /api/foundry/*` (`routes/foundry.js`) is unrelated: a JWT-protected proxy over the read-only bridge.
|
||||||
|
|||||||
@@ -22,6 +22,17 @@ const ActorSchema = new Schema({
|
|||||||
},
|
},
|
||||||
armorClass: { type: Number, min: 0, default: 10 },
|
armorClass: { type: Number, min: 0, default: 10 },
|
||||||
speed: { type: Number, min: 0, default: 30 },
|
speed: { type: Number, min: 0, default: 30 },
|
||||||
|
// The two pools the sheet draws as bars under the portrait (Syndria98/dragonroll#64): the bar
|
||||||
|
// fills `current` of `max`, so both travel together. `current` is kept below `max` by whoever
|
||||||
|
// writes them (routes/actor.js), the same way the sheet clamps the bar.
|
||||||
|
hitPoints: {
|
||||||
|
current: { type: Number, min: 0, default: 10 },
|
||||||
|
max: { type: Number, min: 0, default: 10 }
|
||||||
|
},
|
||||||
|
hitDice: {
|
||||||
|
current: { type: Number, min: 0, default: 1 },
|
||||||
|
max: { type: Number, min: 0, default: 1 }
|
||||||
|
},
|
||||||
proficiencies: { type: String, default: '' },
|
proficiencies: { type: String, default: '' },
|
||||||
inventory: [{
|
inventory: [{
|
||||||
name: { type: String, trim: true, default: '' },
|
name: { type: String, trim: true, default: '' },
|
||||||
|
|||||||
@@ -13,6 +13,15 @@ async function userOwnsCampaign(campaignId, userId) {
|
|||||||
return Boolean(campaign);
|
return Boolean(campaign);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Hit points and hit dice travel as a bar the sheet fills (`current` of `max`, see models/Actor.js).
|
||||||
|
// A partial update keeps whatever half of the pair it did not send, and `current` never passes the
|
||||||
|
// maximum it ends up with.
|
||||||
|
function barPool(existing, value) {
|
||||||
|
const max = Math.max(0, Number(value?.max ?? existing?.max) || 0);
|
||||||
|
const current = Math.max(0, Math.min(Number(value?.current ?? existing?.current) || 0, max));
|
||||||
|
return { current, max };
|
||||||
|
}
|
||||||
|
|
||||||
// Folders the campaign's actors are grouped into, in the shape the sidebar groups by
|
// Folders the campaign's actors are grouped into, in the shape the sidebar groups by
|
||||||
// (the notes, items and maps each keep a tree of their own, see models/Folder.js).
|
// (the notes, items and maps each keep a tree of their own, see models/Folder.js).
|
||||||
async function actorFolders(campaignId) {
|
async function actorFolders(campaignId) {
|
||||||
@@ -56,7 +65,7 @@ router.post('/create', async (req, res) => {
|
|||||||
|
|
||||||
router.post('/update', async (req, res) => {
|
router.post('/update', async (req, res) => {
|
||||||
try {
|
try {
|
||||||
const { id, name, species, className, subclass, level, abilityScores, armorClass, speed, proficiencies, inventory, traits, spells, image, folder } = req.body;
|
const { id, name, species, className, subclass, level, abilityScores, armorClass, speed, hitPoints, hitDice, proficiencies, inventory, traits, spells, image, folder } = req.body;
|
||||||
if (!id) return res.json({ status: 'error', msg: 'errors.missing-data' });
|
if (!id) return res.json({ status: 'error', msg: 'errors.missing-data' });
|
||||||
|
|
||||||
const actor = await Actor.findById(id);
|
const actor = await Actor.findById(id);
|
||||||
@@ -80,6 +89,8 @@ router.post('/update', async (req, res) => {
|
|||||||
if (abilityScores !== undefined) actor.abilityScores = abilityScores;
|
if (abilityScores !== undefined) actor.abilityScores = abilityScores;
|
||||||
if (armorClass !== undefined) actor.armorClass = Number(armorClass);
|
if (armorClass !== undefined) actor.armorClass = Number(armorClass);
|
||||||
if (speed !== undefined) actor.speed = Number(speed);
|
if (speed !== undefined) actor.speed = Number(speed);
|
||||||
|
if (hitPoints !== undefined) actor.hitPoints = barPool(actor.hitPoints, hitPoints);
|
||||||
|
if (hitDice !== undefined) actor.hitDice = barPool(actor.hitDice, hitDice);
|
||||||
if (proficiencies !== undefined) actor.proficiencies = proficiencies;
|
if (proficiencies !== undefined) actor.proficiencies = proficiencies;
|
||||||
if (inventory !== undefined) actor.inventory = inventory;
|
if (inventory !== undefined) actor.inventory = inventory;
|
||||||
if (traits !== undefined) actor.traits = traits;
|
if (traits !== undefined) actor.traits = traits;
|
||||||
|
|||||||
@@ -144,6 +144,16 @@ async function syncFoundryItems(campaign, sources, fullSync = false, folders = n
|
|||||||
// say nothing: the folders they carry belong to that actor's own inventory, and
|
// say nothing: the folders they carry belong to that actor's own inventory, and
|
||||||
// Dragonroll keeps one item per piece of gear anyway.
|
// Dragonroll keeps one item per piece of gear anyway.
|
||||||
|
|
||||||
|
// The colour a pushed folder carries. `undefined` means the push says nothing about
|
||||||
|
// colours — an older module, which knows nothing about them — and the colour the
|
||||||
|
// campaign has stays; `null` is the world leaving a folder uncoloured, which takes
|
||||||
|
// the campaign's colour off along with it. Anything else is the colour to show.
|
||||||
|
function foundryFolderColor(source) {
|
||||||
|
if (source?.color === undefined) return undefined;
|
||||||
|
const color = typeof source.color === 'string' ? source.color.trim() : '';
|
||||||
|
return color || null;
|
||||||
|
}
|
||||||
|
|
||||||
// Parents before children, so a folder is mapped before the one nested in it.
|
// Parents before children, so a folder is mapped before the one nested in it.
|
||||||
// A folder whose parent is missing, or caught in a cycle, becomes a root.
|
// A folder whose parent is missing, or caught in a cycle, becomes a root.
|
||||||
function orderFoundryFolderSources(sources) {
|
function orderFoundryFolderSources(sources) {
|
||||||
@@ -152,7 +162,12 @@ function orderFoundryFolderSources(sources) {
|
|||||||
const id = String(source?.id || '').trim().slice(0, 120);
|
const id = String(source?.id || '').trim().slice(0, 120);
|
||||||
const name = String(source?.name || '').trim();
|
const name = String(source?.name || '').trim();
|
||||||
if (!id || !name) continue;
|
if (!id || !name) continue;
|
||||||
byId.set(id, { id, name, parent: String(source?.parent || '').trim().slice(0, 120) });
|
byId.set(id, {
|
||||||
|
id,
|
||||||
|
name,
|
||||||
|
parent: String(source?.parent || '').trim().slice(0, 120),
|
||||||
|
color: foundryFolderColor(source)
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
const ordered = [];
|
const ordered = [];
|
||||||
@@ -195,6 +210,10 @@ async function syncFoundryItemFolders(campaign, folderSources) {
|
|||||||
// The world owns this tree, so unlike an item's fields a rename or a move
|
// The world owns this tree, so unlike an item's fields a rename or a move
|
||||||
// lands whatever kind of push carried it: the whole tree arrives with each.
|
// lands whatever kind of push carried it: the whole tree arrives with each.
|
||||||
folder.name = source.name;
|
folder.name = source.name;
|
||||||
|
// Its colour is the one part of the tree the campaign colours too: what the
|
||||||
|
// world shows arrives here, and what the campaign picks travels back to the
|
||||||
|
// world with the folder list `/sync/items` answers with.
|
||||||
|
if (source.color !== undefined) folder.color = source.color;
|
||||||
const parent = inTree.has(source.parent) ? folders.get(source.parent) : null;
|
const parent = inTree.has(source.parent) ? folders.get(source.parent) : null;
|
||||||
folder.parentFolder = parent ? parent._id : null;
|
folder.parentFolder = parent ? parent._id : null;
|
||||||
await folder.save();
|
await folder.save();
|
||||||
@@ -388,12 +407,20 @@ router.post('/sync/item-delete', async (req, res) => {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// The item list the world reconciles against, together with the folders its rows are
|
||||||
|
// grouped into — the same shape the campaign's own `/item/list` answers with. The folders
|
||||||
|
// travel back for their colour: the world owns the tree's name and nesting, while whoever
|
||||||
|
// colours a folder on either side expects to see it coloured on the other.
|
||||||
router.get('/sync/items', async (req, res) => {
|
router.get('/sync/items', async (req, res) => {
|
||||||
try {
|
try {
|
||||||
const campaign = await syncCampaign(req, res);
|
const campaign = await syncCampaign(req, res);
|
||||||
if (!campaign) return;
|
if (!campaign) return;
|
||||||
const items = await Item.find({ campaign: campaign._id }).sort({ name: 1 }).lean();
|
const items = await Item.find({ campaign: campaign._id }).sort({ name: 1 }).lean();
|
||||||
res.json({ status: 'ok', items });
|
const folders = await Folder.find({ campaign: campaign._id, target: 'item' })
|
||||||
|
.select('_id name color foundryFolderId')
|
||||||
|
.sort({ name: 1 })
|
||||||
|
.lean();
|
||||||
|
res.json({ status: 'ok', items, folders });
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
console.error(err);
|
console.error(err);
|
||||||
res.json({ status: 'error', msg: 'errors.internal' });
|
res.json({ status: 'error', msg: 'errors.internal' });
|
||||||
|
|||||||
@@ -96,6 +96,10 @@ The campaign's Item list is synchronized with the world's gear, both ways:
|
|||||||
properties, description). An item made by hand in Dragonroll is created in the world's item
|
properties, description). An item made by hand in Dragonroll is created in the world's item
|
||||||
directory on the next reconcile, mapped afterwards, and editing it in Dragonroll updates the Foundry
|
directory on the next reconcile, mapped afterwards, and editing it in Dragonroll updates the Foundry
|
||||||
document.
|
document.
|
||||||
|
- The folders grouping the world's item directory arrive in the campaign as its own item folders, tree
|
||||||
|
and nesting included, and the items are filed in them. A folder's **colour** goes the other way too:
|
||||||
|
what the GM colours in Foundry shows on the campaign's folder, and what the campaign colours lands on
|
||||||
|
the world's folder on the next reconcile (the world's document keeps its name and nesting either way).
|
||||||
- A full snapshot keeps Dragonroll edits on reconnect; live Foundry edits overwrite. Item removal is
|
- A full snapshot keeps Dragonroll edits on reconnect; live Foundry edits overwrite. Item removal is
|
||||||
pruned only by a full snapshot, so a live item push never deletes anything. Deleting a synced item in
|
pruned only by a full snapshot, so a live item push never deletes anything. Deleting a synced item in
|
||||||
Dragonroll removes its Foundry world copy on the next reconcile. Items that live only in an actor's
|
Dragonroll removes its Foundry world copy on the next reconcile. Items that live only in an actor's
|
||||||
@@ -110,14 +114,15 @@ The module calls these Dragonroll routes with the campaign sync token (no Dragon
|
|||||||
| `POST /api/foundry/sync/item-snapshot` | Live world item edits, upsert only |
|
| `POST /api/foundry/sync/item-snapshot` | Live world item edits, upsert only |
|
||||||
| `POST /api/foundry/sync/item-delete` | A world item was deleted |
|
| `POST /api/foundry/sync/item-delete` | A world item was deleted |
|
||||||
| `GET /api/foundry/sync/characters` | Characters to apply back in Foundry |
|
| `GET /api/foundry/sync/characters` | Characters to apply back in Foundry |
|
||||||
| `GET /api/foundry/sync/items` | Items to apply back in Foundry |
|
| `GET /api/foundry/sync/items` | Items, and the item folders with their Dragonroll colours, to apply back in Foundry |
|
||||||
| `GET /api/foundry/sync/status` | The campaign this world's token belongs to, for the module's pairing status |
|
| `GET /api/foundry/sync/status` | The campaign this world's token belongs to, for the module's pairing status |
|
||||||
| `POST /api/foundry/sync/map` / `map-item` | Store an id mapping after creating a document |
|
| `POST /api/foundry/sync/map` / `map-item` | Store an id mapping after creating a document |
|
||||||
| `POST /api/foundry/sync/delete` | An actor was deleted |
|
| `POST /api/foundry/sync/delete` | An actor was deleted |
|
||||||
|
|
||||||
Foundry documents keep the Dragonroll id in the `dragonroll-foundry.actorId` / `dragonroll-foundry.itemId`
|
Foundry documents keep the Dragonroll id in the `dragonroll-foundry.actorId` / `dragonroll-foundry.itemId`
|
||||||
flag, and world items are marked with `dragonroll-foundry.syncMutation` while Dragonroll writes them so
|
flag, and world items are marked with `dragonroll-foundry.syncMutation` while Dragonroll writes them so
|
||||||
the write is not echoed back.
|
the write is not echoed back. A folder colour is written with that folder held in the client's set of
|
||||||
|
folders being synced, for the same reason.
|
||||||
|
|
||||||
## 2. Run the bridge on the Foundry host
|
## 2. Run the bridge on the Foundry host
|
||||||
|
|
||||||
|
|||||||
@@ -23,6 +23,7 @@ let updatingPairingStatus = false;
|
|||||||
let linkedCampaignName = "";
|
let linkedCampaignName = "";
|
||||||
let linkProblem = "";
|
let linkProblem = "";
|
||||||
let actorSyncTimeout;
|
let actorSyncTimeout;
|
||||||
|
let characterSyncRetryTimeout;
|
||||||
let characterSyncRunning = false;
|
let characterSyncRunning = false;
|
||||||
let actorSyncErrorLogged = false;
|
let actorSyncErrorLogged = false;
|
||||||
const syncingActorIds = new Set();
|
const syncingActorIds = new Set();
|
||||||
@@ -33,6 +34,7 @@ let itemSyncErrorLogged = false;
|
|||||||
let folderSyncTimeout;
|
let folderSyncTimeout;
|
||||||
let folderSyncRunning = false;
|
let folderSyncRunning = false;
|
||||||
const syncingItemIds = new Set();
|
const syncingItemIds = new Set();
|
||||||
|
const syncingFolderIds = new Set();
|
||||||
const queuedItemChanges = new Map();
|
const queuedItemChanges = new Map();
|
||||||
|
|
||||||
function getCollectionContents(collection, collectionName) {
|
function getCollectionContents(collection, collectionName) {
|
||||||
@@ -675,10 +677,23 @@ function isWorldItemFolder(folder, seen = new Set()) {
|
|||||||
return isWorldItemFolder(parent, seen);
|
return isWorldItemFolder(parent, seen);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// A Foundry folder's colour, or null for one the GM left uncoloured. Null travels as null:
|
||||||
|
// it tells Dragonroll to take a colour off the folder it was given before, whereas a module
|
||||||
|
// that says nothing about colours at all leaves the campaign's own choice alone.
|
||||||
|
function itemFolderColor(folder) {
|
||||||
|
const color = typeof folder?.color === "string" ? folder.color.trim() : "";
|
||||||
|
return color || null;
|
||||||
|
}
|
||||||
|
|
||||||
function worldItemFolderSnapshots() {
|
function worldItemFolderSnapshots() {
|
||||||
return (game.folders?.contents || [])
|
return (game.folders?.contents || [])
|
||||||
.filter((folder) => isWorldItemFolder(folder))
|
.filter((folder) => isWorldItemFolder(folder))
|
||||||
.map((folder) => ({ id: folder.id, name: folder.name, parent: itemFolderParent(folder)?.id || null }));
|
.map((folder) => ({
|
||||||
|
id: folder.id,
|
||||||
|
name: folder.name,
|
||||||
|
parent: itemFolderParent(folder)?.id || null,
|
||||||
|
color: itemFolderColor(folder),
|
||||||
|
}));
|
||||||
}
|
}
|
||||||
|
|
||||||
// A world item travels with the folder it stands in, so Dragonroll can file it the
|
// A world item travels with the folder it stands in, so Dragonroll can file it the
|
||||||
@@ -706,6 +721,35 @@ function getWorldItemSnapshots() {
|
|||||||
return (game.items?.contents || []).map(serializeFoundryWorldItem).filter(Boolean);
|
return (game.items?.contents || []).map(serializeFoundryWorldItem).filter(Boolean);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// --- Folder colours ----------------------------------------------------------
|
||||||
|
// Colouring a folder is the one thing about the tree the campaign gets to do on its
|
||||||
|
// own: the world owns what the folders are called and how they nest, and Dragonroll
|
||||||
|
// owns the colour its user picks for one. So the colour travels back with the folder
|
||||||
|
// list the item reconcile reads, and lands on the world's folder — marked, like every
|
||||||
|
// Dragonroll write, so the world does not echo it straight back to the campaign.
|
||||||
|
|
||||||
|
async function withFolderSyncSuppressed(folder, callback) {
|
||||||
|
if (!folder?.id) return callback();
|
||||||
|
syncingFolderIds.add(folder.id);
|
||||||
|
try {
|
||||||
|
return await callback();
|
||||||
|
} finally {
|
||||||
|
syncingFolderIds.delete(folder.id);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function applyDragonrollFolderColors(entries) {
|
||||||
|
for (const entry of entries || []) {
|
||||||
|
const folder = entry?.foundryFolderId ? game.folders?.get(entry.foundryFolderId) : null;
|
||||||
|
// Only the world's item directories: a Dragonroll folder the world has no document
|
||||||
|
// for is the campaign's business alone, and making one there is not ours to do.
|
||||||
|
if (!folder || folder.documentName !== "Folder" || !isWorldItemFolder(folder)) continue;
|
||||||
|
const color = entry.color || null;
|
||||||
|
if (itemFolderColor(folder) === color) continue;
|
||||||
|
await withFolderSyncSuppressed(folder, () => folder.update({ color }));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
function dragonrollItemIdOf(item) {
|
function dragonrollItemIdOf(item) {
|
||||||
return item.getFlag?.(MODULE_ID, "itemId") || item.flags?.[MODULE_ID]?.itemId || "";
|
return item.getFlag?.(MODULE_ID, "itemId") || item.flags?.[MODULE_ID]?.itemId || "";
|
||||||
}
|
}
|
||||||
@@ -916,10 +960,13 @@ async function reconcileDragonrollItems() {
|
|||||||
if (!token || !game.user?.isGM || !game.world || itemSyncRunning || !isAutoSyncEnabled()) return;
|
if (!token || !game.user?.isGM || !game.world || itemSyncRunning || !isAutoSyncEnabled()) return;
|
||||||
itemSyncRunning = true;
|
itemSyncRunning = true;
|
||||||
try {
|
try {
|
||||||
|
const result = await getDragonroll("foundry/sync/items", token);
|
||||||
|
// The folder colours are applied first, and whatever system this world runs: a
|
||||||
|
// colour is the same on every one of them, while writing an item is what needs D&D 5e.
|
||||||
|
await applyDragonrollFolderColors(result.folders);
|
||||||
if (game.system.id !== "dnd5e") {
|
if (game.system.id !== "dnd5e") {
|
||||||
throw new Error("Item sync currently requires the D&D 5e Foundry system.");
|
throw new Error("Item sync currently requires the D&D 5e Foundry system.");
|
||||||
}
|
}
|
||||||
const result = await getDragonroll("foundry/sync/items", token);
|
|
||||||
const remoteItems = result.items || [];
|
const remoteItems = result.items || [];
|
||||||
const remoteById = new Map(remoteItems.map((entry) => [String(entry._id), entry]));
|
const remoteById = new Map(remoteItems.map((entry) => [String(entry._id), entry]));
|
||||||
const localByRemoteId = new Map(game.items.contents
|
const localByRemoteId = new Map(game.items.contents
|
||||||
@@ -1223,6 +1270,14 @@ async function reconcileDragonrollCharacters() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Both sides converge on a timer that only runs while the world is open, so a
|
||||||
|
// round that could not reach Dragonroll is asked for again in a while instead of
|
||||||
|
// leaving the campaign with whatever it happened to receive.
|
||||||
|
function scheduleDragonrollCharacterSync(delay = 15000) {
|
||||||
|
clearTimeout(characterSyncRetryTimeout);
|
||||||
|
characterSyncRetryTimeout = setTimeout(reconcileDragonrollCharacters, delay);
|
||||||
|
}
|
||||||
|
|
||||||
async function initializeCharacterSync() {
|
async function initializeCharacterSync() {
|
||||||
if (!getSyncToken() || !game.user?.isGM || !game.world || !isAutoSyncEnabled()) return;
|
if (!getSyncToken() || !game.user?.isGM || !game.world || !isAutoSyncEnabled()) return;
|
||||||
try {
|
try {
|
||||||
@@ -1347,7 +1402,9 @@ Hooks.once("ready", () => {
|
|||||||
}
|
}
|
||||||
// An item folder the GM made, renamed or nested changes the tree the campaign
|
// An item folder the GM made, renamed or nested changes the tree the campaign
|
||||||
// mirrors; nothing about the items themselves changed, so only the tree goes.
|
// mirrors; nothing about the items themselves changed, so only the tree goes.
|
||||||
|
// A colour Dragonroll has just written into the folder is not the GM changing it.
|
||||||
if (document.documentName === "Folder") {
|
if (document.documentName === "Folder") {
|
||||||
|
if (syncingFolderIds.has(document.id)) return;
|
||||||
if (document.type === "Item" && isWorldItemFolder(document)) queueFoundryItemFolders();
|
if (document.type === "Item" && isWorldItemFolder(document)) queueFoundryItemFolders();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -34,6 +34,13 @@ $themes: (
|
|||||||
green: #98c379,
|
green: #98c379,
|
||||||
gray: #cccccc,
|
gray: #cccccc,
|
||||||
|
|
||||||
|
// The rarity of an item colours its row in the sidebar (Syndria98/dragonroll#63).
|
||||||
|
rarity-common: #ffffff,
|
||||||
|
rarity-uncommon: #1eff00,
|
||||||
|
rarity-rare: #2f81f7,
|
||||||
|
rarity-very-rare: #a855f7,
|
||||||
|
rarity-legendary: #ff8000,
|
||||||
|
|
||||||
icon-invert: 100%,
|
icon-invert: 100%,
|
||||||
|
|
||||||
search-background: #20202077,
|
search-background: #20202077,
|
||||||
@@ -72,6 +79,13 @@ $themes: (
|
|||||||
green: #98c379,
|
green: #98c379,
|
||||||
gray: #cccccc,
|
gray: #cccccc,
|
||||||
|
|
||||||
|
// Same rarities as the dark map, darkened to stay readable on a light background.
|
||||||
|
rarity-common: #1e1e1e,
|
||||||
|
rarity-uncommon: #157f2b,
|
||||||
|
rarity-rare: #1d4ed8,
|
||||||
|
rarity-very-rare: #7e22ce,
|
||||||
|
rarity-legendary: #c05621,
|
||||||
|
|
||||||
icon-invert: 0%,
|
icon-invert: 0%,
|
||||||
|
|
||||||
search-background: #f0f0f0aa,
|
search-background: #f0f0f0aa,
|
||||||
|
|||||||
@@ -279,8 +279,13 @@ function entrySummary(actor) {
|
|||||||
return bits.join(' · ');
|
return bits.join(' · ');
|
||||||
}
|
}
|
||||||
|
|
||||||
function itemSummary(item) {
|
// The rarity of an item colours the text of its row instead of listing category, rarity and
|
||||||
return `${t(`campaigns.item.categories.${item.category}`)} · ${t(`campaigns.item.rarities.${item.rarity}`)} · ${t('campaigns.item.quantity-short')} ${item.quantity}`;
|
// quantity (Syndria98/dragonroll#63): common white, uncommon green, rare blue, very rare purple,
|
||||||
|
// legendary orange. Anything else (artifact) keeps the default text colour.
|
||||||
|
function rarityClass(item) {
|
||||||
|
return ['common', 'uncommon', 'rare', 'very-rare', 'legendary'].includes(item.rarity)
|
||||||
|
? `rarity-${item.rarity}`
|
||||||
|
: '';
|
||||||
}
|
}
|
||||||
|
|
||||||
// An item's icon in the sidebar: an uploaded filename served from /api/public, or a full URL
|
// An item's icon in the sidebar: an uploaded filename served from /api/public, or a full URL
|
||||||
@@ -681,9 +686,8 @@ onBeforeUnmount(() => {
|
|||||||
<span v-if="row.item.image" class="entity-entry-image" aria-hidden="true">
|
<span v-if="row.item.image" class="entity-entry-image" aria-hidden="true">
|
||||||
<img :src="itemImageUrl(row.item.image)" alt="">
|
<img :src="itemImageUrl(row.item.image)" alt="">
|
||||||
</span>
|
</span>
|
||||||
<span class="entity-entry-name">{{ row.item.name }}</span>
|
<span class="entity-entry-name" :class="rarityClass(row.item)">{{ row.item.name }}</span>
|
||||||
</span>
|
</span>
|
||||||
<span class="entity-entry-meta">{{ itemSummary(row.item) }}</span>
|
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
</template>
|
</template>
|
||||||
@@ -877,6 +881,13 @@ onBeforeUnmount(() => {
|
|||||||
/* An item row leads with the item's own icon on the left of its name, standing in for the
|
/* An item row leads with the item's own icon on the left of its name, standing in for the
|
||||||
"SYNCED" text it used to show (Syndria98/dragonroll#53). */
|
"SYNCED" text it used to show (Syndria98/dragonroll#53). */
|
||||||
.entity-entry-title { display: flex; align-items: center; gap: 9px; min-width: 0; }
|
.entity-entry-title { display: flex; align-items: center; gap: 9px; min-width: 0; }
|
||||||
|
/* The rarity of an item colours the text of its row (Syndria98/dragonroll#63): common white,
|
||||||
|
uncommon green, rare blue, very rare purple, legendary orange. */
|
||||||
|
.entity-entry-name.rarity-common { color: var(--color-rarity-common); }
|
||||||
|
.entity-entry-name.rarity-uncommon { color: var(--color-rarity-uncommon); }
|
||||||
|
.entity-entry-name.rarity-rare { color: var(--color-rarity-rare); }
|
||||||
|
.entity-entry-name.rarity-very-rare { color: var(--color-rarity-very-rare); }
|
||||||
|
.entity-entry-name.rarity-legendary { color: var(--color-rarity-legendary); }
|
||||||
.entity-entry-image {
|
.entity-entry-image {
|
||||||
flex: 0 0 30px; width: 30px; height: 30px; box-sizing: border-box;
|
flex: 0 0 30px; width: 30px; height: 30px; box-sizing: border-box;
|
||||||
display: grid; place-items: center; overflow: hidden;
|
display: grid; place-items: center; overflow: hidden;
|
||||||
|
|||||||
@@ -34,6 +34,11 @@ const tabs = [
|
|||||||
];
|
];
|
||||||
const activeTab = ref('abilities');
|
const activeTab = ref('abilities');
|
||||||
|
|
||||||
|
// Les pestanyes pengen del marc de la finestra, per fora del contingent (vegeu .sheet-tabs). La
|
||||||
|
// finestra es fa més estreta perquè el marge que la centra sigui prou ample per aguantar-les;
|
||||||
|
// per sota de 760px el marc les fa estar a dins i el marge deixa de fer falta.
|
||||||
|
const TAB_RAIL_WIDTH = 150;
|
||||||
|
|
||||||
function normalizeActor(actor) {
|
function normalizeActor(actor) {
|
||||||
return {
|
return {
|
||||||
name: actor?.name ?? '',
|
name: actor?.name ?? '',
|
||||||
@@ -44,6 +49,16 @@ function normalizeActor(actor) {
|
|||||||
abilityScores: Object.fromEntries(abilityStats.map(({ key }) => [key, Number(actor?.abilityScores?.[key] ?? 10)])),
|
abilityScores: Object.fromEntries(abilityStats.map(({ key }) => [key, Number(actor?.abilityScores?.[key] ?? 10)])),
|
||||||
armorClass: Number(actor?.armorClass ?? 10),
|
armorClass: Number(actor?.armorClass ?? 10),
|
||||||
speed: Number(actor?.speed ?? 30),
|
speed: Number(actor?.speed ?? 30),
|
||||||
|
// Les barres sota la imatge: `current` de `max`. Un personatge que encara no en té
|
||||||
|
// rep un dau de cop per nivell, que és el que D&D compta.
|
||||||
|
hitPoints: {
|
||||||
|
current: Number(actor?.hitPoints?.current ?? actor?.hitPoints?.max ?? 10),
|
||||||
|
max: Number(actor?.hitPoints?.max ?? actor?.hitPoints?.current ?? 10)
|
||||||
|
},
|
||||||
|
hitDice: {
|
||||||
|
current: Number(actor?.hitDice?.current ?? actor?.level ?? 1),
|
||||||
|
max: Number(actor?.hitDice?.max ?? actor?.level ?? 1)
|
||||||
|
},
|
||||||
proficiencies: actor?.proficiencies ?? '',
|
proficiencies: actor?.proficiencies ?? '',
|
||||||
inventory: (actor?.inventory ?? []).map((item) => ({
|
inventory: (actor?.inventory ?? []).map((item) => ({
|
||||||
name: item.name ?? '', quantity: Number(item.quantity ?? 1), weight: Number(item.weight ?? 0)
|
name: item.name ?? '', quantity: Number(item.quantity ?? 1), weight: Number(item.weight ?? 0)
|
||||||
@@ -60,8 +75,11 @@ original.value = normalizeActor(props.data.actor);
|
|||||||
onMounted(() => {
|
onMounted(() => {
|
||||||
Top(wrapper);
|
Top(wrapper);
|
||||||
SetupHandle(id, handle);
|
SetupHandle(id, handle);
|
||||||
|
// Les pestanyes pengen del marc per fora del cos: com que la finestra es centra, el marge que
|
||||||
|
// li queda a la dreta és la meitat del que li sobra, i cal reservar-nos el doble.
|
||||||
|
const railRoom = window.innerWidth > 760 ? 2 * TAB_RAIL_WIDTH : 0;
|
||||||
SetSize(id, {
|
SetSize(id, {
|
||||||
width: Math.max(320, Math.min(900, window.innerWidth - 24)),
|
width: Math.max(320, Math.min(900, window.innerWidth - 24 - railRoom)),
|
||||||
height: Math.max(360, Math.min(700, window.innerHeight - 32))
|
height: Math.max(360, Math.min(700, window.innerHeight - 32))
|
||||||
});
|
});
|
||||||
ResetPosition(id, 'center');
|
ResetPosition(id, 'center');
|
||||||
@@ -79,6 +97,15 @@ onMounted(() => emitter.on('campaign-entry-updated', handleActorSync));
|
|||||||
onBeforeUnmount(() => emitter.off('campaign-entry-updated', handleActorSync));
|
onBeforeUnmount(() => emitter.off('campaign-entry-updated', handleActorSync));
|
||||||
|
|
||||||
const proficiencyBonus = computed(() => Math.ceil(form.value.level / 4) + 1);
|
const proficiencyBonus = computed(() => Math.ceil(form.value.level / 4) + 1);
|
||||||
|
// La iniciativa és el modificador de DESTÀ, que és el que D&D compta quan el personatge no
|
||||||
|
// porta cap do extra que l'augmenti.
|
||||||
|
const initiativeBonus = computed(() => abilityModifier(form.value.abilityScores.dex));
|
||||||
|
// Quina part del màxim representa la barra; buida (màxim 0) o per sobre, tot tallat.
|
||||||
|
function barPercent(current, max) {
|
||||||
|
return max > 0 ? Math.min(100, Math.max(0, ((Number(current) || 0) / max) * 100)) : 0;
|
||||||
|
}
|
||||||
|
const hitPointsPercent = computed(() => barPercent(form.value.hitPoints.current, form.value.hitPoints.max));
|
||||||
|
const hitDicePercent = computed(() => barPercent(form.value.hitDice.current, form.value.hitDice.max));
|
||||||
const carryingCapacity = computed(() => form.value.abilityScores.str * 15);
|
const carryingCapacity = computed(() => form.value.abilityScores.str * 15);
|
||||||
const carriedWeight = computed(() => form.value.inventory.reduce((total, item) => total + (Number(item.quantity) || 0) * (Number(item.weight) || 0), 0));
|
const carriedWeight = computed(() => form.value.inventory.reduce((total, item) => total + (Number(item.quantity) || 0) * (Number(item.weight) || 0), 0));
|
||||||
const carryPercent = computed(() => Math.min(100, carryingCapacity.value ? (carriedWeight.value / carryingCapacity.value) * 100 : 0));
|
const carryPercent = computed(() => Math.min(100, carryingCapacity.value ? (carriedWeight.value / carryingCapacity.value) * 100 : 0));
|
||||||
@@ -179,6 +206,21 @@ async function saveSheet() {
|
|||||||
<template>
|
<template>
|
||||||
<div class="window-wrapper sheet-window" :id="'window-wrapper-' + id" ref="wrapper">
|
<div class="window-wrapper sheet-window" :id="'window-wrapper-' + id" ref="wrapper">
|
||||||
<WindowHandle :window="id" ref="handle" />
|
<WindowHandle :window="id" ref="handle" />
|
||||||
|
|
||||||
|
<!-- Pestilletes del marc de la finestra: pengen del cantó dret, per fora del
|
||||||
|
contingent, i no s'enrolen quan la fitxa desfila. -->
|
||||||
|
<nav class="sheet-tabs" role="tablist" aria-orientation="vertical">
|
||||||
|
<button
|
||||||
|
v-for="tab in tabs"
|
||||||
|
:key="tab.key"
|
||||||
|
class="sheet-tab"
|
||||||
|
:class="{ active: activeTab === tab.key }"
|
||||||
|
type="button"
|
||||||
|
role="tab"
|
||||||
|
:aria-selected="activeTab === tab.key"
|
||||||
|
@click="activeTab = tab.key"
|
||||||
|
>{{ $t(tab.label) }}</button>
|
||||||
|
</nav>
|
||||||
<div class="sheet-body">
|
<div class="sheet-body">
|
||||||
<header class="sheet-hero">
|
<header class="sheet-hero">
|
||||||
<div class="character-mark" aria-hidden="true">{{ form.name.slice(0, 1).toUpperCase() }}</div>
|
<div class="character-mark" aria-hidden="true">{{ form.name.slice(0, 1).toUpperCase() }}</div>
|
||||||
@@ -217,9 +259,8 @@ async function saveSheet() {
|
|||||||
|
|
||||||
<div v-if="error" class="sheet-error">{{ error }}</div>
|
<div v-if="error" class="sheet-error">{{ error }}</div>
|
||||||
|
|
||||||
<div class="sheet-layout">
|
|
||||||
<div class="sheet-content">
|
|
||||||
<main v-show="activeTab === 'abilities'" class="sheet-grid">
|
<main v-show="activeTab === 'abilities'" class="sheet-grid">
|
||||||
|
<div class="character-column">
|
||||||
<div v-if="form.image || editing" class="sheet-portrait" :class="{ empty: !form.image }">
|
<div v-if="form.image || editing" class="sheet-portrait" :class="{ empty: !form.image }">
|
||||||
<img v-if="form.image" :src="imageUrl" :alt="$t('campaigns.character-sheet.photo')">
|
<img v-if="form.image" :src="imageUrl" :alt="$t('campaigns.character-sheet.photo')">
|
||||||
<button v-if="editing && !form.image" class="portrait-upload" type="button" :disabled="uploadingPhoto" @click="pickPhoto">
|
<button v-if="editing && !form.image" class="portrait-upload" type="button" :disabled="uploadingPhoto" @click="pickPhoto">
|
||||||
@@ -234,6 +275,58 @@ async function saveSheet() {
|
|||||||
<input ref="photoInput" class="photo-input" type="file" accept="image/*" @change="onPhotoSelected">
|
<input ref="photoInput" class="photo-input" type="file" accept="image/*" @change="onPhotoSelected">
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<!-- El que es mira primer: classe d'armadura, velocitat i els bonificadors
|
||||||
|
que acompanyen els cops, tot just sota la imatge. -->
|
||||||
|
<section class="sheet-panel vitals-panel">
|
||||||
|
<div class="vital-stats">
|
||||||
|
<div class="vital-stat">
|
||||||
|
<span>{{ $t('campaigns.character-sheet.armor-class') }}</span>
|
||||||
|
<input v-if="editing" v-model.number="form.armorClass" type="number" min="0" :aria-label="$t('campaigns.character-sheet.armor-class')">
|
||||||
|
<strong v-else>{{ form.armorClass }}</strong>
|
||||||
|
</div>
|
||||||
|
<div class="vital-stat">
|
||||||
|
<span>{{ $t('campaigns.character-sheet.speed') }}</span>
|
||||||
|
<label v-if="editing" class="number-with-unit"><input v-model.number="form.speed" type="number" min="0" :aria-label="$t('campaigns.character-sheet.speed')"><small>ft</small></label>
|
||||||
|
<strong v-else>{{ form.speed }} <small>ft</small></strong>
|
||||||
|
</div>
|
||||||
|
<div class="vital-stat">
|
||||||
|
<span>{{ $t('campaigns.character-sheet.proficiency-bonus') }}</span>
|
||||||
|
<strong>+{{ proficiencyBonus }}</strong>
|
||||||
|
</div>
|
||||||
|
<div class="vital-stat">
|
||||||
|
<span>{{ $t('campaigns.character-sheet.initiative') }}</span>
|
||||||
|
<strong>{{ initiativeBonus }}</strong>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="vital-bar hit-points-bar">
|
||||||
|
<div class="vital-bar-head">
|
||||||
|
<span>{{ $t('campaigns.character-sheet.hit-points') }}</span>
|
||||||
|
<strong v-if="!editing">{{ form.hitPoints.current }} / {{ form.hitPoints.max }}</strong>
|
||||||
|
<label v-else class="vital-bar-inputs">
|
||||||
|
<input v-model.number="form.hitPoints.current" type="number" min="0" :aria-label="$t('campaigns.character-sheet.hit-points')">
|
||||||
|
<span>/</span>
|
||||||
|
<input v-model.number="form.hitPoints.max" type="number" min="0" :aria-label="$t('campaigns.character-sheet.max-hit-points')">
|
||||||
|
</label>
|
||||||
|
</div>
|
||||||
|
<div class="vital-bar-track"><div class="vital-bar-fill" :style="{ width: `${hitPointsPercent}%` }" /></div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="vital-bar hit-dice-bar">
|
||||||
|
<div class="vital-bar-head">
|
||||||
|
<span>{{ $t('campaigns.character-sheet.hit-dice') }}</span>
|
||||||
|
<strong v-if="!editing">{{ form.hitDice.current }} / {{ form.hitDice.max }}</strong>
|
||||||
|
<label v-else class="vital-bar-inputs">
|
||||||
|
<input v-model.number="form.hitDice.current" type="number" min="0" :aria-label="$t('campaigns.character-sheet.hit-dice')">
|
||||||
|
<span>/</span>
|
||||||
|
<input v-model.number="form.hitDice.max" type="number" min="0" :aria-label="$t('campaigns.character-sheet.max-hit-dice')">
|
||||||
|
</label>
|
||||||
|
</div>
|
||||||
|
<div class="vital-bar-track"><div class="vital-bar-fill" :style="{ width: `${hitDicePercent}%` }" /></div>
|
||||||
|
</div>
|
||||||
|
</section>
|
||||||
|
</div>
|
||||||
|
|
||||||
<section class="sheet-panel abilities-panel">
|
<section class="sheet-panel abilities-panel">
|
||||||
<h2>{{ $t('campaigns.character-sheet.ability-scores') }}</h2>
|
<h2>{{ $t('campaigns.character-sheet.ability-scores') }}</h2>
|
||||||
<div class="ability-grid">
|
<div class="ability-grid">
|
||||||
@@ -244,28 +337,11 @@ async function saveSheet() {
|
|||||||
<span class="ability-modifier">{{ abilityModifier(form.abilityScores[stat.key]) }}</span>
|
<span class="ability-modifier">{{ abilityModifier(form.abilityScores[stat.key]) }}</span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="proficiency-badge">
|
|
||||||
<span>{{ $t('campaigns.character-sheet.proficiency-bonus') }}</span>
|
|
||||||
<strong>+{{ proficiencyBonus }}</strong>
|
|
||||||
</div>
|
|
||||||
</section>
|
</section>
|
||||||
|
|
||||||
<section class="sheet-panel combat-panel">
|
<section class="sheet-panel proficiencies-panel">
|
||||||
<h2>{{ $t('campaigns.character-sheet.combat') }}</h2>
|
<h2>{{ $t('campaigns.character-sheet.proficiencies') }}</h2>
|
||||||
<div class="combat-stats">
|
<textarea v-if="editing" v-model="form.proficiencies" rows="7" :placeholder="$t('campaigns.character-sheet.proficiencies-placeholder')" />
|
||||||
<div class="combat-stat">
|
|
||||||
<span>{{ $t('campaigns.character-sheet.armor-class') }}</span>
|
|
||||||
<input v-if="editing" v-model.number="form.armorClass" type="number" min="0">
|
|
||||||
<strong v-else>{{ form.armorClass }}</strong>
|
|
||||||
</div>
|
|
||||||
<div class="combat-stat">
|
|
||||||
<span>{{ $t('campaigns.character-sheet.speed') }}</span>
|
|
||||||
<label v-if="editing" class="number-with-unit"><input v-model.number="form.speed" type="number" min="0"><small>ft</small></label>
|
|
||||||
<strong v-else>{{ form.speed }} <small>ft</small></strong>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<h3>{{ $t('campaigns.character-sheet.proficiencies') }}</h3>
|
|
||||||
<textarea v-if="editing" v-model="form.proficiencies" rows="5" :placeholder="$t('campaigns.character-sheet.proficiencies-placeholder')" />
|
|
||||||
<p v-else class="sheet-copy">{{ form.proficiencies || $t('campaigns.character-sheet.empty-proficiencies') }}</p>
|
<p v-else class="sheet-copy">{{ form.proficiencies || $t('campaigns.character-sheet.empty-proficiencies') }}</p>
|
||||||
</section>
|
</section>
|
||||||
</main>
|
</main>
|
||||||
@@ -321,21 +397,6 @@ async function saveSheet() {
|
|||||||
</section>
|
</section>
|
||||||
</main>
|
</main>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<nav class="sheet-tabs" role="tablist" aria-orientation="vertical">
|
|
||||||
<button
|
|
||||||
v-for="tab in tabs"
|
|
||||||
:key="tab.key"
|
|
||||||
class="sheet-tab"
|
|
||||||
:class="{ active: activeTab === tab.key }"
|
|
||||||
type="button"
|
|
||||||
role="tab"
|
|
||||||
:aria-selected="activeTab === tab.key"
|
|
||||||
@click="activeTab = tab.key"
|
|
||||||
>{{ $t(tab.label) }}</button>
|
|
||||||
</nav>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
@@ -359,15 +420,15 @@ async function saveSheet() {
|
|||||||
.sheet-button:disabled { opacity: .55; cursor: wait; }
|
.sheet-button:disabled { opacity: .55; cursor: wait; }
|
||||||
.sheet-button.compact { padding: 5px 9px; font-size: 12px; }
|
.sheet-button.compact { padding: 5px 9px; font-size: 12px; }
|
||||||
.sheet-grid { display: grid; grid-template-columns: minmax(200px, 34%) minmax(0, 1fr) minmax(0, 1fr); grid-template-rows: auto auto; gap: 11px; align-items: start; }
|
.sheet-grid { display: grid; grid-template-columns: minmax(200px, 34%) minmax(0, 1fr) minmax(0, 1fr); grid-template-rows: auto auto; gap: 11px; align-items: start; }
|
||||||
.sheet-layout { display: flex; align-items: flex-start; gap: 10px; }
|
|
||||||
.sheet-content { flex: 1 1 auto; min-width: 0; }
|
|
||||||
.sheet-tab-body { display: block; }
|
.sheet-tab-body { display: block; }
|
||||||
.sheet-tabs { flex: 0 0 auto; display: flex; flex-direction: column; gap: 6px; position: sticky; top: 0; align-self: flex-start; }
|
/* Pestilletes del marc: arrencen del cantó dret de la finestra, per fora del cos, i queden
|
||||||
|
fora del contingent que desfila. Per sota de 760px no hi ha lloc fora (vegeu a sota). */
|
||||||
|
.sheet-tabs { position: absolute; left: 100%; top: 34px; display: flex; flex-direction: column; align-items: flex-start; gap: 5px; padding-top: 6px; }
|
||||||
.sheet-tab {
|
.sheet-tab {
|
||||||
text-align: left;
|
text-align: left;
|
||||||
padding: 9px 14px 9px 11px;
|
padding: 9px 14px 9px 11px;
|
||||||
border: 1px solid var(--color-border);
|
border: 1px solid var(--color-border);
|
||||||
border-left-width: 3px;
|
border-left: 0;
|
||||||
border-radius: 0 9px 9px 0;
|
border-radius: 0 9px 9px 0;
|
||||||
background: var(--color-background-soft);
|
background: var(--color-background-soft);
|
||||||
color: var(--color-text);
|
color: var(--color-text);
|
||||||
@@ -378,11 +439,11 @@ async function saveSheet() {
|
|||||||
transition: background .15s ease, border-color .15s ease, color .15s ease;
|
transition: background .15s ease, border-color .15s ease, color .15s ease;
|
||||||
}
|
}
|
||||||
.sheet-tab:hover { background: var(--color-button-hover); }
|
.sheet-tab:hover { background: var(--color-button-hover); }
|
||||||
.sheet-tab.active { background: var(--color-background-light); color: var(--color-link); border-left-color: var(--color-link); box-shadow: 0 3px 12px var(--color-window-shadow); }
|
.sheet-tab.active { background: var(--color-background-light); color: var(--color-link); border-color: var(--color-link); box-shadow: 0 3px 12px var(--color-window-shadow); }
|
||||||
.sheet-panel { min-width: 0; padding: 13px; border: 1px solid var(--color-border); border-radius: 10px; background: var(--color-background-light); box-shadow: 0 3px 12px var(--color-window-shadow); }
|
.sheet-panel { min-width: 0; padding: 13px; border: 1px solid var(--color-border); border-radius: 10px; background: var(--color-background-light); box-shadow: 0 3px 12px var(--color-window-shadow); }
|
||||||
.sheet-panel h2 { margin: 0 0 12px; padding-bottom: 7px; border-bottom: 1px solid var(--color-border); font: 17px MrEavesRemake; letter-spacing: .03em; }
|
.sheet-panel h2 { margin: 0 0 12px; padding-bottom: 7px; border-bottom: 1px solid var(--color-border); font: 17px MrEavesRemake; letter-spacing: .03em; }
|
||||||
.sheet-panel h3 { margin: 13px 0 7px; font: 14px MrEavesRemake; }
|
.sheet-panel h3 { margin: 13px 0 7px; font: 14px MrEavesRemake; }
|
||||||
.sheet-portrait { grid-column: 1; grid-row: 1 / -1; position: relative; overflow: hidden; border: 1px solid var(--color-border); border-radius: 10px; background: var(--color-background-soft); }
|
.sheet-portrait { position: relative; overflow: hidden; border: 1px solid var(--color-border); border-radius: 10px; background: var(--color-background-soft); }
|
||||||
.sheet-portrait.empty { display: grid; place-items: center; min-height: 220px; border-style: dashed; }
|
.sheet-portrait.empty { display: grid; place-items: center; min-height: 220px; border-style: dashed; }
|
||||||
.sheet-portrait img { display: block; width: 100%; height: auto; }
|
.sheet-portrait img { display: block; width: 100%; height: auto; }
|
||||||
.portrait-upload { border: 0; padding: 8px 10px; background: transparent; color: var(--color-link); font-size: 12px; cursor: pointer; }
|
.portrait-upload { border: 0; padding: 8px 10px; background: transparent; color: var(--color-link); font-size: 12px; cursor: pointer; }
|
||||||
@@ -392,21 +453,34 @@ async function saveSheet() {
|
|||||||
.portrait-controls button:hover { background: var(--color-button-hover); }
|
.portrait-controls button:hover { background: var(--color-button-hover); }
|
||||||
.portrait-controls button:disabled { opacity: .55; cursor: wait; }
|
.portrait-controls button:disabled { opacity: .55; cursor: wait; }
|
||||||
.photo-input { display: none; }
|
.photo-input { display: none; }
|
||||||
|
/* La columna de la fitxa: la imatge dalt i, just a sota, el que es consulta d'anada i
|
||||||
|
tornada — classe d'armadura, velocitat, bonificadors i les barres de cops. */
|
||||||
|
.character-column { grid-column: 1; grid-row: 1 / -1; display: flex; flex-direction: column; gap: 11px; min-width: 0; }
|
||||||
.abilities-panel { grid-column: 2 / -1; grid-row: 1; }
|
.abilities-panel { grid-column: 2 / -1; grid-row: 1; }
|
||||||
.combat-panel { grid-column: 2 / -1; grid-row: 2; }
|
.proficiencies-panel { grid-column: 2 / -1; grid-row: 2; }
|
||||||
.ability-grid { display: grid; grid-template-columns: repeat(6, minmax(0, 1fr)); gap: 7px; }
|
.ability-grid { display: grid; grid-template-columns: repeat(6, minmax(0, 1fr)); gap: 7px; }
|
||||||
.ability-card { min-height: 83px; padding: 8px 5px; display: flex; flex-direction: column; align-items: center; justify-content: center; gap: 3px; border: 1px solid var(--color-border); border-radius: 8px; background: var(--color-background-soft); }
|
.ability-card { min-height: 83px; padding: 8px 5px; display: flex; flex-direction: column; align-items: center; justify-content: center; gap: 3px; border: 1px solid var(--color-border); border-radius: 8px; background: var(--color-background-soft); }
|
||||||
.ability-label { font-size: 11px; font-weight: 700; letter-spacing: .08em; opacity: .75; }
|
.ability-label { font-size: 11px; font-weight: 700; letter-spacing: .08em; opacity: .75; }
|
||||||
.ability-score { font: 25px MrEavesRemake; }
|
.ability-score { font: 25px MrEavesRemake; }
|
||||||
.ability-modifier { min-width: 33px; text-align: center; padding: 2px 5px; border-radius: 999px; background: var(--color-background); font-size: 12px; }
|
.ability-modifier { min-width: 33px; text-align: center; padding: 2px 5px; border-radius: 999px; background: var(--color-background); font-size: 12px; }
|
||||||
.ability-card input { width: 55px; text-align: center; font-size: 21px; }
|
.ability-card input { width: 55px; text-align: center; font-size: 21px; }
|
||||||
.proficiency-badge { display: flex; justify-content: space-between; align-items: center; margin-top: 9px; padding: 8px; border-radius: 8px; background: var(--color-background-soft); font-size: 12px; }
|
.vitals-panel { display: flex; flex-direction: column; gap: 11px; }
|
||||||
.proficiency-badge strong { font-size: 15px; color: var(--color-link); }
|
.vital-stats { display: grid; grid-template-columns: 1fr 1fr; gap: 7px; }
|
||||||
.combat-stats { display: grid; grid-template-columns: 1fr 1fr; gap: 8px; }
|
.vital-stat { min-height: 68px; display: flex; flex-direction: column; align-items: center; justify-content: center; gap: 4px; padding: 6px 4px; border: 1px solid var(--color-border); border-radius: 8px; background: var(--color-background-soft); text-align: center; }
|
||||||
.combat-stat { min-height: 72px; display: flex; flex-direction: column; align-items: center; justify-content: center; gap: 5px; border: 1px solid var(--color-border); border-radius: 8px; background: var(--color-background-soft); }
|
.vital-stat > span { font-size: 10px; text-transform: uppercase; letter-spacing: .05em; opacity: .72; }
|
||||||
.combat-stat > span { font-size: 11px; text-transform: uppercase; letter-spacing: .05em; opacity: .72; }
|
.vital-stat > strong { font: 25px MrEavesRemake; }
|
||||||
.combat-stat > strong { font: 25px MrEavesRemake; }
|
.vital-stat small { font-size: 11px; opacity: .7; }
|
||||||
.combat-stat small { font-size: 11px; opacity: .7; }
|
.vital-stat input { width: 57px; text-align: center; }
|
||||||
|
/* Les dues barres: punts de cop i daus de cop, plenes fins on arriben. */
|
||||||
|
.vital-bar-head { display: flex; justify-content: space-between; align-items: center; gap: 8px; }
|
||||||
|
.vital-bar-head > span { font-size: 10px; text-transform: uppercase; letter-spacing: .05em; opacity: .72; }
|
||||||
|
.vital-bar-head > strong { font: 15px MrEavesRemake; white-space: nowrap; }
|
||||||
|
.vital-bar-inputs { display: flex; align-items: center; gap: 4px; }
|
||||||
|
.vital-bar-inputs input { width: 52px; text-align: center; }
|
||||||
|
.vital-bar-track { height: 8px; margin-top: 5px; overflow: hidden; border-radius: 999px; background: var(--color-background); }
|
||||||
|
.vital-bar-fill { height: 100%; border-radius: inherit; transition: width .2s ease; }
|
||||||
|
.hit-points-bar .vital-bar-fill { background: var(--color-red); }
|
||||||
|
.hit-dice-bar .vital-bar-fill { background: var(--color-link); }
|
||||||
.number-with-unit { display: flex; align-items: center; gap: 4px; }
|
.number-with-unit { display: flex; align-items: center; gap: 4px; }
|
||||||
.number-with-unit input { width: 57px; }
|
.number-with-unit input { width: 57px; }
|
||||||
.sheet-copy { min-height: 74px; margin: 0; white-space: pre-wrap; overflow-wrap: anywhere; font-size: 13px; line-height: 1.45; opacity: .85; }
|
.sheet-copy { min-height: 74px; margin: 0; white-space: pre-wrap; overflow-wrap: anywhere; font-size: 13px; line-height: 1.45; opacity: .85; }
|
||||||
@@ -434,16 +508,16 @@ textarea { resize: vertical; width: 100%; min-height: 88px; font-size: 12px; }
|
|||||||
.sr-only { position: absolute; width: 1px; height: 1px; padding: 0; margin: -1px; overflow: hidden; clip: rect(0, 0, 0, 0); white-space: nowrap; border: 0; }
|
.sr-only { position: absolute; width: 1px; height: 1px; padding: 0; margin: -1px; overflow: hidden; clip: rect(0, 0, 0, 0); white-space: nowrap; border: 0; }
|
||||||
@media (max-width: 760px) {
|
@media (max-width: 760px) {
|
||||||
.sheet-grid { grid-template-columns: 1fr; grid-template-rows: none; }
|
.sheet-grid { grid-template-columns: 1fr; grid-template-rows: none; }
|
||||||
.sheet-portrait, .abilities-panel, .combat-panel { grid-column: 1 / -1; grid-row: auto; }
|
.character-column, .abilities-panel, .proficiencies-panel { grid-column: 1 / -1; grid-row: auto; }
|
||||||
|
/* El cantó dret no dona prou per penjar-hi les pestanyes: llavors es queden al marc, per
|
||||||
|
dins, en una filera sota la barra de la finestra. */
|
||||||
|
.sheet-tabs { position: static; align-self: stretch; flex-direction: row; flex-wrap: wrap; gap: 4px; padding: 6px 8px 0; }
|
||||||
|
.sheet-tab { flex: 1 1 auto; text-align: center; border-left: 1px solid var(--color-border); border-radius: 8px 8px 0 0; }
|
||||||
}
|
}
|
||||||
@media (max-width: 520px) {
|
@media (max-width: 520px) {
|
||||||
.sheet-body { padding: 10px; }
|
.sheet-body { padding: 10px; }
|
||||||
.sheet-hero { align-items: flex-start; flex-wrap: wrap; }
|
.sheet-hero { align-items: flex-start; flex-wrap: wrap; }
|
||||||
.sheet-actions { margin-left: auto; }
|
.sheet-actions { margin-left: auto; }
|
||||||
.ability-grid { grid-template-columns: repeat(3, minmax(0, 1fr)); }
|
.ability-grid { grid-template-columns: repeat(3, minmax(0, 1fr)); }
|
||||||
.sheet-layout { flex-direction: column; }
|
|
||||||
.sheet-tabs { flex-direction: row; flex-wrap: wrap; order: -1; }
|
|
||||||
.sheet-tab { flex: 1 1 auto; text-align: center; border-radius: 7px; border-left-width: 1px; border-top-width: 3px; }
|
|
||||||
.sheet-tab.active { border-left-color: var(--color-border); border-top-color: var(--color-link); }
|
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|||||||
@@ -20,13 +20,13 @@ function initialForm() {
|
|||||||
if (!editing) {
|
if (!editing) {
|
||||||
return {
|
return {
|
||||||
name: '', type: 'character', species: '', className: '', level: '', background: '', challengeRating: '',
|
name: '', type: 'character', species: '', className: '', level: '', background: '', challengeRating: '',
|
||||||
category: 'adventuring-gear', rarity: 'common', quantity: 1, weight: '', properties: '', description: ''
|
category: 'adventuring-gear', rarity: 'common', weight: '', properties: '', description: ''
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
return {
|
return {
|
||||||
name: editing.name ?? '', type: 'character', species: '', className: '', level: '', background: '', challengeRating: '',
|
name: editing.name ?? '', type: 'character', species: '', className: '', level: '', background: '', challengeRating: '',
|
||||||
category: editing.category ?? 'adventuring-gear', rarity: editing.rarity ?? 'common',
|
category: editing.category ?? 'adventuring-gear', rarity: editing.rarity ?? 'common',
|
||||||
quantity: editing.quantity ?? 1, weight: editing.weight ?? '', properties: editing.properties ?? '',
|
weight: editing.weight ?? '', properties: editing.properties ?? '',
|
||||||
description: editing.description ?? ''
|
description: editing.description ?? ''
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
@@ -49,7 +49,7 @@ async function saveEntry() {
|
|||||||
? { name: form.value.name.trim(), campaign: data.campaign }
|
? { name: form.value.name.trim(), campaign: data.campaign }
|
||||||
: { name: form.value.name.trim(), ...(editing ? { id: editing._id } : { campaign: data.campaign }) };
|
: { name: form.value.name.trim(), ...(editing ? { id: editing._id } : { campaign: data.campaign }) };
|
||||||
if (!isActor) {
|
if (!isActor) {
|
||||||
for (const field of ['category', 'rarity', 'quantity', 'weight', 'properties', 'description']) {
|
for (const field of ['category', 'rarity', 'weight', 'properties', 'description']) {
|
||||||
payload[field] = form.value[field];
|
payload[field] = form.value[field];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -105,10 +105,6 @@ async function saveEntry() {
|
|||||||
<option value="artifact">{{ $t('campaigns.item.rarities.artifact') }}</option>
|
<option value="artifact">{{ $t('campaigns.item.rarities.artifact') }}</option>
|
||||||
</select>
|
</select>
|
||||||
</label>
|
</label>
|
||||||
<label class="form-field">
|
|
||||||
<span>{{ $t('campaigns.item.quantity') }}</span>
|
|
||||||
<input v-model.number="form.quantity" type="number" min="1" required>
|
|
||||||
</label>
|
|
||||||
<label class="form-field">
|
<label class="form-field">
|
||||||
<span>{{ $t('campaigns.item.weight') }}</span>
|
<span>{{ $t('campaigns.item.weight') }}</span>
|
||||||
<input v-model="form.weight" type="number" min="0" step="0.1">
|
<input v-model="form.weight" type="number" min="0" step="0.1">
|
||||||
|
|||||||
@@ -22,7 +22,6 @@ function normalizeItem(item) {
|
|||||||
name: item?.name ?? '',
|
name: item?.name ?? '',
|
||||||
category: item?.category ?? 'adventuring-gear',
|
category: item?.category ?? 'adventuring-gear',
|
||||||
rarity: item?.rarity ?? 'common',
|
rarity: item?.rarity ?? 'common',
|
||||||
quantity: Number(item?.quantity ?? 1),
|
|
||||||
weight: item?.weight ?? '',
|
weight: item?.weight ?? '',
|
||||||
properties: item?.properties ?? '',
|
properties: item?.properties ?? '',
|
||||||
description: item?.description ?? '',
|
description: item?.description ?? '',
|
||||||
@@ -161,11 +160,9 @@ async function removeIcon() {
|
|||||||
<input ref="photoInput" class="photo-input" type="file" accept="image/*" @change="onIconSelected">
|
<input ref="photoInput" class="photo-input" type="file" accept="image/*" @change="onIconSelected">
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<!-- Quantity is the actor inventory's business (Syndria98/dragonroll#63); the item
|
||||||
|
sheet only states what the item itself is. -->
|
||||||
<dl class="item-facts">
|
<dl class="item-facts">
|
||||||
<div class="item-fact">
|
|
||||||
<dt>{{ $t('campaigns.item.quantity') }}</dt>
|
|
||||||
<dd>{{ form.quantity }}</dd>
|
|
||||||
</div>
|
|
||||||
<div v-if="form.weight !== '' && form.weight !== undefined" class="item-fact">
|
<div v-if="form.weight !== '' && form.weight !== undefined" class="item-fact">
|
||||||
<dt>{{ $t('campaigns.item.weight') }}</dt>
|
<dt>{{ $t('campaigns.item.weight') }}</dt>
|
||||||
<dd>{{ Number(form.weight).toFixed(1) }} lb</dd>
|
<dd>{{ Number(form.weight).toFixed(1) }} lb</dd>
|
||||||
|
|||||||
@@ -65,8 +65,8 @@
|
|||||||
},
|
},
|
||||||
"item": {
|
"item": {
|
||||||
"new": "Objecte nou", "edit": "Edita l'objecte", "foundry-sync-note": "Els canvis en aquest objecte també s'apliquen al món del Foundry vinculat.",
|
"new": "Objecte nou", "edit": "Edita l'objecte", "foundry-sync-note": "Els canvis en aquest objecte també s'apliquen al món del Foundry vinculat.",
|
||||||
"category": "Categoria", "rarity": "Raresa", "quantity": "Quantitat",
|
"category": "Categoria", "rarity": "Raresa",
|
||||||
"quantity-short": "Quant.", "weight": "Pes (lb)", "properties": "Propietats", "properties-placeholder": "Per exemple, versàtil, subtil",
|
"weight": "Pes (lb)", "properties": "Propietats", "properties-placeholder": "Per exemple, versàtil, subtil",
|
||||||
"sheet": {
|
"sheet": {
|
||||||
"icon": "Icona de l'objecte", "choose-icon": "Tria la teva pròpia icona", "change-icon": "Canvia la icona",
|
"icon": "Icona de l'objecte", "choose-icon": "Tria la teva pròpia icona", "change-icon": "Canvia la icona",
|
||||||
"uploading": "Pujant...", "upload-error": "No s'ha pogut pujar aquesta icona.",
|
"uploading": "Pujant...", "upload-error": "No s'ha pogut pujar aquesta icona.",
|
||||||
@@ -108,7 +108,8 @@
|
|||||||
"tabs": { "abilities": "Característiques", "inventory": "Inventari", "traits": "Trets", "spells": "Conjurs" },
|
"tabs": { "abilities": "Característiques", "inventory": "Inventari", "traits": "Trets", "spells": "Conjurs" },
|
||||||
"level": "Nivell", "species": "Espècie", "unset-species": "Espècie sense definir", "edit": "Edita la fitxa", "cancel": "Cancel·la",
|
"level": "Nivell", "species": "Espècie", "unset-species": "Espècie sense definir", "edit": "Edita la fitxa", "cancel": "Cancel·la",
|
||||||
"saving": "Desant...", "save": "Desa la fitxa", "save-error": "No s'ha pogut desar aquesta fitxa de personatge.", "photo": "Foto", "upload-photo": "Pujar foto", "change-photo": "Canviar foto", "remove-photo": "Treure foto", "uploading-photo": "Pujant...", "photo-error": "No s'ha pogut pujar aquesta foto.", "ability-scores": "Característiques", "proficiency-bonus": "Bonificador de competència",
|
"saving": "Desant...", "save": "Desa la fitxa", "save-error": "No s'ha pogut desar aquesta fitxa de personatge.", "photo": "Foto", "upload-photo": "Pujar foto", "change-photo": "Canviar foto", "remove-photo": "Treure foto", "uploading-photo": "Pujant...", "photo-error": "No s'ha pogut pujar aquesta foto.", "ability-scores": "Característiques", "proficiency-bonus": "Bonificador de competència",
|
||||||
"combat": "Combat", "armor-class": "Classe d'armadura", "speed": "Velocitat", "proficiencies": "Competències",
|
"combat": "Combat", "armor-class": "Classe d'armadura", "speed": "Velocitat", "initiative": "Iniciativa",
|
||||||
|
"hit-points": "Punts de cop", "max-hit-points": "Punts de cop màxims", "hit-dice": "Daus de cop", "max-hit-dice": "Daus de cop màxims", "proficiencies": "Competències",
|
||||||
"proficiencies-placeholder": "Afegeix salvacions, habilitats, armadures, armes, eines i idiomes...", "empty-proficiencies": "No hi ha competències afegides.",
|
"proficiencies-placeholder": "Afegeix salvacions, habilitats, armadures, armes, eines i idiomes...", "empty-proficiencies": "No hi ha competències afegides.",
|
||||||
"traits": "Trets", "traits-placeholder": "Afegeix trets, capacitats i altres detalls...", "empty-traits": "No hi ha trets afegits.",
|
"traits": "Trets", "traits-placeholder": "Afegeix trets, capacitats i altres detalls...", "empty-traits": "No hi ha trets afegits.",
|
||||||
"spells": "Conjurs", "spells-placeholder": "Escriu els conjurs, un per línia...", "empty-spells": "No hi ha conjurs afegits.",
|
"spells": "Conjurs", "spells-placeholder": "Escriu els conjurs, un per línia...", "empty-spells": "No hi ha conjurs afegits.",
|
||||||
|
|||||||
@@ -69,8 +69,8 @@
|
|||||||
},
|
},
|
||||||
"item": {
|
"item": {
|
||||||
"new": "New item", "edit": "Edit item", "foundry-sync-note": "Changes to this item are also applied in the linked Foundry world.",
|
"new": "New item", "edit": "Edit item", "foundry-sync-note": "Changes to this item are also applied in the linked Foundry world.",
|
||||||
"category": "Category", "rarity": "Rarity", "quantity": "Quantity",
|
"category": "Category", "rarity": "Rarity",
|
||||||
"quantity-short": "Qty", "weight": "Weight (lb)", "properties": "Properties", "properties-placeholder": "For example, versatile, finesse",
|
"weight": "Weight (lb)", "properties": "Properties", "properties-placeholder": "For example, versatile, finesse",
|
||||||
"sheet": {
|
"sheet": {
|
||||||
"icon": "Item icon", "choose-icon": "Choose your own icon", "change-icon": "Change icon",
|
"icon": "Item icon", "choose-icon": "Choose your own icon", "change-icon": "Change icon",
|
||||||
"uploading": "Uploading...", "upload-error": "Unable to upload this icon.",
|
"uploading": "Uploading...", "upload-error": "Unable to upload this icon.",
|
||||||
@@ -114,7 +114,8 @@
|
|||||||
"saving": "Saving...", "save": "Save sheet", "save-error": "Unable to save this character sheet.",
|
"saving": "Saving...", "save": "Save sheet", "save-error": "Unable to save this character sheet.",
|
||||||
"photo": "Photo", "upload-photo": "Upload photo", "change-photo": "Change photo", "remove-photo": "Remove photo",
|
"photo": "Photo", "upload-photo": "Upload photo", "change-photo": "Change photo", "remove-photo": "Remove photo",
|
||||||
"uploading-photo": "Uploading...", "photo-error": "Unable to upload this photo.", "ability-scores": "Ability Scores", "proficiency-bonus": "Proficiency Bonus",
|
"uploading-photo": "Uploading...", "photo-error": "Unable to upload this photo.", "ability-scores": "Ability Scores", "proficiency-bonus": "Proficiency Bonus",
|
||||||
"combat": "Combat", "armor-class": "Armor Class", "speed": "Speed", "proficiencies": "Proficiencies",
|
"combat": "Combat", "armor-class": "Armor Class", "speed": "Speed", "initiative": "Initiative",
|
||||||
|
"hit-points": "Hit Points", "max-hit-points": "Maximum hit points", "hit-dice": "Hit Dice", "max-hit-dice": "Maximum hit dice", "proficiencies": "Proficiencies",
|
||||||
"proficiencies-placeholder": "Add saving throws, skills, armor, weapons, tools, and languages...", "empty-proficiencies": "No proficiencies added.",
|
"proficiencies-placeholder": "Add saving throws, skills, armor, weapons, tools, and languages...", "empty-proficiencies": "No proficiencies added.",
|
||||||
"traits": "Traits", "traits-placeholder": "Add features, traits, and other character details...", "empty-traits": "No traits added.",
|
"traits": "Traits", "traits-placeholder": "Add features, traits, and other character details...", "empty-traits": "No traits added.",
|
||||||
"spells": "Spells", "spells-placeholder": "List spells, one per line...", "empty-spells": "No spells added.",
|
"spells": "Spells", "spells-placeholder": "List spells, one per line...", "empty-spells": "No spells added.",
|
||||||
|
|||||||
@@ -65,8 +65,8 @@
|
|||||||
},
|
},
|
||||||
"item": {
|
"item": {
|
||||||
"new": "Nuevo objeto", "edit": "Editar objeto", "foundry-sync-note": "Los cambios en este objeto también se aplican al mundo de Foundry vinculado.",
|
"new": "Nuevo objeto", "edit": "Editar objeto", "foundry-sync-note": "Los cambios en este objeto también se aplican al mundo de Foundry vinculado.",
|
||||||
"category": "Categoría", "rarity": "Rareza", "quantity": "Cantidad",
|
"category": "Categoría", "rarity": "Rareza",
|
||||||
"quantity-short": "Cant.", "weight": "Peso (lb)", "properties": "Propiedades", "properties-placeholder": "Por ejemplo, versátil, sutil",
|
"weight": "Peso (lb)", "properties": "Propiedades", "properties-placeholder": "Por ejemplo, versátil, sutil",
|
||||||
"sheet": {
|
"sheet": {
|
||||||
"icon": "Icono del objeto", "choose-icon": "Elegir tu propio icono", "change-icon": "Cambiar icono",
|
"icon": "Icono del objeto", "choose-icon": "Elegir tu propio icono", "change-icon": "Cambiar icono",
|
||||||
"uploading": "Subiendo...", "upload-error": "No se pudo subir este icono.",
|
"uploading": "Subiendo...", "upload-error": "No se pudo subir este icono.",
|
||||||
@@ -108,7 +108,8 @@
|
|||||||
"tabs": { "abilities": "Características", "inventory": "Inventario", "traits": "Rasgos", "spells": "Conjuros" },
|
"tabs": { "abilities": "Características", "inventory": "Inventario", "traits": "Rasgos", "spells": "Conjuros" },
|
||||||
"level": "Nivel", "species": "Especie", "unset-species": "Especie sin definir", "edit": "Editar hoja", "cancel": "Cancelar",
|
"level": "Nivel", "species": "Especie", "unset-species": "Especie sin definir", "edit": "Editar hoja", "cancel": "Cancelar",
|
||||||
"saving": "Guardando...", "save": "Guardar hoja", "save-error": "No se pudo guardar esta hoja de personaje.", "photo": "Foto", "upload-photo": "Subir foto", "change-photo": "Cambiar foto", "remove-photo": "Quitar foto", "uploading-photo": "Subiendo...", "photo-error": "No se pudo subir esta foto.", "ability-scores": "Características", "proficiency-bonus": "Bonificador por competencia",
|
"saving": "Guardando...", "save": "Guardar hoja", "save-error": "No se pudo guardar esta hoja de personaje.", "photo": "Foto", "upload-photo": "Subir foto", "change-photo": "Cambiar foto", "remove-photo": "Quitar foto", "uploading-photo": "Subiendo...", "photo-error": "No se pudo subir esta foto.", "ability-scores": "Características", "proficiency-bonus": "Bonificador por competencia",
|
||||||
"combat": "Combate", "armor-class": "Clase de armadura", "speed": "Velocidad", "proficiencies": "Competencias",
|
"combat": "Combate", "armor-class": "Clase de armadura", "speed": "Velocidad", "initiative": "Iniciativa",
|
||||||
|
"hit-points": "Puntos de golpe", "max-hit-points": "Puntos de golpe máximos", "hit-dice": "Dados de golpe", "max-hit-dice": "Dados de golpe máximos", "proficiencies": "Competencias",
|
||||||
"proficiencies-placeholder": "Añade salvaciones, habilidades, armaduras, armas, herramientas e idiomas...", "empty-proficiencies": "No hay competencias añadidas.",
|
"proficiencies-placeholder": "Añade salvaciones, habilidades, armaduras, armas, herramientas e idiomas...", "empty-proficiencies": "No hay competencias añadidas.",
|
||||||
"traits": "Rasgos", "traits-placeholder": "Añade rasgos, capacidades y otros detalles...", "empty-traits": "No hay rasgos añadidos.",
|
"traits": "Rasgos", "traits-placeholder": "Añade rasgos, capacidades y otros detalles...", "empty-traits": "No hay rasgos añadidos.",
|
||||||
"spells": "Conjuros", "spells-placeholder": "Escribe los conjuros, uno por línea...", "empty-spells": "No hay conjuros añadidos.",
|
"spells": "Conjuros", "spells-placeholder": "Escribe los conjuros, uno por línea...", "empty-spells": "No hay conjuros añadidos.",
|
||||||
|
|||||||
167
tests/character-sheet-portrait-column.test.js
Normal file
167
tests/character-sheet-portrait-column.test.js
Normal file
@@ -0,0 +1,167 @@
|
|||||||
|
// Tests for Syndria98/dragonroll#64, the second round of modifications to the character sheet:
|
||||||
|
// * the tab rail hangs off the border of the window instead of standing inside the sheet body,
|
||||||
|
// * the armor class, the speed, the proficiency bonus and the initiative bonus stand under the
|
||||||
|
// portrait, together with the hit points and the hit dice, both drawn as bars.
|
||||||
|
//
|
||||||
|
// The window is a `.vue` file and the repository root installs no dependencies for it, so its
|
||||||
|
// template and styles are read out of the source the way tests/character-sheet-tabs.test.js reads
|
||||||
|
// them. The plain functions the sheet and the route work out their numbers with are lifted out of
|
||||||
|
// those sources and called, the way tests/map-viewer.test.js runs a service it cannot import.
|
||||||
|
//
|
||||||
|
// Run with `npm test` from the repository root, or `node --test tests/`.
|
||||||
|
|
||||||
|
const { test } = require("node:test");
|
||||||
|
const assert = require("node:assert/strict");
|
||||||
|
const fs = require("node:fs");
|
||||||
|
const path = require("node:path");
|
||||||
|
|
||||||
|
const read = (...parts) => fs.readFileSync(path.join(__dirname, "..", ...parts), "utf8");
|
||||||
|
|
||||||
|
const sheetSource = read("frontend", "app", "components", "windows", "CharacterSheetWindow.vue");
|
||||||
|
const script = /<script setup>([\s\S]*?)<\/script>/.exec(sheetSource)?.[1] ?? "";
|
||||||
|
const template = /<template>([\s\S]*)<\/template>/.exec(sheetSource)?.[1] ?? "";
|
||||||
|
const actorModelSource = read("backend", "src", "models", "Actor.js");
|
||||||
|
const actorRouteSource = read("backend", "src", "routes", "actor.js");
|
||||||
|
|
||||||
|
// `fromSource` hands back one top-level declaration as a value. Imports and refs are module scope
|
||||||
|
// the test does not have, so the few names a declaration reads are passed in as arguments. The
|
||||||
|
// declaration runs in this realm, so the objects it builds compare with the ones the test builds.
|
||||||
|
function fromSource(source, pattern, locals = {}) {
|
||||||
|
const declaration = pattern.exec(source)?.[0];
|
||||||
|
assert.ok(declaration, `expected ${pattern} in the source`);
|
||||||
|
const name = /(?:const|function)\s+(\w+)/.exec(declaration)[1];
|
||||||
|
return new Function(...Object.keys(locals), `${declaration}\n;return ${name};`)(...Object.values(locals));
|
||||||
|
}
|
||||||
|
|
||||||
|
const abilityStats = fromSource(script, /const abilityStats = \[[\s\S]*?\];/);
|
||||||
|
const normalizeActor = fromSource(script, /function normalizeActor\(actor\) \{[\s\S]*?\n\}/, { abilityStats });
|
||||||
|
const barPercent = fromSource(script, /function barPercent\(current, max\) \{[\s\S]*?\n\}/);
|
||||||
|
const barPool = fromSource(actorRouteSource, /function barPool\(existing, value\) \{[\s\S]*?\n\}/);
|
||||||
|
|
||||||
|
// The column that opens the abilities tab: the portrait with everything under it.
|
||||||
|
function portraitColumn() {
|
||||||
|
const start = template.indexOf('<div class="character-column">');
|
||||||
|
const end = template.indexOf('<section class="sheet-panel abilities-panel">');
|
||||||
|
assert.ok(start !== -1 && end > start, "expected a character column ahead of the ability scores");
|
||||||
|
return template.slice(start, end);
|
||||||
|
}
|
||||||
|
|
||||||
|
test("the tab rail hangs off the border of the window, outside the sheet body", () => {
|
||||||
|
const rail = /\.sheet-tabs\s*\{[^}]*\}/.exec(sheetSource)?.[0] ?? "";
|
||||||
|
assert.match(rail, /position:\s*absolute/, "the rail is mounted on the window frame");
|
||||||
|
assert.match(rail, /left:\s*100%/, "it starts at the right border and reaches outwards");
|
||||||
|
assert.ok(
|
||||||
|
template.indexOf('<nav class="sheet-tabs"') < template.indexOf('<div class="sheet-body">'),
|
||||||
|
"the rail is a child of the window, ahead of the body it hangs beside"
|
||||||
|
);
|
||||||
|
const body = /\.sheet-body\s*\{[^}]*\}/.exec(sheetSource)?.[0] ?? "";
|
||||||
|
assert.match(body, /overflow:\s*auto/, "the sheet body scrolls on its own, the rail stays put");
|
||||||
|
});
|
||||||
|
|
||||||
|
test("the armor class, the speed and both bonuses stand under the portrait", () => {
|
||||||
|
const column = portraitColumn();
|
||||||
|
assert.ok(column.includes('class="sheet-portrait"'), "the portrait opens the column");
|
||||||
|
assert.ok(column.includes('class="sheet-panel vitals-panel"'), "the readouts follow the image");
|
||||||
|
assert.ok(
|
||||||
|
column.indexOf('class="sheet-portrait"') < column.indexOf("vitals-panel"),
|
||||||
|
"the readouts stand under the image, not above it"
|
||||||
|
);
|
||||||
|
for (const key of ["armor-class", "speed", "proficiency-bonus", "initiative"]) {
|
||||||
|
assert.ok(
|
||||||
|
column.includes(`campaigns.character-sheet.${key}`),
|
||||||
|
`the ${key} belongs under the image`
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Gone from where they were: the combat panel is nothing but proficiencies left over, and the
|
||||||
|
// ability scores panel keeps the six scores only.
|
||||||
|
assert.doesNotMatch(template, /combat-panel/, "the combat panel went with the combat stats");
|
||||||
|
const abilities = template
|
||||||
|
.slice(template.indexOf('<section class="sheet-panel abilities-panel">'))
|
||||||
|
.split("</section>")[0];
|
||||||
|
assert.doesNotMatch(abilities, /proficiency-bonus/, "the proficiency bonus moved down the column");
|
||||||
|
assert.match(abilities, /campaigns\.character-sheet\.ability-scores/);
|
||||||
|
});
|
||||||
|
|
||||||
|
test("the hit points and the hit dice stand as bars under the portrait", () => {
|
||||||
|
const column = portraitColumn();
|
||||||
|
assert.match(column, /class="vital-bar hit-points-bar"/);
|
||||||
|
assert.match(column, /class="vital-bar hit-dice-bar"/);
|
||||||
|
for (const pool of ["hitPoints", "hitDice"]) {
|
||||||
|
assert.match(column, new RegExp(`v-model\\.number="form\\.${pool}\\.current"`), `${pool} is editable`);
|
||||||
|
assert.match(column, new RegExp(`v-model\\.number="form\\.${pool}\\.max"`), `${pool} has a maximum to set`);
|
||||||
|
assert.match(
|
||||||
|
column,
|
||||||
|
new RegExp(`\\{\\{ form\\.${pool}\\.current \\}\\} / \\{\\{ form\\.${pool}\\.max \\}\\}`),
|
||||||
|
`${pool} reads current of max outside of editing`
|
||||||
|
);
|
||||||
|
}
|
||||||
|
// Each bar fills what its own maximum allows, and each is painted its own colour.
|
||||||
|
assert.match(column, /:style="\{ width: `\$\{hitPointsPercent\}%` \}"/);
|
||||||
|
assert.match(column, /:style="\{ width: `\$\{hitDicePercent\}%` \}"/);
|
||||||
|
assert.match(sheetSource, /\.hit-points-bar \.vital-bar-fill\s*\{[^}]*var\(--color-red\)/);
|
||||||
|
assert.match(sheetSource, /\.hit-dice-bar \.vital-bar-fill\s*\{[^}]*var\(--color-link\)/);
|
||||||
|
});
|
||||||
|
|
||||||
|
test("a bar fills what its maximum allows, no more and no less", () => {
|
||||||
|
assert.equal(barPercent(5, 10), 50);
|
||||||
|
assert.equal(barPercent(12, 10), 100, "healed past the maximum does not overflow the track");
|
||||||
|
assert.equal(barPercent(-3, 10), 0, "nothing left stands empty");
|
||||||
|
assert.equal(barPercent(4, 0), 0, "a maximum of nothing is no bar either");
|
||||||
|
assert.equal(barPercent("", 10), 0, "an input cleared mid-edit is read as nothing");
|
||||||
|
});
|
||||||
|
|
||||||
|
test("the initiative bonus is the modifier of dexterity", () => {
|
||||||
|
assert.match(
|
||||||
|
script,
|
||||||
|
/const initiativeBonus = computed\(\(\) => abilityModifier\(form\.value\.abilityScores\.dex\)\)/,
|
||||||
|
"D&D counts initiative as the dexterity modifier while the character carries no extra bonus"
|
||||||
|
);
|
||||||
|
const abilityModifier = fromSource(script, /function abilityModifier\(score\) \{[\s\S]*?\n\}/);
|
||||||
|
assert.equal(abilityModifier(16), "+3");
|
||||||
|
assert.equal(abilityModifier(10), "+0", "the sheet writes a flat modifier with its sign, as the ability cards do");
|
||||||
|
assert.equal(abilityModifier(9), "-1");
|
||||||
|
});
|
||||||
|
|
||||||
|
test("an actor carries its pools, and one without them starts on its level", () => {
|
||||||
|
assert.deepEqual(normalizeActor({ level: 3 }).hitPoints, { current: 10, max: 10 });
|
||||||
|
assert.deepEqual(normalizeActor({ level: 3 }).hitDice, { current: 3, max: 3 }, "one die per level");
|
||||||
|
const wounded = normalizeActor({
|
||||||
|
level: 5,
|
||||||
|
hitPoints: { current: 4, max: 44 },
|
||||||
|
hitDice: { current: 2, max: 5 }
|
||||||
|
});
|
||||||
|
assert.deepEqual(wounded.hitPoints, { current: 4, max: 44 });
|
||||||
|
assert.deepEqual(wounded.hitDice, { current: 2, max: 5 });
|
||||||
|
});
|
||||||
|
|
||||||
|
test("the Actor model stores both pools as current of a maximum", () => {
|
||||||
|
for (const pool of ["hitPoints", "hitDice"]) {
|
||||||
|
assert.match(
|
||||||
|
actorModelSource,
|
||||||
|
new RegExp(`${pool}:\\s*\\{\\s*current:\\s*\\{\\s*type:\\s*Number[^}]*\\},\\s*max:\\s*\\{\\s*type:\\s*Number[^}]*\\}`),
|
||||||
|
`${pool} holds a current and a maximum`
|
||||||
|
);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
test("the actor update takes both pools and never lets one pass its maximum", () => {
|
||||||
|
assert.match(actorRouteSource, /const \{[^}]*hitPoints[^}]*hitDice[^}]*\} = req\.body;/, "the update reads them off the body");
|
||||||
|
assert.match(actorRouteSource, /if \(hitPoints !== undefined\) actor\.hitPoints = barPool\(actor\.hitPoints, hitPoints\)/);
|
||||||
|
assert.match(actorRouteSource, /if \(hitDice !== undefined\) actor\.hitDice = barPool\(actor\.hitDice, hitDice\)/);
|
||||||
|
|
||||||
|
assert.deepEqual(barPool({ current: 5, max: 20 }, { current: 8, max: 30 }), { current: 8, max: 30 });
|
||||||
|
assert.deepEqual(barPool({ current: 5, max: 20 }, { current: 40 }), { current: 20, max: 20 }, "a current over its maximum stops at the maximum");
|
||||||
|
assert.deepEqual(barPool({ current: 5, max: 20 }, { max: 4 }), { current: 4, max: 4 }, "a maximum lowered below the current pulls it down");
|
||||||
|
assert.deepEqual(barPool({ current: 5, max: 20 }, { current: 12 }), { current: 12, max: 20 }, "half a pair keeps the half it did not send");
|
||||||
|
assert.deepEqual(barPool({ current: 5, max: 20 }, { current: -2, max: 20 }), { current: 0, max: 20 });
|
||||||
|
});
|
||||||
|
|
||||||
|
test("every locale names the readouts that moved under the portrait", () => {
|
||||||
|
for (const locale of ["en", "es", "ca"]) {
|
||||||
|
const sheet = JSON.parse(read("frontend", "i18n", "locales", locale, "campaigns.json"))["character-sheet"];
|
||||||
|
for (const key of ["initiative", "hit-points", "max-hit-points", "hit-dice", "max-hit-dice"]) {
|
||||||
|
assert.ok(sheet[key], `${locale} is missing campaigns.character-sheet.${key}`);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
@@ -37,9 +37,10 @@ test("the tabs sit on the right as a vertical bookmark rail", () => {
|
|||||||
assert.match(template, /v-for="tab in tabs"[\s\S]*?:aria-selected="activeTab === tab\.key"/);
|
assert.match(template, /v-for="tab in tabs"[\s\S]*?:aria-selected="activeTab === tab\.key"/);
|
||||||
const rail = /\.sheet-tabs\s*\{[^}]*\}/.exec(sheetSource)?.[0] ?? "";
|
const rail = /\.sheet-tabs\s*\{[^}]*\}/.exec(sheetSource)?.[0] ?? "";
|
||||||
assert.match(rail, /flex-direction:\s*column/, "the bookmarks stack down the right edge");
|
assert.match(rail, /flex-direction:\s*column/, "the bookmarks stack down the right edge");
|
||||||
// content column and rail sit side by side, the rail hugging the right
|
// #64 moved the rail out of the content: it hangs off the window border itself, so it is not
|
||||||
assert.match(sheetSource, /\.sheet-layout\s*\{[^}]*display:\s*flex[^}]*\}/, "content and rail share a row");
|
// swept along when the sheet scrolls (see tests/character-sheet-portrait-column.test.js).
|
||||||
assert.match(sheetSource, /\.sheet-content\s*\{[^}]*flex:\s*1[^}]*\}/, "the content takes the room, the rail stays slim");
|
assert.match(rail, /position:\s*absolute/, "the rail is mounted on the window frame");
|
||||||
|
assert.match(rail, /left:\s*100%/, "the rail stands outside the window's right border");
|
||||||
});
|
});
|
||||||
|
|
||||||
// Each tab shows only its own panels; the rest are hidden with v-show so an in-progress edit is
|
// Each tab shows only its own panels; the rest are hidden with v-show so an in-progress edit is
|
||||||
@@ -54,7 +55,7 @@ test("every tab shows only its own content and hides the others", () => {
|
|||||||
const abilities = tabBody("abilities");
|
const abilities = tabBody("abilities");
|
||||||
assert.match(abilities, /class="sheet-portrait"/, "the portrait stays with ability scores");
|
assert.match(abilities, /class="sheet-portrait"/, "the portrait stays with ability scores");
|
||||||
assert.match(abilities, /class="sheet-panel abilities-panel"/);
|
assert.match(abilities, /class="sheet-panel abilities-panel"/);
|
||||||
assert.match(abilities, /class="sheet-panel combat-panel"/, "combat rides with the ability scores");
|
assert.match(abilities, /class="sheet-panel proficiencies-panel"/, "the proficiencies ride with the ability scores");
|
||||||
for (const other of ["inventory-panel", "traits-panel", "spells-panel"]) {
|
for (const other of ["inventory-panel", "traits-panel", "spells-panel"]) {
|
||||||
assert.doesNotMatch(abilities, new RegExp(other));
|
assert.doesNotMatch(abilities, new RegExp(other));
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,7 +1,9 @@
|
|||||||
// Tests for item folders following the Foundry world into the campaign
|
// Tests for item folders following the Foundry world into the campaign
|
||||||
// (Syndria98/dragonroll#44): the world's item directory is grouped into folders, and
|
// (Syndria98/dragonroll#44): the world's item directory is grouped into folders, and
|
||||||
// Dragonroll mirrors that tree as Folders of target 'item' and files the synced items
|
// Dragonroll mirrors that tree as Folders of target 'item' and files the synced items
|
||||||
// in them, so its item list reads like the world's.
|
// in them, so its item list reads like the world's. And for those folders' colours
|
||||||
|
// going both ways (Syndria98/dragonroll#57): the world's colour arrives with its tree,
|
||||||
|
// and the one the campaign picks travels back on the folder list the module reads.
|
||||||
//
|
//
|
||||||
// The repository root installs no dependencies, so each side is loaded the way the
|
// The repository root installs no dependencies, so each side is loaded the way the
|
||||||
// other tests do it. The sync route runs against a stubbed `require` (express,
|
// other tests do it. The sync route runs against a stubbed `require` (express,
|
||||||
@@ -55,7 +57,7 @@ function matches(document, filter = {}) {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
function fakeModel(table, seed = []) {
|
function fakeModel(table, seed = [], campaignId) {
|
||||||
const rows = [];
|
const rows = [];
|
||||||
let counter = 0;
|
let counter = 0;
|
||||||
|
|
||||||
@@ -74,7 +76,9 @@ function fakeModel(table, seed = []) {
|
|||||||
Object.defineProperty(Document.prototype, "id", { get() { return this._id; } });
|
Object.defineProperty(Document.prototype, "id", { get() { return this._id; } });
|
||||||
|
|
||||||
for (const data of seed) {
|
for (const data of seed) {
|
||||||
const row = new Document({ [table === "folder" ? "target" : "name"]: undefined, ...data });
|
// A seeded row belongs to the campaign the requests are made against unless the
|
||||||
|
// seed says otherwise: the routes scope every lookup by campaign.
|
||||||
|
const row = new Document({ campaign: campaignId, [table === "folder" ? "target" : "name"]: undefined, ...data });
|
||||||
row.isNew = false;
|
row.isNew = false;
|
||||||
rows.push(row);
|
rows.push(row);
|
||||||
}
|
}
|
||||||
@@ -120,14 +124,19 @@ function loadSyncRoute({ seed = {}, worldId = "world-1" } = {}) {
|
|||||||
post: (route, ...handlers) => routes.set(`POST ${route}`, handlers),
|
post: (route, ...handlers) => routes.set(`POST ${route}`, handlers),
|
||||||
};
|
};
|
||||||
const campaign = { _id: "campaign-1", id: "campaign-1", name: "Test Campaign", foundryWorldId: worldId };
|
const campaign = { _id: "campaign-1", id: "campaign-1", name: "Test Campaign", foundryWorldId: worldId };
|
||||||
|
// Every row belongs to the campaign the sync token belongs to, like every real row
|
||||||
|
// does: the sync looks its rows up by campaign, so a seeded row without one would be
|
||||||
|
// invisible to it and a test would pass without touching what it means to check.
|
||||||
|
const seeded = (rows = []) => rows.map((row) => ({ campaign: campaign._id, ...row }));
|
||||||
const models = {
|
const models = {
|
||||||
"../models/Actor": fakeModel("actor", seed.actors),
|
"../models/Actor": fakeModel("actor", seeded(seed.actors)),
|
||||||
"../models/Item": fakeModel("item", seed.items),
|
"../models/Item": fakeModel("item", seeded(seed.items)),
|
||||||
"../models/Folder": fakeModel("folder", seed.folders),
|
"../models/Folder": fakeModel("folder", seeded(seed.folders)),
|
||||||
};
|
};
|
||||||
|
|
||||||
const requireStub = (id) => {
|
const requireStub = (id) => {
|
||||||
if (id === "express") return { Router: () => router };
|
if (id === "express") return { Router: () => router };
|
||||||
|
if (id.startsWith("node:")) return require(id); // crypto: the sync token is hashed, not stubbed
|
||||||
if (id === "mongoose") return { isValidObjectId: (value) => typeof value === "string" && value.length > 20 };
|
if (id === "mongoose") return { isValidObjectId: (value) => typeof value === "string" && value.length > 20 };
|
||||||
if (id === "../models/Campaign") return { findOne: async () => campaign };
|
if (id === "../models/Campaign") return { findOne: async () => campaign };
|
||||||
if (id === "../services/actor-foundry") return { foundryActorToCharacter: (actor) => ({ name: actor?.name ?? "" }) };
|
if (id === "../services/actor-foundry") return { foundryActorToCharacter: (actor) => ({ name: actor?.name ?? "" }) };
|
||||||
@@ -290,6 +299,74 @@ test("an item the world moved out of a folder follows it to the root", async ()
|
|||||||
assert.equal(sync.models["../models/Item"].rows[0].folder, null);
|
assert.equal(sync.models["../models/Item"].rows[0].folder, null);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
test("a folder coloured in the world is coloured in the campaign", async () => {
|
||||||
|
const sync = loadSyncRoute();
|
||||||
|
|
||||||
|
await sync.call("POST /sync/item-snapshot", {
|
||||||
|
worldId: "world-1",
|
||||||
|
items: [],
|
||||||
|
folders: [{ id: "folder-melee", name: "Melee Weapons", parent: null, color: "#7f00ff" }],
|
||||||
|
});
|
||||||
|
|
||||||
|
assert.equal(sync.models["../models/Folder"].rows[0].color, "#7f00ff");
|
||||||
|
});
|
||||||
|
|
||||||
|
test("a folder the world leaves uncoloured takes the campaign's colour off", async () => {
|
||||||
|
const sync = loadSyncRoute({
|
||||||
|
seed: {
|
||||||
|
folders: [{ _id: "folder-1", target: "item", foundryFolderId: "folder-melee", name: "Melee Weapons", color: "#7f00ff" }],
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
await sync.call("POST /sync/item-snapshot", {
|
||||||
|
worldId: "world-1",
|
||||||
|
items: [],
|
||||||
|
folders: [{ id: "folder-melee", name: "Melee Weapons", parent: null, color: null }],
|
||||||
|
});
|
||||||
|
|
||||||
|
assert.equal(sync.models["../models/Folder"].rows[0].color, null, "the world has no colour to show, so neither does the campaign");
|
||||||
|
});
|
||||||
|
|
||||||
|
test("a module that says nothing about colours leaves the campaign's colour alone", async () => {
|
||||||
|
const sync = loadSyncRoute({
|
||||||
|
seed: {
|
||||||
|
folders: [{ _id: "folder-1", target: "item", foundryFolderId: "folder-melee", name: "Melee Weapons", color: "#7f00ff" }],
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
// A tree pushed by a module that knows folders but not their colours: no colour at all.
|
||||||
|
await sync.call("POST /sync/snapshot", {
|
||||||
|
worldId: "world-1",
|
||||||
|
actors: [],
|
||||||
|
items: [],
|
||||||
|
folders: [{ id: "folder-melee", name: "Melee Weapons", parent: null }],
|
||||||
|
});
|
||||||
|
|
||||||
|
assert.equal(sync.models["../models/Folder"].rows[0].color, "#7f00ff");
|
||||||
|
});
|
||||||
|
|
||||||
|
test("the folder list the world reads back carries the colours the campaign picked", async () => {
|
||||||
|
const sync = loadSyncRoute({
|
||||||
|
seed: {
|
||||||
|
folders: [
|
||||||
|
{ _id: "folder-1", target: "item", foundryFolderId: "folder-melee", name: "Melee Weapons", color: "#0080ff" },
|
||||||
|
{ _id: "folder-2", target: "item", name: "Homebrew" },
|
||||||
|
{ _id: "folder-3", name: "Chapter 1" },
|
||||||
|
],
|
||||||
|
items: [{ _id: "item-1", name: "Longsword", foundryItemId: "item-1", folder: "folder-1" }],
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
const response = await sync.call("GET /sync/items");
|
||||||
|
|
||||||
|
assert.equal(response.status, "ok");
|
||||||
|
assert.equal(response.items.length, 1);
|
||||||
|
const coloured = response.folders.find((folder) => folder._id === "folder-1");
|
||||||
|
assert.equal(coloured.foundryFolderId, "folder-melee", "the world's folder to write the colour back to");
|
||||||
|
assert.equal(coloured.color, "#0080ff");
|
||||||
|
assert.ok(!response.folders.some((folder) => folder._id === "folder-3"), "only the item list's folders travel back");
|
||||||
|
});
|
||||||
|
|
||||||
test("every folder listing says which campaign list it belongs to", () => {
|
test("every folder listing says which campaign list it belongs to", () => {
|
||||||
// The sidebar's four lists share the Folder model, so a listing that names no target
|
// The sidebar's four lists share the Folder model, so a listing that names no target
|
||||||
// would show folders of the other lists between its own rows. The note routes and
|
// would show folders of the other lists between its own rows. The note routes and
|
||||||
@@ -298,9 +375,12 @@ test("every folder listing says which campaign list it belongs to", () => {
|
|||||||
// field existed carry none at all. tests/entry-folders.test.js runs these routes.
|
// field existed carry none at all. tests/entry-folders.test.js runs these routes.
|
||||||
for (const route of ["note.js", "folder.js"]) {
|
for (const route of ["note.js", "folder.js"]) {
|
||||||
const source = read("backend", "src", "routes", route);
|
const source = read("backend", "src", "routes", route);
|
||||||
const listings = source.match(/Folder\.find\(/g) ?? [];
|
// The listings that gather a campaign's folders are the ones shown as a section's
|
||||||
|
// tree. A walk of one folder's own children (`parentFolder`) is inside a single
|
||||||
|
// list already: folders are only ever nested within their own section.
|
||||||
|
const listings = source.match(/Folder\.find\(\{\s*campaign/g) ?? [];
|
||||||
assert.ok(listings.length, `${route} lists folders`);
|
assert.ok(listings.length, `${route} lists folders`);
|
||||||
const filtered = source.match(/Folder\.find\(\{[^{]*Folder\.filterForTarget\((?:'note'|target)\)/g) ?? [];
|
const filtered = source.match(/Folder\.find\(\{\s*campaign[^{]*Folder\.filterForTarget\((?:'note'|target)\)/g) ?? [];
|
||||||
assert.equal(filtered.length, listings.length, `${route} has a folder listing that names no campaign list`);
|
assert.equal(filtered.length, listings.length, `${route} has a folder listing that names no campaign list`);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
@@ -320,15 +400,40 @@ function makeWorld() {
|
|||||||
registered: new Map(),
|
registered: new Map(),
|
||||||
requests: [],
|
requests: [],
|
||||||
timers: new Map(),
|
timers: new Map(),
|
||||||
|
intervals: new Map(),
|
||||||
|
// What Dragonroll answers a folder reconcile with: the campaign's folders and the
|
||||||
|
// colours its user gave them.
|
||||||
|
remoteFolders: [],
|
||||||
nextTimerId: 1,
|
nextTimerId: 1,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
// Foundry's `update` takes dotted paths ("flags.dragonroll-foundry.itemId"); an
|
||||||
|
// embedded update names the row to write them on, so `_id` is not a path to set.
|
||||||
|
function writeFoundryPaths(target, data) {
|
||||||
|
for (const [key, value] of Object.entries(data)) {
|
||||||
|
if (key === "_id") continue;
|
||||||
|
const parts = key.split(".");
|
||||||
|
const last = parts.pop();
|
||||||
|
let node = target;
|
||||||
|
for (const part of parts) node = node[part] ??= {};
|
||||||
|
node[last] = value;
|
||||||
|
}
|
||||||
|
return target;
|
||||||
|
}
|
||||||
|
|
||||||
|
// A Folder document, plain data and the `update` both the GM and Dragonroll write with.
|
||||||
|
const makeFolder = (id, name, over = {}) => ({
|
||||||
|
id, name, type: "Item", parent: null, color: null, documentName: "Folder",
|
||||||
|
async update(data) { return writeFoundryPaths(this, data); },
|
||||||
|
...over,
|
||||||
|
});
|
||||||
|
|
||||||
const folders = [
|
const folders = [
|
||||||
{ id: "folder-melee", name: "Melee Weapons", type: "Item", parent: null, documentName: "Folder" },
|
makeFolder("folder-melee", "Melee Weapons", { color: "#8b0000" }),
|
||||||
{ id: "folder-ranged", name: "Ranged Weapons", type: "Item", parent: "folder-melee", documentName: "Folder" },
|
makeFolder("folder-ranged", "Ranged Weapons", { parent: "folder-melee" }),
|
||||||
// An actor's own inventory folder: it hangs off the actor, not the world.
|
// An actor's own inventory folder: it hangs off the actor, not the world.
|
||||||
{ id: "folder-carried", name: "Carried", type: "Item", parent: { id: "actor-1", documentName: "Actor" }, documentName: "Folder" },
|
makeFolder("folder-carried", "Carried", { parent: { id: "actor-1", documentName: "Actor" } }),
|
||||||
{ id: "folder-journal", name: "Lore", type: "JournalEntry", parent: null, documentName: "Folder" },
|
makeFolder("folder-journal", "Lore", { type: "JournalEntry" }),
|
||||||
];
|
];
|
||||||
const items = [
|
const items = [
|
||||||
{
|
{
|
||||||
@@ -354,6 +459,15 @@ function makeWorld() {
|
|||||||
id: "actor-1", name: "Thalia", type: "character", documentName: "Actor", flags: {},
|
id: "actor-1", name: "Thalia", type: "character", documentName: "Actor", flags: {},
|
||||||
items: { contents: [carriedItem] },
|
items: { contents: [carriedItem] },
|
||||||
getFlag() { return undefined; },
|
getFlag() { return undefined; },
|
||||||
|
async update(data) { return writeFoundryPaths(this, data); },
|
||||||
|
// Embedded documents are written through the document holding them, and each
|
||||||
|
// update names the row it belongs to.
|
||||||
|
async updateEmbeddedDocuments(_kind, updates) {
|
||||||
|
for (const update of updates) {
|
||||||
|
if (carriedItem.id === update._id) writeFoundryPaths(carriedItem, update);
|
||||||
|
}
|
||||||
|
return [];
|
||||||
|
},
|
||||||
toObject() { return { _id: this.id, name: this.name, type: this.type, flags: this.flags }; },
|
toObject() { return { _id: this.id, name: this.name, type: this.type, flags: this.flags }; },
|
||||||
},
|
},
|
||||||
];
|
];
|
||||||
@@ -375,15 +489,24 @@ function makeWorld() {
|
|||||||
return id;
|
return id;
|
||||||
},
|
},
|
||||||
clearTimeout: (id) => state.timers.delete(id),
|
clearTimeout: (id) => state.timers.delete(id),
|
||||||
setInterval: () => 0,
|
setInterval: (fn, delay = 0) => {
|
||||||
clearInterval: () => {},
|
// Recorded, never run by itself: tests ask for a periodic reconcile with
|
||||||
|
// `runIntervals`, so the ones watching single pushes stay on their own.
|
||||||
|
const id = state.nextTimerId++;
|
||||||
|
state.intervals.set(id, { fn, delay });
|
||||||
|
return id;
|
||||||
|
},
|
||||||
|
clearInterval: (id) => state.intervals.delete(id),
|
||||||
fetch: async (url, options = {}) => {
|
fetch: async (url, options = {}) => {
|
||||||
|
const href = String(url);
|
||||||
state.requests.push({
|
state.requests.push({
|
||||||
href: String(url),
|
href,
|
||||||
method: options.method,
|
method: options.method,
|
||||||
body: options.body ? JSON.parse(options.body) : null,
|
body: options.body ? JSON.parse(options.body) : null,
|
||||||
});
|
});
|
||||||
return { ok: true, status: 200, json: async () => ({ status: "ok", actors: [], items: [] }) };
|
const payload = { status: "ok", actors: [], items: [] };
|
||||||
|
if (href.includes("foundry/sync/items")) payload.folders = state.remoteFolders;
|
||||||
|
return { ok: true, status: 200, json: async () => payload };
|
||||||
},
|
},
|
||||||
Actor: { async create() { return null; } },
|
Actor: { async create() { return null; } },
|
||||||
Item: { async create() { return null; } },
|
Item: { async create() { return null; } },
|
||||||
@@ -434,6 +557,12 @@ function makeWorld() {
|
|||||||
await drain();
|
await drain();
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
// The reconciles `setInterval` registered: what runs every few seconds on a world
|
||||||
|
// that is linked, and so what carries Dragonroll's folder colours back into the world.
|
||||||
|
state.runIntervals = async () => {
|
||||||
|
for (const interval of [...state.intervals.values()]) await interval.fn();
|
||||||
|
await drain();
|
||||||
|
};
|
||||||
state.linkedSetup = async () => {
|
state.linkedSetup = async () => {
|
||||||
await state.fire("init");
|
await state.fire("init");
|
||||||
await state.fire("ready");
|
await state.fire("ready");
|
||||||
@@ -454,9 +583,9 @@ test("the world sends its item folder tree with a snapshot", async () => {
|
|||||||
const [push] = world.pushes("foundry/sync/snapshot");
|
const [push] = world.pushes("foundry/sync/snapshot");
|
||||||
assert.ok(push, "the actor change pushed a snapshot");
|
assert.ok(push, "the actor change pushed a snapshot");
|
||||||
assert.deepEqual(push.body.folders, [
|
assert.deepEqual(push.body.folders, [
|
||||||
{ id: "folder-melee", name: "Melee Weapons", parent: null },
|
{ id: "folder-melee", name: "Melee Weapons", parent: null, color: "#8b0000" },
|
||||||
{ id: "folder-ranged", name: "Ranged Weapons", parent: "folder-melee" },
|
{ id: "folder-ranged", name: "Ranged Weapons", parent: "folder-melee", color: null },
|
||||||
], "the item directory tree, nested, without the actor's own or another type's folders");
|
], "the item directory tree, nested and coloured, without the actor's own or another type's folders");
|
||||||
const longsword = push.body.items.find((item) => item._id === "item-1");
|
const longsword = push.body.items.find((item) => item._id === "item-1");
|
||||||
assert.equal(longsword.dragonroll.folder, "folder-melee", "a world item says which folder it stands in");
|
assert.equal(longsword.dragonroll.folder, "folder-melee", "a world item says which folder it stands in");
|
||||||
const torch = push.body.items.find((item) => item._id === "item-2");
|
const torch = push.body.items.find((item) => item._id === "item-2");
|
||||||
@@ -501,6 +630,21 @@ test("a folder change reaches Dragonroll without pushing the items in it", async
|
|||||||
]);
|
]);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
test("a folder the GM colours sends its colour with the tree", async () => {
|
||||||
|
const world = await makeWorld().linkedSetup();
|
||||||
|
|
||||||
|
const ranged = world.folder("folder-ranged");
|
||||||
|
ranged.color = "#123456";
|
||||||
|
await world.fire("updateFolder", ranged);
|
||||||
|
await world.runTimers();
|
||||||
|
|
||||||
|
const [push] = world.pushes("foundry/sync/item-snapshot");
|
||||||
|
assert.deepEqual(push.body.folders.map((folder) => [folder.id, folder.color]), [
|
||||||
|
["folder-melee", "#8b0000"],
|
||||||
|
["folder-ranged", "#123456"],
|
||||||
|
], "every folder reports the colour the world shows for it, `null` for one it left uncoloured");
|
||||||
|
});
|
||||||
|
|
||||||
test("a folder of another document type does not touch the item list", async () => {
|
test("a folder of another document type does not touch the item list", async () => {
|
||||||
const world = await makeWorld().linkedSetup();
|
const world = await makeWorld().linkedSetup();
|
||||||
|
|
||||||
@@ -521,14 +665,54 @@ test("autosync off: folder changes stop syncing", async () => {
|
|||||||
assert.deepEqual(world.syncRequests(), []);
|
assert.deepEqual(world.syncRequests(), []);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// --- The colours the campaign gives those folders travel back to the world ---------
|
||||||
|
|
||||||
|
test("a folder coloured in the Dragonroll campaign is coloured in the world", async () => {
|
||||||
|
const world = await makeWorld().linkedSetup();
|
||||||
|
|
||||||
|
world.remoteFolders = [
|
||||||
|
{ _id: "db-melee", name: "Melee Weapons", foundryFolderId: "folder-melee", color: "#0080ff" },
|
||||||
|
// A folder the campaign made for its own items: there is no world document to colour.
|
||||||
|
{ _id: "db-homebrew", name: "Homebrew", color: "#00ff00" },
|
||||||
|
];
|
||||||
|
await world.runIntervals();
|
||||||
|
|
||||||
|
assert.equal(world.folder("folder-melee").color, "#0080ff");
|
||||||
|
assert.equal(world.folder("folder-ranged").color, null, "a folder the campaign says nothing about keeps what the world shows");
|
||||||
|
assert.deepEqual(world.requests.filter((request) => request.method === "POST"), [],
|
||||||
|
"Dragonroll's own write is not pushed back to the campaign as a world change");
|
||||||
|
});
|
||||||
|
|
||||||
|
test("a colour taken off in the campaign comes off the world's folder", async () => {
|
||||||
|
const world = await makeWorld().linkedSetup();
|
||||||
|
|
||||||
|
world.remoteFolders = [{ _id: "db-melee", name: "Melee Weapons", foundryFolderId: "folder-melee", color: null }];
|
||||||
|
await world.runIntervals();
|
||||||
|
|
||||||
|
assert.equal(world.folder("folder-melee").color, null, "uncoloured in the campaign is uncoloured in the world");
|
||||||
|
});
|
||||||
|
|
||||||
|
test("autosync off: the campaign's folder colours are not written into the world", async () => {
|
||||||
|
const world = await makeWorld().linkedSetup();
|
||||||
|
await world.game.settings.set("dragonroll-foundry", "autoSync", false);
|
||||||
|
|
||||||
|
world.remoteFolders = [{ _id: "db-melee", name: "Melee Weapons", foundryFolderId: "folder-melee", color: "#0080ff" }];
|
||||||
|
await world.runIntervals();
|
||||||
|
|
||||||
|
assert.equal(world.folder("folder-melee").color, "#8b0000", "the world keeps what it shows while autosync is off");
|
||||||
|
});
|
||||||
|
|
||||||
// --- The sidebar groups its items under those folders ----------------------------
|
// --- The sidebar groups its items under those folders ----------------------------
|
||||||
|
|
||||||
async function loadItemFoldersService() {
|
// `vm.compileFunction` is synchronous, so the service is ready right away. Loading it with
|
||||||
|
// a top-level `await` instead makes Node read this whole file as an ES module, where
|
||||||
|
// `require` is not defined and none of these tests run at all.
|
||||||
|
function loadItemFoldersService() {
|
||||||
const source = read("frontend", "app", "services", "ItemFolders.js").replace("export { BuildItemRows };", "return { BuildItemRows };");
|
const source = read("frontend", "app", "services", "ItemFolders.js").replace("export { BuildItemRows };", "return { BuildItemRows };");
|
||||||
return vm.compileFunction(source)();
|
return vm.compileFunction(source)();
|
||||||
}
|
}
|
||||||
|
|
||||||
const { BuildItemRows } = await loadItemFoldersService();
|
const { BuildItemRows } = loadItemFoldersService();
|
||||||
|
|
||||||
const SIDEBAR_FOLDERS = [
|
const SIDEBAR_FOLDERS = [
|
||||||
{ _id: "f-melee", name: "Melee Weapons" },
|
{ _id: "f-melee", name: "Melee Weapons" },
|
||||||
@@ -546,13 +730,15 @@ test("items are grouped under the folder they stand in, nested", () => {
|
|||||||
row.kind, row.kind === "folder" ? row.folder.name : row.item.name, row.depth,
|
row.kind, row.kind === "folder" ? row.folder.name : row.item.name, row.depth,
|
||||||
]);
|
]);
|
||||||
|
|
||||||
|
// Every folder is followed by what stands in it, one step deeper, and the items that
|
||||||
|
// stand at the root come last (see BuildItemRows).
|
||||||
assert.deepEqual(shape, [
|
assert.deepEqual(shape, [
|
||||||
["folder", "Melee Weapons", 0],
|
["folder", "Melee Weapons", 0],
|
||||||
|
["item", "Longsword", 1],
|
||||||
["folder", "Ranged Weapons", 0],
|
["folder", "Ranged Weapons", 0],
|
||||||
["folder", "Powder Weapons", 1],
|
["folder", "Powder Weapons", 1],
|
||||||
["item", "Pistol", 1],
|
["item", "Pistol", 2],
|
||||||
["item", "Torch", 0],
|
["item", "Torch", 0],
|
||||||
["item", "Longsword", 1],
|
|
||||||
]);
|
]);
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -579,9 +765,9 @@ test("an item whose folder is gone, or a folder nested in itself, reads as a roo
|
|||||||
);
|
);
|
||||||
|
|
||||||
const shape = rows.map((row) => [row.kind, row.kind === "folder" ? row.folder.name : row.item.name]);
|
const shape = rows.map((row) => [row.kind, row.kind === "folder" ? row.folder.name : row.item.name]);
|
||||||
assert.ok(shape.includes(["item", "Torch"]), "the item is not lost with the folder that was removed");
|
assert.ok(shape.some(([kind, name]) => kind === "item" && name === "Torch"), "the item is not lost with the folder that was removed");
|
||||||
assert.deepEqual(new Set(shape.filter(([kind]) => kind === "folder").map(([, name]) => name)), new Set(["A", "B"]));
|
assert.deepEqual(new Set(shape.filter(([kind]) => kind === "folder").map(([, name]) => name)), new Set(["A", "B"]));
|
||||||
assert.equal(rows.filter(([kind]) => kind === "folder").length, 2, "a broken tree is walked once, not forever");
|
assert.equal(shape.filter(([kind]) => kind === "folder").length, 2, "a broken tree is walked once, not forever");
|
||||||
});
|
});
|
||||||
|
|
||||||
test("every locale labels the folder row", () => {
|
test("every locale labels the folder row", () => {
|
||||||
|
|||||||
89
tests/item-rarity-entry.test.js
Normal file
89
tests/item-rarity-entry.test.js
Normal file
@@ -0,0 +1,89 @@
|
|||||||
|
// Tests for Syndria98/dragonroll#63: the item rows in the campaign sidebar dropped the text
|
||||||
|
// listing category, rarity and quantity — the rarity colours the text of the entry instead
|
||||||
|
// (common white, uncommon green, rare blue, very rare purple, legendary orange) — and the
|
||||||
|
// quantity left the item surfaces altogether, since it only belongs to an actor's inventory.
|
||||||
|
//
|
||||||
|
// The repository root installs no dependencies, so these read the sources the way
|
||||||
|
// tests/item-entry-display.test.js does — the checks are about the markup and style.
|
||||||
|
//
|
||||||
|
// Run with `npm test` from the repository root, or `node --test tests/`.
|
||||||
|
|
||||||
|
const { test } = require("node:test");
|
||||||
|
const assert = require("node:assert/strict");
|
||||||
|
const fs = require("node:fs");
|
||||||
|
const path = require("node:path");
|
||||||
|
|
||||||
|
const read = (...parts) => fs.readFileSync(path.join(__dirname, "..", ...parts), "utf8");
|
||||||
|
|
||||||
|
const sidebarSource = read("frontend", "app", "components", "partials", "ContentSidebar.vue");
|
||||||
|
const itemWindowSource = read("frontend", "app", "components", "windows", "ItemSheetWindow.vue");
|
||||||
|
const entryFormSource = read("frontend", "app", "components", "windows", "CreateCampaignEntryWindow.vue");
|
||||||
|
const sheetSource = read("frontend", "app", "components", "windows", "CharacterSheetWindow.vue");
|
||||||
|
const colorsSource = read("frontend", "app", "assets", "css", "colors.scss");
|
||||||
|
|
||||||
|
// The block that renders the item rows, as in tests/item-entry-display.test.js.
|
||||||
|
const itemSection =
|
||||||
|
/<template v-else-if="activeSection === 'items'">([\s\S]*?)<\/template>\s*\n\s*<template v-else>/.exec(sidebarSource)?.[1] ?? "";
|
||||||
|
|
||||||
|
const rarities = ["common", "uncommon", "rare", "very-rare", "legendary"];
|
||||||
|
|
||||||
|
// `selector` is inserted verbatim, so escape the `.` of a class combination. Comments are dropped:
|
||||||
|
// they explain a rule, they are not part of it.
|
||||||
|
function ruleFor(selector) {
|
||||||
|
const rule = new RegExp(`\\.${selector}\\s*\\{([^}]*)\\}`).exec(sidebarSource)?.[0];
|
||||||
|
return rule?.replace(/\/\*[\s\S]*?\*\//g, "");
|
||||||
|
}
|
||||||
|
|
||||||
|
test("the item entry no longer lists the category, rarity and quantity as text", () => {
|
||||||
|
assert.ok(itemSection, "expected to find the items section of the sidebar");
|
||||||
|
assert.doesNotMatch(itemSection, /entity-entry-meta/, "the item row must not render a meta line");
|
||||||
|
assert.doesNotMatch(itemSection, /campaigns\.item\.(categories|rarities|quantity)/, "the item row must not render item meta text");
|
||||||
|
assert.doesNotMatch(sidebarSource, /itemSummary/, "the removed summary helper must not be kept around");
|
||||||
|
});
|
||||||
|
|
||||||
|
test("the rarity of an item picks a class for the text of its entry", () => {
|
||||||
|
assert.match(
|
||||||
|
itemSection,
|
||||||
|
/<span class="entity-entry-name" :class="rarityClass\(row\.item\)"/,
|
||||||
|
"the item name must carry the class picked from its rarity"
|
||||||
|
);
|
||||||
|
const helper = /function rarityClass\(item\)\s*\{[\s\S]*?\n\}/.exec(sidebarSource)?.[0] ?? "";
|
||||||
|
assert.ok(helper, "expected a rarityClass helper");
|
||||||
|
for (const rarity of rarities) {
|
||||||
|
assert.ok(helper.includes(`'${rarity}'`), `rarityClass must know about '${rarity}'`);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
test("each rarity colours the entry text with its own theme colour", () => {
|
||||||
|
for (const rarity of rarities) {
|
||||||
|
const rule = ruleFor(`entity-entry-name\\.rarity-${rarity}`);
|
||||||
|
assert.ok(rule, `expected a colour rule for .entity-entry-name.rarity-${rarity}`);
|
||||||
|
assert.match(rule, new RegExp(`color:\\s*var\\(--color-rarity-${rarity}\\)`));
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
test("both theme maps carry the rarity colours", () => {
|
||||||
|
for (const rarity of rarities) {
|
||||||
|
const declarations = colorsSource.match(new RegExp(`rarity-${rarity}:\\s*#[0-9a-fA-F]{6}`, "g")) || [];
|
||||||
|
assert.equal(declarations.length, 2, `expected rarity-${rarity} in both the dark and the light map`);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
test("the quantity only shows in an actor's inventory", () => {
|
||||||
|
assert.doesNotMatch(itemWindowSource, /quantity/, "the item window must not list the quantity");
|
||||||
|
assert.doesNotMatch(entryFormSource, /quantity/, "the item create/edit form must not offer the quantity");
|
||||||
|
// the character sheet's inventory table keeps it.
|
||||||
|
assert.match(sheetSource, /campaigns\.character-sheet\.quantity/);
|
||||||
|
assert.match(sheetSource, /\{\{ item\.quantity \}\}/);
|
||||||
|
});
|
||||||
|
|
||||||
|
test("no locale keeps the removed item quantity strings", () => {
|
||||||
|
for (const locale of ["en", "es", "ca"]) {
|
||||||
|
const campaigns = JSON.parse(read("frontend", "i18n", "locales", locale, "campaigns.json"));
|
||||||
|
assert.ok(campaigns.item, `${locale} is missing the campaigns.item block`);
|
||||||
|
assert.equal(campaigns.item.quantity, undefined, `${locale} still has campaigns.item.quantity`);
|
||||||
|
assert.equal(campaigns.item["quantity-short"], undefined, `${locale} still has campaigns.item.quantity-short`);
|
||||||
|
// the character sheet's inventory keeps its own quantity column label
|
||||||
|
assert.ok(campaigns["character-sheet"]?.quantity, `${locale} is missing campaigns.character-sheet.quantity`);
|
||||||
|
}
|
||||||
|
});
|
||||||
@@ -66,17 +66,19 @@ test("the item routes accept the icon and upload one", () => {
|
|||||||
test("the item info window is registered and opens on a sidebar click", () => {
|
test("the item info window is registered and opens on a sidebar click", () => {
|
||||||
assert.match(windowDefsSource, /item_sheet:\s*{\s*title:[^}]*ItemSheetWindow\.vue/s);
|
assert.match(windowDefsSource, /item_sheet:\s*{\s*title:[^}]*ItemSheetWindow\.vue/s);
|
||||||
// clicking (or Enter/Space on) an item row opens the window instead of expanding inline.
|
// clicking (or Enter/Space on) an item row opens the window instead of expanding inline.
|
||||||
// Since #44 the rows come from the folder tree the world synced, so the row holds the item.
|
// The rows come from the item list's folder tree, so the row holds the item.
|
||||||
assert.match(sidebarSource, /v-for="row in itemRows"[\s\S]*?@click="openItemSheet\(row\.item\)"/);
|
assert.match(sidebarSource, /v-for="row in entryRows\.item\.value"[\s\S]*?@click="openItemSheet\(row\.item\)"/);
|
||||||
assert.match(sidebarSource, /CreateWindow\(['"]item_sheet['"],\s*\{ item \}\)/);
|
assert.match(sidebarSource, /CreateWindow\(['"]item_sheet['"],\s*\{ item \}\)/);
|
||||||
assert.doesNotMatch(sidebarSource, /toggleEntryDetails/);
|
assert.doesNotMatch(sidebarSource, /toggleEntryDetails/);
|
||||||
});
|
});
|
||||||
|
|
||||||
test("the item window shows the info and offers both icon sources", () => {
|
test("the item window shows the info and offers both icon sources", () => {
|
||||||
// info: name, category, rarity, quantity, weight, properties, description
|
// info: name, category, rarity, weight, properties, description — quantity is gone
|
||||||
for (const key of ["form.name", "form.category", "form.rarity", "form.quantity", "form.weight", "form.properties", "form.description"]) {
|
// (#63 keeps it for the actors' inventories).
|
||||||
|
for (const key of ["form.name", "form.category", "form.rarity", "form.weight", "form.properties", "form.description"]) {
|
||||||
assert.ok(itemWindowSource.includes(key), `expected the window to render ${key}`);
|
assert.ok(itemWindowSource.includes(key), `expected the window to render ${key}`);
|
||||||
}
|
}
|
||||||
|
assert.doesNotMatch(itemWindowSource, /quantity/, "the item window must not list the quantity");
|
||||||
// own icon: upload through the item route like the character sheet does its photo
|
// own icon: upload through the item route like the character sheet does its photo
|
||||||
assert.match(itemWindowSource, /\/item\/upload-image\?item=/);
|
assert.match(itemWindowSource, /\/item\/upload-image\?item=/);
|
||||||
// Foundry icon: switch the item image back to the one the world sent
|
// Foundry icon: switch the item image back to the one the world sent
|
||||||
|
|||||||
@@ -85,6 +85,9 @@ function loadMapRoutes({ ownsCampaign = true, maps = [], notes = [] } = {}) {
|
|||||||
},
|
},
|
||||||
// The pins do not ask after actors, only the token routes below do.
|
// The pins do not ask after actors, only the token routes below do.
|
||||||
"../models/Actor": { findOne: () => mongooseQuery(null) },
|
"../models/Actor": { findOne: () => mongooseQuery(null) },
|
||||||
|
// The map list's own folder tree: `/list` reads it and `/update` checks a move
|
||||||
|
// against it, so the pins need the model to answer, never what it answers.
|
||||||
|
"../models/Folder": { find: () => mongooseQuery([]), belongsToSection: async () => true },
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -181,7 +184,12 @@ function loadNoteRoutes({ ownsCampaign = true, notes = [], folders = [], deleted
|
|||||||
findById: (id) => mongooseQuery(notes.find((note) => note._id === id) ?? null),
|
findById: (id) => mongooseQuery(notes.find((note) => note._id === id) ?? null),
|
||||||
deleteOne: () => mongooseQuery({ deletedCount }),
|
deleteOne: () => mongooseQuery({ deletedCount }),
|
||||||
},
|
},
|
||||||
"../models/Folder": { find: () => mongooseQuery(folders) },
|
"../models/Folder": {
|
||||||
|
find: () => mongooseQuery(folders),
|
||||||
|
// models/Folder.js: the note tree is every folder that is not one of the other
|
||||||
|
// campaign lists, whose rows carry no target at all.
|
||||||
|
filterForTarget: (target) => (target === "note" ? { target: { $nin: ["actor", "item", "map"] } } : { target }),
|
||||||
|
},
|
||||||
"../models/Map": {
|
"../models/Map": {
|
||||||
// The driver drops the pins of the note from every map holding one; what is worth
|
// The driver drops the pins of the note from every map holding one; what is worth
|
||||||
// keeping here is the filter it is asked to do that with.
|
// keeping here is the filter it is asked to do that with.
|
||||||
|
|||||||
@@ -82,6 +82,9 @@ function loadMapRoutes({ ownsCampaign = true, maps = [], actors = [] } = {}) {
|
|||||||
: null
|
: null
|
||||||
),
|
),
|
||||||
},
|
},
|
||||||
|
// The map list's own folder tree: `/list` reads it and `/update` checks a move
|
||||||
|
// against it, so the tokens need the model to answer, never what it answers.
|
||||||
|
"../models/Folder": { find: () => mongooseQuery([]), belongsToSection: async () => true },
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -188,6 +191,8 @@ function loadActorRoutes({ ownsCampaign = true, actors = [], deletedCount = 1 }
|
|||||||
return { modifiedCount: 1 };
|
return { modifiedCount: 1 };
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
// The actor list's own folder tree, which the delete does not ask after.
|
||||||
|
"../models/Folder": { find: () => mongooseQuery([]), belongsToSection: async () => true },
|
||||||
});
|
});
|
||||||
return { api, tokensPulled };
|
return { api, tokensPulled };
|
||||||
}
|
}
|
||||||
@@ -299,10 +304,14 @@ function mapViewerTokenWiringTests() {
|
|||||||
const sidebar = readRepoFile("frontend", "app", "components", "partials", "ContentSidebar.vue");
|
const sidebar = readRepoFile("frontend", "app", "components", "partials", "ContentSidebar.vue");
|
||||||
|
|
||||||
test("an actor row of the sidebar can be dragged out of it", () => {
|
test("an actor row of the sidebar can be dragged out of it", () => {
|
||||||
const actorRow = /<div v-for="actor in actors"[^>]*>/.exec(sidebar)?.[0];
|
// The actors' block of the sidebar: since the entry lists got their folders the rows
|
||||||
|
// come from that tree, so the actor row holds its actor as `row.item`.
|
||||||
|
const actorSection = /<template v-else-if="activeSection === 'actors'">([\s\S]*?)<\/template>\s*\n\s*<template v-else-if="activeSection === 'items'">/
|
||||||
|
.exec(sidebar)?.[1] ?? "";
|
||||||
|
const actorRow = /<div v-else class="entity-entry"[^>]*>/.exec(actorSection)?.[0];
|
||||||
assert.ok(actorRow, "expected the actor rows of the sidebar");
|
assert.ok(actorRow, "expected the actor rows of the sidebar");
|
||||||
assert.match(actorRow, /draggable="true"/);
|
assert.match(actorRow, /draggable="true"/);
|
||||||
assert.match(actorRow, /@dragstart="startActorDrag\(\$event, actor\)"/);
|
assert.match(actorRow, /@dragstart="startActorDrag\(\$event, row\.item\)"/);
|
||||||
assert.match(sidebar, /setData\(ACTOR_DRAG_TYPE, String\(actor\._id\)\)/);
|
assert.match(sidebar, /setData\(ACTOR_DRAG_TYPE, String\(actor\._id\)\)/);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user