summaryrefslogtreecommitdiff
path: root/npc/custom
diff options
context:
space:
mode:
authoreuphyy <euphyy@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-10-21 03:36:01 +0000
committereuphyy <euphyy@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-10-21 03:36:01 +0000
commit1fc108697de200cc316555663642de1ebeae6fc3 (patch)
tree1719f63dc0b2141bb11ff2f6e979134fe0b6e4c4 /npc/custom
parentb8d1e233e66be3812dc2543b381e9656130ef3f8 (diff)
downloadhercules-1fc108697de200cc316555663642de1ebeae6fc3.tar.gz
hercules-1fc108697de200cc316555663642de1ebeae6fc3.tar.bz2
hercules-1fc108697de200cc316555663642de1ebeae6fc3.tar.xz
hercules-1fc108697de200cc316555663642de1ebeae6fc3.zip
* Updated Thanatos Tower quest to Episode 13.1 - huge thanks to Muad_Dib! (bugreport:4498)
* Fixed some syntax in item_db_re.sql (bugreport:6714) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16823 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc/custom')
-rw-r--r--npc/custom/etc/quest_warper.txt2
-rw-r--r--npc/custom/jobmaster.txt2
2 files changed, 2 insertions, 2 deletions
diff --git a/npc/custom/etc/quest_warper.txt b/npc/custom/etc/quest_warper.txt
index 12709ac15..2c2d31083 100644
--- a/npc/custom/etc/quest_warper.txt
+++ b/npc/custom/etc/quest_warper.txt
@@ -63,7 +63,7 @@
//= 2.0b - Special warpname menu option name bug fixed
//= 2.1 - Updated names to fall within retrictions. [L0ne_W0lf]
//= 2.2 - #kafra_code is now stored as is. [brianluau]
-//= 2.3 - Addednew town maps, cleanup, and removed pre-1.8 backwards fix. [Euphy]
+//= 2.3 - Added new town maps, cleanup, and removed pre-1.8 backwards fix. [Euphy]
//=================================================================
//========================Function=&=Script========================
diff --git a/npc/custom/jobmaster.txt b/npc/custom/jobmaster.txt
index 1112c515e..e072ee4b9 100644
--- a/npc/custom/jobmaster.txt
+++ b/npc/custom/jobmaster.txt
@@ -140,7 +140,7 @@ Get_Platinum:
case 5: skill 153,1,0; skill 154,1,0; skill 155,1,0; break;
case 6: skill 149,1,0; skill 150,1,0; skill 151,1,0; skill 152,1,0; break;
default: break; }
- switch(roclass(eaclass()&EAJ_UPPERMASK)) {
+ switch(BaseJob) {
case 7: skill 1001,1,0; break;
case 8: skill 1014,1,0; break;
case 9: skill 1006,1,0; break;