diff --git a/.pql/changelog/ticket_history/2026-06.sql b/.pql/changelog/ticket_history/2026-06.sql index f633627f3..7f6f72047 100644 --- a/.pql/changelog/ticket_history/2026-06.sql +++ b/.pql/changelog/ticket_history/2026-06.sql @@ -9,3 +9,4 @@ Closed via board reconciliation (pql migration cleanup, 2026-06-06): the work INSERT INTO ticket_history (ticket_id, field, old_value, new_value, changed_by, changed_at, created_at, updated_at, deleted_at, hash, canonical_version) VALUES ('T-986', 'description', 'zone_type_id from (ZoningType + economic_role + seed) -> one of the 31 D-142 RON files. BuildingEntryClass from (zone_type x layout_mode x prosperity) incl. Commission/Organic credential fork + U-curve degrade. era from founding_age+prosperity+seed; initial_condition from prosperity_baseline (D-217).', 'zone_type_id from (ZoningType + economic_role + seed) -> one of the 31 D-142 RON files. BuildingEntryClass from (zone_type x layout_mode x prosperity) incl. Commission/Organic credential fork + U-curve degrade. era from founding_age+prosperity+seed; initial_condition from prosperity_baseline (D-217). Closed via board reconciliation (pql migration cleanup, 2026-06-06): zone_type_for / building_entry_class / construction_era / initial_condition all implemented + wired in server/src/atlas/skeleton_gen.rs; 31 D-142 zone-type RON files present. Implemented under T-957/T-1006; verified.', NULL, '2026-06-06 21:34:05', '2026-06-06 21:34:05', '2026-06-06 21:34:05', NULL, '3ec0178c5899bd68734ab0c06113fa49', 1) ON CONFLICT(hash) DO NOTHING; +INSERT INTO ticket_history (ticket_id, field, old_value, new_value, changed_by, changed_at, created_at, updated_at, deleted_at, hash, canonical_version) VALUES ('T-984', 'status', 'backlog', 'in_progress', NULL, '2026-06-06 21:35:56', '2026-06-06 21:35:56', '2026-06-06 21:35:56', NULL, 'd7710baccc79933eece6c4be27d0b1eb', 1) ON CONFLICT(hash) DO NOTHING; diff --git a/.pql/changelog/tickets/2026-06.sql b/.pql/changelog/tickets/2026-06.sql index 57210cabb..3a10bacca 100644 --- a/.pql/changelog/tickets/2026-06.sql +++ b/.pql/changelog/tickets/2026-06.sql @@ -171,3 +171,4 @@ Closed via board reconciliation (pql migration cleanup, 2026-06-06): the work INSERT INTO tickets (id, type, parent_id, title, description, status, priority, assigned_to, team, decision_ref, created_at, updated_at, deleted_at, hash, canonical_version) VALUES ('T-986', 'task', 'T-957', 'zone_type_id selection + BuildingEntryClass / era / initial_condition derivation', 'zone_type_id from (ZoningType + economic_role + seed) -> one of the 31 D-142 RON files. BuildingEntryClass from (zone_type x layout_mode x prosperity) incl. Commission/Organic credential fork + U-curve degrade. era from founding_age+prosperity+seed; initial_condition from prosperity_baseline (D-217). Closed via board reconciliation (pql migration cleanup, 2026-06-06): zone_type_for / building_entry_class / construction_era / initial_condition all implemented + wired in server/src/atlas/skeleton_gen.rs; 31 D-142 zone-type RON files present. Implemented under T-957/T-1006; verified.', 'done', 'high', NULL, 'server', 'D-229', '2026-05-25 19:11:15', '2026-06-06 21:34:05', NULL, 'eac3221ad05f8bfceee12ef66fe672d3', 1) ON CONFLICT(id) DO UPDATE SET type=excluded.type, parent_id=excluded.parent_id, title=excluded.title, description=excluded.description, status=excluded.status, priority=excluded.priority, assigned_to=excluded.assigned_to, team=excluded.team, decision_ref=excluded.decision_ref, updated_at=excluded.updated_at, deleted_at=excluded.deleted_at, hash=excluded.hash, canonical_version=excluded.canonical_version WHERE excluded.updated_at > tickets.updated_at OR (excluded.updated_at = tickets.updated_at AND excluded.hash > tickets.hash); +INSERT INTO tickets (id, type, parent_id, title, description, status, priority, assigned_to, team, decision_ref, created_at, updated_at, deleted_at, hash, canonical_version) VALUES ('T-984', 'task', 'T-957', 'BuildingPropertyTag + FloorExtent/FloorHeightProfile structs; replace BlockSkeleton String stubs', 'Define BuildingPropertyTag (zone_type_id, footprint, extent, entry_class, flavor_ref, era/era_cause, initial_condition) + FloorExtent{base_floor,floor_count,FloorHeightProfile::{Uniform|Variable}}. Resolves Q-104: floor_at_voxel_z / voxel_range_for_floor pure fns. Replaces era/society_profile/zone_palette/chunk_layout String stubs in generator.rs.', 'in_progress', 'high', NULL, 'server', 'D-229', '2026-05-25 19:11:10', '2026-06-06 21:35:56', NULL, '8fb7fbe395fbeb0f735effbed6a4b76f', 1) ON CONFLICT(id) DO UPDATE SET type=excluded.type, parent_id=excluded.parent_id, title=excluded.title, description=excluded.description, status=excluded.status, priority=excluded.priority, assigned_to=excluded.assigned_to, team=excluded.team, decision_ref=excluded.decision_ref, updated_at=excluded.updated_at, deleted_at=excluded.deleted_at, hash=excluded.hash, canonical_version=excluded.canonical_version WHERE excluded.updated_at > tickets.updated_at OR (excluded.updated_at = tickets.updated_at AND excluded.hash > tickets.hash); diff --git a/server/src/atlas/skeleton_gen.rs b/server/src/atlas/skeleton_gen.rs index 4c1a1e9b2..594ad375b 100644 --- a/server/src/atlas/skeleton_gen.rs +++ b/server/src/atlas/skeleton_gen.rs @@ -132,8 +132,6 @@ pub fn generate_quarter_skeleton( z_levels, social_sites: Vec::new(), access_points, - society_profile: String::new(), - zone_palette: Vec::new(), boundaries: String::new(), guarantee_audit: None, } @@ -345,7 +343,6 @@ fn build_block_grid( rotation_steps: 0, }, hosted_sites: Vec::new(), - era_modifications: Vec::new(), era_cause: None, density_pct: density, landmark: None, diff --git a/server/src/simulation/generator.rs b/server/src/simulation/generator.rs index 356014977..a85d10c07 100644 --- a/server/src/simulation/generator.rs +++ b/server/src/simulation/generator.rs @@ -46,16 +46,12 @@ pub type WaterType = String; pub type SpecializedFunction = String; /// Cultural / architectural era tag. Stub. pub type Era = String; -/// Single era modification applied to a block (conversion, overlay, hybrid). Stub. -pub type EraModification = String; /// Landmark slot description within a block. Stub. pub type LandmarkSlot = String; // `ChunkLayout`, `CorridorSpine`, `AccessPoint` are typed street-network structs // (D-234, #957) — see the "Street-network types" section below. /// District context — neighboring districts, world position, system. Stub. pub type QuarterContext = String; -/// Society profile reference (Miri's cultural ingredients). Stub. -pub type SocietyProfileRef = String; /// Zone definition — base palette + modifiers + zone name. Stub. pub type ZoneDefinition = String; /// District boundary system — edge descriptors with neighbors. Stub. @@ -1104,9 +1100,9 @@ pub struct BlockSkeleton { pub reservation: Option, pub chunk_layout: ChunkLayout, pub hosted_sites: Vec, - // Per-block `era: Era` (String stub) removed in #957 — construction era now - // lives per-footprint on `BuildingPropertyTag.era` (typed `ConstructionEra`). - pub era_modifications: Vec, + // Per-block `era: Era` / `era_modifications` String stubs removed (#957, T-984) — + // construction era now lives per-footprint on `BuildingPropertyTag.era` (typed + // `ConstructionEra`); `era_cause` is retained as the block-level cause. pub era_cause: Option, /// Build density percentage (0 = open/empty, 100 = fully built-up). /// Integer to avoid f32 non-determinism (D-010). @@ -1298,9 +1294,9 @@ pub struct QuarterSkeleton { pub social_sites: Vec, pub access_points: Vec, - // ── Cultural / World Context ────────────────────────── - pub society_profile: SocietyProfileRef, - pub zone_palette: Vec, + // Cultural / zone String stubs (`society_profile`, `zone_palette`) removed + // (T-984, D-229) — per-building culture and zoning now live on + // `BuildingPropertyTag` (`flavor_ref`, `zone_type_id`) in the district's `block_tags`. // ── Boundary System ─────────────────────────────────── pub boundaries: QuarterBoundaries,