Dev -> Main Merge for version 4.4.3

CONTRIBUTING.md

@@ -2,9 +2,9 @@
 
 ## **Did you find a bug?**
 
-* **Ensure the bug was not already reported** by searching on GitHub under [Issues](https://github.com/WoD5E-Developers/wod5e//issues).
+* **Ensure the bug was not already reported** by searching on GitHub under [Issues](https://github.com/WoD5E-Developers/wod5e/issues).
 
-* If you're unable to find an open issue addressing the problem, [open a new one](https://github.com/WoD5E-Developers/wod5e//issues/new). Be sure to include a **title and clear description and label it as bug** and as much relevant information as possible. **Steps to reproduce or a screenshot is a must!**
+* If you're unable to find an open issue addressing the problem, [open a new one](https://github.com/WoD5E-Developers/wod5e/issues/new). Be sure to include a **title and clear description and label it as bug** and as much relevant information as possible. **Steps to reproduce or a screenshot is a must!**
 
 ## **Did you write a patch that fixes a bug?**
 

README.md

@@ -1,7 +1,7 @@
 
 # World of Darkness 5e System
 
-[![Foundry Shield 12]][Foundry URL]
+[![Foundry Version Support]][System URL]
 [![MIT License]][MIT URL]
 [![GitHub Super-Linter]][Super-Linter URL]
 
@@ -27,7 +27,7 @@ Replace the 1s with however many you want to roll for each type, and let the dic
 
 ## Feedback
 
-Bugs or feature requests created to this repository are greatly appreciate. Please use the [Issues](https://github.com/WoD5E-Developers/wod5e//issues) page for these!
+Bugs or feature requests created to this repository are greatly appreciate. Please use the [Issues](https://github.com/WoD5E-Developers/wod5e/issues) page for these!
 
 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!
 
@@ -37,21 +37,21 @@ Please check the issues list before suggesting new features.
 
 The lead system developer is [Veilza](https://github.com/Veilza), and the original creator of the system is [Rayji96](https://github.com/Rayji96).
 
-There's lots of other people who contribute to the system, too, and you can find the full list of them down [here](./contributors.md)!
+There's lots of other people who contribute to the system, too, and you can find the full list of them down [here](https://github.com/WoD5E-Developers/.github/blob/main/contributors.md)!
 
 ## Dark Pack
 
 [![Dark Pack]][Dark Pack URL]
 
 Licensed WoD 5e materials will not be provided as this system is provided for public usage, for free. We have made every effort to keep the Dark Pack guidelines as posted at [Dark Pack Agreement].
 
-[Foundry Shield 12]: https://img.shields.io/badge/Foundry-12-informational
-[Foundry URL]: https://foundryvtt.com
+[Foundry Version Support]: https://img.shields.io/endpoint?url=https%3A%2F%2Ffoundryshields.com%2Fversion%3Fstyle%3Dplastic%26url%3Dhttps%3A%2F%2Fgithub.com%2FWoD5E-Developers%2Fwod5e%2Freleases%2Flatest%2Fdownload%2Fsystem.json
+[System URL]: https://foundryvtt.com/packages/vtm5e/
 
 [MIT License]: https://img.shields.io/badge/License-MIT-green
-[MIT URL]: https://github.com/WoD5E-Developers/wod5e//blob/main/LICENSE
+[MIT URL]: https://github.com/WoD5E-Developers/wod5e/blob/main/LICENSE
 
-[GitHub Super-Linter]: https://github.com/WoD5E-Developers/wod5e//workflows/Super-Linter/badge.svg
+[GitHub Super-Linter]: https://github.com/WoD5E-Developers/wod5e/workflows/Super-Linter/badge.svg
 [Super-Linter URL]: https://github.com/marketplace/actions/super-linter
 
 [Dark Pack]: https://s3-eu-north-1.amazonaws.com/pdx-campaign-wp-data/uploads/sites/10/2021/10/05102936/darkpack_logo2-300x300.png

css/parts/buttons.css

@@ -14,20 +14,6 @@ button:focus {
   transition-duration: 0.3s;
 }
 
-.rollable:hover,
-.rollable:focus,
-.power-rollable:hover,
-.power-rollable:focus,
-.edge-rollable:hover,
-.edge-rollable:focus,
-.gift-rollable:hover,
-.gift-rollable:focus,
-.system-rollable:hover,
-.system-rollable:focus {
-    color: #000;
-    cursor: pointer;
-}
-
 .wod5e button.rollable {
     color: #fff;
     font-family: cormorantLight, serif;
@@ -59,4 +45,18 @@ button:focus {
 
 button.lock-btn {
   border-radius: 0 0 3px 3px;
+}
+
+.rollable:hover,
+.rollable:focus,
+.power-rollable:hover,
+.power-rollable:focus,
+.edge-rollable:hover,
+.edge-rollable:focus,
+.gift-rollable:hover,
+.gift-rollable:focus,
+.system-rollable:hover,
+.system-rollable:focus {
+  cursor: pointer;
+  text-shadow: 0 0 10px #000;
 }

css/parts/locked.css

@@ -5,7 +5,9 @@
 
 /* buttons.css */
 .locked .item-delete,
-.locked .discipline-delete {
+.locked .discipline-delete,
+.locked .exceptionalskill-delete,
+.locked .power-delete {
   display: none;
 }
 
@@ -14,6 +16,7 @@
 .locked a.item-control.edge-create,
 .locked .gift-create,
 .locked .rite-create,
+.locked .power-create,
 .locked .item-edit {
   display: none;
 }

css/splats/hunter-styling.css

@@ -7,6 +7,17 @@
   border: 4px solid var(--hunter-primary);
 }
 
+.wod5e.hunter-sheet.window-app .window-header,
+.wod5e.hunter-sheet h1,
+.wod5e.hunter-sheet .flex-group-center,
+.wod5e.hunter-sheet .flex-group-left,
+.wod5e.hunter-sheet .flex-group-right,
+.wod5e.hunter-sheet .window-content nav.sheet-tabs .item.active,
+.wod5e.hunter-sheet .actor-header .resource,
+.wod5e.hunter-sheet .items-list .item {
+  border-color: var(--hunter-primary);
+}
+
 .wod5e.hunter-sheet.window-app .window-header {
   border-bottom: 4px double var(--hunter-primary);
 }
@@ -16,50 +27,36 @@
   border-left: 3px double var(--hunter-primary);
   border-bottom: 1px solid var(--hunter-primary);
   border-right: 1px solid var(--hunter-primary);
-  border-radius: 0;
 }
 
 .wod5e.hunter-sheet.window-app .fa-arrows-alt-h::before,
 .wod5e.hunter-sheet.window-app .fa-left-right::before {
-    color: #ff9a02;
+  color: #ff9a02;
 }
 
 .wod5e.hunter-sheet .window-content .sheet-body .tab > .resource-label,
-.wod5e.hunter-sheet .items-list .item-header {
+.wod5e.hunter-sheet .items-list .item-header,
+.wod5e.hunter-sheet .items-list .spc-item-header,
+.wod5e.hunter-sheet .spc-pool-header,
+.wod5e.hunter-sheet .actor-header .profile-img-zone h1 {
   color: var(--hunter-primary);
   border-color: var(--hunter-primary);
 }
 
-.wod5e.hunter-sheet h1,
-.wod5e.hunter-sheet .flex-group-center,
-.wod5e.hunter-sheet .flex-group-left,
-.wod5e.hunter-sheet .flex-group-right,
-.wod5e.hunter-sheet .window-content nav.sheet-tabs .item.active,
-.wod5e.hunter-sheet .actor-header .resource,
-.wod5e.hunter-sheet .items-list .item,
-.wod5e.hunter-sheet.window-app,
-.wod5e.hunter-sheet.window-app .window-header {
-  border-color: var(--hunter-primary);
-}
-
 .wod5e.hunter-sheet ::-webkit-scrollbar-thumb {
   background: var(--hunter-primary);
 }
 
 .wod5e.hunter-sheet .profile-img,
-.wod5e.hunter-sheet .item-image img {
+.wod5e.hunter-sheet .item-image img,
+.wod5e.hunter-sheet .sheet-banner {
   background: var(--hunter-primary);
 }
 
 .wod5e.hunter-sheet .sheet-banner {
-  background: var(--hunter-primary);
   color: #FFF;
 }
 
-.wod5e.hunter-sheet .actor-header .profile-img-zone h1 {
-  color: var(--hunter-primary);
-}
-
 .wod5e .item-header .edge .perk {
   margin-left: auto;
   margin-right: auto;
@@ -87,11 +84,18 @@
   cursor: pointer;
 }
 
+.wod5e.hunter-sheet .rollable:hover,
+.wod5e.hunter-sheet .rollable:focus,
+.wod5e.hunter-sheet .system-rollable:hover,
+.wod5e.hunter-sheet .system-rollable:focus {
+  text-shadow: 0 0 10px var(--hunter-primary);
+}
+
 .wod5e.hunter-sheet .item-image.edge-rollable img {
-    box-shadow: inset 1px 1px 4px 0 orange;
-    border: 1px solid var(--hunter-primary);
-    filter: drop-shadow(2px 2px 1px grey);
-    border-radius: 4px;
+  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 */
@@ -100,36 +104,16 @@
 }
 
 /* resource-counters.css */
-.wod5e.hunter-sheet .resource-value .resource-value-step.active {
-  background-color: var(--hunter-primary);
-}
-
-.wod5e.hunter-sheet .resource-value-static .resource-value-static-step {
-  height: 14px;
-  width: 14px;
-  border: 1px solid black;
-  display: inline-block;
-  border-radius: 50%;
-}
-
-.wod5e.hunter-sheet .resource-value-static .resource-value-static-step.active {
-  background-color: var(--hunter-primary);
-}
-
+.wod5e.hunter-sheet .resource-value .resource-value-step.active,
+.wod5e.hunter-sheet .resource-value-static .resource-value-static-step.active,
 .wod5e .cell-resource-counter .cell-resource-counter-step[data-state="-"],
-.wod5e.hunter-sheet .cell-resource-counter .cell-resource-counter-step[data-state="-"] {
-  background-color: var(--hunter-primary);
-}
-
+.wod5e.hunter-sheet .cell-resource-counter .cell-resource-counter-step[data-state="-"],
 .wod5e.hunter-sheet .resource-counter .resource-counter-step[data-state="-"],
 .wod5e.hunter-sheet .despair-box .despair-toggle.active {
   background-color: var(--hunter-primary);
 }
 
-.wod5e.hunter-sheet .despair-box {
-  margin-top: 5px;
-}
-
+.wod5e.hunter-sheet .resource-value-static .resource-value-static-step,
 .wod5e.hunter-sheet .despair-box .despair-toggle {
   height: 14px;
   width: 14px;
@@ -138,14 +122,12 @@
   cursor: pointer;
 }
 
-/* groupings.css */
-.wod5e.hunter-sheet .flex-group-center,
-.wod5e.hunter-sheet .flex-group-left,
-.wod5e.hunter-sheet .flex-group-right {
-    border: 1px solid var(--hunter-primary);
+.wod5e.hunter-sheet .despair-box {
+  margin-top: 5px;
 }
 
 /* inputs.css */
-.wod5e.hunter-sheet input, .wod5e.hunter-sheet select {
+.wod5e.hunter-sheet input,
+.wod5e.hunter-sheet select {
   border: 1px solid var(--hunter-primary);
-}
+}

css/splats/vampire-styling.css

@@ -7,6 +7,18 @@
   border: 4px solid var(--vampire-primary);
 }
 
+.wod5e.window-app .window-header,
+.wod5e .actor-header .resource,
+.wod5e .flex-group-center,
+.wod5e .flex-group-left,
+.wod5e .flex-group-right,
+.wod5e .items-list .item,
+.wod5e .items-list .item-header,
+.wod5e .spc-pool-header,
+.wod5e .window-content nav.sheet-tabs .item.active {
+  border-bottom: 1px solid var(--vampire-primary);
+}
+
 .wod5e.window-app .window-header {
   border-bottom: 4px double var(--vampire-primary);
 }
@@ -16,7 +28,6 @@
   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,
@@ -36,37 +47,19 @@
   background: var(--vampire-primary);
 }
 
-.wod5e .items-list .item {
-  border-bottom: 1px solid var(--vampire-primary);
+.wod5e .window-content .sheet-body .tab > .resource-label,
+.wod5e .actor-header .profile-img-zone h1,
+.wod5e .items-list .item-header,
+.wod5e .items-list .spc-item-header {
+  color: var(--vampire-primary);
 }
 
 .wod5e .window-content nav.sheet-tabs .item.active {
-	border-bottom: 2px solid var(--vampire-primary);
+  border-bottom: 2px solid var(--vampire-primary);
 }
 
 .wod5e .resource .resource-control:hover,
-.wod5e .resource .resource-control:focus {
-  text-shadow: 0 0 10px red;
-}
-
-.wod5e .actor-header .resource {
-  border: 1px solid var(--vampire-primary);
-}
-
-.wod5e .window-content .sheet-body .tab > .resource-label {
-  color: var(--vampire-primary);
-  border-bottom: 1px solid var(--vampire-primary);
-}
-
-.wod5e .actor-header .profile-img-zone h1 {
-  color: var(--vampire-primary);
-}
-
-.wod5e .items-list .item-header {
-  border-bottom: 1px solid var(--vampire-primary);
-  color: var(--vampire-primary);
-}
-
+.wod5e .resource .resource-control:focus,
 .wod5e .collapsible:hover,
 .wod5e .collapsible:focus {
   text-shadow: 0 0 10px red;
@@ -112,15 +105,11 @@
   cursor: pointer;
 }
 
-.rollable:hover,
-.rollable:focus,
-.power-rollable:hover,
-.power-rollable:focus,
-.edge-rollable:hover,
-.edge-rollable:focus,
-.gift-rollable:hover,
-.gift-rollable:focus {
-  text-shadow: 0 0 10px red;
+.wod5e.vampire-sheet .rollable:hover,
+.wod5e.vampire-sheet .rollable:focus,
+.wod5e.vampire-sheet .system-rollable:hover,
+.wod5e.vampire-sheet .system-rollable:focus {
+  text-shadow: 0 0 10px var(--vampire-primary);
 }
 
 /* dialog.css */
@@ -129,14 +118,8 @@
 }
 
 /* resource-counters.css */
-.wod5e .resource-value .resource-value-step.active {
-  background-color: var(--vampire-primary);
-}
-
-.wod5e .resource-value-static .resource-value-static-step.active {
-  background-color: var(--vampire-primary);
-}
-
+.wod5e .resource-value .resource-value-step.active,
+.wod5e .resource-value-static .resource-value-static-step.active,
 .wod5e .resource-counter .resource-counter-step[data-state="-"] {
   background-color: var(--vampire-primary);
 }
@@ -150,6 +133,7 @@
 
 /* inputs.css */
 .wod5e input,
-.wod5e select {
+.wod5e select,
+.wod5e input[type="number"] {
   border: 1px solid var(--vampire-primary);
 }