From cb14acf58ef6dd9dedb05574184c3c8e99f22ab5 Mon Sep 17 00:00:00 2001 From: Tipragot Date: Sat, 4 Nov 2023 16:47:31 +0100 Subject: [PATCH] =?UTF-8?q?On=20r=C3=A8gle=20les=20probl=C3=A8mes=20et=20c?= =?UTF-8?q?'est=20bon?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/dialogs/{failed.json => failed/info.json} | 0 assets/dialogs/{search.json => search/info.json} | 0 src/plugins/dialog.py | 13 ++----------- 3 files changed, 2 insertions(+), 11 deletions(-) rename assets/dialogs/{failed.json => failed/info.json} (100%) rename assets/dialogs/{search.json => search/info.json} (100%) diff --git a/assets/dialogs/failed.json b/assets/dialogs/failed/info.json similarity index 100% rename from assets/dialogs/failed.json rename to assets/dialogs/failed/info.json diff --git a/assets/dialogs/search.json b/assets/dialogs/search/info.json similarity index 100% rename from assets/dialogs/search.json rename to assets/dialogs/search/info.json diff --git a/src/plugins/dialog.py b/src/plugins/dialog.py index c08b0d4..aa2d500 100644 --- a/src/plugins/dialog.py +++ b/src/plugins/dialog.py @@ -5,7 +5,6 @@ Un plugin permettant de gérer l'affichage et l'audio des dialogues. import json import random -import threading import pygame from engine.ecs import World @@ -15,27 +14,19 @@ from plugins import render # from plugins.assets import Assets from plugins.sound import Sound from plugins.text import Text -import pyttsx3 - - -engine = pyttsx3.init() def spawn_dialog(world: World, name: str, index: int = -1, height: float = 100): """ Fait apparaitre un dialogue dans le monde. """ - global engine texts: list[str] = json.load( - open(f"assets/dialogs/{name}.json", "r", encoding="utf-8") + open(f"assets/dialogs/{name}/info.json", "r", encoding="utf-8") ) text = random.choice(texts) if index == -1 else texts[index] - # engine.say(text) - engine.save_to_file(text, "voice.mp3") - engine.runAndWait() world.new_entity().set( Sound( - pygame.mixer.Sound("voice.mp3"), + pygame.mixer.Sound(f"assets/dialogs/{name}/{index}.mp3"), callback=lambda world, entity: entity.destroy(), ), Text(text, position=Vec2(render.WIDTH / 2, height), origin=Vec2(0.5)),