GoodStartLabs/AI_Diplomacy
1
0
Fork 0
mirror of https://github.com/GoodStartLabs/AI_Diplomacy.git synced 2026-04-19 12:58:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

FIX: Messages were triggering at the same time

Browse source 
Was calling the onMessageComplete function twice, fixed that
This commit is contained in:
Tyler Marques 2025-06-13 15:20:46 -07:00
parent 9333f531bd
commit bad4ad37e3
No known key found for this signature in database
GPG key ID: CB99EDCF41D3016F
1 changed files with 38 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

108
ai_animation/src/domElements/chatWindows.ts
View file

@ -157,19 +157,7 @@ function fiterAndSortChatMessagesForPhase(phase: GamePhase): Message[] {
relevantMessages.sort((a, b) => a.time_sent - b.time_sent); relevantMessages.sort((a, b) => a.time_sent - b.time_sent);
return relevantMessages return relevantMessages
} }
/**
* updates the gameState.phaseChatMessages array to the messages for this phase.
*
*/
export function initChatMessagesForPhase() {
gameState.phaseChatMessages = []
gameState.phaseChatMessages = fiterAndSortChatMessagesForPhase(gameState.gameData.phases[gameState.phaseIndex])
}
function playChatMessage(messageIndex) {
addMessageToChat(gameState.currentPhase)
}
// Modified to accumulate messages instead of resetting and only animate for new messages // Modified to accumulate messages instead of resetting and only animate for new messages
/** /**
* Updates chat windows with messages for the current phase * Updates chat windows with messages for the current phase
@ -180,7 +168,6 @@ export function updateChatWindows(stepMessages = false, callback?: () => void) {
// Exit early if no messages // Exit early if no messages
if (!gameState.currentPhase.messages || !gameState.currentPhase.messages.length) { if (!gameState.currentPhase.messages || !gameState.currentPhase.messages.length) {
console.log("No messages to display for this phase"); console.log("No messages to display for this phase");
gameState.messagesPlaying = false;
return; return;
} }
@ -201,73 +188,54 @@ export function updateChatWindows(stepMessages = false, callback?: () => void) {
console.log(`Found ${relevantMessages.length} messages for player ${gameState.currentPower} in phase ${gameState.currentPhase.name}`); console.log(`Found ${relevantMessages.length} messages for player ${gameState.currentPower} in phase ${gameState.currentPhase.name}`);
} }
if (!stepMessages) { // Stepwise mode: show one message at a time, animating word-by-word
// Normal mode: show all messages at once let index = 0;
relevantMessages.forEach(msg => {
const isNew = addMessageToChat(msg);
if (isNew) {
// Increment message counter and play sound on every third message
messageCounter++;
animateHeadNod(msg, (messageCounter % config.soundEffectFrequency === 0));
}
});
} else {
// Stepwise mode: show one message at a time, animating word-by-word
let index = 0;
// Store the start time for debugging // Store the start time for debugging
const messageStartTime = Date.now(); const messageStartTime = Date.now();
// Function to process the next message // Function to process the next message
const showNext = () => { const showNext = () => {
// If we're not playing or user has manually advanced, stop message animation // If we're not playing or user has manually advanced, stop message animation
if (!gameState.isPlaying && !config.isDebugMode) { if (!gameState.isPlaying && !config.isDebugMode) {
console.log("Playback stopped, halting message animations"); console.log("Playback stopped, halting message animations");
return; return;
} }
// All messages have been displayed // All messages have been displayed
if (index >= relevantMessages.length) { if (index >= relevantMessages.length) {
if (config.isDebugMode) {
console.log(`All messages displayed in ${Date.now() - messageStartTime}ms`);
}
console.log("Messages complete, triggering next phase");
if (callback) callback();
return;
}
// Get the next message
const msg = relevantMessages[index];
// Only log in debug mode to reduce console noise
if (config.isDebugMode) { if (config.isDebugMode) {
console.log(`Displaying message ${index + 1}/${relevantMessages.length}: ${msg.sender} to ${msg.recipient}`); console.log(`All messages displayed in ${Date.now() - messageStartTime}ms`);
} }
console.log("Messages complete, triggering next phase");
if (callback) callback();
return;
}
// Function to call after message animation completes // Get the next message
const onMessageComplete = () => { const msg = relevantMessages[index];
index++; // Only increment after animation completes
// Schedule next message with proper delay // Only log in debug mode to reduce console noise
gameState.eventQueue.scheduleDelay(config.messageBetweenDelay, showNext, `show-next-message-${index}-${Date.now()}`); if (config.isDebugMode) {
}; console.log(`Displaying message ${index + 1}/${relevantMessages.length}: ${msg.sender} to ${msg.recipient}`);
}
// Add the message with word animation // Function to call after message animation completes
const isNew = addMessageToChat(msg, true, onMessageComplete); const onMessageComplete = () => {
index++; // Only increment after animation completes
// Handle non-new messages showNext()
if (!isNew) {
onMessageComplete(); // Skip animation for already seen messages
} else {
// Animate head and play sound for new messages (not just when not in debug mode)
messageCounter++;
animateHeadNod(msg, (messageCounter % config.soundEffectFrequency === 0));
}
}; };
// Start the message sequence with initial delay // Add the message with word animation
gameState.eventQueue.scheduleDelay(50, showNext, `start-message-sequence-${Date.now()}`); addMessageToChat(msg, true, onMessageComplete);
}
// Animate head and play sound for new messages (not just when not in debug mode)
messageCounter++;
animateHeadNod(msg, (messageCounter % config.soundEffectFrequency === 0));
};
// Start the message sequence with initial delay
gameState.eventQueue.scheduleDelay(50, showNext, `start-message-sequence-${Date.now()}`);
} }
// Modified to support word-by-word animation and callback // Modified to support word-by-word animation and callback