diff --git a/src/module/apps/roll-dialog.mjs b/src/module/apps/roll-dialog.mjs
index 4c05c41..45453b6 100644
--- a/src/module/apps/roll-dialog.mjs
+++ b/src/module/apps/roll-dialog.mjs
@@ -153,6 +153,16 @@ export class GrimwildRollDialog extends foundry.applications.api.DialogV2 {
rollData.hasSpark = rollData.spark > 0;
rollData.sparkArray = Array.from({ length: rollData.spark }, (_, i) => i);
rollData.assistants = game.actors.filter((a) => a.type === "character" && a.name !== rollData.name).map((a) => a.name);
+ // Add weapon mastery as an assistant.
+ if (rollData.actor) {
+ const path = rollData.actor.system.path;
+ const weaponMastery = rollData.actor.itemTypes.talent.filter((t) => t.name.trim().toLowerCase()
+ .includes("weapon mastery"));
+
+ if (path.trim().toLowerCase() === "fighter" || weaponMastery.length > 0) {
+ rollData.assistants.push("Weapon Mastery");
+ }
+ }
options.content = await foundry.applications.handlebars.renderTemplate("systems/grimwild/templates/dialog/stat-roll.hbs", rollData);
options.render = this._render;
diff --git a/src/module/data/actor-character.mjs b/src/module/data/actor-character.mjs
index e705535..3db4967 100644
--- a/src/module/data/actor-character.mjs
+++ b/src/module/data/actor-character.mjs
@@ -303,7 +303,8 @@ export default class GrimwildCharacter extends GrimwildActorBase {
diceDefault: rollData?.stats?.[options.stat].value,
isBloodied: rollData?.isBloodied,
isRattled: rollData?.isRattled,
- isMarked: rollData?.stats?.[options.stat].marked
+ isMarked: rollData?.stats?.[options.stat].marked,
+ actor: this.parent
}
});
// bail out if they closed the dialog
@@ -369,7 +370,7 @@ export default class GrimwildCharacter extends GrimwildActorBase {
await combatant.setFlag("grimwild", "actionCount", actionCount + 1);
const actor = combatant.actor;
- await actor.update({"system.tokenActions.value": Math.max(actor.system.tokenActions.value - 1, 0)});
+ await actor.update({ "system.tokenActions.value": Math.max(actor.system.tokenActions.value - 1, 0) });
// Update the active turn.
const combatantTurn = combat.turns.findIndex((c) => c.id === combatant.id);
diff --git a/src/module/dice/rolls.mjs b/src/module/dice/rolls.mjs
index bda0f5c..ed7cd47 100644
--- a/src/module/dice/rolls.mjs
+++ b/src/module/dice/rolls.mjs
@@ -21,6 +21,7 @@ export default class GrimwildRoll extends Roll {
total: isPrivate ? "?" : this.total,
dice: this.dice[0].results,
thorns: this.dice[1].results,
+ stat: this.options?.stat ?? null,
assists: {},
crit: false,
success: 0,
diff --git a/src/module/documents/chat-message.mjs b/src/module/documents/chat-message.mjs
index 8b7f346..4e7c1ca 100644
--- a/src/module/documents/chat-message.mjs
+++ b/src/module/documents/chat-message.mjs
@@ -75,9 +75,9 @@ export class GrimwildChatMessage extends ChatMessage {
// Handle event listeners.
const click = this.#onClick.bind(this);
const sparkTakenArray = this.getFlag("grimwild", "sparkTaken") ?? [];
- const damageTakenArray = this.getFlag("grimwild", "damageTaken") ?? [];
+ // const damageTakenArray = this.getFlag("grimwild", "damageTaken") ?? [];
const sparkTaken = sparkTakenArray.includes(game.user.id);
- const damageTaken = damageTakenArray.includes(game.user.id);
+ // const damageTaken = damageTakenArray.includes(game.user.id);
html.querySelectorAll("[data-action]")?.forEach((element) => {
const { action } = element.dataset;
if (action === "updateSpark") {
@@ -87,10 +87,10 @@ export class GrimwildChatMessage extends ChatMessage {
}
}
else if (["applyMark", "applyHarm"].includes(action)) {
- if (damageTaken) {
- element.setAttribute("disabled", true);
- return;
- }
+ // if (damageTaken) {
+ // element.setAttribute("disabled", true);
+ // return;
+ // }
}
element.addEventListener("click", click);
});
@@ -256,7 +256,8 @@ export class GrimwildChatMessage extends ChatMessage {
if (!actor.system[harm === "bloodied" ? "isBloodied" : "isRattled"]) {
update[`system.${harm}.marked`] = true;
if (harmPools) {
- update[`system.${harm}.pool.diceNum`] = 1;
+ const newHarmPool = Math.min(actor.system[harm].pool.diceNum + 1, maxHarm);
+ update[`system.${harm}.pool.diceNum`] = newHarmPool;
}
}
else if (!harmPools || actor.system[harm].pool.diceNum >= maxHarm) {
diff --git a/src/module/documents/combat.mjs b/src/module/documents/combat.mjs
index f4baf6c..ace32ac 100644
--- a/src/module/documents/combat.mjs
+++ b/src/module/documents/combat.mjs
@@ -48,7 +48,7 @@ export class GrimwildCombat extends foundry.documents.Combat {
resetActions() {
for (let combatant of this.combatants) {
combatant.setFlag("grimwild", "actionCount", 0);
- combatant.actor.update({"system.tokenActions.value": 2});
+ combatant.actor.update({ "system.tokenActions.value": 2 });
}
}
@@ -185,8 +185,8 @@ export class GrimwildCombatTracker extends foundry.applications.sidebar.tabs.Com
callback: (li) => {
const combatant = getCombatant(li);
if (combatant) {
- combatant?.setFlag("grimwild", "actionCount", 0)
- combatant?.actor.update({"system.tokenActions.value": 2});
+ combatant?.setFlag("grimwild", "actionCount", 0);
+ combatant?.actor.update({ "system.tokenActions.value": 2 });
}
}
}, {
diff --git a/src/module/grimwild.mjs b/src/module/grimwild.mjs
index 1c5578a..d70add3 100644
--- a/src/module/grimwild.mjs
+++ b/src/module/grimwild.mjs
@@ -325,7 +325,7 @@ Hooks.once("ready", function () {
if (event.target?.classList.contains("create-crucible")) {
event.preventDefault();
- const label = game.i18n.format("DOCUMENT.Create", {type: "Crucible Table"});
+ const label = game.i18n.format("DOCUMENT.Create", { type: "Crucible Table" });
try {
const crucibleName = await foundry.applications.api.DialogV2.prompt({
window: { title: label },
@@ -339,7 +339,7 @@ Hooks.once("ready", function () {
callback: (event, button, dialog) => button.form.elements.name.value
}
});
- const defaultData = Array.fromRange(36,1).map(result => {
+ const defaultData = Array.fromRange(36, 1).map((result) => {
return {
name: "",
range: [result, result],
@@ -358,9 +358,9 @@ Hooks.once("ready", function () {
}
});
}
- catch (error) {
+ catch(error) {
console.error(error);
- return;
+
}
}
});
@@ -383,7 +383,7 @@ Hooks.on("renderSceneControls", (application, html, data) => {
Hooks.on("renderDocumentDirectory", (application, html, data) => {
if (data.documentName === "RollTable") {
html.querySelector(".header-actions").insertAdjacentHTML("afterbegin", `
- ${game.i18n.format("DOCUMENT.Create", {type: "Crucible"})} ${game.i18n.format("DOCUMENT.Create", { type: "Crucible" })} For
+ truly wild surges, you can let it be completely random instead of
+ deciding as a group. Roll these all at once: [[/r 2d]]{2d story roll},
+ wild surge crucible below, and [[/r 2d8]]. The d8 determine a sorcery
+ path and sorcery technique. To
+ randomly select a target, roll an additional [[/r 2d]]. Assign numbers
+ to each PC and use remaining numbers for NPCs or the environment. On
+ doubles, it targets that thing as if a critical or disaster. On an
+ actual critical, it targets everything.
@CRUCIBLE[Compendium.grimwild.crucibles.RollTable.o9zE97tH5RUpn9GP]{Wild
+ Surge Crucible 1}
@CRUCIBLE[Compendium.grimwild.crucibles.RollTable.7IpCiKXDnmcjS7lf]{Wild
+ Surge Crucible 2}
+ video:
+ controls: true
+ volume: 0.5
+ src: null
+ category: null
+ ownership:
+ default: -1
+ UV77mtxQgW7KpS6B: 3
+ flags: {}
+ _stats:
+ compendiumSource: null
+ duplicateSource: null
+ exportSource: null
+ coreVersion: '13.351'
+ systemId: grimwild
+ systemVersion: 0.5.0
+ createdTime: 1768923372430
+ modifiedTime: 1768923452531
+ lastModifiedBy: UV77mtxQgW7KpS6B
+ _key: '!journal.pages!T61vQHWAc1MN4LDB.1XlO2O0wK4WGzkld'
+categories: []
+sort: 0
+ownership:
+ default: 0
+ UV77mtxQgW7KpS6B: 3
+flags: {}
+_stats:
+ compendiumSource: null
+ duplicateSource: null
+ exportSource: null
+ coreVersion: '13.351'
+ systemId: grimwild
+ systemVersion: 0.5.0
+ createdTime: 1768923364487
+ modifiedTime: 1768923364487
+ lastModifiedBy: UV77mtxQgW7KpS6B
+_key: '!journal!T61vQHWAc1MN4LDB'
diff --git a/src/packs/talents/Maelstrom_FoCmkVYg9QUQYXg5.yml b/src/packs/talents/Maelstrom_FoCmkVYg9QUQYXg5.yml
index a7c7e74..58f4313 100644
--- a/src/packs/talents/Maelstrom_FoCmkVYg9QUQYXg5.yml
+++ b/src/packs/talents/Maelstrom_FoCmkVYg9QUQYXg5.yml
@@ -7,7 +7,9 @@ system:
description: >-
You open yourself fully to the maelstrom of raw magic. When you cast a
potent spell
+ These 4s also count as 1s towards
+ @UUID[Compendium.grimwild.rules.JournalEntry.T61vQHWAc1MN4LDB]{wild
+ surge}.
core: false
notes:
description: ''
@@ -23,11 +25,11 @@ flags: {}
_stats:
compendiumSource: null
duplicateSource: null
- coreVersion: '13.345'
+ coreVersion: '13.351'
systemId: grimwild
- systemVersion: 0.1.0
+ systemVersion: 0.5.0
createdTime: 1739139357959
- modifiedTime: 1739139357959
- lastModifiedBy: Dl5Tvf37OuEHwdAh
+ modifiedTime: 1768923550235
+ lastModifiedBy: UV77mtxQgW7KpS6B
exportSource: null
_key: '!items!FoCmkVYg9QUQYXg5'
diff --git a/src/packs/talents/Sorcery_MnncHMBYzPHIQJWG.yml b/src/packs/talents/Sorcery_MnncHMBYzPHIQJWG.yml
index ff20eb7..d787130 100644
--- a/src/packs/talents/Sorcery_MnncHMBYzPHIQJWG.yml
+++ b/src/packs/talents/Sorcery_MnncHMBYzPHIQJWG.yml
@@ -16,10 +16,12 @@ system:
technique as touch- stones. You can push yourself to cast a
potent spell When casting, rolling two or more 1s (including thorns) triggers a
- secondary wild surge —raw magic spirals out of your control.
- Make a 2d story roll @UUID[Compendium.grimwild.rules.JournalEntry.T61vQHWAc1MN4LDB]{wild
+ surge} —raw magic spirals out of your control. Make a
+ [[/r 2d]]{2d story roll}
GROWTH : Every 2 levels, gain a new technique or magic
@@ -41,9 +43,9 @@ _stats:
duplicateSource: null
coreVersion: '13.351'
systemId: grimwild
- systemVersion: 0.4.0
+ systemVersion: 0.5.0
createdTime: 1739139357959
- modifiedTime: 1768769887601
+ modifiedTime: 1768923519685
lastModifiedBy: UV77mtxQgW7KpS6B
exportSource: null
_key: '!items!MnncHMBYzPHIQJWG'
diff --git a/src/packs/talents/Spelleater_w989kCy4tafGs3ys.yml b/src/packs/talents/Spelleater_w989kCy4tafGs3ys.yml
index 6d454b8..c5c663d 100644
--- a/src/packs/talents/Spelleater_w989kCy4tafGs3ys.yml
+++ b/src/packs/talents/Spelleater_w989kCy4tafGs3ys.yml
@@ -9,7 +9,9 @@ system:
pool. When you suffer from magic, roll the pool. If dice remain, ignore the
effect and bank essence (max 2). You can spend
essence wild surge
+ 1, but it triggers
+ @UUID[Compendium.grimwild.rules.JournalEntry.T61vQHWAc1MN4LDB]{wild
+ surge} {{stat}}
+ {{#if stat}}{{localize (concat "GRIMWILD.Stat." stat ".long")}} {{/if}}
- {{#if hasActions}}
{{#if isFail }}
@@ -47,12 +46,12 @@
{{/if}}
- {{#if (eq result "disaster")}}
-
+
- {{/if}}
- {{/if}}
{{/unless}}
\ No newline at end of file