Update app.py

app.py

@@ -13,7 +13,7 @@ import struct
 import math
 import os
 
-# Configuration and Data
+# --- CONFIGURATION & DATA ---
 GRID_NUMBERS = [
     10, 12, 14, 15, 16, 18, 20, 21,
     24, 25, 27, 28, 30, 32, 35, 36,
@@ -23,25 +23,35 @@ GRID_NUMBERS = [
 KEYBOARD_KEYS = [2, 3, 4, 5, 6, 7, 8, 9, 10]
 MAX_TIME = 150
 
-# --- AUDIO GENERATION (Same logic as your original script) ---
-def generate_wav(filename, freq, duration=0.1, volume=0.3):
-    sample_rate = 44100
-    n_samples = int(sample_rate * duration)
-    with wave.open(filename, 'w') as f:
-        f.setnchannels(1)
-        f.setsampwidth(2)
-        f.setframerate(sample_rate)
-        for i in range(n_samples):
-            val = int(volume * 32767.0 * math.sin(2.0 * math.pi * freq * i / sample_rate))
-            data = struct.pack('<h', val)
-            f.writeframesraw(data)
-
-# Pre-generate sound files
-if not os.path.exists("sounds"): os.makedirs("sounds")
-generate_wav("sounds/click.wav", 440, 0.05)
-generate_wav("sounds/correct.wav", 880, 0.2)
-generate_wav("sounds/wrong.wav", 220, 0.3)
-
+# --- AUDIO GENERATION ENGINE ---
+def ensure_sounds():
+    if not os.path.exists("sounds"):
+        os.makedirs("sounds")
+    
+    # Frequency mapping (Hz)
+    sound_map = {
+        "sounds/click.wav": 440,    # A4
+        "sounds/correct.wav": 880,  # A5
+        "sounds/wrong.wav": 220     # A3
+    }
+    
+    for filename, freq in sound_map.items():
+        if not os.path.exists(filename):
+            sample_rate = 44100
+            duration = 0.15 if "click" not in filename else 0.05
+            volume = 0.3
+            n_samples = int(sample_rate * duration)
+            with wave.open(filename, 'w') as f:
+                f.setnchannels(1)
+                f.setsampwidth(2)
+                f.setframerate(sample_rate)
+                for i in range(n_samples):
+                    val = int(volume * 32767.0 * math.sin(2.0 * math.pi * freq * i / sample_rate))
+                    f.writeframesraw(struct.pack('<h', val))
+
+ensure_sounds()
+
+# --- GAME LOGIC ---
 def get_empty_state():
     return {
         "solved": [False] * 32,
@@ -62,10 +72,10 @@ def format_grid_button(idx, solved_list, selected_idx):
 
 def handle_game_logic(state, action_type, value=None):
     if state["game_over"]:
-        return state, "Game Over!", None
+        return state, "Game Over! Please restart.", None
 
-    feedback = "Select a number..."
-    sound = "sounds/click.wav" # Default sound
+    feedback = "Select a target number..."
+    sound_to_play = "sounds/click.wav"
     
     if action_type == "select_target":
         state["selected_idx"] = value
@@ -75,46 +85,65 @@ def handle_game_logic(state, action_type, value=None):
     elif action_type == "select_factor":
         if state["selected_idx"] is None:
             feedback = "⚠️ Select a grid number first!"
+            sound_to_play = "sounds/wrong.wav"
         else:
             state["current_factors"].append(int(value))
+            
             if len(state["current_factors"]) == 2:
                 a, b = state["current_factors"]
                 target = GRID_NUMBERS[state["selected_idx"]]
                 
                 if a * b == target:
                     state["solved"][state["selected_idx"]] = True
-                    feedback = f"✔️ {a} x {b} = {target}!"
-                    sound = "sounds/correct.wav"
+                    feedback = f"✔️ {a} x {b} = {target}! Correct!"
+                    sound_to_play = "sounds/correct.wav"
                     state["selected_idx"] = None
                 else:
-                    feedback = f"❌ {a}* {b} = {a*b} (Wrong for {target})."
-                    sound = "sounds/wrong.wav"
+                    feedback = f"❌ {a} x {b} = {a*b} (Incorrect)."
+                    sound_to_play = "sounds/wrong.wav"
                 state["current_factors"] = []
+            else:
+                feedback = f"First factor: {value}. Pick the second one!"
 
+    # Score calculation
     elapsed = int(time.time() - state["start_time"])
     state["score"] = max(0, MAX_TIME - elapsed)
     
     if all(state["solved"]):
         state["game_over"] = True
-        feedback = "🏆 VICTORY!"
+        feedback = f"🏆 VICTORY! Final Score: {state['score']}"
 
-    return state, feedback, sound
+    return state, feedback, sound_to_play
 
+# --- INTERFACE DESIGN ---
 custom_css = """
-.grid-btn { min-width: 80px !important; height: 80px !important; font-size: 20px !important; }
-.kb-btn { min-width: 60px !important; height: 50px !important; }
+.grid-btn { 
+    min-width: 80px !important; 
+    height: 80px !important; 
+    font-size: 20px !important; 
+    margin: 2px !important;
+}
+.kb-btn { 
+    min-width: 60px !important; 
+    height: 50px !important; 
+}
 """
 
 with gr.Blocks(title="Autuori - Factorization Game", css=custom_css) as demo:
     state = gr.State(get_empty_state())
     
-    # Hidden audio component for sound effects
+    # Hidden audio component (The core of the sound system)
     audio_player = gr.Audio(interactive=False, visible=False, autoplay=True)
     
-    gr.Markdown("# 🎮 Interactive Factorization v1.4 EN\n**Developed by Marcos Autuori**")
+    gr.Markdown(f"""
+    # 🎮 Interactive Factorization v1.4 EN
+    **Developer:** Marcos Autuori
+    *Instructions: Select a blue number from the grid, then pick two factors from the keyboard.*
+    """)
     
     with gr.Row():
         with gr.Column(scale=4):
+            # 4x8 Grid Layout
             grid_buttons = []
             for r in range(4):
                 with gr.Row():
@@ -124,16 +153,29 @@ with gr.Blocks(title="Autuori - Factorization Game", css=custom_css) as demo:
                         grid_buttons.append(btn)
         
         with gr.Column(scale=1):
-            status_box = gr.Textbox(label="Status", value="Select a blue number", interactive=False)
-            score_display = gr.Number(label="Score", value=MAX_TIME, interactive=False)
-            keyboard_btns = [gr.Button(str(val), variant="secondary", elem_classes="kb-btn") for val in KEYBOARD_KEYS]
-            reset_btn = gr.Button("Restart", variant="stop")
-
+            # Status & Score Panel
+            status_box = gr.Textbox(label="Status", value="Select a blue target", interactive=False)
+            score_display = gr.Number(label="Score (Time)", value=MAX_TIME, interactive=False)
+            
+            gr.Markdown("### Factors (2-10)")
+            keyboard_btns = []
+            # Keyboard arranged in rows
+            for r_kb in range(3):
+                with gr.Row():
+                    for c_kb in range(3):
+                        val = KEYBOARD_KEYS[r_kb * 3 + c_kb]
+                        kb_btn = gr.Button(str(val), variant="secondary", elem_classes="kb-btn")
+                        keyboard_btns.append(kb_btn)
+            
+            reset_btn = gr.Button("Restart Game", variant="stop")
+
+    # Helper function to sync UI
     def update_ui(s):
         updates = [format_grid_button(i, s["solved"], s["selected_idx"]) for i in range(32)]
         return updates + [s["score"]]
 
-    # Grid Click Events
+    # --- EVENT MAPPING ---
+    # Grid Clicks
     for i, btn in enumerate(grid_buttons):
         btn.click(
             fn=lambda s, idx=i: handle_game_logic(s, "select_target", idx),
@@ -141,7 +183,7 @@ with gr.Blocks(title="Autuori - Factorization Game", css=custom_css) as demo:
             outputs=[state, status_box, audio_player]
         ).then(fn=update_ui, inputs=[state], outputs=grid_buttons + [score_display])
 
-    # Keyboard Click Events
+    # Keyboard Clicks
     for kb_btn in keyboard_btns:
         kb_btn.click(
             fn=lambda s, v=kb_btn.value: handle_game_logic(s, "select_factor", v),
@@ -149,12 +191,16 @@ with gr.Blocks(title="Autuori - Factorization Game", css=custom_css) as demo:
             outputs=[state, status_box, audio_player]
         ).then(fn=update_ui, inputs=[state], outputs=grid_buttons + [score_display])
 
+    # Reset Action
     def reset_all():
         new_state = get_empty_state()
         updates = [gr.update(value=str(num), variant="secondary", interactive=True) for num in GRID_NUMBERS]
-        return [new_state, "Game Restarted!", None] + updates + [MAX_TIME]
+        return [new_state, "New Game Started!", None] + updates + [MAX_TIME]
 
-    reset_btn.click(fn=reset_all, outputs=[state, status_box, audio_player] + grid_buttons + [score_display])
+    reset_btn.click(
+        fn=reset_all, 
+        outputs=[state, status_box, audio_player] + grid_buttons + [score_display]
+    )
 
 if __name__ == "__main__":
     demo.launch()