From f1ffdd5157262ebf0175049db0dea671a53e9b48 Mon Sep 17 00:00:00 2001 From: "Z. Cliffe Schreuders" Date: Wed, 19 Nov 2025 13:44:28 +0000 Subject: [PATCH] fix: Correct conditional syntax in all phase_hub knots across NPC files Fixed Ink conditional syntax errors in all three NPC ongoing conversation files: dr_chen_ongoing_conversations.ink: - phase_2_hub (line 478): Added opening brace and hyphen to first condition - phase_3_hub (line 917): Added opening brace and hyphen to first condition - phase_4_hub (line 1343): Added opening brace and hyphen to first condition netherton_ongoing_conversations.ink: - phase_1_hub (line 85): Added opening brace and hyphen, fixed double-prefix bug - phase_2_hub (line 385): Added opening brace and hyphen to first condition - phase_3_hub (line 770): Added opening brace and hyphen to first condition - phase_4_hub (line 1211): Added opening brace, hyphen, and proper indentation haxolottle_ongoing_conversations.ink: - phase_1_hub (line 93): Added opening brace and hyphen to first condition - phase_2_hub (line 547): Added opening brace, hyphen, and fixed undefined variable reference (missions_together -> total_missions_completed) All conditionals now follow proper Ink syntax: { - condition: content - else: content } --- .../ink/dr_chen_ongoing_conversations.ink | 26 +++++----- .../ink/haxolottle_ongoing_conversations.ink | 18 ++++--- .../ink/netherton_ongoing_conversations.ink | 52 ++++++++++--------- 3 files changed, 52 insertions(+), 44 deletions(-) diff --git a/story_design/ink/dr_chen_ongoing_conversations.ink b/story_design/ink/dr_chen_ongoing_conversations.ink index 99e6b05..1ee0b13 100644 --- a/story_design/ink/dr_chen_ongoing_conversations.ink +++ b/story_design/ink/dr_chen_ongoing_conversations.ink @@ -914,12 +914,13 @@ Dr. Chen: If you ever think I've built something that crosses ethical lines, tel === phase_3_hub === -{npc_chen_rapport >= 85: - Dr. Chen: {player_name}! *genuine excitement* I've been waiting for you. Got something amazing to show you. -- npc_chen_rapport >= 75: - Dr. Chen: Hey! Perfect timing. Want to brainstorm something together? -- else: - Dr. Chen: Agent {player_name}. What brings you by? +{ + - npc_chen_rapport >= 85: + Dr. Chen: {player_name}! *genuine excitement* I've been waiting for you. Got something amazing to show you. + - npc_chen_rapport >= 75: + Dr. Chen: Hey! Perfect timing. Want to brainstorm something together? + - else: + Dr. Chen: Agent {player_name}. What brings you by? } + {not npc_chen_discussed_dream_projects and npc_chen_rapport >= 80} [Ask about their dream projects] @@ -1339,12 +1340,13 @@ Dr. Chen: Arrogance in security research gets people hurt. Stay humble. Stay tho === phase_4_hub === -{npc_chen_rapport >= 95: - Dr. Chen: {player_name}! *lights up* I was just thinking about you. Want to see what we've accomplished together? -- npc_chen_rapport >= 85: - Dr. Chen: Hey partner! Got time to collaborate on something? -- else: - Dr. Chen: {player_name}. What's up? +{ + - npc_chen_rapport >= 95: + Dr. Chen: {player_name}! *lights up* I was just thinking about you. Want to see what we've accomplished together? + - npc_chen_rapport >= 85: + Dr. Chen: Hey partner! Got time to collaborate on something? + - else: + Dr. Chen: {player_name}. What's up? } + {not npc_chen_discussed_future_vision and npc_chen_rapport >= 90} [Ask about their vision for the future] diff --git a/story_design/ink/haxolottle_ongoing_conversations.ink b/story_design/ink/haxolottle_ongoing_conversations.ink index 5b815d6..4779dfd 100644 --- a/story_design/ink/haxolottle_ongoing_conversations.ink +++ b/story_design/ink/haxolottle_ongoing_conversations.ink @@ -90,10 +90,11 @@ EXTERNAL current_mission_id() // LOCAL - Current mission identifier === phase_1_hub === -{total_missions_completed == 1: - Haxolottle: So, we've got some downtime. Want to chat about non-work stuff? Per Regulation 847, personal conversation is encouraged for psychological wellbeing. -- else: - Haxolottle: Got a moment? I could use a break from staring at security feeds. +{ + - total_missions_completed == 1: + Haxolottle: So, we've got some downtime. Want to chat about non-work stuff? Per Regulation 847, personal conversation is encouraged for psychological wellbeing. + - else: + Haxolottle: Got a moment? I could use a break from staring at security feeds. } + {not npc_haxolottle_talked_hobbies_general} [Ask what they do for fun] @@ -543,10 +544,11 @@ Haxolottle: And... *slight smile* ...I have my ridiculous axolotl metaphors. Whe === phase_2_hub === -{missions_together == 6: - Haxolottle: We've been working together for a while now. Starting to feel like a real partnership. Got time to talk? -- else: - Haxolottle: Hey, Agent. Want to chat for a bit? I could use a break from the technical stuff. +{ + - total_missions_completed == 6: + Haxolottle: We've been working together for a while now. Starting to feel like a real partnership. Got time to talk? + - else: + Haxolottle: Hey, Agent. Want to chat for a bit? I could use a break from the technical stuff. } + {not npc_haxolottle_talked_philosophy_change} [Ask how their philosophy has changed over the years] diff --git a/story_design/ink/netherton_ongoing_conversations.ink b/story_design/ink/netherton_ongoing_conversations.ink index 2fe18e9..9855074 100644 --- a/story_design/ink/netherton_ongoing_conversations.ink +++ b/story_design/ink/netherton_ongoing_conversations.ink @@ -82,12 +82,13 @@ EXTERNAL current_mission_id() // LOCAL - Current mission identifier === phase_1_hub === -{total_missions_completed == 1: - Netherton: Agent {player_name}. I have a few minutes available. Is there something you wish to discuss? -- npc_npc_netherton_respect >= 60: - Netherton: Agent. Your performance has been noted. What can I address for you today? -- else: - Netherton: Agent {player_name}. You have questions? +{ + - total_missions_completed == 1: + Netherton: Agent {player_name}. I have a few minutes available. Is there something you wish to discuss? + - npc_netherton_respect >= 60: + Netherton: Agent. Your performance has been noted. What can I address for you today? + - else: + Netherton: Agent {player_name}. You have questions? } + {not npc_netherton_discussed_handbook} [Ask about the Field Operations Handbook] @@ -381,12 +382,13 @@ Netherton: Specific areas for development will be addressed in formal performanc === phase_2_hub === -{npc_netherton_respect >= 70: - Netherton: Agent {player_name}. Your continued excellent performance has been noted. What do you wish to discuss? -- npc_netherton_respect >= 60: - Netherton: Agent. I have time for a brief discussion. -- else: - Netherton: Agent {player_name}. What requires attention? +{ + - npc_netherton_respect >= 70: + Netherton: Agent {player_name}. Your continued excellent performance has been noted. What do you wish to discuss? + - npc_netherton_respect >= 60: + Netherton: Agent. I have time for a brief discussion. + - else: + Netherton: Agent {player_name}. What requires attention? } + {not npc_netherton_discussed_difficult_decisions} [Ask about making difficult command decisions] @@ -765,12 +767,13 @@ Netherton: But that's the price of command. Acceptable trade for the impact I ca === phase_3_hub === -{npc_netherton_respect >= 80: - Netherton: Agent {player_name}. *almost warmth* Your continued excellence is appreciated. What's on your mind? -- npc_netherton_respect >= 70: - Netherton: Agent. I have time for a substantive discussion. -- else: - Netherton: Agent {player_name}. What do you need? +{ + - npc_netherton_respect >= 80: + Netherton: Agent {player_name}. *almost warmth* Your continued excellence is appreciated. What's on your mind? + - npc_netherton_respect >= 70: + Netherton: Agent. I have time for a substantive discussion. + - else: + Netherton: Agent {player_name}. What do you need? } + {not npc_netherton_discussed_weight_of_command and npc_netherton_respect >= 75} [Ask about the weight of command] @@ -1205,12 +1208,13 @@ Netherton: Though I sometimes suspect I only believe that because accepting the === phase_4_hub === -{npc_netherton_respect >= 90: - Netherton: {player_name}. *uses first name, extremely rare* We should talk. -- npc_netherton_respect >= 80: - Netherton: Agent {player_name}. I value your perspective. What's on your mind? -- else: - Netherton: Agent. I have time. +{ + - npc_netherton_respect >= 90: + Netherton: {player_name}. *uses first name, extremely rare* We should talk. + - npc_netherton_respect >= 80: + Netherton: Agent {player_name}. I value your perspective. What's on your mind? + - else: + Netherton: Agent. I have time. } + {not npc_netherton_discussed_legacy and npc_netherton_respect >= 85} [Ask about his legacy]