diff --git a/data/json/npcs/TALK_MARLOSS_VOICE.json b/data/json/npcs/TALK_MARLOSS_VOICE.json index 47aaf56bdbaea..8324a26d49536 100644 --- a/data/json/npcs/TALK_MARLOSS_VOICE.json +++ b/data/json/npcs/TALK_MARLOSS_VOICE.json @@ -78,7 +78,7 @@ "dynamic_line": "Join us then, eat from this meal with us.", "responses": [ { - "text": "[Take Marloss berry] Thank you.", + "text": "[Take Marloss berry.] Thank you.", "topic": "TALK_DONE", "effect": [ { "u_spawn_item": "marloss_berry" }, { "u_add_effect": "u_given_berry", "duration": 43200 } ] }, diff --git a/data/json/npcs/exodii/exodii_Luliya.json b/data/json/npcs/exodii/exodii_Luliya.json index 3250bc656b043..2fc22c21354b6 100644 --- a/data/json/npcs/exodii/exodii_Luliya.json +++ b/data/json/npcs/exodii/exodii_Luliya.json @@ -87,7 +87,7 @@ } }, { - "text": "[You point to your chest] . [You point at the golden figure] What is your name?", + "text": "[You point to your chest.] . [You point at the golden figure.] What is your name?", "topic": "TALK_LULIYA_NAME", "condition": { "and": [ diff --git a/data/json/npcs/exodii/exodii_merchant_talk.json b/data/json/npcs/exodii/exodii_merchant_talk.json index 8b4f09bae2414..ac75434f3ab62 100644 --- a/data/json/npcs/exodii/exodii_merchant_talk.json +++ b/data/json/npcs/exodii/exodii_merchant_talk.json @@ -387,13 +387,13 @@ "id": "TALK_EXODII_MERCHANT_Talk_Intro1a", "type": "talk_topic", "dynamic_line": "'Ow long's it been since the mess happened?", - "responses": [ { "text": "[Tell them]", "topic": "TALK_EXODII_MERCHANT_Talk_Intro2" } ] + "responses": [ { "text": "[Tell them.]", "topic": "TALK_EXODII_MERCHANT_Talk_Intro2" } ] }, { "id": "TALK_EXODII_MERCHANT_Talk_Intro1b", "type": "talk_topic", "dynamic_line": "Thank ye. When you an' Rubik first met, how long'd it been since the mess begun?", - "responses": [ { "text": "[Tell them]", "topic": "TALK_EXODII_MERCHANT_Talk_Intro2" } ] + "responses": [ { "text": "[Tell them.]", "topic": "TALK_EXODII_MERCHANT_Talk_Intro2" } ] }, { "id": "TALK_EXODII_MERCHANT_Talk_Intro2", diff --git a/data/json/npcs/isherwood_farm/Isherwood_Rescue_NPC_Duplicates.json b/data/json/npcs/isherwood_farm/Isherwood_Rescue_NPC_Duplicates.json index 1af935d092d33..af1c2b61cf00b 100644 --- a/data/json/npcs/isherwood_farm/Isherwood_Rescue_NPC_Duplicates.json +++ b/data/json/npcs/isherwood_farm/Isherwood_Rescue_NPC_Duplicates.json @@ -10,7 +10,11 @@ "Not really a good time for a chat.", "I can't believe this is happening." ], - "yes": [ "Barry! Oh my god, you found him!", "Barry! You're okay!", "Oh god, oh thank god. Let's get Barry out of here." ] + "yes": [ + { "gendered_line": "Barry! Oh my god, you found him!", "relevant_genders": [ "u" ] }, + "Barry! You're okay!", + "Oh god, oh thank god. Let's get Barry out of here." + ] }, "responses": [ { @@ -45,7 +49,10 @@ { "type": "talk_topic", "id": "TALK_ISHERWOOD_FAMILY_DUPLICATES_CHRIS", - "dynamic_line": "*eyes you up and down with a nervous smile. \"I almost didn't expect you to show up.\" He hesitates, letting out a soft laugh. \"That sounds bad. I just mean, I can't really believe we're doing this. Thank you… for doing this. You ready to get Uncle Barry?\"", + "dynamic_line": { + "gendered_line": "*eyes you up and down with a nervous smile. \"I almost didn't expect you to show up.\" He hesitates, letting out a soft laugh. \"That sounds bad. I just mean, I can't really believe we're doing this. Thank you… for doing this. You ready to get Uncle Barry?\"", + "relevant_genders": [ "u" ] + }, "responses": [ { "text": "You got it, let's go!", "effect": "follow_only", "topic": "TALK_DONE" }, { "text": "Not yet, just give me a minute.", "topic": "TALK_DONE" } diff --git a/data/json/npcs/isherwood_farm/NPC_Barry_Isherwood.json b/data/json/npcs/isherwood_farm/NPC_Barry_Isherwood.json index e2d3ee59c5b80..0912d361606f4 100644 --- a/data/json/npcs/isherwood_farm/NPC_Barry_Isherwood.json +++ b/data/json/npcs/isherwood_farm/NPC_Barry_Isherwood.json @@ -72,7 +72,7 @@ "dynamic_line": "*gulps. \"I sure as hell am. Did my family send you? Please, we gotta go. There are more of those things. They're everywhere.\"", "responses": [ { - "text": "Yeah, they did. let's go.", + "text": "Yeah, they did. Let's go.", "effect": [ "follow", { "u_add_var": "barry_following", "type": "general", "context": "meeting", "value": "yes" } ], "topic": "TALK_DONE" }, @@ -181,7 +181,7 @@ "dynamic_line": "*shivers, though the room is warm, and moves his mouth wordlessly for a few seconds. \"It's hard to remember details. The air in that place messes with your brain, makes it all feel like some kind of dream. Makes it so you can't fight back. Not that I could have anyway.\" He stares into space for a moment, then swallows hard. \"They cut into me, over and over. I don't think they took anything out. They just opened me up, poked around. I was awake for all of it, as awake as for anything else. Sometimes I felt pain, other times they did something to me so I could feel it but it didn't hurt. There were big, pale ones that did the cutting.\" His voice gets increasingly detached as he speaks, and his shaking grows worse. You're not sure it would be wise for him to go further.", "speaker_effect": { "sentinel": "barry_PTSD1", "effect": { "math": [ "barry_PTSD_freakouts", "+=", "1" ] } }, "responses": [ - { "text": "(Let him continue)", "topic": "TALK_ISHERWOOD_BARRY_TOWER_fresh3" }, + { "text": "[Let him continue.]", "topic": "TALK_ISHERWOOD_BARRY_TOWER_fresh3" }, { "text": "That's enough for now, Barry.", "topic": "TALK_ISHERWOOD_BARRY_TOWER_fresh_stop" }, { "text": "On second thought, I think you should recover more.", "topic": "TALK_DONE" } ] @@ -190,7 +190,7 @@ "type": "talk_topic", "id": "TALK_ISHERWOOD_BARRY_TOWER_fresh3", "dynamic_line": "*shudders, looking like he might vomit. \"What did they want? Why me? Every time, they'd put me back together again, seal it up and make it look almost like nothing happened.\" He yanks up his shirt to show the scars. \"But I know what happened, it was REAL, goddammit!\" He drops the shirt, bends forward, and dry heaves for a few seconds. Wordless, he hides his face in his hands, and stops responding.", - "responses": [ { "text": "(Leave)", "topic": "TALK_DONE" } ] + "responses": [ { "text": "[Leave.]", "topic": "TALK_DONE" } ] }, { "type": "talk_topic", @@ -221,7 +221,7 @@ "speaker_effect": { "effect": { "u_add_var": "u_knows_barry_family_story", "value": "yes" } }, "responses": [ { - "text": "[PERCEPTION] Was your choice in partners part of the problem with your father?", + "text": "[PER 9] Was your choice in partners part of the problem with your father?", "topic": "TALK_ISHERWOOD_BARRY_TOWER_family3", "condition": { "u_has_perception": 9 } }, diff --git a/data/json/npcs/isherwood_farm/NPC_Carlos_Isherwood.json b/data/json/npcs/isherwood_farm/NPC_Carlos_Isherwood.json index a6cc6503e1f57..5746adb645c42 100644 --- a/data/json/npcs/isherwood_farm/NPC_Carlos_Isherwood.json +++ b/data/json/npcs/isherwood_farm/NPC_Carlos_Isherwood.json @@ -105,7 +105,7 @@ "condition": { "u_is_wearing": "badge_marshal" } }, { - "text": "…(Leave)", + "text": "…[Leave.]", "topic": "TALK_DONE", "effect": { "npc_first_topic": "TALK_ISHERWOOD_CARLOS_SawMarshal" }, "opinion": { "trust": -20, "value": -20 }, @@ -140,7 +140,10 @@ "*looks up warily as you approach", { "u_is_wearing": "badge_marshal", - "yes": ", looking at your marshal badge immediately. \"You said you'd keep that goddamn piece of tin out of my sight.\"", + "yes": { + "gendered_line": ", looking at your marshal badge immediately. \"You said you'd keep that goddamn piece of tin out of my sight.\"", + "relevant_genders": [ "u" ] + }, "no": ". \"Yeah?\"" } ] diff --git a/data/json/npcs/isherwood_farm/NPC_Chris_Isherwood.json b/data/json/npcs/isherwood_farm/NPC_Chris_Isherwood.json index 70caf55cb8a62..e89ca2387ea74 100644 --- a/data/json/npcs/isherwood_farm/NPC_Chris_Isherwood.json +++ b/data/json/npcs/isherwood_farm/NPC_Chris_Isherwood.json @@ -193,7 +193,10 @@ "no": { "u_has_var": "isherwood_chris_marshal_badge", "value": "seen", - "yes": "I see you took the badge off. Fine, then, but you'd better not let anyone here know you've got ties to the Marshals.\"", + "yes": { + "gendered_line": "I see you took the badge off. Fine, then, but you'd better not let anyone here know you've got ties to the Marshals.\"", + "relevant_genders": [ "u" ] + }, "no": "Hi, what's up?\"" } } @@ -201,7 +204,7 @@ }, "responses": [ { - "text": "…(Leave)", + "text": "…[Leave.]", "topic": "TALK_LEAVE_NOW_MARSHAL_CHRIS", "effect": { "u_add_var": "isherwood_chris_marshal_badge", "value": "seen" }, "opinion": { "trust": -5, "value": -5 }, @@ -250,7 +253,7 @@ "dynamic_line": "They made their way to this weird spire like structure, I've never seen anything like it, it glistened in the sun like something organic. I think they could be holding Barry there, I've seen them arrive and leave with other humans.", "responses": [ { - "text": "[START MISSION] I might be able to help you get Barry back, but we've got to plan this out.", + "text": "I might be able to help you get Barry back, but we've got to plan this out.", "condition": { "and": [ { "math": [ "isherwood_barry_rescued", "!=", "1" ] }, { "not": { "u_has_mission": "MISSION_ISHERWOOD_CHRIS_1" } } ] }, @@ -558,25 +561,25 @@ "dynamic_line": "*smiles slightly. \"Awesome, getting our team kitted out better will go a long way to making this possible.\"", "responses": [ { - "text": "[5 RIOT ARMOR] I've got enough riot armor for everyone.", + "text": "[5 Riot Armor] I've got enough riot armor for everyone.", "condition": { "and": [ { "u_has_item": "armor_riot" }, { "math": [ "isherwood_gear_retrival_armor_body_count", "<", "5" ] } ] }, "effect": [ { "u_consume_item": "armor_riot" }, { "math": [ "isherwood_gear_retrival_armor_body_count", "++" ] } ], "topic": "TALK_ISHERWOOD_CHRIS_RESCUE_BARRY_PLAN_Gear_Turn_Over" }, { - "text": "[5 RIOT HELMET] These crowd control helmets should help a lot.", + "text": "[5 Riot Helmet] These crowd control helmets should help a lot.", "condition": { "and": [ { "u_has_item": "helmet_riot" }, { "math": [ "isherwood_gear_retrival_helmet_count", "<", "5" ] } ] }, "effect": [ { "u_consume_item": "helmet_riot" }, { "math": [ "isherwood_gear_retrival_helmet_count", "++" ] } ], "topic": "TALK_ISHERWOOD_CHRIS_RESCUE_BARRY_PLAN_Gear_Turn_Over" }, { - "text": "[5 RIOT ARM GUARD] I hope these armguards won't interfere with people's aim.", + "text": "[5 Riot Arm Guard] I hope these armguards won't interfere with people's aim.", "condition": { "and": [ { "u_has_item": "armor_riot_arm" }, { "math": [ "isherwood_gear_retrival_armor_arm_count", "<", "5" ] } ] }, "effect": [ { "u_consume_item": "armor_riot_arm" }, { "math": [ "isherwood_gear_retrival_armor_arm_count", "++" ] } ], "topic": "TALK_ISHERWOOD_CHRIS_RESCUE_BARRY_PLAN_Gear_Turn_Over" }, { - "text": "[5 RIOT LEG GUARD] I've got these leg guards to keep people from getting hobbled.", + "text": "[5 Riot Leg Guard] I've got these leg guards to keep people from getting hobbled.", "condition": { "and": [ { "u_has_item": "armor_riot_leg" }, { "math": [ "isherwood_gear_retrival_armor_leg_count", "<", "5" ] } ] }, "effect": [ { "u_consume_item": "armor_riot_leg" }, { "math": [ "isherwood_gear_retrival_armor_leg_count", "++" ] } ], "topic": "TALK_ISHERWOOD_CHRIS_RESCUE_BARRY_PLAN_Gear_Turn_Over" @@ -616,7 +619,10 @@ { "type": "talk_topic", "id": "TALK_ISHERWOOD_CHRIS_RESCUE_BARRY_PLAN_Gear_Fail", - "dynamic_line": "*nods slowly. \"I understand. You tried. We could maybe… no, nevermind. Time is important here, we can't spend forever hoping to get everything in place if we want to get Uncle Barry back alive. Let's do it without the gear.\"", + "dynamic_line": { + "gendered_line": "*nods slowly. \"I understand. You tried. We could maybe… no, nevermind. Time is important here, we can't spend forever hoping to get everything in place if we want to get Uncle Barry back alive. Let's do it without the gear.\"", + "relevant_genders": [ "u" ] + }, "responses": [ { "text": "Sorry. Let's talk about something else.", "topic": "TALK_ISHERWOOD_CHRIS_TOPICS" }, { "text": "I'm sorry. I'm going to go take care of a few more things.", "topic": "TALK_DONE" } diff --git a/data/json/npcs/isherwood_farm/NPC_Eddie_Isherwood.json b/data/json/npcs/isherwood_farm/NPC_Eddie_Isherwood.json index 655116879d998..87908e2d55bb5 100644 --- a/data/json/npcs/isherwood_farm/NPC_Eddie_Isherwood.json +++ b/data/json/npcs/isherwood_farm/NPC_Eddie_Isherwood.json @@ -121,7 +121,7 @@ "condition": { "u_is_wearing": "badge_marshal" } }, { - "text": "…(Leave)", + "text": "…[Leave.]", "topic": "TALK_DONE", "opinion": { "trust": -20, "value": -20 }, "effect": { "npc_first_topic": "TALK_ISHERWOOD_EDDIE_SawMarshal" }, @@ -149,12 +149,12 @@ }, "responses": [ { - "text": "[SOCIAL] I swear, I'm not here to cause trouble. I just volunteer with those guys to help travellers, things like that. I don't speak for them.", + "text": "[Social 3] I swear, I'm not here to cause trouble. I just volunteer with those guys to help travellers, things like that. I don't speak for them.", "topic": "TALK_ISHERWOOD_EDDIE_MarshalOff_Convince", "condition": { "and": [ { "not": { "u_is_wearing": "badge_marshal" } }, { "math": [ "u_skill('speech')", ">=", "3" ] } ] } }, { - "text": "[SOCIAL] I took it off man, what more do you want from me?", + "text": "[Social <3] I took it off man, what more do you want from me?", "topic": "TALK_ISHERWOOD_EDDIE_MarshalOff_GoAway", "condition": { "and": [ { "not": { "u_is_wearing": "badge_marshal" } }, { "math": [ "u_skill('speech')", "<", "3" ] } ] } }, diff --git a/data/json/npcs/isherwood_farm/NPC_Lisa_Isherwood.json b/data/json/npcs/isherwood_farm/NPC_Lisa_Isherwood.json index 4c7524f0d4fa4..e130d1b268908 100644 --- a/data/json/npcs/isherwood_farm/NPC_Lisa_Isherwood.json +++ b/data/json/npcs/isherwood_farm/NPC_Lisa_Isherwood.json @@ -160,7 +160,7 @@ "type": "talk_topic", "id": "TALK_ISHERWOOD_CHRIS_NOT_TALKED_TO_LISA", "dynamic_line": "He did?\" She touches the shoulder strap on her rifle. \"Like, action? Yeah, I'm a pretty good shot, and I'd do anything to save Uncle Barry. I'm surprised Chris didn't try to go all protective older brother on me. What's the plan?\"", - "responses": [ { "text": "[Explain the plan]", "topic": "TALK_ISHERWOOD_LISA_JOIN_RESCUE" } ] + "responses": [ { "text": "[Explain the plan.]", "topic": "TALK_ISHERWOOD_LISA_JOIN_RESCUE" } ] }, { "type": "talk_topic", diff --git a/data/json/npcs/island_prison/prisoners.json b/data/json/npcs/island_prison/prisoners.json index d29a27b31582b..9017e79523c41 100644 --- a/data/json/npcs/island_prison/prisoners.json +++ b/data/json/npcs/island_prison/prisoners.json @@ -432,7 +432,7 @@ }, "responses": [ { - "text": "[Show the military ID card] You mean this stuff?", + "text": "[Show the military ID card.] You mean this stuff?", "topic": "TALK_PRISONER_LEADER_SHOW_MILITARY_ID", "condition": { "and": [ diff --git a/data/json/npcs/isolated_road/isolated_road_cody_dialogue.json b/data/json/npcs/isolated_road/isolated_road_cody_dialogue.json index 920883b9f9531..636853ec973d1 100644 --- a/data/json/npcs/isolated_road/isolated_road_cody_dialogue.json +++ b/data/json/npcs/isolated_road/isolated_road_cody_dialogue.json @@ -284,7 +284,7 @@ "speaker_effect": { "effect": [ { "u_add_var": "dialogue_artisans_blacksmith_heard_the_deal", "value": "yes" } ] }, "responses": [ { - "text": "[INT 8+] Still this is a lot of equipment. Wouldn't it have been easier to buy this stuff from a manufacturer?", + "text": "[INT 8] Still this is a lot of equipment. Wouldn't it have been easier to buy this stuff from a manufacturer?", "topic": "TALK_BLACKSMITH_SHOP_ABOUT_STUPID_QUESTION" }, { "text": "Can anyone use the workshop?", "topic": "TALK_BLACKSMITH_COOP_ABOUT" }, @@ -347,7 +347,7 @@ "type": "talk_topic", "dynamic_line": [ "Money is part of what got us into this mess in the first place." ], "responses": [ - { "text": "[PER 8+] Is that why you don't carry any cash?", "topic": "TALK_BLACKSMITH_MONEY_NO_CASH" }, + { "text": "[PER 8] Is that why you don't carry any cash?", "topic": "TALK_BLACKSMITH_MONEY_NO_CASH" }, { "text": "…", "topic": "TALK_BLACKSMITH_SERVICES" } ] }, diff --git a/data/json/npcs/lumbermill_employees/TALK_lumbermill_logger.json b/data/json/npcs/lumbermill_employees/TALK_lumbermill_logger.json index a47c41de9e6b2..6aec34653c295 100644 --- a/data/json/npcs/lumbermill_employees/TALK_lumbermill_logger.json +++ b/data/json/npcs/lumbermill_employees/TALK_lumbermill_logger.json @@ -75,8 +75,14 @@ { "npc_has_var": "exodii_mission_wh_correct", "value": "no", - "yes": ", then frowns. \"I think I'd remember something like that, no. Sorry.\"", - "no": ", looking thoughtful. \"You know, around the time things really went bad, I remember a really awful portal storm. A while later, I saw something like that in the distance. Could be what you're talking about.\"" + "yes": { + "gendered_line": ", then frowns. \"I think I'd remember something like that, no. Sorry.\"", + "relevant_genders": [ "npc" ] + }, + "no": { + "gendered_line": ", looking thoughtful. \"You know, around the time things really went bad, I remember a really awful portal storm. A while later, I saw something like that in the distance. Could be what you're talking about.\"", + "relevant_genders": [ "npc" ] + } } ] }, diff --git a/data/json/npcs/militia/GM_Militia_Merchant.json b/data/json/npcs/militia/GM_Militia_Merchant.json index 387858085ca69..0bd35f3905e78 100644 --- a/data/json/npcs/militia/GM_Militia_Merchant.json +++ b/data/json/npcs/militia/GM_Militia_Merchant.json @@ -189,7 +189,7 @@ }, { "text": "Do you have anything to trade?", "topic": "TALK_MILITIA_TRADE" }, { - "text": "Time for me to leave", + "text": "Time for me to leave.", "topic": "TALK_MILITIA_BYE", "condition": { "u_has_var": "talked_to_MILITIAMAIN", "type": "dialogue", "context": "first_meeting", "value": "yes" } } diff --git a/data/json/npcs/random_encounters/camper_van_traveler.json b/data/json/npcs/random_encounters/camper_van_traveler.json index 4f4258bf03467..d73859c5a5182 100644 --- a/data/json/npcs/random_encounters/camper_van_traveler.json +++ b/data/json/npcs/random_encounters/camper_van_traveler.json @@ -147,7 +147,10 @@ { "npc_has_var": "exodii_mission_wh_correct", "value": "no", - "yes": ", then frowns. \"I don't believe I've heard about anything like that, no. Sorry.\"", + "yes": { + "gendered_line": ", then frowns. \"I don't believe I've heard about anything like that, no. Sorry.\"", + "relevant_genders": [ "npc" ] + }, "no": ", nodding along. \"Yeah, I remember something like that a while back. Pretty memorable building, I think it's what you're looking for.\"" } ] diff --git a/data/json/npcs/random_encounters/refugee_caravans.json b/data/json/npcs/random_encounters/refugee_caravans.json index c0abc76f14d59..8b5e6ad9dbd11 100644 --- a/data/json/npcs/random_encounters/refugee_caravans.json +++ b/data/json/npcs/random_encounters/refugee_caravans.json @@ -99,7 +99,10 @@ "npc_has_var": "exodii_mission_wh_correct", "value": "no", "yes": ", then frowns. \"Nope, not ringing any bells, sorry.\"", - "no": ", looking thoughtful. \"Maybe, yeah. I saw a weird building sort of like that a while back, but we were on the move and couldn't stop to check it out.\"" + "no": { + "gendered_line": ", looking thoughtful. \"Maybe, yeah. I saw a weird building sort of like that a while back, but we were on the move and couldn't stop to check it out.\"", + "relevant_genders": [ "npc" ] + } } ] }, diff --git a/data/json/npcs/refugee_center/surface_refugees/NPC_Boris_Borichenko.json b/data/json/npcs/refugee_center/surface_refugees/NPC_Boris_Borichenko.json index d4e412d46acd1..d4ca1fcf46de9 100644 --- a/data/json/npcs/refugee_center/surface_refugees/NPC_Boris_Borichenko.json +++ b/data/json/npcs/refugee_center/surface_refugees/NPC_Boris_Borichenko.json @@ -435,12 +435,12 @@ "type": "talk_topic", "id": "TALK_REFUGEE_Boris_ReadLaptop2", "dynamic_line": [ - "[Boris boots up the laptop and opens a folder labelled 'ART'. He shows you simple digital paintings, clearly done by an adolescent. There's nothing terribly remarkable about them except the number: Ash was a prolific creator. Boris goes through several, proudly showing how his son learned little lighting tricks, or reminiscing on the time his son showed him the art. After a while, he stops commenting and just continues quietly clicking through photos. He seems different in the glow of the screen, like several years dropped away from his face, despite the deep sadness still etched there.]", - "[Boris boots up the laptop and opens a folder labelled 'STORY 1'. In it are numerous text files containing smatterings of stream-of-conscious notes, copy-and-pasted bits of fanfictions, notes about how to write a novel, and more. The story itself is a handful of poorly fleshed out chapters written with the quality level you'd expect from a grade schooler. Nonetheless it's quite impressive that there's this much stuff on a single topic. Boris talks for a while about dinner conversations for weeks that would focus on Ash's ideas for his stories. After a while, he trails off and just continues flipping through the files, reading silently.]", - "[Boris boots up the laptop and opens the videos folder. He shows you several self-made videos that follow a loose blog style, of an awkward young man talking about his favorite games, interspersed with comments about art and writing. Boris comments on little events and laughs a few times, before becoming engrossed in his reminiscence.]" + "&Boris boots up the laptop and opens a folder labelled 'ART'. He shows you simple digital paintings, clearly done by an adolescent. There's nothing terribly remarkable about them except the number: Ash was a prolific creator. Boris goes through several, proudly showing how his son learned little lighting tricks, or reminiscing on the time his son showed him the art. After a while, he stops commenting and just continues quietly clicking through photos. He seems different in the glow of the screen, like several years dropped away from his face, despite the deep sadness still etched there.", + "&Boris boots up the laptop and opens a folder labelled 'STORY 1'. In it are numerous text files containing smatterings of stream-of-conscious notes, copy-and-pasted bits of fanfictions, notes about how to write a novel, and more. The story itself is a handful of poorly fleshed out chapters written with the quality level you'd expect from a grade schooler. Nonetheless it's quite impressive that there's this much stuff on a single topic. Boris talks for a while about dinner conversations for weeks that would focus on Ash's ideas for his stories. After a while, he trails off and just continues flipping through the files, reading silently.", + "&Boris boots up the laptop and opens the videos folder. He shows you several self-made videos that follow a loose blog style, of an awkward young man talking about his favorite games, interspersed with comments about art and writing. Boris comments on little events and laughs a few times, before becoming engrossed in his reminiscence." ], "//": "I would like a specialized effect here that reduces the 'guilty about killing' morale penalty while also adding a small morale penalty of its own.", - "responses": [ { "text": "(Leave Boris alone for now)", "topic": "TALK_DONE" } ] + "responses": [ { "text": "[Leave Boris alone for now.]", "topic": "TALK_DONE" } ] }, { "type": "talk_topic", diff --git a/data/json/npcs/refugee_center/surface_refugees/NPC_Draco_Dune.json b/data/json/npcs/refugee_center/surface_refugees/NPC_Draco_Dune.json index 5626df4716629..2fa39bfa68d8f 100644 --- a/data/json/npcs/refugee_center/surface_refugees/NPC_Draco_Dune.json +++ b/data/json/npcs/refugee_center/surface_refugees/NPC_Draco_Dune.json @@ -438,37 +438,37 @@ "responses": [ { "text": "Just a sec, got something I need to do first.", "topic": "TALK_DONE" }, { - "text": "[Shuffle back and forth a little]", + "text": "[Shuffle back and forth a little.]", "topic": "TALK_REFUGEE_Draco_Dance_1", "condition": { "math": [ "u_val('dodge')", "<", "1" ] }, "switch": true }, { - "text": "[Do a little dance]", + "text": "[Do a little dance.]", "topic": "TALK_REFUGEE_Draco_Dance_2", "condition": { "math": [ "u_val('dodge')", "<", "6" ] }, "switch": true }, { - "text": "[Perform a decent dance]", + "text": "[Perform a decent dance.]", "topic": "TALK_REFUGEE_Draco_Dance_3", "condition": { "math": [ "u_val('dodge')", "<", "10" ] }, "switch": true }, { - "text": "[Perform an impressive dance]", + "text": "[Perform an impressive dance.]", "topic": "TALK_REFUGEE_Draco_Dance_4", "condition": { "math": [ "u_val('dodge')", "<", "15" ] }, "switch": true }, { - "text": "[Perform a masterful dance]", + "text": "[Perform a masterful dance.]", "topic": "TALK_REFUGEE_Draco_Dance_5", "condition": { "math": [ "u_val('dodge')", "<", "20" ] }, "switch": true }, { - "text": "[Perform a legendary dance]", + "text": "[Perform a legendary dance.]", "topic": "TALK_REFUGEE_Draco_Dance_6", "condition": { "math": [ "u_val('dodge')", ">", "20" ] }, "switch": true, diff --git a/data/json/npcs/refugee_center/surface_refugees/NPC_Jenny_Forcette.json b/data/json/npcs/refugee_center/surface_refugees/NPC_Jenny_Forcette.json index d4e529e9681ba..fecef3fa099d8 100644 --- a/data/json/npcs/refugee_center/surface_refugees/NPC_Jenny_Forcette.json +++ b/data/json/npcs/refugee_center/surface_refugees/NPC_Jenny_Forcette.json @@ -240,7 +240,7 @@ "dynamic_line": "*puts her hands on her hips and glares at you. \"I thought I made it clear I wasn't willing to accept enticing tidbits of information. What the actual fuck? Interdimensional cyborgs? I don't want to believe you, but also, I already kinda thought there might be some multidimensional hijinks going on here, so I kinda do want to believe you. They speak English though? Are you sure this isn't some kind of scam? Are you just fucking with me? Honestly this would be a great way to fuck with me.\"", "responses": [ { - "text": "(show her your bionic interface)", + "text": "[Show her your bionic interface.]", "condition": { "u_has_trait": "CBM_Interface" }, "topic": "TALK_REFUGEE_JENNY_Exodii_Proof" }, @@ -295,7 +295,7 @@ "dynamic_line": "Huh.\" She purses her lips and looks at you reluctantly. \"I guess I can teach you a bit, but you'd have to be like, my on-the-job apprentice and help me get stuff done. It'll cost you a bit depending on what you want to learn. Do you know anything about electronics, computers, or mechanics already?\"", "responses": [ { - "text": "[SKILL 2] I'm not a total noob.", + "text": "[Skill 2] I'm not a total noob.", "condition": { "or": [ { "math": [ "u_skill('computer')", ">=", "2" ] }, @@ -306,7 +306,7 @@ "topic": "TALK_REFUGEE_JENNY_Teach2" }, { - "text": "[SKILL <2] No, that's why I want you to teach me.", + "text": "[Skill <2] No, that's why I want you to teach me.", "condition": { "and": [ { "math": [ "u_skill('computer')", "<", "2" ] }, diff --git a/data/json/npcs/refugee_center/surface_refugees/NPC_Mandeep_Singh.json b/data/json/npcs/refugee_center/surface_refugees/NPC_Mandeep_Singh.json index 0f7ddf7603b0b..4116e5a158ed3 100644 --- a/data/json/npcs/refugee_center/surface_refugees/NPC_Mandeep_Singh.json +++ b/data/json/npcs/refugee_center/surface_refugees/NPC_Mandeep_Singh.json @@ -189,7 +189,7 @@ "id": "TALK_REFUGEE_Mandeep_Survival2", "dynamic_line": "*smiles, very briefly, and nods. \"Very well. The blockage had forced us to go through the woods, and our rusty old sedan was not suited to it. We must have jarred something loose, because we were not far past the trailer when there was a loud bang, and the wheels stopped turning. The engine spun and the axles rattled, but it was all sound and fury, signifying nothing. We'd moved far enough from the overturned trailer to buy time, but as we got out of the vehicle, we could hear their moans on the wind, drawing closer.\" As he dives into the story, Mandeep becomes more animated, his resonant accented voice carrying naturally over the rolling cadence of his words. \"I am no mechanic, and even if I were, there was no time for repairs. We took what we owned and carried on on foot. The center was not far, I knew, and at least Guneet and I had our kirpan, should we be forced to defend ourselves.\" He touches the handle of the sword at his side, giving you a moment to interrupt if you want.", "responses": [ - { "text": "(Say nothing)", "topic": "TALK_REFUGEE_Mandeep_Survival3" }, + { "text": "[Say nothing.]", "topic": "TALK_REFUGEE_Mandeep_Survival3" }, { "text": "I'd better get going.", "topic": "TALK_DONE" } ] }, diff --git a/data/json/npcs/refugee_center/surface_staff/NPC_free_merchant_teamster.json b/data/json/npcs/refugee_center/surface_staff/NPC_free_merchant_teamster.json index 95a5d5b998bcd..2bac0c3964fe6 100644 --- a/data/json/npcs/refugee_center/surface_staff/NPC_free_merchant_teamster.json +++ b/data/json/npcs/refugee_center/surface_staff/NPC_free_merchant_teamster.json @@ -250,8 +250,14 @@ { "npc_has_var": "exodii_mission_wh_correct", "value": "no", - "yes": ", then frowns. \"I don't believe I've heard about anything like that, no. Sorry.\"", - "no": ", looking thoughtful. \"Hmm. I'm not sure, but I've heard of an odd building that's a bit like you're describing.\"" + "yes": { + "gendered_line": ", then frowns. \"I don't believe I've heard about anything like that, no. Sorry.\"", + "relevant_genders": [ "npc" ] + }, + "no": { + "gendered_line": ", looking thoughtful. \"Hmm. I'm not sure, but I've heard of an odd building that's a bit like you're describing.\"", + "relevant_genders": [ "npc" ] + } } ] }, @@ -275,7 +281,7 @@ "dynamic_line": "Always lookin' for new places to trade. What you got for me?", "responses": [ { - "text": "[Tell them about Rubik and the Exodii]", + "text": "[Tell them about Rubik and the Exodii.]", "topic": "TALK_FREE_MERCHANT_TEAMSTER_EXODII_1", "condition": { "u_has_var": "general_meeting_u_met_Rubik", "value": "yes" } }, diff --git a/data/json/npcs/tacoma_ranch/NPC_ranch_foreman.json b/data/json/npcs/tacoma_ranch/NPC_ranch_foreman.json index 01d64e21567bd..999caf6b86e54 100644 --- a/data/json/npcs/tacoma_ranch/NPC_ranch_foreman.json +++ b/data/json/npcs/tacoma_ranch/NPC_ranch_foreman.json @@ -21,7 +21,7 @@ }, "responses": [ { - "text": "[MISSION] The merchant at the Refugee Center sent me to get a prospectus from you.", + "text": "The merchant at the Refugee Center sent me to get a prospectus from you.", "topic": "TALK_RANCH_FOREMAN_PROSPECTUS", "condition": { "and": [ { "u_has_mission": "MISSION_FREE_MERCHANTS_EVAC_3" }, { "not": { "u_has_effect": "has_prospectus" } } ] } }, diff --git a/data/json/npcs/your_followers/liam_chat.json b/data/json/npcs/your_followers/liam_chat.json index e17b013c192ad..4ba02cc5b911c 100644 --- a/data/json/npcs/your_followers/liam_chat.json +++ b/data/json/npcs/your_followers/liam_chat.json @@ -5,7 +5,7 @@ "dynamic_line": "Any time, what's on your mind?", "responses": [ { "text": "I'd like your opinion on a job we're doing.", "topic": "TALK_Liam_Opinions" }, - { "text": "(Raise your hand for a high-five)", "topic": "TALK_Liam_HighFive" }, + { "text": "[Raise your hand for a high-five.]", "topic": "TALK_Liam_HighFive" }, { "text": "Can I ask you a bit about yourself?", "topic": "BGSS_Liam1" }, { "text": "You picked up a lot of useful skills over the years, hey.", "topic": "BGSS_Liam_Expertise" }, { @@ -38,8 +38,8 @@ "*pretends to fake you out for a moment, then grins and returns the high five" ], "responses": [ - { "text": "(Nod and continue talking)", "topic": "TALK_NONE" }, - { "text": "(Nod and head on out)", "topic": "TALK_DONE" } + { "text": "[Nod and continue talking.]", "topic": "TALK_NONE" }, + { "text": "[Nod and head on out.]", "topic": "TALK_DONE" } ] }, { @@ -92,7 +92,7 @@ "no": "Aww, of course. No matter what happens, you're always you and I'm always me, right? We've been through worse than this.\" He pauses, his brow furrowed. \"Well, okay, maybe we haven't. But we've stuck through it all for so many years, what's a little apocalypse gonna change? Or a little mutation, or grievous bodily harm, or zombies, or interdimensional monster attacks and serious life-altering PTSD, or whatever. Who cares. You're my family, more than my birth family ever was.", "yes": "" }, - "responses": [ { "text": "(Continue chatting)", "topic": "TALK_DONE" } ] + "responses": [ { "text": "[Continue chatting.]", "topic": "TALK_DONE" } ] }, { "type": "talk_topic", @@ -102,7 +102,7 @@ "Well, I mean, there's the obvious stuff like, uh, video streaming,\" he winks at you, \"but I think lately I'm missing Wikipedia. I have all these random questions about things, and I can't answer them. I feel like I'm living in a box. How did we survive for thousands of years like this?", "Online restaurant reviews.\" He stares at you without a shred of irony. \"I'm serious, I used to love browsing looking for the funniest or weirdest reviews. I guess I could broaden it, I miss pointless doom scrolling. It's harder to find things to keep my mind off things now, and I've got more I wish I could keep my mind off. What about you?" ], - "responses": [ { "text": "(Continue chatting)", "topic": "TALK_DONE" } ] + "responses": [ { "text": "[Continue chatting.]", "topic": "TALK_DONE" } ] }, { "type": "talk_topic", @@ -111,7 +111,7 @@ "*laughs. \"You know me, I was never high on the ambition front. Honestly, if you weren't around I'd probably clean up my dad's old cabin, try to learn how to set up a power supply, and scavenge for parts until I'd built the best damn gaming rig the world will ever see. Then I'd load up whatever games I could find.\" He pauses. \"Or maybe it'd be easier to set up a console, I dunno. Most consoles aren't gonna like the no-internet thing right? There's probably a way to crack 'em but without the internet where would we even check?\" He rubs his chin. \"Still. I'd have maybe found a way. How about you, what's the big overarching plan for all this?\"", "Oh, well. I don't really think of life that way, you know? I guess I'm pretty happy to just hang out with you, doing the shit we're doing, seeing what life brings. Still, I guess I could see settling down somewhere nice, somewhere quiet, somewhere zombie-free. I bet it wouldn't take long to get enough food and supplies to live on forever, and then I'd just let myself turn into some kinda wild bush man, with a big crazy long beard. I'd smell like weed and B.O. and I'd have this giant stack of books to read. Other survivors would come find me, like a guru on a mountaintop, to ask me questions about Batman. In time, as the old world was forgotten, I'd convince them that he was a real person.\" He grins. \"How 'bout you?" ], - "responses": [ { "text": "(Continue chatting)", "topic": "TALK_DONE" } ] + "responses": [ { "text": "[Continue chatting.]", "topic": "TALK_DONE" } ] }, { "type": "talk_topic", @@ -120,7 +120,7 @@ "Oh dude, good question. The news reports made it sound like this is everywhere, you know? Still, somewhere out there's gotta be better than this, right? Maybe like, up in the Yukon or Siberia or something it's all kinda normal? I think most places are like this though, just one big fucked up mess. Maybe they've got different monsters though, like, carnivorous rocks or some shit. How 'bout you, what do you think is out there?", "See, I like that about you. Here we are just trying to keep alive and you're thinking all these big thoughts about the rest of the world. I got no clue how they're doing out there, so I'm just gonna imagine that things are kinda like here, but maybe a bit better. There's a few places where folks have settled in and they're figuring stuff out. Those folks are gonna last a long time, maybe they're how we start rebuilding." ], - "responses": [ { "text": "(Continue chatting)", "topic": "TALK_DONE" } ] + "responses": [ { "text": "[Continue chatting.]", "topic": "TALK_DONE" } ] }, { "type": "talk_topic", @@ -131,7 +131,7 @@ "You know, my friend, I could really go for an egg salad sandwich right now. Nice, fresh eggs, some cheap-ass white bread, bit of pickle on there, hint of mustard. Egg salad gets a bad rap because it sucks if you get it from the store, but you make a good homemade one? That's something else, I tell you. What's your poison?", "You know, I'm kinda in the mood for some pub nachos right now. The whole pub ambience would be good too, but I like how they'd put 'em on wax paper that'd be so soaked with cheese grease you could see right through it. Those little black olive wheels that tasted like rubber, they were only ever good with pub nachos, you know? Any other time, garbage. I'd love to have a big tray of pub nachos, go to a karaoke night, and just sing fuckin' Abba songs until my throat hurt. You in?" ], - "responses": [ { "text": "(Continue chatting)", "topic": "TALK_DONE" } ] + "responses": [ { "text": "[Continue chatting.]", "topic": "TALK_DONE" } ] }, { "type": "talk_topic", diff --git a/data/mods/Xedra_Evolved/npc/xe_liam_chat.json b/data/mods/Xedra_Evolved/npc/xe_liam_chat.json index 60cc5f1fb7c96..544ce24409318 100644 --- a/data/mods/Xedra_Evolved/npc/xe_liam_chat.json +++ b/data/mods/Xedra_Evolved/npc/xe_liam_chat.json @@ -32,7 +32,7 @@ "I still can't decide if our leaders thought Canada was a threat or what? Why else did they militarize the border patrol up here just as bad it had been on the southern border for decades?", "I remember talking to a friend coming back from Vegas a few years back and he mentioned Border Patrol had those big armored Bear Cub vehicles with a roadblock going into one of the canyons outside of Vegas. Hundreds of miles from any border. Weird stuff man, I wonder if it's all connected?" ], - "responses": [ { "text": "(Continue chatting)", "topic": "TALK_DONE" } ] + "responses": [ { "text": "[Continue chatting.]", "topic": "TALK_DONE" } ] }, { "type": "talk_topic",