cosmo/daggerheart
1
0
Fork 0
mirror of https://github.com/Foundryborne/daggerheart.git synced 2026-01-17 23:49:02 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Temp solution for specific weapon feature

Browse source
This commit is contained in:
Dapoolp 2025-08-09 03:25:03 +02:00
parent 85982bac8c
commit bf74596389
15 changed files with 158 additions and 94 deletions
Download patch file Download diff file Expand all files Collapse all files

3
module/applications/dialogs/damageDialog.mjs
View file

@ -56,12 +56,15 @@ export default class DamageDialog extends HandlebarsApplicationMixin(Application
label, label,
icon icon
})); }));
context.modifiers = this.config.modifiers;
return context; return context;
} }
static updateRollConfiguration(_event, _, formData) { static updateRollConfiguration(_event, _, formData) {
const { ...rest } = foundry.utils.expandObject(formData.object); const { ...rest } = foundry.utils.expandObject(formData.object);
foundry.utils.mergeObject(this.config.roll, rest.roll); foundry.utils.mergeObject(this.config.roll, rest.roll);
foundry.utils.mergeObject(this.config.modifiers, rest.modifiers);
console.log(rest)
this.config.selectedRollMode = rest.selectedRollMode; this.config.selectedRollMode = rest.selectedRollMode;
this.render(); this.render();

60
module/config/itemConfig.mjs
View file

@ -1041,16 +1041,16 @@ export const weaponFeatures = {
mode: 2, mode: 2,
value: '-1' value: '-1'
}, },
{ // {
key: 'system.bonuses.damage.primaryWeapon.extraDice', // key: 'system.bonuses.damage.primaryWeapon.extraDice',
mode: 2, // mode: 2,
value: '1' // value: '1'
}, // },
{ // {
key: 'system.rules.weapon.dropLowestDamageDice', // key: 'system.rules.weapon.dropLowestDamageDice',
mode: 5, // mode: 5,
value: '1' // value: '1'
} // }
] ]
} }
] ]
@ -1167,16 +1167,16 @@ export const weaponFeatures = {
description: 'DAGGERHEART.CONFIG.WeaponFeature.powerful.effects.powerful.description', description: 'DAGGERHEART.CONFIG.WeaponFeature.powerful.effects.powerful.description',
img: 'icons/magic/control/buff-flight-wings-runes-red-yellow.webp', img: 'icons/magic/control/buff-flight-wings-runes-red-yellow.webp',
changes: [ changes: [
{ // {
key: 'system.bonuses.damage.primaryWeapon.extraDice', // key: 'system.bonuses.damage.primaryWeapon.extraDice',
mode: 2, // mode: 2,
value: '1' // value: '1'
}, // },
{ // {
key: 'system.rules.weapon.dropLowestDamageDice', // key: 'system.rules.weapon.dropLowestDamageDice',
mode: 5, // mode: 5,
value: '1' // value: '1'
} // }
] ]
} }
] ]
@ -1302,11 +1302,11 @@ export const weaponFeatures = {
description: 'DAGGERHEART.CONFIG.WeaponFeature.selfCorrecting.effects.selfCorrecting.description', description: 'DAGGERHEART.CONFIG.WeaponFeature.selfCorrecting.effects.selfCorrecting.description',
img: 'icons/weapons/ammunition/arrow-broadhead-glowing-orange.webp', img: 'icons/weapons/ammunition/arrow-broadhead-glowing-orange.webp',
changes: [ changes: [
{ // {
key: 'system.rules.damage.flipMinDiceValue', // key: 'system.rules.damage.flipMinDiceValue',
mode: 5, // mode: 5,
value: 1 // value: 1
} // }
] ]
} }
] ]
@ -1320,11 +1320,11 @@ export const weaponFeatures = {
description: 'DAGGERHEART.CONFIG.WeaponFeature.serrated.effects.serrated.description', description: 'DAGGERHEART.CONFIG.WeaponFeature.serrated.effects.serrated.description',
img: 'icons/weapons/ammunition/arrow-broadhead-glowing-orange.webp', img: 'icons/weapons/ammunition/arrow-broadhead-glowing-orange.webp',
changes: [ changes: [
{ // {
key: 'system.rules.damage.flipMinDiceValue', // key: 'system.rules.damage.flipMinDiceValue',
mode: 5, // mode: 5,
value: 1 // value: 1
} // }
] ]
} }
] ]

24
module/data/actor/character.mjs
View file

@ -287,18 +287,18 @@ export default class DhCharacter extends BaseDataActor {
}) })
}) })
}), }),
weapon: new fields.SchemaField({ // weapon: new fields.SchemaField({
/* Unimplemented // /* Unimplemented
-> Should remove the lowest damage dice from weapon damage // -> 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. // -> Reflect this in the chat message somehow so players get feedback that their choice is helping them.
*/ // */
dropLowestDamageDice: new fields.BooleanField({ initial: false }), // dropLowestDamageDice: new fields.BooleanField({ initial: false }),
/* Unimplemented // /* Unimplemented
-> Should flip any lowest possible dice rolls for weapon damage to highest // -> 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. // -> Reflect this in the chat message somehow so players get feedback that their choice is helping them.
*/ // */
flipMinDiceValue: new fields.BooleanField({ intial: false }) // flipMinDiceValue: new fields.BooleanField({ intial: false })
}), // }),
runeWard: new fields.BooleanField({ initial: false }), runeWard: new fields.BooleanField({ initial: false }),
burden: new fields.SchemaField({ burden: new fields.SchemaField({
ignore: new fields.BooleanField() ignore: new fields.BooleanField()

76
module/dice/damageRoll.mjs
View file

@ -102,14 +102,14 @@ export default class DamageRoll extends DHRoll {
} }
constructFormula(config) { constructFormula(config) {
this.options.roll.forEach(part => { this.options.roll.forEach((part, index) => {
part.roll = new Roll(Roll.replaceFormulaData(part.formula, config.data)); part.roll = new Roll(Roll.replaceFormulaData(part.formula, config.data));
this.constructFormulaPart(config, part); this.constructFormulaPart(config, part, index);
}); });
return this.options.roll; return this.options.roll;
} }
constructFormulaPart(config, part) { constructFormulaPart(config, part, index) {
part.roll.terms = Roll.parse(part.roll.formula, config.data); part.roll.terms = Roll.parse(part.roll.formula, config.data);
if (part.applyTo === CONFIG.DH.GENERAL.healingTypes.hitPoints.id) { 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 && config.modifiers.rally?.value) {
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.constructor.parse(`1${rallyFaces}`)
);
}
if (part.extraFormula) { if (part.extraFormula) {
part.roll.terms.push( part.roll.terms.push(
new foundry.dice.terms.OperatorTerm({ operator: '+' }), new foundry.dice.terms.OperatorTerm({ operator: '+' }),
@ -132,6 +141,67 @@ export default class DamageRoll extends DHRoll {
criticalBonus = tmpRoll.total - this.constructor.calculateTotalModifiers(tmpRoll); criticalBonus = tmpRoll.total - this.constructor.calculateTotalModifiers(tmpRoll);
part.roll.terms.push(...this.formatModifier(criticalBonus)); part.roll.terms.push(...this.formatModifier(criticalBonus));
} }
/* To Remove When Reaction System */
if(index === 0 && part.applyTo === CONFIG.DH.GENERAL.healingTypes.hitPoints.id) {
if(config.modifiers.massive?.enabled) config.modifiers.massive.callback(part);
if(config.modifiers.powerful?.enabled) config.modifiers.powerful.callback(part);
}
return (part.roll._formula = this.constructor.getFormula(part.roll.terms)); 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) {
const effects = 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,
callback: (...args) => {
}
};
}
const item = config.data.parent.items?.get(config.source.item);
if(item) {
// Massive (Weapon Feature)
if(item.effects.has("cffkpiwGpEGhjiUC"))
mods.massive = {
label: item.effects.get("cffkpiwGpEGhjiUC").name,
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.effects.has("DCie5eR1dZH2Qvln"))
mods.powerful = {
label: item.effects.get("DCie5eR1dZH2Qvln").name,
enabled: true,
callback: (part) => {
part.roll.terms[0].modifiers.push(`kh${part.roll.terms[0].number}`);
part.roll.terms[0].number += 1;
}
};
}
}
config.modifiers = mods;
console.log(config)
return mods;
}
} }

7
module/dice/dhRoll.mjs
View file

@ -36,6 +36,8 @@ export default class DHRoll extends Roll {
this.applyKeybindings(config); this.applyKeybindings(config);
this.temporaryModifierBuilder(config);
let roll = new this(config.roll.formula, config.data, config); let roll = new this(config.roll.formula, config.data, config);
if (config.dialog.configure !== false) { if (config.dialog.configure !== false) {
// Open Roll Dialog // Open Roll Dialog
@ -207,6 +209,11 @@ export default class DHRoll extends Roll {
} }
return modifierTotal; return modifierTotal;
} }
static temporaryModifierBuilder(config) {
const mods = new Map();
return mods;
}
} }
export const registerRollDiceHooks = () => { export const registerRollDiceHooks = () => {

2
module/dice/dualityRoll.mjs
View file

@ -149,7 +149,7 @@ export default class DualityRoll extends D20Roll {
} }
if (this.rallyFaces) if (this.rallyFaces)
this.terms.push( 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 }) new foundry.dice.terms.Die({ faces: this.rallyFaces })
); );
} }

2
src/packs/items/weapons/weapon_Advanced_Longsword_9xkB3MWXahrsVP4N.json
View file

@ -43,7 +43,7 @@
"parts": [ "parts": [
{ {
"value": { "value": {
"dice": "d8", "dice": "d10",
"bonus": 9, "bonus": 9,
"multiplier": "prof", "multiplier": "prof",
"flatMultiplier": 1, "flatMultiplier": 1,

14
src/packs/items/weapons/weapon_Advanced_Spear_pK6dsNABKKp1CIGN.json
View file

@ -12,15 +12,7 @@
"equipped": false, "equipped": false,
"secondary": false, "secondary": false,
"burden": "twoHanded", "burden": "twoHanded",
"weaponFeatures": [ "weaponFeatures": [],
{
"value": "cumbersome",
"effectIds": [
"hl0S2LrBY5Mg69q6"
],
"actionIds": []
}
],
"attack": { "attack": {
"name": "Attack", "name": "Attack",
"img": "icons/skills/melee/blood-slash-foam-red.webp", "img": "icons/skills/melee/blood-slash-foam-red.webp",
@ -51,8 +43,8 @@
"parts": [ "parts": [
{ {
"value": { "value": {
"dice": "d10", "dice": "d8",
"bonus": 8, "bonus": 9,
"multiplier": "prof", "multiplier": "prof",
"flatMultiplier": 1, "flatMultiplier": 1,
"custom": { "custom": {

2
src/packs/items/weapons/weapon_Improved_Longsword_QyBZ5NxM8F9nCL9s.json
View file

@ -43,7 +43,7 @@
"parts": [ "parts": [
{ {
"value": { "value": {
"dice": "d8", "dice": "d10",
"bonus": 6, "bonus": 6,
"multiplier": "prof", "multiplier": "prof",
"flatMultiplier": 1, "flatMultiplier": 1,

14
src/packs/items/weapons/weapon_Improved_Spear_j5Pt1thLfcvopBij.json
View file

@ -12,15 +12,7 @@
"equipped": false, "equipped": false,
"secondary": false, "secondary": false,
"burden": "twoHanded", "burden": "twoHanded",
"weaponFeatures": [ "weaponFeatures": [],
{
"value": "cumbersome",
"effectIds": [
"8twXPJELZpvFWA5K"
],
"actionIds": []
}
],
"attack": { "attack": {
"name": "Attack", "name": "Attack",
"img": "icons/skills/melee/blood-slash-foam-red.webp", "img": "icons/skills/melee/blood-slash-foam-red.webp",
@ -51,8 +43,8 @@
"parts": [ "parts": [
{ {
"value": { "value": {
"dice": "d10", "dice": "d8",
"bonus": 5, "bonus": 6,
"multiplier": "prof", "multiplier": "prof",
"flatMultiplier": 1, "flatMultiplier": 1,
"custom": { "custom": {

2
src/packs/items/weapons/weapon_Legendary_Longsword_14abPqQcROJfDChR.json
View file

@ -43,7 +43,7 @@
"parts": [ "parts": [
{ {
"value": { "value": {
"dice": "d8", "dice": "d10",
"bonus": 12, "bonus": 12,
"multiplier": "prof", "multiplier": "prof",
"flatMultiplier": 1, "flatMultiplier": 1,

14
src/packs/items/weapons/weapon_Legendary_Spear_4e5pWxi2qohuGsWh.json
View file

@ -12,15 +12,7 @@
"equipped": false, "equipped": false,
"secondary": false, "secondary": false,
"burden": "twoHanded", "burden": "twoHanded",
"weaponFeatures": [ "weaponFeatures": [],
{
"value": "cumbersome",
"effectIds": [
"f44KWDgCQeKYfccr"
],
"actionIds": []
}
],
"attack": { "attack": {
"name": "Attack", "name": "Attack",
"img": "icons/skills/melee/blood-slash-foam-red.webp", "img": "icons/skills/melee/blood-slash-foam-red.webp",
@ -51,8 +43,8 @@
"parts": [ "parts": [
{ {
"value": { "value": {
"dice": "d10", "dice": "d8",
"bonus": 11, "bonus": 12,
"multiplier": "prof", "multiplier": "prof",
"flatMultiplier": 1, "flatMultiplier": 1,
"custom": { "custom": {

2
src/packs/items/weapons/weapon_Longsword_Iv8BZM1R24QMT72M.json
View file

@ -43,7 +43,7 @@
"parts": [ "parts": [
{ {
"value": { "value": {
"dice": "d8", "dice": "d10",
"bonus": 3, "bonus": 3,
"multiplier": "prof", "multiplier": "prof",
"flatMultiplier": 1, "flatMultiplier": 1,

14
src/packs/items/weapons/weapon_Spear_TF85tKJetUjLwh54.json
View file

@ -12,15 +12,7 @@
"equipped": false, "equipped": false,
"secondary": false, "secondary": false,
"burden": "twoHanded", "burden": "twoHanded",
"weaponFeatures": [ "weaponFeatures": [],
{
"value": "cumbersome",
"effectIds": [
"Z5MnVI8EOOgzRdXC"
],
"actionIds": []
}
],
"attack": { "attack": {
"name": "Attack", "name": "Attack",
"img": "icons/skills/melee/blood-slash-foam-red.webp", "img": "icons/skills/melee/blood-slash-foam-red.webp",
@ -51,8 +43,8 @@
"parts": [ "parts": [
{ {
"value": { "value": {
"dice": "d10", "dice": "d8",
"bonus": 2, "bonus": 3,
"multiplier": "prof", "multiplier": "prof",
"flatMultiplier": 1, "flatMultiplier": 1,
"custom": { "custom": {

16
templates/dialogs/dice-roll/damageSelection.hbs
View file

@ -24,6 +24,22 @@
<input type="text" value="{{extraFormula}}" name="roll.{{ @index }}.extraFormula" placeholder="Situational Bonus"> <input type="text" value="{{extraFormula}}" name="roll.{{ @index }}.extraFormula" placeholder="Situational Bonus">
</div> </div>
{{/each}} {{/each}}
{{#if @root.modifiers}}
<fieldset class="modifier-container two-columns">
<legend>{{localize "DAGGERHEART.GENERAL.Modifier.plural"}}</legend>
{{#each @root.modifiers}}
<span class="formula-label">{{ localize label }}</span>
{{#if (hasProperty this "values")}}
<select name="modifiers.{{@key}}.value">
{{selectOptions values blank="" selected=value}}
</select>
{{/if}}
{{#if (hasProperty this "enabled")}}
<input type="checkbox" name="modifiers.{{@key}}.enabled" {{ checked enabled }}>
{{/if}}
{{/each}}
</fieldset>
{{/if}}
<div class="damage-section-controls"> <div class="damage-section-controls">
{{#if directDamage}} {{#if directDamage}}
<select class="roll-mode-select" name="selectedRollMode"> <select class="roll-mode-select" name="selectedRollMode">