Prefer current char if multiple have the same name

- Match against current chat character first
- Also removed avatar-key matching, it was broken
This commit is contained in:
Wolfsblvt 2024-09-15 17:53:14 +02:00
parent c47e198664
commit 6714bb8c15

View File

@ -3138,12 +3138,12 @@ export async function sendMessageAs(args, text) {
const isSystem = bias && !removeMacros(mesText).length;
const compact = isTrueBoolean(args?.compact);
const character = characters.find(x => x.avatar === name) ?? characters.find(x => x.name === name);
let force_avatar, original_avatar;
const chatCharacter = this_chid !== undefined ? characters[this_chid] : null;
const isNeutralCharacter = !chatCharacter && name2 === neutralCharacterName && name === neutralCharacterName;
const character = chatCharacter.name === name ? chatCharacter : characters.find(x => x.name === name);
let force_avatar, original_avatar;
if (chatCharacter === character || isNeutralCharacter) {
// If the targeted character is the currently selected one in a solo chat, we don't need to force any avatars
}