+ You'll need a Foundry VTT License or GM access to a Foundry VTT + server. +
++
You can find System settings in the Configure Settings dialog you open from the sidebar
diff --git a/package/ose-v0.1.zip b/package/ose-v0.1.zip new file mode 100644 index 0000000..e836a3a Binary files /dev/null and b/package/ose-v0.1.zip differ diff --git a/package/ose-v0.2.zip b/package/ose-v0.2.zip new file mode 100644 index 0000000..b9b350e Binary files /dev/null and b/package/ose-v0.2.zip differ diff --git a/package/ose-v0.3.zip b/package/ose-v0.3.zip new file mode 100644 index 0000000..cb4d4d7 Binary files /dev/null and b/package/ose-v0.3.zip differ diff --git a/package/ose-v0.4.zip b/package/ose-v0.4.zip new file mode 100644 index 0000000..7ea54cb Binary files /dev/null and b/package/ose-v0.4.zip differ diff --git a/package/ose-v0.5.zip b/package/ose-v0.5.zip new file mode 100644 index 0000000..28b790f Binary files /dev/null and b/package/ose-v0.5.zip differ diff --git a/package/ose-v0.6.zip b/package/ose-v0.6.zip new file mode 100644 index 0000000..c940b4b Binary files /dev/null and b/package/ose-v0.6.zip differ diff --git a/package/ose-v0.7.zip b/package/ose-v0.7.zip new file mode 100644 index 0000000..e4acd1a Binary files /dev/null and b/package/ose-v0.7.zip differ diff --git a/package/ose-v0.8.zip b/package/ose-v0.8.zip new file mode 100644 index 0000000..1746c13 Binary files /dev/null and b/package/ose-v0.8.zip differ diff --git a/package/ose-v0.9.1.zip b/package/ose-v0.9.1.zip new file mode 100644 index 0000000..303f83e Binary files /dev/null and b/package/ose-v0.9.1.zip differ diff --git a/package/ose-v0.9.2.zip b/package/ose-v0.9.2.zip new file mode 100644 index 0000000..70d24f3 Binary files /dev/null and b/package/ose-v0.9.2.zip differ diff --git a/package/ose-v0.9.3.zip b/package/ose-v0.9.3.zip new file mode 100644 index 0000000..ab0c649 Binary files /dev/null and b/package/ose-v0.9.3.zip differ diff --git a/package/ose-v0.9.4.zip b/package/ose-v0.9.4.zip new file mode 100644 index 0000000..aba3e3e Binary files /dev/null and b/package/ose-v0.9.4.zip differ diff --git a/package/ose-v0.9.5.zip b/package/ose-v0.9.5.zip new file mode 100644 index 0000000..781bb07 Binary files /dev/null and b/package/ose-v0.9.5.zip differ diff --git a/package/ose-v0.9.6.zip b/package/ose-v0.9.6.zip new file mode 100644 index 0000000..a623407 Binary files /dev/null and b/package/ose-v0.9.6.zip differ diff --git a/package/ose-v0.9.7.zip b/package/ose-v0.9.7.zip new file mode 100644 index 0000000..71c2824 Binary files /dev/null and b/package/ose-v0.9.7.zip differ diff --git a/package/ose-v0.9.8.zip b/package/ose-v0.9.8.zip new file mode 100644 index 0000000..18e7802 Binary files /dev/null and b/package/ose-v0.9.8.zip differ diff --git a/package/ose-v0.9.9.zip b/package/ose-v0.9.9.zip new file mode 100644 index 0000000..1ec0b50 Binary files /dev/null and b/package/ose-v0.9.9.zip differ diff --git a/package/ose-v0.9.zip b/package/ose-v0.9.zip new file mode 100644 index 0000000..2142999 Binary files /dev/null and b/package/ose-v0.9.zip differ diff --git a/package/ose-v1.0.1.zip b/package/ose-v1.0.1.zip new file mode 100644 index 0000000..8a7240a Binary files /dev/null and b/package/ose-v1.0.1.zip differ diff --git a/package/ose-v1.0.2.zip b/package/ose-v1.0.2.zip new file mode 100644 index 0000000..a8212ec Binary files /dev/null and b/package/ose-v1.0.2.zip differ diff --git a/package/ose-v1.0.3.zip b/package/ose-v1.0.3.zip new file mode 100644 index 0000000..ecb3e5a Binary files /dev/null and b/package/ose-v1.0.3.zip differ diff --git a/src/acks.js b/src/acks.js index 557b94a..afa8a73 100644 --- a/src/acks.js +++ b/src/acks.js @@ -125,15 +125,22 @@ Hooks.on("renderCombatTracker", (object, html, data) => { Hooks.on("preUpdateCombat", async (combat, data, diff, id) => { let init = game.settings.get("acks", "initiative"); + let reroll = game.settings.get("acks", "rerollInitiative"); if (!data.round) { return; } + if (data.round !== 1) { + if (reroll === "reset") { + OseCombat.resetInitiative(combat, data, diff, id); + return; + } else if (reroll === "keep") { + return; + } + } if (init === "group") { AcksCombat.rollInitiative(combat, data, diff, id); - } else if (init === "rerolled") { + } else if (init === "individual") { AcksCombat.individualInitiative(combat, data, diff, id); - } else if (init === "reset") { - AcksCombat.resetInitiative(combat, data, diff, id); } }); diff --git a/src/lang/en.json b/src/lang/en.json index 492a593..b48faab 100644 --- a/src/lang/en.json +++ b/src/lang/en.json @@ -95,6 +95,7 @@ "ACKS.saves.spell.short": "S", "ACKS.saves.spell.long": "Spells", "ACKS.saves.magic.long": "Bonus vs Magic", + "ACKS.saves.magic.short": "vs Magic", "ACKS.Health": "Hit Points", "ACKS.HealthMax": "Maximum Hit Points", @@ -160,11 +161,14 @@ "ACKS.category.equipment": "Equipment", "ACKS.Setting.Initiative": "Initiative", - "ACKS.Setting.InitiativeHint": "Grouped or individual initiative. Unique individual is only rolled at the start of the combat", - "ACKS.Setting.InitiativeOnce": "Unique individual Initiative", - "ACKS.Setting.InitiativeReroll": "Roll individual Initiative each Round", - "ACKS.Setting.InitiativeReset": "Reset individual Initiative each Round", + "ACKS.Setting.InitiativeHint": "Grouped or individual initiative.", + "ACKS.Setting.InitiativeIndividual": "Individual initiative", "ACKS.Setting.InitiativeGroup": "Grouped Initiative", + "ACKS.Setting.RerollInitiative": "Initiative persistence", + "ACKS.Setting.RerollInitiativeHint": "Keeps, resets or rerolls initiative each round", + "ACKS.Setting.InitiativeKeep": "Keep for each round", + "ACKS.Setting.InitiativeReroll": "Reroll each round", + "ACKS.Setting.InitiativeReset": "Reset each round", "ACKS.Setting.AscendingAC": "Ascending Armor Class", "ACKS.Setting.AscendingACHint": "The more the better", "ACKS.Setting.Morale": "Enable monsters Morale Rating", diff --git a/src/module/actor/actor-sheet.js b/src/module/actor/actor-sheet.js index 8775bb5..1a03b79 100644 --- a/src/module/actor/actor-sheet.js +++ b/src/module/actor/actor-sheet.js @@ -13,8 +13,7 @@ export class AcksActorSheet extends ActorSheet { data.config = CONFIG.ACKS; // Settings data.config.ascendingAC = game.settings.get("acks", "ascendingAC"); - data.config.encumbranceBasic = - game.settings.get("acks", "encumbranceOption") == "basic"; + data.config.encumbrance = game.settings.get("acks", "encumbranceOption"); // Prepare owned items this._prepareItems(data); @@ -120,11 +119,20 @@ export class AcksActorSheet extends ActorSheet { } activateListeners(html) { + super.activateListeners(html); + + // Item summaries html .find(".item .item-name h4") .click((event) => this._onItemSummary(event)); + html.find(".item .item-controls .item-show").click(async (ev) => { + const li = $(ev.currentTarget).parents(".item"); + const item = this.actor.getOwnedItem(li.data("itemId")); + item.show(); + }); + html.find(".saving-throw .attribute-name a").click((ev) => { let actorObject = this.actor; let element = event.currentTarget; @@ -132,12 +140,6 @@ export class AcksActorSheet extends ActorSheet { actorObject.rollSave(save, { event: event }); }); - html.find(".item .item-controls .item-show").click(async (ev) => { - const li = $(ev.currentTarget).parents(".item"); - const item = this.actor.getOwnedItem(li.data("itemId")); - item.show(); - }); - html.find(".item .item-rollable .item-image").click(async (ev) => { const li = $(ev.currentTarget).parents(".item"); const item = this.actor.getOwnedItem(li.data("itemId")); @@ -166,21 +168,35 @@ export class AcksActorSheet extends ActorSheet { let attack = element.parentElement.parentElement.dataset.attack; const rollData = { actor: this.data, - roll: {} - } - actorObject.targetAttack(rollData, attack, {type: attack, skipDialog: ev.ctrlKey}); - }); + roll: {}, + }; + actorObject.targetAttack(rollData, attack, { + type: attack, + skipDialog: ev.ctrlKey, + }); html.find(".spells .item-reset").click((ev) => { this._resetSpells(ev); }); + }); html.find(".hit-dice .attribute-name a").click((ev) => { let actorObject = this.actor; actorObject.rollHitDice({ event: event }); }); - super.activateListeners(html); + // Everything below here is only needed if the sheet is editable + if (!this.options.editable) return; + + html + .find(".memorize input") + .click((ev) => ev.target.select()) + .change(this._onSpellChange.bind(this)); + + + html.find(".spells .item-reset").click((ev) => { + this._resetSpells(ev); + }); } // Override to set resizable initial size @@ -221,7 +237,7 @@ export class AcksActorSheet extends ActorSheet { let heightDelta = this.position.height - this.options.height; editor.style.height = `${ heightDelta + parseInt(container.dataset.editorSize) - }px`; + }px`; } }); } diff --git a/src/module/actor/character-sheet.js b/src/module/actor/character-sheet.js index 86d483f..2201c23 100644 --- a/src/module/actor/character-sheet.js +++ b/src/module/actor/character-sheet.js @@ -26,7 +26,7 @@ export class AcksActorSheetCharacter extends AcksActorSheet { resizable: true, tabs: [ { - navSelector: ".tabs", + navSelector: ".sheet-tabs", contentSelector: ".sheet-body", initial: "attributes", }, @@ -136,6 +136,50 @@ export class AcksActorSheetCharacter extends AcksActorSheet { * @param html {HTML} The prepared HTML object ready to be rendered into the DOM */ activateListeners(html) { + super.activateListeners(html); + + html.find(".ability-score .attribute-name a").click((ev) => { + let actorObject = this.actor; + let element = event.currentTarget; + let score = element.parentElement.parentElement.dataset.score; + let stat = element.parentElement.parentElement.dataset.stat; + if (!score) { + if (stat == "lr") { + actorObject.rollLoyalty(score, { event: event }); + } + } else { + actorObject.rollCheck(score, { event: event }); + } + }); + + html.find(".exploration .attribute-name a").click((ev) => { + let actorObject = this.actor; + let element = event.currentTarget; + let expl = element.parentElement.parentElement.dataset.exploration; + actorObject.rollExploration(expl, { event: event }); + }); + + html.find(".inventory .item-titles .item-caret").click((ev) => { + let items = $(event.currentTarget.parentElement.parentElement).children( + ".item-list" + ); + if (items.css("display") == "none") { + let el = $(event.currentTarget).find(".fas.fa-caret-right"); + el.removeClass("fa-caret-right"); + el.addClass("fa-caret-down"); + items.slideDown(200); + } else { + let el = $(event.currentTarget).find(".fas.fa-caret-down"); + el.removeClass("fa-caret-down"); + el.addClass("fa-caret-right"); + items.slideUp(200); + } + }); + + html.find("a[data-action='modifiers']").click((ev) => { + this._onShowModifiers(ev); + }); + // Everything below here is only needed if the sheet is editable if (!this.options.editable) return; @@ -200,53 +244,8 @@ export class AcksActorSheetCharacter extends AcksActorSheet { .click((ev) => ev.target.select()) .change(this._onQtChange.bind(this)); - html.find(".ability-score .attribute-name a").click((ev) => { - let actorObject = this.actor; - let element = event.currentTarget; - let score = element.parentElement.parentElement.dataset.score; - let stat = element.parentElement.parentElement.dataset.stat; - if (!score) { - if (stat == "lr") { - actorObject.rollLoyalty(score, { event: event }); - } - } else { - actorObject.rollCheck(score, { event: event }); - } - }); - - html.find(".exploration .attribute-name a").click((ev) => { - let actorObject = this.actor; - let element = event.currentTarget; - let expl = element.parentElement.parentElement.dataset.exploration; - actorObject.rollExploration(expl, { event: event }); - }); - - html.find(".inventory .item-titles .item-caret").click((ev) => { - let items = $(event.currentTarget.parentElement.parentElement).children( - ".item-list" - ); - if (items.css("display") == "none") { - let el = $(event.currentTarget).find(".fas.fa-caret-right"); - el.removeClass("fa-caret-right"); - el.addClass("fa-caret-down"); - items.slideDown(200); - } else { - let el = $(event.currentTarget).find(".fas.fa-caret-down"); - el.removeClass("fa-caret-down"); - el.addClass("fa-caret-right"); - items.slideUp(200); - } - }); - - html.find("a[data-action='modifiers']").click((ev) => { - this._onShowModifiers(ev); - }); - html.find("a[data-action='generate-scores']").click((ev) => { this.generateScores(ev); }); - - // Handle default listeners last so system listeners are triggered first - super.activateListeners(html); } } diff --git a/src/module/actor/entity.js b/src/module/actor/entity.js index 80ecbff..1f3efa2 100644 --- a/src/module/actor/entity.js +++ b/src/module/actor/entity.js @@ -123,12 +123,15 @@ export class AcksActor extends Actor { roll: { type: "above", target: this.data.data.saves[save].value, + magic: this.data.data.scores.wis.mod }, details: game.i18n.format("ACKS.roll.details.save", { save: label }), }; let skip = options.event && options.event.ctrlKey; + const rollMethod = this.data.type == "character" ? OseDice.RollSave : OseDice.Roll; + // Roll and return return AcksDice.Roll({ event: options.event, @@ -384,7 +387,10 @@ export class AcksActor extends Actor { if (game.user.targets.size > 0) { for (let t of game.user.targets.values()) { data.roll.target = t; - await this.rollAttack(data, { type: type, skipDialog: options.skipDialog }); + await this.rollAttack(data, { + type: type, + skipDialog: options.skipDialog, + }); } } else { this.rollAttack(data, { type: type, skipDialog: options.skipDialog }); @@ -437,7 +443,7 @@ export class AcksActor extends Actor { thac0: thac0, dmg: dmgParts, save: attData.roll.save, - target: attData.roll.target + target: attData.roll.target, }, }; @@ -500,14 +506,20 @@ export class AcksActor extends Actor { let totalWeight = 0; let hasItems = false; Object.values(this.data.items).forEach((item) => { - if (item.type == "item" && (['complete', 'disabled'].includes(option) || item.data.treasure)) { - totalWeight += item.data.quantity.value * item.data.weight; + if (item.type == "item" && !item.data.treasure) { + hasItems = true; - } else if (option != 'basic' && ['weapon', 'armor'].includes(item.type)) { + } + if ( + item.type == "item" && + (["complete", "disabled"].includes(option) || item.data.treasure) + ) { + totalWeight += item.data.quantity.value * item.data.weight; + } else if (option != "basic" && ["weapon", "armor"].includes(item.type)) { totalWeight += item.data.weight; } }); - if (option === 'detailed' && hasItems) totalWeight += 80; + if (option === "detailed" && hasItems) totalWeight += 80; data.encumbrance = { pct: Math.clamped( diff --git a/src/module/actor/monster-sheet.js b/src/module/actor/monster-sheet.js index 2d78f01..2f655a9 100644 --- a/src/module/actor/monster-sheet.js +++ b/src/module/actor/monster-sheet.js @@ -170,6 +170,24 @@ export class AcksActorSheetMonster extends AcksActorSheet { * @param html {HTML} The prepared HTML object ready to be rendered into the DOM */ activateListeners(html) { + super.activateListeners(html); + + html.find(".morale-check a").click((ev) => { + let actorObject = this.actor; + actorObject.rollMorale({ event: event }); + }); + + html.find(".reaction-check a").click((ev) => { + let actorObject = this.actor; + actorObject.rollReaction({ event: event }); + }); + + html.find(".appearing-check a").click((ev) => { + let actorObject = this.actor; + let check = $(ev.currentTarget).closest('.check-field').data('check'); + actorObject.rollAppearing({ event: event, check: check }); + }); + // Everything below here is only needed if the sheet is editable if (!this.options.editable) return; @@ -220,22 +238,6 @@ export class AcksActorSheetMonster extends AcksActorSheet { this._resetCounters(ev); }); - html.find(".morale-check a").click((ev) => { - let actorObject = this.actor; - actorObject.rollMorale({ event: event }); - }); - - html.find(".reaction-check a").click((ev) => { - let actorObject = this.actor; - actorObject.rollReaction({ event: event }); - }); - - html.find(".appearing-check a").click((ev) => { - let actorObject = this.actor; - let check = $(ev.currentTarget).closest('.check-field').data('check'); - actorObject.rollAppearing({ event: event, check: check }); - }); - html .find(".counter input") .click((ev) => ev.target.select()) @@ -263,7 +265,5 @@ export class AcksActorSheetMonster extends AcksActorSheet { }); html.find('button[data-action="generate-saves"]').click(() => this.generateSave()); - // Handle default listeners last so system listeners are triggered first - super.activateListeners(html); } } diff --git a/src/module/combat.js b/src/module/combat.js index 7fdf28b..24dea47 100644 --- a/src/module/combat.js +++ b/src/module/combat.js @@ -29,14 +29,15 @@ export class AcksCombat { groups[data.combatants[i].flags.acks.group].initiative; } } + combat.setupTurns(); } static async resetInitiative(combat, data) { - let updates = []; - combat.data.combatants.forEach((c, i) => { - updates.push({_id: c._id, initiative: ""}); - }); - await combat.updateEmbeddedEntity("Combatant", updates); + let reroll = game.settings.get("acks", "rerollInitiative"); + if (!["reset", "reroll"].includes(reroll)) { + return; + } + combat.resetAll(); } static async individualInitiative(combat, data) { @@ -171,7 +172,9 @@ export class AcksCombat { } let data = {}; AcksCombat.rollInitiative(game.combat, data); - game.combat.update({ data: data }); + game.combat.update({ data: data }).then(() => { + game.combat.setupTurns(); + }); }); } diff --git a/src/module/dice.js b/src/module/dice.js index 0379fce..98eb53f 100644 --- a/src/module/dice.js +++ b/src/module/dice.js @@ -128,16 +128,23 @@ export class AcksDice { }; result.target = data.roll.thac0; - const targetAc = data.roll.target ? data.roll.target.actor.data.data.ac.value : 9; - const targetAac = data.roll.target ? data.roll.target.actor.data.data.aac.value : 0; - result.victim = data.roll.target ? data.roll.target.actor.name : null; + const targetAc = data.roll.target + ? data.roll.target.actor.data.data.ac.value + : 9; + const targetAac = data.roll.target + ? data.roll.target.actor.data.data.aac.value + : 0; + result.victim = data.roll.target ? data.roll.target.data.name : null; if (game.settings.get("acks", "ascendingAC")) { if (roll.total < targetAac + 10) { - result.details = game.i18n.format("ACKS.messages.AttackAscendingFailure", { - result: roll.total - 10, - bonus: result.target, - }); + result.details = game.i18n.format( + "ACKS.messages.AttackAscendingFailure", + { + result: roll.total - 10, + bonus: result.target, + } + ); return result; } result.details = game.i18n.format("ACKS.messages.AttackAscendingSuccess", { @@ -257,6 +264,77 @@ export class AcksDice { }); } + static async RollSave({ + parts = [], + data = {}, + skipDialog = false, + speaker = null, + flavor = null, + title = null, + } = {}) { + let rolled = false; + const template = "systems/acks/templates/chat/roll-dialog.html"; + let dialogData = { + formula: parts.join(" "), + data: data, + rollMode: game.settings.get("core", "rollMode"), + rollModes: CONFIG.Dice.rollModes, + }; + + let rollData = { + parts: parts, + data: data, + title: title, + flavor: flavor, + speaker: speaker, + }; + if (skipDialog) { AcksDice.sendRoll(rollData); } + + let buttons = { + ok: { + label: game.i18n.localize("ACKS.Roll"), + icon: '', + callback: (html) => { + rolled = true; + rollData.form = html[0].children[0]; + roll = AcksDice.sendRoll(rollData); + }, + }, + magic: { + label: game.i18n.localize("ACKS.saves.magic.short"), + icon: '', + callback: (html) => { + rolled = true; + rollData.form = html[0].children[0]; + rollData.data.roll.target = parseInt(rollData.data.roll.target) + parseInt(rollData.data.roll.magic); + rollData.title += ` ${game.i18n.localize("ACKS.saves.magic.short")} (${rollData.data.roll.magic})`; + roll = AcksDice.sendRoll(rollData); + }, + }, + cancel: { + icon: '', + label: game.i18n.localize("ACKS.Cancel"), + callback: (html) => { }, + }, + }; + + const html = await renderTemplate(template, dialogData); + let roll; + + //Create Dialog window + return new Promise((resolve) => { + new Dialog({ + title: title, + content: html, + buttons: buttons, + default: "ok", + close: () => { + resolve(rolled ? roll : false); + }, + }).render(true); + }); + } + static async Roll({ parts = [], data = {}, @@ -302,7 +380,7 @@ export class AcksDice { cancel: { icon: '', label: game.i18n.localize("ACKS.Cancel"), - callback: (html) => {}, + callback: (html) => { }, }, }; diff --git a/src/module/settings.js b/src/module/settings.js index 489cdf0..7e35630 100644 --- a/src/module/settings.js +++ b/src/module/settings.js @@ -16,6 +16,20 @@ export const registerSettings = function () { onChange: _ => window.location.reload() }); + game.settings.register("acks", "ascendingAC", { + name: game.i18n.localize("ACKS.Setting.RerollInitiative"), + hint: game.i18n.localize("ACKS.Setting.RerollInitiativeHint"), + default: "reset", + scope: "world", + type: String, + config: true, + choices: { + keep: "ACKS.Setting.InitiativeKeep", + reset: "ACKS.Setting.InitiativeReset", + reroll: "ACKS.Setting.InitiativeReroll", + } + }); + game.settings.register("acks", "ascendingAC", { name: game.i18n.localize("ACKS.Setting.AscendingAC"), hint: game.i18n.localize("ACKS.Setting.AscendingACHint"), diff --git a/src/module/treasure.js b/src/module/treasure.js index b288181..18e29b9 100644 --- a/src/module/treasure.js +++ b/src/module/treasure.js @@ -30,38 +30,44 @@ export const augmentTable = (table, html, data) => { }); }; -async function rollTreasure(table, options = {}) { - let percent = (chance) => { - let roll = new Roll("1d100").roll(); +function drawTreasure(table, data) { + const percent = (chance) => { + const roll = new Roll("1d100").roll(); return roll.total <= chance; }; + data.treasure = {}; + if (table.getFlag('ose', 'treasure')) { + table.results.forEach((r) => { + if (percent(r.weight)) { + const text = table._getResultChatText(r); + data.treasure[r._id] = ({ + img: r.img, + text: TextEditor.enrichHTML(text), + }); + if ((r.type === CONST.TABLE_RESULT_TYPES.ENTITY) && (r.collection === "RollTable")) { + const embeddedTable = game.tables.get(r.resultId); + drawTreasure(embeddedTable, data.treasure[r._id]); + } + } + }); + } else { + const results = table.roll().results; + results.forEach((s) => { + const text = TextEditor.enrichHTML(table._getResultChatText(s)); + data.treasure[s._id] = {img: s.img, text: text}; + }); + } + return data; +} + +async function rollTreasure(table, options = {}) { + // Draw treasure + const data = drawTreasure(table, {}); let templateData = { - treasure: [], + treasure: data.treasure, table: table, }; - let ids = []; - table.results.forEach((r) => { - if (percent(r.weight)) { - let text = ""; - switch (r.type) { - case 0: - text = r.text; - break; - case 1: - text = `@${r.collection}[${r.resultId}]{${r.text}}`; - break; - case 2: - text = `@Compendium[${r.collection}.${r.resultId}]{${r.text}}`; - } - templateData.treasure.push({ - id: r._id, - img: r.img, - text: TextEditor.enrichHTML(text), - }); - ids.push(r._id); - } - }); - + // Animation if (options.event) { let results = $(event.currentTarget.parentElement) @@ -69,7 +75,7 @@ async function rollTreasure(table, options = {}) { .find(".table-result"); results.each((_, item) => { item.classList.remove("active"); - if (ids.includes(item.dataset.resultId)) { + if (data.treasure[item.dataset.resultId]) { item.classList.add("active"); } }); @@ -82,7 +88,7 @@ async function rollTreasure(table, options = {}) { let chatData = { content: html, - sound: "/systems/acks/assets/coins.mp3" + // sound: "/systems/acks/assets/coins.mp3" } let rollMode = game.settings.get("core", "rollMode"); diff --git a/src/scss/apps.scss b/src/scss/apps.scss index d0138cb..973e337 100644 --- a/src/scss/apps.scss +++ b/src/scss/apps.scss @@ -306,6 +306,18 @@ } line-height: 36px; } + .sub { + padding-left: 25px; + line-height: 28px; + img { + flex: 0 0 28px; + border: none; + } + div { + text-indent: 10px; + font-size: 14px; + } + } } h3 { font-size: 12px; diff --git a/src/system.json b/src/system.json index 442c5fb..d65631d 100644 --- a/src/system.json +++ b/src/system.json @@ -4,7 +4,7 @@ "description": "Play B/X OSR modules with ACKS on Foundry VTT", "version": "0.1.0", "minimumCoreVersion": "0.6.2", - "compatibleCoreVersion": "0.6.5", + "compatibleCoreVersion": "0.6.6", "templateVersion": 2, "author": "The Happy Anarchist", "esmodules": ["acks.js"], diff --git a/src/templates/actors/character-sheet.html b/src/templates/actors/character-sheet.html index e28ebd6..44e910d 100644 --- a/src/templates/actors/character-sheet.html +++ b/src/templates/actors/character-sheet.html @@ -5,7 +5,7 @@ {{! Sheet Tab Navigation }} -