Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
307 commits
Select commit Hold shift + click to select a range
923b1dd
PokemonLZA AutoStory: follow #332's output-parameters-last signatures
dayfine Nov 10, 2026
8aa2cc7
PokemonLZA: AutoStory: ad test follows the interact prompt counting a…
dayfine Nov 10, 2026
7e42bec
PokemonLZA: AutoStory: after_andi presses A through the mission-compl…
dayfine Nov 10, 2026
d14f476
PokemonLZA: AutoStory: mission complete card, banner A, first menu save
dayfine Nov 10, 2026
0160efc
PokemonLZA: AutoStory: 01.03 to the verification phase
dayfine Nov 10, 2026
b2b60c1
PokemonLZA: AutoStory: shorter pauses between walk legs
dayfine Nov 10, 2026
7a4c4cb
AutoStory: an INTEGER_ROWS story arg ([[0, 4500], [90, 0]])
dayfine Nov 10, 2026
291b8ea
PokemonLZA: AutoStory: walk legs in the story JSON; dev checkpoints f…
dayfine Nov 10, 2026
a1434c7
PokemonLZA: AutoStory: held walk legs, and 02.01's walk to Brigitte
dayfine Nov 11, 2026
12e5bc8
PokemonLZA: AutoStory: split 02.01 at the autosave after Brigitte
dayfine Nov 11, 2026
0015e51
PokemonLZA: AutoStory: 02.02 leaves the Battle Zone from where the st…
dayfine Nov 11, 2026
6826423
PokemonLZA: AutoStory: 02.02 presses A at the Battle Zone gate
dayfine Nov 11, 2026
66f3bf3
PokemonLZA: AutoStory: 02.02's covered passage as a held walk
dayfine Nov 11, 2026
5e0ca1b
PokemonLZA: AutoStory: split 02.02 at the autosave in front of Hotel Z
dayfine Nov 11, 2026
79cb10d
PokemonLZA AutoStory: 02.03 presses A at Hotel Z's door, then plays t…
dayfine Nov 11, 2026
0bd1a8c
PokemonLZA: AutoStory: 02.03 turns to AZ for the check-in; split at t…
dayfine Nov 11, 2026
350a7c1
Merge autostory/engine into plza/autostory-story-steps
dayfine Nov 11, 2026
348e6b8
Merge plza/autostory-story-steps into plza/story-checkpoints
dayfine Nov 11, 2026
3c4d502
Merge plza/story-checkpoints into plza/story-engine
dayfine Nov 11, 2026
d4cccd7
Merge autostory/engine into plza/autostory-story-steps
dayfine Nov 11, 2026
a9fa25a
Merge plza/autostory-story-steps into plza/story-checkpoints
dayfine Nov 11, 2026
ce3b810
Merge plza/story-checkpoints into plza/story-engine
dayfine Nov 11, 2026
5ed29f9
PokemonLZA: AutoStory: 02.04 advances the elevator's talk with A up t…
dayfine Nov 11, 2026
1aa7499
Merge remote-tracking branch 'origin/plza/story-engine' into plza/sto…
dayfine Nov 11, 2026
9d07415
PokemonLZA: AutoStory: a walk's wait comes before its free-control ch…
dayfine Nov 11, 2026
df0e7de
PokemonLZA: AutoStory: Hotel Z's quiet halls count as control; 02.04 …
dayfine Nov 11, 2026
b502ce0
PokemonLZA: AutoStory: the scene machine's outcome in its own function
dayfine Nov 11, 2026
f7a7885
PokemonLZA: AutoStory: split 02.04 at the autosaves in Room 202
dayfine Nov 11, 2026
d89af25
PokemonLZA: AutoStory: 03.01 leaves Room 202 and rides down as 02.04 …
dayfine Nov 11, 2026
1668d72
PokemonLZA: AutoStory: 03.01's lobby scene waits 20 s of quiet; 03.02…
dayfine Nov 11, 2026
a8ba1c2
PokemonLZA: AutoStory: story_battle presses A through the intro until…
dayfine Nov 11, 2026
6a0cac6
PokemonLZA: AutoStory: 03.02's map talk pages its card with A and clo…
dayfine Nov 11, 2026
276371f
PokemonLZA: AutoStory: scene mashes press A on tutorial cards; 03.05 …
dayfine Nov 11, 2026
83230db
PokemonLZA: AutoStory: the tutorial card check ignores the panel's sp…
dayfine Nov 11, 2026
3a88118
PokemonLZA: AutoStory: Wild Zone 1's tutorial catches
dayfine Nov 11, 2026
aadeacf
PokemonLZA: AutoStory: battle_then_catch sends the partner out past t…
dayfine Nov 11, 2026
d5d3c4c
PokemonLZA: AutoStory: 03.07 catches more species in Wild Zone 1 (cat…
dayfine Nov 11, 2026
1512502
PokemonLZA: AutoStory: catch_in_zone walks 5 s into the zone first; 2…
dayfine Nov 11, 2026
f2ca332
PokemonLZA: AutoStory: review fixes: Actions/ and Detectors/, step va…
dayfine Nov 11, 2026
71c6f1c
PokemonLZA: AutoStory: 03.07 catches on the way to the objective marker
dayfine Nov 11, 2026
bd98c7e
Merge plza/review-fixes into plza/story-engine: the #335 review fixes
dayfine Nov 11, 2026
ac7bb1d
Merge origin/plza/story-engine (71c6f1c90) after the review fixes
dayfine Nov 11, 2026
0424aa1
Merge plza/story-mm2 into plza/story-engine: #335 now holds Main Miss…
dayfine Nov 11, 2026
2aec3e0
PokemonLZA: AutoStory: catch_in_zone's waterfill names need Kernels::…
dayfine Nov 11, 2026
82efa27
PokemonLZA: AutoStory: drop an allow tag code health no longer needs
dayfine Nov 11, 2026
1c7d76e
PokemonLZA: AutoStory: catch_in_zone steps right around Taunie's rock…
dayfine Nov 11, 2026
eff38bf
PokemonLZA: AutoStory: catch_in_zone tells a catch by the autosave or…
dayfine Nov 11, 2026
688cfd3
PokemonLZA: AutoStory: catch_in_zone catches a new species by the Pok…
dayfine Nov 11, 2026
bce24da
PokemonLZA: AutoStory: walk_to_objective keeps the marker; catch_in_z…
dayfine Nov 11, 2026
4c1c111
PokemonLZA: AutoStory: a load_backup_save action for lab reruns
dayfine Nov 11, 2026
72eef94
PokemonLZA: AutoStory: catch_in_zone takes the quest as done when onl…
dayfine Nov 11, 2026
885f097
PokemonLZA: AutoStory: 03.07 leaves Wild Zone 1 with A pressed first
dayfine Nov 11, 2026
e24647b
PokemonLZA: AutoStory: 03.07 walks by the objective marker after Wild…
dayfine Nov 11, 2026
6ca3d46
PokemonLZA: AutoStory: walk_to_objective steps around what holds it u…
dayfine Nov 11, 2026
4ce6c48
PokemonLZA: AutoStory: walk_to_objective's pinned-marker turn in its …
dayfine Nov 11, 2026
9e0b47d
PokemonLZA: press A when a question's choices wait behind its text
dayfine Nov 11, 2026
31783a4
PokemonLZA: measured walk from the 3F elevator to Mable
dayfine Nov 11, 2026
0793015
PokemonLZA: Mable's talk is an A scene to control in her office
dayfine Nov 11, 2026
b4d72fc
PokemonLZA: first cut of claim_mable_research_reward (menu to Mable's…
dayfine Nov 11, 2026
747ab96
PokemonLZA: claim_mable_research_reward goes through Mable's lines an…
dayfine Nov 11, 2026
adcd06f
PokemonLZA: allow Mable's talk after her research menu
dayfine Nov 11, 2026
7e192dd
PokemonLZA: AutoStory: every row is ready again; descriptor and story…
dayfine Nov 11, 2026
1032a65
Merge plza/story-mm2 into plza/story-engine
dayfine Nov 11, 2026
e4dfa87
PokemonLZA: AutoStory: 25 recorded walks (three became walk_to_marker…
dayfine Nov 11, 2026
426f6e1
Merge remote-tracking branch 'origin/plza/story-mm2' into plza/story-…
dayfine Nov 11, 2026
b1ffc28
PokemonLZA: AutoStory: 03.xx starts are places
dayfine Nov 11, 2026
73761c7
Merge branch 'plza/story-mm2' into HEAD
dayfine Nov 11, 2026
19c7c19
Merge plza/story-mm2 into plza/story-engine
dayfine Nov 11, 2026
6b7d695
Merge origin/plza/story-mm2 into plza/story-engine
dayfine Nov 12, 2026
58c612f
Merge branch 'plza/story-mm2' into plza/story-engine
dayfine Nov 12, 2026
ee3f033
Merge branch 'plza/story-mm2' into plza/story-engine
dayfine Nov 12, 2026
5202351
Merge branch 'plza/story-mm2' into plza/story-engine
dayfine Nov 12, 2026
614b8fe
Merge branch 'plza/story-mm2' into plza/story-engine
dayfine Nov 12, 2026
0d1f25c
Merge remote-tracking branch 'origin/plza/story-mm2' into plza/story-…
dayfine Nov 12, 2026
a63e4f9
Merge branch 'plza/story-mm2' into plza/story-engine
dayfine Nov 12, 2026
6c0da36
Merge origin/plza/story-mm2 into plza/story-engine
dayfine Nov 12, 2026
eadb7e3
Merge branch 'plza/story-mm2' into plza/story-engine
dayfine Nov 13, 2026
b7faeb8
Merge remote-tracking branch 'origin/plza/story-mm2' into plza/story-…
dayfine Nov 13, 2026
58c0977
Merge branch 'plza/story-mm2' into plza/story-engine
dayfine Nov 13, 2026
b19ebed
Merge branch 'plza/story-mm2' into plza/story-engine
dayfine Nov 13, 2026
251940d
Merge branch 'plza/story-mm2' into plza/story-engine
dayfine Nov 13, 2026
de20954
Merge branch 'plza/story-mm2' into plza/story-engine
dayfine Nov 13, 2026
f223f82
Merge branch 'plza/story-mm2' into plza/story-engine
dayfine Nov 13, 2026
3412547
PokemonLZA AutoStory: 03.01 and 03.02 reload their save when run afte…
dayfine Nov 13, 2026
4d2f807
Merge branch 'plza/story-mm2' into plza/story-engine
dayfine Nov 13, 2026
39ca22c
Merge remote-tracking branch 'origin/plza/story-mm2' into HEAD
dayfine Nov 13, 2026
9c355bd
PokemonLZA AutoStory: 02.03 mashes from the clerk to the elevator, no…
dayfine Nov 13, 2026
852e4e6
PokemonLZA AutoStory: the story table has 24 walks without 02.03's fa…
dayfine Nov 13, 2026
dc667a6
Merge origin/plza/story-mm2 into plza/story-engine: #45 review fixes
dayfine Nov 13, 2026
27145aa
PokemonLZA AutoStory: 02.04 runs on from 02.03 without a reload
dayfine Nov 13, 2026
9ae528e
Merge branch 'plza/story-mm2' into plza/story-engine
dayfine Nov 13, 2026
258a7b0
Merge origin/plza/story-mm2 into plza/story-engine: #45 review fixes
dayfine Nov 13, 2026
cb4c4b1
PokemonLZA AutoStory: 02.03 ends at the Hotel Z lobby autosave; 02.04…
dayfine Nov 13, 2026
8e29b51
PokemonLZA AutoStory: 02.04 check_in ends on 5 s quiet after the scene
dayfine Nov 13, 2026
3948fa1
PokemonLZA AutoStory: split 02.04 at the elevator autosave; new 02.05
dayfine Nov 13, 2026
6d55ebf
Merge origin/plza/story-mm2 into plza/story-engine: shared checkpoint…
dayfine Nov 13, 2026
709e90f
PokemonLZA AutoStory: 02.06 runs on from 02.05 without a reload
dayfine Nov 13, 2026
c0f0430
PokemonLZA AutoStory: autosave badge with a dim glow
dayfine Nov 13, 2026
73088e3
PokemonLZA AutoStory: log autosave spots; autosave then quiet ends a …
dayfine Nov 13, 2026
ff80bec
Merge remote-tracking branch 'origin/plza/story-engine' into plza/sto…
dayfine Nov 13, 2026
cf227bb
Merge branch 'plza/story-mm2' into plza/story-engine
dayfine Nov 13, 2026
2b117e6
Merge branch 'plza/story-mm2' into plza/story-engine
dayfine Nov 13, 2026
fa0f651
PokemonLZA AutoStory: 03.05 heals at the Pokemon Center
dayfine Nov 13, 2026
08d1618
Merge plza/story-mm2 into plza/story-engine
dayfine Nov 13, 2026
49a0f08
Merge origin/plza/story-mm2 into plza/story-engine
dayfine Nov 13, 2026
96a5860
PokemonLZA: AutoStory: through the first map with A and B in turn
dayfine Nov 13, 2026
eec164f
Merge remote-tracking branch 'origin/plza/story-engine' into plza/sto…
dayfine Nov 13, 2026
6cf8171
Merge origin/plza/story-mm2 into plza/story-engine
dayfine Nov 13, 2026
b99791a
PokemonLZA: AutoStory: 03.04 reloads 03.03's autosave even straight t…
dayfine Nov 13, 2026
5f00d23
Merge remote-tracking branch 'origin/plza/story-engine' into plza/sto…
dayfine Nov 13, 2026
e3af39c
Merge origin/plza/story-mm2 into plza/story-engine
dayfine Nov 13, 2026
2cadc64
PokemonLZA: AutoStory: 03.05 turns right into the counter to the nurse
dayfine Nov 13, 2026
2d15ced
Merge remote-tracking branch 'origin/plza/story-engine' into plza/sto…
dayfine Nov 13, 2026
31b94f4
PokemonLZA: AutoStory: 03.06 leaves the counter by reversing 03.05's …
dayfine Nov 13, 2026
91db1c7
PokemonLZA: AutoStory: walk_to_objective rejects far-above misreads, …
dayfine Nov 13, 2026
2127c01
PokemonLZA: AutoStory: weaken a target that broke out and started a b…
dayfine Nov 13, 2026
54bbfb9
Merge origin/plza/story-mm2 into plza/story-engine: shared ScreenEven…
dayfine Nov 14, 2026
17fc6e0
PokemonLZA: AutoStory: catches choose the nearest lock-on target, wal…
dayfine Nov 14, 2026
08aa3a1
Merge remote-tracking branch 'origin/plza/story-engine' into HEAD
dayfine Nov 14, 2026
a080f32
PokemonLZA: AutoStory: catch_in_zone's patrol in its own function; ca…
dayfine Nov 14, 2026
7ea8644
PokemonLZA: AutoStory: test cases take name, input and expectation
dayfine Nov 14, 2026
409916a
PokemonLZA: AutoStory: lock-on bracket detector; catch_in_zone watche…
dayfine Nov 14, 2026
32100ba
PokemonLZA: AutoStory: bracket watch in its own header; code-health f…
dayfine Nov 14, 2026
0038bfa
PokemonLZA: AutoStory: pick the start save by a start check; catch_tu…
dayfine Nov 14, 2026
9e97b54
PokemonLZA: AutoStory: 03.08 catches two species, back to the road be…
dayfine Nov 14, 2026
20018a5
PokemonLZA: FlatWhiteDialogDetector::detect_box(); run_battle_until()
dayfine Nov 14, 2026
039e358
ScreenEvents: fade_of() tests black with is_black()
dayfine Nov 14, 2026
939f71f
PokemonLZA: AutoStory: reuse upstream pieces, merge internal duplicates
dayfine Nov 14, 2026
4247407
PokemonLZA: AutoStory: patrol from mid-road with a camera sweep; fail…
dayfine Nov 14, 2026
294d227
PokemonLZA: AutoStory: dev-only 03.07d walks back from Wild Zone 1 to…
dayfine Nov 14, 2026
07b7c4c
PokemonLZA: AutoStory: TODOs to unify the kept duplicates with upstream
dayfine Nov 14, 2026
9cf9ca6
PokemonLZA: AutoStory: 03.07d as one zone_1_back_to_center step; code…
dayfine Nov 14, 2026
607ecd1
Merge plza/story-mm2 into plza/story-engine
dayfine Nov 14, 2026
a58e5b1
Merge autostory/engine into plza/story-engine: add_checkpoint_prefix …
dayfine Nov 14, 2026
5708d15
Merge plza/story-mm2 (#356) into plza/story-engine
dayfine Nov 14, 2026
cc5bac4
PokemonLZA: AutoStory: build fixes after merging plza/story-mm2
dayfine Nov 14, 2026
19364b5
Merge origin/autostory/engine into plza/story-engine
dayfine Nov 14, 2026
d512055
PokemonLZA: AutoStory: 03.07d is a story checkpoint, not dev-only
dayfine Nov 14, 2026
6dd4b09
AutoStory: shared story files, dev-folder override and execution keys
dayfine Nov 14, 2026
a365d3c
AutoStory: story files: code health fixes
dayfine Nov 14, 2026
8212b19
PLZA AutoStory: objective marker reader in Detectors/, walk_to_object…
dayfine Nov 14, 2026
817668a
Merge autostory/shared-story-data (#474) into plza/story-engine
dayfine Nov 14, 2026
0e721a9
PLZA AutoStory: test the production rows by dropdown index
dayfine Nov 14, 2026
bd665c9
PLZA AutoStory: read the story with the shared story loader
dayfine Nov 14, 2026
1472244
AutoStory: story files: check reloads in the game's row order; StoryD…
dayfine Nov 14, 2026
1afdcf2
Merge remote-tracking branch 'origin/autostory/shared-story-data' int…
dayfine Nov 14, 2026
72e3067
PLZA AutoStory: the story table includes StoryRowExecution.h for Stor…
dayfine Nov 14, 2026
0deacd4
Merge autostory/engine into autostory/shared-story-data
dayfine Nov 14, 2026
f411312
Merge plza/story-mm2 into plza/story-engine
dayfine Nov 14, 2026
7226072
Merge autostory/shared-story-data into plza/story-engine
dayfine Nov 14, 2026
190c3c0
PLZA 03.07d: from the Center into Wild Zone 1 by 03.06's walks, with …
dayfine Nov 14, 2026
3c3bd58
AutoStory: one shared list of story failure classes
dayfine Nov 14, 2026
09bd34a
CI: pin CommandLineTests to 95b9aa8b9 (adds PokemonLZA CatchesToZone1…
dayfine Nov 14, 2026
3e15ff3
Merge autostory/launch-from-home (#477) into plza/story-engine
dayfine Nov 14, 2026
723921b
PLZA AutoStory: reload through the shared launch from HOME
dayfine Nov 14, 2026
92ec0b1
Sim faults: MOUNT_LOST, a riding leg started off the mount
dayfine Nov 14, 2026
fe06d7e
Merge autostory/launch-from-home (#477) into plza/story-engine
dayfine Nov 14, 2026
db55ede
PLZA AutoStory: launch only from the Legends: Z-A tile on HOME
dayfine Nov 14, 2026
eeca418
Merge autostory/launch-from-home (#477) into plza/story-engine
dayfine Nov 14, 2026
8750b6f
AutoStory story files: refuse a checkpoint id missing from the story …
dayfine Nov 14, 2026
8cdd7ce
PLZA 03.07d: walk straight to the Wild Zone 1 gate
dayfine Nov 14, 2026
3175afd
PLZA AutoStory: scene steps on the shared TalkOver, through the backend
dayfine Nov 14, 2026
31d0ef8
Merge autostory/shared-story-data (#474) into plza/story-engine
dayfine Nov 14, 2026
c77e1ae
Merge autostory/launch-from-home (#477) into plza/story-engine
dayfine Nov 14, 2026
9327d13
Merge autostory/engine (#332) into plza/story-engine
dayfine Nov 14, 2026
dde03e5
Merge origin/autostory/engine into autostory/fault-classes
dayfine Nov 14, 2026
2a0c69b
Merge origin/autostory/engine into autostory/shared-story-data
dayfine Nov 14, 2026
1856057
PLZA AutoStory: SceneMash takes the text button; review fixes for sea…
dayfine Nov 14, 2026
f64ffb8
PLZA AutoStory tests: 29 walks with 03.07d; autosave badge on frame 0197
dayfine Nov 14, 2026
af54a61
PLZA launch: the title's PRESS (A) BUTTON no longer vetoes the title
dayfine Nov 14, 2026
024e516
PLZA launch: hold the title check off after a title press's black fade
dayfine Nov 14, 2026
6af16df
AutoStory: failures carry their class; a shared fault sweep by class
dayfine Nov 14, 2026
da0d5a4
Merge remote-tracking branch 'origin/autostory/engine' into autostory…
dayfine Nov 14, 2026
5334a11
AutoStory fault sweep: nest Failure and Injector in their structs
dayfine Nov 14, 2026
e4f6c81
AutoStory: option to skip the reload at the start
dayfine Nov 14, 2026
6bb699b
Merge autostory/engine into autostory/fault-classes: #312 and #313 me…
dayfine Nov 14, 2026
7ace2f2
Merge autostory/engine into autostory/shared-story-data: #312 and #31…
dayfine Nov 14, 2026
a95ab2b
Merge nav/shared into autostory/fault-classes: #332 and #477 merged
dayfine Nov 14, 2026
79fc652
Merge nav/shared into autostory/shared-story-data: #332 and #477 merged
dayfine Nov 14, 2026
1c4df21
PLZA 03.06/03.07d: walk to Wild Zone 1's gate steered by its pillars
dayfine Nov 14, 2026
d8d0958
Merge autostory/fault-classes (#479) into nav/shared
dayfine Nov 14, 2026
b4a3c81
Merge autostory/story-breakpoints (#448) into nav/shared
dayfine Nov 14, 2026
97cf4f3
PLZA 03.07d: walk on to 127 from Wild Zone 1's far gate, not the edge…
dayfine Nov 14, 2026
9a093ab
Merge autostory/shared-story-data (#474) into nav/shared
dayfine Nov 14, 2026
c6cb512
PLZA 03.07d: stop 2 early on the zone 1 road so the walk ends on 127
dayfine Nov 14, 2026
65d4df1
PLZA 03.07d: last leg aims 5 degrees left of the far gate, then faces it
dayfine Nov 14, 2026
c5ce1ba
PLZA 03.07d: zone 1 start walk constants live in the walk's .cpp
dayfine Nov 14, 2026
a113e78
PLZA 03.07d: last leg aims 2.5 degrees left of the far gate
dayfine Nov 14, 2026
aabb349
AutoStory engine: no retry after a SAVE step saved part-way
dayfine Nov 14, 2026
77ece85
AutoStory: SAVE steps in testing, once_per_save in JSON, save option …
dayfine Nov 14, 2026
8cd38a8
AutoStory engine: drop the unused StoryPoseTraits::from_declared()
dayfine Nov 14, 2026
0825ffb
AutoStory: tell INTEGER_ROWS from TIMED_LEGS; assert one arg type per…
dayfine Nov 14, 2026
c4a58f7
AutoStory story files: check reload_when_chained in a user's run too
dayfine Nov 14, 2026
644442d
AutoStory failure classes: function-local table, checked lookup
dayfine Nov 14, 2026
a80d9f3
ScreenEvents: assert the event count; ScreenEventLog tests
dayfine Nov 14, 2026
81e6a30
Merge pull request #490 from dayfine/autostory/engine-fixes
dayfine Nov 14, 2026
1d684bc
PLZA 03.08: lock on by the name plate, fight wild attackers, steer wa…
dayfine Nov 14, 2026
c004f55
Story data codec: run PokemonSimulation's shared wire cases natively …
dayfine Nov 14, 2026
107ce7b
Game languages: say why FRLG lists six languages and Gen 8-9 one Spanish
dayfine Nov 14, 2026
9a6f064
PLZA 03.08: level_camera() resets the camera pitch before each catch …
dayfine Nov 14, 2026
019fa24
Fix shared story engine review nits
dayfine Nov 14, 2026
a9fd4dd
PLZA catches: a stop ends when a throw catches a new species
dayfine Nov 14, 2026
98fe0a9
Story data tests: move the argv dispatch to devtools, a malformed cas…
dayfine Nov 14, 2026
fe8fe0c
Game languages: say what a missing reader gives; drop the upstream me…
dayfine Nov 14, 2026
6cdd02a
PLZA 03.07d: start check at the counter; Report after a backup fallback
dayfine Nov 14, 2026
f5ca8ab
StoryFiles test: replace the dev-only reload case with one that loads…
dayfine Nov 14, 2026
7f36f9e
AutoStory launch: a title read only after the launch waits for the A …
dayfine Nov 15, 2026
56e90e2
PLZA AutoStory: warn that a run from the backup save saves over the l…
dayfine Nov 15, 2026
2f729c4
Merge pull request #497 from dayfine/autostory/engine-nits
dayfine Nov 15, 2026
4437322
PLZA 03.08: count a catch of a not-caught plate when the banner is mi…
dayfine Nov 15, 2026
3299c0b
Merge remote-tracking branch 'origin/plza/story-engine' into plza/sto…
dayfine Nov 15, 2026
3cce494
Merge pull request #494 from dayfine/autostory/story-cases-ci
dayfine Nov 15, 2026
627a84f
PokemonLZA: AutoStory: 03.08 ends out of Wild Zone 1; the lab walk is…
dayfine Nov 15, 2026
752b3c5
PokemonLZA: AutoStory: 03.08b ends on the lab lobby's autosave
dayfine Nov 15, 2026
58cee39
AutoStory engine: judge a watch window on the frames it inspected
dayfine Nov 15, 2026
838bf2d
Merge pull request #495 from dayfine/autostory/languages
dayfine Nov 15, 2026
263ad47
CI: pin CommandLineTests at plza/story-engine-pin (PLZA lock-on and C…
dayfine Nov 15, 2026
b41b3ab
AutoStory engine: watch a hold-length tail past a covered window
dayfine Nov 15, 2026
a72ea1b
AutoStory launch: the backup save's buttons wait for the title proper
dayfine Nov 15, 2026
9755edc
PokemonLZA: AutoStory: 03.08 checks the Pokedex count at thorough che…
dayfine Nov 15, 2026
5b02f76
Merge remote-tracking branch 'origin/plza/story-engine' into plza/sto…
dayfine Nov 15, 2026
eb31588
PokemonLZA: AutoStory: the species check in its own file
dayfine Nov 15, 2026
ec85820
PLZA launch: the backup save is Up, B and X held together
dayfine Nov 15, 2026
382c873
PLZA 03.08: walk to the far gate down the road from 60, steered by it…
dayfine Nov 15, 2026
890e785
AutoStory tests: default postconditions; case names outside the input
dayfine Nov 15, 2026
3df87aa
AutoStory: default RngHandoffResult fields for Windows Clang
dayfine Nov 15, 2026
b11e479
PLZA 03.08: lock on at the first brackets, throw again after a miss, …
dayfine Nov 15, 2026
e370bbf
PLZA 03.08: end with the minimap's arrow checked out of the zone's green
dayfine Nov 15, 2026
cf1eb72
PLZA 03.08: 3 s to first see the far gate; walk on before each zone-e…
dayfine Nov 15, 2026
a104231
PLZA 03.08: drop the zone-exit minimap check; 3 of slack at road stops
dayfine Nov 15, 2026
b1cdfe0
Merge commit '3df87aa4e' into plza/story-engine
dayfine Nov 15, 2026
88cf017
PLZA catches: watch the Registered! banner in frame time
dayfine Nov 15, 2026
8c6aabd
PLZA gate walk: log the minimap heading at the A prompt
dayfine Nov 15, 2026
6e7db1b
PLZA 03.08: face heading 265 before the walk to the far gate
dayfine Nov 15, 2026
e0d5715
Revert "PLZA 03.08: face heading 265 before the walk to the far gate"
dayfine Nov 15, 2026
361376b
PLZA face_heading: L after the turn so the camera follows the player
dayfine Nov 15, 2026
73ee19f
PLZA 03.08: the party bar's filled slots end the catch patrol
dayfine Nov 15, 2026
32e17f7
PLZA dialogs: read the choice row with get_current_selector_index(); …
dayfine Nov 15, 2026
0bc99ee
CI: pin CommandLineTests to d658635 (PartyBarDetector fixtures)
dayfine Nov 15, 2026
13eaf9b
PLZA gate walk tests: expect the L press after the turn (361376bac)
dayfine Nov 15, 2026
7f2ff1d
PLZA walk_to_marker: wait up to 15 s for the objective's prompt or di…
dayfine Nov 15, 2026
be6be4f
PLZA dialogs: read the choice menu's rows from its bottom-anchored panel
dayfine Nov 15, 2026
07906ab
PLZA 03.09: walks finish their legs, Mable's talk and reward must show
dayfine Nov 15, 2026
5952181
PLZA 03.09: split at the 3F autosave; 03.09b walks to Mable
dayfine Nov 15, 2026
edbc48f
PLZA 03.09b to_mable: legs measured from the 3F autosave's facing
dayfine Nov 15, 2026
4af56e8
PLZA walk: a black fade in the held last leg waits for the end event
dayfine Nov 15, 2026
cb79f95
PLZA walk: a black fade in the held last leg ends the walk
dayfine Nov 15, 2026
4909bfb
PLZA walk: test that a black fade in the held last leg ends the walk
dayfine Nov 15, 2026
a6e3275
PLZA AutoStory: drop 03.07d, renumber 03.08b-03.09b to 03.09-03.11
dayfine Nov 15, 2026
e78f864
Merge origin/plza/story-mm2 into plza/story-engine
dayfine Nov 15, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/cpp-ci-serial-programs-base.yml
Original file line number Diff line number Diff line change
Expand Up @@ -245,9 +245,9 @@ jobs:
uses: actions/checkout@v7
if: inputs.run-tests
with:
# The fork's fixtures: upstream's plus the SystemKeyboardDetector and HomeTileReader screenshots.
# The fork's fixtures: upstream's plus the SystemKeyboardDetector, HomeTileReader and PLZA AutoStory frames.
repository: 'dayfine/CommandLineTests'
ref: 'eae4697738d5fe18975e77c05a4e01216bed68e7'
ref: '0195f3b0c6ffb15bf6df176cfd3a64d781346fcf'
path: 'CommandLineTests'

# The unit tests assume the downloadable resources they need are already downloaded
Expand Down
6 changes: 5 additions & 1 deletion .github/workflows/story-data.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
with:
repository: dayfine/PokemonSimulation
# Synthetic contract cases, not an approved map/resource pin.
ref: 866613fa03e5c4a5eb7e57c91b59fafb44fc7ee3
ref: 4e023f3d57022c68018f95f6fc0a4c0722d53adf
path: publisher
- uses: actions/setup-python@v6
with:
Expand All @@ -28,3 +28,7 @@ jobs:
- run: cmake -S devtools/story-data-tests -B build-story-data -DCMAKE_BUILD_TYPE=Debug
- run: cmake --build build-story-data --config Debug -j4
- run: ctest --test-dir build-story-data -C Debug --output-on-failure
- if: runner.os != 'Windows'
run: ./build-story-data/StoryDataTests publisher/data/story/wire-conformance.json
- if: runner.os == 'Windows'
run: ./build-story-data/Debug/StoryDataTests.exe publisher/data/story/wire-conformance.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ enum class ScreenEvent : uint8_t{
};
// How many ScreenEvent values there are.
constexpr size_t SCREEN_EVENT_COUNT = 11;
static_assert((size_t)ScreenEvent::SWITCH_HOME_MENU + 1 == SCREEN_EVENT_COUNT, "SWITCH_HOME_MENU is the last ScreenEvent");
// "dialog box", for the log.
std::string screen_event_name(ScreenEvent event);

Expand Down
11 changes: 9 additions & 2 deletions SerialPrograms/Source/CommonTools/ScreenEvents/ScreenEvents.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
#include <format>
#include "CommonFramework/ImageTools/ImageBoxes.h"
#include "CommonFramework/ImageTools/ImageStats.h"
#include "CommonTools/Images/SolidColorTest.h"
#include "ScreenEventLog.h"
#include "ScreenEventTypes.h"
#include "ScreenFades.h"
Expand Down Expand Up @@ -97,12 +98,18 @@ std::string describe(const ScreenEvents& events, std::string_view separator){
}


// Black is is_black() (SolidColorTest, BlackScreenDetector's test) with
// the fade's thresholds.
// White is not is_white(): that also wants an even grey, and a fade to
// white can be tinted.
WarpFade fade_of(const ImageStats& middle){
if (is_black(middle, FADE_MAX_DARK_SUM, FADE_MAX_STDDEV_SUM)){
return WarpFade::BLACK;
}
if (middle.stddev.sum() > FADE_MAX_STDDEV_SUM){
return WarpFade::NONE;
}
const double sum = middle.average.sum();
return sum <= FADE_MAX_DARK_SUM ? WarpFade::BLACK : sum >= FADE_MIN_WHITE_SUM ? WarpFade::WHITE : WarpFade::NONE;
return middle.average.sum() >= FADE_MIN_WHITE_SUM ? WarpFade::WHITE : WarpFade::NONE;
}
WarpFade fade_of_screen(const ImageViewRGB32& screen){
return fade_of(image_stats(extract_box_reference(screen, ImageFloatBox(0.1, 0.1, 0.8, 0.8))));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,10 @@
#include <string>
#include <utility>
#include <vector>
#include "Common/Cpp/Time.h"
#include "Common/Cpp/TestRunners/UnitTest.h"
#include "CommonFramework/ImageTypes/ImageRGB32.h"
#include "ScreenEventLog.h"
#include "ScreenEventTypes.h"
#include "ScreenFades.h"
#include "ScreenEvents.h"
Expand Down Expand Up @@ -179,10 +181,99 @@ const ScreenEventsCase SCREEN_EVENTS_CASES[] = {
},
};

namespace{

// A stream of frames into a ScreenEventLog, and its describe() text.
struct ScreenEventLogCase{
struct Frame{
int ms = 0;
std::vector<ScreenEvent> events;
};
struct Input{
size_t capacity = 0;
std::vector<Frame> frames;
};
struct Expectation{
// describe() of the log, times from the first frame.
std::string text;
size_t dropped = 0;
};

std::string name;
Input input;
Expectation expectation;
};

class Test_ScreenEventLog : public UnitTest{
public:
explicit Test_ScreenEventLog(ScreenEventLogCase test_case)
: UnitTest(std::format("CommonTools::ScreenEventLog - {}", test_case.name))
, m_case(std::move(test_case))
{}
virtual UnitTestResult run(Logger&, CancellableScope&) const override{
ScreenEventLog log(m_case.input.capacity);
const WallClock origin = current_time();
for (const ScreenEventLogCase::Frame& frame : m_case.input.frames){
ScreenEvents events;
for (ScreenEvent event : frame.events){
events.set(event, true);
}
log.record(events, origin + Milliseconds(frame.ms));
}
if (log.dropped() != m_case.expectation.dropped){
return std::format("dropped(): expected {}, got {}", m_case.expectation.dropped, log.dropped());
}
return expect_equal("describe()", describe(log, origin), m_case.expectation.text);
}

private:
ScreenEventLogCase m_case;
};

} // namespace

const ScreenEventLogCase SCREEN_EVENT_LOG_CASES[] = {
{
.name = "no frames",
.input = {.capacity = 8, .frames = {}},
.expectation = {.text = "no changes", .dropped = 0},
},
{
.name = "the first frame's events all rise",
.input = {.capacity = 8, .frames = {{.ms = 0, .events = {ScreenEvent::DIALOG_BOX, ScreenEvent::SCREEN_STILL}}}},
.expectation = {.text = "+0 ms dialog box rose\n+0 ms screen still rose\n", .dropped = 0},
},
{
.name = "only changes are kept, rising and falling",
.input = {.capacity = 8, .frames = {
{.ms = 0, .events = {ScreenEvent::PLAYER_CAN_MOVE}},
{.ms = 100, .events = {ScreenEvent::PLAYER_CAN_MOVE}},
{.ms = 200, .events = {ScreenEvent::FADE_BLACK}},
{.ms = 900, .events = {}},
}},
.expectation = {
.text = "+0 ms player can move rose\n+200 ms black fade rose\n+200 ms player can move fell\n+900 ms black fade fell\n",
.dropped = 0,
},
},
{
.name = "the oldest changes drop past the capacity",
.input = {.capacity = 2, .frames = {
{.ms = 0, .events = {ScreenEvent::DIALOG_BOX}},
{.ms = 100, .events = {}},
{.ms = 200, .events = {ScreenEvent::CHOICE_BOX}},
}},
.expectation = {.text = "(1 older changes dropped)\n+100 ms dialog box fell\n+200 ms choice box rose\n", .dropped = 1},
},
};

void add_tests_ScreenEvents(UnitTestDatabase& database){
for (const auto& item : SCREEN_EVENTS_CASES){
database.add<Test_ScreenEvents>(item);
}
for (const auto& item : SCREEN_EVENT_LOG_CASES){
database.add<Test_ScreenEventLog>(item);
}
}


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ enum class Failure{
};

struct AuthoredCase{
std::string name;
struct Input{
std::string name;
std::string json;
std::string game = "frlg";
bool resource = false;
Expand All @@ -54,21 +54,21 @@ struct AuthoredCase{
};

const AuthoredCase CASES[] = {
{.input = {.name = "FRLG envelope", .json = FRLG}, .expectation = {}},
{.input = {.name = "BDSP embedded resource", .json = BDSP, .game = "bdsp", .resource = true}, .expectation = {
{.name = "FRLG envelope", .input = {.json = FRLG}, .expectation = {}},
{.name = "BDSP embedded resource", .input = {.json = BDSP, .game = "bdsp", .resource = true}, .expectation = {
.checkpoint = "01.03", .execution = R"({"on_failure":"reload_and_retry","saves_in":"Oreburgh City"})", .events = {"roark"}}},
{.input = {.name = "FRLG embedded resource", .json = FRLG, .resource = true}, .expectation = {}},
{.input = {.name = "wrong game", .json = BDSP}, .expectation = {.failure = Failure::PARSE}},
{.input = {.name = "empty expected game", .json = FRLG, .game = ""}, .expectation = {.failure = Failure::PARSE}},
{.input = {.name = "missing resource", .json = FRLG, .resource = true, .file = "absent"}, .expectation = {.failure = Failure::MISSING_RESOURCE}},
{.input = {.name = "invalid embedded JSON", .json = "{", .resource = true}, .expectation = {.failure = Failure::PARSE}},
{.input = {.name = "wrong format", .json = R"({"format":"future","game":"frlg","checkpoint":{},"execution":{}})"}, .expectation = {.failure = Failure::PARSE}},
{.input = {.name = "missing execution", .json = R"({"format":"pokesim-authored-checkpoint/1","game":"frlg","checkpoint":{}})"}, .expectation = {.failure = Failure::PARSE}},
{.input = {.name = "same count wrong field", .json = R"({"format":"pokesim-authored-checkpoint/1","game":"frlg","checkpoint":{},"extra":{}})"}, .expectation = {.failure = Failure::PARSE}},
{.input = {.name = "extra envelope field", .json = R"({"format":"pokesim-authored-checkpoint/1","game":"frlg","checkpoint":{},"execution":{},"extra":0})"}, .expectation = {.failure = Failure::PARSE}},
{.input = {.name = "execution must be object", .json = R"({"format":"pokesim-authored-checkpoint/1","game":"frlg","checkpoint":{"id":"x","title":"X","events":[]},"execution":false})"}, .expectation = {.failure = Failure::PARSE}},
{.input = {.name = "invalid common action", .json = R"({"format":"pokesim-authored-checkpoint/1","game":"frlg","checkpoint":{"id":"x","title":"X","events":[{"id":"bad","kind":"magic"}]},"execution":{}})"}, .expectation = {.failure = Failure::PARSE}},
{.input = {.name = "execution stays game owned", .json = R"({"format":"pokesim-authored-checkpoint/1","game":"future","checkpoint":{"id":"x","title":"X","events":[]},"execution":{"zero":0,"false":false,"null":null}})", .game = "future"}, .expectation = {
{.name = "FRLG embedded resource", .input = {.json = FRLG, .resource = true}, .expectation = {}},
{.name = "wrong game", .input = {.json = BDSP}, .expectation = {.failure = Failure::PARSE}},
{.name = "empty expected game", .input = {.json = FRLG, .game = ""}, .expectation = {.failure = Failure::PARSE}},
{.name = "missing resource", .input = {.json = FRLG, .resource = true, .file = "absent"}, .expectation = {.failure = Failure::MISSING_RESOURCE}},
{.name = "invalid embedded JSON", .input = {.json = "{", .resource = true}, .expectation = {.failure = Failure::PARSE}},
{.name = "wrong format", .input = {.json = R"({"format":"future","game":"frlg","checkpoint":{},"execution":{}})"}, .expectation = {.failure = Failure::PARSE}},
{.name = "missing execution", .input = {.json = R"({"format":"pokesim-authored-checkpoint/1","game":"frlg","checkpoint":{}})"}, .expectation = {.failure = Failure::PARSE}},
{.name = "same count wrong field", .input = {.json = R"({"format":"pokesim-authored-checkpoint/1","game":"frlg","checkpoint":{},"extra":{}})"}, .expectation = {.failure = Failure::PARSE}},
{.name = "extra envelope field", .input = {.json = R"({"format":"pokesim-authored-checkpoint/1","game":"frlg","checkpoint":{},"execution":{},"extra":0})"}, .expectation = {.failure = Failure::PARSE}},
{.name = "execution must be object", .input = {.json = R"({"format":"pokesim-authored-checkpoint/1","game":"frlg","checkpoint":{"id":"x","title":"X","events":[]},"execution":false})"}, .expectation = {.failure = Failure::PARSE}},
{.name = "invalid common action", .input = {.json = R"({"format":"pokesim-authored-checkpoint/1","game":"frlg","checkpoint":{"id":"x","title":"X","events":[{"id":"bad","kind":"magic"}]},"execution":{}})"}, .expectation = {.failure = Failure::PARSE}},
{.name = "execution stays game owned", .input = {.json = R"({"format":"pokesim-authored-checkpoint/1","game":"future","checkpoint":{"id":"x","title":"X","events":[]},"execution":{"zero":0,"false":false,"null":null}})", .game = "future"}, .expectation = {
.checkpoint = "x", .execution = R"({"zero":0,"false":false,"null":null})", .events = {}}},
};

Expand Down Expand Up @@ -116,7 +116,7 @@ std::string check_case(const AuthoredCase& test){
Loaded actual;
actual.checkpoint = test.input.resource
? load_authored_checkpoint(files, test.input.file, test.input.game, keep_execution(actual.execution))
: read_authored_checkpoint(parse_json(test.input.json), test.input.game, test.input.name, keep_execution(actual.execution));
: read_authored_checkpoint(parse_json(test.input.json), test.input.game, test.name, keep_execution(actual.execution));
return check_loaded(actual, test);
}catch (const ParseException& error){
return test.expectation.failure == Failure::PARSE ? "" : std::format("Unexpected parse failure: {}", error.message());
Expand All @@ -131,7 +131,7 @@ std::string check_case(const AuthoredCase& test){
class AuthoredJsonTest : public UnitTest{
public:
explicit AuthoredJsonTest(AuthoredCase test)
: UnitTest(std::format("Pokemon::AuthoredCheckpointJson - {}", test.input.name))
: UnitTest(std::format("Pokemon::AuthoredCheckpointJson - {}", test.name))
, m_case(std::move(test))
{}

Expand Down Expand Up @@ -172,7 +172,7 @@ int main(){
int failed = 0;
for (const auto& test : PokemonAutomation::Pokemon::CASES){
const std::string error = PokemonAutomation::Pokemon::check_case(test);
std::cout << test.input.name << ": " << (error.empty() ? "PASS" : error) << '\n';
std::cout << test.name << ": " << (error.empty() ? "PASS" : error) << '\n';
failed += !error.empty();
}
return failed != 0;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* PokemonLZA AutoStory - Dev checkpoint files
/* Story Dev Files
*
* From: https://github.com/PokemonAutomation/
*
Expand All @@ -8,22 +8,23 @@
#include "Common/Cpp/Filesystem/FileIO.h"
#include "Common/Cpp/Filesystem/Filesystem.h"
#include "CommonFramework/GlobalAutoPaths.h"
#include "PokemonLZA_AutoStoryDevFiles.h"
#include "Pokemon_StoryDevFiles.h"

namespace PokemonAutomation{
namespace NintendoSwitch{
namespace PokemonLZA{
namespace Pokemon{


std::string story_dev_folder(){
return std::format("{}AutoStoryDev/plza/", USER_FILE_PATH());
std::string story_dev_folder(std::string_view game){
return std::format("{}AutoStoryDev/{}/", USER_FILE_PATH(), game);
}

std::vector<StoryDevFile> read_story_dev_files(std::string_view folder){
std::vector<StoryDevFile> read_story_dev_files(std::string_view folder, std::string_view game){
const Filesystem::Path directory(std::string{folder});
std::vector<StoryDevFile> files;
for (const Filesystem::Path& path : Filesystem::list_directory(Filesystem::Path(std::string(folder)))){
const std::string prefix = std::format("{}-", game);
for (const Filesystem::Path& path : Filesystem::list_directory(directory)){
const std::string name = path.filename().string();
if (!name.starts_with("plza-") || !name.ends_with(".plan.json") || !Filesystem::is_regular_file(path)){
if (!name.starts_with(prefix) || !name.ends_with(".plan.json") || !Filesystem::is_regular_file(path)){
continue;
}
files.push_back({.name = name, .path = path.string(), .text = file_to_string(path.string())});
Expand All @@ -33,6 +34,5 @@ std::vector<StoryDevFile> read_story_dev_files(std::string_view folder){



} // namespace PokemonLZA
} // namespace NintendoSwitch
} // namespace Pokemon
} // namespace PokemonAutomation
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
/* Story Dev Files
*
* From: https://github.com/PokemonAutomation/
*
* For lab tuning: checkpoint files on disk that a run reads in place of
* the built-in ones of the same name (load_story_data() in
* Pokemon_StoryFiles.h), so a walk can be retimed without a rebuild.
*
*/

#ifndef PokemonAutomation_Pokemon_StoryDevFiles_H
#define PokemonAutomation_Pokemon_StoryDevFiles_H

#include <string>
#include <string_view>
#include <vector>

namespace PokemonAutomation{
namespace Pokemon{


// A checkpoint file read from disk.
struct StoryDevFile{
std::string name; // "plza-02.01.plan.json"
std::string path;
std::string text;
};

// The folder whose checkpoint files replace `game`'s built-in ones:
// <user files>/AutoStoryDev/<game>/ (USER_FILE_PATH()).
std::string story_dev_folder(std::string_view game);

// The <game>-*.plan.json files in `folder`, by name; none if it does not
// exist.
std::vector<StoryDevFile> read_story_dev_files(std::string_view folder, std::string_view game);



} // namespace Pokemon
} // namespace PokemonAutomation
#endif
Loading
Loading