summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
authorPlaytester <Playtester@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-04-20 23:15:03 +0000
committerPlaytester <Playtester@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-04-20 23:15:03 +0000
commita09e5436e06f844688f708c23975d3ce7e4b3965 (patch)
treeca2f55f5291977056cd132e96226f743c6b426a5 /npc
parent588a0c8ae0b20f1aa88e4e2987229747e0398baf (diff)
downloadhercules-a09e5436e06f844688f708c23975d3ce7e4b3965.tar.gz
hercules-a09e5436e06f844688f708c23975d3ce7e4b3965.tar.bz2
hercules-a09e5436e06f844688f708c23975d3ce7e4b3965.tar.xz
hercules-a09e5436e06f844688f708c23975d3ce7e4b3965.zip
Hopefully fixed the custom jobmaster as well.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6203 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc')
-rw-r--r--npc/Changelog.txt1
-rw-r--r--npc/custom/jobs/jobmaster.txt2
2 files changed, 3 insertions, 0 deletions
diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index 52049b0ae..9f10e036e 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -28,6 +28,7 @@ Nexon
Date Added
======
04/20
+ * Hopefully also fixed the custom job master [Playtester]
* Fixed it again, better use constants [Playtester]
* Fixed Rebirth script not working for some Knights and Crusaders [Playtester]
- needs some testing!
diff --git a/npc/custom/jobs/jobmaster.txt b/npc/custom/jobs/jobmaster.txt
index be736ead3..db7604597 100644
--- a/npc/custom/jobs/jobmaster.txt
+++ b/npc/custom/jobs/jobmaster.txt
@@ -275,6 +275,8 @@ prontera.gat,153,193,6 script Job Master 123,{
menu "No",L_quit,"Yes",-;
if ((BaseLevel < 99) || (JobLevel < 50)) goto L_cantCh;
set lastJob, readparam(19);
+ if(lastJob == Job_Knight2) set lastJob,Job_Knight;
+ if(lastJob == Job_Crusader2) set lastJob,Job_Crusader;
jobchange Job_Novice_High;
resetlvl(1);
skill 142,1,0;