2.10.7

Dorako · Oct 17, 2023 · c3265e7 · c3265e7
1 parent bf97fb3
commit c3265e7
Show file tree

Hide file tree

Showing 13 changed files with 227 additions and 65 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+# 2.10.7
+
+- (Refinement) Added Foundry 2 styling for Vehicle sheet.
+- (Refinement) Vehicle sheet now respects PC sheet color theme setting.
+
 # 2.10.6
 
 - (Refinement) Added Foundry 2 styling for PC sheets and Kingdom sheets. All sheets should now be styled.

diff --git a/languages/en.json b/languages/en.json
@@ -58,7 +58,7 @@
         },
         "pc-sheet-theme": {
           "name": "PC sheet theme",
-          "hint": "Affects player sheets",
+          "hint": "Affects sheets for player characters and vehicles",
           "choice": {
             "red": "Original Red",
             "green": "Remaster Green",

diff --git a/modules/base-theme-hooks.js b/modules/base-theme-hooks.js
@@ -164,11 +164,13 @@ Hooks.on("renderHazardSheetPF2e", (app, html, data) => {
   html.find("input").addClass("dorako-ui-skip");
 });
 
-Hooks.on("renderCharacterSheetPF2e", (app, html, data) => {
-  const theme = game.settings.get("pf2e-dorako-ui", "theme.pc-sheet-theme");
-  html.closest(".app").find(".journal-entry-content").addClass("dorako-ui dark-theme");
-  html[0].classList.add(`${theme}-theme`);
-});
+for (const appName of [..."CharacterSheetPF2e", "VehicleSheetPF2e"]) {
+  Hooks.on("render" + appName, (app, html, data) => {
+    const theme = game.settings.get("pf2e-dorako-ui", "theme.pc-sheet-theme");
+    // html.closest(".app").find(".journal-entry-content").addClass("dorako-ui dark-theme");
+    html[0].classList.add(`${theme}-theme`);
+  });
+}
 
 // Re-organize NPC sheets, do not apply base styling to selects or input fields
 Hooks.on("renderNPCSheetPF2e", (app, html, data) => {

diff --git a/modules/consts.js b/modules/consts.js
@@ -19,7 +19,7 @@ export const exclusivelyDarkApplications = ["FABattlemaps", "FADownloader"]
 // prettier-ignore
 export const baseThemeCoreFoundryApplications = ["ImagePopout","SceneControls", "SidebarTab", "PlayerList", "HeadsUpDisplay", "Notifications", "TokenHUD", "Sidebar","SceneNavigation", "Hotbar"];
 // prettier-ignore
-export const baseThemePf2eApplications = ["HotbarPF2e", "EffectsPanel", "SceneDarknessAdjuster"]; // "JournalSheetPF2e",
+export const baseThemePf2eApplications = ["VehicleSheetPF2e","HotbarPF2e", "EffectsPanel", "SceneDarknessAdjuster"]; // "JournalSheetPF2e",
 // prettier-ignore
 // export const baseThemePf2eSheets = ["ItemSheet","ActorSheet","LootSheetPF2e"]; //"FamiliarSheetPF2e","HazardSheetPF2e"
 export const baseThemePf2eSheets = ["KingdomSheetPF2e","CreatureSheetPF2e","PartySheetPF2e","SpellPreparationSheet","ItemSheet","NPCSheetPF2e","VehicleSheetPf2e","FamiliarSheetPF2e","HazardSheetPF2e", "CharacterSheetPF2e","LootSheetPF2e"]; //|| "ItemSheet","ActorSheet"

diff --git a/modules/foundry2-theme.js b/modules/foundry2-theme.js
@@ -88,7 +88,7 @@ for (const app of [...baseThemePf2eSheets]) {
   });
 }
 
-for (const app of ["CharacterSheetPF2e"]) {
+for (const app of ["CharacterSheetPF2e", "VehicleSheetPF2e"]) {
   Hooks.on("render" + app, (app, html, data) => {
     const theme = game.settings.get("pf2e-dorako-ui", "theme.application-theme");
     if (theme !== "foundry2-theme") return;

diff --git a/sass/_mixins.scss b/sass/_mixins.scss
@@ -156,7 +156,7 @@
   align-items: center;
   height: var(--input-height);
   line-height: var(--input-height);
-  padding: 0 0.5rem;
+  padding: 0 0.3rem;
   border-radius: 4px;
   outline: 1px solid transparent;
   user-select: text;

diff --git a/sass/foundry/_foundry2.scss b/sass/foundry/_foundry2.scss
@@ -617,9 +617,9 @@
 
   .tags .tag.tag_transparent,
   .tags .tag option.tag_transparent {
-    // box-shadow: inset 0 0 0 1px var(--color-cool-4);
-    box-shadow: unset;
+    box-shadow: 0px 0px 0px 1px rgba(255, 255, 255, 0.2) inset;
     background: var(--color-cool-4);
+    color: var(--color-light-3);
   }
 
   &.pf2e.item.sheet form .sheet-content input[type="text"],

diff --git a/sass/pf2e/_actor-sheet.scss b/sass/pf2e/_actor-sheet.scss
@@ -226,11 +226,12 @@
 .dorako-ui {
   &.actor.sheet.green-theme {
     .crb-style {
-      --header: url("../img/green-header.webp");
-      background-image: url("../img/green-header.webp"), var(--sheet);
+      --header: url("/modules/pf2e-dorako-ui/img/green-header.webp");
+      background-image: url("/modules/pf2e-dorako-ui/img/green-header.webp"), var(--sheet);
 
       aside {
-        background-image: url("../img/green-sidebar-top.webp"), url("../img/green-sidebar-bottom.webp");
+        background-image: url("/modules/pf2e-dorako-ui/img/green-sidebar-top.webp"),
+          url("/modules/pf2e-dorako-ui/img/green-sidebar-bottom.webp");
         .logo {
           filter: grayscale(0.6);
         }
@@ -245,7 +246,7 @@
             background-color: var(--remaster);
           }
           .armor-class .shield.hp {
-            background: url("../img/blue-shield.webp") no-repeat top center;
+            background: url("/modules/pf2e-dorako-ui/img/blue-shield.webp") no-repeat top center;
           }
           .initiative-select select {
             background-color: var(--remaster);
@@ -254,27 +255,28 @@
       }
 
       header.char-header .char-level .level {
-        background: url("../img/blue-level-badge.webp") no-repeat;
+        background: url("/modules/pf2e-dorako-ui/img/blue-level-badge.webp") no-repeat;
       }
 
       nav.sheet-navigation {
         background: var(--remaster-light);
 
         .item:hover,
         .item.active {
-          background-image: url("../img/green-nav-item.webp");
+          background-image: url("/modules/pf2e-dorako-ui/img/green-nav-item.webp");
         }
       }
     }
   }
 
   &.actor.sheet.blue-theme {
     .crb-style {
-      --header: url("../img/blue-header.webp");
-      background-image: url("../img/blue-header.webp"), var(--sheet);
+      --header: url("/modules/pf2e-dorako-ui/img/blue-header.webp");
+      background-image: url("/modules/pf2e-dorako-ui/img/blue-header.webp"), var(--sheet);
 
       aside {
-        background-image: url("../img/blue-sidebar-top.webp"), url("../img/blue-sidebar-bottom.webp");
+        background-image: url("/modules/pf2e-dorako-ui/img/blue-sidebar-top.webp"),
+          url("/modules/pf2e-dorako-ui/img/blue-sidebar-bottom.webp");
         .logo {
           filter: grayscale(0.6);
         }
@@ -289,7 +291,7 @@
             background-color: var(--secondary);
           }
           .armor-class .shield.hp {
-            background: url("../img/blue-shield.webp") no-repeat top center;
+            background: url("/modules/pf2e-dorako-ui/img/blue-shield.webp") no-repeat top center;
           }
           .initiative-select select {
             background-color: var(--secondary);
@@ -298,15 +300,15 @@
       }
 
       header.char-header .char-level .level {
-        background: url("../img/blue-level-badge.webp") no-repeat;
+        background: url("/modules/pf2e-dorako-ui/img/blue-level-badge.webp") no-repeat;
       }
 
       nav.sheet-navigation {
         background: var(--secondary-light);
 
         .item:hover,
         .item.active {
-          background-image: url("../img/blue-nav-item.webp");
+          background-image: url("/modules/pf2e-dorako-ui/img/blue-nav-item.webp");
         }
       }
     }

diff --git a/sass/pf2e/_npc-sheet.scss b/sass/pf2e/_npc-sheet.scss
@@ -264,6 +264,22 @@
   }
 }
 
+.pf2e-see-simple-scale-statistics-High-color-primary {
+  color: #3cff00;
+}
+
+.pf2e-see-simple-scale-statistics-Moderate-color-primary {
+  color: #ffff54;
+}
+
+.pf2e-see-simple-scale-statistics-Low-color-primary {
+  color: #ff8000;
+}
+
+.pf2e-see-simple-scale-statistics-Terrible-color-primary {
+  color: #ff0000;
+}
+
 /* Glassy */
 
 .dorako-ui.sheet.pf2e.actor.npc.glassy-theme {

diff --git a/sass/pf2e/foundry2/_actor-sheet.scss b/sass/pf2e/foundry2/_actor-sheet.scss
@@ -6,27 +6,27 @@
 
   &.sheet nav.sheet-tabs .item {
     @include f2-button-warm;
-    // &.disabled {
-    //   border-color: var(--color-warm-4);
-    //   background: var(--color-cool-5);
-    //   color: var(--color-light-5);
-    //   &:hover {
-    //     border-color: var(--color-warm-3);
-    //     background: var(--color-cool-4);
-    //     color: var(--color-light-4);
-    //   }
-    // }
   }
 
   .tags.paizo-style .tag.rarity.common,
   .tags.paizo-style .tag.rarity[value="common"],
   .tags.paizo-style .tag.rarity > option[value="common"] {
     --input-text-color: black;
   }
+
+  &.pf2e.actor form .tag-legacy {
+    background: var(--color-cool-4);
+    border: unset;
+    box-shadow: 0px 0px 0px 1px rgba(255, 255, 255, 0.2) inset;
+  }
 }
 
 .foundry2-pc,
 .foundry2 {
+  .tags {
+    --color-rarity-common: #323232;
+  }
+
   .currency li > button {
     @include f2-button-warm;
   }

diff --git a/sass/pf2e/foundry2/_npc-sheet.scss b/sass/pf2e/foundry2/_npc-sheet.scss
@@ -5,6 +5,7 @@
     --primary: var(--color-warm-2);
     --secondary: var(--color-cool-2);
   }
+
   &.actor.npc.sheet form .sheet-body .section-container {
     @include f2-app;
     padding: unset;
@@ -22,8 +23,12 @@
     }
   }
 
+  &.actor.npc.sheet form .notes .notes-section.publication .notes-text input[type="text"] {
+    @include f2-input;
+  }
+
   &.actor.npc.sheet form .side-bar-section.initiative select {
-    background: var(--color-cool-4);
+    @include f2-input;
   }
 
   &.actor.npc.sheet form .sheet-body .actions-list li.action:not(:last-child),
@@ -48,4 +53,14 @@
     color: black;
     text-shadow: unset;
   }
+
+  &.app.npc-skills-editor form ol li.skill:nth-child(even) {
+    background-color: color-mix(in srgb, var(--color-cool-4) 20%, transparent);
+  }
+  &.app.npc-skills-editor form ol li.skill:nth-child(odd) {
+    background-color: color-mix(in srgb, var(--color-cool-4) 40%, transparent);
+  }
+  &.app.npc-skills-editor form ol li.skill.header {
+    background-color: var(--color-warm-2);
+  }
 }