FRLG 00.26: the Bike Voucher, back to Cerulean, the Bicycle

.github/workflows/cpp-ci-serial-programs-base.yml

@@ -88,6 +88,49 @@ jobs:
           ref: 'master'
           path: 'Arduino-Source/Packages'
 
+      - name: Install Python for pinned map preparation
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.12'
+
+      - name: Prepare approved FRLG map resources
+        id: map-resources
+        uses: dayfine/PokemonSimulation/integrations/arduino-source/verify-map-packs@906956e94fc912ae9adb0e44845da780f3bc7e4c
+        with:
+          layout: resources
+          operation: prepare
+          consumer-directory: Arduino-Source
+
+      - name: Checkout authored checkpoint simulator
+        if: startsWith(inputs.os, 'ubuntu') && inputs.run-tests
+        uses: actions/checkout@v7
+        with:
+          repository: dayfine/PokemonSimulation
+          ref: 8cb831caf8bfe1f06b1aec9a4a7e55e6e09b0604
+          path: AuthoredStorySource
+
+      - name: Check identical authored Parcel JSON and replay its scenarios
+        if: startsWith(inputs.os, 'ubuntu') && inputs.run-tests
+        env:
+          PYTHONPATH: AuthoredStorySource/src
+        run: |
+          python3 - <<'PYTHON'
+          from pathlib import Path
+          from pokesim.story.replay_binding import load_binding
+          from pokesim.story.replay_cases import read_cases, check_case
+          from pokesim.story.checkpoint_replay import run
+          source = Path('AuthoredStorySource')
+          folder = source / 'data/story/parcel-pilot'
+          native = Path('Arduino-Source/SerialPrograms/Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData')
+          assert (native / 'frlg-parcel-00.05.plan.json').read_bytes() == (folder / 'frlg-parcel-00.05.plan.json').read_bytes()
+          binding = load_binding(folder / 'authored-binding.json', source)
+          cases = read_cases(folder / 'cases.json')
+          for case in cases:
+              check_case(case, run(binding, case['input']))
+              print(case['id'] + ': authored JSON replay passed')
+          assert len(cases) == 7
+          PYTHON
+
       - name: Install Qt
         uses: jurplel/install-qt-action@v4
         with:
@@ -204,6 +247,8 @@ jobs:
           # every file missed, compiling took 10-40% longer than before on Linux and macOS, and
           # about twice as long on Windows.
           CCACHE_DEPEND: 1
+          POKESIM_TOOLS_SOURCE: ${{ steps.map-resources.outputs.tools-source }}
+          POKESIM_SOURCE_CACHE: ${{ steps.map-resources.outputs.source-cache }}
         run: |
           cd Arduino-Source/SerialPrograms
           mkdir bin
@@ -265,7 +310,9 @@ jobs:
         uses: actions/checkout@v7
         if: inputs.run-tests
         with:
-          repository: 'PokemonAutomation/CommandLineTests'
+          # Complete fork fixtures include pending FRLG image submissions.
+          repository: 'dayfine/CommandLineTests'
+          ref: 'd150a6c547434110a920f95ba7857b93d5bb9222'
           path: 'CommandLineTests'
 
       # The unit tests assume the downloadable resources they need are already downloaded

.gitignore

@@ -81,3 +81,6 @@ Packages/*
 # Local agent/linter environments.
 .venv-code-health/
 __pycache__/
+
+# External PokemonSimulation tools/data cache; prepared maps live in ignored Packages.
+.pokesim-map-source/

SerialPrograms/CMakeLists.txt

@@ -227,10 +227,14 @@ add_library(SerialProgramsLib STATIC ${CORE_LIBRARY_SOURCES} ${LIBRARY_SOURCES})
 include(cmake/EmbedTextFiles.cmake)
 pa_embed_text_files(SerialProgramsLib Source/Pokemon/Navigation/TestMaps
     Pokemon/Navigation/Pokemon_Navigation_Tests.h PokemonAutomation::Pokemon navigation_test_map_json)
-pa_embed_text_files(SerialProgramsLib Source/VideoGames/PokemonFRLG/Overworld/Maps
+include(cmake/PokesimMapResources.cmake)
+pa_frlg_map_resources(FRLG_MAP_RESOURCES)
+pa_embed_text_files(SerialProgramsLib "${FRLG_MAP_RESOURCES}"
     VideoGames/PokemonFRLG/Overworld/PokemonFRLG_OverworldMaps.h PokemonAutomation::NintendoSwitch::PokemonFRLG overworld_map_json)
 pa_embed_text_files(SerialProgramsLib Source/VideoGames/PokemonFRLG/Programs/AutoStory/BattleData
     VideoGames/PokemonFRLG/Programs/AutoStory/PokemonFRLG_AutoStoryBattleData.h PokemonAutomation::NintendoSwitch::PokemonFRLG autostory_battle_json)
+pa_embed_text_files(SerialProgramsLib Source/VideoGames/PokemonFRLG/Programs/AutoStory/StoryData
+    VideoGames/PokemonFRLG/Programs/AutoStory/Data/JsonParser.h PokemonAutomation::NintendoSwitch::PokemonFRLG autostory_checkpoint_json)
 
 
 # Create binary target

SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_SaveCardReader.cpp

@@ -73,6 +73,7 @@ class PlaceNameMatcher : public OCR::SmallDictionaryMatcher{
             {"cerulean-city", "Cerulean City"},
             {"route-24", "Route 24"},
             {"route-25", "Route 25"},
+            {"route-10", "Route 10"},
             {"vermilion-city", "Vermilion City"},
         }){
             JsonArray names;

SerialPrograms/Source/VideoGames/PokemonFRLG/Inference/Menus/PokemonFRLG_SaveCardReader.h

@@ -33,7 +33,7 @@ ImageFloatBox save_card_title_box();
 
 //  The place on the save card: "pallet-town", "viridian-city",
 //  "viridian-forest", "pewter-city", "route-1" to "route-4", "cerulean-city",
-//  "route-24", "route-25", "vermilion-city"; empty if it can't be read, as
+//  "route-10", "route-24", "route-25", "vermilion-city"; empty if it can't be read, as
 //  in a language the reader has no names for.
 std::string read_save_card_location(Logger& logger, Language language, const ImageViewRGB32& screen);