Deploy Myco from CI

game/engine.py

@@ -750,43 +750,75 @@ def eat_current(current=None, collection=None, history=None):
     return coll, _append(hist, "assistant", reply)
 
 
-def check_auto_pickup(new_pos_x, new_pos_y, current, collection):
-    """Arcade collision rules that cleanly update score text safely."""
-    if not current or current.get("game_over") == "Yes" or current.get("picked") == "Yes":
-        return current, collection
+def check_auto_pickup(new_pos_x, new_pos_y, current, collection, active_mushrooms=None):
+    """
+    Check if Myco stepped on any mushroom in active_mushrooms.
+    Returns (current, collection, active_mushrooms) — all three updated.
+    """
+    if active_mushrooms is None:
+        # Fallback: try reading from current dict (legacy path)
+        active_mushrooms = (current or {}).get("active_mushrooms", [])
 
-    mushrooms = current.get("active_mushrooms", [])
-    all_picked = True
-    
-    for m in mushrooms:
-        if m.get("picked") == "No":
-            # Check if Myco stepped on this coordinate
-            if new_pos_x == m["mush_x"] and new_pos_y == m["mush_y"]:
-                if m["poison"] == "Yes":
-                    current["game_over"] = "Yes"
-                    current["encounter"] = f"💀 Oh no! Myco stepped directly onto a toxic {m['name']}!"
-                    current["event_title"] = "Poison Shock!"
-                    return current, collection
-                else:
-                    m["picked"] = "Yes"
-                    current["encounter"] = f"💥 Blip! Collected a rare {m['name']}!"
-                    
-                    # Safely tick up scores inside the state without crashing types
-                    current_score = int(current.get("score_total", "0")) + 15
-                    current["score_total"] = str(current_score)
-                    current["reward_text"] = f"+15 Spores from {m['name']}!"
-                    
-                    collection.append(m)
-            else:
-                # This one hasn't been collected yet
-                all_picked = False
-                
-    if all_picked and mushrooms:
-        current["picked"] = "Yes"
-        current["encounter"] = "Area clear! Click Search Clearing to spawn the next cluster."
-        current["event_title"] = "Clearing Purified"
-        
-    return current, collection
+    if not active_mushrooms:
+        return current, collection, []
+
+    if current and (current.get("game_over") == "Yes" or current.get("picked") == "Yes"):
+        return current, collection, active_mushrooms
+
+    updated_mushrooms = list(active_mushrooms)
+    hit = None
+
+    for m in updated_mushrooms:
+        if m.get("picked") == "Yes":
+            continue
+        if int(m.get("mush_x", -1)) == int(new_pos_x) and \
+           int(m.get("mush_y", -1)) == int(new_pos_y):
+            hit = m
+            break
+
+    if hit is None:
+        return current, collection, updated_mushrooms
+
+    # Myco stepped on a mushroom
+    if hit.get("poison") == "Yes":
+        # Game over
+        updated_current = dict(current or {})
+        updated_current["game_over"]   = "Yes"
+        updated_current["health"]      = "0"
+        updated_current["encounter"]   = f"💀 Myco stepped on toxic {hit['name']}! Game Over!"
+        updated_current["event_title"] = "Poison Shock!"
+        updated_current["reward_text"] = f"Poison! {POISON_PENALTY} spores · Game Over"
+        updated_current["score_total"] = str(max(0, _score_collection(collection) + POISON_PENALTY))
+        # Mark it picked so it disappears from scene
+        updated_mushrooms = [
+            {**m, "picked": "Yes"} if m.get("name") == hit.get("name") else m
+            for m in updated_mushrooms
+        ]
+        return updated_current, collection, updated_mushrooms
+
+    # Safe mushroom — collect it
+    score_delta = RARITY_SCORE.get(hit.get("rarity", "Common"), 10)
+    new_score   = _score_collection(collection) + score_delta
+    updated_mushrooms = [
+        {**m, "picked": "Yes"} if m.get("name") == hit.get("name") else m
+        for m in updated_mushrooms
+    ]
+    collection = list(collection) + [hit]
+
+    updated_current = dict(current or {})
+    updated_current["score_total"] = str(new_score)
+    updated_current["encounter"]   = f"💥 Collected {hit['name']}! +{score_delta} spores!"
+    updated_current["reward_text"] = f"+{score_delta} spores · {hit.get('rarity','Common')}"
+    updated_current["event_title"] = "Pickup!"
+
+    # Check if all mushrooms are now picked
+    remaining = [m for m in updated_mushrooms if m.get("picked") != "Yes"]
+    if not remaining:
+        updated_current["picked"]      = "Yes"
+        updated_current["encounter"]   = "Area clear! Search the next clearing!"
+        updated_current["event_title"] = "Clearing Purified"
+
+    return updated_current, collection, updated_mushrooms
     
 
 # Myco narrative