summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-09-09 03:24:35 +0300
committerGitHub <noreply@github.com>2016-09-09 03:24:35 +0300
commita45a8d92d11acf1f3f2d10853bf60ebb515b84a5 (patch)
tree5033d5bf2881557da0bedbb0354ca22e84ec85a6
parentfe6752d119d2d3b9940368782abe704c08296441 (diff)
parentda4f403345f70dc10841d9e6b2fea5d9c3a21927 (diff)
downloadhercules-a45a8d92d11acf1f3f2d10853bf60ebb515b84a5.tar.gz
hercules-a45a8d92d11acf1f3f2d10853bf60ebb515b84a5.tar.bz2
hercules-a45a8d92d11acf1f3f2d10853bf60ebb515b84a5.tar.xz
hercules-a45a8d92d11acf1f3f2d10853bf60ebb515b84a5.zip
Merge pull request #1420 from Ridley8819/workstation
Followup 0a097048
-rw-r--r--npc/re/jobs/1-1e/taekwon.txt4
-rw-r--r--npc/re/scripts_jobs.conf2
2 files changed, 4 insertions, 2 deletions
diff --git a/npc/re/jobs/1-1e/taekwon.txt b/npc/re/jobs/1-1e/taekwon.txt
index d4f512a94..1befa3b73 100644
--- a/npc/re/jobs/1-1e/taekwon.txt
+++ b/npc/re/jobs/1-1e/taekwon.txt
@@ -28,7 +28,7 @@
//================= Description ===========================================
//= Official TaeKwon Job Change Quest
//================= Current Version =======================================
-//= 1.0
+//= 1.0.1
//=========================================================================
-payon_in01,62,10,5 duplicate(Pheonix) Phoenix#TKJobChangeRE 4_M_MONK
+payon_in01,62,10,5 duplicate(TKJobChange) Phoenix#TKJobChangeRE 4_M_MONK
diff --git a/npc/re/scripts_jobs.conf b/npc/re/scripts_jobs.conf
index 08218a912..77d1532e1 100644
--- a/npc/re/scripts_jobs.conf
+++ b/npc/re/scripts_jobs.conf
@@ -36,6 +36,8 @@
"npc/re/jobs/1-1/merchant.txt",
"npc/re/jobs/1-1/swordman.txt",
"npc/re/jobs/1-1/thief.txt",
+// - 1-1 Expanded
+"npc/re/jobs/1-1e/taekwon.txt",
// - 2e
"npc/re/jobs/2e/kagerou_oboro.txt",
// - 3-1