Restrict transfers to HoF team and prevent blocking starter route

Transfer modal now only appears when a Hall of Fame team is selected,
using the existing hofTeam data instead of the survivors endpoint.
Without a HoF selection, advance proceeds directly with no transfer step.

Transferred encounters are now a separate category: they appear in their
own "Transferred Pokemon" section, don't occupy route slots in the
encounter map, and don't block the route-lock check (excluded via
genlocke_transfers subquery). The run detail endpoint returns
transferEncounterIds so the frontend can distinguish them.

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

backend/src/app/api/encounters.py

@@ -8,6 +8,7 @@ from sqlalchemy.orm import joinedload, selectinload
 from app.core.database import get_session
 from app.models.encounter import Encounter
 from app.models.evolution import Evolution
+from app.models.genlocke_transfer import GenlockeTransfer
 from app.models.genlocke import GenlockeLeg
 from app.models.nuzlocke_run import NuzlockeRun
 from app.models.pokemon import Pokemon
@@ -85,11 +86,14 @@ async def create_encounter(
             sibling_ids = [s.id for s in siblings]
 
         # Check if any relevant sibling already has an encounter in this run
+        # Exclude transfer-target encounters so they don't block the starter
+        transfer_target_ids = select(GenlockeTransfer.target_encounter_id)
         existing_encounter = await session.execute(
             select(Encounter)
             .where(
                 Encounter.run_id == run_id,
                 Encounter.route_id.in_(sibling_ids),
+                ~Encounter.id.in_(transfer_target_ids),
             )
         )
         if existing_encounter.scalar_one_or_none() is not None:

backend/src/app/api/runs.py

@@ -105,8 +105,19 @@ async def get_run(run_id: int, session: AsyncSession = Depends(get_session)):
             retired_pokemon_ids=retired_pokemon_ids,
         )
 
+    # Load transfer-target encounter IDs for this run
+    transfer_ids_result = await session.execute(
+        select(GenlockeTransfer.target_encounter_id).where(
+            GenlockeTransfer.target_encounter_id.in_(
+                select(Encounter.id).where(Encounter.run_id == run_id)
+            )
+        )
+    )
+    transfer_encounter_ids = [row[0] for row in transfer_ids_result]
+
     response = RunDetailResponse.model_validate(run)
     response.genlocke = genlocke_context
+    response.transfer_encounter_ids = transfer_encounter_ids
     return response
 
 

backend/src/app/schemas/run.py

@@ -42,3 +42,4 @@ class RunDetailResponse(RunResponse):
     game: GameResponse
     encounters: list[EncounterDetailResponse] = []
     genlocke: RunGenlockeContext | None = None
+    transfer_encounter_ids: list[int] = []

frontend/src/components/TransferModal.tsx

@@ -1,16 +1,16 @@
 import { useState } from 'react'
-import type { SurvivorEncounter } from '../types'
+import type { EncounterDetail } from '../types'
 
 interface TransferModalProps {
-  survivors: SurvivorEncounter[]
+  hofTeam: EncounterDetail[]
   onSubmit: (encounterIds: number[]) => void
   onSkip: () => void
   isPending: boolean
 }
 
-export function TransferModal({ survivors, onSubmit, onSkip, isPending }: TransferModalProps) {
+export function TransferModal({ hofTeam, onSubmit, onSkip, isPending }: TransferModalProps) {
   const [selected, setSelected] = useState<Set<number>>(
-    () => new Set(survivors.map((s) => s.id)),
+    () => new Set(hofTeam.map((e) => e.id)),
   )
 
   const toggle = (id: number) => {
@@ -39,21 +39,16 @@ export function TransferModal({ survivors, onSubmit, onSkip, isPending }: Transf
         </div>
 
         <div className="px-6 py-4">
-          {survivors.length === 0 ? (
-            <p className="text-sm text-gray-500 dark:text-gray-400 text-center py-8">
-              No surviving Pokemon to transfer.
-            </p>
-          ) : (
           <div className="grid grid-cols-3 gap-2">
-              {survivors.map((survivor) => {
+            {hofTeam.map((enc) => {
-                const displayPokemon = survivor.currentPokemon ?? survivor.pokemon
+              const displayPokemon = enc.currentPokemon ?? enc.pokemon
-                const isSelected = selected.has(survivor.id)
+              const isSelected = selected.has(enc.id)
 
               return (
                 <button
-                    key={survivor.id}
+                  key={enc.id}
                   type="button"
-                    onClick={() => toggle(survivor.id)}
+                  onClick={() => toggle(enc.id)}
                   className={`flex flex-col items-center p-3 rounded-lg border-2 text-center transition-colors ${
                     isSelected
                       ? 'border-indigo-500 bg-indigo-50 dark:bg-indigo-900/20'
@@ -72,21 +67,20 @@ export function TransferModal({ survivors, onSubmit, onSkip, isPending }: Transf
                     </div>
                   )}
                   <span className="text-xs font-medium text-gray-700 dark:text-gray-300 mt-1 capitalize">
-                      {survivor.nickname || displayPokemon.name}
+                    {enc.nickname || displayPokemon.name}
                   </span>
-                    {survivor.nickname && (
+                  {enc.nickname && (
                     <span className="text-[10px] text-gray-400">
                       {displayPokemon.name}
                     </span>
                   )}
                   <span className="text-[10px] text-gray-400 mt-0.5">
-                      {survivor.routeName}
+                    {enc.route.name}
                   </span>
                 </button>
               )
             })}
           </div>
-          )}
         </div>
 
         <div className="sticky bottom-0 bg-white dark:bg-gray-800 border-t border-gray-200 dark:border-gray-700 px-6 py-4 rounded-b-xl flex items-center justify-between">
@@ -100,7 +94,7 @@ export function TransferModal({ survivors, onSubmit, onSkip, isPending }: Transf
           </button>
           <div className="flex items-center gap-3">
             <span className="text-sm text-gray-400 dark:text-gray-500">
-              {selected.size}/{survivors.length} selected
+              {selected.size}/{hofTeam.length} selected
             </span>
             <button
               type="button"

frontend/src/pages/RunEncounters.tsx

@@ -1,7 +1,7 @@
 import { useState, useMemo, useEffect, useCallback } from 'react'
 import { useParams, Link, useNavigate } from 'react-router-dom'
 import { useRun, useUpdateRun } from '../hooks/useRuns'
-import { useAdvanceLeg, useLegSurvivors } from '../hooks/useGenlockes'
+import { useAdvanceLeg } from '../hooks/useGenlockes'
 import { useGameRoutes } from '../hooks/useGames'
 import { useCreateEncounter, useUpdateEncounter, useBulkRandomize } from '../hooks/useEncounters'
 import { usePokemonFamilies } from '../hooks/usePokemon'
@@ -397,11 +397,6 @@ export function RunEncounters() {
   const { data: run, isLoading, error } = useRun(runIdNum)
   const advanceLeg = useAdvanceLeg()
   const [showTransferModal, setShowTransferModal] = useState(false)
-  const { data: survivors } = useLegSurvivors(
-    run?.genlocke?.genlockeId ?? 0,
-    run?.genlocke?.legOrder ?? 0,
-    showTransferModal && !!run?.genlocke,
-  )
   const { data: routes, isLoading: loadingRoutes } = useGameRoutes(
     run?.gameId ?? null,
   )
@@ -455,19 +450,27 @@ export function RunEncounters() {
   }, [routes])
 
   // Split encounters into normal (non-shiny) and shiny
-  const { normalEncounters, shinyEncounters } = useMemo(() => {
+  const transferIdSet = useMemo(
-    if (!run) return { normalEncounters: [], shinyEncounters: [] }
+    () => new Set(run?.transferEncounterIds ?? []),
+    [run?.transferEncounterIds],
+  )
+
+  const { normalEncounters, shinyEncounters, transferEncounters } = useMemo(() => {
+    if (!run) return { normalEncounters: [], shinyEncounters: [], transferEncounters: [] }
     const normal: EncounterDetail[] = []
     const shiny: EncounterDetail[] = []
+    const transfer: EncounterDetail[] = []
     for (const enc of run.encounters) {
-      if (enc.isShiny) {
+      if (transferIdSet.has(enc.id)) {
+        transfer.push(enc)
+      } else if (enc.isShiny) {
         shiny.push(enc)
       } else {
         normal.push(enc)
       }
     }
-    return { normalEncounters: normal, shinyEncounters: shiny }
+    return { normalEncounters: normal, shinyEncounters: shiny, transferEncounters: transfer }
-  }, [run])
+  }, [run, transferIdSet])
 
   // Map routeId → encounter for quick lookup (normal encounters only)
   const encounterByRoute = useMemo(() => {
@@ -871,7 +874,25 @@ export function RunEncounters() {
             </div>
             {run.status === 'completed' && run.genlocke && !run.genlocke.isFinalLeg && (
               <button
-                onClick={() => setShowTransferModal(true)}
+                onClick={() => {
+                  if (hofTeam && hofTeam.length > 0) {
+                    setShowTransferModal(true)
+                  } else {
+                    advanceLeg.mutate(
+                      { genlockeId: run.genlocke!.genlockeId, legOrder: run.genlocke!.legOrder },
+                      {
+                        onSuccess: (genlocke) => {
+                          const nextLeg = genlocke.legs.find(
+                            (l) => l.legOrder === run.genlocke!.legOrder + 1,
+                          )
+                          if (nextLeg?.runId) {
+                            navigate(`/runs/${nextLeg.runId}`)
+                          }
+                        },
+                      },
+                    )
+                  }
+                }}
                 disabled={advanceLeg.isPending}
                 className="px-4 py-2 text-sm font-medium rounded-lg bg-blue-600 text-white hover:bg-blue-700 disabled:opacity-50 transition-colors"
               >
@@ -1081,6 +1102,24 @@ export function RunEncounters() {
         </div>
       )}
 
+      {/* Transfer Encounters */}
+      {transferEncounters.length > 0 && (
+        <div className="mb-6">
+          <h2 className="text-sm font-medium text-indigo-600 dark:text-indigo-400 mb-2">
+            Transferred Pokemon
+          </h2>
+          <div className="grid grid-cols-3 sm:grid-cols-4 md:grid-cols-6 gap-2">
+            {transferEncounters.map((enc) => (
+              <PokemonCard
+                key={enc.id}
+                encounter={enc}
+                onClick={isActive ? () => setSelectedTeamEncounter(enc) : undefined}
+              />
+            ))}
+          </div>
+        </div>
+      )}
+
       {/* Progress bar */}
       <div className="mb-4">
         <div className="flex items-center justify-between mb-1">
@@ -1449,9 +1488,9 @@ export function RunEncounters() {
       )}
 
       {/* Transfer Modal */}
-      {showTransferModal && survivors && (
+      {showTransferModal && hofTeam && hofTeam.length > 0 && (
         <TransferModal
-          survivors={survivors}
+          hofTeam={hofTeam}
           onSubmit={(encounterIds) => {
             advanceLeg.mutate(
               {

frontend/src/types/game.ts

@@ -107,6 +107,7 @@ export interface RunDetail extends NuzlockeRun {
   game: Game
   encounters: EncounterDetail[]
   genlocke: RunGenlockeContext | null
+  transferEncounterIds: number[]
 }
 
 export interface EncounterDetail extends Encounter {