fix: resolve merge conflicts with main (Situation + Mood variants)

Keep all new variants from both branches: Greeting (copy), FirstMeeting
and RepeatedVisit (server). Combine Mood doc comments.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

server/src/content/line_pool.rs

@@ -99,6 +99,10 @@ pub enum Situation {
     Observation,
     /// Added Sprint 8 (D-035 amendment): PC dialogue initial contact lines.
     Greeting,
+    /// First player-NPC interaction — interaction_count == 0 (#325, D-028 Layer 2).
+    FirstMeeting,
+    /// Player has talked to this NPC 3+ times — interaction_count >= 3 (#325, D-028 Layer 2).
+    RepeatedVisit,
 }
 
 impl FromStr for Situation {
@@ -119,6 +123,8 @@ impl FromStr for Situation {
             "routine" => Ok(Self::Routine),
             "observation" => Ok(Self::Observation),
             "greeting" => Ok(Self::Greeting),
+            "first_meeting" => Ok(Self::FirstMeeting),
+            "repeated_visit" => Ok(Self::RepeatedVisit),
             _ => Err(ParseEnumError {
                 kind: "Situation",
                 value: s.to_string(),
@@ -165,6 +171,7 @@ impl FromStr for Topic {
 /// D-028 Layer 4: Mood tag — influences weighted selection.
 ///
 /// 8 v0.1 values aligned to voice guide vocabulary (Sprint 14 rename).
+/// D-035 amendment (Sprint 8): `Focused` added as 9th variant.
 /// Neutral mood is represented by omitting the mood tag (untagged = baseline).
 #[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)]
 pub enum Mood {
@@ -175,6 +182,8 @@ pub enum Mood {
     Warm,
     Hostile,
     Relieved,
+    /// D-035 amendment (Sprint 8): task-focused NPC mood — used at The Terminal
+    /// and maintenance corridors. Maps from NpcMood::Focused.
     Focused,
 }
 
@@ -674,6 +683,8 @@ mod tests {
             "routine",
             "observation",
             "greeting", // Sprint 8 amendment (D-035)
+            "first_meeting",
+            "repeated_visit",
         ];
         for v in values {
             assert!(

server/src/content/spawn.rs

@@ -111,6 +111,12 @@ fn spawn_npc(world: &mut World, profile: &types::NpcProfile, result: &mut SpawnR
     // Mark NPC as interactable for proximity-based verb detection (#413)
     entity_commands.insert(Interactable);
 
+    // Interaction history — drives Layer 2 situation activation (#325, D-028)
+    entity_commands.insert(npc::interaction::InteractionMemory::default());
+
+    // Mood state — drives Layer 4 dialogue selection and monologue tone (#323)
+    entity_commands.insert(npc::mood::MoodState::default());
+
     // Axis 1: Want
     if let Some(want) = &profile.want {
         if let Some(kind) = parse_want_kind(&want.primary) {