Merge pull request #281 from Muttley/develop

Release 11.6.1

CHANGELOG.md

@@ -1,3 +1,11 @@
+# v11.6.1
+
+# Enhancements
+- [#280] Cache available Ammo items in compendiums at startup to improve performance on slow systems with large amounts of compendium items
+	* This will mean that if you add a new ammo item type it won't be available on Weapon item sheets until the system is reloaded.
+
+---
+
 # v11.6.0
 
 # Enhancements

system/src/config.mjs

@@ -341,6 +341,20 @@ FALLOUT.WEAPON_TYPES = {
 	unarmed: "FALLOUT.WEAPONS.weaponType.unarmed",
 };
 
+export async function discoverAvailableAmmoTypes() {
+	const ammo = await fallout.compendiums.ammo();
+
+	CONFIG.FALLOUT.AMMO_BY_UUID = {};
+	let ammoTypes = [];
+	for (const ammoType of ammo) {
+		ammoTypes.push(ammoType.name);
+		CONFIG.FALLOUT.AMMO_BY_UUID[ammoType.uuid] = ammoType.name;
+	}
+	ammoTypes = [...new Set(ammoTypes)]; // de-dupe
+
+	CONFIG.FALLOUT.AMMO_TYPES = ammoTypes.sort((a, b) => a.localeCompare(b));
+}
+
 export async function generateEnrichedTooltips() {
 	CONFIG.FALLOUT.WEAPON_QUALITY_TOOLTIPS = {};
 	CONFIG.FALLOUT.WEAPON_QUALITY_HAS_RANK = {};

system/src/hooks/setupHook.mjs

@@ -1,4 +1,7 @@
-import { generateEnrichedTooltips } from "../config.mjs";
+import {
+	discoverAvailableAmmoTypes,
+	generateEnrichedTooltips,
+} from "../config.mjs";
 
 export const setupHook = {
 	attach: () => {
@@ -20,6 +23,7 @@ export const setupHook = {
 			}
 
 			generateEnrichedTooltips();
+			discoverAvailableAmmoTypes();
 		});
 	},
 };

system/src/sheets/FalloutItemSheet.mjs

@@ -80,20 +80,13 @@ export default class FalloutItemSheet extends ItemSheet {
 		}
 
 		if (item.type === "weapon") {
-			const ammo = await fallout.compendiums.ammo();
-
-			context.ammoUuid = ammo.find(
-				a => a.name === this.item.system.ammo
-			)?.uuid ?? "";
-
-
-			let ammoTypes = [];
-			for (const ammoType of ammo) {
-				ammoTypes.push(ammoType.name);
+			for (const [uuid, name] of Object.entries(CONFIG.FALLOUT.AMMO_BY_UUID)) {
+				if (name === this.item.system.ammo) {
+					context.ammoUuid = uuid;
+					break;
+				}
 			}
-			ammoTypes = [...new Set(ammoTypes)]; // de-dupe
-
-			context.ammoTypes = ammoTypes.sort((a, b) => a.localeCompare(b));
+			context.ammoTypes = CONFIG.FALLOUT.AMMO_TYPES;
 
 			context.damageTypes = [];
 			for (const key in CONFIG.FALLOUT.DAMAGE_TYPES) {

system/system.json

@@ -2,7 +2,7 @@
 	"id": "fallout",
 	"title": "Fallout: The Roleplaying Game",
 	"description": "An unofficial system for playing the Fallout RPG from Modiphius Entertainment Ltd.",
-	"version": "11.6.0",
+	"version": "11.6.1",
 	"compatibility": {
 		"minimum": "11",
 		"verified": "11"