Skip to content

Commit

Permalink
Snippets in dialogs, part 3/3 (#76133)
Browse files Browse the repository at this point in the history 
* Replace snippets p9

* Replace snippets p10

* Replace snippets p11

* Replace snippets p12

* snippet fix
  • Loading branch information
@Uwuewsky
Uwuewsky authored Oct 24, 2024
1 parent a59aed1 commit c9ee15e
Show file tree
Hide file tree
Showing 41 changed files with 579 additions and 567 deletions.
4 changes: 2 additions & 2 deletions data/json/npcs/godco/members/NPC_Arturo_Maldonado.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@
"topic": "TALK_DONE"
},
{
"text": "Nice talking to you, but I gotta go.",
"text": "<end_talking_leave>",
"condition": {
"and": [
{ "math": [ "n_npc_anger()", "<", "5" ] },
Expand All @@ -131,7 +131,7 @@
},
"responses": [
{ "text": "It's alright, just take your time.", "topic": "TALK_DONE" },
{ "text": "Sorry, I gotta go.", "topic": "TALK_DONE" }
{ "text": "<end_talking_leave>", "topic": "TALK_DONE" }
]
},
{
Expand Down
24 changes: 12 additions & 12 deletions data/json/npcs/godco/members/NPC_Aunt_Theresa.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@
"topic": "TALK_GODCO_Theresa_Anger"
},
{
"text": "I'm afraid I can't talk right now.",
"text": "<end_talking_leave>",
"condition": {
"and": [
{ "math": [ "n_npc_anger()", "<", "5" ] },
Expand Down Expand Up @@ -114,7 +114,7 @@
"type": "talk_topic",
"id": "TALK_GODCO_Theresa_Firstmeet",
"dynamic_line": "It is nice to meet you as well. I reckon you got some questions about our group.",
"responses": [ { "text": "Actually I'm just heading out.", "topic": "TALK_DONE" } ]
"responses": [ { "text": "<end_talking_leave>", "topic": "TALK_DONE" } ]
},
{
"type": "talk_topic",
Expand Down Expand Up @@ -157,7 +157,7 @@
"effect": [ { "u_spawn_item": "quilt" } ],
"topic": "TALK_GODCO_Theresa_Knit_Done"
},
{ "text": "Well, it's been nice talking to you, but I need to head out.", "topic": "TALK_DONE" }
{ "text": "<end_talking_leave>", "topic": "TALK_DONE" }
]
},
{
Expand All @@ -166,7 +166,7 @@
"dynamic_line": "We're doing better than most, to put it mildly. There's a reason for that, as for everything. Say, have I told you about my husband? I'm sorry if I already have, my memory's not what it used to be.",
"responses": [
{ "text": "Tell me about your husband.", "topic": "TALK_GODCO_Theresa_Husband" },
{ "text": "Well, it's been nice talking to you, but I need to head out.", "topic": "TALK_DONE" }
{ "text": "<end_talking_leave>", "topic": "TALK_DONE" }
]
},
{
Expand All @@ -176,7 +176,7 @@
"responses": [
{ "text": "So, he founded the community?", "topic": "TALK_GODCO_Theresa_Community" },
{ "text": "Tell me about his visions.", "topic": "TALK_GODCO_Theresa_Vision" },
{ "text": "Well, it's been nice talking to you, but I need to head out.", "topic": "TALK_DONE" }
{ "text": "<end_talking_leave>", "topic": "TALK_DONE" }
]
},
{
Expand All @@ -185,7 +185,7 @@
"dynamic_line": "That's right. He wanted something to return for the guidance he received when he was at the lowest point of his life. He created a charity group which, over the years, became what's now known as the New England Church Community. He lead them for many decades, until his death a few years before his prophecy was fulfilled. Now, our niece Helena leads the community.",
"responses": [
{ "text": "Tell me about his visions.", "topic": "TALK_GODCO_Theresa_Vision" },
{ "text": "Well, it's been nice talking to you, but I need to head out.", "topic": "TALK_DONE" }
{ "text": "<end_talking_leave>", "topic": "TALK_DONE" }
]
},
{
Expand All @@ -194,28 +194,28 @@
"dynamic_line": "He was a man of many secrets. It would've been too personal to share, I'm afraid. On the other hand, there was a prophecy he was quite vocal about. In a way, he predicted <the_cataclysm> long before the first warning signs appeared. Thanks to him, we had the foresight to prepare. Oh what a great man he was…",
"responses": [
{ "text": "So, he founded the community?", "topic": "TALK_GODCO_Theresa_Community" },
{ "text": "Well, it's been nice talking to you, but I need to head out.", "topic": "TALK_DONE" }
{ "text": "<end_talking_leave>", "topic": "TALK_DONE" }
]
},
{
"type": "talk_topic",
"id": "TALK_GODCO_Theresa_Story",
"dynamic_line": "Oh you don't have the time for that, do you now? It's a long, long tale, thank goodness. I'm grateful, for I was blessed with a full life.",
"responses": [ { "text": "Well, it's been nice talking to you, but I need to head out.", "topic": "TALK_DONE" } ]
"responses": [ { "text": "<end_talking_leave>", "topic": "TALK_DONE" } ]
},
{
"type": "talk_topic",
"id": "TALK_GODCO_Theresa_Help",
"dynamic_line": "That's very sweet of you <granny_name_g>, but there's nothing I could possibly want from this mortal world. My life is now complete, I believe.",
"responses": [ { "text": "Well, it's been nice talking to you, but I need to head out.", "topic": "TALK_DONE" } ]
"responses": [ { "text": "<end_talking_leave>", "topic": "TALK_DONE" } ]
},
{
"type": "talk_topic",
"id": "TALK_GODCO_Theresa_Knit",
"dynamic_line": "Yes, I knit and sew in my spare time. Its' helped keep my hands in good shape over the years.",
"responses": [
{ "text": "Could you make something for me?", "topic": "TALK_GODCO_Theresa_Knit_Something" },
{ "text": "Well, it's been nice talking to you, but I need to head out.", "topic": "TALK_DONE" }
{ "text": "<end_talking_leave>", "topic": "TALK_DONE" }
]
},
{
Expand Down Expand Up @@ -255,7 +255,7 @@
},
{ "text": "How long does it take you to make these?", "topic": "TALK_GODCO_Theresa_Knit_Time" },
{ "text": "I've changed my mind. How're you feeling?", "topic": "TALK_GODCO_Theresa_2" },
{ "text": "I've changed my mind, I have to leave.", "topic": "TALK_DONE" }
{ "text": "<end_talking_nevermind> <end_talking_later>", "topic": "TALK_DONE" }
]
},
{
Expand All @@ -276,7 +276,7 @@
"dynamic_line": "I've grown tired, <granny_name_g>. I haven't left here since we came, and things outside are getting worse each day. All my old aches and pains have come back too; I can't see too good, and my muscles are always sore. I don't like where my niece is going either; she's ever more fanatical, and taking my dear husband's prophecy to the extreme. I'm content with my life, though. I've lived long and prospered by the grace of the Lord.",
"responses": [
{ "text": "Is there anything I can do to help?", "topic": "TALK_MISSION_LIST" },
{ "text": "Well, it's been nice talking to you, but I need to head out.", "topic": "TALK_DONE" }
{ "text": "<end_talking_leave>", "topic": "TALK_DONE" }
]
},
{
Expand Down
11 changes: 7 additions & 4 deletions data/json/npcs/godco/members/NPC_Chloe_Taylor_King.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"effect": { "npc_add_var": "general_meeting_u_met_chloe", "value": "yes" }
},
{
"text": "Hi. I can't stay and chat right now.",
"text": "Hi. <end_talking_leave>",
"topic": "TALK_DONE",
"condition": {
"and": [
Expand Down Expand Up @@ -135,14 +135,17 @@
},
{ "text": "Aren't you a bit young to be carrying a knife?", "topic": "TALK_GODCO_chloe_knife" },
{ "text": "On second though, let's talk about something else.", "topic": "TALK_GODCO_chloe" },
{ "text": "I gotta go.", "topic": "TALK_DONE" }
{ "text": "<end_talking_leave>", "topic": "TALK_DONE" }
]
},
{
"id": "TALK_GODCO_chloe_2",
"type": "talk_topic",
"dynamic_line": "Things suck right now, but you know that anyway. I don't even know why you bother asking these stupid questions.",
"responses": [ { "text": "What's your story?", "topic": "TALK_GODCO_chloe_past" }, { "text": "I gotta go.", "topic": "TALK_DONE" } ]
"responses": [
{ "text": "What's your story?", "topic": "TALK_GODCO_chloe_past" },
{ "text": "<end_talking_leave>", "topic": "TALK_DONE" }
]
},
{
"id": "TALK_GODCO_chloe_help",
Expand All @@ -162,7 +165,7 @@
},
"speaker_effect": [ { "effect": { "npc_add_var": "told_backstory_second_attempt", "value": "yes" } } ],
"responses": [
{ "text": "I'm sorry for your loss. Maybe we should talk about something else.", "topic": "TALK_GODCO_chloe" },
{ "text": "I'm sorry for your loss. <done_conversation_section>", "topic": "TALK_GODCO_chloe" },
{ "text": "Yeah, that's enough for me.", "topic": "TALK_DONE" }
]
},
Expand Down
30 changes: 15 additions & 15 deletions data/json/npcs/godco/members/NPC_Corrie_Kaja_Dosia.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@
"topic": "TALK_GODCO_Corrie_Angry"
},
{
"text": "Hey Corrie. I gotta go.",
"text": "Hey Corrie. <end_talking_leave>",
"condition": { "compare_string": [ "yes", { "npc_val": "general_meeting_u_met_godco_corrie" } ] },
"topic": "TALK_DONE"
}
Expand Down Expand Up @@ -134,24 +134,24 @@
"type": "talk_topic",
"id": "TALK_GODCO_Corrie_2",
"dynamic_line": [ "Sure. I can clear a few minutes of my oh-so hectic schedule." ],
"responses": [ { "text": "Sorry Corrie, I can't stay to chat.", "topic": "TALK_DONE" } ]
"responses": [ { "text": "Sorry Corrie. <end_talking_leave>", "topic": "TALK_DONE" } ]
},
{
"type": "talk_topic",
"id": "TALK_GODCO_Corrie_Story",
"dynamic_line": "&Corrie blankly stares at the wall for a moment. \"Me and my friends were in the cities when it hit, I was the only one to make it out. Some gigantic horror… devoured… everything in its way. There was a memorial service and all, organized by the church-goers. By far the nicest thing they've done for me.\"",
"responses": [
{ "text": "Sorry for bringing it up. What were you saying before?", "topic": "TALK_NONE" },
{ "text": "Sorry for bringing it up. Well, bye.", "topic": "TALK_DONE" }
{ "text": "Sorry for bringing it up. <done_conversation_section>", "topic": "TALK_NONE" },
{ "text": "Sorry for bringing it up. <end_talking_bye>", "topic": "TALK_DONE" }
]
},
{
"type": "talk_topic",
"id": "TALK_GODCO_Corrie_Community",
"dynamic_line": "Like second-class citizens, that's how they treat us.",
"responses": [
{ "text": "What were you saying before?", "topic": "TALK_NONE" },
{ "text": "I'd better get going.", "topic": "TALK_DONE" }
{ "text": "<done_conversation_section>", "topic": "TALK_NONE" },
{ "text": "<end_talking_leave>", "topic": "TALK_DONE" }
]
},
{
Expand Down Expand Up @@ -179,7 +179,7 @@
]
}
},
{ "text": "What were you saying before?", "topic": "TALK_NONE" },
{ "text": "<done_conversation_section>", "topic": "TALK_NONE" },
{ "text": "No rest for the weary…", "topic": "TALK_DONE" }
]
},
Expand All @@ -189,7 +189,7 @@
"dynamic_line": "Not much. I told you not to go for the icons.",
"responses": [
{
"text": "Sorry to hear that. What were you saying before?",
"text": "Sorry to hear that. <done_conversation_section>",
"effect": [
{ "npc_add_var": "mission_completed_godco_corrie_machine", "value": "yes" },
{ "u_add_var": "mission_completed_godco_corrie_machine", "value": "yes" },
Expand Down Expand Up @@ -233,7 +233,7 @@
]
},
{
"text": "Glad to help. What were you saying before?",
"text": "Glad to help. <done_conversation_section>",
"topic": "TALK_NONE",
"effect": [ { "u_add_var": "mission_completed_godco_corrie_machine", "value": "yes" } ]
},
Expand All @@ -250,8 +250,8 @@
"dynamic_line": "Oh, I completely forget. Here you are.",
"speaker_effect": { "effect": [ { "u_spawn_item": "jerky", "count": 5 } ] },
"responses": [
{ "text": "What were you saying before?", "topic": "TALK_NONE" },
{ "text": "I'd better get going.", "topic": "TALK_DONE" }
{ "text": "<done_conversation_section>", "topic": "TALK_NONE" },
{ "text": "<end_talking_leave>", "topic": "TALK_DONE" }
]
},
{
Expand All @@ -260,22 +260,22 @@
"dynamic_line": "Basic repairs and upkeep, mostly. The generator in the basement is on its last legs, so I've been thinking about building a solar array for this place. Helena's against it, but I want to change her mind. All I need are a few spare parts.",
"responses": [
{ "text": "I can help you get the items you need.", "topic": "TALK_MISSION_LIST" },
{ "text": "What were you saying before?", "topic": "TALK_NONE" },
{ "text": "I'd better get going.", "topic": "TALK_DONE" }
{ "text": "<done_conversation_section>", "topic": "TALK_NONE" },
{ "text": "<end_talking_leave>", "topic": "TALK_DONE" }
]
},
{
"type": "talk_topic",
"id": "TALK_GODCO_Corrie_Recruit",
"dynamic_line": "Sure, I'll come. I hate staying here, and you've gone out of your way to help me. I appreciate that, <name_g>.",
"responses": [ { "text": "Let's hit the road.", "topic": "TALK_DONE", "effect": "follow" } ]
"responses": [ { "text": "<lets_go>", "topic": "TALK_DONE", "effect": "follow" } ]
},
{
"type": "talk_topic",
"id": "TALK_GODCO_Corrie_You_Mutant",
"dynamic_line": "Nearly everyone here went to a church that was a bit… out there, shall we say. They hate what they call \"mutants\", how some creatures and people have physically changed inexplicably after everything went to shit. I'm glad they didn't kill you on the spot, not many people are left out there.",
"responses": [
{ "text": "Well, thank's for telling me. Let's talk about something else.", "topic": "TALK_GODCO_Corrie_2" },
{ "text": "Well, thank's for telling me. <done_conversation_section>", "topic": "TALK_GODCO_Corrie_2" },
{ "text": "Wow. This place is <swear> crazy, I'm outta here.", "topic": "TALK_DONE" }
]
},
Expand Down
22 changes: 11 additions & 11 deletions data/json/npcs/godco/members/NPC_Darryl_Johnstone.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@
"topic": "TALK_GODCO_Darryl_Trade_Eggs"
},
{
"text": "I'm afraid I can't talk right now.",
"text": "<end_talking_leave>",
"condition": {
"and": [
{ "math": [ "n_npc_anger()", "<", "5" ] },
Expand Down Expand Up @@ -176,16 +176,16 @@
"topic": "TALK_GODCO_Darryl_Trade_Eggs"
},
{ "text": "Do you have any family?", "topic": "TALK_GODCO_Darryl_Wife" },
{ "text": "Actually I'm just heading out.", "topic": "TALK_DONE" }
{ "text": "<end_talking_leave>", "topic": "TALK_DONE" }
]
},
{
"type": "talk_topic",
"id": "TALK_GODCO_Darryl_Mood",
"dynamic_line": "This uncertainty is eating me inside, to be frank with you. I'm a simple man: I tend my farm, I scare off vermin, but even I can see somethin' ain't right here. I've talked to my wife, I had a word with Damien, they told me to have more faith in God. It's the last sliver of hope I have left, and I was told that's enough.",
"responses": [
{ "text": "What were you saying before?", "topic": "TALK_NONE" },
{ "text": "I'd better get going.", "topic": "TALK_DONE" }
{ "text": "<done_conversation_section>", "topic": "TALK_NONE" },
{ "text": "<end_talking_leave>", "topic": "TALK_DONE" }
]
},
{
Expand All @@ -194,7 +194,7 @@
"dynamic_line": "Well, I'd rather not get into my life before all this. I have a farm to maintain, after all. Would be nice, sharing our tales while sipping cold brew beer. Not at a time like this. Now if you'll excuse me, I'll be back to work.",
"responses": [
{ "text": "Is there anything I can do to help you out?", "topic": "TALK_MISSION_LIST" },
{ "text": "What were you saying before?", "topic": "TALK_NONE" },
{ "text": "<done_conversation_section>", "topic": "TALK_NONE" },
{ "text": "I'll leave you to it.", "topic": "TALK_DONE" }
]
},
Expand All @@ -204,7 +204,7 @@
"dynamic_line": "Took us three days and four hard-working hands to clear this humble little land. It's a far-cry from my old garden, it really is. I heard theories, from Tom of course, that really messed with my head. You can never know what's in one of them toxic clouds, can ya? I suspect goo-puker blood. That putrid oil is a sure way to make any soil infertile, or so that nitwit says. Here I go again, ramblin' once more. One of my bad habits.",
"responses": [
{ "text": "Is there anything I can do to help you out?", "topic": "TALK_MISSION_LIST" },
{ "text": "What were you saying before?", "topic": "TALK_NONE" },
{ "text": "<done_conversation_section>", "topic": "TALK_NONE" },
{ "text": "I'll leave you to it.", "topic": "TALK_DONE" }
]
},
Expand All @@ -214,8 +214,8 @@
"dynamic_line": "Huh, never would have thought you were interested in the fine art of farming. Sure, I've got seeds I can say goodbye to… if you have the appropriate money of course.",
"responses": [
{ "text": "Let's trade, then.", "topic": "TALK_GODCO_Darryl_Trade2" },
{ "text": "You know what? Nevermind. What were you saying before?", "topic": "TALK_NONE" },
{ "text": "Actually, I had better go.", "topic": "TALK_DONE" }
{ "text": "<end_talking_nevermind> <done_conversation_section>", "topic": "TALK_NONE" },
{ "text": "<end_talking_leave>", "topic": "TALK_DONE" }
]
},
{
Expand All @@ -229,7 +229,7 @@
"condition": { "u_has_items": { "item": "icon", "count": 7 } },
"effect": [ { "u_sell_item": "icon", "count": 7 }, { "u_spawn_item": "egg_chicken", "count": 12 } ]
},
{ "text": "That's a bit rich for my blood. I'd better go.", "topic": "TALK_DONE" }
{ "text": "That's a bit rich for my blood. <end_talking_leave>", "topic": "TALK_DONE" }
]
},
{
Expand Down Expand Up @@ -304,7 +304,7 @@
},
"failure": { "topic": "TALK_GODCO_Darryl_BarterFail", "opinion": { "trust": -6 } }
},
{ "text": "That's a bit rich for my blood. I had better go.", "topic": "TALK_DONE" }
{ "text": "That's a bit rich for my blood. <end_talking_leave>", "topic": "TALK_DONE" }
]
},
{
Expand Down Expand Up @@ -336,7 +336,7 @@
"id": "TALK_GODCO_Darryl_Mom&Dad",
"dynamic_line": "Oh, they passed a long time ago. Wish they could've seen Gemma and I marry…",
"responses": [
{ "text": "What were you saying before?", "topic": "TALK_NONE" },
{ "text": "<done_conversation_section>", "topic": "TALK_NONE" },
{ "text": "I'm sorry for your loss.", "topic": "TALK_DONE" }
]
},
Expand Down
8 changes: 4 additions & 4 deletions data/json/npcs/godco/members/NPC_Father_Greenwood.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@
"topic": "TALK_GODCO_Greenwood_Angry",
"condition": { "math": [ "n_npc_anger()", ">=", "8" ] }
},
{ "text": "I'm afraid I can't talk right now.", "topic": "TALK_DONE" }
{ "text": "<end_talking_leave>", "topic": "TALK_DONE" }
]
},
{
Expand All @@ -119,7 +119,7 @@
"dynamic_line": "What can I do for you?",
"responses": [
{ "text": "Where am I?", "topic": "TALK_GODCO_Greenwood_Where" },
{ "text": "Actually, I'm just heading out.", "topic": "TALK_DONE" }
{ "text": "<end_talking_leave>", "topic": "TALK_DONE" }
]
},
{
Expand All @@ -135,7 +135,7 @@
},
{ "text": "Could you tell me a bit about this church?", "topic": "TALK_GODCO_Greenwood_NECC" },
{ "text": "I'm looking for work. Can I do anything for your congregation?", "topic": "TALK_MISSION_LIST" },
{ "text": "Actually I'm just heading out.", "topic": "TALK_DONE" }
{ "text": "<end_talking_leave>", "topic": "TALK_DONE" }
]
},
{
Expand Down Expand Up @@ -195,7 +195,7 @@
"id": "TALK_GODCO_Greenwood_You_Mutant",
"dynamic_line": "Well, it's your appearance. You're… how do I say, significantly different than what most people are used to. With the sudden appearance of strange phenomenon following the Rapture, some have taken your changes as a mark of demonic corruption, and won't be very kind to you either. Be wary of this.",
"responses": [
{ "text": "Alright. Let's talk about something else.", "topic": "TALK_GODCO_Greenwood_2" },
{ "text": "Alright. <done_conversation_section>", "topic": "TALK_GODCO_Greenwood_2" },
{ "text": "Thanks for the info, I'd best be going then.", "topic": "TALK_DONE" }
]
},
Expand Down
Loading

0 comments on commit c9ee15e

Please sign in to comment.