diff --git a/lang/en.json b/lang/en.json
index a2c3dc79..41441b61 100755
--- a/lang/en.json
+++ b/lang/en.json
@@ -210,10 +210,7 @@
"type": { "label": "Type" }
},
"hordeDamage": "Horde Damage",
- "horderHp": "Horde/HP",
- "adversaryReactionRoll": {
- "headerTitle": "Adversary Reaction Roll"
- }
+ "horderHp": "Horde/HP"
},
"Character": {
"advantageSources": {
@@ -336,8 +333,7 @@
"minor": "MIN",
"major": "MAJ",
"severe": "SEV"
- },
- "triggerRestContent": "This will trigger a dialog to players make their downtime moves. Are you sure?"
+ }
}
},
"APPLICATIONS": {
@@ -471,10 +467,6 @@
"defaultOwnershipTooltip": "The default player ownership of countdowns",
"hideNewCountdowns": "Hide New Countdowns"
},
- "CreateItemDialog": {
- "createItem": "Create Item",
- "browseCompendium": "Browse Compendium"
- },
"DaggerheartMenu": {
"title": "GM Tools",
"refreshFeatures": "Refresh Features",
@@ -689,12 +681,6 @@
"noPlayers": "No players to assign ownership to",
"default": "Default Ownership"
},
- "PendingReactionsDialog": {
- "title": "Pending Reaction Rolls Found",
- "unfinishedRolls": "Some Tokens still need to roll their Reaction Roll.",
- "confirmation": "Are you sure you want to continue ?",
- "warning": "Undone reaction rolls will be considered as failed"
- },
"ReactionRoll": {
"title": "Reaction Roll: {trait}"
},
@@ -749,11 +735,11 @@
},
"GroupRollSelect": {
"title": "Group Roll",
- "aidingCharacters": "Aiding Characters",
"leader": "Leader",
"leaderRoll": "Leader Roll",
"openDialogForAll": "Open Dialog For All",
"startGroupRoll": "Start Group Roll",
+ "cancelGroupRoll": "Cancel",
"finishGroupRoll": "Finish Group Roll",
"cancelConfirmTitle": "Cancel Group Roll",
"cancelConfirmText": "Are you sure you want to cancel the Group Roll? This will close it for all other players too."
@@ -778,11 +764,6 @@
"session": "Next Session",
"custom": "Custom"
},
- "ActionAutomationChoices": {
- "never": "Never",
- "showDialog": "Show Dialog Only",
- "always": "Always"
- },
"AdversaryTrait": {
"relentless": {
"name": "Relentless",
@@ -1312,11 +1293,6 @@
"on": "On",
"onWithToggle": "On With Toggle"
},
- "SceneRangeMeasurementTypes": {
- "disable": "Disable Daggerheart Range Measurement",
- "default": "Default",
- "custom": "Custom"
- },
"SelectAction": {
"selectType": "Select Action Type",
"selectAction": "Action Selection"
@@ -2428,7 +2404,6 @@
"multiclass": "Multiclass",
"newCategory": "New Category",
"newThing": "New {thing}",
- "next": "Next",
"none": "None",
"noTarget": "No current target",
"partner": "Partner",
@@ -2460,7 +2435,6 @@
"scalable": "Scalable",
"scars": "Scars",
"situationalBonus": "Situational Bonus",
- "searchPlaceholder": "Search...",
"spent": "Spent",
"step": "Step",
"stress": "Stress",
@@ -3036,9 +3010,6 @@
"resourceRoll": {
"playerMessage": "{user} rerolled their {name}"
},
- "saveRoll": {
- "reactionRollAllTargets": "Reaction Roll All Targets"
- },
"tagTeam": {
"title": "Tag Team",
"membersTitle": "Members"
@@ -3069,6 +3040,7 @@
"title": "Daggerheart Compendium Browser",
"hint": "Select a Folder in sidebar to start browsing through the compendium",
"browserSettings": "Browser Settings",
+ "searchPlaceholder": "Search...",
"columnName": "Name",
"tooltipFilters": "Filters",
"tooltipErase": "Erase",
@@ -3104,7 +3076,7 @@
"weapons": "Weapons",
"armors": "Armors",
"consumables": "Consumables",
- "loots": "Loot"
+ "loots": "Loots"
}
},
"Notifications": {
@@ -3199,7 +3171,6 @@
"companion": "Level {level} - {partner}",
"companionNoPartner": "No Partner",
"duplicateToNewTier": "Duplicate to New Tier",
- "createAdversary": "Create Adversary",
"pickTierTitle": "Pick a new tier for this adversary"
},
"daggerheartMenu": {
diff --git a/module/applications/dialogs/groupRollDialog.mjs b/module/applications/dialogs/groupRollDialog.mjs
index a47dd0a8..2a7be791 100644
--- a/module/applications/dialogs/groupRollDialog.mjs
+++ b/module/applications/dialogs/groupRollDialog.mjs
@@ -116,7 +116,7 @@ export default class GroupRollDialog extends HandlebarsApplicationMixin(Applicat
initializationPart.insertAdjacentHTML('afterend', '
');
initializationPart.insertAdjacentHTML(
'afterend',
- `${game.i18n.localize('DAGGERHEART.APPLICATIONS.GroupRollSelect.aidingCharacters')}
`
+ `${game.i18n.localize('Aiding Characters')}
`
);
const teamContainer = this.element.querySelector('.team-container');
diff --git a/module/applications/settings/appearanceSettings.mjs b/module/applications/settings/appearanceSettings.mjs
index 64e5a076..151648e1 100644
--- a/module/applications/settings/appearanceSettings.mjs
+++ b/module/applications/settings/appearanceSettings.mjs
@@ -118,13 +118,8 @@ export default class DHAppearanceSettings extends HandlebarsApplicationMixin(App
break;
case 'footer':
partContext.buttons = [
- {
- type: 'button',
- action: 'reset',
- icon: 'fa-solid fa-arrow-rotate-left',
- label: game.i18n.localize('ACTIONS.Reset')
- },
- { type: 'submit', icon: 'fa-solid fa-floppy-disk', label: game.i18n.localize('EDITOR.Save') }
+ { type: 'button', action: 'reset', icon: 'fa-solid fa-arrow-rotate-left', label: 'Reset' },
+ { type: 'submit', icon: 'fa-solid fa-floppy-disk', label: 'Save Changes' }
];
break;
}
diff --git a/module/applications/sheets/actors/adversary.mjs b/module/applications/sheets/actors/adversary.mjs
index 04be3efb..d8a3df29 100644
--- a/module/applications/sheets/actors/adversary.mjs
+++ b/module/applications/sheets/actors/adversary.mjs
@@ -217,8 +217,8 @@ export default class AdversarySheet extends DHBaseActorSheet {
static #reactionRoll(event) {
const config = {
event,
- title: game.i18n.localize('DAGGERHEART.GENERAL.reactionRoll'),
- headerTitle: game.i18n.localize('DAGGERHEART.ACTORS.Adversary.adversaryReactionRoll.headerTitle'),
+ title: `Reaction Roll: ${this.actor.name}`,
+ headerTitle: 'Adversary Reaction Roll',
roll: {
type: 'trait'
},
diff --git a/module/applications/sheets/actors/party.mjs b/module/applications/sheets/actors/party.mjs
index a7eeccdf..d4545f63 100644
--- a/module/applications/sheets/actors/party.mjs
+++ b/module/applications/sheets/actors/party.mjs
@@ -288,7 +288,7 @@ export default class Party extends DHBaseActorSheet {
title: game.i18n.localize(`DAGGERHEART.APPLICATIONS.Downtime.${button.dataset.type}.title`),
icon: button.dataset.type === 'shortRest' ? 'fa-solid fa-utensils' : 'fa-solid fa-bed'
},
- content: game.i18n.localize('DAGGERHEART.ACTORS.Party.triggerRestContent'),
+ content: 'This will trigger a dialog to players make their downtime moves, are you sure?',
classes: ['daggerheart', 'dialog', 'dh-style']
});
diff --git a/module/applications/sheets/api/application-mixin.mjs b/module/applications/sheets/api/application-mixin.mjs
index e93ce774..64f62405 100644
--- a/module/applications/sheets/api/application-mixin.mjs
+++ b/module/applications/sheets/api/application-mixin.mjs
@@ -644,12 +644,12 @@ export default function DHApplicationMixin(Base) {
buttons: [
{
action: 'create',
- label: game.i18n.localize('DAGGERHEART.APPLICATIONS.CreateItemDialog.createItem'),
+ label: 'Create Item',
icon: 'fa-solid fa-plus'
},
{
action: 'browse',
- label: game.i18n.localize('DAGGERHEART.APPLICATIONS.CreateItemDialog.browseCompendium'),
+ label: 'Browse Compendium',
icon: 'fa-solid fa-book'
}
]
diff --git a/module/applications/sidebar/tabs/actorDirectory.mjs b/module/applications/sidebar/tabs/actorDirectory.mjs
index e9484553..9d8f16e1 100644
--- a/module/applications/sidebar/tabs/actorDirectory.mjs
+++ b/module/applications/sidebar/tabs/actorDirectory.mjs
@@ -76,7 +76,7 @@ export default class DhActorDirectory extends foundry.applications.sidebar.tabs.
window: { title: 'DAGGERHEART.UI.Sidebar.actorDirectory.pickTierTitle' },
content,
ok: {
- label: 'DAGGERHEART.UI.Sidebar.actorDirectory.createAdversary',
+ label: 'Create Adversary',
callback: (event, button, dialog) => Number(button.form.elements.tier.value)
}
});
diff --git a/module/applications/ui/fearTracker.mjs b/module/applications/ui/fearTracker.mjs
index 4e5e1132..82dda215 100644
--- a/module/applications/ui/fearTracker.mjs
+++ b/module/applications/ui/fearTracker.mjs
@@ -22,7 +22,7 @@ export default class FearTracker extends HandlebarsApplicationMixin(ApplicationV
tag: 'div',
window: {
frame: true,
- title: 'DAGGERHEART.GENERAL.fear',
+ title: 'Fear',
positioned: true,
resizable: true,
minimizable: false
diff --git a/module/applications/ui/itemBrowser.mjs b/module/applications/ui/itemBrowser.mjs
index 9ca328a0..2d2e8cdc 100644
--- a/module/applications/ui/itemBrowser.mjs
+++ b/module/applications/ui/itemBrowser.mjs
@@ -207,23 +207,8 @@ export class ItemBrowser extends HandlebarsApplicationMixin(ApplicationV2) {
label: game.i18n.localize(col.label)
}));
- const splitPath = folderId?.split('.') ?? [];
- const { pathLabels } = splitPath.reduce(
- (acc, curr) => {
- acc.currentPath = !acc.currentPath ? curr : [acc.currentPath, curr].join('.');
- if (curr === 'folder') return acc;
-
- const label = foundry.utils.getProperty(this.config, acc.currentPath)?.label;
- if (label) acc.pathLabels.push(game.i18n.localize(label));
-
- return acc;
- },
- { pathLabels: [], currentPath: '' }
- );
-
this.selectedMenu = {
- path: splitPath,
- pathLabels: pathLabels,
+ path: folderId?.split('.') ?? [],
data: {
...folderData,
columns: columns
diff --git a/module/applications/ux/filter-menu.mjs b/module/applications/ux/filter-menu.mjs
index 791c0e1f..065d08f9 100644
--- a/module/applications/ux/filter-menu.mjs
+++ b/module/applications/ux/filter-menu.mjs
@@ -188,7 +188,7 @@ export default class FilterMenu extends foundry.applications.ux.ContextMenu {
}));
const damageTypeFilter = Object.values(CONFIG.DH.GENERAL.damageTypes).map(({ id, abbreviation }) => ({
- group: game.i18n.localize('DAGGERHEART.GENERAL.damageType'),
+ group: 'Damage Type', //TODO localize
name: game.i18n.localize(abbreviation),
filter: {
field: 'system.damage.type',
diff --git a/module/config/generalConfig.mjs b/module/config/generalConfig.mjs
index 58a9dff9..4a3d672d 100644
--- a/module/config/generalConfig.mjs
+++ b/module/config/generalConfig.mjs
@@ -955,15 +955,15 @@ export const countdownAppMode = {
export const sceneRangeMeasurementSetting = {
disable: {
id: 'disable',
- label: 'DAGGERHEART.CONFIG.SceneRangeMeasurementTypes.disable'
+ label: 'Disable Daggerheart Range Measurement'
},
default: {
id: 'default',
- label: 'DAGGERHEART.CONFIG.SceneRangeMeasurementTypes.default'
+ label: 'Default'
},
custom: {
id: 'custom',
- label: 'DAGGERHEART.CONFIG.SceneRangeMeasurementTypes.custom'
+ label: 'Custom'
}
};
diff --git a/module/config/itemBrowserConfig.mjs b/module/config/itemBrowserConfig.mjs
index 0a4154a8..3b10409c 100644
--- a/module/config/itemBrowserConfig.mjs
+++ b/module/config/itemBrowserConfig.mjs
@@ -7,12 +7,7 @@ export const typeConfig = {
},
{
key: 'system.type',
- label: 'DAGGERHEART.GENERAL.type',
- format: type => {
- if (!type) return '-';
-
- return CONFIG.DH.ACTOR.allAdversaryTypes()[type].label;
- }
+ label: 'DAGGERHEART.GENERAL.type'
}
],
filters: [
@@ -323,14 +318,7 @@ export const typeConfig = {
},
{
key: 'system.domains',
- label: 'DAGGERHEART.GENERAL.Domain.plural',
- format: domains => {
- const config = CONFIG.DH.DOMAIN.allDomains();
- return domains
- .map(x => (x ? game.i18n.localize(config[x].label) : null))
- .filter(x => x)
- .join(', ');
- }
+ label: 'DAGGERHEART.GENERAL.Domain.plural'
}
],
filters: [
@@ -379,8 +367,7 @@ export const typeConfig = {
},
{
key: 'system.spellcastingTrait',
- label: 'DAGGERHEART.ITEMS.Subclass.spellcastingTrait',
- format: trait => (trait ? `DAGGERHEART.CONFIG.Traits.${trait}.name` : '-')
+ label: 'DAGGERHEART.ITEMS.Subclass.spellcastingTrait'
}
],
filters: [
diff --git a/module/config/settingsConfig.mjs b/module/config/settingsConfig.mjs
index 74315a8b..de4d96be 100644
--- a/module/config/settingsConfig.mjs
+++ b/module/config/settingsConfig.mjs
@@ -46,14 +46,18 @@ export const gameSettings = {
export const actionAutomationChoices = {
never: {
id: 'never',
- label: 'DAGGERHEART.CONFIG.ActionAutomationChoices.never'
+ label: 'Never'
},
showDialog: {
id: 'showDialog',
- label: 'DAGGERHEART.CONFIG.ActionAutomationChoices.showDialog'
+ label: 'Show Dialog only'
},
+ // npcOnly: {
+ // id: "npcOnly",
+ // label: "Always for non-characters"
+ // },
always: {
id: 'always',
- label: 'DAGGERHEART.CONFIG.ActionAutomationChoices.always'
+ label: 'Always'
}
};
diff --git a/module/data/actor/character.mjs b/module/data/actor/character.mjs
index 61338344..52ead5ba 100644
--- a/module/data/actor/character.mjs
+++ b/module/data/actor/character.mjs
@@ -153,6 +153,7 @@ export default class DhCharacter extends DhCreature {
shortMoves: new fields.NumberField({
required: true,
integer: true,
+ min: 0,
initial: 0,
label: 'DAGGERHEART.GENERAL.Bonuses.rest.shortRest.shortRestMoves.label',
hint: 'DAGGERHEART.GENERAL.Bonuses.rest.shortRest.shortRestMoves.hint'
@@ -160,6 +161,7 @@ export default class DhCharacter extends DhCreature {
longMoves: new fields.NumberField({
required: true,
integer: true,
+ min: 0,
initial: 0,
label: 'DAGGERHEART.GENERAL.Bonuses.rest.shortRest.longRestMoves.label',
hint: 'DAGGERHEART.GENERAL.Bonuses.rest.shortRest.longRestMoves.hint'
@@ -169,6 +171,7 @@ export default class DhCharacter extends DhCreature {
shortMoves: new fields.NumberField({
required: true,
integer: true,
+ min: 0,
initial: 0,
label: 'DAGGERHEART.GENERAL.Bonuses.rest.longRest.shortRestMoves.label',
hint: 'DAGGERHEART.GENERAL.Bonuses.rest.longRest.shortRestMoves.hint'
@@ -176,6 +179,7 @@ export default class DhCharacter extends DhCreature {
longMoves: new fields.NumberField({
required: true,
integer: true,
+ min: 0,
initial: 0,
label: 'DAGGERHEART.GENERAL.Bonuses.rest.longRest.longRestMoves.label',
hint: 'DAGGERHEART.GENERAL.Bonuses.rest.longRest.longRestMoves.hint'
diff --git a/module/data/fields/action/damageField.mjs b/module/data/fields/action/damageField.mjs
index 30a5ad7c..7839bf5a 100644
--- a/module/data/fields/action/damageField.mjs
+++ b/module/data/fields/action/damageField.mjs
@@ -320,7 +320,7 @@ export class DHDamageData extends DHResourceData {
required: true
}),
{
- label: game.i18n.localize('DAGGERHEART.GENERAL.type')
+ label: 'Type'
}
)
};
diff --git a/module/data/tagTeamData.mjs b/module/data/tagTeamData.mjs
index 640c2f6c..25158606 100644
--- a/module/data/tagTeamData.mjs
+++ b/module/data/tagTeamData.mjs
@@ -33,7 +33,7 @@ export class MemberData extends foundry.abstract.DataModel {
required: true,
choices: CONFIG.DH.GENERAL.tagTeamRollTypes,
initial: CONFIG.DH.GENERAL.tagTeamRollTypes.trait.id,
- label: game.i18n.localize('DAGGERHEART.APPLICATIONS.TagTeamSelect.rollType')
+ label: 'Roll Type'
}),
rollChoice: new fields.StringField({ nullable: true, initial: null }),
rollData: new fields.JSONField({ nullable: true, initial: null }),
diff --git a/module/documents/chatMessage.mjs b/module/documents/chatMessage.mjs
index ad64336f..307677bb 100644
--- a/module/documents/chatMessage.mjs
+++ b/module/documents/chatMessage.mjs
@@ -178,8 +178,8 @@ export default class DhpChatMessage extends foundry.documents.ChatMessage {
const pendingingSaves = targets.filter(t => t.saved.success === null);
if (pendingingSaves.length) {
const confirm = await foundry.applications.api.DialogV2.confirm({
- window: { title: game.i18n.localize('DAGGERHEART.APPLICATIONS.PendingReactionsDialog.title') },
- content: `${game.i18n.localize('DAGGERHEART.APPLICATIONS.PendingReactionsDialog.unfinishedRolls')}
${game.i18n.localize('DAGGERHEART.APPLICATIONS.PendingReactionsDialog.confirmation')}
${game.i18n.localize('DAGGERHEART.APPLICATIONS.PendingReactionsDialog.warning')}
`
+ window: { title: 'Pending Reaction Rolls found' },
+ content: `Some Tokens still need to roll their Reaction Roll.
Are you sure you want to continue ?
Undone reaction rolls will be considered as failed
`
});
if (!confirm) return;
}
diff --git a/styles/less/global/prose-mirror.less b/styles/less/global/prose-mirror.less
index 8a663e28..3523dc89 100644
--- a/styles/less/global/prose-mirror.less
+++ b/styles/less/global/prose-mirror.less
@@ -25,7 +25,7 @@
}
h4 {
font-size: var(--font-size-16);
- color: light-dark(@dark, @beige);
+ color: @beige;
font-weight: 600;
}
diff --git a/styles/less/ui/combat-sidebar/encounter-controls.less b/styles/less/ui/combat-sidebar/encounter-controls.less
index 66f265e0..16a8e11a 100644
--- a/styles/less/ui/combat-sidebar/encounter-controls.less
+++ b/styles/less/ui/combat-sidebar/encounter-controls.less
@@ -10,7 +10,6 @@
.encounter-battlepoints {
display: flex;
cursor: help;
- color: light-dark(@dark, @beige);
}
.inner-controls {
diff --git a/system.json b/system.json
index 614b9cc0..450c33b2 100644
--- a/system.json
+++ b/system.json
@@ -8,9 +8,6 @@
"verified": "14.360",
"maximum": "14"
},
- "url": "https://github.com/Foundryborne/daggerheart",
- "manifest": "https://raw.githubusercontent.com/Foundryborne/daggerheart/v14/system.json",
- "download": "https://github.com/Foundryborne/daggerheart/releases/download/2.1.1/system.zip",
"authors": [
{
"name": "WBHarry"
@@ -298,5 +295,8 @@
},
"background": "systems/daggerheart/assets/logos/FoundrybornBackgroundLogo.png",
"primaryTokenAttribute": "resources.hitPoints",
- "secondaryTokenAttribute": "resources.stress"
+ "secondaryTokenAttribute": "resources.stress",
+ "url": "https://github.com/Foundryborne/daggerheart",
+ "manifest": "https://raw.githubusercontent.com/Foundryborne/daggerheart/main/system.json",
+ "download": "https://github.com/Foundryborne/daggerheart/releases/download/2.1.1/system.zip"
}
diff --git a/templates/characterCreation/footer.hbs b/templates/characterCreation/footer.hbs
index 51eef110..95b86cfb 100644
--- a/templates/characterCreation/footer.hbs
+++ b/templates/characterCreation/footer.hbs
@@ -1,8 +1,8 @@
\ No newline at end of file
diff --git a/templates/dialogs/characterReset.hbs b/templates/dialogs/characterReset.hbs
index 59f88437..298826e5 100644
--- a/templates/dialogs/characterReset.hbs
+++ b/templates/dialogs/characterReset.hbs
@@ -28,6 +28,6 @@
-
+
\ No newline at end of file
diff --git a/templates/dialogs/deathMove.hbs b/templates/dialogs/deathMove.hbs
index 97900022..341659df 100644
--- a/templates/dialogs/deathMove.hbs
+++ b/templates/dialogs/deathMove.hbs
@@ -17,7 +17,7 @@