diff --git a/system/assets/icons/.gitkeep b/system/assets/icons/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/system/assets/icons/Imperial.webp b/system/assets/icons/Imperial.webp new file mode 100644 index 0000000..00252ea Binary files /dev/null and b/system/assets/icons/Imperial.webp differ diff --git a/system/assets/icons/Invocations.webp b/system/assets/icons/Invocations.webp new file mode 100644 index 0000000..637c9c9 Binary files /dev/null and b/system/assets/icons/Invocations.webp differ diff --git a/system/assets/icons/Katas.webp b/system/assets/icons/Katas.webp new file mode 100644 index 0000000..bcdd1a9 Binary files /dev/null and b/system/assets/icons/Katas.webp differ diff --git a/system/assets/icons/Kihos.webp b/system/assets/icons/Kihos.webp new file mode 100644 index 0000000..7d22835 Binary files /dev/null and b/system/assets/icons/Kihos.webp differ diff --git a/system/assets/icons/Magic.webp b/system/assets/icons/Magic.webp new file mode 100644 index 0000000..476a578 Binary files /dev/null and b/system/assets/icons/Magic.webp differ diff --git a/system/assets/icons/Maho.webp b/system/assets/icons/Maho.webp new file mode 100644 index 0000000..0b44034 Binary files /dev/null and b/system/assets/icons/Maho.webp differ diff --git a/system/assets/icons/Ninjutsu.webp b/system/assets/icons/Ninjutsu.webp new file mode 100644 index 0000000..742abe4 Binary files /dev/null and b/system/assets/icons/Ninjutsu.webp differ diff --git a/system/assets/icons/Rituals.webp b/system/assets/icons/Rituals.webp new file mode 100644 index 0000000..87c6834 Binary files /dev/null and b/system/assets/icons/Rituals.webp differ diff --git a/system/assets/icons/Shujis.webp b/system/assets/icons/Shujis.webp new file mode 100644 index 0000000..cf077a4 Binary files /dev/null and b/system/assets/icons/Shujis.webp differ diff --git a/system/assets/icons/damage.webp b/system/assets/icons/damage.webp new file mode 100644 index 0000000..1f751a5 Binary files /dev/null and b/system/assets/icons/damage.webp differ diff --git a/system/assets/icons/range.webp b/system/assets/icons/range.webp new file mode 100644 index 0000000..bb6a06a Binary files /dev/null and b/system/assets/icons/range.webp differ diff --git a/system/assets/imgs/bgL5R.jpg b/system/assets/imgs/bgL5R.jpg new file mode 100644 index 0000000..b0a0579 Binary files /dev/null and b/system/assets/imgs/bgL5R.jpg differ diff --git a/system/fonts/.gitkeep b/system/fonts/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/system/fonts/LogotypeL5r.ttf b/system/fonts/LogotypeL5r.ttf new file mode 100644 index 0000000..2e2f689 Binary files /dev/null and b/system/fonts/LogotypeL5r.ttf differ diff --git a/system/l5r-ui/ui/frames/chat-texture.webp b/system/l5r-ui/ui/frames/chat-texture.webp index e10aaa0..49809fc 100644 Binary files a/system/l5r-ui/ui/frames/chat-texture.webp and b/system/l5r-ui/ui/frames/chat-texture.webp differ diff --git a/system/l5r-ui/ui/logo/l5r-logo.webp b/system/l5r-ui/ui/logo/l5r-logo.webp index 8989680..2b76ff5 100644 Binary files a/system/l5r-ui/ui/logo/l5r-logo.webp and b/system/l5r-ui/ui/logo/l5r-logo.webp differ diff --git a/system/scripts/items/feat-sheet.js b/system/scripts/items/feat-sheet.js index cab760b..02bbeca 100644 --- a/system/scripts/items/feat-sheet.js +++ b/system/scripts/items/feat-sheet.js @@ -1,21 +1,20 @@ -import { L5RItemSheet } from "./item-sheet.js"; +import { ItemSheetL5r5e } from "./item-sheet.js"; /** -* @extends {ItemSheet} -*/ -export class L5RFeatSheet extends L5RItemSheet { - + * @extends {ItemSheet} + */ +export class FeatSheetL5r5e extends ItemSheetL5r5e { /** @override */ static get defaultOptions() { return mergeObject(super.defaultOptions, { classes: ["l5r", "sheet", "feat"], - template: "systems/l5r/templates/item/feat-sheet.html", + template: "systems/l5r5e/templates/item/feat-sheet.html", width: 520, height: 480, - tabs: [{navSelector: ".sheet-tabs", contentSelector: ".sheet-body", initial: "description"}] + tabs: [{ navSelector: ".sheet-tabs", contentSelector: ".sheet-body", initial: "description" }], }); } - + /** @override */ getData() { const sheetData = super.getData(); @@ -33,19 +32,18 @@ export class L5RFeatSheet extends L5RItemSheet { */ activateListeners(html) { super.activateListeners(html); - + // Everything below here is only needed if the sheet is editable if (!this.options.editable) return; } - + /** * Update feat with the data from the sheet. - * @param event - * @param formData + * @param event + * @param formData */ _updateObject(event, formData) { - // Update the Item return this.object.update(formData); } -} \ No newline at end of file +} diff --git a/system/scripts/items/item-sheet.js b/system/scripts/items/item-sheet.js index 0501b31..6a412c6 100644 --- a/system/scripts/items/item-sheet.js +++ b/system/scripts/items/item-sheet.js @@ -1,46 +1,45 @@ /** -* Extend the basic ItemSheet with some very simple modifications -* @extends {ItemSheet} -*/ -export class L5RItemSheet extends ItemSheet { - + * Extend the basic ItemSheet with some very simple modifications + * @extends {ItemSheet} + */ +export class ItemSheetL5r5e extends ItemSheet { /** @override */ static get defaultOptions() { return mergeObject(super.defaultOptions, { classes: ["l5r", "sheet", "item"], - template: "systems/l5r/templates/item/item-sheet.html", + template: "systems/l5r5e/templates/item/item-sheet.html", width: 520, height: 480, - tabs: [{navSelector: ".sheet-tabs", contentSelector: ".sheet-body", initial: "description"}] + tabs: [{ navSelector: ".sheet-tabs", contentSelector: ".sheet-body", initial: "description" }], }); } getData() { const sheetData = super.getData(); - + sheetData.data.dtypes = ["String", "Number", "Boolean"]; - + sheetData.data.isEquipment = true; - + return sheetData; } - + /** - * Subscribe to events from the sheet. - * @param html HTML content of the sheet. - */ + * Subscribe to events from the sheet. + * @param html HTML content of the sheet. + */ activateListeners(html) { super.activateListeners(html); - + // Everything below here is only needed if the sheet is editable if (!this.options.editable) return; } - + /** - * Update the item with data from the sheet. - * @param event - * @param formData - */ + * Update the item with data from the sheet. + * @param event + * @param formData + */ _updateObject(event, formData) { return this.object.update(formData); } diff --git a/system/scripts/items/item.js b/system/scripts/items/item.js index 3fae8e4..f908fde 100644 --- a/system/scripts/items/item.js +++ b/system/scripts/items/item.js @@ -1,4 +1 @@ - -export class L5RItem extends Item { - -} \ No newline at end of file +export class ItemL5r5e extends Item {} diff --git a/system/scripts/items/weapon-sheet.js b/system/scripts/items/weapon-sheet.js index c2f738e..037269a 100644 --- a/system/scripts/items/weapon-sheet.js +++ b/system/scripts/items/weapon-sheet.js @@ -1,48 +1,47 @@ -import { L5RItemSheet } from "./item-sheet.js"; +import { ItemSheetL5r5e } from "./item-sheet.js"; /** -* @extends {ItemSheet} -*/ -export class L5RWeaponSheet extends L5RItemSheet { - + * @extends {ItemSheet} + */ +export class WeaponSheetL5r5e extends ItemSheetL5r5e { /** @override */ static get defaultOptions() { return mergeObject(super.defaultOptions, { classes: ["l5r", "sheet", "weapon"], - template: "systems/l5r/templates/item/weapon-sheet.html", + template: "systems/l5r5e/templates/item/weapon-sheet.html", width: 520, height: 480, - tabs: [{navSelector: ".sheet-tabs", contentSelector: ".sheet-body", initial: "description"}] + tabs: [{ navSelector: ".sheet-tabs", contentSelector: ".sheet-body", initial: "description" }], }); } - + getData() { const sheetData = super.getData(); sheetData.data.dtypes = ["String", "Number", "Boolean"]; - + sheetData.data.isWeapon = true; sheetData.data.isEquipment = true; - + return sheetData; } - + /** - * Subscribe to events from the sheet. - * @param html HTML content of the sheet. - */ + * Subscribe to events from the sheet. + * @param html HTML content of the sheet. + */ activateListeners(html) { super.activateListeners(html); - + // Everything below here is only needed if the sheet is editable if (!this.options.editable) return; } - + /** - * Update item with values from the sheet. - * @param event - * @param formData - */ + * Update item with values from the sheet. + * @param event + * @param formData + */ _updateObject(event, formData) { return this.object.update(formData); } -} \ No newline at end of file +} diff --git a/system/scripts/main-l5r5e.js b/system/scripts/main-l5r5e.js index b9a2758..8d6ae58 100644 --- a/system/scripts/main-l5r5e.js +++ b/system/scripts/main-l5r5e.js @@ -6,6 +6,10 @@ import { ActorSheetL5r5e } from "./sheets/actor-sheet.js"; import { RollL5r5e } from "./dice/roll.js"; import { AbilityDie } from "./dice/dietype/ability-die.js"; import { RingDie } from "./dice/dietype/ring-die.js"; +import { ItemL5r5e } from "./items/item.js"; +import { ItemSheetL5r5e } from "./items/item-sheet.js"; +import { WeaponSheetL5r5e } from "./items/weapon-sheet.js"; +import { FeatSheetL5r5e } from "./items/feat-sheet.js"; // Import Dice Types @@ -18,6 +22,7 @@ Hooks.once("init", async function () { // Assign custom classes and constants here CONFIG.Actor.entityClass = ActorL5r5e; CONFIG.Actor.sheetClasses = ActorSheetL5r5e; + CONFIG.Item.entityClass = ItemL5r5e; // Define custom Roll class CONFIG.Dice.rolls.push(CONFIG.Dice.rolls[0]); @@ -46,6 +51,12 @@ Hooks.once("init", async function () { Actors.unregisterSheet("core", ActorSheet); Actors.registerSheet("l5r5e", ActorSheetL5r5e, { types: ["character"], makeDefault: true }); + // Items sheet + Items.unregisterSheet("core", ItemSheet); + Items.registerSheet("l5r5e", ItemSheetL5r5e, { types: ["item"], makeDefault: true }); + Items.registerSheet("l5r5e", WeaponSheetL5r5e, { types: ["weapon"], makeDefault: true }); + Items.registerSheet("l5r5e", FeatSheetL5r5e, { types: ["feat"], makeDefault: true }); + Handlebars.registerHelper("localizeSkillCategory", function (skillName) { const key = "L5r5e.Skills." + skillName + ".Title"; return game.i18n.localize(key); diff --git a/system/scripts/preloadTemplates.js b/system/scripts/preloadTemplates.js index 98418c0..f0ef11a 100644 --- a/system/scripts/preloadTemplates.js +++ b/system/scripts/preloadTemplates.js @@ -1,25 +1,27 @@ -export const PreloadTemplates = async function() { - const templatePaths = [ - // Add paths to "systems/l5r5e/templates" - 'systems/l5r5e/templates/sheets/actor/rings.html', - 'systems/l5r5e/templates/sheets/actor/identity.html', - 'systems/l5r5e/templates/sheets/actor/category.html', - 'systems/l5r5e/templates/sheets/actor/skill.html', - 'systems/l5r5e/templates/sheets/actor/social.html', - 'systems/l5r5e/templates/sheets/actor/conflict.html', - 'systems/l5r5e/templates/sheets/actor/stance.html', - 'systems/l5r5e/templates/sheets/actor/feats.html', - 'systems/l5r5e/templates/sheets/actor/experience.html', - 'systems/l5r5e/templates/sheets/actor/adquisition.html', - // items - 'systems/l5r5e/templates/item/weapon-sheet.html', - 'systems/l5r5e/templates/item/items.html', - 'systems/l5r5e/templates/item/item-entry.html', - 'systems/l5r5e/templates/item/weapons.html', - 'systems/l5r5e/templates/item/weapon-entry.html', - 'systems/l5r5e/templates/item/feat-sheet.html', - 'systems/l5r5e/templates/item/feat-entry.html' - ]; +export const PreloadTemplates = async function () { + const templatePaths = [ + // Add paths to "systems/l5r5e/templates" + "systems/l5r5e/templates/sheets/actor/rings.html", + "systems/l5r5e/templates/sheets/actor/narrative.html", + "systems/l5r5e/templates/sheets/actor/identity.html", + "systems/l5r5e/templates/sheets/actor/category.html", + "systems/l5r5e/templates/sheets/actor/skill.html", + "systems/l5r5e/templates/sheets/actor/social.html", + "systems/l5r5e/templates/sheets/actor/attributes.html", + "systems/l5r5e/templates/sheets/actor/conflict.html", + "systems/l5r5e/templates/sheets/actor/stance.html", + "systems/l5r5e/templates/sheets/actor/feats.html", + "systems/l5r5e/templates/sheets/actor/experience.html", + "systems/l5r5e/templates/sheets/actor/adquisition.html", + // items + "systems/l5r5e/templates/item/weapon-sheet.html", + "systems/l5r5e/templates/item/items.html", + "systems/l5r5e/templates/item/item-entry.html", + "systems/l5r5e/templates/item/weapons.html", + "systems/l5r5e/templates/item/weapon-entry.html", + "systems/l5r5e/templates/item/feat-sheet.html", + "systems/l5r5e/templates/item/feat-entry.html", + ]; - return loadTemplates(templatePaths); -} + return loadTemplates(templatePaths); +}; diff --git a/system/styles/conf/l5r5e.scss b/system/styles/conf/l5r5e.scss index f292dcb..c2b46a7 100644 --- a/system/styles/conf/l5r5e.scss +++ b/system/styles/conf/l5r5e.scss @@ -1,13 +1,14 @@ /* Global */ -@import "../scss/fonts"; @import "../scss/colors"; +@import "../scss/global"; +@import "../scss/fonts"; @import "../scss/ui"; @import "../scss/dices"; .l5r5e { - @import "../scss/sheet"; - @import "../scss/nav"; - @import "../scss/rings"; - @import "../scss/skills"; - @import "../scss/items"; + @import "../scss/sheets"; + @import "../scss/nav"; + @import "../scss/rings"; + @import "../scss/skills"; + @import "../scss/items"; } diff --git a/system/styles/scss/colors.scss b/system/styles/scss/colors.scss index 105cebd..300010d 100644 --- a/system/styles/scss/colors.scss +++ b/system/styles/scss/colors.scss @@ -1,9 +1,71 @@ -//SCSS -// l5re5.scss -.testing { - width: percentage(1/7); +/** Colors **/ + +// -- Global +$white: rgba(255, 255, 255, 0.75); +$black: rgba(0, 0, 0, 0.75); +$red: rgba(255, 0, 0, 0.75); +$orange: rgba(255, 100, 0, 0.75); +$blue: rgba(0, 0, 255, 0.75); +$green: rgba(0, 255, 0, 0.75); + +// color title +$l5r5e-title: rgb(186, 187, 177); +// color bold +$l5r5e-bold: rgb(118, 79, 64); +// color red +$l5r5e-red: rgb(150, 60, 65); +// color white 0.5 +$l5r5e-white: rgba(255, 255, 255, 0.5); +// color black 0.5 +$l5r5e-black: rgba(0, 0, 0, 0.5); + +// Earth +$l5r5e-earth: rgb(110, 141, 107); +// Air +$l5r5e-air: rgb(142, 118, 140); +// Water +$l5r5e-water: rgb(110, 139, 145); +// Fire +$l5r5e-fire: rgb(146, 111, 71); +// Void +$l5r5e-void: rgb(77, 72, 68); + +// -- Clans + +// Crab +$l5r5e-dragon: rgb(130, 130, 140); +// Crane +$l5r5e-dragon: rgb(120, 145, 145); +// Dragon +$l5r5e-dragon: rgb(85, 130, 110); +// Lion +$l5r5e-dragon: rgb(160, 140, 80); +// Mantis +$l5r5e-dragon: rgb(45, 85, 30); +// Phoenix +$l5r5e-dragon: rgb(145, 190, 175); +// Scorpion +$l5r5e-dragon: rgb(155, 70, 60); +// Unicorn +$l5r5e-dragon: rgb(120, 90, 135); +// Spider +$l5r5e-dragon: rgb(0, 0, 0); + +.Crab { +} +.Crane { +} +.Dragon { +} +.Lion { +} +.Mantis { +} +.Phoenix { +} +.Scorpion { +} +.Unicorn { +} +.Spider { } -// test -.testing { - width: percentage(2/7); -} \ No newline at end of file diff --git a/system/styles/scss/fonts.scss b/system/styles/scss/fonts.scss index 105cebd..b39db77 100644 --- a/system/styles/scss/fonts.scss +++ b/system/styles/scss/fonts.scss @@ -1,9 +1,73 @@ -//SCSS -// l5re5.scss -.testing { - width: percentage(1/7); +/** Fonts **/ + +// Font Logotype L5R +@font-face { + font-family: "LogotypeL5r"; + src: url("../fonts/LogotypeL5r.ttf") format("truetype"); +} + +// Font BrushtipTexe +@font-face { + font-family: "BrushtipTexe"; + src: url("../fonts/BrushtipTexe.otf") format("opentype"); +} + +$font-primary: "Roboto", sans-serif; +$font-secondary: "BrushtipTexe", sans-serif; +$font-dice: "LogotypeL5r", sans-serif; + +h1 { + font: 1.5rem "BrushtipTexe"; +} + +i.strife, +i.success, +i.explosive, +i.opportunity, +i.d6, +i.d12, +i.i_earth, +i.i_water, +i.i_fire, +i.i_air, +i.i_void { + font-family: LogotypeL5r; + line-height: 1rem; + font-style: normal; + font-weight: normal; + vertical-align: middle; +} + +i.strife:before { + content: "f"; +} +i.success:before { + content: "s"; +} +i.explosive:before { + content: "e"; +} +i.opportunity:before { + content: "o"; +} +i.d6:before { + content: "r"; +} +i.d12:before { + content: "k"; +} +i.i_earth:before { + content: "g"; +} +i.i_water:before { + content: "w"; +} +i.i_fire:before { + content: "i"; +} +i.i_air:before { + content: "a"; +} +i.i_void:before { + content: "v"; } -// test -.testing { - width: percentage(2/7); -} \ No newline at end of file diff --git a/system/styles/scss/global.scss b/system/styles/scss/global.scss new file mode 100644 index 0000000..8b6fbe9 --- /dev/null +++ b/system/styles/scss/global.scss @@ -0,0 +1,34 @@ +/** Global **/ + +/* Windows */ +.window-app { + .window-content { + background: url("../assets/imgs/bgL5R.jpg") no-repeat; + background-size: cover; + } +} + +/* Focus, Active */ +* { + transition-property: background, color, border-color, text-shadow, box-shadow; + transition-duration: 0.5s; + transition-timing-function: ease; +} +input[type="text"]:focus, +input[type="number"]:focus, +input[type="password"]:focus, +input[type="date"]:focus, +input[type="time"]:focus { + box-shadow: 0 0 6px $red; +} +.tabs .item.active { + text-shadow: 0 0 10px $red; +} + +/* lists */ +ul, +li { + list-style-type: none; + margin: 0; + padding: 0; +} diff --git a/system/styles/scss/rings.scss b/system/styles/scss/rings.scss index 105cebd..5ff311a 100644 --- a/system/styles/scss/rings.scss +++ b/system/styles/scss/rings.scss @@ -1,9 +1,151 @@ -//SCSS -// l5re5.scss -.testing { - width: percentage(1/7); +/** Rings **/ + +.rings { + display: flex; + flex-wrap: wrap; + color: $white; + // All + #earth, + #air, + #water, + #fire, + #void { + position: relative; + flex: 1 1 50%; + text-align: center; + + i.i_earth, + i.i_water, + i.i_fire, + i.i_air, + i.i_void { + font-size: 5rem; + line-height: 4.75rem; + } + + label { + position: relative; + width: 5rem; + line-height: 0; + float: right; + } + + input { + position: absolute; + height: 2rem; + width: 2rem; + border-radius: 100%; + top: 0; + left: 0; + border: 2px solid $l5r5e-title; + color: $white; + &:hover { + border: 2px solid $red; + text-shadow: 0 0 6px $red; + box-shadow: 0 0 6px inset $red; + } + } + } + // Earth + #earth { + float: right; + color: $l5r5e-earth; + input { + top: auto; + right: 0; + bottom: -1rem; + left: auto; + background: $l5r5e-earth; + } + label { + strong { + position: absolute; + bottom: 0.75rem; + left: -1.5rem; + } + } + } + + // Air + #air { + color: $l5r5e-air; + input { + top: auto; + right: auto; + bottom: -1rem; + left: 0; + background: $l5r5e-air; + } + label { + float: left; + strong { + position: absolute; + bottom: 0.75rem; + right: -1rem; + } + } + } + + // Water + #water { + float: right; + color: $l5r5e-water; + padding-right: 2rem; + input { + top: 17%; + right: -1.25rem; + bottom: auto; + left: auto; + background: $l5r5e-water; + } + label { + strong { + position: absolute; + bottom: -0.75rem; + right: 2rem; + } + } + } + + // Fire + #fire { + color: $l5r5e-fire; + padding-left: 2rem; + input { + top: 17%; + right: auto; + bottom: auto; + left: -1.25rem; + background: $l5r5e-fire; + } + label { + float: left; + strong { + position: absolute; + bottom: -0.75rem; + right: 2rem; + } + } + } + + // Void + #void { + top: -2rem; + margin: 0 calc(50% - 2.5rem); + color: $l5r5e-void; + input { + top: -1rem; + right: auto; + bottom: auto; + left: 30%; + background: $l5r5e-void; + } + label { + strong { + position: absolute; + bottom: -0.75rem; + left: 1.75rem; + } + } + } } -// test -.testing { - width: percentage(2/7); -} \ No newline at end of file diff --git a/system/styles/scss/sheet.scss b/system/styles/scss/sheet.scss deleted file mode 100644 index 105cebd..0000000 --- a/system/styles/scss/sheet.scss +++ /dev/null @@ -1,9 +0,0 @@ -//SCSS -// l5re5.scss -.testing { - width: percentage(1/7); -} -// test -.testing { - width: percentage(2/7); -} \ No newline at end of file diff --git a/system/styles/scss/sheets.scss b/system/styles/scss/sheets.scss new file mode 100644 index 0000000..9372ff9 --- /dev/null +++ b/system/styles/scss/sheets.scss @@ -0,0 +1,58 @@ +/** Sheets **/ +&.sheet { + min-width: 600px; + .sheet-header { + h1 { + flex: 0 0 100%; + input { + height: 3rem; + line-height: 1.5rem; + margin: 0; + padding: 0 0 0.5rem; + width: 100%; + border: 1px solid $l5r5e-white; + color: $l5r5e-red; + } + } + img { + flex: 0 0 150px; + height: 150px; + margin-right: 0.25rem; + } + .header-fields { + display: flex; + flex-wrap: wrap; + } + .identity-wrapper { + flex: 0 0 calc(100% - 150px - 0.25rem); + .identity-content { + flex: 0 0 100%; + display: flex; + flex-wrap: wrap; + li { + flex: 33%; + &:nth-child(1), + &:nth-child(2) { + flex: 50%; + margin: 0 0 0.5rem; + } + } + } + } + .rings { + flex: 0 0 calc(50% - 0.25rem); + display: flex; + padding: 0.25rem; + } + .social-content { + flex: 0 0 100%; + display: flex; + padding: 0.25rem; + } + .attributes-wrapper { + flex: 0 0 calc(50% - 0.25rem); + display: flex; + padding: 0.25rem; + } + } +} diff --git a/system/styles/scss/ui.scss b/system/styles/scss/ui.scss index 105cebd..64b7b39 100644 --- a/system/styles/scss/ui.scss +++ b/system/styles/scss/ui.scss @@ -1,9 +1,22 @@ //SCSS -// l5re5.scss -.testing { - width: percentage(1/7); +// sdebar +#sidebar { + #sidebar-tabs { + flex: 0 0 1rem; + box-sizing: border-box; + margin: 0 0 0.25rem; + border-bottom: 1px solid $l5r5e-white; + box-shadow: none; + > .item { + line-height: 27px; + border-radius: 100%; + margin: 0; + flex: 0 0 27px; + height: 27px; + .active { + border: 1px solid $orange; + box-shadow: 0 0 6px $orange; + } + } + } } -// test -.testing { - width: percentage(2/7); -} \ No newline at end of file diff --git a/system/templates/sheets/actor-sheet.html b/system/templates/sheets/actor-sheet.html index 62b3ed0..1ed70db 100644 --- a/system/templates/sheets/actor-sheet.html +++ b/system/templates/sheets/actor-sheet.html @@ -1,10 +1,15 @@
{{!-- Sheet Header --}}
- -
+ +

+ {{> 'systems/l5r5e/templates/sheets/actor/identity.html' }} +
+
+ {{> 'systems/l5r5e/templates/sheets/actor/social.html' }} {{> 'systems/l5r5e/templates/sheets/actor/rings.html' }} + {{> 'systems/l5r5e/templates/sheets/actor/attributes.html' }}
@@ -21,10 +26,7 @@
{{!-- Narrative Tab --}}
- {{> 'systems/l5r5e/templates/sheets/actor/identity.html' }} - {{> 'systems/l5r5e/templates/sheets/actor/social.html' }} -

{{ localize 'L5r5e.Notes' }}

- {{ editor content=data.notes.value target="data.notes.value" button=true editable=editable }} + {{> 'systems/l5r5e/templates/sheets/actor/narrative.html' }}
{{!-- Skills Tab --}} @@ -42,7 +44,7 @@ {{> 'systems/l5r5e/templates/sheets/actor/conflict.html' }} -
+
{{> 'systems/l5r5e/templates/item/items.html' }}
diff --git a/system/templates/sheets/actor/attributes.html b/system/templates/sheets/actor/attributes.html new file mode 100644 index 0000000..4670189 --- /dev/null +++ b/system/templates/sheets/actor/attributes.html @@ -0,0 +1,52 @@ +
    +
  • + + +

    {{ localize 'L5r5e.Conflict.EnduranceTip' }}

    +
    • +
  • + + +

    {{ localize 'L5r5e.Conflict.ComposureTip' }}

    +
    • +
  • + +

    {{ localize 'L5r5e.Conflict.FocusTip' }}

    +
    • +
  • + +

    {{ localize 'L5r5e.Conflict.VigilanteTip' }}

    +
    • +
  • +
    + +
    +
    + +
    +
    • +
\ No newline at end of file diff --git a/system/templates/sheets/actor/category.html b/system/templates/sheets/actor/category.html index fcc5320..2df5b05 100644 --- a/system/templates/sheets/actor/category.html +++ b/system/templates/sheets/actor/category.html @@ -1,15 +1,15 @@ -
  • +

  • {{ localizeSkillCategory categoryId }}

      {{#each category as |skill id| }} {{> 'systems/l5r/templates/sheets/actor/skill.html' categoryId=../categoryId skill=skill skillId=id }} {{/each}}
    -
    - - - - - -
    +
      +
    • {{ localizeSkill categoryId 'Air' }}
      • +
    • {{ localizeSkill categoryId 'Earth' }}
      • +
    • {{ localizeSkill categoryId 'Fire' }}
      • +
    • {{ localizeSkill categoryId 'Water' }}
      • +
    • {{ localizeSkill categoryId 'Void' }}
      • +
    • \ No newline at end of file diff --git a/system/templates/sheets/actor/conflict.html b/system/templates/sheets/actor/conflict.html index ef56140..3f40571 100644 --- a/system/templates/sheets/actor/conflict.html +++ b/system/templates/sheets/actor/conflict.html @@ -1,63 +1,5 @@
    -
    -
    -
    -
    - - -
    -
    - - -
    -
    -

    {{ localize 'L5r5e.Conflict.EnduranceTip' }}

    -
    -
    -
    -
    - - -
    -
    - - -
    -
    -

    {{ localize 'L5r5e.Conflict.ComposureTip' }}

    -
    -
    -
    -
    - - -
    -
    -

    {{ localize 'L5r5e.Conflict.FocusTip' }}

    -
    -
    -
    -
    - - -
    -
    -

    {{ localize 'L5r5e.Conflict.VigilanteTip' }}

    -
    -
    -
    -
    - - -
    -
    - - -
    -
    -
    -

    {{ localize 'L5r5e.Conflict.Stance' }}

    {{#each data.stances as |stance stanceId|}} @@ -65,6 +7,5 @@ {{/each}}
    {{> 'systems/l5r5e/templates/item/weapons.html' }} -
    \ No newline at end of file diff --git a/system/templates/sheets/actor/identity.html b/system/templates/sheets/actor/identity.html index cf004a2..bbbdd18 100644 --- a/system/templates/sheets/actor/identity.html +++ b/system/templates/sheets/actor/identity.html @@ -1,4 +1,4 @@ -
      +
      • diff --git a/system/templates/sheets/actor/narrative.html b/system/templates/sheets/actor/narrative.html new file mode 100644 index 0000000..297d972 --- /dev/null +++ b/system/templates/sheets/actor/narrative.html @@ -0,0 +1,16 @@ +
          +
        • + + +
          • +
        • + + +
          • +
        • + + +
          • +
        +

        {{ localize 'L5r5e.Notes' }}

        +{{ editor content=data.notes.value target="data.notes.value" button=true editable=editable }} \ No newline at end of file diff --git a/system/templates/sheets/actor/rings.html b/system/templates/sheets/actor/rings.html index cebc78f..a28ef95 100644 --- a/system/templates/sheets/actor/rings.html +++ b/system/templates/sheets/actor/rings.html @@ -1,22 +1,37 @@
        • - - +
        • - - +
        • - - +
        • - - +
        • - - +
        \ No newline at end of file diff --git a/system/templates/sheets/actor/skill.html b/system/templates/sheets/actor/skill.html index 1fb80b4..255c1d7 100644 --- a/system/templates/sheets/actor/skill.html +++ b/system/templates/sheets/actor/skill.html @@ -1,5 +1,6 @@ -
      • -
      • + diff --git a/system/templates/sheets/actor/social.html b/system/templates/sheets/actor/social.html index 7dab8ce..4392050 100644 --- a/system/templates/sheets/actor/social.html +++ b/system/templates/sheets/actor/social.html @@ -1,4 +1,4 @@ -