From 77d4a832da89c73bdee46eb8ceab163a740652c2 Mon Sep 17 00:00:00 2001 From: Ava <47678781+Ilysen@users.noreply.github.com> Date: Tue, 5 Apr 2022 15:42:32 -0400 Subject: [PATCH] Isolated artisans writing touchup (#56438) * Isolated artisans writing touchup * Remove extraneous response, adjust Jay dialogue * Fix a typo * Fix some oversights * Fix some more oversights * Show Cody the -> show the * spacey boys * Lowercases merch name --- data/json/items/gun/artisan_guns.json | 8 +- data/json/items/id_cards.json | 2 +- .../isolated_road_cody_dialogue.json | 68 ++++---- .../isolated_road_cody_fabricate.json | 76 ++++++--- .../isolated_road_cody_prototype.json | 30 ++-- .../isolated_road_jay_convert.json | 148 ++++++++++-------- .../isolated_road_jay_dialogue.json | 22 +-- .../isolated_road/isolated_road_missions.json | 20 +-- .../overmap_terrain_isolated_road.json | 6 +- 9 files changed, 215 insertions(+), 165 deletions(-) diff --git a/data/json/items/gun/artisan_guns.json b/data/json/items/gun/artisan_guns.json index 8cfbb487f3c26..105c93f240cd5 100644 --- a/data/json/items/gun/artisan_guns.json +++ b/data/json/items/gun/artisan_guns.json @@ -4,7 +4,7 @@ "copy-from": "mosin91_30", "type": "GUN", "name": { "str_sp": "the Obrez" }, - "description": "A cut down modified Mozin-Nagant. It has a short barrel and the stock has been cut down and fitted with a mace head. The sides of the firearm as well have been reinforced with metal to withstand a beating.", + "description": "A cut-down, modified Mosin-Nagant. It has a short barrel, and the stock has been cut down and fitted with a mace head. The sides of the firearm have been reinforced with metal to withstand a beating.", "weight": "3000 g", "volume": "2220 ml", "longest_side": "40 cm", @@ -30,7 +30,7 @@ "copy-from": "hammer_sledge", "name": { "str": "the Disorder" }, "type": "GENERIC", - "description": "A large, heavy hammer converted for use as a weapon. Has a notable safety on the side and the back of the head has a firing mechanism that can be loaded with rifle blanks. When the head impacts and the safety is off the blanks are engaged sending a moving piston forward causing massive damage. Etched into the head are the words 'she's lost control'.", + "description": "A large, heavy sledge hammer converted for use as a weapon. It features a notable safety on the side, and the back of the head has a firing mechanism that can be loaded with rifle blanks. When the head impacts and the safety is off, the blanks are engaged, sending the moving piston forward and causing massive damage. Etched into the head are the words 'she's lost control'.", "proportional": { "weight": 1.2 }, "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "powder_blank": 1 } } ], "extend": { "flags": [ "RELOAD_EJECT" ] }, @@ -41,7 +41,7 @@ "copy-from": "mace", "type": "TOOL", "name": { "str_sp": "the Louverture" }, - "description": "A oddly vented mace with an internal fuel reservoir built into the pommel. Can be engaged to ignite large puffs of gasoline and start fires.", + "description": "A oddly-vented mace with an internal fuel reservoir built into the pommel. Can be engaged to ignite large puffs of gasoline and start fires.", "proportional": { "weight": 1.2, "volume": 1.1 }, "charges_per_use": 100, "extend": { "flags": [ "FIRESTARTER" ] }, @@ -86,7 +86,7 @@ "copy-from": "kp32", "type": "GUN", "name": { "str_sp": "the Pressin" }, - "description": "A compact short range pistol without a pistol grip. When in use the entire gun body is pointed at targets and squeezed. The body also conceals a switch blade for close quarters use.", + "description": "A compact short-range pistol without a pistol grip. When in use, the entire gun body is pointed at targets and squeezed. The body also conceals a switchblade for close quarters use.", "weight": "300 g", "volume": "150 ml", "longest_side": "15 cm", diff --git a/data/json/items/id_cards.json b/data/json/items/id_cards.json index f00ec4f4402c3..18849079ac3d7 100644 --- a/data/json/items/id_cards.json +++ b/data/json/items/id_cards.json @@ -55,7 +55,7 @@ "symbol": ",", "color": "green", "name": { "str": "co-op badge" }, - "description": "A manually encoded badge giving you access to the artisans workshop. It even has your name written on the back.", + "description": "A manually encoded badge giving you access to the artisans' workshop. It even has your name written on the back.", "price": 120000, "flags": [ "COOP_CARD" ], "price_postapoc": 100, diff --git a/data/json/npcs/isolated_road/isolated_road_cody_dialogue.json b/data/json/npcs/isolated_road/isolated_road_cody_dialogue.json index 8205a805a49a6..870aaffd52f6c 100644 --- a/data/json/npcs/isolated_road/isolated_road_cody_dialogue.json +++ b/data/json/npcs/isolated_road/isolated_road_cody_dialogue.json @@ -1,12 +1,12 @@ [ { - "id": "TALK_BLACKSMITH_SERVICES", + "id": [ "TALK_BLACKSMITH_SERVICES", "TALK_BLACKSMITH_PROTOTYPE_EXODII_ITEMS_READY" ], "type": "talk_topic", "dynamic_line": [ - "Hiya darlin' welcome to the shop", - "Hey killer hows it going?", - "You look like you haven't eaten in days", - "Still the apocalypse out there huh?", + "Hiya darlin', welcome to the shop.", + "Hey, killer! How's it going?", + "You look like you haven't eaten in days.", + "Still the apocalypse out there, huh?", "See anything you like?" ], "speaker_effect": { "effect": { "npc_add_effect": "npc_said", "duration": 600 } }, @@ -19,7 +19,6 @@ "condition": { "not": { "u_has_var": "blacksmith_mentioned_jay", "type": "dialogue", "context": "artisans", "value": "yes" } }, "topic": "TALK_BLACKSMITH_LOCATION_ABOUT" }, - { "text": "I have to go.", "topic": "TALK_DONE" }, { "text": "Are you and Jay close?", "condition": { @@ -33,7 +32,7 @@ "topic": "TALK_BLACKSMITH_JAY" }, { - "text": "[Motioning to the engineer scribbles] What is it that you are working on?", + "text": "[Motion to the sketches.] What is it that you are working on?", "condition": { "and": [ { "u_has_var": "seen_blacksmith_sketches", "type": "dialogue", "context": "artisans", "value": "yes" }, @@ -43,7 +42,7 @@ "topic": "TALK_BLACKSMITH_PROTOTYPE_NOT_FEELING_IT" }, { - "text": "[Motioning to the engineer scribbles] You seem more excited about this stuff recently?", + "text": "[Motion to the sketches.] You seem more excited about this stuff recently.", "condition": { "and": [ { "u_has_var": "seen_blacksmith_sketches", "type": "dialogue", "context": "artisans", "value": "yes" }, @@ -58,7 +57,7 @@ "topic": "TALK_BLACKSMITH_PROTOTYPE" }, { - "text": "[Show Nomad Blueprints] Hey I met this group with some interesting ideas for armor design. Is any of this of use to you?", + "text": "[Show the nomad jumpsuit blueprint.] Hey - I met a group with some interesting ideas for armor design. Is any of this of use to you?", "condition": { "and": [ { "u_has_items": { "item": "bp_nomad_jumpsuit", "count": 1 } }, @@ -104,12 +103,6 @@ }, "topic": "TALK_MISSION_LIST" }, - { - "text": "Lets trade.", - "condition": { "u_has_var": "blacksmith_heard_the_deal", "type": "dialogue", "context": "artisans", "value": "yes" }, - "topic": "TALK_BLACKSMITH_SERVICES", - "effect": "start_trade" - }, { "text": "Could you make me a suit of armor?", "condition": { @@ -204,14 +197,31 @@ ] }, "topic": "TALK_BLACKSMITH_ARMOR_READY" - } + }, + { + "text": "You mentioned you'd need some special materials to make that nomad armor?", + "condition": { + "and": [ + { "not": { "u_has_var": "blacksmith_has_exodii_items", "type": "dialogue", "context": "artisans", "value": "yes" } }, + { "u_has_var": "blacksmith_crafting_EXODII", "type": "dialogue", "context": "artisans", "value": "yes" } + ] + }, + "topic": "TALK_BLACKSMITH_PROTOTYPE_EXODII_ITEMS" + }, + { + "text": "Let's trade.", + "condition": { "u_has_var": "blacksmith_heard_the_deal", "type": "dialogue", "context": "artisans", "value": "yes" }, + "topic": "TALK_BLACKSMITH_SERVICES", + "effect": "start_trade" + }, + { "text": "I have to go.", "topic": "TALK_DONE" } ] }, { "id": "TALK_BLACKSMITH_ABOUT", "type": "talk_topic", "dynamic_line": [ - "I'm Cody, was an engineer before everything went to hell. I guess I still am but I don't have to consult anymore so I consider that a plus at least." + "I'm Cody, was an engineer before everything went to hell. I guess I still am, but I don't have to consult anymore, so I consider that a plus at least." ], "responses": [ { "text": "What's with all the weapons and armor?", "topic": "TALK_BLACKSMITH_SHOP_ABOUT" }, @@ -223,7 +233,7 @@ "id": "TALK_BLACKSMITH_LOCATION_ABOUT", "type": "talk_topic", "dynamic_line": [ - "I don't know if you've met Jay yet but he and I split a garden out here. We both work, well, worked in technology, and were convinced the world was ending so we both got property outside town. We met when he moved in next door. So this is our little homestead with a few upgrades. We aren't really sweating property lines at this point." + "I don't know if you've met Jay yet, but he and I split a garden out here. We both work - well, worked - in technology, and we were convinced the world was ending so we both got property outside town. We met when he moved in next door. So this is our little homestead with a few upgrades. We aren't really sweating property lines at this point." ], "speaker_effect": { "effect": [ { "u_add_var": "blacksmith_mentioned_jay", "type": "dialogue", "context": "artisans", "value": "yes" } ] }, "responses": [ @@ -252,14 +262,14 @@ "id": "TALK_BLACKSMITH_SHOP_ABOUT_MORE", "type": "talk_topic", "dynamic_line": [ - "Well what can I say, I had lots of disposable income. Kept me busy and all that. So yes I've got a pretty impressive shop in the back." + "Well, what can I say, I had lots of disposable income. Kept me busy and all that. So yeah, I've got a pretty impressive shop in the back." ], "speaker_effect": { "effect": [ { "u_add_var": "blacksmith_heard_the_deal", "type": "dialogue", "context": "artisans", "value": "yes" } ] }, "responses": [ { - "text": "[int 8] Still this is a lot of equipment. Wouldn't it have been easier to buy this stuff from a manufacturer?", + "text": "[INT 8+] Still this is a lot of equipment. Wouldn't it have been easier to buy this stuff from a manufacturer?", "topic": "TALK_BLACKSMITH_SHOP_ABOUT_STUPID_QUESTION" }, { "text": "Can anyone use the workshop?", "topic": "TALK_BLACKSMITH_COOP_ABOUT" }, @@ -269,21 +279,21 @@ { "id": "TALK_BLACKSMITH_SHOP_ABOUT_STUPID_QUESTION", "type": "talk_topic", - "dynamic_line": [ "Honey I have a hard time finding a bra that fits. Good luck finding a breastplate." ], + "dynamic_line": [ "Honey, I have a hard time finding a bra that fits. Good luck finding a breastplate." ], "responses": [ { "text": "…", "topic": "TALK_BLACKSMITH_SERVICES" }, { "text": "Tell me about it, finding anything that fits in this apocalypse has been a nightmare.", "topic": "TALK_BLACKSMITH_SERVICES" }, - { "text": "Oh uh right uh.", "topic": "TALK_BLACKSMITH_SERVICES" } + { "text": "Oh, uh. Right, uh.", "topic": "TALK_BLACKSMITH_SERVICES" } ] }, { "id": "TALK_BLACKSMITH_COOP_ABOUT", "type": "talk_topic", "dynamic_line": [ - "Well not anyone, but I've always been a believer in community. The shop is run as a co-op so if you want access you'll have to buy a share. As a partial owner, you will have full access to the shop. Shares are currently 100 merch, I hate the currency but it's the closest thing we've got to a representation of labor." + "Well, not *anyone*, but I've always been a believer in community. The shop is run as a co-op, so if you want access you'll have to buy a share. As a partial owner, you will have full access to the shop. Shares are currently 100 merch; I hate the currency but it's the closest thing we've got to a representation of labor." ], "speaker_effect": { "effect": [ @@ -294,7 +304,7 @@ "responses": [ { "text": "Why do you hate merch?", "topic": "TALK_BLACKSMITH_MONEY_RAMBLE" }, { - "text": "[100 merch] Yeah I can do that.", + "text": "[100 merch] Yeah, I can do that.", "condition": { "u_has_items": { "item": "FMCNote", "count": 100 } }, "effect": [ { "u_sell_item": "FMCNote", "count": 100 }, @@ -310,7 +320,7 @@ "id": "TALK_BLACKSMITH_BOUGHT_COOP", "type": "talk_topic", "dynamic_line": [ - "There yah go, one co-op membership with your name on it. Shops in the back, keep it tidy and share if anyone else is around workin'." + "There yah go, one co-op membership with your name on it. Shop's in the back, keep it tidy and share if anyone else is around workin'. Just as a heads-up, you'll need to bring your own charcoal. There's a kiln in there too, so if you got things to burn, just throw 'em in there there and light up." ], "responses": [ { "text": "Thanks.", "topic": "TALK_BLACKSMITH_SERVICES" }, @@ -322,21 +332,21 @@ "type": "talk_topic", "dynamic_line": [ "Money is part of what got us into this mess in the first place." ], "responses": [ - { "text": "[per 8] Is that why you don't carry any cash?", "topic": "TALK_BLACKSMITH_MONEY_NO_CASH" }, + { "text": "[PER 8+] Is that why you don't carry any cash?", "topic": "TALK_BLACKSMITH_MONEY_NO_CASH" }, { "text": "…", "topic": "TALK_BLACKSMITH_SERVICES" } ] }, { "id": "TALK_BLACKSMITH_MONEY_NO_CASH", "type": "talk_topic", - "dynamic_line": [ "B-I-N-G-O. If you bring it, I'll take it but that's about it." ], + "dynamic_line": [ "B-I-N-G-O. If you bring it, I'll take it, but that's about it." ], "responses": [ { "text": "…", "topic": "TALK_BLACKSMITH_SERVICES" } ] }, { "id": "TALK_BLACKSMITH_JAY", "type": "talk_topic", "dynamic_line": [ - "Yeah, we've always got along great. He comes over for supper every Friday have a few drinks maybe take some guns out, or, well… He used to. A little while ago, we had a huge fight. It was right after this stuff got real bad… I'm fuzzy on the details or what I said, all I remember was being so angry that I could kill him. We haven't talked much since." + "Yeah, we've always got along great. He comes over for supper every Friday. Have a few drinks, maybe take some guns out. Or, well… we used to. A little while ago, we had a huge fight. It was right after this stuff got real bad… I'm fuzzy on the details or what I said, all I remember was being so angry that I could kill him. We haven't talked much since." ], "speaker_effect": { "effect": [ { "u_add_var": "blacksmith_mentioned_fight", "type": "dialogue", "context": "artisans", "value": "yes" } ] @@ -362,7 +372,7 @@ "id": "TALK_BLACKSMITH_JAY_QUEST", "type": "talk_topic", "dynamic_line": [ - "If you are offering. Before everything went to hell Jay was talking about going to some gun show. There was a guy there who had managed to sneak some Russian gun into the US. It was a massive deal for Jay, it was all he could talk about. I know it's a long shot but maybe that guy was already at the gun show? If you find the gun you can keep it, but it would mean a lot to Jay if he could take a look. All he wanted was to pull it apart and put it back together." + "If you're offering. Before everything went to hell, Jay was talking about going to some gun show. There was a guy there who had managed to sneak some Russian gun into the US. It was a massive deal for Jay, it was all he could talk about. I know it's a long shot, but maybe that guy was already at the gun show? If you find the gun you can keep it, but it would mean a lot to Jay if he could take a look. All he wanted was to pull it apart and put it back together." ], "responses": [ { diff --git a/data/json/npcs/isolated_road/isolated_road_cody_fabricate.json b/data/json/npcs/isolated_road/isolated_road_cody_fabricate.json index 2760d1963bd7c..94ece5efbc0bf 100644 --- a/data/json/npcs/isolated_road/isolated_road_cody_fabricate.json +++ b/data/json/npcs/isolated_road/isolated_road_cody_fabricate.json @@ -13,24 +13,24 @@ "//": "this is all the dialogue related to working on armor with Cody", "type": "talk_topic", "dynamic_line": [ - "Sure after what you did for me I'll equip an army for you. I'll need some money to negotiate with the caravans and scavengers that come by. What level of protection are you thinking? I can do 2mm, 4mm, and 6mm suits depending on how much you want to resemble a tank. Materials costs are 100 merch per 2mm. whatever I save in non-scaling bits like the chain and leather I get gouged in looking for so much bulk metal." + "Sure. After what you did for me, I'd equip an army for you. I'll need some money to negotiate with the caravans and scavengers that come by. What level of protection are you thinking? I can do 2mm, 4mm, and 6mm suits depending on how much you want to resemble a tank. Materials costs are 100 merch per 2mm. Whatever I save in non-scaling bits like the chain and leather, I get gouged in looking for so much bulk metal." ], "responses": [ { "text": "Forget it.", "topic": "TALK_BLACKSMITH_SERVICES" }, { - "text": "[100 merch, 2 mm] I like to stay light.", + "text": "[100 merch, 2mm] I like to stay light.", "condition": { "u_has_items": { "item": "FMCNote", "count": 100 } }, "effect": [ { "u_add_var": "blacksmith_thickness", "type": "number", "context": "artisans", "value": "2" } ], "topic": "TALK_BLACKSMITH_FABRICATE_TYPE" }, { - "text": "[200 merch, 4 mm] A middle ground would be good.", + "text": "[200 merch, 4mm] A middle ground would be good.", "condition": { "u_has_items": { "item": "FMCNote", "count": 200 } }, "effect": [ { "u_add_var": "blacksmith_thickness", "type": "number", "context": "artisans", "value": "4" } ], "topic": "TALK_BLACKSMITH_FABRICATE_TYPE" }, { - "text": "[300 merch, 6 mm] Never skimp on protection.", + "text": "[300 merch, 6mm] Never skimp on protection.", "condition": { "u_has_items": { "item": "FMCNote", "count": 300 } }, "effect": [ { "u_add_var": "blacksmith_thickness", "type": "number", "context": "artisans", "value": "6" } ], "topic": "TALK_BLACKSMITH_FABRICATE_TYPE" @@ -46,23 +46,24 @@ "type": "dialogue", "context": "artisans", "value": "yes", - "yes": "Alright mm, so the next question is time. Currently, it's the classic problem, if you want quality, you gotta wait. Two processes I could offer that you would be hard-pressed to find anywhere else are either really great high carbon steel or, I can go through the lengthy process of tempering. High carbon will take three weeks to process and do the work, and tempering will take me four. For five I could, I think, create a suit of that Nomad armor. It would incorporate climate control, help you support more weight, and it'll have a jumpsuit built in but you will not be able to wear normal clothes with it.", - "no": "Alright mm, so the next question is time. Currently, it's the classic problem, if you want quality, you gotta wait. Two processes I could offer that you would be hard-pressed to find anywhere else are either really great high carbon steel or, I can go through the lengthy process of tempering. High carbon will take three weeks to process and do the work, and tempering will take me four." + "yes": "Alright, mm, so the next question is time. Currently, it's the classic problem: if you want quality, you gotta wait. Two processes I could offer that you would be hard-pressed to find anywhere else are either really great high carbon steel, or I can go through the lengthy process of tempering. High carbon will take three weeks to process and do the work, and tempering will take me four. For five I could, I think, create a suit of that nomad armor. It would incorporate climate control, help you support more weight, and it'll have a jumpsuit built in, but you won't be able to wear normal clothes with it.", + "no": "Alright, mm, so the next question is time. Currently, it's the classic problem: if you want quality, you gotta wait. Two processes I could offer that you would be hard-pressed to find anywhere else are either really great high carbon steel, or I can go through the lengthy process of tempering. High carbon will take three weeks to process and do the work, and tempering will take me four." }, "responses": [ { "text": "Forget it.", "topic": "TALK_BLACKSMITH_SERVICES" }, { - "text": "[3 weeks great protection] High carbon steel sounds great.", + "text": "[3 weeks, great protection] High carbon steel sounds great.", "effect": [ { "u_add_var": "blacksmith_wait", "type": "number", "context": "artisans", "value": "3" } ], "topic": "TALK_BLACKSMITH_FABRICATE_MEASUREMENTS" }, { - "text": "[4 weeks exceptional protection] I'll wait for the best you can do.", + "text": "[4 weeks, exceptional protection] I'll wait for the best you can do.", "effect": [ { "u_add_var": "blacksmith_wait", "type": "number", "context": "artisans", "value": "4" } ], "topic": "TALK_BLACKSMITH_FABRICATE_MEASUREMENTS" }, { - "text": "[5 weeks CBM integrated protection] I want this wanderer armor.", + "text": "[5 weeks, CBM-integrated protection] I'd like nomad armor.", + "condition": { "u_has_var": "blacksmith_has_exodii_items", "type": "dialogue", "context": "artisans", "value": "yes" }, "effect": [ { "u_add_var": "blacksmith_wait", "type": "number", "context": "artisans", "value": "5" } ], "topic": "TALK_BLACKSMITH_FABRICATE_MEASUREMENTS" } @@ -78,15 +79,15 @@ "context": "artisans", "op": "==", "value": 3, - "yes": "Alright, so it'll be mm armor made of the best high carbon steel a woman can scavenge. If you're good with that I'll take the merch up front and start taking some very invasive measurements.", + "yes": "Alright, so it'll be mm armor made of the best high carbon steel a woman can scavenge. If you're good with that, I'll take the merch up front and we can start taking some very invasive measurements.", "no": { "u_compare_var": "blacksmith_wait", "type": "number", "context": "artisans", "op": "==", "value": 4, - "yes": "Alright, so it'll be mm armor made with some of the best fabrication techniques the world has ever seen. If you're good with that I'll take the merch up front and start taking some very invasive measurements.", - "no": "Alright, so it'll be mm armor made with some of the best fabrication techniques the world has ever seen, as well as some help from some extradimensional friends. I'd be lying if I said I wasn't excited. If you're good with that I'll take the merch up front and start taking some very invasive measurements." + "yes": "Alright, so it'll be mm armor made with some of the best fabrication techniques the world has ever seen. If you're good with that, I'll take the merch up front and we can start taking some very invasive measurements.", + "no": "Alright, so it'll be mm armor made with some of the best fabrication techniques the world has ever seen, as well as help from some extradimensional friends. I'd be lying if I said I wasn't excited. If you're good with that, I'll take the merch up front and we can start taking some very invasive measurements." } }, "responses": [ @@ -145,7 +146,7 @@ "id": "TALK_BLACKSMITH_ARMOR_READY", "//": "this is dialogue to pickup the armor", "type": "talk_topic", - "dynamic_line": [ "It's all done! Sorry for the long wait hopefully it's worth it. If you need it refitted let me know." ], + "dynamic_line": [ "It's all done! Sorry for the long wait; hopefully it's worth it. If you need it refitted, let me know." ], "responses": [ { "text": "Thanks.", @@ -185,7 +186,8 @@ }, "effect": [ { "u_spawn_item": "armor_nomad_lightplate" }, - { "u_add_var": "blacksmith_crafting", "type": "dialogue", "context": "artisans", "value": "no" } + { "u_add_var": "blacksmith_crafting", "type": "dialogue", "context": "artisans", "value": "no" }, + { "u_lose_var": "blacksmith_has_exodii_items", "type": "dialogue", "context": "artisans" } ], "topic": "TALK_BLACKSMITH_SERVICES" }, @@ -227,7 +229,8 @@ }, "effect": [ { "u_spawn_item": "armor_nomad_plate" }, - { "u_add_var": "blacksmith_crafting", "type": "dialogue", "context": "artisans", "value": "no" } + { "u_add_var": "blacksmith_crafting", "type": "dialogue", "context": "artisans", "value": "no" }, + { "u_lose_var": "blacksmith_has_exodii_items", "type": "dialogue", "context": "artisans" } ], "topic": "TALK_BLACKSMITH_SERVICES" }, @@ -269,7 +272,8 @@ }, "effect": [ { "u_spawn_item": "armor_nomad_heavyplate" }, - { "u_add_var": "blacksmith_crafting", "type": "dialogue", "context": "artisans", "value": "no" } + { "u_add_var": "blacksmith_crafting", "type": "dialogue", "context": "artisans", "value": "no" }, + { "u_lose_var": "blacksmith_has_exodii_items", "type": "dialogue", "context": "artisans" } ], "topic": "TALK_BLACKSMITH_SERVICES" } @@ -290,23 +294,18 @@ "//": "this is dialogue for sharing EXODII secrets", "type": "talk_topic", "dynamic_line": [ - "Oh wow, this is really interesting huh. The way they balance weight for travel is genius. If you wanted a real suit of armor for a traveling warrior, I think I could do it with this. I'm gonna need one of their AC kits and wiring kits though." + "Oh wow, this is really interesting, huh? The way they balance weight for travel is genius. If you wanted a real suit of armor for a traveling warrior, I think I could do it with this. I'll need one of each of these wire kits, though, for each set I make. Bring some to me if you want me to use them." ], "responses": [ { - "text": "[AC kit, Wire kit] Alright.", - "condition": { - "and": [ - { "u_has_items": { "item": "exodii_ac_kit", "count": 1 } }, - { "u_has_items": { "item": "exodii_wire_kit", "count": 1 } } - ] - }, + "text": "I have some right now. [Hand over a CBM interface wire kit and an external climate control kit.]", + "condition": { "and": [ { "u_has_item": "exodii_ac_kit" }, { "u_has_item": "exodii_wire_kit" } ] }, "effect": [ - { "u_add_var": "blacksmith_crafting_EXODII", "type": "dialogue", "context": "artisans", "value": "yes" }, + { "u_add_var": "blacksmith_has_exodii_items", "type": "dialogue", "context": "artisans", "value": "yes" }, { "u_consume_item": "exodii_ac_kit", "count": 1 }, { "u_consume_item": "exodii_wire_kit", "count": 1 } ], - "topic": "TALK_BLACKSMITH_SERVICES" + "topic": "TALK_BLACKSMITH_PROTOTYPE_EXODII_ITEMS_READY" }, { "text": "I'll try and find some.", @@ -314,5 +313,30 @@ "topic": "TALK_BLACKSMITH_SERVICES" } ] + }, + { + "type": "talk_topic", + "id": "TALK_BLACKSMITH_PROTOTYPE_EXODII_ITEMS", + "dynamic_line": [ + "Yeah; the designs you showed me call for 'em. Not sure what they are myself, but the pictures are real descriptive about how to use them. To make anything, I'll need one of each of those wire kits. Got any?" + ], + "responses": [ + { + "text": "Here you go. [Hand over a CBM interface wire kit and an external climate control kit.]", + "condition": { "and": [ { "u_has_item": "exodii_ac_kit" }, { "u_has_item": "exodii_wire_kit" } ] }, + "effect": [ + { "u_add_var": "blacksmith_has_exodii_items", "type": "dialogue", "context": "artisans", "value": "yes" }, + { "u_consume_item": "exodii_ac_kit", "count": 1 }, + { "u_consume_item": "exodii_wire_kit", "count": 1 } + ], + "topic": "TALK_BLACKSMITH_PROTOTYPE_EXODII_ITEMS_READY" + }, + { "text": "Not right now.", "topic": "TALK_BLACKSMITH_SERVICES" } + ] + }, + { + "type": "talk_topic", + "id": "TALK_BLACKSMITH_PROTOTYPE_EXODII_ITEMS_READY", + "dynamic_line": [ "Thanks, sugar! If you ever have me make some armor, just let me know if you want me to use these in it." ] } ] diff --git a/data/json/npcs/isolated_road/isolated_road_cody_prototype.json b/data/json/npcs/isolated_road/isolated_road_cody_prototype.json index 952a94083fa46..fc91e0c9b698e 100644 --- a/data/json/npcs/isolated_road/isolated_road_cody_prototype.json +++ b/data/json/npcs/isolated_road/isolated_road_cody_prototype.json @@ -3,7 +3,7 @@ "id": "TALK_BLACKSMITH_PROTOTYPE_NOT_FEELING_IT", "type": "talk_topic", "dynamic_line": [ - "Oh, these. With the end of the world, Jay and I had been talking about some new projects for the wasteland warriors. Anyways it doesn't matter anymore since, well it doesn't matter." + "Oh, these. With the end of the world, Jay and I had been talking about some new projects for the wasteland warriors. Anyways, it doesn't matter anymore since… well, it doesn't matter." ], "responses": [ { @@ -23,7 +23,7 @@ "id": "TALK_BLACKSMITH_PROTOTYPE_FEELING_IT", "type": "talk_topic", "dynamic_line": [ - "Oh, these. With the end of the world, Jay and I had been talking about some new projects for the wasteland warriors. If you wanted to help source parts and do some testing we could definitely work on some of this stuff." + "Yeah! I feel a lot better now that Jay and I are talking again, and we've been putting some serious work into this stuff. If you wanted to help source parts and do some testing, we could definitely get some prototypes made." ], "responses": [ { @@ -48,7 +48,7 @@ { "id": "TALK_BLACKSMITH_PROTOTYPE", "type": "talk_topic", - "dynamic_line": [ "Sure what would you like to know more about." ], + "dynamic_line": [ "Sure, what would you like to know more about?" ], "responses": [ { "text": "Can you work on one of these projects for me?", @@ -56,7 +56,7 @@ "topic": "TALK_BLACKSMITH_BUSY" }, { - "text": "[motion to the pictured mace gun] What's the 'OBREZ'?", + "text": "[Motion to the picture of some kind of rifle.] What's the 'OBREZ'?", "condition": { "not": { "u_has_var": "blacksmith_crafting", "type": "dialogue", "context": "artisans", "value": "yes" } }, "topic": "TALK_BLACKSMITH_OBREZ" }, @@ -93,7 +93,7 @@ "topic": "TALK_BLACKSMITH_OBREZ_COMPLETE" }, { - "text": "[motion to the pictured switchblade] What's the 'PRESSIN'?", + "text": "[Motion to the picture of a switchblade.] What's the 'PRESSIN'?", "condition": { "not": { "u_has_var": "blacksmith_crafting", "type": "dialogue", "context": "artisans", "value": "yes" } }, "topic": "TALK_BLACKSMITH_PRESSIN" }, @@ -130,7 +130,7 @@ "topic": "TALK_BLACKSMITH_PRESSIN_COMPLETE" }, { - "text": "[motion to the mace] What's the 'LOUVERTURE'?", + "text": "[Motion to the picture of a mace styled with fire on the head.] What's the 'LOUVERTURE'?", "condition": { "not": { "u_has_var": "blacksmith_crafting", "type": "dialogue", "context": "artisans", "value": "yes" } }, "topic": "TALK_BLACKSMITH_LOUVERTURE" }, @@ -167,7 +167,7 @@ "topic": "TALK_BLACKSMITH_LOUVERTURE_COMPLETE" }, { - "text": "[motion to the sledge hammer] What's the 'DISORDER'?", + "text": "[Motion to the picture of a sledge hammer with a piston jutting from one face of the head.] What's the 'DISORDER'?", "condition": { "not": { "u_has_var": "blacksmith_crafting", "type": "dialogue", "context": "artisans", "value": "yes" } }, "topic": "TALK_BLACKSMITH_DISORDER" }, @@ -210,7 +210,7 @@ "id": "TALK_BLACKSMITH_OBREZ", "//": "Obrez Mace", "type": "talk_topic", - "dynamic_line": "The Obrez is a classic Mosin-Nagant that someone has cut down and removed the stock of. The idea was, in some parts of the world a surplus rifle was easier than finding a pistol to conceal. Way I see it, a sturdy classic gun like that with a bit of reinforcement could make a great mace. You find me a functioning Mosin, any variant will do, 50 merch for parts and give me a week and I can get this one working.", + "dynamic_line": "The Obrez is a classic Mosin-Nagant that someone has cut down and removed the stock of. The idea was that in some parts of the world a surplus rifle was easier than finding a pistol to conceal. Way I see it, a sturdy classic gun like that with a bit of reinforcement could make a great mace. You find me a functioning Mosin - any variant will do - and 50 merch for parts, and I can get this one working in a week.", "responses": [ { "text": "[Mosin-Nagant M44, 50 merch] See you in a week.", @@ -268,7 +268,7 @@ "id": "TALK_BLACKSMITH_PRESSIN", "//": "Pressin Pistol Knife", "type": "talk_topic", - "dynamic_line": "The Pressin was a self defense weapon for politicians in Spain. It was a small breach loaded handheld pistol that could fit in a glasses case and be fired subtly. I figure that we can improve on the design by adding a retracting blade while keeping the surprise shots. To get this working I'm gonna need a .32 gun like a: SIG Sauer P230, Kel-Tec P-32, or a Walther PPK. I'll also need a switchblade, 20 merch and a week.", + "dynamic_line": "The Pressin was a self defense weapon for politicians in Spain. It was a small breach loaded handheld pistol that could fit in a glasses case and be fired subtly. I figure that we can improve on the design by adding a retracting blade while keeping the surprise shots. To get this working I'm gonna need a .32 gun like a SIG Sauer P230, Kel-Tec P-32, or a Walther PPK. I'll also need a switchblade, 20 merch, and a week.", "responses": [ { "text": "[P230, switchblade, 20 merch] See you in a week.", @@ -339,7 +339,7 @@ "id": "TALK_BLACKSMITH_PRESSIN_COMPLETE", "//": "making the pressin", "type": "talk_topic", - "dynamic_line": "The guns done, mind the safety on the side, this guy is pretty dangerous.", + "dynamic_line": "The gun's done. Mind the safety on the side, this guy is pretty dangerous.", "responses": [ { "text": "Thanks.", @@ -356,10 +356,10 @@ "id": "TALK_BLACKSMITH_LOUVERTURE", "//": "Sun Mace", "type": "talk_topic", - "dynamic_line": "Oh that's one of my sillier ideas. Jay is convinced it will never work but I really want to give it a shot. A traditional mace with gas venting ports and an ignition system for mini bursts of fire. Maybe I've just played too many fantasy RPGs but it seems worth a shot. To get this one working I'm gonna need a real deal mace, something that can handle the pressure and additional parts as well as a military grade flamethrower. Fabrication will definitely take 2 weeks on this one.", + "dynamic_line": "Oh, that's one of my sillier ideas. Jay is convinced it'll never work but I really want to give it a shot. A traditional mace with gas-venting ports and an ignition system for mini bursts of fire. Maybe I've just played too many RPGs, but it seems worth a shot. To get this one working I'm gonna need a real deal mace - something that can handle the pressure - as well as a military grade flamethrower. Fabrication will definitely take two weeks on this one.", "responses": [ { - "text": "[mace, flamethrower] See you in 2 weeks.", + "text": "[Mace, flamethrower] See you in 2 weeks.", "condition": { "and": [ { "u_has_items": { "item": "flamethrower", "count": 1 } }, { "u_has_items": { "item": "mace", "count": 1 } } ] }, @@ -399,10 +399,10 @@ "id": "TALK_BLACKSMITH_DISORDER", "//": "Disorder sledge hammer", "type": "talk_topic", - "dynamic_line": "The Disorder is already kind of a real thing. I got the idea from a viral video I saw of a guy making something similar with a baseball bat for hitting home runs. Takes a sledge hammer with a center mounted piston that you can arm with .22 caliber blanks. When you hit a zombie with that sweet spot… BOOM. I'll need a sledge hammer, 80 merch and at least 20 .22 LR rounds. Fabrication will definitely take 2 weeks on this one.", + "dynamic_line": "The Disorder is already kind of a real thing. I got the idea from a viral video I saw of a guy making something similar with a baseball bat for hitting home runs. Takes a sledge hammer with a center mounted piston that you can arm with .22 caliber blanks. When you hit a zombie with that sweet spot… boom. The blank goes off and sends the piston straight down into whatever poor fucker you hit it with. I'll need a sledge hammer, 80 merch, and at least 20 .22 LR rounds. Fabrication will definitely take two weeks on this one.", "responses": [ { - "text": "[sledge hammer, 80 merch, 20 .22 LR] See you in 2 weeks.", + "text": "[Sledge hammer, 80 merch, 20 .22 LR] See you in 2 weeks.", "condition": { "and": [ { "u_has_items": { "item": "hammer_sledge", "count": 1 } }, @@ -430,7 +430,7 @@ "id": "TALK_BLACKSMITH_DISORDER_COMPLETE", "//": "making the pulverizer", "type": "talk_topic", - "dynamic_line": "The beast is done, really heavy duty but really packs a punch. Be careful with your fingers I'm serious this thing could tear em off.", + "dynamic_line": "The beast is done! Really heavy duty but really packs a punch. Be careful with your fingers. I'm serious, this thing could tear 'em off.", "responses": [ { "text": "Thanks.", diff --git a/data/json/npcs/isolated_road/isolated_road_jay_convert.json b/data/json/npcs/isolated_road/isolated_road_jay_convert.json index 0ad9586d43c42..39fb2b000538d 100644 --- a/data/json/npcs/isolated_road/isolated_road_jay_convert.json +++ b/data/json/npcs/isolated_road/isolated_road_jay_convert.json @@ -1,20 +1,36 @@ [ + { + "id": "TALK_BULLET_EXCHANGE_INFO", + "type": "talk_topic", + "dynamic_line": [ + "You hit the nail on the head. You bring me bullets - 5.56, 7.62, 5.45, or .300 - and I'll convert between 'em. I take a 10% cut, just so you know." + ], + "responses": [ + { "text": "Thanks for filling me in.", "topic": "TALK_GUNSMITH_SERVICES" }, + { "text": "Can we do that now?", "topic": "TALK_BULLET_EXCHANGE" } + ] + }, { "id": "TALK_BULLET_EXCHANGE", "//": "this is all the dialogue related to converting bullets with Jay", "type": "talk_topic", "dynamic_line": [ - "Yup what would you like to convert? Behind me is what I can do over the counter but larger conversions will take a few days." + "Yup, what would you like to convert? As a reminder, I do 5.56, 7.62, 5.45, or .300. You want anything else, we can just trade 'em directly over the counter." ], "responses": [ - { "text": "Forget it.", "topic": "TALK_GUNSMITH_SERVICES" }, + { "text": "Nothing for now.", "topic": "TALK_GUNSMITH_SERVICES" }, + { + "text": "Let's see what you have in stock right now.", + "topic": "TALK_GUNSMITH_SERVICES", + "effect": "start_trade" + }, { - "text": "[1 day] 200 Rounds", + "text": "[1 day] 200 rounds.", "effect": [ { "u_add_var": "gunsmith_ammo_ammount", "type": "number", "context": "artisans", "value": "200" } ], "topic": "TALK_GUNSMITH_CONVERT_FROM_TYPE" }, { - "text": "[5 days] 800 Rounds", + "text": "[5 days] 800 rounds.", "effect": [ { "u_add_var": "gunsmith_ammo_ammount", "type": "number", "context": "artisans", "value": "800" } ], "topic": "TALK_GUNSMITH_CONVERT_FROM_TYPE" } @@ -29,12 +45,12 @@ "context": "artisans", "op": "==", "value": 200, - "yes": "Alright 200 rounds, what are you looking to give me?", - "no": "Alright 800 rounds, what are you looking to give me?" + "yes": "Alright, 200 rounds. First off, what are you looking to give me?", + "no": "Alright, 800 rounds. First off, what are you looking to give me?" }, "responses": [ { - "text": "5.56x45", + "text": "5.56x45.", "condition": { "and": [ { "u_has_items": { "item": "556", "count": 200 } }, @@ -54,7 +70,7 @@ "topic": "TALK_GUNSMITH_CONVERT_TO_TYPE" }, { - "text": "5.56x45", + "text": "5.56x45.", "condition": { "and": [ { "u_has_items": { "item": "556", "count": 800 } }, @@ -94,7 +110,7 @@ "topic": "TALK_GUNSMITH_CONVERT_TO_TYPE" }, { - "text": "7.62x51", + "text": "7.62x51.", "condition": { "and": [ { "u_has_items": { "item": "762_51", "count": 800 } }, @@ -114,7 +130,7 @@ "topic": "TALK_GUNSMITH_CONVERT_TO_TYPE" }, { - "text": "7.62x39", + "text": "7.62x39.", "condition": { "and": [ { "u_has_items": { "item": "762_m87", "count": 200 } }, @@ -134,7 +150,7 @@ "topic": "TALK_GUNSMITH_CONVERT_TO_TYPE" }, { - "text": "7.62x39", + "text": "7.62x39.", "condition": { "and": [ { "u_has_items": { "item": "762_m87", "count": 800 } }, @@ -154,7 +170,7 @@ "topic": "TALK_GUNSMITH_CONVERT_TO_TYPE" }, { - "text": "5.54x39", + "text": "5.45x39.", "condition": { "and": [ { "u_has_items": { "item": "545", "count": 200 } }, @@ -174,7 +190,7 @@ "topic": "TALK_GUNSMITH_CONVERT_TO_TYPE" }, { - "text": "5.54x39", + "text": "5.45x39.", "condition": { "and": [ { "u_has_items": { "item": "545", "count": 800 } }, @@ -194,7 +210,7 @@ "topic": "TALK_GUNSMITH_CONVERT_TO_TYPE" }, { - "text": ".300 AAC", + "text": ".300 AAC.", "condition": { "and": [ { "u_has_items": { "item": "300blk", "count": 200 } }, @@ -214,7 +230,7 @@ "topic": "TALK_GUNSMITH_CONVERT_TO_TYPE" }, { - "text": ".300 AAC", + "text": ".300 AAC.", "condition": { "and": [ { "u_has_items": { "item": "300blk", "count": 800 } }, @@ -282,7 +298,7 @@ }, "responses": [ { - "text": "5.56x45", + "text": "5.56x45.", "condition": { "not": { "u_compare_var": "gunsmith_ammo_from", "type": "number", "context": "artisans", "op": "==", "value": 556 } }, "effect": [ { "u_add_var": "gunsmith_ammo_to", "type": "number", "context": "artisans", "value": "556" }, @@ -292,7 +308,7 @@ "topic": "TALK_GUNSMITH_CONVERT_CONFIRM" }, { - "text": "7.62x51", + "text": "7.62x51.", "condition": { "not": { "u_compare_var": "gunsmith_ammo_from", "type": "number", "context": "artisans", "op": "==", "value": 76251 } }, @@ -304,7 +320,7 @@ "topic": "TALK_GUNSMITH_CONVERT_CONFIRM" }, { - "text": "7.62x39", + "text": "7.62x39.", "condition": { "not": { "u_compare_var": "gunsmith_ammo_from", "type": "number", "context": "artisans", "op": "==", "value": 76239 } }, @@ -316,7 +332,7 @@ "topic": "TALK_GUNSMITH_CONVERT_CONFIRM" }, { - "text": "5.54x39", + "text": "5.45x39.", "condition": { "not": { "u_compare_var": "gunsmith_ammo_from", "type": "number", "context": "artisans", "op": "==", "value": 545 } }, "effect": [ { "u_add_var": "gunsmith_ammo_to", "type": "number", "context": "artisans", "value": "545" }, @@ -326,7 +342,7 @@ "topic": "TALK_GUNSMITH_CONVERT_CONFIRM" }, { - "text": ".300 AAC", + "text": ".300 AAC.", "condition": { "not": { "u_compare_var": "gunsmith_ammo_from", "type": "number", "context": "artisans", "op": "==", "value": 300 } }, "effect": [ { "u_add_var": "gunsmith_ammo_to", "type": "number", "context": "artisans", "value": "300" }, @@ -346,21 +362,21 @@ "context": "artisans", "op": "==", "value": 200, - "yes": "Alright, that's 200 rounds minus the 10% service fee, they'll be converted in a day.", - "no": "Alright, that's 800 rounds minus the 10% service fee, they'll be converted in 5 days." + "yes": "Alright, that's 200 rounds minus the 10% service fee. They'll be converted in a day.", + "no": "Alright, that's 800 rounds minus the 10% service fee. They'll be converted in 5 days." }, "responses": [ { "text": "See you then.", "topic": "TALK_DONE" }, - { "text": "Something else I'd like to talk about.", "topic": "TALK_GUNSMITH_SERVICES" } + { "text": "There's something else I'd like to talk about.", "topic": "TALK_GUNSMITH_SERVICES" } ] }, { "id": "TALK_GUNSMITH_BULLET_PICKUP_NOT_YET", "type": "talk_topic", - "dynamic_line": "Sorry it isn't ready yet.", + "dynamic_line": "Sorry, it isn't ready yet.", "responses": [ { "text": "See you then.", "topic": "TALK_DONE" }, - { "text": "Something else I'd like to talk about.", "topic": "TALK_GUNSMITH_SERVICES" } + { "text": "There's something else I'd like to talk about.", "topic": "TALK_GUNSMITH_SERVICES" } ] }, { @@ -370,7 +386,7 @@ "responses": [ { "//": "ALL 556 Converts" }, { - "text": "[pickup ammo] Thanks.", + "text": "[Take your new ammo.] Thanks.", "condition": { "and": [ { "u_compare_var": "gunsmith_ammo_from", "type": "number", "context": "artisans", "op": "==", "value": 556 }, @@ -397,7 +413,7 @@ "topic": "TALK_DONE" }, { - "text": "[pickup ammo] Thanks.", + "text": "[Take your new ammo.] Thanks.", "condition": { "and": [ { "u_compare_var": "gunsmith_ammo_from", "type": "number", "context": "artisans", "op": "==", "value": 556 }, @@ -424,7 +440,7 @@ "topic": "TALK_DONE" }, { - "text": "[pickup ammo] Thanks.", + "text": "[Take your new ammo.] Thanks.", "condition": { "and": [ { "u_compare_var": "gunsmith_ammo_from", "type": "number", "context": "artisans", "op": "==", "value": 556 }, @@ -445,7 +461,7 @@ "topic": "TALK_DONE" }, { - "text": "[pickup ammo] Thanks.", + "text": "[Take your new ammo.] Thanks.", "condition": { "and": [ { "u_compare_var": "gunsmith_ammo_from", "type": "number", "context": "artisans", "op": "==", "value": 556 }, @@ -466,7 +482,7 @@ "topic": "TALK_DONE" }, { - "text": "[pickup ammo] Thanks.", + "text": "[Take your new ammo.] Thanks.", "condition": { "and": [ { "u_compare_var": "gunsmith_ammo_from", "type": "number", "context": "artisans", "op": "==", "value": 556 }, @@ -493,7 +509,7 @@ "topic": "TALK_DONE" }, { - "text": "[pickup ammo] Thanks.", + "text": "[Take your new ammo.] Thanks.", "condition": { "and": [ { "u_compare_var": "gunsmith_ammo_from", "type": "number", "context": "artisans", "op": "==", "value": 556 }, @@ -520,7 +536,7 @@ "topic": "TALK_DONE" }, { - "text": "[pickup ammo] Thanks.", + "text": "[Take your new ammo.] Thanks.", "condition": { "and": [ { "u_compare_var": "gunsmith_ammo_from", "type": "number", "context": "artisans", "op": "==", "value": 556 }, @@ -541,7 +557,7 @@ "topic": "TALK_DONE" }, { - "text": "[pickup ammo] Thanks.", + "text": "[Take your new ammo.] Thanks.", "condition": { "and": [ { "u_compare_var": "gunsmith_ammo_from", "type": "number", "context": "artisans", "op": "==", "value": 556 }, @@ -563,7 +579,7 @@ }, { "//": "ALL 762x39 Converts" }, { - "text": "[pickup ammo] Thanks.", + "text": "[Take your new ammo.] Thanks.", "condition": { "and": [ { "u_compare_var": "gunsmith_ammo_from", "type": "number", "context": "artisans", "op": "==", "value": 76239 }, @@ -584,7 +600,7 @@ "topic": "TALK_DONE" }, { - "text": "[pickup ammo] Thanks.", + "text": "[Take your new ammo.] Thanks.", "condition": { "and": [ { "u_compare_var": "gunsmith_ammo_from", "type": "number", "context": "artisans", "op": "==", "value": 76239 }, @@ -605,7 +621,7 @@ "topic": "TALK_DONE" }, { - "text": "[pickup ammo] Thanks.", + "text": "[Take your new ammo.] Thanks.", "condition": { "and": [ { "u_compare_var": "gunsmith_ammo_from", "type": "number", "context": "artisans", "op": "==", "value": 76239 }, @@ -626,7 +642,7 @@ "topic": "TALK_DONE" }, { - "text": "[pickup ammo] Thanks.", + "text": "[Take your new ammo.] Thanks.", "condition": { "and": [ { "u_compare_var": "gunsmith_ammo_from", "type": "number", "context": "artisans", "op": "==", "value": 76239 }, @@ -647,7 +663,7 @@ "topic": "TALK_DONE" }, { - "text": "[pickup ammo] Thanks.", + "text": "[Take your new ammo.] Thanks.", "condition": { "and": [ { "u_compare_var": "gunsmith_ammo_from", "type": "number", "context": "artisans", "op": "==", "value": 76239 }, @@ -674,7 +690,7 @@ "topic": "TALK_DONE" }, { - "text": "[pickup ammo] Thanks.", + "text": "[Take your new ammo.] Thanks.", "condition": { "and": [ { "u_compare_var": "gunsmith_ammo_from", "type": "number", "context": "artisans", "op": "==", "value": 76239 }, @@ -701,7 +717,7 @@ "topic": "TALK_DONE" }, { - "text": "[pickup ammo] Thanks.", + "text": "[Take your new ammo.] Thanks.", "condition": { "and": [ { "u_compare_var": "gunsmith_ammo_from", "type": "number", "context": "artisans", "op": "==", "value": 76239 }, @@ -722,7 +738,7 @@ "topic": "TALK_DONE" }, { - "text": "[pickup ammo] Thanks.", + "text": "[Take your new ammo.] Thanks.", "condition": { "and": [ { "u_compare_var": "gunsmith_ammo_from", "type": "number", "context": "artisans", "op": "==", "value": 76239 }, @@ -744,7 +760,7 @@ }, { "//": "ALL 545 Converts" }, { - "text": "[pickup ammo] Thanks.", + "text": "[Take your new ammo.] Thanks.", "condition": { "and": [ { "u_compare_var": "gunsmith_ammo_from", "type": "number", "context": "artisans", "op": "==", "value": 545 }, @@ -765,7 +781,7 @@ "topic": "TALK_DONE" }, { - "text": "[pickup ammo] Thanks.", + "text": "[Take your new ammo.] Thanks.", "condition": { "and": [ { "u_compare_var": "gunsmith_ammo_from", "type": "number", "context": "artisans", "op": "==", "value": 545 }, @@ -786,7 +802,7 @@ "topic": "TALK_DONE" }, { - "text": "[pickup ammo] Thanks.", + "text": "[Take your new ammo.] Thanks.", "condition": { "and": [ { "u_compare_var": "gunsmith_ammo_from", "type": "number", "context": "artisans", "op": "==", "value": 545 }, @@ -813,7 +829,7 @@ "topic": "TALK_DONE" }, { - "text": "[pickup ammo] Thanks.", + "text": "[Take your new ammo.] Thanks.", "condition": { "and": [ { "u_compare_var": "gunsmith_ammo_from", "type": "number", "context": "artisans", "op": "==", "value": 545 }, @@ -840,7 +856,7 @@ "topic": "TALK_DONE" }, { - "text": "[pickup ammo] Thanks.", + "text": "[Take your new ammo.] Thanks.", "condition": { "and": [ { "u_compare_var": "gunsmith_ammo_from", "type": "number", "context": "artisans", "op": "==", "value": 545 }, @@ -867,7 +883,7 @@ "topic": "TALK_DONE" }, { - "text": "[pickup ammo] Thanks.", + "text": "[Take your new ammo.] Thanks.", "condition": { "and": [ { "u_compare_var": "gunsmith_ammo_from", "type": "number", "context": "artisans", "op": "==", "value": 545 }, @@ -894,7 +910,7 @@ "topic": "TALK_DONE" }, { - "text": "[pickup ammo] Thanks.", + "text": "[Take your new ammo.] Thanks.", "condition": { "and": [ { "u_compare_var": "gunsmith_ammo_from", "type": "number", "context": "artisans", "op": "==", "value": 545 }, @@ -915,7 +931,7 @@ "topic": "TALK_DONE" }, { - "text": "[pickup ammo] Thanks.", + "text": "[Take your new ammo.] Thanks.", "condition": { "and": [ { "u_compare_var": "gunsmith_ammo_from", "type": "number", "context": "artisans", "op": "==", "value": 545 }, @@ -937,7 +953,7 @@ }, { "//": "ALL 762 NATO Converts" }, { - "text": "[pickup ammo] Thanks.", + "text": "[Take your new ammo.] Thanks.", "condition": { "and": [ { "u_compare_var": "gunsmith_ammo_from", "type": "number", "context": "artisans", "op": "==", "value": 76251 }, @@ -958,7 +974,7 @@ "topic": "TALK_DONE" }, { - "text": "[pickup ammo] Thanks.", + "text": "[Take your new ammo.] Thanks.", "condition": { "and": [ { "u_compare_var": "gunsmith_ammo_from", "type": "number", "context": "artisans", "op": "==", "value": 76251 }, @@ -979,7 +995,7 @@ "topic": "TALK_DONE" }, { - "text": "[pickup ammo] Thanks.", + "text": "[Take your new ammo.] Thanks.", "condition": { "and": [ { "u_compare_var": "gunsmith_ammo_from", "type": "number", "context": "artisans", "op": "==", "value": 76251 }, @@ -1006,7 +1022,7 @@ "topic": "TALK_DONE" }, { - "text": "[pickup ammo] Thanks.", + "text": "[Take your new ammo.] Thanks.", "condition": { "and": [ { "u_compare_var": "gunsmith_ammo_from", "type": "number", "context": "artisans", "op": "==", "value": 76251 }, @@ -1033,7 +1049,7 @@ "topic": "TALK_DONE" }, { - "text": "[pickup ammo] Thanks.", + "text": "[Take your new ammo.] Thanks.", "condition": { "and": [ { "u_compare_var": "gunsmith_ammo_from", "type": "number", "context": "artisans", "op": "==", "value": 76251 }, @@ -1054,7 +1070,7 @@ "topic": "TALK_DONE" }, { - "text": "[pickup ammo] Thanks.", + "text": "[Take your new ammo.] Thanks.", "condition": { "and": [ { "u_compare_var": "gunsmith_ammo_from", "type": "number", "context": "artisans", "op": "==", "value": 76251 }, @@ -1075,7 +1091,7 @@ "topic": "TALK_DONE" }, { - "text": "[pickup ammo] Thanks.", + "text": "[Take your new ammo.] Thanks.", "condition": { "and": [ { "u_compare_var": "gunsmith_ammo_from", "type": "number", "context": "artisans", "op": "==", "value": 76251 }, @@ -1096,7 +1112,7 @@ "topic": "TALK_DONE" }, { - "text": "[pickup ammo] Thanks.", + "text": "[Take your new ammo.] Thanks.", "condition": { "and": [ { "u_compare_var": "gunsmith_ammo_from", "type": "number", "context": "artisans", "op": "==", "value": 76251 }, @@ -1118,7 +1134,7 @@ }, { "//": "ALL Blackout Converts" }, { - "text": "[pickup ammo] Thanks.", + "text": "[Take your new ammo.] Thanks.", "condition": { "and": [ { "u_compare_var": "gunsmith_ammo_from", "type": "number", "context": "artisans", "op": "==", "value": 300 }, @@ -1139,7 +1155,7 @@ "topic": "TALK_DONE" }, { - "text": "[pickup ammo] Thanks.", + "text": "[Take your new ammo.] Thanks.", "condition": { "and": [ { "u_compare_var": "gunsmith_ammo_from", "type": "number", "context": "artisans", "op": "==", "value": 300 }, @@ -1160,7 +1176,7 @@ "topic": "TALK_DONE" }, { - "text": "[pickup ammo] Thanks.", + "text": "[Take your new ammo.] Thanks.", "condition": { "and": [ { "u_compare_var": "gunsmith_ammo_from", "type": "number", "context": "artisans", "op": "==", "value": 300 }, @@ -1187,7 +1203,7 @@ "topic": "TALK_DONE" }, { - "text": "[pickup ammo] Thanks.", + "text": "[Take your new ammo.] Thanks.", "condition": { "and": [ { "u_compare_var": "gunsmith_ammo_from", "type": "number", "context": "artisans", "op": "==", "value": 300 }, @@ -1214,7 +1230,7 @@ "topic": "TALK_DONE" }, { - "text": "[pickup ammo] Thanks.", + "text": "[Take your new ammo.] Thanks.", "condition": { "and": [ { "u_compare_var": "gunsmith_ammo_from", "type": "number", "context": "artisans", "op": "==", "value": 300 }, @@ -1235,7 +1251,7 @@ "topic": "TALK_DONE" }, { - "text": "[pickup ammo] Thanks.", + "text": "[Take your new ammo.] Thanks.", "condition": { "and": [ { "u_compare_var": "gunsmith_ammo_from", "type": "number", "context": "artisans", "op": "==", "value": 300 }, @@ -1256,7 +1272,7 @@ "topic": "TALK_DONE" }, { - "text": "[pickup ammo] Thanks.", + "text": "[Take your new ammo.] Thanks.", "condition": { "and": [ { "u_compare_var": "gunsmith_ammo_from", "type": "number", "context": "artisans", "op": "==", "value": 300 }, @@ -1283,7 +1299,7 @@ "topic": "TALK_DONE" }, { - "text": "[pickup ammo] Thanks.", + "text": "[Take your new ammo.] Thanks.", "condition": { "and": [ { "u_compare_var": "gunsmith_ammo_from", "type": "number", "context": "artisans", "op": "==", "value": 300 }, @@ -1309,7 +1325,7 @@ ], "topic": "TALK_DONE" }, - { "text": "Something else I'd like to talk about.", "topic": "TALK_GUNSMITH_SERVICES" } + { "text": "There's something else I'd like to talk about.", "topic": "TALK_GUNSMITH_SERVICES" } ] } ] diff --git a/data/json/npcs/isolated_road/isolated_road_jay_dialogue.json b/data/json/npcs/isolated_road/isolated_road_jay_dialogue.json index de13d02fe81e1..6386f2b8bc513 100644 --- a/data/json/npcs/isolated_road/isolated_road_jay_dialogue.json +++ b/data/json/npcs/isolated_road/isolated_road_jay_dialogue.json @@ -12,7 +12,7 @@ "topic": "TALK_GUNSMITH_SHOP_ABOUT" }, { - "text": "Hey, Cody says they are sorry. They thought you would want to see this.", + "text": "Hey. Cody wanted to say that she's sorry. She thought that you would want to see this.", "condition": { "and": [ { "u_has_items": { "item": "kord", "count": 1 } }, @@ -132,7 +132,6 @@ "topic": "TALK_GUNSMITH_CODY" }, { "text": "What is this place?", "topic": "TALK_GUNSMITH_LOCATION_ABOUT" }, - { "text": "I have to go.", "topic": "TALK_DONE" }, { "text": "About those contracts…", "topic": "TALK_MISSION_LIST_ASSIGNED", @@ -148,7 +147,8 @@ }, "topic": "TALK_MISSION_LIST" }, - { "text": "I'd like to make a withdrawl.", "topic": "TALK_GUNSMITH_SERVICES", "effect": "start_trade" } + { "text": "Let's trade.", "topic": "TALK_GUNSMITH_SERVICES", "effect": "start_trade" }, + { "text": "I have to go.", "topic": "TALK_DONE" } ] }, { @@ -164,14 +164,14 @@ "id": "TALK_GUNSMITH_SHOP_ABOUT_MORE", "type": "talk_topic", "dynamic_line": [ - "Pretty simple stuff bud'. I barter in pre-shitshow ammo and to stimulate the growing economy print and issue more. I take your goods, Cody would call it 'labor' and exchange it for the new universal currency. If you want to convert currency I'm happy to facilitate but it'll take a few days and there is a service charge." + "Pretty simple stuff, bud. I barter in pre-shitshow ammo, and to stimulate the growing economy, I print and issue more. I take your goods - Cody would call it labor - and exchange it for the new universal currency. If you want to convert currency I'm happy to facilitate, but it'll take a few days and there is a service charge." ], "speaker_effect": { "effect": { "u_add_var": "gunsmith_knows_about_conversion", "type": "dialogue", "context": "artisans", "value": "yes" } }, "responses": [ { "text": "So you're really going all in on this bank thing?", "topic": "TALK_GUNSMITH_SERVICES" }, - { "text": "So you'll exchange bullets for other bullets directly?", "topic": "TALK_BULLET_EXCHANGE" }, + { "text": "So you'll exchange bullets for other bullets directly?", "topic": "TALK_BULLET_EXCHANGE_INFO" }, { "text": "…", "topic": "TALK_GUNSMITH_SERVICES" } ] }, @@ -188,31 +188,31 @@ "id": "TALK_GUNSMITH_LOCATION_ABOUT", "type": "talk_topic", "dynamic_line": [ - "It's my house and Cody's if you've met her. We dug a pit and set up some milspec turrets. I programmed them and Cody armored them. Now we're just trying to get by. This ain't the wizard of oz you can look behind the curtain over there." + "It's my house. Cody's in the other building, if you've met her. We dug a trench and set up some milspec turrets. I programmed them, Cody armored them. Now we're just trying to get by. This ain't the wizard of Oz, you can look behind the curtain over there." ], "speaker_effect": { "effect": [ { "u_add_var": "gunsmith_mentioned_cody", "type": "dialogue", "context": "artisans", "value": "yes" } ] }, "responses": [ - { "text": "Where'd you get half a dozen mil spec turrets?", "topic": "TALK_GUNSMITH_TURRETS" }, + { "text": "Where'd you get half a dozen milspec turrets?", "topic": "TALK_GUNSMITH_TURRETS" }, { "text": "…", "topic": "TALK_GUNSMITH_SERVICES" } ] }, { "id": "TALK_GUNSMITH_TURRETS", "type": "talk_topic", - "dynamic_line": [ "[staring off into the distance] The owners didn't need them anymore. Not anymore…" ], + "dynamic_line": [ "*stares off into the distance. \"The owners didn't need them anymore. Not anymore…\"" ], "responses": [ { "text": "…", "topic": "TALK_GUNSMITH_SERVICES" } ] }, { "id": "TALK_GUNSMITH_CODY", "type": "talk_topic", - "dynamic_line": [ "Stuff is fucked all over bud, how about we stick to talking business." ], + "dynamic_line": [ "Stuff is fucked all over, bud. How about we stick to talking business?" ], "responses": [ { "text": "Alright.", "topic": "TALK_GUNSMITH_SERVICES" } ] }, { "id": "TALK_GUNSMITH_KORD", "type": "talk_topic", "dynamic_line": [ - "Where did you… I, I don't know what to say. Cody put you up to this, didn't they? The weapon is beautiful, modern rails, ergonomic furniture, recoil balancing system. I know Cody thinks they did something wrong but all I remember is being so angry… just blindingly furious and then running. When I woke up everything was fine. Thank you for letting me see this and getting Cody and I talking. If you could help me out with something for Cody I'll hook you up with a casket mag for that thing and a box of the good ammo, stuff from my reserves." + "Where did you… I- I don't know what to say.\" Jay takes the rifle reverently. He turns it over so carefully that you could mistake him for holding a child instead of a gun. \"This thing is is beautiful. Modern rails, ergonomic furniture, recoil balancing system. I know Cody thinks that she did something wrong, but all I remember is being so angry… just blindingly furious. Then I was running. When I woke up everything, was fine.\"\n\nJay hands back the Kord. \"Thank you for letting me see this, and for getting Cody and I talking. If you could help me out with something for Cody, I'll hook you up with a casket mag for that thing and a box of the good ammo. Stuff from my reserves." ], "speaker_effect": { "effect": [ { "u_add_var": "gunsmith_mentioned_quest", "type": "dialogue", "context": "artisans", "value": "yes" } ] }, "responses": [ @@ -232,7 +232,7 @@ "id": "TALK_GUNSMITH_Q1_DETAILS", "type": "talk_topic", "dynamic_line": [ - "Alright, so Cody has talked about some cutting-edge tech she's seen displayed. This thing is called a nano-fabricator. It's like a complicated, robotic 3d printer. Cody used to run with some hackers that steal IP, schematics that sort of thing. I guess a problem they were running into was the newest tech stuff is all encrypted as templates for these printers. Well, I know of a colleague who went home with debug software for the system. You get that for her and we are in business." + "Alright, so Cody has talked about some cutting-edge tech she's seen displayed. This thing is called a nano-fabricator. It's like a complicated, robotic 3D printer. Cody used to run with some hackers that steal IP, schematics, that sort of thing. I guess a problem they were running into was the newest tech stuff is all encrypted as templates for these printers. Well, I know of a colleague who went home with debug software for the system. You get that for her, and we're in business." ], "speaker_effect": { "effect": [ { "u_add_var": "gunsmith_mentioned_quest", "type": "dialogue", "context": "artisans", "value": "yes" } ] }, "responses": [ diff --git a/data/json/npcs/isolated_road/isolated_road_missions.json b/data/json/npcs/isolated_road/isolated_road_missions.json index fe45d5faa7c96..90c6b1d7e2d82 100644 --- a/data/json/npcs/isolated_road/isolated_road_missions.json +++ b/data/json/npcs/isolated_road/isolated_road_missions.json @@ -17,11 +17,11 @@ "dialogue": { "describe": "…", "offer": "Before everything went to hell Jay was talking about going to some gun show. There was a guy there who had managed to sneak some Russian gun into the US. It was a massive deal for Jay, it was all he could talk about. I know it's a long shot but maybe that guy was already at the gun show? If you find the gun you can keep it, but it would mean a lot to Jay if he could take a look all he wanted was to pull it apart and put it back together.", - "accepted": "Thanks, I'll start working on an apology.", + "accepted": "Thanks. I'll start working on an apology.", "rejected": "Let me know if you change your mind.", - "advice": "I'd be careful there Jay was saying they were bringing some new autonomous hardware to the show. Your looking for a Russian rifle that should be modded to the moon. CARD, CORE rifle, something like that.", - "inquire": "Any luck finding that gun show? I think it was a Russian gun maybe a CARD or CORE rifle? Something like that.", - "success": "Thanks darlin' if you could show it to Jay that would mean a lot to me. If there is anything I could ever make for you as payment just let me know.", + "advice": "I'd be careful there; Jay was saying they were bringing some new autonomous hardware to the show. You're looking for a Russian rifle that should be modded to the moon. CARD, CORE rifle, something like that.", + "inquire": "Any luck finding that gun show? I think it was a Russian gun, maybe a CARD or CORE rifle? Something like that.", + "success": "Thanks, darlin'. If you could show it to Jay, that would mean a lot to me. If there's anything I could ever make for you as payment after that, just let me know.", "success_lie": "That's great! Make sure to show it to Jay.", "failure": "Well you tried at least…" } @@ -30,7 +30,7 @@ "id": "MISSION_GUNSMITH_1", "type": "mission_definition", "name": { "str": "Find the debug software" }, - "description": "Jay wants you to go to someones house and get some software they had taken home.", + "description": "Jay wants you to go to someone's house and get some software that they had taken home.", "goal": "MGOAL_FIND_ITEM", "difficulty": 5, "item": "usb_drive_nano", @@ -81,13 +81,13 @@ "has_generic_rewards": false, "dialogue": { "describe": "…", - "offer": "Alright, so Cody has talked about some cutting-edge tech she's seen displayed. This thing is called a nano-fabricator. It's like a complicated, robotic 3d printer. Cody used to run with some hackers that steal IP, schematics that sort of thing. I guess a problem they were running into was the newest tech stuff is all encrypted as templates for these printers. Well, I know of a colleague who went home with debug software for the system. You get that for her and we are in business.", - "accepted": "Thanks, I'll start working on an apology.", + "offer": "Alright, so Cody has talked about some cutting-edge tech she's seen displayed. This thing is called a nano-fabricator. It's like a complicated, robotic 3D printer. Cody used to run with some hackers that steal IP, schematics, that sort of thing. I guess a problem they were running into was the newest tech stuff is all encrypted as templates for these printers. Well, I know of a colleague who went home with debug software for the system. You get that for her, and we're in business.", + "accepted": "Thanks. I'll start working on an apology.", "rejected": "Let me know if you change your mind.", - "advice": "I'd be careful, guy was a bit of a nut I don't know what he was planning to do with that software.", + "advice": "I'd be careful. Guy was a bit of a nut, I don't know what he was planning to do with that software.", "inquire": "Any luck finding that USB?", - "success": "Thanks bud I'll take it from here on the apology you enjoy the new munitions.", - "success_lie": "Shame. Shame, Shame.", + "success": "Thanks bud, I'll take it from here. Enjoy those bullets.", + "success_lie": "Shame. Shame, shame.", "failure": "Well fuck me then." } } diff --git a/data/json/overmap/overmap_terrain/overmap_terrain_isolated_road.json b/data/json/overmap/overmap_terrain/overmap_terrain_isolated_road.json index 92a68314ab2b3..443ef007c43c0 100644 --- a/data/json/overmap/overmap_terrain/overmap_terrain_isolated_road.json +++ b/data/json/overmap/overmap_terrain/overmap_terrain_isolated_road.json @@ -10,7 +10,7 @@ { "type": "overmap_terrain", "id": [ "isolated_house_farm_gunsmith", "isolated_house_farm_roof_gunsmith" ], - "name": "gunsmiths home", + "name": "gunsmith's home", "sym": "v", "color": "red", "flags": [ "NO_ROTATE" ], @@ -19,8 +19,8 @@ { "type": "overmap_terrain", "id": [ "isolated_house_farm_blacksmith", "isolated_house_farm_roof_blacksmith" ], - "name": "blacksmiths home", - "sym": "v", + "name": "blacksmith's home", + "sym": "^", "color": "cyan", "flags": [ "NO_ROTATE" ], "see_cost": 5