Encounter blocks come to MEJ! Yes, I know there's an Encounter page t…

…ype. I was asked for the inline block for more diverse usage.
AmazingVanish · Feb 10, 2022 · 4d41395 · 4d41395
1 parent f09de24
commit 4d41395
Show file tree

Hide file tree

Showing 6 changed files with 93 additions and 37 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,12 +1,21 @@
 # RELEASE NOTES
 
-## Version 1.3.0 - Toolbar and Font sizes
+## 1.3.1 - Encounters
 
-**FIXED**
+**ADDED**
 
--   Remove the separators from the toolbar to prevent TinyMCE from truncating. This prevents the persistent display of the toolbar when closing the journal dialog (Thanks SecretSquirrel77)
--   Read Aloud icon was using the same class as DFred's Effects Panel. Shame on us both for not namespacing. (Thanks weepingminotaur)
-    -   NOTE: Prior entries of the Read Aloud block will NOT be rendered correctly. Sorry. Just copy your contents, delete the block, re-add it, and paste in your content
+-   Encounter blocks come to MEJ! Yes, I know there's an Encounter page type. I was asked for the inline block for more diverse usage.
+
+**CHANGED**
+
+-   Variable Tweaks
+-   All blocks: format tweaks
+
+## 1.3.0 - Toolbar and Font sizes
+
+**ADDED**
+
+-   Colored the journal tabs, nav items, buttons, and sidebar elements (made the active tab stand out more)
 
 **CHANGED**
 
@@ -19,28 +28,31 @@
 -   Ensured compatibility with Warhammer Fantasy 4e
 -   MOAR VARIABLES
 
-**ADDED**
+**FIXED**
 
--   Colored the journal tabs, nav items, buttons, and sidebar elements (made the active tab stand out more)
+-   Remove the separators from the toolbar to prevent TinyMCE from truncating. This prevents the persistent display of the toolbar when closing the journal dialog (Thanks SecretSquirrel77)
+-   Read Aloud icon was using the same class as DFred's Effects Panel. Shame on us both for not namespacing. (Thanks weepingminotaur)
+    -   NOTE: Prior entries of the Read Aloud block will NOT be rendered correctly. Sorry. Just copy your contents, delete the block, re-add it, and paste in your content
 
-## Version 1.2.5 - Warhammer 4e Compatibility
+## 1.2.5 - Warhammer 4e Compatibility
 
 **CHANGED**
 
 -   Modified the way I style some interface elements in Monk's Enhanced Journal to apply ONLY to the DND5e system
 -   Modified the text in tabs to be black instead of white so they show up correctly in Warhmmer Fantasy 4e (Thanks Sasmira)
 
-## Version 1.2.1 - Spacing Fix
+## 1.2.1 - Spacing Fix
 
 **CHANGED**
 
 -   Add paragrpah tags at the end of all templates so the user can continue to work below them easily.
 
-## Version 1.2.0 - Parchment Setting
+## 1.2.0 - Parchment Setting
 
-**FIXED**
+**ADDED**
 
--   More font naming (Thanks SecretSquirrel77 for pointing it out)
+-   Added a setting to enable/disable the parchment background (Thanks KSMI for the request)
+-   Added localization for the settings panel
 
 **CHANGED**
 
@@ -49,16 +61,11 @@
 -   Modified the names of the Stylish Text to be more in line with standard naming conventions (Thanks weepingminotaur for the idea)
 -   Removed size settings for the Stylish Text to prepare for future changes and consistency
 
-**ADDED**
-
--   Added a setting to enable/disable the parchment background (Thanks KSMI for the request)
--   Added localization for the settings panel
-
-## Version 1.1.0 - More Stylings
+**FIXED**
 
-**CHANGED**
+-   More font naming (Thanks SecretSquirrel77 for pointing it out)
 
--   Tweak box shadows
+## 1.1.0 - More Stylings
 
 **ADDED**
 
@@ -68,7 +75,11 @@
 -   Styled item bars
 -   Stlyed background of Enhanced entry icons boxes
 
-## Version 1.0.0 - Initial Public Release
+**CHANGED**
+
+-   Tweak box shadows
+
+## 1.0.0 - Initial Public Release
 
 **ADDED**
 

diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # Arius Planeswalker's Stylish Journal for Monk's Enhanced Journal
 
-![All Releases Downloads](https://img.shields.io/github/downloads/AmazingVanish/apsj4mej/total?logo=GitHub) ![Latest Release Downloads](https://img.shields.io/github/downloads/AmazingVanish/apsj4mej/latest/total) ![Forge Installs](https://img.shields.io/badge/dynamic/json?color=red&label=Forge%20Installs&query=package.installs&suffix=%25&url=https%3A%2F%2Fforge-vtt.com%2Fapi%2Fbazaar%2Fpackage%2Fapsj4mej) [![Endorsements](https://img.shields.io/endpoint?logoColor=white&url=https%3A%2F%2Fwww.foundryvtt-hub.com%2Fwp-json%2Fhubapi%2Fv1%2Fpackage%2Fapsj4mej%2Fshield%2Fendorsements)](https://www.foundryvtt-hub.com/package/df-architect/) ![GitHub Release (latest by date)](https://img.shields.io/github/v/release/AmazingVanish/apsj4mej) ![Issues](https://img.shields.io/github/issues/AmazingVanish/apsj4mej) ![Foundry](https://img.shields.io/endpoint?url=https://foundryshields.com/version?url=https://raw.githubusercontent.com/AmazingVanish/apsj4mej/master/module.json&color=ff6400) [![Discord Server](https://img.shields.io/badge/-Discord-%232c2f33?style=flat-square&logo=discord)](https://discord.gg/ge9GJXDsM2)
+![All Releases Downloads](https://img.shields.io/github/downloads/AmazingVanish/apsj4mej/total?logo=GitHub) ![Latest Release Downloads](https://img.shields.io/github/downloads/AmazingVanish/apsj4mej/latest/total?logo=GitHub) ![GitHub Release (latest by date)](https://img.shields.io/github/v/release/AmazingVanish/apsj4mej?logo=GitHub) ![Issues](https://img.shields.io/github/issues/AmazingVanish/apsj4mej?logo=GitHub) ![Forge Installs](https://img.shields.io/badge/dynamic/json?color=green&label=Forge%20Installs&query=package.installs&suffix=%25&url=https%3A%2F%2Fforge-vtt.com%2Fapi%2Fbazaar%2Fpackage%2Fapsj4mej) [![Endorsements](https://img.shields.io/endpoint?logoColor=white&url=https%3A%2F%2Fwww.foundryvtt-hub.com%2Fwp-json%2Fhubapi%2Fv1%2Fpackage%2Fapsj4mej%2Fshield%2Fendorsements)](https://www.foundryvtt-hub.com/package/df-architect/) ![Foundry](https://img.shields.io/endpoint?url=https://foundryshields.com/version?url=https://raw.githubusercontent.com/AmazingVanish/apsj4mej/master/module.json&color=ff6400) ![License](https://img.shields.io/github/license/AmazingVanish/apsj4mej) [![Discord Server](https://img.shields.io/badge/-Discord-%232c2f33?logo=discord)](https://discord.gg/ge9GJXDsM2)
 
 ## Arius Planeswalker Presents Stylish Journal for Monk's Enhanced Journal
 

diff --git a/media/apsj4mej-ss.webp b/media/apsj4mej-ss.webp
diff --git a/module.json b/module.json
@@ -6,7 +6,7 @@
     "library": "false",
     "manifestPlusVersion": "1.2.0",
     "minimumCoreVersion": "9",
-    "compatibleCoreVersion": "9.248",
+    "compatibleCoreVersion": "9.249",
     "author": "Vanish",
     "authors": [
         {

diff --git a/scripts/apsj4mej.js b/scripts/apsj4mej.js
@@ -188,6 +188,27 @@ Hooks.on('ready', () => {
 		<p class="dnd-data">The body of the Bnus message.</p>
 	</main>
 </section>
+<p class="dnd-text"></p>`,
+        },
+        {
+            title: 'Block: Encounter',
+            description:
+                'A stylish block for displaying encounter data and descrptions.',
+            content: `
+<section class="block encounter">
+	<header><h1 class="dnd-title">Encounter!</h1></header>
+	<div class="block-contents">
+		<main class="light-overlay">
+			<h2 class="dnd-heading">Description</h2>
+			<p class="dnd-text">Enter a detailed description of the environment and scenario here to read to the players.</p>
+			<p class="dnd-text">Drag Actor tokens from your compendium into the Adversaries list on the right for easy setup of the encounter.</p>
+		</main>
+		<aside class="red-overlay">
+			<h2 class="dnd-heading">Adversaries</h2>
+			<p class="dnd-data"></p>
+		</aside>
+	</div>
+</section>
 <p class="dnd-text"></p>`,
         },
         {

diff --git a/styles/apsj4mej.css b/styles/apsj4mej.css
@@ -1,5 +1,11 @@
+/*
+  APSJ Variables
+*/
+
 :root {
     --color-apsj-primary: rgb(128, 0, 0);
+    --color-apsj-background-primary: rgba(128, 0, 0, 0.75);
+    --color-apsj-border-primary: rgb(160, 0, 0);
 
     --color-apsj-light-0: rgb(255, 255, 255);
     --color-apsj-light-1: rgb(238, 238, 238);
@@ -18,7 +24,7 @@
     --color-apsj-dark-1: rgb(17, 17, 17);
     --color-apsj-dark-0: rgb(0, 0, 0);
 
-    --color-apsj-background-primary: rgba(128, 0, 0, 0.75);
+    --color-apsj-background-warning: rgba(128, 0, 0, 0.75);
     --color-apsj-background-info: rgba(57, 90, 150, 0.75);
     --color-apsj-background-note: rgba(214, 150, 0, 0.75);
     --color-apsj-background-bonus: rgba(101, 155, 0, 0.75);
@@ -39,7 +45,24 @@
     --color-apsj-background-dark-1: rgba(17, 17, 17, 0.75);
     --color-apsj-background-dark-0: rgba(0, 0, 0, 0.75);
 
-    --color-apsj-border-primary: rgb(160, 0, 0);
+    --color-apsj-background-light-50: rgba(255, 255, 255, 0.5);
+    --color-apsj-background-light-51: rgba(238, 238, 238, 0.5);
+    --color-apsj-background-light-52: rgba(221, 221, 221, 0.5);
+    --color-apsj-background-light-53: rgba(204, 204, 204, 0.5);
+    --color-apsj-background-light-54: rgba(187, 187, 187, 0.5);
+    --color-apsj-background-light-55: rgba(170, 170, 170, 0.5);
+    --color-apsj-background-light-56: rgba(153, 153, 153, 0.5);
+    --color-apsj-background-light-57: rgba(136, 136, 136, 0.5);
+    --color-apsj-background-dark-57: rgba(119, 119, 119, 0.5);
+    --color-apsj-background-dark-56: rgba(102, 102, 102, 0.5);
+    --color-apsj-background-dark-55: rgba(85, 85, 85, 0.5);
+    --color-apsj-background-dark-54: rgba(68, 68, 68, 0.5);
+    --color-apsj-background-dark-53: rgba(51, 51, 51, 0.5);
+    --color-apsj-background-dark-52: rgba(34, 34, 34, 0.5);
+    --color-apsj-background-dark-51: rgba(17, 17, 17, 0.5);
+    --color-apsj-background-dark-50: rgba(0, 0, 0, 0.5);
+
+    --color-apsj-border-warning: rgb(160, 0, 0);
     --color-apsj-border-info: rgb(110, 150, 200);
     --color-apsj-border-note: rgb(246, 190, 7);
     --color-apsj-border-bonus: rgb(138, 211, 4);
@@ -202,6 +225,7 @@ a.content-link,
 a.inline-roll {
     font-family: var(--font-apsj-scalysans);
     font-weight: 700;
+    border: 1px solid var(--color-apsj-primary) !important;
     border-radius: 0.35em !important;
     background: linear-gradient(
         var(--color-apsj-background-light-0),
@@ -404,8 +428,8 @@ a.inline-roll i {
 }
 
 .panel.warning {
-    background: var(--color-apsj-background-primary);
-    border: 2px solid var(--color-apsj-border-primary);
+    background: var(--color-apsj-background-warning);
+    border: 2px solid var(--color-apsj-border-warning);
 }
 
 .panel.warning::before {
@@ -463,6 +487,14 @@ a.inline-roll i {
     text-shadow: 1px 1px 2px var(--color-apsj-dark-0) !important;
 }
 
+.block.encounter {
+    border: 2px solid var(--color-apsj-primary);
+    border-radius: 0.5em;
+    background: url('../assets/parchment-bloody.webp') no-repeat;
+    background-size: cover;
+    box-shadow: 0 0 3px var(--color-shadow-dark);
+}
+
 .block.magic-item {
     color: var(--color-apsj-light-0) !important;
     border: 2px solid var(--color-apsj-border-info) !important;
@@ -505,7 +537,6 @@ a.inline-roll i {
 .block.magic-item a.content-link i,
 .block.magic-item a.inline-roll i {
     color: var(--color-apsj-background-light-0) !important;
-    text-shadow: 1px 1px 2px var(--color-apsj-dark-0) !important;
 }
 
 .block.magic-item a:hover {
@@ -536,13 +567,6 @@ a.inline-roll i {
     content: '\f4ad';
 }
 
-.block.read-aloud a.entity-link,
-.block.read-aloud a.content-link,
-.block.read-aloud a.inline-roll {
-    border: 1px solid var(--color-apsj-primary) !important;
-    font-family: var(--font-apsj-scalysans) !important;
-}
-
 .red-overlay {
     margin: 0;
     padding: 10px;
@@ -565,8 +589,8 @@ a.inline-roll i {
     margin: 0;
     padding: 10px;
     background: linear-gradient(
-        var(--color-apsj-background-light-0),
-        var(--color-apsj-background-dark-4)
+        var(--color-apsj-background-light-50),
+        var(--color-apsj-background-dark-54)
     );
     border: 2px solid var(--color-apsj-primary);
     border-radius: 0.5em;