fix(simulation): address PR #37 review — doc corrections, race fix, marker cleanup
Hoshe review (4 items): - types.rs: doc comment "Current: 6" → "Current: 9" - dialogue.rs: walk-away doc duplicated numbering (items 4-5 were 2-3) - test_world/mod.rs: comment "Reset plates at 49-51" → "49-55" - content_scaling.rs: magic number 51 → constants::RESET_PLATE_STABLE_IDS.1 Tyre review (3 items): - knowledge/types.rs: guard comments on decrement() floor at Hostile - input.rs: TeleportToHub now clears ConfrontationDelivered marker - content_scaling.rs: same magic number fix (covered above) Additional: - content_runtime.rs: barrier-based shutdown handshake fixes TCP RST race condition under parallel test execution - dialogue_room.rs: clippy type_complexity allow on NPCS tuple array Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -498,8 +498,8 @@ pub fn process_talk_interaction(
|
||||
/// 1. Target NPC shifts to AnimationTier::Tier2 (D-047 ambiguous animation)
|
||||
/// 2. NPC routine deviation recorded (storyteller hook)
|
||||
/// 3. Emits IncompleteInteraction knowledge event (recorded in KG)
|
||||
/// 2. Clears ActiveDialogue state
|
||||
/// 3. Removes the WalkAwayRequest marker
|
||||
/// 4. Clears ActiveDialogue state
|
||||
/// 5. Removes the WalkAwayRequest marker
|
||||
///
|
||||
/// If no ActiveDialogue is present, removes WalkAwayRequest silently (no-op).
|
||||
///
|
||||
|
||||
@@ -629,12 +629,13 @@ fn handle_teleport_to_hub(
|
||||
// Clear any pending movement
|
||||
commands.entity(player_entity).remove::<MoveIntent>();
|
||||
|
||||
// Clear dialogue/interaction markers
|
||||
// Clear dialogue/interaction markers (including mid-confrontation state)
|
||||
commands
|
||||
.entity(player_entity)
|
||||
.remove::<crate::simulation::dialogue::TalkRequest>()
|
||||
.remove::<crate::simulation::dialogue::ActiveDialogue>()
|
||||
.remove::<crate::simulation::dialogue::WalkAwayRequest>();
|
||||
.remove::<crate::simulation::dialogue::WalkAwayRequest>()
|
||||
.remove::<crate::simulation::dialogue::ConfrontationDelivered>();
|
||||
|
||||
tracing::info!(
|
||||
x = hub_spawn.x,
|
||||
|
||||
Reference in New Issue
Block a user