diff --git a/module/applications/dialogs/damageDialog.mjs b/module/applications/dialogs/damageDialog.mjs
index 2d372725..fbc584e4 100644
--- a/module/applications/dialogs/damageDialog.mjs
+++ b/module/applications/dialogs/damageDialog.mjs
@@ -56,12 +56,14 @@ export default class DamageDialog extends HandlebarsApplicationMixin(Application
label,
icon
}));
+ context.modifiers = this.config.modifiers;
return context;
}
static updateRollConfiguration(_event, _, formData) {
const { ...rest } = foundry.utils.expandObject(formData.object);
foundry.utils.mergeObject(this.config.roll, rest.roll);
+ foundry.utils.mergeObject(this.config.modifiers, rest.modifiers);
this.config.selectedRollMode = rest.selectedRollMode;
this.render();
diff --git a/module/applications/sheets/api/application-mixin.mjs b/module/applications/sheets/api/application-mixin.mjs
index 7f646460..f35ebb9f 100644
--- a/module/applications/sheets/api/application-mixin.mjs
+++ b/module/applications/sheets/api/application-mixin.mjs
@@ -333,7 +333,7 @@ export default function DHApplicationMixin(Base) {
}
];
- if (usable)
+ if (usable) {
options.unshift({
name: 'DAGGERHEART.GENERAL.damage',
icon: 'fa-solid fa-explosion',
@@ -353,24 +353,11 @@ export default function DHApplicationMixin(Base) {
icon: 'fa-solid fa-burst',
condition: target => {
const doc = getDocFromElementSync(target);
- return doc?.system?.attack?.damage.parts.length || doc?.damage?.parts.length;
+ return doc && !(doc.type === 'domainCard' && doc.system.inVault);
},
- callback: async (target, event) => {
- const doc = await getDocFromElement(target),
- action = doc?.system?.attack ?? doc;
- return action && action.use(event, { byPassRoll: true });
- }
+ callback: async (target, event) => (await getDocFromElement(target)).use(event)
});
-
- options.unshift({
- name: 'DAGGERHEART.APPLICATIONS.ContextMenu.useItem',
- icon: 'fa-solid fa-burst',
- condition: target => {
- const doc = getDocFromElementSync(target);
- return doc && !(doc.type === 'domainCard' && doc.system.inVault);
- },
- callback: async (target, event) => (await getDocFromElement(target)).use(event)
- });
+ }
if (toChat)
options.push({
diff --git a/module/config/itemConfig.mjs b/module/config/itemConfig.mjs
index e9d8de4c..296dc927 100644
--- a/module/config/itemConfig.mjs
+++ b/module/config/itemConfig.mjs
@@ -1040,16 +1040,6 @@ export const weaponFeatures = {
key: 'system.evasion',
mode: 2,
value: '-1'
- },
- {
- key: 'system.bonuses.damage.primaryWeapon.extraDice',
- mode: 2,
- value: '1'
- },
- {
- key: 'system.rules.weapon.dropLowestDamageDice',
- mode: 5,
- value: '1'
}
]
}
@@ -1166,18 +1156,7 @@ export const weaponFeatures = {
name: 'DAGGERHEART.CONFIG.WeaponFeature.powerful.effects.powerful.name',
description: 'DAGGERHEART.CONFIG.WeaponFeature.powerful.effects.powerful.description',
img: 'icons/magic/control/buff-flight-wings-runes-red-yellow.webp',
- changes: [
- {
- key: 'system.bonuses.damage.primaryWeapon.extraDice',
- mode: 2,
- value: '1'
- },
- {
- key: 'system.rules.weapon.dropLowestDamageDice',
- mode: 5,
- value: '1'
- }
- ]
+ changes: []
}
]
},
@@ -1301,13 +1280,7 @@ export const weaponFeatures = {
name: 'DAGGERHEART.CONFIG.WeaponFeature.selfCorrecting.effects.selfCorrecting.name',
description: 'DAGGERHEART.CONFIG.WeaponFeature.selfCorrecting.effects.selfCorrecting.description',
img: 'icons/weapons/ammunition/arrow-broadhead-glowing-orange.webp',
- changes: [
- {
- key: 'system.rules.damage.flipMinDiceValue',
- mode: 5,
- value: 1
- }
- ]
+ changes: []
}
]
},
@@ -1319,13 +1292,7 @@ export const weaponFeatures = {
name: 'DAGGERHEART.CONFIG.WeaponFeature.serrated.effects.serrated.name',
description: 'DAGGERHEART.CONFIG.WeaponFeature.serrated.effects.serrated.description',
img: 'icons/weapons/ammunition/arrow-broadhead-glowing-orange.webp',
- changes: [
- {
- key: 'system.rules.damage.flipMinDiceValue',
- mode: 5,
- value: 1
- }
- ]
+ changes: []
}
]
},
diff --git a/module/data/actor/character.mjs b/module/data/actor/character.mjs
index d4544d2c..c40e7e5d 100644
--- a/module/data/actor/character.mjs
+++ b/module/data/actor/character.mjs
@@ -287,18 +287,6 @@ export default class DhCharacter extends BaseDataActor {
})
})
}),
- weapon: new fields.SchemaField({
- /* Unimplemented
- -> Should remove the lowest damage dice from weapon damage
- -> Reflect this in the chat message somehow so players get feedback that their choice is helping them.
- */
- dropLowestDamageDice: new fields.BooleanField({ initial: false }),
- /* Unimplemented
- -> Should flip any lowest possible dice rolls for weapon damage to highest
- -> Reflect this in the chat message somehow so players get feedback that their choice is helping them.
- */
- flipMinDiceValue: new fields.BooleanField({ intial: false })
- }),
runeWard: new fields.BooleanField({ initial: false }),
burden: new fields.SchemaField({
ignore: new fields.BooleanField()
diff --git a/module/dice/damageRoll.mjs b/module/dice/damageRoll.mjs
index 31458516..34973108 100644
--- a/module/dice/damageRoll.mjs
+++ b/module/dice/damageRoll.mjs
@@ -102,14 +102,14 @@ export default class DamageRoll extends DHRoll {
}
constructFormula(config) {
- this.options.roll.forEach(part => {
+ this.options.roll.forEach((part, index) => {
part.roll = new Roll(Roll.replaceFormulaData(part.formula, config.data));
- this.constructFormulaPart(config, part);
+ this.constructFormulaPart(config, part, index);
});
return this.options.roll;
}
- constructFormulaPart(config, part) {
+ constructFormulaPart(config, part, index) {
part.roll.terms = Roll.parse(part.roll.formula, config.data);
if (part.applyTo === CONFIG.DH.GENERAL.healingTypes.hitPoints.id) {
@@ -120,6 +120,15 @@ export default class DamageRoll extends DHRoll {
});
}
+ /* To Remove When Reaction System */
+ if(index === 0 && part.applyTo === CONFIG.DH.GENERAL.healingTypes.hitPoints.id) {
+ for(const mod in config.modifiers) {
+ const modifier = config.modifiers[mod];
+ if(modifier.beforeCrit === true && (modifier.enabled || modifier.value))
+ modifier.callback(part);
+ }
+ }
+
if (part.extraFormula) {
part.roll.terms.push(
new foundry.dice.terms.OperatorTerm({ operator: '+' }),
@@ -132,6 +141,102 @@ export default class DamageRoll extends DHRoll {
criticalBonus = tmpRoll.total - this.constructor.calculateTotalModifiers(tmpRoll);
part.roll.terms.push(...this.formatModifier(criticalBonus));
}
+
+ /* To Remove When Reaction System */
+ if(index === 0 && part.applyTo === CONFIG.DH.GENERAL.healingTypes.hitPoints.id) {
+ for(const mod in config.modifiers) {
+ const modifier = config.modifiers[mod];
+ if(!modifier.beforeCrit && (modifier.enabled || modifier.value))
+ modifier.callback(part);
+ }
+ }
+
return (part.roll._formula = this.constructor.getFormula(part.roll.terms));
}
+
+ /* To Remove When Reaction System */
+ static temporaryModifierBuilder(config) {
+ const mods = {};
+ if(config.data?.parent) {
+ if(config.data.parent.appliedEffects) {
+ // Bardic Rally
+ mods.rally = {
+ label: "DAGGERHEART.CLASS.Feature.rallyDice",
+ values: config.data?.parent?.appliedEffects.reduce((a, c) => {
+ const change = c.changes.find(ch => ch.key === 'system.bonuses.rally');
+ if (change) a.push({ value: c.id, label: change.value });
+ return a;
+ }, []),
+ value: null,
+ beforeCrit: true,
+ callback: (part) => {
+ const rallyFaces = config.modifiers.rally.values.find(r => r.value === config.modifiers.rally.value)?.label;
+ part.roll.terms.push(
+ new foundry.dice.terms.OperatorTerm({ operator: '+' }),
+ ...this.parse(`1${rallyFaces}`)
+ );
+ }
+ };
+ }
+
+ const item = config.data.parent.items?.get(config.source.item);
+ if(item) {
+ // Massive (Weapon Feature)
+ if(item.system.itemFeatures.find(f => f.value === "massive"))
+ mods.massive = {
+ label: CONFIG.DH.ITEM.weaponFeatures.massive.label,
+ enabled: true,
+ callback: (part) => {
+ part.roll.terms[0].modifiers.push(`kh${part.roll.terms[0].number}`);
+ part.roll.terms[0].number += 1;
+ }
+ };
+
+ // Powerful (Weapon Feature)
+ if(item.system.itemFeatures.find(f => f.value === "powerful"))
+ mods.powerful = {
+ label: CONFIG.DH.ITEM.weaponFeatures.powerful.label,
+ enabled: true,
+ callback: (part) => {
+ part.roll.terms[0].modifiers.push(`kh${part.roll.terms[0].number}`);
+ part.roll.terms[0].number += 1;
+ }
+ };
+
+ // Brutal (Weapon Feature)
+ if(item.system.itemFeatures.find(f => f.value === "brutal"))
+ mods.brutal = {
+ label: CONFIG.DH.ITEM.weaponFeatures.brutal.label,
+ enabled: true,
+ beforeCrit: true,
+ callback: (part) => {
+ part.roll.terms[0].modifiers.push(`x${part.roll.terms[0].faces}`);
+ }
+ };
+
+ // Serrated (Weapon Feature)
+ if(item.system.itemFeatures.find(f => f.value === "serrated"))
+ mods.serrated = {
+ label: CONFIG.DH.ITEM.weaponFeatures.serrated.label,
+ enabled: true,
+ callback: (part) => {
+ part.roll.terms[0].modifiers.push(`sc8`);
+ }
+ };
+
+ // Self-Correcting (Weapon Feature)
+ if(item.system.itemFeatures.find(f => f.value === "selfCorrecting"))
+ mods.selfCorrecting = {
+ label: CONFIG.DH.ITEM.weaponFeatures.selfCorrecting.label,
+ enabled: true,
+ callback: (part) => {
+ part.roll.terms[0].modifiers.push(`sc6`);
+ }
+ };
+ }
+ }
+
+ config.modifiers = mods;
+ return mods;
+ }
}
diff --git a/module/dice/dhRoll.mjs b/module/dice/dhRoll.mjs
index 889b24b3..a785e508 100644
--- a/module/dice/dhRoll.mjs
+++ b/module/dice/dhRoll.mjs
@@ -36,6 +36,8 @@ export default class DHRoll extends Roll {
this.applyKeybindings(config);
+ this.temporaryModifierBuilder(config);
+
let roll = new this(config.roll.formula, config.data, config);
if (config.dialog.configure !== false) {
// Open Roll Dialog
@@ -207,6 +209,10 @@ export default class DHRoll extends Roll {
}
return modifierTotal;
}
+
+ static temporaryModifierBuilder(config) {
+ return {};
+ }
}
export const registerRollDiceHooks = () => {
diff --git a/module/dice/dualityRoll.mjs b/module/dice/dualityRoll.mjs
index 030b4df2..35bae725 100644
--- a/module/dice/dualityRoll.mjs
+++ b/module/dice/dualityRoll.mjs
@@ -149,7 +149,7 @@ export default class DualityRoll extends D20Roll {
}
if (this.rallyFaces)
this.terms.push(
- new foundry.dice.terms.OperatorTerm({ operator: '+' }),
+ new foundry.dice.terms.OperatorTerm({ operator: this.hasDisadvantage ? '-' : '+' }),
new foundry.dice.terms.Die({ faces: this.rallyFaces })
);
}
diff --git a/module/helpers/utils.mjs b/module/helpers/utils.mjs
index 7b588fc7..f1483e31 100644
--- a/module/helpers/utils.mjs
+++ b/module/helpers/utils.mjs
@@ -172,6 +172,26 @@ Roll.replaceFormulaData = function (formula, data = {}, { missing, warn = false
return nativeReplaceFormulaData(formula, data, { missing, warn });
};
+foundry.dice.terms.Die.MODIFIERS.sc = "selfCorrecting";
+
+/**
+ * Return the configured value as result if 1 is rolled
+ * Example: 6d6sc6 Roll 6d6, each result of 1 will be changed into 6
+ * @param {string} modifier The matched modifier query
+ */
+foundry.dice.terms.Die.prototype.selfCorrecting = function(modifier) {
+ const rgx = /(?:sc)([0-9]+)/i;
+ const match = modifier.match(rgx);
+ if ( !match ) return false;
+ let [target] = match.slice(1);
+ target = parseInt(target);
+ for ( const r of this.results ) {
+ if ( r.result === 1 ) {
+ r.result = target;
+ }
+ }
+}
+
export const getDamageKey = damage => {
return ['none', 'minor', 'major', 'severe'][damage];
};
diff --git a/src/packs/items/weapons/weapon_Advanced_Longsword_9xkB3MWXahrsVP4N.json b/src/packs/items/weapons/weapon_Advanced_Longsword_9xkB3MWXahrsVP4N.json
index 79ce8416..8b44c759 100644
--- a/src/packs/items/weapons/weapon_Advanced_Longsword_9xkB3MWXahrsVP4N.json
+++ b/src/packs/items/weapons/weapon_Advanced_Longsword_9xkB3MWXahrsVP4N.json
@@ -43,7 +43,7 @@
"parts": [
{
"value": {
- "dice": "d8",
+ "dice": "d10",
"bonus": 9,
"multiplier": "prof",
"flatMultiplier": 1,
diff --git a/src/packs/items/weapons/weapon_Advanced_Spear_pK6dsNABKKp1CIGN.json b/src/packs/items/weapons/weapon_Advanced_Spear_pK6dsNABKKp1CIGN.json
index 433533e3..0bfb4a8f 100644
--- a/src/packs/items/weapons/weapon_Advanced_Spear_pK6dsNABKKp1CIGN.json
+++ b/src/packs/items/weapons/weapon_Advanced_Spear_pK6dsNABKKp1CIGN.json
@@ -12,15 +12,7 @@
"equipped": false,
"secondary": false,
"burden": "twoHanded",
- "weaponFeatures": [
- {
- "value": "cumbersome",
- "effectIds": [
- "hl0S2LrBY5Mg69q6"
- ],
- "actionIds": []
- }
- ],
+ "weaponFeatures": [],
"attack": {
"name": "Attack",
"img": "icons/skills/melee/blood-slash-foam-red.webp",
@@ -51,8 +43,8 @@
"parts": [
{
"value": {
- "dice": "d10",
- "bonus": 8,
+ "dice": "d8",
+ "bonus": 9,
"multiplier": "prof",
"flatMultiplier": 1,
"custom": {
diff --git a/src/packs/items/weapons/weapon_Improved_Longsword_QyBZ5NxM8F9nCL9s.json b/src/packs/items/weapons/weapon_Improved_Longsword_QyBZ5NxM8F9nCL9s.json
index 867a563f..b064b1c2 100644
--- a/src/packs/items/weapons/weapon_Improved_Longsword_QyBZ5NxM8F9nCL9s.json
+++ b/src/packs/items/weapons/weapon_Improved_Longsword_QyBZ5NxM8F9nCL9s.json
@@ -43,7 +43,7 @@
"parts": [
{
"value": {
- "dice": "d8",
+ "dice": "d10",
"bonus": 6,
"multiplier": "prof",
"flatMultiplier": 1,
diff --git a/src/packs/items/weapons/weapon_Improved_Spear_j5Pt1thLfcvopBij.json b/src/packs/items/weapons/weapon_Improved_Spear_j5Pt1thLfcvopBij.json
index beb295d6..367f80ad 100644
--- a/src/packs/items/weapons/weapon_Improved_Spear_j5Pt1thLfcvopBij.json
+++ b/src/packs/items/weapons/weapon_Improved_Spear_j5Pt1thLfcvopBij.json
@@ -12,15 +12,7 @@
"equipped": false,
"secondary": false,
"burden": "twoHanded",
- "weaponFeatures": [
- {
- "value": "cumbersome",
- "effectIds": [
- "8twXPJELZpvFWA5K"
- ],
- "actionIds": []
- }
- ],
+ "weaponFeatures": [],
"attack": {
"name": "Attack",
"img": "icons/skills/melee/blood-slash-foam-red.webp",
@@ -51,8 +43,8 @@
"parts": [
{
"value": {
- "dice": "d10",
- "bonus": 5,
+ "dice": "d8",
+ "bonus": 6,
"multiplier": "prof",
"flatMultiplier": 1,
"custom": {
diff --git a/src/packs/items/weapons/weapon_Legendary_Longsword_14abPqQcROJfDChR.json b/src/packs/items/weapons/weapon_Legendary_Longsword_14abPqQcROJfDChR.json
index 186cd1c1..636dd7a5 100644
--- a/src/packs/items/weapons/weapon_Legendary_Longsword_14abPqQcROJfDChR.json
+++ b/src/packs/items/weapons/weapon_Legendary_Longsword_14abPqQcROJfDChR.json
@@ -43,7 +43,7 @@
"parts": [
{
"value": {
- "dice": "d8",
+ "dice": "d10",
"bonus": 12,
"multiplier": "prof",
"flatMultiplier": 1,
diff --git a/src/packs/items/weapons/weapon_Legendary_Spear_4e5pWxi2qohuGsWh.json b/src/packs/items/weapons/weapon_Legendary_Spear_4e5pWxi2qohuGsWh.json
index c1322de0..bfdcd4eb 100644
--- a/src/packs/items/weapons/weapon_Legendary_Spear_4e5pWxi2qohuGsWh.json
+++ b/src/packs/items/weapons/weapon_Legendary_Spear_4e5pWxi2qohuGsWh.json
@@ -12,15 +12,7 @@
"equipped": false,
"secondary": false,
"burden": "twoHanded",
- "weaponFeatures": [
- {
- "value": "cumbersome",
- "effectIds": [
- "f44KWDgCQeKYfccr"
- ],
- "actionIds": []
- }
- ],
+ "weaponFeatures": [],
"attack": {
"name": "Attack",
"img": "icons/skills/melee/blood-slash-foam-red.webp",
@@ -51,8 +43,8 @@
"parts": [
{
"value": {
- "dice": "d10",
- "bonus": 11,
+ "dice": "d8",
+ "bonus": 12,
"multiplier": "prof",
"flatMultiplier": 1,
"custom": {
diff --git a/src/packs/items/weapons/weapon_Longsword_Iv8BZM1R24QMT72M.json b/src/packs/items/weapons/weapon_Longsword_Iv8BZM1R24QMT72M.json
index 54d18b78..c5d9070b 100644
--- a/src/packs/items/weapons/weapon_Longsword_Iv8BZM1R24QMT72M.json
+++ b/src/packs/items/weapons/weapon_Longsword_Iv8BZM1R24QMT72M.json
@@ -43,7 +43,7 @@
"parts": [
{
"value": {
- "dice": "d8",
+ "dice": "d10",
"bonus": 3,
"multiplier": "prof",
"flatMultiplier": 1,
diff --git a/src/packs/items/weapons/weapon_Spear_TF85tKJetUjLwh54.json b/src/packs/items/weapons/weapon_Spear_TF85tKJetUjLwh54.json
index 6aa8fe8c..77ba9a93 100644
--- a/src/packs/items/weapons/weapon_Spear_TF85tKJetUjLwh54.json
+++ b/src/packs/items/weapons/weapon_Spear_TF85tKJetUjLwh54.json
@@ -12,15 +12,7 @@
"equipped": false,
"secondary": false,
"burden": "twoHanded",
- "weaponFeatures": [
- {
- "value": "cumbersome",
- "effectIds": [
- "Z5MnVI8EOOgzRdXC"
- ],
- "actionIds": []
- }
- ],
+ "weaponFeatures": [],
"attack": {
"name": "Attack",
"img": "icons/skills/melee/blood-slash-foam-red.webp",
@@ -51,8 +43,8 @@
"parts": [
{
"value": {
- "dice": "d10",
- "bonus": 2,
+ "dice": "d8",
+ "bonus": 3,
"multiplier": "prof",
"flatMultiplier": 1,
"custom": {
diff --git a/styles/less/global/dialog.less b/styles/less/global/dialog.less
index aaa5c812..701d5025 100644
--- a/styles/less/global/dialog.less
+++ b/styles/less/global/dialog.less
@@ -53,7 +53,7 @@
font-weight: 500;
font-size: 14px;
line-height: 17px;
-
+ white-space: nowrap;
color: light-dark(@dark, @beige);
}
diff --git a/templates/dialogs/dice-roll/damageSelection.hbs b/templates/dialogs/dice-roll/damageSelection.hbs
index 2967b675..be49906b 100644
--- a/templates/dialogs/dice-roll/damageSelection.hbs
+++ b/templates/dialogs/dice-roll/damageSelection.hbs
@@ -24,6 +24,22 @@
{{/each}}
+ {{#if @root.modifiers}}
+
+ {{/if}}
{{#if directDamage}}