fix defaults

MrVauxs · Jun 18, 2023 · ce13dff · ce13dff
1 parent 141f243
commit ce13dff
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 25 deletions.
diff --git a/packs/macros/000020.log → packs/macros/000024.log b/packs/macros/000020.log → packs/macros/000024.log
diff --git a/packs/macros/CURRENT b/packs/macros/CURRENT
@@ -1 +1 @@
-MANIFEST-000018
+MANIFEST-000022
diff --git a/packs/macros/LOG b/packs/macros/LOG
@@ -1,8 +1,8 @@
-2023/06/18-19:27:36.992624 ffff74e7e160 Recovering log #16
-2023/06/18-19:27:37.003088 ffff74e7e160 Delete type=0 #16
-2023/06/18-19:27:37.003115 ffff74e7e160 Delete type=3 #14
-2023/06/18-19:56:59.611723 fffe53fff160 Level-0 table #21: started
-2023/06/18-19:56:59.611769 fffe53fff160 Level-0 table #21: 0 bytes OK
-2023/06/18-19:56:59.614804 fffe53fff160 Delete type=0 #19
-2023/06/18-19:56:59.620689 fffe53fff160 Manual compaction at level-0 from '!macros!Ix6ye8207xMySmjN' @ 72057594037927935 : 1 .. '!macros!mnKNj84r6ZmGZyX3' @ 0 : 0; will stop at (end)
-2023/06/18-19:56:59.623407 fffe53fff160 Manual compaction at level-1 from '!macros!Ix6ye8207xMySmjN' @ 72057594037927935 : 1 .. '!macros!mnKNj84r6ZmGZyX3' @ 0 : 0; will stop at (end)
+2023/06/18-20:55:59.886966 ffff7467d160 Recovering log #20
+2023/06/18-20:55:59.895468 ffff7467d160 Delete type=3 #18
+2023/06/18-20:55:59.895510 ffff7467d160 Delete type=0 #20
+2023/06/18-21:00:33.833232 fffe53fff160 Level-0 table #25: started
+2023/06/18-21:00:33.833300 fffe53fff160 Level-0 table #25: 0 bytes OK
+2023/06/18-21:00:33.836508 fffe53fff160 Delete type=0 #23
+2023/06/18-21:00:33.836644 fffe53fff160 Manual compaction at level-0 from '!macros!Ix6ye8207xMySmjN' @ 72057594037927935 : 1 .. '!macros!mnKNj84r6ZmGZyX3' @ 0 : 0; will stop at (end)
+2023/06/18-21:00:33.836678 fffe53fff160 Manual compaction at level-1 from '!macros!Ix6ye8207xMySmjN' @ 72057594037927935 : 1 .. '!macros!mnKNj84r6ZmGZyX3' @ 0 : 0; will stop at (end)
diff --git a/packs/macros/LOG.old b/packs/macros/LOG.old
@@ -1,8 +1,8 @@
-2023/06/18-18:52:47.336438 ffff7567f160 Recovering log #12
-2023/06/18-18:52:47.348643 ffff7567f160 Delete type=0 #12
-2023/06/18-18:52:47.348694 ffff7567f160 Delete type=3 #10
-2023/06/18-19:26:57.867368 fffe53fff160 Level-0 table #17: started
-2023/06/18-19:26:57.867411 fffe53fff160 Level-0 table #17: 0 bytes OK
-2023/06/18-19:26:57.870206 fffe53fff160 Delete type=0 #15
-2023/06/18-19:26:57.875841 fffe53fff160 Manual compaction at level-0 from '!macros!Ix6ye8207xMySmjN' @ 72057594037927935 : 1 .. '!macros!mnKNj84r6ZmGZyX3' @ 0 : 0; will stop at (end)
-2023/06/18-19:26:57.876053 fffe53fff160 Manual compaction at level-1 from '!macros!Ix6ye8207xMySmjN' @ 72057594037927935 : 1 .. '!macros!mnKNj84r6ZmGZyX3' @ 0 : 0; will stop at (end)
+2023/06/18-19:27:36.992624 ffff74e7e160 Recovering log #16
+2023/06/18-19:27:37.003088 ffff74e7e160 Delete type=0 #16
+2023/06/18-19:27:37.003115 ffff74e7e160 Delete type=3 #14
+2023/06/18-19:56:59.611723 fffe53fff160 Level-0 table #21: started
+2023/06/18-19:56:59.611769 fffe53fff160 Level-0 table #21: 0 bytes OK
+2023/06/18-19:56:59.614804 fffe53fff160 Delete type=0 #19
+2023/06/18-19:56:59.620689 fffe53fff160 Manual compaction at level-0 from '!macros!Ix6ye8207xMySmjN' @ 72057594037927935 : 1 .. '!macros!mnKNj84r6ZmGZyX3' @ 0 : 0; will stop at (end)
+2023/06/18-19:56:59.623407 fffe53fff160 Manual compaction at level-1 from '!macros!Ix6ye8207xMySmjN' @ 72057594037927935 : 1 .. '!macros!mnKNj84r6ZmGZyX3' @ 0 : 0; will stop at (end)
diff --git a/packs/macros/MANIFEST-000018 → packs/macros/MANIFEST-000022 b/packs/macros/MANIFEST-000018 → packs/macros/MANIFEST-000022
diff --git a/src/settings/settings.js b/src/settings/settings.js
@@ -89,11 +89,13 @@ Hooks.once('init', () => {
 });
 
 Hooks.once('ready', () => {
-	if (game.settings.get(moduleID, 'sources') === 'none') {
+	if (game.settings.get(moduleID, 'sources').includes('none')) {
+		console.log('Foundry Summons | Selecting default sources');
 		selectDefaultSources();
 	}
 
-	if (game.settings.get(moduleID, 'indexFields') === 'none') {
+	if (game.settings.get(moduleID, 'indexFields').includes('none')) {
+		console.log('Foundry Summons | Selecting default index fields');
 		setDefaultIndexFields();
 	}
 

diff --git a/src/settings/systemSpecific.js b/src/settings/systemSpecific.js
@@ -34,7 +34,7 @@ export function selectDefaultSources() {
 				.map((x) => x.metadata)
 				.filter((x) => x.name === 'monsters');
 
-			game.settings.set(moduleID, 'sources', array);
+			gameSettings.getStore('sources').set(array);
 			break;
 		}
 		case 'pf2e': {
@@ -47,11 +47,11 @@ export function selectDefaultSources() {
 						.includes(x.id)
 				);
 
-			game.settings.set(moduleID, 'sources', array);
+			gameSettings.getStore('sources').set(array);
 			break;
 		}
 		default: {
-			game.settings.set(moduleID, 'sources', ['']);
+			gameSettings.getStore('sources').set(['']);
 			break;
 		}
 	}
@@ -63,15 +63,15 @@ export function selectDefaultSources() {
 export function setDefaultIndexFields() {
 	switch (game.system.id) {
 		case 'dnd5e': {
-			game.settings.set(moduleID, 'indexFields', ['img']);
+			gameSettings.getStore('indexFields').set(['img']);
 			break;
 		}
 		case 'pf2e': {
-			game.settings.set(moduleID, 'indexFields', game.pf2e.compendiumBrowser.tabs.bestiary.index);
+			gameSettings.getStore('indexFields').set(game.pf2e.compendiumBrowser.tabs.bestiary.index);
 			break;
 		}
 		default: {
-			game.settings.set(moduleID, 'indexFields', ['']);
+			gameSettings.getStore('indexFields').set(['']);
 			break;
 		}
 	}