summaryrefslogtreecommitdiff
path: root/npc/quests/first_class/tu_merchant.txt
diff options
context:
space:
mode:
authorshennetsind <ind@henn.et>2013-10-30 18:38:14 -0200
committershennetsind <ind@henn.et>2013-10-30 18:38:14 -0200
commit7fefefdde386f13f8fefa8db3ffe9ed140c8aa10 (patch)
tree715f3b80d75cab3a9c2a3abd04ae4461165e8854 /npc/quests/first_class/tu_merchant.txt
parenta2405882a4123d6a11d24e895b40148dc7cb455e (diff)
parentbd04c6c566902d03d633b4dfee5335361155a79e (diff)
downloadhercules-7fefefdde386f13f8fefa8db3ffe9ed140c8aa10.tar.gz
hercules-7fefefdde386f13f8fefa8db3ffe9ed140c8aa10.tar.bz2
hercules-7fefefdde386f13f8fefa8db3ffe9ed140c8aa10.tar.xz
hercules-7fefefdde386f13f8fefa8db3ffe9ed140c8aa10.zip
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'npc/quests/first_class/tu_merchant.txt')
-rw-r--r--npc/quests/first_class/tu_merchant.txt19
1 files changed, 9 insertions, 10 deletions
diff --git a/npc/quests/first_class/tu_merchant.txt b/npc/quests/first_class/tu_merchant.txt
index c947d0342..2e838e4da 100644
--- a/npc/quests/first_class/tu_merchant.txt
+++ b/npc/quests/first_class/tu_merchant.txt
@@ -1,20 +1,19 @@
//===== Hercules Script ======================================
//= Merchant Class Tutorial and Job Specific Quest
-//===== By: ==================================================
+//===== By: ==================================================
//= Fix up by Jukka
-//===== Current Version: =====================================
+//===== Current Version: =====================================
//= 1.3
-//===== Compatible With: =====================================
-//= Hercules
-//===== Description: =========================================
-//= Tutorial for Merchant Class
-//===== Additional Comments: =================================
+//===== Description: =========================================
+//= [Official Conversion]
+//= Merchant training quest.
+//===== Additional Comments: =================================
//= 1.0 Fully working
-//= 1.1 Fixed bugs, optimized [Lupus] 1.2 fixed Weight check
-//= TODO: Test, add missing misceffects
+//= 1.1 Fixed bugs, optimized [Lupus]
+//= 1.2 fixed Weight check
//= 1.2 Fixed experience gains to match upcoming rate adjustments. [SinSloth]
//= 1.3 Misc. updates. [L0ne_W0lf]
-//============================================================
+//============================================================
// Guarnien
//============================================================