Add `/reroll-pick` command to reset `{{pick}}` macro (#5049) * feat(macros): Add `/reroll-pick` command to reset `{{pick}}` macro choices - Added `/reroll-pick` slash command to change the seed for all `{{pick}}` macros in current chat - Command accepts optional numeric seed value, otherwise increments current seed by 1 - Updated `{{pick}}` macro to use `pick_reroll_seed` from chat metadata in seed calculation - Updated `{{pick}}` macro description to mention reroll capability - Added comprehensive help text with examples for `/reroll-pick` command - Updated tests * lint fix * fix(macros): exclude null reroll seed from {{pick}} hash calculation - Changed reroll seed default from 0 to null when not set - Filter out null values from combined seed string to avoid including "-0" suffix - Updated both core macro implementation and tests to match new behavior * Use strict null comparison --------- Co-authored-by: Cohee <18619528+Cohee1207@users.noreply.github.com>

26d495f45705f264d4c2aa5bc26d5964d349d5d4

Wolfsblvt <wolfsblvt@gmail.com>

Signed

Parents: f3c886fd120558d702734e56e715937f8c2b191d

public/scripts/macros/definitions/core-macros.js+10 -2 Viewed

     MacroRegistry.registerMacro('pick', {
         category: MacroCategory.RANDOM,
         list: true,
         description: 'Picks a random item from a list, but keeps the choice stable for a given chat and macro position. Can be rerolled via /reroll-pick slash command.',
 +        // TODO: add expanded documentation once HTML details are supported
 +        // descriptionDetails: `
 +        //     <p>Picks a random item from a list, but keeps the choice stable for a given chat and macro position.</p>
 +        //     <p>The choice can be reset per chat using the <code>/reroll-pick</code> slash command.</p>
 +        // `,
         returns: 'Stable randomly selected item from the list.',
         exampleUsage: ['{{pick::blonde::brown::red::black::blue}}'],
         handler: ({ list, globalOffset, env }) => {

             // nested inside arguments or scoped content
             const offset = globalOffset;
 -            const combinedSeedString = `${chatIdHash}-${rawContentHash}-${offset}`;
 +            // Reroll seed allows users to reset all picks in the chat via /reroll-pick command
 +            const rerollSeed = chat_metadata.pick_reroll_seed || null;
++
 +            const combinedSeedString = [chatIdHash, rawContentHash, offset, rerollSeed].filter(it => it !== null).join('-');
             const finalSeed = getStringHash(combinedSeedString);
             const rng = seedrandom(String(finalSeed));
             const randomIndex = Math.floor(rng() * list.length);

public/scripts/slash-commands.js+42 -0 Viewed

         },
     }));
 +    SlashCommandParser.addCommandObject(SlashCommand.fromProps({
 +        name: 'reroll-pick',
 +        callback: (_, value) => {
 +            const currentSeed = chat_metadata.pick_reroll_seed ?? 0;
 +            const parsedValue = value ? parseInt(String(value), 10) : NaN;
++
 +            if (!isNaN(parsedValue)) {
 +                chat_metadata.pick_reroll_seed = parsedValue;
 +            } else {
 +                chat_metadata.pick_reroll_seed = currentSeed + 1;
 +            }
++
 +            saveMetadataDebounced();
 +            return String(chat_metadata.pick_reroll_seed);
 +        },
 +        returns: t`The new reroll seed value.`,
 +        unnamedArgumentList: [
 +            SlashCommandArgument.fromProps({
 +                description: t`Optional seed value to set. If not provided, increments current seed by 1.`,
 +                typeList: [ARGUMENT_TYPE.NUMBER],
 +            }),
 +        ],
 +        helpString: `
 +            <div>
 +                ${t`Rerolls all <code>{{pick}}</code> macro choices in the current chat.`}
 +            </div>
 +            <div>
 +                ${t`The <code>{{pick}}</code> macro normally keeps stable choices per chat. This command changes the seed used for all picks, causing them to resolve to (possibly) different values.`}
 +            </div>
 +            <div>
 +                ${t`If a number is provided, sets the seed to that value. Otherwise, increments the current seed by 1.`}
 +            </div>
 +            <div>
 +                <strong>${t`Example:`}</strong>
 +                <ul>
 +                    <li><pre><code>/reroll-pick</code></pre> ${t`Increments the seed by 1.`}</li>
 +                    <li><pre><code>/reroll-pick 5</code></pre> ${t`Sets the seed to 5.`}</li>
 +                </ul>
 +            </div>
 +        `,
 +    }));
++
     registerVariableCommands();
+}

tests/frontend/MacroEngine.e2e.js+2 -1 Viewed

                         const chatIdHash = chat_metadata.chat_id_hash ?? 0;
                         const rawContentHash = env.contentHash;
                         const offset = globalOffset;
 -                        const combinedSeedString = `${chatIdHash}-${rawContentHash}-${offset}`;
 +                        const rerollSeed = chat_metadata.pick_reroll_seed || null;
 +                        const combinedSeedString = [chatIdHash, rawContentHash, offset, rerollSeed].filter(it => it !== null).join('-');
                         // Return both the seed and what would be picked for validation
                         const finalSeed = getStringHash(combinedSeedString);
                         const rng = seedrandom(String(finalSeed));