Merge pull request #2474 from Esalarc/talkativeness

Tweaks to activateNaturalOrder
This commit is contained in:
Cohee 2024-07-04 20:02:39 +03:00 committed by GitHub
commit 0ec79427ff
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -1006,6 +1006,7 @@ function activateNaturalOrder(members, input, lastMessage, allowSelfResponses, i
}
}
let chattyMembers = [];
// activation by talkativeness (in shuffled order, except banned)
const shuffledMembers = shuffle([...members]);
for (let member of shuffledMembers) {
@ -1023,19 +1024,24 @@ function activateNaturalOrder(members, input, lastMessage, allowSelfResponses, i
if (talkativeness >= rollValue) {
activatedMembers.push(member);
}
if (talkativeness > 0){
chattyMembers.push(member);
}
}
// pick 1 at random if no one was activated
let retries = 0;
while (activatedMembers.length === 0 && ++retries <= members.length) {
const randomIndex = Math.floor(Math.random() * members.length);
const character = characters.find((x) => x.avatar === members[randomIndex]);
// try to limit the selected random character to those with talkativeness > 0
let randomPool = chattyMembers.length > 0? chattyMembers : members;
while (activatedMembers.length === 0 && ++retries <= randomPool.length) {
const randomIndex = Math.floor(Math.random() * randomPool.length);
const character = characters.find((x) => x.avatar === randomPool[randomIndex]);
if (!character) {
continue;
}
activatedMembers.push(members[randomIndex]);
activatedMembers.push(randomPool[randomIndex]);
}
// de-duplicate array of character avatars