Skip to content

Commit

Permalink
Replace snippets p8
Browse files Browse the repository at this point in the history
  • Loading branch information
@Uwuewsky
Uwuewsky committed Sep 23, 2024
1 parent 64b8a84 commit c80de55
Show file tree
Hide file tree
Showing 9 changed files with 191 additions and 191 deletions.
18 changes: 9 additions & 9 deletions data/json/npcs/isherwood_farm/NPC_Barry_Isherwood.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
"condition": { "u_has_mission": "MISSION_ISHERWOOD_CHRIS_1" }
},
{
"text": "I'll get you out of here, just stay calm. Let's hit the road.",
"text": "I'll get you out of here, just stay calm. <lets_go>",
"topic": "TALK_ISHERWOOD_BARRY_Escaping",
"condition": { "not": { "u_has_mission": "MISSION_ISHERWOOD_CHRIS_1" } }
},
Expand Down Expand Up @@ -239,7 +239,7 @@
"dynamic_line": "\"Oh, so my family didn't send you then.\" Barry looks downtrodden for a brief moment. \"Look, we just need to get out of here first, I'll tell you about it later.\"",
"responses": [
{
"text": "Okay, sounds good to me. Let's go.",
"text": "Okay, sounds good to me. <lets_go>",
"topic": "TALK_DONE",
"effect": [
"follow_only",
Expand Down Expand Up @@ -359,7 +359,7 @@
}
},
{
"text": "I'd better get going.",
"text": "<end_talking_leave>",
"topic": "TALK_DONE",
"condition": {
"and": [
Expand All @@ -371,7 +371,7 @@
}
},
{
"text": "Alright, let's get going.",
"text": "<lets_go>",
"topic": "TALK_DONE",
"condition": {
"or": [
Expand Down Expand Up @@ -440,7 +440,7 @@
"dynamic_line": "*laughs. \"It was terrible timing, but I have to admit, you don't see many situations that perfect for that reference. Sorry I didn't get it at the time.\"",
"responses": [
{ "text": "Can I ask you some questions?", "topic": "TALK_ISHERWOOD_BARRY_askback" },
{ "text": "Well, I should head out.", "topic": "TALK_DONE" }
{ "text": "<end_talking_leave>", "topic": "TALK_DONE" }
]
},
{
Expand Down Expand Up @@ -506,7 +506,7 @@
"text": "Thanks for taking the time to talk to me. I had some other questions.",
"topic": "TALK_ISHERWOOD_BARRY_askback"
},
{ "text": "Thanks for the story, I'm going to head out.", "topic": "TALK_DONE" }
{ "text": "Thanks for the story. <end_talking_leave>", "topic": "TALK_DONE" }
]
},
{
Expand All @@ -519,7 +519,7 @@
"text": "Thanks for taking the time to talk to me. I had some other questions.",
"topic": "TALK_ISHERWOOD_BARRY_askback"
},
{ "text": "Thanks for the story, I'm going to head out.", "topic": "TALK_DONE" }
{ "text": "Thanks for the story. <end_talking_leave>", "topic": "TALK_DONE" }
]
},
{
Expand All @@ -533,12 +533,12 @@
"responses": [
{ "text": "Can you give me some directions to it?", "topic": "TALK_ISHERWOOD_BARRY_TOWER_farm_directions" },
{
"text": "That's pretty cool. I'd like to ask you about something else.",
"text": "That's pretty cool. <done_conversation_section>",
"topic": "TALK_ISHERWOOD_BARRY_askback",
"effect": { "u_add_var": "u_thinking_about_farm", "type": "general", "context": "knowledge", "value": "yes" }
},
{
"text": "I'm going to head out.",
"text": "<end_talking_leave>",
"topic": "TALK_DONE",
"effect": { "u_add_var": "u_thinking_about_farm", "type": "general", "context": "knowledge", "value": "yes" }
}
Expand Down
50 changes: 25 additions & 25 deletions data/json/npcs/isherwood_farm/NPC_Carlos_Isherwood.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
"condition": { "not": { "u_is_wearing": "badge_marshal" } }
},
{
"text": "I'd better get going.",
"text": "<end_talking_leave>",
"topic": "TALK_DONE",
"condition": { "not": { "u_is_wearing": "badge_marshal" } }
}
Expand All @@ -95,7 +95,7 @@
"yes": ", and then puts his hand on the butt of the rifle slung across his back. \"I see that badge, I think you need to keep on walking, straight off this property.\"",
"no": {
"u_male": true,
"yes": ", then smiles distantly. \"Hello Sir, what brings you here?",
"yes": ", then smiles distantly. \"Hello Sir, what brings you here?\"",
"no": ", then smiles distantly. \"Hello Ma'am, what brings you here?\""
}
}
Expand Down Expand Up @@ -137,7 +137,7 @@
]
}
},
{ "text": "…(Leave)", "topic": "TALK_DONE" }
{ "text": "…[Leave.]", "topic": "TALK_DONE" }
]
},
{
Expand All @@ -158,7 +158,7 @@
},
"responses": [
{
"text": "Oh, right… (Leave)",
"text": "Oh, right… [Leave.]",
"topic": "TALK_DONE",
"opinion": { "trust": -10, "value": -10 },
"condition": { "u_is_wearing": "badge_marshal" }
Expand All @@ -181,8 +181,8 @@
]
}
},
{ "text": "Let's talk about something else.", "topic": "TALK_ISHERWOOD_CARLOS_TOPICS" },
{ "text": "I'd better get going.", "topic": "TALK_DONE" }
{ "text": "<done_conversation_section>", "topic": "TALK_ISHERWOOD_CARLOS_TOPICS" },
{ "text": "<end_talking_leave>", "topic": "TALK_DONE" }
]
},
{
Expand All @@ -201,8 +201,8 @@
]
}
},
{ "text": "Let's talk about something else.", "topic": "TALK_ISHERWOOD_CARLOS_TOPICS" },
{ "text": "I'd better get going.", "topic": "TALK_DONE" }
{ "text": "<done_conversation_section>", "topic": "TALK_ISHERWOOD_CARLOS_TOPICS" },
{ "text": "<end_talking_leave>", "topic": "TALK_DONE" }
]
},
{
Expand All @@ -211,8 +211,8 @@
"dynamic_line": "It was pink and really fast, it had lots of limbs, definitely not human.\" Carlos rubs the back of his hand idly, staring into space. \"It easily kept up with us when we tried to escape, horrifying stuff. Barry just dropped to the ground, and the thing swept him away.",
"responses": [
{ "text": "You all just gonna leave him out there to his fate?", "topic": "TALK_CARLOS_BARRY2" },
{ "text": "Let's talk about something else.", "topic": "TALK_ISHERWOOD_CARLOS_TOPICS" },
{ "text": "I'd better get going.", "topic": "TALK_DONE" }
{ "text": "<done_conversation_section>", "topic": "TALK_ISHERWOOD_CARLOS_TOPICS" },
{ "text": "<end_talking_leave>", "topic": "TALK_DONE" }
]
},
{
Expand All @@ -221,62 +221,62 @@
"dynamic_line": "*frowns at you. \"Of course not. We tracked it for a while, but lost the trail. Right now we don't have the resources to try to rescue him. My son, Chris, has been trying to pick up the trail again and figure out a rescue plan.\"",
"responses": [
{ "text": "I could help. Where did Chris go?", "topic": "TALK_CARLOS_BARRY3" },
{ "text": "Let's talk about something else.", "topic": "TALK_ISHERWOOD_CARLOS_TOPICS" },
{ "text": "I'd better get going.", "topic": "TALK_DONE" }
{ "text": "<done_conversation_section>", "topic": "TALK_ISHERWOOD_CARLOS_TOPICS" },
{ "text": "<end_talking_leave>", "topic": "TALK_DONE" }
]
},
{
"type": "talk_topic",
"id": "TALK_CARLOS_BARRY3",
"dynamic_line": "*shakes his head. \"Leave Chris be, he knows what he's doing. Give him some time. Calling more attention to him could get both of you killed.\"",
"responses": [
{ "text": "Let's talk about something else.", "topic": "TALK_ISHERWOOD_CARLOS_TOPICS" },
{ "text": "I'd better get going.", "topic": "TALK_DONE" }
{ "text": "<done_conversation_section>", "topic": "TALK_ISHERWOOD_CARLOS_TOPICS" },
{ "text": "<end_talking_leave>", "topic": "TALK_DONE" }
]
},
{
"type": "talk_topic",
"id": "TALK_CARLOS_FORGE1",
"dynamic_line": "The big item I need is an anvil, once I have that I can get a lot of repairs done.\" He smiles briefly. \"Can't exactly head to town to get it done anymore, but I learned a bit of old world metalwork from my granddad.",
"responses": [
{ "text": "Let's talk about something else.", "topic": "TALK_ISHERWOOD_CARLOS_TOPICS" },
{ "text": "I'd better get going.", "topic": "TALK_DONE" }
{ "text": "<done_conversation_section>", "topic": "TALK_ISHERWOOD_CARLOS_TOPICS" },
{ "text": "<end_talking_leave>", "topic": "TALK_DONE" }
]
},
{
"type": "talk_topic",
"id": "TALK_CARLOS_FORGE2",
"dynamic_line": "*gestures around the workspace, which looks more set up. \"I'm figuring things out, getting it worked out. It's been a while since I did this kind of metalwork.",
"responses": [
{ "text": "Let's talk about something else.", "topic": "TALK_ISHERWOOD_CARLOS_TOPICS" },
{ "text": "I'd better get going.", "topic": "TALK_DONE" }
{ "text": "<done_conversation_section>", "topic": "TALK_ISHERWOOD_CARLOS_TOPICS" },
{ "text": "<end_talking_leave>", "topic": "TALK_DONE" }
]
},
{
"type": "talk_topic",
"id": "TALK_CARLOS_FORGE3",
"dynamic_line": "Yeah, it's coming along nice.\" He slaps the surface of the anvil. \"Thanks for this, I'm still getting my skills back up, but it's going to be real helpful.",
"responses": [
{ "text": "Let's talk about something else.", "topic": "TALK_ISHERWOOD_CARLOS_TOPICS" },
{ "text": "I'd better get going.", "topic": "TALK_DONE" }
{ "text": "<done_conversation_section>", "topic": "TALK_ISHERWOOD_CARLOS_TOPICS" },
{ "text": "<end_talking_leave>", "topic": "TALK_DONE" }
]
},
{
"type": "talk_topic",
"id": "TALK_CARLOS_CHRIS1",
"dynamic_line": "Chris is hiking the perimeter of our land, planning some defense options.\" He looks you up and down. \"Best just let him be.",
"responses": [
{ "text": "Let's talk about something else.", "topic": "TALK_ISHERWOOD_CARLOS_TOPICS" },
{ "text": "I'd better get going.", "topic": "TALK_DONE" }
{ "text": "<done_conversation_section>", "topic": "TALK_ISHERWOOD_CARLOS_TOPICS" },
{ "text": "<end_talking_leave>", "topic": "TALK_DONE" }
]
},
{
"type": "talk_topic",
"id": "TALK_CARLOS_CHRIS2",
"dynamic_line": "*looks at you curiously. \"Should be where you saw him last. He's not missing again, is he?\"",
"responses": [
{ "text": "Let's talk about something else.", "topic": "TALK_ISHERWOOD_CARLOS_TOPICS" },
{ "text": "I'd better get going.", "topic": "TALK_DONE" }
{ "text": "<done_conversation_section>", "topic": "TALK_ISHERWOOD_CARLOS_TOPICS" },
{ "text": "<end_talking_leave>", "topic": "TALK_DONE" }
]
},
{
Expand Down Expand Up @@ -320,7 +320,7 @@
"condition": { "compare_string": [ "yes", { "u_val": "u_found_chris_for_carlos" } ] }
},
{ "text": "Can I do anything for you?", "topic": "TALK_MISSION_LIST" },
{ "text": "I'd better get going.", "topic": "TALK_DONE" }
{ "text": "<end_talking_leave>", "topic": "TALK_DONE" }
]
},
{
Expand Down
Loading

0 comments on commit c80de55

Please sign in to comment.