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>
This commit is contained in:
2026-02-20 19:31:20 +01:00
co-authored by Claude Opus 4.6
34 changed files with 6676 additions and 85 deletions
+4 -1
View File
@@ -348,7 +348,8 @@ fn run_dialogue(index: &LinePoolIndex, args: &Args) {
"situation",
"arrival, shift_start, shift_end, shift_transition, bar_evening, \
night_shift, investigation, confrontation, social, alone, \
emergency, routine, observation, greeting",
emergency, routine, observation, greeting, first_meeting, \
repeated_visit",
)
})
.collect()
@@ -597,6 +598,8 @@ fn situation_str(s: &Situation) -> &'static str {
Situation::Routine => "routine",
Situation::Observation => "observation",
Situation::Greeting => "greeting",
Situation::FirstMeeting => "first_meeting",
Situation::RepeatedVisit => "repeated_visit",
}
}