summaryrefslogtreecommitdiff
path: root/npc/other
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/other
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/other')
-rw-r--r--npc/other/Global_Functions.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/npc/other/Global_Functions.txt b/npc/other/Global_Functions.txt
index 4ecb028f5..63e877b28 100644
--- a/npc/other/Global_Functions.txt
+++ b/npc/other/Global_Functions.txt
@@ -148,7 +148,7 @@ function script Is_Magic_Class {
//////////////////////////////////////////////////////////////////////////////////
function script Is_Merc_Class {
- return ( BaseJob==Job_Merchant || BaseJob==Job_Blacksmith || BaseJob==Job_Alchem );
+ return ( BaseJob==Job_Merchant || BaseJob==Job_Blacksmith || BaseJob==Job_Alchemist );
}