Skip to content

Commit

Permalink
Merge remote-tracking branch 'righthandofvecna/801-npc-builder-null-s…
Browse files Browse the repository at this point in the history
…afety'
  • Loading branch information
Ashe committed Sep 11, 2024
2 parents be110c4 + db4192e commit 0d1fefd
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 6 deletions.
11 changes: 6 additions & 5 deletions src/module/apps/npc-quick-build/document.js
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,7 @@ export class NpcQuickBuildData {

// load feats with pack loader/compendium browser!
if (!NpcQuickBuildData._preloadedCompendiums) {
compendiumBrowser.initCompendiumList();
await compendiumBrowser.tabs.feats.loadData();
await compendiumBrowser.tabs.edges.loadData();
await compendiumBrowser.tabs.species.loadData();
Expand All @@ -212,11 +213,11 @@ export class NpcQuickBuildData {
let speciesCompendiums = ["ptu.species"];

// try to use the ones set up in the compendium browser
const compendiumSettings = game.settings.get("ptu", "compendiumBrowserPacks");
const compendiumSettings = compendiumBrowser.settings;
if (compendiumSettings) {
featureCompendiums = Object.keys(compendiumSettings.feats).filter(c => compendiumSettings.feats[c].load);
edgeCompendiums = Object.keys(compendiumSettings.edges).filter(c => compendiumSettings.edges[c].load);
speciesCompendiums = Object.keys(compendiumSettings.species).filter(c => compendiumSettings.species[c].load);
featureCompendiums = Object.keys(compendiumSettings.feats ?? {}).filter(c => compendiumSettings.feats[c].load);
edgeCompendiums = Object.keys(compendiumSettings.edges ?? {}).filter(c => compendiumSettings.edges[c].load);
speciesCompendiums = Object.keys(compendiumSettings.species ?? {}).filter(c => compendiumSettings.species[c].load);
}

// get classes/features
Expand Down Expand Up @@ -281,7 +282,7 @@ export class NpcQuickBuildData {
get estimatedAppropriateLevel () {
// this generator broadly speaking assumes that power level goes up with the square of level
const playerLevelsSquared = game.users.filter(u=>u.character?.id != undefined).map(u=>Math.pow(u.character?.system?.level?.current ?? 1, 2));
return Math.sqrt(average(playerLevelsSquared));
return Math.sqrt(average(playerLevelsSquared)) || 1;
}

setProperty(key, value) {
Expand Down
2 changes: 1 addition & 1 deletion system.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"verified": "12.329",
"maximum": 12
},
"version": "4.3.4",
"version": "4.3.5",
"templateVersion": 2,
"authors": [
{
Expand Down

0 comments on commit 0d1fefd

Please sign in to comment.