diff --git a/public/scripts/slash-commands.js b/public/scripts/slash-commands.js index b6a9f2de0..ef164883e 100644 --- a/public/scripts/slash-commands.js +++ b/public/scripts/slash-commands.js @@ -84,7 +84,7 @@ SlashCommandParser.addCommandObject(SlashCommand.fromProps({ typeList: [ARGUMENT_TYPE.STRING], enumList: [ new SlashCommandEnumValue('slash', 'slash commands (STscript)', enumTypes.command, '/'), - new SlashCommandEnumValue('macros', '{{macros}} (text replacement)', enumTypes.macro, '{{'), + new SlashCommandEnumValue('macros', '{{macros}} (text replacement)', enumTypes.macro, enumIcons.macro), new SlashCommandEnumValue('format', 'chat/text formatting', enumTypes.name, '★'), new SlashCommandEnumValue('hotkeys', 'keyboard shortcuts', enumTypes.enum, '⏎'), ], diff --git a/public/scripts/slash-commands/SlashCommandArgument.js b/public/scripts/slash-commands/SlashCommandArgument.js index 8cf16e820..e27831a0c 100644 --- a/public/scripts/slash-commands/SlashCommandArgument.js +++ b/public/scripts/slash-commands/SlashCommandArgument.js @@ -28,7 +28,7 @@ export class SlashCommandArgument { * @param {string|SlashCommandClosure} [props.defaultValue=null] default value if no value is provided * @param {string|SlashCommandEnumValue|(string|SlashCommandEnumValue)[]} [props.enumList=[]] list of accepted values * @param {(executor:SlashCommandExecutor)=>SlashCommandEnumValue[]} [props.enumProvider=null] function that returns auto complete options - * @param {boolean} [props.forceEnum=true] default: true - whether the input must match one of the enum values + * @param {boolean} [props.forceEnum=false] default: false - whether the input must match one of the enum values */ static fromProps(props) { return new SlashCommandArgument( @@ -39,7 +39,7 @@ export class SlashCommandArgument { props.defaultValue ?? null, props.enumList ?? [], props.enumProvider ?? null, - props.forceEnum ?? true, + props.forceEnum ?? false, ); } @@ -50,7 +50,7 @@ export class SlashCommandArgument { /**@type {string|SlashCommandClosure}*/ defaultValue; /**@type {SlashCommandEnumValue[]}*/ enumList = []; /**@type {(executor:SlashCommandExecutor)=>SlashCommandEnumValue[]}*/ enumProvider = null; - /**@type {boolean}*/ forceEnum = true; + /**@type {boolean}*/ forceEnum = false; /** * @param {string} description diff --git a/public/scripts/slash-commands/SlashCommandCommonEnumsProvider.js b/public/scripts/slash-commands/SlashCommandCommonEnumsProvider.js index 22f25a281..87816db90 100644 --- a/public/scripts/slash-commands/SlashCommandCommonEnumsProvider.js +++ b/public/scripts/slash-commands/SlashCommandCommonEnumsProvider.js @@ -14,7 +14,7 @@ export const enumIcons = { default: '◊', // Variables - variable: 'V', + variable: '𝑥', localVariable: 'L', globalVariable: 'G', scopeVariable: 'S', @@ -24,6 +24,8 @@ export const enumIcons = { group: '🧑‍🤝‍🧑', persona: '🧙‍♂️', qr: 'QR', + closure: '𝑓', + macro: '{{', tag: '🏷️', world: '🌐', preset: '⚙️', @@ -37,10 +39,9 @@ export const enumIcons = { boolean: '🔲', string: '📝', number: '1️⃣', - array: '📦', + array: '[]', enum: '📚', - dictionary: '📖', - closure: '🧩', + dictionary: '{}', // Roles system: '⚙️',