Skip to content

Commit 62069c2

Browse files
committed
v1.182.1
1 parent 8c95e2a commit 62069c2

9 files changed

+25
-10
lines changed

data/changelog.json

+5
Original file line numberDiff line numberDiff line change
@@ -2467,5 +2467,10 @@
24672467
"date": "2023-07-23",
24682468
"title": "Slow Track",
24692469
"txt": "- DM Screen Initiative Tracker\n - _[Rewrote from the ground up to enable more and better features. The Initiative Tracker has a lot of moving parts, so this means a high likelihood of lots of bugs. Please report via the usual channels, and make use of the DM Screen's \"Save to File\" feature when doing so.]_\n - Added \"Initiative Tracker Creature Viewer\" companion panel type, which, when linked to an Initiative Tracker, displays the statblock of the active creature (where available)\n - Added \"default party\" editor; this allows for the creation of a set of player combatants which are always added to the tracker each time it is reset/when an encounter is loaded\n - Custom conditions can now be saved\n - Added \"Reroll initiative each round\" option\n - Added \"Image\" column type; this displays a creature's token (where available) in the tracker, the creature's fluff image (where available) when hovered, and the former can be clicked to send the latter to connected Player Views\n - Added \"Checkbox; clears at start of round\" and \"Checkbox; ticks at start of round\" additional column types\n - Revised \"Legendary Actions\" column type to a \"x/y\" format which resets to max at the start of each round\n - Added \"Initiative\" (bonus) column type, which can be used to customize initiative values for the default party, and is used as the initiative modifier for each combatant when using the \"Reroll initiative each round\" option\n - Added \"Customize\" flow to \"Add Monster\" dialogue, which allows a custom name to be entered, and CR/etc. scaling to be applied\n - When adding multiple creatures via the \"Add Monster\" button, the \"Roll groups of creatures together\" setting is now respected\n - SHIFT-clicking a creature \"Delete\" button now also deletes all similar creatures\n - The active row is now scrolled into view when advancing turn\n - SHIFT-clicking the \"Player View\" button now opens the \"Standard\" Player View dialogue, and SHIFT-clicking the \"Configure\" button now opens the \"Settings\" dialogue\n - Added various SHIFT/CTRL-click combinations to \"Add Condition\" dialogue buttons, to quickly add conditions with unlimited/1-turn/10-turn durations\n - Sort ordering is now indicated by toggle status of sort buttons\n - Round number is now persistent between loads\n - Tweaked and improved Player View styling\n\n- Improved DM Screen handling of errors when initially loading; a dialogue is now presented with an option to download the current save, and/or purge the current save and continue loading (the old default behaviour) \n- Maps page now remembers chapter/book selection between reloads\n- Maps page \"intermediate\" checkboxes now downgrade to \"unchecked\" when clicked, rather than upgrading to \"checked.\" This allows partially-selected chapters/books to be de-selected without first loading all images for that chapter/book.\n- Added Dynamic Map Viewer support for LLK Daoine Gloine maps\n- Fixed Omnisearch clear \"x\" button inconsistency\n- (Brew) Added support for `\"anyExotic\"` language proficiencies\n- (Brew) Updated JSON character constraints in \"Add/Edit Homebrew Source\" dialogue to better reflect schema requirements\n- (Brew) Removed broken rendering of image title/credits when using comic styles. This information has been relegated to the image tooltip.\n- (Fixed typos/added tags)"
2470+
},
2471+
{
2472+
"ver": "1.182.1",
2473+
"date": "2023-07-25",
2474+
"txt": "- Fixed DM Screen Initiative Tracker \"Add Monster\" rows crashing on non-customize click\n- Fixed scalable dice rollers failing to open level-picker dropdown menu\n- (Fixed typos/added tags)"
24702475
}
24712476
]

data/items.json

+3
Original file line numberDiff line numberDiff line change
@@ -24992,6 +24992,9 @@
2499224992
"immune": [
2499324993
"poison"
2499424994
],
24995+
"conditionImmune": [
24996+
"poisoned"
24997+
],
2499524998
"tier": "major",
2499624999
"rarity": "rare",
2499725000
"wondrous": true,

js/converter-item.js

+2
Original file line numberDiff line numberDiff line change
@@ -387,6 +387,8 @@ class ItemParser extends BaseParser {
387387
delete cpyStatsQuarterstaff.page;
388388
delete cpyStatsQuarterstaff.rarity;
389389
delete cpyStatsQuarterstaff.value;
390+
delete cpyStatsQuarterstaff.srd;
391+
delete cpyStatsQuarterstaff.basicRules;
390392
// region tags found only on basic items
391393
delete cpyStatsQuarterstaff.weapon;
392394
delete cpyStatsQuarterstaff.dagger;

js/dmscreen/initiativetracker/dmscreen-initiativetracker-monsteradd.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,7 @@ export class InitiativeTrackerMonsterAdd extends BaseComponent {
298298

299299
results.forEach(res => {
300300
const $row = this._render_$getSearchRow({rdState, res}).appendTo($results);
301-
SearchWidget.bindRowHandlers({result: res, $row, $ptrRows, fnHandleClick: this._render_pHandleClickRow.bind({rdState}), $iptSearch});
301+
SearchWidget.bindRowHandlers({result: res, $row, $ptrRows, fnHandleClick: this._render_pHandleClickRow.bind(this, {rdState}), $iptSearch});
302302
$ptrRows._.push($row);
303303
});
304304

js/render-dice.js

+3
Original file line numberDiff line numberDiff line change
@@ -196,6 +196,9 @@ Renderer.dice = {
196196

197197
// region Event handling
198198
async pRollerClickUseData (evt, ele) {
199+
evt.stopPropagation();
200+
evt.preventDefault();
201+
199202
const $ele = $(ele);
200203
const rollData = $ele.data("packed-dice");
201204
let name = $ele.data("roll-name");

js/render.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -7801,7 +7801,7 @@ Renderer.item = {
78017801
// armor
78027802
if (item.ac != null) {
78037803
const prefix = item.type === "S" ? "+" : "";
7804-
const suffix = (item.type === "LA" || item.bardingType === "LA") || ((item.type === "MA" || item.bardingType === "MA") && item.dexterityMax === null) ? " + Dex" : (item.type === "MA" || item.bardingType === "MA") ? " + Dex (max 2)" : "";
7804+
const suffix = (item.type === "LA" || item.bardingType === "LA") || ((item.type === "MA" || item.bardingType === "MA") && item.dexterityMax === null) ? " + Dex" : (item.type === "MA" || item.bardingType === "MA") ? ` + Dex (max ${item.dexterityMax ?? 2})` : "";
78057805
damageParts.push(`AC ${prefix}${item.ac}${suffix}`);
78067806
}
78077807
if (item.acSpecial != null) damageParts.push(item.ac != null ? item.acSpecial : `AC ${item.acSpecial}`);

js/utils.js

+7-5
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
// in deployment, `IS_DEPLOYED = "<version number>";` should be set below.
44
globalThis.IS_DEPLOYED = undefined;
5-
globalThis.VERSION_NUMBER = /* 5ETOOLS_VERSION__OPEN */"1.182.0"/* 5ETOOLS_VERSION__CLOSE */;
5+
globalThis.VERSION_NUMBER = /* 5ETOOLS_VERSION__OPEN */"1.182.1"/* 5ETOOLS_VERSION__CLOSE */;
66
globalThis.DEPLOYED_STATIC_ROOT = ""; // "https://static.5etools.com/"; // FIXME re-enable this when we have a CDN again
77
globalThis.DEPLOYED_IMG_ROOT = undefined;
88
// for the roll20 script to set
@@ -7297,10 +7297,12 @@ if (!IS_VTT && typeof window !== "undefined") {
72977297
});
72987298

72997299
window.addEventListener("load", () => {
7300-
$(document.body)
7301-
.on("click", `[data-packed-dice]`, evt => {
7302-
Renderer.dice.pRollerClickUseData(evt, evt.currentTarget);
7303-
});
7300+
document.body.addEventListener("click", (evt) => {
7301+
if (!evt?.target.hasAttribute("data-packed-dice")) return;
7302+
evt.preventDefault();
7303+
evt.stopImmediatePropagation();
7304+
Renderer.dice.pRollerClickUseData(evt, evt.target).then(null);
7305+
});
73047306
Renderer.events.bindGeneric();
73057307
});
73067308

package-lock.json

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "5etools",
33
"author": "TheGiddyLimit",
4-
"version": "1.182.0",
4+
"version": "1.182.1",
55
"license": "MIT",
66
"description": "A site dedicated to making playing games with your friends as easy as possible.",
77
"type": "module",

0 commit comments

Comments
 (0)