1.11.25

Dorako · Feb 15, 2023 · 27de0ba · 27de0ba
1 parent 28483b8
commit 27de0ba
Show file tree

Hide file tree

Showing 16 changed files with 328 additions and 39 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,18 +1,26 @@
+# 1.11.25
+
+- (SWADE) Made the token/portrait avatar setting functional.
+- (SWADE) Possibly avoided style collision with SWPF premium module.
+- (Fix) Fixed a regression that caused Damage Log messages to lose their background color.
+- (Module) Added support for Monk's Scene Navigation.
+- (Refinement) Updated support for new PF2e Target Damage features.
+
 # 1.11.24
 
 - (Fix) Fixed an issue where Token Action Hud Core integration was not working as expected due to TAHC registering its settings much later than expected.
 - (Fix) Fixed an issue where some Journals were dark-themed regardles of the dark-theme journals setting.
 
 # 1.11.23
 
-- (System) Blacklisted complex SWADE sheets from dark-theme.
-- (System) Rejiggered some things to make SWADE journals compatible with dark theme.
-- (System) Updated all instanced of 'red' (--primary) in SWADE to be the SWADE accent color.
+- (SWADE) Blacklisted complex SWADE sheets from dark-theme.
+- (SWADE) Rejiggered some things to make SWADE journals compatible with dark theme.
+- (SWADE) Updated all instanced of 'red' (--primary) in SWADE to be the SWADE accent color.
 
 # 1.11.22
 
 - (Refinement) Updated the wrapping-behavior of long in-character and player names. In general more stuff should avoid reflowing.
-- (System) Added experimental compatability with SWADE. Lots of stuff expected to work not-quite-right.
+- (SWADE) Added experimental compatability with SWADE. Lots of stuff expected to work not-quite-right.
 
 # 1.11.21
 

diff --git a/languages/en.json b/languages/en.json
@@ -14,6 +14,7 @@
       "disabled": "Disabled"
     },
     "settings": {
+      "reset-changes": "Reset Changes",
       "theme": {
         "name": "Theme Settings",
         "label": "Configure Theme Settings",

diff --git a/modules/consts.js b/modules/consts.js
@@ -31,7 +31,9 @@ export const baseThemeApplications = [...baseThemeCoreFoundryApplications,...bas
 export const darkThemeCompatibleApplications = [...darkThemeCompatibleCoreFoundryApplications, ...darkThemeCompatibleModuleApplications, ...darkThemeCompatiblePf2eApplications, ...dorakoUiApplications]
 
 // prettier-ignore
-export const premiumModuleSelector = ".pf2e-av, .gatewalkers-wrapper, .gatewalkers, .outlaws-wrapper, .outlaws, .bloodlords-wrapper, .bloodlords, .kingmaker-wrapper, .kingmaker"; //
+export const premiumModuleSelector = ".swpf-sheet, .swpf-wrapper, .pf2e-av, .gatewalkers-wrapper, .gatewalkers, .outlaws-wrapper, .outlaws, .bloodlords-wrapper, .bloodlords, .kingmaker-wrapper, .kingmaker"; //
+// SWPFSheet
+// SWPFJournalSheet
 
 // CLASSES
 export class Avatar {

diff --git a/modules/message-hooks.js b/modules/message-hooks.js
@@ -464,14 +464,13 @@ function addAvatarsToFlags(message) {
     game.modules.get("combat-tracker-images")?.active && message.actor
       ? message.actor.getFlag("combat-tracker-images", "trackerImage")
       : null;
-  let actorImg = message.actor?.img;
-  let tokenImg = message.token?.texture.src;
+  let speaker = message.speaker;
+  const token = game.scenes.get(speaker.scene)?.tokens.get(speaker.token);
+  let tokenImg = token?.texture.src;
+  const actor = game.actors.get(speaker.actor);
+  let actorImg = actor?.img;
   let userImg = message.user?.avatar;
 
-  // console.log(message.token);
-  // console.log(message.token?.texture);
-  // console.log(message.token?.texture.src);
-
   let userAvatar = new Avatar(message.speaker.alias, userImg);
 
   let combatantAvatar = combatantImg ? new CombatantAvatar(message.speaker.alias, combatantImg) : null;
@@ -480,12 +479,7 @@ function addAvatarsToFlags(message) {
 
   let tokenAvatar = null;
   if (tokenImg) {
-    tokenAvatar = new TokenAvatar(
-      message.speaker.alias,
-      tokenImg,
-      message.token.texture.scaleX,
-      message.actor.size == "sm"
-    );
+    tokenAvatar = new TokenAvatar(message.speaker.alias, tokenImg, token.texture.scaleX, actor.size == "sm");
   }
 
   message.updateSource({

diff --git a/sass/_messages-dark.scss b/sass/_messages-dark.scss
@@ -2,6 +2,10 @@
 @import "colors";
 @import "mixins";
 
+.dorako-ui.message.chat-message.spell {
+  padding-bottom: 3px;
+}
+
 /* ----------------------------------------- */
 /* Glassy Buttons                            */
 /* ----------------------------------------- */

diff --git a/sass/_messages.scss b/sass/_messages.scss
@@ -56,6 +56,7 @@
     max-width: 160px;
     text-overflow: ellipsis;
     overflow: hidden;
+    white-space: nowrap;
   }
 
   .portrait-and-name {

diff --git a/sass/foundry/_controls.scss b/sass/foundry/_controls.scss
@@ -25,7 +25,7 @@ nav#controls.dorako-ui {
       margin-bottom: 8px;
 
       img {
-        filter: sepia() brightness(0.8) drop-shadow(0px 0px 3px black);
+        filter: sepia() grayscale(0.9) brightness(0.8) drop-shadow(0px 0px 3px black);
       }
 
       &.active,

diff --git a/sass/foundry/_sidebar.scss b/sass/foundry/_sidebar.scss
@@ -26,6 +26,8 @@ section.chat-sidebar {
 
 #chat-log {
   margin-left: 4px;
+  display: flex;
+  flex-direction: column;
   li.dorako-ui:first-child {
     margin-top: 2px;
   }
@@ -84,13 +86,15 @@ section.chat-sidebar {
 .dorako-ui {
   #chat-controls {
     margin: 0px 5px;
+    gap: 5px;
 
     i.fas {
       line-height: 24px; // center-aligns icons
     }
 
     .roll-type-select {
       margin-left: 0px;
+      margin-right: 0px;
     }
   }
 }
diff --git a/sass/module/_damage-log.scss b/sass/module/_damage-log.scss
@@ -33,3 +33,30 @@ nav.damage-log-nav.tabs {
     }
   }
 }
+
+#damage-log {
+  margin-left: 4px;
+}
+
+.dorako-ui {
+  /* Styling for damage messages */
+  &.message.damage-log.damage {
+    background-color: #ffd9d9;
+    background-blend-mode: luminosity;
+  }
+  /* Styling for healing messages */
+  &.message.damage-log.healing {
+    background-color: #d9ffd9;
+    background-blend-mode: luminosity;
+  }
+  /* Dim reverted damage */
+  &.message.damage-log.reverted.damage {
+    background-color: #ffeaea;
+    background-blend-mode: luminosity;
+  }
+  /* Dim reverted healing */
+  &.message.damage-log.reverted.healing {
+    background-color: #eaffea;
+    background-blend-mode: luminosity;
+  }
+}
diff --git a/sass/module/_monks.scss b/sass/module/_monks.scss
@@ -586,3 +586,70 @@ section.readaloud {
   border-image: linear-gradient(90deg, #f1edea, #d5cac1) 1 repeat;
   border-width: 0 0 1px;
 }
+
+/* ----------------------------------------- */
+/* Monk's Scene Navigation                   */
+/* ----------------------------------------- */
+
+body.compact-ui #navigation .monks-scene-navigation #nav-toggle {
+  display: unset;
+}
+
+#navigation .nav-item-container {
+  @include glass;
+}
+
+#navigation .monks-scene-navigation .scene-list > li a {
+  @include glass;
+}
+
+#navigation .monks-scene-navigation .scene-list > li {
+  a {
+    @include glass;
+    @include quick-transition;
+    text-shadow: 0px 0px 3px black;
+    color: var(--color-text-light-heading);
+    &:hover {
+      background-color: var(--primary);
+      color: var(--color-text-light-heading-highlight);
+    }
+  }
+
+  &.view a {
+    background-color: var(--primary);
+    color: var(--color-text-light-heading-highlight);
+
+    &:hover {
+      background-color: var(--primary-light);
+      color: white;
+    }
+  }
+
+  &.gm a {
+    background-color: var(--secondary);
+    color: var(--color-text-light-heading-highlight);
+
+    &:hover {
+      background-color: var(--secondary-light);
+      color: white;
+    }
+  }
+  &.gm.view a {
+    background-color: var(--secondary-light);
+    color: white;
+  }
+}
+#navigation .monks-scene-navigation .scene-list > li.view a,
+#navigation .monks-scene-navigation .scene-list > li.context a {
+  box-shadow: var(--glassy);
+  border: none;
+}
+
+#navigation .monks-scene-navigation .scene-list > li.active a {
+  @include glass;
+  box-shadow: var(--gold-and-glow), var(--glassy);
+}
+
+#navigation.background .monks-scene-navigation .scene-list {
+  @include glass;
+}
diff --git a/sass/module/_target-damage.scss b/sass/module/_target-damage.scss
@@ -2,6 +2,44 @@
 /* PF2e Target Damage                        */
 /* ----------------------------------------- */
 
+.dorako-ui.message.chat-message .message-content .pf2e.chat-card .card-buttons .save.pf2e-td {
+  &.criticalSuccess {
+    $color: rgb(0, 128, 0);
+    background-color: $color;
+    &:hover {
+      background-color: $color;
+      box-shadow: 0px 0px 1px 1px var(--tertiary) inset, 0px 0px 5px $color;
+    }
+  }
+
+  &.success {
+    $color: rgb(0, 0, 255);
+    background-color: $color;
+    &:hover {
+      background-color: $color;
+      box-shadow: 0px 0px 1px 1px var(--tertiary) inset, 0px 0px 5px $color;
+    }
+  }
+
+  &.failure {
+    $color: rgb(255, 69, 0);
+    background-color: $color;
+    &:hover {
+      background-color: $color;
+      box-shadow: 0px 0px 1px 1px var(--tertiary) inset, 0px 0px 5px $color;
+    }
+  }
+
+  &.criticalFailure {
+    $color: rgb(255, 0, 0);
+    background-color: $color;
+    &:hover {
+      background-color: $color;
+      box-shadow: 0px 0px 1px 1px var(--tertiary) inset, 0px 0px 5px $color;
+    }
+  }
+}
+
 .chat-message .message-content .pf2e-td.damage-application button .label {
   font-size: var(--font-size-8);
 }
@@ -26,6 +64,10 @@ wrapper.pf2e-td.name-top .pf2e-td.name {
     display: none !important; // inline style overwrite
   }
 
+  .spell-button.pf2e-td.target-button {
+    @include glass;
+  }
+
   button.small-button.pf2e-td {
     @include glass;
     @include quick-transition;

diff --git a/styles/dorako-ui.css b/styles/dorako-ui.css
diff --git a/styles/dorako-ui.css.map b/styles/dorako-ui.css.map