diff --git a/fonts/EngliBesh-KG3W.ttf b/fonts/EngliBesh-KG3W.ttf new file mode 100644 index 00000000..bd886327 Binary files /dev/null and b/fonts/EngliBesh-KG3W.ttf differ diff --git a/less/original/apps.less b/less/original/apps.less index 34a2d302..5d34777a 100644 --- a/less/original/apps.less +++ b/less/original/apps.less @@ -178,11 +178,14 @@ background: transparent; } - // Rollable Links + // Rollable Titles .editable .rollable:hover { + cursor: pointer; + } + .editable h4.rollable:hover, + .editable .rollable:hover > h4 { color: #000; text-shadow: 0 0 10px red; - cursor: pointer; } // Separators @@ -306,6 +309,7 @@ /* ----------------------------------------- */ .filter-list { + align-items: center; list-style: none; margin: 0; padding: 0; @@ -382,6 +386,30 @@ padding: 0; } + // Item Name + .item-name { + flex: 2; + margin: 0; + overflow: hidden; + font-size: 13px; + text-align: left; + align-items: center; + h3, h4 { + margin: 0; + white-space: nowrap; + overflow-x: hidden; + } + } + + // Control Buttons + .item-controls { + flex: 0 0 60px; + justify-content: space-between; + a { + font-size: 12px; + text-align: center; + } + } // Individual Item .item { align-items: center; @@ -419,32 +447,13 @@ font-size: 12px; text-align: center; } - .item-name { + h3 { padding-left: 5px; //.modesto(); + text-align: left; font-size: 16px; } } - - // Item Name - .item-name { - flex: 2; - margin: 0; - overflow: hidden; - font-size: 13px; - text-align: left; - align-items: center; - } - - // Control Buttons - .item-controls { - flex: 0 0 60px; - justify-content: space-between; - a { - font-size: 12px; - text-align: center; - } - } } /* ----------------------------------------- */ @@ -482,4 +491,41 @@ height: 24px; margin: 2px; } +} + +/* ----------------------------------------- */ +/* HUD +/* ----------------------------------------- */ + +.placeable-hud .control-icon { + box-sizing: content-box; + width: 40px; + flex: 0 0 40px; + margin: 8px 0; + font-size: 28px; + line-height: 40px; + text-align: center; + color: #FBF4F4; + background: rgba(0, 0, 0, 0.6); + box-shadow: 0 0 15px #000; + border: 1px solid #333; + border-radius: 8px; + pointer-events: all; +} +#token-hud .status-effects { + visibility: hidden; + position: absolute; + left: 50px; + top: 0; + display: grid; + padding: 3px; + box-sizing: content-box; + width: 100px; + color: #FBF4F4; + grid-template-columns: 25px 25px 25px 25px; + background: rgba(0, 0, 0, 0.6); + box-shadow: 0 0 15px #000; + border: 1px solid #333; + border-radius: 4px; + pointer-events: all; } \ No newline at end of file diff --git a/less/original/variables.less b/less/original/variables.less index 0f923b72..75ca7ded 100644 --- a/less/original/variables.less +++ b/less/original/variables.less @@ -19,15 +19,15 @@ font-size: @font-size; font-weight: 400; } -/* bungee-inline-regular - latin */ +/* engli-besh */ @font-face { - font-family: 'Bungee Inline'; + font-family: 'Engli-Besh'; font-style: normal; font-weight: 400; - src: url('./fonts/BungeeInline.ttf'); + src: url('./fonts/EngliBesh-KG3W.ttf'); } -.bungeeInline { - font-family: 'Bungee Inline'; +.engli-Besh { + font-family: 'Engli-Besh'; font-size: 20px; font-weight: 400; } diff --git a/less/update/components/actor-global.less b/less/update/components/actor-global.less index ddce5187..62cdfe71 100644 --- a/less/update/components/actor-global.less +++ b/less/update/components/actor-global.less @@ -5,7 +5,7 @@ .dropShadow1(); } .sw5e.sheet.actor.character { - min-width: 800px; + min-width: 850px; min-height: 720px; } .sw5e.sheet .window-content { @@ -54,7 +54,7 @@ grid-template-rows: 1fr 26px auto; grid-template-columns: 128px 1fr; column-gap: 8px; - row-gap: 8px; + grid-row-gap: 8px; img { grid-column-start: 1; @@ -683,7 +683,7 @@ display: grid; grid-template-columns: 1fr 1fr; grid-gap: 16px; - row-gap: 8px; + grid-row-gap: 8px; input, select { @@ -715,7 +715,7 @@ } .languages { - grid-column-end: span 2; + grid-column-end: span 1; label { &:hover { cursor: pointer; @@ -745,7 +745,7 @@ display: grid; grid-template-columns: 1fr 1fr; grid-gap: 4px; - row-gap: 4px; + grid-row-gap: 4px; strong { font-size: 13px; @@ -994,7 +994,7 @@ } &.limited { grid-template-rows: 144px auto; - row-gap: 8px; + grid-row-gap: 8px; header { grid-template-rows: 1fr; } diff --git a/less/update/sw5e-global.less b/less/update/sw5e-global.less index 6f73a9c0..66173163 100644 --- a/less/update/sw5e-global.less +++ b/less/update/sw5e-global.less @@ -48,6 +48,12 @@ font-weight: 400; src: url('./fonts/Aurebesh.ttf'); } +@font-face { + font-family: 'Engli-Besh'; + font-style: normal; + font-weight: 400; + src: url('./fonts/EngliBesh-KG3W.ttf'); +} @import "_variables.less"; html { @@ -77,6 +83,9 @@ html { body { .openSans(13px, 400); + background-image: url('./ui/SW5e-logo.svg'); + background-repeat: no-repeat; + background-size: cover; } h1 { diff --git a/sw5e-global.css b/sw5e-global.css index f5349371..a54ef3d5 100644 --- a/sw5e-global.css +++ b/sw5e-global.css @@ -48,6 +48,17 @@ font-weight: 400; src: url('./fonts/Aurebesh.ttf'); } +@font-face { + font-family: 'Engli-Besh'; + font-style: normal; + font-weight: 400; + src: url('./fonts/EngliBesh-KG3W.ttf'); +} +.engli-Besh { + font-family: 'Engli-Besh'; + font-size: 20px; + font-weight: 400; +} /* ----------------------------------------- */ /* Fonts */ /* ----------------------------------------- */ @@ -379,12 +390,12 @@ input[type="reset"]:disabled { padding: 0; border: none; } -.sw5e.chat-card .card-header, +.sw5e.chat-card .card-header img, .midi-qol-item-card .card-header img { flex: 0 0 36px; margin-right: 4px; } -.sw5e.chat-card .card-header, +.sw5e.chat-card .card-header h3, .midi-qol-item-card .card-header h3 { flex: 1; margin: 0; @@ -705,7 +716,7 @@ input[type="reset"]:disabled { box-shadow: 0 2px 2px 0 rgba(0, 0, 0, 0.14), 0 3px 1px -2px rgba(0, 0, 0, 0.12), 0 1px 5px 0 rgba(0, 0, 0, 0.2); } .sw5e.sheet.actor.character { - min-width: 800px; + min-width: 850px; min-height: 720px; } .sw5e.sheet .window-content { @@ -945,7 +956,7 @@ input[type="reset"]:disabled { } .sw5e.sheet.actor .swalt-sheet nav.sheet-navigation { display: grid; - grid-template-columns: repeat(7, 1fr); + grid-template-columns: repeat(6, 1fr); column-gap: 16px; margin: 4px 0; } @@ -1330,7 +1341,7 @@ input[type="reset"]:disabled { display: grid; grid-template-columns: 1fr 1fr; grid-gap: 16px; - row-gap: 8px; + grid-row-gap: 8px; } .sw5e.sheet.actor .swalt-sheet .tab.attributes .traits-resources section.traits input, .sw5e.sheet.actor .swalt-sheet .tab.attributes .traits-resources section.traits select { @@ -1357,7 +1368,7 @@ input[type="reset"]:disabled { text-shadow: none; } .sw5e.sheet.actor .swalt-sheet .tab.attributes .traits-resources section.traits .languages { - grid-column-end: span 2; + grid-column-end: span 1; } .sw5e.sheet.actor .swalt-sheet .tab.attributes .traits-resources section.traits .languages label:hover { cursor: pointer; diff --git a/sw5e.css b/sw5e.css index 19c1a5fb..5a3388f1 100644 --- a/sw5e.css +++ b/sw5e.css @@ -9,15 +9,15 @@ font-weight: 400; src: url('./fonts/RussoOne.ttf'); } -/* bungee-inline-regular - latin */ +/* engli-besh */ @font-face { - font-family: 'Bungee Inline'; + font-family: 'Engli-Besh'; font-style: normal; font-weight: 400; - src: url('./fonts/BungeeInline.ttf'); + src: url('./fonts/EngliBesh-KG3W.ttf'); } -.bungeeInline { - font-family: 'Bungee Inline'; +.engli-Besh { + font-family: 'Engli-Besh'; font-size: 20px; font-weight: 400; } @@ -272,9 +272,12 @@ background: transparent; } .sw5e.sheet .editable .rollable:hover { + cursor: pointer; +} +.sw5e.sheet .editable h4.rollable:hover, +.sw5e.sheet .editable .rollable:hover > h4 { color: #000; text-shadow: 0 0 10px red; - cursor: pointer; } .sw5e.sheet span.sep { flex: none; @@ -366,6 +369,7 @@ overflow: hidden; } .sw5e.sheet .filter-list { + align-items: center; list-style: none; margin: 0; padding: 0; @@ -423,6 +427,28 @@ margin: 0; padding: 0; } +.sw5e.sheet .items-list .item-name { + flex: 2; + margin: 0; + overflow: hidden; + font-size: 13px; + text-align: left; + align-items: center; +} +.sw5e.sheet .items-list .item-name h3, +.sw5e.sheet .items-list .item-name h4 { + margin: 0; + white-space: nowrap; + overflow-x: hidden; +} +.sw5e.sheet .items-list .item-controls { + flex: 0 0 60px; + justify-content: space-between; +} +.sw5e.sheet .items-list .item-controls a { + font-size: 12px; + text-align: center; +} .sw5e.sheet .items-list .item { align-items: center; padding: 0 2px; @@ -459,25 +485,10 @@ font-size: 12px; text-align: center; } -.sw5e.sheet .items-list .items-header .item-name { +.sw5e.sheet .items-list .items-header h3 { padding-left: 5px; - font-size: 16px; -} -.sw5e.sheet .items-list .item-name { - flex: 2; - margin: 0; - overflow: hidden; - font-size: 13px; text-align: left; - align-items: center; -} -.sw5e.sheet .items-list .item-controls { - flex: 0 0 60px; - justify-content: space-between; -} -.sw5e.sheet .items-list .item-controls a { - font-size: 12px; - text-align: center; + font-size: 16px; } .sw5e.sheet .effects .item .effect-source, .sw5e.sheet .effects .item .effect-duration, @@ -586,7 +597,21 @@ height: 30px; line-height: 30px; } -.sw5e.sheet.actor .attributes input.temphp { +.sw5e.sheet.actor .sheet-header .attributes .movement h4.attribute-name { + position: relative; +} +.sw5e.sheet.actor .sheet-header .attributes .movement .config-button { + position: absolute; + display: none; + right: 0; + top: 1px; + font-size: 12px; + font-weight: normal; +} +.sw5e.sheet.actor .sheet-header .attributes .movement:hover .config-button { + display: block; +} +.sw5e.sheet.actor .sheet-header .attributes input.temphp { width: 48%; } .sw5e.sheet.actor h4.box-title { @@ -798,7 +823,7 @@ margin: 0 0 3px 0; justify-content: space-between; } -.sw5e.sheet.actor .traits .configure-flags { +.sw5e.sheet.actor .traits .config-button { flex: 1; } .sw5e.sheet.actor .traits label { @@ -871,8 +896,8 @@ .sw5e.sheet.actor .inventory-list .item .item-name i.attuned { color: #7a7971; } -.sw5e.sheet.actor .inventory-list .item .item-name h4 { - font-size: 14px; +.sw5e.sheet.actor .inventory-list .item .item-name i.not-attuned { + color: #44191A; } .sw5e.sheet.actor .inventory-list .item .item-uses input { width: 24px; @@ -905,6 +930,9 @@ .sw5e.sheet.actor .inventory-list .item-detail.item-action { flex: 0 0 100px; } +.sw5e.sheet.actor .inventory-list .item-detail.attunement { + flex: 0 0 24px; +} .sw5e.sheet.actor .inventory-list .item-weight { flex: 0 0 60px; border-left: 1px solid #c9c7b8; @@ -995,24 +1023,22 @@ flex: 0 0 240px; margin: 0; } -.sw5e.sheet.actor .powercasting-ability input, +.sw5e.sheet.actor .powercasting-ability label, .sw5e.sheet.actor .powercasting-ability span { - flex: 0 0 32px; + flex: none; +} +.sw5e.sheet.actor .powercasting-ability input { + flex: 0 0 28px; text-align: center; } .sw5e.sheet.actor .powercasting-ability select { margin: 0 5px; - flex: 0 0 150px; -} -.sw5e.sheet.actor .powercasting-ability h3.power-dc { - flex: 1; - text-align: right; + flex: 0 0 120px; } .sw5e.sheet.actor .power-slots, .sw5e.sheet.actor .power-comps { - flex: 0 0 75px; - padding-right: 5px; - text-align: right; + flex: none; + padding: 0 5px; font-size: 12px; color: #7a7971; border-right: 1px solid #c9c7b8; @@ -1025,9 +1051,10 @@ font-size: 13px; font-weight: normal; } -.sw5e.sheet.actor .power-uses { - padding-right: 8px; - text-align: right !important; +.sw5e.sheet.actor .powerbook .power-uses { + padding-right: 5px; + text-align: right; + color: #7a7971; } .sw5e.sheet.actor .power-school, .sw5e.sheet.actor .power-action, @@ -1069,6 +1096,7 @@ padding-right: 8px; margin-bottom: 4px; overflow-y: auto; + scrollbar-width: thin; } .sw5e.sheet.item { min-height: 660px; @@ -1587,7 +1615,7 @@ .sw5e.chat-card .card-footer span, .midi-qol-item-card .card-footer span { border-right: 2px groove #FFF; - padding: 0 5px 0 0; + padding: 0 3px 0 0; font-size: 10px; } .sw5e.chat-card .card-footer span:last-child, @@ -1762,7 +1790,7 @@ resize: none; } .sw5e.sheet.actor.character .biography { - max-width: calc(-80%); + max-width: calc(100% - 180px); } /* ----------------------------------------- */ /* Basic Structure */ @@ -1794,9 +1822,6 @@ .sw5e.sheet.actor.npc .summary { font-size: 18px; } -.sw5e.sheet.actor.npc .powercasting-ability label { - flex: none; -} .sw5e.sheet.actor.vehicle .features .item-controls { flex: 0 0 68px; } @@ -1817,30 +1842,35 @@ max-width: 40px; text-align: right; } -input[type="number"] { - width: calc(100% - 2px); - min-width: 20px; - height: 26px; - background: rgba(0, 0, 0, 0.05); - padding: 1px 3px; - margin: 0; - color: #191813; - font-family: inherit; - font-size: inherit; - text-align: inherit; - line-height: inherit; - border: 1px solid #7a7971; - border-radius: 3px; - -webkit-user-select: text; - -moz-user-select: text; - -ms-user-select: text; - user-select: text; - -moz-appearance: textfield; -} -input[type="number"]:focus { - box-shadow: 0 0 5px red; -} -input[type="number"]::-webkit-inner-spin-button, -input[type="number"]::-webkit-outer-spin-button { - -webkit-appearance: none; +.placeable-hud .control-icon { + box-sizing: content-box; + width: 40px; + flex: 0 0 40px; + margin: 8px 0; + font-size: 28px; + line-height: 40px; + text-align: center; + color: #FBF4F4; + background: rgba(0, 0, 0, 0.6); + box-shadow: 0 0 15px #000; + border: 1px solid #333; + border-radius: 8px; + pointer-events: all; } +#token-hud .status-effects { + visibility: hidden; + position: absolute; + left: 50px; + top: 0; + display: grid; + padding: 3px; + box-sizing: content-box; + width: 100px; + color: #FBF4F4; + grid-template-columns: 25px 25px 25px 25px; + background: rgba(0, 0, 0, 0.6); + box-shadow: 0 0 15px #000; + border: 1px solid #333; + border-radius: 4px; + pointer-events: all; +} \ No newline at end of file diff --git a/sw5e.js b/sw5e.js index ca288fe3..78320267 100644 --- a/sw5e.js +++ b/sw5e.js @@ -26,7 +26,6 @@ import ActorSheet5eCharacter from "./module/actor/sheets/oldSheets/character.js" import ActorSheet5eNPC from "./module/actor/sheets/oldSheets/npc.js"; import ActorSheet5eVehicle from "./module/actor/sheets/oldSheets/vehicle.js"; import ActorSheet5eCharacterNew from "./module/actor/sheets/newSheet/character.js"; -import ActorSheet5eNPCNew from "./module/actor/sheets/newSheet/npc.js"; import ItemSheet5e from "./module/item/sheet.js"; import ShortRestDialog from "./module/apps/short-rest.js"; import TraitSelector from "./module/apps/trait-selector.js"; @@ -53,7 +52,6 @@ Hooks.once("init", function() { ActorSheet5eCharacter, ActorSheet5eCharacterNew, ActorSheet5eNPC, - ActorSheet5eNPCNew, ActorSheet5eVehicle, ItemSheet5e, ShortRestDialog, @@ -79,6 +77,11 @@ Hooks.once("init", function() { CONFIG.Actor.entityClass = Actor5e; CONFIG.Item.entityClass = Item5e; CONFIG.time.roundTime = 6; + CONFIG.fontFamilies = [ + "Engli-Besh", + "Open Sans", + "Russo One" + ]; // Add DND5e namespace for module compatability game.dnd5e = game.sw5e; @@ -103,16 +106,11 @@ Hooks.once("init", function() { makeDefault: false, label: "SW5E.SheetClassCharacterOld" }); - Actors.registerSheet("sw5e", ActorSheet5eNPCNew, { + Actors.registerSheet("sw5e", ActorSheet5eNPC, { types: ["npc"], makeDefault: true, label: "SW5E.SheetClassNPC" }); - Actors.registerSheet("sw5e", ActorSheet5eNPC, { - types: ["npc"], - makeDefault: false, - label: "SW5E.SheetClassNPCOld" - }); Actors.registerSheet('sw5e', ActorSheet5eVehicle, { types: ['vehicle'], makeDefault: true, diff --git a/templates/actors/newActor/parts/swalt-core.html b/templates/actors/newActor/parts/swalt-core.html index fefcf69c..6ab9d404 100644 --- a/templates/actors/newActor/parts/swalt-core.html +++ b/templates/actors/newActor/parts/swalt-core.html @@ -44,8 +44,8 @@
{{> "systems/sw5e/templates/actors/newActor/parts/swalt-traits.html"}} diff --git a/templates/actors/newActor/parts/swalt-resources.html b/templates/actors/newActor/parts/swalt-resources.html index 79bb24ff..935b99e7 100644 --- a/templates/actors/newActor/parts/swalt-resources.html +++ b/templates/actors/newActor/parts/swalt-resources.html @@ -1,65 +1,36 @@ {{!-- Resources, Counters, & Favorites --}} -
-
- {{#each resources as |res|}} -
-

- -

-
- - / - -
-
- - -
-
- {{/each}} -
-
-
-

{{ localize "SW5E.DeathSave" }}

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

{{ localize "SW5E.Exhaustion" }}

-
- -
-
-
-

{{ localize "SW5E.Inspiration" }}

-
- -
-
-
-
-

Favorites

+
+

Favorites

-
-
\ No newline at end of file +
+

 

+
+

Journal and Notes

+ + + {{editor content=data.details.notes.value target="data.details.notes.value" button=true owner=owner editable=editable}} +
+
+ + {{editor content=data.details.notes1.value target="data.details.notes1.value" button=true owner=owner editable=editable}} +
+ +
+ + {{editor content=data.details.notes2.value target="data.details.notes2.value" button=true owner=owner editable=editable}} +
+ +
+ + {{editor content=data.details.notes3.value target="data.details.notes3.value" button=true owner=owner editable=editable}} +
+ +
+ + {{editor content=data.details.notes4.value target="data.details.notes4.value" button=true owner=owner editable=editable}} +
\ No newline at end of file diff --git a/templates/actors/newActor/parts/swalt-traits.html b/templates/actors/newActor/parts/swalt-traits.html index 57edaf99..2cadc4f5 100644 --- a/templates/actors/newActor/parts/swalt-traits.html +++ b/templates/actors/newActor/parts/swalt-traits.html @@ -16,6 +16,16 @@ placeholder="{{ localize 'SW5E.None' }}" /> {{/unless}} +
+ + +
+
+ {{#unless isVehicle}} + + + {{/unless}} +
@@ -26,7 +36,40 @@
  • {{v}}
    • {{/each}} +
    +
    + + + + +
      + {{#each data.traits.armorProf.selected as |v k|}} +
    • {{v}}
      • + {{/each}} +
    +
    + + + + +
      + {{#each data.traits.toolProf.selected as |v k|}} +
    • {{v}}
      • + {{/each}} +
    +
    +
    + + + + +
      + {{#each data.traits.weaponProf.selected as |v k|}} +
    • {{v}}
      • + {{/each}} +
    +
    @@ -72,47 +115,66 @@ {{/each}}
    {{#if isCharacter}} -
    - - - - -
      - {{#each data.traits.weaponProf.selected as |v k|}} -
    • {{v}}
      • - {{/each}} -
    -
    -
    - - - - -
      - {{#each data.traits.armorProf.selected as |v k|}} -
    • {{v}}
      • - {{/each}} -
    -
    -
    - - - - -
      - {{#each data.traits.toolProf.selected as |v k|}} -
    • {{v}}
      • - {{/each}} -
    -
    {{/if}} - - {{#unless isVehicle}} -
    - - -
    - {{/unless}} +
    +
    +
    + {{#each resources as |res|}} +
    +

    + +

    +
    + + / + +
    +
    + + +
    +
    + {{/each}} +
    +
    +
    +

    {{ localize "SW5E.DeathSave" }}

    +
    +
    + + +
    +
    + + +
    +
    +
    +
    +

    {{ localize "SW5E.Exhaustion" }}

    +
    + +
    +
    +
    +

    {{ localize "SW5E.Inspiration" }}

    +
    + +
    +
    \ No newline at end of file