Merge pull request #74518 from Uwuewsky/fix-dialogue

Dialogue fix/Gend-line

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 } ]
       },

data/json/npcs/exodii/exodii_Luliya.json

@@ -87,7 +87,7 @@
         }
       },
       {
-        "text": "[You point to your chest]  <u_name>.  [You point at the golden figure]  What is your name?",
+        "text": "[You point to your chest.]  <u_name>.  [You point at the golden figure.]  What is your name?",
         "topic": "TALK_LULIYA_NAME",
         "condition": {
           "and": [

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",

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" }

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 }
       },

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?\""
         }
       ]

data/json/npcs/isherwood_farm/NPC_Chris_Isherwood.json

@@ -193,15 +193,18 @@
           "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?\""
           }
         }
       ]
     },
     "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" }

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": "<color_green>[SOCIAL]</color> 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": "<color_green>[Social 3]</color> 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": "<color_yellow>[SOCIAL]</color> I took it off man, what more do you want from me?",
+        "text": "<color_yellow>[Social <3]</color> 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" ] } ] }
       },

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",

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": [

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" }
     ]
   },

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" ]
+          }
         }
       ]
     },

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.\""
         }
       ]

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" ]
+          }
         }
       ]
     },