${clazz.data.data.flavorText}
${description}
`; -} +}; export const invokeStartingMacro = async (actor) => { - const clazz = actor.items.find((i) => i.data.type === CONFIG.PB.itemTypes.class); - const [compendium, macroName] = compendiumInfoFromString(clazz.data.data.startingMacro); + const clazz = actor.items.find( + (i) => i.data.type === CONFIG.PB.itemTypes.class + ); + const [compendium, macroName] = compendiumInfoFromString( + clazz.data.data.startingMacro + ); if (compendium && macroName) { const macro = await findCompendiumItem(compendium, macroName); - executeMacro(macro, { actor, item: clazz}) + executeMacro(macro, { actor, item: clazz }); } -} +}; export const invokeGettingBetterMacro = async (actor) => { - const clazz = actor.items.find((i) => i.data.type === CONFIG.PB.itemTypes.class); - const [compendium, macroName] = compendiumInfoFromString(clazz.data.data.gettingBetterMacro); + const clazz = actor.items.find( + (i) => i.data.type === CONFIG.PB.itemTypes.class + ); + const [compendium, macroName] = compendiumInfoFromString( + clazz.data.data.gettingBetterMacro + ); if (compendium && macroName) { const macro = await findCompendiumItem(compendium, macroName); - executeMacro(macro, { actor, item: clazz}) + executeMacro(macro, { actor, item: clazz }); } -} +}; export const rollScvmForClass = async (clazz) => { console.log(`Creating new ${clazz.data.name}`); - + const data = clazz.data.data; const name = await rollName(); @@ -285,24 +347,43 @@ export const rollScvmForClass = async (clazz) => { const hitPoints = rollHitPoints(data.startingHitPoints, abilities.toughness); const baseTables = await rollBaseTables(); - const background = baseTables.find((item) => item.type === CONFIG.PB.itemTypes.background); - const features = baseTables.filter((item) => item.type === CONFIG.PB.itemTypes.feature); - const hasRelic = baseTables.some((item) => item.data.data.invokableType === 'Ancient Relic'); + const background = baseTables.find( + (item) => item.type === CONFIG.PB.itemTypes.background + ); + const features = baseTables.filter( + (item) => item.type === CONFIG.PB.itemTypes.feature + ); + const hasRelic = baseTables.some( + (item) => item.data.data.invokableType === "Ancient Relic" + ); const silver = rollSilver(background); - const armor = clazz.data.data.startingArmorTableFormula ? (await rollArmor(!hasRelic ? clazz.data.data.startingArmorTableFormula : '1d6')) : []; - const hat = clazz.data.data.startingHatTableFormula ? (await rollHat(clazz.data.data.startingHatTableFormula)) : []; - const weapon = clazz.data.data.startingWeaponTableFormula ? (await rollWeapon(clazz.data.data.startingWeaponTableFormula)) : []; + const armor = clazz.data.data.startingArmorTableFormula + ? await rollArmor( + !hasRelic ? clazz.data.data.startingArmorTableFormula : "1d6" + ) + : []; + const hat = clazz.data.data.startingHatTableFormula + ? await rollHat(clazz.data.data.startingHatTableFormula) + : []; + const weapon = clazz.data.data.startingWeaponTableFormula + ? await rollWeapon(clazz.data.data.startingWeaponTableFormula) + : []; const startingRollItems = await rollRollItems(clazz.data.data.startingRolls); const startingItems = await findItems(clazz.data.data.startingItems); - const backgroundBonusItems = await findItems(background.data.data.startingBonusItems); - const featuresBonusItems = await findFeatureBonusItems([...(features || []), ...(startingRollItems || [])]); + const backgroundBonusItems = await findItems( + background.data.data.startingBonusItems + ); + const featuresBonusItems = await findFeatureBonusItems([ + ...(features || []), + ...(startingRollItems || []), + ]); const description = generateDescription(clazz, baseTables); - + const allDocs = [ ...baseTables, ...(armor || []), @@ -310,14 +391,18 @@ export const rollScvmForClass = async (clazz) => { ...(weapon || []), ...(startingRollItems || []), ...(startingItems || []), - ...(backgroundBonusItems || []), - ...(featuresBonusItems || []), - clazz + ...(backgroundBonusItems || []), + ...(featuresBonusItems || []), + clazz, ]; - + // power uses - const powerUsesRoll = new Roll(`1d4 + ${abilities.spirit}`).evaluate({ async: false }); - const extraResourceRoll = new Roll(`1d4 + ${abilities.spirit}`).evaluate({ async: false }); + const powerUsesRoll = new Roll(`1d4 + ${abilities.spirit}`).evaluate({ + async: false, + }); + const extraResourceRoll = new Roll(`1d4 + ${abilities.spirit}`).evaluate({ + async: false, + }); const items = allDocs.map((i) => ({ data: i.data.data, @@ -335,9 +420,9 @@ export const rollScvmForClass = async (clazz) => { ...abilities, items, description, - silver, + silver, powerUses: powerUsesRoll.total, - extraResourceUses: extraResourceRoll.total + extraResourceUses: extraResourceRoll.total, }; }; @@ -412,18 +497,22 @@ export const findTableItems = async (results) => { items.push(item); } } else if (result.data.type === 0 && item) { - const [property, value] = result.getChatText().split(': '); - const enrichHtml = TextEditor.enrichHTML(value, {options: {command: true}}); - if (property === 'description') { + const [property, value] = result.getChatText().split(": "); + const enrichHtml = TextEditor.enrichHTML(value, { + options: { command: true }, + }); + if (property === "description") { item.data.data.description = enrichHtml; + } else if (property === "quantity") { + item.data.data.quantity = parseInt( + $(`${enrichHtml}`).text().trim(), + 10 + ); } - else if (property === 'quantity') { - item.data.data.quantity = parseInt($(`${enrichHtml}`).text().trim(), 10); - } } } return items; -} +}; const abilityBonus = (rollTotal) => { if (rollTotal <= 4) { diff --git a/module/system/configure-system.js b/module/system/configure-system.js index 33a5bada..d8ee2131 100755 --- a/module/system/configure-system.js +++ b/module/system/configure-system.js @@ -18,7 +18,7 @@ export const configureSystem = () => { PBItem, rollItemMacro, pirateFactory, - macroHelpers + macroHelpers, }; CONFIG.Actor.documentClass = PBActor; @@ -53,7 +53,7 @@ export const configureSystem = () => { Items.unregisterSheet("core", ItemSheet); - Items.registerSheet("pirateborg", PBItemSheet, { + Items.registerSheet("pirateborg", PBItemSheet, { makeDefault: true, label: "PB.SheetItem", }); diff --git a/module/system/render-chat-message.js b/module/system/render-chat-message.js index 0d219432..b3b0a42f 100755 --- a/module/system/render-chat-message.js +++ b/module/system/render-chat-message.js @@ -1,15 +1,15 @@ import { rollPartyInitiative } from "../combat.js"; -export const renderChatMessage = async (message, html, data)=> { +export const renderChatMessage = async (message, html, data) => { if (message.data.flags.hasButton) { - const buttons = html.find('.item-button'); + const buttons = html.find(".item-button"); if (buttons.length) { const button = $(buttons[0]); - const isMysticalMishap = button.data('is-mystical-mishap'); + const isMysticalMishap = button.data("is-mystical-mishap"); if (isMysticalMishap) { - button.on('click', async () => { - const actorId = button.data('actor-id'); - const actor = game.actors.get(actorId); + button.on("click", async () => { + const actorId = button.data("actor-id"); + const actor = game.actors.get(actorId); await actor.rollMysticalMishap(); }); } diff --git a/scss/pirateborg/_actor-sheet.scss b/scss/pirateborg/_actor-sheet.scss index 439ce527..cce1496a 100644 --- a/scss/pirateborg/_actor-sheet.scss +++ b/scss/pirateborg/_actor-sheet.scss @@ -126,7 +126,7 @@ width: 60px; } - &.weapon-type { + &.weapon-type { text-align: right; width: 60px; } @@ -167,7 +167,6 @@ gap: 12px; li { - } label { @@ -215,7 +214,6 @@ } &.tier-dmg { - } } } @@ -234,7 +232,7 @@ } .defend-rule { - text-align: center; + text-align: center; margin-top: 16px; } } diff --git a/scss/pirateborg/_character-sheet.scss b/scss/pirateborg/_character-sheet.scss index 32a0c042..0869cb07 100644 --- a/scss/pirateborg/_character-sheet.scss +++ b/scss/pirateborg/_character-sheet.scss @@ -81,11 +81,11 @@ .hp-entries { display: flex; align-items: center; - gap: 4px; - span { + gap: 4px; + span { font-size: 18px; margin-top: 3px; - } + } } .luck-row { @@ -102,11 +102,9 @@ } .luck-rule { - } .stat-label { - } .ability-row { @@ -143,7 +141,6 @@ } .sheet-body { - .powers-top-row { margin-bottom: 16px; display: flex; @@ -205,7 +202,6 @@ line-height: 32px; } } - } .container-label { diff --git a/scss/pirateborg/_container-sheet.scss b/scss/pirateborg/_container-sheet.scss index 40a2ddb6..0bd98db6 100644 --- a/scss/pirateborg/_container-sheet.scss +++ b/scss/pirateborg/_container-sheet.scss @@ -14,7 +14,7 @@ margin-right: 8px; line-height: 0; } - + .header-col2 { display: flex; flex: 1; @@ -22,7 +22,7 @@ height: 100%; justify-content: flex-start; } - + .profile-img { height: 200px; width: 200px; diff --git a/scss/pirateborg/_foundry-overrides.scss b/scss/pirateborg/_foundry-overrides.scss index 0b7e0c56..dabf85c8 100644 --- a/scss/pirateborg/_foundry-overrides.scss +++ b/scss/pirateborg/_foundry-overrides.scss @@ -122,16 +122,13 @@ form.editable .results { .window-app .window-content { .notes { - } form { .form-header { - } .notes { - } } @@ -217,7 +214,7 @@ form.editable .results { #chat-controls { color: var(--foreground-color); - + i.fas:hover { color: var(--highlight-background-color); text-shadow: 0 0 5px var(--highlight-background-color); @@ -257,7 +254,6 @@ form.editable .results { justify-content: center; } } - .message { h4, @@ -358,7 +354,6 @@ form.editable .results { } select { - &:focus { outline: none; box-shadow: 0 0 5px var(--highlight-background-color); @@ -430,7 +425,6 @@ form.editable .results { } .dialog .dialog-buttons { - button { margin-top: 8px; background: var(--button-background); @@ -442,7 +436,7 @@ form.editable .results { width: auto; padding: 0 16px; font-weight: 500; - + cursor: pointer; &.default { @@ -464,8 +458,8 @@ form .form-group select { form .form-group, form .form-group-stacked { - margin: 8px 0; - } + margin: 8px 0; +} #hotbar { #hotbar-directory-controls, @@ -520,7 +514,7 @@ form .form-group-stacked { } } #sidebar { - background: var(--sidebar-background); + background: var(--sidebar-background); color: var(--sidebar-color); &.collapsed #sidebar-tabs > .item.active { @@ -573,7 +567,6 @@ form .form-group-stacked { } &.directory { - .folder-header { border: none; } @@ -587,23 +580,23 @@ form .form-group-stacked { background: none; border-bottom: 2px groove var(--light-border-color); h3 { - color: var(--foreground-color); + color: var(--foreground-color); } - } + } &.folder { background: none; &.collapsed > .folder-header { background: none; border: none; } - } + } } .directory-list { .directory-item:last-child { border-bottom: 2px groove var(--light-border-color); } - + .subdirectory { padding-left: 16px; border: none; @@ -629,7 +622,7 @@ form .form-group-stacked { padding: 2px; border-radius: 8px; } - } + } } } } @@ -684,7 +677,6 @@ form .form-group-stacked { .journal-sheet form { button[type="submit"] { - } input[name="name"] { @@ -753,4 +745,4 @@ hr { border: none; background: var(--background-color); color: var(--foreground-alt-color); -} \ No newline at end of file +} diff --git a/scss/pirateborg/_item-list.scss b/scss/pirateborg/_item-list.scss index 090792f1..dff1efb7 100644 --- a/scss/pirateborg/_item-list.scss +++ b/scss/pirateborg/_item-list.scss @@ -1,5 +1,5 @@ .pirateborg { - .items-list .items-header { + .items-list .items-header { margin: 0; padding: 0 0 4px 0; align-items: center; @@ -39,7 +39,7 @@ flex: 0 0 24px; background: black; padding: 2px; - border-radius: 4px; + border-radius: 4px; } &.item-container-item { @@ -64,7 +64,6 @@ } .item-field { - } .item-buttons { @@ -93,7 +92,6 @@ } .item-button { - } .equipped { diff --git a/scss/pirateborg/_item-sheet.scss b/scss/pirateborg/_item-sheet.scss index 22816a82..f6b192b8 100644 --- a/scss/pirateborg/_item-sheet.scss +++ b/scss/pirateborg/_item-sheet.scss @@ -40,11 +40,10 @@ width: 100%; margin: 0; } - } + } } .sheet-body { - } } } diff --git a/scss/pirateborg/_module-fixes.scss b/scss/pirateborg/_module-fixes.scss index 00d08fff..94c9250d 100644 --- a/scss/pirateborg/_module-fixes.scss +++ b/scss/pirateborg/_module-fixes.scss @@ -14,7 +14,7 @@ } .dice-tray button { - background: var(--button-background) !important; + background: var(--button-background) !important; color: var(--button-color) !important; font-family: var(--button-font) !important; } @@ -27,11 +27,10 @@ button.dice-calculator--button { color: var(--foreground-color) !important; } - #settings { padding: 0 !important; button { padding: 0 16px !important; margin: 4px 0 !important; } -} \ No newline at end of file +} diff --git a/scss/pirateborg/_root.scss b/scss/pirateborg/_root.scss index 7da1643a..c26db8da 100644 --- a/scss/pirateborg/_root.scss +++ b/scss/pirateborg/_root.scss @@ -5,19 +5,18 @@ /* try to deprecated */ --background-color: #000; - --foreground-color: #000; - --foreground-alt-color: #FFF; + --foreground-alt-color: #fff; --highlight-background-color: #d20608; - --highlight-foreground-color: #FFFFFF; - + --highlight-foreground-color: #ffffff; + --window-background: url(/systems/pirateborg/ui/parchment-2.jpg) repeat; - --window-header-color: #FFFFFF; + --window-header-color: #ffffff; --window-header-background-color: #000000; --sidebar-tab-background: #000000; - --sidebar-tab-color: #FFFFFF; + --sidebar-tab-color: #ffffff; --light-border-color: #f6dec2; --dark-border-color: #a29280; @@ -26,19 +25,19 @@ --sidebar-color: #000000; --button-background: #000000; - --button-color: #FFFFFF; + --button-color: #ffffff; --icon-backgroud-color: #000000; --h1-font: "Roman Antique Regular"; --h2-font: "IM Fell English SC"; --h3-font: "IM Fell English SC"; - - --chat-font: "Alegreya"; + + --chat-font: "Alegreya"; --chat-info-font: "Alegreya"; --item-font: "Alegreya"; - --button-font: "Alegreya" + --button-font: "Alegreya"; /* foundry core */ --color-text-light-6: var(--foreground-color); @@ -57,4 +56,4 @@ @font-face { font-family: "Roman Antique Regular"; src: url("../fonts/Roman Antique Regular.ttf") format("truetype"); -} \ No newline at end of file +} diff --git a/scss/pirateborg/_sheet.scss b/scss/pirateborg/_sheet.scss index 7b3f42d6..924e911a 100644 --- a/scss/pirateborg/_sheet.scss +++ b/scss/pirateborg/_sheet.scss @@ -108,8 +108,8 @@ .item { font-family: var(--h2-font); font-size: 22px; - height: 34px; - line-height: 34px; + height: 36px; + line-height: 38px; width: 100%; white-space: nowrap; padding-left: 16px; @@ -127,7 +127,7 @@ border-bottom: 0; border-top-left-radius: 16px; border-top-right-radius: 16px; - background: rgba(255, 255, 255, 0.20); + background: rgba(255, 255, 255, 0.2); border-bottom: 0; } } @@ -140,7 +140,7 @@ .tab { height: 100%; overflow-y: auto; - padding: 16px 16px 16px 16px; + padding: 16px 16px 16px 16px; background: rgba(255, 255, 255, 0.2); } } diff --git a/system.json b/system.json index fb0b821b..5155dc51 100644 --- a/system.json +++ b/system.json @@ -86,15 +86,15 @@ "system": "pirateborg", "path": "./packs/equipment-hats.db", "entity": "Item" - }, - + }, + { "name": "backgrounds", "label": "Backgrounds", "system": "pirateborg", "path": "./packs/backgrounds.db", "entity": "Item" - }, + }, { "name": "backgrounds-items", @@ -102,7 +102,7 @@ "system": "pirateborg", "path": "./packs/backgrounds-items.db", "entity": "Item" - }, + }, { "name": "macros-pirateborg", @@ -118,43 +118,43 @@ "system": "pirateborg", "path": "./packs/feature-distinctive-flaws.db", "entity": "Item" - }, + }, { "name": "feature-physical-ailments", "label": "Feature - Physical ailments", "system": "pirateborg", "path": "./packs/feature-physical-ailments.db", "entity": "Item" - }, + }, { "name": "feature-idiosyncrasies", "label": "Feature - Idiosyncrasies", "system": "pirateborg", "path": "./packs/feature-idiosyncrasies.db", "entity": "Item" - }, + }, { "name": "feature-unfortunate-incidents-conditions", "label": "Feature - Unfortunate incidents & conditions", "system": "pirateborg", "path": "./packs/feature-unfortunate-incidents-conditions.db", "entity": "Item" - }, + }, { "name": "feature-thing-of-importance", "label": "Feature - Thing of importance", "system": "pirateborg", "path": "./packs/feature-thing-of-importance.db", "entity": "Item" - }, - + }, + { "name": "invokable-ancient-relics", "label": "Invokable - Ancient relics", "system": "pirateborg", "path": "./packs/invokable-ancient-relics.db", "entity": "Item" - }, + }, { "name": "invokable-arcane-rituals", "label": "Invokable - Arcane Rituals", @@ -162,7 +162,7 @@ "path": "./packs/invokable-arcane-rituals.db", "entity": "Item" }, - + { "name": "macros-ancient-relics", "label": "Macros - Ancient relics", @@ -193,7 +193,7 @@ "system": "pirateborg", "path": "./packs/rolls-gamemaster.db", "entity": "RollTable" - }, + }, { "name": "class-landlubber", @@ -201,7 +201,7 @@ "system": "pirateborg", "path": "./packs/class-landlubber.db", "entity": "Item" - }, + }, { "name": "class-brute", @@ -267,8 +267,8 @@ "system": "pirateborg", "path": "./packs/macros-buccaneer.db", "entity": "Macro" - }, - + }, + { "name": "class-swashbuckler", "label": "Class - Swashbuckler", @@ -289,7 +289,7 @@ "system": "pirateborg", "path": "./packs/macros-swashbuckler.db", "entity": "Macro" - }, + }, { "name": "class-zealot", @@ -333,8 +333,7 @@ "system": "pirateborg", "path": "./packs/macros-sorcerer.db", "entity": "Macro" - } - + } ], "languages": [ { diff --git a/template.json b/template.json index f4f568fd..c784bef3 100644 --- a/template.json +++ b/template.json @@ -1,10 +1,6 @@ { "Actor": { - "types": [ - "character", - "container", - "creature" - ], + "types": ["character", "container", "creature"], "templates": { "common": {} }, @@ -63,7 +59,7 @@ "hp": { "max": 1, "value": 1 - }, + }, "armor": "", "attack": "", "morale": 7, @@ -97,10 +93,8 @@ } }, "weapon": { - "templates": [ - "equipment" - ], - "damageDie": "1d1", + "templates": ["equipment"], + "damageDie": "1d1", "critOn": 20, "critExtraDamage": "", "handed": 1, @@ -111,26 +105,18 @@ "isGunpowderWeapon": false }, "misc": { - "templates": [ - "equipment" - ] - }, + "templates": ["equipment"] + }, "ammo": { - "templates": [ - "equipment" - ], + "templates": ["equipment"], "damageDie": "" }, "container": { - "templates": [ - "equipment" - ], + "templates": ["equipment"], "capacity": 1 }, "armor": { - "templates": [ - "equipment" - ], + "templates": ["equipment"], "currentTier": 1, "maxTier": 1, "tier": { @@ -140,26 +126,22 @@ } }, "hat": { - "templates": [ - "equipment" - ], + "templates": ["equipment"], "reduceDamage": false, "ruleText": "" }, "invokable": { - "templates": [ - "equipment" - ], + "templates": ["equipment"], "invokableType": "", "isEquipment": true, "maxQuantity": 1 - }, + }, "background": { "description": "", "startingGold": "2d6 * 10", "quantity": 1, "startingBonusItems": "" - }, + }, "feature": { "description": "", "featureType": "", @@ -168,7 +150,7 @@ "actionMacro": "", "actionMacroLabel": "", "startingBonusItems": "" - }, + }, "class": { "description": "", "flavorText": "", @@ -188,15 +170,15 @@ "startingHitPoints": "1d10", - "startingItems": null, + "startingItems": null, "startingRolls": null, "startingMacro": null, - "gettingBetterRolls": null, + "gettingBetterRolls": null, "gettingBetterMacro": null, - "useExtraResource": false, - "extraResourceNameSingular": null, - "extraResourceNamePlural": null, + "useExtraResource": false, + "extraResourceNameSingular": null, + "extraResourceNamePlural": null, "extraResourceFormula": null, "extraResourceFormulaLabel": null, @@ -204,4 +186,4 @@ "extraResourceTestFormulaLabel": null } } -} \ No newline at end of file +} diff --git a/templates/actor/character-sheet.html b/templates/actor/character-sheet.html index d442b567..7f7cd882 100644 --- a/templates/actor/character-sheet.html +++ b/templates/actor/character-sheet.html @@ -199,7 +199,7 @@ - + {{!-- Weapons --}} @@ -398,17 +398,15 @@