cosmo/daggerheart
1
0
Fork 0
mirror of https://github.com/Foundryborne/daggerheart.git synced 2026-06-05 20:34:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch 'main' into unstoppable-alt

Browse source
This commit is contained in:
WBHarry 2026-04-25 22:51:13 +02:00
commit 4371c5af95
5 changed files with 12 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -725,7 +725,7 @@ export default function DHApplicationMixin(Base) {
: null : null
: this.document; : this.document;
let systemData = {}; let systemData = null;
if (featureOnCharacter) { if (featureOnCharacter) {
systemData = { systemData = {
originItemType: this.document.type, originItemType: this.document.type,
@ -738,10 +738,11 @@ export default function DHApplicationMixin(Base) {
const data = { const data = {
name: cls.defaultName({ type, parent }), name: cls.defaultName({ type, parent }),
type, type
system: systemData
}; };
if (systemData) data.system = systemData;
if (inVault) data['system.inVault'] = true; if (inVault) data['system.inVault'] = true;
if (disabled) data.disabled = true; if (disabled) data.disabled = true;
if (type === 'domainCard' && parent?.system.domains?.length) { if (type === 'domainCard' && parent?.system.domains?.length) {

4
module/config/itemBrowserConfig.mjs
View file

@ -177,8 +177,8 @@ export const typeConfig = {
key: 'system.secondary', key: 'system.secondary',
label: 'DAGGERHEART.UI.ItemBrowser.subtype', label: 'DAGGERHEART.UI.ItemBrowser.subtype',
choices: [ choices: [
{ value: false, label: 'DAGGERHEART.ITEMS.Weapon.primaryWeapon' }, { value: false, label: 'DAGGERHEART.ITEMS.Weapon.primaryWeapon.full' },
{ value: true, label: 'DAGGERHEART.ITEMS.Weapon.secondaryWeapon' } { value: true, label: 'DAGGERHEART.ITEMS.Weapon.secondaryWeapon.full' }
] ]
}, },
{ {

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

@ -28,7 +28,10 @@ export default class DHWeapon extends AttachableItem {
equipped: new fields.BooleanField({ initial: false }), equipped: new fields.BooleanField({ initial: false }),
//SETTINGS //SETTINGS
secondary: new fields.BooleanField({ initial: false, label: 'DAGGERHEART.ITEMS.Weapon.secondaryWeapon' }), secondary: new fields.BooleanField({
initial: false,
label: 'DAGGERHEART.ITEMS.Weapon.secondaryWeapon.full'
}),
burden: new fields.StringField({ burden: new fields.StringField({
required: true, required: true,
choices: CONFIG.DH.GENERAL.burden, choices: CONFIG.DH.GENERAL.burden,

2
templates/settings/variant-rules.hbs
View file

@ -32,7 +32,7 @@
<footer class="form-footer"> <footer class="form-footer">
<button data-action="reset"> <button data-action="reset">
<i class="fa-solid fa-arrow-rotate-left"></i> <i class="fa-solid fa-arrow-rotate-left"></i>
<span>{{localize "SETTINGS.UI.ACTIONS.ResetReset"}}</span> <span>{{localize "SETTINGS.UI.ACTIONS.Reset"}}</span>
</button> </button>
<button data-action="save" > <button data-action="save" >
<i class="fa-solid fa-floppy-disk"></i> <i class="fa-solid fa-floppy-disk"></i>

2
templates/ui/combatTracker/combatTrackerHeader.hbs
View file

@ -66,7 +66,7 @@
{{#if (and combats.length user.isGM)}} {{#if (and combats.length user.isGM)}}
<div class="encounter-battlepoints" data-tooltip="#battlepoints#" data-combat-id="{{combat.id}}"> <div class="encounter-battlepoints" data-tooltip="#battlepoints#" data-combat-id="{{combat.id}}">
{{battlepoints.current}}/{{battlepoints.max}} BP{{#if battlepoints.hasModifierBP}}*{{/if}} {{battlepoints.current}}/{{battlepoints.max}} {{localize "DAGGERHEART.GENERAL.Battlepoints.short"}}{{#if battlepoints.hasModifierBP}}*{{/if}}
</div> </div>
{{/if}} {{/if}}