Skip to content

Commit

Permalink
closes #88
Browse files Browse the repository at this point in the history
  • Loading branch information
Muttley committed May 31, 2024
1 parent b73af89 commit 7869364
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 16 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

### Bugfix
- [#65] Fix un-localized strings in Actor abilities template
- [#66] Hardcoded skills in autocalc MaxStress
- [#71] Skill localization not working on NPCs
- [#73] Typo in max stress calculation meant Will+Resilience not used when it should
- [#75] Error in char sheet talent listing text enrichments used in description
Expand All @@ -15,6 +16,7 @@
- [#78] Merge new Spanish and Portuguese/Brazilian translation updates from Crowdin
- [#79] Merge new Portuguese/Brazilian translation updates from Crowdin
- [#87] Unable to alter max momentum setting if you reduce it to zero
- [#88] Retire the Skills Compendium world setting now that it is no longer required

*Many thanks to **lozanoje** for contributing code and translations included in this build*

Expand Down
11 changes: 6 additions & 5 deletions system/src/documents/ACActor.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -168,13 +168,14 @@ export default class ACActor extends Actor {
&& data.items.filter(i => i.type === "skill").length > 0;

if (!alreadyHasSkills) {
let skillsCompendium = game.settings.get(
"ac2d20", "compendium-skills"
);
// let skillsCompendium = game.settings.get(
// "ac2d20", "compendium-skills"
// );

if (!skillsCompendium) skillsCompendium = "ac2d20.skills";
// if (!skillsCompendium) skillsCompendium = "ac2d20.skills";

const packSkills = await game.packs.get(skillsCompendium).getDocuments();
const packSkills =
await game.packs.get("ac2d20.skills").getDocuments();

update.items = this.items.map(i => i.toObject());

Expand Down
22 changes: 11 additions & 11 deletions system/src/settings.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -95,18 +95,18 @@ export default async function registerSettings() {
type: Boolean,
});

const itemCompendiums = await ac2d20.utils.getAvailableItemCompendiumSelectData();
// const itemCompendiums = await ac2d20.utils.getAvailableItemCompendiumSelectData();

game.settings.register(SYSTEM_ID, "compendium-skills", {
name: game.i18n.localize("AC2D20.SETTINGS.compendiumName"),
hint: game.i18n.localize("AC2D20.SETTINGS.compendiumHint"),
choices: itemCompendiums,
type: String,
default: "ac2d20.skills",
scope: "world",
config: true,
requiresReload: true,
});
// game.settings.register(SYSTEM_ID, "compendium-skills", {
// name: game.i18n.localize("AC2D20.SETTINGS.compendiumName"),
// hint: game.i18n.localize("AC2D20.SETTINGS.compendiumHint"),
// choices: itemCompendiums,
// type: String,
// default: "ac2d20.skills",
// scope: "world",
// config: true,
// requiresReload: true,
// });

game.settings.register(SYSTEM_ID, "hoversJsonLocation", {
name: game.i18n.localize("AC2D20.SETTINGS.hoverName"),
Expand Down

0 comments on commit 7869364

Please sign in to comment.