Merge pull request #338 from Rayji96/dev

Dev -> Main Merge for 4.4.0 Stable Release
Rayji96 · Jun 23, 2024 · 9b5300e · 9b5300e
2 parents 1480177 + bbab07e
commit 9b5300e
Show file tree

Hide file tree

Showing 118 changed files with 2,319 additions and 1,407 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -30,7 +30,7 @@ jobs:
                             "notes": "https://github.com/Rayji96/foundry-V5/releases/tag/${{ github.event.release.tag_name }}",
                             "compatibility": {
                                 "minimum": "11",
-                                "verified": "12.324",
+                                "verified": "12.327",
                                 "maximum": ""
                             }
                         }

diff --git a/README.md b/README.md
@@ -29,12 +29,16 @@ Replace the 1s with however many you want to roll for each type, and let the dic
 
 Bugs or feature requests created to this repository are greatly appreciate. Please use the [Issues](https://github.com/Rayji96/foundry-V5/issues) page for these!
 
-Please reach out to me at "weinerdolphin" or "veilza" on Discord with any pressing issues, I'd love to help you get your game running smoothly!
+You can also reach out to "weinerdolphin" or "veilza" on Discord, or leave a message in the #wod channel in the official Foundry Discord server, with any issues. We'd love to help you get your game running smoothly!
 
 Please check the issues list before suggesting new features.
 
 ## Credits
 
+### Core Developers
+* Lead System Developer: [Veilza]
+* Quality Assurance: [Rayji96]
+
 Huge thanks to these folks for their contributions!
 
 ### System Contributors
@@ -46,7 +50,6 @@ Huge thanks to these folks for their contributions!
 * Incredible work on dot and box counters by [erizocosmico]
 * Refactors and enhancements by [bmgraves]
 * Partial HTML, character types, migrations, bugfixes, and refactors by [Dakayl]
-* In-chat willpower rerolling, dark theme, Werewolf v5 support, and numerous other features and fixes by [Veilza]
 * Adding blood potency bonus to discipline rolls by [MarkusOzgur]
 * Various upgrades and CSS design improvements by [LorduFreeman]
 * Dicebox by [crcroberts]
@@ -107,4 +110,5 @@ Licensed WoD 5e materials will not be provided as this system is provided for pu
 [gbursson]: https://github.com/gbursson
 [MrDionysus]: https://github.com/MrDionysus
 [LorduFreeman]: https://github.com/LorduFreeman
-[Xuula]: https://github.com/Xuula
+[Xuula]: https://github.com/Xuula
+[Rayji96]: https://github.com/Rayji96
diff --git a/css/lang/de.css b/css/lang/de.css
@@ -1,4 +1,4 @@
 .de .attribute, .de .skill {
-  margin-left: 10px;
-  margin-right: 10px;
-}
+  margin-left: 15px;
+  margin-right: 15px;
+}
diff --git a/css/lang/pl.css b/css/lang/pl.css
@@ -1,4 +1,4 @@
 .pl .attribute, .pl .skill {
-  margin-left: 10px;
-  margin-right: 10px;
-}
+  margin-left: 15px;
+  margin-right: 15px;
+}
diff --git a/css/lang/ru.css b/css/lang/ru.css
@@ -1,4 +1,4 @@
 .ru .attribute, .ru .skill {
-  margin-left: 10px;
-  margin-right: 10px;
-}
+  margin-left: 15px;
+  margin-right: 15px;
+}
diff --git a/css/parts/group-sheet.css b/css/parts/group-sheet.css
@@ -34,6 +34,7 @@
 
 .group-sheet .members .group-member .actor-image img {
   margin: 0 3px;
+  cursor: pointer;
 }
 
 .group-sheet .members .group-member .sub-item {

diff --git a/css/parts/menus.css b/css/parts/menus.css
@@ -8,14 +8,22 @@
   text-align: center;
 }
 
-.wod5e-config-form.storyteller-menu .modification-row {
+.wod5e-config-form.storyteller-menu .modification-row, .wod5e-config-form.storyteller-menu .custom-row {
   margin-top: 3px;
   margin-bottom: 3px;
 }
 
-.wod5e-config-form.storyteller-menu .modification-row .mod-label {
+.wod5e-config-form.storyteller-menu .mod-label {
   font-weight: bold;
   text-align: center;
+  display: flex;
+  flex-direction: row;
+  margin-left: auto;
+  margin-right: auto;
+}
+
+.wod5e-config-form.storyteller-menu .mod-label input {
+  margin-left: 5px;
 }
 
 .wod5e-config-form.storyteller-menu .modification-row .mod-hidden {
@@ -28,13 +36,13 @@
   text-align: center;
 }
 
-.wod5e-config-form.storyteller-menu .add-mod-button {
+.wod5e-config-form.storyteller-menu .addition-button {
   border-radius: 0;
   font-weight: bold;
   letter-spacing: 0.05em;
 }
 
-.wod5e-config-form.storyteller-menu .add-mod-button:hover {
+.wod5e-config-form.storyteller-menu .addition-button:hover {
   cursor: pointer;
   outline: none;
   transition-duration: 0.3s;
@@ -43,3 +51,8 @@
 .wod5e-config-form.storyteller-menu .remove-mod-button {
   cursor: pointer;
 }
+
+.wod5e-config-form.storyteller-menu .remove-custom-button {
+  cursor: pointer;
+  margin-top: 5px;
+}
diff --git a/css/parts/resource-counters.css b/css/parts/resource-counters.css
@@ -1,3 +1,7 @@
+.wod5e .resource-value {
+  align-self: flex-end;
+}
+
 .wod5e .resource-value .resource-value-step {
   height: 14px;
   width: 14px;
@@ -152,4 +156,4 @@ span.resource-counter-step:nth-child(5n) {
 
 span.resource-counter-step:last-child {
   margin-right: 0;
-}
+}
diff --git a/css/splats/hunter-styling.css b/css/splats/hunter-styling.css
@@ -12,9 +12,10 @@
 }
 
 .wod5e.hunter-sheet.window-app .window-resizable-handle {
-  border-top: 3px double #ff9a02;
-  border-left: 3px double #ff9a02;
-  border-bottom: 1px solid #ff9a02;
+  border-top: 3px double var(--hunter-primary);
+  border-left: 3px double var(--hunter-primary);
+  border-bottom: 1px solid var(--hunter-primary);
+  border-right: 1px solid var(--hunter-primary);
   border-radius: 0;
 }
 
@@ -87,7 +88,10 @@
 }
 
 .wod5e.hunter-sheet .item-image.edge-rollable img {
-  box-shadow: inset 0 0 5px 0 red;
+    box-shadow: inset 1px 1px 4px 0 orange;
+    border: 1px solid var(--hunter-primary);
+    filter: drop-shadow(2px 2px 1px grey);
+    border-radius: 4px;
 }
 
 /* dialog.css */

diff --git a/css/splats/vampire-styling.css b/css/splats/vampire-styling.css
@@ -12,19 +12,23 @@
 }
 
 .wod5e.window-app .window-resizable-handle {
-  border-top: 3px double #ff0404;
-  border-left: 3px double #ff0404;
-  border-bottom: 1px solid #ff0404;
+  border-top: 3px double var(--vampire-primary);
+  border-left: 3px double var(--vampire-primary);
+  border-bottom: 1px solid var(--vampire-primary);
+  border-right: 1px solid var(--vampire-primary);
   border-radius: 0;
 }
 
 .fa-arrows-alt-h::before,
 .fa-left-right::before {
-    color: #ff0404;
+  color: var(--vampire-primary);
 }
 
 .item-image.power-rollable img {
-  box-shadow: inset 0 0 5px 0 #c7c7c7
+  box-shadow: inset 1px 1px 4px 0 red;
+  border: 1px solid var(--vampire-primary);
+  filter: drop-shadow(2px 2px 1px grey);
+  border-radius: 4px;
 }
 
 .wod5e .profile-img,

diff --git a/css/splats/werewolf-styling.css b/css/splats/werewolf-styling.css
@@ -12,9 +12,10 @@
 }
 
 .wod5e.werewolf-sheet.window-app .window-resizable-handle {
-  border-top: 3px double #997018;
-  border-left: 3px double #997018;
-  border-bottom: 1px solid #997018;
+  border-top: 3px double var(--werewolf-primary);
+  border-left: 3px double var(--werewolf-primary);
+  border-bottom: 1px solid var(--werewolf-primary);
+  border-right:1px solid var(--werewolf-primary);
   border-radius: 0;
 }
 
@@ -54,7 +55,10 @@
 }
 
 .wod5e.werewolf-sheet .item-image.gift-rollable img {
-  box-shadow: inset 0 0 5px 0 red;
+    box-shadow: inset 1px 1px 4px 0 rosybrown;
+    border: 1px solid var(--werewolf-primary);
+    filter: drop-shadow(2px 2px 1px grey);
+    border-radius: 4px;
 }
 
 .wod5e.werewolf-sheet .sheet-banner {

diff --git a/css/themes/dark-theme.css b/css/themes/dark-theme.css
@@ -212,14 +212,18 @@
   color: #bb1020;
 }
 
-.wod5e.item.sheet .window-content input[type="number"] {
-    color: #000;
-}
-
 .dark-theme .wod5e .actor-header h1.charname input {
   color: #faf5ed;
 }
 
+.dark-theme .wod5e.item.sheet .bonuses input {
+  color: #000;
+}
+
+.wod5e.item.sheet .window-content input[type="number"] {
+    color: #000;
+}
+
 .dark-theme .wod5e .description-content {
   background: none;
   border: 0;
@@ -245,7 +249,7 @@
   background: #121212;
 }
 
-.dark-theme textarea {
+.dark-theme .actor.sheet textarea, .dark-theme .item.sheet textarea {
   color: #FFF;
 }
 
@@ -259,3 +263,7 @@
 .dark-theme .wod5e .resource-counter .resource-counter-step[data-state="-"] {
   background-color: #f30018;
 }
+
+.dark-theme .wod5e-config-form .notes {
+  color: #FFF;
+}
diff --git a/css/wod5e.css b/css/wod5e.css
@@ -113,6 +113,7 @@
 
 .wod5e .resource-label {
     font-weight: 500;
+    position: relative;
 }
 
 .wod5e .description-content {
@@ -125,6 +126,7 @@
 .wod5e .window-content .resource-label {
     text-transform: initial;
     font-size: 1.2em;
+    text-align: left;
 }
 
 .wod5e .window-content .abilities .ability .resource-label {
@@ -306,6 +308,9 @@
 
 .wod5e.sheet.actor .window-content .skills .skill .edit-skill {
     font-size: 14px;
+    position: absolute;
+    left: -20px;
+    top: 2px;
 }
 
 .wod5e .window-content .sheet-body .tab > .resource-label {
@@ -355,7 +360,6 @@
 .wod5e .sheet-body,
 .wod5e .sheet-body .tab,
 .wod5e .sheet-body .tab .editor {
-    height: 100%;
     min-height: 160px;
 }