summaryrefslogtreecommitdiff
path: root/npc/cities
diff options
context:
space:
mode:
authorultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-07-31 21:27:01 +0000
committerultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-07-31 21:27:01 +0000
commit118a84582aee4e93e1c8836c86f9d974f7510d87 (patch)
treeaf4e419462559a22aff52a8ddce445effba1d228 /npc/cities
parent57c2a527907c73e1615fab2834d7e8a97ef08592 (diff)
downloadhercules-118a84582aee4e93e1c8836c86f9d974f7510d87.tar.gz
hercules-118a84582aee4e93e1c8836c86f9d974f7510d87.tar.bz2
hercules-118a84582aee4e93e1c8836c86f9d974f7510d87.tar.xz
hercules-118a84582aee4e93e1c8836c86f9d974f7510d87.zip
* Fixed north prontera kafra having an empty warp list
* Removed junk &#1038;A text from the 2004 headgears * Changed deprecated Job_Alchem to Job_Alchemist (see r10904) * Fixed a typo in a geffen city npc (Job_Merhcant) * Fixed a typo in the Jobmaster custom script (Job_Gunsliger) * Fixed one old eAAC Quest Warper bug (warp to nonwalkable coords) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10940 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc/cities')
-rw-r--r--npc/cities/amatsu.txt2
-rw-r--r--npc/cities/geffen.txt5
2 files changed, 4 insertions, 3 deletions
diff --git a/npc/cities/amatsu.txt b/npc/cities/amatsu.txt
index d6444d3ed..d1b3fad59 100644
--- a/npc/cities/amatsu.txt
+++ b/npc/cities/amatsu.txt
@@ -284,7 +284,7 @@ amatsu,205,163,4 script Mimi 759,{
}
//=====================================================================
amatsu,230,160,4 script Lady 757,{
- mes "[Yorukoc]";
+ mes "[Yoruko]";
mes "Although I come to the well for water everyday,";
mes "if it's misty or rainy,";
mes "I will not come out here.";
diff --git a/npc/cities/geffen.txt b/npc/cities/geffen.txt
index a3e1b01a0..b7da4df61 100644
--- a/npc/cities/geffen.txt
+++ b/npc/cities/geffen.txt
@@ -901,8 +901,8 @@ geffen_in,114,73,5 script Hadenheim 709,{
mes "[Hans Hadenheim]";
mes "I mean, all these new cities are being discovered by explorers, so import and export trade is really booming!";
next;
- mes "[Hans Handenheim]";
- if (BaseJob == Job_Merhcant)
+ mes "[Hans Handenheim]";
+ if (BaseJob == Job_Merchant)
mes "You're in the trading business yourself, right? So of course you'd understand that we're in a Golden Age of trade!";
else if (Class == Job_Novice) {
mes "I guess...";
@@ -910,6 +910,7 @@ geffen_in,114,73,5 script Hadenheim 709,{
}
else
mes "Anyway...";
+ next;
mes "[Hans Hadenheim]";
mes "Have you been some of these new lands? They're really interesting and you can learn a lot of new things from these foreign cultures.";
next;