summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
authorReid <reidyaro@gmail.com>2016-08-06 16:32:56 +0000
committerReid <reidyaro@gmail.com>2016-08-06 16:32:56 +0000
commitbc57764583e5f808435c68a8d173749a0ffca8a9 (patch)
treeeb5498d881584fce2a8e8b2b403b0084ec399555 /npc
parent0b0ca4af260490c081c290b5f69cb5ec1593e075 (diff)
parent0ce0fa7195889077fbc8ac9b95045ce26b43cbea (diff)
downloadserverdata-bc57764583e5f808435c68a8d173749a0ffca8a9.tar.gz
serverdata-bc57764583e5f808435c68a8d173749a0ffca8a9.tar.bz2
serverdata-bc57764583e5f808435c68a8d173749a0ffca8a9.tar.xz
serverdata-bc57764583e5f808435c68a8d173749a0ffca8a9.zip
Merge branch 'typos' into 'master'
Fixed a few typos reported by Ledmitz and removed the shovel "can't dig here" message from a npc window, it's now a message over the player's head. See merge request !32
Diffstat (limited to 'npc')
-rw-r--r--npc/001-2-28/plush.txt2
-rw-r--r--npc/001-2-9/janus.txt6
-rw-r--r--npc/functions/fishing.txt2
-rw-r--r--npc/items/shovel.txt2
4 files changed, 6 insertions, 6 deletions
diff --git a/npc/001-2-28/plush.txt b/npc/001-2-28/plush.txt
index 65dffeed..563a151f 100644
--- a/npc/001-2-28/plush.txt
+++ b/npc/001-2-28/plush.txt
@@ -105,7 +105,7 @@
case 2:
emotion E_WINK;
speech 5,
- l("We offer a room for travelers passing by Artis, our beds are comfy and you can be guaranted to be right as rain after a night here!"),
+ l("We offer a room for travelers passing by Artis, our beds are comfy and you can be guaranteed to be right as rain after a night here!"),
l("If you wake up at the inn after a harsh battle, you will find yourself revitalized in an instant unlike other places where you can rest.");
narrator_explication;
diff --git a/npc/001-2-9/janus.txt b/npc/001-2-9/janus.txt
index 98b9fb97..f7d865a8 100644
--- a/npc/001-2-9/janus.txt
+++ b/npc/001-2-9/janus.txt
@@ -70,7 +70,7 @@
function explain_service {
speech 5,
- l("You are on the human ressource wing of the Town Hall."),
+ l("You are on the human resource wing of the Town Hall."),
l("We offer party and guild certifications and we can also teach you how to use some basic communication skills."),
l("Do you know how to speak with people around you?");
@@ -82,7 +82,7 @@
if (compareandsetq (General_Janus, 0, 1))
{
speech 12,
- l("This book resumes everything you should know about it, take it!");
+ l("This book contains everything you should know about it, take it!");
inventoryplace CommunicationTheory, 1;
getitem CommunicationTheory, 1;
@@ -99,7 +99,7 @@
{
speech 12,
l("Anyway."),
- l("This book resumes everything you should know about it, take it!");
+ l("This book contains everything you should know about it, take it!");
inventoryplace CommunicationTheory, 1;
getitem CommunicationTheory, 1;
diff --git a/npc/functions/fishing.txt b/npc/functions/fishing.txt
index 49ca3727..4910c29d 100644
--- a/npc/functions/fishing.txt
+++ b/npc/functions/fishing.txt
@@ -1,6 +1,6 @@
// Evol functions.
// Authors:
-// Omatt
+// omatt
// Travolta
// Description:
// Fishing functions.
diff --git a/npc/items/shovel.txt b/npc/items/shovel.txt
index 5ada2353..3f338c2c 100644
--- a/npc/items/shovel.txt
+++ b/npc/items/shovel.txt
@@ -135,7 +135,7 @@
OnUse:
if (!CheckDigLocation())
{
- narrator l("You can't use the shovel here.");
+ message strcharinfo(0), l("I can't use the shovel here.");
close;
}