From 4be9cde3fae6a805ca51b77a248354b1b7ba4a8a Mon Sep 17 00:00:00 2001 From: Jeroen Schweitzer Date: Sat, 21 Feb 2026 14:48:03 +0100 Subject: [PATCH] =?UTF-8?q?fix(copy):=20PR=20#53=20review=20round=202=20?= =?UTF-8?q?=E2=80=94=20ID=20collision,=20wary/tired=20moods,=20greeting=20?= =?UTF-8?q?enum?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Renumber Kael greeting IDs _d_046-049 → _d_050-053 (pc-detective.yaml holds 046-048, Hoshe R2-H1) - Replace pre-existing invalid mood values: wary→suspicious (22 lines), tired→frustrated (4 lines) across 5 dialogue files (Hoshe R2-H2) - Add greeting to situations.yaml enum with server-pending note (Hoshe R2-H3) - Fix double-dash → em-dash on Kael greeting lines (Hoshe R2-H5) Co-Authored-By: Claude Opus 4.6 --- .../maintenance-corridors/ring-operative.yaml | 8 +++--- .../dialogue/the-last-shift/bar-owner.yaml | 2 +- .../dialogue/the-last-shift/bar-regular.yaml | 20 +++++++------- .../dialogue/the-terminal/dock-worker.yaml | 26 +++++++++---------- .../dialogue/the-terminal/kael-davan.yaml | 12 ++++----- .../dialogue/the-terminal/scheduler.yaml | 2 +- content/global/enums/situations.yaml | 7 +++++ 7 files changed, 42 insertions(+), 35 deletions(-) diff --git a/content/campaigns/main/systems/krenn/stations/sova/districts/transit/dialogue/maintenance-corridors/ring-operative.yaml b/content/campaigns/main/systems/krenn/stations/sova/districts/transit/dialogue/maintenance-corridors/ring-operative.yaml index 42f3ec76d..fad7d44f0 100644 --- a/content/campaigns/main/systems/krenn/stations/sova/districts/transit/dialogue/maintenance-corridors/ring-operative.yaml +++ b/content/campaigns/main/systems/krenn/stations/sova/districts/transit/dialogue/maintenance-corridors/ring-operative.yaml @@ -274,7 +274,7 @@ lines: trust: surface situation: [investigation, confrontation] topic: [institution, routine] - mood: [wary] + mood: [suspicious] tags: [ring-operative, detective-path, access-denial] - id: maintenance-corridors_d_118 @@ -284,7 +284,7 @@ lines: trust: surface situation: [investigation] topic: [institution, routine] - mood: [wary] + mood: [suspicious] tags: [ring-operative, detective-path, voss-redirect] dual_lens: smuggler: "Never encounters this." @@ -297,7 +297,7 @@ lines: trust: surface situation: [investigation] topic: [routine] - mood: [wary] + mood: [suspicious] tags: [ring-operative, detective-path, deflection] # ========================================== @@ -365,7 +365,7 @@ lines: trust: surface situation: [routine, shift_end] topic: [routine] - mood: [tired] + mood: [frustrated] tags: [ring-operative, surface-cover, generation-pass] - id: maintenance-corridors_d_126 diff --git a/content/campaigns/main/systems/krenn/stations/sova/districts/transit/dialogue/the-last-shift/bar-owner.yaml b/content/campaigns/main/systems/krenn/stations/sova/districts/transit/dialogue/the-last-shift/bar-owner.yaml index 4bd853885..3234f345d 100644 --- a/content/campaigns/main/systems/krenn/stations/sova/districts/transit/dialogue/the-last-shift/bar-owner.yaml +++ b/content/campaigns/main/systems/krenn/stations/sova/districts/transit/dialogue/the-last-shift/bar-owner.yaml @@ -230,7 +230,7 @@ lines: trust: surface situation: [investigation, confrontation] topic: [institution, routine] - mood: [wary] + mood: [suspicious] tags: [lera, detective-path, authority-assertion] - id: the-last-shift_d_118 diff --git a/content/campaigns/main/systems/krenn/stations/sova/districts/transit/dialogue/the-last-shift/bar-regular.yaml b/content/campaigns/main/systems/krenn/stations/sova/districts/transit/dialogue/the-last-shift/bar-regular.yaml index d5e8319e5..60b2eaecc 100644 --- a/content/campaigns/main/systems/krenn/stations/sova/districts/transit/dialogue/the-last-shift/bar-regular.yaml +++ b/content/campaigns/main/systems/krenn/stations/sova/districts/transit/dialogue/the-last-shift/bar-regular.yaml @@ -63,7 +63,7 @@ lines: trust: surface situation: [routine] topic: [colleague, cargo] - mood: [wary] + mood: [suspicious] tags: [bar-regular, maret, voss, discrepancy] dual_lens: smuggler: "They're talking about Maret's flags as general knowledge. That's a wider problem than I thought." @@ -76,7 +76,7 @@ lines: trust: surface situation: [routine] topic: [cargo, routine] - mood: [wary] + mood: [suspicious] tags: [bar-regular, bay-four, observation] dual_lens: smuggler: "They've noticed bay four. It's becoming visible. Not good." @@ -102,7 +102,7 @@ lines: trust: surface situation: [routine] topic: [institution, routine] - mood: [wary] + mood: [suspicious] tags: [bar-regular, commission, audit] dual_lens: smuggler: "Cycle fifteen. That's the deadline. Get clean before then." @@ -115,7 +115,7 @@ lines: trust: surface situation: [routine] topic: [institution, colleague] - mood: [wary] + mood: [suspicious] tags: [bar-regular, voss, observation] dual_lens: smuggler: "Voss is visible more. Is that heat from above, or is he managing something on the floor?" @@ -188,7 +188,7 @@ lines: trust: surface situation: [routine] topic: [institution, community] - mood: [wary] + mood: [suspicious] tags: [bar-regular, workers-association, voss, transition-window] dual_lens: smuggler: "Voss is defending the twenty-minute window against Association pressure. He's protecting the gap." @@ -205,7 +205,7 @@ lines: trust: surface situation: [arrival, investigation] topic: [routine] - mood: [wary] + mood: [suspicious] tags: [bar-regular, detective-path, recognition] - id: the-last-shift_d_316 @@ -215,7 +215,7 @@ lines: trust: surface situation: [investigation, routine] topic: [institution, routine] - mood: [wary] + mood: [suspicious] tags: [bar-regular, detective-path, deflection] - id: the-last-shift_d_317 @@ -225,7 +225,7 @@ lines: trust: surface situation: [investigation] topic: [routine] - mood: [wary] + mood: [suspicious] tags: [bar-regular, detective-path, lera-redirect] # ========================================== @@ -283,7 +283,7 @@ lines: trust: surface situation: [arrival] topic: [routine] - mood: [tired] + mood: [frustrated] tags: [bar-regular, greeting, generation-pass] - id: the-last-shift_d_323 @@ -323,7 +323,7 @@ lines: trust: surface situation: [routine] topic: [institution, routine] - mood: [wary] + mood: [suspicious] tags: [bar-regular, infrastructure, generation-pass] - id: the-last-shift_d_327 diff --git a/content/campaigns/main/systems/krenn/stations/sova/districts/transit/dialogue/the-terminal/dock-worker.yaml b/content/campaigns/main/systems/krenn/stations/sova/districts/transit/dialogue/the-terminal/dock-worker.yaml index 34c5ce396..a379adbdb 100644 --- a/content/campaigns/main/systems/krenn/stations/sova/districts/transit/dialogue/the-terminal/dock-worker.yaml +++ b/content/campaigns/main/systems/krenn/stations/sova/districts/transit/dialogue/the-terminal/dock-worker.yaml @@ -29,7 +29,7 @@ lines: trust: surface situation: [arrival, shift_start] topic: [routine] - mood: [tired] + mood: [frustrated] tags: [dock-worker, greeting] - id: the-terminal_d_202 @@ -39,7 +39,7 @@ lines: trust: surface situation: [arrival, shift_start] topic: [institution, routine] - mood: [wary] + mood: [suspicious] tags: [dock-worker, voss, caution] dual_lens: smuggler: "Voss is in early. If the schedule's tight, the window shifts. Check it." @@ -79,7 +79,7 @@ lines: trust: surface situation: [routine] topic: [colleague, routine] - mood: [wary] + mood: [suspicious] tags: [dock-worker, maret, observation] dual_lens: smuggler: "Maret reviewing something. If she flags a discrepancy, Voss'll sit on it. He always does." @@ -105,7 +105,7 @@ lines: trust: surface situation: [shift_transition, routine] topic: [institution, routine] - mood: [wary] + mood: [suspicious] tags: [dock-worker, commission, transition-window] dual_lens: smuggler: "Commission presence during transition. Window's compromised." @@ -128,7 +128,7 @@ lines: trust: surface situation: [routine] topic: [cargo, colleague] - mood: [wary] + mood: [suspicious] tags: [dock-worker, maret, voss, discrepancy] dual_lens: smuggler: "Forty kilos. Maret flagged it. Voss buried it. Same as last time." @@ -144,7 +144,7 @@ lines: trust: surface situation: [routine] topic: [cargo, routine] - mood: [wary] + mood: [suspicious] tags: [dock-worker, c4-storage, observation] dual_lens: smuggler: "C-4's getting casual attention. Note it." @@ -195,7 +195,7 @@ lines: trust: surface situation: [investigation, routine] topic: [institution, routine] - mood: [wary] + mood: [suspicious] tags: [dock-worker, detective-path, redirect] - id: the-terminal_d_215 @@ -205,7 +205,7 @@ lines: trust: surface situation: [investigation, confrontation] topic: [institution, routine] - mood: [wary] + mood: [suspicious] tags: [dock-worker, detective-path, deflection] - id: the-terminal_d_216 @@ -215,7 +215,7 @@ lines: trust: surface situation: [investigation] topic: [institution, routine] - mood: [wary] + mood: [suspicious] tags: [dock-worker, detective-path, voss, redirect] # ========================================== @@ -229,7 +229,7 @@ lines: trust: real situation: [routine] topic: [colleague] - mood: [wary] + mood: [suspicious] tags: [dock-worker, maret, peer-candor] dual_lens: smuggler: "Maret's not going to drop it. That's the problem." @@ -242,7 +242,7 @@ lines: trust: real situation: [routine] topic: [institution, colleague] - mood: [wary] + mood: [suspicious] tags: [dock-worker, voss, peer-candor] dual_lens: smuggler: "He suspects Voss is shaving something. Doesn't know what. Doesn't want to." @@ -353,7 +353,7 @@ lines: trust: surface situation: [routine, shift_start] topic: [routine, cargo] - mood: [wary] + mood: [suspicious] tags: [dock-worker, span-gate, generation-pass] - id: the-terminal_d_229 @@ -363,7 +363,7 @@ lines: trust: surface situation: [shift_start, routine] topic: [colleague, routine] - mood: [tired] + mood: [frustrated] tags: [dock-worker, staffing, generation-pass] - id: the-terminal_d_230 diff --git a/content/campaigns/main/systems/krenn/stations/sova/districts/transit/dialogue/the-terminal/kael-davan.yaml b/content/campaigns/main/systems/krenn/stations/sova/districts/transit/dialogue/the-terminal/kael-davan.yaml index f25069004..d3527a1dc 100644 --- a/content/campaigns/main/systems/krenn/stations/sova/districts/transit/dialogue/the-terminal/kael-davan.yaml +++ b/content/campaigns/main/systems/krenn/stations/sova/districts/transit/dialogue/the-terminal/kael-davan.yaml @@ -431,7 +431,7 @@ lines: # ======================================== # first_meeting: InteractionMemory.count == 0. RelationshipState: Unknown → Public access only. - - id: the-terminal_d_046 + - id: the-terminal_d_050 text: "This section is dock crew and logistics. If you're Commission or admin, check-in's back that way." role: dock-worker access: [public] @@ -443,8 +443,8 @@ lines: notes: "Layer 2 greeting — first meeting. Kael is helpful but orienting the stranger away from his work." # established — peer/smuggler context: count >= 3, RelationshipState: Known/Friendly → Peer/Insider access. - - id: the-terminal_d_047 - text: "You're back. Good -- bay three's been quiet. I'll fill you in." + - id: the-terminal_d_051 + text: "You're back. Good — bay three's been quiet. I'll fill you in." role: dock-worker access: [peer, insider] trust: surface @@ -455,8 +455,8 @@ lines: notes: "Layer 2 greeting — established. Warm, practical, skips pleasantries. Treats them as crew." # established — authority/detective context: count >= 3, RelationshipState: PersonOfInterest → Authority access. - - id: the-terminal_d_048 - text: "Back again. I'm on shift -- if you have questions, make them quick." + - id: the-terminal_d_052 + text: "Back again. I'm on shift — if you have questions, make them quick." role: dock-worker access: [authority] trust: surface @@ -467,7 +467,7 @@ lines: notes: "Layer 2 greeting — repeat with authority figure. Professional, clipped, not hostile. Kael can't refuse but won't volunteer." # post-confrontation: confrontation in InteractionMemory.notable_events. NPC mood shifted to suspicious/frustrated. - - id: the-terminal_d_049 + - id: the-terminal_d_053 text: "Didn't expect you today." role: dock-worker access: [peer, insider] diff --git a/content/campaigns/main/systems/krenn/stations/sova/districts/transit/dialogue/the-terminal/scheduler.yaml b/content/campaigns/main/systems/krenn/stations/sova/districts/transit/dialogue/the-terminal/scheduler.yaml index 31eba436d..83565fe05 100644 --- a/content/campaigns/main/systems/krenn/stations/sova/districts/transit/dialogue/the-terminal/scheduler.yaml +++ b/content/campaigns/main/systems/krenn/stations/sova/districts/transit/dialogue/the-terminal/scheduler.yaml @@ -367,5 +367,5 @@ lines: trust: surface situation: [routine] topic: [institution, routine] - mood: [wary] + mood: [suspicious] tags: [maret, commission, audit, generation-pass] diff --git a/content/global/enums/situations.yaml b/content/global/enums/situations.yaml index 820b44eb7..74ccedd18 100644 --- a/content/global/enums/situations.yaml +++ b/content/global/enums/situations.yaml @@ -51,3 +51,10 @@ values: - value: observation description: Player is watching from a distance, not directly interacting + + - value: greeting + description: > + Initial contact phase of an encounter. Layer 2 (D-028) uses greeting lines + with access tier filtering to differentiate first meeting vs established vs + post-confrontation greetings. Added Sprint 8 amendment. NOTE: server + derive_situations() does not yet push Situation::Greeting — pending Rust update.