diff options
| author | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-07-31 21:27:01 +0000 |
|---|---|---|
| committer | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-07-31 21:27:01 +0000 |
| commit | 118a84582aee4e93e1c8836c86f9d974f7510d87 (patch) | |
| tree | af4e419462559a22aff52a8ddce445effba1d228 /npc/custom/jobs | |
| parent | 57c2a527907c73e1615fab2834d7e8a97ef08592 (diff) | |
| download | hercules-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 Ў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/custom/jobs')
| -rw-r--r-- | npc/custom/jobs/jobmaster.txt | 6 | ||||
| -rw-r--r-- | npc/custom/jobs/old/jobchange.txt | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/npc/custom/jobs/jobmaster.txt b/npc/custom/jobs/jobmaster.txt index 2db205ba7..d3bf6f59b 100644 --- a/npc/custom/jobs/jobmaster.txt +++ b/npc/custom/jobs/jobmaster.txt @@ -43,7 +43,7 @@ prontera,153,193,6 script Job Master 123,{ case Job_Priest: set @target_job, Job_Acolyte_High; break; - case Job_Alchem: + case Job_Alchemist: case Job_Blacksmith: set @target_job, Job_Merchant_High; break; @@ -91,7 +91,7 @@ prontera,153,193,6 script Job Master 123,{ mes "Are you sure you want to change to " + JobName(@target_job) + "?"; if(select("No","Yes") == 2){ callfunc "Job_Change", @target_job; - if(@target_job == Job_Gunsliger || @target_job == Job_Ninja || @target_job == Job_Taekwon) { + if(@target_job == Job_Gunslinger || @target_job == Job_Ninja || @target_job == Job_Taekwon) { callfunc "F_ClearJobVar"; } else { if($@JC_Plat) goto L_GivePlat; @@ -138,7 +138,7 @@ prontera,153,193,6 script Job Master 123,{ case Job_Baby_Merchant: case Job_Merchant: set @job_opt[0], Job_Blacksmith; - set @job_opt[1], Job_Alchem; + set @job_opt[1], Job_Alchemist; break; case Job_Thief_High: case Job_Baby_Thief: diff --git a/npc/custom/jobs/old/jobchange.txt b/npc/custom/jobs/old/jobchange.txt index 10c4a9cbe..2c0439eca 100644 --- a/npc/custom/jobs/old/jobchange.txt +++ b/npc/custom/jobs/old/jobchange.txt @@ -617,7 +617,7 @@ LSecondClass2: mes "[ ^0065DFJobra^000000 ]"; if(class !=5) goto LNotMerc2; mes "Cool! Go make some potions! Open a Pharmacy! yeah yeah yeah! ^_^"; - jobchange 18;// Job: Job_Alchem + jobchange 18;// Job: Job_Alchemist cutin "kafra_01",255; close; |