';
// Iterate over the supplied keys and build their inputs (including whether or not they need a group key).
for (let [key, item] of Object.entries(items)) {
result = result + ``;
@@ -231,12 +224,13 @@ export class EntitySheetHelper {
/**
* Validate whether or not a group name can be used.
- * @param {string} groupName Groupname to validate
+ * @param {string} groupName The candidate group name to validate
+ * @param {Document} document The Actor or Item instance within which the group is being defined
* @returns {boolean}
*/
- static validateGroup(groupName, entity) {
- let groups = Object.keys(entity.object.data.data.groups);
- let attributes = Object.keys(entity.object.data.data.attributes).filter(a => !groups.includes(a));
+ static validateGroup(groupName, document) {
+ let groups = Object.keys(document.data.data.groups || {});
+ let attributes = Object.keys(document.data.data.attributes).filter(a => !groups.includes(a));
// Check for duplicate group keys.
if ( groups.includes(groupName) ) {
@@ -255,7 +249,6 @@ export class EntitySheetHelper {
ui.notifications.error(game.i18n.localize("SIMPLE.NotifyGroupAlphanumeric"));
return false;
}
-
return true;
}
@@ -283,7 +276,7 @@ export class EntitySheetHelper {
while ( objKeys.includes(newValue) ) {
++nk;
newValue = `attr${nk}`;
- };
+ }
// Build options for construction HTML inputs.
let htmlItems = {
@@ -364,7 +357,7 @@ export class EntitySheetHelper {
const form = app.form;
let newValue = $(a).siblings('.group-prefix').val();
// Verify the new group key is valid, and use it to create the group.
- if ( newValue.length > 0 && EntitySheetHelper.validateGroup(newValue, app) ) {
+ if ( newValue.length > 0 && EntitySheetHelper.validateGroup(newValue, app.object) ) {
let newKey = document.createElement("div");
newKey.innerHTML = ``;
// Append the form element and submit the form.
@@ -374,6 +367,8 @@ export class EntitySheetHelper {
}
}
+ /* -------------------------------------------- */
+
/**
* Delete an attribute group.
* @param {MouseEvent} event The originating left click event
@@ -410,15 +405,15 @@ export class EntitySheetHelper {
/**
* Update attributes when updating an actor object.
- *
- * @param {Object} formData Form data object to modify keys and values for.
- * @returns {Object} updated formData object.
+ * @param {object} formData The form data object to modify keys and values for.
+ * @param {Document} document The Actor or Item document within which attributes are being updated
+ * @returns {object} The updated formData object.
*/
- static updateAttributes(formData, entity) {
+ static updateAttributes(formData, document) {
let groupKeys = [];
// Handle the free-form attributes list
- const formAttrs = expandObject(formData).data.attributes || {};
+ const formAttrs = foundry.utils.expandObject(formData)?.data?.attributes || {};
const attributes = Object.values(formAttrs).reduce((obj, v) => {
let attrs = [];
let group = null;
@@ -453,14 +448,14 @@ export class EntitySheetHelper {
}, {});
// Remove attributes which are no longer used
- for ( let k of Object.keys(entity.object.data.data.attributes) ) {
+ for ( let k of Object.keys(document.data.data.attributes) ) {
if ( !attributes.hasOwnProperty(k) ) attributes[`-=${k}`] = null;
}
// Remove grouped attributes which are no longer used.
for ( let group of groupKeys) {
- if ( entity.object.data.data.attributes[group] ) {
- for ( let k of Object.keys(entity.object.data.data.attributes[group]) ) {
+ if ( document.data.data.attributes[group] ) {
+ for ( let k of Object.keys(document.data.data.attributes[group]) ) {
if ( !attributes[group].hasOwnProperty(k) ) attributes[group][`-=${k}`] = null;
}
}
@@ -470,18 +465,20 @@ export class EntitySheetHelper {
formData = Object.entries(formData).filter(e => !e[0].startsWith("data.attributes")).reduce((obj, e) => {
obj[e[0]] = e[1];
return obj;
- }, {_id: entity.object._id, "data.attributes": attributes});
+ }, {_id: document.id, "data.attributes": attributes});
return formData;
}
+ /* -------------------------------------------- */
+
/**
* Update attribute groups when updating an actor object.
- *
- * @param {Object} formData Form data object to modify keys and values for.
- * @returns {Object} updated formData object.
+ * @param {object} formData The form data object to modify keys and values for.
+ * @param {Document} document The Actor or Item document within which attributes are being updated
+ * @returns {object} The updated formData object.
*/
- static updateGroups(formData, entity) {
+ static updateGroups(formData, document) {
// Handle the free-form groups list
const formGroups = expandObject(formData).data.groups || {};
const groups = Object.values(formGroups).reduce((obj, v) => {
@@ -498,7 +495,7 @@ export class EntitySheetHelper {
}, {});
// Remove groups which are no longer used
- for ( let k of Object.keys(entity.object.data.data.groups) ) {
+ for ( let k of Object.keys(document.data.data.groups) ) {
if ( !groups.hasOwnProperty(k) ) groups[`-=${k}`] = null;
}
@@ -506,42 +503,71 @@ export class EntitySheetHelper {
formData = Object.entries(formData).filter(e => !e[0].startsWith("data.groups")).reduce((obj, e) => {
obj[e[0]] = e[1];
return obj;
- }, {_id: entity.object._id, "data.groups": groups});
-
+ }, {_id: document.id, "data.groups": groups});
return formData;
}
/* -------------------------------------------- */
/**
- * Replace referenced data attributes in the roll formula with the syntax `@attr` with the corresponding key from
- * the provided `data` object. This is a temporary helper function that will be replaced with Roll.replaceFormulaData()
- * in Foundry 0.7.1.
- *
- * @param {String} formula The original formula within which to replace.
- * @param {Object} data Data object to use for value replacements.
- * @param {Object} missing Value to use as missing replacements, such as {missing: "0"}.
- * @return {String} The formula with attributes replaced with values.
+ * @see ClientDocumentMixin.createDialog
*/
- static replaceData(formula, data, {missing=null,depth=1}={}) {
- // Exit early if the formula is invalid.
- if ( typeof formula != "string" || depth < 1) {
- return 0;
- }
- // Replace attributes with their numeric equivalents.
- let dataRgx = new RegExp(/@([a-z.0-9_\-]+)/gi);
- let rollFormula = formula.replace(dataRgx, (match, term) => {
- let value = getProperty(data, term);
- // If there was a value returned, trim and return it.
- if ( value ) {
- return String(value).trim();
- }
- // Otherwise, return either the missing replacement value, or the original @attr string for later replacement.
- else {
- return missing != null ? missing : `@${term}`;
- }
- });
- return rollFormula;
- }
+ static async createDialog(data={}, options={}) {
+ // Collect data
+ const documentName = this.metadata.name;
+ const folders = game.folders.filter(f => (f.data.type === documentName) && f.displayed);
+ const label = game.i18n.localize(this.metadata.label);
+ const title = game.i18n.format("ENTITY.Create", {entity: label});
+
+ // Identify the template Actor types
+ const collection = game.collections.get(this.documentName);
+ const templates = collection.filter(a => a.getFlag("worldbuilding", "isTemplate"));
+ const defaultType = this.metadata.types[0];
+ const types = {
+ [defaultType]: game.i18n.localize("SIMPLE.NoTemplate")
+ }
+ for ( let a of templates ) {
+ types[a.id] = a.name;
+ }
+
+ // Render the entity creation form
+ const html = await renderTemplate(`templates/sidebar/entity-create.html`, {
+ name: data.name || game.i18n.format("ENTITY.New", {entity: label}),
+ folder: data.folder,
+ folders: folders,
+ hasFolders: folders.length > 1,
+ type: data.type || templates[0]?.id || "",
+ types: types,
+ hasTypes: true
+ });
+
+ // Render the confirmation dialog window
+ return Dialog.prompt({
+ title: title,
+ content: html,
+ label: title,
+ callback: html => {
+
+ // Get the form data
+ const form = html[0].querySelector("form");
+ const fd = new FormDataExtended(form);
+ let createData = fd.toObject();
+
+ // Merge with template data
+ const template = collection.get(form.type.value);
+ if ( template ) {
+ createData = foundry.utils.mergeObject(template.toObject(), createData);
+ createData.type = template.data.type;
+ delete createData.flags.worldbuilding.isTemplate;
+ }
+
+ // Merge provided override data
+ createData = foundry.utils.mergeObject(createData, data);
+ return this.create(createData, {renderSheet: true});
+ },
+ rejectClose: false,
+ options: options
+ });
+ }
}
\ No newline at end of file
diff --git a/module/item-sheet.js b/module/item-sheet.js
index 9d4a83c..fbe20ad 100644
--- a/module/item-sheet.js
+++ b/module/item-sheet.js
@@ -1,4 +1,5 @@
import { EntitySheetHelper } from "./helper.js";
+import {ATTRIBUTE_TYPES} from "./constants.js";
/**
* Extend the basic ItemSheet with some very simple modifications
@@ -6,9 +7,9 @@ import { EntitySheetHelper } from "./helper.js";
*/
export class SimpleItemSheet extends ItemSheet {
- /** @override */
+ /** @inheritdoc */
static get defaultOptions() {
- return mergeObject(super.defaultOptions, {
+ return foundry.utils.mergeObject(super.defaultOptions, {
classes: ["worldbuilding", "sheet", "item"],
template: "systems/worldbuilding/templates/item-sheet.html",
width: 520,
@@ -20,26 +21,30 @@ export class SimpleItemSheet extends ItemSheet {
/* -------------------------------------------- */
- /** @override */
+ /** @inheritdoc */
getData() {
- const data = super.getData();
- EntitySheetHelper.getAttributeData(data);
- return data;
+ const context = super.getData();
+ EntitySheetHelper.getAttributeData(context.data);
+ context.systemData = context.data.data;
+ context.dtypes = ATTRIBUTE_TYPES;
+ return context;
}
/* -------------------------------------------- */
- /** @override */
+ /** @inheritdoc */
activateListeners(html) {
super.activateListeners(html);
// Everything below here is only needed if the sheet is editable
- if (!this.options.editable) return;
+ if ( !this.isEditable ) return;
- // Rollable attributes
+ // Attribute Management
+ html.find(".attributes").on("click", ".attribute-control", EntitySheetHelper.onClickAttributeControl.bind(this));
+ html.find(".groups").on("click", ".group-control", EntitySheetHelper.onClickAttributeGroupControl.bind(this));
html.find(".attributes").on("click", "a.attribute-roll", EntitySheetHelper.onAttributeRoll.bind(this));
- // Add draggable for macros.
+ // Add draggable for Macro creation
html.find(".attributes a.attribute-roll").each((i, a) => {
a.setAttribute("draggable", true);
a.addEventListener("dragstart", ev => {
@@ -47,24 +52,15 @@ export class SimpleItemSheet extends ItemSheet {
ev.dataTransfer.setData('text/plain', JSON.stringify(dragData));
}, false);
});
-
- // Add or Remove Attribute
- html.find(".attributes").on("click", ".attribute-control", EntitySheetHelper.onClickAttributeControl.bind(this));
-
- // Add attribute groups.
- html.find(".groups").on("click", ".group-control", EntitySheetHelper.onClickAttributeGroupControl.bind(this));
}
/* -------------------------------------------- */
/** @override */
- _updateObject(event, formData) {
-
- // Handle attribute and group updates.
- formData = EntitySheetHelper.updateAttributes(formData, this);
- formData = EntitySheetHelper.updateGroups(formData, this);
-
- // Update the Actor with the new form values.
- return this.object.update(formData);
+ _getSubmitData(updateData) {
+ let formData = super._getSubmitData(updateData);
+ formData = EntitySheetHelper.updateAttributes(formData, this.object);
+ formData = EntitySheetHelper.updateGroups(formData, this.object);
+ return formData;
}
}
diff --git a/module/item.js b/module/item.js
new file mode 100644
index 0000000..b4e0cce
--- /dev/null
+++ b/module/item.js
@@ -0,0 +1,22 @@
+import {EntitySheetHelper} from "./helper.js";
+
+/**
+ * Extend the base Item document to support attributes and groups with a custom template creation dialog.
+ * @extends {Item}
+ */
+export class SimpleItem extends Item {
+
+ /** @inheritdoc */
+ prepareDerivedData() {
+ super.prepareDerivedData();
+ this.data.data.groups = this.data.data.groups || {};
+ this.data.data.attributes = this.data.data.attributes || {};
+ }
+
+ /* -------------------------------------------- */
+
+ /** @override */
+ static async createDialog(data={}, options={}) {
+ return EntitySheetHelper.createDialog.call(this, data, options);
+ }
+}
diff --git a/module/simple.js b/module/simple.js
index 31e525f..0556c25 100644
--- a/module/simple.js
+++ b/module/simple.js
@@ -5,6 +5,7 @@
// Import Modules
import { SimpleActor } from "./actor.js";
+import { SimpleItem } from "./item.js";
import { SimpleItemSheet } from "./item-sheet.js";
import { SimpleActorSheet } from "./actor-sheet.js";
import { preloadHandlebarsTemplates } from "./templates.js";
@@ -35,7 +36,8 @@ Hooks.once("init", async function() {
};
// Define custom Entity classes
- CONFIG.Actor.entityClass = SimpleActor;
+ CONFIG.Actor.documentClass = SimpleActor;
+ CONFIG.Item.documentClass = SimpleItem;
// Register sheet application classes
Actors.unregisterSheet("core", ActorSheet);
@@ -74,21 +76,12 @@ Hooks.once("init", async function() {
* @param {boolean} notify - Whether or not to post nofications.
*/
function _simpleUpdateInit(formula, notify = false) {
- // If the formula is valid, use it.
- try {
- new Roll(formula).roll();
- CONFIG.Combat.initiative.formula = formula;
- if (notify) {
- ui.notifications.notify(game.i18n.localize("SIMPLE.NotifyInitFormulaUpdated") + ` ${formula}`);
- }
- }
- // Otherwise, fall back to a d20.
- catch (error) {
- CONFIG.Combat.initiative.formula = "1d20";
- if (notify) {
- ui.notifications.error(game.i18n.localize("SIMPLE.NotifyInitFormulaInvalid") + ` ${formula}`);
- }
+ const isValid = Roll.validate(formula);
+ if ( !isValid ) {
+ if ( notify ) ui.notifications.error(`${game.i18n.localize("SIMPLE.NotifyInitFormulaInvalid")}: ${formula}`);
+ return;
}
+ CONFIG.Combat.initiative.formula = formula;
}
/**
@@ -98,8 +91,8 @@ Hooks.once("init", async function() {
return value.slugify({strict: true});
});
- // Preload template partials.
- preloadHandlebarsTemplates();
+ // Preload template partials
+ await preloadHandlebarsTemplates();
});
/**
@@ -172,68 +165,3 @@ Hooks.on("getItemDirectoryEntryContext", (html, options) => {
}
});
});
-
-
-async function _onCreateEntity(event) {
- event.preventDefault();
- event.stopPropagation();
- return _simpleDirectoryTemplates(this, event);
-}
-ActorDirectory.prototype._onCreateEntity = _onCreateEntity; // For 0.7.x+
-ItemDirectory.prototype._onCreateEntity = _onCreateEntity;
-ActorDirectory.prototype._onCreate = _onCreateEntity; // TODO: for 0.6.6
-ItemDirectory.prototype._onCreate = _onCreateEntity;
-
-/**
- * Display the entity template dialog.
- *
- * Helper function to display a dialog if there are multiple template types defined for the entity type.
- * TODO: Refactor in 0.7.x to play more nicely with the Entity.createDialog method
- *1
- * @param {EntityCollection} entityType - The sidebar tab
- * @param {MouseEvent} event - Triggering event
- */
-async function _simpleDirectoryTemplates(collection, event) {
-
- // Retrieve the collection and find any available templates
- const entityCollection = collection.tabName === "actors" ? game.actors : game.items;
- const cls = collection.tabName === "actors" ? Actor : Item;
- let templates = entityCollection.filter(a => a.getFlag("worldbuilding", "isTemplate"));
- let ent = game.i18n.localize(cls.config.label);
-
- // Setup default creation data
- let type = collection.tabName === "actors" ? 'character' : 'item';
- let createData = {
- name: `${game.i18n.localize("SIMPLE.New")} ${ent}`,
- type: type,
- folder: event.currentTarget.dataset.folder
- };
- if ( !templates.length ) return cls.create(createData, {renderSheet: true});
-
- // Build an array of types for the form, including an empty default.
- let types = [{
- value: null,
- label: game.i18n.localize("SIMPLE.NoTemplate")
- }].concat(templates.map(a => { return { value: a.id, label: a.name } }));
-
- // Render the confirmation dialog window
- const templateData = {upper: ent, lower: ent.toLowerCase(), types: types};
- const dlg = await renderTemplate(`systems/worldbuilding/templates/sidebar/entity-create.html`, templateData);
- return Dialog.confirm({
- title: `${game.i18n.localize("SIMPLE.Create")} ${createData.name}`,
- content: dlg,
- yes: html => {
- const form = html[0].querySelector("form");
- const template = entityCollection.get(form.type.value);
- if ( template ) {
- createData = mergeObject(template.data, createData, {inplace: false});
- createData.type = template.data.type;
- delete createData.flags.worldbuilding.isTemplate;
- }
- createData.name = form.name.value;
- return cls.create(createData, {renderSheet: true});
- },
- no: () => {},
- defaultYes: false
- });
-}
\ No newline at end of file
diff --git a/system.json b/system.json
index 1ba9387..fb57af9 100644
--- a/system.json
+++ b/system.json
@@ -2,10 +2,9 @@
"name": "worldbuilding",
"title": "Simple World-Building",
"description": "A minimalist game system which provides configurable Actor and Item templates to support free-form system agnostic game-play.",
- "version": 0.40,
- "minimumCoreVersion": "0.6.6",
- "compatibleCoreVersion": "0.7.3",
- "templateVersion": 2,
+ "version": "0.5.0",
+ "minimumCoreVersion": "0.8.4",
+ "compatibleCoreVersion": "0.8.6",
"author": "Atropos",
"esmodules": ["module/simple.js"],
"styles": ["styles/simple.css"],
@@ -22,7 +21,7 @@
"primaryTokenAttribute": "health",
"secondaryTokenAttribute": "power",
"url": "https://gitlab.com/foundrynet/worldbuilding/",
- "manifest": "https://gitlab.com/foundrynet/worldbuilding/raw/master/system.json",
- "download": "https://gitlab.com/foundrynet/worldbuilding/-/archive/release-040/worldbuilding-release-040.zip",
+ "manifest": "https://gitlab.com/foundrynet/worldbuilding/raw/0.5.x/system.json",
+ "download": "https://gitlab.com/foundrynet/worldbuilding/-/archive/release-050/worldbuilding-release-050.zip",
"license": "LICENSE.txt"
}
diff --git a/templates/actor-sheet.html b/templates/actor-sheet.html
index d0795d1..7979f17 100644
--- a/templates/actor-sheet.html
+++ b/templates/actor-sheet.html
@@ -2,18 +2,20 @@
{{!-- Sheet Header --}}
- 
+ 
@@ -29,14 +31,14 @@
{{!-- Biography Tab --}}
-
-
+
+ +
-
+
/
-
+
-
+
/
-
+
- {{editor content=data.biography target="data.biography" button=true owner=owner editable=editable}}
+
{{/each}}
+
{{!-- Attributes Tab --}}
@@ -94,14 +99,14 @@
{{!-- Render the attribute list partial. --}}
- {{> "systems/worldbuilding/templates/parts/sheet-attributes.html" attributes=data.ungroupedAttributes dtypes=dtypes}}
+ {{> "systems/worldbuilding/templates/parts/sheet-attributes.html" attributes=systemData.ungroupedAttributes dtypes=dtypes}}
{{!-- Render the grouped attributes partial and control. --}}
+ {{editor content=systemData.biography target="data.biography" button=true owner=owner editable=editable rollData=rollData}}
{{!-- Owned Items Tab --}}
-
- {{#each actor.items as |item id|}}
+ {{#each data.items as |item id|}}
-
{{item.name}}
@@ -75,12 +77,15 @@ {{/each}}
- {{> "systems/worldbuilding/templates/parts/sheet-groups.html" attributes=data.groupedAttributes groups=data.groups dtypes=dtypes}}
+ {{> "systems/worldbuilding/templates/parts/sheet-groups.html" attributes=systemData.groupedAttributes groups=systemData.groups dtypes=dtypes}}
diff --git a/templates/item-sheet.html b/templates/item-sheet.html
index 6e6524b..0909121 100644
--- a/templates/item-sheet.html
+++ b/templates/item-sheet.html
@@ -1,15 +1,17 @@