2.11.9

Dorako · Oct 28, 2023 · 780b9cb · 780b9cb
1 parent 6b13d6e
commit 780b9cb
Show file tree

Hide file tree

Showing 11 changed files with 398 additions and 97 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+# 2.11.9
+
+- (Refinement) Added Foundry 2 styling for Monk's TokenBar.
+- (New) Added Foundry 2 styling for PF2e Toolbelt's heroic action stuff.
+- (Maintenance) Changed localization in send-to-chat functionality.
+
 # 2.11.8
 
 - (Refinement) Improved Foundry 2 styling for TAH.

diff --git a/esmodules/dorako-ux/customization.js b/esmodules/dorako-ux/customization.js
@@ -134,7 +134,7 @@ Hooks.on("getItemSheetPF2eHeaderButtons", (sheet, buttons) => {
   }
 
   buttons.unshift({
-    label: util.i18n(`${MODULE_NAME}.text.send-to-chat`),
+    label: `${MODULE_NAME}.text.send-to-chat`,
     class: "send",
     icon: "fas fa-comment-alt",
     onclick: async () => {

diff --git a/esmodules/foundry2-theme.js b/esmodules/foundry2-theme.js
@@ -89,6 +89,22 @@ Hooks.on("renderTokenActionHud", (app, html, data) => {
   html.attr("data-theme", "foundry2");
 });
 
+Hooks.on("renderTokenBar", (app, html, data) => {
+  const theme = game.settings.get("pf2e-dorako-ui", "theme.application-theme");
+  if (theme !== "foundry2-theme") {
+    html.attr("data-theme", "dorako-ui");
+    return;
+  }
+  const excludeString = game.settings.get("pf2e-dorako-ui", "customization.excluded-applications");
+  if (excludeString.toLowerCase().includes("TokenBar".toLowerCase())) {
+    console.debug(
+      `${MODULE_NAME} | render${app.constructor.name} | is included in excluded applications string ${excludeString} => do not add .foundry2`
+    );
+    return;
+  }
+  html.attr("data-theme", "foundry2");
+});
+
 for (const app of [...baseThemePf2eSheets]) {
   Hooks.on("render" + app, (app, html, data) => {
     const theme = game.settings.get("pf2e-dorako-ui", "theme.application-theme");

diff --git a/sass/_mixins.scss b/sass/_mixins.scss
@@ -86,6 +86,7 @@
     box-shadow: var(--box-shadow);
   }
 
+  &.selected,
   &.active {
     background: var(--button-hover-background-color);
     outline: 1px solid var(--button-focus-outline-color);

diff --git a/sass/foundry2-theme/pf2e-system/_messages.scss b/sass/foundry2-theme/pf2e-system/_messages.scss
@@ -23,10 +23,11 @@
     text-shadow: 0px 1px 1px black;
   }
 
-  &.pf2e.chat-card .card-header h3 {
+  .pf2e.chat-card .card-header h3 {
     font-family: var(--serif);
     font-size: x-large;
     line-height: 1.3rem;
+    color: var(--color-light-2);
   }
 
   .table-draw .table-results .table-result img.result-image {

diff --git a/sass/foundry2-theme/pf2e-system/_pc-sheet.scss b/sass/foundry2-theme/pf2e-system/_pc-sheet.scss
@@ -116,6 +116,7 @@
 
   &.actor.sheet.character .crb-style .sheet-body .sheet-content .item-image:hover i {
     background: var(--color-warm-2);
+    color: var(--color-light-1);
     text-shadow: 0px 1px 2px black;
   }
 

diff --git a/sass/module-support/_index.scss b/sass/module-support/_index.scss
@@ -28,6 +28,7 @@
 @import "pf2e-dailies";
 @import "pf2e-idle-hud";
 @import "pf2e-see-simple-scale-statistics";
+@import "pf2e-toolbelt";
 @import "pf2e-utility-buttons";
 @import "pinned-chatlog";
 @import "polyglot";

diff --git a/sass/module-support/_monks.scss b/sass/module-support/_monks.scss
@@ -42,7 +42,8 @@
 /* ----------------------------------------- */
 /* Monk's tokenbar                           */
 /* ----------------------------------------- */
-#tokenbar {
+
+#tokenbar[data-theme="dorako-ui"] {
   gap: 3px;
 
   .token-list {
@@ -87,35 +88,35 @@
       -webkit-backdrop-filter: blur(5px);
     }
   }
-}
 
-.monks-tokenbar.chat-card .card-header h3:hover {
-  text-shadow: unset;
-}
+  .monks-tokenbar.chat-card .card-header h3:hover {
+    text-shadow: unset;
+  }
 
-.monks-tokenbar .sheet .items-list .items-header {
-  border: none;
-}
+  .monks-tokenbar .sheet .items-list .items-header {
+    border: none;
+  }
 
-#tokenbar .bar-controls .tokenbar-buttons div.active:not(.disabled) i,
-#tokenbar[movement="free"] #movement-free:not(.disabled) i,
-#tokenbar[movement="none"] #movement-none:not(.disabled) i,
-#tokenbar[movement="combat"] #movement-combat:not(.disabled) i {
-  @include quick-transition;
-  border: none;
-  margin: 2px;
-  box-shadow: 0 0 0 1px var(--tertiary), 0 0 0 2px var(--gold-brown);
-  border-radius: 3px;
-  text-shadow: 0px 0px 3px black;
-  background-color: var(--primary-light);
-  color: var(--color-text-light-highlight);
-}
+  .bar-controls .tokenbar-buttons div.active:not(.disabled) i,
+  &[movement="free"] #movement-free:not(.disabled) i,
+  &[movement="none"] #movement-none:not(.disabled) i,
+  &[movement="combat"] #movement-combat:not(.disabled) i {
+    @include quick-transition;
+    border: none;
+    margin: 2px;
+    box-shadow: 0 0 0 1px var(--tertiary), 0 0 0 2px var(--gold-brown);
+    border-radius: 3px;
+    text-shadow: 0px 0px 3px black;
+    background-color: var(--primary-light);
+    color: var(--color-text-light-highlight);
+  }
 
-#tokenbar:not(.hidectrl) .bar-controls .tokenbar-buttons div.active:not(.disabled):hover i,
-#tokenbar[movement="free"]:not(.hidectrl) #movement-free:not(.disabled):hover i,
-#tokenbar[movement="none"]:not(.hidectrl) #movement-none:not(.disabled):hover i,
-#tokenbar[movement="combat"]:not(.hidectrl) #movement-combat:not(.disabled):hover i {
-  color: var(--color-text-light-highlight);
+  &:not(.hidectrl) .bar-controls .tokenbar-buttons div.active:not(.disabled):hover i,
+  &[movement="free"]:not(.hidectrl) #movement-free:not(.disabled):hover i,
+  &[movement="none"]:not(.hidectrl) #movement-none:not(.disabled):hover i,
+  &[movement="combat"]:not(.hidectrl) #movement-combat:not(.disabled):hover i {
+    color: var(--color-text-light-highlight);
+  }
 }
 
 .dorako-ui.dark-theme .monks-tokenbar .sheet .items-list .item .item-name,
@@ -195,6 +196,58 @@
   }
 }
 
+#tokenbar[data-theme="foundry2"] {
+  .bar-controls {
+    @include f2-app;
+    div#tokenbar-move-handle {
+      background: unset;
+    }
+  }
+  .token-list {
+    border: unset;
+    gap: 5px;
+    .token {
+      @include f2-app;
+      .tooltip {
+        background: var(--app-background);
+        border: 1px solid var(--color-warm-1);
+        box-shadow: 0px 0px 6px var(--color-warm-2), 0px 2px 8px 1px var(--color-warm-3);
+        backdrop-filter: blur(5px);
+        border-radius: var(--border-radius);
+        -webkit-backdrop-filter: blur(5px);
+        font-size: var(--font-size-16);
+        line-height: var(--font-size-16);
+        text-shadow: 0px 1px 2px black;
+        padding: 0.3em 0.6em;
+      }
+      .token-stats {
+        background: unset;
+      }
+      .token-icon {
+        box-shadow: unset;
+      }
+    }
+  }
+}
+
+.foundry2 {
+  &#requestsavingthrow .request-grid > div {
+    @include f2-button-warm;
+    text-align: center;
+  }
+  &#requestsavingthrow .request-grid {
+    gap: 6px;
+    grid-template-columns: 31% 31% 31%;
+  }
+  .monks-tokenbar .sheet .items-list .items-header {
+    background: unset;
+    border: unset;
+  }
+  .monks-tokenbar .sheet .items-list .item {
+    border: unset;
+  }
+}
+
 /* ----------------------------------------- */
 /* Monk's little details                     */
 /* ----------------------------------------- */

diff --git a/sass/module-support/_pf2e-toolbelt.scss b/sass/module-support/_pf2e-toolbelt.scss
@@ -0,0 +1,22 @@
+.foundry2-pc {
+  &.sheet.actor.character
+    .sheet-body
+    .sheet-content
+    [data-tab="actions"]
+    .tab-content
+    .actions-panels
+    [data-tab="encounter"]
+    ol.actions-list.heroActions-list
+    .action
+    .item-controls
+    > button {
+    color: black;
+    &:hover {
+      box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.15), inset 0 0 0 2px rgba(0, 0, 0, 0.4);
+    }
+  }
+  .heroActions-list > button {
+    @include f2-button-warm;
+    margin-top: 5px;
+  }
+}