Ground named cargo price event descriptors

This commit is contained in:
Jan Petykiewicz 2026-04-17 13:41:44 -07:00
commit 09ccc77a45
13 changed files with 1281 additions and 598 deletions

View file

@ -3,7 +3,7 @@
"fixture_id": "packed-event-cargo-economics-parity-save-slice-fixture",
"source": {
"kind": "captured-runtime",
"description": "Fixture pinning the remaining named cargo-price descriptor strip on explicit evidence-blocked parity."
"description": "Fixture pinning the remaining negative named cargo-price variant on explicit variant-blocked parity."
},
"state_save_slice_path": "packed-event-cargo-economics-parity-save-slice.json",
"commands": [
@ -18,20 +18,21 @@
"packed_event_record_count": 1,
"packed_event_decoded_record_count": 1,
"packed_event_imported_runtime_record_count": 0,
"packed_event_blocked_evidence_blocked_descriptor_count": 1,
"packed_event_blocked_evidence_blocked_descriptor_count": 0,
"packed_event_blocked_unmapped_real_descriptor_count": 0,
"packed_event_blocked_unmapped_world_descriptor_count": 0,
"event_runtime_record_count": 0
"event_runtime_record_count": 0,
"packed_event_blocked_variant_or_scope_blocked_descriptor_count": 1
},
"expected_state_fragment": {
"packed_event_collection": {
"records": [
{
"import_outcome": "blocked_evidence_blocked_descriptor",
"import_outcome": "blocked_variant_or_scope_blocked_descriptor",
"grouped_effect_rows": [
{
"descriptor_id": 106,
"descriptor_label": "Named Cargo Price Slot 1",
"descriptor_label": "Alcohol Price",
"parameter_family": "cargo_price_scalar",
"semantic_family": "scalar_assignment"
}

View file

@ -2,12 +2,12 @@
"format_version": 1,
"save_slice_id": "packed-event-cargo-economics-parity-save-slice",
"source": {
"description": "Tracked save-slice document pinning the remaining named cargo-price descriptor strip on explicit evidence-blocked parity.",
"description": "Tracked save-slice document pinning the remaining negative named cargo-price variant on explicit variant-blocked parity.",
"original_save_filename": "captured-cargo-economics-parity.gms",
"original_save_sha256": "cargo-economics-parity-sample-sha256",
"notes": [
"tracked as JSON save-slice document rather than raw .smp",
"pins the named cargo-price strip until exact descriptor-to-cargo ordering is grounded strongly enough"
"pins the negative named cargo-price variant after the positive strip is grounded"
]
},
"save_slice": {
@ -37,7 +37,9 @@
"packed_state_version_hex": "0x000003e9",
"live_id_bound": 65,
"live_record_count": 1,
"live_entry_ids": [65],
"live_entry_ids": [
65
],
"decoded_record_count": 1,
"imported_runtime_record_count": 0,
"records": [
@ -57,25 +59,45 @@
"one_shot_header_0x7f5": 0,
"modifier_flag_0x7f9": 0,
"modifier_flag_0x7fa": 0,
"grouped_target_scope_ordinals_0x7fb": [0, 0, 0, 0],
"grouped_scope_checkboxes_0x7ff": [1, 0, 0, 0],
"grouped_target_scope_ordinals_0x7fb": [
0,
0,
0,
0
],
"grouped_scope_checkboxes_0x7ff": [
1,
0,
0,
0
],
"summary_toggle_0x800": 1,
"grouped_territory_selectors_0x80f": [-1, -1, -1, -1]
"grouped_territory_selectors_0x80f": [
-1,
-1,
-1,
-1
]
},
"text_bands": [],
"standalone_condition_row_count": 0,
"standalone_condition_rows": [],
"grouped_effect_row_counts": [1, 0, 0, 0],
"grouped_effect_row_counts": [
1,
0,
0,
0
],
"grouped_effect_rows": [
{
"group_index": 0,
"row_index": 0,
"descriptor_id": 106,
"descriptor_label": "Named Cargo Price Slot 1",
"descriptor_label": "Alcohol Price",
"target_mask_bits": 8,
"parameter_family": "cargo_price_scalar",
"opcode": 3,
"raw_scalar_value": 140,
"raw_scalar_value": -1,
"value_byte_0x09": 0,
"value_dword_0x0d": 0,
"value_byte_0x11": 0,
@ -84,27 +106,28 @@
"value_word_0x16": 0,
"row_shape": "scalar_assignment",
"semantic_family": "scalar_assignment",
"semantic_preview": "Set Named Cargo Price Slot 1 to 140",
"semantic_preview": "Set Alcohol Price to -1",
"recovered_cargo_slot": null,
"recovered_cargo_class": null,
"recovered_locomotive_id": null,
"locomotive_name": null,
"notes": [
"descriptor recovered from checked-in EventEffects semantic catalog",
"exact named cargo ordering for the price strip is not yet pinned"
]
"negative named cargo price variants remain parity-only"
],
"recovered_cargo_label": "Alcohol"
}
],
"decoded_actions": [],
"executable_import_ready": false,
"notes": [
"named cargo-price descriptors remain explicit evidence-blocked parity"
"negative named cargo-price variants remain explicit parity"
]
}
]
},
"notes": [
"named cargo price evidence-blocked parity sample"
"negative named cargo price variant parity sample"
]
}
}

View file

@ -3,7 +3,7 @@
"fixture_id": "packed-event-cargo-economics-save-slice-fixture",
"source": {
"kind": "captured-runtime",
"description": "Fixture proving the grounded aggregate cargo-economics descriptors plus the grounded named production strip execute through bounded cargo override surfaces."
"description": "Fixture proving the grounded aggregate cargo-economics descriptors plus the grounded named price and production strips execute through bounded cargo override surfaces."
},
"state_save_slice_path": "packed-event-cargo-economics-save-slice.json",
"commands": [
@ -50,6 +50,14 @@
},
"value": 180
},
{
"kind": "set_cargo_price_override",
"target": {
"kind": "named",
"name": "Alcohol"
},
"value": 140
},
{
"kind": "set_cargo_production_override",
"target": {
@ -81,6 +89,9 @@
}
]
}
]
],
"named_cargo_price_overrides": {
"Alcohol": 140
}
}
}

View file

@ -2,12 +2,12 @@
"format_version": 1,
"save_slice_id": "packed-event-cargo-economics-save-slice",
"source": {
"description": "Tracked save-slice document proving the grounded aggregate and named-production cargo-economics descriptors execute through bounded cargo override surfaces.",
"description": "Tracked save-slice document proving the grounded aggregate, named-price, and named-production cargo-economics descriptors execute through bounded cargo override surfaces.",
"original_save_filename": "captured-cargo-economics.gms",
"original_save_sha256": "cargo-economics-sample-sha256",
"notes": [
"tracked as JSON save-slice document rather than raw .smp",
"pins the grounded aggregate descriptors 105 and 177..179 plus the grounded named production strip 180..229 while named cargo price remains evidence-blocked"
"pins the grounded descriptors 105..179 plus named cargo price 106..176 and named cargo production 180..229"
]
},
"save_slice": {
@ -37,9 +37,11 @@
"packed_state_version_hex": "0x000003e9",
"live_id_bound": 64,
"live_record_count": 1,
"live_entry_ids": [64],
"live_entry_ids": [
64
],
"decoded_record_count": 1,
"imported_runtime_record_count": 0,
"imported_runtime_record_count": 1,
"records": [
{
"record_index": 0,
@ -57,15 +59,35 @@
"one_shot_header_0x7f5": 0,
"modifier_flag_0x7f9": 0,
"modifier_flag_0x7fa": 0,
"grouped_target_scope_ordinals_0x7fb": [0, 0, 0, 0],
"grouped_scope_checkboxes_0x7ff": [1, 0, 0, 0],
"grouped_target_scope_ordinals_0x7fb": [
0,
0,
0,
0
],
"grouped_scope_checkboxes_0x7ff": [
1,
0,
0,
0
],
"summary_toggle_0x800": 1,
"grouped_territory_selectors_0x80f": [-1, -1, -1, -1]
"grouped_territory_selectors_0x80f": [
-1,
-1,
-1,
-1
]
},
"text_bands": [],
"standalone_condition_row_count": 0,
"standalone_condition_rows": [],
"grouped_effect_row_counts": [5, 0, 0, 0],
"grouped_effect_row_counts": [
6,
0,
0,
0
],
"grouped_effect_rows": [
{
"group_index": 0,
@ -96,6 +118,34 @@
{
"group_index": 0,
"row_index": 1,
"descriptor_id": 106,
"descriptor_label": "Alcohol Price",
"target_mask_bits": 8,
"parameter_family": "cargo_price_scalar",
"opcode": 3,
"raw_scalar_value": 140,
"value_byte_0x09": 0,
"value_dword_0x0d": 0,
"value_byte_0x11": 0,
"value_byte_0x12": 0,
"value_word_0x14": 0,
"value_word_0x16": 0,
"row_shape": "scalar_assignment",
"semantic_family": "scalar_assignment",
"semantic_preview": "Set Alcohol Price to 140",
"recovered_cargo_slot": null,
"recovered_cargo_class": null,
"recovered_cargo_label": "Alcohol",
"recovered_locomotive_id": null,
"locomotive_name": null,
"notes": [
"descriptor recovered from checked-in EventEffects semantic catalog",
"named cargo price descriptor maps to cargo Alcohol"
]
},
{
"group_index": 0,
"row_index": 2,
"descriptor_id": 177,
"descriptor_label": "All Cargo Production",
"target_mask_bits": 8,
@ -121,7 +171,7 @@
},
{
"group_index": 0,
"row_index": 2,
"row_index": 3,
"descriptor_id": 178,
"descriptor_label": "All Factory Production",
"target_mask_bits": 8,
@ -147,7 +197,7 @@
},
{
"group_index": 0,
"row_index": 3,
"row_index": 4,
"descriptor_id": 179,
"descriptor_label": "All Farm/Mine Production",
"target_mask_bits": 8,
@ -173,7 +223,7 @@
},
{
"group_index": 0,
"row_index": 4,
"row_index": 5,
"descriptor_id": 180,
"descriptor_label": "Alcohol Production",
"target_mask_bits": 8,
@ -208,6 +258,14 @@
},
"value": 180
},
{
"kind": "set_cargo_price_override",
"target": {
"kind": "named",
"name": "Alcohol"
},
"value": 140
},
{
"kind": "set_cargo_production_override",
"target": {
@ -240,8 +298,9 @@
],
"executable_import_ready": true,
"notes": [
"grounded aggregate cargo economics descriptors plus the grounded named production strip execute through bounded cargo override surfaces"
]
"aggregate and named cargo-economics descriptors now import through bounded cargo overrides"
],
"imported_runtime_record_count": 1
}
]
},