Remove streak from prompt; support up to 3 animals and places

- build_prompt() no longer takes a streak argument — mood/extras tiers
removed in favour of a single fixed style (NUMZOO_STYLE)
- All selected places (up to 3) are now included in the prompt, same
as animals — previously only one random place was picked
- Pre-selection in the emoji picker bumped from 2 → 3 for both
animals and places so users start with a richer default selection
- Removed unused streak variable from pregenerate_image and
generate_on_demand call sites

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

app.py

@@ -121,8 +121,8 @@ def enter_name(player_name: str, state: dict):
             gr.update(visible=True),    # emoji picker
             gr.update(visible=False),   # game
             gr.update(visible=False),   # picker_level_md
-            random.sample(ANIMAL_EMOJIS, 2),
-            random.sample(PLACE_EMOJIS, 2),
+            random.sample(ANIMAL_EMOJIS, 3),
+            random.sample(PLACE_EMOJIS, 3),
         )
     except Exception as e:
         print(f"enter_name error: {e}")
@@ -177,10 +177,9 @@ def pregenerate_image(state: dict):
     try:
         animals = state.get("selected_animals", [random.choice(ANIMAL_EMOJIS)])
         places  = state.get("selected_places",  [random.choice(PLACE_EMOJIS)])
-        streak  = state.get("streak", 0)
 
         print(f"[pregenerate] level={level} | animals={animals} | places={places}")
-        result, prompt = generate_reward_image(streak, animals, places)
+        result, prompt = generate_reward_image(animals, places)
         print(f"[pregenerate] level={level} done | prompt={prompt!r}")
 
         if result is not None:
@@ -313,10 +312,9 @@ def generate_on_demand(state: dict, coll_items: list):
     try:
         animals = state.get("selected_animals", [random.choice(ANIMAL_EMOJIS)])
         places  = state.get("selected_places",  [random.choice(PLACE_EMOJIS)])
-        streak  = state.get("streak", 0)
 
         print(f"[on_demand] level={level}")
-        result, prompt = generate_reward_image(streak, animals, places)
+        result, prompt = generate_reward_image(animals, places)
         print(f"[on_demand] level={level} done")
 
         if result is not None:

image_generator.py

@@ -71,11 +71,12 @@ NUMZOO_STYLE = (
 # Prompt builder
 # ---------------------------------------------------------------------------
 
-def build_prompt(streak: int, animals: list[str], places: list[str]) -> str:
-    # Include ALL selected animals (up to 3) — pick one place randomly
-    animal_list  = animals[:3] if animals else [random.choice(list(ANIMAL_MAP))]
-    place_emoji  = random.choice(places) if places else random.choice(list(PLACE_MAP))
+def build_prompt(animals: list[str], places: list[str]) -> str:
+    # Use ALL selected animals and places (up to 3 each)
+    animal_list = animals[:3] if animals else [random.choice(list(ANIMAL_MAP))]
+    place_list  = places[:3]  if places  else [random.choice(list(PLACE_MAP))]
 
+    # Build animal text: "puppy", "puppy and bunny", "puppy, bunny and kitten"
     animal_names = [ANIMAL_MAP.get(a, "bunny") for a in animal_list]
     if len(animal_names) == 1:
         animal_text = animal_names[0]
@@ -84,25 +85,16 @@ def build_prompt(streak: int, animals: list[str], places: list[str]) -> str:
     else:
         animal_text = f"{animal_names[0]}, {animal_names[1]} and {animal_names[2]}"
 
-    place_text = PLACE_MAP.get(place_emoji, "in a magical garden")
-
-    if streak <= 2:
-        mood   = "cute"
-        extras = "soft pastel colors, smiling gently"
-    elif streak <= 5:
-        mood   = "super cute and happy"
-        extras = "glitter, pastel rainbow colors, big smile, joyful expression"
+    # Build place text: "in a garden", "in a garden and under a rainbow", ...
+    place_texts = [PLACE_MAP.get(p, "in a magical garden") for p in place_list]
+    if len(place_texts) == 1:
+        place_text = place_texts[0]
+    elif len(place_texts) == 2:
+        place_text = f"{place_texts[0]} and {place_texts[1]}"
     else:
-        mood   = "magically adorable, ultra fluffy"
-        extras = (
-            "magical sparkles, rainbow aura, tiny crown, looking amazed, "
-            "pastel colors, surrounded by glowing stars"
-        )
+        place_text = f"{place_texts[0]}, {place_texts[1]} and {place_texts[2]}"
 
-    prompt = (
-        f"A {mood} {animal_text} {place_text}, {extras}, {NUMZOO_STYLE}"
-    )
-    return prompt
+    return f"A cute {animal_text} {place_text}, {NUMZOO_STYLE}"
 
 # ---------------------------------------------------------------------------
 # Pipeline loader (cached globally — survives between ZeroGPU calls)
@@ -150,11 +142,11 @@ def get_pipeline():
 # Core generation (always wrapped in try/except)
 # ---------------------------------------------------------------------------
 
-def _generate(streak: int, animals: list[str], places: list[str]):
+def _generate(animals: list[str], places: list[str]):
     try:
         pipe   = get_pipeline()
-        prompt = build_prompt(streak, animals, places)
-        print(f"Generating | streak={streak} | prompt: {prompt}")
+        prompt = build_prompt(animals, places)
+        print(f"Generating | prompt: {prompt}")
 
         result = pipe(
             prompt=prompt,
@@ -180,10 +172,10 @@ if IS_HF_SPACE:
     # duration=120: covers first-run model download (~30s) + load (~10s) + generate (~5s).
     # On subsequent calls _pipe is already loaded so only ~5s of GPU time is used.
     @spaces.GPU(duration=120)
-    def generate_reward_image(streak: int, animals: list[str], places: list[str]):
+    def generate_reward_image(animals: list[str], places: list[str]):
         """Generate reward image on HF Spaces ZeroGPU."""
-        return _generate(streak, animals, places)
+        return _generate(animals, places)
 else:
-    def generate_reward_image(streak: int, animals: list[str], places: list[str]):
+    def generate_reward_image(animals: list[str], places: list[str]):
         """Generate reward image locally."""
-        return _generate(streak, animals, places)
+        return _generate(animals, places)