Game update 0.1.5

-bug words list, otherwise working

battlewords/__init__.py

@@ -1,2 +1,2 @@
-__version__ = "0.1.4"
+__version__ = "0.1.5"
 __all__ = ["models", "generator", "logic", "ui"]

battlewords/logic.py

@@ -64,7 +64,7 @@ def guess_word(state: GameState, guess_text: str) -> Tuple[bool, int]:
     state.guessed.add(target.text)
 
     state.last_action = f"Correct! +{points} points for {target.text}."
-    state.can_guess = False
+    state.can_guess = True  # <-- Allow another guess after a correct guess
     return True, points
 
 

battlewords/ui.py

@@ -191,6 +191,22 @@ def inject_styles() -> None:
         .shiny-border:hover::before {
           left: 100%;
         }
+
+        /* Hit/Miss radio indicators - circular group */
+        .bw-radio-group { display:flex; align-items:center; gap: 10px; flex-flow: column;}
+        .bw-radio-item { display:flex; flex-direction:column; align-items:center; gap:6px; }
+        .bw-radio-circle {
+          width: 46px; height: 46px; border-radius: 50%;
+          border: 4px solid; /* border-image: linear-gradient(45deg, #a1a1a1, #ffffff, #a1a1a1, #666666) 1; */
+          background: rgba(255,255,255,0.06);
+          display: grid; place-items: center; color:#fff; font-weight:700;
+        }
+        .bw-radio-circle .dot { width: 14px; height: 14px; border-radius: 50%; background:#777; box-shadow: inset 0 0 0 2px rgba(255,255,255,0.25); }
+        .bw-radio-circle.active.hit { background: linear-gradient(135deg, rgba(0,255,127,0.18), rgba(0,128,64,0.38)); }
+        .bw-radio-circle.active.hit .dot { background:#20d46c; box-shadow: 0 0 10px rgba(32,212,108,0.85); }
+        .bw-radio-circle.active.miss { background: linear-gradient(135deg, rgba(255,0,0,0.18), rgba(128,0,0,0.38)); }
+        .bw-radio-circle.active.miss .dot { background:#ff4b4b; box-shadow: 0 0 10px rgba(255,75,75,0.85); }
+        .bw-radio-caption { font-size: 0.8rem; color:#fff; opacity:0.85; letter-spacing:0.5px; }
         </style>
         """,
         unsafe_allow_html=True,
@@ -219,14 +235,14 @@ def _init_session() -> None:
     st.session_state.points_by_word = {}
     st.session_state.letter_map = build_letter_map(puzzle)
     st.session_state.initialized = True
-
+    st.session_state.radar_gif_path = None  # Add this line
 
 def _new_game() -> None:
-    # Preserve selected wordlist across resets
     selected = st.session_state.get("selected_wordlist")
     st.session_state.clear()
     if selected:
         st.session_state.selected_wordlist = selected
+    st.session_state.radar_gif_path = None  # Reset radar GIF path
     _init_session()
 
 
@@ -296,6 +312,7 @@ def _render_sidebar():
                 _sort_wordlist(st.session_state.selected_wordlist)
         else:
             st.info("No word lists found in words/ directory. Using built-in fallback.")
+
 def get_scope_image(size=4, bgcolor="none", scope_color="green", img_name="scope.gif"):
     scope_path = os.path.join(os.path.dirname(__file__), img_name)
     if not os.path.exists(scope_path):
@@ -351,36 +368,22 @@ def _render_radar(puzzle: Puzzle, size: int, r_max: float = 0.85, max_frames: in
     from matplotlib.animation import FuncAnimation, PillowWriter
     from matplotlib.patches import Circle
     from matplotlib import colors as mcolors
+    import tempfile
+    import os
 
-    st.markdown(
-        """
-        <style>
-        h3 {
-            margin: 0.25rem auto;
-            text-align: center;
-        }
-        </style>
-        """,
-        unsafe_allow_html=True,
-    )
-    st.subheader("Score Board")
-
-    # Radar blip positions
     xs = np.array([c.y + 1 for c in puzzle.radar])
     ys = np.array([c.x + 1 for c in puzzle.radar])
     n_points = len(xs)
 
-    # Animation parameters (in data units)
     r_min = 0.15
-    ring_linewidth = 4  # thickness of the ring stroke
+    ring_linewidth = 4
 
     rgba_labels = mcolors.to_rgba("#FFFFFF", 0.7)
     rgba_ticks  = mcolors.to_rgba("#FFFFFF", 0.66) 
     bgcolor="#4b7bc4"
     scope_size=3
     scope_color="#ffffff"
-    
-    
+
     imgscope = get_scope_image(size=scope_size, bgcolor=bgcolor, scope_color=scope_color, img_name="scope_blue.png")
     fig, ax = plt.subplots(figsize=(scope_size, scope_size))    
     ax.set_xlim(0.2, size)
@@ -389,17 +392,13 @@ def _render_radar(puzzle: Puzzle, size: int, r_max: float = 0.85, max_frames: in
     ax.set_yticks(range(1, size + 1))
     ax.tick_params(axis="both", which="both", labelcolor=rgba_labels)
     ax.tick_params(axis="both", which="both", colors=rgba_ticks)
-    #ax.grid(True, which="both", linestyle="--", alpha=0.3)
-    # ax.set_title("Radar")
     ax.set_aspect('equal', adjustable='box')
 
-    # Build a linear gradient background on the figure (outside the main axes)
     def _make_linear_gradient(width: int, height: int, angle_deg: float,
                               colors_hex: list[str], stops: list[float]) -> np.ndarray:
         yy, xx = np.meshgrid(np.linspace(0, 1, height), np.linspace(0, 1, width), indexing='ij')
         theta = np.deg2rad(angle_deg)
         proj = np.cos(theta) * xx + np.sin(theta) * yy
-        # Normalize projection to [0,1] using corner extrema
         corners = np.array([[0, 0], [1, 0], [0, 1], [1, 1]], dtype=float)
         pc = np.cos(theta) * corners[:, 0] + np.sin(theta) * corners[:, 1]
         proj = (proj - pc.min()) / (pc.max() - pc.min() + 1e-12)
@@ -408,7 +407,6 @@ def _render_radar(puzzle: Puzzle, size: int, r_max: float = 0.85, max_frames: in
         stop_arr = np.asarray(stops, dtype=float)
         cols = np.asarray([mcolors.to_rgb(c) for c in colors_hex], dtype=float)
 
-        # For each pixel pick the interval and interpolate colors
         j = np.clip(np.searchsorted(stop_arr, proj, side='right') - 1, 0, len(stop_arr) - 2)
         a = stop_arr[j]
         b = stop_arr[j + 1]
@@ -418,7 +416,6 @@ def _render_radar(puzzle: Puzzle, size: int, r_max: float = 0.85, max_frames: in
         img = (1.0 - w) * c0 + w * c1
         return img
 
-    # Size gradient to the rendered figure pixel size
     fig_w, fig_h = [int(v) for v in fig.canvas.get_width_height()]
     grad_img = _make_linear_gradient(
         width=fig_w,
@@ -427,27 +424,19 @@ def _render_radar(puzzle: Puzzle, size: int, r_max: float = 0.85, max_frames: in
         colors_hex=['#a1a1a1', '#ffffff', '#a1a1a1', '#666666'],
         stops=[0.0, 1.0 / 3.0, 2.0 / 3.0, 1.0],
     )
-    # Background axes that spans the whole figure (zorder below main axes)
     bg_ax = fig.add_axes([0, 0, 1, 1], zorder=0)
     bg_ax.imshow(grad_img, aspect='auto', interpolation='bilinear')
     bg_ax.axis('off')
 
-    # Overlay the radar scope image centered in the main axes
     scope_ax = fig.add_axes([-0.075, -0.075, 1.15, 1.15], zorder=1)    
     scope_ax.imshow(imgscope, aspect='auto', interpolation='lanczos')
     scope_ax.axis('off')
 
-    # Main axes above the background, with solid interior color for the radar grid
-    ax.set_facecolor('none')  # interior of the radar
+    ax.set_facecolor('none')
     ax.set_zorder(2)
-    #ax.axis('off')
-    # Hide decorations but keep patch/frame on
     for spine in ax.spines.values():
         spine.set_visible(False)
-    # ax.set_xticks([])
-    # ax.set_yticks([])
 
-    # Create ring (annulus-like) patches for each radar blip using Circle with stroke
     rings: list[Circle] = []
     for x, y in zip(xs, ys):
         ring = Circle((x, y), radius=r_min, fill=False, edgecolor='#9ceffe', linewidth=ring_linewidth, alpha=1.0, zorder=3)
@@ -473,18 +462,24 @@ def _render_radar(puzzle: Puzzle, size: int, r_max: float = 0.85, max_frames: in
                 ring.set_alpha(alpha_i)
         return rings
 
-    ani = FuncAnimation(fig, update, frames=max_frames, interval=50, blit=True)
+    # Use persistent GIF if available
+    gif_path = st.session_state.get("radar_gif_path")
+    if gif_path and os.path.exists(gif_path):
+        with open(gif_path, "rb") as f:
+            gif_bytes = f.read()
+        st.image(gif_bytes, width='content', output_format="auto")
+        plt.close(fig)
+        return
 
-    # Save animation to a temporary GIF file
+    # Otherwise, generate and persist
     with tempfile.NamedTemporaryFile(suffix=".gif", delete=False) as tmpfile:
+        ani = FuncAnimation(fig, update, frames=max_frames, interval=50, blit=True)
         ani.save(tmpfile.name, writer=PillowWriter(fps=20))
         plt.close(fig)
-        # Read the GIF into memory
         tmpfile.seek(0)
         gif_bytes = tmpfile.read()
+        st.session_state.radar_gif_path = tmpfile.name  # Save path for reuse
     st.image(gif_bytes, width='content', output_format="auto")
-    os.unlink(tmpfile.name) 
-
 
 def _render_grid(state: GameState, letter_map):
     size = state.grid_size
@@ -576,6 +571,34 @@ def _render_grid(state: GameState, letter_map):
         _sync_back(state)
 
 
+def _render_hit_miss(state: GameState):
+    # Determine last reveal outcome from last_action string
+    action = (state.last_action or "").strip()
+    is_hit = action.startswith("Revealed '")
+    is_miss = action.startswith("Revealed empty")
+
+    # Render as a circular radio group, side-by-side
+    st.markdown(
+        f"""
+        <div class="bw-radio-group" role="radiogroup" aria-label="Hit or Miss">
+          <div class="bw-radio-item">
+            <div class="bw-radio-circle {'active hit' if is_hit else ''}" role="radio" aria-checked="{'true' if is_hit else 'false'}" aria-label="Hit">
+              <span class="dot"></span>
+            </div>
+            <div class="bw-radio-caption">HIT</div>
+          </div>
+          <div class="bw-radio-item">
+            <div class="bw-radio-circle {'active miss' if is_miss else ''}" role="radio" aria-checked="{'true' if is_miss else 'false'}" aria-label="Miss">
+              <span class="dot"></span>
+            </div>
+            <div class="bw-radio-caption">MISS</div>
+          </div>
+        </div>
+        """,
+        unsafe_allow_html=True,
+    )
+
+
 def _render_guess_form(state: GameState):
     with st.form("guess_form"):
         guess_text = st.text_input("Your guess", value="", max_chars=12)
@@ -652,10 +675,15 @@ def run_app():
     left, right = st.columns([2, 2], gap="medium")
     with left:
         _render_grid(state, st.session_state.letter_map)
-        st.divider()
-        _render_guess_form(state)
+
     with right:
-        _render_radar(state.puzzle, size=state.grid_size, r_max=1.6, max_frames=60, sinusoid_expand=False, stagger_radar=True)
+        one, two = st.columns([1, 5], gap="small")
+        with one:
+            _render_hit_miss(state)
+        with two:
+            _render_radar(state.puzzle, size=state.grid_size, r_max=1.6, max_frames=60, sinusoid_expand=False, stagger_radar=True)        
+        #st.divider()
+        _render_guess_form(state)
         _render_score_panel(state)