From e0cc61307f4c375631dd6551516cd9c64aef1995 Mon Sep 17 00:00:00 2001 From: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com> Date: Thu, 10 Jan 2019 13:20:37 -0800 Subject: [PATCH 01/16] Create NPC_Jenny_Forcette.json --- .../refugee_center/NPC_Jenny_Forcette.json | 171 ++++++++++++++++++ 1 file changed, 171 insertions(+) create mode 100644 data/json/npcs/refugee_center/NPC_Jenny_Forcette.json diff --git a/data/json/npcs/refugee_center/NPC_Jenny_Forcette.json b/data/json/npcs/refugee_center/NPC_Jenny_Forcette.json new file mode 100644 index 0000000000000..a30ca367bf277 --- /dev/null +++ b/data/json/npcs/refugee_center/NPC_Jenny_Forcette.json @@ -0,0 +1,171 @@ +[ + { + "type": "npc_class", + "id": "NC_REFUGEE_Jenny", + "name": "Refugee", + "job_description": "I'm just trying to survive.", + "common": false, + "//": "Jenny Forcette is an experienced mechanical engineer. Like the other refugees in the center, she's terrified of the outside world. Unlike many, she has some ideas what to do about it.", + "bonus_str": { "rng": [ -4, -2 ] }, + "bonus_dex": { "rng": [ -2, 1 ] }, + "bonus_int": { "rng": [ 3, 4 ] }, + "bonus_per": { "rng": [ -1, 1 ] }, + "worn_override": "REFUGEE_Jenny_worn", + "carry_override": "REFUGEE_Jenny_carried", + "weapon_override": "REFUGEE_Jenny_wield", + "traits": [ { "trait": "PACIFIST" }, { "trait": "Exp_MechEng2" } ], + "skills": [ + { "skill": "mechanics", "bonus": { "rng": [ 5, 7 ] } }, + { "skill": "computers", "bonus": { "rng": [ 2, 5 ] } }, + { "skill": "electronics", "bonus": { "rng": [ 3, 6 ] } }, + { "skill": "fabrication", "bonus": { "rng": [ 2, 6 ] } } + ] + }, + { + "type": "item_group", + "id": "REFUGEE_Jenny_worn", + "subtype": "collection", + "entries": [ + { "item": "linuxtshirt" }, + { "item": "jeans" }, + { "item": "hoody" }, + { "item": "sports_bra" }, + { "item": "panties" }, + { "item": "socks" }, + { "item": "sneakers" }, + { "item": "backpack" } + ] + }, + { + "type": "item_group", + "id": "REFUGEE_Jenny_carried", + "subtype": "collection", + "entries": [ { "item": "paper" }, { "item": "soldering_iron", "ammo-item": "battery", "charges": 20 } ] + }, + { + "type": "item_group", + "id": "REFUGEE_Jenny_wield", + "subtype": "collection", + "entries": [ { "item": "laptop" } ] + }, + { + "type": "npc", + "id": "refugee_JennyForcette", + "name_unique": "Jenny Forcette", + "gender": "female", + "name_suffix": "refugee", + "class": "NC_REFUGEE_Jenny", + "attitude": 0, + "mission": 7, + "chat": "TALK_REFUGEE_JENNY_1", + "faction": "free_merchants" + }, + { + "type": "talk_topic", + "id": "TALK_REFUGEE_JENNY_1", + "dynamic_line": { + "npc_has_effect": "player_has_met", + "yes": [ "Hello again.", "Nice to see you again.", "What's up?" ], + "no": "Hi there. Haven't see you around here before. I'm Jenny, Jenny Forcette." + }, + "responses": [ + { + "text": "What are you doing on that computer?", + "condition": { "days_since_cataclysm": 60 }, + "npc_add_effect": "player_has_met", + "topic": "TALK_REFUGEE_JENNY_Project1_developed", + "switch": true + }, + { + "text": "What are you doing on that computer?", + "condition": { "days_since_cataclysm": 30 }, + "npc_add_effect": "player_has_met", + "topic": "TALK_REFUGEE_JENNY_Project1_early", + "switch": true + }, + { + "text": "What are you doing on that computer?", + "npc_add_effect": "player_has_met", + "topic": "TALK_REFUGEE_JENNY_Project1_veryearly", + "switch": true, + "default": true + }, + { + "text": "Nice meeting you. I'd best get going, though.", + "condition": { "not": { "npc_has_effect": "player_has_met" } }, + "npc_add_effect": "player_has_met", + "topic": "TALK_DONE" + }, + { + "text": "Sorry Jenny, I can't stay to chat.", + "condition": { "npc_has_effect": "player_has_met" }, + "topic": "TALK_DONE" + } + ] + }, + { + "type": "talk_topic", + "id": "TALK_REFUGEE_JENNY_Project1_veryearly", + "dynamic_line": "Just puttering around. I'm still a bit too shell-shocked to do very much. I used to be an engineer, though... I'm trying to think of some kind of project to get my mind off all this.", + "responses": [ + { "text": "What's it like living here?", "topic": "TALK_REFUGEE_JENNY_Personal1_veryearly" }, + { "text": "Good luck with that. I'd better get going.", "topic": "TALK_DONE" } + ] + }, + { + "type": "talk_topic", + "id": "TALK_REFUGEE_JENNY_Personal1_veryearly", + "dynamic_line": "Living here? Yeah, I guess I live here now. It's... it's weird. We're crowded into this tiny space, I don't know these people, but we're sharing bathrooms and we've all been through the same stuff. It's not great. At night we can hear the outside, and we all just lie there awake, thinking the same things but too scared to talk about it.", + "responses": [ { "text": "I'd better get going.", "topic": "TALK_DONE" } ] + }, + { + "type": "talk_topic", + "id": "TALK_REFUGEE_JENNY_Project1_early", + "dynamic_line": "I recently came into possession of this mold for making high-calibre air rifle bullets. I'm kinda working on a design that would use them to protect the base. Got a long way to go, though.", + "responses": [ + { "text": "What are you planning?", "topic": "TALK_REFUGEE_JENNY_Project2_early" }, + { "text": "What's it like living here?", "topic": "TALK_REFUGEE_JENNY_Personal1_early" }, + { "text": "Good luck with that. I'd better get going.", "topic": "TALK_DONE" } + ] + }, + { + "type": "talk_topic", + "id": "TALK_REFUGEE_JENNY_Project2_early", + "dynamic_line": "Well, these things are a standard .30 calibre. They should be compatible with any similar rifle barrel. It would be pretty easy to repurpose some rifle parts into large air weapons that we could use without relying on gunpowder, and without so much noise. I'm still drawing up an actual design though, I have a bunch of features I want. Ask me again in a couple weeks and I'll give you some more info.", + "responses": [ + { "text": "What's it like living here?", "topic": "TALK_REFUGEE_JENNY_Personal1_early" }, + { "text": "Good luck with that. I'd better get going.", "topic": "TALK_DONE" } + ] + }, + { + "type": "talk_topic", + "id": "TALK_REFUGEE_JENNY_Personal1_early", + "dynamic_line": "It's been over a month now, so I guess I'm starting to get used to it. Things were pretty rough after Sean died, but it wasn't our first big loss and it won't be the last I guess. I've made a couple friends, and in a weird way we're all like family. We were all hoping they'd let us downstairs sooner than this though. We're never quite sure if there's going to be enough food to go around. I'm really hoping I can lose myself in this project. Still haven't had a good night's sleep since .", + "responses": [ { "text": "I'd better get going.", "topic": "TALK_DONE" } ] + }, + { + "type": "talk_topic", + "id": "TALK_REFUGEE_JENNY_Project1_developed", + "dynamic_line": "About a month ago, I got a mold for making high-calibre air rifle bullets. I've been designing some turrets that would use a central air system to power pneumatic rifle turrets around the center. It's a lot easier than trying to make gunpowder!", + "responses": [ + { "text": "Tell me more about those turrets.", "topic": "TALK_REFUGEE_JENNY_Project2_developed" }, + { "text": "What's it like living here?", "topic": "TALK_REFUGEE_JENNY_Personal1_mid" }, + { "text": "Sounds interesting, talk to you later.", "topic": "TALK_DONE" } + ] + }, + { + "type": "talk_topic", + "id": "TALK_REFUGEE_JENNY_Project2_developed", + "dynamic_line": "They're pretty big. This isn't something you'd carry around with you. They fire .30 cal bullets using compressed air that we'd make inside the basement and then pipe up to individual storage tanks for the guns that would be good for a few hundred shots each. The design should be capable of auto or semi-auto fire, at a range that's pretty comparable to a gunpowder-based weapon. It takes out some of the most limited parts of ranged weapons: no gunpowder, no brass casings, just lead that we melt into my mold. It's not soundless, but it's not as loud as a chemical weapon. There are tons of advantages. Only trouble is, I can't convince the Free Merchants to give me the parts I need.", + "responses": [ + { "text": "What's it like living here?", "topic": "TALK_REFUGEE_JENNY_Personal1_mid" }, + { "text": "Sounds interesting, talk to you later.", "topic": "TALK_DONE" } + ] + }, + { + "type": "talk_topic", + "id": "TALK_REFUGEE_JENNY_Personal1_mid", + "dynamic_line": "There's good and there's bad. We're all pretty sick of being cooped up in here for the last two months, never knowing if there's going to be food to eat or not. It's starting to look like they're never going to let us go down to the secure basement, and none of us have slept well since we were brought in. We know we've got it pretty good... we're safe, we're alive.", + "responses": [ { "text": "I'd better get going.", "topic": "TALK_DONE" } ] + } +] From 4f500d8e74f127d69e77d100d47c97eed6394343 Mon Sep 17 00:00:00 2001 From: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com> Date: Thu, 10 Jan 2019 13:28:42 -0800 Subject: [PATCH 02/16] Add a conversation flags file for commonly used conversation conditions --- data/json/npcs/Conversation_Flags.json | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 data/json/npcs/Conversation_Flags.json diff --git a/data/json/npcs/Conversation_Flags.json b/data/json/npcs/Conversation_Flags.json new file mode 100644 index 0000000000000..6d8cf2541f96d --- /dev/null +++ b/data/json/npcs/Conversation_Flags.json @@ -0,0 +1,9 @@ +[ + { + "type": "effect_type", + "id": "player_has_met", + "//": "Use this flag to indicate if the player has met this NPC before.", + "name": [ "You've met before" ], + "desc": [ "AI tag: You've met this NPC before. If you have this effect it's a bug." ] + } +] \ No newline at end of file From 04ccebe2746784dde1dfc2ffa1a27dbdaa0352e0 Mon Sep 17 00:00:00 2001 From: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com> Date: Thu, 10 Jan 2019 13:29:31 -0800 Subject: [PATCH 03/16] Update Conversation_Flags.json --- data/json/npcs/Conversation_Flags.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/npcs/Conversation_Flags.json b/data/json/npcs/Conversation_Flags.json index 6d8cf2541f96d..aaa71bd1f9d47 100644 --- a/data/json/npcs/Conversation_Flags.json +++ b/data/json/npcs/Conversation_Flags.json @@ -6,4 +6,4 @@ "name": [ "You've met before" ], "desc": [ "AI tag: You've met this NPC before. If you have this effect it's a bug." ] } -] \ No newline at end of file +] From 84f01ef2ff0e7749904bfd918531015ea340becc Mon Sep 17 00:00:00 2001 From: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com> Date: Thu, 10 Jan 2019 16:10:19 -0800 Subject: [PATCH 04/16] Add missions to Jenny (1) --- .../refugee_center/NPC_Jenny_Forcette.json | 46 ++++++++++++++++++- 1 file changed, 44 insertions(+), 2 deletions(-) diff --git a/data/json/npcs/refugee_center/NPC_Jenny_Forcette.json b/data/json/npcs/refugee_center/NPC_Jenny_Forcette.json index a30ca367bf277..2aeada347ebeb 100644 --- a/data/json/npcs/refugee_center/NPC_Jenny_Forcette.json +++ b/data/json/npcs/refugee_center/NPC_Jenny_Forcette.json @@ -158,6 +158,7 @@ "id": "TALK_REFUGEE_JENNY_Project2_developed", "dynamic_line": "They're pretty big. This isn't something you'd carry around with you. They fire .30 cal bullets using compressed air that we'd make inside the basement and then pipe up to individual storage tanks for the guns that would be good for a few hundred shots each. The design should be capable of auto or semi-auto fire, at a range that's pretty comparable to a gunpowder-based weapon. It takes out some of the most limited parts of ranged weapons: no gunpowder, no brass casings, just lead that we melt into my mold. It's not soundless, but it's not as loud as a chemical weapon. There are tons of advantages. Only trouble is, I can't convince the Free Merchants to give me the parts I need.", "responses": [ + { "text": "Is there some way I can help you get the stuff you need?", "topic": "TALK_MISSION_INQUIRE" }, { "text": "What's it like living here?", "topic": "TALK_REFUGEE_JENNY_Personal1_mid" }, { "text": "Sounds interesting, talk to you later.", "topic": "TALK_DONE" } ] @@ -165,7 +166,48 @@ { "type": "talk_topic", "id": "TALK_REFUGEE_JENNY_Personal1_mid", - "dynamic_line": "There's good and there's bad. We're all pretty sick of being cooped up in here for the last two months, never knowing if there's going to be food to eat or not. It's starting to look like they're never going to let us go down to the secure basement, and none of us have slept well since we were brought in. We know we've got it pretty good... we're safe, we're alive.", - "responses": [ { "text": "I'd better get going.", "topic": "TALK_DONE" } ] + "dynamic_line": "There's good and there's bad. We're all pretty sick of being cooped up in here for the over two months, never knowing if there's going to be food to eat or not. It's starting to look like they're never going to let us go down to the secure basement, and none of us have slept well since we were brought in. We know we've got it pretty good... we're safe, we're alive.", + "responses": [ + { "text": "Tell me more about those turrets.", "topic": "TALK_REFUGEE_JENNY_Project2_developed" }, + { "text": "I'd better get going.", "topic": "TALK_DONE" } + ] + }, + { + "id": "MISSION_REFUGEE_Jenny_GET_MOTOR", + "type": "mission_definition", + "name": "Bring Jenny a motor for her compressor.", + "goal": "MGOAL_FIND_ITEM", + "item": "engine_electric", + "followup": "MISSION_REFUGEE_Jenny_GET_TANK", + "dialogue": { + "describe": "Yeah, if you want to risk your neck out there and bring me what I need, I'm not gonna say no.", + "offer": "Before I get anything going, I'm going to need to set up a compressor. I have a lot of the stuff for that, but I need a large tank for air, and a good sized electric motor - about 10 kg or so.", + "accepted": "Great! Bring it to me when you find one.", + "rejected": "Oh well. Thanks for offering anyway.", + "advice": "A lot of electric cars and bikes use these kind of motors. So do some bigger robots.", + "inquire": "Any sign of a motor I can use?", + "success": "That's exactly what I need! Want to talk about that tank now?", + "success_lie": "Huh. This isn't going to work like I thought.", + "failure": "No worries. Let me know if you want to try again." + } + }, + { + "id": "MISSION_REFUGEE_Jenny_GET_TANK", + "type": "mission_definition", + "name": "Bring Jenny a tank for her compressor.", + "goal": "MGOAL_FIND_ITEM", + "item": "metal_tank", + "//": "followup: MISSION_REFUGEE_Jenny_GET_RIFLES", + "dialogue": { + "describe": "Now that I've got that motor, I can get my compressor mostly built. I will need a tank though.", + "offer": "I can get started building the compressor, but I need a large metal tank to store compressed air centrally. About 60 litres should do...", + "accepted": "Great! Bring it to me when you find one.", + "rejected": "Oh well. Thanks for offering anyway.", + "advice": "It needs to be a good strong tank, like a big propane tank or something... you could look at fuel storage tanks and things, as long as they're durable enough. Heck, if you get some sheet metal you could probably even weld a good one together.", + "inquire": "Any sign of a tank I can use?", + "success": "Hey, this is perfect, \"tanks\" a bunch. Okay, I'm sorry for that.", + "success_lie": "Huh. This isn't going to work like I thought. Back to the drawing board I guess.", + "failure": "No worries. Let me know if you want to try again." + } } ] From 23af232abd0f08945f3e6a0761aab80e725102e5 Mon Sep 17 00:00:00 2001 From: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com> Date: Thu, 10 Jan 2019 16:11:47 -0800 Subject: [PATCH 05/16] Update NPC_Jenny_Forcette.json --- data/json/npcs/refugee_center/NPC_Jenny_Forcette.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/json/npcs/refugee_center/NPC_Jenny_Forcette.json b/data/json/npcs/refugee_center/NPC_Jenny_Forcette.json index 2aeada347ebeb..c18d7672e3e83 100644 --- a/data/json/npcs/refugee_center/NPC_Jenny_Forcette.json +++ b/data/json/npcs/refugee_center/NPC_Jenny_Forcette.json @@ -181,7 +181,7 @@ "followup": "MISSION_REFUGEE_Jenny_GET_TANK", "dialogue": { "describe": "Yeah, if you want to risk your neck out there and bring me what I need, I'm not gonna say no.", - "offer": "Before I get anything going, I'm going to need to set up a compressor. I have a lot of the stuff for that, but I need a large tank for air, and a good sized electric motor - about 10 kg or so.", + "offer": "Before I get anything going, I'm going to need to set up a compressor. I have a lot of the stuff for that, but I need a large tank for air, and a good sized electric motor - about 10 kg or so. I'm also going to need a 60 liter tank, after that.", "accepted": "Great! Bring it to me when you find one.", "rejected": "Oh well. Thanks for offering anyway.", "advice": "A lot of electric cars and bikes use these kind of motors. So do some bigger robots.", @@ -200,7 +200,7 @@ "//": "followup: MISSION_REFUGEE_Jenny_GET_RIFLES", "dialogue": { "describe": "Now that I've got that motor, I can get my compressor mostly built. I will need a tank though.", - "offer": "I can get started building the compressor, but I need a large metal tank to store compressed air centrally. About 60 litres should do...", + "offer": "I can get started building the compressor, but I need a large metal tank to store compressed air centrally. About 60 liters should do...", "accepted": "Great! Bring it to me when you find one.", "rejected": "Oh well. Thanks for offering anyway.", "advice": "It needs to be a good strong tank, like a big propane tank or something... you could look at fuel storage tanks and things, as long as they're durable enough. Heck, if you get some sheet metal you could probably even weld a good one together.", From 61649a3c933f20f52192688911e22aee07d86c49 Mon Sep 17 00:00:00 2001 From: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com> Date: Thu, 10 Jan 2019 16:15:31 -0800 Subject: [PATCH 06/16] Update NPC_Jenny_Forcette.json --- data/json/npcs/refugee_center/NPC_Jenny_Forcette.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/npcs/refugee_center/NPC_Jenny_Forcette.json b/data/json/npcs/refugee_center/NPC_Jenny_Forcette.json index c18d7672e3e83..1d85dc25fd655 100644 --- a/data/json/npcs/refugee_center/NPC_Jenny_Forcette.json +++ b/data/json/npcs/refugee_center/NPC_Jenny_Forcette.json @@ -205,7 +205,7 @@ "rejected": "Oh well. Thanks for offering anyway.", "advice": "It needs to be a good strong tank, like a big propane tank or something... you could look at fuel storage tanks and things, as long as they're durable enough. Heck, if you get some sheet metal you could probably even weld a good one together.", "inquire": "Any sign of a tank I can use?", - "success": "Hey, this is perfect, \"tanks\" a bunch. Okay, I'm sorry for that.", + "success": "Hey, this is perfect, \"tanks\" a bunch. Okay, I'm sorry for that. Anyway, now that I've got the parts, I might be able to build a proof of concept. First I gotta get this thing up and running, and argue with the bean counters about letting me draw power to run it.", "success_lie": "Huh. This isn't going to work like I thought. Back to the drawing board I guess.", "failure": "No worries. Let me know if you want to try again." } From 08e48e79dc9dc67216311721898f69ecfd942ab4 Mon Sep 17 00:00:00 2001 From: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com> Date: Thu, 10 Jan 2019 16:18:32 -0800 Subject: [PATCH 07/16] Update NPC_Jenny_Forcette.json --- data/json/npcs/refugee_center/NPC_Jenny_Forcette.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/npcs/refugee_center/NPC_Jenny_Forcette.json b/data/json/npcs/refugee_center/NPC_Jenny_Forcette.json index 1d85dc25fd655..df0deb0885dc5 100644 --- a/data/json/npcs/refugee_center/NPC_Jenny_Forcette.json +++ b/data/json/npcs/refugee_center/NPC_Jenny_Forcette.json @@ -180,7 +180,7 @@ "item": "engine_electric", "followup": "MISSION_REFUGEE_Jenny_GET_TANK", "dialogue": { - "describe": "Yeah, if you want to risk your neck out there and bring me what I need, I'm not gonna say no.", + "describe": "Yeah, if you want to risk your neck out there and bring me what I need, I'm not gonna say no. I can't, like, pay you or anything though, you know that right?", "offer": "Before I get anything going, I'm going to need to set up a compressor. I have a lot of the stuff for that, but I need a large tank for air, and a good sized electric motor - about 10 kg or so. I'm also going to need a 60 liter tank, after that.", "accepted": "Great! Bring it to me when you find one.", "rejected": "Oh well. Thanks for offering anyway.", From 9f80c863a1e0ebbf058ff07cab4575232c6b30a6 Mon Sep 17 00:00:00 2001 From: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com> Date: Thu, 17 Jan 2019 15:21:50 -0800 Subject: [PATCH 08/16] Update NPC_Jenny_Forcette.json --- .../refugee_center/NPC_Jenny_Forcette.json | 52 ++++++++++++++----- 1 file changed, 38 insertions(+), 14 deletions(-) diff --git a/data/json/npcs/refugee_center/NPC_Jenny_Forcette.json b/data/json/npcs/refugee_center/NPC_Jenny_Forcette.json index df0deb0885dc5..d29fd7ff4bdd3 100644 --- a/data/json/npcs/refugee_center/NPC_Jenny_Forcette.json +++ b/data/json/npcs/refugee_center/NPC_Jenny_Forcette.json @@ -16,7 +16,7 @@ "traits": [ { "trait": "PACIFIST" }, { "trait": "Exp_MechEng2" } ], "skills": [ { "skill": "mechanics", "bonus": { "rng": [ 5, 7 ] } }, - { "skill": "computers", "bonus": { "rng": [ 2, 5 ] } }, + { "skill": "computer", "bonus": { "rng": [ 2, 5 ] } }, { "skill": "electronics", "bonus": { "rng": [ 3, 6 ] } }, { "skill": "fabrication", "bonus": { "rng": [ 2, 6 ] } } ] @@ -28,7 +28,7 @@ "entries": [ { "item": "linuxtshirt" }, { "item": "jeans" }, - { "item": "hoody" }, + { "item": "hoodie" }, { "item": "sports_bra" }, { "item": "panties" }, { "item": "socks" }, @@ -58,7 +58,8 @@ "attitude": 0, "mission": 7, "chat": "TALK_REFUGEE_JENNY_1", - "faction": "free_merchants" + "faction": "free_merchants", + "mission_offered" : "MISSION_REFUGEE_Jenny_GET_MOTOR" }, { "type": "talk_topic", @@ -70,30 +71,48 @@ }, "responses": [ { - "text": "What are you doing on that computer?", + "text": "Nice meeting you. What are you doing on that computer?", + "condition": { "and": [ { "days_since_cataclysm": 60 }, { "not": { "npc_has_effect": "player_has_met" } } ] }, + "effect": { "npc_add_effect": "player_has_met", "duration": "PERMANENT" }, + "topic": "TALK_REFUGEE_JENNY_Project1_developed", + "switch": true + }, + { + "text": "Hi, Jenny. What are you doing on that computer?", "condition": { "days_since_cataclysm": 60 }, - "npc_add_effect": "player_has_met", "topic": "TALK_REFUGEE_JENNY_Project1_developed", "switch": true }, { - "text": "What are you doing on that computer?", + "text": "Nice meeting you. What are you doing on that computer?", + "condition": { "and": [ { "days_since_cataclysm": 30 }, { "not": { "npc_has_effect": "player_has_met" } } ] }, + "effect": { "npc_add_effect": "player_has_met", "duration": "PERMANENT" }, + "topic": "TALK_REFUGEE_JENNY_Project1_early", + "switch": true + }, + { + "text": "Hi, Jenny. What are you doing on that computer?", "condition": { "days_since_cataclysm": 30 }, - "npc_add_effect": "player_has_met", "topic": "TALK_REFUGEE_JENNY_Project1_early", "switch": true }, { - "text": "What are you doing on that computer?", - "npc_add_effect": "player_has_met", + "text": "Nice meeting you. What are you doing on that computer?", + "condition": { "not": { "npc_has_effect": "player_has_met" } }, + "effect": { "npc_add_effect": "player_has_met", "duration": "PERMANENT" }, "topic": "TALK_REFUGEE_JENNY_Project1_veryearly", - "switch": true, - "default": true + "switch": true + }, + { + "text": "Hi, Jenny. What are you doing on that computer?", + "condition": { "npc_has_effect": "player_has_met" }, + "topic": "TALK_REFUGEE_JENNY_Project1_veryearly", + "switch": true }, { "text": "Nice meeting you. I'd best get going, though.", "condition": { "not": { "npc_has_effect": "player_has_met" } }, - "npc_add_effect": "player_has_met", + "effect": { "npc_add_effect": "player_has_met", "duration": "PERMANENT" }, "topic": "TALK_DONE" }, { @@ -158,7 +177,7 @@ "id": "TALK_REFUGEE_JENNY_Project2_developed", "dynamic_line": "They're pretty big. This isn't something you'd carry around with you. They fire .30 cal bullets using compressed air that we'd make inside the basement and then pipe up to individual storage tanks for the guns that would be good for a few hundred shots each. The design should be capable of auto or semi-auto fire, at a range that's pretty comparable to a gunpowder-based weapon. It takes out some of the most limited parts of ranged weapons: no gunpowder, no brass casings, just lead that we melt into my mold. It's not soundless, but it's not as loud as a chemical weapon. There are tons of advantages. Only trouble is, I can't convince the Free Merchants to give me the parts I need.", "responses": [ - { "text": "Is there some way I can help you get the stuff you need?", "topic": "TALK_MISSION_INQUIRE" }, + { "text": "Is there some way I can help you get the stuff you need?", "topic": "TALK_MISSION_LIST" }, { "text": "What's it like living here?", "topic": "TALK_REFUGEE_JENNY_Personal1_mid" }, { "text": "Sounds interesting, talk to you later.", "topic": "TALK_DONE" } ] @@ -176,9 +195,12 @@ "id": "MISSION_REFUGEE_Jenny_GET_MOTOR", "type": "mission_definition", "name": "Bring Jenny a motor for her compressor.", + "difficulty": 1, + "value": 0, "goal": "MGOAL_FIND_ITEM", - "item": "engine_electric", + "item": "motor", "followup": "MISSION_REFUGEE_Jenny_GET_TANK", + "origins": [ "ORIGIN_SECONDARY" ], "dialogue": { "describe": "Yeah, if you want to risk your neck out there and bring me what I need, I'm not gonna say no. I can't, like, pay you or anything though, you know that right?", "offer": "Before I get anything going, I'm going to need to set up a compressor. I have a lot of the stuff for that, but I need a large tank for air, and a good sized electric motor - about 10 kg or so. I'm also going to need a 60 liter tank, after that.", @@ -195,6 +217,8 @@ "id": "MISSION_REFUGEE_Jenny_GET_TANK", "type": "mission_definition", "name": "Bring Jenny a tank for her compressor.", + "difficulty": 1, + "value": 0, "goal": "MGOAL_FIND_ITEM", "item": "metal_tank", "//": "followup: MISSION_REFUGEE_Jenny_GET_RIFLES", From 39c5fa2a456a47075ac388aba6c1b6c35f628a56 Mon Sep 17 00:00:00 2001 From: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com> Date: Thu, 17 Jan 2019 15:25:00 -0800 Subject: [PATCH 09/16] place in evac center --- data/json/mapgen/evac_center.json | 2 +- data/json/npcs/refugee_center/NPC_Jenny_Forcette.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/data/json/mapgen/evac_center.json b/data/json/mapgen/evac_center.json index 4c17d45662c98..0a9c9e032e820 100644 --- a/data/json/mapgen/evac_center.json +++ b/data/json/mapgen/evac_center.json @@ -272,7 +272,7 @@ { "item": "allclothes", "x": [ 8, 17 ], "y": [ 16, 16 ], "chance": 60 }, { "item": "trash", "x": [ 13, 14 ], "y": 21, "chance": 60, "repeat": [ 1, 2 ] } ], - "place_npcs": [ { "class": "guard", "x": 19, "y": 21 } ] + "place_npcs": [ { "class": "refugee_JennyForcette", "x": 8, "y": 8 }, { "class": "guard", "x": 19, "y": 21 } ] } }, { diff --git a/data/json/npcs/refugee_center/NPC_Jenny_Forcette.json b/data/json/npcs/refugee_center/NPC_Jenny_Forcette.json index d29fd7ff4bdd3..5372edf5d4dec 100644 --- a/data/json/npcs/refugee_center/NPC_Jenny_Forcette.json +++ b/data/json/npcs/refugee_center/NPC_Jenny_Forcette.json @@ -58,8 +58,8 @@ "attitude": 0, "mission": 7, "chat": "TALK_REFUGEE_JENNY_1", - "faction": "free_merchants", - "mission_offered" : "MISSION_REFUGEE_Jenny_GET_MOTOR" + "faction": "free_merchants", + "mission_offered": "MISSION_REFUGEE_Jenny_GET_MOTOR" }, { "type": "talk_topic", From 5fcb9f0b185b0a7e7769b8ebb4841277c487ccf2 Mon Sep 17 00:00:00 2001 From: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com> Date: Thu, 17 Jan 2019 15:45:39 -0800 Subject: [PATCH 10/16] Update NPC_Jenny_Forcette.json mission fix --- data/json/npcs/refugee_center/NPC_Jenny_Forcette.json | 1 + 1 file changed, 1 insertion(+) diff --git a/data/json/npcs/refugee_center/NPC_Jenny_Forcette.json b/data/json/npcs/refugee_center/NPC_Jenny_Forcette.json index 5372edf5d4dec..7ea0d7d2c3aa9 100644 --- a/data/json/npcs/refugee_center/NPC_Jenny_Forcette.json +++ b/data/json/npcs/refugee_center/NPC_Jenny_Forcette.json @@ -221,6 +221,7 @@ "value": 0, "goal": "MGOAL_FIND_ITEM", "item": "metal_tank", + "origins": [ "ORIGIN_SECONDARY" ], "//": "followup: MISSION_REFUGEE_Jenny_GET_RIFLES", "dialogue": { "describe": "Now that I've got that motor, I can get my compressor mostly built. I will need a tank though.", From cd61f88eeca46e78baae06538b59d08a9ed26a91 Mon Sep 17 00:00:00 2001 From: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com> Date: Thu, 17 Jan 2019 17:52:49 -0800 Subject: [PATCH 11/16] Add dialogue about other refugees to Jenny (1) --- .../refugee_center/NPC_Jenny_Forcette.json | 63 ++++++++++++++++++- 1 file changed, 61 insertions(+), 2 deletions(-) diff --git a/data/json/npcs/refugee_center/NPC_Jenny_Forcette.json b/data/json/npcs/refugee_center/NPC_Jenny_Forcette.json index 7ea0d7d2c3aa9..909c1c4075175 100644 --- a/data/json/npcs/refugee_center/NPC_Jenny_Forcette.json +++ b/data/json/npcs/refugee_center/NPC_Jenny_Forcette.json @@ -135,7 +135,19 @@ "type": "talk_topic", "id": "TALK_REFUGEE_JENNY_Personal1_veryearly", "dynamic_line": "Living here? Yeah, I guess I live here now. It's... it's weird. We're crowded into this tiny space, I don't know these people, but we're sharing bathrooms and we've all been through the same stuff. It's not great. At night we can hear the outside, and we all just lie there awake, thinking the same things but too scared to talk about it.", - "responses": [ { "text": "I'd better get going.", "topic": "TALK_DONE" } ] + "responses": [ + { "text": "Can you tell me anything about the other refugees here?", "topic": "TALK_REFUGEE_JENNY_Refugees1_veryearly" }, + { "text": "I'd better get going.", "topic": "TALK_DONE" } + ] + }, + { + "type": "talk_topic", + "id": "TALK_REFUGEE_JENNY_Refugees1_veryearly", + "dynamic_line": "I don't know the other folks very well yet. There's Boris, Garry, and Stan, they seem to keep to each other. They've gone through something, but I haven't pried. Dana and her husband lost their baby, that was a big deal right when they arrived. There's that counsellor lady with the unusual name, she's nice enough. Fatima just showed up a little while ago, but I've been trying to get to know her better, I think we've at least got our professional stuff in common a bit. I haven't really spoken much to anyone else.", + "responses": [ + { "text": "What was that you said about living here?", "topic": "TALK_REFUGEE_JENNY_Personal1_veryearly" }, + { "text": "I'd better get going.", "topic": "TALK_DONE" } + ] }, { "type": "talk_topic", @@ -144,6 +156,7 @@ "responses": [ { "text": "What are you planning?", "topic": "TALK_REFUGEE_JENNY_Project2_early" }, { "text": "What's it like living here?", "topic": "TALK_REFUGEE_JENNY_Personal1_early" }, + { "text": "Can you tell me anything about the other refugees here?", "topic": "TALK_REFUGEE_JENNY_Refugees1_early" }, { "text": "Good luck with that. I'd better get going.", "topic": "TALK_DONE" } ] }, @@ -153,6 +166,7 @@ "dynamic_line": "Well, these things are a standard .30 calibre. They should be compatible with any similar rifle barrel. It would be pretty easy to repurpose some rifle parts into large air weapons that we could use without relying on gunpowder, and without so much noise. I'm still drawing up an actual design though, I have a bunch of features I want. Ask me again in a couple weeks and I'll give you some more info.", "responses": [ { "text": "What's it like living here?", "topic": "TALK_REFUGEE_JENNY_Personal1_early" }, + { "text": "Can you tell me anything about the other refugees here?", "topic": "TALK_REFUGEE_JENNY_Refugees1_early" }, { "text": "Good luck with that. I'd better get going.", "topic": "TALK_DONE" } ] }, @@ -160,7 +174,52 @@ "type": "talk_topic", "id": "TALK_REFUGEE_JENNY_Personal1_early", "dynamic_line": "It's been over a month now, so I guess I'm starting to get used to it. Things were pretty rough after Sean died, but it wasn't our first big loss and it won't be the last I guess. I've made a couple friends, and in a weird way we're all like family. We were all hoping they'd let us downstairs sooner than this though. We're never quite sure if there's going to be enough food to go around. I'm really hoping I can lose myself in this project. Still haven't had a good night's sleep since .", - "responses": [ { "text": "I'd better get going.", "topic": "TALK_DONE" } ] + "responses": [ + { "text": "What was it you said you were planning?", "topic": "TALK_REFUGEE_JENNY_Project1_early" }, + { "text": "Can you tell me anything about the other refugees here?", "topic": "TALK_REFUGEE_JENNY_Refugees1_early" }, + { "text": "I'd better get going.", "topic": "TALK_DONE" } ] + }, + { + "type": "talk_topic", + "id": "TALK_REFUGEE_JENNY_Refugees1_early", + "dynamic_line": "Well, there's a bunch of us. We're starting to form a bit of a community. Fatima and I work together a fair bit, and I've been hanging out with Dana, Draco, and Aleesha quite a lot. I don't know the Borichenko bunch, the Singhs, Vanessa, Uyen, or Rhyzaea quite as well, but we've talked enough. What did you want to know?", + "responses": [ + { "text": "Can you tell me about Fatima?", "topic": "TALK_REFUGEE_JENNY_Refugees2_Fatima_early" }, + { "text": "What has made you friends with Dana, Draco, and Aleesha?", "topic": "TALK_REFUGEE_JENNY_Refugees2_Friends_early" }, + { "text": "Can you tell me about the Borichenkos?", "topic": "TALK_REFUGEE_JENNY_Refugees2_Borichenko_early" }, + { "text": "Can you tell me about the Singhs?", "topic": "TALK_REFUGEE_JENNY_Refugees2_Singh_early" }, + { "text": "Can you tell me about the others?", "topic": "TALK_REFUGEE_JENNY_Refugees2_Others_early" }, + { "text": "What was it you said you were planning?", "topic": "TALK_REFUGEE_JENNY_Project1_early" }, + { "text": "What's it like living here?", "topic": "TALK_REFUGEE_JENNY_Personal1_early" }, + { "text": "I'd better get going.", "topic": "TALK_DONE" } ] + }, + { + "type": "talk_topic", + "id": "TALK_REFUGEE_JENNY_Refugees2_Fatima_early", + "dynamic_line": "Fatima's a sweety, but she's a total dork. I know, I know, it's backwards for the engineer to call the heavy duty mechanic a nerd, but hey. I call it like it is. She and I have been doing some odd jobs around the upstairs here, fixing up old machinery and things.", + "responses": [ + { "text": "What was it you said about the whole group, again?", "topic": "TALK_REFUGEE_JENNY_Refugees1_early" }, + { "text": "What has made you friends with Dana, Draco, and Aleesha?", "topic": "TALK_REFUGEE_JENNY_Refugees2_Friends_early" }, + { "text": "Can you tell me about the Borichenkos?", "topic": "TALK_REFUGEE_JENNY_Refugees2_Borichenko_early" }, + { "text": "Can you tell me about the Singhs?", "topic": "TALK_REFUGEE_JENNY_Refugees2_Singh_early" }, + { "text": "Can you tell me about the others?", "topic": "TALK_REFUGEE_JENNY_Refugees2_Others_early" }, + { "text": "What was it you said you were planning?", "topic": "TALK_REFUGEE_JENNY_Project1_early" }, + { "text": "What's it like living here?", "topic": "TALK_REFUGEE_JENNY_Personal1_early" }, + { "text": "I'd better get going.", "topic": "TALK_DONE" } ] + }, + { + "type": "talk_topic", + "id": "TALK_REFUGEE_JENNY_Refugees2_Friends_early", + "dynamic_line": "Well, Dana lost her baby right after , in a bus rollover. She was lucky to make it out alive. She and Pedro had one of the rougher trips here, I guess. We just kinda click as friends, I'm grateful there's someone else here I can really get along with. Draco is just a cantankerous old fart who hasn't actually got old yet, give him twenty years and he'll be there. I like grumpy people. We also have pretty similar taste in music. Aleesha's a sweet kid, and we've all kind of adopted her, but she seems to hang out with me and Dana the most.", + "responses": [ + { "text": "Can you tell me about Fatima?", "topic": "TALK_REFUGEE_JENNY_Refugees2_Fatima_early" }, + { "text": "What was it you said about the whole group, again?", "topic": "TALK_REFUGEE_JENNY_Refugees1_early" }, + { "text": "Can you tell me about the Borichenkos?", "topic": "TALK_REFUGEE_JENNY_Refugees2_Borichenko_early" }, + { "text": "Can you tell me about the Singhs?", "topic": "TALK_REFUGEE_JENNY_Refugees2_Singh_early" }, + { "text": "Can you tell me about the others?", "topic": "TALK_REFUGEE_JENNY_Refugees2_Others_early" }, + { "text": "What was it you said you were planning?", "topic": "TALK_REFUGEE_JENNY_Project1_early" }, + { "text": "What's it like living here?", "topic": "TALK_REFUGEE_JENNY_Personal1_early" }, + { "text": "I'd better get going.", "topic": "TALK_DONE" } ] }, { "type": "talk_topic", From 047a7ee030f660e1ac6fab022b337b8f3edcbf1f Mon Sep 17 00:00:00 2001 From: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com> Date: Thu, 17 Jan 2019 21:04:46 -0800 Subject: [PATCH 12/16] Talk about all the refugees I plan to add None of these people exist yet which amuses me. --- .../refugee_center/NPC_Jenny_Forcette.json | 159 +++++++++++++----- 1 file changed, 114 insertions(+), 45 deletions(-) diff --git a/data/json/npcs/refugee_center/NPC_Jenny_Forcette.json b/data/json/npcs/refugee_center/NPC_Jenny_Forcette.json index 909c1c4075175..4d404ed28ae3d 100644 --- a/data/json/npcs/refugee_center/NPC_Jenny_Forcette.json +++ b/data/json/npcs/refugee_center/NPC_Jenny_Forcette.json @@ -156,7 +156,7 @@ "responses": [ { "text": "What are you planning?", "topic": "TALK_REFUGEE_JENNY_Project2_early" }, { "text": "What's it like living here?", "topic": "TALK_REFUGEE_JENNY_Personal1_early" }, - { "text": "Can you tell me anything about the other refugees here?", "topic": "TALK_REFUGEE_JENNY_Refugees1_early" }, + { "text": "Can you tell me anything about the other refugees here?", "topic": "TALK_REFUGEE_JENNY_Refugees1" }, { "text": "Good luck with that. I'd better get going.", "topic": "TALK_DONE" } ] }, @@ -166,7 +166,7 @@ "dynamic_line": "Well, these things are a standard .30 calibre. They should be compatible with any similar rifle barrel. It would be pretty easy to repurpose some rifle parts into large air weapons that we could use without relying on gunpowder, and without so much noise. I'm still drawing up an actual design though, I have a bunch of features I want. Ask me again in a couple weeks and I'll give you some more info.", "responses": [ { "text": "What's it like living here?", "topic": "TALK_REFUGEE_JENNY_Personal1_early" }, - { "text": "Can you tell me anything about the other refugees here?", "topic": "TALK_REFUGEE_JENNY_Refugees1_early" }, + { "text": "Can you tell me anything about the other refugees here?", "topic": "TALK_REFUGEE_JENNY_Refugees1" }, { "text": "Good luck with that. I'd better get going.", "topic": "TALK_DONE" } ] }, @@ -176,77 +176,146 @@ "dynamic_line": "It's been over a month now, so I guess I'm starting to get used to it. Things were pretty rough after Sean died, but it wasn't our first big loss and it won't be the last I guess. I've made a couple friends, and in a weird way we're all like family. We were all hoping they'd let us downstairs sooner than this though. We're never quite sure if there's going to be enough food to go around. I'm really hoping I can lose myself in this project. Still haven't had a good night's sleep since .", "responses": [ { "text": "What was it you said you were planning?", "topic": "TALK_REFUGEE_JENNY_Project1_early" }, - { "text": "Can you tell me anything about the other refugees here?", "topic": "TALK_REFUGEE_JENNY_Refugees1_early" }, - { "text": "I'd better get going.", "topic": "TALK_DONE" } ] + { "text": "Can you tell me anything about the other refugees here?", "topic": "TALK_REFUGEE_JENNY_Refugees1" }, + { "text": "I'd better get going.", "topic": "TALK_DONE" } + ] }, { "type": "talk_topic", - "id": "TALK_REFUGEE_JENNY_Refugees1_early", - "dynamic_line": "Well, there's a bunch of us. We're starting to form a bit of a community. Fatima and I work together a fair bit, and I've been hanging out with Dana, Draco, and Aleesha quite a lot. I don't know the Borichenko bunch, the Singhs, Vanessa, Uyen, or Rhyzaea quite as well, but we've talked enough. What did you want to know?", + "id": "TALK_REFUGEE_JENNY_Project1_developed", + "dynamic_line": "About a month ago, I got a mold for making high-calibre air rifle bullets. I've been designing some turrets that would use a central air system to power pneumatic rifle turrets around the center. It's a lot easier than trying to make gunpowder!", "responses": [ - { "text": "Can you tell me about Fatima?", "topic": "TALK_REFUGEE_JENNY_Refugees2_Fatima_early" }, - { "text": "What has made you friends with Dana, Draco, and Aleesha?", "topic": "TALK_REFUGEE_JENNY_Refugees2_Friends_early" }, - { "text": "Can you tell me about the Borichenkos?", "topic": "TALK_REFUGEE_JENNY_Refugees2_Borichenko_early" }, - { "text": "Can you tell me about the Singhs?", "topic": "TALK_REFUGEE_JENNY_Refugees2_Singh_early" }, - { "text": "Can you tell me about the others?", "topic": "TALK_REFUGEE_JENNY_Refugees2_Others_early" }, - { "text": "What was it you said you were planning?", "topic": "TALK_REFUGEE_JENNY_Project1_early" }, - { "text": "What's it like living here?", "topic": "TALK_REFUGEE_JENNY_Personal1_early" }, - { "text": "I'd better get going.", "topic": "TALK_DONE" } ] + { "text": "Tell me more about those turrets.", "topic": "TALK_REFUGEE_JENNY_Project2_developed" }, + { "text": "What's it like living here?", "topic": "TALK_REFUGEE_JENNY_Personal1_mid" }, + { "text": "Can you tell me anything about the other refugees here?", "topic": "TALK_REFUGEE_JENNY_Refugees1" }, + { "text": "Sounds interesting, talk to you later.", "topic": "TALK_DONE" } + ] + }, + { + "type": "talk_topic", + "id": "TALK_REFUGEE_JENNY_Project2_developed", + "dynamic_line": "They're pretty big. This isn't something you'd carry around with you. They fire .30 cal bullets using compressed air that we'd make inside the basement and then pipe up to individual storage tanks for the guns that would be good for a few hundred shots each. The design should be capable of auto or semi-auto fire, at a range that's pretty comparable to a gunpowder-based weapon. It takes out some of the most limited parts of ranged weapons: no gunpowder, no brass casings, just lead that we melt into my mold. It's not soundless, but it's not as loud as a chemical weapon. There are tons of advantages. Only trouble is, I can't convince the Free Merchants to give me the parts I need.", + "responses": [ + { "text": "Is there some way I can help you get the stuff you need?", "topic": "TALK_MISSION_LIST" }, + { "text": "What's it like living here?", "topic": "TALK_REFUGEE_JENNY_Personal1_mid" }, + { "text": "Can you tell me anything about the other refugees here?", "topic": "TALK_REFUGEE_JENNY_Refugees1" }, + { "text": "Sounds interesting, talk to you later.", "topic": "TALK_DONE" } + ] + }, + { + "type": "talk_topic", + "id": "TALK_REFUGEE_JENNY_Personal1_mid", + "dynamic_line": "There's good and there's bad. We're all pretty sick of being cooped up in here for months, never knowing if there's going to be food to eat or not. It's starting to look like they're never going to let us go down to the secure basement, and none of us have slept well since we were brought in. We know we've got it pretty good... we're safe, we're alive. It's just, like, what kind of life are we even living?", + "responses": [ + { "text": "Tell me more about those turrets.", "topic": "TALK_REFUGEE_JENNY_Project2_developed" }, + { "text": "Can you tell me anything about the other refugees here?", "topic": "TALK_REFUGEE_JENNY_Refugees1" }, + { "text": "I'd better get going.", "topic": "TALK_DONE" } + ] + }, + { + "type": "talk_topic", + "id": "TALK_REFUGEE_JENNY_Refugees1", + "dynamic_line": { + "days_since_cataclysm": 90, + "yes": "For better or worse, we're a community now. Fatima and I work together a fair bit, and I consider Dana, Draco, and Aleesha my friends, and so of course I've gotten to know Dana's husband Pedro too. The Borichenkos are their own sweet brand of messed up, like all of us. The Singhs have each other, and keep mostly to themselves. Vanessa and I don't see eye to eye, but I'm still glad she's here. Uyen and Rhyzaea are always bickering about leadership decisions, as if they made those kind of calls. What did you want to know?", + "no": "Well, there's a bunch of us. We're starting to form a bit of a community. Fatima and I work together a fair bit, and I've been hanging out with Dana, Draco, and Aleesha quite a lot. I don't know the Borichenko bunch, the Singhs, Vanessa, Uyen, or Rhyzaea quite as well, but we've talked enough. What did you want to know?" + }, + "responses": [ + { "text": "Can you tell me about Fatima?", "topic": "TALK_REFUGEE_JENNY_Refugees2_Fatima" }, + { + "text": "What has made you friends with Dana, Draco, and Aleesha?", + "topic": "TALK_REFUGEE_JENNY_Refugees2_Friends" + }, + { "text": "Can you tell me about the Borichenkos?", "topic": "TALK_REFUGEE_JENNY_Refugees2_Borichenko" }, + { "text": "Can you tell me about the Singhs?", "topic": "TALK_REFUGEE_JENNY_Refugees2_Singh" }, + { "text": "Can you tell me about the others?", "topic": "TALK_REFUGEE_JENNY_Refugees2_Others" }, + { "text": "What was it you said earlier?", "topic": "TALK_NONE" }, + { "text": "I'd better get going.", "topic": "TALK_DONE" } + ] }, { "type": "talk_topic", - "id": "TALK_REFUGEE_JENNY_Refugees2_Fatima_early", + "id": "TALK_REFUGEE_JENNY_Refugees2_Fatima", "dynamic_line": "Fatima's a sweety, but she's a total dork. I know, I know, it's backwards for the engineer to call the heavy duty mechanic a nerd, but hey. I call it like it is. She and I have been doing some odd jobs around the upstairs here, fixing up old machinery and things.", "responses": [ - { "text": "What was it you said about the whole group, again?", "topic": "TALK_REFUGEE_JENNY_Refugees1_early" }, - { "text": "What has made you friends with Dana, Draco, and Aleesha?", "topic": "TALK_REFUGEE_JENNY_Refugees2_Friends_early" }, - { "text": "Can you tell me about the Borichenkos?", "topic": "TALK_REFUGEE_JENNY_Refugees2_Borichenko_early" }, - { "text": "Can you tell me about the Singhs?", "topic": "TALK_REFUGEE_JENNY_Refugees2_Singh_early" }, - { "text": "Can you tell me about the others?", "topic": "TALK_REFUGEE_JENNY_Refugees2_Others_early" }, - { "text": "What was it you said you were planning?", "topic": "TALK_REFUGEE_JENNY_Project1_early" }, - { "text": "What's it like living here?", "topic": "TALK_REFUGEE_JENNY_Personal1_early" }, - { "text": "I'd better get going.", "topic": "TALK_DONE" } ] + { "text": "What has made you friends with Dana, Draco, and Aleesha?", "topic": "TALK_REFUGEE_JENNY_Refugees2_Friends" }, + { "text": "Can you tell me about the Borichenkos?", "topic": "TALK_REFUGEE_JENNY_Refugees2_Borichenko" }, + { "text": "Can you tell me about the Singhs?", "topic": "TALK_REFUGEE_JENNY_Refugees2_Singh" }, + { "text": "Can you tell me about the others?", "topic": "TALK_REFUGEE_JENNY_Refugees2_Others" }, + { "text": "What was it you said earlier?", "topic": "TALK_NONE" }, + { "text": "I'd better get going.", "topic": "TALK_DONE" } + ] }, { "type": "talk_topic", - "id": "TALK_REFUGEE_JENNY_Refugees2_Friends_early", + "id": "TALK_REFUGEE_JENNY_Refugees2_Friends", "dynamic_line": "Well, Dana lost her baby right after , in a bus rollover. She was lucky to make it out alive. She and Pedro had one of the rougher trips here, I guess. We just kinda click as friends, I'm grateful there's someone else here I can really get along with. Draco is just a cantankerous old fart who hasn't actually got old yet, give him twenty years and he'll be there. I like grumpy people. We also have pretty similar taste in music. Aleesha's a sweet kid, and we've all kind of adopted her, but she seems to hang out with me and Dana the most.", "responses": [ - { "text": "Can you tell me about Fatima?", "topic": "TALK_REFUGEE_JENNY_Refugees2_Fatima_early" }, - { "text": "What was it you said about the whole group, again?", "topic": "TALK_REFUGEE_JENNY_Refugees1_early" }, - { "text": "Can you tell me about the Borichenkos?", "topic": "TALK_REFUGEE_JENNY_Refugees2_Borichenko_early" }, - { "text": "Can you tell me about the Singhs?", "topic": "TALK_REFUGEE_JENNY_Refugees2_Singh_early" }, - { "text": "Can you tell me about the others?", "topic": "TALK_REFUGEE_JENNY_Refugees2_Others_early" }, - { "text": "What was it you said you were planning?", "topic": "TALK_REFUGEE_JENNY_Project1_early" }, - { "text": "What's it like living here?", "topic": "TALK_REFUGEE_JENNY_Personal1_early" }, - { "text": "I'd better get going.", "topic": "TALK_DONE" } ] + { "text": "Can you tell me about Fatima?", "topic": "TALK_REFUGEE_JENNY_Refugees2_Fatima" }, + { "text": "Can you tell me about the Borichenkos?", "topic": "TALK_REFUGEE_JENNY_Refugees2_Borichenko" }, + { "text": "Can you tell me about the Singhs?", "topic": "TALK_REFUGEE_JENNY_Refugees2_Singh" }, + { "text": "Can you tell me about the others?", "topic": "TALK_REFUGEE_JENNY_Refugees2_Others" }, + { "text": "What was it you said earlier?", "topic": "TALK_NONE" }, + { "text": "I'd better get going.", "topic": "TALK_DONE" } + ] }, { "type": "talk_topic", - "id": "TALK_REFUGEE_JENNY_Project1_developed", - "dynamic_line": "About a month ago, I got a mold for making high-calibre air rifle bullets. I've been designing some turrets that would use a central air system to power pneumatic rifle turrets around the center. It's a lot easier than trying to make gunpowder!", + "id": "TALK_REFUGEE_JENNY_Refugees2_Borichenko", + "dynamic_line": { + "days_since_cataclysm": 90, + "yes": "I didn't get to know Boris, Garry, and Stan so well for the first while. They kinda kept to themselves. Boris and Garry had just lost their son, you know. It's pretty lucky that Stan was with them, he's Boris' little brother. Together, they're a pretty good team. I feel bad for thinking they were standoffish before. They probably do the most to pull their weight around here whenever there's work to be done.", + "no": "Boris and Garry are married, I guess. They kinda keep to themselves, they seem a bit standoffish if you ask me. Stan is Boris's brother, I think, but I'm not totally sure. He seems nice enough, but he's a man of few words. I can't get a good bead on them. I've learned not to pry too much though." + }, "responses": [ - { "text": "Tell me more about those turrets.", "topic": "TALK_REFUGEE_JENNY_Project2_developed" }, - { "text": "What's it like living here?", "topic": "TALK_REFUGEE_JENNY_Personal1_mid" }, - { "text": "Sounds interesting, talk to you later.", "topic": "TALK_DONE" } + { "text": "Can you tell me about Fatima?", "topic": "TALK_REFUGEE_JENNY_Refugees2_Fatima" }, + { + "text": "What has made you friends with Dana, Draco, and Aleesha?", + "topic": "TALK_REFUGEE_JENNY_Refugees2_Friends" + }, + { "text": "Can you tell me about the Singhs?", "topic": "TALK_REFUGEE_JENNY_Refugees2_Singh" }, + { "text": "Can you tell me about the others?", "topic": "TALK_REFUGEE_JENNY_Refugees2_Others" }, + { "text": "What was it you said earlier?", "topic": "TALK_NONE" }, + { "text": "I'd better get going.", "topic": "TALK_DONE" } ] }, { "type": "talk_topic", - "id": "TALK_REFUGEE_JENNY_Project2_developed", - "dynamic_line": "They're pretty big. This isn't something you'd carry around with you. They fire .30 cal bullets using compressed air that we'd make inside the basement and then pipe up to individual storage tanks for the guns that would be good for a few hundred shots each. The design should be capable of auto or semi-auto fire, at a range that's pretty comparable to a gunpowder-based weapon. It takes out some of the most limited parts of ranged weapons: no gunpowder, no brass casings, just lead that we melt into my mold. It's not soundless, but it's not as loud as a chemical weapon. There are tons of advantages. Only trouble is, I can't convince the Free Merchants to give me the parts I need.", + "id": "TALK_REFUGEE_JENNY_Refugees2_Singh", + "dynamic_line": { + "days_since_cataclysm": 120, + "yes": "The Singhs are really shy, and I think they feel pretty bad about making it through this together. They're the only complete family I've seen since . That has to feel really weird, and I think it's made them stick really close together. I think... I think they also just don't really like any of us.", + "no": "I really can't get a bead on them. They never really talk to anyone outside of their little family group, they just sit in their own spot and speak Punjabi. They always seem nice, and they do their share, they just don't have any social connection." + }, "responses": [ - { "text": "Is there some way I can help you get the stuff you need?", "topic": "TALK_MISSION_LIST" }, - { "text": "What's it like living here?", "topic": "TALK_REFUGEE_JENNY_Personal1_mid" }, - { "text": "Sounds interesting, talk to you later.", "topic": "TALK_DONE" } + { "text": "Can you tell me about Fatima?", "topic": "TALK_REFUGEE_JENNY_Refugees2_Fatima" }, + { + "text": "What has made you friends with Dana, Draco, and Aleesha?", + "topic": "TALK_REFUGEE_JENNY_Refugees2_Friends" + }, + { "text": "Can you tell me about the Borichenkos?", "topic": "TALK_REFUGEE_JENNY_Refugees2_Borichenko" }, + { "text": "Can you tell me about the others?", "topic": "TALK_REFUGEE_JENNY_Refugees2_Others" }, + { "text": "What was it you said earlier?", "topic": "TALK_NONE" }, + { "text": "I'd better get going.", "topic": "TALK_DONE" } ] }, { "type": "talk_topic", - "id": "TALK_REFUGEE_JENNY_Personal1_mid", - "dynamic_line": "There's good and there's bad. We're all pretty sick of being cooped up in here for the over two months, never knowing if there's going to be food to eat or not. It's starting to look like they're never going to let us go down to the secure basement, and none of us have slept well since we were brought in. We know we've got it pretty good... we're safe, we're alive.", + "id": "TALK_REFUGEE_JENNY_Refugees2_Others", + "dynamic_line": { + "days_since_cataclysm": 80, + "yes": "Vanessa... I'm doing my best, I really am, but we just do not get along. One of these days one of us is probably going to brain the other with a tire iron, and I'm just grateful I spend more time around the tire irons. Uyen and Rhyzaea are both excellent people, and I genuinely like them, but I can't stand this ongoing political bullshit they've got going on. Alonso is just a... he's... there's no polite word for what he is. A lot of the others are fine with it, and okay, sure, I guess. John is a walking stereotype, but he's a great poker buddy. I admit I kinda like him.", + "no": "Vanessa... well, she's nice, I guess. I gotta say, she kinda drives me nuts, but we're in this together so I try not to be too harsh. Uyen and Rhyzaea both seem to want to run the show here, but I try to stay out of those politics and just focus on building stuff. I don't see much good coming of it. Alonso is fine, he's clearly interested in me, and also in every other single woman here. Not my thing, in a group this small. John is a walking stereotype, I imagine there must be more depth to him, but I haven't seen it yet." + }, "responses": [ - { "text": "Tell me more about those turrets.", "topic": "TALK_REFUGEE_JENNY_Project2_developed" }, + { "text": "Can you tell me about Fatima?", "topic": "TALK_REFUGEE_JENNY_Refugees2_Fatima" }, + { + "text": "What has made you friends with Dana, Draco, and Aleesha?", + "topic": "TALK_REFUGEE_JENNY_Refugees2_Friends" + }, + { "text": "Can you tell me about the Borichenkos?", "topic": "TALK_REFUGEE_JENNY_Refugees2_Borichenko" }, + { "text": "Can you tell me about the Singhs?", "topic": "TALK_REFUGEE_JENNY_Refugees2_Singh" }, + { "text": "What was it you said earlier?", "topic": "TALK_NONE" }, { "text": "I'd better get going.", "topic": "TALK_DONE" } ] }, From f5ffb3fb6a4c7b592d17353dbae6e6808f27fc68 Mon Sep 17 00:00:00 2001 From: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com> Date: Thu, 17 Jan 2019 21:20:44 -0800 Subject: [PATCH 13/16] Switch to user-based conversation flag I realized that storting this flag on the NPC will cause her to recognize any player. "has met npc" flags will have to be stored on the user side. --- data/json/npcs/Conversation_Flags.json | 9 ----- .../refugee_center/NPC_Jenny_Forcette.json | 38 +++++++++++-------- 2 files changed, 23 insertions(+), 24 deletions(-) delete mode 100644 data/json/npcs/Conversation_Flags.json diff --git a/data/json/npcs/Conversation_Flags.json b/data/json/npcs/Conversation_Flags.json deleted file mode 100644 index aaa71bd1f9d47..0000000000000 --- a/data/json/npcs/Conversation_Flags.json +++ /dev/null @@ -1,9 +0,0 @@ -[ - { - "type": "effect_type", - "id": "player_has_met", - "//": "Use this flag to indicate if the player has met this NPC before.", - "name": [ "You've met before" ], - "desc": [ "AI tag: You've met this NPC before. If you have this effect it's a bug." ] - } -] diff --git a/data/json/npcs/refugee_center/NPC_Jenny_Forcette.json b/data/json/npcs/refugee_center/NPC_Jenny_Forcette.json index 4d404ed28ae3d..54b10888765ee 100644 --- a/data/json/npcs/refugee_center/NPC_Jenny_Forcette.json +++ b/data/json/npcs/refugee_center/NPC_Jenny_Forcette.json @@ -61,63 +61,71 @@ "faction": "free_merchants", "mission_offered": "MISSION_REFUGEE_Jenny_GET_MOTOR" }, + { + "type": "effect_type", + "id": "u_met_Jenny_Forcette", + "//": "Use this flag to indicate if the player has met this NPC before.", + "player_visible": false, + "name": [ "Met NPC Jenny Forcette" ], + "desc": [ "AI tag: You've met this NPC before. You're not supposed to be able to see this." ] + }, { "type": "talk_topic", "id": "TALK_REFUGEE_JENNY_1", "dynamic_line": { - "npc_has_effect": "player_has_met", + "u_has_effect": "u_met_Jenny_Forcette", "yes": [ "Hello again.", "Nice to see you again.", "What's up?" ], "no": "Hi there. Haven't see you around here before. I'm Jenny, Jenny Forcette." }, "responses": [ { "text": "Nice meeting you. What are you doing on that computer?", - "condition": { "and": [ { "days_since_cataclysm": 60 }, { "not": { "npc_has_effect": "player_has_met" } } ] }, - "effect": { "npc_add_effect": "player_has_met", "duration": "PERMANENT" }, + "condition": { "and": [ { "days_since_cataclysm": 60 }, { "not": { "u_has_effect": "u_met_Jenny_Forcette" } } ] }, + "effect": { "u_add_effect": "u_met_Jenny_Forcette", "duration": "PERMANENT" }, "topic": "TALK_REFUGEE_JENNY_Project1_developed", "switch": true }, { - "text": "Hi, Jenny. What are you doing on that computer?", + "text": "Hi, Jenny. What are you up to these days?", "condition": { "days_since_cataclysm": 60 }, "topic": "TALK_REFUGEE_JENNY_Project1_developed", "switch": true }, { "text": "Nice meeting you. What are you doing on that computer?", - "condition": { "and": [ { "days_since_cataclysm": 30 }, { "not": { "npc_has_effect": "player_has_met" } } ] }, - "effect": { "npc_add_effect": "player_has_met", "duration": "PERMANENT" }, + "condition": { "and": [ { "days_since_cataclysm": 30 }, { "not": { "u_has_effect": "u_met_Jenny_Forcette" } } ] }, + "effect": { "u_add_effect": "u_met_Jenny_Forcette", "duration": "PERMANENT" }, "topic": "TALK_REFUGEE_JENNY_Project1_early", "switch": true }, { - "text": "Hi, Jenny. What are you doing on that computer?", + "text": "Hi, Jenny. What are you up to these days?", "condition": { "days_since_cataclysm": 30 }, "topic": "TALK_REFUGEE_JENNY_Project1_early", "switch": true }, { "text": "Nice meeting you. What are you doing on that computer?", - "condition": { "not": { "npc_has_effect": "player_has_met" } }, - "effect": { "npc_add_effect": "player_has_met", "duration": "PERMANENT" }, + "condition": { "not": { "u_has_effect": "u_met_Jenny_Forcette" } }, + "effect": { "u_add_effect": "u_met_Jenny_Forcette", "duration": "PERMANENT" }, "topic": "TALK_REFUGEE_JENNY_Project1_veryearly", "switch": true }, { - "text": "Hi, Jenny. What are you doing on that computer?", - "condition": { "npc_has_effect": "player_has_met" }, + "text": "Hi, Jenny. What are you up to these days?", + "condition": { "u_has_effect": "u_met_Jenny_Forcette" }, "topic": "TALK_REFUGEE_JENNY_Project1_veryearly", "switch": true }, { "text": "Nice meeting you. I'd best get going, though.", - "condition": { "not": { "npc_has_effect": "player_has_met" } }, - "effect": { "npc_add_effect": "player_has_met", "duration": "PERMANENT" }, + "condition": { "not": { "u_has_effect": "u_met_Jenny_Forcette" } }, + "effect": { "u_add_effect": "u_met_Jenny_Forcette", "duration": "PERMANENT" }, "topic": "TALK_DONE" }, { "text": "Sorry Jenny, I can't stay to chat.", - "condition": { "npc_has_effect": "player_has_met" }, + "condition": { "u_has_effect": "u_met_Jenny_Forcette" }, "topic": "TALK_DONE" } ] @@ -249,7 +257,7 @@ { "type": "talk_topic", "id": "TALK_REFUGEE_JENNY_Refugees2_Friends", - "dynamic_line": "Well, Dana lost her baby right after , in a bus rollover. She was lucky to make it out alive. She and Pedro had one of the rougher trips here, I guess. We just kinda click as friends, I'm grateful there's someone else here I can really get along with. Draco is just a cantankerous old fart who hasn't actually got old yet, give him twenty years and he'll be there. I like grumpy people. We also have pretty similar taste in music. Aleesha's a sweet kid, and we've all kind of adopted her, but she seems to hang out with me and Dana the most.", + "dynamic_line": "Well, Dana lost her baby right after , in a bus rollover. She was lucky to make it out alive. She and Pedro had one of the rougher trips here, I guess. We just kinda click as friends, I'm grateful there's someone else here I can really get along with. Her husband, Pedro, is still pretty shellshocked. He doesn't talk much. I like him though, when he opens up he's just hilarious. Draco is just a cantankerous old fart who hasn't actually got old yet, give him twenty years and he'll be there. I like grumpy people. We also have pretty similar taste in music. Aleesha's a sweet kid, and we've all kind of adopted her, but she seems to hang out with me and Dana the most. She's a great artist, and she's full of crazy ideas. I guess I like her because of all of us, she seems to have the most hope that there's a future to be had.", "responses": [ { "text": "Can you tell me about Fatima?", "topic": "TALK_REFUGEE_JENNY_Refugees2_Fatima" }, { "text": "Can you tell me about the Borichenkos?", "topic": "TALK_REFUGEE_JENNY_Refugees2_Borichenko" }, From d13de3f3fc1ca1f4a71347b4719d084436dbc86c Mon Sep 17 00:00:00 2001 From: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com> Date: Fri, 18 Jan 2019 07:18:42 -0800 Subject: [PATCH 14/16] fix visibility flag --- data/json/npcs/refugee_center/NPC_Jenny_Forcette.json | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/data/json/npcs/refugee_center/NPC_Jenny_Forcette.json b/data/json/npcs/refugee_center/NPC_Jenny_Forcette.json index 54b10888765ee..18a2fa0f26ad9 100644 --- a/data/json/npcs/refugee_center/NPC_Jenny_Forcette.json +++ b/data/json/npcs/refugee_center/NPC_Jenny_Forcette.json @@ -64,10 +64,7 @@ { "type": "effect_type", "id": "u_met_Jenny_Forcette", - "//": "Use this flag to indicate if the player has met this NPC before.", - "player_visible": false, - "name": [ "Met NPC Jenny Forcette" ], - "desc": [ "AI tag: You've met this NPC before. You're not supposed to be able to see this." ] + "//": "Use this flag to indicate if the player has met this NPC before." }, { "type": "talk_topic", From 2edf4d991e414abad24f7619e6723e2ddb5e9802 Mon Sep 17 00:00:00 2001 From: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com> Date: Fri, 18 Jan 2019 08:22:22 -0800 Subject: [PATCH 15/16] Update NPC_Jenny_Forcette.json Fix a typo where I somehow wrote a name *I invented* incorrectly. I need to cut back on the booze. --- data/json/npcs/refugee_center/NPC_Jenny_Forcette.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/npcs/refugee_center/NPC_Jenny_Forcette.json b/data/json/npcs/refugee_center/NPC_Jenny_Forcette.json index 18a2fa0f26ad9..b3faa267f769d 100644 --- a/data/json/npcs/refugee_center/NPC_Jenny_Forcette.json +++ b/data/json/npcs/refugee_center/NPC_Jenny_Forcette.json @@ -13,7 +13,7 @@ "worn_override": "REFUGEE_Jenny_worn", "carry_override": "REFUGEE_Jenny_carried", "weapon_override": "REFUGEE_Jenny_wield", - "traits": [ { "trait": "PACIFIST" }, { "trait": "Exp_MechEng2" } ], + "traits": [ { "trait": "PACIFIST" }, { "trait": "Exp_Eng_Mechanical2" } ], "skills": [ { "skill": "mechanics", "bonus": { "rng": [ 5, 7 ] } }, { "skill": "computer", "bonus": { "rng": [ 2, 5 ] } }, From 1ccafba773ae132e2e483459b1aba4c48c113fb6 Mon Sep 17 00:00:00 2001 From: I-am-Erk <45136638+I-am-Erk@users.noreply.github.com> Date: Mon, 21 Jan 2019 11:10:24 -0800 Subject: [PATCH 16/16] add some info about free merchants also a bit for her 'late' phase that I'm adding to other refugees --- .../refugee_center/NPC_Jenny_Forcette.json | 51 ++++++++++++++++++- 1 file changed, 49 insertions(+), 2 deletions(-) diff --git a/data/json/npcs/refugee_center/NPC_Jenny_Forcette.json b/data/json/npcs/refugee_center/NPC_Jenny_Forcette.json index b3faa267f769d..ee72be2a81e80 100644 --- a/data/json/npcs/refugee_center/NPC_Jenny_Forcette.json +++ b/data/json/npcs/refugee_center/NPC_Jenny_Forcette.json @@ -191,7 +191,18 @@ "dynamic_line": "About a month ago, I got a mold for making high-calibre air rifle bullets. I've been designing some turrets that would use a central air system to power pneumatic rifle turrets around the center. It's a lot easier than trying to make gunpowder!", "responses": [ { "text": "Tell me more about those turrets.", "topic": "TALK_REFUGEE_JENNY_Project2_developed" }, - { "text": "What's it like living here?", "topic": "TALK_REFUGEE_JENNY_Personal1_mid" }, + { + "text": "What's it like living here?", + "condition": { "days_since_cataclysm": 120 }, + "topic": "TALK_REFUGEE_JENNY_Personal1_late", + "switch": true + }, + { + "text": "What's it like living here?", + "condition": { "days_since_cataclysm": 60 }, + "topic": "TALK_REFUGEE_JENNY_Personal1_mid", + "switch": true + }, { "text": "Can you tell me anything about the other refugees here?", "topic": "TALK_REFUGEE_JENNY_Refugees1" }, { "text": "Sounds interesting, talk to you later.", "topic": "TALK_DONE" } ] @@ -217,6 +228,16 @@ { "text": "I'd better get going.", "topic": "TALK_DONE" } ] }, + { + "type": "talk_topic", + "id": "TALK_REFUGEE_JENNY_Personal1_late", + "dynamic_line": "It's getting bad. We've been stuck in here for months, nothing changing, nothing improving. We can't go outside, we don't have enough to eat, and we didn't choose to be with each other. I don't know how long we can stay like this before somebody snaps.", + "responses": [ + { "text": "Tell me more about those turrets.", "topic": "TALK_REFUGEE_JENNY_Project2_developed" }, + { "text": "Can you tell me anything about the other refugees here?", "topic": "TALK_REFUGEE_JENNY_Refugees1" }, + { "text": "I'd better get going.", "topic": "TALK_DONE" } + ] + }, { "type": "talk_topic", "id": "TALK_REFUGEE_JENNY_Refugees1", @@ -225,6 +246,24 @@ "yes": "For better or worse, we're a community now. Fatima and I work together a fair bit, and I consider Dana, Draco, and Aleesha my friends, and so of course I've gotten to know Dana's husband Pedro too. The Borichenkos are their own sweet brand of messed up, like all of us. The Singhs have each other, and keep mostly to themselves. Vanessa and I don't see eye to eye, but I'm still glad she's here. Uyen and Rhyzaea are always bickering about leadership decisions, as if they made those kind of calls. What did you want to know?", "no": "Well, there's a bunch of us. We're starting to form a bit of a community. Fatima and I work together a fair bit, and I've been hanging out with Dana, Draco, and Aleesha quite a lot. I don't know the Borichenko bunch, the Singhs, Vanessa, Uyen, or Rhyzaea quite as well, but we've talked enough. What did you want to know?" }, + "responses": [ + { "text": "Can you tell me about the Free Merchants?", "topic": "TALK_REFUGEE_JENNY_FreeMerchants" }, + { "text": "Can you tell me about Fatima?", "topic": "TALK_REFUGEE_JENNY_Refugees2_Fatima" }, + { + "text": "What has made you friends with Dana, Draco, and Aleesha?", + "topic": "TALK_REFUGEE_JENNY_Refugees2_Friends" + }, + { "text": "Can you tell me about the Borichenkos?", "topic": "TALK_REFUGEE_JENNY_Refugees2_Borichenko" }, + { "text": "Can you tell me about the Singhs?", "topic": "TALK_REFUGEE_JENNY_Refugees2_Singh" }, + { "text": "Can you tell me about the others?", "topic": "TALK_REFUGEE_JENNY_Refugees2_Others" }, + { "text": "What was it you said earlier?", "topic": "TALK_NONE" }, + { "text": "I'd better get going.", "topic": "TALK_DONE" } + ] + }, + { + "type": "talk_topic", + "id": "TALK_REFUGEE_JENNY_FreeMerchants", + "dynamic_line": "They run this place, and they don't run a charity. We get paid for working around the place, maintaining it, what have you, and we trade cash for food. The thing is, supply and demand and all... there's a lot more cash than food around. It's easier to buy a laptop than a piece of beef jerky, and there's no sign of that getting better. The balance is way off right now, a hard day of work barely gets you enough to fill your belly. I shouldn't bitch too much though. I don't know much better way to run it, although rumour is that the folks living downstairs have it a lot easier than we do. I try not to think too much on that.", "responses": [ { "text": "Can you tell me about Fatima?", "topic": "TALK_REFUGEE_JENNY_Refugees2_Fatima" }, { @@ -243,7 +282,11 @@ "id": "TALK_REFUGEE_JENNY_Refugees2_Fatima", "dynamic_line": "Fatima's a sweety, but she's a total dork. I know, I know, it's backwards for the engineer to call the heavy duty mechanic a nerd, but hey. I call it like it is. She and I have been doing some odd jobs around the upstairs here, fixing up old machinery and things.", "responses": [ - { "text": "What has made you friends with Dana, Draco, and Aleesha?", "topic": "TALK_REFUGEE_JENNY_Refugees2_Friends" }, + { "text": "Can you tell me about the Free Merchants?", "topic": "TALK_REFUGEE_JENNY_FreeMerchants" }, + { + "text": "What has made you friends with Dana, Draco, and Aleesha?", + "topic": "TALK_REFUGEE_JENNY_Refugees2_Friends" + }, { "text": "Can you tell me about the Borichenkos?", "topic": "TALK_REFUGEE_JENNY_Refugees2_Borichenko" }, { "text": "Can you tell me about the Singhs?", "topic": "TALK_REFUGEE_JENNY_Refugees2_Singh" }, { "text": "Can you tell me about the others?", "topic": "TALK_REFUGEE_JENNY_Refugees2_Others" }, @@ -256,6 +299,7 @@ "id": "TALK_REFUGEE_JENNY_Refugees2_Friends", "dynamic_line": "Well, Dana lost her baby right after , in a bus rollover. She was lucky to make it out alive. She and Pedro had one of the rougher trips here, I guess. We just kinda click as friends, I'm grateful there's someone else here I can really get along with. Her husband, Pedro, is still pretty shellshocked. He doesn't talk much. I like him though, when he opens up he's just hilarious. Draco is just a cantankerous old fart who hasn't actually got old yet, give him twenty years and he'll be there. I like grumpy people. We also have pretty similar taste in music. Aleesha's a sweet kid, and we've all kind of adopted her, but she seems to hang out with me and Dana the most. She's a great artist, and she's full of crazy ideas. I guess I like her because of all of us, she seems to have the most hope that there's a future to be had.", "responses": [ + { "text": "Can you tell me about the Free Merchants?", "topic": "TALK_REFUGEE_JENNY_FreeMerchants" }, { "text": "Can you tell me about Fatima?", "topic": "TALK_REFUGEE_JENNY_Refugees2_Fatima" }, { "text": "Can you tell me about the Borichenkos?", "topic": "TALK_REFUGEE_JENNY_Refugees2_Borichenko" }, { "text": "Can you tell me about the Singhs?", "topic": "TALK_REFUGEE_JENNY_Refugees2_Singh" }, @@ -273,6 +317,7 @@ "no": "Boris and Garry are married, I guess. They kinda keep to themselves, they seem a bit standoffish if you ask me. Stan is Boris's brother, I think, but I'm not totally sure. He seems nice enough, but he's a man of few words. I can't get a good bead on them. I've learned not to pry too much though." }, "responses": [ + { "text": "Can you tell me about the Free Merchants?", "topic": "TALK_REFUGEE_JENNY_FreeMerchants" }, { "text": "Can you tell me about Fatima?", "topic": "TALK_REFUGEE_JENNY_Refugees2_Fatima" }, { "text": "What has made you friends with Dana, Draco, and Aleesha?", @@ -293,6 +338,7 @@ "no": "I really can't get a bead on them. They never really talk to anyone outside of their little family group, they just sit in their own spot and speak Punjabi. They always seem nice, and they do their share, they just don't have any social connection." }, "responses": [ + { "text": "Can you tell me about the Free Merchants?", "topic": "TALK_REFUGEE_JENNY_FreeMerchants" }, { "text": "Can you tell me about Fatima?", "topic": "TALK_REFUGEE_JENNY_Refugees2_Fatima" }, { "text": "What has made you friends with Dana, Draco, and Aleesha?", @@ -313,6 +359,7 @@ "no": "Vanessa... well, she's nice, I guess. I gotta say, she kinda drives me nuts, but we're in this together so I try not to be too harsh. Uyen and Rhyzaea both seem to want to run the show here, but I try to stay out of those politics and just focus on building stuff. I don't see much good coming of it. Alonso is fine, he's clearly interested in me, and also in every other single woman here. Not my thing, in a group this small. John is a walking stereotype, I imagine there must be more depth to him, but I haven't seen it yet." }, "responses": [ + { "text": "Can you tell me about the Free Merchants?", "topic": "TALK_REFUGEE_JENNY_FreeMerchants" }, { "text": "Can you tell me about Fatima?", "topic": "TALK_REFUGEE_JENNY_Refugees2_Fatima" }, { "text": "What has made you friends with Dana, Draco, and Aleesha?",