pokemon/nuzlocke-tracker
1
1
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Scope genlocke retireHoF to HoF team instead of all alive Pokemon

Browse Source 
advance_leg() now checks current_run.hof_encounter_ids first and only
retires those Pokemon and their families. Falls back to all alive
non-shiny Pokemon when no HoF team is selected (backwards compatible).

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
Julian Tabel
2026-02-09 10:26:49 +01:00
parent 58d36c4433
commit 056bef9f75
3 changed files with 31 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
.beans/nuzlocke-tracker-h3fw--use-hof-team-for-genlocke-retirement-instead-of-al.md
View File

@@ -1,11 +1,11 @@
--- ---
# nuzlocke-tracker-h3fw # nuzlocke-tracker-h3fw
title: Use HoF team for genlocke retirement instead of all alive Pokemon title: Use HoF team for genlocke retirement instead of all alive Pokemon
status: todo status: in-progress
type: task type: task
priority: normal priority: normal
created_at: 2026-02-09T09:15:00Z created_at: 2026-02-09T09:15:00Z
updated_at: 2026-02-09T09:15:03Z updated_at: 2026-02-09T09:26:16Z
parent: nuzlocke-tracker-8w9s parent: nuzlocke-tracker-8w9s
blocking: blocking:
- nuzlocke-tracker-25mh - nuzlocke-tracker-25mh
@@ -36,5 +36,5 @@ select(Encounter.pokemon_id).where(
- Update the frontend `RunEncounters.tsx` to also scope `retiredPokemonIds` correctly (no change needed — it reads from the backend response) - Update the frontend `RunEncounters.tsx` to also scope `retiredPokemonIds` correctly (no change needed — it reads from the backend response)
## Checklist ## Checklist
- [ ] Update `advance_leg()` to prefer `hof_encounter_ids` over all-alive query - [x] Update `advance_leg()` to prefer `hof_encounter_ids` over all-alive query
- [ ] Verify backwards compatibility when `hof_encounter_ids` is null - [x] Verify backwards compatibility when `hof_encounter_ids` is null

11
.beans/nuzlocke-tracker-lqf2--fix-hooks-order-violation-in-runencounters.md Normal file
View File

@@ -0,0 +1,11 @@
---
# nuzlocke-tracker-lqf2
title: Fix hooks order violation in RunEncounters
status: completed
type: bug
priority: critical
created_at: 2026-02-09T09:22:14Z
updated_at: 2026-02-09T09:22:58Z
---
The hofTeam useMemo was placed after early returns, causing a 'Rendered more hooks than during the previous render' error and blank page.

25
backend/src/app/api/genlockes.py
View File

@@ -146,16 +146,23 @@ async def advance_leg(
# Compute retired Pokemon families if retireHoF is enabled # Compute retired Pokemon families if retireHoF is enabled
if genlocke.genlocke_rules.get("retireHoF", False): if genlocke.genlocke_rules.get("retireHoF", False):
# Query surviving caught Pokemon from the completed run # Prefer the player's HoF team selection; fall back to all alive
# "Surviving HoF" = caught, not fainted, not shiny if current_run.hof_encounter_ids:
survivors_result = await session.execute( survivors_result = await session.execute(
select(Encounter.pokemon_id).where( select(Encounter.pokemon_id).where(
Encounter.run_id == current_leg.run_id, Encounter.id.in_(current_run.hof_encounter_ids),
Encounter.status == "caught", )
Encounter.faint_level.is_(None), )
Encounter.is_shiny.is_(False), else:
# Fallback: all surviving caught, non-shiny Pokemon
survivors_result = await session.execute(
select(Encounter.pokemon_id).where(
Encounter.run_id == current_leg.run_id,
Encounter.status == "caught",
Encounter.faint_level.is_(None),
Encounter.is_shiny.is_(False),
)
) )
)
survivor_ids = [row[0] for row in survivors_result] survivor_ids = [row[0] for row in survivors_result]
if survivor_ids: if survivor_ids: