fix: исправлено формирование текста и TTS для предыдущего хода и текущего движения

Author: axtrace

handlers/waiting_newgame_confirm_handler.py

@@ -18,7 +18,7 @@ def handle(self):
         logger.info(f"WaitingNewgameConfirmHandler. handle. Запрос: {self.request}") 
         if self.intent_validator.validate_yes():
             self.reset_game()
-            self.game.set_skill_state('WAITING_CONFIRM')
+            self.game.set_skill_state('WAITING_COLOR')
             state_text = texts.state_texts.get(self.game.get_skill_state(), '')
             return self.say(state_text)
 

text_preparer.py

@@ -30,17 +30,9 @@ def say_your_move(self, comp_move='', prev_turn='', text_to_show='', text_to_say
         prev_turn_tts = self.speaker.say_turn(prev_turn, lang) if prev_turn else ''
 
         if prev_turn:
-            # if previous turn was given
-            text_tts += f'{prev_turn_tts} пошли '
-            text += f'\n{prev_turn_tts} пошли '
-        if comp_move:
-            # if comp move was given
-            text += f'{comp_move}. '
-            text_tts += f'{move_to_say}. '
-
-        # text += '\nВаш ход!'
-        # text_tts += '. Ваш ход!'
-
+            text = f'\n{prev_turn_tts} пошли {comp_move}.' + text
+            text_tts = f'{prev_turn_tts} пошли {move_to_say}.' + text_tts
+  
         return text, text_tts
 
     @staticmethod