Skip to content

Commit 39035aa

Browse files
TheGiddyLimitTheGiddyLimit
committed
v1.182.2
1 parent 62069c2 commit 39035aa

File tree

9 files changed

+124
-92
lines changed

9 files changed

+124
-92
lines changed

‎data/bestiary/template.json

+52-52
Original file line numberDiff line numberDiff line change
@@ -1191,6 +1191,32 @@
11911191
}
11921192
}
11931193
},
1194+
{
1195+
"name": "Hill Dwarf",
1196+
"source": "PHB",
1197+
"_copy": {
1198+
"name": "Mountain Dwarf",
1199+
"source": "PHB",
1200+
"_mod": {
1201+
"*": {
1202+
"mode": "setProp",
1203+
"prop": "apply._root.type",
1204+
"value": {
1205+
"type": "humanoid",
1206+
"tags": [
1207+
{
1208+
"tag": "dwarf",
1209+
"prefix": "Hill"
1210+
}
1211+
]
1212+
}
1213+
}
1214+
},
1215+
"_preserve": {
1216+
"page": true
1217+
}
1218+
}
1219+
},
11941220
{
11951221
"name": "Huge Half-Black Dragon",
11961222
"source": "MM",
@@ -2396,58 +2422,6 @@
23962422
}
23972423
}
23982424
},
2399-
{
2400-
"name": "Hill Dwarf",
2401-
"source": "PHB",
2402-
"_copy": {
2403-
"name": "Mountain Dwarf",
2404-
"source": "PHB",
2405-
"_mod": {
2406-
"*": {
2407-
"mode": "setProp",
2408-
"prop": "apply._root.type",
2409-
"value": {
2410-
"type": "humanoid",
2411-
"tags": [
2412-
{
2413-
"tag": "dwarf",
2414-
"prefix": "Hill"
2415-
}
2416-
]
2417-
}
2418-
}
2419-
},
2420-
"_preserve": {
2421-
"page": true
2422-
}
2423-
}
2424-
},
2425-
{
2426-
"name": "Shield Dwarf",
2427-
"source": "PHB",
2428-
"_copy": {
2429-
"name": "Mountain Dwarf",
2430-
"source": "PHB",
2431-
"_mod": {
2432-
"*": {
2433-
"mode": "setProp",
2434-
"prop": "apply._root.type",
2435-
"value": {
2436-
"type": "humanoid",
2437-
"tags": [
2438-
{
2439-
"tag": "dwarf",
2440-
"prefix": "Shield"
2441-
}
2442-
]
2443-
}
2444-
}
2445-
},
2446-
"_preserve": {
2447-
"page": true
2448-
}
2449-
}
2450-
},
24512425
{
24522426
"name": "Orc",
24532427
"source": "DMG",
@@ -2647,6 +2621,32 @@
26472621
}
26482622
}
26492623
},
2624+
{
2625+
"name": "Shield Dwarf",
2626+
"source": "PHB",
2627+
"_copy": {
2628+
"name": "Mountain Dwarf",
2629+
"source": "PHB",
2630+
"_mod": {
2631+
"*": {
2632+
"mode": "setProp",
2633+
"prop": "apply._root.type",
2634+
"value": {
2635+
"type": "humanoid",
2636+
"tags": [
2637+
{
2638+
"tag": "dwarf",
2639+
"prefix": "Shield"
2640+
}
2641+
]
2642+
}
2643+
}
2644+
},
2645+
"_preserve": {
2646+
"page": true
2647+
}
2648+
}
2649+
},
26502650
{
26512651
"name": "Skeleton",
26522652
"source": "DMG",

‎data/changelog.json

+5
Original file line numberDiff line numberDiff line change
@@ -2472,5 +2472,10 @@
24722472
"ver": "1.182.1",
24732473
"date": "2023-07-25",
24742474
"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)"
2475+
},
2476+
{
2477+
"ver": "1.182.2",
2478+
"date": "2023-07-26",
2479+
"txt": "- Fixed Bestiary d20-based dice rollers failing to roll on click\n- Fixed DM Screen Initiative Tracker always rolling initiative for new creatures when the \"Roll initiative\" option is disabled \n- (Fixed typos/added tags)"
24752480
}
24762481
]

‎img/adventure/LLK/005-mary.png

-360 KB
Loading

‎js/dmscreen/initiativetracker/dmscreen-initiativetracker-rowstatebuilder.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ export class InitiativeTrackerRowStateBuilderActive extends _InitiativeTrackerRo
163163
hpCurrent = hpMax = await this._roller.pGetOrRollHp(mon, {isRollHp: this._comp._state.isRollHp});
164164
}
165165

166-
if (initiative == null) {
166+
if (initiative == null && this._comp._state.isRollInit) {
167167
initiative = await this._roller.pGetRollInitiative({mon});
168168
}
169169

‎js/utils-proporder.js

+43-24
Original file line numberDiff line numberDiff line change
@@ -264,6 +264,48 @@ PropOrder._MONSTER__COPY_MOD = [
264264
return it;
265265
}),
266266
];
267+
PropOrder._MONSTER_TEMPLATE = [
268+
"name",
269+
270+
"source",
271+
"page",
272+
273+
"ref",
274+
275+
new PropOrder._ObjectKey("_copy", {
276+
order: [
277+
"name",
278+
"source",
279+
"_trait",
280+
new PropOrder._ObjectKey("_mod", {
281+
fnGetOrder: () => PropOrder._MONSTER_TEMPLATE__COPY_MOD,
282+
}),
283+
"_preserve",
284+
],
285+
}),
286+
287+
"crMin",
288+
"crMax",
289+
290+
new PropOrder._ObjectKey("prerequisite", {
291+
order: PropOrder._MONSTER,
292+
}),
293+
new PropOrder._ObjectKey("apply", {
294+
order: [
295+
new PropOrder._ObjectKey("_root", {
296+
order: PropOrder._MONSTER,
297+
}),
298+
new PropOrder._ObjectKey("_mod", {
299+
fnGetOrder: () => PropOrder._MONSTER__COPY_MOD,
300+
}),
301+
],
302+
}),
303+
];
304+
PropOrder._MONSTER_TEMPLATE__COPY_MOD = [
305+
"*",
306+
"_",
307+
...PropOrder._MONSTER_TEMPLATE,
308+
];
267309
PropOrder._GENERIC_FLUFF = [
268310
"name",
269311
"source",
@@ -411,30 +453,6 @@ PropOrder._BACKGROUND__COPY_MOD = [
411453
"_",
412454
...PropOrder._BACKGROUND,
413455
];
414-
PropOrder._TRAIT = [
415-
"name",
416-
417-
"source",
418-
"page",
419-
420-
"ref",
421-
422-
"crMin",
423-
424-
new PropOrder._ObjectKey("prerequisite", {
425-
order: PropOrder._MONSTER,
426-
}),
427-
new PropOrder._ObjectKey("apply", {
428-
order: [
429-
new PropOrder._ObjectKey("_root", {
430-
order: PropOrder._MONSTER,
431-
}),
432-
new PropOrder._ObjectKey("_mod", {
433-
fnGetOrder: () => PropOrder._MONSTER__COPY_MOD,
434-
}),
435-
],
436-
}),
437-
];
438456
PropOrder._LEGENDARY_GROUP = [
439457
"name",
440458
"source",
@@ -1435,6 +1453,7 @@ PropOrder._CARD = [
14351453
PropOrder._PROP_TO_LIST = {
14361454
"monster": PropOrder._MONSTER,
14371455
"monsterFluff": PropOrder._GENERIC_FLUFF,
1456+
"monsterTemplate": PropOrder._MONSTER_TEMPLATE,
14381457
"backgroundFluff": PropOrder._GENERIC_FLUFF,
14391458
"featFluff": PropOrder._GENERIC_FLUFF,
14401459
"conditionFluff": PropOrder._GENERIC_FLUFF,

‎js/utils.js

+11-3
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.1"/* 5ETOOLS_VERSION__CLOSE */;
5+
globalThis.VERSION_NUMBER = /* 5ETOOLS_VERSION__OPEN */"1.182.2"/* 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
@@ -7298,10 +7298,18 @@ if (!IS_VTT && typeof window !== "undefined") {
72987298

72997299
window.addEventListener("load", () => {
73007300
document.body.addEventListener("click", (evt) => {
7301-
if (!evt?.target.hasAttribute("data-packed-dice")) return;
7301+
const eleDice = evt.target.hasAttribute("data-packed-dice")
7302+
? evt.target
7303+
// Tolerate e.g. Bestiary wrapped proficiency dice rollers
7304+
: evt.target.parentElement.hasAttribute("data-packed-dice")
7305+
? evt.target.parentElement
7306+
: null;
7307+
7308+
if (!eleDice) return;
7309+
73027310
evt.preventDefault();
73037311
evt.stopImmediatePropagation();
7304-
Renderer.dice.pRollerClickUseData(evt, evt.target).then(null);
7312+
Renderer.dice.pRollerClickUseData(evt, eleDice).then(null);
73057313
});
73067314
Renderer.events.bindGeneric();
73077315
});

‎node/prettify-data.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ function getFnListSort (prop) {
3838
case "spell":
3939
case "monster":
4040
case "monsterFluff":
41+
case "monsterTemplate":
4142
case "action":
4243
case "background":
43-
case "trait":
4444
case "legendaryGroup":
4545
case "language":
4646
case "languageScript":

‎package-lock.json

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

‎package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "5etools",
33
"author": "TheGiddyLimit",
4-
"version": "1.182.1",
4+
"version": "1.182.2",
55
"license": "MIT",
66
"description": "A site dedicated to making playing games with your friends as easy as possible.",
77
"type": "module",
@@ -44,7 +44,7 @@
4444
"url": "git+https://github.com/5etools-mirror-1/5etools-mirror-1.github.io.git"
4545
},
4646
"devDependencies": {
47-
"5etools-utils": "^0.8.34",
47+
"5etools-utils": "^0.8.35",
4848
"ajv": "^8.11.2",
4949
"ajv-formats": "^2.1.1",
5050
"esbuild": "^0.14.38",

0 commit comments

Comments
 (0)