Skip to content

Commit

Permalink
Some more typo cleanup for 0.E
Browse files Browse the repository at this point in the history
Some more typo cleanup for 0.E
  • Loading branch information
Cyrano7 committed Jan 25, 2020
1 parent 1f2840c commit a59d1de
Show file tree
Hide file tree
Showing 25 changed files with 44 additions and 44 deletions.
2 changes: 1 addition & 1 deletion data/json/items/bionics.json
Original file line number Diff line number Diff line change
Expand Up @@ -940,7 +940,7 @@
"type": "BIONIC_ITEM",
"name": "Uncanny Dodge CBM",
"looks_like": "bio_int_enhancer",
"description": "Bionic processors that augment the the user's nervous system, allowing them to dodge attacks beyond normal human capability, including bullets.",
"description": "Bionic processors that augment the user's nervous system, allowing them to dodge attacks beyond normal human capability, including bullets.",
"price": 950000,
"weight": "1000 g",
"difficulty": 11
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/gun/308.json
Original file line number Diff line number Diff line change
Expand Up @@ -364,7 +364,7 @@
"looks_like": "ar15",
"type": "GUN",
"name": "M110A1",
"description": "A derivative of H&K's G28 with an aluminium upper receiver to meet US Army weight requirements. It is a gas operated, rotating bolt rifle accurate to 1.5 MOA with standard ammunition.",
"description": "A derivative of H&K's G28 with an aluminum upper receiver to meet US Army weight requirements. It is a gas operated, rotating bolt rifle accurate to 1.5 MOA with standard ammunition.",
"weight": "4330 g",
"volume": "2 L",
"price": 320000,
Expand Down
2 changes: 1 addition & 1 deletion data/json/monsters/mi-go.json
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@
"id": "mon_mi_go_guard",
"type": "MONSTER",
"name": { "str": "mi-go guard" },
"description": "This, like the more common mi-go, is an alien creature; this one is more heavily armoured. Its trunk is a shapeless mass of strange flesh encased in an iridescent carapace, from which sprout several appendages terminating in what appear to be devices of some sort. Its pyramidal head is encrusted in barnacle-like armor, aside from the bristling antennae that serve as its - you must assume sensory devices and mouth.",
"description": "This, like the more common mi-go, is an alien creature; this one is more heavily armored. Its trunk is a shapeless mass of strange flesh encased in an iridescent carapace, from which sprout several appendages terminating in what appear to be devices of some sort. Its pyramidal head is encrusted in barnacle-like armor, aside from the bristling antennae that serve as its - you must assume sensory devices and mouth.",
"default_faction": "mi-go",
"bodytype": "migo",
"species": [ "NETHER" ],
Expand Down
4 changes: 2 additions & 2 deletions data/json/npcs/TALK_ALLY_TUTORIAL.json
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@
{
"id": "TALK_ALLY_TUTORIAL_COMMANDS",
"type": "talk_topic",
"dynamic_line": "Here's the list of shouted commands I'll respond to:\n - Order me to guard, and I'll stay where I am and watch out for danger. I'll investigate suspicious noises unless you told me not to.\n - Order me to follow, and I'll stop guarding and go back to following you.\n - Order me to stay awake, and I'll stay awake until I'm too tired to keep my eyes open.\n - Order me to sleep when tired, and I'll nap when I get tired. I'll try to tell you when I'm off to bed unless you don't want to hear it.\n - Order me to flee, and I'll stick close to you when you run from danger. I won't go running off on my own - though if things really bad, I might be running away already!\n - Order me to stop running, and I'll evaluate the danger myself and might go off and fight something while you're doing other things.\n - Ordering me to prepare for danger is special: it's an override command. That means I'm going to follow certain instructions, even if you've given me other instructions earlier. Specifically, I'm going to flee with you, I'm not going to open or close doors, I'm not going to sleep until I'm exhausted, and I'm going to try to hold any chokepoints that you're fighting at.\n - Ordering me to relax from danger is another special command, and it will clear any overrides I currently have and I'll go back to whatever instructions I had before you told me to prepare for danger.",
"dynamic_line": "Here's the list of shouted commands I'll respond to:\n - Order me to guard, and I'll stay where I am and watch out for danger. I'll investigate suspicious noises unless you told me not to.\n - Order me to follow, and I'll stop guarding and go back to following you.\n - Order me to stay awake, and I'll stay awake until I'm too tired to keep my eyes open.\n - Order me to sleep when tired, and I'll nap when I get tired. I'll try to tell you when I'm off to bed unless you don't want to hear it.\n - Order me to flee, and I'll stick close to you when you run from danger. I won't go running off on my own - though if things really bad, I might be running away already!\n - Order me to stop running, and I'll evaluate the danger myself and might go off and fight something while you're doing other things.\n - Ordering me to prepare for danger is special: it's an override command. That means I'm going to follow certain instructions, even if you've given me other instructions earlier. Specifically, I'm going to flee with you, I'm not going to open or close doors, I'm not going to sleep until I'm exhausted, and I'm going to try to hold any chokepoints that you're fighting at.\n - Ordering me to relax from danger is another special command, and it will clear any overrides I currently have and I'll go back to whatever instructions I had before you told me to prepare for danger.",
"responses": [
{ "text": "Thanks. How can I give you instructions normally?", "topic": "TALK_ALLY_TUTORIAL_TALK" },
{ "text": "Can I give you instructions about fighting?", "topic": "TALK_ALLY_TUTORIAL_COMBAT" },
Expand All @@ -186,7 +186,7 @@
{
"id": "TALK_ALLY_TUTORIAL_CHANGES",
"type": "talk_topic",
"dynamic_line": "Well, this conversation is pretty new! But there's been some other changes.\n I've been able to install CBMs on you, and have passive bionics installed in me, for a while. But now I can use some active bionics, and I can explain some details on how I use bionics.\n I can also ride horses, and you can give me orders to do things like farmwork, cutting trees, or even building houses from a blueprint.\n I can even read books to improve my skills, so you don't have to spend time reading to me.\n If you've got a faction camp, and we're near it, I'll eat from the camp's food reserves when I'm hungry. And if the camp has a well, I'll drink from the well when thirsty. Be careful, though - if other people are out on missions, I may eat the food they expected to eat when they got done!",
"dynamic_line": "Well, this conversation is pretty new! But there's been some other changes.\n I've been able to install CBMs on you, and have passive bionics installed in me, for a while. But now I can use some active bionics, and I can explain some details on how I use bionics.\n I can also ride horses, and you can give me orders to do things like farmwork, cutting trees, or even building houses from a blueprint.\n I can even read books to improve my skills, so you don't have to spend time reading to me.\n If you've got a faction camp, and we're near it, I'll eat from the camp's food reserves when I'm hungry. And if the camp has a well, I'll drink from the well when thirsty. Be careful, though - if other people are out on missions, I may eat the food they expected to eat when they got done!",
"responses": [
{ "text": "You can use bionics? How does that work?", "topic": "TALK_ALLY_TUTORIAL_CBMS" },
{ "text": "You can ride horses? Can I ride horses?", "topic": "TALK_ALLY_TUTORIAL_HORSES" },
Expand Down
2 changes: 1 addition & 1 deletion data/json/npcs/TALK_COMMON_ALLY.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
{
"id": "TALK_REBOOT",
"type": "talk_topic",
"dynamic_line": "This character was previously put into a suspension state due to an AI bug. If you have reason to believe the problem was fixed, you can wake them up. Do you want to do that now?",
"dynamic_line": "This character was previously put into a suspension state due to an AI bug. If you have reason to believe the problem was fixed, you can wake them up. Do you want to do that now?",
"responses": [
{ "text": "yes, wake up!", "topic": "TALK_NONE", "effect": "wake_up" },
{ "text": "no, go back to sleep.", "topic": "TALK_DONE" }
Expand Down
6 changes: 3 additions & 3 deletions data/json/npcs/TALK_COMMON_OTHER.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
"no": {
"npc_has_effect": "asked_to_hint",
"no": "I have some reason for not telling you.",
"yes": "Nothing comes to my mind now. Ask me later perhaps?"
"yes": "Nothing comes to my mind now. Ask me later perhaps?"
},
"yes": "I'm too tired, let me rest first."
},
Expand Down Expand Up @@ -370,7 +370,7 @@
"condition": "u_has_stolen_item"
},
{
"text": "No, I'm keeping it. Try and take it off me, I dare you.",
"text": "No, I'm keeping it. Try and take it off me, I dare you.",
"condition": "u_has_stolen_item",
"trial": { "type": "INTIMIDATE", "difficulty": 30, "mod": [ [ "FEAR", 8 ], [ "VALUE", 2 ], [ "TRUST", 2 ], [ "BRAVERY", -2 ] ] },
"success": { "topic": "TALK_KEEPING_ITEM", "effect": { "u_faction_rep": -2 } },
Expand Down Expand Up @@ -407,7 +407,7 @@
{
"id": "TALK_ALLOW_KEEP_ITEM",
"type": "talk_topic",
"dynamic_line": "Just this once, you can keep it. Don't tell anyone else.",
"dynamic_line": "Just this once, you can keep it. Don't tell anyone else.",
"responses": [ { "text": "Thanks.", "topic": "TALK_DONE", "effect": "remove_stolen_status" } ]
},
{
Expand Down
6 changes: 3 additions & 3 deletions data/json/npcs/TALK_CYBORG_1.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
"dynamic_line": "*buzz* Great! So what happens now?",
"responses": [
{
"text": "Come with me. We can help each other out.",
"text": "Come with me. We can help each other out.",
"trial": { "type": "PERSUADE", "difficulty": 0, "mod": [ [ "value", 2 ] ] },
"success": { "topic": "TALK_AGREE_FOLLOW", "effect": "follow", "opinion": { "trust": 1, "value": 1 } },
"failure": { "topic": "TALK_DENY_FOLLOW", "effect": "deny_follow", "opinion": { "trust": -1, "fear": 1 } }
Expand All @@ -73,7 +73,7 @@
"success": { "topic": "TALK_CYBORG_FEARFUL", "opinion": { "trust": -4, "fear": 3, "value": -1, "anger": 4 } },
"failure": { "topic": "TALK_CYBORG_BREAKDOWN", "opinion": { "trust": -4, "value": -5, "anger": 10 } }
},
{ "text": "Forget it. Enjoy your freedom.", "topic": "TALK_DONE" }
{ "text": "Forget it. Enjoy your freedom.", "topic": "TALK_DONE" }
]
},
{
Expand Down Expand Up @@ -124,7 +124,7 @@
{
"id": "TALK_CYBORG_LEAVES",
"type": "talk_topic",
"dynamic_line": "Yeah, *beeeeep* I don't think so. Bye.",
"dynamic_line": "Yeah, *beeeeep* I don't think so. Bye.",
"responses": [ { "text": "Suit yourself.", "topic": "TALK_DONE" } ]
}
]
2 changes: 1 addition & 1 deletion data/json/npcs/TALK_FACTION_CAMP.json
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@
{
"id": "TALK_CAMP_OVERSEER",
"type": "talk_topic",
"dynamic_line": "Hey boss. I was thinking, you don't really need me sitting in this tent and not really contributing to the camp. it's a cushy job, but I could do more. We could put up a bulletin board and you could write up what you want done there. What do you say?",
"dynamic_line": "Hey boss. I was thinking, you don't really need me sitting in this tent and not really contributing to the camp. It's a cushy job, but I could do more. We could put up a bulletin board and you could write up what you want done there. What do you say?",
"responses": [
{ "text": "What needs to be done?", "topic": "TALK_CAMP_OVERSEER", "effect": "basecamp_mission" },
{
Expand Down
2 changes: 1 addition & 1 deletion data/json/npcs/isherwood_farm/NPC_Eddie_Isherwood.json
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@
{
"type": "talk_topic",
"id": "TALK_LEAVE_NOW",
"dynamic_line": "You should get off my farm, I won't deal with a a government stooge.",
"dynamic_line": "You should get off my farm, I won't deal with a government stooge.",
"responses": [ { "text": "", "topic": "TALK_DONE" } ]
},
{
Expand Down
2 changes: 1 addition & 1 deletion data/json/npcs/isherwood_farm/NPC_Jesse_Isherwood.json
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@
{
"type": "talk_topic",
"id": "TALK_LEAVE_NOW",
"dynamic_line": "You should get off my farm, I won't deal with a a government stooge.",
"dynamic_line": "You should get off my farm, I won't deal with a government stooge.",
"responses": [ { "text": "", "topic": "TALK_DONE" } ]
},
{
Expand Down
2 changes: 1 addition & 1 deletion data/json/npcs/isherwood_farm/NPC_Lisa_Isherwood.json
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@
{
"type": "talk_topic",
"id": "TALK_LEAVE_NOW",
"dynamic_line": "You should get off my farm, I won't deal with a a government stooge.",
"dynamic_line": "You should get off my farm, I won't deal with a government stooge.",
"responses": [ { "text": "", "topic": "TALK_DONE" } ]
}
]
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@
{
"type": "talk_topic",
"id": "TALK_REFUGEE_Pablo_Situation",
"dynamic_line": "It's pretty tough here. We're packed into too small a location with too many people. Everyone is dealing with their own trauma. Rhy is trying to help out, but she can't be a proper counsellor in these circumstances. I don't know how we're going to survive for long. As for me, I wish I could be anywhere but here. I need to see the sky again, or I'm going to go insane.",
"dynamic_line": "It's pretty tough here. We're packed into too small a location with too many people. Everyone is dealing with their own trauma. Rhy is trying to help out, but she can't be a proper counselor in these circumstances. I don't know how we're going to survive for long. As for me, I wish I could be anywhere but here. I need to see the sky again, or I'm going to go insane.",
"responses": [
{
"text": "Why not move to the Tacoma Commune?",
Expand Down
2 changes: 1 addition & 1 deletion data/json/npcs/talk_tags.json
Original file line number Diff line number Diff line change
Expand Up @@ -1173,7 +1173,7 @@
"We'd better get moving.",
"Let's head out.",
"Time's a-wasting. Let's head out.",
"Come on. We got stuff to do.",
"Come on. We got stuff to do.",
"Let's hit the road.",
"We'll pick this up another time. Let's go.",
"Let's put a pin in this chat for now.",
Expand Down
Loading

0 comments on commit a59d1de

Please sign in to comment.