From 648244d4352fe19768520e5580f5f2fdef38f52a Mon Sep 17 00:00:00 2001 From: Kaelin Bougneit Date: Fri, 22 Jul 2022 15:17:17 -0700 Subject: [PATCH 01/14] initial commit --- data/json/npcs/Backgrounds/prepper_1.json | 1 + 1 file changed, 1 insertion(+) diff --git a/data/json/npcs/Backgrounds/prepper_1.json b/data/json/npcs/Backgrounds/prepper_1.json index 4992046fa6365..2c61520125975 100644 --- a/data/json/npcs/Backgrounds/prepper_1.json +++ b/data/json/npcs/Backgrounds/prepper_1.json @@ -107,6 +107,7 @@ "type": "mission_definition", "name": { "str": "Check out that LMOE shelter" }, "description": "Maybe there's something left in that LMOE shelter you heard about.", + "//": "This mission should direct toward a locked shelter. Completion should open a new line of dialog that leads to opening the shelter and (possibly?) convincing the prepper to share their most prized stuff with the player.", "goal": "MGOAL_GO_TO", "difficulty": 2, "value": 0, From d739af5fb5c805c2100eaa25841bbc592080dd55 Mon Sep 17 00:00:00 2001 From: Kaelin Bougneit Date: Wed, 3 Aug 2022 13:00:36 -0700 Subject: [PATCH 02/14] add locked LMOE, specials, and new item group --- data/json/mapgen/lmoe.json | 75 +++++++++++++++++++ data/json/mapgen_palettes/lmoe.json | 30 ++++++++ .../overmap/overmap_special/specials.json | 14 ++++ .../overmap_terrain_military.json | 18 +++++ 4 files changed, 137 insertions(+) diff --git a/data/json/mapgen/lmoe.json b/data/json/mapgen/lmoe.json index ac2c25191a559..00c2ee72027b7 100644 --- a/data/json/mapgen/lmoe.json +++ b/data/json/mapgen/lmoe.json @@ -191,6 +191,81 @@ ] } }, + { + "type": "mapgen", + "method": "json", + "om_terrain": [ "lmoe_prepperquest" ], + "//": "Above ground", + "//2": "The front door to this LMOE is locked and can be unlocked by doing the prepper_1 quest line.", + "weight": 100, + "object": { + "rows": [ + " S S S", + " S S S ", + " S S S ", + " S ", + " S S SSSSS S ", + " SSSSSSSSSSSS ", + " SS$$$$$$$$$$SS ", + " S$$TTTTTTTT$$S S ", + " SS$$T))))))T$$S ", + " S SS$$T)####)T$$SS ", + " SS$$T)#>>#)T$$SS ", + " SS$$T)#..#)T$$SS ", + " SS$$T)#L##)T$$SS S", + " S S$$T))_)))T$$SS ", + " S$$$$$_$$$$$$S ", + " SS$$$$_$$$$$SS S ", + " SSSSS_SSSSSS ", + "S S S SS S ", + " S S ", + " S S ", + " S S ", + " S", + " S S ", + " S " + ], + "palettes": [ "bunker_ext" ] + } + }, + { + "type": "mapgen", + "method": "json", + "om_terrain": [ "lmoe_under_empty_prepperquest" ], + "//": "This particular 2-bed shelter is a more professionally done, all metal bomb shelter with kitchen, secret safe room / gun locker, and workshop.", + "//2": "This terrain is the destination for the prepper_1 quest. The front door is locked and can be unlocked by completing the quest.", + "weight": 100, + "object": { + "fill_ter": "t_metal_floor", + "rows": [ + "########################", + "########################", + "##||||||||||||||||||||##", + "##|{{{{{|UUUUUU|w__BB|##", + "##|u____|U____U|d__BB|##", + "##|u___h|U_UU_U|A,,,_|##", + "##|u___D|=*==*=|_,,,}|##", + "##|A____:______+_,,,}|##", + "##|||||||_1,,1_|S__hD|##", + "##|VVVVV=_e,,P_|||||||##", + "##|_____*__,,____|s_K|##", + "##|vvvvv=_E,,f___+__t|##", + "##|||||||||++|||||||||##", + "##|c_bbbbA|,,|CSCCKCC|##", + "##|c______|,,|u_____C|##", + "##|c_TT___|,,|u_hLh_F|##", + "##|c_TTh__+__+_______|##", + "##|c_TT___|__|rrrr__~|##", + "##|c______|__|||||+|||##", + "##|c______|__*__a|__A|##", + "##|ccccccc|<<=G_a|HlW|##", + "##||||||||||||||||||||##", + "########################", + "########################" + ], + "palettes": [ "bunker", "empty_prepperquest_bunker_items" ] + } + }, { "type": "mapgen", "method": "json", diff --git a/data/json/mapgen_palettes/lmoe.json b/data/json/mapgen_palettes/lmoe.json index 189bc41a14f69..2a1a38e65b6a9 100644 --- a/data/json/mapgen_palettes/lmoe.json +++ b/data/json/mapgen_palettes/lmoe.json @@ -85,6 +85,35 @@ "}": { "item": "novels", "chance": 90, "repeat": [ 3, 8 ] } } }, + { + "type": "palette", + "id": "empty_prepperquest_bunker_items", + "//": "Used for the prepper_1 NPC's bunker. Nearly identical to empty_bunker_items but with some added item groups and other spawns buffed ~15-25%, especially food and ammo.", + "items": { + "b": [ { "item": "manuals", "chance": 70 }, { "item": "textbooks", "chance": 50 } ], + "B": { "item": "bed", "chance": 70, "repeat": [ 1, 2 ] }, + "c": { "item": "hardware", "chance": 70 }, + "C": [ { "item": "dining", "chance": 35, "repeat": [ 1, 3 ] }, { "item": "oven", "chance": 20 }, { "item": "cleaning", "chance": 40, "repeat": [ 1, 2 ] } ], + "d": { "item": "allclothes", "chance": 85, "repeat": [ 2, 4 ] }, + "D": { "item": "office", "chance": 75 }, + "F": { "item": "SUS_fridge_survivor", "chance": 100 }, + "l": { "item": "hardware", "chance": 65, "repeat": [ 1, 3 ] }, + "L": { "item": "dining", "chance": 30 }, + "r": { "item": "stash_wood", "chance": 80, "repeat": [ 1, 4 ] }, + "R": { "item": "hardware", "chance": 80 }, + "S": { "item": "oven", "chance": 80 }, + "T": { "item": "tools_common", "chance": 70, "repeat": [ 1, 2 ] }, + "U": { "item": "gear_survival", "chance": 30, "repeat": [ 3, 5 ] }, + "u": [ { "item": "cannedfood", "chance": 50, "repeat": [ 1, 5 ] }, { "item": "pasta", "chance": 20, "repeat": [ 1, 3 ] } ], + "v": { "item": "softdrugs", "chance": 75, "repeat": [ 1, 3 ] }, + "V": [{ "item": "bags", "chance": 30 }, { "item": "large_bags", "chance": 8 }], + "w": { "item": "allclothes", "chance": 80, "repeat": [ 2, 4 ] }, + "Y": [ { "item": "jackets", "chance": 20 }, { "item": "hatstore_hats", "chance": 20 }, { "item": "winter", "chance": 15 } ], + "^": { "item": "shelter", "chance": 30 }, + "{": [ { "item": "lmoe_guns", "chance": 90 }, { "item": "ammo", "chance": 30, "repeat": [ 2, 8 ] } ], + "}": [{ "item": "novels", "chance": 90, "repeat": [ 3, 8 ] }, { "item": "religious_books", "chance": 25 }] + } + }, { "type": "palette", "id": "bunker_ext", @@ -103,6 +132,7 @@ ], "v": "t_open_air", "+": "t_door_metal_c", + "L": "t_door_metal_locked", ".": "t_dirt", ">": "t_stairs_down", ")": "t_slope_up", diff --git a/data/json/overmap/overmap_special/specials.json b/data/json/overmap/overmap_special/specials.json index a94c1fc304f73..e5baba1c344b4 100644 --- a/data/json/overmap/overmap_special/specials.json +++ b/data/json/overmap/overmap_special/specials.json @@ -319,6 +319,20 @@ "occurrences": [ 0, 2 ], "flags": [ "CLASSIC", "MAN_MADE" ] }, + { + "type": "overmap_special", + "id": "Prepper LMOE Shelter", + "overmaps": [ + { "point": [ 0, 0, 0 ], "overmap": "lmoe_prepperquest_north" }, + { "point": [ 0, 0, 1 ], "overmap": "lmoe_roof_north" }, + { "point": [ 0, 0, -1 ], "overmap": "lmoe_under_empty_prepperquest_north" } + ], + "locations": [ "forest_without_trail" ], + "city_distance": [ 25, -1 ], + "city_sizes": [ 0, 12 ], + "occurrences": [ 80, 100 ], + "flags": [ "CLASSIC", "MAN_MADE", "UNIQUE" ] + }, { "type": "overmap_special", "id": "Occupied LMOE Shelter", diff --git a/data/json/overmap/overmap_terrain/overmap_terrain_military.json b/data/json/overmap/overmap_terrain/overmap_terrain_military.json index c2399ea65f3fc..c564d3d9cd772 100644 --- a/data/json/overmap/overmap_terrain/overmap_terrain_military.json +++ b/data/json/overmap/overmap_terrain/overmap_terrain_military.json @@ -188,6 +188,15 @@ "see_cost": 2, "flags": [ "KNOWN_DOWN", "SOURCE_PEOPLE", "SOURCE_SAFETY", "SOURCE_GUN", "SOURCE_AMMO", "SOURCE_FOOD" ] }, + { + "type": "overmap_terrain", + "id": "lmoe_prepperquest", + "name": "LMOE shelter", + "sym": "+", + "color": "red", + "see_cost": 2, + "flags": [ "KNOWN_DOWN", "SOURCE_PEOPLE", "SOURCE_SAFETY", "SOURCE_GUN", "SOURCE_AMMO", "SOURCE_FOOD" ] + }, { "type": "overmap_terrain", "id": "lmoe_roof", @@ -215,6 +224,15 @@ "see_cost": 2, "flags": [ "KNOWN_UP", "SOURCE_PEOPLE", "SOURCE_SAFETY", "SOURCE_GUN", "SOURCE_AMMO", "SOURCE_FOOD" ] }, + { + "type": "overmap_terrain", + "id": "lmoe_under_empty_prepperquest", + "name": "LMOE shelter", + "sym": "+", + "color": "red", + "see_cost": 2, + "flags": [ "KNOWN_UP", "SOURCE_PEOPLE", "SOURCE_SAFETY", "SOURCE_GUN", "SOURCE_AMMO", "SOURCE_FOOD" ] + }, { "type": "overmap_terrain", "id": "lmoe_zombie", From d7cf77a3c6221b39af2b8fa6ca3b15a095937824 Mon Sep 17 00:00:00 2001 From: Kaelin Bougneit Date: Wed, 3 Aug 2022 13:08:21 -0700 Subject: [PATCH 03/14] rename overmap special for clarity --- data/json/overmap/overmap_special/specials.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/overmap/overmap_special/specials.json b/data/json/overmap/overmap_special/specials.json index e5baba1c344b4..9211f2596b1c2 100644 --- a/data/json/overmap/overmap_special/specials.json +++ b/data/json/overmap/overmap_special/specials.json @@ -321,7 +321,7 @@ }, { "type": "overmap_special", - "id": "Prepper LMOE Shelter", + "id": "Locked LMOE Shelter", "overmaps": [ { "point": [ 0, 0, 0 ], "overmap": "lmoe_prepperquest_north" }, { "point": [ 0, 0, 1 ], "overmap": "lmoe_roof_north" }, From 68d7ccd71b5b44686111b5c38813e11acaeb0407 Mon Sep 17 00:00:00 2001 From: Kaelin Bougneit Date: Mon, 8 Aug 2022 16:47:02 -0700 Subject: [PATCH 04/14] more conversation --- data/json/npcs/Backgrounds/prepper_1.json | 174 +++++++++++++++++++++- 1 file changed, 168 insertions(+), 6 deletions(-) diff --git a/data/json/npcs/Backgrounds/prepper_1.json b/data/json/npcs/Backgrounds/prepper_1.json index 2c61520125975..6b6a68d8a4e5d 100644 --- a/data/json/npcs/Backgrounds/prepper_1.json +++ b/data/json/npcs/Backgrounds/prepper_1.json @@ -6,6 +6,11 @@ "responses": [ { "text": "What happened to you?", "topic": "BGSS_PREPPER_1_STORY2" }, { "text": "What about your shelter?", "topic": "BGSS_PREPPER_1_LMOE" }, + { + "text": "You said you could tell me more about the shelter if I wanted. How did these things get built?", + "topic": "BGSS_PREPPER_1_LMOE2", + "condition": { "u_has_var": "prepper_1_finished_quest", "type": "mission", "context": "BGSS", "value": "yes" } + }, { "text": "", "topic": "TALK_FRIEND" }, { "text": "", "topic": "TALK_DONE" } ] @@ -65,7 +70,7 @@ } ] }, - "trial": { "type": "PERSUADE", "difficulty": 60, "mod": [ [ "TRUST", 4 ], [ "VALUE", 2 ], [ "ANGER", -6 ] ] }, + "trial": { "type": "PERSUADE", "difficulty": 10, "mod": [ [ "TRUST", 2 ], [ "VALUE", 2 ], [ "ANGER", -6 ] ] }, "success": { "topic": "BGSS_PREPPER_1_SHELTERSUCCESS", "effect": [ @@ -90,6 +95,146 @@ { "text": "", "topic": "TALK_DONE" } ] }, + { + "id": "BGSS_PREPPER_1_LMOE2", + "type": "talk_topic", + "dynamic_line": "The shelter? I hired a contractor to build this but did the door myself. Metal pin in the door frame. Can't open unless you remove it. There's a little pulley inside you have to pull up to reset. They made dozens of these in the area, and I couldn't sleep knowing just any at that company could waltz in as soon as shit hit the fan. They'd know exactly where to go and what to do! Nah… how do you think I've made it this long? Always keep a trick up your sleeve.", + "responses": [ + { + "text": "But we're good to go, right? I mean… the door is the only trick you had? No clever traps hidden in the walls or anything?", + "topic": "BGSS_PREPPER_1_LMOE3" + }, + { "text": "A contractor? How much does something like this cost?", "topic": "BGSS_PREPPER_1_LMOE4" }, + { + "text": "You wouldn't keep ALL your tricks and secrets from me, though, would you? After everything we've been through?", + "condition": { "not": { "u_has_var": "prepper_1_asked_about_secrets", "type": "mission", "context": "BGSS", "value": "yes" } }, + "//": "Even though material possessions have been made trivially easy to obtain in the apocalypse, the prepper still values theirs, hence the difficult trial here.", + "trial": { "type": "PERSUADE", "difficulty": -170, "mod": [ [ "TRUST", 1 ], [ "VALUE", 1 ], [ "ANGER", -8 ] ] }, + "success": { + "topic": "BGSS_PREPPER_1_SHARELOOTSUCCESS", + "effect": { "u_add_var": "prepper_1_asked_about_secrets", "type": "mission", "context": "BGSS", "value": "yes" } + }, + "failure": { + "topic": "BGSS_PREPPER_1_SHARELOOTFAILURE", + "effect": { "u_add_var": "prepper_1_asked_about_secrets", "type": "mission", "context": "BGSS", "value": "yes" }, + "opinion": { "trust": -6, "value": -3, "anger": 5 } + } + }, + { "text": "That's all I wanted to know.", "topic": "TALK_DONE" } + ] + }, + { + "id": "BGSS_PREPPER_1_LMOE3", + "type": "talk_topic", + "dynamic_line": "Nope, that's it. Got the idea for the door from a book on medieval castles, in case you were wondering. But instead of a counterweight holding a drawbridge up, I just ram a hex key in a hole.", + "responses": [ { "text": "Interesting…", "topic": "TALK_NONE" } ] + }, + { + "id": "BGSS_PREPPER_1_LMOE4", + "type": "talk_topic", + "dynamic_line": "Almost as much as my house, in the end. I think they realized they could make a lot of money as things got worse and worse. But it's nicer than my house, too. They said the ventilation system was built to withstand a month of anything: nuclear fallout, biological attack, you name it. Concrete and soil above me to absorb radiation, appliances and supplies… I even brought some old books I've never read. I always knew it would come to this.", + "responses": [ { "text": "How many of these did the company build?", "topic": "BGSS_PREPPER_1_LMOE5" } ] + }, + { + "id": "BGSS_PREPPER_1_LMOE5", + "type": "talk_topic", + "dynamic_line": "Dozens, they told me. Probably more by the end of it. But they obviously didn't say where or who for. They weren't the only ones doing it, but I think the best.", + "responses": [ { "text": "Right…", "topic": "BGSS_PREPPER_1_LMOE2" } ] + }, + { + "id": "BGSS_PREPPER_1_SHARELOOTSUCCESS", + "type": "talk_topic", + "dynamic_line": "Okay, listen… across the hall from the bedroom… by the pillars… it's a fake wall. Directly across the hall. If you push in a little bit, the whole thing kinda slides aside. I hid some guns back there and a handful of rounds, too. I meant to bring a lot more - I had boxes on backorder - but it started getting hard to buy past a certain point. Might as well share now that we're here. A spare bullet could save your life.", + "responses": [ { "text": "The wall thing is pretty nifty, I have to admit.", "topic": "BGSS_PREPPER_1_SHARELOOTSUCCESS2" } ] + }, + { + "id": "BGSS_PREPPER_1_SHARELOOTSUCCESS2", + "type": "talk_topic", + "dynamic_line": "Yeah, but they put the secret room in their advertising. Not really a secret then, is it?", + "responses": [ { "text": "Hmm, good point.", "topic": "TALK_DONE" } ] + }, + { + "id": "BGSS_PREPPER_1_SHARELOOTFAILURE", + "type": "talk_topic", + "dynamic_line": "What, like some secret Batcave? Pull back the curtain and it turns out I'm the communist who opened a portal to netherfuck in their basement? I just gave you food, all the tools in my workshop, and the safest hole in the ground in the county. If I've got any secrets left, they're mine to keep.", + "responses": [ + { "text": "No, you're right! I'm sorry for intruding!", "topic": "BGSS_PREPPER_1_SHARELOOTAPOLOGIZE" }, + { + "text": "For all I know, you COULD have something to do with this. Who really knows what happened?", + "topic": "BGSS_PREPPER_1_SHARELOOTFAILURE2", + "opinion": { "anger": 2 } + } + ] + }, + { + "id": "BGSS_PREPPER_1_SHARELOOTFAILURE2", + "type": "talk_topic", + "dynamic_line": "Well, I certainly wouldn't tell you. The way you talk… the questions you ask… they're extremely suspicious. Why did you ask about the shelter anyway? What do you want from me?", + "responses": [ + { + "text": "I just wanted the loot, I'll be honest.", + "topic": "TALK_DONE", + "opinion": { "anger": 5, "value": -5, "trust": -10, "fear": -2 }, + "effect": "insult_combat" + }, + { + "text": "Well… I'm actually a government agent sent to assassinate you. I just had to find out the location of your secret stash before I took you out.", + "topic": "BGSS_PREPPER_1_SHARELOOTFAILURE3" + }, + { + "text": "I thought we could team up. It sounded like a good place to stay safe.", + "topic": "BGSS_PREPPER_1_SHARELOOTAPOLOGIZE2", + "opinion": { "anger": -4 } + } + ] + }, + { + "id": "BGSS_PREPPER_1_SHARELOOTFAILURE3", + "type": "talk_topic", + "dynamic_line": "*tenses up and stares in disbelief. \"You're playing with me. The government doesn't exist anymore… You better be messing around or I-\"", + "responses": [ + { + "text": "Why else would I ask about your shelter? I don't need your gear. I don't need your help. Look around you! I'm tracking down the last free thinkers who have been putting the puzzle pieces together. It's YOU I'm after!", + "topic": "BGSS_PREPPER_1_SHARELOOTFAILURE4" + }, + { + "text": "Yeah, I'm just messing with you, don't worry. What, can't take a joke?", + "topic": "BGSS_PREPPER_1_SHARELOOTAPOLOGIZE3", + "opinion": { "trust": -3 } + } + ] + }, + { + "id": "BGSS_PREPPER_1_SHARELOOTFAILURE4", + "type": "talk_topic", + "dynamic_line": "I knew it… This whole time. It was all part of the plan. The riots, the storms… You always had control…", + "responses": [ + { + "text": "Prepare to meet your end, . *Attack*", + "topic": "TALK_DONE", + "opinion": { "anger": 40, "value": -30, "trust": -30, "fear": -10 }, + "effect": "hostile" + } + ] + }, + { + "id": "BGSS_PREPPER_1_SHARELOOTAPOLOGIZE", + "type": "talk_topic", + "dynamic_line": "Yeah, listen, just keep your questions to yourself. I don't trust you and you shouldn't trust me, either.", + "responses": [ { "text": "Sorry, I won't ask again.", "topic": "TALK_DONE", "opinion": { "anger": -1 } } ] + }, + { + "id": "BGSS_PREPPER_1_SHARELOOTAPOLOGIZE2", + "type": "talk_topic", + "dynamic_line": "It IS a good place to stay safe. Just don't go prying, okay?", + "responses": [ { "text": "You got it.", "topic": "TALK_DONE" } ] + }, + { + "id": "BGSS_PREPPER_1_SHARELOOTAPOLOGIZE3", + "type": "talk_topic", + "dynamic_line": "You think that's funny?! Some of us watched the warning signs for years. All the news, all the violence and the secret plots… Now the dead are walking, reality itself is tearing apart, and you're making jokes like that?!", + "responses": [ { "text": "Yeah…? I didn't realize it bothered you so much.", "topic": "TALK_DONE" } ] + }, { "id": "BGSS_PREPPER_1_SHELTERSUCCESS", "type": "talk_topic", @@ -112,10 +257,21 @@ "difficulty": 2, "value": 0, "start": { - "assign_mission_target": { "om_special": "LMOE Shelter", "om_terrain": "lmoe", "reveal_radius": 3, "search_range": 400 }, + "assign_mission_target": { "om_special": "Locked LMOE Shelter", "om_terrain": "lmoe_prepperquest", "reveal_radius": 3, "search_range": 400 }, "effect": { "u_add_var": "prepper_1_started_quest", "type": "mission", "context": "BGSS", "value": "yes" } }, - "end": { "opinion": { "trust": 1, "value": 1 } }, + "end": { + "opinion": { "trust": 1, "value": 1 }, + "effect": [ + { + "u_message": " walks up to the front door and pries back a thin piece of metal from the top of the doorframe, revealing an opening. They reach inside, pull hard on something, and you hear a heavy metal *clunk*.", + "type": "good", + "popup": true + }, + { "mapgen_update": "LMOE_unlock_door", "om_terrain": "lmoe_prepperquest" }, + { "u_add_var": "prepper_1_finished_quest", "type": "mission", "context": "BGSS", "value": "yes" } + ] + }, "origins": [ "ORIGIN_SECONDARY" ], "dialogue": { "describe": "…", @@ -123,10 +279,16 @@ "accepted": "…", "rejected": "…", "advice": "…", - "inquire": "Any luck finding the LMOE shelter?", - "success": "Thank you! I'm so glad we made it. I've tucked away some real loot back here.", - "success_lie": "Great!", + "inquire": "Any luck finding the LMOE shelter? Don't forget to take me with you. I changed the design and you sure as hell aren't getting in unless you know the trick.", + "success": "Damn, can't believe we finally made it. I was smart enough not to store anything that might rot, so as long as nobody else already broke in, I bet there's at least two weeks of good food just sitting there. Pristine workshop down there, too. It cost me a pretty penny to get built. I could tell you all about it sometime if you ever wanted. Anyway, thanks for helping me get back here. It sure ain't safe to travel on your own anymore.", + "success_lie": "…", "failure": "Not that surprising." } + }, + { + "type": "mapgen", + "update_mapgen_id": "LMOE_unlock_door", + "method": "json", + "object": { "translate_ter": [ { "from": "t_door_metal_locked", "to": "t_door_metal_c", "x": 0, "y": 0 } ] } } ] From 4aaf91d208d442951cebcb6451dcc967fc354404 Mon Sep 17 00:00:00 2001 From: Kaelin Bougneit Date: Mon, 8 Aug 2022 16:52:07 -0700 Subject: [PATCH 05/14] linting and spellcheck fixes --- data/json/mapgen_palettes/lmoe.json | 10 +++++++--- data/json/npcs/Backgrounds/prepper_1.json | 3 +-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/data/json/mapgen_palettes/lmoe.json b/data/json/mapgen_palettes/lmoe.json index 2a1a38e65b6a9..b8c61a7a3800e 100644 --- a/data/json/mapgen_palettes/lmoe.json +++ b/data/json/mapgen_palettes/lmoe.json @@ -93,7 +93,11 @@ "b": [ { "item": "manuals", "chance": 70 }, { "item": "textbooks", "chance": 50 } ], "B": { "item": "bed", "chance": 70, "repeat": [ 1, 2 ] }, "c": { "item": "hardware", "chance": 70 }, - "C": [ { "item": "dining", "chance": 35, "repeat": [ 1, 3 ] }, { "item": "oven", "chance": 20 }, { "item": "cleaning", "chance": 40, "repeat": [ 1, 2 ] } ], + "C": [ + { "item": "dining", "chance": 35, "repeat": [ 1, 3 ] }, + { "item": "oven", "chance": 20 }, + { "item": "cleaning", "chance": 40, "repeat": [ 1, 2 ] } + ], "d": { "item": "allclothes", "chance": 85, "repeat": [ 2, 4 ] }, "D": { "item": "office", "chance": 75 }, "F": { "item": "SUS_fridge_survivor", "chance": 100 }, @@ -106,12 +110,12 @@ "U": { "item": "gear_survival", "chance": 30, "repeat": [ 3, 5 ] }, "u": [ { "item": "cannedfood", "chance": 50, "repeat": [ 1, 5 ] }, { "item": "pasta", "chance": 20, "repeat": [ 1, 3 ] } ], "v": { "item": "softdrugs", "chance": 75, "repeat": [ 1, 3 ] }, - "V": [{ "item": "bags", "chance": 30 }, { "item": "large_bags", "chance": 8 }], + "V": [ { "item": "bags", "chance": 30 }, { "item": "large_bags", "chance": 8 } ], "w": { "item": "allclothes", "chance": 80, "repeat": [ 2, 4 ] }, "Y": [ { "item": "jackets", "chance": 20 }, { "item": "hatstore_hats", "chance": 20 }, { "item": "winter", "chance": 15 } ], "^": { "item": "shelter", "chance": 30 }, "{": [ { "item": "lmoe_guns", "chance": 90 }, { "item": "ammo", "chance": 30, "repeat": [ 2, 8 ] } ], - "}": [{ "item": "novels", "chance": 90, "repeat": [ 3, 8 ] }, { "item": "religious_books", "chance": 25 }] + "}": [ { "item": "novels", "chance": 90, "repeat": [ 3, 8 ] }, { "item": "religious_books", "chance": 25 } ] } }, { diff --git a/data/json/npcs/Backgrounds/prepper_1.json b/data/json/npcs/Backgrounds/prepper_1.json index 6b6a68d8a4e5d..4e2917847dc3a 100644 --- a/data/json/npcs/Backgrounds/prepper_1.json +++ b/data/json/npcs/Backgrounds/prepper_1.json @@ -144,7 +144,7 @@ { "id": "BGSS_PREPPER_1_SHARELOOTSUCCESS", "type": "talk_topic", - "dynamic_line": "Okay, listen… across the hall from the bedroom… by the pillars… it's a fake wall. Directly across the hall. If you push in a little bit, the whole thing kinda slides aside. I hid some guns back there and a handful of rounds, too. I meant to bring a lot more - I had boxes on backorder - but it started getting hard to buy past a certain point. Might as well share now that we're here. A spare bullet could save your life.", + "dynamic_line": "Okay, listen… across the hall from the bedroom… by the pillars… it's a fake wall. Directly across the hall. If you push in a little bit, the whole thing kinda slides aside. I hid some guns back there and a handful of rounds, too. I meant to bring a lot more - I had boxes on back order - but it started getting hard to buy past a certain point. Might as well share now that we're here. A spare bullet could save your life.", "responses": [ { "text": "The wall thing is pretty nifty, I have to admit.", "topic": "BGSS_PREPPER_1_SHARELOOTSUCCESS2" } ] }, { @@ -252,7 +252,6 @@ "type": "mission_definition", "name": { "str": "Check out that LMOE shelter" }, "description": "Maybe there's something left in that LMOE shelter you heard about.", - "//": "This mission should direct toward a locked shelter. Completion should open a new line of dialog that leads to opening the shelter and (possibly?) convincing the prepper to share their most prized stuff with the player.", "goal": "MGOAL_GO_TO", "difficulty": 2, "value": 0, From 4ae24742f1cca0a845ac3e6eb920cb473612c520 Mon Sep 17 00:00:00 2001 From: Kaelin Bougneit Date: Mon, 8 Aug 2022 17:30:53 -0700 Subject: [PATCH 06/14] add lmoe sign and dialog touchup --- data/json/mapgen/lmoe.json | 3 ++- data/json/npcs/Backgrounds/prepper_1.json | 14 +++++++------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/data/json/mapgen/lmoe.json b/data/json/mapgen/lmoe.json index 00c2ee72027b7..1b70caebcd0dd 100644 --- a/data/json/mapgen/lmoe.json +++ b/data/json/mapgen/lmoe.json @@ -216,7 +216,7 @@ " S S$$T))_)))T$$SS ", " S$$$$$_$$$$$$S ", " SS$$$$_$$$$$SS S ", - " SSSSS_SSSSSS ", + " SSSSS_ SSSSS ", "S S S SS S ", " S S ", " S S ", @@ -225,6 +225,7 @@ " S S ", " S " ], + "place_signs": [ { "signage": "Private property! Keep out!", "x": 12, "y": 16 }], "palettes": [ "bunker_ext" ] } }, diff --git a/data/json/npcs/Backgrounds/prepper_1.json b/data/json/npcs/Backgrounds/prepper_1.json index 4e2917847dc3a..8bf57f791efcc 100644 --- a/data/json/npcs/Backgrounds/prepper_1.json +++ b/data/json/npcs/Backgrounds/prepper_1.json @@ -99,17 +99,17 @@ "id": "BGSS_PREPPER_1_LMOE2", "type": "talk_topic", "dynamic_line": "The shelter? I hired a contractor to build this but did the door myself. Metal pin in the door frame. Can't open unless you remove it. There's a little pulley inside you have to pull up to reset. They made dozens of these in the area, and I couldn't sleep knowing just any at that company could waltz in as soon as shit hit the fan. They'd know exactly where to go and what to do! Nah… how do you think I've made it this long? Always keep a trick up your sleeve.", - "responses": [ + "responses": [ + { "text": "A contractor? How much does something like a survivalist shelter cost?", "topic": "BGSS_PREPPER_1_LMOE4" }, { "text": "But we're good to go, right? I mean… the door is the only trick you had? No clever traps hidden in the walls or anything?", "topic": "BGSS_PREPPER_1_LMOE3" }, - { "text": "A contractor? How much does something like this cost?", "topic": "BGSS_PREPPER_1_LMOE4" }, { "text": "You wouldn't keep ALL your tricks and secrets from me, though, would you? After everything we've been through?", "condition": { "not": { "u_has_var": "prepper_1_asked_about_secrets", "type": "mission", "context": "BGSS", "value": "yes" } }, - "//": "Even though material possessions have been made trivially easy to obtain in the apocalypse, the prepper still values theirs, hence the difficult trial here.", - "trial": { "type": "PERSUADE", "difficulty": -170, "mod": [ [ "TRUST", 1 ], [ "VALUE", 1 ], [ "ANGER", -8 ] ] }, + "//": "Even though material possessions have been made trivially easy to obtain in the apocalypse, the prepper still values their stash, hence the difficult trial here.", + "trial": { "type": "PERSUADE", "difficulty": -60, "mod": [ [ "TRUST", 1 ], [ "VALUE", 1 ], [ "ANGER", -8 ] ] }, "success": { "topic": "BGSS_PREPPER_1_SHARELOOTSUCCESS", "effect": { "u_add_var": "prepper_1_asked_about_secrets", "type": "mission", "context": "BGSS", "value": "yes" } @@ -133,12 +133,12 @@ "id": "BGSS_PREPPER_1_LMOE4", "type": "talk_topic", "dynamic_line": "Almost as much as my house, in the end. I think they realized they could make a lot of money as things got worse and worse. But it's nicer than my house, too. They said the ventilation system was built to withstand a month of anything: nuclear fallout, biological attack, you name it. Concrete and soil above me to absorb radiation, appliances and supplies… I even brought some old books I've never read. I always knew it would come to this.", - "responses": [ { "text": "How many of these did the company build?", "topic": "BGSS_PREPPER_1_LMOE5" } ] + "responses": [ { "text": "How many of these places did the company build?", "topic": "BGSS_PREPPER_1_LMOE5" } ] }, { "id": "BGSS_PREPPER_1_LMOE5", "type": "talk_topic", - "dynamic_line": "Dozens, they told me. Probably more by the end of it. But they obviously didn't say where or who for. They weren't the only ones doing it, but I think the best.", + "dynamic_line": "Dozens, they told me. Probably more by the end of it. But they obviously didn't say where or who for. It was kind of a hot business and I think they were some of the best doing it.", "responses": [ { "text": "Right…", "topic": "BGSS_PREPPER_1_LMOE2" } ] }, { @@ -174,7 +174,7 @@ { "text": "I just wanted the loot, I'll be honest.", "topic": "TALK_DONE", - "opinion": { "anger": 5, "value": -5, "trust": -10, "fear": -2 }, + "opinion": { "anger": 5, "value": -5, "trust": -8, "fear": -2 }, "effect": "insult_combat" }, { From 37ff74218a38a8da330b919bc9baaf71be43059f Mon Sep 17 00:00:00 2001 From: Kaelin Bougneit Date: Mon, 8 Aug 2022 17:33:42 -0700 Subject: [PATCH 07/14] lint json --- data/json/mapgen/lmoe.json | 2 +- data/json/npcs/Backgrounds/prepper_1.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/data/json/mapgen/lmoe.json b/data/json/mapgen/lmoe.json index 1b70caebcd0dd..b8f82a598b280 100644 --- a/data/json/mapgen/lmoe.json +++ b/data/json/mapgen/lmoe.json @@ -225,7 +225,7 @@ " S S ", " S " ], - "place_signs": [ { "signage": "Private property! Keep out!", "x": 12, "y": 16 }], + "place_signs": [ { "signage": "Private property! Keep out!", "x": 12, "y": 16 } ], "palettes": [ "bunker_ext" ] } }, diff --git a/data/json/npcs/Backgrounds/prepper_1.json b/data/json/npcs/Backgrounds/prepper_1.json index 8bf57f791efcc..1790d20776c8e 100644 --- a/data/json/npcs/Backgrounds/prepper_1.json +++ b/data/json/npcs/Backgrounds/prepper_1.json @@ -99,7 +99,7 @@ "id": "BGSS_PREPPER_1_LMOE2", "type": "talk_topic", "dynamic_line": "The shelter? I hired a contractor to build this but did the door myself. Metal pin in the door frame. Can't open unless you remove it. There's a little pulley inside you have to pull up to reset. They made dozens of these in the area, and I couldn't sleep knowing just any at that company could waltz in as soon as shit hit the fan. They'd know exactly where to go and what to do! Nah… how do you think I've made it this long? Always keep a trick up your sleeve.", - "responses": [ + "responses": [ { "text": "A contractor? How much does something like a survivalist shelter cost?", "topic": "BGSS_PREPPER_1_LMOE4" }, { "text": "But we're good to go, right? I mean… the door is the only trick you had? No clever traps hidden in the walls or anything?", From 7a5265fc2f2432c60cc9eb8a8de7d807e24f3a2b Mon Sep 17 00:00:00 2001 From: Kaelin Bougneit Date: Mon, 8 Aug 2022 18:48:53 -0700 Subject: [PATCH 08/14] add space --- data/json/npcs/Backgrounds/prepper_1.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/npcs/Backgrounds/prepper_1.json b/data/json/npcs/Backgrounds/prepper_1.json index 1790d20776c8e..a06bd9c0920d1 100644 --- a/data/json/npcs/Backgrounds/prepper_1.json +++ b/data/json/npcs/Backgrounds/prepper_1.json @@ -158,7 +158,7 @@ "type": "talk_topic", "dynamic_line": "What, like some secret Batcave? Pull back the curtain and it turns out I'm the communist who opened a portal to netherfuck in their basement? I just gave you food, all the tools in my workshop, and the safest hole in the ground in the county. If I've got any secrets left, they're mine to keep.", "responses": [ - { "text": "No, you're right! I'm sorry for intruding!", "topic": "BGSS_PREPPER_1_SHARELOOTAPOLOGIZE" }, + { "text": "No, you're right! I'm sorry for intruding!", "topic": "BGSS_PREPPER_1_SHARELOOTAPOLOGIZE" }, { "text": "For all I know, you COULD have something to do with this. Who really knows what happened?", "topic": "BGSS_PREPPER_1_SHARELOOTFAILURE2", From 51bf786e5dd5a8c2e51835e07ad1a2ab53089816 Mon Sep 17 00:00:00 2001 From: Kaelin Bougneit Date: Mon, 8 Aug 2022 19:00:12 -0700 Subject: [PATCH 09/14] add space --- data/json/mapgen/lmoe.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/mapgen/lmoe.json b/data/json/mapgen/lmoe.json index b8f82a598b280..fff8ad76b8a95 100644 --- a/data/json/mapgen/lmoe.json +++ b/data/json/mapgen/lmoe.json @@ -225,7 +225,7 @@ " S S ", " S " ], - "place_signs": [ { "signage": "Private property! Keep out!", "x": 12, "y": 16 } ], + "place_signs": [ { "signage": "Private property! Keep out!", "x": 12, "y": 16 } ], "palettes": [ "bunker_ext" ] } }, From 65507b6ba47248559ad3ed9294e7290652fa8fac Mon Sep 17 00:00:00 2001 From: Kaelin Bougneit Date: Mon, 8 Aug 2022 19:36:02 -0700 Subject: [PATCH 10/14] test kicking --- data/json/npcs/Backgrounds/prepper_1.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/npcs/Backgrounds/prepper_1.json b/data/json/npcs/Backgrounds/prepper_1.json index a06bd9c0920d1..9274ba67910f8 100644 --- a/data/json/npcs/Backgrounds/prepper_1.json +++ b/data/json/npcs/Backgrounds/prepper_1.json @@ -178,7 +178,7 @@ "effect": "insult_combat" }, { - "text": "Well… I'm actually a government agent sent to assassinate you. I just had to find out the location of your secret stash before I took you out.", + "text": "Well… I'm actually a government agent sent to assassinate you. I just had to find out the location of your secret stash before I took you out!", "topic": "BGSS_PREPPER_1_SHARELOOTFAILURE3" }, { From f009accd6e266a5147421a7290365c78d433bb3d Mon Sep 17 00:00:00 2001 From: Kaelin Bougneit Date: Wed, 10 Aug 2022 12:57:13 -0700 Subject: [PATCH 11/14] switch LMOE door ascii --- data/json/mapgen/lmoe.json | 2 +- data/json/mapgen_palettes/lmoe.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/data/json/mapgen/lmoe.json b/data/json/mapgen/lmoe.json index fff8ad76b8a95..7cf626a078545 100644 --- a/data/json/mapgen/lmoe.json +++ b/data/json/mapgen/lmoe.json @@ -212,7 +212,7 @@ " S SS$$T)####)T$$SS ", " SS$$T)#>>#)T$$SS ", " SS$$T)#..#)T$$SS ", - " SS$$T)#L##)T$$SS S", + " SS$$T)#X##)T$$SS S", " S S$$T))_)))T$$SS ", " S$$$$$_$$$$$$S ", " SS$$$$_$$$$$SS S ", diff --git a/data/json/mapgen_palettes/lmoe.json b/data/json/mapgen_palettes/lmoe.json index b8c61a7a3800e..e0eb7d877afd8 100644 --- a/data/json/mapgen_palettes/lmoe.json +++ b/data/json/mapgen_palettes/lmoe.json @@ -136,7 +136,7 @@ ], "v": "t_open_air", "+": "t_door_metal_c", - "L": "t_door_metal_locked", + "X": "t_door_metal_locked", ".": "t_dirt", ">": "t_stairs_down", ")": "t_slope_up", From 6eade67752edc8efe96b1fc302936451d28fa4ca Mon Sep 17 00:00:00 2001 From: Kaelin Bougneit Date: Wed, 10 Aug 2022 14:02:18 -0700 Subject: [PATCH 12/14] fill_ter set and trial difficulty change --- data/json/mapgen/lmoe.json | 1 + data/json/npcs/Backgrounds/prepper_1.json | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/data/json/mapgen/lmoe.json b/data/json/mapgen/lmoe.json index 7cf626a078545..28ca8a0714f89 100644 --- a/data/json/mapgen/lmoe.json +++ b/data/json/mapgen/lmoe.json @@ -199,6 +199,7 @@ "//2": "The front door to this LMOE is locked and can be unlocked by doing the prepper_1 quest line.", "weight": 100, "object": { + "fill_ter": "t_metal_floor", "rows": [ " S S S", " S S S ", diff --git a/data/json/npcs/Backgrounds/prepper_1.json b/data/json/npcs/Backgrounds/prepper_1.json index 9274ba67910f8..333d320f1e911 100644 --- a/data/json/npcs/Backgrounds/prepper_1.json +++ b/data/json/npcs/Backgrounds/prepper_1.json @@ -109,7 +109,7 @@ "text": "You wouldn't keep ALL your tricks and secrets from me, though, would you? After everything we've been through?", "condition": { "not": { "u_has_var": "prepper_1_asked_about_secrets", "type": "mission", "context": "BGSS", "value": "yes" } }, "//": "Even though material possessions have been made trivially easy to obtain in the apocalypse, the prepper still values their stash, hence the difficult trial here.", - "trial": { "type": "PERSUADE", "difficulty": -60, "mod": [ [ "TRUST", 1 ], [ "VALUE", 1 ], [ "ANGER", -8 ] ] }, + "trial": { "type": "PERSUADE", "difficulty": -75, "mod": [ [ "TRUST", 1 ], [ "VALUE", 1 ], [ "ANGER", -8 ] ] }, "success": { "topic": "BGSS_PREPPER_1_SHARELOOTSUCCESS", "effect": { "u_add_var": "prepper_1_asked_about_secrets", "type": "mission", "context": "BGSS", "value": "yes" } From dd15ed6bd2403bfad97e13c11ac41ace02b908de Mon Sep 17 00:00:00 2001 From: Kaelin Bougneit Date: Fri, 12 Aug 2022 15:01:57 -0700 Subject: [PATCH 13/14] move metal door to mapgen --- data/json/mapgen/lmoe.json | 1 + data/json/mapgen_palettes/lmoe.json | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/mapgen/lmoe.json b/data/json/mapgen/lmoe.json index 28ca8a0714f89..91922cf635248 100644 --- a/data/json/mapgen/lmoe.json +++ b/data/json/mapgen/lmoe.json @@ -227,6 +227,7 @@ " S " ], "place_signs": [ { "signage": "Private property! Keep out!", "x": 12, "y": 16 } ], + "terrain": { "X": "t_door_metal_locked" }, "palettes": [ "bunker_ext" ] } }, diff --git a/data/json/mapgen_palettes/lmoe.json b/data/json/mapgen_palettes/lmoe.json index e0eb7d877afd8..47b28c03613ef 100644 --- a/data/json/mapgen_palettes/lmoe.json +++ b/data/json/mapgen_palettes/lmoe.json @@ -136,7 +136,6 @@ ], "v": "t_open_air", "+": "t_door_metal_c", - "X": "t_door_metal_locked", ".": "t_dirt", ">": "t_stairs_down", ")": "t_slope_up", From 64840fef4ee39f719a2c27ee5c2e32322801c77c Mon Sep 17 00:00:00 2001 From: Kaelin Bougneit Date: Fri, 12 Aug 2022 15:46:48 -0700 Subject: [PATCH 14/14] fix prepper's headcanon; almost forgot --- data/json/npcs/Backgrounds/prepper_1.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/npcs/Backgrounds/prepper_1.json b/data/json/npcs/Backgrounds/prepper_1.json index 333d320f1e911..d84a792d8115a 100644 --- a/data/json/npcs/Backgrounds/prepper_1.json +++ b/data/json/npcs/Backgrounds/prepper_1.json @@ -156,7 +156,7 @@ { "id": "BGSS_PREPPER_1_SHARELOOTFAILURE", "type": "talk_topic", - "dynamic_line": "What, like some secret Batcave? Pull back the curtain and it turns out I'm the communist who opened a portal to netherfuck in their basement? I just gave you food, all the tools in my workshop, and the safest hole in the ground in the county. If I've got any secrets left, they're mine to keep.", + "dynamic_line": "What, like some secret Batcave? Pull back the curtain and it turns out I'm the communist who brewed up a demon bio-weapon in their basement? I just gave you food, all the tools in my workshop, and the safest hole in the ground in the county. If I've got any secrets left, they're mine to keep.", "responses": [ { "text": "No, you're right! I'm sorry for intruding!", "topic": "BGSS_PREPPER_1_SHARELOOTAPOLOGIZE" }, {