From ff64589e46ab568ccd62b62a48f1e04ff51a770c Mon Sep 17 00:00:00 2001 From: LyleSY Date: Wed, 7 Oct 2020 20:49:16 -0400 Subject: [PATCH 01/40] [Aftershock] forgotten experiment new unique NPC Sadie --- data/mods/Aftershock/npcs/classes.json | 66 ++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) diff --git a/data/mods/Aftershock/npcs/classes.json b/data/mods/Aftershock/npcs/classes.json index cc5696dbc594b..31c074af2dee5 100644 --- a/data/mods/Aftershock/npcs/classes.json +++ b/data/mods/Aftershock/npcs/classes.json @@ -159,5 +159,71 @@ "chat": "TALK_WHATELY_GENERIC1", "faction": "whately_family", "gender": "male" + }, + { + "type": "npc", + "id": "sadie", + "name_unique": "Sadie", + "name_suffix": "forgotten experiment", + "class": "afs_forgotten_experiment", + "attitude": 0, + "mission": 7, + "chat": "TALK_Sadie_1", + "mission_offered": "MISSION_sadie_nuts", + "faction": "no_faction", + "gender": "female" + }, + { + "type": "npc_class", + "id": "afs_forgotten_experiment", + "name": "forgotten experiment", + "job_description": "What a magical world to explore…", + "common": false, + "traits": [ + [ "PRETTY", 100 ], + [ "OPTIMISTIC", 100 ], + [ "INT_DOWN_3", 100 ], + [ "STR_UP_3", 100 ], + [ "THRESH_MEDICAL", 100 ], + [ "CENOBITE", 100 ], + { "group": "trait_group_medical" }, + { + "distribution": [ { "group": "trait_group_medical_nonthres" }, { "group": "trait_group_medical_postthres" } ] + } + ], + "skills": [ + { "skill": "ALL", "level": { "mul": [ { "one_in": 3 }, { "sum": [ { "dice": [ 2, 2 ] }, { "constant": -4 } ] } ] } }, + { "skill": "firstaid", "bonus": { "rng": [ 4, 8 ] } } + ], + "bionics": [ + { "id": "bio_ankles", "chance": 5 }, + { "id": "bio_batteries", "chance": 20 }, + { "id": "bio_carbon", "chance": 30 }, + { "id": "bio_claws", "chance": 10 }, + { "id": "bio_noise", "chance": 10 }, + { "id": "bio_power_weakness", "chance": 5 }, + { "id": "bio_itchy", "chance": 15 }, + { "id": "bio_laser", "chance": 10 }, + { "id": "bio_thumbs", "chance": 10 }, + { "id": "bio_spasm", "chance": 10 }, + { "id": "bio_shakes", "chance": 10 }, + { "id": "bio_dex_enhancer", "chance": 20 }, + { "id": "bio_sleepy", "chance": 5 }, + { "id": "bio_heat_absorb", "chance": 20 }, + { "id": "bio_eye_enhancer", "chance": 20 }, + { "id": "bio_pokedeye", "chance": 10 }, + { "id": "bio_hydraulics", "chance": 10 }, + { "id": "bio_painkiller", "chance": 15 }, + { "id": "bio_shock", "chance": 10 }, + { "id": "bio_speed", "chance": 10 }, + { "id": "bio_str_enhancer", "chance": 100 }, + { "id": "bio_armor_head", "chance": 3 }, + { "id": "bio_armor_torso", "chance": 15 }, + { "id": "bio_armor_arms", "chance": 30 }, + { "id": "bio_armor_legs", "chance": 25 }, + { "id": "bio_razors", "chance": 15 }, + { "id": "bio_power_storage", "chance": 100 }, + { "id": "bio_torsionratchet", "chance": 20 } + ] } ] From 23536326693e0912684afa3abb3c6f43739c3585 Mon Sep 17 00:00:00 2001 From: LyleSY Date: Wed, 7 Oct 2020 23:28:06 -0400 Subject: [PATCH 02/40] Sadie dialog --- data/mods/Aftershock/npcs/sadie.json | 188 +++++++++++++++++++++++++++ 1 file changed, 188 insertions(+) create mode 100644 data/mods/Aftershock/npcs/sadie.json diff --git a/data/mods/Aftershock/npcs/sadie.json b/data/mods/Aftershock/npcs/sadie.json new file mode 100644 index 0000000000000..03885055941a5 --- /dev/null +++ b/data/mods/Aftershock/npcs/sadie.json @@ -0,0 +1,188 @@ +[ + { + "type": "effect_type", + "id": "u_met_sadie" + }, + { + "type": "effect_type", + "id": "sadie_injection", + "name": [ "Sadie's injection" ], + "desc": [ "" ], + "blood_analysis_description": "Several hundred lines of text list a series of complex biological molecules with unknown interactions. Many appear to be associated with healing and immune response. Only a few are known to be poisonous and many are known carcinogens. Several have psychological and hormonal effects.", + "duration": 2000, + "rating": "mixed", + "apply_message": "A wave of cold runs through your body and you feel dizzy", + "remove_message": "The effects of Sadie's injection appear to be wearing off now", + "removes_effects": [ "bite", "flu" ], + "blocks_effects": [ "bite", "cold", "flu" ], + "base_mods": { "str_mod": [ 1 ], "sleep_chance": [ -1003 ], "sleep_min": [ 2500 ], "sleep_max": [ 3500 ] } + }, + { + "type": "talk_topic", + "id": "TALK_Sadie_1", + "dynamic_line": { + "u_has_var": "u_met_sadie", + "type": "general", + "context": "meeting", + "value": "yes", + "yes": [ + "Are we meeting again or did we already do that part?", + "You remind me of my friend Billy.", + "What an amazing world to be alive in, more or less.", + "My head always beats when I see you. Or is that my heart? I should check that.", + "It's always so nice to be seen." + ], + "no": "Hello Billy. Back again to try and kill me? It won't work, you should just give up." + }, + "responses": [ + { + "text": "What, who is Billy?", + "effect": { "u_add_var": "u_met_sadie", "type": "general", "context": "meeting", "value": "yes" }, + "condition": { "not": { "u_has_var": "u_met_sadie", "type": "general", "context": "meeting", "value": "yes" } }, + "topic": "TALK_sadie_firstmeet" + }, + { + "text": "Die foul creature!", + "effect": [ { "u_add_var": "u_met_sadie", "type": "general", "context": "meeting", "value": "yes" }, "insult_combat" ], + "condition": { "not": { "u_has_var": "u_met_sadie", "type": "general", "context": "meeting", "value": "yes" } }, + "topic": "TALK_DONE" + }, + { + "text": "What did you just inject me with?", + "condition": { "u_has_var": "sadie_injection", "type": "general", "context": "injection", "value": "yes" }, + "topic": "TALK_sadie_ask_injection" + }, + { + "text": "Can you inject me with whatever that was again?", + "condition": { "u_has_var": "sadie_nuts", "type": "general", "context": "nuts", "value": "yes" }, + "topic": "TALK_sadie_ask_injection2" + }, + { + "text": "How did you get here?", + "condition": { "u_has_var": "u_met_sadie", "type": "general", "context": "meeting", "value": "yes" }, + "topic": "TALK_sadie_ask_past" + }, + { + "text": "How are things here?", + "condition": { "u_has_var": "u_met_sadie", "type": "general", "context": "meeting", "value": "yes" }, + "topic": "TALK_sadie_ask_mood" + }, + { + "text": "Can I do anything for you?", + "condition": { "u_has_var": "u_met_sadie", "type": "general", "context": "meeting", "value": "yes" }, + "topic": "TALK_MISSION_LIST" + }, + { "text": "Goodbye.", "topic": "TALK_DONE" } + ] + }, + { + "type": "talk_topic", + "id": "TALK_sadie_firstmeet", + "dynamic_line": "Oh. I see now. You have different sexual traits than Billy, likely due to a mutation or cybernetic enhancement, useful in mating rituals, the act of reproduction, and establishing social hierarchies. Very good, I accept that you are either not Billy or have changed enough that we can establish a new relationship beyond violence, for example based around the gathering of food, mating, or shared hobbies such as badminton or photography. How do you wish to proceed with our relationship not-Billy?", + "responses": [ + { "text": "I'd like to understand more about you first. Are you human, more or less?", "topic": "TALK_sadie_what" }, + { "text": "You are aware of the Cataclysm?", "topic": "TALK_sadie_cataclysm" }, + { "text": "I am your new friend and I'm here to help you.", "topic": "TALK_sadie_1" } + ] + }, + { + "type": "talk_topic", + "id": "TALK_sadie_what", + "dynamic_line": "Yes, much of what you see is human I think. I don't have the proper equipment to be entirely sure and I have some strange memories. My beacon has already told you that I am Sadie. Beyond that I don't know much to tell you. I know a great deal about medicine. I have some strange responses to physical stimula that I don't completely understand. I think I must be a medical experiment of some kind. I am hungry.", + "responses": [ { "text": "Can I help you?", "topic": "TALK_MISSION_LIST" }, { "text": "I should go.", "topic": "TALK_DONE" } ] + }, + { + "type": "talk_topic", + "id": "TALK_sadie_ask_past", + "dynamic_line": "I have so many memories, but they feel like they belong to other people? And animals too I think? It makes me dizzy and I have to sit down.", + "responses": [ { "text": "Let's talk about something else.", "topic": "TALK_sadie_1" } ] + }, + { + "type": "talk_topic", + "id": "TALK_sadie_cataclysm", + "dynamic_line": "I don't know her.", + "responses": [ { "text": "Yes. Let's talk about something else.", "topic": "TALK_sadie_1" } ] + }, + { + "type": "talk_topic", + "id": "TALK_sadie_ask_mood", + "dynamic_line": "Things stay pretty much the same here. Sometimes I feel bad, and that feels good, and sometimes I feel good, and that feels good too. Overall things are better than you might expect, but this may be a common experience, in which case things are exactly as you might expect. Does that make sense?", + "responses": [ { "text": "Perfect sense.", "topic": "TALK_sadie_1" } ] + }, + { + "type": "talk_topic", + "id": "TALK_sadie_injection", + "dynamic_line": "I hope you like it, it's one of my favorite things in the world, actually a lot of them all blended together. It should feel really good. Or really bad, I guess I don't know much about your body chemistry. You're still alive, that's a really good sign!", + "responses": [ + { + "text": "Wonderful. Please don't inject me with anything else unless I ask for it in the future.", + "effect": [ + { "u_lose_var": "sadie_injection", "type": "general", "context": "injection", "value": "yes" }, + { "u_add_var": "sadie_nuts", "type": "general", "context": "nuts", "value": "yes" } + ], + "topic": "TALK_sadie_1" + } + ] + }, + { + "type": "talk_topic", + "id": "TALK_sadie_injection2", + "dynamic_line": "I'm so glad you liked it. It really means a lot to me that we have similar body chemistry. That's so important for all kinds of biological and emotional compatibility for example organ transplants and the reproductive act. This shows how I feel about you, I think.", + "responses": [ + { + "text": "I'm glad we get along so well Sadie.", + "effect": [ { "u_add_effect": "give_aid" }, { "u_add_effect": "morale_chat" }, { "u_add_effect": "sadie_injection" } ], + "topic": "TALK_sadie_1" + } + ] + }, + { + "id": "MISSION_sadie_nuts", + "type": "mission_definition", + "name": "Nuts for Sadie", + "description": "Find nuts", + "goal": "MGOAL_FIND_ITEM", + "difficulty": 1, + "value": 0, + "item": [ + "hickory_nut", + "peanut", + "hazelnut", + "chestnut", + "walnut", + "pine_nuts", + "peanut_unshelled", + "beech_nuts", + "walnut_unshelled", + "walnut_roasted", + "chestnut_unshelled", + "chestnut_roasted", + "hazelnut_unshelled", + "soy_nuts", + "hazelnut_roasted", + "hickory_nut_unshelled", + "hickory_nut_roasted" + ], + "count": 1, + "origins": [ "ORIGIN_SECONDARY" ], + "dialogue": { + "describe": "Can you get me some nuts?", + "offer": "I miss nuts, I remember that I liked to eat them. Can you get me some nuts?", + "accepted": "Hurray! I love nuts.", + "rejected": "This makes me sad. Which makes me happy. So thanks? Let me know if you change your mind.", + "advice": "Nuts can be found growing on certain trees, in stores and in homes, as well as hidden in bushes to be enjoyed later. I know all about nuts.", + "inquire": "Do you have some nuts for me?", + "success": "Hurray! I love nuts. Here, let me inject you with this.", + "success_lie": "Aw, nuts.", + "failure": "This is nuts. Is it really so hard to find nuts out there? Thank you for trying though, your failure gives me pleasure. What else are you bad at?" + }, + "end": { + "effect": [ + { "u_add_effect": "give_aid" }, + { "u_add_effect": "morale_chat" }, + { "u_add_effect": "sadie_injection" }, + { "u_add_var": "sadie_injection", "type": "general", "context": "injection", "value": "yes" } + ] + } + } +] From 90afee66004c87c0d1cc5e65588ce8bad0506224 Mon Sep 17 00:00:00 2001 From: LyleSY Date: Thu, 8 Oct 2020 00:41:59 -0400 Subject: [PATCH 03/40] missing lab assistant mission --- data/mods/Aftershock/npcs/cyrus_whately.json | 26 ++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/data/mods/Aftershock/npcs/cyrus_whately.json b/data/mods/Aftershock/npcs/cyrus_whately.json index e42509a09d772..a65f3f9d3ab87 100644 --- a/data/mods/Aftershock/npcs/cyrus_whately.json +++ b/data/mods/Aftershock/npcs/cyrus_whately.json @@ -203,6 +203,7 @@ "item": "living_brain_jar", "count": 2, "origins": [ "ORIGIN_SECONDARY" ], + "followup": "MISSION_LAST_ASSISTANT", "dialogue": { "describe": "I need some brains, but brains that are still living. We've got our own brain blasters, but I won't risk them in experiments.", "offer": "If this works I may be able to give some of these poor souls bodies again. Six should do.", @@ -215,5 +216,30 @@ "failure": "I can't be Dr Frankenstein unless you get me these." }, "end": { "effect": [ { "u_buy_item": "inactive_frankenstein", "count": 1 } ] } + }, + { + "id": "MISSION_LAST_ASSISTANT", + "type": "mission_definition", + "name": "The last lab assistant", + "description": "Find the missing lab assistant.", + "goal": "MGOAL_TALK_TO_NPC", + "difficulty": 5, + "value": 0, + "start": { + "assign_mission_target": { "om_terrain": "abandonedwarehouse", "reveal_radius": 1, "random": true, "search_range": 120 }, + "update_mapgen": { "om_terrain": "abandonedwarehouse", "place_npcs": [ { "class": "sadie", "x": 19, "y": 20, "target": "true" } ] } + }, + "origins": [ "ORIGIN_SECONDARY" ], + "dialogue": { + "describe": "My previous lab assistant Willsworth was charged with getting some important medicine back from storage, but they are late, more than usual. Go to the storage unit and find them.", + "offer": "I need my medicine. Maybe you could find the courier?", + "accepted": "Perfect, I am sure all is well, but best to be dead certain.", + "rejected": "You are refusing vital medicine for those in need. I demand you reconsider.", + "advice": "Willsworth, sort of a shortish, tallish, maybe mediumish, mostly human probably, probably some kind of gender. It doesn't matter, they should be there.", + "inquire": "Yes, where is my medicine?", + "success": "Well that's fine I suppose, I already went ahead and made more. Do tell me if you ever find Willsworth, there are some good bionics in there I'd like back.", + "success_lie": "Thanks for trying… I guess.", + "failure": "Disappointing. Of course I knew this would happen and have already prepared a replacement. And perhaps I should make a replacement for you as well?" + } } ] From 8a89cc88a730216e26bd7d6a85d95d4c5afef6e4 Mon Sep 17 00:00:00 2001 From: LyleSY Date: Thu, 8 Oct 2020 07:12:18 -0400 Subject: [PATCH 04/40] true formatting --- data/mods/Aftershock/npcs/cyrus_whately.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/mods/Aftershock/npcs/cyrus_whately.json b/data/mods/Aftershock/npcs/cyrus_whately.json index a65f3f9d3ab87..008676c1aba8c 100644 --- a/data/mods/Aftershock/npcs/cyrus_whately.json +++ b/data/mods/Aftershock/npcs/cyrus_whately.json @@ -227,7 +227,7 @@ "value": 0, "start": { "assign_mission_target": { "om_terrain": "abandonedwarehouse", "reveal_radius": 1, "random": true, "search_range": 120 }, - "update_mapgen": { "om_terrain": "abandonedwarehouse", "place_npcs": [ { "class": "sadie", "x": 19, "y": 20, "target": "true" } ] } + "update_mapgen": { "om_terrain": "abandonedwarehouse", "place_npcs": [ { "class": "sadie", "x": 19, "y": 20, "target": true } ] } }, "origins": [ "ORIGIN_SECONDARY" ], "dialogue": { From 50f89b26d52ddb7bc4eb464add9b1abdcc56821c Mon Sep 17 00:00:00 2001 From: LyleSY Date: Thu, 8 Oct 2020 13:53:35 -0400 Subject: [PATCH 05/40] stimulation --- data/mods/Aftershock/npcs/sadie.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/mods/Aftershock/npcs/sadie.json b/data/mods/Aftershock/npcs/sadie.json index 03885055941a5..30b7ae47c6020 100644 --- a/data/mods/Aftershock/npcs/sadie.json +++ b/data/mods/Aftershock/npcs/sadie.json @@ -88,7 +88,7 @@ { "type": "talk_topic", "id": "TALK_sadie_what", - "dynamic_line": "Yes, much of what you see is human I think. I don't have the proper equipment to be entirely sure and I have some strange memories. My beacon has already told you that I am Sadie. Beyond that I don't know much to tell you. I know a great deal about medicine. I have some strange responses to physical stimula that I don't completely understand. I think I must be a medical experiment of some kind. I am hungry.", + "dynamic_line": "Yes, much of what you see is human I think. I don't have the proper equipment to be entirely sure and I have some strange memories. My beacon has already told you that I am Sadie. Beyond that I don't know much to tell you. I know a great deal about medicine. I have some strange responses to physical stimuli that I don't completely understand. I think I must be a medical experiment of some kind. I am hungry.", "responses": [ { "text": "Can I help you?", "topic": "TALK_MISSION_LIST" }, { "text": "I should go.", "topic": "TALK_DONE" } ] }, { From e8bc7f20386e0fd8a8124647597039df0389cbc1 Mon Sep 17 00:00:00 2001 From: LyleSY Date: Fri, 9 Oct 2020 19:08:39 -0400 Subject: [PATCH 06/40] Update data/mods/Aftershock/npcs/classes.json Co-authored-by: Maleclypse <54345792+Maleclypse@users.noreply.github.com> --- data/mods/Aftershock/npcs/classes.json | 1 + 1 file changed, 1 insertion(+) diff --git a/data/mods/Aftershock/npcs/classes.json b/data/mods/Aftershock/npcs/classes.json index 31c074af2dee5..82c53cc57b6bf 100644 --- a/data/mods/Aftershock/npcs/classes.json +++ b/data/mods/Aftershock/npcs/classes.json @@ -183,6 +183,7 @@ [ "PRETTY", 100 ], [ "OPTIMISTIC", 100 ], [ "INT_DOWN_3", 100 ], + [ "FORGETFUL", 100 ], [ "STR_UP_3", 100 ], [ "THRESH_MEDICAL", 100 ], [ "CENOBITE", 100 ], From c7d89eb750aa23dc45dc41e7fddbf443aa9c5ecb Mon Sep 17 00:00:00 2001 From: LyleSY Date: Fri, 9 Oct 2020 19:20:58 -0400 Subject: [PATCH 07/40] duration troubleshooting --- data/mods/Aftershock/npcs/sadie.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/data/mods/Aftershock/npcs/sadie.json b/data/mods/Aftershock/npcs/sadie.json index 30b7ae47c6020..15ef96309faac 100644 --- a/data/mods/Aftershock/npcs/sadie.json +++ b/data/mods/Aftershock/npcs/sadie.json @@ -178,9 +178,9 @@ }, "end": { "effect": [ - { "u_add_effect": "give_aid" }, - { "u_add_effect": "morale_chat" }, - { "u_add_effect": "sadie_injection" }, + { "u_add_effect": "give_aid", "duration": 2000 }, + { "u_add_effect": "morale_chat", "duration": 2000 }, + { "u_add_effect": "sadie_injection", "duration": 2000 }, { "u_add_var": "sadie_injection", "type": "general", "context": "injection", "value": "yes" } ] } From 04f0009c36d9072ff5183b957dfcec80e4b68e6c Mon Sep 17 00:00:00 2001 From: LyleSY Date: Fri, 9 Oct 2020 21:09:07 -0400 Subject: [PATCH 08/40] more duration troubleshooting --- data/mods/Aftershock/npcs/sadie.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/data/mods/Aftershock/npcs/sadie.json b/data/mods/Aftershock/npcs/sadie.json index 15ef96309faac..b67715ffaff16 100644 --- a/data/mods/Aftershock/npcs/sadie.json +++ b/data/mods/Aftershock/npcs/sadie.json @@ -131,7 +131,11 @@ "responses": [ { "text": "I'm glad we get along so well Sadie.", - "effect": [ { "u_add_effect": "give_aid" }, { "u_add_effect": "morale_chat" }, { "u_add_effect": "sadie_injection" } ], + "effect": [ + { "u_add_effect": "give_aid", "duration": 2000 }, + { "u_add_effect": "morale_chat", "duration": 2000 }, + { "u_add_effect": "sadie_injection", "duration": 2000 } + ], "topic": "TALK_sadie_1" } ] From 2fe10fea560a6ec3d3a6f56ebbb258ea64a79ef3 Mon Sep 17 00:00:00 2001 From: LyleSY Date: Fri, 9 Oct 2020 23:24:31 -0400 Subject: [PATCH 09/40] custom location dialog and mission rework --- data/mods/Aftershock/npcs/sadie.json | 110 ++++++++++++++++----------- 1 file changed, 65 insertions(+), 45 deletions(-) diff --git a/data/mods/Aftershock/npcs/sadie.json b/data/mods/Aftershock/npcs/sadie.json index b67715ffaff16..0c41bb67ca62b 100644 --- a/data/mods/Aftershock/npcs/sadie.json +++ b/data/mods/Aftershock/npcs/sadie.json @@ -9,7 +9,6 @@ "name": [ "Sadie's injection" ], "desc": [ "" ], "blood_analysis_description": "Several hundred lines of text list a series of complex biological molecules with unknown interactions. Many appear to be associated with healing and immune response. Only a few are known to be poisonous and many are known carcinogens. Several have psychological and hormonal effects.", - "duration": 2000, "rating": "mixed", "apply_message": "A wave of cold runs through your body and you feel dizzy", "remove_message": "The effects of Sadie's injection appear to be wearing off now", @@ -21,18 +20,53 @@ "type": "talk_topic", "id": "TALK_Sadie_1", "dynamic_line": { - "u_has_var": "u_met_sadie", - "type": "general", - "context": "meeting", + "npc_at_om_location": "hospital", "value": "yes", - "yes": [ - "Are we meeting again or did we already do that part?", - "You remind me of my friend Billy.", - "What an amazing world to be alive in, more or less.", - "My head always beats when I see you. Or is that my heart? I should check that.", - "It's always so nice to be seen." - ], - "no": "Hello Billy. Back again to try and kill me? It won't work, you should just give up." + "yes": "Places like this are so romantic. I used to come to places like this all the time. Or lots of different parts of me came here just a few times. Anyway it feels nice and I'm so glad you brought me here.", + "no": { + "npc_at_om_location": "butcher", + "value": "yes", + "yes": "Such a nice smell here. And all the pretty pointy things to touch. Do you mind if we stay here a while? I'd like to play butcher with you.", + "no": { + "npc_at_om_location": "cathedral", + "value": "yes", + "yes": "Something is wrong here. The air is too thin, my skin is too thin, this place is too thin. We should leave and never come back.", + "no": { + "npc_at_om_location": "cs_sex_shop", + "value": "yes", + "yes": "This is all a little bit basic but I like the direction we're going in here. How do you feel about bonesaws and heavy voltage?", + "no": { + "npc_at_om_location": "mansion", + "value": "yes", + "yes": "Ooh, it's like a murder mystery here. Are we the murderers, the murdered, or the mystery?", + "no": { + "npc_at_om_location": "mortuary", + "value": "yes", + "yes": "This seems so familiar. I think I was naked here with a strange man who put makeup on me and a pretty dress and there were flowers and music and everyone was crying. Or was that prom?", + "no": { + "npc_at_om_location": "refugee_center", + "value": "yes", + "yes": "I think you would make a very nice refugee. I think they should let us stay here and beg for catfood with the rest. Should we become cat mutants? I would be such a good apocalyptic cat mutant. I would run and fetch and play dead and eat feces and all of it. That's all cat stuff I think.", + "no": { + "u_has_var": "u_met_sadie", + "type": "general", + "context": "meeting", + "value": "yes", + "yes": [ + "Are we meeting again or did we already do that part?", + "You remind me of my friend Billy.", + "What an amazing world to be alive in, more or less.", + "My head always beats when I see you. Or is that my heart? I should check that.", + "It's always so nice to be seen." + ], + "no": "Hello Billy. Back again to try and kill me? It won't work, you should just give up." + } + } + } + } + } + } + } }, "responses": [ { @@ -88,7 +122,7 @@ { "type": "talk_topic", "id": "TALK_sadie_what", - "dynamic_line": "Yes, much of what you see is human I think. I don't have the proper equipment to be entirely sure and I have some strange memories. My beacon has already told you that I am Sadie. Beyond that I don't know much to tell you. I know a great deal about medicine. I have some strange responses to physical stimuli that I don't completely understand. I think I must be a medical experiment of some kind. I am hungry.", + "dynamic_line": "Yes, much of what you see is human I think. I don't have the proper equipment to be entirely sure and I have some strange memories. My beacon has already told you that I am Sadie. Beyond that I don't know much to tell you. I know a great deal about medicine. I have some strange responses to physical stimuli that I don't completely understand. I think I must be a medical experiment of some kind. My chest hurts in a really yummy way.", "responses": [ { "text": "Can I help you?", "topic": "TALK_MISSION_LIST" }, { "text": "I should go.", "topic": "TALK_DONE" } ] }, { @@ -141,44 +175,30 @@ ] }, { - "id": "MISSION_sadie_nuts", + "id": "MISSION_sadie_heart", "type": "mission_definition", - "name": "Nuts for Sadie", - "description": "Find nuts", + "name": "Heart for Sadie", + "description": "Find a special organ", "goal": "MGOAL_FIND_ITEM", - "difficulty": 1, + "difficulty": 5, "value": 0, - "item": [ - "hickory_nut", - "peanut", - "hazelnut", - "chestnut", - "walnut", - "pine_nuts", - "peanut_unshelled", - "beech_nuts", - "walnut_unshelled", - "walnut_roasted", - "chestnut_unshelled", - "chestnut_roasted", - "hazelnut_unshelled", - "soy_nuts", - "hazelnut_roasted", - "hickory_nut_unshelled", - "hickory_nut_roasted" - ], + "item": "flesh_golem_heart", "count": 1, + "start": { + "assign_mission_target": { "om_terrain": "forest_thick", "reveal_radius": 1, "random": true, "search_range": 18, "min_distance": 5, "z": 0 }, + "update_mapgen": { "place_monster": [ { "monster": "mon_flesh_golem", "x": 11, "y": 11, "target": true, "name": "Billy" } ] } + }, "origins": [ "ORIGIN_SECONDARY" ], "dialogue": { - "describe": "Can you get me some nuts?", - "offer": "I miss nuts, I remember that I liked to eat them. Can you get me some nuts?", - "accepted": "Hurray! I love nuts.", - "rejected": "This makes me sad. Which makes me happy. So thanks? Let me know if you change your mind.", - "advice": "Nuts can be found growing on certain trees, in stores and in homes, as well as hidden in bushes to be enjoyed later. I know all about nuts.", - "inquire": "Do you have some nuts for me?", - "success": "Hurray! I love nuts. Here, let me inject you with this.", - "success_lie": "Aw, nuts.", - "failure": "This is nuts. Is it really so hard to find nuts out there? Thank you for trying though, your failure gives me pleasure. What else are you bad at?" + "describe": "I want your organ.", + "offer": "I've been feeling really yummy since the last time Billy came to work on me, and I think it's because my heart is gone. Like literally gone. I checked. Billy did a really good job taking it out, but I want to leave this storage unit with you and if I'm going to do that I need a working heart. My first idea was to take yours, but you probably need it even more. You know who has a nice big juicy heart? Billy does. And I bet I know where Billy is.", + "accepted": "Aw, I heart that you're going to help me get that big organ.", + "rejected": "This makes me sad. Which makes me happy. So thanks? Let me know if you change your mind. I probably shouldn't go without a heart for too too long but I'm kind of enjoying it. It's like always being on the edge of something horrible, but in a nice way.", + "advice": "Please be careful cutting that heart out. If you ruin it I don't know about another good one nearby.", + "inquire": "Do you have my heart?", + "success": "Ooh, Billy had a really good heart. Can you turn away please? I just need to do some quick open chest surgery here. Just a quick cut here *ooh* and I need to break this and this *SNAP* *oh!* and just sew some little things together here quickly. Not as much blood as you'd think. I should probably look into that later, there should be more blood in there. Ah, good enough, I can do a better job closing up later. Kind of tingly, feeling everything moving again in there. See, heart surgery isn't hard if you have the right attitude. Well now, you need a good reward for everything you've done for me. Here, let me inject you with this.", + "success_lie": "I don't know why, but I feel better. Also worse. Maybe I'm good without it.", + "failure": "Oh no, my heart. Thank you for trying though, your failure gives me pleasure. What else are you bad at?" }, "end": { "effect": [ From 7b36c6410a896f24821b6d639fa60022fd255160 Mon Sep 17 00:00:00 2001 From: LyleSY Date: Sat, 10 Oct 2020 10:35:10 -0400 Subject: [PATCH 10/40] lose_var troubleshooting --- data/mods/Aftershock/npcs/sadie.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/mods/Aftershock/npcs/sadie.json b/data/mods/Aftershock/npcs/sadie.json index 0c41bb67ca62b..c9fd62a91a3e5 100644 --- a/data/mods/Aftershock/npcs/sadie.json +++ b/data/mods/Aftershock/npcs/sadie.json @@ -151,7 +151,7 @@ { "text": "Wonderful. Please don't inject me with anything else unless I ask for it in the future.", "effect": [ - { "u_lose_var": "sadie_injection", "type": "general", "context": "injection", "value": "yes" }, + { "u_lose_var": "sadie_injection", "type": "general", "context": "injection" }, { "u_add_var": "sadie_nuts", "type": "general", "context": "nuts", "value": "yes" } ], "topic": "TALK_sadie_1" From 83e5c9845af018ca89ae9923622b17df5998ea1d Mon Sep 17 00:00:00 2001 From: LyleSY Date: Sat, 10 Oct 2020 15:13:58 -0400 Subject: [PATCH 11/40] location check reformatting --- data/mods/Aftershock/npcs/sadie.json | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/data/mods/Aftershock/npcs/sadie.json b/data/mods/Aftershock/npcs/sadie.json index c9fd62a91a3e5..fcde6689f13d6 100644 --- a/data/mods/Aftershock/npcs/sadie.json +++ b/data/mods/Aftershock/npcs/sadie.json @@ -21,31 +21,24 @@ "id": "TALK_Sadie_1", "dynamic_line": { "npc_at_om_location": "hospital", - "value": "yes", "yes": "Places like this are so romantic. I used to come to places like this all the time. Or lots of different parts of me came here just a few times. Anyway it feels nice and I'm so glad you brought me here.", "no": { "npc_at_om_location": "butcher", - "value": "yes", "yes": "Such a nice smell here. And all the pretty pointy things to touch. Do you mind if we stay here a while? I'd like to play butcher with you.", "no": { "npc_at_om_location": "cathedral", - "value": "yes", "yes": "Something is wrong here. The air is too thin, my skin is too thin, this place is too thin. We should leave and never come back.", "no": { "npc_at_om_location": "cs_sex_shop", - "value": "yes", "yes": "This is all a little bit basic but I like the direction we're going in here. How do you feel about bonesaws and heavy voltage?", "no": { "npc_at_om_location": "mansion", - "value": "yes", "yes": "Ooh, it's like a murder mystery here. Are we the murderers, the murdered, or the mystery?", "no": { "npc_at_om_location": "mortuary", - "value": "yes", "yes": "This seems so familiar. I think I was naked here with a strange man who put makeup on me and a pretty dress and there were flowers and music and everyone was crying. Or was that prom?", "no": { "npc_at_om_location": "refugee_center", - "value": "yes", "yes": "I think you would make a very nice refugee. I think they should let us stay here and beg for catfood with the rest. Should we become cat mutants? I would be such a good apocalyptic cat mutant. I would run and fetch and play dead and eat feces and all of it. That's all cat stuff I think.", "no": { "u_has_var": "u_met_sadie", @@ -152,7 +145,7 @@ "text": "Wonderful. Please don't inject me with anything else unless I ask for it in the future.", "effect": [ { "u_lose_var": "sadie_injection", "type": "general", "context": "injection" }, - { "u_add_var": "sadie_nuts", "type": "general", "context": "nuts", "value": "yes" } + { "u_add_var": "sadie_heart", "type": "general", "context": "heart", "value": "yes" } ], "topic": "TALK_sadie_1" } From 46edfba4d9f81280e0d0bb882d925be31642a8a2 Mon Sep 17 00:00:00 2001 From: LyleSY Date: Mon, 12 Oct 2020 08:41:55 -0400 Subject: [PATCH 12/40] Wilhemina and Nicodemus bugfix --- data/mods/Aftershock/npcs/classes.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/mods/Aftershock/npcs/classes.json b/data/mods/Aftershock/npcs/classes.json index 82c53cc57b6bf..980865eeee6d2 100644 --- a/data/mods/Aftershock/npcs/classes.json +++ b/data/mods/Aftershock/npcs/classes.json @@ -144,7 +144,7 @@ "class": "whately_cousin", "attitude": 0, "mission": 3, - "chat": "TALK_WHATELY_GENERIC1", + "chat": "TALK_WHATELY_1", "faction": "whately_family", "gender": "female" }, @@ -156,7 +156,7 @@ "class": "whately_cousin", "attitude": 0, "mission": 3, - "chat": "TALK_WHATELY_GENERIC1", + "chat": "TALK_WHATELY_1", "faction": "whately_family", "gender": "male" }, From 341849e9b93696d25b04bedac8741d77439cb40b Mon Sep 17 00:00:00 2001 From: LyleSY Date: Mon, 12 Oct 2020 08:47:31 -0400 Subject: [PATCH 13/40] finish fixing Sadie's mission --- data/mods/Aftershock/npcs/classes.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/mods/Aftershock/npcs/classes.json b/data/mods/Aftershock/npcs/classes.json index 980865eeee6d2..0fd82373cef64 100644 --- a/data/mods/Aftershock/npcs/classes.json +++ b/data/mods/Aftershock/npcs/classes.json @@ -169,7 +169,7 @@ "attitude": 0, "mission": 7, "chat": "TALK_Sadie_1", - "mission_offered": "MISSION_sadie_nuts", + "mission_offered": "MISSION_sadie_heart", "faction": "no_faction", "gender": "female" }, From 29e4f64a5f71bf663a55a24521058d8a49f95273 Mon Sep 17 00:00:00 2001 From: LyleSY Date: Tue, 13 Oct 2020 10:08:02 -0400 Subject: [PATCH 14/40] Cyrus alpha mission fix --- data/mods/Aftershock/npcs/cyrus_whately.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/mods/Aftershock/npcs/cyrus_whately.json b/data/mods/Aftershock/npcs/cyrus_whately.json index 008676c1aba8c..7e037940e46f7 100644 --- a/data/mods/Aftershock/npcs/cyrus_whately.json +++ b/data/mods/Aftershock/npcs/cyrus_whately.json @@ -149,7 +149,7 @@ "goal": "MGOAL_FIND_ITEM", "difficulty": 4, "value": 0, - "item": "mutagen", + "item": "mutagen_alpha", "count": 3, "origins": [ "ORIGIN_SECONDARY" ], "followup": "MISSION_FRANKENSTEIN_4", From 173278c127dd5d867493048c7dd4292315d1e2fa Mon Sep 17 00:00:00 2001 From: LyleSY Date: Tue, 13 Oct 2020 22:35:30 -0400 Subject: [PATCH 15/40] one broken cyborg mission fix --- data/mods/Aftershock/npcs/cyrus_whately.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/mods/Aftershock/npcs/cyrus_whately.json b/data/mods/Aftershock/npcs/cyrus_whately.json index 7e037940e46f7..c27a82b684096 100644 --- a/data/mods/Aftershock/npcs/cyrus_whately.json +++ b/data/mods/Aftershock/npcs/cyrus_whately.json @@ -175,7 +175,7 @@ "difficulty": 6, "value": 0, "item": "bot_broken_cyborg", - "count": 3, + "count": 1, "origins": [ "ORIGIN_SECONDARY" ], "followup": "MISSION_FRANKENSTEIN_5", "dialogue": { From cdeb78dd2ccafb3132238f3e8dcbd91641d6bf38 Mon Sep 17 00:00:00 2001 From: LyleSY Date: Wed, 14 Oct 2020 06:50:32 -0400 Subject: [PATCH 16/40] Sadie INT fix --- data/mods/Aftershock/npcs/classes.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/mods/Aftershock/npcs/classes.json b/data/mods/Aftershock/npcs/classes.json index 0fd82373cef64..192b8643c89d1 100644 --- a/data/mods/Aftershock/npcs/classes.json +++ b/data/mods/Aftershock/npcs/classes.json @@ -182,7 +182,7 @@ "traits": [ [ "PRETTY", 100 ], [ "OPTIMISTIC", 100 ], - [ "INT_DOWN_3", 100 ], + [ "INT_DOWN_2", 100 ], [ "FORGETFUL", 100 ], [ "STR_UP_3", 100 ], [ "THRESH_MEDICAL", 100 ], From 78156eb0280427a454fb84b18669c414f9b2658a Mon Sep 17 00:00:00 2001 From: LyleSY Date: Wed, 14 Oct 2020 06:56:53 -0400 Subject: [PATCH 17/40] Sadie spawn fix --- data/mods/Aftershock/npcs/cyrus_whately.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/mods/Aftershock/npcs/cyrus_whately.json b/data/mods/Aftershock/npcs/cyrus_whately.json index c27a82b684096..456cd817c2e27 100644 --- a/data/mods/Aftershock/npcs/cyrus_whately.json +++ b/data/mods/Aftershock/npcs/cyrus_whately.json @@ -226,7 +226,7 @@ "difficulty": 5, "value": 0, "start": { - "assign_mission_target": { "om_terrain": "abandonedwarehouse", "reveal_radius": 1, "random": true, "search_range": 120 }, + "assign_mission_target": { "om_terrain": "abandonedwarehouse", "reveal_radius": 1, "random": true, "search_range": 120, "z": 1 }, "update_mapgen": { "om_terrain": "abandonedwarehouse", "place_npcs": [ { "class": "sadie", "x": 19, "y": 20, "target": true } ] } }, "origins": [ "ORIGIN_SECONDARY" ], From d1cf22e1c499acee593fb8e524e0abd9ca0a0b84 Mon Sep 17 00:00:00 2001 From: LyleSY Date: Sun, 18 Oct 2020 12:55:53 -0400 Subject: [PATCH 18/40] Sadie int fix again --- data/mods/Aftershock/npcs/classes.json | 1 - 1 file changed, 1 deletion(-) diff --git a/data/mods/Aftershock/npcs/classes.json b/data/mods/Aftershock/npcs/classes.json index 192b8643c89d1..e5f4888c1d17d 100644 --- a/data/mods/Aftershock/npcs/classes.json +++ b/data/mods/Aftershock/npcs/classes.json @@ -182,7 +182,6 @@ "traits": [ [ "PRETTY", 100 ], [ "OPTIMISTIC", 100 ], - [ "INT_DOWN_2", 100 ], [ "FORGETFUL", 100 ], [ "STR_UP_3", 100 ], [ "THRESH_MEDICAL", 100 ], From b04d61003b9fa53920314c294f09c44daea8acf4 Mon Sep 17 00:00:00 2001 From: LyleSY Date: Sun, 18 Oct 2020 13:10:14 -0400 Subject: [PATCH 19/40] Sadie spawn troubleshooting more --- data/mods/Aftershock/npcs/cyrus_whately.json | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/data/mods/Aftershock/npcs/cyrus_whately.json b/data/mods/Aftershock/npcs/cyrus_whately.json index 456cd817c2e27..12e2ca7979ad6 100644 --- a/data/mods/Aftershock/npcs/cyrus_whately.json +++ b/data/mods/Aftershock/npcs/cyrus_whately.json @@ -226,7 +226,14 @@ "difficulty": 5, "value": 0, "start": { - "assign_mission_target": { "om_terrain": "abandonedwarehouse", "reveal_radius": 1, "random": true, "search_range": 120, "z": 1 }, + "assign_mission_target": { + "om_terrain": "abandonedwarehouse", + "om_terrain_replace": "field", + "reveal_radius": 1, + "random": true, + "search_range": 120, + "z": 1 + }, "update_mapgen": { "om_terrain": "abandonedwarehouse", "place_npcs": [ { "class": "sadie", "x": 19, "y": 20, "target": true } ] } }, "origins": [ "ORIGIN_SECONDARY" ], From cba7cc33e0b8f4385548e7d85a5f6eb3c474427d Mon Sep 17 00:00:00 2001 From: LyleSY Date: Sun, 18 Oct 2020 13:54:52 -0400 Subject: [PATCH 20/40] More Sadie spawn troubleshooting --- data/mods/Aftershock/npcs/cyrus_whately.json | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/data/mods/Aftershock/npcs/cyrus_whately.json b/data/mods/Aftershock/npcs/cyrus_whately.json index 12e2ca7979ad6..3558f84766799 100644 --- a/data/mods/Aftershock/npcs/cyrus_whately.json +++ b/data/mods/Aftershock/npcs/cyrus_whately.json @@ -231,10 +231,9 @@ "om_terrain_replace": "field", "reveal_radius": 1, "random": true, - "search_range": 120, - "z": 1 + "search_range": 150 }, - "update_mapgen": { "om_terrain": "abandonedwarehouse", "place_npcs": [ { "class": "sadie", "x": 19, "y": 20, "target": true } ] } + "update_mapgen": { "place_npcs": [ { "class": "sadie", "x": 19, "y": 20, "target": true } ] } }, "origins": [ "ORIGIN_SECONDARY" ], "dialogue": { From ee4bd092ac8471c7a4dbea3af0c4fe569ae33794 Mon Sep 17 00:00:00 2001 From: LyleSY Date: Sun, 18 Oct 2020 16:23:49 -0400 Subject: [PATCH 21/40] Sadie spawn at regular warehouse --- data/mods/Aftershock/npcs/cyrus_whately.json | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/data/mods/Aftershock/npcs/cyrus_whately.json b/data/mods/Aftershock/npcs/cyrus_whately.json index 3558f84766799..d505011e5bb38 100644 --- a/data/mods/Aftershock/npcs/cyrus_whately.json +++ b/data/mods/Aftershock/npcs/cyrus_whately.json @@ -226,13 +226,7 @@ "difficulty": 5, "value": 0, "start": { - "assign_mission_target": { - "om_terrain": "abandonedwarehouse", - "om_terrain_replace": "field", - "reveal_radius": 1, - "random": true, - "search_range": 150 - }, + "assign_mission_target": { "om_terrain": "warehouse_north", "om_special": "warehouse", "reveal_radius": 3, "random": true, "search_range": 180 }, "update_mapgen": { "place_npcs": [ { "class": "sadie", "x": 19, "y": 20, "target": true } ] } }, "origins": [ "ORIGIN_SECONDARY" ], From 9316589ffddb8d87fce129f3b01f10be777c0e98 Mon Sep 17 00:00:00 2001 From: LyleSY Date: Sun, 18 Oct 2020 18:38:40 -0400 Subject: [PATCH 22/40] remove Sadie location dialog --- data/mods/Aftershock/npcs/sadie.json | 52 +++++++--------------------- 1 file changed, 12 insertions(+), 40 deletions(-) diff --git a/data/mods/Aftershock/npcs/sadie.json b/data/mods/Aftershock/npcs/sadie.json index fcde6689f13d6..fb34c0d62b06a 100644 --- a/data/mods/Aftershock/npcs/sadie.json +++ b/data/mods/Aftershock/npcs/sadie.json @@ -20,46 +20,18 @@ "type": "talk_topic", "id": "TALK_Sadie_1", "dynamic_line": { - "npc_at_om_location": "hospital", - "yes": "Places like this are so romantic. I used to come to places like this all the time. Or lots of different parts of me came here just a few times. Anyway it feels nice and I'm so glad you brought me here.", - "no": { - "npc_at_om_location": "butcher", - "yes": "Such a nice smell here. And all the pretty pointy things to touch. Do you mind if we stay here a while? I'd like to play butcher with you.", - "no": { - "npc_at_om_location": "cathedral", - "yes": "Something is wrong here. The air is too thin, my skin is too thin, this place is too thin. We should leave and never come back.", - "no": { - "npc_at_om_location": "cs_sex_shop", - "yes": "This is all a little bit basic but I like the direction we're going in here. How do you feel about bonesaws and heavy voltage?", - "no": { - "npc_at_om_location": "mansion", - "yes": "Ooh, it's like a murder mystery here. Are we the murderers, the murdered, or the mystery?", - "no": { - "npc_at_om_location": "mortuary", - "yes": "This seems so familiar. I think I was naked here with a strange man who put makeup on me and a pretty dress and there were flowers and music and everyone was crying. Or was that prom?", - "no": { - "npc_at_om_location": "refugee_center", - "yes": "I think you would make a very nice refugee. I think they should let us stay here and beg for catfood with the rest. Should we become cat mutants? I would be such a good apocalyptic cat mutant. I would run and fetch and play dead and eat feces and all of it. That's all cat stuff I think.", - "no": { - "u_has_var": "u_met_sadie", - "type": "general", - "context": "meeting", - "value": "yes", - "yes": [ - "Are we meeting again or did we already do that part?", - "You remind me of my friend Billy.", - "What an amazing world to be alive in, more or less.", - "My head always beats when I see you. Or is that my heart? I should check that.", - "It's always so nice to be seen." - ], - "no": "Hello Billy. Back again to try and kill me? It won't work, you should just give up." - } - } - } - } - } - } - } + "u_has_var": "u_met_sadie", + "type": "general", + "context": "meeting", + "value": "yes", + "yes": [ + "Are we meeting again or did we already do that part?", + "You remind me of my friend Billy.", + "What an amazing world to be alive in, more or less.", + "My head always beats when I see you. Or is that my heart? I should check that.", + "It's always so nice to be seen." + ], + "no": "Hello Billy. Back again to try and kill me? It won't work, you should just give up." }, "responses": [ { From 718fdc26483f7c28481905e5523de9d8d0a2591b Mon Sep 17 00:00:00 2001 From: LyleSY Date: Mon, 26 Oct 2020 22:02:05 -0400 Subject: [PATCH 23/40] sadie_spawn nested mapgen --- data/mods/Aftershock/maps/nested/sadie_spawn.json | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 data/mods/Aftershock/maps/nested/sadie_spawn.json diff --git a/data/mods/Aftershock/maps/nested/sadie_spawn.json b/data/mods/Aftershock/maps/nested/sadie_spawn.json new file mode 100644 index 0000000000000..2a915fd1e8af4 --- /dev/null +++ b/data/mods/Aftershock/maps/nested/sadie_spawn.json @@ -0,0 +1,8 @@ +[ + { + "type": "mapgen", + "method": "json", + "nested_mapgen_id": "Sadie_spawn", + "object": { "mapgensize": [ 1, 1 ], "place_npcs": [ { "class": "sadie", "x": 0, "y": 0 } ] } + } +] From b6a1869e4eee74485052a1d97d803d9cccd82fe8 Mon Sep 17 00:00:00 2001 From: LyleSY Date: Mon, 26 Oct 2020 22:11:06 -0400 Subject: [PATCH 24/40] stick Sadie in storage --- .../maps/mapgen/sadie_large_storage.json | 121 ++++++++++++++++++ 1 file changed, 121 insertions(+) create mode 100644 data/mods/Aftershock/maps/mapgen/sadie_large_storage.json diff --git a/data/mods/Aftershock/maps/mapgen/sadie_large_storage.json b/data/mods/Aftershock/maps/mapgen/sadie_large_storage.json new file mode 100644 index 0000000000000..1023e4aea54bf --- /dev/null +++ b/data/mods/Aftershock/maps/mapgen/sadie_large_storage.json @@ -0,0 +1,121 @@ +[ + { + "type": "mapgen", + "method": "json", + "om_terrain": "large_storage_units_3", + "weight": 1000, + "object": { + "fill_ter": "t_thconc_floor", + "rows": [ + "-------66666666666666666", + "|AAAAA|.................", + "|G 7y................", + "|G 7y................", + "| MM |8................", + "|-----|..........|-----|", + "|C MM7y........y7 MM A|", + "|CMM 7y........y7 A|", + "|C M |8........8| MM A|", + "|-----|..........|-----|", + "|G M 7y........y7 C|", + "|G MM7y........y7MM C|", + "|G MM |8........8| MM C|", + "|-----|..........|-----|", + "|G MM 7y........y7 MM G|", + "|G 7y........y7 G|", + "|G GGG|8........8| MM G|", + "|-----|..........|-----|", + "|G MM 7y........y7 MMA|", + "|G MM 7y........y7MM A|", + "|G MM7y........y7MM G|", + "|MM |8........8| MM M|", + "| MMM |..........|CCCCC|", + "------------------------" + ], + "terrain": { + " ": "t_thconc_floor", + "+": "t_door_c", + "-": "t_wall_w", + ".": "t_pavement", + "1": "t_window", + "2": "t_sidewalk", + "3": "t_tree_young", + "4": "t_chaingate_l", + "5": "t_wall_wood", + "6": "t_chainfence_h", + "7": "t_door_metal_locked", + "8": "t_gates_mech_control", + "E": "t_dirtfloor", + "r": "t_pavement", + "y": "t_pavement_y", + "|": "t_wall_w" + }, + "furniture": { + "A": "f_rack", + "B": "f_toilet", + "C": "f_counter", + "D": "f_sink", + "E": "f_sink", + "F": "f_chair", + "G": "f_locker", + "H": "f_table", + "I": "f_sofa", + "M": [ "f_crate_c", "f_cardboard_box" ] + }, + "place_items": [ + { "item": "livingroom", "x": [ 1, 5 ], "y": [ 2, 4 ], "chance": 50, "repeat": [ 1, 6 ] }, + { "item": "hardware_bulk", "x": [ 1, 5 ], "y": [ 2, 4 ], "chance": 20, "repeat": [ 1, 6 ] }, + { "item": "home_hw", "x": [ 1, 5 ], "y": [ 2, 4 ], "chance": 5, "repeat": [ 1, 6 ] }, + { "item": "tools_home", "x": [ 1, 5 ], "y": [ 2, 4 ], "chance": 35, "repeat": [ 1, 6 ] }, + { "item": "tools_construction", "x": [ 1, 5 ], "y": [ 2, 4 ], "chance": 20, "repeat": [ 1, 6 ] }, + { "item": "supplies_electronics", "x": [ 1, 5 ], "y": [ 2, 4 ], "chance": 10, "repeat": [ 1, 6 ] }, + { "item": "gear_survival", "x": [ 1, 5 ], "y": [ 2, 4 ], "chance": 5, "repeat": [ 1, 6 ] }, + { "item": "homebooks", "x": [ 1, 5 ], "y": [ 6, 8 ], "chance": 50, "repeat": [ 1, 6 ] }, + { "item": "supplies_fuel", "x": [ 1, 5 ], "y": [ 6, 8 ], "chance": 35, "repeat": [ 1, 6 ] }, + { "item": "bedroom", "x": [ 1, 5 ], "y": [ 10, 12 ], "chance": 50, "repeat": [ 1, 6 ] }, + { "item": "dresser", "x": [ 1, 5 ], "y": [ 10, 12 ], "chance": 50, "repeat": [ 1, 6 ] }, + { "item": "mil_surplus", "x": [ 1, 5 ], "y": [ 10, 12 ], "chance": 35, "repeat": [ 1, 6 ] }, + { "item": "mil_hw", "x": [ 1, 5 ], "y": [ 10, 12 ], "chance": 10, "repeat": [ 1, 6 ] }, + { "item": "mil_armor", "x": [ 1, 5 ], "y": [ 10, 12 ], "chance": 5, "repeat": [ 1, 6 ] }, + { "item": "mil_accessories", "x": [ 1, 5 ], "y": [ 10, 12 ], "chance": 5, "repeat": [ 1, 6 ] }, + { "item": "weapons", "x": [ 1, 5 ], "y": [ 10, 12 ], "chance": 35, "repeat": [ 1, 6 ] }, + { "item": "ammo_pistol_common", "x": [ 1, 5 ], "y": [ 10, 12 ], "chance": 20, "repeat": [ 1, 6 ] }, + { "item": "mags_common", "x": [ 1, 5 ], "y": [ 10, 12 ], "chance": 20, "repeat": [ 1, 6 ] }, + { "item": "mags_crime", "x": [ 1, 5 ], "y": [ 10, 12 ], "chance": 20, "repeat": [ 1, 6 ] }, + { "item": "homeguns", "x": [ 1, 5 ], "y": [ 10, 12 ], "chance": 20, "repeat": [ 1, 6 ] }, + { "item": "mansion_guns", "x": [ 1, 5 ], "y": [ 10, 12 ], "chance": 5, "repeat": [ 1, 6 ] }, + { "item": "gunmod_common", "x": [ 1, 5 ], "y": [ 10, 12 ], "chance": 10, "repeat": [ 1, 6 ] }, + { "item": "gear_soldier_sidearm", "x": [ 1, 5 ], "y": [ 10, 12 ], "chance": 5, "repeat": [ 1, 6 ] }, + { "item": "softdrugs", "x": [ 1, 5 ], "y": [ 14, 16 ], "chance": 35, "repeat": [ 1, 6 ] }, + { "item": "harddrugs", "x": [ 1, 5 ], "y": [ 14, 16 ], "chance": 10, "repeat": [ 1, 6 ] }, + { "item": "gear_medical", "x": [ 1, 5 ], "y": [ 14, 16 ], "chance": 35, "repeat": [ 1, 6 ] }, + { "item": "drugs_emergency", "x": [ 1, 5 ], "y": [ 14, 16 ], "chance": 20, "repeat": [ 1, 6 ] }, + { "item": "drugs_pharmacy", "x": [ 1, 5 ], "y": [ 14, 16 ], "chance": 35, "repeat": [ 1, 6 ] }, + { "item": "drugs_soldier", "x": [ 1, 5 ], "y": [ 14, 16 ], "chance": 10, "repeat": [ 1, 6 ] }, + { "item": "bionics_common", "x": [ 1, 5 ], "y": [ 14, 16 ], "chance": 5, "repeat": [ 1, 6 ] }, + { "item": "dining", "x": [ 1, 5 ], "y": [ 18, 22 ], "chance": 50, "repeat": [ 1, 6 ] }, + { "item": "kitchen", "x": [ 1, 5 ], "y": [ 18, 22 ], "chance": 50, "repeat": [ 1, 6 ] }, + { "item": "oven", "x": [ 1, 5 ], "y": [ 18, 22 ], "chance": 35, "repeat": [ 1, 6 ] }, + { "item": "camping", "x": [ 1, 5 ], "y": [ 18, 22 ], "chance": 20, "repeat": [ 1, 6 ] }, + { "item": "vending_food", "x": [ 1, 5 ], "y": [ 18, 22 ], "chance": 35, "repeat": [ 1, 6 ] }, + { "item": "vending_drink", "x": [ 1, 5 ], "y": [ 18, 22 ], "chance": 35, "repeat": [ 1, 6 ] }, + { "item": "cannedfood", "x": [ 1, 5 ], "y": [ 18, 22 ], "chance": 35, "repeat": [ 1, 6 ] }, + { "item": "snacks", "x": [ 1, 5 ], "y": [ 18, 22 ], "chance": 20, "repeat": [ 1, 6 ] }, + { "item": "pasta", "x": [ 1, 5 ], "y": [ 18, 22 ], "chance": 20, "repeat": [ 1, 6 ] }, + { "item": "snacks_fancy", "x": [ 1, 5 ], "y": [ 18, 22 ], "chance": 10, "repeat": [ 1, 6 ] }, + { "item": "coffee_shop", "x": [ 1, 5 ], "y": [ 18, 22 ], "chance": 10, "repeat": [ 1, 6 ] }, + { "item": "alcohol", "x": [ 1, 5 ], "y": [ 18, 22 ], "chance": 10, "repeat": [ 1, 6 ] }, + { "item": "mil_food", "x": [ 1, 5 ], "y": [ 18, 22 ], "chance": 5, "repeat": [ 1, 6 ] }, + { "item": "methlab", "x": [ 18, 22 ], "y": [ 10, 12 ], "chance": 50, "repeat": [ 1, 6 ] }, + { "item": "harddrugs", "x": [ 18, 22 ], "y": [ 10, 12 ], "chance": 35, "repeat": [ 1, 6 ] }, + { "item": "chem_home", "x": [ 18, 22 ], "y": [ 10, 12 ], "chance": 20, "repeat": [ 1, 6 ] }, + { "item": "chem_lab", "x": [ 18, 22 ], "y": [ 10, 12 ], "chance": 10, "repeat": [ 1, 6 ] }, + { "item": "arcade_prizes", "x": [ 18, 22 ], "y": [ 14, 16 ], "chance": 50, "repeat": [ 1, 6 ] }, + { "item": "antique", "x": [ 18, 22 ], "y": [ 14, 16 ], "chance": 35, "repeat": [ 1, 6 ] }, + { "item": "farming_tools", "x": [ 18, 22 ], "y": [ 18, 22 ], "chance": 35, "repeat": [ 1, 6 ] }, + { "item": "farming_seeds", "x": [ 18, 22 ], "y": [ 18, 22 ], "chance": 10, "repeat": [ 1, 6 ] } + ], + "place_nested": [ { "chunks": [ [ "Sadie_spawn", 20 ] ], "x": 3, "y": 3 } ] + } + } +] \ No newline at end of file From 53ff7c42c3f046ac53e9e0db58379701c5e7bd78 Mon Sep 17 00:00:00 2001 From: LyleSY Date: Mon, 26 Oct 2020 22:12:46 -0400 Subject: [PATCH 25/40] revert Cyrus mission --- data/mods/Aftershock/npcs/cyrus_whately.json | 25 -------------------- 1 file changed, 25 deletions(-) diff --git a/data/mods/Aftershock/npcs/cyrus_whately.json b/data/mods/Aftershock/npcs/cyrus_whately.json index d505011e5bb38..b51e21586016c 100644 --- a/data/mods/Aftershock/npcs/cyrus_whately.json +++ b/data/mods/Aftershock/npcs/cyrus_whately.json @@ -216,30 +216,5 @@ "failure": "I can't be Dr Frankenstein unless you get me these." }, "end": { "effect": [ { "u_buy_item": "inactive_frankenstein", "count": 1 } ] } - }, - { - "id": "MISSION_LAST_ASSISTANT", - "type": "mission_definition", - "name": "The last lab assistant", - "description": "Find the missing lab assistant.", - "goal": "MGOAL_TALK_TO_NPC", - "difficulty": 5, - "value": 0, - "start": { - "assign_mission_target": { "om_terrain": "warehouse_north", "om_special": "warehouse", "reveal_radius": 3, "random": true, "search_range": 180 }, - "update_mapgen": { "place_npcs": [ { "class": "sadie", "x": 19, "y": 20, "target": true } ] } - }, - "origins": [ "ORIGIN_SECONDARY" ], - "dialogue": { - "describe": "My previous lab assistant Willsworth was charged with getting some important medicine back from storage, but they are late, more than usual. Go to the storage unit and find them.", - "offer": "I need my medicine. Maybe you could find the courier?", - "accepted": "Perfect, I am sure all is well, but best to be dead certain.", - "rejected": "You are refusing vital medicine for those in need. I demand you reconsider.", - "advice": "Willsworth, sort of a shortish, tallish, maybe mediumish, mostly human probably, probably some kind of gender. It doesn't matter, they should be there.", - "inquire": "Yes, where is my medicine?", - "success": "Well that's fine I suppose, I already went ahead and made more. Do tell me if you ever find Willsworth, there are some good bionics in there I'd like back.", - "success_lie": "Thanks for trying… I guess.", - "failure": "Disappointing. Of course I knew this would happen and have already prepared a replacement. And perhaps I should make a replacement for you as well?" - } } ] From b4cc86848e2bf2fa9412b54912de022fa9fc3681 Mon Sep 17 00:00:00 2001 From: LyleSY Date: Mon, 26 Oct 2020 22:13:11 -0400 Subject: [PATCH 26/40] revert some more --- data/mods/Aftershock/npcs/cyrus_whately.json | 1 - 1 file changed, 1 deletion(-) diff --git a/data/mods/Aftershock/npcs/cyrus_whately.json b/data/mods/Aftershock/npcs/cyrus_whately.json index b51e21586016c..cd054180e4771 100644 --- a/data/mods/Aftershock/npcs/cyrus_whately.json +++ b/data/mods/Aftershock/npcs/cyrus_whately.json @@ -203,7 +203,6 @@ "item": "living_brain_jar", "count": 2, "origins": [ "ORIGIN_SECONDARY" ], - "followup": "MISSION_LAST_ASSISTANT", "dialogue": { "describe": "I need some brains, but brains that are still living. We've got our own brain blasters, but I won't risk them in experiments.", "offer": "If this works I may be able to give some of these poor souls bodies again. Six should do.", From 2b35a2721029d935b6432b7d54bd2709c76ebe1a Mon Sep 17 00:00:00 2001 From: LyleSY Date: Mon, 26 Oct 2020 22:18:20 -0400 Subject: [PATCH 27/40] lint storage, more drugs --- .../maps/mapgen/sadie_large_storage.json | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/data/mods/Aftershock/maps/mapgen/sadie_large_storage.json b/data/mods/Aftershock/maps/mapgen/sadie_large_storage.json index 1023e4aea54bf..f121aea9f519e 100644 --- a/data/mods/Aftershock/maps/mapgen/sadie_large_storage.json +++ b/data/mods/Aftershock/maps/mapgen/sadie_large_storage.json @@ -86,13 +86,13 @@ { "item": "mansion_guns", "x": [ 1, 5 ], "y": [ 10, 12 ], "chance": 5, "repeat": [ 1, 6 ] }, { "item": "gunmod_common", "x": [ 1, 5 ], "y": [ 10, 12 ], "chance": 10, "repeat": [ 1, 6 ] }, { "item": "gear_soldier_sidearm", "x": [ 1, 5 ], "y": [ 10, 12 ], "chance": 5, "repeat": [ 1, 6 ] }, - { "item": "softdrugs", "x": [ 1, 5 ], "y": [ 14, 16 ], "chance": 35, "repeat": [ 1, 6 ] }, - { "item": "harddrugs", "x": [ 1, 5 ], "y": [ 14, 16 ], "chance": 10, "repeat": [ 1, 6 ] }, - { "item": "gear_medical", "x": [ 1, 5 ], "y": [ 14, 16 ], "chance": 35, "repeat": [ 1, 6 ] }, - { "item": "drugs_emergency", "x": [ 1, 5 ], "y": [ 14, 16 ], "chance": 20, "repeat": [ 1, 6 ] }, - { "item": "drugs_pharmacy", "x": [ 1, 5 ], "y": [ 14, 16 ], "chance": 35, "repeat": [ 1, 6 ] }, - { "item": "drugs_soldier", "x": [ 1, 5 ], "y": [ 14, 16 ], "chance": 10, "repeat": [ 1, 6 ] }, - { "item": "bionics_common", "x": [ 1, 5 ], "y": [ 14, 16 ], "chance": 5, "repeat": [ 1, 6 ] }, + { "item": "softdrugs", "x": [ 1, 5 ], "y": [ 14, 16 ], "chance": 50, "repeat": [ 1, 6 ] }, + { "item": "harddrugs", "x": [ 1, 5 ], "y": [ 14, 16 ], "chance": 30, "repeat": [ 1, 6 ] }, + { "item": "gear_medical", "x": [ 1, 5 ], "y": [ 14, 16 ], "chance": 50, "repeat": [ 1, 6 ] }, + { "item": "drugs_emergency", "x": [ 1, 5 ], "y": [ 14, 16 ], "chance": 40, "repeat": [ 1, 6 ] }, + { "item": "drugs_pharmacy", "x": [ 1, 5 ], "y": [ 14, 16 ], "chance": 50, "repeat": [ 1, 6 ] }, + { "item": "drugs_soldier", "x": [ 1, 5 ], "y": [ 14, 16 ], "chance": 20, "repeat": [ 1, 6 ] }, + { "item": "bionics_common", "x": [ 1, 5 ], "y": [ 14, 16 ], "chance": 20, "repeat": [ 1, 6 ] }, { "item": "dining", "x": [ 1, 5 ], "y": [ 18, 22 ], "chance": 50, "repeat": [ 1, 6 ] }, { "item": "kitchen", "x": [ 1, 5 ], "y": [ 18, 22 ], "chance": 50, "repeat": [ 1, 6 ] }, { "item": "oven", "x": [ 1, 5 ], "y": [ 18, 22 ], "chance": 35, "repeat": [ 1, 6 ] }, @@ -106,8 +106,8 @@ { "item": "coffee_shop", "x": [ 1, 5 ], "y": [ 18, 22 ], "chance": 10, "repeat": [ 1, 6 ] }, { "item": "alcohol", "x": [ 1, 5 ], "y": [ 18, 22 ], "chance": 10, "repeat": [ 1, 6 ] }, { "item": "mil_food", "x": [ 1, 5 ], "y": [ 18, 22 ], "chance": 5, "repeat": [ 1, 6 ] }, - { "item": "methlab", "x": [ 18, 22 ], "y": [ 10, 12 ], "chance": 50, "repeat": [ 1, 6 ] }, - { "item": "harddrugs", "x": [ 18, 22 ], "y": [ 10, 12 ], "chance": 35, "repeat": [ 1, 6 ] }, + { "item": "methlab", "x": [ 18, 22 ], "y": [ 10, 12 ], "chance": 70, "repeat": [ 1, 6 ] }, + { "item": "harddrugs", "x": [ 18, 22 ], "y": [ 10, 12 ], "chance": 50, "repeat": [ 1, 6 ] }, { "item": "chem_home", "x": [ 18, 22 ], "y": [ 10, 12 ], "chance": 20, "repeat": [ 1, 6 ] }, { "item": "chem_lab", "x": [ 18, 22 ], "y": [ 10, 12 ], "chance": 10, "repeat": [ 1, 6 ] }, { "item": "arcade_prizes", "x": [ 18, 22 ], "y": [ 14, 16 ], "chance": 50, "repeat": [ 1, 6 ] }, @@ -118,4 +118,4 @@ "place_nested": [ { "chunks": [ [ "Sadie_spawn", 20 ] ], "x": 3, "y": 3 } ] } } -] \ No newline at end of file +] From 77e6deae1863b6e888ca294b976ff7f28da012f5 Mon Sep 17 00:00:00 2001 From: LyleSY Date: Tue, 27 Oct 2020 08:55:12 -0400 Subject: [PATCH 28/40] Billy heart drop --- data/mods/Aftershock/npcs/sadie.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/data/mods/Aftershock/npcs/sadie.json b/data/mods/Aftershock/npcs/sadie.json index fb34c0d62b06a..d70643cf48947 100644 --- a/data/mods/Aftershock/npcs/sadie.json +++ b/data/mods/Aftershock/npcs/sadie.json @@ -151,7 +151,11 @@ "count": 1, "start": { "assign_mission_target": { "om_terrain": "forest_thick", "reveal_radius": 1, "random": true, "search_range": 18, "min_distance": 5, "z": 0 }, - "update_mapgen": { "place_monster": [ { "monster": "mon_flesh_golem", "x": 11, "y": 11, "target": true, "name": "Billy" } ] } + "update_mapgen": { + "place_monster": [ + { "monster": "mon_flesh_golem", "x": 11, "y": 11, "target": true, "name": "Billy", "death_drops": "flesh_golem_heart" } + ] + } }, "origins": [ "ORIGIN_SECONDARY" ], "dialogue": { From 6ab68f7297ea1c8729ad11b6fae74e4b885fd023 Mon Sep 17 00:00:00 2001 From: LyleSY Date: Tue, 27 Oct 2020 21:06:30 -0400 Subject: [PATCH 29/40] Fix Sadie dialog --- data/mods/Aftershock/npcs/sadie.json | 86 ++++++++++++++++++++++------ 1 file changed, 70 insertions(+), 16 deletions(-) diff --git a/data/mods/Aftershock/npcs/sadie.json b/data/mods/Aftershock/npcs/sadie.json index d70643cf48947..af4f19a91fa7f 100644 --- a/data/mods/Aftershock/npcs/sadie.json +++ b/data/mods/Aftershock/npcs/sadie.json @@ -53,19 +53,34 @@ }, { "text": "Can you inject me with whatever that was again?", - "condition": { "u_has_var": "sadie_nuts", "type": "general", "context": "nuts", "value": "yes" }, + "condition": { "u_has_var": "sadie_heart", "type": "general", "context": "heart", "value": "yes" }, "topic": "TALK_sadie_ask_injection2" }, { "text": "How did you get here?", - "condition": { "u_has_var": "u_met_sadie", "type": "general", "context": "meeting", "value": "yes" }, + "condition": { + "and": [ + { "u_has_var": "u_met_sadie", "type": "general", "context": "meeting", "value": "yes" }, + { "not": { "u_has_var": "sadie_heart", "type": "general", "context": "heart", "value": "yes" } } + ] + }, "topic": "TALK_sadie_ask_past" }, { "text": "How are things here?", - "condition": { "u_has_var": "u_met_sadie", "type": "general", "context": "meeting", "value": "yes" }, + "condition": { + "and": [ + { "u_has_var": "u_met_sadie", "type": "general", "context": "meeting", "value": "yes" }, + { "not": { "u_has_var": "sadie_heart", "type": "general", "context": "heart", "value": "yes" } } + ] + }, "topic": "TALK_sadie_ask_mood" }, + { + "text": "What do you think of this place?", + "condition": { "u_has_var": "sadie_heart", "type": "general", "context": "heart", "value": "yes" }, + "topic": "TALK_sadie_ask_place" + }, { "text": "Can I do anything for you?", "condition": { "u_has_var": "u_met_sadie", "type": "general", "context": "meeting", "value": "yes" }, @@ -81,7 +96,7 @@ "responses": [ { "text": "I'd like to understand more about you first. Are you human, more or less?", "topic": "TALK_sadie_what" }, { "text": "You are aware of the Cataclysm?", "topic": "TALK_sadie_cataclysm" }, - { "text": "I am your new friend and I'm here to help you.", "topic": "TALK_sadie_1" } + { "text": "I am your new friend and I'm here to help you.", "topic": "TALK_Sadie_1" } ] }, { @@ -94,19 +109,61 @@ "type": "talk_topic", "id": "TALK_sadie_ask_past", "dynamic_line": "I have so many memories, but they feel like they belong to other people? And animals too I think? It makes me dizzy and I have to sit down.", - "responses": [ { "text": "Let's talk about something else.", "topic": "TALK_sadie_1" } ] + "responses": [ { "text": "Let's talk about something else.", "topic": "TALK_Sadie_1" } ] }, { "type": "talk_topic", "id": "TALK_sadie_cataclysm", "dynamic_line": "I don't know her.", - "responses": [ { "text": "Yes. Let's talk about something else.", "topic": "TALK_sadie_1" } ] + "responses": [ { "text": "Yes. Let's talk about something else.", "topic": "TALK_Sadie_1" } ] }, { "type": "talk_topic", "id": "TALK_sadie_ask_mood", "dynamic_line": "Things stay pretty much the same here. Sometimes I feel bad, and that feels good, and sometimes I feel good, and that feels good too. Overall things are better than you might expect, but this may be a common experience, in which case things are exactly as you might expect. Does that make sense?", - "responses": [ { "text": "Perfect sense.", "topic": "TALK_sadie_1" } ] + "responses": [ { "text": "Perfect sense.", "topic": "TALK_Sadie_1" } ] + }, + { + "type": "talk_topic", + "id": "TALK_sadie_ask_place", + "dynamic_line": { + "and": [ + { "is_outside": true, "yes": "It's nice being out here. ", "no": "" }, + "", + { + "at_safe_space": true, + "no": "This might not be a very private place.", + "yes": "This feels like a good place to relax. Want to play doctor with real scalpels?" + }, + " ", + { + "npc_at_om_location": "field", + "no": "", + "yes": "This place is so boring. We should take people and kill some drugs." + }, + { + "npc_at_om_location": "water", + "no": "", + "yes": "Water water everywhere. Let's go skinny dipping. I bet you'll attract some leeches. I need them for something I want to do to you. It'll be so weird." + }, + { + "npc_at_om_location": "subterranean", + "no": "", + "yes": "I like it down here. This reminds me of that time I was down in a place like this and someone creeped up behind me and hit me in the back of the head with a shovel. *shiver* It still gives me goosebumps." + }, + { + "npc_at_om_location": "forest", + "no": "", + "yes": "I love nature. It smells so good out here, like living things growing and multiplying and dying and returning from the dead with horrifying new powers and trying to slowly rip us apart and eat us. It brings back really happy memories for me." + }, + { + "npc_at_om_location": "swamp", + "no": "", + "yes": "I love swampy places like this. The smell of the pussywillows, the sound of the crickets, the giant mutant mosquitoes hungry for our blood. It's like we're in a sexy vampire romance novel." + } + ] + }, + "responses": [ { "text": "I feel the same Sadie.", "topic": "TALK_Sadie_1" } ] }, { "type": "talk_topic", @@ -119,7 +176,7 @@ { "u_lose_var": "sadie_injection", "type": "general", "context": "injection" }, { "u_add_var": "sadie_heart", "type": "general", "context": "heart", "value": "yes" } ], - "topic": "TALK_sadie_1" + "topic": "TALK_Sadie_1" } ] }, @@ -135,7 +192,7 @@ { "u_add_effect": "morale_chat", "duration": 2000 }, { "u_add_effect": "sadie_injection", "duration": 2000 } ], - "topic": "TALK_sadie_1" + "topic": "TALK_Sadie_1" } ] }, @@ -151,11 +208,7 @@ "count": 1, "start": { "assign_mission_target": { "om_terrain": "forest_thick", "reveal_radius": 1, "random": true, "search_range": 18, "min_distance": 5, "z": 0 }, - "update_mapgen": { - "place_monster": [ - { "monster": "mon_flesh_golem", "x": 11, "y": 11, "target": true, "name": "Billy", "death_drops": "flesh_golem_heart" } - ] - } + "update_mapgen": { "place_monster": [ { "monster": "mon_flesh_golem", "x": 11, "y": 11, "target": true, "name": "Billy" } ] } }, "origins": [ "ORIGIN_SECONDARY" ], "dialogue": { @@ -163,7 +216,7 @@ "offer": "I've been feeling really yummy since the last time Billy came to work on me, and I think it's because my heart is gone. Like literally gone. I checked. Billy did a really good job taking it out, but I want to leave this storage unit with you and if I'm going to do that I need a working heart. My first idea was to take yours, but you probably need it even more. You know who has a nice big juicy heart? Billy does. And I bet I know where Billy is.", "accepted": "Aw, I heart that you're going to help me get that big organ.", "rejected": "This makes me sad. Which makes me happy. So thanks? Let me know if you change your mind. I probably shouldn't go without a heart for too too long but I'm kind of enjoying it. It's like always being on the edge of something horrible, but in a nice way.", - "advice": "Please be careful cutting that heart out. If you ruin it I don't know about another good one nearby.", + "advice": "Please be careful cutting that heart out. If you ruin it I don't know about another good one nearby. Maybe practice on some friends and neighbors first, you really want to be sure and get it right. If you break Billy's heart I can use a heart from another of whatever Billy is, but I can't use regular hearts, and I don't know where to find more Billy types.", "inquire": "Do you have my heart?", "success": "Ooh, Billy had a really good heart. Can you turn away please? I just need to do some quick open chest surgery here. Just a quick cut here *ooh* and I need to break this and this *SNAP* *oh!* and just sew some little things together here quickly. Not as much blood as you'd think. I should probably look into that later, there should be more blood in there. Ah, good enough, I can do a better job closing up later. Kind of tingly, feeling everything moving again in there. See, heart surgery isn't hard if you have the right attitude. Well now, you need a good reward for everything you've done for me. Here, let me inject you with this.", "success_lie": "I don't know why, but I feel better. Also worse. Maybe I'm good without it.", @@ -174,7 +227,8 @@ { "u_add_effect": "give_aid", "duration": 2000 }, { "u_add_effect": "morale_chat", "duration": 2000 }, { "u_add_effect": "sadie_injection", "duration": 2000 }, - { "u_add_var": "sadie_injection", "type": "general", "context": "injection", "value": "yes" } + { "u_add_var": "sadie_injection", "type": "general", "context": "injection", "value": "yes" }, + { "npc_add_effect": "follow" } ] } } From bf3918f6682c24389d662026a43f89421c29de23 Mon Sep 17 00:00:00 2001 From: LyleSY Date: Thu, 29 Oct 2020 20:52:05 -0400 Subject: [PATCH 30/40] many Sadie fixes --- data/mods/Aftershock/npcs/sadie.json | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/data/mods/Aftershock/npcs/sadie.json b/data/mods/Aftershock/npcs/sadie.json index af4f19a91fa7f..b0aa04260a1a2 100644 --- a/data/mods/Aftershock/npcs/sadie.json +++ b/data/mods/Aftershock/npcs/sadie.json @@ -49,12 +49,12 @@ { "text": "What did you just inject me with?", "condition": { "u_has_var": "sadie_injection", "type": "general", "context": "injection", "value": "yes" }, - "topic": "TALK_sadie_ask_injection" + "topic": "TALK_sadie_injection" }, { "text": "Can you inject me with whatever that was again?", "condition": { "u_has_var": "sadie_heart", "type": "general", "context": "heart", "value": "yes" }, - "topic": "TALK_sadie_ask_injection2" + "topic": "TALK_sadie_injection2" }, { "text": "How did you get here?", @@ -160,6 +160,11 @@ "npc_at_om_location": "swamp", "no": "", "yes": "I love swampy places like this. The smell of the pussywillows, the sound of the crickets, the giant mutant mosquitoes hungry for our blood. It's like we're in a sexy vampire romance novel." + }, + { + "npc_at_om_location": "Lab", + "no": "", + "yes": "What a beautiful facility. I bet they have all kinds of lovely toys to play with. We should kill everyone here and do some creative self-experimentation." } ] }, @@ -187,11 +192,7 @@ "responses": [ { "text": "I'm glad we get along so well Sadie.", - "effect": [ - { "u_add_effect": "give_aid", "duration": 2000 }, - { "u_add_effect": "morale_chat", "duration": 2000 }, - { "u_add_effect": "sadie_injection", "duration": 2000 } - ], + "effect": [ "give_aid", { "u_add_effect": "sadie_injection", "duration": 200000 } ], "topic": "TALK_Sadie_1" } ] @@ -208,7 +209,11 @@ "count": 1, "start": { "assign_mission_target": { "om_terrain": "forest_thick", "reveal_radius": 1, "random": true, "search_range": 18, "min_distance": 5, "z": 0 }, - "update_mapgen": { "place_monster": [ { "monster": "mon_flesh_golem", "x": 11, "y": 11, "target": true, "name": "Billy" } ] } + "update_mapgen": { + "place_monster": [ + { "monster": "mon_flesh_golem", "x": 11, "y": 11, "target": true, "name": "Billy", "death_drops": "flesh_golem_heart" } + ] + } }, "origins": [ "ORIGIN_SECONDARY" ], "dialogue": { @@ -224,11 +229,10 @@ }, "end": { "effect": [ - { "u_add_effect": "give_aid", "duration": 2000 }, - { "u_add_effect": "morale_chat", "duration": 2000 }, - { "u_add_effect": "sadie_injection", "duration": 2000 }, + "give_aid", + { "u_add_effect": "sadie_injection", "duration": 200000 }, { "u_add_var": "sadie_injection", "type": "general", "context": "injection", "value": "yes" }, - { "npc_add_effect": "follow" } + "follow" ] } } From c3f59c19c03c6840f72a46ac56edf4661467b2d1 Mon Sep 17 00:00:00 2001 From: LyleSY Date: Thu, 29 Oct 2020 21:25:08 -0400 Subject: [PATCH 31/40] free Sadie --- data/mods/Aftershock/npcs/sadie.json | 37 ++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/data/mods/Aftershock/npcs/sadie.json b/data/mods/Aftershock/npcs/sadie.json index b0aa04260a1a2..dd855aca423d9 100644 --- a/data/mods/Aftershock/npcs/sadie.json +++ b/data/mods/Aftershock/npcs/sadie.json @@ -51,6 +51,13 @@ "condition": { "u_has_var": "sadie_injection", "type": "general", "context": "injection", "value": "yes" }, "topic": "TALK_sadie_injection" }, + { + "text": "Would you like to come with me Sadie?", + "topic": "TALK_sadie_follow", + "condition": { + "and": [ { "not": "npc_following" }, { "u_has_var": "sadie_heart", "type": "general", "context": "heart", "value": "yes" } ] + } + }, { "text": "Can you inject me with whatever that was again?", "condition": { "u_has_var": "sadie_heart", "type": "general", "context": "heart", "value": "yes" }, @@ -197,6 +204,36 @@ } ] }, + { + "id": "TALK_sadie_follow", + "type": "talk_topic", + "dynamic_line": { + "u_has_var": "u_freed_sadie", + "type": "general", + "context": "free", + "value": "yes", + "no": [ + "I can't wait to see how wonderful the world must be. I've heard the shrieking and moaning and cries for help and I just know it's going to be perfect if everyone out there is as sweet and loving as you and Billy." + ], + "yes": [ + "Let's go explore. There's still so much these eyes haven't seen. Wait, are these new eyes? Where did I put my old eyes? Are they pretty?" + ] + }, + "responses": [ + { + "text": "Yes, everyone left is exactly like Billy and me, or worse.", + "condition": [ { "not": { "u_has_var": "u_freed_sadie", "type": "general", "context": "free", "value": "yes" } } ], + "effect": [ "follow", { "u_add_var": "u_freed_sadie", "type": "general", "context": "free", "value": "yes" } ], + "topic": "TALK_DONE" + }, + { + "text": "They're even better. Let's go.", + "condition": { "and": [ { "u_has_var": "u_freed_sadie", "type": "general", "context": "free", "value": "yes" } ] }, + "effect": [ "follow" ], + "topic": "TALK_DONE" + } + ] + }, { "id": "MISSION_sadie_heart", "type": "mission_definition", From c8d61c839f0021c200aa944f506ebfd930ada6c5 Mon Sep 17 00:00:00 2001 From: LyleSY Date: Thu, 29 Oct 2020 21:26:25 -0400 Subject: [PATCH 32/40] remove extra follow --- data/mods/Aftershock/npcs/sadie.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/data/mods/Aftershock/npcs/sadie.json b/data/mods/Aftershock/npcs/sadie.json index dd855aca423d9..204a982211004 100644 --- a/data/mods/Aftershock/npcs/sadie.json +++ b/data/mods/Aftershock/npcs/sadie.json @@ -268,8 +268,7 @@ "effect": [ "give_aid", { "u_add_effect": "sadie_injection", "duration": 200000 }, - { "u_add_var": "sadie_injection", "type": "general", "context": "injection", "value": "yes" }, - "follow" + { "u_add_var": "sadie_injection", "type": "general", "context": "injection", "value": "yes" } ] } } From d5be54582bf482a492f22693bfa112418fd5b891 Mon Sep 17 00:00:00 2001 From: LyleSY Date: Thu, 29 Oct 2020 21:31:15 -0400 Subject: [PATCH 33/40] formatting error fix --- data/mods/Aftershock/npcs/sadie.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/mods/Aftershock/npcs/sadie.json b/data/mods/Aftershock/npcs/sadie.json index 204a982211004..d648b2c9ba2a8 100644 --- a/data/mods/Aftershock/npcs/sadie.json +++ b/data/mods/Aftershock/npcs/sadie.json @@ -222,7 +222,7 @@ "responses": [ { "text": "Yes, everyone left is exactly like Billy and me, or worse.", - "condition": [ { "not": { "u_has_var": "u_freed_sadie", "type": "general", "context": "free", "value": "yes" } } ], + "condition": { "not": { "u_has_var": "u_freed_sadie", "type": "general", "context": "free", "value": "yes" } }, "effect": [ "follow", { "u_add_var": "u_freed_sadie", "type": "general", "context": "free", "value": "yes" } ], "topic": "TALK_DONE" }, From 90eac2cd3d6d4d717e114b31e0de10ce85799807 Mon Sep 17 00:00:00 2001 From: LyleSY Date: Thu, 29 Oct 2020 23:12:27 -0400 Subject: [PATCH 34/40] Travis troubleshooting --- data/mods/Aftershock/npcs/sadie.json | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/data/mods/Aftershock/npcs/sadie.json b/data/mods/Aftershock/npcs/sadie.json index d648b2c9ba2a8..7350389f26c7e 100644 --- a/data/mods/Aftershock/npcs/sadie.json +++ b/data/mods/Aftershock/npcs/sadie.json @@ -135,8 +135,8 @@ "id": "TALK_sadie_ask_place", "dynamic_line": { "and": [ - { "is_outside": true, "yes": "It's nice being out here. ", "no": "" }, - "", + { "is_outside": true, "yes": "It's nice being out here.", "no": "" }, + " ", { "at_safe_space": true, "no": "This might not be a very private place.", @@ -246,11 +246,7 @@ "count": 1, "start": { "assign_mission_target": { "om_terrain": "forest_thick", "reveal_radius": 1, "random": true, "search_range": 18, "min_distance": 5, "z": 0 }, - "update_mapgen": { - "place_monster": [ - { "monster": "mon_flesh_golem", "x": 11, "y": 11, "target": true, "name": "Billy", "death_drops": "flesh_golem_heart" } - ] - } + "update_mapgen": { "place_monster": [ { "monster": "mon_flesh_golem", "x": 11, "y": 11, "target": true, "name": "Billy" } ] } }, "origins": [ "ORIGIN_SECONDARY" ], "dialogue": { From 7f7716e3b6de2b7cf745dfc9b4ee9d6bb8049a53 Mon Sep 17 00:00:00 2001 From: LyleSY Date: Fri, 30 Oct 2020 07:04:43 -0400 Subject: [PATCH 35/40] Sadie items and start background migration --- data/mods/Aftershock/npcs/classes.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/data/mods/Aftershock/npcs/classes.json b/data/mods/Aftershock/npcs/classes.json index e5f4888c1d17d..97868873daeff 100644 --- a/data/mods/Aftershock/npcs/classes.json +++ b/data/mods/Aftershock/npcs/classes.json @@ -179,6 +179,9 @@ "name": "forgotten experiment", "job_description": "What a magical world to explore…", "common": false, + "worn_override": "NC_CYBORG_worn", + "carry_override": "NC_DOCTOR_misc", + "weapon_override": "EMPTY_GROUP", "traits": [ [ "PRETTY", 100 ], [ "OPTIMISTIC", 100 ], @@ -189,7 +192,8 @@ { "group": "trait_group_medical" }, { "distribution": [ { "group": "trait_group_medical_nonthres" }, { "group": "trait_group_medical_postthres" } ] - } + }, + [ "BGSS_Sadie", 100 ] ], "skills": [ { "skill": "ALL", "level": { "mul": [ { "one_in": 3 }, { "sum": [ { "dice": [ 2, 2 ] }, { "constant": -4 } ] } ] } }, From 218e9ed3ff4bc3e2b158a392e193399e36dd6c23 Mon Sep 17 00:00:00 2001 From: LyleSY Date: Fri, 30 Oct 2020 07:12:15 -0400 Subject: [PATCH 36/40] add Sadie to BG_traits_afs --- .../Aftershock/npcs/Backgrounds/BG_traits_afs.json | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/data/mods/Aftershock/npcs/Backgrounds/BG_traits_afs.json b/data/mods/Aftershock/npcs/Backgrounds/BG_traits_afs.json index 9dfb7d43d6634..1bc58ca235183 100644 --- a/data/mods/Aftershock/npcs/Backgrounds/BG_traits_afs.json +++ b/data/mods/Aftershock/npcs/Backgrounds/BG_traits_afs.json @@ -238,5 +238,18 @@ "purifiable": false, "types": [ "BACKGROUND_SURVIVAL_STORY" ], "flags": [ "BG_SURVIVAL_STORY" ] + }, + { + "type": "mutation", + "//": "This is a unique background story trait that should not be given out randomly.", + "id": "BGSS_Sadie", + "name": { "str": "Sadie Story" }, + "points": 0, + "description": "This NPC could tell you about how they survived the Cataclysm", + "player_display": false, + "valid": false, + "purifiable": false, + "types": [ "BACKGROUND_SURVIVAL_STORY" ], + "flags": [ "BG_SURVIVAL_STORY" ] } ] From 423d2622cd1a6c5e3dd2d5edadcae1f2931730e7 Mon Sep 17 00:00:00 2001 From: LyleSY Date: Fri, 30 Oct 2020 07:16:34 -0400 Subject: [PATCH 37/40] add Sadie to BG_BR_tableofcontents_AFS --- .../npcs/Backgrounds/BG_BR_tableofcontents_AFS.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/data/mods/Aftershock/npcs/Backgrounds/BG_BR_tableofcontents_AFS.json b/data/mods/Aftershock/npcs/Backgrounds/BG_BR_tableofcontents_AFS.json index dbbcd754ead53..7b110bae858b5 100644 --- a/data/mods/Aftershock/npcs/Backgrounds/BG_BR_tableofcontents_AFS.json +++ b/data/mods/Aftershock/npcs/Backgrounds/BG_BR_tableofcontents_AFS.json @@ -140,6 +140,12 @@ "topic": "BGSS_CYBERNINJA_STORY1", "condition": { "npc_has_trait": "BGSS_CYBERNINJA" }, "switch": true + }, + { + "text": "", + "topic": "BGSS_Sadie_STORY1", + "condition": { "npc_has_trait": "BGSS_Sadie" }, + "switch": true } ] } From 6f7318b47f66e7f806ccdb9c3a84beec0432d825 Mon Sep 17 00:00:00 2001 From: LyleSY Date: Fri, 30 Oct 2020 07:42:24 -0400 Subject: [PATCH 38/40] move Sadie location dialog to BGBR_Sadie --- .../npcs/Backgrounds/BGBR_Sadie.json | 52 +++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 data/mods/Aftershock/npcs/Backgrounds/BGBR_Sadie.json diff --git a/data/mods/Aftershock/npcs/Backgrounds/BGBR_Sadie.json b/data/mods/Aftershock/npcs/Backgrounds/BGBR_Sadie.json new file mode 100644 index 0000000000000..baef5148106e5 --- /dev/null +++ b/data/mods/Aftershock/npcs/Backgrounds/BGBR_Sadie.json @@ -0,0 +1,52 @@ +[ + { + "id": "BGSS_Sadie_STORY1", + "type": "talk_topic", + "dynamic_line": { + "and": [ + { + "at_safe_space": true, + "no": "This might not be a very private place.", + "yes": "This feels like a good place to relax. Want to play doctor with real scalpels?" + }, + " ", + { + "npc_at_om_location": "field", + "no": "", + "yes": "This place is so boring. We should take people and kill some drugs." + }, + { + "npc_at_om_location": "water", + "no": "", + "yes": "Water water everywhere. Let's go skinny dipping. I bet you'll attract some leeches. I need them for something I want to do to you. It'll be so weird." + }, + { + "npc_at_om_location": "subterranean", + "no": "", + "yes": "I like it down here. This reminds me of that time I was down in a place like this and someone creeped up behind me and hit me in the back of the head with a shovel. *shiver* It still gives me goosebumps." + }, + { + "npc_at_om_location": "forest", + "no": "", + "yes": "I love nature. It smells so good out here, like living things growing and multiplying and dying and returning from the dead with horrifying new powers and trying to slowly rip us apart and eat us. It brings back really happy memories for me." + }, + { + "npc_at_om_location": "swamp", + "no": "", + "yes": "I love swampy places like this. The smell of the pussywillows, the sound of the crickets, the giant mutant mosquitoes hungry for our blood. It's like we're in a sexy vampire romance novel." + }, + { + "npc_at_om_location": "Lab", + "no": "", + "yes": "What a beautiful facility. I bet they have all kinds of lovely toys to play with. We should kill everyone here and do some creative self-experimentation." + }, + { + "npc_at_om_location": [ "Mansion_Wild", "Mansion_WildAlt" ], + "no": "", + "yes": "Ooh, it's like a murder mystery here. Are we the murderers, the murdered, or the mystery?" + } + ] + }, + "responses": [ { "text": "", "topic": "TALK_FRIEND" }, { "text": "", "topic": "TALK_DONE" } ] + } +] From 48470fa6dda5bbb864fc72b4adbfe59c52205523 Mon Sep 17 00:00:00 2001 From: LyleSY Date: Fri, 30 Oct 2020 07:44:16 -0400 Subject: [PATCH 39/40] finish moving Sadie location dialog --- data/mods/Aftershock/npcs/sadie.json | 52 ---------------------------- 1 file changed, 52 deletions(-) diff --git a/data/mods/Aftershock/npcs/sadie.json b/data/mods/Aftershock/npcs/sadie.json index 7350389f26c7e..618b7a0a7c16e 100644 --- a/data/mods/Aftershock/npcs/sadie.json +++ b/data/mods/Aftershock/npcs/sadie.json @@ -83,11 +83,6 @@ }, "topic": "TALK_sadie_ask_mood" }, - { - "text": "What do you think of this place?", - "condition": { "u_has_var": "sadie_heart", "type": "general", "context": "heart", "value": "yes" }, - "topic": "TALK_sadie_ask_place" - }, { "text": "Can I do anything for you?", "condition": { "u_has_var": "u_met_sadie", "type": "general", "context": "meeting", "value": "yes" }, @@ -130,53 +125,6 @@ "dynamic_line": "Things stay pretty much the same here. Sometimes I feel bad, and that feels good, and sometimes I feel good, and that feels good too. Overall things are better than you might expect, but this may be a common experience, in which case things are exactly as you might expect. Does that make sense?", "responses": [ { "text": "Perfect sense.", "topic": "TALK_Sadie_1" } ] }, - { - "type": "talk_topic", - "id": "TALK_sadie_ask_place", - "dynamic_line": { - "and": [ - { "is_outside": true, "yes": "It's nice being out here.", "no": "" }, - " ", - { - "at_safe_space": true, - "no": "This might not be a very private place.", - "yes": "This feels like a good place to relax. Want to play doctor with real scalpels?" - }, - " ", - { - "npc_at_om_location": "field", - "no": "", - "yes": "This place is so boring. We should take people and kill some drugs." - }, - { - "npc_at_om_location": "water", - "no": "", - "yes": "Water water everywhere. Let's go skinny dipping. I bet you'll attract some leeches. I need them for something I want to do to you. It'll be so weird." - }, - { - "npc_at_om_location": "subterranean", - "no": "", - "yes": "I like it down here. This reminds me of that time I was down in a place like this and someone creeped up behind me and hit me in the back of the head with a shovel. *shiver* It still gives me goosebumps." - }, - { - "npc_at_om_location": "forest", - "no": "", - "yes": "I love nature. It smells so good out here, like living things growing and multiplying and dying and returning from the dead with horrifying new powers and trying to slowly rip us apart and eat us. It brings back really happy memories for me." - }, - { - "npc_at_om_location": "swamp", - "no": "", - "yes": "I love swampy places like this. The smell of the pussywillows, the sound of the crickets, the giant mutant mosquitoes hungry for our blood. It's like we're in a sexy vampire romance novel." - }, - { - "npc_at_om_location": "Lab", - "no": "", - "yes": "What a beautiful facility. I bet they have all kinds of lovely toys to play with. We should kill everyone here and do some creative self-experimentation." - } - ] - }, - "responses": [ { "text": "I feel the same Sadie.", "topic": "TALK_Sadie_1" } ] - }, { "type": "talk_topic", "id": "TALK_sadie_injection", From 3fad6b429cd81e4c904baaca58d6db96c6dc347f Mon Sep 17 00:00:00 2001 From: LyleSY Date: Fri, 30 Oct 2020 15:12:58 -0400 Subject: [PATCH 40/40] Mansion fix --- data/mods/Aftershock/npcs/Backgrounds/BGBR_Sadie.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/mods/Aftershock/npcs/Backgrounds/BGBR_Sadie.json b/data/mods/Aftershock/npcs/Backgrounds/BGBR_Sadie.json index baef5148106e5..d2e813779d092 100644 --- a/data/mods/Aftershock/npcs/Backgrounds/BGBR_Sadie.json +++ b/data/mods/Aftershock/npcs/Backgrounds/BGBR_Sadie.json @@ -41,7 +41,7 @@ "yes": "What a beautiful facility. I bet they have all kinds of lovely toys to play with. We should kill everyone here and do some creative self-experimentation." }, { - "npc_at_om_location": [ "Mansion_Wild", "Mansion_WildAlt" ], + "npc_at_om_location": "Mansion_Wild", "no": "", "yes": "Ooh, it's like a murder mystery here. Are we the murderers, the murdered, or the mystery?" }