Skip to content

Commit a697ad4

Browse files
ironmonk88ironmonk88
committed
11.04 changes
1 parent a347e57 commit a697ad4

23 files changed

+243
-142
lines changed

‎CHANGELOG.md

+34
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,37 @@
1+
# Version 11.04
2+
3+
Fixed DC configuration in systems that don't have support for skills lists.
4+
5+
Added a setting to open the enhanced journal with the table of contents collapsed.
6+
7+
Fixed context menu option for opening outside the enhanced journal, when right clicking on a blank page.
8+
9+
Updated the Objective Display to include colour highlighting and icons. And added sorting of objectives based on status.
10+
11+
Fixed padding of ownership indication of journal entries.
12+
13+
Added a slight background highlight to polyglot text.
14+
15+
Fixed issue with GURPS system and relationship list positioning.
16+
17+
Fixed issue with background while using Ernie's Modern UI.
18+
19+
Updated the Hotbar so that opening a Journal Entry link will open Enhanced Journal sheets properly.
20+
21+
Added code to ignore conflicts between Enhanced Journal and Multiple Document Selection.
22+
23+
Fixed issue that was clearing out all the saved setting of Journal Pages.
24+
25+
Fixed issue with refreshing the Object list when the permission of the Journal Entry changes.
26+
27+
Added additional compatibility with Polyglot.
28+
29+
Updated the notes tab to use an Editor rather than just a textarea.
30+
31+
Fixed issue where offerings from an actor that no longer existed were preventing the sheet fro loading.
32+
33+
Added In Progress back to the quest sheet.
34+
135
# Version 11.03
236

337
Added Saving Thorws to the DC Config for Encounters

‎apps/dc-config.js

+8-4
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ export class DCConfig extends FormApplication {
1717
});
1818
}
1919

20-
getData(options) {
20+
static optionList() {
2121
let config = CONFIG[game.system.id.toUpperCase()];
2222
if (game.system.id == "tormenta20")
2323
config = CONFIG.T20;
@@ -33,18 +33,22 @@ export class DCConfig extends FormApplication {
3333
];
3434
if (game.system.id == "pf2e")
3535
attributeOptions.push({ id: "attribute", text: i18n("MonksTokenBar.Attribute"), groups: { perception: CONFIG.PF2E.attributes.perception } });
36-
36+
3737
attributeOptions = attributeOptions.filter(g => g.groups);
3838
for (let attr of attributeOptions) {
3939
attr.groups = duplicate(attr.groups);
4040
for (let [k, v] of Object.entries(attr.groups)) {
4141
attr.groups[k] = v?.label || v;
4242
}
43-
}
43+
}
44+
45+
return attributeOptions;
46+
}
4447

48+
getData(options) {
4549
return mergeObject(super.getData(options),
4650
{
47-
attributeOptions: attributeOptions
51+
attributeOptions: DCConfig.optionList()
4852
}, { recursive: false }
4953
);
5054
}

‎apps/enhanced-journal.js

+9-1
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,11 @@ export class EnhancedJournal extends Application {
225225
if (this.object instanceof Promise)
226226
this.object = await this.object;
227227

228-
options = mergeObject(options, game.user.getFlag("monks-enhanced-journal", `pagestate.${this.object.id}`) || {}, { overwrite: false });
228+
let defaultOptions = {
229+
collapsed: setting("start-toc-collapsed")
230+
};
231+
232+
options = mergeObject(options, mergeObject(defaultOptions, game.user.getFlag("monks-enhanced-journal", `pagestate.${this.object.id}`) || {}), { overwrite: false });
229233

230234
let contentform = $('.content > section', this.element);
231235

@@ -1452,6 +1456,10 @@ export class EnhancedJournal extends Application {
14521456
{
14531457
name: "Open outside Enhanced Journal",
14541458
icon: '<i class="fas fa-file-export"></i>',
1459+
condition: (li) => {
1460+
let tab = this.tabs.find(t => t.id == this.contextTab);
1461+
return !["blank", "folder"].includes(tab.type);
1462+
},
14551463
callback: async (li) => {
14561464
let tab = this.tabs.find(t => t.id == this.contextTab);
14571465
let document = tab.entity;

‎apps/objective-display.js

+15-1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,13 @@ export class ObjectiveDisplay extends Application {
2121
}
2222

2323
getData(options) {
24+
let icons = {
25+
inactive: "fa-ban",
26+
available: "fa-circle-plus",
27+
inprogress: "fa-circle-exclamation",
28+
completed: "fa-check",
29+
failed: "fa-xmark"
30+
}
2431
let quests = game.journal.filter(j => {
2532
if (j.pages.size != 1)
2633
return false;
@@ -30,12 +37,14 @@ export class ObjectiveDisplay extends Application {
3037
page.getFlag('monks-enhanced-journal', 'display');
3138
}).map(q => {
3239
let page = q.pages.contents[0];
40+
let status = getProperty(page, 'flags.monks-enhanced-journal.status') || (getProperty(page, 'flags.monks-enhanced-journal.completed') ? 'completed' : 'inactive');
3341
let data = {
3442
id: page.id,
3543
uuid: page.uuid,
3644
completed: page.getFlag('monks-enhanced-journal', 'completed'),
3745
status: getProperty(page, 'flags.monks-enhanced-journal.status') || (getProperty(page, 'flags.monks-enhanced-journal.completed') ? 'completed' : 'inactive'),
38-
name: page.name
46+
name: page.name,
47+
icon: icons[status]
3948
};
4049

4150
if (setting('use-objectives')) {
@@ -52,6 +61,11 @@ export class ObjectiveDisplay extends Application {
5261
}
5362

5463
return data;
64+
}).sort((a, b) => {
65+
let indexA = Object.keys(icons).findIndex(i => i == a.status);
66+
let indexB = Object.keys(icons).findIndex(i => i == b.status);
67+
68+
return indexA - indexB;
5569
});
5670

5771
return mergeObject(super.getData(options), { quests: quests } );

‎css/monks-enhanced-journal.css

+12-12
Original file line numberDiff line numberDiff line change
@@ -118,11 +118,11 @@
118118
--mej-objective-header-background: rgba(255, 255, 255, 0.2);
119119
--mej-objective-header-border: rgba(255, 255, 255, 0.3);
120120
--mej-objective-item-border: rgba(255, 255, 255, 0.2);
121-
--mej-quest-status-default: rgb(128, 128, 128);
122-
--mej-quest-status-available: rgb(47, 150, 180);
123-
--mej-quest-status-inprogress: rgb(248, 148, 6);
124-
--mej-quest-status-completed: rgb(81, 163, 81);
125-
--mej-quest-status-failed: rgb(189, 54, 47);
121+
--mej-quest-status-default: 128, 128, 128;
122+
--mej-quest-status-available: 47, 150, 180;
123+
--mej-quest-status-inprogress: 248, 148, 6;
124+
--mej-quest-status-completed: 81, 163, 81;
125+
--mej-quest-status-failed: 136, 26, 26;
126126
--mej-slideshow-add-slide: rgba(0, 0, 0, 0.2);
127127
--mej-slideshow-duration-border: rgb(0, 24, 74);
128128
--mej-slideshow-duration-background: rgba(0, 0, 0, 0.5);
@@ -757,35 +757,35 @@
757757
margin: 0 0.25em;
758758
}
759759

760-
#journal li.journalentry[status] .entry-name i,
761-
.monks-enhanced-journal .directory li.journalentry[status] .entry-name i {
760+
#journal li.journalentry[status] .entry-name > i,
761+
.monks-enhanced-journal .directory li.journalentry[status] .entry-name > i {
762762
margin-left: 6px;
763763
}
764764

765765
#journal li.journalentry[status] .entry-name,
766766
.monks-enhanced-journal .directory li.journalentry[status] .entry-name {
767-
border-left: 0.45em solid var(--mej-quest-status-default);
767+
border-left: 0.45em solid rgb(var(--mej-quest-status-default));
768768
margin-left: 0px;
769769
}
770770

771771
#journal li.journalentry[status='available'] .entry-name,
772772
.monks-enhanced-journal .directory li.journalentry[status='available'] .entry-name {
773-
border-left-color: var(--mej-quest-status-available);
773+
border-left-color: rgb(var(--mej-quest-status-available));
774774
}
775775

776776
#journal li.journalentry[status='inprogress'] .entry-name,
777777
.monks-enhanced-journal .directory li.journalentry[status='inprogress'] .entry-name {
778-
border-left-color: var(--mej-quest-status-inprogress);
778+
border-left-color: rgb(var(--mej-quest-status-inprogress));
779779
}
780780

781781
#journal li.journalentry[status='completed'] .entry-name,
782782
.monks-enhanced-journal .directory li.journalentry[status='completed'] .entry-name {
783-
border-left-color: var(--mej-quest-status-completed);
783+
border-left-color: rgb(var(--mej-quest-status-completed));
784784
}
785785

786786
#journal li.journalentry[status='failed'] .entry-name,
787787
.monks-enhanced-journal .directory li.journalentry[status='failed'] .entry-name {
788-
border-left-color: var(--mej-quest-status-failed);
788+
border-left-color: rgb(var(--mej-quest-status-failed));
789789
}
790790

791791
.directory .directory-item.journalentry .permissions {

‎css/monks-journal-sheet.css

+72-20
Original file line numberDiff line numberDiff line change
@@ -485,16 +485,18 @@ body:not(.system-pf2e) .monks-journal-sheet .sheet-container .tag {
485485
position: relative;
486486
}
487487

488-
.monks-journal-sheet .tab.notes textarea.trim-textarea {
489-
resize: none;
490-
width: calc(100% - 4px);
491-
height: calc(100% - 6px);
488+
.monks-journal-sheet .tab.notes .notes-container {
489+
overflow: auto;
492490
border: var(--mej-sheet-input-border);
493491
background: var(--mej-sheet-input-background);
494492
color: var(--mej-sheet-input-color);
495-
margin-left: 2px;
493+
border-radius: 4px;
494+
margin-bottom: 3px;
496495
}
497496

497+
.monks-journal-sheet .tab.notes .notes-container .editor-content {
498+
padding: 0px 6px;
499+
}
498500
/* Editor */
499501
.monks-journal-sheet.sheet .editor {
500502
overflow: visible;
@@ -545,7 +547,7 @@ body:not(.system-pf2e) .monks-journal-sheet .sheet-container .tag {
545547

546548
.monks-journal-sheet.sheet .editor-content .polyglot-journal {
547549
cursor: help;
548-
background-color: transparent;
550+
background-color: rgba(var(--polyglot-journal-color), 0.1);
549551
}
550552

551553
.monks-journal-sheet.sheet .editor-content .polyglot-journal:hover {
@@ -2026,15 +2028,11 @@ body:not(.system-pf2e) .monks-journal-sheet .sheet-container .tag {
20262028
}
20272029

20282030
#objective-display .window-content > ul > li {
2029-
padding: 4px;
2030-
}
2031-
2032-
#objective-display .window-content > ul > li:not(:last-child) {
20332031
border-bottom: 1px solid #fff;
2032+
cursor: pointer;
20342033
}
2035-
2036-
#objective-display .window-content > ul > li:nth-child(even) {
2037-
background-color: rgba(255, 255, 255, 0.1);
2034+
#objective-display .window-content > ul > li:first-child {
2035+
border-top: 1px solid #fff;
20382036
}
20392037

20402038
#objective-display ul ul li:before {
@@ -2062,26 +2060,80 @@ body:not(.system-pf2e) .monks-journal-sheet .sheet-container .tag {
20622060
}
20632061

20642062
#objective-display .objective-list > li[status] .quest-name {
2065-
border-bottom: 2px solid var(--mej-quest-status-default);
2063+
background-color: rgba(var(--mej-quest-status-default), 0.4);
20662064
width: 100%;
2067-
border-left: 2px solid var(--mej-quest-status-default);
2068-
padding-left: 4px;
2065+
border-left: 2px solid rgb(var(--mej-quest-status-default));
2066+
padding: 4px;
2067+
}
2068+
#objective-display .objective-list > li[status] ul {
2069+
background-color: rgba(var(--mej-quest-status-default), 0.2);
2070+
border-left: 2px solid rgb(var(--mej-quest-status-default));
2071+
margin: 0px;
2072+
padding: 4px 10px;
2073+
}
2074+
#objective-display .objective-list > li[status] ul li {
2075+
padding-left: 5px;
2076+
}
2077+
/*
2078+
#objective-display .objective-list > li[status] .quest-name i {
2079+
color: rgb(var(--mej-quest-status-default));
20692080
}
2081+
*/
20702082

20712083
#objective-display .objective-list > li[status='available'] .quest-name {
2072-
border-color: var(--mej-quest-status-available);
2084+
border-color: rgb(var(--mej-quest-status-available));
2085+
background-color: rgba(var(--mej-quest-status-available), 0.4);
2086+
}
2087+
/*
2088+
#objective-display .objective-list > li[status='available'] .quest-name i {
2089+
color: rgb(var(--mej-quest-status-available));
2090+
}
2091+
*/
2092+
#objective-display .objective-list > li[status='available'] ul {
2093+
background-color: rgba(var(--mej-quest-status-available), 0.2);
2094+
border-color: rgb(var(--mej-quest-status-available));
20732095
}
20742096

20752097
#objective-display .objective-list > li[status='inprogress'] .quest-name {
2076-
border-color: var(--mej-quest-status-inprogress);
2098+
border-color: rgb(var(--mej-quest-status-inprogress));
2099+
background-color: rgba(var(--mej-quest-status-inprogress), 0.4);
2100+
}
2101+
/*
2102+
#objective-display .objective-list > li[status='inprogress'] .quest-name i {
2103+
color: rgb(var(--mej-quest-status-inprogress));
2104+
}
2105+
*/
2106+
#objective-display .objective-list > li[status='inprogress'] ul {
2107+
background-color: rgba(var(--mej-quest-status-inprogress), 0.2);
2108+
border-color: rgb(var(--mej-quest-status-inprogress));
20772109
}
20782110

20792111
#objective-display .objective-list > li[status='completed'] .quest-name {
2080-
border-color: var(--mej-quest-status-completed);
2112+
border-color: rgb(var(--mej-quest-status-completed));
2113+
background-color: rgba(var(--mej-quest-status-completed), 0.4);
2114+
}
2115+
/*
2116+
#objective-display .objective-list > li[status='completed'] .quest-name i {
2117+
color: rgb(var(--mej-quest-status-completed));
2118+
}
2119+
*/
2120+
#objective-display .objective-list > li[status='completed'] ul {
2121+
background-color: rgba(var(--mej-quest-status-completed), 0.2);
2122+
border-color: rgb(var(--mej-quest-status-completed));
20812123
}
20822124

20832125
#objective-display .objective-list > li[status='failed'] .quest-name {
2084-
border-color: var(--mej-quest-status-failed);
2126+
border-color: rgb(var(--mej-quest-status-failed));
2127+
background-color: rgba(var(--mej-quest-status-failed), 0.2);
2128+
}
2129+
/*
2130+
#objective-display .objective-list > li[status='failed'] .quest-name i {
2131+
color: rgb(var(--mej-quest-status-failed));
2132+
}
2133+
*/
2134+
#objective-display .objective-list > li[status='failed'] ul {
2135+
background-color: rgba(var(--mej-quest-status-failed), 0.1);
2136+
border-color: rgb(var(--mej-quest-status-failed));
20852137
}
20862138

20872139
/*

‎css/system.css

+10-1
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,12 @@ body.system-wfrp4e {
185185
box-shadow: inset 0px 0px 12px #6b3a0f87 !important;
186186
}
187187

188+
/* GURPS */
189+
.system-gurps .monks-enhanced-journal .relationships .item-list .item {
190+
line-height: 70px;
191+
height: 70px;
192+
}
193+
188194
/* AGE System */
189195
.age-system .sheet-container .form-group label {
190196
font-size: var(--font-size-16);
@@ -535,6 +541,10 @@ body.system-vaesen {
535541
}
536542

537543
/* EMU Layout */
544+
.-emu-layout body.-emu {
545+
--mej-background: RGBA(var(--emu-color-background-lightest,230,233,235),var(--emu-background-opacity-window-content,1));
546+
--mej-adventure-toc-background: RGB(var(--emu-color-background,41,62,64));
547+
}
538548
.-emu-layout body.-emu .monks-journal-sheet.journal-sheet.sheet.window-app .window-content form.sheet-body.flexcol {
539549
flex-direction: column;
540550
flex-wrap: nowrap;
@@ -561,7 +571,6 @@ body.system-vaesen {
561571
background: transparent;
562572
border: transparent;
563573
}
564-
565574
/* Tidy UI */
566575
.monks-enhanced-journal .tidy5e.sheet.actor .list-layout {
567576
height: 100%;

‎lang/en.json

+2
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,8 @@
7474
"MonksEnhancedJournal.add-create-link.hint": "Add context menu, when text is selected to find a document with that name and replace the text with a link.",
7575
"MonksEnhancedJournal.party-loot-entity.name": "Party Loot",
7676
"MonksEnhancedJournal.party-loot-entity.hint": "When selling items, add option to ",
77+
"MonksEnhancedJournal.start-toc-collapsed.name": "Start TOC Collapsed",
78+
"MonksEnhancedJournal.start-toc-collapsed.hint": "Start with the Table of Contents collapsed",
7779

7880
"MonksEnhancedJournal.SlideConfiguration": "Slide Configuration",
7981
"MonksEnhancedJournal.DCConfiguration": "DC Configuration",

‎module.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"title": "Monk's Enhanced Journal",
33
"description": "Treat the journal like it's going to be popped out and used as a digital guide book. Add extra information to summarize an encounter. Show summaries of people and places. Allow for bookmarking of commonly used pages",
4-
"version": "11.03",
4+
"version": "11.04",
55
"authors": [
66
{
77
"name": "IronMonk",
@@ -95,7 +95,7 @@
9595
"css/apsjournal.css"
9696
],
9797
"url": "https://github.com/ironmonk88/monks-enhanced-journal",
98-
"download": "https://github.com/ironmonk88/monks-enhanced-journal/archive/11.03.zip",
98+
"download": "https://github.com/ironmonk88/monks-enhanced-journal/archive/11.04.zip",
9999
"manifest": "https://github.com/ironmonk88/monks-enhanced-journal/releases/latest/download/module.json",
100100
"bugs": "https://github.com/ironmonk88/monks-enhanced-journal/issues",
101101
"allowBugReporter": true,

0 commit comments

Comments
 (0)