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

Restructured all the files

Browse source
This commit is contained in:
WBHarry 2025-07-04 17:54:18 +02:00
parent 099a4576da
commit ba3157a2fc
180 changed files with 722 additions and 1730 deletions
Download patch file Download diff file Expand all files Collapse all files

99
daggerheart.mjs
View file

@ -1,32 +1,25 @@
import { SYSTEM } from './module/config/system.mjs'; import { SYSTEM } from './module/applications/config/system.mjs';
import * as applications from './module/applications/_module.mjs'; import * as applications from './module/applications/_module.mjs';
import * as models from './module/data/_module.mjs'; import * as models from './module/data/_module.mjs';
import * as documents from './module/documents/_module.mjs'; import * as documents from './module/documents/_module.mjs';
import RegisterHandlebarsHelpers from './module/helpers/handlebarsHelper.mjs'; import RegisterHandlebarsHelpers from './module/helpers/handlebarsHelper.mjs';
import DhCombatTracker from './module/ui/combatTracker.mjs';
import { handleSocketEvent, registerSocketHooks } from './module/helpers/socket.mjs';
import { registerDHSettings } from './module/applications/settings.mjs';
import DhpChatLog from './module/ui/chatLog.mjs';
import DhpRuler from './module/ui/ruler.mjs';
import DhpTokenRuler from './module/ui/tokenRuler.mjs';
import { DhDualityRollEnricher, DhTemplateEnricher } from './module/enrichers/_module.mjs'; import { DhDualityRollEnricher, DhTemplateEnricher } from './module/enrichers/_module.mjs';
import { getCommandTarget, rollCommandToJSON, setDiceSoNiceForDualityRoll } from './module/helpers/utils.mjs'; import { getCommandTarget, rollCommandToJSON } from './module/helpers/utils.mjs';
import { abilities } from './module/config/actorConfig.mjs'; import { NarrativeCountdowns, registerCountdownApplicationHooks } from './module/applications/ui/countdowns.mjs';
import Resources from './module/applications/resources.mjs';
import { NarrativeCountdowns, registerCountdownApplicationHooks } from './module/applications/countdowns.mjs';
import DHDualityRoll from './module/data/chat-message/dualityRoll.mjs';
import { DualityRollColor } from './module/data/settings/Appearance.mjs'; import { DualityRollColor } from './module/data/settings/Appearance.mjs';
import { DHRoll, DualityRoll, D20Roll, DamageRoll, DualityDie } from './module/applications/roll.mjs'; import { DHRoll, DualityRoll, D20Roll, DamageRoll, DualityDie } from './module/documents/roll.mjs';
import { DhMeasuredTemplate } from './module/placeables/_module.mjs';
import { renderDualityButton } from './module/enrichers/DualityRollEnricher.mjs'; import { renderDualityButton } from './module/enrichers/DualityRollEnricher.mjs';
import { renderMeasuredTemplate } from './module/enrichers/TemplateEnricher.mjs'; import { renderMeasuredTemplate } from './module/enrichers/TemplateEnricher.mjs';
import { registerCountdownHooks } from './module/data/countdowns.mjs'; import { registerCountdownHooks } from './module/data/countdowns.mjs';
import {
globalThis.SYSTEM = SYSTEM; handlebarsRegistration,
settingsRegistration,
socketRegistration
} from './module/systemRegistration/_module.mjs';
import { DhPlaceables } from './module/canvas/_module.mjs';
Hooks.once('init', () => { Hooks.once('init', () => {
CONFIG.daggerheart = SYSTEM; CONFIG.DH = SYSTEM;
game.system.api = { game.system.api = {
applications, applications,
models, models,
@ -60,7 +53,7 @@ Hooks.once('init', () => {
}; };
CONFIG.Dice.rolls = [...CONFIG.Dice.rolls, ...[DHRoll, DualityRoll, D20Roll, DamageRoll]]; CONFIG.Dice.rolls = [...CONFIG.Dice.rolls, ...[DHRoll, DualityRoll, D20Roll, DamageRoll]];
CONFIG.MeasuredTemplate.objectClass = DhMeasuredTemplate; CONFIG.MeasuredTemplate.objectClass = DhPlaceables.DhMeasuredTemplate;
CONFIG.Item.documentClass = documents.DHItem; CONFIG.Item.documentClass = documents.DHItem;
@ -116,28 +109,27 @@ Hooks.once('init', () => {
}; };
CONFIG.ChatMessage.dataModels = models.messages.config; CONFIG.ChatMessage.dataModels = models.messages.config;
CONFIG.ChatMessage.documentClass = applications.DhpChatMessage; CONFIG.ChatMessage.documentClass = documents.DhChatMessage;
CONFIG.Canvas.rulerClass = DhpRuler; CONFIG.Canvas.rulerClass = DhPlaceables.DhRuler;
CONFIG.Combat.documentClass = documents.DhpCombat; CONFIG.Combat.documentClass = documents.DhpCombat;
CONFIG.ui.combat = DhCombatTracker; CONFIG.ui.combat = applications.ui.DhCombatTracker;
CONFIG.ui.chat = DhpChatLog; CONFIG.ui.chat = applications.ui.DhChatLog;
// CONFIG.ui.players = DhpPlayers; CONFIG.Token.rulerClass = DhPlaceables.DhTokenRuler;
CONFIG.Token.rulerClass = DhpTokenRuler;
CONFIG.ui.resources = Resources; CONFIG.ui.resources = applications.ui.DhFearTracker;
CONFIG.ux.ContextMenu = applications.DhContextMenu; CONFIG.ux.ContextMenu = applications.DhContextMenu;
CONFIG.ux.TooltipManager = applications.DhTooltipManager; CONFIG.ux.TooltipManager = documents.DhTooltipManager;
game.socket.on(`system.${SYSTEM.id}`, handleSocketEvent); game.socket.on(`system.${SYSTEM.id}`, socketRegistration.handleSocketEvent);
// Make Compendium Dialog resizable // Make Compendium Dialog resizable
foundry.applications.sidebar.apps.Compendium.DEFAULT_OPTIONS.window.resizable = true; foundry.applications.sidebar.apps.Compendium.DEFAULT_OPTIONS.window.resizable = true;
registerDHSettings(); settingsRegistration.registerDHSettings();
RegisterHandlebarsHelpers.registerHelpers(); RegisterHandlebarsHelpers.registerHelpers();
return preloadHandlebarsTemplates(); return handlebarsRegistration();
}); });
Hooks.on('ready', () => { Hooks.on('ready', () => {
@ -152,7 +144,7 @@ Hooks.on('ready', () => {
); );
registerCountdownHooks(); registerCountdownHooks();
registerSocketHooks(); socketRegistration.registerSocketHooks();
registerCountdownApplicationHooks(); registerCountdownApplicationHooks();
}); });
@ -212,7 +204,7 @@ Hooks.on('chatMessage', (_, message) => {
const title = traitValue const title = traitValue
? game.i18n.format('DAGGERHEART.Chat.DualityRoll.AbilityCheckTitle', { ? game.i18n.format('DAGGERHEART.Chat.DualityRoll.AbilityCheckTitle', {
ability: game.i18n.localize(abilities[traitValue].label) ability: game.i18n.localize(applications.config.actorConfig.abilities[traitValue].label)
}) })
: game.i18n.localize('DAGGERHEART.General.Duality'); : game.i18n.localize('DAGGERHEART.General.Duality');
@ -266,46 +258,3 @@ Hooks.on('renderJournalDirectory', async (tab, html, _, options) => {
}; };
} }
}); });
const preloadHandlebarsTemplates = async function () {
return foundry.applications.handlebars.loadTemplates([
'systems/daggerheart/templates/sheets/global/tabs/tab-navigation.hbs',
'systems/daggerheart/templates/sheets/global/partials/inventory-item.hbs',
'systems/daggerheart/templates/sheets/global/partials/action-item.hbs',
'systems/daggerheart/templates/sheets/global/partials/domain-card-item.hbs',
'systems/daggerheart/templates/sheets/global/partials/inventory-fieldset-items.hbs',
'systems/daggerheart/templates/sheets/parts/attributes.hbs',
'systems/daggerheart/templates/sheets/parts/defense.hbs',
'systems/daggerheart/templates/sheets/parts/armor.hbs',
'systems/daggerheart/templates/sheets/parts/experience.hbs',
'systems/daggerheart/templates/sheets/parts/features.hbs',
'systems/daggerheart/templates/sheets/parts/gold.hbs',
'systems/daggerheart/templates/sheets/parts/health.hbs',
'systems/daggerheart/templates/sheets/parts/hope.hbs',
'systems/daggerheart/templates/sheets/parts/weapons.hbs',
'systems/daggerheart/templates/sheets/parts/domainCard.hbs',
'systems/daggerheart/templates/sheets/parts/heritage.hbs',
'systems/daggerheart/templates/sheets/parts/subclassFeature.hbs',
'systems/daggerheart/templates/sheets/parts/effects.hbs',
'systems/daggerheart/templates/sheets/items/subclass/parts/subclass-features.hbs',
'systems/daggerheart/templates/sheets/items/subclass/parts/subclass-feature.hbs',
'systems/daggerheart/templates/components/card-preview.hbs',
'systems/daggerheart/templates/views/levelup/parts/selectable-card-preview.hbs',
'systems/daggerheart/templates/sheets/global/partials/feature-section-item.hbs',
'systems/daggerheart/templates/ui/combat/combatTrackerSection.hbs',
'systems/daggerheart/templates/views/actionTypes/damage.hbs',
'systems/daggerheart/templates/views/actionTypes/healing.hbs',
'systems/daggerheart/templates/views/actionTypes/resource.hbs',
'systems/daggerheart/templates/views/actionTypes/uuid.hbs',
'systems/daggerheart/templates/views/actionTypes/uses.hbs',
'systems/daggerheart/templates/views/actionTypes/roll.hbs',
'systems/daggerheart/templates/views/actionTypes/save.hbs',
'systems/daggerheart/templates/views/actionTypes/cost.hbs',
'systems/daggerheart/templates/views/actionTypes/range-target.hbs',
'systems/daggerheart/templates/views/actionTypes/effect.hbs',
'systems/daggerheart/templates/views/actionTypes/beastform.hbs',
'systems/daggerheart/templates/settings/components/settings-item-line.hbs',
'systems/daggerheart/templates/chat/parts/damage-chat.hbs',
'systems/daggerheart/templates/chat/parts/target-chat.hbs'
]);
};

6
module/applications/_module.mjs
View file

@ -11,12 +11,12 @@ export { default as DhpMiscellaneous } from './sheets/items/miscellaneous.mjs';
export { default as DhpConsumable } from './sheets/items/consumable.mjs'; export { default as DhpConsumable } from './sheets/items/consumable.mjs';
export { default as DhpWeapon } from './sheets/items/weapon.mjs'; export { default as DhpWeapon } from './sheets/items/weapon.mjs';
export { default as DhpArmor } from './sheets/items/armor.mjs'; export { default as DhpArmor } from './sheets/items/armor.mjs';
export { default as DhpChatMessage } from './chatMessage.mjs';
export { default as DhpEnvironment } from './sheets/actors/environment.mjs'; export { default as DhpEnvironment } from './sheets/actors/environment.mjs';
export { default as DhActiveEffectConfig } from './sheets/activeEffectConfig.mjs'; export { default as DhActiveEffectConfig } from './sheets/activeEffectConfig.mjs';
export { default as DhContextMenu } from './contextMenu.mjs'; export { default as DhContextMenu } from './ux/contextMenu.mjs';
export { default as DhBeastform } from './sheets/items/beastform.mjs'; export { default as DhBeastform } from './sheets/items/beastform.mjs';
export { default as DhTooltipManager } from './tooltipManager.mjs';
export * as config from './config/_module.mjs';
export * as api from './sheets/api/_modules.mjs'; export * as api from './sheets/api/_modules.mjs';
export * as ui from './ui/_module.mjs';
export * as ux from './ux/_module.mjs'; export * as ux from './ux/_module.mjs';

250
module/applications/ancestrySelectionDialog.mjs
View file

@ -1,250 +0,0 @@
const { ApplicationV2, HandlebarsApplicationMixin } = foundry.applications.api;
export default class AncestrySelectionDialog extends HandlebarsApplicationMixin(ApplicationV2) {
constructor(resolve) {
super({});
this.resolve = resolve;
this.data = {
ancestries: [],
features: [],
ancestryInfo: {
name: '',
img: null,
customImg: 'icons/svg/mystery-man.svg',
description: ''
}
};
}
static DEFAULT_OPTIONS = {
tag: 'form',
classes: ['daggerheart', 'views', 'ancestry-selection'],
position: {
width: 800,
height: 'auto'
},
actions: {
selectAncestry: this.selectAncestry,
selectFeature: this.selectFeature,
viewItem: this.viewItem,
selectImage: this.selectImage,
editImage: this._onEditImage,
saveAncestry: this.saveAncestry
},
form: {
submitOnChange: true,
closeOnSubmit: false
}
};
/** @override */
static PARTS = {
damageSelection: {
id: 'ancestrySelection',
template: 'systems/daggerheart/templates/views/ancestrySelection.hbs'
}
};
/* -------------------------------------------- */
/** @inheritDoc */
get title() {
return `Ancestry Selection`;
}
_attachPartListeners(partId, htmlElement, options) {
super._attachPartListeners(partId, htmlElement, options);
const ancestryNameInput = $(htmlElement).find('.ancestry-name');
if (ancestryNameInput.length > 0) {
ancestryNameInput.on('change', this.setName.bind(this));
$(htmlElement).find('.ancestry-description').on('change', this.setDescription.bind(this));
}
// $(htmlElement).find(".ancestry-image").on("change", this.selectImage.bind(this));
}
async _prepareContext(_options) {
const systemAncestries = Array.from((await game.packs.get('daggerheart.ancestries')).index).map(x => ({
...x,
selected: this.data.ancestries.some(selected => selected.uuid === x.uuid)
}));
const customAncestries = game.items.reduce((acc, x) => {
if (x.type === 'ancestry') {
acc.push({
...x,
uuid: x.uuid,
selected: this.data.ancestries.some(selected => selected.uuid === x.uuid)
});
}
return acc;
}, []);
const ancestryFeatures = this.data.ancestries.flatMap(x =>
x.system.abilities.map(x => ({
...x,
selected: this.data.features.some(selected => selected.uuid === x.uuid)
}))
);
return {
systemAncestries,
customAncestries,
ancestryFeatures,
selectedAncestries: this.data.ancestries,
selectedFeatures: this.data.features,
ancestryInfo: this.data.ancestryInfo
};
}
static async selectAncestry(_, button) {
const newAncestries = [...this.data.ancestries];
if (!newAncestries.findSplice(x => x.uuid === button.dataset.uuid) && this.data.ancestries.length < 2) {
const ancestry = await fromUuid(button.dataset.uuid);
newAncestries.push(ancestry);
}
this.data.ancestries = newAncestries;
this.data.features = newAncestries.length === 1 ? newAncestries[0].system.abilities : [];
this.render(true);
}
static async selectFeature(_, button) {
const newFeatures = [...this.data.features];
if (!newFeatures.findSplice(x => x.uuid === button.dataset.uuid) && this.data.features.length < 2) {
const feature = await fromUuid(button.dataset.uuid);
newFeatures.push(feature);
}
this.data.features = newFeatures;
this.render(true);
}
static async viewItem(_, button) {
(await fromUuid(button.dataset.uuid)).sheet.render(true);
}
setName(event) {
this.data.ancestryInfo.name = event.currentTarget.value;
this.render(true);
}
setDescription(event) {
this.data.ancestryInfo.description = event.currentTarget.value;
this.render(true);
}
static selectImage(_, button) {
this.data.ancestryInfo.img = button.dataset.img;
this.render(true);
}
static _onEditImage() {
const fp = new foundry.applications.apps.FilePicker.implementation({
current: this.data.ancestryInfo.img,
type: 'image',
redirectToRoot: ['icons/svg/mystery-man.svg'],
callback: async path => this._updateImage.bind(this)(path),
top: this.position.top + 40,
left: this.position.left + 10
});
return fp.browse();
}
_updateImage(path) {
this.data.ancestryInfo.customImg = path;
this.data.ancestryInfo.img = path;
this.render(true);
}
static async saveAncestry(_, button) {
if (this.data.ancestries.length === 2) {
const { name, img, description } = this.data.ancestryInfo;
this.resolve({
data: {
name: name,
img: img,
type: 'ancestry',
system: {
description: description,
abilities: this.data.features.map(x => ({
name: x.name,
img: x.img,
uuid: x.uuid,
subclassLevel: ''
}))
}
}
});
} else {
this.resolve({ data: this.data.ancestries[0].toObject() });
}
this.close();
}
}
// export default class DamageSelectionDialog extends FormApplication {
// constructor(rollString, bonusDamage, resolve){
// super({}, {});
// this.data = {
// rollString,
// bonusDamage: bonusDamage.map(x => ({
// ...x,
// hopeUses: 0
// })),
// }
// this.resolve = resolve;
// }
// get title (){
// return 'Damage Options';
// }
// static get defaultOptions() {
// const defaults = super.defaultOptions;
// const overrides = {
// height: 'auto',
// width: 400,
// id: 'damage-selection',
// template: 'systems/daggerheart/templates/views/damageSelection.hbs',
// closeOnSubmit: false,
// classes: ["daggerheart", "views", "damage-selection"],
// };
// const mergedOptions = foundry.utils.mergeObject(defaults, overrides);
// return mergedOptions;
// }
// async getData(){
// const context = super.getData();
// context.rollString = this.data.rollString;
// context.bonusDamage = this.data.bonusDamage;
// return context;
// }
// activateListeners(html) {
// super.activateListeners(html);
// html.find('.roll-button').click(this.finish.bind(this));
// html.find('.').change();
// }
// // async _updateObject(_, formData) {
// // const data = foundry.utils.expandObject(formData);
// // this.data = foundry.utils.mergeObject(this.data, data);
// // this.render(true);
// // }
// finish(){
// this.resolve(this.data);
// this.close();
// }
// }

14
module/applications/characterCreation.mjs → module/applications/characterCreation/characterCreation.mjs
View file

@ -74,11 +74,11 @@ export default class DhCharacterCreation extends HandlebarsApplicationMixin(Appl
}; };
static PARTS = { static PARTS = {
tabs: { template: 'systems/daggerheart/templates/views/characterCreation/tabs.hbs' }, tabs: { template: 'systems/daggerheart/templates/characterCreation/tabs.hbs' },
setup: { template: 'systems/daggerheart/templates/views/characterCreation/tabs/setup.hbs' }, setup: { template: 'systems/daggerheart/templates/characterCreation/tabs/setup.hbs' },
equipment: { template: 'systems/daggerheart/templates/views/characterCreation/tabs/equipment.hbs' }, equipment: { template: 'systems/daggerheart/templates/characterCreation/tabs/equipment.hbs' },
// story: { template: 'systems/daggerheart/templates/views/characterCreation/tabs/story.hbs' }, // story: { template: 'systems/daggerheart/templates/characterCreation/tabs/story.hbs' },
footer: { template: 'systems/daggerheart/templates/views/characterCreation/footer.hbs' } footer: { template: 'systems/daggerheart/templates/characterCreation/footer.hbs' }
}; };
static TABS = { static TABS = {
@ -176,7 +176,7 @@ export default class DhCharacterCreation extends HandlebarsApplicationMixin(Appl
switch (partId) { switch (partId) {
case 'setup': case 'setup':
const availableTraitModifiers = game.settings const availableTraitModifiers = game.settings
.get(SYSTEM.id, SYSTEM.SETTINGS.gameSettings.Homebrew) .get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Homebrew)
.traitArray.map(trait => ({ key: trait, name: trait })); .traitArray.map(trait => ({ key: trait, name: trait }));
for (let trait of Object.values(this.setup.traits).filter(x => x.value !== null)) { for (let trait of Object.values(this.setup.traits).filter(x => x.value !== null)) {
const index = availableTraitModifiers.findIndex(x => x.key === trait.value); const index = availableTraitModifiers.findIndex(x => x.key === trait.value);
@ -396,7 +396,7 @@ export default class DhCharacterCreation extends HandlebarsApplicationMixin(Appl
} }
async _onDrop(event) { async _onDrop(event) {
const data = TextEditor.getDragEventData(event); const data = foundry.applications.ux.TextEditor.implementation.getDragEventData(event);
const item = await foundry.utils.fromUuid(data.uuid); const item = await foundry.utils.fromUuid(data.uuid);
if (item.type === 'ancestry' && event.target.closest('.ancestry-card')) { if (item.type === 'ancestry' && event.target.closest('.ancestry-card')) {
this.setup.ancestry = { this.setup.ancestry = {

6
module/applications/config/Action.mjs
View file

@ -34,7 +34,7 @@ export default class DHActionConfig extends DaggerheartSheet(ApplicationV2) {
static PARTS = { static PARTS = {
form: { form: {
id: 'action', id: 'action',
template: 'systems/daggerheart/templates/views/action.hbs' template: 'systems/daggerheart/templates/config/action.hbs'
} }
}; };
@ -60,7 +60,7 @@ export default class DHActionConfig extends DaggerheartSheet(ApplicationV2) {
context.source = this.action.toObject(false); context.source = this.action.toObject(false);
context.openSection = this.openSection; context.openSection = this.openSection;
context.tabs = this._getTabs(); context.tabs = this._getTabs();
context.config = SYSTEM; context.config = CONFIG.DH;
if (!!this.action.effects) context.effects = this.action.effects.map(e => this.action.item.effects.get(e._id)); if (!!this.action.effects) context.effects = this.action.effects.map(e => this.action.item.effects.get(e._id));
if (this.action.damage?.hasOwnProperty('includeBase') && this.action.type === 'attack') if (this.action.damage?.hasOwnProperty('includeBase') && this.action.type === 'attack')
context.hasBaseDamage = !!this.action.parent.damage; context.hasBaseDamage = !!this.action.parent.damage;
@ -70,7 +70,7 @@ export default class DHActionConfig extends DaggerheartSheet(ApplicationV2) {
context.isNPC = this.action.actor && this.action.actor.type !== 'character'; context.isNPC = this.action.actor && this.action.actor.type !== 'character';
context.hasRoll = this.action.hasRoll; context.hasRoll = this.action.hasRoll;
const settingsTiers = game.settings.get(SYSTEM.id, SYSTEM.SETTINGS.gameSettings.LevelTiers).tiers; const settingsTiers = game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.LevelTiers).tiers;
context.tierOptions = [ context.tierOptions = [
{ key: 1, label: game.i18n.localize('DAGGERHEART.Tiers.tier1') }, { key: 1, label: game.i18n.localize('DAGGERHEART.Tiers.tier1') },
...Object.values(settingsTiers).map(x => ({ key: x.tier, label: x.name })) ...Object.values(settingsTiers).map(x => ({ key: x.tier, label: x.name }))

25
module/applications/config/_module.mjs Normal file
View file

@ -0,0 +1,25 @@
import * as action from './Action.mjs';
import * as actionConfig from './actionConfig.mjs';
import * as actorConfig from './actorConfig.mjs';
import * as domainConfig from './domainConfig.mjs';
import * as effectConfig from './effectConfig.mjs';
import * as flagsConfig from './flagsConfig.mjs';
import * as generalConfig from './generalConfig.mjs';
import * as hooksConfig from './hooksConfig.mjs';
import * as itemConfig from './itemConfig.mjs';
import * as settingsConfig from './settingsConfig.mjs';
import * as systemConfig from './system.mjs';
export {
action,
actionConfig,
actorConfig,
domainConfig,
effectConfig,
flagsConfig,
generalConfig,
hooksConfig,
itemConfig,
settingsConfig,
systemConfig
};

0
module/config/actionConfig.mjs → module/applications/config/actionConfig.mjs
View file

0
module/config/actorConfig.mjs → module/applications/config/actorConfig.mjs
View file

0
module/config/domainConfig.mjs → module/applications/config/domainConfig.mjs
View file

2
module/config/effectConfig.mjs → module/applications/config/effectConfig.mjs
View file

@ -1,4 +1,4 @@
import { range } from './generalConfig.mjs'; import { range } from '../config/generalConfig.mjs';
export const valueTypes = { export const valueTypes = {
numberString: { numberString: {

0
module/config/flagsConfig.mjs → module/applications/config/flagsConfig.mjs
View file

2
module/config/generalConfig.mjs → module/applications/config/generalConfig.mjs
View file

@ -290,7 +290,7 @@ export const diceSetNumbers = {
}; };
export const getDiceSoNicePresets = () => { export const getDiceSoNicePresets = () => {
const { diceSoNice } = game.settings.get(SYSTEM.id, SYSTEM.SETTINGS.gameSettings.appearance); const { diceSoNice } = game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.appearance);
return { return {
hope: { hope: {

0
module/config/hooksConfig.mjs → module/applications/config/hooksConfig.mjs
View file

0
module/config/itemConfig.mjs → module/applications/config/itemConfig.mjs
View file

0
module/config/settingsConfig.mjs → module/applications/config/settingsConfig.mjs
View file

0
module/config/system.mjs → module/applications/config/system.mjs
View file

2
module/dialogs/beastformDialog.mjs → module/applications/dialogs/beastformDialog.mjs
View file

@ -35,7 +35,7 @@ export default class BeastformDialog extends HandlebarsApplicationMixin(Applicat
/** @override */ /** @override */
static PARTS = { static PARTS = {
beastform: { beastform: {
template: 'systems/daggerheart/templates/views/beastformDialog.hbs' template: 'systems/daggerheart/templates/dialogs/beastformDialog.hbs'
} }
}; };

2
module/applications/costSelectionDialog.mjs → module/applications/dialogs/costSelectionDialog.mjs
View file

@ -30,7 +30,7 @@ export default class CostSelectionDialog extends HandlebarsApplicationMixin(Appl
static PARTS = { static PARTS = {
costSelection: { costSelection: {
id: 'costSelection', id: 'costSelection',
template: 'systems/daggerheart/templates/views/costSelection.hbs' template: 'systems/daggerheart/templates/dialogs/costSelection.hbs'
} }
}; };

6
module/dialogs/d20RollDialog.mjs → module/applications/dialogs/d20RollDialog.mjs
View file

@ -41,11 +41,11 @@ export default class D20RollDialog extends HandlebarsApplicationMixin(Applicatio
static PARTS = { static PARTS = {
costSelection: { costSelection: {
id: 'costSelection', id: 'costSelection',
template: 'systems/daggerheart/templates/views/costSelection.hbs' template: 'systems/daggerheart/templates/dialogs/costSelection.hbs'
}, },
rollSelection: { rollSelection: {
id: 'rollSelection', id: 'rollSelection',
template: 'systems/daggerheart/templates/views/rollSelection.hbs' template: 'systems/daggerheart/templates/dialogs/rollSelection.hbs'
} }
}; };
@ -60,7 +60,7 @@ export default class D20RollDialog extends HandlebarsApplicationMixin(Applicatio
})); }));
context.selectedExperiences = this.config.experiences; context.selectedExperiences = this.config.experiences;
context.advantage = this.config.roll?.advantage; context.advantage = this.config.roll?.advantage;
context.diceOptions = SYSTEM.GENERAL.diceTypes; context.diceOptions = CONFIG.DH.GENERAL.diceTypes;
context.canRoll = true; context.canRoll = true;
context.isLite = this.config.roll?.lite; context.isLite = this.config.roll?.lite;
if (this.config.costs?.length) { if (this.config.costs?.length) {

2
module/dialogs/damageDialog.mjs → module/applications/dialogs/damageDialog.mjs
View file

@ -30,7 +30,7 @@ export default class DamageDialog extends HandlebarsApplicationMixin(Application
static PARTS = { static PARTS = {
damageSelection: { damageSelection: {
id: 'damageSelection', id: 'damageSelection',
template: 'systems/daggerheart/templates/views/damageSelection.hbs' template: 'systems/daggerheart/templates/dialogs/damageSelection.hbs'
} }
}; };

4
module/applications/damageReductionDialog.mjs → module/applications/dialogs/damageReductionDialog.mjs
View file

@ -1,4 +1,4 @@
import { damageKeyToNumber, getDamageLabel } from '../helpers/utils.mjs'; import { damageKeyToNumber, getDamageLabel } from '../../helpers/utils.mjs';
const { ApplicationV2, HandlebarsApplicationMixin } = foundry.applications.api; const { ApplicationV2, HandlebarsApplicationMixin } = foundry.applications.api;
@ -71,7 +71,7 @@ export default class DamageReductionDialog extends HandlebarsApplicationMixin(Ap
static PARTS = { static PARTS = {
damageSelection: { damageSelection: {
id: 'damageReduction', id: 'damageReduction',
template: 'systems/daggerheart/templates/views/damageReduction.hbs' template: 'systems/daggerheart/templates/dialogs/damageReduction.hbs'
} }
}; };

4
module/applications/damageSelectionDialog.mjs → module/applications/dialogs/damageSelectionDialog.mjs
View file

@ -7,7 +7,7 @@ export default class DamageSelectionDialog extends HandlebarsApplicationMixin(Ap
this.data = { this.data = {
rollString, rollString,
bonusDamage: bonusDamage.reduce((acc, x) => { bonusDamage: bonusDamage.reduce((acc, x) => {
if (x.appliesOn === SYSTEM.EFFECTS.applyLocations.damageRoll.id) { if (x.appliesOn === CONFIG.DH.EFFECTS.applyLocations.damageRoll.id) {
acc.push({ acc.push({
...x, ...x,
hopeUses: 0 hopeUses: 0
@ -44,7 +44,7 @@ export default class DamageSelectionDialog extends HandlebarsApplicationMixin(Ap
static PARTS = { static PARTS = {
damageSelection: { damageSelection: {
id: 'damageSelection', id: 'damageSelection',
template: 'systems/daggerheart/templates/views/damageSelection.hbs' template: 'systems/daggerheart/templates/dialogs/damageSelection.hbs'
} }
}; };

8
module/applications/deathMove.mjs → module/applications/dialogs/deathMove.mjs
View file

@ -24,21 +24,21 @@ export default class DhpDeathMove extends HandlebarsApplicationMixin(Application
static PARTS = { static PARTS = {
application: { application: {
id: 'death-move', id: 'death-move',
template: 'systems/daggerheart/templates/views/deathMove.hbs' template: 'systems/daggerheart/templates/dialogs/deathMove.hbs'
} }
}; };
async _prepareContext(_options) { async _prepareContext(_options) {
const context = await super._prepareContext(_options); const context = await super._prepareContext(_options);
context.selectedMove = this.selectedMove; context.selectedMove = this.selectedMove;
context.options = SYSTEM.GENERAL.deathMoves; context.options = CONFIG.DH.GENERAL.deathMoves;
return context; return context;
} }
static selectMove(_, button) { static selectMove(_, button) {
const move = button.dataset.move; const move = button.dataset.move;
this.selectedMove = SYSTEM.GENERAL.deathMoves[move]; this.selectedMove = CONFIG.DH.GENERAL.deathMoves[move];
this.render(); this.render();
} }
@ -48,7 +48,7 @@ export default class DhpDeathMove extends HandlebarsApplicationMixin(Application
const msg = new cls({ const msg = new cls({
user: game.user.id, user: game.user.id,
content: await foundry.applications.handlebars.renderTemplate( content: await foundry.applications.handlebars.renderTemplate(
'systems/daggerheart/templates/chat/deathMove.hbs', 'systems/daggerheart/templates/ui/chat/deathMove.hbs',
{ {
player: this.actor.name, player: this.actor.name,
title: game.i18n.localize(this.selectedMove.name), title: game.i18n.localize(this.selectedMove.name),

8
module/applications/downtime.mjs → module/applications/dialogs/downtime.mjs
View file

@ -1,4 +1,4 @@
import { actionsTypes } from '../data/_module.mjs'; import { actionsTypes } from '../../data/_module.mjs';
const { HandlebarsApplicationMixin, ApplicationV2 } = foundry.applications.api; const { HandlebarsApplicationMixin, ApplicationV2 } = foundry.applications.api;
@ -9,7 +9,7 @@ export default class DhpDowntime extends HandlebarsApplicationMixin(ApplicationV
this.actor = actor; this.actor = actor;
this.shortrest = shortrest; this.shortrest = shortrest;
const options = game.settings.get(SYSTEM.id, SYSTEM.SETTINGS.gameSettings.Homebrew).restMoves; const options = game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Homebrew).restMoves;
this.moveData = shortrest ? options.shortRest : options.longRest; this.moveData = shortrest ? options.shortRest : options.longRest;
} }
@ -31,7 +31,7 @@ export default class DhpDowntime extends HandlebarsApplicationMixin(ApplicationV
static PARTS = { static PARTS = {
application: { application: {
id: 'downtime', id: 'downtime',
template: 'systems/daggerheart/templates/views/downtime.hbs' template: 'systems/daggerheart/templates/dialogs/downtime.hbs'
} }
}; };
@ -88,7 +88,7 @@ export default class DhpDowntime extends HandlebarsApplicationMixin(ApplicationV
actor: this.actor.uuid actor: this.actor.uuid
}, },
content: await foundry.applications.handlebars.renderTemplate( content: await foundry.applications.handlebars.renderTemplate(
'systems/daggerheart/templates/chat/downtime.hbs', 'systems/daggerheart/templates/ui/chat/downtime.hbs',
{ {
title: `${this.actor.name} - ${game.i18n.localize(`DAGGERHEART.Downtime.${this.shortRest ? 'ShortRest' : 'LongRest'}.title`)}`, title: `${this.actor.name} - ${game.i18n.localize(`DAGGERHEART.Downtime.${this.shortRest ? 'ShortRest' : 'LongRest'}.title`)}`,
moves: moves moves: moves

2
module/applications/ownershipSelection.mjs → module/applications/dialogs/ownershipSelection.mjs
View file

@ -22,7 +22,7 @@ export default class OwnershipSelection extends HandlebarsApplicationMixin(Appli
static PARTS = { static PARTS = {
selection: { selection: {
template: 'systems/daggerheart/templates/views/ownershipSelection.hbs' template: 'systems/daggerheart/templates/dialogs/ownershipSelection.hbs'
} }
}; };

8
module/applications/levelup/characterLevelup.mjs
View file

@ -1,13 +1,15 @@
import LevelUpBase from './levelup.mjs'; import LevelUpBase from './levelup.mjs';
import { DhLevelup } from '../../data/levelup.mjs'; import { DhLevelup } from '../../data/levelup.mjs';
import { domains } from '../../config/domainConfig.mjs'; import { domains } from '../../applications/config/domainConfig.mjs';
import { abilities } from '../../config/actorConfig.mjs'; import { abilities } from '../../applications/config/actorConfig.mjs';
export default class DhCharacterLevelUp extends LevelUpBase { export default class DhCharacterLevelUp extends LevelUpBase {
constructor(actor) { constructor(actor) {
super(actor); super(actor);
this.levelTiers = this.addBonusChoices(game.settings.get(SYSTEM.id, SYSTEM.SETTINGS.gameSettings.LevelTiers)); this.levelTiers = this.addBonusChoices(
game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.LevelTiers)
);
const playerLevelupData = actor.system.levelData; const playerLevelupData = actor.system.levelData;
this.levelup = new DhLevelup(DhLevelup.initializeData(this.levelTiers, playerLevelupData)); this.levelup = new DhLevelup(DhLevelup.initializeData(this.levelTiers, playerLevelupData));
} }

2
module/applications/levelup/companionLevelup.mjs
View file

@ -1,7 +1,7 @@
import BaseLevelUp from './levelup.mjs'; import BaseLevelUp from './levelup.mjs';
import { defaultCompanionTier, LevelOptionType } from '../../data/levelTier.mjs'; import { defaultCompanionTier, LevelOptionType } from '../../data/levelTier.mjs';
import { DhLevelup } from '../../data/levelup.mjs'; import { DhLevelup } from '../../data/levelup.mjs';
import { diceTypes, range } from '../../config/generalConfig.mjs'; import { diceTypes, range } from '../../applications/config/generalConfig.mjs';
export default class DhCompanionLevelUp extends BaseLevelUp { export default class DhCompanionLevelUp extends BaseLevelUp {
constructor(actor) { constructor(actor) {

12
module/applications/levelup/levelup.mjs
View file

@ -1,5 +1,5 @@
import { abilities, subclassFeatureLabels } from '../../config/actorConfig.mjs'; import { abilities, subclassFeatureLabels } from '../../applications/config/actorConfig.mjs';
import { domains } from '../../config/domainConfig.mjs'; import { domains } from '../../applications/config/domainConfig.mjs';
import { getDeleteKeys, tagifyElement } from '../../helpers/utils.mjs'; import { getDeleteKeys, tagifyElement } from '../../helpers/utils.mjs';
const { HandlebarsApplicationMixin, ApplicationV2 } = foundry.applications.api; const { HandlebarsApplicationMixin, ApplicationV2 } = foundry.applications.api;
@ -43,10 +43,10 @@ export default class DhlevelUp extends HandlebarsApplicationMixin(ApplicationV2)
}; };
static PARTS = { static PARTS = {
tabs: { template: 'systems/daggerheart/templates/views/levelup/tabs/tab-navigation.hbs' }, tabs: { template: 'systems/daggerheart/templates/levelup/tabs/tab-navigation.hbs' },
advancements: { template: 'systems/daggerheart/templates/views/levelup/tabs/advancements.hbs' }, advancements: { template: 'systems/daggerheart/templates/levelup/tabs/advancements.hbs' },
selections: { template: 'systems/daggerheart/templates/views/levelup/tabs/selections.hbs' }, selections: { template: 'systems/daggerheart/templates/levelup/tabs/selections.hbs' },
summary: { template: 'systems/daggerheart/templates/views/levelup/tabs/summary.hbs' } summary: { template: 'systems/daggerheart/templates/levelup/tabs/summary.hbs' }
}; };
static TABS = { static TABS = {

80
module/applications/npcRollSelectionDialog.mjs
View file

@ -1,80 +0,0 @@
/** NOT USED ANYMORE - TO BE DELETED **/
const { HandlebarsApplicationMixin, ApplicationV2 } = foundry.applications.api;
export default class NpcRollSelectionDialog extends HandlebarsApplicationMixin(ApplicationV2) {
constructor(experiences, resolve, reject) {
super({});
this.experiences = experiences;
this.resolve = resolve;
this.reject = reject;
this.selectedExperiences = [];
this.data = {
advantage: null
};
}
get title() {
return game.i18n.localize('DAGGERHEART.Application.RollSelection.Title');
}
static DEFAULT_OPTIONS = {
tag: 'form',
classes: ['daggerheart', 'views', 'npc-roll-selection'],
position: { width: '500', height: 'auto' },
actions: {
updateIsAdvantage: this.updateIsAdvantage,
selectExperience: this.selectExperience
},
form: { handler: this.updateData, submitOnChange: false }
};
static PARTS = {
main: {
id: 'main',
template: 'systems/daggerheart/templates/views/npcRollSelection.hbs'
}
};
async _prepareContext(_options) {
const context = await super._prepareContext(_options);
context.advantage = this.data.advantage;
context.experiences = Object.values(this.experiences).map(x => ({
...x,
selected: this.selectedExperiences.find(selected => selected.id === x.id),
value: `${x.value >= 0 ? '+' : '-'}${x.value}`
}));
return context;
}
static updateIsAdvantage(_, button) {
const advantage = Boolean(button.dataset.advantage);
this.data.advantage = this.data.advantage === advantage ? null : advantage;
this.render();
}
static selectExperience(_, button) {
const experience = Object.values(this.experiences).find(experience => experience.id === button.id);
this.selectedExperiences = this.selectedExperiences.find(x => x.id === experience.id)
? this.selectedExperiences.filter(x => x.id !== experience.id)
: [...this.selectedExperiences, experience];
this.render();
}
static async updateData() {
this.resolve({ ...this.data, experiences: this.selectedExperiences });
this.close({ updateClose: true });
}
async close(options = {}) {
const { updateClose, ...baseOptions } = options;
if (!updateClose) {
this.reject();
}
await super.close(baseOptions);
}
}

111
module/applications/rollSelectionDialog.mjs
View file

@ -1,111 +0,0 @@
/** NOT USED ANYMORE - TO BE DELETED **/
const { ApplicationV2, HandlebarsApplicationMixin } = foundry.applications.api;
export default class RollSelectionDialog extends HandlebarsApplicationMixin(ApplicationV2) {
constructor(experiences, costs, action, resolve) {
super({}, {});
this.experiences = experiences;
this.costs = costs;
this.action = action;
this.resolve = resolve;
this.isNpc;
this.selectedExperiences = [];
this.data = {
diceOptions: [
{ name: 'd12', value: 'd12' },
{ name: 'd20', value: 'd20' }
],
hope: ['d12'],
fear: ['d12'],
advantage: null
};
}
static DEFAULT_OPTIONS = {
tag: 'form',
id: 'roll-selection',
classes: ['daggerheart', 'views', 'roll-selection'],
position: {
width: 400,
height: 'auto'
},
actions: {
updateIsAdvantage: this.updateIsAdvantage,
selectExperience: this.selectExperience,
finish: this.finish
},
form: {
handler: this.updateSelection,
submitOnChange: true,
submitOnClose: false
}
};
/** @override */
static PARTS = {
costSelection: {
id: 'costSelection',
template: 'systems/daggerheart/templates/views/costSelection.hbs'
},
damageSelection: {
id: 'damageSelection',
template: 'systems/daggerheart/templates/views/rollSelection.hbs'
}
};
get title() {
return game.i18n.localize('DAGGERHEART.Application.RollSelection.Title');
}
async _prepareContext(_options) {
const context = await super._prepareContext(_options);
context.isNpc = this.isNpc;
context.diceOptions = this.data.diceOptions;
context.hope = this.data.hope;
context.fear = this.data.fear;
context.advantage = this.data.advantage;
context.experiences = Object.keys(this.experiences).map(id => ({ id, ...this.experiences[id] }));
if (this.costs?.length) {
const updatedCosts = this.action.calcCosts(this.costs);
context.costs = updatedCosts;
context.canRoll = this.action.getRealCosts(updatedCosts)?.hasCost;
} else context.canRoll = true;
return context;
}
static updateSelection(event, _, formData) {
const { ...rest } = foundry.utils.expandObject(formData.object);
this.data = foundry.utils.mergeObject(this.data, rest);
this.costs = foundry.utils.mergeObject(this.costs, rest.costs);
this.render();
}
static selectExperience(_, button) {
if (this.selectedExperiences.find(x => x.id === button.dataset.key)) {
this.selectedExperiences = this.selectedExperiences.filter(x => x.id !== button.dataset.key);
} else {
this.selectedExperiences = [...this.selectedExperiences, button.dataset.key];
}
this.render();
}
static updateIsAdvantage(_, button) {
const advantage = Boolean(button.dataset.advantage);
this.data.advantage = this.data.advantage === advantage ? null : advantage;
this.render();
}
static async finish() {
const { diceOptions, ...rest } = this.data;
this.resolve({
...rest,
experiences: this.selectedExperiences.map(x => ({ id: x, ...this.experiences[x] })),
costs: this.action.getRealCosts(this.costs)
});
this.close();
}
}

6
module/applications/settings/appearanceSettings.mjs
View file

@ -7,7 +7,7 @@ export default class DHAppearanceSettings extends HandlebarsApplicationMixin(App
super({}); super({});
this.settings = new DhAppearance( this.settings = new DhAppearance(
game.settings.get(SYSTEM.id, SYSTEM.SETTINGS.gameSettings.appearance).toObject() game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.appearance).toObject()
); );
} }
@ -53,10 +53,10 @@ export default class DHAppearanceSettings extends HandlebarsApplicationMixin(App
} }
static async save() { static async save() {
await game.settings.set(SYSTEM.id, SYSTEM.SETTINGS.gameSettings.appearance, this.settings.toObject()); await game.settings.set(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.appearance, this.settings.toObject());
document.body.classList.toggle( document.body.classList.toggle(
'theme-colorful', 'theme-colorful',
game.settings.get(SYSTEM.id, SYSTEM.SETTINGS.gameSettings.appearance).dualityColorScheme === game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.appearance).dualityColorScheme ===
DualityRollColor.colorful.value DualityRollColor.colorful.value
); );

4
module/applications/settings/automationSettings.mjs
View file

@ -7,7 +7,7 @@ export default class DhAutomationSettings extends HandlebarsApplicationMixin(App
super({}); super({});
this.settings = new DhAutomation( this.settings = new DhAutomation(
game.settings.get(SYSTEM.id, SYSTEM.SETTINGS.gameSettings.Automation).toObject() game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Automation).toObject()
); );
} }
@ -53,7 +53,7 @@ export default class DhAutomationSettings extends HandlebarsApplicationMixin(App
} }
static async save() { static async save() {
await game.settings.set(SYSTEM.id, SYSTEM.SETTINGS.gameSettings.Automation, this.settings.toObject()); await game.settings.set(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Automation, this.settings.toObject());
this.close(); this.close();
} }
} }

6
module/applications/settings/components/settingsActionsView.mjs
View file

@ -96,8 +96,8 @@ export default class DhSettingsActionView extends HandlebarsApplicationMixin(App
async selectActionType() { async selectActionType() {
const content = await foundry.applications.handlebars.renderTemplate( const content = await foundry.applications.handlebars.renderTemplate(
'systems/daggerheart/templates/views/actionType.hbs', 'systems/daggerheart/templates/actionTypes/actionType.hbs',
{ types: SYSTEM.ACTIONS.actionTypes } { types: CONFIG.DH.ACTIONS.actionTypes }
), ),
title = 'Select Action Type', title = 'Select Action Type',
type = 'form', type = 'form',
@ -123,7 +123,7 @@ export default class DhSettingsActionView extends HandlebarsApplicationMixin(App
action = new cls({ action = new cls({
_id: foundry.utils.randomID(), _id: foundry.utils.randomID(),
type: actionType.type, type: actionType.type,
name: game.i18n.localize(SYSTEM.ACTIONS.actionTypes[actionType.type].name), name: game.i18n.localize(CONFIG.DH.ACTIONS.actionTypes[actionType.type].name),
...cls.getSourceConfig(this.document) ...cls.getSourceConfig(this.document)
}); });

8
module/applications/settings/homebrewSettings.mjs
View file

@ -7,7 +7,9 @@ export default class DhHomebrewSettings extends HandlebarsApplicationMixin(Appli
constructor() { constructor() {
super({}); super({});
this.settings = new DhHomebrew(game.settings.get(SYSTEM.id, SYSTEM.SETTINGS.gameSettings.Homebrew).toObject()); this.settings = new DhHomebrew(
game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Homebrew).toObject()
);
} }
get title() { get title() {
@ -113,7 +115,7 @@ export default class DhHomebrewSettings extends HandlebarsApplicationMixin(Appli
if (!confirmed) return; if (!confirmed) return;
const fields = game.settings.get(SYSTEM.id, SYSTEM.SETTINGS.gameSettings.Homebrew).schema.fields; const fields = game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Homebrew).schema.fields;
const removeUpdate = Object.keys(this.settings.restMoves[target.dataset.type].moves).reduce((acc, key) => { const removeUpdate = Object.keys(this.settings.restMoves[target.dataset.type].moves).reduce((acc, key) => {
acc[`-=${key}`] = null; acc[`-=${key}`] = null;
@ -153,7 +155,7 @@ export default class DhHomebrewSettings extends HandlebarsApplicationMixin(Appli
} }
static async save() { static async save() {
await game.settings.set(SYSTEM.id, SYSTEM.SETTINGS.gameSettings.Homebrew, this.settings.toObject()); await game.settings.set(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Homebrew, this.settings.toObject());
this.close(); this.close();
} }

8
module/applications/settings/rangeMeasurementSettings.mjs
View file

@ -7,7 +7,7 @@ export default class DhRangeMeasurementSettings extends HandlebarsApplicationMix
super({}); super({});
this.settings = new DhRangeMeasurement( this.settings = new DhRangeMeasurement(
game.settings.get(SYSTEM.id, SYSTEM.SETTINGS.gameSettings.RangeMeasurement).toObject() game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.RangeMeasurement).toObject()
); );
} }
@ -53,7 +53,11 @@ export default class DhRangeMeasurementSettings extends HandlebarsApplicationMix
} }
static async save() { static async save() {
await game.settings.set(SYSTEM.id, SYSTEM.SETTINGS.gameSettings.RangeMeasurement, this.settings.toObject()); await game.settings.set(
CONFIG.DH.id,
CONFIG.DH.SETTINGS.gameSettings.RangeMeasurement,
this.settings.toObject()
);
this.close(); this.close();
} }
} }

4
module/applications/settings/variantRuleSettings.mjs
View file

@ -7,7 +7,7 @@ export default class DHVariantRuleSettings extends HandlebarsApplicationMixin(Ap
super({}); super({});
this.settings = new DhVariantRules( this.settings = new DhVariantRules(
game.settings.get(SYSTEM.id, SYSTEM.SETTINGS.gameSettings.variantRules).toObject() game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.variantRules).toObject()
); );
} }
@ -53,7 +53,7 @@ export default class DHVariantRuleSettings extends HandlebarsApplicationMixin(Ap
} }
static async save() { static async save() {
await game.settings.set(SYSTEM.id, SYSTEM.SETTINGS.gameSettings.variantRules, this.settings.toObject()); await game.settings.set(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.variantRules, this.settings.toObject());
this.close(); this.close();
} }
} }

4
module/applications/sheets/actors/adversary.mjs
View file

@ -92,7 +92,7 @@ export default class AdversarySheet extends DaggerheartSheet(ActorSheetV2) {
}, },
chatMessage: { chatMessage: {
type: 'adversaryRoll', type: 'adversaryRoll',
template: 'systems/daggerheart/templates/chat/adversary-roll.hbs', template: 'systems/daggerheart/templates/ui/chat/adversary-roll.hbs',
mute: true mute: true
} }
}; };
@ -127,7 +127,7 @@ export default class AdversarySheet extends DaggerheartSheet(ActorSheetV2) {
user: game.user.id, user: game.user.id,
system: systemData, system: systemData,
content: await foundry.applications.handlebars.renderTemplate( content: await foundry.applications.handlebars.renderTemplate(
'systems/daggerheart/templates/chat/ability-use.hbs', 'systems/daggerheart/templates/ui/chat/ability-use.hbs',
systemData systemData
) )
}); });

59
module/applications/sheets/actors/character.mjs
View file

@ -1,13 +1,11 @@
import { capitalize } from '../../../helpers/utils.mjs'; import { capitalize } from '../../../helpers/utils.mjs';
import DhpDeathMove from '../../deathMove.mjs'; import DhpDeathMove from '../../dialogs/deathMove.mjs';
import DhpDowntime from '../../downtime.mjs'; import DhpDowntime from '../../dialogs/downtime.mjs';
import AncestrySelectionDialog from '../../ancestrySelectionDialog.mjs';
import DaggerheartSheet from '.././daggerheart-sheet.mjs'; import DaggerheartSheet from '.././daggerheart-sheet.mjs';
import { abilities } from '../../../config/actorConfig.mjs'; import { abilities } from '../../../applications/config/actorConfig.mjs';
import DhCharacterlevelUp from '../../levelup/characterLevelup.mjs'; import DhCharacterlevelUp from '../../levelup/characterLevelup.mjs';
import DhCharacterCreation from '../../characterCreation.mjs'; import DhCharacterCreation from '../../characterCreation/characterCreation.mjs';
import FilterMenu from '../../ux/filter-menu.mjs'; import FilterMenu from '../../ux/filter-menu.mjs';
import { DhBeastformAction } from '../../../data/action/action.mjs';
import DHActionConfig from '../../config/Action.mjs'; import DHActionConfig from '../../config/Action.mjs';
const { ActorSheetV2 } = foundry.applications.sheets; const { ActorSheetV2 } = foundry.applications.sheets;
@ -33,7 +31,6 @@ export default class CharacterSheet extends DaggerheartSheet(ActorSheetV2) {
useDomainCard: this.useDomainCard, useDomainCard: this.useDomainCard,
selectClass: this.selectClass, selectClass: this.selectClass,
selectSubclass: this.selectSubclass, selectSubclass: this.selectSubclass,
selectAncestry: this.selectAncestry,
selectCommunity: this.selectCommunity, selectCommunity: this.selectCommunity,
viewObject: this.viewObject, viewObject: this.viewObject,
useItem: this.useItem, useItem: this.useItem,
@ -338,13 +335,13 @@ export default class CharacterSheet extends DaggerheartSheet(ActorSheetV2) {
const context = await super._prepareContext(_options); const context = await super._prepareContext(_options);
context.document = this.document; context.document = this.document;
context.tabs = super._getTabs(this.constructor.TABS); context.tabs = super._getTabs(this.constructor.TABS);
context.config = SYSTEM; context.config = CONFIG.DH;
context.attributes = Object.keys(this.document.system.traits).reduce((acc, key) => { context.attributes = Object.keys(this.document.system.traits).reduce((acc, key) => {
acc[key] = { acc[key] = {
...this.document.system.traits[key], ...this.document.system.traits[key],
name: game.i18n.localize(SYSTEM.ACTOR.abilities[key].name), name: game.i18n.localize(CONFIG.DH.ACTOR.abilities[key].name),
verbs: SYSTEM.ACTOR.abilities[key].verbs.map(x => game.i18n.localize(x)) verbs: CONFIG.DH.ACTOR.abilities[key].verbs.map(x => game.i18n.localize(x))
}; };
return acc; return acc;
@ -360,7 +357,7 @@ export default class CharacterSheet extends DaggerheartSheet(ActorSheetV2) {
} }
}; };
const homebrewCurrency = game.settings.get(SYSTEM.id, SYSTEM.SETTINGS.gameSettings.Homebrew).currency; const homebrewCurrency = game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Homebrew).currency;
if (homebrewCurrency.enabled) { if (homebrewCurrency.enabled) {
context.inventory.currency = homebrewCurrency; context.inventory.currency = homebrewCurrency;
} }
@ -631,13 +628,13 @@ export default class CharacterSheet extends DaggerheartSheet(ActorSheetV2) {
static async toggleLoadoutView(_, button) { static async toggleLoadoutView(_, button) {
const newAbilityView = !(button.dataset.value === 'true'); const newAbilityView = !(button.dataset.value === 'true');
await game.user.setFlag(SYSTEM.id, SYSTEM.FLAGS.displayDomainCardsAsList, newAbilityView); await game.user.setFlag(CONFIG.DH.id, CONFIG.DH.FLAGS.displayDomainCardsAsList, newAbilityView);
this.render(); this.render();
} }
static async toggleLoadoutView(_, button) { static async toggleLoadoutView(_, button) {
const newAbilityView = !(button.dataset.value === 'true'); const newAbilityView = !(button.dataset.value === 'true');
await game.user.setFlag(SYSTEM.id, SYSTEM.FLAGS.displayDomainCardsAsList, newAbilityView); await game.user.setFlag(CONFIG.DH.id, CONFIG.DH.FLAGS.displayDomainCardsAsList, newAbilityView);
this.render(); this.render();
} }
@ -647,7 +644,7 @@ export default class CharacterSheet extends DaggerheartSheet(ActorSheetV2) {
const wasUsed = await weapon.use(event); const wasUsed = await weapon.use(event);
if (wasUsed) { if (wasUsed) {
Hooks.callAll(SYSTEM.HOOKS.characterAttack, {}); Hooks.callAll(CONFIG.DH.HOOKS.characterAttack, {});
} }
} }
@ -689,7 +686,7 @@ export default class CharacterSheet extends DaggerheartSheet(ActorSheetV2) {
type: 'abilityUse', type: 'abilityUse',
user: game.user.id, user: game.user.id,
content: await foundry.applications.handlebars.renderTemplate( content: await foundry.applications.handlebars.renderTemplate(
'systems/daggerheart/templates/chat/ability-use.hbs', 'systems/daggerheart/templates/ui/chat/ability-use.hbs',
systemData systemData
), ),
system: systemData system: systemData
@ -706,28 +703,6 @@ export default class CharacterSheet extends DaggerheartSheet(ActorSheetV2) {
(await game.packs.get('daggerheart.subclasses'))?.render(true); (await game.packs.get('daggerheart.subclasses'))?.render(true);
} }
static async selectAncestry() {
const dialogClosed = new Promise((resolve, _) => {
new AncestrySelectionDialog(resolve).render(true);
});
const result = await dialogClosed;
for (var ancestry of this.document.items.filter(x => x => x.type === 'ancestry')) {
await ancestry.delete();
}
const createdItems = [];
for (var feature of this.document.items.filter(
x => x.type === 'feature' && x.system.type === SYSTEM.ITEM.featureTypes.ancestry.id
)) {
await feature.delete();
}
createdItems.push(result.data);
await this.document.createEmbeddedDocuments('Item', createdItems);
}
static async selectCommunity() { static async selectCommunity() {
(await game.packs.get('daggerheart.communities'))?.render(true); (await game.packs.get('daggerheart.communities'))?.render(true);
} }
@ -744,7 +719,7 @@ export default class CharacterSheet extends DaggerheartSheet(ActorSheetV2) {
} else { } else {
const wasUsed = await item.use(event); const wasUsed = await item.use(event);
if (wasUsed && item.type === 'weapon') { if (wasUsed && item.type === 'weapon') {
Hooks.callAll(SYSTEM.HOOKS.characterAttack, {}); Hooks.callAll(CONFIG.DH.HOOKS.characterAttack, {});
} }
} }
} }
@ -840,7 +815,7 @@ export default class CharacterSheet extends DaggerheartSheet(ActorSheetV2) {
type: 'abilityUse', type: 'abilityUse',
user: game.user.id, user: game.user.id,
content: await foundry.applications.handlebars.renderTemplate( content: await foundry.applications.handlebars.renderTemplate(
'systems/daggerheart/templates/chat/ability-use.hbs', 'systems/daggerheart/templates/ui/chat/ability-use.hbs',
systemData systemData
), ),
system: systemData system: systemData
@ -862,7 +837,7 @@ export default class CharacterSheet extends DaggerheartSheet(ActorSheetV2) {
user: game.user.id, user: game.user.id,
system: systemData, system: systemData,
content: await foundry.applications.handlebars.renderTemplate( content: await foundry.applications.handlebars.renderTemplate(
'systems/daggerheart/templates/chat/ability-use.hbs', 'systems/daggerheart/templates/ui/chat/ability-use.hbs',
systemData systemData
) )
}); });
@ -898,7 +873,7 @@ export default class CharacterSheet extends DaggerheartSheet(ActorSheetV2) {
user: game.user.id, user: game.user.id,
system: systemData, system: systemData,
content: await foundry.applications.handlebars.renderTemplate( content: await foundry.applications.handlebars.renderTemplate(
'systems/daggerheart/templates/chat/ability-use.hbs', 'systems/daggerheart/templates/ui/chat/ability-use.hbs',
systemData systemData
) )
}); });
@ -921,7 +896,7 @@ export default class CharacterSheet extends DaggerheartSheet(ActorSheetV2) {
user: game.user.id, user: game.user.id,
system: systemData, system: systemData,
content: await foundry.applications.handlebars.renderTemplate( content: await foundry.applications.handlebars.renderTemplate(
'systems/daggerheart/templates/chat/ability-use.hbs', 'systems/daggerheart/templates/ui/chat/ability-use.hbs',
systemData systemData
) )
}); });

2
module/applications/sheets/actors/companion.mjs
View file

@ -90,7 +90,7 @@ export default class DhCompanionSheet extends DaggerheartSheet(ActorSheetV2) {
user: game.user.id, user: game.user.id,
system: systemData, system: systemData,
content: await foundry.applications.handlebars.renderTemplate( content: await foundry.applications.handlebars.renderTemplate(
'systems/daggerheart/templates/chat/ability-use.hbs', 'systems/daggerheart/templates/ui/chat/ability-use.hbs',
systemData systemData
) )
}); });

4
module/applications/sheets/api/application-mixin.mjs
View file

@ -139,7 +139,7 @@ export default function DHApplicationMixin(Base) {
* @param {DragEvent} event * @param {DragEvent} event
* @protected * @protected
*/ */
_onDrop(event) { } _onDrop(event) {}
/* -------------------------------------------- */ /* -------------------------------------------- */
/* Prepare Context */ /* Prepare Context */
@ -154,7 +154,7 @@ export default function DHApplicationMixin(Base) {
*/ */
async _prepareContext(options, objectPath = 'document') { async _prepareContext(options, objectPath = 'document') {
const context = await super._prepareContext(options); const context = await super._prepareContext(options);
context.config = CONFIG.daggerheart; context.config = CONFIG.DH;
context.source = this[objectPath]; context.source = this[objectPath];
context.fields = this[objectPath].schema.fields; context.fields = this[objectPath].schema.fields;
context.systemFields = this[objectPath].system ? this[objectPath].system.schema.fields : {}; context.systemFields = this[objectPath].system ? this[objectPath].system.schema.fields : {};

6
module/applications/sheets/api/base-item.mjs
View file

@ -69,8 +69,8 @@ export default class DHBaseItemSheet extends DHApplicationMixin(ItemSheetV2) {
*/ */
static async selectActionType() { static async selectActionType() {
const content = await foundry.applications.handlebars.renderTemplate( const content = await foundry.applications.handlebars.renderTemplate(
'systems/daggerheart/templates/views/actionType.hbs', 'systems/daggerheart/templates/actionTypes/actionType.hbs',
{ types: SYSTEM.ACTIONS.actionTypes } { types: CONFIG.DH.ACTIONS.actionTypes }
), ),
title = 'Select Action Type'; title = 'Select Action Type';
@ -98,7 +98,7 @@ export default class DHBaseItemSheet extends DHApplicationMixin(ItemSheetV2) {
{ {
_id: foundry.utils.randomID(), _id: foundry.utils.randomID(),
type: actionType, type: actionType,
name: game.i18n.localize(SYSTEM.ACTIONS.actionTypes[actionType].name), name: game.i18n.localize(CONFIG.DH.ACTIONS.actionTypes[actionType].name),
...cls.getSourceConfig(this.document) ...cls.getSourceConfig(this.document)
}, },
{ {

12
module/applications/sheets/applications/adversary-settings.mjs
View file

@ -40,24 +40,24 @@ export default class DHAdversarySettings extends HandlebarsApplicationMixin(Appl
static PARTS = { static PARTS = {
header: { header: {
id: 'header', id: 'header',
template: 'systems/daggerheart/templates/sheets/applications/adversary-settings/header.hbs' template: 'systems/daggerheart/templates/sheets-settings/adversary-settings/header.hbs'
}, },
tabs: { template: 'systems/daggerheart/templates/sheets/global/tabs/tab-navigation.hbs' }, tabs: { template: 'systems/daggerheart/templates/sheets/global/tabs/tab-navigation.hbs' },
details: { details: {
id: 'details', id: 'details',
template: 'systems/daggerheart/templates/sheets/applications/adversary-settings/details.hbs' template: 'systems/daggerheart/templates/sheets-settings/adversary-settings/details.hbs'
}, },
attack: { attack: {
id: 'attack', id: 'attack',
template: 'systems/daggerheart/templates/sheets/applications/adversary-settings/attack.hbs' template: 'systems/daggerheart/templates/sheets-settings/adversary-settings/attack.hbs'
}, },
experiences: { experiences: {
id: 'experiences', id: 'experiences',
template: 'systems/daggerheart/templates/sheets/applications/adversary-settings/experiences.hbs' template: 'systems/daggerheart/templates/sheets-settings/adversary-settings/experiences.hbs'
}, },
actions: { actions: {
id: 'actions', id: 'actions',
template: 'systems/daggerheart/templates/sheets/applications/adversary-settings/actions.hbs' template: 'systems/daggerheart/templates/sheets-settings/adversary-settings/actions.hbs'
} }
}; };
@ -139,7 +139,7 @@ export default class DHAdversarySettings extends HandlebarsApplicationMixin(Appl
{ {
_id: foundry.utils.randomID(), _id: foundry.utils.randomID(),
type: actionType, type: actionType,
name: game.i18n.localize(SYSTEM.ACTIONS.actionTypes[actionType].name), name: game.i18n.localize(CONFIG.DH.ACTIONS.actionTypes[actionType].name),
...cls.getSourceConfig(this.actor) ...cls.getSourceConfig(this.actor)
}, },
{ {

12
module/applications/sheets/applications/companion-settings.mjs
View file

@ -1,4 +1,4 @@
import { GMUpdateEvent, socketEvent } from '../../../helpers/socket.mjs'; import { GMUpdateEvent, socketEvent } from '../../../systemRegistration/socket.mjs';
import DhCompanionlevelUp from '../../levelup/companionLevelup.mjs'; import DhCompanionlevelUp from '../../levelup/companionLevelup.mjs';
const { HandlebarsApplicationMixin, ApplicationV2 } = foundry.applications.api; const { HandlebarsApplicationMixin, ApplicationV2 } = foundry.applications.api;
@ -35,20 +35,20 @@ export default class DHCompanionSettings extends HandlebarsApplicationMixin(Appl
static PARTS = { static PARTS = {
header: { header: {
id: 'header', id: 'header',
template: 'systems/daggerheart/templates/sheets/applications/companion-settings/header.hbs' template: 'systems/daggerheart/templates/sheets-settings/companion-settings/header.hbs'
}, },
tabs: { template: 'systems/daggerheart/templates/sheets/global/tabs/tab-navigation.hbs' }, tabs: { template: 'systems/daggerheart/templates/sheets/global/tabs/tab-navigation.hbs' },
details: { details: {
id: 'details', id: 'details',
template: 'systems/daggerheart/templates/sheets/applications/companion-settings/details.hbs' template: 'systems/daggerheart/templates/sheets-settings/companion-settings/details.hbs'
}, },
experiences: { experiences: {
id: 'experiences', id: 'experiences',
template: 'systems/daggerheart/templates/sheets/applications/companion-settings/experiences.hbs' template: 'systems/daggerheart/templates/sheets-settings/companion-settings/experiences.hbs'
}, },
attack: { attack: {
id: 'attack', id: 'attack',
template: 'systems/daggerheart/templates/sheets/applications/companion-settings/attack.hbs' template: 'systems/daggerheart/templates/sheets-settings/companion-settings/attack.hbs'
} }
}; };
@ -120,7 +120,7 @@ export default class DHCompanionSettings extends HandlebarsApplicationMixin(Appl
const partnerUpdate = { 'system.companion': event.target.value ? this.actor.uuid : null }; const partnerUpdate = { 'system.companion': event.target.value ? this.actor.uuid : null };
if (!partnerDocument.testUserPermission(game.user, CONST.DOCUMENT_OWNERSHIP_LEVELS.OWNER)) { if (!partnerDocument.testUserPermission(game.user, CONST.DOCUMENT_OWNERSHIP_LEVELS.OWNER)) {
await game.socket.emit(`system.${SYSTEM.id}`, { await game.socket.emit(`system.${CONFIG.DH.id}`, {
action: socketEvent.GMUpdate, action: socketEvent.GMUpdate,
data: { data: {
action: GMUpdateEvent.UpdateDocument, action: GMUpdateEvent.UpdateDocument,

12
module/applications/sheets/applications/environment-settings.mjs
View file

@ -44,20 +44,20 @@ export default class DHEnvironmentSettings extends HandlebarsApplicationMixin(Ap
static PARTS = { static PARTS = {
header: { header: {
id: 'header', id: 'header',
template: 'systems/daggerheart/templates/sheets/applications/environment-settings/header.hbs' template: 'systems/daggerheart/templates/sheets-settings/environment-settings/header.hbs'
}, },
tabs: { template: 'systems/daggerheart/templates/sheets/global/tabs/tab-navigation.hbs' }, tabs: { template: 'systems/daggerheart/templates/sheets/global/tabs/tab-navigation.hbs' },
details: { details: {
id: 'details', id: 'details',
template: 'systems/daggerheart/templates/sheets/applications/environment-settings/details.hbs' template: 'systems/daggerheart/templates/sheets-settings/environment-settings/details.hbs'
}, },
actions: { actions: {
id: 'actions', id: 'actions',
template: 'systems/daggerheart/templates/sheets/applications/environment-settings/actions.hbs' template: 'systems/daggerheart/templates/sheets-settings/environment-settings/actions.hbs'
}, },
adversaries: { adversaries: {
id: 'adversaries', id: 'adversaries',
template: 'systems/daggerheart/templates/sheets/applications/environment-settings/adversaries.hbs' template: 'systems/daggerheart/templates/sheets-settings/environment-settings/adversaries.hbs'
} }
}; };
@ -131,7 +131,7 @@ export default class DHEnvironmentSettings extends HandlebarsApplicationMixin(Ap
{ {
_id: foundry.utils.randomID(), _id: foundry.utils.randomID(),
type: actionType, type: actionType,
name: game.i18n.localize(SYSTEM.ACTIONS.actionTypes[actionType].name), name: game.i18n.localize(CONFIG.DH.ACTIONS.actionTypes[actionType].name),
...cls.getSourceConfig(this.actor) ...cls.getSourceConfig(this.actor)
}, },
{ {
@ -200,7 +200,7 @@ export default class DHEnvironmentSettings extends HandlebarsApplicationMixin(Ap
} }
async _onDrop(event) { async _onDrop(event) {
const data = TextEditor.getDragEventData(event); const data = foundry.applications.ux.TextEditor.implementation.getDragEventData(event);
const item = await fromUuid(data.uuid); const item = await fromUuid(data.uuid);
if (item.type === 'adversary') { if (item.type === 'adversary') {
const target = event.target.closest('.category-container'); const target = event.target.closest('.category-container');

2
module/applications/sheets/items/armor.mjs
View file

@ -8,7 +8,7 @@ export default class ArmorSheet extends DHBaseItemSheet {
tagifyConfigs: [ tagifyConfigs: [
{ {
selector: '.features-input', selector: '.features-input',
options: () => CONFIG.daggerheart.ITEM.armorFeatures, options: () => CONFIG.DH.ITEM.armorFeatures,
callback: ArmorSheet.#onFeatureSelect callback: ArmorSheet.#onFeatureSelect
} }
] ]

2
module/applications/sheets/items/beastform.mjs
View file

@ -55,7 +55,7 @@ export default class BeastformSheet extends DHBaseItemSheet {
} }
async _onDrop(event) { async _onDrop(event) {
const data = TextEditor.getDragEventData(event); const data = foundry.applications.ux.TextEditor.implementation.getDragEventData(event);
const item = await fromUuid(data.uuid); const item = await fromUuid(data.uuid);
if (item.type === 'feature') { if (item.type === 'feature') {
const current = this.document.system.features.map(x => x.uuid); const current = this.document.system.features.map(x => x.uuid);

8
module/applications/sheets/items/class.mjs
View file

@ -20,7 +20,7 @@ export default class ClassSheet extends DHBaseItemSheet {
tagifyConfigs: [ tagifyConfigs: [
{ {
selector: '.domain-input', selector: '.domain-input',
options: () => CONFIG.daggerheart.DOMAIN.domains, options: () => CONFIG.DH.DOMAIN.domains,
callback: ClassSheet.#onDomainSelect callback: ClassSheet.#onDomainSelect
} }
], ],
@ -172,8 +172,8 @@ export default class ClassSheet extends DHBaseItemSheet {
//TODO: redo this //TODO: redo this
async selectActionType() { async selectActionType() {
const content = await foundry.applications.handlebars.renderTemplate( const content = await foundry.applications.handlebars.renderTemplate(
'systems/daggerheart/templates/views/actionType.hbs', 'systems/daggerheart/templates/actionTypes/actionType.hbs',
{ types: SYSTEM.ACTIONS.actionTypes } { types: CONFIG.DH.ACTIONS.actionTypes }
), ),
title = 'Select Action Type', title = 'Select Action Type',
type = 'form', type = 'form',
@ -209,7 +209,7 @@ export default class ClassSheet extends DHBaseItemSheet {
_id: foundry.utils.randomID(), _id: foundry.utils.randomID(),
systemPath: actionPath, systemPath: actionPath,
type: actionType.type, type: actionType.type,
name: game.i18n.localize(SYSTEM.ACTIONS.actionTypes[actionType.type].name), name: game.i18n.localize(CONFIG.DH.ACTIONS.actionTypes[actionType.type].name),
...cls.getSourceConfig(this.document) ...cls.getSourceConfig(this.document)
}, },
{ {

6
module/applications/sheets/items/subclass.mjs
View file

@ -58,8 +58,8 @@ export default class SubclassSheet extends DHBaseItemSheet {
async #selectActionType() { async #selectActionType() {
const content = await foundry.applications.handlebars.renderTemplate( const content = await foundry.applications.handlebars.renderTemplate(
'systems/daggerheart/templates/views/actionType.hbs', 'systems/daggerheart/templates/actionTypes/actionType.hbs',
{ types: SYSTEM.ACTIONS.actionTypes } { types: CONFIG.DH.ACTIONS.actionTypes }
), ),
title = 'Select Action Type', title = 'Select Action Type',
type = 'form', type = 'form',
@ -87,7 +87,7 @@ export default class SubclassSheet extends DHBaseItemSheet {
_id: foundry.utils.randomID(), _id: foundry.utils.randomID(),
systemPath: `${level}.actions`, systemPath: `${level}.actions`,
type: actionType.type, type: actionType.type,
name: game.i18n.localize(SYSTEM.ACTIONS.actionTypes[actionType.type].name), name: game.i18n.localize(CONFIG.DH.ACTIONS.actionTypes[actionType.type].name),
...cls.getSourceConfig(this.document) ...cls.getSourceConfig(this.document)
}, },
{ {

2
module/applications/sheets/items/weapon.mjs
View file

@ -7,7 +7,7 @@ export default class WeaponSheet extends DHBaseItemSheet {
tagifyConfigs: [ tagifyConfigs: [
{ {
selector: '.features-input', selector: '.features-input',
options: () => CONFIG.daggerheart.ITEM.weaponFeatures, options: () => CONFIG.DH.ITEM.weaponFeatures,
callback: WeaponSheet.#onFeatureSelect callback: WeaponSheet.#onFeatureSelect
} }
] ]

6
module/applications/ui/_module.mjs Normal file
View file

@ -0,0 +1,6 @@
import { default as DhChatLog } from './chatLog.mjs';
import { default as DhCombatTracker } from './combatTracker.mjs';
import * as DhCountdowns from './countdowns.mjs';
import { default as DhFearTracker } from './fearTracker.mjs';
export { DhChatLog, DhCombatTracker, DhCountdowns, DhFearTracker };

4
module/ui/chatLog.mjs → module/applications/ui/chatLog.mjs
View file

@ -1,4 +1,4 @@
import { actionsTypes } from '../data/_module.mjs'; import { actionsTypes } from '../../data/_module.mjs';
export default class DhpChatLog extends foundry.applications.sidebar.tabs.ChatLog { export default class DhpChatLog extends foundry.applications.sidebar.tabs.ChatLog {
constructor() { constructor() {
@ -213,7 +213,7 @@ export default class DhpChatLog extends foundry.applications.sidebar.tabs.ChatLo
for (let target of targets) { for (let target of targets) {
let damage = message.system.roll.total; let damage = message.system.roll.total;
if (message.system.onSave && message.system.targets.find(t => t.id === target.id)?.saved?.success === true) if (message.system.onSave && message.system.targets.find(t => t.id === target.id)?.saved?.success === true)
damage = Math.ceil(damage * (SYSTEM.ACTIONS.damageOnSave[message.system.onSave]?.mod ?? 1)); damage = Math.ceil(damage * (CONFIG.DH.ACTIONS.damageOnSave[message.system.onSave]?.mod ?? 1));
await target.actor.takeDamage(damage, message.system.roll.type); await target.actor.takeDamage(damage, message.system.roll.type);
} }

14
module/ui/combatTracker.mjs → module/applications/ui/combatTracker.mjs
View file

@ -1,4 +1,4 @@
import { EncounterCountdowns } from '../applications/countdowns.mjs'; import { EncounterCountdowns } from '../ui/countdowns.mjs';
export default class DhCombatTracker extends foundry.applications.sidebar.tabs.CombatTracker { export default class DhCombatTracker extends foundry.applications.sidebar.tabs.CombatTracker {
static DEFAULT_OPTIONS = { static DEFAULT_OPTIONS = {
@ -12,13 +12,13 @@ export default class DhCombatTracker extends foundry.applications.sidebar.tabs.C
static PARTS = { static PARTS = {
header: { header: {
template: 'systems/daggerheart/templates/ui/combat/combatTrackerHeader.hbs' template: 'systems/daggerheart/templates/ui/combatTracker/combatTrackerHeader.hbs'
}, },
tracker: { tracker: {
template: 'systems/daggerheart/templates/ui/combat/combatTracker.hbs' template: 'systems/daggerheart/templates/ui/combatTracker/combatTracker.hbs'
}, },
footer: { footer: {
template: 'systems/daggerheart/templates/ui/combat/combatTrackerFooter.hbs' template: 'systems/daggerheart/templates/ui/combatTracker/combatTrackerFooter.hbs'
} }
}; };
@ -26,7 +26,7 @@ export default class DhCombatTracker extends foundry.applications.sidebar.tabs.C
await super._prepareCombatContext(context, options); await super._prepareCombatContext(context, options);
Object.assign(context, { Object.assign(context, {
fear: game.settings.get(SYSTEM.id, SYSTEM.SETTINGS.gameSettings.Resources.Fear) fear: game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Resources.Fear)
}); });
} }
@ -37,7 +37,7 @@ export default class DhCombatTracker extends foundry.applications.sidebar.tabs.C
const characters = context.turns?.filter(x => !x.isNPC) ?? []; const characters = context.turns?.filter(x => !x.isNPC) ?? [];
Object.assign(context, { Object.assign(context, {
actionTokens: game.settings.get(SYSTEM.id, SYSTEM.SETTINGS.gameSettings.variantRules).actionTokens, actionTokens: game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.variantRules).actionTokens,
adversaries, adversaries,
characters characters
}); });
@ -86,7 +86,7 @@ export default class DhCombatTracker extends foundry.applications.sidebar.tabs.C
.map(x => x.id) .map(x => x.id)
.indexOf(combatantId); .indexOf(combatantId);
if (this.viewed.turn !== toggleTurn) Hooks.callAll(SYSTEM.HOOKS.spotlight, {}); if (this.viewed.turn !== toggleTurn) Hooks.callAll(CONFIG.DH.HOOKS.spotlight, {});
await this.viewed.update({ turn: this.viewed.turn === toggleTurn ? null : toggleTurn }); await this.viewed.update({ turn: this.viewed.turn === toggleTurn ? null : toggleTurn });
await combatant.update({ 'system.spotlight.requesting': false }); await combatant.update({ 'system.spotlight.requesting': false });

79
module/applications/countdowns.mjs → module/applications/ui/countdowns.mjs
View file

@ -1,7 +1,7 @@
import { countdownTypes } from '../config/generalConfig.mjs'; import { countdownTypes } from '../config/generalConfig.mjs';
import { GMUpdateEvent, RefreshType, socketEvent } from '../helpers/socket.mjs'; import { GMUpdateEvent, RefreshType, socketEvent } from '../../systemRegistration/socket.mjs';
import constructHTMLButton from '../helpers/utils.mjs'; import constructHTMLButton from '../../helpers/utils.mjs';
import OwnershipSelection from './ownershipSelection.mjs'; import OwnershipSelection from '../dialogs/ownershipSelection.mjs';
const { HandlebarsApplicationMixin, ApplicationV2 } = foundry.applications.api; const { HandlebarsApplicationMixin, ApplicationV2 } = foundry.applications.api;
@ -41,7 +41,7 @@ class Countdowns extends HandlebarsApplicationMixin(ApplicationV2) {
static PARTS = { static PARTS = {
countdowns: { countdowns: {
template: 'systems/daggerheart/templates/views/countdowns.hbs', template: 'systems/daggerheart/templates/ui/countdowns.hbs',
scrollable: ['.expanded-view'] scrollable: ['.expanded-view']
} }
}; };
@ -57,18 +57,18 @@ class Countdowns extends HandlebarsApplicationMixin(ApplicationV2) {
async _preFirstRender(context, options) { async _preFirstRender(context, options) {
options.position = options.position =
game.user.getFlag(SYSTEM.id, SYSTEM.FLAGS[`${this.basePath}Countdown`].position) ?? game.user.getFlag(CONFIG.DH.id, CONFIG.DH.FLAGS[`${this.basePath}Countdown`].position) ??
Countdowns.DEFAULT_OPTIONS.position; Countdowns.DEFAULT_OPTIONS.position;
const viewSetting = const viewSetting =
game.user.getFlag(SYSTEM.id, SYSTEM.FLAGS[`${this.basePath}Countdown`].simple) ?? !game.user.isGM; game.user.getFlag(CONFIG.DH.id, CONFIG.DH.FLAGS[`${this.basePath}Countdown`].simple) ?? !game.user.isGM;
this.simpleView = this.simpleView =
game.user.isGM || !this.testUserPermission(CONST.DOCUMENT_OWNERSHIP_LEVELS.OBSERVER) ? viewSetting : true; game.user.isGM || !this.testUserPermission(CONST.DOCUMENT_OWNERSHIP_LEVELS.OBSERVER) ? viewSetting : true;
context.simple = this.simpleView; context.simple = this.simpleView;
} }
_onPosition(position) { _onPosition(position) {
game.user.setFlag(SYSTEM.id, SYSTEM.FLAGS[`${this.basePath}Countdown`].position, position); game.user.setFlag(CONFIG.DH.id, CONFIG.DH.FLAGS[`${this.basePath}Countdown`].position, position);
} }
async _renderFrame(options) { async _renderFrame(options) {
@ -90,7 +90,7 @@ class Countdowns extends HandlebarsApplicationMixin(ApplicationV2) {
if (game.user.isGM) return true; if (game.user.isGM) return true;
const settings = const settings =
altSettings ?? game.settings.get(SYSTEM.id, SYSTEM.SETTINGS.gameSettings.Countdowns)[this.basePath]; altSettings ?? game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Countdowns)[this.basePath];
const defaultAllowed = exact ? settings.ownership.default === level : settings.ownership.default >= level; const defaultAllowed = exact ? settings.ownership.default === level : settings.ownership.default >= level;
const userAllowed = exact const userAllowed = exact
? settings.playerOwnership[game.user.id]?.value === level ? settings.playerOwnership[game.user.id]?.value === level
@ -100,7 +100,9 @@ class Countdowns extends HandlebarsApplicationMixin(ApplicationV2) {
async _prepareContext(_options) { async _prepareContext(_options) {
const context = await super._prepareContext(_options); const context = await super._prepareContext(_options);
const countdownData = game.settings.get(SYSTEM.id, SYSTEM.SETTINGS.gameSettings.Countdowns)[this.basePath]; const countdownData = game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Countdowns)[
this.basePath
];
context.isGM = game.user.isGM; context.isGM = game.user.isGM;
context.base = this.basePath; context.base = this.basePath;
@ -131,19 +133,19 @@ class Countdowns extends HandlebarsApplicationMixin(ApplicationV2) {
static async updateData(event, _, formData) { static async updateData(event, _, formData) {
const data = foundry.utils.expandObject(formData.object); const data = foundry.utils.expandObject(formData.object);
const newSetting = foundry.utils.mergeObject( const newSetting = foundry.utils.mergeObject(
game.settings.get(SYSTEM.id, SYSTEM.SETTINGS.gameSettings.Countdowns).toObject(), game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Countdowns).toObject(),
data data
); );
if (game.user.isGM) { if (game.user.isGM) {
await game.settings.set(SYSTEM.id, SYSTEM.SETTINGS.gameSettings.Countdowns, newSetting); await game.settings.set(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Countdowns, newSetting);
this.render(); this.render();
} else { } else {
await game.socket.emit(`system.${SYSTEM.id}`, { await game.socket.emit(`system.${CONFIG.DH.id}`, {
action: socketEvent.GMUpdate, action: socketEvent.GMUpdate,
data: { data: {
action: GMUpdateEvent.UpdateSetting, action: GMUpdateEvent.UpdateSetting,
uuid: SYSTEM.SETTINGS.gameSettings.Countdowns, uuid: CONFIG.DH.SETTINGS.gameSettings.Countdowns,
update: newSetting update: newSetting
} }
}); });
@ -152,8 +154,8 @@ class Countdowns extends HandlebarsApplicationMixin(ApplicationV2) {
async updateSetting(update) { async updateSetting(update) {
if (game.user.isGM) { if (game.user.isGM) {
await game.settings.set(SYSTEM.id, SYSTEM.SETTINGS.gameSettings.Countdowns, update); await game.settings.set(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Countdowns, update);
await game.socket.emit(`system.${SYSTEM.id}`, { await game.socket.emit(`system.${CONFIG.DH.id}`, {
action: socketEvent.Refresh, action: socketEvent.Refresh,
data: { data: {
refreshType: RefreshType.Countdown, refreshType: RefreshType.Countdown,
@ -163,11 +165,11 @@ class Countdowns extends HandlebarsApplicationMixin(ApplicationV2) {
this.render(); this.render();
} else { } else {
await game.socket.emit(`system.${SYSTEM.id}`, { await game.socket.emit(`system.${CONFIG.DH.id}`, {
action: socketEvent.GMUpdate, action: socketEvent.GMUpdate,
data: { data: {
action: GMUpdateEvent.UpdateSetting, action: GMUpdateEvent.UpdateSetting,
uuid: SYSTEM.SETTINGS.gameSettings.Countdowns, uuid: CONFIG.DH.SETTINGS.gameSettings.Countdowns,
update: update, update: update,
refresh: { refreshType: RefreshType.Countdown, application: `${this.basePath}-countdowns` } refresh: { refreshType: RefreshType.Countdown, application: `${this.basePath}-countdowns` }
} }
@ -176,7 +178,7 @@ class Countdowns extends HandlebarsApplicationMixin(ApplicationV2) {
} }
static onEditImage(_, target) { static onEditImage(_, target) {
const setting = game.settings.get(SYSTEM.id, SYSTEM.SETTINGS.gameSettings.Countdowns)[this.basePath]; const setting = game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Countdowns)[this.basePath];
const current = setting.countdowns[target.dataset.countdown].img; const current = setting.countdowns[target.dataset.countdown].img;
const fp = new foundry.applications.apps.FilePicker.implementation({ const fp = new foundry.applications.apps.FilePicker.implementation({
current, current,
@ -189,7 +191,7 @@ class Countdowns extends HandlebarsApplicationMixin(ApplicationV2) {
} }
async updateImage(path, countdown) { async updateImage(path, countdown) {
const setting = game.settings.get(SYSTEM.id, SYSTEM.SETTINGS.gameSettings.Countdowns); const setting = game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Countdowns);
await setting.updateSource({ await setting.updateSource({
[`${this.basePath}.countdowns.${countdown}.img`]: path [`${this.basePath}.countdowns.${countdown}.img`]: path
}); });
@ -199,16 +201,16 @@ class Countdowns extends HandlebarsApplicationMixin(ApplicationV2) {
static openOwnership(_, target) { static openOwnership(_, target) {
new Promise((resolve, reject) => { new Promise((resolve, reject) => {
const setting = game.settings.get(SYSTEM.id, SYSTEM.SETTINGS.gameSettings.Countdowns)[this.basePath]; const setting = game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Countdowns)[this.basePath];
const ownership = { default: setting.ownership.default, players: setting.playerOwnership }; const ownership = { default: setting.ownership.default, players: setting.playerOwnership };
new OwnershipSelection(resolve, reject, this.title, ownership).render(true); new OwnershipSelection(resolve, reject, this.title, ownership).render(true);
}).then(async ownership => { }).then(async ownership => {
const setting = game.settings.get(SYSTEM.id, SYSTEM.SETTINGS.gameSettings.Countdowns); const setting = game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Countdowns);
await setting.updateSource({ await setting.updateSource({
[`${this.basePath}.ownership`]: ownership [`${this.basePath}.ownership`]: ownership
}); });
await game.settings.set(SYSTEM.id, SYSTEM.SETTINGS.gameSettings.Countdowns, setting.toObject()); await game.settings.set(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Countdowns, setting.toObject());
this.render(); this.render();
}); });
} }
@ -216,29 +218,29 @@ class Countdowns extends HandlebarsApplicationMixin(ApplicationV2) {
static openCountdownOwnership(_, target) { static openCountdownOwnership(_, target) {
const countdownId = target.dataset.countdown; const countdownId = target.dataset.countdown;
new Promise((resolve, reject) => { new Promise((resolve, reject) => {
const countdown = game.settings.get(SYSTEM.id, SYSTEM.SETTINGS.gameSettings.Countdowns)[this.basePath] const countdown = game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Countdowns)[this.basePath]
.countdowns[countdownId]; .countdowns[countdownId];
const ownership = { default: countdown.ownership.default, players: countdown.playerOwnership }; const ownership = { default: countdown.ownership.default, players: countdown.playerOwnership };
new OwnershipSelection(resolve, reject, countdown.name, ownership).render(true); new OwnershipSelection(resolve, reject, countdown.name, ownership).render(true);
}).then(async ownership => { }).then(async ownership => {
const setting = game.settings.get(SYSTEM.id, SYSTEM.SETTINGS.gameSettings.Countdowns); const setting = game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Countdowns);
await setting.updateSource({ await setting.updateSource({
[`${this.basePath}.countdowns.${countdownId}.ownership`]: ownership [`${this.basePath}.countdowns.${countdownId}.ownership`]: ownership
}); });
await game.settings.set(SYSTEM.id, SYSTEM.SETTINGS.gameSettings.Countdowns, setting); await game.settings.set(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Countdowns, setting);
this.render(); this.render();
}); });
} }
static async toggleSimpleView() { static async toggleSimpleView() {
this.simpleView = !this.simpleView; this.simpleView = !this.simpleView;
await game.user.setFlag(SYSTEM.id, SYSTEM.FLAGS[`${this.basePath}Countdown`].simple, this.simpleView); await game.user.setFlag(CONFIG.DH.id, CONFIG.DH.FLAGS[`${this.basePath}Countdown`].simple, this.simpleView);
this.render(); this.render();
} }
async updateCountdownValue(event, increase) { async updateCountdownValue(event, increase) {
const countdownSetting = game.settings.get(SYSTEM.id, SYSTEM.SETTINGS.gameSettings.Countdowns); const countdownSetting = game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Countdowns);
const countdown = countdownSetting[this.basePath].countdowns[event.currentTarget.dataset.countdown]; const countdown = countdownSetting[this.basePath].countdowns[event.currentTarget.dataset.countdown];
if (!this.testUserPermission(CONST.DOCUMENT_OWNERSHIP_LEVELS.OWNER)) { if (!this.testUserPermission(CONST.DOCUMENT_OWNERSHIP_LEVELS.OWNER)) {
@ -260,7 +262,7 @@ class Countdowns extends HandlebarsApplicationMixin(ApplicationV2) {
} }
static async addCountdown() { static async addCountdown() {
const countdownSetting = game.settings.get(SYSTEM.id, SYSTEM.SETTINGS.gameSettings.Countdowns); const countdownSetting = game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Countdowns);
await countdownSetting.updateSource({ await countdownSetting.updateSource({
[`${this.basePath}.countdowns.${foundry.utils.randomID()}`]: { [`${this.basePath}.countdowns.${foundry.utils.randomID()}`]: {
name: game.i18n.localize('DAGGERHEART.Countdown.NewCountdown'), name: game.i18n.localize('DAGGERHEART.Countdown.NewCountdown'),
@ -278,7 +280,7 @@ class Countdowns extends HandlebarsApplicationMixin(ApplicationV2) {
} }
static async removeCountdown(_, target) { static async removeCountdown(_, target) {
const countdownSetting = game.settings.get(SYSTEM.id, SYSTEM.SETTINGS.gameSettings.Countdowns); const countdownSetting = game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Countdowns);
const countdownName = countdownSetting[this.basePath].countdowns[target.dataset.countdown].name; const countdownName = countdownSetting[this.basePath].countdowns[target.dataset.countdown].name;
const confirmed = await foundry.applications.api.DialogV2.confirm({ const confirmed = await foundry.applications.api.DialogV2.confirm({
@ -297,8 +299,9 @@ class Countdowns extends HandlebarsApplicationMixin(ApplicationV2) {
async open() { async open() {
await this.render(true); await this.render(true);
if ( if (
Object.keys(game.settings.get(SYSTEM.id, SYSTEM.SETTINGS.gameSettings.Countdowns)[this.basePath].countdowns) Object.keys(
.length > 0 game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Countdowns)[this.basePath].countdowns
).length > 0
) { ) {
this.minimize(); this.minimize();
} }
@ -327,8 +330,8 @@ export class EncounterCountdowns extends Countdowns {
export const registerCountdownApplicationHooks = () => { export const registerCountdownApplicationHooks = () => {
const updateCountdowns = async shouldProgress => { const updateCountdowns = async shouldProgress => {
if (game.settings.get(SYSTEM.id, SYSTEM.SETTINGS.gameSettings.Automation).countdowns) { if (game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Automation).countdowns) {
const countdownSetting = game.settings.get(SYSTEM.id, SYSTEM.SETTINGS.gameSettings.Countdowns); const countdownSetting = game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Countdowns);
for (let countdownCategoryKey in countdownSetting) { for (let countdownCategoryKey in countdownSetting) {
const countdownCategory = countdownSetting[countdownCategoryKey]; const countdownCategory = countdownSetting[countdownCategoryKey];
for (let countdownKey in countdownCategory.countdowns) { for (let countdownKey in countdownCategory.countdowns) {
@ -339,7 +342,11 @@ export const registerCountdownApplicationHooks = () => {
[`${countdownCategoryKey}.countdowns.${countdownKey}.progress.current`]: [`${countdownCategoryKey}.countdowns.${countdownKey}.progress.current`]:
countdown.progress.current - 1 countdown.progress.current - 1
}); });
await game.settings.set(SYSTEM.id, SYSTEM.SETTINGS.gameSettings.Countdowns, countdownSetting); await game.settings.set(
CONFIG.DH.id,
CONFIG.DH.SETTINGS.gameSettings.Countdowns,
countdownSetting
);
foundry.applications.instances.get(`${countdownCategoryKey}-countdowns`)?.render(); foundry.applications.instances.get(`${countdownCategoryKey}-countdowns`)?.render();
} }
} }
@ -347,7 +354,7 @@ export const registerCountdownApplicationHooks = () => {
} }
}; };
Hooks.on(SYSTEM.HOOKS.characterAttack, async () => { Hooks.on(CONFIG.DH.HOOKS.characterAttack, async () => {
updateCountdowns(countdown => { updateCountdowns(countdown => {
return ( return (
countdown.progress.type.value === countdownTypes.characterAttack.id && countdown.progress.current > 0 countdown.progress.type.value === countdownTypes.characterAttack.id && countdown.progress.current > 0
@ -355,7 +362,7 @@ export const registerCountdownApplicationHooks = () => {
}); });
}); });
Hooks.on(SYSTEM.HOOKS.spotlight, async () => { Hooks.on(CONFIG.DH.HOOKS.spotlight, async () => {
updateCountdowns(countdown => { updateCountdowns(countdown => {
return countdown.progress.type.value === countdownTypes.spotlight.id && countdown.progress.current > 0; return countdown.progress.type.value === countdownTypes.spotlight.id && countdown.progress.current > 0;
}); });

23
module/applications/resources.mjs → module/applications/ui/fearTracker.mjs
View file

@ -8,7 +8,7 @@ const { HandlebarsApplicationMixin, ApplicationV2 } = foundry.applications.api;
* @mixes HandlebarsApplication * @mixes HandlebarsApplication
*/ */
export default class Resources extends HandlebarsApplicationMixin(ApplicationV2) { export default class FearTracker extends HandlebarsApplicationMixin(ApplicationV2) {
constructor(options = {}) { constructor(options = {}) {
super(options); super(options);
} }
@ -26,8 +26,8 @@ export default class Resources extends HandlebarsApplicationMixin(ApplicationV2)
minimizable: false minimizable: false
}, },
actions: { actions: {
setFear: Resources.setFear, setFear: FearTracker.setFear,
increaseFear: Resources.increaseFear increaseFear: FearTracker.increaseFear
}, },
position: { position: {
width: 222, width: 222,
@ -41,16 +41,16 @@ export default class Resources extends HandlebarsApplicationMixin(ApplicationV2)
static PARTS = { static PARTS = {
resources: { resources: {
root: true, root: true,
template: 'systems/daggerheart/templates/views/resources.hbs' template: 'systems/daggerheart/templates/ui/fearTracker.hbs'
} }
}; };
get currentFear() { get currentFear() {
return game.settings.get(SYSTEM.id, SYSTEM.SETTINGS.gameSettings.Resources.Fear); return game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Resources.Fear);
} }
get maxFear() { get maxFear() {
return game.settings.get(SYSTEM.id, SYSTEM.SETTINGS.gameSettings.Homebrew).maxFear; return game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Homebrew).maxFear;
} }
/* -------------------------------------------- */ /* -------------------------------------------- */
@ -59,7 +59,7 @@ export default class Resources extends HandlebarsApplicationMixin(ApplicationV2)
/** @override */ /** @override */
async _prepareContext(_options) { async _prepareContext(_options) {
const display = game.settings.get(SYSTEM.id, SYSTEM.SETTINGS.gameSettings.appearance).displayFear, const display = game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.appearance).displayFear,
current = this.currentFear, current = this.currentFear,
max = this.maxFear, max = this.maxFear,
percent = (current / max) * 100, percent = (current / max) * 100,
@ -70,17 +70,18 @@ export default class Resources extends HandlebarsApplicationMixin(ApplicationV2)
/** @override */ /** @override */
async _preFirstRender(context, options) { async _preFirstRender(context, options) {
options.position = game.user.getFlag(SYSTEM.id, 'app.resources.position') ?? Resources.DEFAULT_OPTIONS.position; options.position =
game.user.getFlag(CONFIG.DH.id, 'app.resources.position') ?? FearTracker.DEFAULT_OPTIONS.position;
} }
/** @override */ /** @override */
async _preRender(context, options) { async _preRender(context, options) {
if (this.currentFear > this.maxFear) if (this.currentFear > this.maxFear)
await game.settings.set(SYSTEM.id, SYSTEM.SETTINGS.gameSettings.Resources.Fear, this.maxFear); await game.settings.set(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Resources.Fear, this.maxFear);
} }
_onPosition(position) { _onPosition(position) {
game.user.setFlag(SYSTEM.id, 'app.resources.position', position); game.user.setFlag(CONFIG.DH.id, 'app.resources.position', position);
} }
async close(options = {}) { async close(options = {}) {
@ -104,6 +105,6 @@ export default class Resources extends HandlebarsApplicationMixin(ApplicationV2)
async updateFear(value) { async updateFear(value) {
if (!game.user.isGM) return; if (!game.user.isGM) return;
value = Math.max(0, Math.min(this.maxFear, value)); value = Math.max(0, Math.min(this.maxFear, value));
await game.settings.set(SYSTEM.id, SYSTEM.SETTINGS.gameSettings.Resources.Fear, value); await game.settings.set(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Resources.Fear, value);
} }
} }

0
module/applications/contextMenu.mjs → module/applications/ux/contextMenu.mjs
View file

11
module/applications/ux/filter-menu.mjs
View file

@ -19,7 +19,8 @@ export default class FilterMenu extends foundry.applications.ux.ContextMenu {
const mergedOptions = { const mergedOptions = {
eventName: 'click', eventName: 'click',
fixed: true, fixed: true,
...options ...options,
jQuery: false
}; };
super(container, selector, menuItems, mergedOptions); super(container, selector, menuItems, mergedOptions);
@ -176,7 +177,7 @@ export default class FilterMenu extends foundry.applications.ux.ContextMenu {
} }
})); }));
const burdenFilter = Object.values(CONFIG.daggerheart.GENERAL.burden).map(({ value, label }) => ({ const burdenFilter = Object.values(CONFIG.DH.GENERAL.burden).map(({ value, label }) => ({
group: game.i18n.localize('DAGGERHEART.Sheets.Weapon.Burden'), group: game.i18n.localize('DAGGERHEART.Sheets.Weapon.Burden'),
name: game.i18n.localize(label), name: game.i18n.localize(label),
filter: { filter: {
@ -186,7 +187,7 @@ export default class FilterMenu extends foundry.applications.ux.ContextMenu {
} }
})); }));
const damageTypeFilter = Object.values(CONFIG.daggerheart.GENERAL.damageTypes).map(({ id, abbreviation }) => ({ const damageTypeFilter = Object.values(CONFIG.DH.GENERAL.damageTypes).map(({ id, abbreviation }) => ({
group: 'Damage Type', //TODO localize group: 'Damage Type', //TODO localize
name: game.i18n.localize(abbreviation), name: game.i18n.localize(abbreviation),
filter: { filter: {
@ -210,7 +211,7 @@ export default class FilterMenu extends foundry.applications.ux.ContextMenu {
static get cardsFilters() { static get cardsFilters() {
const { OPERATORS } = foundry.applications.ux.SearchFilter; const { OPERATORS } = foundry.applications.ux.SearchFilter;
const typesFilters = Object.values(CONFIG.daggerheart.DOMAIN.cardTypes).map(({ id, label }) => ({ const typesFilters = Object.values(CONFIG.DH.DOMAIN.cardTypes).map(({ id, label }) => ({
group: game.i18n.localize('Type'), group: game.i18n.localize('Type'),
name: game.i18n.localize(label), name: game.i18n.localize(label),
filter: { filter: {
@ -220,7 +221,7 @@ export default class FilterMenu extends foundry.applications.ux.ContextMenu {
} }
})); }));
const domainFilter = Object.values(CONFIG.daggerheart.DOMAIN.domains).map(({ id, label }) => ({ const domainFilter = Object.values(CONFIG.DH.DOMAIN.domains).map(({ id, label }) => ({
group: game.i18n.localize('DAGGERHEART.Sheets.DomainCard.Domain'), group: game.i18n.localize('DAGGERHEART.Sheets.DomainCard.Domain'),
name: game.i18n.localize(label), name: game.i18n.localize(label),
filter: { filter: {

3
module/canvas/_module.mjs Normal file
View file

@ -0,0 +1,3 @@
import * as DhPlaceables from './placeables/_module.mjs';
export { DhPlaceables };

5
module/canvas/placeables/_module.mjs Normal file
View file

@ -0,0 +1,5 @@
import { default as DhMeasuredTemplate } from './measuredTemplate.mjs';
import { default as DhRuler } from './ruler.mjs';
import { default as DhTokenRuler } from './tokenRuler.mjs';
export { DhMeasuredTemplate, DhRuler, DhTokenRuler };

5
module/placeables/measuredTemplate.mjs → module/canvas/placeables/measuredTemplate.mjs
View file

@ -2,7 +2,10 @@ export default class DhMeasuredTemplate extends foundry.canvas.placeables.Measur
_refreshRulerText() { _refreshRulerText() {
super._refreshRulerText(); super._refreshRulerText();
const rangeMeasurementSettings = game.settings.get(SYSTEM.id, SYSTEM.SETTINGS.gameSettings.RangeMeasurement); const rangeMeasurementSettings = game.settings.get(
CONFIG.DH.id,
CONFIG.DH.SETTINGS.gameSettings.RangeMeasurement
);
if (rangeMeasurementSettings.enabled) { if (rangeMeasurementSettings.enabled) {
const splitRulerText = this.ruler.text.split(' '); const splitRulerText = this.ruler.text.split(' ');
if (splitRulerText.length > 0) { if (splitRulerText.length > 0) {

2
module/ui/ruler.mjs → module/canvas/placeables/ruler.mjs
View file

@ -5,7 +5,7 @@ export default class DhpRuler extends foundry.canvas.interaction.Ruler {
const context = super._getWaypointLabelContext(waypoint, state); const context = super._getWaypointLabelContext(waypoint, state);
if (!context) return; if (!context) return;
const range = game.settings.get(SYSTEM.id, SYSTEM.SETTINGS.gameSettings.RangeMeasurement); const range = game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.RangeMeasurement);
if (range.enabled) { if (range.enabled) {
const distance = DhMeasuredTemplate.getDistanceLabel(waypoint.measurement.distance.toNearest(0.01), range); const distance = DhMeasuredTemplate.getDistanceLabel(waypoint.measurement.distance.toNearest(0.01), range);

2
module/ui/tokenRuler.mjs → module/canvas/placeables/tokenRuler.mjs
View file

@ -5,7 +5,7 @@ export default class DhpTokenRuler extends foundry.canvas.placeables.tokens.Toke
const context = super._getWaypointLabelContext(waypoint, state); const context = super._getWaypointLabelContext(waypoint, state);
if (!context) return; if (!context) return;
const range = game.settings.get(SYSTEM.id, SYSTEM.SETTINGS.gameSettings.RangeMeasurement); const range = game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.RangeMeasurement);
if (range.enabled) { if (range.enabled) {
const distance = DhMeasuredTemplate.getDistanceLabel(waypoint.measurement.distance.toNearest(0.01), range); const distance = DhMeasuredTemplate.getDistanceLabel(waypoint.measurement.distance.toNearest(0.01), range);

68
module/data/action/action.mjs
View file

@ -1,7 +1,7 @@
import { DHActionDiceData, DHActionRollData, DHDamageData, DHDamageField } from './actionDice.mjs'; import { DHActionDiceData, DHActionRollData, DHDamageData, DHDamageField } from './actionDice.mjs';
import DhpActor from '../../documents/actor.mjs'; import DhpActor from '../../documents/actor.mjs';
import D20RollDialog from '../../dialogs/d20RollDialog.mjs'; import D20RollDialog from '../../applications/dialogs/d20RollDialog.mjs';
import BeastformDialog from '../../dialogs/beastformDialog.mjs'; import BeastformDialog from '../../applications/dialogs/beastformDialog.mjs';
const fields = foundry.data.fields; const fields = foundry.data.fields;
@ -33,11 +33,15 @@ export class DHBaseAction extends foundry.abstract.DataModel {
description: new fields.HTMLField(), description: new fields.HTMLField(),
img: new fields.FilePathField({ initial: undefined, categories: ['IMAGE'], base64: false }), img: new fields.FilePathField({ initial: undefined, categories: ['IMAGE'], base64: false }),
chatDisplay: new fields.BooleanField({ initial: true, label: 'Display in chat' }), chatDisplay: new fields.BooleanField({ initial: true, label: 'Display in chat' }),
actionType: new fields.StringField({ choices: SYSTEM.ITEM.actionTypes, initial: 'action', nullable: true }), actionType: new fields.StringField({
choices: CONFIG.DH.ITEM.actionTypes,
initial: 'action',
nullable: true
}),
cost: new fields.ArrayField( cost: new fields.ArrayField(
new fields.SchemaField({ new fields.SchemaField({
type: new fields.StringField({ type: new fields.StringField({
choices: SYSTEM.GENERAL.abilityCosts, choices: CONFIG.DH.GENERAL.abilityCosts,
nullable: false, nullable: false,
required: true, required: true,
initial: 'hope' initial: 'hope'
@ -51,13 +55,13 @@ export class DHBaseAction extends foundry.abstract.DataModel {
value: new fields.NumberField({ nullable: true, initial: null }), value: new fields.NumberField({ nullable: true, initial: null }),
max: new fields.NumberField({ nullable: true, initial: null }), max: new fields.NumberField({ nullable: true, initial: null }),
recovery: new fields.StringField({ recovery: new fields.StringField({
choices: SYSTEM.GENERAL.refreshTypes, choices: CONFIG.DH.GENERAL.refreshTypes,
initial: null, initial: null,
nullable: true nullable: true
}) })
}), }),
range: new fields.StringField({ range: new fields.StringField({
choices: SYSTEM.GENERAL.range, choices: CONFIG.DH.GENERAL.range,
required: false, required: false,
blank: true blank: true
// initial: null // initial: null
@ -71,17 +75,21 @@ export class DHBaseAction extends foundry.abstract.DataModel {
damage: new DHDamageField(), damage: new DHDamageField(),
roll: new fields.EmbeddedDataField(DHActionRollData), roll: new fields.EmbeddedDataField(DHActionRollData),
save: new fields.SchemaField({ save: new fields.SchemaField({
trait: new fields.StringField({ nullable: true, initial: null, choices: SYSTEM.ACTOR.abilities }), trait: new fields.StringField({
nullable: true,
initial: null,
choices: CONFIG.DH.ACTOR.abilities
}),
difficulty: new fields.NumberField({ nullable: true, initial: 10, integer: true, min: 0 }), difficulty: new fields.NumberField({ nullable: true, initial: 10, integer: true, min: 0 }),
damageMod: new fields.StringField({ damageMod: new fields.StringField({
initial: SYSTEM.ACTIONS.damageOnSave.none.id, initial: CONFIG.DH.ACTIONS.damageOnSave.none.id,
choices: SYSTEM.ACTIONS.damageOnSave choices: CONFIG.DH.ACTIONS.damageOnSave
}) })
}), }),
target: new fields.SchemaField({ target: new fields.SchemaField({
type: new fields.StringField({ type: new fields.StringField({
choices: SYSTEM.ACTIONS.targetTypes, choices: CONFIG.DH.ACTIONS.targetTypes,
initial: SYSTEM.ACTIONS.targetTypes.any.id, initial: CONFIG.DH.ACTIONS.targetTypes.any.id,
nullable: true, nullable: true,
initial: null initial: null
}), }),
@ -95,10 +103,10 @@ export class DHBaseAction extends foundry.abstract.DataModel {
), ),
healing: new fields.SchemaField({ healing: new fields.SchemaField({
type: new fields.StringField({ type: new fields.StringField({
choices: SYSTEM.GENERAL.healingTypes, choices: CONFIG.DH.GENERAL.healingTypes,
required: true, required: true,
blank: false, blank: false,
initial: SYSTEM.GENERAL.healingTypes.hitPoints.id, initial: CONFIG.DH.GENERAL.healingTypes.hitPoints.id,
label: 'Healing' label: 'Healing'
}), }),
resultBased: new fields.BooleanField({ resultBased: new fields.BooleanField({
@ -143,7 +151,7 @@ export class DHBaseAction extends foundry.abstract.DataModel {
} }
get chatTemplate() { get chatTemplate() {
return 'systems/daggerheart/templates/chat/duality-roll.hbs'; return 'systems/daggerheart/templates/ui/chat/duality-roll.hbs';
} }
static getRollType(parent) { static getRollType(parent) {
@ -228,7 +236,7 @@ export class DHBaseAction extends foundry.abstract.DataModel {
data: actorData data: actorData
}; };
if (Hooks.call(`${SYSTEM.id}.preUseAction`, this, config) === false) return; if (Hooks.call(`${CONFIG.DH.id}.preUseAction`, this, config) === false) return;
// Display configuration window if necessary // Display configuration window if necessary
if (config.dialog?.configure && this.requireConfigurationDialog(config)) { if (config.dialog?.configure && this.requireConfigurationDialog(config)) {
@ -284,7 +292,7 @@ export class DHBaseAction extends foundry.abstract.DataModel {
// Consume resources // Consume resources
await this.consume(config); await this.consume(config);
if (Hooks.call(`${SYSTEM.id}.postUseAction`, this, config) === false) return; if (Hooks.call(`${CONFIG.DH.id}.postUseAction`, this, config) === false) return;
return config; return config;
} }
@ -324,11 +332,11 @@ export class DHBaseAction extends foundry.abstract.DataModel {
prepareTarget() { prepareTarget() {
let targets; let targets;
if (this.target?.type === SYSTEM.ACTIONS.targetTypes.self.id) if (this.target?.type === CONFIG.DH.ACTIONS.targetTypes.self.id)
targets = this.constructor.formatTarget(this.actor.token ?? this.actor.prototypeToken); targets = this.constructor.formatTarget(this.actor.token ?? this.actor.prototypeToken);
targets = Array.from(game.user.targets); targets = Array.from(game.user.targets);
// foundry.CONST.TOKEN_DISPOSITIONS.FRIENDLY // foundry.CONST.TOKEN_DISPOSITIONS.FRIENDLY
if (this.target?.type && this.target.type !== SYSTEM.ACTIONS.targetTypes.any.id) { if (this.target?.type && this.target.type !== CONFIG.DH.ACTIONS.targetTypes.any.id) {
targets = targets.filter(t => this.isTargetFriendly(t)); targets = targets.filter(t => this.isTargetFriendly(t));
if (this.target.amount && targets.length > this.target.amount) targets = []; if (this.target.amount && targets.length > this.target.amount) targets = [];
} }
@ -350,7 +358,7 @@ export class DHBaseAction extends foundry.abstract.DataModel {
difficulty: this.roll?.difficulty, difficulty: this.roll?.difficulty,
formula: this.roll.getFormula(), formula: this.roll.getFormula(),
bonus: this.roll.bonus, bonus: this.roll.bonus,
advantage: SYSTEM.ACTIONS.advandtageState[this.roll.advState].value advantage: CONFIG.DH.ACTIONS.advandtageState[this.roll.advState].value
}; };
if (this.roll?.type === 'diceSet') roll.lite = true; if (this.roll?.type === 'diceSet') roll.lite = true;
@ -413,7 +421,7 @@ export class DHBaseAction extends foundry.abstract.DataModel {
const fearCost = realCosts.splice(hasFearCost, 1); const fearCost = realCosts.splice(hasFearCost, 1);
if ( if (
!game.user.isGM || !game.user.isGM ||
fearCost[0].total > game.settings.get(SYSTEM.id, SYSTEM.SETTINGS.gameSettings.Resources.Fear) fearCost[0].total > game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Resources.Fear)
) )
return false; return false;
} }
@ -446,8 +454,10 @@ export class DHBaseAction extends foundry.abstract.DataModel {
: this.actor.prototypeToken.disposition, : this.actor.prototypeToken.disposition,
targetDisposition = target.document.disposition; targetDisposition = target.document.disposition;
return ( return (
(this.target.type === SYSTEM.ACTIONS.targetTypes.friendly.id && actorDisposition === targetDisposition) || (this.target.type === CONFIG.DH.ACTIONS.targetTypes.friendly.id &&
(this.target.type === SYSTEM.ACTIONS.targetTypes.hostile.id && actorDisposition + targetDisposition === 0) actorDisposition === targetDisposition) ||
(this.target.type === CONFIG.DH.ACTIONS.targetTypes.hostile.id &&
actorDisposition + targetDisposition === 0)
); );
} }
@ -567,7 +577,7 @@ export class DHBaseAction extends foundry.abstract.DataModel {
user: game.user.id, user: game.user.id,
system: systemData, system: systemData,
content: await foundry.applications.handlebars.renderTemplate( content: await foundry.applications.handlebars.renderTemplate(
'systems/daggerheart/templates/chat/ability-use.hbs', 'systems/daggerheart/templates/ui/chat/ability-use.hbs',
systemData systemData
) )
}); });
@ -621,7 +631,7 @@ export class DHAttackAction extends DHDamageAction {
} }
get chatTemplate() { get chatTemplate() {
return 'systems/daggerheart/templates/chat/duality-roll.hbs'; return 'systems/daggerheart/templates/ui/chat/duality-roll.hbs';
} }
prepareData() { prepareData() {
@ -669,7 +679,7 @@ export class DHHealingAction extends DHBaseAction {
const config = { const config = {
title: game.i18n.format('DAGGERHEART.Chat.HealingRoll.Title', { title: game.i18n.format('DAGGERHEART.Chat.HealingRoll.Title', {
healing: game.i18n.localize(SYSTEM.GENERAL.healingTypes[this.healing.type].label) healing: game.i18n.localize(CONFIG.DH.GENERAL.healingTypes[this.healing.type].label)
}), }),
roll: { formula }, roll: { formula },
targets: (data.system?.targets ?? data.targets).filter(t => t.hit), targets: (data.system?.targets ?? data.targets).filter(t => t.hit),
@ -682,7 +692,7 @@ export class DHHealingAction extends DHBaseAction {
} }
get chatTemplate() { get chatTemplate() {
return 'systems/daggerheart/templates/chat/healing-roll.hbs'; return 'systems/daggerheart/templates/ui/chat/healing-roll.hbs';
} }
} }
@ -730,7 +740,7 @@ export class DHEffectAction extends DHBaseAction {
user: game.user.id, user: game.user.id,
system: systemData, system: systemData,
content: await foundry.applications.handlebars.renderTemplate( content: await foundry.applications.handlebars.renderTemplate(
'systems/daggerheart/templates/chat/apply-effects.hbs', 'systems/daggerheart/templates/ui/chat/apply-effects.hbs',
systemData systemData
) )
}); });
@ -739,7 +749,7 @@ export class DHEffectAction extends DHBaseAction {
} }
get chatTemplate() { get chatTemplate() {
return 'systems/daggerheart/templates/chat/apply-effects.hbs'; return 'systems/daggerheart/templates/ui/chat/apply-effects.hbs';
} }
} }
@ -781,7 +791,7 @@ export class DhBeastformAction extends DHBaseAction {
} }
prepareBeastformConfig(config) { prepareBeastformConfig(config) {
const settingsTiers = game.settings.get(SYSTEM.id, SYSTEM.SETTINGS.gameSettings.LevelTiers).tiers; const settingsTiers = game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.LevelTiers).tiers;
const actorLevel = this.actor.system.levelData.level.current; const actorLevel = this.actor.system.levelData.level.current;
const actorTier = const actorTier =
Object.values(settingsTiers).find( Object.values(settingsTiers).find(

24
module/data/action/actionDice.mjs
View file

@ -8,21 +8,25 @@ export class DHActionRollData extends foundry.abstract.DataModel {
/** @override */ /** @override */
static defineSchema() { static defineSchema() {
return { return {
type: new fields.StringField({ nullable: true, initial: null, choices: SYSTEM.GENERAL.rollTypes }), type: new fields.StringField({ nullable: true, initial: null, choices: CONFIG.DH.GENERAL.rollTypes }),
trait: new fields.StringField({ nullable: true, initial: null, choices: SYSTEM.ACTOR.abilities }), trait: new fields.StringField({ nullable: true, initial: null, choices: CONFIG.DH.ACTOR.abilities }),
difficulty: new fields.NumberField({ nullable: true, initial: null, integer: true, min: 0 }), difficulty: new fields.NumberField({ nullable: true, initial: null, integer: true, min: 0 }),
bonus: new fields.NumberField({ nullable: true, initial: null, integer: true }), bonus: new fields.NumberField({ nullable: true, initial: null, integer: true }),
advState: new fields.StringField({ choices: SYSTEM.ACTIONS.advandtageState, initial: 'neutral' }), advState: new fields.StringField({ choices: CONFIG.DH.ACTIONS.advandtageState, initial: 'neutral' }),
diceRolling: new fields.SchemaField({ diceRolling: new fields.SchemaField({
multiplier: new fields.StringField({ multiplier: new fields.StringField({
choices: SYSTEM.GENERAL.diceSetNumbers, choices: CONFIG.DH.GENERAL.diceSetNumbers,
initial: 'prof', initial: 'prof',
label: 'Dice Number' label: 'Dice Number'
}), }),
flatMultiplier: new fields.NumberField({ nullable: true, initial: 1, label: 'Flat Multiplier' }), flatMultiplier: new fields.NumberField({ nullable: true, initial: 1, label: 'Flat Multiplier' }),
dice: new fields.StringField({ choices: SYSTEM.GENERAL.diceTypes, initial: 'd6', label: 'Dice Type' }), dice: new fields.StringField({
choices: CONFIG.DH.GENERAL.diceTypes,
initial: 'd6',
label: 'Dice Type'
}),
compare: new fields.StringField({ compare: new fields.StringField({
choices: SYSTEM.ACTIONS.diceCompare, choices: CONFIG.DH.ACTIONS.diceCompare,
initial: 'above', initial: 'above',
label: 'Should be' label: 'Should be'
}), }),
@ -40,7 +44,7 @@ export class DHActionRollData extends foundry.abstract.DataModel {
this.diceRolling.multiplier === 'flat' this.diceRolling.multiplier === 'flat'
? this.diceRolling.flatMultiplier ? this.diceRolling.flatMultiplier
: `@${this.diceRolling.multiplier}`; : `@${this.diceRolling.multiplier}`;
formula = `${multiplier}${this.diceRolling.dice}cs${SYSTEM.ACTIONS.diceCompare[this.diceRolling.compare].operator}${this.diceRolling.treshold}`; formula = `${multiplier}${this.diceRolling.dice}cs${CONFIG.DH.ACTIONS.diceCompare[this.diceRolling.compare].operator}${this.diceRolling.treshold}`;
break; break;
default: default:
// formula = `${(!!this.parent?.actor?.system?.attack ? `@attackBonus` : `@traits.${this.trait}.total`)}`; // formula = `${(!!this.parent?.actor?.system?.attack ? `@attackBonus` : `@traits.${this.trait}.total`)}`;
@ -58,12 +62,12 @@ export class DHActionDiceData extends foundry.abstract.DataModel {
static defineSchema() { static defineSchema() {
return { return {
multiplier: new fields.StringField({ multiplier: new fields.StringField({
choices: SYSTEM.GENERAL.multiplierTypes, choices: CONFIG.DH.GENERAL.multiplierTypes,
initial: 'prof', initial: 'prof',
label: 'Multiplier' label: 'Multiplier'
}), }),
flatMultiplier: new fields.NumberField({ nullable: true, initial: 1, label: 'Flat Multiplier' }), flatMultiplier: new fields.NumberField({ nullable: true, initial: 1, label: 'Flat Multiplier' }),
dice: new fields.StringField({ choices: SYSTEM.GENERAL.diceTypes, initial: 'd6', label: 'Dice' }), dice: new fields.StringField({ choices: CONFIG.DH.GENERAL.diceTypes, initial: 'd6', label: 'Dice' }),
bonus: new fields.NumberField({ nullable: true, initial: null, label: 'Bonus' }), bonus: new fields.NumberField({ nullable: true, initial: null, label: 'Bonus' }),
custom: new fields.SchemaField({ custom: new fields.SchemaField({
enabled: new fields.BooleanField({ label: 'Custom Formula' }), enabled: new fields.BooleanField({ label: 'Custom Formula' }),
@ -101,7 +105,7 @@ export class DHDamageData extends foundry.abstract.DataModel {
// ...super.defineSchema(), // ...super.defineSchema(),
base: new fields.BooleanField({ initial: false, readonly: true, label: 'Base' }), base: new fields.BooleanField({ initial: false, readonly: true, label: 'Base' }),
type: new fields.StringField({ type: new fields.StringField({
choices: SYSTEM.GENERAL.damageTypes, choices: CONFIG.DH.GENERAL.damageTypes,
initial: 'physical', initial: 'physical',
label: 'Type', label: 'Type',
nullable: false, nullable: false,

9
module/data/actor/adversary.mjs
View file

@ -22,13 +22,13 @@ export default class DhpAdversary extends BaseDataActor {
return { return {
tier: new fields.StringField({ tier: new fields.StringField({
required: true, required: true,
choices: SYSTEM.GENERAL.tiers, choices: CONFIG.DH.GENERAL.tiers,
initial: SYSTEM.GENERAL.tiers.tier1.id initial: CONFIG.DH.GENERAL.tiers.tier1.id
}), }),
type: new fields.StringField({ type: new fields.StringField({
required: true, required: true,
choices: SYSTEM.ACTOR.adversaryTypes, choices: CONFIG.DH.ACTOR.adversaryTypes,
initial: SYSTEM.ACTOR.adversaryTypes.standard.id initial: CONFIG.DH.ACTOR.adversaryTypes.standard.id
}), }),
description: new fields.StringField(), description: new fields.StringField(),
motivesAndTactics: new fields.StringField(), motivesAndTactics: new fields.StringField(),
@ -47,6 +47,7 @@ export default class DhpAdversary extends BaseDataActor {
attack: new ActionField({ attack: new ActionField({
initial: { initial: {
name: 'Attack', name: 'Attack',
img: 'icons/skills/melee/blood-slash-foam-red.webp',
_id: foundry.utils.randomID(), _id: foundry.utils.randomID(),
systemPath: 'attack', systemPath: 'attack',
type: 'attack', type: 'attack',

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

@ -1,4 +1,4 @@
import { burden } from '../../config/generalConfig.mjs'; import { burden } from '../../applications/config/generalConfig.mjs';
import ActionField from '../fields/actionField.mjs'; import ActionField from '../fields/actionField.mjs';
import ForeignDocumentUUIDField from '../fields/foreignDocumentUUIDField.mjs'; import ForeignDocumentUUIDField from '../fields/foreignDocumentUUIDField.mjs';
import DhLevelData from '../levelData.mjs'; import DhLevelData from '../levelData.mjs';
@ -144,7 +144,7 @@ export default class DhCharacter extends BaseDataActor {
get tier() { get tier() {
return this.levelData.level.current === 1 return this.levelData.level.current === 1
? 1 ? 1
: Object.values(game.settings.get(SYSTEM.id, SYSTEM.SETTINGS.gameSettings.LevelTiers).tiers).find( : Object.values(game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.LevelTiers).tiers).find(
tier => currentLevel >= tier.levels.start && currentLevel <= tier.levels.end tier => currentLevel >= tier.levels.start && currentLevel <= tier.levels.end
).tier; ).tier;
} }
@ -225,7 +225,7 @@ export default class DhCharacter extends BaseDataActor {
const primary = this.primaryWeapon, const primary = this.primaryWeapon,
secondary = this.secondaryWeapon; secondary = this.secondaryWeapon;
if (itemToEquip.system.secondary) { if (itemToEquip.system.secondary) {
if (primary && primary.burden === SYSTEM.GENERAL.burden.twoHanded.value) { if (primary && primary.burden === CONFIG.DH.GENERAL.burden.twoHanded.value) {
await primary.update({ 'system.equipped': false }); await primary.update({ 'system.equipped': false });
} }
@ -233,7 +233,7 @@ export default class DhCharacter extends BaseDataActor {
await secondary.update({ 'system.equipped': false }); await secondary.update({ 'system.equipped': false });
} }
} else { } else {
if (secondary && itemToEquip.system.burden === SYSTEM.GENERAL.burden.twoHanded.value) { if (secondary && itemToEquip.system.burden === CONFIG.DH.GENERAL.burden.twoHanded.value) {
await secondary.update({ 'system.equipped': false }); await secondary.update({ 'system.equipped': false });
} }
@ -248,7 +248,7 @@ export default class DhCharacter extends BaseDataActor {
const currentTier = const currentTier =
currentLevel === 1 currentLevel === 1
? null ? null
: Object.values(game.settings.get(SYSTEM.id, SYSTEM.SETTINGS.gameSettings.LevelTiers).tiers).find( : Object.values(game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.LevelTiers).tiers).find(
tier => currentLevel >= tier.levels.start && currentLevel <= tier.levels.end tier => currentLevel >= tier.levels.start && currentLevel <= tier.levels.end
).tier; ).tier;
for (let levelKey in this.levelData.levelups) { for (let levelKey in this.levelData.levelups) {

7
module/data/actor/environment.mjs
View file

@ -1,6 +1,5 @@
import { environmentTypes } from '../../config/actorConfig.mjs'; import { environmentTypes } from '../../applications/config/actorConfig.mjs';
import BaseDataActor from './base.mjs'; import BaseDataActor from './base.mjs';
import ForeignDocumentUUIDField from '../fields/foreignDocumentUUIDField.mjs';
import ActionField from '../fields/actionField.mjs'; import ActionField from '../fields/actionField.mjs';
import ForeignDocumentUUIDArrayField from '../fields/foreignDocumentUUIDArrayField.mjs'; import ForeignDocumentUUIDArrayField from '../fields/foreignDocumentUUIDArrayField.mjs';
@ -19,8 +18,8 @@ export default class DhEnvironment extends BaseDataActor {
return { return {
tier: new fields.StringField({ tier: new fields.StringField({
required: true, required: true,
choices: SYSTEM.GENERAL.tiers, choices: CONFIG.DH.GENERAL.tiers,
initial: SYSTEM.GENERAL.tiers.tier1.id initial: CONFIG.DH.GENERAL.tiers.tier1.id
}), }),
type: new fields.StringField({ choices: environmentTypes }), type: new fields.StringField({ choices: environmentTypes }),
description: new fields.StringField(), description: new fields.StringField(),

2
module/data/chat-message/adversaryRoll.mjs
View file

@ -37,7 +37,7 @@ export default class DHAdversaryRoll extends foundry.abstract.TypeDataModel {
} }
get messageTemplate() { get messageTemplate() {
return 'systems/daggerheart/templates/chat/adversary-roll.hbs'; return 'systems/daggerheart/templates/ui/chat/adversary-roll.hbs';
} }
prepareDerivedData() { prepareDerivedData() {

2
module/data/chat-message/damageRoll.mjs
View file

@ -33,7 +33,7 @@ export default class DHDamageRoll extends foundry.abstract.TypeDataModel {
} }
get messageTemplate() { get messageTemplate() {
return `systems/daggerheart/templates/chat/${this.messageType}-roll.hbs`; return `systems/daggerheart/templates/ui/chat/${this.messageType}-roll.hbs`;
} }
prepareDerivedData() { prepareDerivedData() {

2
module/data/chat-message/dualityRoll.mjs
View file

@ -2,6 +2,6 @@ import DHAdversaryRoll from './adversaryRoll.mjs';
export default class DHDualityRoll extends DHAdversaryRoll { export default class DHDualityRoll extends DHAdversaryRoll {
get messageTemplate() { get messageTemplate() {
return 'systems/daggerheart/templates/chat/duality-roll.hbs'; return 'systems/daggerheart/templates/ui/chat/duality-roll.hbs';
} }
} }

0
module/data/chat-message/hitRoll.mjs
View file

4
module/data/countdowns.mjs
View file

@ -1,5 +1,5 @@
import { countdownTypes } from '../config/generalConfig.mjs'; import { countdownTypes } from '../applications/config/generalConfig.mjs';
import { RefreshType, socketEvent } from '../helpers/socket.mjs'; import { RefreshType, socketEvent } from '../systemRegistration/socket.mjs';
export default class DhCountdowns extends foundry.abstract.DataModel { export default class DhCountdowns extends foundry.abstract.DataModel {
static defineSchema() { static defineSchema() {

10
module/data/item/armor.mjs
View file

@ -1,6 +1,6 @@
import BaseDataItem from './base.mjs'; import BaseDataItem from './base.mjs';
import ActionField from '../fields/actionField.mjs'; import ActionField from '../fields/actionField.mjs';
import { armorFeatures } from '../../config/itemConfig.mjs'; import { armorFeatures } from '../../applications/config/itemConfig.mjs';
export default class DHArmor extends BaseDataItem { export default class DHArmor extends BaseDataItem {
/** @inheritDoc */ /** @inheritDoc */
@ -24,7 +24,11 @@ export default class DHArmor extends BaseDataItem {
baseScore: new fields.NumberField({ integer: true, initial: 0 }), baseScore: new fields.NumberField({ integer: true, initial: 0 }),
features: new fields.ArrayField( features: new fields.ArrayField(
new fields.SchemaField({ new fields.SchemaField({
value: new fields.StringField({ required: true, choices: SYSTEM.ITEM.armorFeatures, blank: true }), value: new fields.StringField({
required: true,
choices: CONFIG.DH.ITEM.armorFeatures,
blank: true
}),
effectIds: new fields.ArrayField(new fields.StringField({ required: true })), effectIds: new fields.ArrayField(new fields.StringField({ required: true })),
actionIds: new fields.ArrayField(new fields.StringField({ required: true })) actionIds: new fields.ArrayField(new fields.StringField({ required: true }))
}) })
@ -41,7 +45,7 @@ export default class DHArmor extends BaseDataItem {
} }
get featureInfo() { get featureInfo() {
return this.feature ? CONFIG.daggerheart.ITEM.armorFeatures[this.feature] : null; return this.feature ? CONFIG.DH.ITEM.armorFeatures[this.feature] : null;
} }
async _preUpdate(changes, options, user) { async _preUpdate(changes, options, user) {

2
module/data/item/base.mjs
View file

@ -66,7 +66,7 @@ export default class BaseDataItem extends foundry.abstract.TypeDataModel {
{ {
_id: foundry.utils.randomID(), _id: foundry.utils.randomID(),
type: actionType, type: actionType,
name: game.i18n.localize(SYSTEM.ACTIONS.actionTypes[actionType].name), name: game.i18n.localize(CONFIG.DH.ACTIONS.actionTypes[actionType].name),
...cls.getSourceConfig(this.parent) ...cls.getSourceConfig(this.parent)
}, },
{ {

4
module/data/item/beastform.mjs
View file

@ -21,8 +21,8 @@ export default class DHBeastform extends BaseDataItem {
...super.defineSchema(), ...super.defineSchema(),
tier: new fields.StringField({ tier: new fields.StringField({
required: true, required: true,
choices: SYSTEM.GENERAL.tiers, choices: CONFIG.DH.GENERAL.tiers,
initial: SYSTEM.GENERAL.tiers.tier1.id initial: CONFIG.DH.GENERAL.tiers.tier1.id
}), }),
tokenImg: new fields.FilePathField({ tokenImg: new fields.FilePathField({
initial: 'icons/svg/mystery-man.svg', initial: 'icons/svg/mystery-man.svg',

8
module/data/item/domainCard.mjs
View file

@ -17,16 +17,16 @@ export default class DHDomainCard extends BaseDataItem {
return { return {
...super.defineSchema(), ...super.defineSchema(),
domain: new fields.StringField({ domain: new fields.StringField({
choices: SYSTEM.DOMAIN.domains, choices: CONFIG.DH.DOMAIN.domains,
required: true, required: true,
initial: SYSTEM.DOMAIN.domains.arcana.id initial: CONFIG.DH.DOMAIN.domains.arcana.id
}), }),
level: new fields.NumberField({ initial: 1, integer: true }), level: new fields.NumberField({ initial: 1, integer: true }),
recallCost: new fields.NumberField({ initial: 0, integer: true }), recallCost: new fields.NumberField({ initial: 0, integer: true }),
type: new fields.StringField({ type: new fields.StringField({
choices: SYSTEM.DOMAIN.cardTypes, choices: CONFIG.DH.DOMAIN.cardTypes,
required: true, required: true,
initial: SYSTEM.DOMAIN.cardTypes.ability.id initial: CONFIG.DH.DOMAIN.cardTypes.ability.id
}), }),
foundation: new fields.BooleanField({ initial: false }), foundation: new fields.BooleanField({ initial: false }),
inVault: new fields.BooleanField({ initial: false }), inVault: new fields.BooleanField({ initial: false }),

2
module/data/item/subclass.mjs
View file

@ -26,7 +26,7 @@ export default class DHSubclass extends BaseDataItem {
return { return {
...super.defineSchema(), ...super.defineSchema(),
spellcastingTrait: new fields.StringField({ spellcastingTrait: new fields.StringField({
choices: SYSTEM.ACTOR.abilities, choices: CONFIG.DH.ACTOR.abilities,
integer: false, integer: false,
nullable: true, nullable: true,
initial: null initial: null

19
module/data/item/weapon.mjs
View file

@ -1,7 +1,6 @@
import BaseDataItem from './base.mjs'; import BaseDataItem from './base.mjs';
import FormulaField from '../fields/formulaField.mjs';
import ActionField from '../fields/actionField.mjs'; import ActionField from '../fields/actionField.mjs';
import { weaponFeatures } from '../../config/itemConfig.mjs'; import { weaponFeatures } from '../../applications/config/itemConfig.mjs';
import { actionsTypes } from '../action/_module.mjs'; import { actionsTypes } from '../action/_module.mjs';
export default class DHWeapon extends BaseDataItem { export default class DHWeapon extends BaseDataItem {
@ -27,22 +26,26 @@ export default class DHWeapon extends BaseDataItem {
//SETTINGS //SETTINGS
secondary: new fields.BooleanField({ initial: false }), secondary: new fields.BooleanField({ initial: false }),
trait: new fields.StringField({ required: true, choices: SYSTEM.ACTOR.abilities, initial: 'agility' }), trait: new fields.StringField({ required: true, choices: CONFIG.DH.ACTOR.abilities, initial: 'agility' }),
range: new fields.StringField({ required: true, choices: SYSTEM.GENERAL.range, initial: 'melee' }), range: new fields.StringField({ required: true, choices: CONFIG.DH.GENERAL.range, initial: 'melee' }),
burden: new fields.StringField({ required: true, choices: SYSTEM.GENERAL.burden, initial: 'oneHanded' }), burden: new fields.StringField({ required: true, choices: CONFIG.DH.GENERAL.burden, initial: 'oneHanded' }),
//DAMAGE //DAMAGE
damage: new fields.SchemaField({ damage: new fields.SchemaField({
dice: new fields.StringField({ choices: SYSTEM.GENERAL.diceTypes, initial: 'd6' }), dice: new fields.StringField({ choices: CONFIG.DH.GENERAL.diceTypes, initial: 'd6' }),
bonus: new fields.NumberField({ nullable: true, initial: null }), bonus: new fields.NumberField({ nullable: true, initial: null }),
type: new fields.StringField({ type: new fields.StringField({
required: true, required: true,
choices: SYSTEM.GENERAL.damageTypes, choices: CONFIG.DH.GENERAL.damageTypes,
initial: 'physical' initial: 'physical'
}) })
}), }),
features: new fields.ArrayField( features: new fields.ArrayField(
new fields.SchemaField({ new fields.SchemaField({
value: new fields.StringField({ required: true, choices: SYSTEM.ITEM.weaponFeatures, blank: true }), value: new fields.StringField({
required: true,
choices: CONFIG.DH.ITEM.weaponFeatures,
blank: true
}),
effectIds: new fields.ArrayField(new fields.StringField({ required: true })), effectIds: new fields.ArrayField(new fields.StringField({ required: true })),
actionIds: new fields.ArrayField(new fields.StringField({ required: true })) actionIds: new fields.ArrayField(new fields.StringField({ required: true }))
}) })

2
module/data/levelup.mjs
View file

@ -1,4 +1,4 @@
import { abilities } from '../config/actorConfig.mjs'; import { abilities } from '../applications/config/actorConfig.mjs';
import { chunkify } from '../helpers/utils.mjs'; import { chunkify } from '../helpers/utils.mjs';
import { LevelOptionType } from './levelTier.mjs'; import { LevelOptionType } from './levelTier.mjs';

2
module/data/settings/Appearance.mjs
View file

@ -1,4 +1,4 @@
import { fearDisplay } from '../../config/generalConfig.mjs'; import { fearDisplay } from '../../applications/config/generalConfig.mjs';
export default class DhAppearance extends foundry.abstract.DataModel { export default class DhAppearance extends foundry.abstract.DataModel {
static defineSchema() { static defineSchema() {

2
module/data/settings/Homebrew.mjs
View file

@ -1,4 +1,4 @@
import { defaultRestOptions } from '../../config/generalConfig.mjs'; import { defaultRestOptions } from '../../applications/config/generalConfig.mjs';
export default class DhHomebrew extends foundry.abstract.DataModel { export default class DhHomebrew extends foundry.abstract.DataModel {
static LOCALIZATION_PREFIXES = ['DAGGERHEART.Settings.Homebrew']; // Doesn't work for some reason static LOCALIZATION_PREFIXES = ['DAGGERHEART.Settings.Homebrew']; // Doesn't work for some reason

3
module/documents/_module.mjs
View file

@ -2,3 +2,6 @@ export { default as DhpActor } from './actor.mjs';
export { default as DHItem } from './item.mjs'; export { default as DHItem } from './item.mjs';
export { default as DhpCombat } from './combat.mjs'; export { default as DhpCombat } from './combat.mjs';
export { default as DhActiveEffect } from './activeEffect.mjs'; export { default as DhActiveEffect } from './activeEffect.mjs';
export { default as DhChatMessage } from './chatMessage.mjs';
export * as DhRoll from './roll.mjs';
export { default as DhTooltipManager } from './tooltipManager.mjs';

2
module/documents/activeEffect.mjs
View file

@ -44,7 +44,7 @@ export default class DhActiveEffect extends ActiveEffect {
user: game.user.id, user: game.user.id,
system: systemData, system: systemData,
content: await foundry.applications.handlebars.renderTemplate( content: await foundry.applications.handlebars.renderTemplate(
'systems/daggerheart/templates/chat/ability-use.hbs', 'systems/daggerheart/templates/ui/chat/ability-use.hbs',
systemData systemData
) )
}); });

16
module/documents/actor.mjs
View file

@ -1,6 +1,6 @@
import DamageSelectionDialog from '../applications/damageSelectionDialog.mjs'; import DamageSelectionDialog from '../applications/dialogs/damageSelectionDialog.mjs';
import { GMUpdateEvent, socketEvent } from '../helpers/socket.mjs'; import { GMUpdateEvent, socketEvent } from '../systemRegistration/socket.mjs';
import DamageReductionDialog from '../applications/damageReductionDialog.mjs'; import DamageReductionDialog from '../applications/dialogs/damageReductionDialog.mjs';
import { LevelOptionType } from '../data/levelTier.mjs'; import { LevelOptionType } from '../data/levelTier.mjs';
import DHFeature from '../data/item/feature.mjs'; import DHFeature from '../data/item/feature.mjs';
@ -24,7 +24,7 @@ export default class DhpActor extends Actor {
if (newLevel > this.system.levelData.level.current) { if (newLevel > this.system.levelData.level.current) {
const maxLevel = Object.values( const maxLevel = Object.values(
game.settings.get(SYSTEM.id, SYSTEM.SETTINGS.gameSettings.LevelTiers).tiers game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.LevelTiers).tiers
).reduce((acc, tier) => Math.max(acc, tier.levels.end), 0); ).reduce((acc, tier) => Math.max(acc, tier.levels.end), 0);
if (newLevel > maxLevel) { if (newLevel > maxLevel) {
ui.notifications.warn(game.i18n.localize('DAGGERHEART.Sheets.PC.Errors.tooHighLevel')); ui.notifications.warn(game.i18n.localize('DAGGERHEART.Sheets.PC.Errors.tooHighLevel'));
@ -375,7 +375,7 @@ export default class DhpActor extends Actor {
bonusDamage = result.bonusDamage; bonusDamage = result.bonusDamage;
rollString = result.rollString; rollString = result.rollString;
const automateHope = await game.settings.get(SYSTEM.id, SYSTEM.SETTINGS.gameSettings.Automation.Hope); const automateHope = await game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Automation.Hope);
if (automateHope && result.hopeUsed) { if (automateHope && result.hopeUsed) {
await this.update({ await this.update({
'system.resources.hope.value': this.system.resources.hope.value - result.hopeUsed 'system.resources.hope.value': this.system.resources.hope.value - result.hopeUsed
@ -421,7 +421,7 @@ export default class DhpActor extends Actor {
sound: CONFIG.sounds.dice, sound: CONFIG.sounds.dice,
system: systemData, system: systemData,
content: await foundry.applications.handlebars.renderTemplate( content: await foundry.applications.handlebars.renderTemplate(
'systems/daggerheart/templates/chat/damage-roll.hbs', 'systems/daggerheart/templates/ui/chat/damage-roll.hbs',
systemData systemData
), ),
rolls: [roll] rolls: [roll]
@ -488,7 +488,7 @@ export default class DhpActor extends Actor {
switch (r.type) { switch (r.type) {
case 'fear': case 'fear':
ui.resources.updateFear( ui.resources.updateFear(
game.settings.get(SYSTEM.id, SYSTEM.SETTINGS.gameSettings.Resources.Fear) + r.value game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Resources.Fear) + r.value
); );
break; break;
case 'armorStack': case 'armorStack':
@ -513,7 +513,7 @@ export default class DhpActor extends Actor {
if (game.user.isGM) { if (game.user.isGM) {
await u.target.update(u.resources); await u.target.update(u.resources);
} else { } else {
await game.socket.emit(`system.${SYSTEM.id}`, { await game.socket.emit(`system.${CONFIG.DH.id}`, {
action: socketEvent.GMUpdate, action: socketEvent.GMUpdate,
data: { data: {
action: GMUpdateEvent.UpdateDocument, action: GMUpdateEvent.UpdateDocument,

0
module/applications/chatMessage.mjs → module/documents/chatMessage.mjs
View file

4
module/documents/item.mjs
View file

@ -79,7 +79,7 @@ export default class DHItem extends foundry.documents.Item {
async selectActionDialog() { async selectActionDialog() {
const content = await foundry.applications.handlebars.renderTemplate( const content = await foundry.applications.handlebars.renderTemplate(
'systems/daggerheart/templates/views/actionSelect.hbs', 'systems/daggerheart/templates/dialogs/actionSelect.hbs',
{ actions: this.system.actions } { actions: this.system.actions }
), ),
title = 'Select Action'; title = 'Select Action';
@ -131,7 +131,7 @@ export default class DHItem extends foundry.documents.Item {
user: game.user.id, user: game.user.id,
system: systemData, system: systemData,
content: await foundry.applications.handlebars.renderTemplate( content: await foundry.applications.handlebars.renderTemplate(
'systems/daggerheart/templates/chat/ability-use.hbs', 'systems/daggerheart/templates/ui/chat/ability-use.hbs',
systemData systemData
) )
}); });

18
module/applications/roll.mjs → module/documents/roll.mjs
View file

@ -1,5 +1,5 @@
import D20RollDialog from '../dialogs/d20RollDialog.mjs'; import D20RollDialog from '../applications/dialogs/d20RollDialog.mjs';
import DamageDialog from '../dialogs/damageDialog.mjs'; import DamageDialog from '../applications/dialogs/damageDialog.mjs';
import { setDiceSoNiceForDualityRoll } from '../helpers/utils.mjs'; import { setDiceSoNiceForDualityRoll } from '../helpers/utils.mjs';
/* /*
@ -29,7 +29,7 @@ export class DHRoll extends Roll {
config.hooks = [...(config.hooks ?? []), '']; config.hooks = [...(config.hooks ?? []), ''];
config.dialog ??= {}; config.dialog ??= {};
for (const hook of config.hooks) { for (const hook of config.hooks) {
if (Hooks.call(`${SYSTEM.id}.preRoll${hook.capitalize()}`, config, message) === false) return null; if (Hooks.call(`${CONFIG.DH.id}.preRoll${hook.capitalize()}`, config, message) === false) return null;
} }
this.applyKeybindings(config); this.applyKeybindings(config);
@ -43,7 +43,9 @@ export class DHRoll extends Roll {
} }
for (const hook of config.hooks) { for (const hook of config.hooks) {
if (Hooks.call(`${SYSTEM.id}.post${hook.capitalize()}RollConfiguration`, roll, config, message) === false) if (
Hooks.call(`${CONFIG.DH.id}.post${hook.capitalize()}RollConfiguration`, roll, config, message) === false
)
return []; return [];
} }
return roll; return roll;
@ -56,7 +58,7 @@ export class DHRoll extends Roll {
static async buildPost(roll, config, message) { static async buildPost(roll, config, message) {
for (const hook of config.hooks) { for (const hook of config.hooks) {
if (Hooks.call(`${SYSTEM.id}.postRoll${hook.capitalize()}`, config, message) === false) return null; if (Hooks.call(`${CONFIG.DH.id}.postRoll${hook.capitalize()}`, config, message) === false) return null;
} }
// Create Chat Message // Create Chat Message
@ -478,11 +480,11 @@ export class DamageRoll extends DHRoll {
chatMessage.update({ 'system.damage': config }); chatMessage.update({ 'system.damage': config });
} }
} }
constructFormula(config) { constructFormula(config) {
super.constructFormula(config); super.constructFormula(config);
if(config.isCritical) { if (config.isCritical) {
const tmpRoll = new Roll(this._formula)._evaluateSync({maximize: true}), const tmpRoll = new Roll(this._formula)._evaluateSync({ maximize: true }),
criticalBonus = tmpRoll.total - this.constructor.calculateTotalModifiers(tmpRoll); criticalBonus = tmpRoll.total - this.constructor.calculateTotalModifiers(tmpRoll);
this.terms.push(...this.formatModifier(criticalBonus)); this.terms.push(...this.formatModifier(criticalBonus));
} }

4
module/applications/tooltipManager.mjs → module/documents/tooltipManager.mjs
View file

@ -1,11 +1,11 @@
export default class DhTooltipManager extends TooltipManager { export default class DhTooltipManager extends foundry.helpers.interaction.TooltipManager.implementation {
async activate(element, options = {}) { async activate(element, options = {}) {
let html = options.html; let html = options.html;
if (element.dataset.tooltip.startsWith('#item#')) { if (element.dataset.tooltip.startsWith('#item#')) {
const item = await foundry.utils.fromUuid(element.dataset.tooltip.slice(6)); const item = await foundry.utils.fromUuid(element.dataset.tooltip.slice(6));
if (item) { if (item) {
html = await foundry.applications.handlebars.renderTemplate( html = await foundry.applications.handlebars.renderTemplate(
`systems/daggerheart/templates/tooltip/${item.type}.hbs`, `systems/daggerheart/templates/ui/tooltip/${item.type}.hbs`,
item item
); );
} }

4
module/enrichers/DualityRollEnricher.mjs
View file

@ -1,4 +1,4 @@
import { abilities } from '../config/actorConfig.mjs'; import { abilities } from '../applications/config/actorConfig.mjs';
import { getCommandTarget, rollCommandToJSON } from '../helpers/utils.mjs'; import { getCommandTarget, rollCommandToJSON } from '../helpers/utils.mjs';
export default function DhDualityRollEnricher(match, _options) { export default function DhDualityRollEnricher(match, _options) {
@ -55,7 +55,7 @@ export const renderDualityButton = async event => {
type: button.dataset.actionType ?? null // Need check type: button.dataset.actionType ?? null // Need check
}, },
chatMessage: { chatMessage: {
template: 'systems/daggerheart/templates/chat/duality-roll.hbs' template: 'systems/daggerheart/templates/ui/chat/duality-roll.hbs'
} }
}; };
await target.diceRoll(config); await target.diceRoll(config);

4
module/enrichers/TemplateEnricher.mjs
View file

@ -1,4 +1,4 @@
import { range as configRange } from '../config/generalConfig.mjs'; import { range as configRange } from '../applications/config/generalConfig.mjs';
export default function DhTemplateEnricher(match, _options) { export default function DhTemplateEnricher(match, _options) {
const parts = match[1].split('|').map(x => x.trim()); const parts = match[1].split('|').map(x => x.trim());
@ -45,7 +45,7 @@ export const renderMeasuredTemplate = async event => {
if (!type || !range || !game.canvas.scene) return; if (!type || !range || !game.canvas.scene) return;
const distance = game.settings.get(SYSTEM.id, SYSTEM.SETTINGS.gameSettings.RangeMeasurement)[range]; const distance = game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.RangeMeasurement)[range];
const { width, height } = game.canvas.scene.dimensions; const { width, height } = game.canvas.scene.dimensions;
canvas.scene.createEmbeddedDocuments('MeasuredTemplate', [ canvas.scene.createEmbeddedDocuments('MeasuredTemplate', [
{ {

4
module/helpers/utils.mjs
View file

@ -1,4 +1,4 @@
import { diceTypes, getDiceSoNicePresets, range } from '../config/generalConfig.mjs'; import { diceTypes, getDiceSoNicePresets, range } from '../applications/config/generalConfig.mjs';
import Tagify from '@yaireo/tagify'; import Tagify from '@yaireo/tagify';
export const loadCompendiumOptions = async compendiums => { export const loadCompendiumOptions = async compendiums => {
@ -226,7 +226,7 @@ export const getDeleteKeys = (property, innerProperty, innerPropertyDefaultValue
// Fix on Foundry native formula replacement for DH // Fix on Foundry native formula replacement for DH
const nativeReplaceFormulaData = Roll.replaceFormulaData; const nativeReplaceFormulaData = Roll.replaceFormulaData;
Roll.replaceFormulaData = function (formula, data = {}, { missing, warn = false } = {}) { Roll.replaceFormulaData = function (formula, data = {}, { missing, warn = false } = {}) {
const terms = Object.keys(SYSTEM.GENERAL.multiplierTypes).map(type => { const terms = Object.keys(CONFIG.DH.GENERAL.multiplierTypes).map(type => {
return { term: type, default: 1 }; return { term: type, default: 1 };
}); });
formula = terms.reduce((a, c) => a.replaceAll(`@${c.term}`, data[c.term] ?? c.default), formula); formula = terms.reduce((a, c) => a.replaceAll(`@${c.term}`, data[c.term] ?? c.default), formula);

3
module/placeables/_module.mjs
View file

@ -1,3 +0,0 @@
import DhMeasuredTemplate from './measuredTemplate.mjs';
export { DhMeasuredTemplate };

5
module/systemRegistration/_module.mjs Normal file
View file

@ -0,0 +1,5 @@
import { preloadHandlebarsTemplates as handlebarsRegistration } from './handlebars.mjs';
import * as settingsRegistration from './settings.mjs';
import * as socketRegistration from './socket.mjs';
export { handlebarsRegistration, settingsRegistration, socketRegistration };

29
module/systemRegistration/handlebars.mjs Normal file
View file

@ -0,0 +1,29 @@
export const preloadHandlebarsTemplates = async function () {
return foundry.applications.handlebars.loadTemplates([
'systems/daggerheart/templates/sheets/global/tabs/tab-navigation.hbs',
'systems/daggerheart/templates/sheets/global/partials/inventory-item.hbs',
'systems/daggerheart/templates/sheets/global/partials/action-item.hbs',
'systems/daggerheart/templates/sheets/global/partials/domain-card-item.hbs',
'systems/daggerheart/templates/sheets/global/partials/inventory-fieldset-items.hbs',
'systems/daggerheart/templates/sheets/items/subclass/parts/subclass-features.hbs',
'systems/daggerheart/templates/sheets/items/subclass/parts/subclass-feature.hbs',
'systems/daggerheart/templates/components/card-preview.hbs',
'systems/daggerheart/templates/levelup/parts/selectable-card-preview.hbs',
'systems/daggerheart/templates/sheets/global/partials/feature-section-item.hbs',
'systems/daggerheart/templates/ui/combatTracker/combatTrackerSection.hbs',
'systems/daggerheart/templates/actionTypes/damage.hbs',
'systems/daggerheart/templates/actionTypes/healing.hbs',
'systems/daggerheart/templates/actionTypes/resource.hbs',
'systems/daggerheart/templates/actionTypes/uuid.hbs',
'systems/daggerheart/templates/actionTypes/uses.hbs',
'systems/daggerheart/templates/actionTypes/roll.hbs',
'systems/daggerheart/templates/actionTypes/save.hbs',
'systems/daggerheart/templates/actionTypes/cost.hbs',
'systems/daggerheart/templates/actionTypes/range-target.hbs',
'systems/daggerheart/templates/actionTypes/effect.hbs',
'systems/daggerheart/templates/actionTypes/beastform.hbs',
'systems/daggerheart/templates/settings/components/settings-item-line.hbs',
'systems/daggerheart/templates/ui/chat/parts/damage-chat.hbs',
'systems/daggerheart/templates/ui/chat/parts/target-chat.hbs'
]);
};

36
module/applications/settings.mjs → module/systemRegistration/settings.mjs
View file

@ -13,7 +13,7 @@ import {
DhHomebrewSettings, DhHomebrewSettings,
DhRangeMeasurementSettings, DhRangeMeasurementSettings,
DhVariantRuleSettings DhVariantRuleSettings
} from './settings/_module.mjs'; } from '../applications/settings/_module.mjs';
export const registerDHSettings = () => { export const registerDHSettings = () => {
registerMenuSettings(); registerMenuSettings();
@ -22,19 +22,19 @@ export const registerDHSettings = () => {
}; };
const registerMenuSettings = () => { const registerMenuSettings = () => {
game.settings.register(SYSTEM.id, SYSTEM.SETTINGS.gameSettings.variantRules, { game.settings.register(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.variantRules, {
scope: 'world', scope: 'world',
config: false, config: false,
type: DhVariantRules type: DhVariantRules
}); });
game.settings.register(SYSTEM.id, SYSTEM.SETTINGS.gameSettings.Automation, { game.settings.register(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Automation, {
scope: 'world', scope: 'world',
config: false, config: false,
type: DhAutomation type: DhAutomation
}); });
game.settings.register(SYSTEM.id, SYSTEM.SETTINGS.gameSettings.Homebrew, { game.settings.register(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Homebrew, {
scope: 'world', scope: 'world',
config: false, config: false,
type: DhHomebrew, type: DhHomebrew,
@ -45,7 +45,7 @@ const registerMenuSettings = () => {
} }
}); });
game.settings.register(SYSTEM.id, SYSTEM.SETTINGS.gameSettings.appearance, { game.settings.register(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.appearance, {
scope: 'client', scope: 'client',
config: false, config: false,
type: DhAppearance, type: DhAppearance,
@ -59,7 +59,7 @@ const registerMenuSettings = () => {
} }
}); });
game.settings.register(SYSTEM.id, SYSTEM.SETTINGS.gameSettings.RangeMeasurement, { game.settings.register(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.RangeMeasurement, {
scope: 'client', scope: 'client',
config: false, config: false,
type: DhRangeMeasurement type: DhRangeMeasurement
@ -67,32 +67,32 @@ const registerMenuSettings = () => {
}; };
const registerMenus = () => { const registerMenus = () => {
game.settings.registerMenu(SYSTEM.id, SYSTEM.SETTINGS.menu.Automation.Name, { game.settings.registerMenu(CONFIG.DH.id, CONFIG.DH.SETTINGS.menu.Automation.Name, {
name: game.i18n.localize('DAGGERHEART.Settings.Menu.Automation.Name'), name: game.i18n.localize('DAGGERHEART.Settings.Menu.Automation.Name'),
label: game.i18n.localize('DAGGERHEART.Settings.Menu.Automation.Label'), label: game.i18n.localize('DAGGERHEART.Settings.Menu.Automation.Label'),
hint: game.i18n.localize('DAGGERHEART.Settings.Menu.Automation.Hint'), hint: game.i18n.localize('DAGGERHEART.Settings.Menu.Automation.Hint'),
icon: SYSTEM.SETTINGS.menu.Automation.Icon, icon: CONFIG.DH.SETTINGS.menu.Automation.Icon,
type: DhAutomationSettings, type: DhAutomationSettings,
restricted: true restricted: true
}); });
game.settings.registerMenu(SYSTEM.id, SYSTEM.SETTINGS.menu.Homebrew.Name, { game.settings.registerMenu(CONFIG.DH.id, CONFIG.DH.SETTINGS.menu.Homebrew.Name, {
name: game.i18n.localize('DAGGERHEART.Settings.Menu.Homebrew.Name'), name: game.i18n.localize('DAGGERHEART.Settings.Menu.Homebrew.Name'),
label: game.i18n.localize('DAGGERHEART.Settings.Menu.Homebrew.Label'), label: game.i18n.localize('DAGGERHEART.Settings.Menu.Homebrew.Label'),
hint: game.i18n.localize('DAGGERHEART.Settings.Menu.Homebrew.Hint'), hint: game.i18n.localize('DAGGERHEART.Settings.Menu.Homebrew.Hint'),
icon: SYSTEM.SETTINGS.menu.Homebrew.Icon, icon: CONFIG.DH.SETTINGS.menu.Homebrew.Icon,
type: DhHomebrewSettings, type: DhHomebrewSettings,
restricted: true restricted: true
}); });
game.settings.registerMenu(SYSTEM.id, SYSTEM.SETTINGS.menu.Range.Name, { game.settings.registerMenu(CONFIG.DH.id, CONFIG.DH.SETTINGS.menu.Range.Name, {
name: game.i18n.localize('DAGGERHEART.Settings.Menu.Range.Name'), name: game.i18n.localize('DAGGERHEART.Settings.Menu.Range.Name'),
label: game.i18n.localize('DAGGERHEART.Settings.Menu.Range.Label'), label: game.i18n.localize('DAGGERHEART.Settings.Menu.Range.Label'),
hint: game.i18n.localize('DAGGERHEART.Settings.Menu.Range.Hint'), hint: game.i18n.localize('DAGGERHEART.Settings.Menu.Range.Hint'),
icon: SYSTEM.SETTINGS.menu.Range.Icon, icon: CONFIG.DH.SETTINGS.menu.Range.Icon,
type: DhRangeMeasurementSettings, type: DhRangeMeasurementSettings,
restricted: true restricted: true
}); });
game.settings.registerMenu(SYSTEM.id, SYSTEM.SETTINGS.gameSettings.appearance, { game.settings.registerMenu(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.appearance, {
name: game.i18n.localize('DAGGERHEART.Settings.Menu.Appearance.title'), name: game.i18n.localize('DAGGERHEART.Settings.Menu.Appearance.title'),
label: game.i18n.localize('DAGGERHEART.Settings.Menu.Appearance.label'), label: game.i18n.localize('DAGGERHEART.Settings.Menu.Appearance.label'),
hint: game.i18n.localize('DAGGERHEART.Settings.Menu.Appearance.hint'), hint: game.i18n.localize('DAGGERHEART.Settings.Menu.Appearance.hint'),
@ -101,25 +101,25 @@ const registerMenus = () => {
restricted: false restricted: false
}); });
game.settings.registerMenu(SYSTEM.id, SYSTEM.SETTINGS.menu.VariantRules.Name, { game.settings.registerMenu(CONFIG.DH.id, CONFIG.DH.SETTINGS.menu.VariantRules.Name, {
name: game.i18n.localize('DAGGERHEART.Settings.Menu.VariantRules.title'), name: game.i18n.localize('DAGGERHEART.Settings.Menu.VariantRules.title'),
label: game.i18n.localize('DAGGERHEART.Settings.Menu.VariantRules.label'), label: game.i18n.localize('DAGGERHEART.Settings.Menu.VariantRules.label'),
hint: game.i18n.localize('DAGGERHEART.Settings.Menu.VariantRules.hint'), hint: game.i18n.localize('DAGGERHEART.Settings.Menu.VariantRules.hint'),
icon: SYSTEM.SETTINGS.menu.VariantRules.Icon, icon: CONFIG.DH.SETTINGS.menu.VariantRules.Icon,
type: DhVariantRuleSettings, type: DhVariantRuleSettings,
restricted: false restricted: false
}); });
}; };
const registerNonConfigSettings = () => { const registerNonConfigSettings = () => {
game.settings.register(SYSTEM.id, SYSTEM.SETTINGS.gameSettings.LevelTiers, { game.settings.register(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.LevelTiers, {
scope: 'world', scope: 'world',
config: false, config: false,
type: DhLevelTiers, type: DhLevelTiers,
default: defaultLevelTiers default: defaultLevelTiers
}); });
game.settings.register(SYSTEM.id, SYSTEM.SETTINGS.gameSettings.Resources.Fear, { game.settings.register(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Resources.Fear, {
name: game.i18n.localize('DAGGERHEART.Settings.Resources.Fear.Name'), name: game.i18n.localize('DAGGERHEART.Settings.Resources.Fear.Name'),
hint: game.i18n.localize('DAGGERHEART.Settings.Resources.Fear.Hint'), hint: game.i18n.localize('DAGGERHEART.Settings.Resources.Fear.Hint'),
scope: 'world', scope: 'world',
@ -132,7 +132,7 @@ const registerNonConfigSettings = () => {
} }
}); });
game.settings.register(SYSTEM.id, SYSTEM.SETTINGS.gameSettings.Countdowns, { game.settings.register(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Countdowns, {
scope: 'world', scope: 'world',
config: false, config: false,
type: DhCountdowns type: DhCountdowns

10
module/helpers/socket.mjs → module/systemRegistration/socket.mjs
View file

@ -40,24 +40,24 @@ export const registerSocketHooks = () => {
break; break;
case GMUpdateEvent.UpdateSetting: case GMUpdateEvent.UpdateSetting:
if (game.user.isGM) { if (game.user.isGM) {
await game.settings.set(SYSTEM.id, data.uuid, data.update); await game.settings.set(CONFIG.DH.id, data.uuid, data.update);
} }
break; break;
case GMUpdateEvent.UpdateFear: case GMUpdateEvent.UpdateFear:
if (game.user.isGM) { if (game.user.isGM) {
await game.settings.set( await game.settings.set(
SYSTEM.id, CONFIG.DH.id,
SYSTEM.SETTINGS.gameSettings.Resources.Fear, CONFIG.DH.SETTINGS.gameSettings.Resources.Fear,
Math.max(Math.min(data.update, 6), 0) Math.max(Math.min(data.update, 6), 0)
); );
Hooks.callAll(socketEvent.DhpFearUpdate); Hooks.callAll(socketEvent.DhpFearUpdate);
await game.socket.emit(`system.${SYSTEM.id}`, { action: socketEvent.DhpFearUpdate }); await game.socket.emit(`system.${CONFIG.DH.id}`, { action: socketEvent.DhpFearUpdate });
} }
break; break;
} }
if (data.refresh) { if (data.refresh) {
await game.socket.emit(`system.${SYSTEM.id}`, { await game.socket.emit(`system.${CONFIG.DH.id}`, {
action: socketEvent.Refresh, action: socketEvent.Refresh,
data: data.refresh data: data.refresh
}); });

0
templates/views/actionType.hbs → templates/actionTypes/actionType.hbs
View file

0
templates/views/actionTypes/beastform.hbs → templates/actionTypes/beastform.hbs
View file

0
templates/views/actionTypes/cost.hbs → templates/actionTypes/cost.hbs
View file

0
templates/views/actionTypes/damage.hbs → templates/actionTypes/damage.hbs
View file

0
templates/views/actionTypes/effect.hbs → templates/actionTypes/effect.hbs
View file

Some files were not shown because too many files have changed in this diff Show more