diff --git a/lang/en.json b/lang/en.json index 5bcc3dd4..84fdaf18 100755 --- a/lang/en.json +++ b/lang/en.json @@ -880,7 +880,7 @@ "Gold": { "title": "Gold", "coins": "Coins", - "handfulls": "Handfulls", + "handfuls": "Handfuls", "bags": "Bags", "chests": "Chests" }, @@ -2138,7 +2138,7 @@ "title": "Currency Overrides", "currencyName": "Currency Name", "coinName": "Coin Name", - "handfullName": "Handfull Name", + "handfulName": "Handful Name", "bagName": "Bag Name", "chestName": "Chest Name" }, diff --git a/module/applications/sheets/actors/character.mjs b/module/applications/sheets/actors/character.mjs index 76ca7562..457d949d 100644 --- a/module/applications/sheets/actors/character.mjs +++ b/module/applications/sheets/actors/character.mjs @@ -156,7 +156,7 @@ export default class CharacterSheet extends DHBaseActorSheet { currency: { title: game.i18n.localize('DAGGERHEART.CONFIG.Gold.title'), coins: game.i18n.localize('DAGGERHEART.CONFIG.Gold.coins'), - handfulls: game.i18n.localize('DAGGERHEART.CONFIG.Gold.handfulls'), + handfuls: game.i18n.localize('DAGGERHEART.CONFIG.Gold.handfuls'), bags: game.i18n.localize('DAGGERHEART.CONFIG.Gold.bags'), chests: game.i18n.localize('DAGGERHEART.CONFIG.Gold.chests') } diff --git a/module/canvas/placeables/token.mjs b/module/canvas/placeables/token.mjs index 4c2ae4ed..e6179b10 100644 --- a/module/canvas/placeables/token.mjs +++ b/module/canvas/placeables/token.mjs @@ -53,4 +53,40 @@ export default class DhTokenPlaceable extends foundry.canvas.placeables.Token { this.effects.renderable = true; this.renderFlags.set({ refreshEffects: true }); } + + /** @inheritDoc */ + _drawBar(number, bar, data) { + const val = Number(data.value); + const pct = Math.clamp(val, 0, data.max) / data.max; + + // Determine sizing + const { width, height } = this.document.getSize(); + const s = canvas.dimensions.uiScale; + const bw = width; + const bh = 8 * (this.document.height >= 2 ? 1.5 : 1) * s; + + // Determine the color to use + const fillColor = + number === 0 ? foundry.utils.Color.fromRGB([1, 0, 0]) : foundry.utils.Color.fromString('#0032b1'); + + // Draw the bar + const widthUnit = bw / data.max; + bar.clear().lineStyle(s, 0x000000, 1.0); + const sections = [...Array(data.max).keys()]; + for (let mark of sections) { + const x = mark * widthUnit; + const marked = mark + 1 <= data.value; + const color = marked ? fillColor : foundry.utils.Color.fromRGB([0, 0, 0]); + if (mark === 0 || mark === sections.length - 1) { + bar.beginFill(color, marked ? 1.0 : 0.5).drawRect(x, 0, widthUnit, bh, 2 * s); // Would like drawRoundedRect, but it's very troublsome with the corners. Leaving for now. + } else { + bar.beginFill(color, marked ? 1.0 : 0.5).drawRect(x, 0, widthUnit, bh, 2 * s); + } + } + + // Set position + const posY = number === 0 ? height - bh : 0; + bar.position.set(0, posY); + return true; + } } diff --git a/module/config/itemConfig.mjs b/module/config/itemConfig.mjs index e54abc8b..cb4c5f97 100644 --- a/module/config/itemConfig.mjs +++ b/module/config/itemConfig.mjs @@ -857,7 +857,7 @@ export const weaponFeatures = { name: 'DAGGERHEART.CONFIG.WeaponFeature.greedy.name', description: 'DAGGERHEART.CONFIG.WeaponFeature.greedy.description', img: 'icons/commodities/currency/coins-crown-stack-gold.webp', - // Should cost handfull of gold, + // Should cost handful of gold, effects: [ { name: 'DAGGERHEART.CONFIG.WeaponFeature.greedy.actions.greed.name', diff --git a/module/data/actor/character.mjs b/module/data/actor/character.mjs index ee84aa7d..613f82da 100644 --- a/module/data/actor/character.mjs +++ b/module/data/actor/character.mjs @@ -73,7 +73,7 @@ export default class DhCharacter extends BaseDataActor { ), gold: new fields.SchemaField({ coins: new fields.NumberField({ initial: 0, integer: true }), - handfulls: new fields.NumberField({ initial: 1, integer: true }), + handfuls: new fields.NumberField({ initial: 1, integer: true }), bags: new fields.NumberField({ initial: 0, integer: true }), chests: new fields.NumberField({ initial: 0, integer: true }) }), diff --git a/module/data/settings/Homebrew.mjs b/module/data/settings/Homebrew.mjs index d2296dc6..e18fee39 100644 --- a/module/data/settings/Homebrew.mjs +++ b/module/data/settings/Homebrew.mjs @@ -45,10 +45,10 @@ export default class DhHomebrew extends foundry.abstract.DataModel { initial: 'Coins', label: 'DAGGERHEART.SETTINGS.Homebrew.currency.coinName' }), - handfulls: new fields.StringField({ + handfuls: new fields.StringField({ required: true, - initial: 'Handfulls', - label: 'DAGGERHEART.SETTINGS.Homebrew.currency.handfullName' + initial: 'Handfuls', + label: 'DAGGERHEART.SETTINGS.Homebrew.currency.handfulName' }), bags: new fields.StringField({ required: true, diff --git a/templates/settings/homebrew-settings.hbs b/templates/settings/homebrew-settings.hbs index b70d63ad..4e2c442f 100644 --- a/templates/settings/homebrew-settings.hbs +++ b/templates/settings/homebrew-settings.hbs @@ -24,7 +24,7 @@ {{formGroup settingFields.schema.fields.currency.fields.enabled value=settingFields._source.currency.enabled localize=true}} {{formGroup settingFields.schema.fields.currency.fields.title value=settingFields._source.currency.title localize=true}} {{formGroup settingFields.schema.fields.currency.fields.coins value=settingFields._source.currency.coins localize=true}} - {{formGroup settingFields.schema.fields.currency.fields.handfulls value=settingFields._source.currency.handfulls localize=true}} + {{formGroup settingFields.schema.fields.currency.fields.handfuls value=settingFields._source.currency.handfuls localize=true}} {{formGroup settingFields.schema.fields.currency.fields.bags value=settingFields._source.currency.bags localize=true}} {{formGroup settingFields.schema.fields.currency.fields.chests value=settingFields._source.currency.chests localize=true}} diff --git a/templates/settings/homebrew-settings/settings.hbs b/templates/settings/homebrew-settings/settings.hbs index be408353..1c7c787d 100644 --- a/templates/settings/homebrew-settings/settings.hbs +++ b/templates/settings/homebrew-settings/settings.hbs @@ -29,7 +29,7 @@ {{formGroup settingFields.schema.fields.currency.fields.enabled value=settingFields._source.currency.enabled localize=true}} {{formGroup settingFields.schema.fields.currency.fields.title value=settingFields._source.currency.title localize=true}} {{formGroup settingFields.schema.fields.currency.fields.coins value=settingFields._source.currency.coins localize=true}} - {{formGroup settingFields.schema.fields.currency.fields.handfulls value=settingFields._source.currency.handfulls localize=true}} + {{formGroup settingFields.schema.fields.currency.fields.handfuls value=settingFields._source.currency.handfuls localize=true}} {{formGroup settingFields.schema.fields.currency.fields.bags value=settingFields._source.currency.bags localize=true}} {{formGroup settingFields.schema.fields.currency.fields.chests value=settingFields._source.currency.chests localize=true}} diff --git a/templates/sheets/actors/character/inventory.hbs b/templates/sheets/actors/character/inventory.hbs index 10433483..017d37d9 100644 --- a/templates/sheets/actors/character/inventory.hbs +++ b/templates/sheets/actors/character/inventory.hbs @@ -19,9 +19,9 @@ localize=true toggled=true}}
- {{localize this.inventory.currency.handfulls}} - {{formInput systemFields.gold.fields.handfulls value=source.system.gold.handfulls - enriched=source.system.gold.handfulls localize=true toggled=true}} + {{localize this.inventory.currency.handfuls}} + {{formInput systemFields.gold.fields.handfuls value=source.system.gold.handfuls + enriched=source.system.gold.handfuls localize=true toggled=true}}
{{localize this.inventory.currency.bags}}