Changelog, fixes

changelog.md

@@ -1,5 +1,15 @@
 # Item Piles Changelog
 
+## Version 2.9.1
+
+- Added support for the Shadowdark system (thank you mrstarbuck007 on github!)
+- Added additional settings for item types (thank you p4535992 on github!)
+- Tweaked currency settings to update cached item if the currency names or images were updated
+- Updated D&D4e system support (thank you EndlesNights on github!)
+- Fixed Better Rolltables compatibility (thank you p4535992 on github!)
+- Fixed trying to open merchant columns settings after they had broken would throw error and prevent fixing the error
+- Fixed Simple Calendar integration not hiding tokens of closed merchants that were set to hide
+
 ## Version 2.9.0
 
 - Added formal support for D&D5e 3.0.x - moving/buying/trading containers is still not supported

src/applications/editors/merchant-columns-editor/merchant-columns-editor-shell.svelte

@@ -63,10 +63,6 @@
 		form.requestSubmit();
 	}
 
-	function preventDefault(event) {
-		event.preventDefault();
-	}
-
 </script>
 
 <svelte:options accessors={true}/>

src/applications/item-pile-config/settings/merchant.svelte

@@ -74,13 +74,13 @@
 	}
 
 	async function showMerchantColumns() {
-		const data = pileData.merchantColumns || [];
+		const data = Array.isArray(pileData.merchantColumns) ? pileData.merchantColumns : [];
 		return MerchantColumnsEditor.show(
 			data,
 			{ id: `merchant-columns-item-pile-config-${pileActor.id}` },
 			{ title: localize("ITEM-PILES.Applications.MerchantColumnsEditor.TitleActor", { actor_name: pileActor.name }), }
 		).then((result) => {
-			pileData.merchantColumns = result || [];
+			pileData.merchantColumns = Array.isArray(result.merchantColumns) ? result.merchantColumns : [];
 		});
 	}
 
@@ -292,7 +292,7 @@
 		<span>{localize("ITEM-PILES.Applications.ItemPileConfig.Merchant.HideTokenWhenClosed")}</span>
 		<p>{localize("ITEM-PILES.Applications.ItemPileConfig.Merchant.HideTokenWhenClosedExplanation")}</p>
 	</label>
-	<input bind:checked={pileData.openTimes.hideTokenWhenClosed} type="checkbox"/>
+	<input bind:checked={pileData.hideTokenWhenClosed} type="checkbox"/>
 </div>
 
 <div class="form-group">

src/applications/item-pile-inventory-app/item-pile-inventory-shell.svelte

@@ -220,7 +220,7 @@
 
   .item-piles-items-list {
     max-height: 500px;
-    overflow-y: scroll;
+    overflow-y: auto;
     display: block;
     padding-right: 5px;
 

src/applications/settings-app/Setting.svelte

@@ -4,6 +4,7 @@
 	export let key;
 	export let data;
 	export let disabled = false;
+	export let options = [];
 
 </script>
 
@@ -26,7 +27,7 @@
 		{:else if data.choices}
 
 			<div class="choice-container">
-				<select name={data.key} bind:value={data.value} disabled={disabled}>
+				<select name={key} bind:value={data.value} disabled={disabled}>
 					{#each Object.entries(data.choices) as [key, choice], index (index)}
 						{#if data.type === Number}
 							<option value="{index}">{localize(choice)}</option>
@@ -52,9 +53,18 @@
 		{:else}
 
 			<div class="item-pile-setting-container">
-				<input type="text" bind:value={data.value} disabled={disabled}/>
-				{#if data.localize}
-					<input type="text" disabled value={localize(data.value)}/>
+
+				{#if options.length}
+					<select name="{key}" bind:value={data.value} disabled={disabled}>
+						{#each options as option}
+							<option value={option === "None" ? "" : option}>{option}</option>
+						{/each}
+					</select>
+				{:else}
+					<input type="text" bind:value={data.value} disabled={disabled}/>
+					{#if data.localize}
+						<input type="text" disabled value={localize(data.value)}/>
+					{/if}
 				{/if}
 			</div>
 

src/applications/settings-app/settings-app.js

@@ -3,7 +3,7 @@ import { getActiveApps } from '../../helpers/helpers';
 import SettingsShell from './settings-shell.svelte';
 import SETTINGS from "../../constants/settings.js";
 
-class SettingsApp extends SvelteApplication {
+export class SettingsApp extends SvelteApplication {
 
 	static get defaultOptions() {
 		return foundry.utils.mergeObject(super.defaultOptions, {
@@ -99,7 +99,7 @@ class SettingsApp extends SvelteApplication {
 	}
 }
 
-export default class SettingsShim extends FormApplication {
+export class SettingsShim extends FormApplication {
 
 	/**
 	 * @inheritDoc

src/applications/settings-app/settings-shell.svelte

@@ -57,6 +57,15 @@
 		for (let [key, setting] of settingsToUpdate) {
 			await helpers.setSetting(key, setting.value);
 		}
+		const currencies = settings[SETTINGS.CURRENCIES].value.concat(settings[SETTINGS.SECONDARY_CURRENCIES].value)
+		for (const currency of currencies) {
+			if (!currency.data?.uuid) continue;
+			const actualItem = await fromUuid(currency.data?.uuid);
+			await actualItem.update({
+				name: currency.name,
+				img: currency.img
+			});
+		}
 		application.close();
 	}
 
@@ -101,7 +110,7 @@
 		{ value: "system", label: localize("ITEM-PILES.Applications.Settings.System"), hidden: !userCanChangeSettings },
 	];
 
-	let activeTab = tabs[0].value;
+	let activeTab = application?.options?.tab ?? tabs[0].value;
 
 </script>
 
@@ -183,13 +192,13 @@
             getSettings();
           }}/>
 					<Setting key={SETTINGS.ACTOR_CLASS_TYPE} bind:data="{settings[SETTINGS.ACTOR_CLASS_TYPE]}"
-					         options={game.system.template.Actor.types}/>
+					         options={["None", ...game.system.template.Actor.types]}/>
 					<Setting key={SETTINGS.ITEM_CLASS_LOOT_TYPE} bind:data="{settings[SETTINGS.ITEM_CLASS_LOOT_TYPE]}"
-					         options={game.system.template.Item.types}/>
+					         options={["None", ...game.system.template.Item.types]}/>
 					<Setting key={SETTINGS.ITEM_CLASS_WEAPON_TYPE} bind:data="{settings[SETTINGS.ITEM_CLASS_WEAPON_TYPE]}"
-					         options={game.system.template.Item.types}/>
+					         options={["None", ...game.system.template.Item.types]}/>
 					<Setting key={SETTINGS.ITEM_CLASS_EQUIPMENT_TYPE} bind:data="{settings[SETTINGS.ITEM_CLASS_EQUIPMENT_TYPE]}"
-					         options={game.system.template.Item.types}/>							 							 
+					         options={["None", ...game.system.template.Item.types]}/>
 					<Setting key={SETTINGS.ITEM_QUANTITY_ATTRIBUTE} bind:data="{settings[SETTINGS.ITEM_QUANTITY_ATTRIBUTE]}"/>
 					<Setting key={SETTINGS.ITEM_PRICE_ATTRIBUTE} bind:data="{settings[SETTINGS.ITEM_PRICE_ATTRIBUTE]}"/>
 					<SettingButton key={SETTINGS.CURRENCIES} bind:data="{settings[SETTINGS.CURRENCIES]}"/>

src/constants/settings.js

@@ -35,7 +35,7 @@ const SETTINGS = {
 	ITEM_FILTERS: "itemFilters",
 	ACTOR_CLASS_TYPE: "actorClassType",
 	ITEM_CLASS_LOOT_TYPE: "itemClassLootType",
-    ITEM_CLASS_WEAPON_TYPE: "itemClassWeaponType", 
+	ITEM_CLASS_WEAPON_TYPE: "itemClassWeaponType",
 	ITEM_CLASS_EQUIPMENT_TYPE: "itemClassEquipmentType",
 	ITEM_QUANTITY_ATTRIBUTE: "itemQuantityAttribute",
 	ITEM_PRICE_ATTRIBUTE: "itemPriceAttribute",
@@ -221,7 +221,7 @@ const SETTINGS = {
 			type: String
 		},
 
-		[SETTINGS.ITEM_CLASS_LOOT_TYPE]: {
+		[SETTINGS.ITEM_CLASS_WEAPON_TYPE]: {
 			name: "ITEM-PILES.Settings.ItemWeaponClass.Title",
 			hint: "ITEM-PILES.Settings.ItemWeaponClass.Hint",
 			scope: "world",

src/plugins/simple-calendar.js

@@ -135,25 +135,34 @@ export default class SimpleCalendarPlugin extends BasePlugin {
 
 		const actors = this.actors.filter((actor) => {
 			const pileData = PileUtilities.getActorFlagData(actor);
-			return pileData.hideTokenWhenClosed && PileUtilities.isMerchantClosed(actor, { pileData });
+			return pileData.hideTokenWhenClosed;
 		});
 
-		const actorTokens = actors.map(actor => actor.getActiveTokens())
+		const validTokensOnScenes = actors.map(actor => actor.getActiveTokens())
 			.deepFlatten()
 			.reduce((acc, token) => {
-				if (!acc[token.parent.id]) acc[token.parent.id] = [];
-				acc[token.parent.id].push(token);
+				const tokenDocument = token.document;
+				const sceneId = tokenDocument.parent.id;
+				if (!acc[sceneId]) acc[sceneId] = [];
+				acc[sceneId].push(tokenDocument);
 				return acc;
 			}, {});
 
-		const validTokensOnScenes = this.validTokensOnScenes.filter((token) => {
+		this.validTokensOnScenes.filter((token) => {
 			const pileData = PileUtilities.getActorFlagData(token);
-			return pileData.hideTokenWhenClosed && PileUtilities.isMerchantClosed(token, { pileData });
+			return pileData.hideTokenWhenClosed;
+		}).forEach(([sceneId, token]) => {
+			if (validTokensOnScenes[sceneId].length) {
+				if (!validTokensOnScenes[sceneId].find(t => t === token)) return;
+				validTokensOnScenes[sceneId].push(token)
+			} else {
+				validTokensOnScenes[sceneId] = [token]
+			}
 		});
 
-		for (const [sceneId, tokens] of validTokensOnScenes) {
+		for (const [sceneId, tokens] of Object.entries(validTokensOnScenes)) {
 			const scene = game.scenes.get(sceneId);
-			const updates = Object.values(tokens.concat(actorTokens).reduce((acc, token) => {
+			const updates = Object.values(tokens.reduce((acc, token) => {
 				if (!acc[token.id]) {
 					acc[token.id] = {
 						_id: token.id,