uberwald/fvtt-adventures-with-emmy
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

First row of tests and fixes

Browse Source
This commit is contained in:
LeRatierBretonnier
2026-03-05 22:50:53 +01:00
parent 12458925a1
commit f28df2ae76
23 changed files with 442 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/applications/sheets/base-item-sheet.mjs
+43 -1
View File
@@ -30,7 +30,9 @@ export default class AwEItemSheet extends HandlebarsApplicationMixin(foundry.app
dragDrop: [{ dragSelector: "[data-drag]", dropSelector: null }],
actions: {
toggleSheet: AwEItemSheet.#onToggleSheet,
editImage: AwEItemSheet.#onEditImage
editImage: AwEItemSheet.#onEditImage,
addTrait: AwEItemSheet.#onAddTrait,
removeTrait: AwEItemSheet.#onRemoveTrait
}
}
@@ -77,6 +79,16 @@ export default class AwEItemSheet extends HandlebarsApplicationMixin(foundry.app
_onRender(context, options) {
super._onRender(context, options)
this.#dragDrop.forEach(d => d.bind(this.element))
// Bind Enter key on tag input fields to trigger the addTrait/addSpecialization actions
this.element.querySelectorAll("input.new-tag[data-action]").forEach(input => {
input.addEventListener("keydown", event => {
if (event.key !== "Enter") return
event.preventDefault()
const actionName = input.dataset.action
const handler = this.options.actions?.[actionName]
if (handler) handler.call(this, event, input)
})
})
}
// #region Drag-and-Drop Workflow
@@ -182,4 +194,34 @@ export default class AwEItemSheet extends HandlebarsApplicationMixin(foundry.app
}
// #endregion
// #region Array field helpers (traits, specializations)
/**
* Handle adding a tag (trait, specialization) from the input field.
* @param {PointerEvent|KeyboardEvent} event - The initiating event.
* @param {HTMLElement} target - The input element.
*/
static async #onAddTrait(event, target) {
const value = target.value.trim()
if (!value) return
const fieldName = target.dataset.field ?? "system.traits"
const current = foundry.utils.getProperty(this.document, fieldName) ?? []
await this.document.update({ [fieldName]: [...current, value] })
target.value = ""
}
/**
* Handle removing a tag (trait, specialization) from an array field.
* @param {PointerEvent} event - The initiating click event.
* @param {HTMLElement} target - The remove button.
*/
static async #onRemoveTrait(event, target) {
const index = Number(target.dataset.index)
const fieldName = target.dataset.field ?? "system.traits"
const current = [...(foundry.utils.getProperty(this.document, fieldName) ?? [])]
current.splice(index, 1)
await this.document.update({ [fieldName]: current })
}
// #endregion
}
module/applications/sheets/character-sheet.mjs
+8 -1
View File
@@ -1,4 +1,5 @@
import AwEActorSheet from "./base-actor-sheet.mjs"
import { SYSTEM } from "../../config/system.mjs"
export default class AwECharacterSheet extends AwEActorSheet {
/** @override */
@@ -23,6 +24,9 @@ export default class AwECharacterSheet extends AwEActorSheet {
/** @override */
static PARTS = {
header: {
template: "systems/fvtt-adventures-with-emmy/templates/character-header.hbs"
},
main: {
template: "systems/fvtt-adventures-with-emmy/templates/character-main.hbs"
},
@@ -72,7 +76,10 @@ export default class AwECharacterSheet extends AwEActorSheet {
switch (partId) {
case "main":
context.tab = context.tabs.main
context.abilities = doc.itemTypes.ability
context.abilities = doc.itemTypes.ability.map(item => ({
...item,
costLabel: game.i18n.localize(SYSTEM.ABILITY_COST[item.system.cost]?.label ?? item.system.cost)
}))
break
case "biography":
context.tab = context.tabs.biography
module/applications/sheets/field-sheet.mjs
+30 -1
View File
@@ -5,7 +5,11 @@ export default class AwEFieldSheet extends AwEItemSheet {
static DEFAULT_OPTIONS = {
classes: ["field"],
position: { width: 620 },
window: { contentClasses: ["field-content"] }
window: { contentClasses: ["field-content"] },
actions: {
addSpecialization: AwEFieldSheet.#onAddSpecialization,
removeSpecialization: AwEFieldSheet.#onRemoveSpecialization
}
}
/** @override */
@@ -14,4 +18,29 @@ export default class AwEFieldSheet extends AwEItemSheet {
template: "systems/fvtt-adventures-with-emmy/templates/field.hbs"
}
}
/**
* Handle adding a specialization.
* @param {PointerEvent} event - The initiating event.
* @param {HTMLElement} target - The input element.
*/
static async #onAddSpecialization(event, target) {
const value = target.value.trim()
if (!value) return
const current = this.document.system.specializations ?? []
await this.document.update({ "system.specializations": [...current, value] })
target.value = ""
}
/**
* Handle removing a specialization.
* @param {PointerEvent} event - The initiating click event.
* @param {HTMLElement} target - The remove button.
*/
static async #onRemoveSpecialization(event, target) {
const index = Number(target.dataset.index)
const current = [...(this.document.system.specializations ?? [])]
current.splice(index, 1)
await this.document.update({ "system.specializations": current })
}
}
module/documents/actor.mjs
+11 -27
View File
@@ -1,3 +1,5 @@
import AwERoll from "./roll.mjs"
export default class AwEActor extends Actor {
/** @override */
prepareData() {
@@ -33,38 +35,20 @@ export default class AwEActor extends Actor {
/**
* Roll an attribute check.
* @param {string} attributeId - The attribute to roll.
* @param {object} options - Roll options.
* @returns {Promise<Roll>} The roll result.
* @param {object} options - Roll options (passed through to AwERoll.prompt).
* @returns {Promise<AwERoll|null>} The evaluated roll, or null if cancelled.
*/
async rollAttribute(attributeId, options = {}) {
const attribute = this.system.attributes[attributeId]
if (!attribute) return null
const mod = attribute.mod ?? 0
const formula = `1d20 + ${mod}`
const roll = new Roll(formula)
await roll.evaluate()
// Determine outcome vs DC if provided
let outcome = null
if (options.dc !== undefined) {
const total = roll.total
const dc = options.dc
if (total >= dc + 10) outcome = "criticalSuccess"
else if (total >= dc) outcome = "success"
else if (total <= dc - 10) outcome = "criticalFailure"
else outcome = "failure"
}
// Send to chat
const attrLabel = attributeId.charAt(0).toUpperCase() + attributeId.slice(1)
const flavor = options.flavor || game.i18n.localize(`AWEMMY.Attribute.${attrLabel}`)
await roll.toMessage({
speaker: ChatMessage.getSpeaker({ actor: this }),
flavor,
rollMode: game.settings.get("core", "rollMode")
return AwERoll.prompt({
attributeKey: attributeId,
modifier: attribute.mod ?? 0,
actorId: this.id,
actorName: this.name,
actorImage: this.img,
...options
})
return { roll, outcome }
}
}
module/documents/chat-message.mjs
+21 -3
View File
@@ -1,7 +1,25 @@
import AwERoll from "./roll.mjs"
export default class AwEChatMessage extends ChatMessage {
/** @override */
async getHTML(...args) {
const html = await super.getHTML(...args)
return html
async _renderRollContent(messageData) {
if (this.rolls[0] instanceof AwERoll) {
const isPrivate = !this.isContentVisible
const roll = this.rolls[0]
const html = await foundry.applications.handlebars.renderTemplate(
AwERoll.CHAT_TEMPLATE,
{
flavor: this.flavor,
total: roll.total,
outcome: isPrivate ? null : roll.outcome,
dc: roll.dc,
isPrivate
}
)
messageData.message.content = html
return
}
return super._renderRollContent(messageData)
}
}
module/documents/roll.mjs
+133 -2
View File
@@ -1,5 +1,136 @@
import { SYSTEM } from "../config/system.mjs"
export default class AwERoll extends Roll {
constructor(formula, data = {}, options = {}) {
super(formula, data, options)
/** @type {string} */
static CHAT_TEMPLATE = "systems/fvtt-adventures-with-emmy/templates/chat-message.hbs"
// --- Accessors for roll options ---
get attributeKey() { return this.options.attributeKey }
get rollName() { return this.options.rollName }
get modifier() { return this.options.modifier ?? 0 }
get bonus() { return this.options.bonus ?? 0 }
get dc() { return this.options.dc }
get outcome() { return this.options.outcome }
get actorId() { return this.options.actorId }
get actorName() { return this.options.actorName }
get actorImage() { return this.options.actorImage }
// --- Outcome calculation ---
/**
* Compute the degree of success for a d20 check.
* - Critical Success : total ≥ dc + 10, OR natural 20 upgrades result
* - Success : total ≥ dc
* - Failure : total < dc
* - Critical Failure : total ≤ dc − 10, OR natural 1 downgrades result
*
* @param {number} total The final roll total (d20 + modifiers)
* @param {number} dc The Difficulty Class to compare against
* @param {number} d20Value The raw d20 result (for nat-20 / nat-1 adjustment)
* @returns {"criticalSuccess"|"success"|"failure"|"criticalFailure"}
*/
static computeOutcome(total, dc, d20Value) {
const DEGREES = ["criticalFailure", "failure", "success", "criticalSuccess"]
let idx
if (total >= dc + 10) idx = 3
else if (total >= dc) idx = 2
else if (total <= dc - 10) idx = 0
else idx = 1
if (d20Value === 20) idx = Math.min(3, idx + 1)
if (d20Value === 1) idx = Math.max(0, idx - 1)
return DEGREES[idx]
}
// --- Prompt dialog ---
/**
* Open a dialog so the player can add a situational bonus and choose visibility,
* then evaluate and post the roll to chat.
*
* @param {object} options
* @param {string} options.attributeKey Attribute id (agility | fitness | awareness | influence)
* @param {number} options.modifier Base attribute modifier
* @param {number} [options.dc] Pre-set DC (skips DC field if provided)
* @param {string} options.actorId
* @param {string} options.actorName
* @param {string} options.actorImage
* @returns {Promise<AwERoll|null>} Resolved roll, or null if dialog was cancelled
*/
static async prompt(options = {}) {
const attrLabel = options.attributeKey
? game.i18n.localize(SYSTEM.ATTRIBUTES[options.attributeKey]?.label ?? options.attributeKey)
: (options.rollName ?? game.i18n.localize("AWEMMY.Roll.Check"))
const rollModes = Object.fromEntries(
Object.entries(CONFIG.Dice.rollModes).map(([k, v]) => [k, game.i18n.localize(v.label ?? v)])
)
const content = await foundry.applications.handlebars.renderTemplate(
"systems/fvtt-adventures-with-emmy/templates/roll-dialog.hbs",
{
attrLabel,
modifier: options.modifier ?? 0,
dc: options.dc ?? "",
rollModes,
visibility: game.settings.get("core", "rollMode")
}
)
const result = await foundry.applications.api.DialogV2.wait({
window: { title: game.i18n.format("AWEMMY.Roll.DialogTitle", { name: attrLabel }) },
classes: ["awemmy"],
content,
buttons: [{
label: game.i18n.localize("AWEMMY.Roll.Roll"),
callback: (_event, button) =>
Array.from(button.form.elements).reduce((obj, input) => {
if (input.name) obj[input.name] = input.value
return obj
}, {})
}],
rejectClose: false
})
if (!result) return null
const mod = options.modifier ?? 0
const bonus = parseInt(result.bonus) || 0
const dc = result.dc !== "" ? parseInt(result.dc) : undefined
const rollMode = result.visibility ?? game.settings.get("core", "rollMode")
// Build formula: 1d20 + mod [± bonus]
let formula = `1d20 + ${mod}`
if (bonus > 0) formula += ` + ${bonus}`
else if (bonus < 0) formula += ` - ${Math.abs(bonus)}`
const roll = new this(formula, {}, {
attributeKey: options.attributeKey,
rollName: attrLabel,
modifier: mod,
bonus,
dc,
actorId: options.actorId,
actorName: options.actorName,
actorImage: options.actorImage
})
await roll.evaluate()
// Compute degree of success when a DC is known
if (dc !== undefined) {
const d20Value = roll.dice[0]?.results[0]?.result ?? 0
roll.options.outcome = AwERoll.computeOutcome(roll.total, dc, d20Value)
}
await roll.toMessage({
speaker: ChatMessage.getSpeaker({ actor: game.actors.get(options.actorId) }),
flavor: attrLabel,
rollMode
})
return roll
}
}
module/models/ability.mjs
+2 -2
View File
@@ -10,13 +10,13 @@ export default class AwEAbility extends foundry.abstract.TypeDataModel {
required: true,
nullable: false,
initial: "field",
choices: Object.keys(SYSTEM.ABILITY_TYPE)
choices: Object.fromEntries(Object.values(SYSTEM.ABILITY_TYPE).map(a => [a.id, a.label]))
})
schema.cost = new fields.StringField({
required: true,
nullable: false,
initial: "one",
choices: Object.keys(SYSTEM.ABILITY_COST)
choices: Object.fromEntries(Object.values(SYSTEM.ABILITY_COST).map(a => [a.id, a.label]))
})
schema.frequency = new fields.StringField({ initial: "", required: false, nullable: true })
schema.requirements = new fields.StringField({ initial: "", required: false, nullable: true })
module/models/character.mjs
-7
View File
@@ -63,12 +63,5 @@ export default class AwECharacter extends foundry.abstract.TypeDataModel {
attr.mod = level + attr.boostLevel + attr.bonus
attr.dc = 10 + attr.mod
}
// Compute max HP if not overridden
// Base HP = 10 + (level * 2) + fitness modifier
const fitnessMod = this.attributes.fitness.mod ?? 0
if (this.hp.max === 10) {
this.hp.max = 10 + (level * 2) + fitnessMod
}
}
}
module/models/field.mjs
+4 -3
View File
@@ -10,13 +10,14 @@ export default class AwEField extends foundry.abstract.TypeDataModel {
required: true,
nullable: false,
initial: "agility",
choices: Object.keys(SYSTEM.ATTRIBUTES)
choices: Object.fromEntries(Object.values(SYSTEM.ATTRIBUTES).map(a => [a.id, a.label]))
})
schema.keyAttribute2 = new fields.StringField({
required: false,
nullable: true,
initial: null,
choices: [...Object.keys(SYSTEM.ATTRIBUTES), null]
initial: "",
blank: true,
choices: { "": "—", ...Object.values(SYSTEM.ATTRIBUTES).reduce((o, a) => { o[a.id] = a.label; return o }, {}) }
})
schema.specializations = new fields.ArrayField(new fields.StringField())
schema.knowledgeBonus = new fields.StringField({ initial: "", required: false, nullable: true })
module/models/weapon.mjs
+1 -1
View File
@@ -14,7 +14,7 @@ export default class AwEWeapon extends foundry.abstract.TypeDataModel {
required: true,
nullable: false,
initial: "agility",
choices: Object.keys(SYSTEM.ATTRIBUTES)
choices: Object.fromEntries(Object.values(SYSTEM.ATTRIBUTES).map(a => [a.id, a.label]))
})
schema.traits = new fields.ArrayField(new fields.StringField())