tuipet 0.5.332__tar.gz → 0.5.334__tar.gz

{tuipet-0.5.332/src/tuipet.egg-info → tuipet-0.5.334}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tuipet
-Version: 0.5.332
+Version: 0.5.334
 Summary: A terminal virtual pet (Digimon V-Pet style) rendered with halfblock sprites, built on data from the real devices.
 Author-email: Joel Taylor <joeltaylor734@gmail.com>
 License-Expression: MIT

{tuipet-0.5.332 → tuipet-0.5.334}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "tuipet"
-version = "0.5.332"
+version = "0.5.334"
 description = "A terminal virtual pet (Digimon V-Pet style) rendered with halfblock sprites, built on data from the real devices."
 readme = "README.md"
 requires-python = ">=3.10"

{tuipet-0.5.332 → tuipet-0.5.334}/src/tuipet/app.py

@@ -150,7 +150,7 @@ class TuiPetApp(ActionsMixin, App):
     """
     # the release-news line (title-screen msg box, first launch per build) --
     # UPDATE THIS WITH EVERY RELEASE that ships something player-visible
-    WHATS_NEW = ("THAT LITTLE SPRITE IN THE CORNER IS A FESTIVAL, NOT A STUCK PIXEL: on four days a year a decoration appears in your arena — the Crest of Courage on Odaiba Memorial Day, a present at Christmas, candy at Halloween, cake at New Year — and until now nothing on the home screen said so. The card names the day above your vitals whenever one is on, on the egg screen too. It was only ever labelled on the adventure card before.")
+    WHATS_NEW = ("THE FESTIVAL DECORATION REALLY STOPS CLIPPING NOW: the last fix taught the main painter to keep your mon out of the prop, but the yawn and poop-dance idles ran a second copy of that rule that never learned it — so the mon still walked 9 pixels into the decoration whenever one of those poses played. There is one rule now, in one place, shared by every path that puts your mon on screen.")
 
     BINDINGS = [
         # jogress is LOBBY-ONLY (fusion needs a real partner from the

{tuipet-0.5.332 → tuipet-0.5.334}/src/tuipet/arena.py

@@ -32,7 +32,7 @@ from .arenafx import (  # noqa: F401,E402
     PLAY_HOP, PLAY_HOP_H, PLAY_LEAD, POOP_PAD, POOP_W, SCREEN_COLS,
     SCREEN_ROWS, SICK_ZONE, SPRITE_W, _FxCtx, _WINDOW, _clip_win,
     _HIDDEN_STATUS_ICONS, _blit, _effect_overlay, _evol_strobe, _filth_pts,
-    _filth_right, _sick_mark_up)
+    _filth_right, _holiday_right, _sick_mark_up, _zone_clamp)
 
 
 def hearts(n, total=4, color=None):
@@ -189,11 +189,9 @@ class Screen(FxMixin, Static):
         # 2026-07-11): the filth block is a hard left wall and the sick skull
         # a hard right one -- sleep/sick/startle bypass the roamer's bounds,
         # so the clamp here is what actually guarantees no overlap.
-        base = PET_BASE_X
-        lo = (_filth_right(pet.poop) if pet.poop else grid.X0) - base
-        cap = ((grid.X1 - SICK_ZONE if _sick_mark_up(pet) else grid.X1)
-               - SPRITE_W) - base
-        xshift = min(max(xshift, lo), max(cap, lo))       # poop wins over the skull (it yields when crowded)
+        xshift = _zone_clamp(pet, xshift)   # ONE source (arenafx._zone_clamp):
+        #   filth + festival prop are left walls, the skull a right one, and
+        #   poop wins over the skull (it yields when crowded)
         pts = _effect_overlay(pet, wf, SCREEN_COLS, SCREEN_ROWS * 2, tick=self.frame_i)
         # (THE AMBIENT SULK IS POSE-ONLY -- Joel 2026-07-28, final: "the
         # smoke is the reaction sprites... we already went over this."  The

{tuipet-0.5.332 → tuipet-0.5.334}/src/tuipet/arenafx.py

@@ -60,6 +60,44 @@ def _evol_strobe(c):
                   if ev[y % mh][x % mw] == "1"]
 
 
+def _holiday_right(today=None):
+    """Right edge x of TODAY's festival prop, or grid.X0 on an ordinary day.
+
+    ⭐The decor is a LEFT-WALL occupant exactly like the filth block (Joel
+    2026-08-01: "my mon is clipping right into it. looks like shit").  The
+    exclusive-floor-zone law -- filth a hard left wall, the sick skull a hard
+    right one -- predates the prop by three months, and when the prop landed
+    (2026-07-24) it simply never joined the clamp.  Its own comment claimed it
+    "sits where a resting pet does not reach", which is true of a CENTRED
+    sleeper and false of the roamer, which walks the whole band; and the
+    overlay is stamped AFTER the sprite, so the prop punched straight through
+    the mon.  Four days a year, the arena looked broken."""
+    deco = _holiday_decor(today)
+    if not deco:
+        return grid.X0
+    return grid.X0 + max(len(r) for r in deco)
+
+
+def _zone_clamp(pet, xshift):
+    """THE EXCLUSIVE FLOOR ZONES, IN ONE PLACE (Bandai-grammar sweep
+    2026-07-11; unified 2026-08-01).  The filth block and today's festival
+    prop are hard LEFT walls, the sick skull a hard RIGHT one; sleep / sick /
+    startle / the special idles all bypass the roamer's own bounds, so this
+    clamp is what actually guarantees no sprite draws on another.
+
+    ⚠IT WAS COPIED, AND THE COPY ROTTED.  `Screen.paint` and the yawn /
+    poopdance branch of `_paint_fx` each carried their own transcription of
+    these three lines.  v0.5.333 taught the prop to the first one and shipped;
+    Joel: "woooooow dude.... still clipping into it" -- the special idles were
+    still walking the mon straight through the crest, 9 px deep.  One
+    function now, so a fourth caller cannot inherit a stale wall."""
+    lo = max(_filth_right(pet.poop) if pet.poop else grid.X0,
+             _holiday_right()) - PET_BASE_X
+    cap = ((grid.X1 - SICK_ZONE if _sick_mark_up(pet) else grid.X1)
+           - SPRITE_W) - PET_BASE_X
+    return min(max(xshift, lo), max(cap, lo))
+
+
 def _filth_right(count):
     """Right edge x of the filth block: fixed POOP_W columns like DVPet's 30px slots."""
     n = min(count or 0, POOP_MAX_PILES)
@@ -560,10 +598,7 @@ class FxMixin:
             # The pose sways around the roamer's spot, so it gets the same
             # zone clamp as paint() (sickness striking MID-yawn would
             # otherwise stand the skull on the pet for the pose's last beats).
-            lo = (_filth_right(pet.poop) if pet.poop else grid.X0) - PET_BASE_X
-            cap = ((grid.X1 - SICK_ZONE if _sick_mark_up(pet) else grid.X1)
-                   - SPRITE_W) - PET_BASE_X
-            c.xshift = min(max(c.xshift, lo), max(cap, lo))
+            c.xshift = _zone_clamp(pet, c.xshift)
             c.overlay += _effect_overlay(pet, self.frame_i // 4, SCREEN_COLS, c.px_h,
                                          tick=self.frame_i)
         if dark:                     # the opaque cover: black over everything

{tuipet-0.5.332 → tuipet-0.5.334/src/tuipet.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tuipet
-Version: 0.5.332
+Version: 0.5.334
 Summary: A terminal virtual pet (Digimon V-Pet style) rendered with halfblock sprites, built on data from the real devices.
 Author-email: Joel Taylor <joeltaylor734@gmail.com>
 License-Expression: MIT

{tuipet-0.5.332 → tuipet-0.5.334}/tests/test_scene_actors.py

@@ -363,3 +363,81 @@ def test_the_ambient_sulk_is_pose_only():
     assert '_FX.get("unhappy")' not in src, "the idle painter still draws smoke"
     afx = open("src/tuipet/arenafx.py").read()
     assert afx.count('"unhappy"') >= 2, "the REACTION smoke must survive"
+
+
+def test_no_sprite_draws_on_the_festival_prop(monkeypatch):
+    """⭐Bug report 2026-08-01 (Joel): "my mon is clipping right into it.
+    looks like shit."
+
+    The exclusive-floor-zone law (2026-07-11) gives the filth block a hard
+    LEFT wall and the sick skull a hard RIGHT one, and `test_no_sprite_ever_
+    draws_on_another` above sweeps it.  The festival prop landed three months
+    later (2026-07-24) in the top-LEFT corner and never joined the clamp: its
+    own comment claimed it "sits where a resting pet does not reach", true of
+    a centred sleeper and false of the roamer, which walks the whole band --
+    and the overlay is stamped AFTER the sprite, so it punched through the
+    mon.  Measured before the fix: 11 pixels of crest inside the creature.
+
+    ⚠The sweep above could never catch it, because it runs on whatever day
+    the suite runs and 361 of them have no prop -- and conftest's
+    `ordinary_day` now pins even that away.  This one FORCES each festival."""
+    import datetime
+    from tuipet import arenafx, tournament
+    cap = _paint_capture(monkeypatch)
+    for m, d in ((8, 1), (12, 25), (10, 31), (1, 1)):
+        monkeypatch.setattr(tournament, "_today",
+                            lambda mm=m, dd=d: datetime.date(2026, mm, dd))
+        assert arenafx._holiday_decor() is not None, (m, d)
+        assert arenafx._holiday_right() > grid.X0            # a real wall
+        for n, sizes in LOADS:
+            random.seed(7)
+            p = _pet(weather="Clear", poop=n, poop_sizes=list(sizes))
+            s = _screen()
+            for i in range(30):
+                s.advance(p)
+                s.paint(p)
+                pet_px = _sprite_px(cap["rows"], cap["xshift"], cap["mirror"])
+                hit = pet_px & set(cap["overlay"])
+                assert not hit, ((m, d), n, i, sorted(hit)[:6])
+
+
+def test_the_special_idles_share_the_one_zone_clamp(monkeypatch):
+    """⭐Joel 2026-08-01: "woooooow dude.... still clipping into it."
+
+    v0.5.333 taught the festival prop to `Screen.paint`'s wall and shipped --
+    but the yawn / poopdance branch of `_paint_fx` carried its OWN
+    transcription of the same three lines, and that copy still knew only the
+    filth wall.  The special idles walked the mon 9 px into the crest.  There
+    is ONE `arenafx._zone_clamp` now; this sweeps the fx paths that the
+    scene-actor sweep above never drove."""
+    import datetime
+    from tuipet import arenafx, tournament
+    cap = _paint_capture(monkeypatch)
+    for m, d in ((8, 1), (12, 25), (10, 31), (1, 1)):
+        monkeypatch.setattr(tournament, "_today",
+                            lambda mm=m, dd=d: datetime.date(2026, mm, dd))
+        for kind in ("yawn", "poopdance"):
+            for poop in (0, 2):
+                random.seed(3)
+                p = _pet(weather="Clear", poop=poop, poop_sizes=[2] * poop)
+                s = _screen()
+                s.start_fx(kind)
+                # walk the mon ACROSS the band while the pose plays: the bug
+                # only shows where the roamer stood, and the default anchor
+                # sits clear of the corner
+                for x0 in range(grid.X0 - 4, grid.X1 + 1):
+                    s.roamer.x = float(x0)
+                    if not s.fx:
+                        s.start_fx(kind)
+                    s.advance(p)
+                    s.paint(p)
+                    pet_px = _sprite_px(cap["rows"], cap["xshift"],
+                                        cap["mirror"])
+                    hit = pet_px & set(cap["overlay"])
+                    assert not hit, (kind, (m, d), poop, x0, sorted(hit)[:6])
+    # and the clamp is genuinely ONE function, not three transcriptions
+    import inspect
+    from tuipet import arena
+    for src in (inspect.getsource(arena.Screen.paint),
+                inspect.getsource(arenafx.FxMixin._paint_fx)):
+        assert "_filth_right(" not in src, "a hand-rolled wall crept back in"