tuipet 0.2.330__tar.gz → 0.2.332__tar.gz

{tuipet-0.2.330/src/tuipet.egg-info → tuipet-0.2.332}/PKG-INFO

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

{tuipet-0.2.330 → tuipet-0.2.332}/pyproject.toml

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

{tuipet-0.2.330 → tuipet-0.2.332}/src/tuipet/data.py

@@ -389,6 +389,33 @@ def assist_pool():
     return sorted(n for n, r in load_requirements().items() if r.get("can_assist"))
 
 
+@lru_cache(maxsize=1)
+def _name_canonical_map():
+    """num -> the CANONICAL (lowest) num among same-name roster rows.  DVPet
+    stores duplicate species rows (the 1410+ egg-hatch block mirrors the
+    chart's canonical rows) and its dex sync is BY NAME: checkNaturalUnlocked
+    propagates `unlocked` across every same-name row, so a form raised under
+    either num reveals both (album/dex audit 2026-07-06).  Empty names stay
+    themselves -- never lump the unnamed rows into one group."""
+    _, by_num = load_sprites()
+    groups = {}
+    for n, rec in by_num.items():
+        nm = (rec.get("name") or "").upper()
+        if nm:
+            groups.setdefault(nm, []).append(n)
+    out = {}
+    for ns in groups.values():
+        c = min(ns)
+        for n in ns:
+            out[n] = c
+    return out
+
+
+def canonical_num(num):
+    """The name-canonical roster num (checkNaturalUnlocked's identity)."""
+    return _name_canonical_map().get(num, num)
+
+
 @lru_cache(maxsize=1)
 def _canonical_habitat_by_name():
     """DVPet stores duplicate species rows: the egg-hatch duplicates carry

{tuipet-0.2.330 → tuipet-0.2.332}/src/tuipet/egg.py

@@ -121,7 +121,11 @@ def _conditions_met(rule, prog):
         return False
     if rule["map"] is not None and rule["map"] not in prog["maps"]:
         return False
-    if rule["history"] and not all(n in prog["album"] for n in rule["history"]):
+    if rule["history"] and not all(data.canonical_num(n) in prog["album"]
+                                   for n in rule["history"]):
+        # name-canonical both sides (album/dex audit 2026-07-06): raising
+        # ChibiKiwimon as its 1432 hatch-twin satisfies a 944 history gate,
+        # exactly like canon's checkNaturalUnlocked name sync
         return False
     if rule["prev_field"] is not None and prog["last_field"] != rule["prev_field"]:
         return False

{tuipet-0.2.330 → tuipet-0.2.332}/src/tuipet/persistence.py

@@ -51,8 +51,14 @@ def save_settings(d, path=None):
 
 
 def get_album():
-    """Set of distinct Digimon species nums ever raised (the DM20-style zukan)."""
-    return set(load_settings().get("progress", {}).get("album", []))
+    """Set of distinct Digimon species ever raised, NAME-CANONICAL (the
+    DM20-style zukan).  DVPet's dex sync is by name (checkNaturalUnlocked):
+    the 1410+ egg-hatch duplicate rows and their chart twins reveal together
+    -- old saves may hold either num, so entries canonicalize on read
+    (album/dex audit 2026-07-06)."""
+    from . import data
+    return {data.canonical_num(n)
+            for n in load_settings().get("progress", {}).get("album", [])}
 
 
 def get_wins():
@@ -65,15 +71,22 @@ _ALBUM_SEEN = set()          # in-memory mirror: the 10s autosave was re-reading
 
 
 def album_seen(num):
-    """Has ANY generation been this form? (canon Evolution.setUnlocked --
-    the dex reveal state the hidden-evolution mask keys on)."""
+    """Has ANY generation been this form -- under EITHER of its name-twin nums?
+    (canon Evolution.setUnlocked + checkNaturalUnlocked: the dex reveal state
+    the hidden-evolution mask keys on, synced across same-name rows)."""
+    from . import data
+    num = data.canonical_num(num)
     if num in _ALBUM_SEEN:
         return True
-    return num in set(load_settings().get("progress", {}).get("album", []))
+    return num in get_album()
 
 
 def album_add(num):
-    if num is None or num < 0 or num in _ALBUM_SEEN:
+    if num is None or num < 0:
+        return
+    from . import data
+    num = data.canonical_num(num)    # store the name-canonical identity
+    if num in _ALBUM_SEEN:
         return
     _ALBUM_SEEN.add(num)
     d = load_settings()
@@ -277,7 +290,7 @@ def get_progress():
     prog = _prog()
     last = prog.get("last_gen", {}) or {}
     return {
-        "album": set(prog.get("album", [])),
+        "album": get_album(),        # name-canonical (the egg gates match on it)
         "wins": int(prog.get("wins", 0)),
         "mega_kills": int(prog.get("mega_kills", 0)),
         "max_gen": int(prog.get("max_gen", 1)),

{tuipet-0.2.330 → tuipet-0.2.332}/src/tuipet/pet.py

@@ -155,6 +155,16 @@ ITEM_INTEREST_HIGH_TIMER = 80       # ItemInterestHighTimer (disposition -1)
 PERSONALITY_MOOD_MATCH = 10         # ConsumablePersonalityMatchMoodChange
 PERSONALITY_MOOD_UNMATCH = -10      # ConsumablePersonalityUnmatchMoodChange
 EGG_MOOD = 100                      # EggMood: a new egg starts warm (Evolution.egg)
+# Evolution.java per-stage ARRIVAL setters (egg/hatch audit 2026-07-06; the
+# shipped ranges are all min==max -> deterministic)
+FRESH_MOOD = -10                    # FreshMood: born grumpy (it's a newborn)
+FRESH_OBEDIENCE = 75                # FreshObedienceMin/Max: born TRUSTING
+START_NUTRITION = 6                 # StartProtein/StartMineral/StartVitamin
+IN_TRAINING_OBEDIENCE = 50          # InTrainingObedienceMin/Max: toddler rebellion cap
+IN_TRAINING_SLEEP_LAPSE = 360       # InTrainingSleepLapse: wakes with real bedtime pressure
+ROOKIE_OBED_GOOD = 50               # RookieGoodObedience (Happy daily majority)
+ROOKIE_OBED_DEFAULT = 25            # RookieDefaultObedience (Neutral majority)
+ROOKIE_OBED_BAD = 0                 # RookieBadObedience (anything else, ties included)
 # the missed-day / birthday system (setTimeToAge): each game day of AGE the pet
 # has a birthday judged by the day's MAJOR mood and its missed-day tally
 MOOD_RECORD_MIN = 5                 # MoodRecordMin: sample the mood tier every 5 game-min
@@ -2411,6 +2421,40 @@ class Pet:
     def evolve_to(self, num):
         was_young = self.stage in ("Egg", "Fresh", "InTraining", "Rookie")
         _req = self._become(num)
+        # Evolution.java's per-stage ARRIVAL setters (egg/hatch audit
+        # 2026-07-06 -- none of these were ported; the missing fresh()
+        # obedience 75 was the deepest root of the misbehaving-babies era):
+        if self.stage == "Fresh":
+            # fresh(): born TRUSTING (obedience 75) but grumpy (-10 mood),
+            # hungry, full of energy, with a starter nutrition base 6/6/6
+            lo, hi = self.ideal_temp
+            self.temp = (lo + hi) // 2
+            self._set_mood(FRESH_MOOD)
+            self._set_obedience(FRESH_OBEDIENCE)
+            self.strength = 0
+            self.hunger = 0
+            self.energy = self.max_energy
+            self.nutr_protein = self.nutr_mineral = self.nutr_vitamin = START_NUTRITION
+        elif self.stage == "InTraining":
+            # inTraining(): toddler rebellion -- obedience above 50 KNOCKS
+            # BACK to 50; it wakes with the lights on and real bedtime
+            # pressure (sleepLapse 360)
+            if self.obedience > IN_TRAINING_OBEDIENCE:
+                self._set_obedience(IN_TRAINING_OBEDIENCE)
+            self.asleep, self.nap = False, False
+            self.lights = True
+            self.sleep_lapse = IN_TRAINING_SLEEP_LAPSE
+        elif self.stage == "Rookie":
+            # rookie(): the childhood report card SETS obedience -- a Happy
+            # daily-mood majority earns 50, Neutral 25, anything else 0
+            # (a TIE is Mood.None -> the switch default -> bad, canon exact)
+            counts = self.daily_mood
+            best = max(counts.values()) if counts else 0
+            tops = [k for k, v in counts.items() if v == best and best > 0]
+            major = tops[0] if len(tops) == 1 else None
+            self._set_obedience(ROOKIE_OBED_GOOD if major == "Happy"
+                                else ROOKIE_OBED_DEFAULT if major == "Neutral"
+                                else ROOKIE_OBED_BAD)
         if was_young and self.stage == "Champion":
             # randOnChampion (taste/rank audit 2026-07-06): the childhood-care
             # tally becomes the adult temperament

{tuipet-0.2.330 → tuipet-0.2.332/src/tuipet.egg-info}/PKG-INFO

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

{tuipet-0.2.330 → tuipet-0.2.332}/src/tuipet.egg-info/SOURCES.txt

@@ -119,6 +119,7 @@ src/tuipet/data/sounds/wind.wav
 tests/test_adventure.py
 tests/test_adventure_math.py
 tests/test_adventure_scenery.py
+tests/test_album_dex.py
 tests/test_anim_canon.py
 tests/test_anim_timing.py
 tests/test_announce.py
@@ -194,6 +195,7 @@ tests/test_sleep.py
 tests/test_sleep_system.py
 tests/test_sleep_weather_math.py
 tests/test_sound.py
+tests/test_stage_arrival.py
 tests/test_status_box.py
 tests/test_status_icons.py
 tests/test_sync.py

tuipet-0.2.332/tests/test_album_dex.py

@@ -0,0 +1,52 @@
+"""Album/dex — canon Evolution.setUnlocked at digivolve + checkNaturalUnlocked's
+NAME sync across duplicate roster rows (the 1410+ egg-hatch block mirrors the
+chart's canonical rows), persisted device-lifetime (saves/Shared/tree.txt ->
+tuipet's settings progress channel).  Audit 2026-07-06."""
+from tuipet import data, persistence
+from tuipet.egg import _conditions_met
+
+
+def test_name_twins_share_one_canonical_num():
+    assert data.canonical_num(1432) == data.canonical_num(944) == 944  # ChibiKiwimon
+    assert data.canonical_num(1410) == 1                               # Yukimibotamon
+    assert data.canonical_num(100) == data.canonical_num(100)          # stable
+    assert data.canonical_num(999999) == 999999                        # unknown: identity
+
+
+def test_the_album_records_and_reveals_by_name():
+    """Raising a form under its hatch-twin num reveals BOTH (canon
+    checkNaturalUnlocked): the album stores the canonical identity and
+    album_seen answers for either alias."""
+    persistence.album_add(1432)                    # lived as the hatch twin
+    assert persistence.album_seen(944)             # ...the chart row is revealed
+    assert persistence.album_seen(1432)
+    assert 944 in persistence.get_album() and 1432 not in persistence.get_album()
+
+
+def test_old_raw_entries_canonicalize_on_read():
+    """Existing saves may hold duplicate-block nums from before the sync --
+    get_album() canonicalizes on read, no migration needed."""
+    d = persistence.load_settings()
+    d.setdefault("progress", {})["album"] = [1410, 102]   # an old-save shape
+    persistence.save_settings(d)
+    persistence._ALBUM_SEEN.clear()
+    assert persistence.get_album() == {1, 102}
+    assert persistence.album_seen(1)               # the chart twin answers
+
+
+def test_the_chibikiwimon_gate_accepts_either_twin():
+    """Egg 22's unlock history demands num 944 -- raising ChibiKiwimon from
+    its own egg (which hatches 1432) must satisfy it, like canon's name sync
+    (the exact stranding this audit found)."""
+    rule = data.load_egg_unlock()[22]
+    assert rule["history"] == [944]
+    prog = {"album": {944}, "wins": 10**9, "mega_kills": 10**9, "max_gen": 99,
+            "max_stage": 99, "xanti_ever": True, "maps": set(range(99)),
+            "tourneys": set(range(999)), "last_field": rule.get("prev_field"),
+            "last_xanti": True, "last_attribute": rule.get("prev_attribute"),
+            "last_element": rule.get("prev_element")}
+    # the album arrives canonicalized (get_album) -- 1432 stored old-style
+    # resolves to 944; simulate both shapes through the gate:
+    assert _conditions_met(rule, dict(prog, album={data.canonical_num(1432)}))
+    assert _conditions_met(rule, dict(prog, album={944}))
+    assert not _conditions_met(rule, dict(prog, album={1}))

tuipet-0.2.332/tests/test_stage_arrival.py

@@ -0,0 +1,59 @@
+"""Evolution.java's per-stage ARRIVAL setters (egg/hatch audit 2026-07-06):
+fresh()/inTraining()/rookie() SET the newcomer's state on top of digivolve --
+the missing fresh() obedience 75 was the deepest root of the misbehaving-
+babies era (canon babies are born TRUSTING; the 0 was pre-hatch defaultData)."""
+from tuipet.pet import (Pet, FRESH_MOOD, FRESH_OBEDIENCE, START_NUTRITION,
+                        IN_TRAINING_OBEDIENCE, IN_TRAINING_SLEEP_LAPSE,
+                        ROOKIE_OBED_GOOD, ROOKIE_OBED_DEFAULT, ROOKIE_OBED_BAD)
+
+
+def _egg():
+    p = Pet.new_egg(egg_type=0)
+    p.world_seconds = 10 * 60.0
+    return p
+
+
+def test_a_hatchling_is_born_trusting_grumpy_and_hungry():
+    p = _egg()
+    p.hatching = True
+    p._hatch_t = 0.0
+    assert p.advance_hatch(0.1)                    # the egg hatches
+    assert p.stage == "Fresh"
+    assert p.obedience == FRESH_OBEDIENCE == 75    # born trusting
+    assert p.mood == FRESH_MOOD == -10             # ...and grumpy
+    assert p.hunger == 0 and p.strength == 0       # born hungry, no effort yet
+    assert p.energy == p.max_energy                # full of beans
+    assert (p.nutr_protein, p.nutr_mineral, p.nutr_vitamin) == (6, 6, 6)
+    lo, hi = p.ideal_temp
+    assert p.temp == (lo + hi) // 2
+
+
+def test_intraining_arrival_is_the_toddler_rebellion():
+    p = Pet(num=2, stage="Fresh", attribute="Vaccine")
+    p.world_seconds = 10 * 60.0
+    p.obedience = 75
+    p.asleep, p.lights = True, False
+    p.evolve_to(12)                                # any InTraining form
+    assert p.stage == "InTraining"
+    assert p.obedience == IN_TRAINING_OBEDIENCE == 50   # knocked back down
+    assert not p.asleep and p.lights                    # wakes, lights on
+    assert p.sleep_lapse == IN_TRAINING_SLEEP_LAPSE == 360
+    q = Pet(num=2, stage="Fresh", attribute="Vaccine")
+    q.world_seconds = 10 * 60.0
+    q.obedience = 10
+    q.evolve_to(12)
+    assert q.obedience == 10                       # only re-set when ABOVE the cap
+
+
+def test_rookie_arrival_grades_the_childhood():
+    for moods, want in ((dict(Happy=5, Neutral=1), ROOKIE_OBED_GOOD),
+                        (dict(Neutral=5, Happy=1), ROOKIE_OBED_DEFAULT),
+                        (dict(Unhappy=5), ROOKIE_OBED_BAD),
+                        (dict(Happy=3, Neutral=3), ROOKIE_OBED_BAD)):   # a TIE is Mood.None -> bad
+        p = Pet(num=12, stage="InTraining", attribute="Vaccine")
+        p.world_seconds = 10 * 60.0
+        p.obedience = 99
+        for k, v in moods.items():
+            p.daily_mood[k] = v
+        p.evolve_to(25)                            # any Rookie form
+        assert p.obedience == want, (moods, p.obedience)