Skip to content

Commit

Permalink
Apply suggestions
Browse files Browse the repository at this point in the history
Co-authored-by: Valiant <[email protected]>
  • Loading branch information
Uwuewsky and Valiant committed Nov 30, 2024
1 parent 5751a71 commit b5cba84
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 41 deletions.
25 changes: 11 additions & 14 deletions data/json/npcs/exodii/exodii_merchant_talk.json
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@
"dynamic_line": [
"Good an' fine, then.",
"Have it as ye'll see.",
{ "//~": "That was a good exchange", "str": "For a card an' a wink, eh?" }
{ "//~": "That was a good exchange.", "str": "For a card an' a wink, eh?" }
],
"speaker_effect": {
"condition": { "and": [ { "math": [ "n_val('sold') >= 20" ] }, { "not": { "u_has_faction_trust": 21 } } ] },
Expand All @@ -270,7 +270,7 @@
"id": "TALK_EXODII_MERCHANT_Stock_Medieval",
"type": "talk_topic",
"dynamic_line": {
"//~": "It's a bit of a surprise, isn't it? Before we came here, we were in a place about 600 years earlier in time, or so. We landed in the middle of a war that turned wrong when the dead started joining back in. Truth be told, not a very unusual situation. The Enemy makes us fight. By and by, we came in, and by then the killing fields were ready for us to harvest their bronze. It's no steel-of-the-lake, but it's a good strong metal for stopping a nibbling mouth, so we kept some of their armor and weapons to trade.",
"//~": "It's a bit of a surprise, isn't it? Before we came here, we were in a place about 600 years earlier in time, or so. We landed in the middle of a war that turned wrong when the dead started joining back in. Truth be told, not a very unusual situation. The Enemy makes us fight. By and by, we came in, and by then the killing fields were ready for us to harvest their bronze. It's not steel, but it's a good strong metal for stopping a nibbling mouth, so we kept some of their armor and weapons to trade.",
"str": "That be a right welcher, eh? Afore us'n were to this land, the preface were on a half-score century by the reckonin'. Landed us in amidst of a war'd turned wrong, for an' as the dead had come back in. By the butcher's block, not much an unusual case, really. The Enemy makes us fight. By an' by, we came in, an' by then the killin' fields were plump and ready to harvest the bronze. 'Tain't no steel-of-the-lake, but 'tis a good dross metal for holdin' off a nibblin' mouth, so we kept a few o' their vestments an' stickers for to trade."
},
"responses": [
Expand Down Expand Up @@ -315,7 +315,7 @@
"id": "TALK_EXODII_MERCHANT_Stock_Nomad3",
"type": "talk_topic",
"dynamic_line": {
"//~": "It's a simple matter of how we teleport. Our clothes are often made from cloth and hides from wherever we visit, and our teleporter tears living stuff apart here and there when we travel. Some can be saved if we take care, but there's no room to store nearly enough extra. That, and our fabricators are always busy, no time to waste on stuff we don't need for ourselves",
"//~": "It's a simple matter of how we teleport. Our clothes are often made from cloth and hides from wherever we visit, and our teleporter tears living stuff apart here and there when we travel. Some can be saved if we take care, but there's no room to store nearly enough extra. That, and our fabricators are always busy, no time to waste on stuff we don't need for ourselves.",
"str": "'Tis as simple as comes to a wobble. Our vestment be oft made from the fine clothes and hides of the land, and our jibber tears the stuff o' life apart here and there when us'n travel. For as some can be saved if care be taken, there be no case to store nigh enough o' this. That, an' our manuc-makers run as hot as a sunstone, no spit'n taste for that which we don't use usselves."
},
"responses": [
Expand All @@ -329,7 +329,7 @@
"id": "TALK_EXODII_MERCHANT_AskedRestock",
"type": "talk_topic",
"dynamic_line": {
"//~": "HEH, you can't get enough of old Rubik's merchandise, eh? Sure as hell, come back in <interval>.",
"//~": "HEH, you can't get enough of old Rubik's merchandise, eh? Sure as hell, come back in <interval>.",
"str": "HEH, ye c'nnae get enough o' ol' Rubik's merchandise, eh? Sure as 'ell, come back in <interval>."
},
"responses": [
Expand Down Expand Up @@ -447,7 +447,7 @@
{
"id": "TALK_EXODII_MERCHANT_Experiment_Cyborg_Rescue_Ongoing",
"type": "talk_topic",
"dynamic_line": "Nah, mate, still operatin",
"dynamic_line": "Nah, mate, still operatin'.",
"responses": [
{ "text": "<end_talking_nevermind> <done_conversation_section>", "topic": "TALK_EXODII_MERCHANT_Talk" },
{ "text": "Ok. <end_talking_bye>", "topic": "TALK_DONE" }
Expand Down Expand Up @@ -565,7 +565,7 @@
"id": "TALK_EXODII_MERCHANT_Experiment_Prototype_Cyborg_Rescue",
"type": "talk_topic",
"dynamic_line": {
"//~": "For this one, I can pull out their CBM and give any working to you, or I can just take out broken bits so that they will still be able to use the rest of stuff in them. Alternatively why don't you just give them to me I surely can help them adjust to life as a cyborg.",
"//~": "For this one, I can pull out their CBM and give any working to you, or I can just take out broken bits so that they will still be able to use the rest of stuff in them. Alternatively, why don't you just give them to me? I surely can help them adjust to life as a cyborg.",
"str": "Fer this 'un, I can yank out their bits 'n give 'em to ya, or I can jus' take out the busted pieces so they can still use th' rest o' stuff in 'em. Elsewise, why don't ya jest give 'im to me? I reckon I can turn 'im into a right useful worker."
},
"responses": [
Expand Down Expand Up @@ -864,7 +864,7 @@
"id": "TALK_EXODII_MERCHANT_Aliens2",
"type": "talk_topic",
"dynamic_line": {
"//~": "Yeah, that's a big question. Otherworlds are how you got those ugly bug-creatures around here, you know? Walking plants, talking mushroom, stuff like that. Otherlands are closer related. I'm from Earth, just a different Earth. You shouldn't be asking what the Exodii are doing in Earth, because some of us are feeling pretty at home here, I think. You should be asking what we're doing hanging out in your part of town.",
"//~": "Yeah, that's a big question. Otherworlds are how you got those ugly bug-creatures around here, you know? Walking plants, talking mushroom, stuff like that. Otherlands are closer related. I'm from Earth, just a different Earth. You shouldn't be asking what the Exodii are doing in Earth, because some of us are feeling pretty at home here, I think. You should be asking what we're doing hanging out in your part of town.",
"str": "Sure an that's a biggun'. Otherworlds be the wherefore o' them uggo buggers you got round and here, eh? Walkin' plants and talkin' mushrooms and whatlike. Otherlands be tassed more of a kinship. I be from Earth, but my Earth be differed. So you's shouldno be asked what the Exodii is doin' on Earth, because some is feelin' of us fine an' fine at home, an I'm ken. You's should be askin' what the Exodii is doin' razzin up your green and brown."
},
"responses": [
Expand Down Expand Up @@ -929,7 +929,7 @@
"id": "TALK_EXODII_MERCHANT_Robot",
"type": "talk_topic",
"dynamic_line": {
"//~": "Robot? What does that word mean? Hang on. …Ah, an automate? No, I'm as flesh and blood as you are, encased in a shell of metal and wire. Not as much flesh as there used to be. The wire is mixed and woven into the flesh, all as one, you see.",
"//~": "Robot? What does that word mean? Hang on. …Ah, an automate? No, I'm as flesh and blood as you are, encased in a shell of metal and wire. Not as much flesh as there used to be. The wire is mixed and woven into the flesh, all as one, you see.",
"str": "Robot? What assert is f'r it? Ahold…\" Rubik stops for a moment, as if thinking. \"Ah, an automate? No, this'n be flesh 'n blood as ye be, encased in a shell o' metal an' wire. Not so much flesh as there were. The wire is amixed an' afloat with the flesh, all as one, kennit.\""
},
"speaker_effect": { "effect": { "u_add_var": "knowledge_rubik_is_cyborg_u_knows_exodiilore", "value": "yes" } },
Expand Down Expand Up @@ -1096,7 +1096,7 @@
"concatenate": [
{
"//": "mod_update_script_compact",
"//~": "Yeah, we're always in need of some help around here. Here's the list I've got for stuff like this",
"//~": "Yeah, we're always in need of some help around here. Here's the list I've got for stuff like this.",
"str": "*pulls out a sheaf of mismatched papers, and leafs through the pages for a second. Their broad metallic fingers look surprisingly deft and delicate, and incongruous on the otherwise unremarkable looseleaf. \"Aye, an' there's room for a pop-an-work roun' here. Rubik's got tassed a lissy, right and clean"
},
{
Expand Down Expand Up @@ -1165,10 +1165,7 @@
{
"id": "TALK_EXODII_MERCHANT_Exodus",
"type": "talk_topic",
"dynamic_line": {
"//~": "Oh yeah, just that. Every one of us. We wander, we make do. It's a living.",
"str": "Oh yeah, right and so. Each and every. We wander, we make do. It's a livin'."
},
"dynamic_line": "Oh yeah, right and so. Each and every. We wander, we make do. It's a livin'.",
"responses": [
{ "text": "What drove you out?", "topic": "TALK_EXODII_MERCHANT_Exodus2" },
{ "text": "<done_conversation_section>", "topic": "TALK_NONE" },
Expand Down Expand Up @@ -1346,7 +1343,7 @@
"id": "TALK_EXODII_MERCHANT_Scythean",
"type": "talk_topic",
"dynamic_line": {
"//~": "Ha! A new part of our crew. Signed up early on in the world we were in before. He's a really tough guy, and the node appreciates his grit. (recites some poetry), as 'twere. I think he's pretty good as a military commander.",
"//~": "Ha! A new part of our crew. Signed up early on in the world we were in before. He's a really tough guy, and the node appreciates his grit. (Recites some poetry), as it were. I think he's pretty good as a military commander.",
"str": "Ha! A new string and beans, an I'm ken. Latched and keyed in the bright shine o' the deadland afore this'n. He be a thing o' fire and bronze, an' the node appreciates his grit. \"A cnight of old, clade in shining steel, leading the hoste onward to glorie,\" as 'twere. This'n finds him an apt one to give rede. To command in battle, that's t'yark."
},
"responses": [
Expand Down
4 changes: 2 additions & 2 deletions data/json/npcs/exodii/exodii_merchant_talk_exodization.json
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@
"id": "TALK_EXODII_MERCHANT_ExodizeMe1",
"type": "talk_topic",
"dynamic_line": {
"//~": "Great, great, great!! Ha! We'll fire up the old meat grinder. Your job is to bring us a bit of good tea. Not literally 'tea' of course. That's my Anglic street slang. I mean the stuff that puts you to sleep for surgery. The Great Grey says your word for it is 'anesthetic'. You bring us a thousand units of anesthetic, we'll fix you up with a wire and everything.",
"//~": "Great, great, great! Ha! We'll fire up the old meat grinder. Your job is to bring us a bit of good tea. Not literally 'tea' of course. That's my Anglic street slang. I mean the stuff that puts you to sleep for surgery. The Great Grey says your word for it is 'anesthetic'. You bring us a thousand units of anesthetic, we'll fix you up with a wire and everything.",
"str": "Fine an' fine, an' fine an' fine! Ha! Us'll rubber up the ol' gristle mill. Yer tassed wi' bringin' us a nip o' good tea. Not 'tea', o'course. I'm yarkin dockside Anglic here. Us means the stuff what puts y'to sleep f'r a chirurgery. The Great Grey says y'r assert for it is 'anus fetick'. You bring us a thousand unit of 'anus fetick', us'll fix'n ye up with a wire an' a tiff."
},
"responses": [
Expand Down Expand Up @@ -196,7 +196,7 @@
"id": "TALK_EXODII_MERCHANT_ExodizeMe2",
"type": "talk_topic",
"dynamic_line": {
"//~": "Great, great, great!! Ha! We'll fire up the old meat grinder. You just come along with old Rubik.",
"//~": "Great, great, great! Ha! We'll fire up the old meat grinder. You just come along with old Rubik.",
"str": "Fine an' fine, an' fine an' fine! Ha! Now as us've got the good tea, us'll rubber up the ol' gristle mill. You jus' set along with ol' Rubik."
},
"responses": [
Expand Down
Loading

0 comments on commit b5cba84

Please sign in to comment.