Skip to content
This repository has been archived by the owner on Jan 26, 2024. It is now read-only.

Commit

Permalink
v1.182.2
Browse files Browse the repository at this point in the history
  • Loading branch information
@TheGiddyLimit
TheGiddyLimit committed Jul 26, 2023
1 parent 62069c2 commit 39035aa
Show file tree
Hide file tree
Showing 9 changed files with 124 additions and 92 deletions.
104 changes: 52 additions & 52 deletions data/bestiary/template.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1191,6 +1191,32 @@
}
}
},
{
"name": "Hill Dwarf",
"source": "PHB",
"_copy": {
"name": "Mountain Dwarf",
"source": "PHB",
"_mod": {
"*": {
"mode": "setProp",
"prop": "apply._root.type",
"value": {
"type": "humanoid",
"tags": [
{
"tag": "dwarf",
"prefix": "Hill"
}
]
}
}
},
"_preserve": {
"page": true
}
}
},
{
"name": "Huge Half-Black Dragon",
"source": "MM",
Expand Down Expand Up @@ -2396,58 +2422,6 @@
}
}
},
{
"name": "Hill Dwarf",
"source": "PHB",
"_copy": {
"name": "Mountain Dwarf",
"source": "PHB",
"_mod": {
"*": {
"mode": "setProp",
"prop": "apply._root.type",
"value": {
"type": "humanoid",
"tags": [
{
"tag": "dwarf",
"prefix": "Hill"
}
]
}
}
},
"_preserve": {
"page": true
}
}
},
{
"name": "Shield Dwarf",
"source": "PHB",
"_copy": {
"name": "Mountain Dwarf",
"source": "PHB",
"_mod": {
"*": {
"mode": "setProp",
"prop": "apply._root.type",
"value": {
"type": "humanoid",
"tags": [
{
"tag": "dwarf",
"prefix": "Shield"
}
]
}
}
},
"_preserve": {
"page": true
}
}
},
{
"name": "Orc",
"source": "DMG",
Expand Down Expand Up @@ -2647,6 +2621,32 @@
}
}
},
{
"name": "Shield Dwarf",
"source": "PHB",
"_copy": {
"name": "Mountain Dwarf",
"source": "PHB",
"_mod": {
"*": {
"mode": "setProp",
"prop": "apply._root.type",
"value": {
"type": "humanoid",
"tags": [
{
"tag": "dwarf",
"prefix": "Shield"
}
]
}
}
},
"_preserve": {
"page": true
}
}
},
{
"name": "Skeleton",
"source": "DMG",
Expand Down
5 changes: 5 additions & 0 deletions data/changelog.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2472,5 +2472,10 @@
"ver": "1.182.1",
"date": "2023-07-25",
"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)"
},
{
"ver": "1.182.2",
"date": "2023-07-26",
"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)"
}
]
Binary file modified img/adventure/LLK/005-mary.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion js/dmscreen/initiativetracker/dmscreen-initiativetracker-rowstatebuilder.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ export class InitiativeTrackerRowStateBuilderActive extends _InitiativeTrackerRo
hpCurrent = hpMax = await this._roller.pGetOrRollHp(mon, {isRollHp: this._comp._state.isRollHp});
}

if (initiative == null) {
if (initiative == null && this._comp._state.isRollInit) {
initiative = await this._roller.pGetRollInitiative({mon});
}

Expand Down
67 changes: 43 additions & 24 deletions js/utils-proporder.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -264,6 +264,48 @@ PropOrder._MONSTER__COPY_MOD = [
return it;
}),
];
PropOrder._MONSTER_TEMPLATE = [
"name",

"source",
"page",

"ref",

new PropOrder._ObjectKey("_copy", {
order: [
"name",
"source",
"_trait",
new PropOrder._ObjectKey("_mod", {
fnGetOrder: () => PropOrder._MONSTER_TEMPLATE__COPY_MOD,
}),
"_preserve",
],
}),

"crMin",
"crMax",

new PropOrder._ObjectKey("prerequisite", {
order: PropOrder._MONSTER,
}),
new PropOrder._ObjectKey("apply", {
order: [
new PropOrder._ObjectKey("_root", {
order: PropOrder._MONSTER,
}),
new PropOrder._ObjectKey("_mod", {
fnGetOrder: () => PropOrder._MONSTER__COPY_MOD,
}),
],
}),
];
PropOrder._MONSTER_TEMPLATE__COPY_MOD = [
"*",
"_",
...PropOrder._MONSTER_TEMPLATE,
];
PropOrder._GENERIC_FLUFF = [
"name",
"source",
Expand Down Expand Up @@ -411,30 +453,6 @@ PropOrder._BACKGROUND__COPY_MOD = [
"_",
...PropOrder._BACKGROUND,
];
PropOrder._TRAIT = [
"name",

"source",
"page",

"ref",

"crMin",

new PropOrder._ObjectKey("prerequisite", {
order: PropOrder._MONSTER,
}),
new PropOrder._ObjectKey("apply", {
order: [
new PropOrder._ObjectKey("_root", {
order: PropOrder._MONSTER,
}),
new PropOrder._ObjectKey("_mod", {
fnGetOrder: () => PropOrder._MONSTER__COPY_MOD,
}),
],
}),
];
PropOrder._LEGENDARY_GROUP = [
"name",
"source",
Expand Down Expand Up @@ -1435,6 +1453,7 @@ PropOrder._CARD = [
PropOrder._PROP_TO_LIST = {
"monster": PropOrder._MONSTER,
"monsterFluff": PropOrder._GENERIC_FLUFF,
"monsterTemplate": PropOrder._MONSTER_TEMPLATE,
"backgroundFluff": PropOrder._GENERIC_FLUFF,
"featFluff": PropOrder._GENERIC_FLUFF,
"conditionFluff": PropOrder._GENERIC_FLUFF,
Expand Down
14 changes: 11 additions & 3 deletions js/utils.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.182.1"/* 5ETOOLS_VERSION__CLOSE */;
globalThis.VERSION_NUMBER = /* 5ETOOLS_VERSION__OPEN */"1.182.2"/* 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
Expand Down Expand Up @@ -7298,10 +7298,18 @@ if (!IS_VTT && typeof window !== "undefined") {

window.addEventListener("load", () => {
document.body.addEventListener("click", (evt) => {
if (!evt?.target.hasAttribute("data-packed-dice")) return;
const eleDice = evt.target.hasAttribute("data-packed-dice")
? evt.target
// Tolerate e.g. Bestiary wrapped proficiency dice rollers
: evt.target.parentElement.hasAttribute("data-packed-dice")
? evt.target.parentElement
: null;

if (!eleDice) return;

evt.preventDefault();
evt.stopImmediatePropagation();
Renderer.dice.pRollerClickUseData(evt, evt.target).then(null);
Renderer.dice.pRollerClickUseData(evt, eleDice).then(null);
});
Renderer.events.bindGeneric();
});
Expand Down
2 changes: 1 addition & 1 deletion node/prettify-data.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@ function getFnListSort (prop) {
case "spell":
case "monster":
case "monsterFluff":
case "monsterTemplate":
case "action":
case "background":
case "trait":
case "legendaryGroup":
case "language":
case "languageScript":
Expand Down
18 changes: 9 additions & 9 deletions package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "5etools",
"author": "TheGiddyLimit",
"version": "1.182.1",
"version": "1.182.2",
"license": "MIT",
"description": "A site dedicated to making playing games with your friends as easy as possible.",
"type": "module",
Expand Down Expand Up @@ -44,7 +44,7 @@
"url": "git+https://github.com/5etools-mirror-1/5etools-mirror-1.github.io.git"
},
"devDependencies": {
"5etools-utils": "^0.8.34",
"5etools-utils": "^0.8.35",
"ajv": "^8.11.2",
"ajv-formats": "^2.1.1",
"esbuild": "^0.14.38",
Expand Down

0 comments on commit 39035aa

Please sign in to comment.