mirror of
https://github.com/Foundryborne/daggerheart.git
synced 2026-07-21 18:09:54 +02:00
Compare commits
3 commits
e2414b167a
...
27eb4a1430
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
27eb4a1430 | ||
|
|
2b9e21bd53 | ||
|
|
274b99d8c6 |
7 changed files with 16 additions and 12 deletions
|
|
@ -1326,6 +1326,11 @@
|
||||||
"short": "V. Far"
|
"short": "V. Far"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"ReloadChoices": {
|
||||||
|
"off": { "label": "Don't Use" },
|
||||||
|
"button": { "label": "Use button" },
|
||||||
|
"auto": { "label": "Automatic" }
|
||||||
|
},
|
||||||
"RollTypes": {
|
"RollTypes": {
|
||||||
"trait": {
|
"trait": {
|
||||||
"name": "Trait"
|
"name": "Trait"
|
||||||
|
|
|
||||||
|
|
@ -964,8 +964,9 @@ export default class CharacterSheet extends DHBaseActorSheet {
|
||||||
if (!item || !item.system.resource?.max)
|
if (!item || !item.system.resource?.max)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
await item.update({ 'system.resource.value':
|
await item.update({
|
||||||
item.system.needsReload ? itemAbleRollParse(item.system.resource.max, this.document, item) : 0
|
'system.resource.value': item.system.needsReload ?
|
||||||
|
itemAbleRollParse(item.system.resource.max, this.document, item) : 0
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -282,8 +282,6 @@ export default class DhpChatLog extends foundry.applications.sidebar.tabs.ChatLo
|
||||||
async onRollReloadCheck(_event, messageData) {
|
async onRollReloadCheck(_event, messageData) {
|
||||||
const message = game.messages.get(messageData._id);
|
const message = game.messages.get(messageData._id);
|
||||||
const needReload = await message.system.action.handleReload?.({ awaitRoll: true });
|
const needReload = await message.system.action.handleReload?.({ awaitRoll: true });
|
||||||
await message.update({
|
await message.update({ 'system.needsReload': needReload });
|
||||||
'system.needReload': needReload
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -63,14 +63,14 @@ export const actionAutomationChoices = {
|
||||||
export const reloadChoices = {
|
export const reloadChoices = {
|
||||||
off: {
|
off: {
|
||||||
id: 'off',
|
id: 'off',
|
||||||
label: 'Don\'t Use'
|
label: 'DAGGERHEART.CONFIG.ReloadChoices.off.label'
|
||||||
},
|
},
|
||||||
button: {
|
button: {
|
||||||
id: 'button',
|
id: 'button',
|
||||||
label: 'Use Button'
|
label: 'DAGGERHEART.CONFIG.ReloadChoices.button.label'
|
||||||
},
|
},
|
||||||
auto: {
|
auto: {
|
||||||
id: 'auto',
|
id: 'auto',
|
||||||
label: 'Automatic'
|
label: 'DAGGERHEART.CONFIG.ReloadChoices.auto.label'
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
@ -53,7 +53,7 @@ export default class DHAttackAction extends DHDamageAction {
|
||||||
|
|
||||||
async use(event, options) {
|
async use(event, options) {
|
||||||
if (this.item?.system.needsReload) {
|
if (this.item?.system.needsReload) {
|
||||||
return ui.notifications.error(game.i18n.format('DAGGERHEART.UI.Notifications.reloadRequired', { weapon: this.item.name }));
|
return ui.notifications.error(_loc('DAGGERHEART.UI.Notifications.reloadRequired', { weapon: this.item.name }));
|
||||||
}
|
}
|
||||||
|
|
||||||
const result = await super.use(event, options);
|
const result = await super.use(event, options);
|
||||||
|
|
|
||||||
|
|
@ -42,7 +42,7 @@ export default class DHActorRoll extends foundry.abstract.TypeDataModel {
|
||||||
hasEffect: new fields.BooleanField({ initial: false }),
|
hasEffect: new fields.BooleanField({ initial: false }),
|
||||||
hasSave: new fields.BooleanField({ initial: false }),
|
hasSave: new fields.BooleanField({ initial: false }),
|
||||||
hasTarget: new fields.BooleanField({ initial: false }),
|
hasTarget: new fields.BooleanField({ initial: false }),
|
||||||
needReload: new fields.BooleanField({ initial: false }),
|
needsReload: new fields.BooleanField({ initial: false }),
|
||||||
isDirect: new fields.BooleanField({ initial: false }),
|
isDirect: new fields.BooleanField({ initial: false }),
|
||||||
onSave: new fields.StringField(),
|
onSave: new fields.StringField(),
|
||||||
source: new fields.SchemaField({
|
source: new fields.SchemaField({
|
||||||
|
|
|
||||||
|
|
@ -2,9 +2,9 @@
|
||||||
<div class="roll-part-title"><span>{{title}}</span></div>
|
<div class="roll-part-title"><span>{{title}}</span></div>
|
||||||
|
|
||||||
{{#if (eq action.type 'attack')}}
|
{{#if (eq action.type 'attack')}}
|
||||||
{{#if needReload}}
|
{{#if needsReload}}
|
||||||
<div class="roll-reload-container">
|
<div class="roll-reload-container">
|
||||||
{{#if needReload}}
|
{{#if needsReload}}
|
||||||
<p class='reload-warning'>{{localize "DAGGERHEART.ACTIONS.Reload.reloadRequired"}}</p>
|
<p class='reload-warning'>{{localize "DAGGERHEART.ACTIONS.Reload.reloadRequired"}}</p>
|
||||||
{{/if}}
|
{{/if}}
|
||||||
</div>
|
</div>
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue