Skip to content

Commit

Permalink
Isolated artisans writing touchup (#56438)
Browse files Browse the repository at this point in the history 
* 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
  • Loading branch information
@Ilysen
Ilysen authored Apr 5, 2022
1 parent aba61a8 commit 77d4a83
Show file tree
Hide file tree
Showing 9 changed files with 215 additions and 165 deletions.
8 changes: 4 additions & 4 deletions data/json/items/gun/artisan_guns.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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" ] },
Expand All @@ -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" ] },
Expand Down Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/id_cards.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
68 changes: 39 additions & 29 deletions data/json/npcs/isolated_road/isolated_road_cody_dialogue.json
View file
Original file line number Diff line number Diff line change
@@ -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 } },
Expand All @@ -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": {
Expand All @@ -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" },
Expand All @@ -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" },
Expand All @@ -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 } },
Expand Down Expand Up @@ -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": {
Expand Down Expand Up @@ -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" },
Expand All @@ -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": [
Expand Down Expand Up @@ -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" },
Expand All @@ -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": [
Expand All @@ -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 },
Expand All @@ -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" },
Expand All @@ -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" } ]
Expand All @@ -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": [
{
Expand Down
Loading

0 comments on commit 77d4a83

Please sign in to comment.