fix(simulation): address PR #55 review — stale comment, range, duplication, docs
- Fix protocol version comment (12 → 13) in ObserverSnapshot doc - Widen Want intensity range from 3..=9 to 1..=10 to match spec and test - Replace duplicated pool selection in trigger_recognition_monologue with call to select_pool_line helper (~50 lines removed) - Document NaiveSpatialIndex migration cost for grid/quadtree swap - Remove misleading Default derive from TellCategory (Nervous is not a sensible default for neutral NPCs) - Add caller invariant doc on generate_npc (no TilePosition spawned) Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -352,53 +352,9 @@ pub fn trigger_recognition_monologue(
|
||||
};
|
||||
|
||||
// Try content pools for observe_anomaly trigger lines
|
||||
let line = if let Some(ref content) = content {
|
||||
let character = state.character.as_str();
|
||||
let mut candidates: Vec<(&str, &str)> = Vec::new();
|
||||
|
||||
for district in content.0.districts.values() {
|
||||
for pool in &district.monologue_pools {
|
||||
if pool.character != character {
|
||||
continue;
|
||||
}
|
||||
for line in &pool.lines {
|
||||
if line.trigger != "observe_anomaly" {
|
||||
continue;
|
||||
}
|
||||
if state.shown_ids.contains(&line.id) {
|
||||
continue;
|
||||
}
|
||||
candidates.push((&line.id, &line.text));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if candidates.is_empty() {
|
||||
// Fallback: allow repeats from content pools
|
||||
for district in content.0.districts.values() {
|
||||
for pool in &district.monologue_pools {
|
||||
if pool.character != character {
|
||||
continue;
|
||||
}
|
||||
for line in &pool.lines {
|
||||
if line.trigger != "observe_anomaly" {
|
||||
continue;
|
||||
}
|
||||
candidates.push((&line.id, &line.text));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if !candidates.is_empty() {
|
||||
let i = rng.rng.random_range(0..candidates.len());
|
||||
Some((candidates[i].0.to_string(), candidates[i].1.to_string()))
|
||||
} else {
|
||||
None
|
||||
}
|
||||
} else {
|
||||
None
|
||||
};
|
||||
let line = content
|
||||
.as_deref()
|
||||
.and_then(|c| select_pool_line("observe_anomaly", &state, c, &mut rng.rng));
|
||||
|
||||
// Use content pool line or hardcoded fallback
|
||||
let (id, text) = if let Some((id, text)) = line {
|
||||
|
||||
@@ -33,6 +33,16 @@ pub trait SpatialIndex: Send + Sync {
|
||||
/// Replace with grid or quadtree when profiling shows this is a bottleneck.
|
||||
/// Deterministic iteration: entries stored in insertion order, but callers
|
||||
/// should not depend on ordering (sort by Entity::to_bits() if needed).
|
||||
///
|
||||
/// ## Migration cost for grid/quadtree swap
|
||||
///
|
||||
/// `sync_spatial_index` takes `ResMut<NaiveSpatialIndex>` directly because
|
||||
/// bevy_ecs cannot store `dyn SpatialIndex` as a Resource. A swap to Grid or
|
||||
/// BVH requires changing the concrete type in: (1) `sync_spatial_index` system
|
||||
/// parameter, (2) `SimulationPlugin` resource registration, (3) any system
|
||||
/// that queries `Res<NaiveSpatialIndex>` (currently: `update_follow_state`).
|
||||
/// The `SpatialIndex` trait ensures the API surface stays identical — only the
|
||||
/// type name changes at call sites. Estimated: ~5 lines per caller.
|
||||
#[derive(Resource, Debug, Default)]
|
||||
pub struct NaiveSpatialIndex {
|
||||
entries: Vec<(Entity, TilePosition)>,
|
||||
|
||||
Reference in New Issue
Block a user