From 78693648eceeb1a611bec7822d5ec93c2cae6f82 Mon Sep 17 00:00:00 2001
From: Paul Maskelyne <mu77ley@gmail.com>
Date: Fri, 31 May 2024 23:00:25 +0100
Subject: [PATCH] closes #88

---
 CHANGELOG.md                     |  2 ++
 system/src/documents/ACActor.mjs | 11 ++++++-----
 system/src/settings.mjs          | 22 +++++++++++-----------
 3 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 45ac5d0..f1b0ecd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -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
@@ -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*
 
diff --git a/system/src/documents/ACActor.mjs b/system/src/documents/ACActor.mjs
index 59fcdd2..e488442 100644
--- a/system/src/documents/ACActor.mjs
+++ b/system/src/documents/ACActor.mjs
@@ -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());
 
diff --git a/system/src/settings.mjs b/system/src/settings.mjs
index 5e6c895..8017cba 100644
--- a/system/src/settings.mjs
+++ b/system/src/settings.mjs
@@ -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"),