Skip to content

Commit

Permalink
Apply suggestions from code review
Browse files Browse the repository at this point in the history
Co-authored-by: actual-nh <[email protected]>
Co-authored-by: matskuman5 <[email protected]>
  • Loading branch information
3 people authored Jan 15, 2021
1 parent e1045b6 commit 3ddf94a
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 10 deletions.
2 changes: 1 addition & 1 deletion data/json/npcs/factions.json
Original file line number Diff line number Diff line change
Expand Up @@ -703,6 +703,6 @@
"old_guard": { "kill on sight": true },
"your_followers": { "kill on sight": false }
},
"description": "Former prisoners who get their freedom during the apocalypse."
"description": "Former prisoners who got their freedom during the apocalypse."
}
]
14 changes: 7 additions & 7 deletions data/json/npcs/island_prison/prisoners.json
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@
"context": "annoyed_greeter",
"value": "yes",
"no": "<get_lost>",
"yes": "Are you deaf or stupid? I said I don't give a fuck to you and your problems. Bother me one more time, and you'll regret that. <get_lost>"
"yes": "Are you deaf or stupid? I said I don't give a fuck for you and your <swear> problems. Bother me one more time, and you'll regret that. <get_lost>"
},
"speaker_effect": { "effect": { "u_add_var": "talked_to_greeter", "type": "dialogue", "context": "angry_greeter", "value": "yes" } },
"responses": [
Expand Down Expand Up @@ -256,7 +256,7 @@
"type": "mission",
"context": "completed",
"value": "yes",
"yes": "I don't know if you know, but there are sewers underneath the prison. I was planning the escape long before <the_cataclysm>, and while I was working on cleaning the sewers, I noticed there is a damaged section of the wall. There was a flow of fresh air coming out of this section, so I think it's leading to the surface. It could be you way to the freedom. Feel free to use it.",
"yes": "I don't know if you know, but there are sewers underneath the prison. I was planning an escape long before <the_cataclysm>, and while I was working on cleaning the sewers, I noticed a damaged wall section. There was a flow of fresh air coming out of it, so I think it's leading to the surface. It could be your way to freedom. Feel free to use it.",
"no": {
"u_has_var": "talked_to_leader",
"type": "dialogue",
Expand Down Expand Up @@ -317,7 +317,7 @@
}
},
{
"text": "I want to get off this <swear> prison. I hoped you could help me with that.",
"text": "I want to get out of this <swear> prison. I hoped you could help me with that.",
"topic": "TALK_PRISONER_LEADER_GIVES_WORK",
"condition": {
"and": [
Expand Down Expand Up @@ -375,7 +375,7 @@
],
"responses": [
{
"text": "I want to get off this <swear> prison. I hoped you could help me with that.",
"text": "I want to get out of this <swear> prison. I hoped you could help me with that.",
"topic": "TALK_PRISONER_LEADER_GIVES_WORK"
}
]
Expand All @@ -386,7 +386,7 @@
"dynamic_line": [ "Hold the horses, pal. Nobody allowed you to stay here - yet." ],
"responses": [
{
"text": "Please! I don't want to get back there! I'm tired and hungry! I just need time to rest!",
"text": "Please! I don't want to go back there! I'm tired and hungry! I just need time to rest!",
"topic": "TALK_PRISONER_LEADER_ANNOYED"
},
{ "text": "Shit! Looks like I'm on my own now. Thanks for nothing. Bye.", "topic": "TALK_DONE" }
Expand Down Expand Up @@ -416,7 +416,7 @@
"id": "TALK_PRISONER_LEADER_NO",
"type": "talk_topic",
"dynamic_line": [
"The answer is still no. In fact it might be better for us to kill you right away, as, you know, the less mouths to feed, the better. But I'm in good mood today, so I decided to help you get out of this island."
"The answer is still no. In fact it might be better for us to kill you right away - you know, the less mouths to feed, the better. But I'm in a good mood today, so I've decided to help you get out of this island."
],
"responses": [
{ "text": "Ok, I'm listening.", "topic": "TALK_PRISONER_LEADER_GIVES_WORK" },
Expand Down Expand Up @@ -476,7 +476,7 @@
{
"id": "TALK_PRISONER_LEADER_ASKED_ABOUT_WHAT_FOR_DO_YOU_NEED_IT",
"type": "talk_topic",
"dynamic_line": [ "Let's say that's not of your <swear> business. Other questions?" ],
"dynamic_line": [ "Let's say that's none of your <swear> business. Other questions?" ],
"responses": [
{ "text": "That's weird.", "topic": "TALK_NONE" },
{ "text": "I have a bad feeling about this. Sorry, I'll pass.", "topic": "TALK_DONE" }
Expand Down
5 changes: 3 additions & 2 deletions data/json/npcs/talk_tags.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@
"Get outta my sight.",
"Get lost.",
"Get off.",
"Get the fuck out here.",
"Get the fuck out of here.",
"Get the fuck outta here.",
"Go bug someone else."
]
},
Expand Down Expand Up @@ -720,7 +721,7 @@
"I've had enough of you, begone",
"you're a poster child for abortions",
"how the fuck you've survived this far is beyond me, you <swear> <swear> <name_b>",
"you're the reason the gene pool needs a lifeguard"
"you're why the gene pool needs a lifeguard"
]
},
{
Expand Down

0 comments on commit 3ddf94a

Please sign in to comment.