Waffe:${weapon.name}` + tooltip += `
Waffe: ${weapon.name}` } if (cooldown.data.target) { target = game.actors.get(game.scenes.current.tokens.find(p => p._id === cooldown.data.target).actorId) - tooltip += `
Waffe:${target.name}` + tooltip += `
Ziel: ${target.name}` } cooldown.title = cooldown.data.title cooldown.progress = ((cooldown.current / cooldown.start) * 100) + "%" - cooldown.tooltip = tooltip + `
Aktionen verbleibend: ${cooldown.current}` + if (cooldown.start - cooldown.current > 0) { + cooldown.tooltip = tooltip + `
Aktionen verbleibend: ${cooldown.start - cooldown.current}
: 1 Aktion aufwenden` + } else { + cooldown.tooltip = tooltip + `
Aktionen verbleibend: ${cooldown.start - cooldown.current}
: Aktion durchführen` + } + }) context.hasSpells = actorData.itemTypes["Spell"].length > 0 @@ -493,11 +669,11 @@ class CharacterSheet extends HandlebarsApplicationMixin(ActorSheetV2) { case "advsf": await Advsf._prepareContext(context, this.document) break - case "combat": - await Combat._prepareContext(context, this.document) + case "health": + await Health._prepareContext(context, this.document) break case "equipment": - await Equipment._prepareContext(context, this.document) + await Equipment._prepareContext(context, this.document, this) break case "skills": await Skills._prepareContext(context, this.document) @@ -515,11 +691,23 @@ class CharacterSheet extends HandlebarsApplicationMixin(ActorSheetV2) { return context } + _onPosition(position) { + + if (position.width < 300) { + this.element.classList.add("tiny") + this.element.querySelector(".sidebuttons").style.left = (position.width + position.left) + "px" + this.element.querySelector(".sidebuttons").style.top = (position.top) + "px" + } else { + this.element.classList.remove("tiny") + } + + } + _onRender(context, options) { Meta._onRender(context, options, this.element) Social._onRender(context, options, this.element) Advsf._onRender(context, options, this) - Combat._onRender(context, options, this.element) + Health._onRender(context, options, this.element) Effects._onRender(context, options, this.element) Equipment._onRender(context, options, this) Liturgies._onRender(context, options, this.element) @@ -559,7 +747,7 @@ class CharacterSheet extends HandlebarsApplicationMixin(ActorSheetV2) { } else { if (document.parent && document.parent !== this.actor) { - document.parent.items.get(document._id).delete() + game.DSA41.socket.executeAsGM("removeFromLootTable", document.parent.id, document._id) } await this._onDropDocument(event, document) diff --git a/src/module/sheets/creatureSheet.mjs b/src/module/sheets/creatureSheet.mjs index 87aafffa..895dc9e2 100644 --- a/src/module/sheets/creatureSheet.mjs +++ b/src/module/sheets/creatureSheet.mjs @@ -25,7 +25,6 @@ export class CreatureSheet extends HandlebarsApplicationMixin(ActorSheetV2) { static TABS = { sheet: { tabs: [], - initial: 'meta' } } @@ -66,6 +65,19 @@ export class CreatureSheet extends HandlebarsApplicationMixin(ActorSheetV2) { tabs.tabs.push(tab) } } + + if (!game.user.isGM) { + if (this.document.system.visibility.meta) { + tabs.initial = 'meta' + } else if (this.document.system.visibility.attacks) { + tabs.initial = 'attacks' + } else if (this.document.system.visibility.description) { + tabs.initial = 'description' + } else if (this.document.system.visibility.loot) { + tabs.initial = 'loot' + } + } + return tabs } diff --git a/src/module/sheets/equipmentSheet.mjs b/src/module/sheets/equipmentSheet.mjs index 6d29b1fd..76b352c2 100644 --- a/src/module/sheets/equipmentSheet.mjs +++ b/src/module/sheets/equipmentSheet.mjs @@ -1,6 +1,6 @@ const {DocumentSheetV2, HandlebarsApplicationMixin} = foundry.applications.api -export class EquipmentSheet extends HandlebarsApplicationMixin(DocumentSheetV2) { +class EquipmentSheet extends HandlebarsApplicationMixin(DocumentSheetV2) { /** @inheritDoc */ static DEFAULT_OPTIONS = { @@ -311,3 +311,5 @@ export class EquipmentSheet extends HandlebarsApplicationMixin(DocumentSheetV2) } } + +export default EquipmentSheet diff --git a/src/module/sheets/merchantSheet.mjs b/src/module/sheets/merchantSheet.mjs index bc9b2b63..2774656f 100644 --- a/src/module/sheets/merchantSheet.mjs +++ b/src/module/sheets/merchantSheet.mjs @@ -109,13 +109,8 @@ export class MerchantSheet extends HandlebarsApplicationMixin(ActorSheetV2) { actor.createEmbeddedDocuments('Item', [item]).then(documents => { documents[0].update({'system.quantity': 1}) }) - if (item.system.quantity != -1) { // -1 means infinite - if (item.system.quantity > 1) { - item.update({'system.quantity': item.system.quantity - 1}) - } else { - this.document.deleteEmbeddedDocuments('Item', [item._id]) // delete when the quantity is equal to 0 - } - } + + game.DSA41.socket.executeAsGM("buyFromLootTable", this.document.id, item.id) ChatMessage.create({ user: game.user._id, speaker: {actor}, diff --git a/src/style/atoms/_buttons.scss b/src/style/atoms/_buttons.scss new file mode 100644 index 00000000..270daf15 --- /dev/null +++ b/src/style/atoms/_buttons.scss @@ -0,0 +1,58 @@ +@use "./colours"; + +@mixin raised_button { + background: rgba(0, 0, 0, 0.05); + border: 1px solid #ccc; + box-shadow: 1px 1px 1px #ccc; + border-top-right-radius: 8px; + border-bottom-right-radius: 8px; +} + +@mixin uncut_raised_button { + @include raised_button; + border-radius: 8px; + + button { + background: unset; + border: unset; + box-shadow: unset; + color: black; + + &:hover { + color: black; + } + + @include colours.highlight; + } +} + +@mixin pill-button($color:false, $button-color: #F80) { + background-image: url("/systems/DSA_4-1/assets/velvet_button.png"); + background-color: $color; + background-repeat: repeat-y; + background-size: cover; + @if $color { + background-blend-mode: overlay; + } + border-color: $button-color; + border-width: 1px; + border-style: solid; + border-radius: 8px; + box-shadow: 2px 2px 4px #000; + color: $button-color; + cursor: pointer; + display: inline-block; + text-shadow: 1px 1px 1px rgba(0, 0, 0, 0.2); + padding: 0 8px; + height: 28px; + line-height: 28px; + vertical-align: middle; +} + +@mixin mini-button($color:false, $button-color: #F80) { + @include pill-button($color, $button-color); + width: 100%; + border-radius: 2px; + height: 24px; + line-height: 24px; +} \ No newline at end of file diff --git a/src/style/atoms/_colours.scss b/src/style/atoms/_colours.scss index e495c79a..774e4429 100644 --- a/src/style/atoms/_colours.scss +++ b/src/style/atoms/_colours.scss @@ -1,25 +1,25 @@ $nachteil-color: #555753; $nachteil-text-color: #FFF; -$liturgie-color: #edd400; +$liturgie-color: #59aebf; $liturgie-text-color: #000; $zauber-color: #3465a4; $zauber-text-color: #000; $talent-color: #f57900; $talent-text-color: #000; -$kampftalent-color: #cc0000; +$kampftalent-color: #c36e14; $kampftalent-text-color: #FFF; -$talent-body-color: #16bd6c; +$talent-body-color: #45d18c; $talent-body-text-color: #000; -$talent-nature-color: #46800d; +$talent-nature-color: #7cb544; $talent-nature-text-color: #000; -$talent-social-color: #ae9809; +$talent-social-color: #c8588a; $talent-social-text-color: #000; -$talent-knowledge-color: #d319ba; +$talent-knowledge-color: #2ba9c5; $talent-knowledge-text-color: #000; -$talent-language-color: #573bbc; -$talent-language-text-color: #fff; -$talent-crafting-color: #ae6813; +$talent-language-color: #957fe8; +$talent-language-text-color: #000; +$talent-crafting-color: #cd9551; $talent-crafting-text-color: #000; @@ -83,4 +83,14 @@ $special-action: rgba(68, 34, 204, 0.8); $special-action-color: #000; +@mixin highlight { + &:hover { + text-shadow: 0 0 10px red; + } + cursor: pointer; +} +@mixin svg-highlight { + filter: drop-shadow(0px 0px 10px rgb(255 0 0)); + cursor: pointer; +} \ No newline at end of file diff --git a/src/style/atoms/_typography.scss b/src/style/atoms/_typography.scss index 0827abfe..cdbf65cc 100644 --- a/src/style/atoms/_typography.scss +++ b/src/style/atoms/_typography.scss @@ -24,16 +24,21 @@ } input, - .rkp .pill, .cooldown > span, .attribute.rollable > .name, .attribute.rollable > .wert { font-family: Andalus, sans-serif; } + .mini-skill, .mini-weaponskill, .mini-language-skill, .mini-liturgy, .mini-spell, .editor.prosemirror.active, .editor.prosemirror.inactive { font-family: Gentium, sans-serif; } + .mini-skill, .mini-weaponskill, .mini-language-skill, .mini-liturgy, .mini-spell { + font-weight: bold; + text-transform: capitalize; + } + } diff --git a/src/style/molecules/_attribute-die.scss b/src/style/molecules/_attribute-die.scss index c3126fcf..484520a5 100644 --- a/src/style/molecules/_attribute-die.scss +++ b/src/style/molecules/_attribute-die.scss @@ -31,11 +31,12 @@ position: absolute; left: -1px; width: 48px; - top: -1px; - font-size: smaller; + top: 2px; + font-size: large; line-height: 48px; vertical-align: middle; text-align: center; + @if $darkmode { color: colours.$attribute-die-label-color-darkmode; } @else { @@ -62,7 +63,7 @@ &.colorfulDice { - &.Mut { + .Mut { .die svg path { fill: colours.$attribute-die-co-color; diff --git a/src/style/molecules/_equipment.scss b/src/style/molecules/_equipment.scss index 8b541f92..1ff14ae4 100644 --- a/src/style/molecules/_equipment.scss +++ b/src/style/molecules/_equipment.scss @@ -1,4 +1,5 @@ @use "../atoms/assets"; +@use "../atoms/colours" as colour; @mixin equipment($darkmode: false) { position: relative; @@ -9,14 +10,12 @@ padding: 2px 0 0 2px; margin: 4px 0 0 4px; gap: 8px; - @if darkmode { - background: rgba(0, 0, 0, 0.3); - } @else { - background: assets.$tab-pane-background; - } + background: assets.$tab-pane-background; .icon { - width: 32px; + object-fit: cover; + max-width: 32px; + max-height: 32px; padding: 0; } @@ -46,7 +45,7 @@ &:hover { .name { - text-shadow: 0 0 10px rgb(255 0 0); + @include colour.highlight; } border: 1px solid #ccc; @@ -55,4 +54,12 @@ padding: 0 4px 4px 0; z-index: 2; } + + &.worn { + + .name { + font-weight: bold; + } + + } } \ No newline at end of file diff --git a/src/style/molecules/_liturgy-banner.scss b/src/style/molecules/_liturgy-banner.scss index 75b73fe7..affcde17 100644 --- a/src/style/molecules/_liturgy-banner.scss +++ b/src/style/molecules/_liturgy-banner.scss @@ -205,24 +205,29 @@ $deity_colours_tint: ( .liturgy.rollable { width: 24px; + padding: 0; svg { - $color: #e4de61; - width: 24px; - height: 24px; + + $color: colour.$liturgie-color; + width: 32px; + height: 32px; top: 1px; z-index: 1; position: relative; - path { fill: $color; } } + + &:hover { + @include colour.svg-highlight; + } } - .clickable:hover { - text-shadow: 0 0 10px rgb(255 0 0); + .clickable { + @include colour.highlight; } } diff --git a/src/style/molecules/_rollable.scss b/src/style/molecules/_rollable.scss index a1c7cb5b..ca2d0893 100644 --- a/src/style/molecules/_rollable.scss +++ b/src/style/molecules/_rollable.scss @@ -2,6 +2,7 @@ @use 'sass:map'; @use "../atoms/colours" as colour; @use "../atoms/numbers" as numbers; +@use "../atoms/buttons"; $rollable_colours: ( "nachteil": colour.$nachteil-color, @@ -36,7 +37,7 @@ $rollable_colours_font: ( display: block; height: 32px; position: relative; - margin: 4px; + margin: 4px 32px 4px 4px; .die { width: 32px; @@ -52,7 +53,7 @@ $rollable_colours_font: ( .value { position: absolute; left: 0; - top: 0; + top: 1px; width: 32px; line-height: 30px; vertical-align: middle; @@ -69,6 +70,24 @@ $rollable_colours_font: ( top: 6px; } } + + &:active { + + + scale: 0.8; + + .value { + + img { + position: absolute; + width: 20px; + height: 20px; + left: 4px; + top: 7px; + } + } + + } } .container { @@ -122,43 +141,30 @@ $rollable_colours_font: ( } } } + + .outside { + position: absolute; + right: -24px; + top: 8px; + bottom: 8px; + z-index: 3; + + @include colour.highlight; + } } // interactivity .block.rollable { - &:hover { + .die:hover { - .die svg { - filter: drop-shadow(0px 0px 10px rgb(255 0 0)); + svg { + @include colour.svg-highlight; } } - &:active { - .die { - width: 28px; - height: 28px; - left: 2px; - top: 2px; - - .value { - width: 28px; - height: 28px; - left: -1px; - top: -2px; - - img { - position: absolute; - width: 20px; - height: 20px; - left: 4px; - top: 7px; - } - } - } - } } } @@ -168,7 +174,6 @@ $rollable_colours_font: ( .#{$name}.rollable { .die { - stroke-width: 0.5; svg { @@ -176,8 +181,7 @@ $rollable_colours_font: ( path { fill: $color; - stroke: colour.$rollable-die-border-color; - stroke-width: 5px; + } } @@ -189,9 +193,8 @@ $rollable_colours_font: ( } .container { - background-image: linear-gradient(to right, rgba($color, numbers.$start_gradient), rgba($color, numbers.$end_gradient)); - border-top-right-radius: 8px; - border-bottom-right-radius: 8px; + // background-image: linear-gradient(to right, rgba($color, numbers.$start_gradient), rgba($color, numbers.$end_gradient)); + @include buttons.raised_button; } } } diff --git a/src/style/molecules/_sidebar-elements.scss b/src/style/molecules/_sidebar-elements.scss index 2ec297a8..f8a5ba5c 100644 --- a/src/style/molecules/_sidebar-elements.scss +++ b/src/style/molecules/_sidebar-elements.scss @@ -1,5 +1,6 @@ @use "../atoms/colours" as colors; @use "sass:color"; +@use "../atoms/buttons"; .dsa41.sheet.actor.character { @@ -11,7 +12,7 @@ width: 100%; position: relative; border: 1px inset #ccc; - background-color: rgba(0, 0, 0, 0.2); + background-color: rgba(0, 0, 0, 0.5); margin: 8px 0; label { @@ -19,8 +20,6 @@ left: 0; top: 0; bottom: 0; - width: 48px; - background-color: rgba(0, 0, 0, 0.1); z-index: 3; line-height: 24px; vertical-align: middle; @@ -112,9 +111,7 @@ cursor: pointer; } - &:hover { - text-shadow: 0 0 2px rgba(255, 0, 0, 1); - } + @include colors.highlight; } .pa { @@ -126,21 +123,84 @@ cursor: pointer; } - &:hover { - text-shadow: 0 0 2px rgba(255, 0, 0, 1); - } + @include colors.highlight; } .ini { grid-area: ini; + cursor: pointer; + + label { + cursor: pointer; + } + + @include colors.highlight; } .tp { grid-area: tp; + cursor: pointer; + label { + cursor: pointer; + } + + @include colors.highlight; } } + .favourites { + + h3 { + text-align: center; + margin: 8px 0; + } + + .mini-skill, .mini-weaponskill, .mini-language-skill, .mini-spell, .mini-liturgy { + margin-bottom: 4px; + + + @include colors.highlight; + } + + .mini-skill.Körperlich { + @include buttons.mini-button($color: color.scale(colors.$talent-body-color, $lightness: -50%), $button-color: gold); + } + + .mini-skill.Gesellschaft { + @include buttons.mini-button($color: color.scale(colors.$talent-social-color, $lightness: -50%), $button-color: gold); + } + + .mini-skill.Natur { + @include buttons.mini-button($color: color.scale(colors.$talent-nature-color, $lightness: -50%), $button-color: gold); + } + + .mini-skill.Wissen { + @include buttons.mini-button($color: color.scale(colors.$talent-knowledge-color, $lightness: -50%), $button-color: gold); + } + + .mini-skill.Handwerk { + @include buttons.mini-button($color: color.scale(colors.$talent-crafting-color, $lightness: -50%), $button-color: gold); + } + + .mini-weaponskill { + @include buttons.mini-button($color: color.scale(colors.$kampftalent-color, $lightness: -50%), $button-color: gold); + } + + .mini-language-skill { + @include buttons.mini-button($color: color.scale(colors.$talent-language-color, $lightness: -50%), $button-color: gold); + } + + .mini-spell { + @include buttons.mini-button($color: colors.$zauber-color, $button-color: gold); + } + + .mini-liturgy { + @include buttons.mini-button($color: colors.$liturgie-color, $button-color: gold); + } + + } + .cooldowns { h3 { @@ -208,22 +268,13 @@ position: absolute; background: url('/systems/DSA_4-1/assets/gradient.png'); background-size: 12px 100%; + background-blend-mode: overlay; + background-color: rgba(128, 0, 192, 1); left: 0; bottom: 0; top: 0; border-radius: 12px; z-index: 2; - - &::after { // progress fill - content: ''; - position: absolute; - left: 0; - top: 0; - right: 0; - bottom: 0; - border-radius: 12px; - background-color: rgba(128, 0, 192, 0.5); - } } &::after { @@ -238,20 +289,20 @@ } - &.Kampf .progress::after { - background-color: rgba(colors.$kampftalent-color, 0.5); + &.Kampf .progress { + background-color: rgba(colors.$kampftalent-color, 1); } - &.Karmal .progress::after { - background-color: rgba(colors.$liturgie-color, 0.5); + &.Karmal .progress { + background-color: rgba(colors.$liturgie-color, 1); } - &.Magisch .progress::after { - background-color: rgba(colors.$zauber-color, 0.5); + &.Magisch .progress { + background-color: rgba(colors.$zauber-color, 1); } - &.Talent .progress::after { - background-color: rgba(colors.$talent-color, 0.5); + &.Talent .progress { + background-color: rgba(colors.$talent-color, 1); } } diff --git a/src/style/organisms/_character-sheet.scss b/src/style/organisms/_character-sheet.scss index 5b452e73..52e67a4b 100644 --- a/src/style/organisms/_character-sheet.scss +++ b/src/style/organisms/_character-sheet.scss @@ -5,10 +5,11 @@ @use "./character-tabs/social"; @use "./character-tabs/advsf"; @use "./character-tabs/inventory"; -@use "./character-tabs/combat"; +@use "./character-tabs/health"; @use "./character-tabs/spells"; @use "./character-tabs/liturgies"; @use "./character-tabs/skills"; +@use "../atoms/buttons"; .application.sheet.dsa41.actor.character { @@ -36,6 +37,14 @@ font-size: large; } + .rkp { + + .pill { + @include buttons.pill-button; + } + + } + } div.head-data { @@ -50,6 +59,7 @@ .profile-img { width: $sidebar-width - 16px; } + } nav.sheet-tabs.tabs { @@ -86,8 +96,8 @@ @include inventory.tab; } - .tab.combat.active { - @include combat.tab; + .tab.health.active { + @include health.tab; } .tab.skills.active { @@ -102,6 +112,76 @@ @include liturgies.tab; } + .sidebuttons { + display: none; + } + } + + &.tiny:not(.minimized):not(.minimizing) { + + .header-fields { + & > div:not(.attributes) { + display: none; + } + + & > div.attributes { + position: absolute; + left: -8px; + top: -8px; + right: -8px; + display: grid; + gap: 8px; + grid-template-columns: repeat(4, 1fr); + } + + } + + div.head-data { + width: unset; + top: 136px; + left: 8px; + right: 8px; + bottom: 8px; + + .profile-img { + justify-self: center; + } + } + + .sheet-tabs { + display: none; + } + + section.tab.tab.tab { + display: none; + } + + .sidebuttons { + position: fixed; + display: block; + margin-left: 27px; + margin-top: 48px; + pointer-events: none; + rotate: 90deg; + transform-origin: top left; + + div { + display: flex; + gap: 4px; + + button { + background-image: url("/systems/DSA_4-1/assets/velvet_button.png"); + background-repeat: repeat-y; + background-size: cover; + color: white; + font-weight: bold; + pointer-events: all; + border-radius: 0; + border-top-left-radius: 8px; + border-top-right-radius: 8px; + } + } + } } } @@ -126,8 +206,8 @@ @include inventory.tab(true); } - .tab.combat.active { - @include combat.tab(true); + .tab.health.active { + @include health.tab(true); } .tab.skills.active { diff --git a/src/style/organisms/_combat-action-dialog.scss b/src/style/organisms/_combat-action-dialog.scss index 274d1032..e5359f2b 100644 --- a/src/style/organisms/_combat-action-dialog.scss +++ b/src/style/organisms/_combat-action-dialog.scss @@ -45,6 +45,8 @@ li { + cursor: pointer; + height: 32px; display: grid; line-height: 32px; @@ -63,6 +65,7 @@ } &.name-only { + padding-left: 40px; display: block; } } diff --git a/src/style/organisms/_group-sheet.scss b/src/style/organisms/_group-sheet.scss index 00635e88..4d4aa441 100644 --- a/src/style/organisms/_group-sheet.scss +++ b/src/style/organisms/_group-sheet.scss @@ -1,3 +1,5 @@ +@use "../atoms/colours" as colour; + .application.sheet.dsa41.actor.group { .sheet-header { @@ -30,8 +32,8 @@ } } - .rollable:hover { - text-shadow: 0 0 10px rgb(255 0 0); + .rollable { + @include colour.highlight; } .character { @@ -131,9 +133,7 @@ display: inline-block; padding: 0 4px; - &:hover { - text-shadow: 0 0 10px rgb(255 0 0); - } + @include colour.highlight; } } } @@ -168,7 +168,7 @@ &:hover { .item-name { - text-shadow: 0 0 10px rgb(255 0 0); + @include colour.highlight; } } } diff --git a/src/style/organisms/_item-browser-dialog.scss b/src/style/organisms/_item-browser-dialog.scss new file mode 100644 index 00000000..9636d2df --- /dev/null +++ b/src/style/organisms/_item-browser-dialog.scss @@ -0,0 +1,102 @@ +.dsa41.dialog.item-browser { + + .window-content [data-application-part] { + + position: relative; + + .progress { + position: absolute; + top: 0; + left: 0; + right: 0; + height: 24px; + border-radius: 4px; + background-color: rgba(0, 0, 0, 0.3); + + .fill { + position: absolute; + left: 0; + top: 0; + bottom: 0; + background: url('/systems/DSA_4-1/assets/gradient.png'); + background-size: 24px 100%; + background-color: rgba(64, 192, 192, 0.8); + background-blend-mode: multiply; + } + + .text { + position: absolute; + left: 0; + top: 0; + right: 0; + bottom: 0; + height: 24px; + line-height: 24px; + vertical-align: middle; + font-weight: bold; + margin-left: 8px; + text-shadow: 2px 2px 0 rgba(0, 0, 0, 0.3); + color: white; + } + + + } + + display: grid; + grid-template-columns: 240px 1fr; + height: 100%; + gap: 16px; + + aside { + width: 240px; + } + + .scrollable-table { + + display: grid; + grid-template-rows: 32px 1fr; + overflow: hidden; + + .header { + display: grid; + grid-template-columns: 64px 1fr 120px 120px 120px; + gap: 4px; + background-color: rgba(0, 0, 0, 0.3); + + * { + font-weight: bold; + line-height: 32px; + vertical-align: middle; + } + } + + .scroll-y { + overflow-x: hidden; + overflow-y: auto; + + border: 1px inset #ccc; + + .item { + display: grid; + grid-template-columns: 64px 1fr 120px 120px 120px; + gap: 4px; + + &:nth-child(odd) { + background-color: rgba(0, 0, 0, 0.1); + } + + &.selected { + background-color: rgba(255, 140, 0, 0.2); + border: 1px solid orange; + } + } + + } + + + } + + } + + +} \ No newline at end of file diff --git a/src/style/organisms/_merchant-sheet.scss b/src/style/organisms/_merchant-sheet.scss index 8325fdf6..1eba2f36 100644 --- a/src/style/organisms/_merchant-sheet.scss +++ b/src/style/organisms/_merchant-sheet.scss @@ -1,3 +1,6 @@ +@use "../atoms/buttons"; + + .dsa41.actor.merchant { .tab.goods.active { @@ -22,9 +25,12 @@ overflow-y: auto; .merchant-good { + @include buttons.uncut_raised_button; + width: 100%; display: grid; break-inside: avoid; + grid-template-columns: 32px 1fr 32px; grid-template-rows: 16px 16px; grid-template-areas: "img title options" "img price options"; @@ -39,6 +45,7 @@ button { grid-area: options; + height: 100%; } .price { @@ -57,12 +64,7 @@ overflow-y: auto; .service { - - border: 1px inset rgba(0, 0, 0, 1); - background-color: rgba(0, 0, 0, 0.2); - border-radius: 4px; - padding: 4px; - margin: 4px 0; + @include buttons.uncut_raised_button; display: grid; grid-template-columns: 32px 1fr 32px; @@ -105,6 +107,9 @@ } &.infinite { + width: 32px; + bottom: -2px; + &::before { content: '∞'; } diff --git a/src/style/organisms/_resting-dialog.scss b/src/style/organisms/_resting-dialog.scss index f2b212b6..6d6ef938 100644 --- a/src/style/organisms/_resting-dialog.scss +++ b/src/style/organisms/_resting-dialog.scss @@ -14,6 +14,10 @@ margin-left: 32px; padding-bottom: 16px; + &.setting-nest-1 { + margin-left: 64px; + } + &.range { padding-bottom: 0; margin-left: 34px; diff --git a/src/style/organisms/character-tabs/_advsf.scss b/src/style/organisms/character-tabs/_advsf.scss index 7d7834c9..26022e6f 100644 --- a/src/style/organisms/character-tabs/_advsf.scss +++ b/src/style/organisms/character-tabs/_advsf.scss @@ -1,3 +1,5 @@ +@use "../../atoms/buttons"; + @mixin tab($darkmode: false) { .advantages-and-specialabilities { @@ -21,19 +23,9 @@ .advantage, .special-ability, .flaw { position: relative; - border: 1px solid gold; - box-shadow: 2px 2px 4px #000; - border-radius: 8px; - height: 24px; - color: gold; - text-shadow: 1px 1px 1px rgba(0, 0, 0, 0.2); - display: inline-block; - padding: 0 8px; margin-left: 0; margin-bottom: 4px; - background-image: url("/systems/DSA_4-1/assets/velvet_button.png"); - background-repeat: repeat-y; - background-size: cover; + @include buttons.pill-button($color: rgb(0, 128, 0), $button-color: gold); span { position: relative; @@ -43,20 +35,7 @@ } &.special-ability { - &::after { - background: rgba(128, 0, 96, 0.5); - } - } - - &::after { - content: ""; - position: absolute; - left: 0; - top: 0; - right: 0; - bottom: 0; - border-radius: 8px; - background: rgba(0, 128, 0, 0.5); + @include buttons.pill-button($color: rgb(128, 0, 96), $button-color: gold); } & + .advantage, & + .special-ability { @@ -80,21 +59,23 @@ width: 24px; } - &::after { - background: rgba(106, 36, 216, 0.5); - } - + @include buttons.pill-button($color: rgb(106, 36, 216), $button-color: gold); } &.disadvantage { font-style: italic; - - &::after { - background: rgba(128, 0, 0, 0.5); - } + @include buttons.pill-button($color: rgb(128, 0, 0), $button-color: gold); } } } } } + +.dsa41.actor.character.standalone.advsf { + @include tab; + + .advantages-and-specialabilities { + flex-direction: column; + } +} diff --git a/src/style/organisms/character-tabs/_combat.scss b/src/style/organisms/character-tabs/_health.scss similarity index 56% rename from src/style/organisms/character-tabs/_combat.scss rename to src/style/organisms/character-tabs/_health.scss index 1e3163b7..52769dbe 100644 --- a/src/style/organisms/character-tabs/_combat.scss +++ b/src/style/organisms/character-tabs/_health.scss @@ -3,8 +3,8 @@ display: grid; grid-template-columns: 1fr 320px; - grid-template-rows: 32px 32px 1fr; - grid-template-areas: "res res" "wounds wounds" "actions actions" "cooldowns cooldowns"; + grid-template-rows: 32px 32px 32px 1fr; + grid-template-areas: "res res" "wounds wounds" "fatigue fatigue" "effects effects" "effects effects"; padding: 8px; gap: 8px; @@ -31,7 +31,7 @@ } - .wounds { + .wounds, .fatigue { position: relative; height: 24px; display: flex; @@ -90,22 +90,46 @@ } - .actions { - grid-area: actions; - padding: 0; + .fatigue { + grid-area: fatigue; + flex-direction: row; - .grid-of-actions { - display: unset; + label { + span { + display: inline-block; + height: 26px; + line-height: 26px; + vertical-align: middle; + } + + input { + position: absolute; + right: 0; + height: 26px; + text-align: center; + padding: 0; + margin: 0; + width: 28px; + } } + + .filled-segment { + background-color: rgba(0, 128, 0, 0.8); + + &.danger { + background-color: rgba(255, 0, 0, 0.8); + } + } + } - .cooldowns { - grid-area: cooldowns; + .effects { + grid-area: effects; } &.zones { - grid-template-areas: "res res" "wounds wounds" "actions paperdoll" "cooldowns paperdoll"; + grid-template-areas: "res res" "wounds wounds" "fatigue fatigue" "effects paperdoll" "effects paperdoll"; .paperdoll { grid-area: paperdoll; @@ -230,4 +254,145 @@ } +} + +.mini-health { + @include tab; + + display: flex; + flex-direction: column; + padding: 0; + + input { + height: 26px !important; + text-align: center !important; + padding: 0 !important; + margin: 0 !important; + width: 28px !important; + } + + .side-by-side { + display: flex; + + > * { + flex: 1; + } + } + + .paperdoll { + + div { + position: relative; + + .wound { + position: absolute; + width: 32px; + height: 32px; + border-radius: 16px; + border: 1px solid black; + background-color: rgba(0, 0, 0, 0.5); + box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.3); + line-height: 32px; + vertical-align: middle; + text-align: center; + color: red; + + + &.armlinks { + top: 146px; + left: 210px; + } + + &.armrechts { + top: 146px; + left: 60px; + } + + &.beinlinks { + top: 346px; + left: 210px; + } + + &.beinrechts { + top: 346px; + left: 60px; + } + + &.bauch { + top: 166px; + left: 136px; + } + + &.kopf { + top: 6px; + left: 136px + } + + &.brust { + top: 86px; + left: 110px; + } + + &.ruecken { + top: 86px; + left: 160px; + } + + } + + .armor { + position: absolute; + width: 32px; + height: 32px; + border-radius: 0 0 16px 16px; + line-height: 32px; + vertical-align: middle; + text-align: center; + border: 1px solid silver; + background-color: rgba(0, 0, 0, 0.5); + box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.3); + color: silver; + + &.armlinks { + top: 180px; + left: 210px; + } + + &.armrechts { + top: 180px; + left: 60px; + } + + &.beinlinks { + top: 380px; + left: 210px; + } + + &.beinrechts { + top: 380px; + left: 60px; + } + + &.bauch { + top: 200px; + left: 136px; + } + + &.kopf { + top: 40px; + left: 136px + } + + &.ruecken { + top: 120px; + left: 160px; + } + + &.brust { + top: 120px; + left: 110px; + } + } + } + } } \ No newline at end of file diff --git a/src/style/organisms/character-tabs/_inventory.scss b/src/style/organisms/character-tabs/_inventory.scss index 3ad244aa..d8c96658 100644 --- a/src/style/organisms/character-tabs/_inventory.scss +++ b/src/style/organisms/character-tabs/_inventory.scss @@ -28,7 +28,7 @@ position: relative; border: 1px inset #ccc; background-color: rgba(0, 0, 0, 0.2); - height: 8px; + height: 16px; span.fill { position: absolute; @@ -56,11 +56,29 @@ } } - h3.inventory-header { + .inventory-header { line-height: 32px; grid-area: inventory-header; margin: 0; padding: 0; + display: flex; + + h3 { + flex: 1; + line-height: 32px; + } + + .buttons { + flex: 0; + display: flex; + gap: 4px; + + button { + + } + } + + } @@ -81,5 +99,67 @@ } } + + h3.equipment-header { + line-height: 32px; + grid-area: equipment-header; + margin: 0; + padding: 0; + } + + .set { + grid-area: equipment; + margin: 0; + padding: 0; + } } } + +.dsa41.sheet.actor.character.standalone.bagpack { + @include tab; + + + .coinage { + position: absolute; + bottom: 0; + right: 8px; + height: 38px; + line-height: 38px; + vertical-align: middle; + } + + .capacity { + position: absolute; + top: 0; + left: 0; + right: 0; + } + + .buttons { + position: absolute; + bottom: 4px; + left: 4px; + + button { + display: inline-block; + } + + } + + .inventory-table { + overflow-x: hidden; + overflow-y: auto; + + position: absolute; + left: 4px; + top: 4px; + right: 4px; + bottom: 38px; + + .equipment { + @include equipment.equipment + } + + } +} + diff --git a/src/style/organisms/character-tabs/_skills.scss b/src/style/organisms/character-tabs/_skills.scss index 3a2a7e4f..e9acdc57 100644 --- a/src/style/organisms/character-tabs/_skills.scss +++ b/src/style/organisms/character-tabs/_skills.scss @@ -17,6 +17,13 @@ gap: unset; padding: unset; + fieldset { + margin-top: 0; + margin-bottom: 0; + padding-top: 0; + padding-bottom: 0; + } + } ul { @@ -38,4 +45,18 @@ } } +} + +.mini-skills { + overflow-x: hidden; + overflow-y: auto; + height: 100%; + @include tab; + + container: unset; + + ul { + list-style-type: none; + padding-left: 0; + } } \ No newline at end of file diff --git a/src/style/organisms/character-tabs/_spells.scss b/src/style/organisms/character-tabs/_spells.scss index 8a47be00..93c98bc6 100644 --- a/src/style/organisms/character-tabs/_spells.scss +++ b/src/style/organisms/character-tabs/_spells.scss @@ -27,12 +27,16 @@ z-index: 2; top: 0; left: -4px; - display: none; path { fill: colour.$zauber-color; } } + + &:hover { + @include colour.svg-highlight; + } + } @@ -44,6 +48,8 @@ span { position: relative; z-index: 1; + + @include colour.highlight; } } @@ -59,9 +65,9 @@ border-top-right-radius: 8px; border-bottom-right-radius: 8px; position: absolute; - top: 2px; left: 12px; bottom: 2px; + height: 2px; right: 33%; z-index: 0; pointer-events: none; @@ -87,4 +93,61 @@ padding: 0 4px; } } +} + +.mini-spells { + height: 100%; + display: flex; + flex-direction: column; + + .table-header { + display: grid; + grid-template-columns: 1fr 100px 30px; + padding: 0 8px; + font-weight: bold; + } + + .scrollable-table { + overflow-x: hidden; + overflow-y: auto; + + thead { + display: none; + + } + + + tr { + + td:nth-child(1) { + width: 32px; + } + + td:nth-child(3) { + width: 100px; + } + + td:nth-child(4) { + width: 30px; + } + + .spell.rollable { + position: relative; + + svg { + + position: absolute; + width: 32px; + height: 32px; + z-index: 2; + top: 0; + left: -4px; + + path { + fill: colour.$zauber-color; + } + } + } + } + } } \ No newline at end of file diff --git a/src/style/styles.scss b/src/style/styles.scss index e78462f6..070b26d5 100644 --- a/src/style/styles.scss +++ b/src/style/styles.scss @@ -35,4 +35,5 @@ @use "organisms/battle-dialog"; @use "organisms/liturgy-sheet"; @use "organisms/dialog"; -@use "organisms/deity-sheet"; \ No newline at end of file +@use "organisms/deity-sheet"; +@use "organisms/item-browser-dialog"; \ No newline at end of file diff --git a/src/system.json b/src/system.json index 94324e87..2c5045b7 100644 --- a/src/system.json +++ b/src/system.json @@ -2,11 +2,12 @@ "id": "DSA_4-1", "title": "Das Schwarze Auge 4.1", "description": "Noch ein Spielsystem für Das Schwarze Auge 4.1", - "version": "0.5.1-rc1", + "version": "0.0.1", "compatibility": { "minimum": 12, "verified": 13 }, + "dependencies": [], "authors": [ { "name": "GrandpaPoppy" @@ -340,7 +341,16 @@ } } }, - "socket": false, + "socket": true, + "relationships": { + "requires": [ + { + "id": "socketlib", + "type": "module", + "manifest": "https://github.com/farling42/foundryvtt-socketlib/releases/latest/download/module.json" + } + ] + }, "initiative": "1d6", "grid": { "distance": 1, @@ -349,5 +359,5 @@ "primaryTokenAttribute": "lep.aktuell", "url": "https://git.macniel.online/macniel/foundry-dsa41-game", "manifest": "https://git.macniel.online/macniel/foundry-dsa41-game/raw/branch/main/src/system.json", - "download": "https://git.macniel.online/macniel/foundry-dsa41-game/releases/download/0.5.1-rc1/release.zip" + "download": "https://git.macniel.online/macniel/foundry-dsa41-game/releases/download/0.0.1/release.zip" } diff --git a/src/templates/actor/character/main-sheet.hbs b/src/templates/actor/character/main-sheet.hbs index e4420fc3..611361ed 100644 --- a/src/templates/actor/character/main-sheet.hbs +++ b/src/templates/actor/character/main-sheet.hbs @@ -32,12 +32,14 @@
{{this.using}} ({{this.name}})
{{#if this.at}} -
+
{{/if}}
{{#if this.pa}}
-
\ No newline at end of file
diff --git a/src/templates/actor/character/tab-combat.hbs b/src/templates/actor/character/tab-health.hbs
similarity index 72%
rename from src/templates/actor/character/tab-combat.hbs
rename to src/templates/actor/character/tab-health.hbs
index 67511b0f..dab36be2 100644
--- a/src/templates/actor/character/tab-combat.hbs
+++ b/src/templates/actor/character/tab-health.hbs
@@ -1,7 +1,6 @@
-
+
{{/if}}
- {{#if this.at}}
-
diff --git a/src/templates/actor/character/standalone/advsf.hbs b/src/templates/actor/character/standalone/advsf.hbs
new file mode 100644
index 00000000..13434596
--- /dev/null
+++ b/src/templates/actor/character/standalone/advsf.hbs
@@ -0,0 +1,26 @@
+
+
+
diff --git a/src/templates/actor/character/standalone/bagpack.hbs b/src/templates/actor/character/standalone/bagpack.hbs
new file mode 100644
index 00000000..1ab325de
--- /dev/null
+++ b/src/templates/actor/character/standalone/bagpack.hbs
@@ -0,0 +1,20 @@
+
+
+ Schlechte Eigenschaften
+-
+ {{#each this.flaws}}
+
- {{> "systems/DSA_4-1/templates/ui/partial-advantage-button.hbs" this}} + {{/each}} +
+
+ Vor- und Nachteile
+-
+ {{#each this.advantages}}
+
- {{> "systems/DSA_4-1/templates/ui/partial-advantage-button.hbs" this}} + {{/each}} +
+
+Sonderfertigkeiten
+-
+ {{#each this.specialAbilities}}
+
- {{> "systems/DSA_4-1/templates/ui/partial-sf-button.hbs" this}} + {{/each}} +
+
diff --git a/src/templates/actor/character/standalone/health.hbs b/src/templates/actor/character/standalone/health.hbs
new file mode 100644
index 00000000..e259fc5f
--- /dev/null
+++ b/src/templates/actor/character/standalone/health.hbs
@@ -0,0 +1,138 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ {{> "systems/DSA_4-1/templates/ui/partial-equipment-button.hbs" equipments}}
+
+
+
diff --git a/src/templates/actor/character/standalone/liturgies.hbs b/src/templates/actor/character/standalone/liturgies.hbs
new file mode 100644
index 00000000..e8b8cb52
--- /dev/null
+++ b/src/templates/actor/character/standalone/liturgies.hbs
@@ -0,0 +1,204 @@
+
+
+
+ {{#if (not trefferzonen)}}
+
+
+
+ w6
+
+
+
+
+
+ von
+
+
+ {{#if ausdauer}}
+
+
+
+ von
+
+
+ {{/if}}
+ {{#if (not zonenruestung)}}
+
+
+ {{derived.rs}}
+
+ {{/if}}
+
+
+ {{derived.be}}
+
+
+
+ {{derived.gs.aktuell}}
+
+
+
+
+
+ {{#each this.woundsFilled}}
+ {{#if this}}
+
+ {{/if}}
+
+ {{#if withErschoepfung}}
+ {{@index}}
+ {{else}}
+ {{@index}}
+ {{/if}}
+ {{/each}}
+
+
+ {{#each this.erschoepfungFilled}}
+ {{#if this}}
+
+ {{/if}}
+
+ {{#if (or trefferzonen zonenruestung)}}
+ {{@index}}
+ {{else}}
+ {{@index}}
+ {{/if}}
+ {{/each}}
+
+ {{#if (gt this.ueberanstrengung 0)}}
+ {{system.erschoepfung.aktuell}}
+ {{else}}
+
+ {{/if}}
+
+ {{/if}}
+
+
+ {{/if}}
+
+
+
+
+ {{#if (or trefferzonen zonenruestung)}}
+ -
+ {{#each effects}}
+
- {{this}} + {{/each}} +
+
+ {{/if}}
+
+ {{#if (or trefferzonen zonenruestung)}}
+ {{#if (and trefferzonen zonenruestung)}}Trefferzonen{{/if}}{{#if + (and trefferzonen (not zonenruestung))}}Wunden{{/if}}{{#if + (and (not trefferzonen) zonenruestung)}}Rüstung{{/if}}
+
+
+ {{#if trefferzonen}}
+ {{derived.wunden.kopf}}
+ {{derived.wunden.brust}}
+ {{derived.wunden.armlinks}}
+ {{derived.wunden.armrechts}}
+ {{derived.wunden.ruecken}}
+ {{derived.wunden.bauch}}
+ {{derived.wunden.beinlinks}}
+ {{derived.wunden.beinrechts}}
+ {{/if}}
+ {{#if zonenruestung}}
+ {{derived.rs.kopf}}
+ {{derived.rs.brust}}
+ {{derived.rs.armlinks}}
+ {{derived.rs.armrechts}}
+ {{derived.rs.ruecken}}
+ {{derived.rs.bauch}}
+ {{derived.rs.beinlinks}}
+ {{derived.rs.beinrechts}}
+ {{/if}}
+
+
+
-
+
+
+
+
+
+ von
+
+
+
+ {{#each this.liturgies}}
+
+
+
+ {{/each}}
+
\ No newline at end of file
diff --git a/src/templates/actor/character/standalone/skills.hbs b/src/templates/actor/character/standalone/skills.hbs
new file mode 100644
index 00000000..67ff834e
--- /dev/null
+++ b/src/templates/actor/character/standalone/skills.hbs
@@ -0,0 +1,97 @@
+| + |  |
+ Liturgiekenntnis: {{this.lkp}} | +|
|---|---|---|---|
| + |
+
+
+ {{#if this.count0}}0{{/if}}
+ |
+ ||
| + {{> 'systems/DSA_4-1/templates/ui/partial-die.hbs' }} + | ++ {{this.name}} | ++ | |
|
+
+
+ {{#if this.countI}}I{{/if}}
+ |
+ |||
| + {{> 'systems/DSA_4-1/templates/ui/partial-die.hbs' }} + | ++ {{this.name}} | ++ | |
|
+
+
+ {{#if this.countII}}II{{/if}}
+ |
+ |||
| + {{> 'systems/DSA_4-1/templates/ui/partial-die.hbs' }} + | +{{this.name}} | +||
|
+
+
+ {{#if this.countIII}}III{{/if}}
+ |
+ |||
| + {{> 'systems/DSA_4-1/templates/ui/partial-die.hbs' }} + | +{{this.name}} | +||
|
+
+
+ {{#if this.countIV}}IV{{/if}}
+ |
+ |||
| + {{> 'systems/DSA_4-1/templates/ui/partial-die.hbs' }} + | +{{this.name}} | +||
|
+
+
+ {{#if this.countV}}V{{/if}}
+ |
+ |||
| + {{> 'systems/DSA_4-1/templates/ui/partial-die.hbs' }} + | +{{this.name}} | +||
|
+
+
+ {{#if this.countVI}}VI{{/if}}
+ |
+ |||
| + {{> 'systems/DSA_4-1/templates/ui/partial-die.hbs' }} + | +{{this.name}} | +||
|
+
+
+ {{#if this.countVII}}VII{{/if}}
+ |
+ |||
| + {{> 'systems/DSA_4-1/templates/ui/partial-die.hbs' }} + | +{{this.name}} | +||
|
+
+
+ {{#if this.countVIII}}VIII{{/if}}
+ |
+ |||
| + {{> 'systems/DSA_4-1/templates/ui/partial-die.hbs' }} + | +{{this.name}} | +||
+
\ No newline at end of file
diff --git a/src/templates/actor/character/standalone/spells.hbs b/src/templates/actor/character/standalone/spells.hbs
new file mode 100644
index 00000000..2ed2e4b5
--- /dev/null
+++ b/src/templates/actor/character/standalone/spells.hbs
@@ -0,0 +1,51 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/templates/actor/character/tab-equipment.hbs b/src/templates/actor/character/tab-equipment.hbs
index 2f59d916..f289a702 100644
--- a/src/templates/actor/character/tab-equipment.hbs
+++ b/src/templates/actor/character/tab-equipment.hbs
@@ -15,29 +15,32 @@
+
+
+
+
+
+
+ von
+
+
+
+
+
+
+
+
+ Zaubername
+
+
+ Probe
+
+ ZfW
+
+
+
+
+
+
+
+| + | Zaubername | +Probe | +ZfW | +
|---|---|---|---|
| + {{> 'systems/DSA_4-1/templates/ui/partial-die.hbs' }} + | ++ {{this.name}} | +{{this.eigenschaft1}} {{this.eigenschaft2}} {{this.eigenschaft3}} | +{{this.zfw}} | +
Inventar
+
+
Inventar
+ +
{{> "systems/DSA_4-1/templates/ui/partial-equipment-button.hbs" equipments}}
-
-
@@ -43,35 +42,54 @@
{{#if (not trefferzonen)}}
-
+
{{#each this.woundsFilled}}
{{#if this}}
-
{{/if}}
+ {{#if withErschoepfung}}
+ {{@index}}
{{else}}
- {{@index}}
+ {{@index}}
{{/if}}
{{/each}}
+
+ {{#each this.erschoepfungFilled}}
+ {{#if this}}
+
{{/if}}
-
diff --git a/src/templates/actor/character/tab-set.hbs b/src/templates/actor/character/tab-set.hbs
index 43b5bb2c..cde2bd41 100644
--- a/src/templates/actor/character/tab-set.hbs
+++ b/src/templates/actor/character/tab-set.hbs
@@ -1,29 +1,25 @@
-{{@index}}
+ {{else}}
+ {{@index}}
+ {{/if}}
+ {{/each}}
-
-
Aktionen im Kampf
-
-
+ {{/if}}
+
+
- Angriff
- variabel
-
-
- Verteidigen
- variabel
-
-
- {{#each this.actions}}
- {{> "systems/DSA_4-1/templates/ui/partial-action-button.hbs" this}}
- {{/each}}
+ {{#if (gt this.ueberanstrengung 0)}}
+ {{system.erschoepfung.aktuell}}
+ {{else}}
+
+ {{/if}}
+
+
{{#if (or trefferzonen zonenruestung)}}
@@ -111,5 +129,4 @@
-
+ {{#each effects}}
+
- {{this}} + {{/each}} +
+
+ {{#each this.slots}}
+ 
+ {{/each}}
+ {{!--
+ {{#if (eq ../actor.system.setEquipped @index)}}
+
+ {{else}}
+
+ {{/if}}
-
\ No newline at end of file
diff --git a/src/templates/actor/character/tab-skills.hbs b/src/templates/actor/character/tab-skills.hbs
index 26c619c2..49203fec 100644
--- a/src/templates/actor/character/tab-skills.hbs
+++ b/src/templates/actor/character/tab-skills.hbs
@@ -2,8 +2,9 @@
data-tab="{{tabs.skills.id}}"
data-group="{{tabs.skills.group}}">
-
+ --}}
- {{#each this.slots}}
-
- {{/each}}
- {{#if (eq ../actor.system.setEquipped @index)}}
-
- {{else}}
-
- {{/if}}
-
-
-
-
\ No newline at end of file
+
-
-
Kampftalente
+
+
-
-
Körperliche Talente
+
+
-
-
Gesellschaftliche Talente
+ -
-
Natur Talente
+
+
-
-
{{#each circumstances}}
- Wissenstalente
+
+
-
- Probe
ZfW
Merkmale
+
{{> 'systems/DSA_4-1/templates/ui/partial-die.hbs' }}
-
+
{{this.name}}
{{this.eigenschaft1}}
{{this.eigenschaft2}}
@@ -43,6 +44,15 @@
+
{{/each}}
diff --git a/src/templates/actor/merchant/tab-services.hbs b/src/templates/actor/merchant/tab-services.hbs
index 6f69dd1d..ca964624 100644
--- a/src/templates/actor/merchant/tab-services.hbs
+++ b/src/templates/actor/merchant/tab-services.hbs
@@ -40,7 +40,8 @@
{{this.name}}
{{currency this.price}}
{{this.availability}}
+ (lte this.availability 0)}}infinite{{/if}}">{{#unless
+ (lte this.availability 0)}}{{this.availability}}{{/unless}}
{{/if}}
diff --git a/src/templates/dialog/combat-action.hbs b/src/templates/dialog/combat-action.hbs
index e39875e7..8fdad05a 100644
--- a/src/templates/dialog/combat-action.hbs
+++ b/src/templates/dialog/combat-action.hbs
@@ -5,7 +5,7 @@
Schriften & Sprachen
+
+
-
-
\ No newline at end of file
diff --git a/src/templates/actor/character/tab-spells.hbs b/src/templates/actor/character/tab-spells.hbs
index 46ec9463..42ca511e 100644
--- a/src/templates/actor/character/tab-spells.hbs
+++ b/src/templates/actor/character/tab-spells.hbs
@@ -25,6 +25,7 @@
Handwerkliche Talente
+
+
- {{#each this.merkmal}}
- {{this}} {{/each}}
+ {{#if this.fav}}
+
+ {{else}}
+
+ {{/if}}
+
+ -
{{#each tokenDistances}}
-
{{this.actor.name}}({{this.d}} {{../distanceUnit}} )
@@ -18,7 +18,7 @@
{{this.name}} ({{this.skillName}}){{#if this.combatStatistics}} @@ -31,7 +31,7 @@
-
{{#each maneuver}}
-
- {{this.name}} {{/each}}
-diff --git a/src/templates/dialog/defense-action.hbs b/src/templates/dialog/defense-action.hbs index 90eae4e7..c9724512 100644 --- a/src/templates/dialog/defense-action.hbs +++ b/src/templates/dialog/defense-action.hbs @@ -3,7 +3,7 @@-
{{#each weapons}}
-
-
{{#if this.img}}
-
{{#each maneuver}}
-
- {{this.name}} {{/each}}
-diff --git a/src/templates/dialog/item-browser-dialog.hbs b/src/templates/dialog/item-browser-dialog.hbs new file mode 100644 index 00000000..b484a1f5 --- /dev/null +++ b/src/templates/dialog/item-browser-dialog.hbs @@ -0,0 +1,73 @@ ++ + + + +\ No newline at end of file diff --git a/src/templates/dialog/resting-dialog.hbs b/src/templates/dialog/resting-dialog.hbs index 87cb1b60..afae5b85 100644 --- a/src/templates/dialog/resting-dialog.hbs +++ b/src/templates/dialog/resting-dialog.hbs @@ -24,10 +24,10 @@++ ++ + Name + Kategorie + Preis + Gewicht +++ {{#each items}} ++++ {{/each}} +
-
{{#each weapons}}
-
+
\ No newline at end of file
diff --git a/src/templates/item/spell/tab-variants.hbs b/src/templates/item/spell/tab-variants.hbs
index 334d3786..c382c66d 100644
--- a/src/templates/item/spell/tab-variants.hbs
+++ b/src/templates/item/spell/tab-variants.hbs
@@ -1,7 +1,7 @@
-
+
-
+
\ No newline at end of file
diff --git a/src/templates/ui/partial-cooldown.hbs b/src/templates/ui/partial-cooldown.hbs
new file mode 100644
index 00000000..d6cb26ee
--- /dev/null
+++ b/src/templates/ui/partial-cooldown.hbs
@@ -0,0 +1,14 @@
+
+
+ {{this.title}}
+
+
\ No newline at end of file
diff --git a/src/templates/ui/partial-mini-rollable-button.hbs b/src/templates/ui/partial-mini-rollable-button.hbs
new file mode 100644
index 00000000..36984790
--- /dev/null
+++ b/src/templates/ui/partial-mini-rollable-button.hbs
@@ -0,0 +1,3 @@
+
+ {{this.name}}
+
\ No newline at end of file
diff --git a/src/templates/ui/partial-mini-rollable-language-button.hbs b/src/templates/ui/partial-mini-rollable-language-button.hbs
new file mode 100644
index 00000000..7fb3506c
--- /dev/null
+++ b/src/templates/ui/partial-mini-rollable-language-button.hbs
@@ -0,0 +1,3 @@
+
+ {{this.name}}
+
\ No newline at end of file
diff --git a/src/templates/ui/partial-mini-rollable-liturgy-button.hbs b/src/templates/ui/partial-mini-rollable-liturgy-button.hbs
new file mode 100644
index 00000000..e032c98a
--- /dev/null
+++ b/src/templates/ui/partial-mini-rollable-liturgy-button.hbs
@@ -0,0 +1,3 @@
+
+ {{this.name}}
+
\ No newline at end of file
diff --git a/src/templates/ui/partial-mini-rollable-spell-button.hbs b/src/templates/ui/partial-mini-rollable-spell-button.hbs
new file mode 100644
index 00000000..da472975
--- /dev/null
+++ b/src/templates/ui/partial-mini-rollable-spell-button.hbs
@@ -0,0 +1,3 @@
+
+ {{this.name}}
+
\ No newline at end of file
diff --git a/src/templates/ui/partial-mini-rollable-weaponskill-button.hbs b/src/templates/ui/partial-mini-rollable-weaponskill-button.hbs
new file mode 100644
index 00000000..aabced0f
--- /dev/null
+++ b/src/templates/ui/partial-mini-rollable-weaponskill-button.hbs
@@ -0,0 +1,7 @@
+
+
\ No newline at end of file
diff --git a/src/templates/ui/partial-rollable-button.hbs b/src/templates/ui/partial-rollable-button.hbs
index 7007661b..dcfe6edc 100644
--- a/src/templates/ui/partial-rollable-button.hbs
+++ b/src/templates/ui/partial-rollable-button.hbs
@@ -1,9 +1,5 @@
-
+ {{this.name}}
+
+
+
+
diff --git a/src/templates/ui/partial-rollable-language-button.hbs b/src/templates/ui/partial-rollable-language-button.hbs
index 76027387..b4196107 100644
--- a/src/templates/ui/partial-rollable-language-button.hbs
+++ b/src/templates/ui/partial-rollable-language-button.hbs
@@ -1,10 +1,7 @@
-
{{> 'systems/DSA_4-1/templates/ui/partial-die.hbs' }}
@@ -25,4 +21,11 @@
{{/each}}
+ {{#if this.fav}}
+
+ {{else}}
+
+ {{/if}}
+
+
-
diff --git a/src/templates/ui/partial-rollable-weaponskill-button.hbs b/src/templates/ui/partial-rollable-weaponskill-button.hbs
index 552ea31f..fe7648dd 100644
--- a/src/templates/ui/partial-rollable-weaponskill-button.hbs
+++ b/src/templates/ui/partial-rollable-weaponskill-button.hbs
@@ -1,11 +1,10 @@
-
+
+
{{> 'systems/DSA_4-1/templates/ui/partial-die.hbs' }}
{{#if this.taw}}
{{this.taw}}
@@ -26,4 +23,11 @@
{{/each}}
+ {{#if this.fav}}
+
+ {{else}}
+
+ {{/if}}
+
+
+
{{> 'systems/DSA_4-1/templates/ui/partial-die.hbs' }}
- {{#if this.taw}}
{{this.taw}}
{{else}}
@@ -25,4 +24,11 @@
{{/if}}
+ {{#if this.fav}}
+
+ {{else}}
+
+ {{/if}}
+