Merge branch 'release' into staging

66adbea12bc36f7d543812331dfe641733433551

Cohee <18619528+Cohee1207@users.noreply.github.com>

1 files changed, +5 -5Showing whitespace changes
public/scripts/world-info.js+5 -5
@@ -3608,7 +3608,7 @@ export async function deleteWorldInfoEntry(data, uid, { silent = false } = {}) {
3608 *3608 *
3609 * Use `newEntryTemplate` if you just need the template that contains default values3609 * Use `newEntryTemplate` if you just need the template that contains default values
3610 *3610 *
3611 * @type {{[key: string]: { default: any, type: string }}}3611 * @type {{[key: string]: { default: any, type: string, excludeFromTemplate?: boolean }}}
3612 */3612 */
3613export const newWorldInfoEntryDefinition = {3613export const newWorldInfoEntryDefinition = {
3614 key: { default: [], type: 'array' },3614 key: { default: [], type: 'array' },
@@ -3647,13 +3647,13 @@ export const newWorldInfoEntryDefinition = {
3647 sticky: { default: null, type: 'number?' },3647 sticky: { default: null, type: 'number?' },
3648 cooldown: { default: null, type: 'number?' },3648 cooldown: { default: null, type: 'number?' },
3649 delay: { default: null, type: 'number?' },3649 delay: { default: null, type: 'number?' },
3650 characterFilterNames: { default: [], type: 'array' },3650 characterFilterNames: { default: [], type: 'array', excludeFromTemplate: true },
3651 characterFilterTags: { default: [], type: 'array' },3651 characterFilterTags: { default: [], type: 'array', excludeFromTemplate: true },
3652 characterFilterExclude: { default: false, type: 'boolean' },3652 characterFilterExclude: { default: false, type: 'boolean', excludeFromTemplate: true },
3653};3653};
36543654
3655export const newWorldInfoEntryTemplate = Object.fromEntries(3655export const newWorldInfoEntryTemplate = Object.fromEntries(
3656 Object.entries(newWorldInfoEntryDefinition).map(([key, value]) => [key, value.default]),3656 Object.entries(newWorldInfoEntryDefinition).filter(([_, value]) => !value.excludeFromTemplate).map(([key, value]) => [key, value.default]),
3657);3657);
36583658
3659/**3659/**