v1.181.5

Author: TheGiddyLimit

data/adventure/adventure-idrotf.json

@@ -15740,7 +15740,7 @@
 													"type": "image",
 													"href": {
 														"type": "internal",
-														"path": "adventure/IDRotF/064-01-031.gang-the-verbeeg.png"
+														"path": "adventure/IDRotF/064-01-031.gahg-the-verbeeg.png"
 													},
 													"title": "Gahg the verbeeg has a basket of goodies for her beloved Duhg",
 													"width": 1700,
@@ -23630,7 +23630,7 @@
 													"type": "image",
 													"href": {
 														"type": "internal",
-														"path": "adventure/IDRotF/093-02-004.reindeer-hero.png"
+														"path": "adventure/IDRotF/093-02-004.reindeer-herd.png"
 													},
 													"title": "{@creature Reindeer|IDRotF} Herd",
 													"width": 1700,
@@ -57141,7 +57141,6 @@
 										}
 									]
 								}
-
 							]
 						},
 						{

data/bestiary/fluff-bestiary-mm.json

@@ -9272,7 +9272,7 @@
 								{
 									"type": "quote",
 									"entries": [
-										"They invent their own gods ... the very definition of insanity."
+										"They invent their own gods... the very definition of insanity."
 									],
 									"by": "Sabal Mizzrym of Menzoberranzan"
 								}

data/changelog.json

@@ -2441,5 +2441,10 @@
 		"ver": "1.181.4",
 		"date": "2023-06-14",
 		"txt": "- Added \"Equipment\" filter to Bestiary page\n- Overhauled Monster Manual fluff, reformatting and adding various missing chunks of text (notably quotes) (thanks @ Spappz)\n- Added \"Spell Level\" column to Classes page class table when in Spell Points mode\n- Fixed Classes page failing to correctly apply \"reprinted\" color styling in some cases\n- Added \"reprinted\" coloring support to Classes page outline view\n- Fixed DM Screen Initiative Tracker \"Spell DC\" additional column failing to auto-populate\n- (Brew) Added support for `\"_copy\"` on `\"baseitem\"`s\n- (Brew) Added support for `\"_copy\"` within `\"statblockInline\"`-type entries\n- (Brew) Fixed rare case where Creature Builder could output invalid creature types\n- (Fixed typos/added tags)"
+	},
+	{
+		"ver": "1.181.5",
+		"date": "2023-06-15",
+		"txt": "- Fixed DM Screen Clock/Calendar failing to load \n- (Brew) Fixed self-source-referencing `\"_copy\"`s within `\"statblockInline\"`-type entries failing to load\n- (Fixed typos/added tags)"
 	}
 ]

img/adventure/IDRotF/064-01-031.gang-the-verbeeg.png img/adventure/IDRotF/064-01-031.gahg-the-verbeeg.png

@@ -1,5 +1,15 @@
 "use strict";
 
+const _TIME_TRACKER_MOON_SPRITE = new Image();
+const TIME_TRACKER_MOON_SPRITE_LOADER = new Promise(resolve => {
+	_TIME_TRACKER_MOON_SPRITE.onload = resolve;
+	_TIME_TRACKER_MOON_SPRITE.onerror = () => {
+		_TIME_TRACKER_MOON_SPRITE.hasError = true;
+		resolve();
+	};
+});
+_TIME_TRACKER_MOON_SPRITE.src = "img/dmscreen/moon.png";
+
 class TimeTracker {
 	static $getTracker (board, state) {
 		const $wrpPanel = $(`<div class="w-100 h-100 dm-time__root dm__panel-bg dm__data-anchor"/>`) // root class used to identify for saving
@@ -421,9 +431,9 @@ class TimeTrackerBase extends TimeTrackerComponent {
 		const ctx = c.getContext("2d");
 
 		// draw image
-		if (!TIME_TRACKER_MOON_SPRITE.hasError) {
+		if (!_TIME_TRACKER_MOON_SPRITE.hasError) {
 			ctx.drawImage(
-				TIME_TRACKER_MOON_SPRITE,
+				_TIME_TRACKER_MOON_SPRITE,
 				moonInfo.phaseIndex * TimeTrackerBase._MOON_RENDER_RES, // source x
 				0, // source y
 				TimeTrackerBase._MOON_RENDER_RES, // source w

img/adventure/IDRotF/093-02-004.reindeer-hero.png img/adventure/IDRotF/093-02-004.reindeer-herd.png

@@ -37,16 +37,6 @@ const PANEL_TYP_GENERIC_EMBED = 90;
 const PANEL_TYP_ERROR = 98;
 const PANEL_TYP_BLANK = 99;
 
-const TIME_TRACKER_MOON_SPRITE = new Image();
-const TIME_TRACKER_MOON_SPRITE_LOADER = new Promise(resolve => {
-	TIME_TRACKER_MOON_SPRITE.onload = resolve;
-	TIME_TRACKER_MOON_SPRITE.onerror = () => {
-		TIME_TRACKER_MOON_SPRITE.hasError = true;
-		resolve();
-	};
-});
-TIME_TRACKER_MOON_SPRITE.src = "img/dmscreen/moon.png";
-
 class Board {
 	constructor () {
 		this.panels = {};

js/dmscreen-timetracker.js

@@ -441,6 +441,13 @@ class _BrewUtil2Base {
 
 	/* -------------------------------------------- */
 
+	async pGetBrewBySource (source, {lockToken} = {}) {
+		const brews = await this.pGetBrew({lockToken});
+		return brews.find(brew => brew?.body?._meta?.sources?.some(src => src?.json === source));
+	}
+
+	/* -------------------------------------------- */
+
 	async _pGetBrew_pGetLocalBrew ({lockToken} = {}) {
 		if (this._cache_brewsLocal) return this._cache_brewsLocal;
 		if (IS_VTT || IS_DEPLOYED || typeof window === "undefined") return this._cache_brewsLocal = [];

js/dmscreen.js

@@ -2,7 +2,7 @@
 
 // in deployment, `IS_DEPLOYED = "<version number>";` should be set below.
 globalThis.IS_DEPLOYED = undefined;
-globalThis.VERSION_NUMBER = /* 5ETOOLS_VERSION__OPEN */"1.181.4"/* 5ETOOLS_VERSION__CLOSE */;
+globalThis.VERSION_NUMBER = /* 5ETOOLS_VERSION__OPEN */"1.181.5"/* 5ETOOLS_VERSION__CLOSE */;
 globalThis.DEPLOYED_STATIC_ROOT = ""; // "https://static.5etools.com/"; // FIXME re-enable this when we have a CDN again
 globalThis.DEPLOYED_IMG_ROOT = undefined;
 // for the roll20 script to set
@@ -3655,7 +3655,7 @@ globalThis.DataUtil = {
 				const data = await DataUtil[prop].pLoadSingleSource(source);
 				if (data) return data;
 
-				return DataUtil._pLoadByMeta_pGetPrereleaseBrewUrl(source);
+				return DataUtil._pLoadByMeta_pGetPrereleaseBrew(source);
 			}
 			// endregion
 
@@ -3668,7 +3668,7 @@ globalThis.DataUtil = {
 				const index = await DataUtil.loadJSON(`${baseUrlPart}/${DataUtil._MULTI_SOURCE_PROP_TO_INDEX_NAME[prop]}`);
 				if (index[source]) return DataUtil.loadJSON(`${baseUrlPart}/${index[source]}`);
 
-				return DataUtil._pLoadByMeta_pGetPrereleaseBrewUrl(source);
+				return DataUtil._pLoadByMeta_pGetPrereleaseBrew(source);
 			}
 			// endregion
 
@@ -3678,12 +3678,12 @@ globalThis.DataUtil = {
 			case "baseitem": {
 				const data = await DataUtil.item.loadRawJSON();
 				if (data[prop] && data[prop].some(it => it.source === source)) return data;
-				return DataUtil._pLoadByMeta_pGetPrereleaseBrewUrl(source);
+				return DataUtil._pLoadByMeta_pGetPrereleaseBrew(source);
 			}
 			case "race": {
 				const data = await DataUtil.race.loadJSON({isAddBaseRaces: true});
 				if (data[prop] && data[prop].some(it => it.source === source)) return data;
-				return DataUtil._pLoadByMeta_pGetPrereleaseBrewUrl(source);
+				return DataUtil._pLoadByMeta_pGetPrereleaseBrew(source);
 			}
 			// endregion
 
@@ -3694,7 +3694,7 @@ globalThis.DataUtil = {
 					const data = await (impl.loadJSON ? impl.loadJSON() : DataUtil.loadJSON(impl.getDataUrl()));
 					if (data[prop] && data[prop].some(it => it.source === source)) return data;
 
-					return DataUtil._pLoadByMeta_pGetPrereleaseBrewUrl(source);
+					return DataUtil._pLoadByMeta_pGetPrereleaseBrew(source);
 				}
 
 				throw new Error(`Could not get loadable URL for \`${JSON.stringify({key: prop, value: source})}\``);
@@ -3703,7 +3703,7 @@ globalThis.DataUtil = {
 		}
 	},
 
-	async _pLoadByMeta_pGetPrereleaseBrewUrl (source) {
+	async _pLoadByMeta_pGetPrereleaseBrew (source) {
 		const fromPrerelease = await DataUtil.pLoadPrereleaseBySource(source);
 		if (fromPrerelease) return fromPrerelease;
 
@@ -3713,20 +3713,32 @@ globalThis.DataUtil = {
 		throw new Error(`Could not find prerelease/brew URL for source "${source}"`);
 	},
 
+	/* -------------------------------------------- */
+
 	async pLoadPrereleaseBySource (source) {
 		if (typeof PrereleaseUtil === "undefined") return null;
-		const url = await PrereleaseUtil.pGetSourceUrl(source);
-		if (!url) return null;
-		return DataUtil.loadJSON(url);
+		return this._pLoadPrereleaseBrewBySource({source, brewUtil: PrereleaseUtil});
 	},
 
 	async pLoadBrewBySource (source) {
 		if (typeof BrewUtil2 === "undefined") return null;
-		const url = await BrewUtil2.pGetSourceUrl(source);
+		return this._pLoadPrereleaseBrewBySource({source, brewUtil: BrewUtil2});
+	},
+
+	async _pLoadPrereleaseBrewBySource ({source, brewUtil}) {
+		// Load from existing first
+		const fromExisting = await brewUtil.pGetBrewBySource(source);
+		if (fromExisting) return MiscUtil.copyFast(fromExisting.body);
+
+		// Load from remote
+		const url = await brewUtil.pGetSourceUrl(source);
 		if (!url) return null;
+
 		return DataUtil.loadJSON(url);
 	},
 
+	/* -------------------------------------------- */
+
 	// region Dbg
 	dbg: {
 		isTrackCopied: false,

js/utils-brew.js

@@ -1,7 +1,7 @@
 {
 	"name": "5etools",
 	"author": "TheGiddyLimit",
-	"version": "1.181.4",
+	"version": "1.181.5",
 	"license": "MIT",
 	"description": "A site dedicated to making playing games with your friends as easy as possible.",
 	"type": "module",