summaryrefslogtreecommitdiff
path: root/npc/jobs
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/jobs
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/jobs')
-rw-r--r--npc/jobs/1-1/swordman.txt2
-rw-r--r--npc/jobs/2-2/alchemist.txt6
2 files changed, 4 insertions, 4 deletions
diff --git a/npc/jobs/1-1/swordman.txt b/npc/jobs/1-1/swordman.txt
index 88450b49a..072df242e 100644
--- a/npc/jobs/1-1/swordman.txt
+++ b/npc/jobs/1-1/swordman.txt
@@ -10,7 +10,7 @@
//= [Aegis Conversion]
//= Job quest for Swordman classes
//= Uses Job_sword1 as opposed to sword_1-1 -> sword_3-1.
-//= EXPLAOITABLE in a sense because while the sword_x-1 maps
+//= EXPLOITABLE in a sense because while the sword_x-1 maps
//= are marked as "inside" by the client, job_sword1 is not.
//= giving players FREE camera rotation while doing the job quest.
//===== Additional Comments: =================================
diff --git a/npc/jobs/2-2/alchemist.txt b/npc/jobs/2-2/alchemist.txt
index 3a3377d68..4e22a809a 100644
--- a/npc/jobs/2-2/alchemist.txt
+++ b/npc/jobs/2-2/alchemist.txt
@@ -37,7 +37,7 @@ alde_alche,27,185,4 script Parmry Gianino 744,{
mes "[Parmry Gianino]";
if(baseJob == Job_Merchant) goto L_Merc;
- if(baseJob == Job_Alchem){
+ if(baseJob == Job_Alchemist){
mes "Hey there fellow Alchemist. How's the business going? Good I hope, well good luck to you.";
close;
}
@@ -1020,7 +1020,7 @@ L_Done:
alde_alche,101,184,4 script Vincent Carsciallo 122,{
mes "[Vincent Carsciallo]";
if(baseJob == Job_Merchant) goto L_Merc;
- if(baseJob == Job_Alchem){
+ if(baseJob == Job_Alchemist){
mes "How Alchemy going? Make sure to be carefull and think about safety at all times.";
mes "I wouldn't want you blowing yourself up or anything.....";
close;
@@ -1059,7 +1059,7 @@ L_Change:
mes "Oh, Ok. You joined and learned the basics, too. Well done.";
next;
set @gift,JBLVL;
- callfunc "Job_Change",Job_Alchem;
+ callfunc "Job_Change",Job_Alchemist;
callfunc "F_ClearJobVar";
emotion e_grat;
mes "[Vincent Carsciallo]";