Update app.py

app.py

@@ -23,7 +23,6 @@ import io
 # 1. ЗВУКИ (только эффекты, без фона)
 # =====================================================
 
-# Генерируем простые звуки в base64 (без внешних файлов)
 def generate_sound(freq=440, duration=0.1, waveform='sine'):
     """Генерирует простой звук в base64"""
     import struct
@@ -32,14 +31,12 @@ def generate_sound(freq=440, duration=0.1, waveform='sine'):
     sample_rate = 22050
     samples = int(sample_rate * duration)
     
-    # Создаём WAV в памяти
     buffer = io.BytesIO()
     wav = wave.open(buffer, 'wb')
     wav.setnchannels(1)
     wav.setsampwidth(2)
     wav.setframerate(sample_rate)
     
-    # Генерируем волну
     for i in range(samples):
         t = i / sample_rate
         if waveform == 'sine':
@@ -48,7 +45,7 @@ def generate_sound(freq=440, duration=0.1, waveform='sine'):
             val = int(32767 * 0.5 * (1 if math.sin(2 * math.pi * freq * t) > 0 else -1))
         elif waveform == 'noise':
             val = int(32767 * 0.3 * random.random())
-        else:  # sweep (для смерти)
+        else:  # sweep
             f = freq + i * 200 / samples
             val = int(32767 * 0.5 * math.sin(2 * math.pi * f * t))
         wav.writeframes(struct.pack('<h', val))
@@ -56,19 +53,16 @@ def generate_sound(freq=440, duration=0.1, waveform='sine'):
     wav.close()
     buffer.seek(0)
     
-    # Конвертируем в base64
     audio_data = base64.b64encode(buffer.read()).decode('utf-8')
     return f'data:audio/wav;base64,{audio_data}'
 
-# Создаём звуки
 SOUNDS = {
-    'jump': generate_sound(600, 0.08, 'sine'),     # Высокий писк
-    'coin': generate_sound(880, 0.05, 'sine'),     # Очень высокий
-    'die': generate_sound(200, 0.3, 'sweep')       # Падающий звук
+    'jump': generate_sound(600, 0.08, 'sine'),
+    'coin': generate_sound(880, 0.05, 'sine'),
+    'die': generate_sound(200, 0.3, 'sweep')
 }
 
 def get_sound_html(sound_type):
-    """Возвращает HTML для воспроизведения звука"""
     if sound_type in SOUNDS:
         return f'<audio autoplay><source src="{SOUNDS[sound_type]}" type="audio/wav"></audio>'
     return ''
@@ -129,7 +123,6 @@ class InfinitePlatformer:
         num_enemies = random.randint(1, 3) + int(self.difficulty * 0.5)
         num_coins = random.randint(5, 10) + int(self.difficulty)
         
-        # Препятствия
         for _ in range(num_obstacles):
             x = base_x + random.randint(5, 25)
             height = random.randint(1, 3 + int(self.difficulty * 0.5))
@@ -139,7 +132,6 @@ class InfinitePlatformer:
                 'width': width, 'height': height
             })
         
-        # Ямы
         for _ in range(random.randint(1, 2)):
             x = base_x + random.randint(10, 20)
             width = random.randint(2, 4)
@@ -148,7 +140,6 @@ class InfinitePlatformer:
                 'width': width, 'height': 1, 'is_pit': True
             })
         
-        # Враги
         for _ in range(num_enemies):
             x = base_x + random.randint(5, 25)
             y = self.ground_level - 1
@@ -161,7 +152,6 @@ class InfinitePlatformer:
                 'start_x': x
             })
         
-        # Монетки
         for _ in range(num_coins):
             x = base_x + random.randint(2, 28)
             y = random.randint(5, self.ground_level - 2)
@@ -256,66 +246,54 @@ class InfinitePlatformer:
         return False
     
     def step(self, action, is_ai=False):
-        """Выполняет действие. Возвращает (состояние, награда, конец, звук)"""
         px, py = self.player[0], self.player[1]
         sound = None
         
-        # Горизонтальное движение
-        if action == 1:  # влево
+        if action == 1:
             self.player[0] -= 0.5
-        elif action == 2:  # вправо
+        elif action == 2:
             self.player[0] += 0.5
         
-        # Прыжок
         if action == 3 and self.on_ground:
             self.velocity_y = self.jump_power
             self.on_ground = False
             sound = 'jump'
         
-        # Гравитация
         self.velocity_y += self.gravity
         self.player[1] += self.velocity_y
         
-        # Земля
         if self.player[1] >= self.ground_level:
             self.player[1] = self.ground_level
             self.velocity_y = 0
             self.on_ground = True
         
-        # Падение в яму
         if self.player[1] > self.height:
             self.alive = False
             sound = 'die'
             return self.get_state(), -50, True, sound
         
-        # Обновление врагов
         died = self.update_entities()
         if died:
             self.alive = False
             sound = 'die'
             return self.get_state(), -50, True, sound
         
-        # Сбор моне��ок
         coins_collected = self.collect_coins()
         if coins_collected > 0:
             self.coins_collected += coins_collected
             sound = 'coin'
         
-        # Проверка препятствий
         if self.check_obstacles():
             self.alive = False
             sound = 'die'
             return self.get_state(), -50, True, sound
         
-        # Продвижение
         self.distance += 0.1 * self.speed
         self.score += coins_collected * 10 + 1
         
-        # Сложность
         self.difficulty = 1 + self.distance / 1000
         self.speed = 1 + self.difficulty * 0.1
         
-        # Генерация чанков
         current_chunk = int(self.player[0] // 30)
         for i in range(current_chunk, current_chunk + 3):
             self.generate_chunk(i)
@@ -334,7 +312,6 @@ class InfinitePlatformer:
                         if coin not in self.coins:
                             self.coins.append(coin)
         
-        # Удаление далёких объектов
         self.obstacles = [o for o in self.obstacles if abs(o['x'] - self.player[0]) < self.width]
         self.entities = [e for e in self.entities if abs(e['x'] - self.player[0]) < self.width]
         self.coins = [c for c in self.coins if abs(c['x'] - self.player[0]) < self.width]
@@ -347,14 +324,11 @@ class InfinitePlatformer:
         return self.get_state(), reward, False, sound
     
     def render(self, show_player=True):
-        """Визуализация"""
         grid = np.zeros((self.height, 80, 3), dtype=np.uint8)
         grid.fill(200)
         
-        # Земля
         grid[self.ground_level:self.ground_level+2, :] = [100, 80, 40]
         
-        # Препятствия
         for obs in self.obstacles:
             if obs.get('is_pit', False):
                 x = int(obs['x'] - self.player[0] + 40)
@@ -370,7 +344,6 @@ class InfinitePlatformer:
                         if 0 <= sx < 80 and 0 <= sy < self.height:
                             grid[sy, sx] = [150, 120, 80]
         
-        # Враги
         for enemy in self.entities:
             x = int(enemy['x'] - self.player[0] + 40)
             y = int(enemy['y'])
@@ -379,7 +352,6 @@ class InfinitePlatformer:
                 if enemy['type'] == 'jumper':
                     grid[y-1, x] = [200, 0, 0]
         
-        # Монетки
         for coin in self.coins:
             if not coin['collected']:
                 x = int(coin['x'] - self.player[0] + 40)
@@ -387,7 +359,6 @@ class InfinitePlatformer:
                 if 0 <= x < 80 and 0 <= y < self.height:
                     grid[y, x] = [255, 215, 0]
         
-        # Игрок
         if show_player:
             px = 40
             py = int(self.player[1])
@@ -396,7 +367,6 @@ class InfinitePlatformer:
                 grid[py-1, px] = [0, 200, 0]
                 grid[py-2, px] = [0, 150, 0]
         
-        # Информация
         img = Image.fromarray(grid, 'RGB')
         return img
 
@@ -546,22 +516,22 @@ class ChatMemory:
         return None
 
 # =====================================================
-# 5. ИГРОВОЙ ЦИКЛ
+# 5. ГЛОБАЛЬНЫЕ ПЕРЕМЕННЫЕ (объявлены ДО использования)
 # =====================================================
 
 agent = DQNAgent()
 chat_memory = ChatMemory()
 training_thread = None
 is_training = False
-
-# Синхронизированный seed для обоих игроков
 current_seed = random.randint(0, 999999)
 
+# =====================================================
+# 6. ИГРОВОЙ ЦИКЛ
+# =====================================================
+
 def game_loop(player_action=None):
-    """Основной игровой цикл для двух игроков"""
     global current_seed, agent
     
-    # Создаём два экземпляра игры с одинаковым seed
     ai_env = InfinitePlatformer(seed=current_seed)
     player_env = InfinitePlatformer(seed=current_seed)
     
@@ -577,7 +547,6 @@ def game_loop(player_action=None):
     sound_html = ''
     
     for step in range(200):
-        # Ход ИИ
         if ai_alive:
             ai_action = agent.act(ai_state)
             ai_next_state, ai_reward, ai_done, ai_sound = ai_env.step(ai_action, is_ai=True)
@@ -587,9 +556,7 @@ def game_loop(player_action=None):
             ai_score = ai_env.score
             ai_alive = not ai_done
         
-        # Ход игрока
         if player_alive and player_action is not None:
-            # player_action: 0-ничего, 1-влево, 2-вправо, 3-прыжок
             player_next_state, player_reward, player_done, player_sound = player_env.step(player_action, is_ai=False)
             if player_sound and player_alive:
                 sound_html += get_sound_html(player_sound)
@@ -597,29 +564,24 @@ def game_loop(player_action=None):
             player_score = player_env.score
             player_alive = not player_done
         
-        # Рендерим оба окна
         frames_ai.append(ai_env.render(show_player=ai_alive))
         frames_player.append(player_env.render(show_player=player_alive))
         
         if not ai_alive and not player_alive:
             break
     
-    # Создаём анимацию через HTML
-    from PIL import Image as PILImage
-    import io
-    
-    # Конвертируем кадры в GIF (для демонстрации используем последний кадр)
     final_img_ai = frames_ai[-1] if frames_ai else ai_env.render()
     final_img_player = frames_player[-1] if frames_player else player_env.render()
     
-    return final_img_ai, final_img_player, f"🤖 ИИ: {ai_score} | 🎮 Ты: {player_score}", sound_html
+    return final_img_ai, final_img_player, f"🤖 ИИ: {ai_score} | 🎮 Ты: {player_score} | 🪙 Монет: {player_env.coins_collected}", sound_html
 
 # =====================================================
-# 6. CHAT FUNCTIONS
+# 7. CHAT FUNCTIONS
 # =====================================================
 
 def chat_ai(message):
-    """Обработчик чата"""
+    global training_thread, is_training, current_seed
+    
     if message.startswith('/ai '):
         question = message[4:].strip()
         if not question:
@@ -660,7 +622,6 @@ def chat_ai(message):
 """
     
     elif message == '/train':
-        global training_thread, is_training, current_seed
         if not is_training:
             is_training = True
             def train():
@@ -681,12 +642,10 @@ def chat_ai(message):
         return "🤖 Команды:\n/ai <вопрос>\n/data вопрос|ответ\n/stats\n/train"
 
 def player_move(action):
-    """Обработка действий игрока"""
-    # action: 0-ничего, 1-влево, 2-вправо, 3-прыжок
     return game_loop(action)
 
 # =====================================================
-# 7. GRADIO INTERFACE
+# 8. GRADIO INTERFACE
 # =====================================================
 
 with gr.Blocks(title="🎮 AI vs Player Platformer", theme=gr.themes.Soft()) as demo:
@@ -757,7 +716,7 @@ with gr.Blocks(title="🎮 AI vs Player Platformer", theme=gr.themes.Soft()) as
     demo.load(reset_game, outputs=[ai_output, player_output, stats_output, sound_output])
 
 # =====================================================
-# 8. ЗАПУСК
+# 9. ЗАПУСК
 # =====================================================
 
 if __name__ == "__main__":