diff --git a/src/ui/roll-actions.js b/src/ui/roll-actions.js
new file mode 100644
index 0000000..bfedd88
--- /dev/null
+++ b/src/ui/roll-actions.js
@@ -0,0 +1,236 @@
+/**
+ * Post-roll interactive action buttons injected into dice result chat messages.
+ * Allows players to pull dice from the Loksyu (as Successes or dés-fastes)
+ * and allows the GM to spend Tin Ji to intervene.
+ *
+ * After a draw, the originating roll result message is updated in-place
+ * with the new counts, without creating noise.
+ */
+
+import { getLoksyuData, setLoksyuData, getTinjiValue, setTinjiValue } from "./apps/singletons.js"
+
+const SYSTEM_ID = "fvtt-chroniques-de-l-etrange"
+const RESULT_TEMPLATE = "systems/fvtt-chroniques-de-l-etrange/templates/form/cde-dice-result.html"
+
+const WU_XING_CYCLE = {
+ wood: ["wood", "fire", "water", "earth", "metal"],
+ fire: ["fire", "earth", "wood", "metal", "water"],
+ earth: ["earth", "metal", "fire", "water", "wood"],
+ metal: ["metal", "water", "earth", "wood", "fire"],
+ water: ["water", "wood", "metal", "fire", "earth"],
+}
+
+const ASPECT_LABELS = {
+ metal: "CDE.Metal",
+ water: "CDE.Water",
+ earth: "CDE.Earth",
+ fire: "CDE.Fire",
+ wood: "CDE.Wood",
+}
+
+const ASPECT_ICONS = {
+ metal: "systems/fvtt-chroniques-de-l-etrange/images/cde_metal.webp",
+ water: "systems/fvtt-chroniques-de-l-etrange/images/cde_eau.webp",
+ earth: "systems/fvtt-chroniques-de-l-etrange/images/cde_terre.webp",
+ fire: "systems/fvtt-chroniques-de-l-etrange/images/cde_feu.webp",
+ wood: "systems/fvtt-chroniques-de-l-etrange/images/cde_bois.webp",
+}
+
+/**
+ * Inject or refresh post-roll action buttons in the given chat message HTML element.
+ * Called from renderChatMessageHTML hook.
+ * @param {ChatMessage} message
+ * @param {HTMLElement} html - the chat message HTML element (li.chat-message)
+ */
+export function injectRollActions(message, html) {
+ const rollCard = html.querySelector(".cde-roll-result")
+ if (!rollCard) return
+ const aspect = rollCard.dataset.aspect
+ if (!aspect || !WU_XING_CYCLE[aspect]) return
+ refreshRollActions(rollCard, aspect, message)
+}
+
+/**
+ * Re-render the action buttons section based on current Loksyu / TinJi state.
+ */
+function refreshRollActions(rollCard, aspect, message) {
+ rollCard.querySelector(".cde-roll-actions")?.remove()
+
+ const cycle = WU_XING_CYCLE[aspect]
+ const fasteAspect = cycle[1]
+
+ const loksyu = getLoksyuData()
+ const tinji = getTinjiValue()
+
+ const successAvail = (loksyu[aspect]?.yin ?? 0) + (loksyu[aspect]?.yang ?? 0)
+ const fasteAvail = (loksyu[fasteAspect]?.yin ?? 0) + (loksyu[fasteAspect]?.yang ?? 0)
+ const isGM = game.user.isGM
+
+ const hasSomething = successAvail > 0 || fasteAvail > 0 || (isGM && tinji > 0)
+ if (!hasSomething) return
+
+ const aspLabel = game.i18n.localize(ASPECT_LABELS[aspect])
+ const fasteLabel = game.i18n.localize(ASPECT_LABELS[fasteAspect])
+
+ let btns = ""
+
+ if (successAvail > 0) {
+ btns += `
`
+ }
+
+ if (fasteAvail > 0) {
+ btns += `
`
+ }
+
+ if (isGM && tinji > 0) {
+ btns += `
`
+ }
+
+ const wrapper = document.createElement("div")
+ wrapper.className = "cde-roll-actions"
+ wrapper.innerHTML = `
+
+
+ ${game.i18n.localize("CDE.PostRollActions")}
+
+
${btns}
+ `
+ rollCard.appendChild(wrapper)
+
+ wrapper.addEventListener("click", async ev => {
+ const btn = ev.target.closest("[data-action]")
+ if (!btn || btn.disabled) return
+ const action = btn.dataset.action
+ if (action === "loksyu-success") {
+ await _drawFromLoksyu(message, aspect, "success", aspLabel)
+ } else if (action === "loksyu-faste") {
+ await _drawFromLoksyu(message, fasteAspect, "faste", fasteLabel)
+ } else if (action === "tinji") {
+ await _spendTinjiPostRoll()
+ }
+ // Buttons will be re-injected automatically via renderChatMessageHTML
+ // after message.update(). For tinji (no message update), refresh manually.
+ if (action === "tinji") refreshRollActions(rollCard, aspect, message)
+ })
+}
+
+/**
+ * Pull one die from a given Loksyu aspect slot, update Loksyu settings,
+ * and update the originating roll-result message in-place.
+ *
+ * @param {ChatMessage} message - the roll result chat message to update
+ * @param {string} aspect - which Loksyu aspect slot to draw from
+ * @param {"success"|"faste"} type
+ * @param {string} aspectLabel - localised aspect name for the notification
+ */
+async function _drawFromLoksyu(message, aspect, type, aspectLabel) {
+ const data = getLoksyuData()
+ const entry = data[aspect] ?? { yin: 0, yang: 0 }
+ const total = entry.yin + entry.yang
+ if (total <= 0) {
+ ui.notifications.warn(game.i18n.localize("CDE.LoksyuEmpty"))
+ return
+ }
+
+ // Remove 1 die (prefer yang first)
+ if (entry.yang > 0) entry.yang--
+ else entry.yin--
+ data[aspect] = entry
+ await setLoksyuData(data)
+
+ // Update the roll-result message in-place if it has stored flags
+ const flags = message?.flags?.[SYSTEM_ID]
+ if (flags?.rollResult && message.isOwner) {
+ const updated = foundry.utils.deepClone(flags.rollResult)
+ if (type === "success") {
+ updated.successesdice = (updated.successesdice ?? 0) + 1
+ updated.loksyuBonusSuc = (updated.loksyuBonusSuc ?? 0) + 1
+ // Recalculate weapon damage if applicable
+ if (updated.damageBase) updated.totalDamage = updated.successesdice * updated.damageBase
+ } else {
+ updated.auspiciousdice = (updated.auspiciousdice ?? 0) + 1
+ updated.loksyuBonusFaste = (updated.loksyuBonusFaste ?? 0) + 1
+ }
+ const newHtml = await foundry.applications.handlebars.renderTemplate(RESULT_TEMPLATE, updated)
+ await message.update({
+ content: newHtml,
+ [`flags.${SYSTEM_ID}.rollResult`]: updated,
+ })
+ // renderChatMessageHTML hook fires automatically → buttons re-injected
+ }
+
+ const remain = entry.yin + entry.yang
+ const typeLabel = type === "success"
+ ? game.i18n.localize("CDE.Successes")
+ : game.i18n.localize("CDE.AuspiciousDie")
+
+ ChatMessage.create({
+ user: game.user.id,
+ content: `
+
+
+
`,
+ })
+}
+
+/**
+ * Spend 1 Tin Ji point (GM only) and post a notification.
+ */
+async function _spendTinjiPostRoll() {
+ if (!game.user.isGM) return
+ const current = getTinjiValue()
+ if (current <= 0) {
+ ui.notifications.warn(game.i18n.localize("CDE.TinjiEmpty"))
+ return
+ }
+ await setTinjiValue(current - 1)
+ ChatMessage.create({
+ user: game.user.id,
+ content: `
+ 天
+
+ ${game.user.name} ${game.i18n.localize("CDE.TinjiSpent").replace("{name}", game.user.name)}
+
+ (${current - 1} ${game.i18n.localize("CDE.TinjiRemaining")})
+
`,
+ })
+}
+
+/**
+ * Refresh all visible roll-result buttons when Loksyu or TinJi settings change.
+ * Wired up via Hooks.on("updateSetting", ...) in system.js.
+ */
+export function refreshAllRollActions() {
+ document.querySelectorAll(".chat-message .cde-roll-result[data-aspect]").forEach(card => {
+ const aspect = card.dataset.aspect
+ if (!aspect || !WU_XING_CYCLE[aspect]) return
+ // Find the ChatMessage document from the ancestor element's data-message-id
+ const msgEl = card.closest("[data-message-id]")
+ const msgId = msgEl?.dataset?.messageId
+ const message = msgId ? game.messages.get(msgId) : null
+ refreshRollActions(card, aspect, message)
+ })
+}
+
diff --git a/src/ui/rolling.js b/src/ui/rolling.js
index aa3bcdd..00aab53 100644
--- a/src/ui/rolling.js
+++ b/src/ui/rolling.js
@@ -250,6 +250,9 @@ async function sendResultMessage(actor, resultData, roll, rollMode) {
content: html,
rolls: [roll],
rollMode,
+ flags: {
+ "fvtt-chroniques-de-l-etrange": { rollResult: { ...resultData } },
+ },
})
}
@@ -297,43 +300,43 @@ export async function rollForActor(actor, rollKey) {
title = game.i18n.localize(`CDE.${skillLibel.charAt(0).toUpperCase() + skillLibel.slice(1)}`)
break
case "skill":
- numberofdice = sys.skills[skillLibel]?.value ?? 0
- title = game.i18n.localize(sys.skills[skillLibel]?.label ?? "CDE.Roll")
+ numberofdice = sys.skills?.[skillLibel]?.value ?? 0
+ title = game.i18n.localize(sys.skills?.[skillLibel]?.label ?? "CDE.Roll")
break
case "special":
- numberofdice = sys.skills[skillLibel]?.value ?? 0
- title = game.i18n.localize(sys.skills[skillLibel]?.label ?? "CDE.Roll")
+ numberofdice = sys.skills?.[skillLibel]?.value ?? 0
+ title = game.i18n.localize(sys.skills?.[skillLibel]?.label ?? "CDE.Roll")
title += ` [${game.i18n.localize("CDE.Speciality")}]`
isSpecial = true
- if (!sys.skills[skillLibel]?.specialities) {
+ if (!sys.skills?.[skillLibel]?.specialities) {
ui.notifications.warn(game.i18n.localize("CDE.Error2"))
return
}
break
case "resource":
- numberofdice = sys.resources[skillLibel]?.value ?? 0
- title = game.i18n.localize(sys.resources[skillLibel]?.label ?? "CDE.Roll")
+ numberofdice = sys.resources?.[skillLibel]?.value ?? 0
+ title = game.i18n.localize(sys.resources?.[skillLibel]?.label ?? "CDE.Roll")
break
case "field":
- numberofdice = sys.resources[skillLibel]?.value ?? 0
- title = game.i18n.localize(sys.resources[skillLibel]?.label ?? "CDE.Roll")
+ numberofdice = sys.resources?.[skillLibel]?.value ?? 0
+ title = game.i18n.localize(sys.resources?.[skillLibel]?.label ?? "CDE.Roll")
title += ` [${game.i18n.localize("CDE.Field")}]`
isSpecial = true
- if (!sys.resources[skillLibel]?.specialities) {
+ if (!sys.resources?.[skillLibel]?.specialities) {
ui.notifications.warn(game.i18n.localize("CDE.Error4"))
return
}
break
case "magic":
- numberofdice = sys.magics[skillLibel]?.value ?? 0
+ numberofdice = sys.magics?.[skillLibel]?.value ?? 0
isMagic = true
title = game.i18n.localize(MAGIC_I18N_KEYS[skillLibel] ?? "CDE.Magics")
break
case "magicspecial":
- numberofdice = sys.magics[skillLibel]?.value ?? 0
+ numberofdice = sys.magics?.[skillLibel]?.value ?? 0
isMagicSpecial = true
isMagic = true
- if (!sys.magics[skillLibel]?.speciality?.[specialLibel]?.check) {
+ if (!sys.magics?.[skillLibel]?.speciality?.[specialLibel]?.check) {
ui.notifications.warn(game.i18n.localize("CDE.Error6"))
return
}
@@ -344,8 +347,8 @@ export async function rollForActor(actor, rollKey) {
const kfItem = actor.items.get(skillLibel)
if (!kfItem) { ui.notifications.warn(game.i18n.localize("CDE.Error0")); return }
const kfSkill = kfItem.system.skill ?? "kungfu"
- numberofdice = sys.skills[kfSkill]?.value ?? 0
- title = `${kfItem.name} [${game.i18n.localize(sys.skills[kfSkill]?.label ?? "CDE.KungFu")}]`
+ numberofdice = sys.skills?.[kfSkill]?.value ?? 0
+ title = `${kfItem.name} [${game.i18n.localize(sys.skills?.[kfSkill]?.label ?? "CDE.KungFu")}]`
kfDefaultAspect = ASPECT_NAMES.indexOf(kfItem.system.aspect ?? "metal")
if (kfDefaultAspect < 0) kfDefaultAspect = 0
break
@@ -357,7 +360,7 @@ export async function rollForActor(actor, rollKey) {
const wpType = wpItem.system.weaponType ?? "melee"
const wpSkill = WEAPON_TYPE_SKILL[wpType] ?? "kungfu"
- numberofdice = sys.skills[wpSkill]?.value ?? 0
+ numberofdice = sys.skills?.[wpSkill]?.value ?? 0
const wpAspectRaw = wpItem.system.damageAspect ?? "metal"
const wpAspectIdx = WEAPON_ASPECT_INDEX[wpAspectRaw] ?? 0
@@ -372,7 +375,7 @@ export async function rollForActor(actor, rollKey) {
// Show weapon-specific prompt
const wParams = await showWeaponPrompt({
- title: `${wpItem.name} [${game.i18n.localize(sys.skills[wpSkill]?.label ?? "CDE.WeaponRoll")}]`,
+ title: `${wpItem.name} [${game.i18n.localize(sys.skills?.[wpSkill]?.label ?? "CDE.WeaponRoll")}]`,
numberofdice,
weaponName: wpItem.name,
weaponTypeLabel: WEAPON_TYPE_LABELS[wpType] ?? "CDE.Weapon",
@@ -392,7 +395,7 @@ export async function rollForActor(actor, rollKey) {
// Resolve final pool from weapon prompt values
const wpChosenSkill = wParams.weaponskill ?? wpSkill
- const wpSkillDice = sys.skills[wpChosenSkill]?.value ?? 0
+ const wpSkillDice = sys.skills?.[wpChosenSkill]?.value ?? 0
const wpAspFinal = Number(wParams.aspect ?? wpAspectIdx)
const wpAspectDice = sys.aspect[ASPECT_NAMES[wpAspFinal]]?.value ?? 0
const wpRangeMalus = RANGE_MALUS[wParams.effectiverange ?? "contact"] ?? 0
@@ -537,7 +540,7 @@ export async function rollForActor(actor, rollKey) {
rollDifficulty = Math.max(1, Number(params.rolldifficulty ?? 1))
throwMode = Number(params.typeofthrow ?? 0)
// magic: magic skill + aspect + bonuses + 1 (speciality base) + HEI spent
- const aspectDice = sys.aspect[ASPECT_NAMES[aspectIndex]]?.value ?? 0
+ const aspectDice = sys.aspect?.[ASPECT_NAMES[aspectIndex]]?.value ?? 0
const bonusSpec = Number(params.bonusmalusspeciality ?? 0)
const heiDice = Number(params.heispend ?? 0)
numberofdice = numberofdice + aspectDice + bonusMalus + 1 + bonusSpec + heiDice
@@ -549,7 +552,7 @@ export async function rollForActor(actor, rollKey) {
throwMode = Number(params.typeofthrow ?? 0)
const aspectDice = (typeLibel !== "aspect")
- ? (sys.aspect[ASPECT_NAMES[aspectIndex]]?.value ?? 0)
+ ? (sys.aspect?.[ASPECT_NAMES[aspectIndex]]?.value ?? 0)
: 0
numberofdice = numberofdice + aspectDice + bonusMalus - woundMalus
diff --git a/src/ui/sheets/actors/base.js b/src/ui/sheets/actors/base.js
index 6512811..5948c22 100644
--- a/src/ui/sheets/actors/base.js
+++ b/src/ui/sheets/actors/base.js
@@ -22,7 +22,7 @@ export class CDEBaseActorSheet extends HandlebarsApplicationMixin(foundry.applic
}
async _prepareContext() {
- const descriptionHTML = await TextEditor.enrichHTML(this.document.system.description ?? "", { async: true })
+ const descriptionHTML = await foundry.applications.ux.TextEditor.implementation.enrichHTML(this.document.system.description ?? "", { async: true })
const cssClass = this.options.classes?.join(" ") ?? ""
return {
actor: this.document,
diff --git a/src/ui/sheets/actors/index.js b/src/ui/sheets/actors/index.js
index 14c7423..39b2ff0 100644
--- a/src/ui/sheets/actors/index.js
+++ b/src/ui/sheets/actors/index.js
@@ -1,4 +1,2 @@
export { CDECharacterSheet } from "./character.js"
export { CDENpcSheet } from "./npc.js"
-export { CDETinjiSheet } from "./tinji.js"
-export { CDELoksyuSheet } from "./loksyu.js"
diff --git a/src/ui/sheets/actors/loksyu.js b/src/ui/sheets/actors/loksyu.js
deleted file mode 100644
index 46b0f06..0000000
--- a/src/ui/sheets/actors/loksyu.js
+++ /dev/null
@@ -1,21 +0,0 @@
-import { CDEBaseActorSheet } from "./base.js"
-import { CDELoksyuApp } from "../../apps/loksyu-app.js"
-
-export class CDELoksyuSheet extends CDEBaseActorSheet {
- static DEFAULT_OPTIONS = {
- classes: ["loksyu"],
- }
-
- static PARTS = {
- main: { template: "systems/fvtt-chroniques-de-l-etrange/templates/actor/cde-loksyu-sheet.html" },
- }
-
- tabGroups = { primary: "loksyu" }
-
- /** Redirect any direct actor-sheet open to the standalone app instead */
- async _onFirstRender(context, options) {
- // Close this actor sheet immediately and open the standalone app
- await this.close({ animate: false })
- CDELoksyuApp.open()
- }
-}
diff --git a/src/ui/sheets/actors/tinji.js b/src/ui/sheets/actors/tinji.js
deleted file mode 100644
index f346c5d..0000000
--- a/src/ui/sheets/actors/tinji.js
+++ /dev/null
@@ -1,20 +0,0 @@
-import { CDEBaseActorSheet } from "./base.js"
-import { CDETinjiApp } from "../../apps/tinji-app.js"
-
-export class CDETinjiSheet extends CDEBaseActorSheet {
- static DEFAULT_OPTIONS = {
- classes: ["tinji"],
- }
-
- static PARTS = {
- main: { template: "systems/fvtt-chroniques-de-l-etrange/templates/actor/cde-tinji-sheet.html" },
- }
-
- tabGroups = { primary: "tinji" }
-
- /** Redirect any direct actor-sheet open to the standalone app instead */
- async _onFirstRender(context, options) {
- await this.close({ animate: false })
- CDETinjiApp.open()
- }
-}
diff --git a/src/ui/sheets/items/base.js b/src/ui/sheets/items/base.js
index 86bbff2..cd5ea9c 100644
--- a/src/ui/sheets/items/base.js
+++ b/src/ui/sheets/items/base.js
@@ -19,8 +19,8 @@ export class CDEBaseItemSheet extends HandlebarsApplicationMixin(foundry.applica
async _prepareContext() {
const cssClass = this.options.classes?.join(" ") ?? ""
- const enrichedDescription = await TextEditor.enrichHTML(this.document.system.description ?? "", { async: true })
- const enrichedNotes = await TextEditor.enrichHTML(this.document.system.notes ?? "", { async: true })
+ const enrichedDescription = await foundry.applications.ux.TextEditor.implementation.enrichHTML(this.document.system.description ?? "", { async: true })
+ const enrichedNotes = await foundry.applications.ux.TextEditor.implementation.enrichHTML(this.document.system.notes ?? "", { async: true })
return {
item: this.document,
system: this.document.system,
diff --git a/src/ui/templates.js b/src/ui/templates.js
index e4be15d..09126ff 100644
--- a/src/ui/templates.js
+++ b/src/ui/templates.js
@@ -1,5 +1,5 @@
import { TEMPLATE_PARTIALS } from "../config/constants.js"
export async function preloadPartials() {
- return loadTemplates(TEMPLATE_PARTIALS)
+ return foundry.applications.handlebars.loadTemplates(TEMPLATE_PARTIALS)
}
diff --git a/system.json b/system.json
index 986e2af..011c0da 100644
--- a/system.json
+++ b/system.json
@@ -168,16 +168,6 @@
"htmlFields": [
"description"
]
- },
- "tinji": {
- "htmlFields": [
- "description"
- ]
- },
- "loksyu": {
- "htmlFields": [
- "description"
- ]
}
},
"Item": {
@@ -267,4 +257,4 @@
"secondaryTokenAttribute": "threetreasures.heiyin",
"manifest": "https://chroniques-etrange-no.fr/download/foundry/system.json",
"download": "https://chroniques-etrange-no.fr/download/foundry/release-233.zip"
-}
\ No newline at end of file
+}
diff --git a/templates/actor/cde-loksyu-sheet.html b/templates/actor/cde-loksyu-sheet.html
deleted file mode 100644
index a63ea0c..0000000
--- a/templates/actor/cde-loksyu-sheet.html
+++ /dev/null
@@ -1,137 +0,0 @@
-
diff --git a/templates/actor/cde-tinji-sheet.html b/templates/actor/cde-tinji-sheet.html
deleted file mode 100644
index f0b0713..0000000
--- a/templates/actor/cde-tinji-sheet.html
+++ /dev/null
@@ -1,48 +0,0 @@
-
-
-
-
-
-
-
-
-
-
天機
-
{{ localize "CDE.UpperCaseTinJi" }}
-
-
-
-
{{ localize "CDE.AuspiciousDice" }}
-
-
-
-
-
- {{formInput systemFields.description enriched=descriptionHTML value=system.description name="system.description" toggled=true}}
-
-
diff --git a/templates/actor/parts/cde-npc-supernaturals.html b/templates/actor/parts/cde-npc-supernaturals.html
index 9ac78e2..3a92d5c 100644
--- a/templates/actor/parts/cde-npc-supernaturals.html
+++ b/templates/actor/parts/cde-npc-supernaturals.html
@@ -1,29 +1,37 @@
+{{!-- ===================== CAPACITÉS SURNATURELLES ===================== --}}
+
+
+
{{#if supernaturals.length}}
-
- {{#each supernaturals as |item|}}
- -
-
+ ${game.user.name}
+ ${game.i18n.localize("CDE.LoksyuDrawsA")}
+ ${typeLabel}
+ ${game.i18n.localize("CDE.LoksyuFromAspect")} ${aspectLabel}
+