Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion data/story/native/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Evaluated native story captures

`frlg-parcel-00.05.json` is the actual compiled FRLG Parcel checkpoint, not a
`frlg-parcel-02.01.json` is the actual compiled FRLG Parcel checkpoint, not a
hand transcription or captured console execution. It was generated by
[Arduino #251](https://github.com/dayfine/Arduino-Source/pull/251), revision
`b170b7d2103e887ded825c37fdbdc19fd654fca8`, in
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"format": "pokesim-native-checkpoint-export/1",
"game": "frlg",
"checkpoint": {
"id": "00.05",
"id": "02.01",
"title": "Route 1 to Viridian Mart: Oak's Parcel",
"start": {
"certainty": "tile",
Expand Down
2 changes: 1 addition & 1 deletion data/story/parcel-pilot/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ handoff/resume, battles or full PokeGuy story execution.

## Authored JSON pilot

`frlg-parcel-00.05.plan.json` is the data-authored checkpoint consumed by the native story table in Arduino-Source #260. `pokesim-authored-checkpoint/1` contains common events/start plus the FRLG save-menu setting in `execution`; it does not contain export provenance, native supplies, or claimed observations. Its schema is `schemas/authored-checkpoint.schema.json`.
`frlg-parcel-02.01.plan.json` is the data-authored checkpoint consumed by the native story table in Arduino-Source #260. `pokesim-authored-checkpoint/1` contains common events/start plus the FRLG save-menu setting in `execution`; it does not contain export provenance, native supplies, or claimed observations. Its schema is `schemas/authored-checkpoint.schema.json`.

`authored-binding.json` pins that file and the same maps/action capabilities used by the existing replay scenarios. `test_authored_checkpoint.py` runs all seven cases with the same expected semantic actions and outcomes. The report has no native source revision: it identifies the authored file by SHA256. The old capture/binding remain migration fixtures.

Expand Down
4 changes: 2 additions & 2 deletions data/story/parcel-pilot/authored-binding.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"format": "pokesim-story-replay-binding/1",
"plan": {
"file": "data/story/parcel-pilot/frlg-parcel-00.05.plan.json",
"sha256": "c6ebd128a7c1472671db78aa0bb0bd88317ee84109f5da458fee60b193ec5a3d"
"file": "data/story/parcel-pilot/frlg-parcel-02.01.plan.json",
"sha256": "e88c2e9f7a3506bed55e5386c6f32d97bc6be62e4e7800afca3f6437b0940775"
},
"map_revision": "e52be04ed7bb007c7219c7d2c96963cf053e0000",
"maps": {
Expand Down
4 changes: 2 additions & 2 deletions data/story/parcel-pilot/binding.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"format": "pokesim-story-replay-binding/1",
"capture": {
"file": "data/story/native/frlg-parcel-00.05.json",
"sha256": "8b0c04f2e1507aee0f0927a8d022b8b431036431e95f8893aa7a2383360f8504",
"file": "data/story/native/frlg-parcel-02.01.json",
"sha256": "793abfef624f690c73cd0bb2e2a149da5f4c8654b50ffbd5905e27d88e1b0c04",
"source_revision": "b170b7d2103e887ded825c37fdbdc19fd654fca8"
},
"map_revision": "e52be04ed7bb007c7219c7d2c96963cf053e0000",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"format": "pokesim-authored-checkpoint/1",
"game": "frlg",
"checkpoint": {
"id": "00.05",
"id": "02.01",
"title": "Route 1 to Viridian Mart: Oak's Parcel",
"start": {
"certainty": "tile",
Expand Down
2 changes: 1 addition & 1 deletion docs/story/NATIVE_EXPORTS.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ unknown native field, missing extension field or incorrectly claimed observation
fails instead of silently discarding data. Source revision is an identity check,
not cryptographic authentication of a caller-provided document.

The [checked-in Parcel capture](../../data/story/native/frlg-parcel-00.05.json)
The [checked-in Parcel capture](../../data/story/native/frlg-parcel-02.01.json)
was produced by the compiled native table. Its [provenance](../../data/story/native/README.md)
records the CI revision, run, artifact and original file hash. Python checks its
schema, source identity, actual event order and key poses; it is no longer just
Expand Down
2 changes: 1 addition & 1 deletion src/pokesim/formats/json_schema.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ def published():
yield 'frlg-battle-cases', ROOT / 'data/games/frlg/battles/cases.json'
for path in sorted(ROOT.glob('data/story/native/*.json')):
yield 'native-checkpoint-export', path
yield 'authored-checkpoint', ROOT / 'data/story/parcel-pilot/frlg-parcel-00.05.plan.json'
yield 'authored-checkpoint', ROOT / 'data/story/parcel-pilot/frlg-parcel-02.01.plan.json'
for path in sorted(ROOT.glob('data/story/frlg-authored/*.plan.json')):
yield 'authored-checkpoint', path
yield 'story-replay-binding', ROOT / 'data/story/parcel-pilot/binding.json'
Expand Down
2 changes: 1 addition & 1 deletion src/pokesim/formats/test_json_schema.py
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ def test_frlg_authored_plans_pass_schema_and_reader(self):
check = validator('authored-checkpoint')
paths = sorted(FRLG_AUTHORED.glob('*.plan.json'))
self.assertEqual(len(paths), 35)
for path in paths + [ROOT / 'data/story/parcel-pilot/frlg-parcel-00.05.plan.json']:
for path in paths + [ROOT / 'data/story/parcel-pilot/frlg-parcel-02.01.plan.json']:
with self.subTest(path=path.name):
value = json.loads(path.read_text())
check.validate(value)
Expand Down
4 changes: 2 additions & 2 deletions src/pokesim/story/test_authored_checkpoint.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ def test_same_authored_plan_passes_all_shared_scenarios(self):
check_case(case, report)
self.assertIsNone(report['native_source_revision'])
self.assertEqual(report['authored_plan_sha256'], hashlib.sha256(
(FOLDER / 'frlg-parcel-00.05.plan.json').read_bytes()).hexdigest())
(FOLDER / 'frlg-parcel-02.01.plan.json').read_bytes()).hexdigest())

def test_rejects_snapshot_fields_and_unsupported_executor_configuration(self):
original = json.loads((FOLDER / 'frlg-parcel-00.05.plan.json').read_text())
original = json.loads((FOLDER / 'frlg-parcel-02.01.plan.json').read_text())
mutations = [lambda p: p.update(native_fields={}),
lambda p: p.update(game='bdsp'),
lambda p: p['execution'].update(menu='guess'),
Expand Down
4 changes: 2 additions & 2 deletions src/pokesim/story/test_native_export.py
Original file line number Diff line number Diff line change
Expand Up @@ -71,12 +71,12 @@ def test_still_rejects_duplicate_event_ids_after_schema_validation(self):
read_native_export(value)

def test_actual_parcel_capture_from_clean_native_ci(self):
path = ROOT / 'data/story/native/frlg-parcel-00.05.json'
path = ROOT / 'data/story/native/frlg-parcel-02.01.json'
source = json.loads(path.read_text())
result = read_native_export(source, 'b170b7d2103e887ded825c37fdbdc19fd654fca8')
self.assertEqual(result, source)
row = result['checkpoint']
self.assertEqual(row['id'], '00.05')
self.assertEqual(row['id'], '02.01')
self.assertEqual(row['start'], {
'map': 'PalletTown_ProfessorOaksLab', 'certainty': 'tile',
'where': {'kind': 'tiles', 'tiles': [[7, 8]], 'facing': 'south'}})
Expand Down
Loading