GoodStartLabs/AI_Diplomacy
1
0
Fork 0
mirror of https://github.com/GoodStartLabs/AI_Diplomacy.git synced 2026-04-28 17:29:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Cleanup of some lingering code

Browse source 
There is logic littered all over the place. We don't have some central
way of determining order for operations and it's driving me insane. This
needs a refactoring so we have a central way to control the order of
operations here.
This commit is contained in:
Tyler Marques 2025-06-09 17:31:06 -07:00
parent e7a862aee8
commit d454c68044
No known key found for this signature in database
GPG key ID: CB99EDCF41D3016F
5 changed files with 81 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

19
ai_animation/src/phase.ts
View file

@ -35,7 +35,6 @@ export function _setPhase(phaseIndex: number) {
if (config.isDebugMode) {
debugMenuInstance.updateTools()
}
const gameLength = gameState.gameData.phases.length
// Validate that the phaseIndex is within the bounds of the game length.
@ -73,6 +72,12 @@ export function _setPhase(phaseIndex: number) {
}
// --- PLAYBACK CONTROLS ---
/**
* Updates the gameState.isPlaying variable, toggling it from current position. Updates UI Elements to indicate current state.
*
* @param explicitSet - If you need to set the state to playing or not, use this with the bool of what you want the state to be.
*
*/
export function togglePlayback(explicitSet: boolean | undefined = undefined) {
// If the game doesn't have any data, or there are no phases, return;
if (!gameState.gameData || gameState.gameData.phases.length <= 0) {
@ -98,15 +103,14 @@ export function togglePlayback(explicitSet: boolean | undefined = undefined) {
if (gameState.cameraPanAnim) gameState.cameraPanAnim.getAll()[1].start()
// First, show the messages of the current phase if it's the initial playback
const phase = gameState.gameData.phases[gameState.phaseIndex];
if (phase.messages && phase.messages.length) {
if (gameState.currentPhase.messages && gameState.currentPhase.messages.length) {
// Show messages with stepwise animation
logger.log(`Playing ${phase.messages.length} messages from phase ${gameState.phaseIndex + 1}/${gameState.gameData.phases.length}`);
updateChatWindows(phase, true);
logger.log(`Playing ${gameState.currentPhase.messages.length} messages from phase ${gameState.phaseIndex + 1}/${gameState.gameData.phases.length}`);
gameState.nextPhaseScheduled = true
displayPhase()
} else {
// No messages, go straight to unit animations
logger.log("No messages for this phase, proceeding to animations");
displayPhaseWithAnimation();
}
} else {
if (gameState.cameraPanAnim) gameState.cameraPanAnim.getAll()[0].pause();
@ -211,7 +215,7 @@ export function displayPhase(skipMessages = false) {
// Show messages with animation or immediately based on skipMessages flag
if (!skipMessages) {
updateChatWindows(currentPhase, true);
updateChatWindows(true);
} else {
gameState.messagesPlaying = false;
}
@ -234,7 +238,6 @@ export function displayPhase(skipMessages = false) {
}
} else {
logger.log("No animations for this phase transition");
gameState.messagesPlaying = false;
}
gameState.nextPhaseScheduled = false;