summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorReid <reidyaro@gmail.com>2015-11-09 01:29:22 +0100
committerReid <reidyaro@gmail.com>2015-11-09 01:29:22 +0100
commitaa7d95f35c4da3674d93943c1012b8eaf6fa6dad (patch)
treed696f38e278ecd5f4d222200d9615e46ac074b0f
parent99e5e37d08b1c262e6293200e8c2fb1c37549cd7 (diff)
downloadserverdata-aa7d95f35c4da3674d93943c1012b8eaf6fa6dad.tar.gz
serverdata-aa7d95f35c4da3674d93943c1012b8eaf6fa6dad.tar.bz2
serverdata-aa7d95f35c4da3674d93943c1012b8eaf6fa6dad.tar.xz
serverdata-aa7d95f35c4da3674d93943c1012b8eaf6fa6dad.zip
Add Merlin on const.txt.
-rw-r--r--db/const.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/db/const.txt b/db/const.txt
index b7c19341..76ebd3a1 100644
--- a/db/const.txt
+++ b/db/const.txt
@@ -3398,6 +3398,7 @@ NPC_SALEM 125
NPC_LLOYD 126
NPC_IVAN 127
NPC_ALIGE_OUTSIDE_BARREL 128
+NPC_MERLIN 129
NPC_ALIGE 401
NPC_ORC_SAILOR 402
NPC_RATTO_SAILOR 403