summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
authorJesusaves <cpntb1@ymail.com>2020-06-17 04:07:00 +0000
committerJesusaves <cpntb1@ymail.com>2020-06-17 04:07:00 +0000
commit4e242e64460a5548b77d512f317a8cd66967a95f (patch)
tree68dc43b4738cccc2125c0ba06fd674e13ac5cdcb /npc
parent29e1ad40faa662f6b4d66cc3381ba1a8df4a73ad (diff)
parent42ba4602de17807f346a49ab60fd0f99bbafb44e (diff)
downloadserverdata-4e242e64460a5548b77d512f317a8cd66967a95f.tar.gz
serverdata-4e242e64460a5548b77d512f317a8cd66967a95f.tar.bz2
serverdata-4e242e64460a5548b77d512f317a8cd66967a95f.tar.xz
serverdata-4e242e64460a5548b77d512f317a8cd66967a95f.zip
Merge branch 'jesusalva/faction' into 'master'
Factions Utils - For Future Use See merge request evol/serverdata!245
Diffstat (limited to 'npc')
-rw-r--r--npc/001-2-39/qanon.txt2
-rw-r--r--npc/008-3-5/nunia.txt2
2 files changed, 2 insertions, 2 deletions
diff --git a/npc/001-2-39/qanon.txt b/npc/001-2-39/qanon.txt
index 427a97ca..e2273850 100644
--- a/npc/001-2-39/qanon.txt
+++ b/npc/001-2-39/qanon.txt
@@ -85,7 +85,7 @@ function legionState {
// minor guilds: Merchants, Thieves and Mages.
// It would be the commands below:
- // join_clan(CLAN_LEGION);
+ // join_clan(FACTION_LEGION);
// clan_leave();
return;
}
diff --git a/npc/008-3-5/nunia.txt b/npc/008-3-5/nunia.txt
index f87a32d9..b2234dff 100644
--- a/npc/008-3-5/nunia.txt
+++ b/npc/008-3-5/nunia.txt
@@ -71,7 +71,7 @@ function nuniaBegin {
l("At least, you look peaceful. And I see by your fingers that you can deal with lockpicks."),
l("I am going to teach you all what a thief needs to know, later"),
l("Call for Micksha and Jesusalva to implement all this, please."),
- l("And Tezer, our president in Tulimshar, should be able to give you even more training.");
+ l("And Tanveer, our president in Tulimshar, should be able to give you even more training.");
return;
}